Changeset 361

Timestamp:

09/01/08 19:25:56 (3 months ago)

Author:

arneke

Message:

Cleanup of existing RESTful API code

Location:

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

Files:

• RESTDispatcher.java (modified) (1 diff)
• TileLayerResource.java (modified) (5 diffs)

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

@@ -133 +133 @@
         if (myRouter == null) {
             myRouter = new Router();
-            myRouter.attach("/layers/", TileLayerResource.class);
+            //myRouter.attach("/layers/", TileLayerResource.class);
             myRouter.attach("/layers", TileLayerResource.class);
             myRouter.attach("/seed/", SeedResource.class);
-            myRouter.attach("/rest/layers/", TileLayerResource.class);
-            myRouter.attach("/rest/layers", TileLayerResource.class);
             myRouter.attach("/rest/seed/", SeedResource.class);
         }

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

@@ -76 +76 @@
         super(context, request, response);
         
+        System.out.println(this);
+        
         // Prep
         RESTDispatcher restDispatch = RESTDispatcher.getInstance();
@@ -81 +83 @@
         tlDispatcher = restDispatch.getTileLayerDispatcher();
 
-        
-        String remainingString = (String) request.getResourceRef().getRemainingPart();
-        String myReqLayerName = null;
-        if (remainingString == null) {
-            // request was made to ...rest/layers/
+        // TODO this is really the kind of stuff RESTlet.org could do for us
+        //String remainingString = (String) request.getResourceRef().getRemainingPart();
+        
+        String lastSegment = request.getResourceRef().getLastSegment();
+        String layerName = null;
+        String format = null;
+        if(0 < lastSegment.lastIndexOf(".")) {
+            String[] splitStr = lastSegment.split("\\.");
+            layerName = splitStr[0];
+            format = splitStr[1];
+        } else {
+            layerName = lastSegment;
+        }
+
+        if(format != null && format.equalsIgnoreCase("json")) {
+            getVariants().add(new Variant(MediaType.APPLICATION_JSON));
+        } else {
             getVariants().add(new Variant(MediaType.TEXT_XML));
-            currentLayer = null;
-        } else if (remainingString.indexOf('.') == -1) {
-            // no extension provided, default to xml
-            getVariants().add(new Variant(MediaType.TEXT_XML));
-            myReqLayerName = remainingString;
-            currentLayer = tlDispatcher.getLayers().get(myReqLayerName);
-        } else if (remainingString.indexOf('.') != -1) {
-            myReqLayerName = remainingString.substring(0, remainingString
-                    .indexOf('.'));
-            String format = remainingString.substring(remainingString
-                    .indexOf('.') + 1);
-            if (format.equals("xml")) {
-                getVariants().add(new Variant(MediaType.TEXT_XML));
-            } else if (format.equals("json")) {
-                getVariants().add(new Variant(MediaType.APPLICATION_JSON));
-            } else if (format.equals("text")) {
-                getVariants().add(new Variant(MediaType.TEXT_PLAIN));
-            }
-            currentLayer = tlDispatcher.getLayers().get(myReqLayerName);
-        }
-
+        }
+        
+        if(layerName != null && ! layerName.equalsIgnoreCase("layers")) {
+            currentLayer = tlDispatcher.getLayers().get(layerName);
+        }
     }
 
@@ -116 +114 @@
     public Representation getRepresentation(Variant variant) {
         Representation result = null;
-        TileLayer tl = currentLayer;
-        if (variant.getMediaType().equals(MediaType.TEXT_PLAIN)) {
-            // create a text representation of the current layer
-            result = getStringRepresentation(currentLayer);
-        } else if (tl == null
-                && variant.getMediaType().equals(MediaType.TEXT_XML)) {
-            // create a dom representation that will list of all available layers
-            result = getDomRepresentationAsListOfLayers();
-        } else if (tl != null && variant.getMediaType().equals(MediaType.TEXT_XML)) {
-            // create xml representation of the currentLayer
-            result = getXMLRepresentation(currentLayer);
-        } else if (variant.getMediaType().equals(MediaType.APPLICATION_JSON)) {
-            // create JSONRepresentation of the currentLayer
-            result = getJsonRepresentation(currentLayer);
+        
+        if(currentLayer == null) {
+            //if(variant.getMediaType() == MediaType.APPLICATION_JSON) {
+            //    result = getJSONRepresentationAsListOfLayers();
+            //} else {
+                result = getDomRepresentationAsListOfLayers();
+            //}
+        } else {
+            if(variant.getMediaType() == MediaType.APPLICATION_JSON) {
+                result = getXMLRepresentation(currentLayer);
+            } else {
+                result = getJsonRepresentation(currentLayer);
+            }
         }
 
         return result;
     }
+    
+    
     /**
      * Returns a DomRepresentation of all available layers
@@ -169 +168 @@
         }
         return new DomRepresentation(MediaType.TEXT_XML, doc);
-    }
-
-    /**
-     * Returns a StringRepresentation of the layer ONLY FOR TESTING PURPOSES
-     * 
-     * @param layer
-     * @return
-     */
-    public StringRepresentation getStringRepresentation(TileLayer layer) {
-        StringBuilder sb = new StringBuilder();
-        sb.append("Layer details\n");
-        sb.append("_____________\n");
-        sb.append("Name: ").append(layer.getName()).append('\n');
-        return new StringRepresentation(sb);
     }
 
@@ -378 +363 @@
         }
     }
-    
-//    public void setXMLConfiguration(TileLayerDispatcher tlDispatcher) {
-//        this.tlDispatcher = tlDispatcher;
-//        
-//    }
-//
-//    public void setXMLConfiguration(XMLConfiguration xmlConfig) {
-//        this.xmlConfig = xmlConfig;
-//    }
 }