Skip to content

Commit

Permalink
Formatting changes after upgrading fmt-maven-plugin
Browse files Browse the repository at this point in the history
  • Loading branch information
groldan committed Oct 27, 2023
1 parent ee7b39d commit 967c8c0
Show file tree
Hide file tree
Showing 14 changed files with 35 additions and 0 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@ public class WmsApplicationAutoConfiguration {
legendSample\
).*$\
""";

/**
* Required by {@link GetCapabilitiesTransformer}, excluded from gs-wms.jar
*
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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";

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@
* @since geoserver 2.23.0
*/
private String startValue;

/**
* @since geoserver 2.23.0
*/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,14 +37,17 @@ public enum Mode {
protected List<MetadataLink> metadataLinks;
protected Envelope bounds;
private List<Keyword> keywords;

/**
* @since geoserver 2.20.0
*/
private Map<String, String> internationalTitle;

/**
* @since geoserver 2.20.0
*/
private Map<String, String> internationalAbstract;

/**
* @since geoserver 2.21.0
*/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@ public enum ProjectionPolicy {
* @since geoserver 2.20.0
*/
private Map<String, String> internationalTitle;

/**
* @since geoserver 2.20.0
*/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,54 +33,67 @@
* @since geoserver 2.20.0
*/
private Map<String, String> internationalAddress;

/**
* @since geoserver 2.20.0
*/
private Map<String, String> internationalContactFacsimile;

/**
* @since geoserver 2.20.0
*/
private Map<String, String> internationalContactOrganization;

/**
* @since geoserver 2.20.0
*/
private Map<String, String> internationalContactPerson;

/**
* @since geoserver 2.20.0
*/
private Map<String, String> internationalContactPosition;

/**
* @since geoserver 2.20.0
*/
private Map<String, String> internationalContactVoice;

/**
* @since geoserver 2.20.0
*/
private Map<String, String> internationalOnlineResource;

/**
* @since geoserver 2.20.0
*/
private Map<String, String> internationalAddressCity;

/**
* @since geoserver 2.20.0
*/
private Map<String, String> internationalAddressCountry;

/**
* @since geoserver 2.20.0
*/
private Map<String, String> internationalAddressDeliveryPoint;

/**
* @since geoserver 2.20.0
*/
private Map<String, String> internationalAddressPostalCode;

/**
* @since geoserver 2.20.0
*/
private Map<String, String> internationalAddressState;

/**
* @since geoserver 2.20.0
*/
private Map<String, String> internationalAddressType;

/**
* @since geoserver 2.20.0
*/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -64,17 +64,20 @@
private String schemaBaseURL;
private boolean verbose;
private MetadataMapDto metadata;

// not used
// Map<Object, Object> clientProperties;

/**
* @since geoserver 2.20.0
*/
private Locale defaultLocale;

/**
* @since geoserver 2.20.0
*/
private Map<String, String> internationalTitle;

/**
* @since geoserver 2.20.0
*/
Expand Down Expand Up @@ -122,6 +125,7 @@
* @since geoserver 2.20.0
*/
private Map<String, String> internationalRootLayerTitle;

/**
* @since geoserver 2.20.0
*/
Expand Down Expand Up @@ -163,6 +167,7 @@
* @since geoserver 2.22.0
*/
private boolean getFeatureOutputTypeCheckingEnabled;

/**
* @since geoserver 2.22.0
*/
Expand Down Expand Up @@ -215,6 +220,7 @@
private MetadataMapDto metadata;
private List<String> roles;
}

/** DTO for {@link ProcessInfo} */
public static @Data @Generated class Process {
private NameDto name;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,7 @@ abstract class CatalogInfoLookup<T extends CatalogInfo> 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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ public class GeoServerServletContextConfiguration {
public @Bean RequestContextListener requestContextListener() {
return new RequestContextListener();
}

// Filters

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down

0 comments on commit 967c8c0

Please sign in to comment.