[GEOS-8764] Allow LayerGroups in default worksaces to be found when w…

…orkspace isn't specified
geoserver · Jun 22, 2018 · dea9aaf · dea9aaf
1 parent 29a96ce
commit dea9aaf
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 7 deletions.
diff --git a/src/main/src/main/java/org/geoserver/catalog/impl/CatalogImpl.java b/src/main/src/main/java/org/geoserver/catalog/impl/CatalogImpl.java
@@ -1060,6 +1060,9 @@ public LayerGroupInfo getLayerGroupByName(String name) {
 
         int colon = name.indexOf(':');
         if (colon == -1) {
+            // if there is no prefix, try the default workspace
+            WorkspaceInfo defaultWs = getDefaultWorkspace();
+            workspaceName = defaultWs == null ? null : defaultWs.getName();
             layerGroupName = name;
         }
         if (colon != -1) {

diff --git a/src/main/src/test/java/org/geoserver/catalog/impl/CatalogImplTest.java b/src/main/src/test/java/org/geoserver/catalog/impl/CatalogImplTest.java
@@ -2124,18 +2124,30 @@ public void testGetLayerGroupByName() {
         assertNull(catalog.getLayerGroupByName(catalog.getDefaultWorkspace(), "layerGroup"));
 
         LayerGroupInfo lg2 = catalog.getFactory().createLayerGroup();
-        WorkspaceInfo defaultWorkspace = catalog.getDefaultWorkspace();
+        lg2.setWorkspace(ws);
-        lg2.setWorkspace(defaultWorkspace);
+        assertEquals(ws, catalog.getDefaultWorkspace());
         lg2.setName("layerGroup2");
         lg2.getLayers().add(l);
         lg2.getStyles().add(s);
         catalog.add(lg2);
 
+        // When in the default workspace, we should be able to find it without the prefix
+        assertNotNull(catalog.getLayerGroupByName("layerGroup2"));
+        assertNotNull(catalog.getLayerGroupByName(ws.getName() + ":layerGroup2"));
+        assertNotNull(catalog.getLayerGroupByName(catalog.getDefaultWorkspace(), "layerGroup2"));
+        assertNull(catalog.getLayerGroupByName("cite", "layerGroup2"));
+
+        // Repeat in a non-default workspace
+        WorkspaceInfo ws2 = catalog.getFactory().createWorkspace();
+        ws2.setName("ws2");
+        catalog.add(ws2);
+        catalog.setDefaultWorkspace(ws2);
+
         assertNull(
-                "layerGropu2 is not global, should not be found",
+                "layerGroup2 is not global, should not be found",
                 catalog.getLayerGroupByName("layerGroup2"));
-        assertNotNull(catalog.getLayerGroupByName(defaultWorkspace.getName() + ":layerGroup2"));
+        assertNotNull(catalog.getLayerGroupByName(ws.getName() + ":layerGroup2"));
-        assertNotNull(catalog.getLayerGroupByName(catalog.getDefaultWorkspace(), "layerGroup2"));
+        assertNotNull(catalog.getLayerGroupByName(ws, "layerGroup2"));
         assertNull(catalog.getLayerGroupByName("cite", "layerGroup2"));
     }
 
@@ -2165,6 +2177,7 @@ public void testGetLayerGroupByNameWithColon() {
     @Test
     public void testGetLayerGroupByNameWithWorkspace() {
         addLayer();
+        assertEquals(ws, catalog.getDefaultWorkspace());
 
         CatalogFactory factory = catalog.getFactory();
         LayerGroupInfo lg1 = factory.createLayerGroup();
@@ -2220,8 +2233,9 @@ public void testGetLayerGroupByNameWithWorkspace() {
         lg2.getStyles().add(s2);
         catalog.add(lg2);
 
-        // lg is not global, should not be found at least we specify a prefixed name
+        // lg is not global, but it is in the default workspace, so it should be found if we don't
-        assertNull(catalog.getLayerGroupByName("lg"));
+        // specify the workspace
+        assertEquals(lg1, catalog.getLayerGroupByName("lg"));
 
         assertEquals(lg1, catalog.getLayerGroupByName(ws.getName(), "lg"));
         assertEquals(lg1, catalog.getLayerGroupByName(ws, "lg"));