Changeset 368

Timestamp:

09/02/08 15:18:46 (4 months ago)

Author:

arneke

Message:

Improved error handling (ie. tell someone) for SeedResource?

Files:

• trunk/geowebcache/src/main/java/org/geowebcache/rest/SeedResource.java (modified) (4 diffs)

trunk/geowebcache/src/main/java/org/geowebcache/rest/SeedResource.java

@@ -30 +30 @@
 import org.restlet.data.Request;
 import org.restlet.data.Response;
+import org.restlet.data.Status;
 import org.restlet.ext.json.JsonRepresentation;
 import org.restlet.resource.Representation;
@@ -98 +99 @@
     @Override
     public void post(Representation entity) {
-        log.info("Received seed request from  "
-                + getRequest().getClientInfo().getAddress());
-
+        
+        String remoteAdr = getRequest().getClientInfo().getAddress();
+        
+        if(entity == null) {
+            String message = "Request from " + remoteAdr + " did not specify MIME type"
+                    + " of the document posted. Please specify application/xml "
+                    + " or application/json";
+            writeError(Status.CLIENT_ERROR_BAD_REQUEST, message);
+        } else {
+            log.info("Received seed request from  "
+                    + getRequest().getClientInfo().getAddress());
+        }
+        
         try {
             String text = entity.getText();
@@ -150 +161 @@
             TileLayerDispatcher tlDispatch = RESTDispatcher.getInstance().getTileLayerDispatcher();
             TileLayer tl = tlDispatch.getTileLayer(rq.getLayerName());
+            
             if(tl != null) {
                 RESTDispatcher.getInstance().getExecutor().submit(new MTSeeder(new SeedTask(rq,tl)));
             } else {
-                throw new GeoWebCacheException("Unknown layer " + rq.getLayerName());
-            }
+                writeError(Status.CLIENT_ERROR_BAD_REQUEST, "Unknown layer " + rq.getLayerName());
+            }
+            
         } catch (IOException ioex) {
-            log.error("Exception occured while unmarshalling SeedRequest from XML");
+            writeError(Status.SERVER_ERROR_INTERNAL, ioex.getMessage());
         } catch (GeoWebCacheException gwce) {
-            log.error(gwce.getMessage());
+            writeError(Status.SERVER_ERROR_INTERNAL, gwce.getMessage());
         }
     }
@@ -182 +195 @@
     }
 
+    private void writeError(Status status, String message) {
+        log.error(message);
+        this.getResponse().setStatus(status, message);
+    }
 }