From ee7b39d1371f9b30b337062b96bc36533ec7a81e Mon Sep 17 00:00:00 2001 From: Gabriel Roldan Date: Thu, 26 Oct 2023 22:07:35 -0300 Subject: [PATCH 1/2] build: maven plugin version updates ``` com.spotify.fmt:fmt-maven-plugin ................... 2.20 -> 2.21.1 io.github.git-commit-id:git-commit-id-maven-plugin . 5.0.0 -> 7.0.0 maven-compiler-plugin ............................. 3.8.1 -> 3.11.0 maven-enforcer-plugin .............................. 3.3.0 -> 3.4.1 maven-failsafe-plugin ........................... 3.0.0-M7 -> 3.2.1 maven-jar-plugin ................................... 3.2.0 -> 3.3.0 maven-resources-plugin ............................... 2.6 -> 3.3.1 maven-surefire-plugin ........................... 3.0.0-M5 -> 3.2.1 org.codehaus.mojo:build-helper-maven-plugin ........ 3.2.0 -> 3.4.0 org.codehaus.mojo:flatten-maven-plugin ............. 1.0.0 -> 1.5.0 org.codehaus.mojo:versions-maven-plugin ........... 2.8.1 -> 2.16.1 ``` --- pom.xml | 2 +- src/apps/pom.xml | 2 +- src/pom.xml | 17 ++++++++--------- 3 files changed, 10 insertions(+), 11 deletions(-) diff --git a/pom.xml b/pom.xml index be557b1bb..462a66a25 100644 --- a/pom.xml +++ b/pom.xml @@ -232,7 +232,7 @@ com.spotify.fmt fmt-maven-plugin - 2.20 + 2.21.1 com.github.ekryd.sortpom diff --git a/src/apps/pom.xml b/src/apps/pom.xml index 0eece0abc..85a9a7edf 100644 --- a/src/apps/pom.xml +++ b/src/apps/pom.xml @@ -19,7 +19,7 @@ io.github.git-commit-id git-commit-id-maven-plugin - 5.0.0 + 7.0.0 false true diff --git a/src/pom.xml b/src/pom.xml index 4361fd8a2..fa59a2238 100644 --- a/src/pom.xml +++ b/src/pom.xml @@ -811,7 +811,7 @@ org.apache.maven.plugins maven-compiler-plugin - 3.8.1 + 3.11.0 true 17 @@ -824,7 +824,7 @@ org.apache.maven.plugins maven-resources-plugin - 2.6 + 3.3.1 UTF-8 @@ -883,7 +883,7 @@ org.apache.maven.plugins maven-failsafe-plugin - 3.0.0-M7 + 3.2.1 true @@ -897,8 +897,7 @@ org.apache.maven.plugins maven-surefire-plugin - - 3.0.0-M5 + 3.2.1 true false @@ -908,17 +907,17 @@ org.apache.maven.plugins maven-jar-plugin - 3.2.0 + 3.3.0 org.codehaus.mojo build-helper-maven-plugin - 3.2.0 + 3.4.0 org.codehaus.mojo versions-maven-plugin - 2.8.1 + 2.16.1 @@ -930,7 +929,7 @@ org.apache.maven.plugins maven-enforcer-plugin - 3.3.0 + 3.4.1 enforce From 967c8c04003b193d0cc2c0858ab15f7b4ea5fc90 Mon Sep 17 00:00:00 2001 From: Gabriel Roldan Date: Thu, 26 Oct 2023 22:18:23 -0300 Subject: [PATCH 2/2] Formatting changes after upgrading fmt-maven-plugin --- .../wms/WmsApplicationAutoConfiguration.java | 1 + .../catalog/filter/PgsqlCatalogFilterSplitter.java | 1 + .../cloud/catalog/cache/CachingGeoServerFacade.java | 2 ++ .../org/geoserver/cloud/event/GeoServerEvent.java | 1 + .../org/geoserver/cloud/event/info/InfoEvent.java | 1 + .../jackson/databind/catalog/dto/Dimension.java | 1 + .../jackson/databind/catalog/dto/LayerGroup.java | 3 +++ .../jackson/databind/catalog/dto/Resource.java | 1 + .../jackson/databind/config/dto/Contact.java | 13 +++++++++++++ .../jackson/databind/config/dto/Service.java | 6 ++++++ .../geoserver/catalog/plugin/CatalogInfoLookup.java | 1 + .../org/geoserver/catalog/plugin/CatalogPlugin.java | 1 + .../GeoServerServletContextConfiguration.java | 1 + .../extensions/WmsExtensionsConfigProperties.java | 2 ++ 14 files changed, 35 insertions(+) diff --git a/src/apps/geoserver/wms/src/main/java/org/geoserver/cloud/autoconfigure/wms/WmsApplicationAutoConfiguration.java b/src/apps/geoserver/wms/src/main/java/org/geoserver/cloud/autoconfigure/wms/WmsApplicationAutoConfiguration.java index 65c0b5b05..071cddfd0 100644 --- a/src/apps/geoserver/wms/src/main/java/org/geoserver/cloud/autoconfigure/wms/WmsApplicationAutoConfiguration.java +++ b/src/apps/geoserver/wms/src/main/java/org/geoserver/cloud/autoconfigure/wms/WmsApplicationAutoConfiguration.java @@ -61,6 +61,7 @@ public class WmsApplicationAutoConfiguration { legendSample\ ).*$\ """; + /** * Required by {@link GetCapabilitiesTransformer}, excluded from gs-wms.jar * diff --git a/src/catalog/backends/pgsql/src/main/java/org/geoserver/cloud/backend/pgsql/catalog/filter/PgsqlCatalogFilterSplitter.java b/src/catalog/backends/pgsql/src/main/java/org/geoserver/cloud/backend/pgsql/catalog/filter/PgsqlCatalogFilterSplitter.java index 9eb205069..8c27125da 100644 --- a/src/catalog/backends/pgsql/src/main/java/org/geoserver/cloud/backend/pgsql/catalog/filter/PgsqlCatalogFilterSplitter.java +++ b/src/catalog/backends/pgsql/src/main/java/org/geoserver/cloud/backend/pgsql/catalog/filter/PgsqlCatalogFilterSplitter.java @@ -32,6 +32,7 @@ public static PgsqlCatalogFilterSplitter split( filter.accept(splitter, null); return splitter; } + /** * If the property name is supported, proceeds with the splitting, otherwise aborts splitting * the current filter making it part of the unsupported filter result. diff --git a/src/catalog/cache/src/main/java/org/geoserver/cloud/catalog/cache/CachingGeoServerFacade.java b/src/catalog/cache/src/main/java/org/geoserver/cloud/catalog/cache/CachingGeoServerFacade.java index 4ae93638a..bfc2d9609 100644 --- a/src/catalog/cache/src/main/java/org/geoserver/cloud/catalog/cache/CachingGeoServerFacade.java +++ b/src/catalog/cache/src/main/java/org/geoserver/cloud/catalog/cache/CachingGeoServerFacade.java @@ -35,8 +35,10 @@ public interface CachingGeoServerFacade extends GeoServerFacade { * through {@link CacheManager#getCache(String)} */ String CACHE_NAME = "gs-config"; + /** Key used to cache and evict the {@link GeoServerInfo global configuration} object */ String GEOSERVERINFO_KEY = "global_GeoServer"; + /** Key used to cache and evict the {@link LoggingInfo global logging} settings object */ String LOGGINGINFO_KEY = "global_Logging"; diff --git a/src/catalog/events/src/main/java/org/geoserver/cloud/event/GeoServerEvent.java b/src/catalog/events/src/main/java/org/geoserver/cloud/event/GeoServerEvent.java index 5727ef221..8d3c41410 100644 --- a/src/catalog/events/src/main/java/org/geoserver/cloud/event/GeoServerEvent.java +++ b/src/catalog/events/src/main/java/org/geoserver/cloud/event/GeoServerEvent.java @@ -84,6 +84,7 @@ protected ToStringCreator toStringBuilder() { * global config} itself (e.g. {@code updateSequence} and the like) */ private static final String GEOSERVER_ID = "geoserver"; + /** * {@link #getObjectId() object identifier} for changes performed to the {@link LoggingInfo} * config diff --git a/src/catalog/events/src/main/java/org/geoserver/cloud/event/info/InfoEvent.java b/src/catalog/events/src/main/java/org/geoserver/cloud/event/info/InfoEvent.java index d5c45d933..657eb2481 100644 --- a/src/catalog/events/src/main/java/org/geoserver/cloud/event/info/InfoEvent.java +++ b/src/catalog/events/src/main/java/org/geoserver/cloud/event/info/InfoEvent.java @@ -56,6 +56,7 @@ protected InfoEvent( * global config} itself (e.g. {@code updateSequence} and the like) */ private static final String GEOSERVER_ID = "geoserver"; + /** * {@link #getObjectId() object identifier} for changes performed to the {@link LoggingInfo} * config diff --git a/src/catalog/jackson-bindings/geoserver/src/main/java/org/geoserver/jackson/databind/catalog/dto/Dimension.java b/src/catalog/jackson-bindings/geoserver/src/main/java/org/geoserver/jackson/databind/catalog/dto/Dimension.java index 13ac20839..22a6f619d 100644 --- a/src/catalog/jackson-bindings/geoserver/src/main/java/org/geoserver/jackson/databind/catalog/dto/Dimension.java +++ b/src/catalog/jackson-bindings/geoserver/src/main/java/org/geoserver/jackson/databind/catalog/dto/Dimension.java @@ -35,6 +35,7 @@ * @since geoserver 2.23.0 */ private String startValue; + /** * @since geoserver 2.23.0 */ diff --git a/src/catalog/jackson-bindings/geoserver/src/main/java/org/geoserver/jackson/databind/catalog/dto/LayerGroup.java b/src/catalog/jackson-bindings/geoserver/src/main/java/org/geoserver/jackson/databind/catalog/dto/LayerGroup.java index d205faa7d..e5ab78a56 100644 --- a/src/catalog/jackson-bindings/geoserver/src/main/java/org/geoserver/jackson/databind/catalog/dto/LayerGroup.java +++ b/src/catalog/jackson-bindings/geoserver/src/main/java/org/geoserver/jackson/databind/catalog/dto/LayerGroup.java @@ -37,14 +37,17 @@ public enum Mode { protected List metadataLinks; protected Envelope bounds; private List keywords; + /** * @since geoserver 2.20.0 */ private Map internationalTitle; + /** * @since geoserver 2.20.0 */ private Map internationalAbstract; + /** * @since geoserver 2.21.0 */ diff --git a/src/catalog/jackson-bindings/geoserver/src/main/java/org/geoserver/jackson/databind/catalog/dto/Resource.java b/src/catalog/jackson-bindings/geoserver/src/main/java/org/geoserver/jackson/databind/catalog/dto/Resource.java index e858bf6c2..96bb0eb0e 100644 --- a/src/catalog/jackson-bindings/geoserver/src/main/java/org/geoserver/jackson/databind/catalog/dto/Resource.java +++ b/src/catalog/jackson-bindings/geoserver/src/main/java/org/geoserver/jackson/databind/catalog/dto/Resource.java @@ -56,6 +56,7 @@ public enum ProjectionPolicy { * @since geoserver 2.20.0 */ private Map internationalTitle; + /** * @since geoserver 2.20.0 */ diff --git a/src/catalog/jackson-bindings/geoserver/src/main/java/org/geoserver/jackson/databind/config/dto/Contact.java b/src/catalog/jackson-bindings/geoserver/src/main/java/org/geoserver/jackson/databind/config/dto/Contact.java index 49f8d2f3f..db2c1d3ed 100644 --- a/src/catalog/jackson-bindings/geoserver/src/main/java/org/geoserver/jackson/databind/config/dto/Contact.java +++ b/src/catalog/jackson-bindings/geoserver/src/main/java/org/geoserver/jackson/databind/config/dto/Contact.java @@ -33,54 +33,67 @@ * @since geoserver 2.20.0 */ private Map internationalAddress; + /** * @since geoserver 2.20.0 */ private Map internationalContactFacsimile; + /** * @since geoserver 2.20.0 */ private Map internationalContactOrganization; + /** * @since geoserver 2.20.0 */ private Map internationalContactPerson; + /** * @since geoserver 2.20.0 */ private Map internationalContactPosition; + /** * @since geoserver 2.20.0 */ private Map internationalContactVoice; + /** * @since geoserver 2.20.0 */ private Map internationalOnlineResource; + /** * @since geoserver 2.20.0 */ private Map internationalAddressCity; + /** * @since geoserver 2.20.0 */ private Map internationalAddressCountry; + /** * @since geoserver 2.20.0 */ private Map internationalAddressDeliveryPoint; + /** * @since geoserver 2.20.0 */ private Map internationalAddressPostalCode; + /** * @since geoserver 2.20.0 */ private Map internationalAddressState; + /** * @since geoserver 2.20.0 */ private Map internationalAddressType; + /** * @since geoserver 2.20.0 */ diff --git a/src/catalog/jackson-bindings/geoserver/src/main/java/org/geoserver/jackson/databind/config/dto/Service.java b/src/catalog/jackson-bindings/geoserver/src/main/java/org/geoserver/jackson/databind/config/dto/Service.java index cc5041c6d..d5b8144dc 100644 --- a/src/catalog/jackson-bindings/geoserver/src/main/java/org/geoserver/jackson/databind/config/dto/Service.java +++ b/src/catalog/jackson-bindings/geoserver/src/main/java/org/geoserver/jackson/databind/config/dto/Service.java @@ -64,6 +64,7 @@ private String schemaBaseURL; private boolean verbose; private MetadataMapDto metadata; + // not used // Map clientProperties; @@ -71,10 +72,12 @@ * @since geoserver 2.20.0 */ private Locale defaultLocale; + /** * @since geoserver 2.20.0 */ private Map internationalTitle; + /** * @since geoserver 2.20.0 */ @@ -122,6 +125,7 @@ * @since geoserver 2.20.0 */ private Map internationalRootLayerTitle; + /** * @since geoserver 2.20.0 */ @@ -163,6 +167,7 @@ * @since geoserver 2.22.0 */ private boolean getFeatureOutputTypeCheckingEnabled; + /** * @since geoserver 2.22.0 */ @@ -215,6 +220,7 @@ private MetadataMapDto metadata; private List roles; } + /** DTO for {@link ProcessInfo} */ public static @Data @Generated class Process { private NameDto name; diff --git a/src/catalog/plugin/src/main/java/org/geoserver/catalog/plugin/CatalogInfoLookup.java b/src/catalog/plugin/src/main/java/org/geoserver/catalog/plugin/CatalogInfoLookup.java index d5691d925..fea671e5f 100644 --- a/src/catalog/plugin/src/main/java/org/geoserver/catalog/plugin/CatalogInfoLookup.java +++ b/src/catalog/plugin/src/main/java/org/geoserver/catalog/plugin/CatalogInfoLookup.java @@ -66,6 +66,7 @@ abstract class CatalogInfoLookup implements CatalogInfoRe /** constant no-op Comparator for {@link #providedOrder()} */ static final Ordering PROVIDED_ORDER = Ordering.allEqual(); + /** * Name mapper for {@link MapInfo}, uses simple name mapping on {@link MapInfo#getName()} as it * doesn't have a namespace component diff --git a/src/catalog/plugin/src/main/java/org/geoserver/catalog/plugin/CatalogPlugin.java b/src/catalog/plugin/src/main/java/org/geoserver/catalog/plugin/CatalogPlugin.java index 896a9b6f5..ec70520c2 100644 --- a/src/catalog/plugin/src/main/java/org/geoserver/catalog/plugin/CatalogPlugin.java +++ b/src/catalog/plugin/src/main/java/org/geoserver/catalog/plugin/CatalogPlugin.java @@ -350,6 +350,7 @@ public ValidationResult validate(MapInfo map, boolean isNew) { updateNamespace(resource, rolbackNamespace); }); } + // override, super calls facade.save and depends on it throwing the events protected @Override void rollback(StoreInfo store, StoreInfo rollbackTo) { // apply the rollback object properties to the real store diff --git a/src/starters/webmvc/src/main/java/org/geoserver/cloud/config/servlet/GeoServerServletContextConfiguration.java b/src/starters/webmvc/src/main/java/org/geoserver/cloud/config/servlet/GeoServerServletContextConfiguration.java index 334f13b43..ecaf3442e 100644 --- a/src/starters/webmvc/src/main/java/org/geoserver/cloud/config/servlet/GeoServerServletContextConfiguration.java +++ b/src/starters/webmvc/src/main/java/org/geoserver/cloud/config/servlet/GeoServerServletContextConfiguration.java @@ -36,6 +36,7 @@ public class GeoServerServletContextConfiguration { public @Bean RequestContextListener requestContextListener() { return new RequestContextListener(); } + // Filters /** diff --git a/src/starters/wms-extensions/src/main/java/org/geoserver/cloud/autoconfigure/wms/extensions/WmsExtensionsConfigProperties.java b/src/starters/wms-extensions/src/main/java/org/geoserver/cloud/autoconfigure/wms/extensions/WmsExtensionsConfigProperties.java index d976c64ba..7d2d0a627 100644 --- a/src/starters/wms-extensions/src/main/java/org/geoserver/cloud/autoconfigure/wms/extensions/WmsExtensionsConfigProperties.java +++ b/src/starters/wms-extensions/src/main/java/org/geoserver/cloud/autoconfigure/wms/extensions/WmsExtensionsConfigProperties.java @@ -55,8 +55,10 @@ public static @Data class VectorTilesConfigProperties { /** Enable or disable MapBox VectorTiles output format */ private EnabledProperty mapbox = new EnabledProperty(true); + /** Enable or disable GeoJSON VectorTiles output format */ private EnabledProperty geojson = new EnabledProperty(true); + /** Enable or disable TopoJSON VectorTiles output format */ private EnabledProperty topojson = new EnabledProperty(true);