[GEOS-8493] Support POST for non-SLD styles

Support POSTing non-SLD style body Refactor StyleController to be a bit more consistent / structured. Move common code to methods. Improve javadocs for utility methods
geoserver · Jan 24, 2018 · e149eb1 · e149eb1
1 parent 66b38ec
commit e149eb1
Show file tree

Hide file tree

Showing 4 changed files with 442 additions and 298 deletions.
diff --git a/src/community/mbstyle/src/test/java/org/geoserver/rest/catalog/MBStyleControllerTest.java b/src/community/mbstyle/src/test/java/org/geoserver/rest/catalog/MBStyleControllerTest.java
@@ -164,4 +164,29 @@ public void testRawPutJson() throws Exception {
         catalog.remove(styleInfo);
     }
 
+    @Test
+    public void testPostJson() throws Exception {
+        String jsonBody = newMbStyle();
+        Catalog cat = getCatalog();
+        assertNull("foo not available", cat.getStyleByName("foo"));
+
+        MockHttpServletResponse response = postAsServletResponse("/rest/styles?name=foo",jsonBody, MBStyleHandler.MIME_TYPE);
+        assertEquals(201, response.getStatus());
+
+        GeoServerResourceLoader resources = catalog.getResourceLoader();
+        Resource resource = resources.get("/styles/foo.json");
+        String definition = new String(resource.getContents());
+        assertTrue("is json", definition.contains("\"circle-color\": \"#FFFFFF\""));
+
+        StyleInfo styleInfo = catalog.getStyleByName("foo");
+        Style s = styleInfo.getStyle();
+        ByteArrayOutputStream out = new ByteArrayOutputStream();
+
+        SLDHandler handler = new SLDHandler();
+        handler.encode(Styles.sld(s), SLDHandler.VERSION_10, false, out);
+        String contentOut = new String(out.toByteArray());
+        assertTrue(contentOut.contains("<sld:Name>foo</sld:Name>"));
+        catalog.remove(styleInfo);
+    }
+
 }
diff --git a/src/extension/css/src/test/java/org/geoserver/rest/catalog/CssStyleControllerTest.java b/src/extension/css/src/test/java/org/geoserver/rest/catalog/CssStyleControllerTest.java
@@ -124,6 +124,33 @@ public void testRawPutCSS() throws Exception {
         catalog.remove(styleInfo);
     }
 
+    @Test
+    public void testPostCSS() throws Exception {
+        Catalog cat = getCatalog();
+        assertNull("foo not available", cat.getStyleByName("foo"));
+
+        String content = newCSS();
+        MockHttpServletResponse response = postAsServletResponse("/rest/styles?name=foo", content, CssHandler.MIME_TYPE);
+        assertEquals(201, response.getStatus());
+
+        GeoServerResourceLoader resources = catalog.getResourceLoader();
+
+        Resource resource = resources.get("/styles/foo.css");
+
+        String definition = new String(resource.getContents());
+        assertTrue("is css", definition.contains("stroke: red"));
+
+        StyleInfo styleInfo = catalog.getStyleByName("foo");
+        Style s = styleInfo.getStyle();
+        ByteArrayOutputStream out = new ByteArrayOutputStream();
+
+        SLDHandler handler = new SLDHandler();
+        handler.encode(Styles.sld(s), SLDHandler.VERSION_10, false, out);
+        content = new String(out.toByteArray());
+        assertTrue(content.contains("<sld:Name>foo</sld:Name>"));
+        catalog.remove(styleInfo);
+    }
+
     @Test
     public void testPutCSS() throws Exception {
         // step 1 create style info with correct format

diff --git a/src/extension/ysld/src/test/java/org/geoserver/rest/catalog/YsldStyleControllerTest.java b/src/extension/ysld/src/test/java/org/geoserver/rest/catalog/YsldStyleControllerTest.java
@@ -99,6 +99,34 @@ public void testRawPutYSLD() throws Exception {
         assertTrue(content.contains("<sld:Name>foo</sld:Name>"));
         catalog.remove(styleInfo);
     }
+
+    @Test
+    public void testPostYSLD() throws Exception {
+        // step 1 create style info with correct format
+        Catalog cat = getCatalog();
+        assertNull("foo not available",cat.getStyleByName("foo"));
+
+        String content = newYSLD();
+        MockHttpServletResponse response = postAsServletResponse( "/rest/styles?name=foo", content, YsldHandler.MIMETYPE);
+        assertEquals( 201, response.getStatus() );
+
+        GeoServerResourceLoader resources = catalog.getResourceLoader();
+
+        Resource resource = resources.get("/styles/foo.yaml");
+
+        String definition = new String(resource.getContents());
+        assertTrue("is yaml",definition.contains("stroke-color: '#FF0000'"));
+
+        StyleInfo styleInfo = catalog.getStyleByName( "foo" );
+        Style s = styleInfo.getStyle();
+        ByteArrayOutputStream out = new ByteArrayOutputStream();
+
+        SLDHandler handler = new SLDHandler();
+        handler.encode(Styles.sld(s), SLDHandler.VERSION_10, false, out);
+        content = new String(out.toByteArray());
+        assertTrue(content.contains("<sld:Name>foo</sld:Name>"));
+        catalog.remove(styleInfo);
+    }
 
     @Test
     public void testPutYSLD() throws Exception {