Changeset 333

Timestamp:

08/15/08 18:11:14 (3 months ago)

Author:

masuta

Message:

added support for posting layers in json format. see example file under /resources

Location:

trunk/geowebcache/src/main

Files:

• java/org/geowebcache/layer/TileLayerResource.java (modified) (3 diffs)
• java/org/geowebcache/seeder/SeedResource.java (modified) (2 diffs)
• java/org/geowebcache/util/XMLConfiguration.java (modified) (2 diffs)
• resources/geowebcache.xml (modified) (1 diff)
• resources/layerTest.json (added)
• resources/layerTest.xml (modified) (1 diff)

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

@@ -6 +6 @@
 import java.io.Reader;
 import java.io.CharArrayReader;
+import java.io.StringReader;
+import java.io.StringWriter;
 
 import org.restlet.Context;
@@ -22 +24 @@
 
 import com.thoughtworks.xstream.*;
+import com.thoughtworks.xstream.io.HierarchicalStreamDriver;
+import com.thoughtworks.xstream.io.HierarchicalStreamReader;
 import com.thoughtworks.xstream.io.xml.DomDriver;
+import com.thoughtworks.xstream.io.xml.PrettyPrintWriter;
+import com.thoughtworks.xstream.io.copy.HierarchicalStreamCopier;
+import com.thoughtworks.xstream.io.json.JettisonMappedXmlDriver;
 import com.thoughtworks.xstream.io.json.JsonHierarchicalStreamDriver;
 
@@ -226 +233 @@
                 + getRequest().getHostRef().getHostIdentifier());
         try{
-            String xmlText = entity.getText();
+            String xmlText = entity.getText();      
             XStream xs = RESTDispatcher.getConfig().getConfiguredXStream(new XStream(new DomDriver()));
-            TileLayer tileLayer = (WMSLayer) xs.fromXML(xmlText);
+            TileLayer tileLayer = null;
+            if(entity.getMediaType().equals(MediaType.APPLICATION_XML)){
+                tileLayer = (WMSLayer) xs.fromXML(xmlText);
+            }
+            
+            /**
+             * deserializing a json string is more complicated. XStream does not natively
+             * support it. Rather it uses a JettisonMappedXmlDriver to convert to intermediate xml
+             * and then deserializes that into the desired object. At this time, there is a known issue 
+             * with the Jettison driver involving elements that come after an array in the json string. 
+             * 
+             * http://jira.codehaus.org/browse/JETTISON-48
+             * 
+             * The code below is a hack: it treats the json string as text, then converts it to the intermediate
+             * xml and then deserializes that into the tileLayer object. 
+             * 
+             * 
+             */
+            else if(entity.getMediaType().equals(MediaType.APPLICATION_JSON)){
+                HierarchicalStreamDriver driver = new JettisonMappedXmlDriver();
+                StringReader reader = new StringReader(xmlText);
+                HierarchicalStreamReader hsr = driver.createReader(reader);
+                StringWriter writer = new StringWriter();
+                new HierarchicalStreamCopier().copy(hsr, new PrettyPrintWriter(writer));
+                writer.close(); 
+                
+                XStream x = new XStream(new DomDriver());
+                x.alias("wmslayer", WMSLayer.class);
+                x.aliasField("layer-name", TileLayer.class, "name");
+                x.alias("grid", Grid.class);
+                
+                
+                tileLayer = (WMSLayer) x.fromXML(writer.toString());
+            }
+            
             //the layer we are posting to is null, so we need to create a new one
             if(currentLayer == null){

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

@@ -99 +99 @@
         try {
             String text = entity.getText();
+            
             XStream xs = new XStream(new DomDriver());
                 xs.alias("seedRequest", SeedRequest.class);
@@ -106 +107 @@
             xs.alias("zoomstart", Integer.class);
             xs.alias("zoomstop", Integer.class);
+            
             SeedRequest rq = null; 
+            
             if(entity.getMediaType().equals(MediaType.APPLICATION_XML)){
                 rq = (SeedRequest) xs.fromXML(text);
             }
+            
+            /**
+             * deserializing a json string is more complicated. XStream does not natively
+             * support it. Rather it uses a JettisonMappedXmlDriver to convert to intermediate xml
+             * and then deserializes that into the desired object. At this time, there is a known issue 
+             * with the Jettison driver involving elements that come after an array in the json string. 
+             * 
+             * http://jira.codehaus.org/browse/JETTISON-48
+             * 
+             * The code below is a hack: it treats the json string as text, then converts it to the intermediate
+             * xml and then deserializes that into the SeedRequest object. 
+             * 
+             * 
+             */
+          
             else if(entity.getMediaType().equals(MediaType.APPLICATION_JSON)){
                 HierarchicalStreamDriver driver = new JettisonMappedXmlDriver();

trunk/geowebcache/src/main/java/org/geowebcache/util/XMLConfiguration.java

@@ -35 +35 @@
 import org.geowebcache.layer.wms.WMSLayer;
 import org.geowebcache.GeoWebCacheException;
-import org.geowebcache.cache.CacheFactory;
 import org.geowebcache.cache.*;
 import org.geowebcache.layer.Grid;
@@ -133 +132 @@
     public XStream getConfiguredXStream(XStream xstream) {
         XStream xs = xstream;
-
+        xs.setMode(XStream.NO_REFERENCES);
+        
         xs.alias("layer", TileLayer.class);
         xs.alias("wmslayer", WMSLayer.class);
         xs.aliasField("layer-name", TileLayer.class, "name");
+        xs.alias("grids", new ArrayList<Grid>().getClass());
         xs.alias("grid", Grid.class);
-        xs.alias("format", String.class);
-
+        xs.aliasType("format", String.class);
+        xs.alias("mimeFormats", new ArrayList<String>().getClass());
+        xs.aliasType("WMSurl", String.class);
+        xs.aliasType("errormime", String.class);
+        xs.alias("metaWidthHeight", new int[1].getClass());
+        xs.alias("width", Integer.class);
+        xs.alias("height", Integer.class);
+        xs.aliasType("version", String.class);
+        xs.alias("tiled", boolean.class);
+        xs.alias("transparent", boolean.class);
+        xs.alias("debugheaders", boolean.class);
+        
+        
         return xs;
     }

trunk/geowebcache/src/main/resources/geowebcache.xml

@@ -3 +3 @@
              <layer-name>topp:states</layer-name>
              <mimeFormats>
-                 <format>image/png</format>
-                 <format>image/jpeg</format>
+                 <string>image/png</string>
+                 <string>image/jpeg</string>
               </mimeFormats>
               <grids>

trunk/geowebcache/src/main/resources/layerTest.xml

@@ -3 +3 @@
              <layer-name>my:newTest</layer-name>
              <mimeFormats>
-                 <format>image/jpeg</format>
+                 <string>image/jpeg</string>
               </mimeFormats>
               <grids>