Update geoserver submodule, add new Service.WCSInfo.defaultDeflateCom…

…pressionLevel property to geoserver-jackson-bindings (#220)
geoserver · Apr 16, 2022 · bc0e85f · bc0e85f
1 parent 0078987
commit bc0e85f
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 4 deletions.
diff --git a/.github/workflows/build-and-push.yaml b/.github/workflows/build-and-push.yaml
@@ -49,4 +49,4 @@ jobs:
 
     - name: Remove project jars from cached repository
       run: |
-        rm -rf .m2/repository/org/geoserver/cloud
+        rm -rf .m2/repository/org/geoserver
diff --git a/.github/workflows/pull-request.yaml b/.github/workflows/pull-request.yaml
@@ -37,4 +37,4 @@ jobs:
 
     - name: Remove project jars from cached repository
       run: |
-        rm -rf .m2/repository/org/geoserver/cloud
+        rm -rf .m2/repository/org/geoserver
diff --git a/geoserver_submodule/geoserver b/geoserver_submodule/geoserver
diff --git a/...ver-jackson-bindings/src/main/java/org/geoserver/jackson/databind/config/dto/Service.java b/...ver-jackson-bindings/src/main/java/org/geoserver/jackson/databind/config/dto/Service.java
@@ -148,6 +148,7 @@
         private boolean LatLon;
         private List<String> SRS;
         private int maxRequestedDimensionValues;
+        private int defaultDeflateCompressionLevel;
     }
 
     @EqualsAndHashCode(callSuper = true)

diff --git a/...ndings/src/test/java/org/geoserver/jackson/databind/config/GeoServerConfigModuleTest.java b/...ndings/src/test/java/org/geoserver/jackson/databind/config/GeoServerConfigModuleTest.java
@@ -27,6 +27,7 @@
 import org.geoserver.jackson.databind.catalog.ProxyUtils;
 import org.geoserver.ows.util.OwsUtils;
 import org.geoserver.platform.GeoServerExtensionsHelper;
+import org.geoserver.wcs.WCSInfo;
 import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.Test;
@@ -105,7 +106,10 @@ private <T extends Info> void roundtripTest(@NonNull T orig) throws JsonProcessi
     }
 
     public @Test void wcsServiceInfo() throws Exception {
-        roundtripTest(testData.wcsService);
+        WCSInfo wcsService = testData.wcsService;
+        // WCSInfoImpl.equals() is broken, set a value for this property to workaround it
+        wcsService.setMaxRequestedDimensionValues(10);
+        roundtripTest(wcsService);
     }
 
     public @Test void wfsServiceInfo() throws Exception {