[1431] Upgrade codebase to Java 17 language features

geowebcache/arcgiscache/src/test/java/org/geowebcache/arcgis/layer/XMLConfigurationLayerConformanceWithArcGisLayersTest.java

@@ -22,7 +22,7 @@
 import java.net.URISyntaxException;
 import java.net.URL;
 import java.nio.file.Files;
-import java.nio.file.Paths;
+import java.nio.file.Path;
 import java.util.List;
 import java.util.Optional;
 import java.util.stream.Collectors;
@@ -123,8 +123,8 @@ protected Matcher<TileLayer> infoEquals(TileLayer expected) {
 
             @Override
             public boolean matches(Object item) {
-                return item instanceof ArcGISCacheLayer
-                        && ((ArcGISCacheLayer) item).getBackendTimeout().equals(expected.getBackendTimeout());
+                return item instanceof ArcGISCacheLayer agiscl
+                        && agiscl.getBackendTimeout().equals(expected.getBackendTimeout());
             }
         };
     }
@@ -135,8 +135,8 @@ protected Matcher<TileLayer> infoEquals(int expected) {
 
             @Override
             public boolean matches(Object item) {
-                return item instanceof ArcGISCacheLayer
-                        && ((ArcGISCacheLayer) item).getBackendTimeout().equals(expected);
+                return item instanceof ArcGISCacheLayer agiscl
+                        && agiscl.getBackendTimeout().equals(expected);
             }
         };
     }
@@ -158,7 +158,7 @@ protected void makeConfigFile() throws Exception {
             configFile = temp.newFile("geowebcache.xml");
 
             URL source = XMLConfigurationLayerConformanceWithArcGisLayersTest.class.getResource("geowebcache.xml");
-            try (Stream<String> lines = Files.lines(Paths.get(source.toURI()))) {
+            try (Stream<String> lines = Files.lines(Path.of(source.toURI()))) {
                 List<String> replaced = lines.map(line -> {
                             String tilingSchemePath =
                                     resourceAsFile("/compactcache/Conf.xml").getAbsolutePath();

geowebcache/azureblob/src/main/java/org/geowebcache/azure/AzureBlobStoreData.java

@@ -160,9 +160,9 @@ public String getLocation() {
         String container = this.getContainer();
         String prefix = this.getPrefix();
         if (prefix == null) {
-            return String.format("container: %s", container);
+            return "container: %s".formatted(container);
         } else {
-            return String.format("container: %s prefix: %s", container, prefix);
+            return "container: %s prefix: %s".formatted(container, prefix);
         }
     }
 

geowebcache/azureblob/src/main/java/org/geowebcache/azure/AzureBlobStoreInfo.java

@@ -16,6 +16,7 @@
 import static com.google.common.base.Preconditions.checkNotNull;
 import static com.google.common.base.Preconditions.checkState;
 
+import java.io.Serial;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 import javax.annotation.Nullable;
@@ -30,6 +31,7 @@
 
 /** Plain old java object representing the configuration for an Azure blob store. */
 public class AzureBlobStoreInfo extends BlobStoreInfo {
+    @Serial
     private static final long serialVersionUID = -8068069256598987874L;
 
     /**
@@ -229,9 +231,9 @@ public String getLocation() {
         String container = this.getContainer();
         String prefix = this.getPrefix();
         if (prefix == null) {
-            return String.format("container: %s", container);
+            return "container: %s".formatted(container);
         } else {
-            return String.format("container: %s prefix: %s", container, prefix);
+            return "container: %s prefix: %s".formatted(container, prefix);
         }
     }
 

geowebcache/azureblob/src/main/java/org/geowebcache/azure/AzureClient.java

@@ -142,7 +142,7 @@ String getServiceURL(AzureBlobStoreData configuration) {
             // default to account name based location
             String proto = configuration.isUseHTTPS() ? "https" : "http";
             String account = configuration.getAccountName();
-            serviceURL = String.format("%s://%s.blob.core.windows.net", proto, account);
+            serviceURL = "%s://%s.blob.core.windows.net".formatted(proto, account);
         }
         return serviceURL;
     }

geowebcache/azureblob/src/main/java/org/geowebcache/azure/DeleteManager.java

@@ -118,9 +118,8 @@ public Long deleteParallel(List<String> keys) throws StorageException {
 
     public boolean scheduleAsyncDelete(final String prefix) throws StorageException {
         final long timestamp = currentTimeSeconds();
-        String msg = String.format(
-                "Issuing bulk delete on '%s/%s' for objects older than %d",
-                client.getContainerName(), prefix, timestamp);
+        String msg = "Issuing bulk delete on '%s/%s' for objects older than %d"
+                .formatted(client.getContainerName(), prefix, timestamp);
         log.info(msg);
 
         try {
@@ -159,9 +158,8 @@ public void issuePendingBulkDeletes() throws StorageException {
                 final String prefix = e.getKey().toString();
                 final long timestamp = Long.parseLong(e.getValue().toString());
                 if (log.isLoggable(Level.INFO))
-                    log.info(String.format(
-                            "Restarting pending bulk delete on '%s/%s':%d",
-                            client.getContainerName(), prefix, timestamp));
+                    log.info("Restarting pending bulk delete on '%s/%s':%d"
+                            .formatted(client.getContainerName(), prefix, timestamp));
                 if (!asyncDelete(prefix, timestamp)) {
                     deletesToClear.add(prefix);
                 }
@@ -219,8 +217,8 @@ public Long call() throws Exception {
             try {
                 checkInterrupted();
                 if (log.isLoggable(Level.INFO))
-                    log.info(String.format(
-                            "Running bulk delete on '%s/%s':%d", client.getContainerName(), prefix, timestamp));
+                    log.info("Running bulk delete on '%s/%s':%d"
+                            .formatted(client.getContainerName(), prefix, timestamp));
 
                 BlobContainerClient container = client.getContainer();
 
@@ -238,24 +236,21 @@ public Long call() throws Exception {
                     }
                 }
             } catch (InterruptedException | IllegalStateException e) {
-                log.info(String.format(
-                        "Azure bulk delete aborted for '%s/%s'. Will resume on next startup.",
-                        client.getContainerName(), prefix));
+                log.info("Azure bulk delete aborted for '%s/%s'. Will resume on next startup."
+                        .formatted(client.getContainerName(), prefix));
                 throw e;
             } catch (RuntimeException e) {
                 log.log(
                         Level.WARNING,
-                        String.format(
-                                "Unknown error performing bulk Azure blobs delete of '%s/%s'",
-                                client.getContainerName(), prefix),
+                        "Unknown error performing bulk Azure blobs delete of '%s/%s'"
+                                .formatted(client.getContainerName(), prefix),
                         e);
                 throw e;
             }
 
             if (log.isLoggable(Level.INFO))
-                log.info(String.format(
-                        "Finished bulk delete on '%s/%s':%d. %d objects deleted",
-                        client.getContainerName(), prefix, timestamp, count));
+                log.info("Finished bulk delete on '%s/%s':%d. %d objects deleted"
+                        .formatted(client.getContainerName(), prefix, timestamp, count));
 
             clearPendingBulkDelete(prefix, timestamp);
             return count;
@@ -286,9 +281,8 @@ private void clearPendingBulkDelete(final String prefix, final long timestamp) t
                 if (timestamp >= storedTimestamp) {
                     client.putProperties(pendingDeletesKey, deletes);
                 } else if (log.isLoggable(Level.INFO)) {
-                    log.info(String.format(
-                            "bulk delete finished but there's a newer one ongoing for container '%s/%s'",
-                            client.getContainerName(), prefix));
+                    log.info("bulk delete finished but there's a newer one ongoing for container '%s/%s'"
+                            .formatted(client.getContainerName(), prefix));
                 }
             } catch (StorageException e) {
                 throw new UncheckedIOException(e);
@@ -329,9 +323,8 @@ public Long call() throws Exception {
             try {
                 checkInterrupted();
                 if (log.isLoggable(Level.FINER)) {
-                    log.finer(String.format(
-                            "Running delete delete on list of items on '%s':%s ... (only the first 100 items listed)",
-                            client.getContainerName(), keys.subList(0, Math.min(keys.size(), 100))));
+                    log.finer("Running delete delete on list of items on '%s':%s ... (only the first 100 items listed)"
+                            .formatted(client.getContainerName(), keys.subList(0, Math.min(keys.size(), 100))));
                 }
 
                 BlobContainerClient container = client.getContainer();
@@ -348,8 +341,7 @@ public Long call() throws Exception {
             }
 
             if (log.isLoggable(Level.INFO))
-                log.info(String.format(
-                        "Finished bulk delete on %s, %d objects deleted", client.getContainerName(), count));
+                log.info("Finished bulk delete on %s, %d objects deleted".formatted(client.getContainerName(), count));
             return count;
         }
 

geowebcache/azureblob/src/test/java/org/geowebcache/azure/AzureBlobStoreIntegrationTest.java

@@ -539,7 +539,7 @@ private void seed(
             int max = (int) Math.pow(2, z);
             for (int x = 0; x < max; x++) {
                 for (int y = 0; y < max; y++) {
-                    log.fine(String.format("seeding %d,%d,%d", x, y, z));
+                    log.fine("seeding %d,%d,%d".formatted(x, y, z));
                     put(x, y, z, gridset, formatExtension, parameters);
                 }
             }

geowebcache/azureblob/src/test/java/org/geowebcache/testcontainers/azure/AzuriteContainer.java

@@ -13,7 +13,6 @@
  */
 package org.geowebcache.testcontainers.azure;
 
-import static java.lang.String.format;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assume.assumeTrue;
 
@@ -145,7 +144,7 @@ public int getBlobsPort() {
     }
 
     public String getBlobServiceUrl() {
-        return format("http://localhost:%d/%s", getBlobsPort(), getAccountName());
+        return "http://localhost:%d/%s".formatted(getBlobsPort(), getAccountName());
     }
 
     public AzureBlobStoreData getConfiguration(String container) {

geowebcache/core/src/main/java/org/geowebcache/ClientStreamAbortedException.java

@@ -14,6 +14,7 @@
 package org.geowebcache;
 
 import java.io.IOException;
+import java.io.Serial;
 
 /**
  * An IOException that means a {@link ServiceStrategy#getDestination(javax.servlet.http.HttpServletResponse)
@@ -28,6 +29,7 @@
  */
 public final class ClientStreamAbortedException extends IOException {
 
+    @Serial
     private static final long serialVersionUID = -812677957232110980L;
 
     public ClientStreamAbortedException() {

geowebcache/core/src/main/java/org/geowebcache/GeoWebCacheDispatcher.java

@@ -339,7 +339,7 @@ private boolean isClientStreamAbortedException(Throwable t) {
         while (current != null
                 && !(current instanceof ClientStreamAbortedException)
                 && !(current instanceof HttpErrorCodeException)) {
-            if (current instanceof SAXException) current = ((SAXException) current).getException();
+            if (current instanceof SAXException exception) current = exception.getException();
             else current = current.getCause();
         }
         if (current instanceof ClientStreamAbortedException) {
@@ -393,8 +393,8 @@ private void handleServiceRequest(String serviceStr, HttpServletRequest request,
             if (!layer.isEnabled()) {
                 throw new OWSException(400, "InvalidParameterValue", "LAYERS", "Layer '" + layerName + "' is disabled");
             }
-            if (conv instanceof ConveyorTile) {
-                ((ConveyorTile) conv).setTileLayer(layer);
+            if (conv instanceof ConveyorTile tile) {
+                tile.setTileLayer(layer);
             }
         } else {
             layer = null;
@@ -513,17 +513,17 @@ private void appendStorageLocations(StringBuilder str) {
         str.append("<table class=\"stats\">\n");
         str.append("<tbody>");
         XMLConfiguration config;
-        if (mainConfiguration instanceof XMLConfiguration) {
-            config = (XMLConfiguration) mainConfiguration;
+        if (mainConfiguration instanceof XMLConfiguration configuration) {
+            config = configuration;
         } else {
             config = GeoWebCacheExtensions.bean(XMLConfiguration.class);
         }
         String configLoc;
         String localStorageLoc;
         // TODO: Disk Quota location
         Map<String, String> blobStoreLocations = new HashMap<>();
-        if (storageBroker instanceof DefaultStorageBroker) {
-            BlobStore bStore = ((DefaultStorageBroker) storageBroker).getBlobStore();
+        if (storageBroker instanceof DefaultStorageBroker broker) {
+            BlobStore bStore = broker.getBlobStore();
             if (bStore instanceof CompositeBlobStore) {
                 for (BlobStoreInfo bsConfig : blobStoreAggregator.getBlobStores()) {
                     blobStoreLocations.put(bsConfig.getName(), bsConfig.getLocation());
@@ -584,8 +584,8 @@ private void appendInternalCacheStats(StringBuilder strGlobal) {
             LOG.fine("Searching for the blobstore used");
         }
         // Getting the BlobStore if present
-        if (storageBroker instanceof DefaultStorageBroker) {
-            blobStore = ((DefaultStorageBroker) storageBroker).getBlobStore();
+        if (storageBroker instanceof DefaultStorageBroker broker) {
+            blobStore = broker.getBlobStore();
         }
 
         // If it is not present, or it is not a memory blobstore, nothing is done

geowebcache/core/src/main/java/org/geowebcache/GeoWebCacheEnvironment.java

@@ -139,8 +139,8 @@ protected String resolveStringValue(String strVal) throws BeansException {
      */
     @SuppressWarnings("unchecked")
     public <T> T resolveValue(T value) {
-        if (value instanceof String) {
-            return (T) resolveStringValue((String) value);
+        if (value instanceof String string) {
+            return (T) resolveStringValue(string);
         }
 
         return value;

geowebcache/core/src/main/java/org/geowebcache/GeoWebCacheException.java

@@ -13,8 +13,11 @@
  */
 package org.geowebcache;
 
+import java.io.Serial;
+
 public class GeoWebCacheException extends Exception {
     /** */
+    @Serial
     private static final long serialVersionUID = 5837933971679774371L;
 
     public GeoWebCacheException(String msg) {

geowebcache/core/src/main/java/org/geowebcache/GeoWebCacheExtensions.java

@@ -211,13 +211,13 @@ public static void reinitialize(ApplicationContext context) {
             try {
                 bean.deinitialize();
             } catch (Exception e) {
-                if (bean instanceof BaseConfiguration) {
+                if (bean instanceof BaseConfiguration configuration) {
                     LOGGER.log(
                             Level.SEVERE,
                             "Error while preparing configuration to reinitialize "
-                                    + ((BaseConfiguration) bean).getIdentifier()
+                                    + configuration.getIdentifier()
                                     + " from "
-                                    + ((BaseConfiguration) bean).getLocation(),
+                                    + configuration.getLocation(),
                             e);
                 } else {
                     LOGGER.log(Level.SEVERE, "Error while preparing bean to reinitialize " + bean.toString(), e);
@@ -228,13 +228,13 @@ public static void reinitialize(ApplicationContext context) {
             try {
                 bean.reinitialize();
             } catch (Exception e) {
-                if (bean instanceof BaseConfiguration) {
+                if (bean instanceof BaseConfiguration configuration) {
                     LOGGER.log(
                             Level.SEVERE,
                             "Error while reinitializing configuration "
-                                    + ((BaseConfiguration) bean).getIdentifier()
+                                    + configuration.getIdentifier()
                                     + " from "
-                                    + ((BaseConfiguration) bean).getLocation(),
+                                    + configuration.getLocation(),
                             e);
                 } else {
                     LOGGER.log(Level.SEVERE, "Error while reinitializing bean " + bean.toString(), e);

geowebcache/core/src/main/java/org/geowebcache/UncheckedGeoWebCacheException.java

@@ -13,11 +13,13 @@
  */
 package org.geowebcache;
 
+import java.io.Serial;
 import java.util.Objects;
 
 public class UncheckedGeoWebCacheException extends RuntimeException {
 
     /** serialVersionUID */
+    @Serial
     private static final long serialVersionUID = -7981050129260733945L;
 
     public UncheckedGeoWebCacheException(GeoWebCacheException cause) {

geowebcache/core/src/main/java/org/geowebcache/config/BlobStoreInfo.java

@@ -13,6 +13,7 @@
  */
 package org.geowebcache.config;
 
+import java.io.Serial;
 import java.io.Serializable;
 import org.geowebcache.layer.TileLayerDispatcher;
 import org.geowebcache.locks.LockProvider;
@@ -38,6 +39,7 @@
  */
 public abstract class BlobStoreInfo implements Serializable, Cloneable, Info {
 
+    @Serial
     private static final long serialVersionUID = 1L;
 
     private String name;

geowebcache/core/src/main/java/org/geowebcache/config/ConfigurationException.java

@@ -13,6 +13,7 @@
  */
 package org.geowebcache.config;
 
+import java.io.Serial;
 import org.geowebcache.GeoWebCacheException;
 
 /**
@@ -21,6 +22,7 @@
  */
 public class ConfigurationException extends GeoWebCacheException {
 
+    @Serial
     private static final long serialVersionUID = 1613753249919539845L;
 
     public ConfigurationException(String msg) {