Reorder the modifiers to comply with the Java Language Specification.

groldan · Dec 2, 2023 · 3c79c8a · 3c79c8a
1 parent 51aafd1
commit 3c79c8a
Show file tree

Hide file tree

Showing 126 changed files with 2,693 additions and 1,490 deletions.
diff --git a/...er/gwc/src/main/java/org/geoserver/cloud/gwc/app/GeoWebCacheApplicationConfiguration.java b/...er/gwc/src/main/java/org/geoserver/cloud/gwc/app/GeoWebCacheApplicationConfiguration.java
@@ -62,6 +62,7 @@ public void configureContentNegotiation(ContentNegotiationConfigurer configurer)
      */
     @SuppressWarnings("deprecation")
     @Bean
+    @Override
     public RequestMappingHandlerMapping requestMappingHandlerMapping(
             @Qualifier("mvcContentNegotiationManager")
                     ContentNegotiationManager contentNegotiationManager,
@@ -108,11 +109,13 @@ protected ServletRequest adaptRequest(HttpServletRequest request) {
                 final String pathInfo = requestURI.substring(pathToRest.length());
 
                 return new HttpServletRequestWrapper(request) {
-                    public @Override String getServletPath() {
+                    @Override
+                    public String getServletPath() {
                         return "/rest";
                     }
 
-                    public @Override String getPathInfo() {
+                    @Override
+                    public String getPathInfo() {
                         return pathInfo;
                     }
                 };

diff --git a/...nfig/src/main/java/org/geoserver/cloud/restconfig/RestConfigApplicationConfiguration.java b/...nfig/src/main/java/org/geoserver/cloud/restconfig/RestConfigApplicationConfiguration.java
@@ -56,6 +56,7 @@ public void configureContentNegotiation(ContentNegotiationConfigurer configurer)
      * https://github.com/spring-projects/spring-framework/issues/24179}
      */
     @Bean
+    @Override
     public RequestMappingHandlerMapping requestMappingHandlerMapping(
             @Qualifier("mvcContentNegotiationManager")
                     ContentNegotiationManager contentNegotiationManager,
@@ -104,11 +105,13 @@ protected ServletRequest adaptRequest(HttpServletRequest request) {
                 final String pathInfo = requestURI.substring(pathToRest.length());
 
                 return new HttpServletRequestWrapper(request) {
-                    public @Override String getServletPath() {
+                    @Override
+                    public String getServletPath() {
                         return "/rest";
                     }
 
-                    public @Override String getPathInfo() {
+                    @Override
+                    public String getPathInfo() {
                         return pathInfo;
                     }
                 };

diff --git a/src/apps/geoserver/webui/src/main/java/org/geoserver/cloud/web/service/ServiceInstance.java b/src/apps/geoserver/webui/src/main/java/org/geoserver/cloud/web/service/ServiceInstance.java
@@ -19,7 +19,8 @@
     private String uri;
     private String status;
 
-    public @Override int compareTo(ServiceInstance o) {
+    @Override
+    public int compareTo(ServiceInstance o) {
         int c = getName().compareTo(o.getName());
         if (c == 0) {
             c = getInstanceId().compareTo(o.getInstanceId());

diff --git a/...eoserver/wms/src/main/java/org/geoserver/cloud/wms/controller/kml/KMLIconsController.java b/...eoserver/wms/src/main/java/org/geoserver/cloud/wms/controller/kml/KMLIconsController.java
@@ -60,11 +60,13 @@ private HttpServletRequest adaptRequest(HttpServletRequest request) {
             final String pathInfo = requestURI.substring(pathToKml.length());
 
             return new HttpServletRequestWrapper(request) {
-                public @Override String getServletPath() {
+                @Override
+                public String getServletPath() {
                     return servletPath;
                 }
 
-                public @Override String getPathInfo() {
+                @Override
+                public String getPathInfo() {
                     return pathInfo;
                 }
             };

diff --git a/...src/main/java/org/geoserver/cloud/gateway/predicate/RegExpQueryRoutePredicateFactory.java b/...src/main/java/org/geoserver/cloud/gateway/predicate/RegExpQueryRoutePredicateFactory.java
@@ -68,19 +68,22 @@ public RegExpQueryRoutePredicateFactory() {
         super(Config.class);
     }
 
-    public @Override List<String> shortcutFieldOrder() {
+    @Override
+    public List<String> shortcutFieldOrder() {
         return Arrays.asList(PARAM_KEY, VALUE_KEY);
     }
 
-    public @Override Predicate<ServerWebExchange> apply(Config config) {
+    @Override
+    public Predicate<ServerWebExchange> apply(Config config) {
         return new RegExpQueryRoutePredicate(config);
     }
 
     @RequiredArgsConstructor
     private static class RegExpQueryRoutePredicate implements GatewayPredicate {
         private final @NonNull Config config;
 
-        public @Override boolean test(ServerWebExchange exchange) {
+        @Override
+        public boolean test(ServerWebExchange exchange) {
             final String paramRegexp = config.getParamRegexp();
             final String valueRegexp = config.getValueRegexp();
 
@@ -93,7 +96,8 @@ private static class RegExpQueryRoutePredicate implements GatewayPredicate {
             return paramNameMatches && paramValueMatches(paramName.get(), valueRegexp, exchange);
         }
 
-        public @Override String toString() {
+        @Override
+        public String toString() {
             return String.format(
                     "Query: param regexp='%s' value regexp='%s'",
                     config.getParamRegexp(), config.getValueRegexp());

diff --git a/.../org/geoserver/cloud/autoconfigure/geotools/SpringEnvironmentAwareGeoToolsHttpClient.java b/.../org/geoserver/cloud/autoconfigure/geotools/SpringEnvironmentAwareGeoToolsHttpClient.java
@@ -170,7 +170,8 @@ private HttpClientBuilder builder() {
         return builder;
     }
 
-    public @Override HttpMethodResponse post(
+    @Override
+    public HttpMethodResponse post(
             final URL url, final InputStream postContent, final String postContentType)
             throws IOException {
 
@@ -235,11 +236,13 @@ private HttpMethodResponse executeMethod(HttpRequestBase method)
         return response;
     }
 
-    public @Override HTTPResponse get(final URL url) throws IOException {
+    @Override
+    public HTTPResponse get(final URL url) throws IOException {
         return this.get(url, null);
     }
 
-    public @Override HTTPResponse get(URL url, Map<String, String> headers) throws IOException {
+    @Override
+    public HTTPResponse get(URL url, Map<String, String> headers) throws IOException {
         HttpGet getMethod = new HttpGet(url.toExternalForm());
         getMethod.setConfig(connectionConfig(url));
 
@@ -271,51 +274,61 @@ private HttpMethodResponse executeMethod(HttpRequestBase method)
         return response;
     }
 
-    public @Override String getUser() {
+    @Override
+    public String getUser() {
         return user;
     }
 
-    public @Override void setUser(String user) {
+    @Override
+    public void setUser(String user) {
         this.user = user;
         resetCredentials();
     }
 
-    public @Override String getPassword() {
+    @Override
+    public String getPassword() {
         return password;
     }
 
-    public @Override void setPassword(String password) {
+    @Override
+    public void setPassword(String password) {
         this.password = password;
         resetCredentials();
     }
 
-    public @Override int getConnectTimeout() {
+    @Override
+    public int getConnectTimeout() {
         return (int) ofMillis(connectionConfig.getConnectionRequestTimeout()).toSeconds();
     }
 
-    public @Override void setConnectTimeout(int connectTimeout) {
+    @Override
+    public void setConnectTimeout(int connectTimeout) {
         connectionConfig =
                 RequestConfig.copy(connectionConfig)
                         .setConnectionRequestTimeout((int) ofSeconds(connectTimeout).toMillis())
                         .build();
     }
 
-    public @Override int getReadTimeout() {
+    @Override
+    public int getReadTimeout() {
         return (int) ofMillis(connectionConfig.getSocketTimeout()).toSeconds();
     }
 
-    public @Override void setReadTimeout(int readTimeout) {
+    @Override
+    public void setReadTimeout(int readTimeout) {
         connectionConfig =
                 RequestConfig.copy(connectionConfig)
                         .setSocketTimeout((int) ofSeconds(readTimeout).toMillis())
                         .build();
     }
 
-    public @Override int getMaxConnections() {
+    @Override
+    public int getMaxConnections() {
         return connectionManager.getDefaultMaxPerRoute();
     }
 
-    public @Override void setMaxConnections(final int maxConnections) {
+    @Override
+    public void setMaxConnections(final int maxConnections) {
         connectionManager.setDefaultMaxPerRoute(maxConnections);
         connectionManager.setMaxTotal(maxConnections);
     }
@@ -339,7 +352,8 @@ public int getStatusCode() {
             }
         }
 
-        public @Override void dispose() {
+        @Override
+        public void dispose() {
             if (responseBodyAsStream != null) {
                 try {
                     responseBodyAsStream.close();
@@ -353,16 +367,19 @@ public int getStatusCode() {
             }
         }
 
-        public @Override String getContentType() {
+        @Override
+        public String getContentType() {
             return getResponseHeader("Content-Type");
         }
 
-        public @Override String getResponseHeader(final String headerName) {
+        @Override
+        public String getResponseHeader(final String headerName) {
             Header responseHeader = methodResponse.getFirstHeader(headerName);
             return responseHeader == null ? null : responseHeader.getValue();
         }
 
-        public @Override InputStream getResponseStream() throws IOException {
+        @Override
+        public InputStream getResponseStream() throws IOException {
             if (responseBodyAsStream == null) {
                 responseBodyAsStream = methodResponse.getEntity().getContent();
                 // commons httpclient does not handle gzip encoding automatically, we have to check
@@ -375,21 +392,25 @@ public int getStatusCode() {
             return responseBodyAsStream;
         }
 
-        public @Override String getResponseCharset() {
+        @Override
+        public String getResponseCharset() {
             final Header encoding = methodResponse.getEntity().getContentEncoding();
             return encoding == null ? null : encoding.getValue();
         }
     }
 
-    public @Override void setTryGzip(boolean tryGZIP) {
+    @Override
+    public void setTryGzip(boolean tryGZIP) {
         this.tryGzip = tryGZIP;
     }
 
-    public @Override boolean isTryGzip() {
+    @Override
+    public boolean isTryGzip() {
         return tryGzip;
     }
 
-    public @Override void close() {
+    @Override
+    public void close() {
         this.connectionManager.shutdown();
     }
 }
diff --git a/...oserver/cloud/autoconfigure/geotools/SpringEnvironmentAwareGeoToolsHttpClientFactory.java b/...oserver/cloud/autoconfigure/geotools/SpringEnvironmentAwareGeoToolsHttpClientFactory.java
@@ -22,11 +22,13 @@ public class SpringEnvironmentAwareGeoToolsHttpClientFactory extends AbstractHTT
     GeoToolsHttpClientProxyConfigurationProperties proxyConfig =
             new GeoToolsHttpClientProxyConfigurationProperties();
 
-    public @Override List<Class<?>> clientClasses() {
+    @Override
+    public List<Class<?>> clientClasses() {
         return List.of(SpringEnvironmentAwareGeoToolsHttpClient.class);
     }
 
-    public @Override final HTTPClient createClient(List<Class<? extends HTTPBehavior>> behaviors) {
+    @Override
+    public final HTTPClient createClient(List<Class<? extends HTTPBehavior>> behaviors) {
         return new SpringEnvironmentAwareGeoToolsHttpClient(proxyConfig);
     }
 

diff --git a/...ommon/src/main/java/org/geoserver/cloud/autoconfigure/metrics/catalog/CatalogMetrics.java b/...ommon/src/main/java/org/geoserver/cloud/autoconfigure/metrics/catalog/CatalogMetrics.java
@@ -53,7 +53,8 @@ class CatalogMetrics implements MeterBinder {
 
     private MetricsCatalogListener listener;
 
-    public @Override void bindTo(@NonNull MeterRegistry registry) {
+    @Override
+    public void bindTo(@NonNull MeterRegistry registry) {
         if (listener != null) {
             catalog.removeListener(listener);
         }

diff --git a/...c/main/java/org/geoserver/cloud/autoconfigure/metrics/catalog/MetricsCatalogListener.java b/...c/main/java/org/geoserver/cloud/autoconfigure/metrics/catalog/MetricsCatalogListener.java
@@ -60,23 +60,28 @@ private Counter.Builder counter(String name, String instanceId, MeterRegistry re
         return builder;
     }
 
-    public @Override void handleAddEvent(CatalogAddEvent event) throws CatalogException {
+    @Override
+    public void handleAddEvent(CatalogAddEvent event) throws CatalogException {
         added.increment();
     }
 
-    public @Override void handleRemoveEvent(CatalogRemoveEvent event) {
+    @Override
+    public void handleRemoveEvent(CatalogRemoveEvent event) {
         removed.increment();
     }
 
-    public @Override void reloaded() {
+    @Override
+    public void reloaded() {
         reloads.increment();
     }
 
-    public @Override void handlePostModifyEvent(CatalogPostModifyEvent event) {
+    @Override
+    public void handlePostModifyEvent(CatalogPostModifyEvent event) {
         modified.increment();
     }
 
-    public @Override void handleModifyEvent(CatalogModifyEvent event) {
+    @Override
+    public void handleModifyEvent(CatalogModifyEvent event) {
         // no-op, see #handlePostModifyEvent
     }
 }