LayerGroupController does not encode links to contained layers and st…

…yles
geoserver · Apr 2, 2017 · 458cde6 · 458cde6
1 parent a561b77
commit 458cde6
Show file tree

Hide file tree

Showing 2 changed files with 43 additions and 9 deletions.
diff --git a/src/restconfig-ng/src/main/java/org/geoserver/catalog/rest/LayerGroupController.java b/src/restconfig-ng/src/main/java/org/geoserver/catalog/rest/LayerGroupController.java
@@ -10,6 +10,8 @@
 import org.geoserver.catalog.CatalogFacade;
 import org.geoserver.catalog.CatalogInfo;
 import org.geoserver.catalog.LayerGroupInfo;
+import org.geoserver.catalog.LayerInfo;
+import org.geoserver.catalog.StyleInfo;
 import org.geoserver.config.util.XStreamPersister;
 import org.geoserver.rest.ResourceNotFoundException;
 import org.geoserver.rest.RestBaseController;
@@ -33,6 +35,9 @@
 import org.springframework.web.util.UriComponents;
 import org.springframework.web.util.UriComponentsBuilder;
 
+import com.thoughtworks.xstream.converters.MarshallingContext;
+import com.thoughtworks.xstream.io.HierarchicalStreamWriter;
+
 import java.lang.reflect.Type;
 import java.util.List;
 import java.util.Map;
@@ -67,7 +72,7 @@ public RestWrapper getLayerGroups(@PathVariable( name = "workspace", required =
     }
 
     @GetMapping(value = {"/layergroups/{layerGroup}", "/workspaces/{workspace}/layergroups/{layerGroup}"},
-            produces = {MediaType.APPLICATION_JSON_VALUE, MediaType.APPLICATION_XML_VALUE, MediaType.TEXT_HTML_VALUE})
+            produces = {MediaType.APPLICATION_JSON_VALUE, CatalogController.TEXT_JSON, MediaType.APPLICATION_XML_VALUE, MediaType.TEXT_XML_VALUE, MediaType.TEXT_HTML_VALUE})
     public RestWrapper getLayerGroup(@PathVariable (name = "layerGroup") String layerGroupName,
                                      @PathVariable (name = "workspace", required = false) String workspaceName,
                                      @RequestParam (name = "quietOnNotFound", required = false) Boolean quietOnNotFound) {
@@ -178,7 +183,7 @@ public boolean supports(MethodParameter methodParameter, Type targetType, Class<
     }
 
     @Override
-    public void configurePersister(XStreamPersister persister, XStreamMessageConverter xStreamMessageConverter) {
+    public void configurePersister(XStreamPersister persister, XStreamMessageConverter converter) {
         persister.setCallback(new XStreamPersister.Callback() {
             @Override
             protected Class<LayerGroupInfo> getObjectClass() {
@@ -196,6 +201,22 @@ protected CatalogInfo getCatalogObject() {
                 }
                 return catalog.getLayerGroupByName(workspace, layerGroup);
             }
+
+            @Override
+            protected void postEncodeReference(Object obj, String ref, String prefix,
+                    HierarchicalStreamWriter writer, MarshallingContext context) {
+                if ( obj instanceof StyleInfo ) {
+                    StringBuffer link = new StringBuffer();
+                    if (prefix != null) {
+                        link.append("/workspaces/").append(converter.encode(prefix));
+                    }
+                    link.append("/styles/").append(converter.encode(ref));
+                    converter.encodeLink(link.toString(), writer);
+                }
+                if ( obj instanceof LayerInfo ) {
+                    converter.encodeLink("/layers/" + converter.encode(ref), writer);
+                }
+            }
         });
     }
 }
diff --git a/src/restconfig-ng/src/test/java/org/geoserver/rest/catalog/LayerGroupControllerTest.java b/src/restconfig-ng/src/test/java/org/geoserver/rest/catalog/LayerGroupControllerTest.java
@@ -7,17 +7,16 @@
 
 import static org.custommonkey.xmlunit.XMLAssert.assertXpathEvaluatesTo;
 import static org.custommonkey.xmlunit.XMLAssert.assertXpathExists;
-import static org.junit.Assert.assertEquals;
+import static org.hamcrest.Matchers.endsWith;
-import static org.junit.Assert.assertFalse;
+import static org.hamcrest.Matchers.equalTo;
-import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.*;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
 
 import net.sf.json.JSON;
 import net.sf.json.JSONArray;
 import net.sf.json.JSONObject;
 import org.geoserver.catalog.Catalog;
 import org.geoserver.catalog.LayerGroupInfo;
+import org.geoserver.catalog.LayerInfo;
 import org.geoserver.catalog.PublishedInfo;
 import org.geoserver.catalog.StyleInfo;
 import org.geoserver.rest.RestBaseController;
@@ -113,14 +112,28 @@ void addLayerGroupToWorkspace() {
 
     @Test
     public void testGetAsXML() throws Exception {
+
+
         print(get(RestBaseController.ROOT_PATH + "/layergroups/sfLayerGroup.xml"));
         Document dom = getAsDOM( RestBaseController.ROOT_PATH + "/layergroups/sfLayerGroup.xml");
+        print(dom);
+
         assertEquals( "layerGroup", dom.getDocumentElement().getNodeName() );
         assertXpathEvaluatesTo("sfLayerGroup", "/layerGroup/name", dom );
         assertXpathEvaluatesTo( "2", "count(//published)", dom );
         assertXpathEvaluatesTo( "2", "count(//style)", dom );
-
+        // check layer link
-        print(get(RestBaseController.ROOT_PATH + "/layergroups/citeLayerGroup.xml"));
+        assertThat(xp.evaluate("//published[name='PrimitiveGeoFeature']/atom:link/@href", dom), 
+                endsWith(RestBaseController.ROOT_PATH + "/layers/PrimitiveGeoFeature.xml"));
+        assertThat(xp.evaluate("//published[name='PrimitiveGeoFeature']/atom:link/@type", dom), 
+                equalTo("application/xml"));
+        // check style link
+        assertThat(xp.evaluate("//style[1]/atom:link/@href", dom), 
+                endsWith(RestBaseController.ROOT_PATH + "/styles/point.xml"));
+        assertThat(xp.evaluate("//style[1]/atom:link/@type", dom), 
+                equalTo("application/xml"));
+
+
         dom = getAsDOM( RestBaseController.ROOT_PATH + "/layergroups/citeLayerGroup.xml");
         assertEquals( "layerGroup", dom.getDocumentElement().getNodeName() );
         assertXpathEvaluatesTo("citeLayerGroup", "/layerGroup/name", dom );