From 91f10bf17f47528f99e4efb920989db282835b19 Mon Sep 17 00:00:00 2001 From: Andrea Aime Date: Sun, 1 Jun 2025 19:04:41 +0200 Subject: [PATCH 1/2] Removing unecessary compiler suppressions --- .../main/java/org/geowebcache/util/ServletUtils.java | 1 - .../java/org/geowebcache/MockExtensionRuleTest.java | 1 - .../config/BlobStoreConfigurationTest.java | 4 ---- .../geowebcache/config/ListenerCollectionTest.java | 1 - .../test/java/org/geowebcache/seed/SeedTaskTest.java | 2 -- .../org/geowebcache/seed/TruncateBboxRequestTest.java | 1 - .../geowebcache/storage/AbstractBlobStoreTest.java | 1 - .../org/geowebcache/sqlite/MbtilesBlobStoreTest.java | 2 +- .../config/wms/GetCapabilitiesConfigurationTest.java | 2 +- .../org/geowebcache/service/wmts/WMTSServiceTest.java | 11 ----------- 10 files changed, 2 insertions(+), 24 deletions(-) diff --git a/geowebcache/core/src/main/java/org/geowebcache/util/ServletUtils.java b/geowebcache/core/src/main/java/org/geowebcache/util/ServletUtils.java index 54b9a3555..365102dca 100644 --- a/geowebcache/core/src/main/java/org/geowebcache/util/ServletUtils.java +++ b/geowebcache/core/src/main/java/org/geowebcache/util/ServletUtils.java @@ -103,7 +103,6 @@ public static String[][] selectedStringArraysFromMap(Map map, * * @return map subset containing (URL decoded) values for {@code keys}, with keys normalized to upper case */ - @SuppressWarnings("unchecked") public static Map selectedStringsFromMap(Map map, String encoding, String... keys) { map = new CaseInsensitiveMap<>(map); diff --git a/geowebcache/core/src/test/java/org/geowebcache/MockExtensionRuleTest.java b/geowebcache/core/src/test/java/org/geowebcache/MockExtensionRuleTest.java index 84bcbc492..1c8ca7af3 100644 --- a/geowebcache/core/src/test/java/org/geowebcache/MockExtensionRuleTest.java +++ b/geowebcache/core/src/test/java/org/geowebcache/MockExtensionRuleTest.java @@ -172,7 +172,6 @@ public void testAddsTypedExtensions() throws Throwable { rule.apply( new Statement() { - @SuppressWarnings("unchecked") @Override public void evaluate() throws Throwable { String bean1 = "THISISTHEBEAN"; diff --git a/geowebcache/core/src/test/java/org/geowebcache/config/BlobStoreConfigurationTest.java b/geowebcache/core/src/test/java/org/geowebcache/config/BlobStoreConfigurationTest.java index b48690102..147b58c30 100644 --- a/geowebcache/core/src/test/java/org/geowebcache/config/BlobStoreConfigurationTest.java +++ b/geowebcache/core/src/test/java/org/geowebcache/config/BlobStoreConfigurationTest.java @@ -477,7 +477,6 @@ public void testExceptionInAddListenerDoesntBlockOtherListeners() throws Excepti EasyMock.verify(listener2); } - @SuppressWarnings("unchecked") @Test public void testExceptionInAddListenerRecordsSuppressedExceptions() throws Exception { BlobStoreConfigurationListener listener1 = @@ -578,7 +577,6 @@ public void testExceptionInModifyListenerDoesntBlockOtherListeners() throws Exce EasyMock.verify(listener2); } - @SuppressWarnings("unchecked") @Test public void testExceptionInModifyListenerRecordsSuppressedExceptions() throws Exception { BlobStoreConfigurationListener listener1 = @@ -683,7 +681,6 @@ public void testExceptionInRenameListenerDoesntBlockOtherListeners() throws Exce EasyMock.verify(listener2); } - @SuppressWarnings("unchecked") @Test public void testExceptionInRenameListenerRecordsSuppressedExceptions() throws Exception { BlobStoreConfigurationListener listener1 = @@ -788,7 +785,6 @@ public void testExceptionInRemoveListenerDoesntBlockOtherListeners() throws Exce EasyMock.verify(listener2); } - @SuppressWarnings("unchecked") @Test public void testExceptionInRemoveListenerRecordsSuppressedExceptions() throws Exception { BlobStoreConfigurationListener listener1 = diff --git a/geowebcache/core/src/test/java/org/geowebcache/config/ListenerCollectionTest.java b/geowebcache/core/src/test/java/org/geowebcache/config/ListenerCollectionTest.java index c47e1dc0b..ad13955ec 100644 --- a/geowebcache/core/src/test/java/org/geowebcache/config/ListenerCollectionTest.java +++ b/geowebcache/core/src/test/java/org/geowebcache/config/ListenerCollectionTest.java @@ -143,7 +143,6 @@ public void testExceptionDoesntPreventOthers() throws Exception { control.verify(); } - @SuppressWarnings("unchecked") @Test public void testSuppressedExceptionsRecorded() throws Exception { ListenerCollection collection = new ListenerCollection<>(); diff --git a/geowebcache/core/src/test/java/org/geowebcache/seed/SeedTaskTest.java b/geowebcache/core/src/test/java/org/geowebcache/seed/SeedTaskTest.java index 729e2407e..a7825abb3 100644 --- a/geowebcache/core/src/test/java/org/geowebcache/seed/SeedTaskTest.java +++ b/geowebcache/core/src/test/java/org/geowebcache/seed/SeedTaskTest.java @@ -74,7 +74,6 @@ public void tearDown() throws Exception {} /** For a metatiled seed request over a given zoom level, make sure the correct wms calls are issued */ @Test - @SuppressWarnings("serial") public void testSeedWMSRequests() throws Exception { WMSLayer tl = createWMSLayer("image/png"); @@ -243,7 +242,6 @@ protected void makeRequest( /** Make sure when seeding a given zoom level, the correct tiles are sent to the {@link StorageBroker} */ @Test - @SuppressWarnings("serial") public void testSeedStoredTiles() throws Exception { WMSLayer tl = createWMSLayer("image/png"); diff --git a/geowebcache/core/src/test/java/org/geowebcache/seed/TruncateBboxRequestTest.java b/geowebcache/core/src/test/java/org/geowebcache/seed/TruncateBboxRequestTest.java index 6d81990cd..09d50d775 100644 --- a/geowebcache/core/src/test/java/org/geowebcache/seed/TruncateBboxRequestTest.java +++ b/geowebcache/core/src/test/java/org/geowebcache/seed/TruncateBboxRequestTest.java @@ -39,7 +39,6 @@ public class TruncateBboxRequestTest { - @SuppressWarnings("unchecked") protected SeedRequest seedRequest( String layerName, String gridSet, diff --git a/geowebcache/core/src/test/java/org/geowebcache/storage/AbstractBlobStoreTest.java b/geowebcache/core/src/test/java/org/geowebcache/storage/AbstractBlobStoreTest.java index d97db7510..06b58293a 100644 --- a/geowebcache/core/src/test/java/org/geowebcache/storage/AbstractBlobStoreTest.java +++ b/geowebcache/core/src/test/java/org/geowebcache/storage/AbstractBlobStoreTest.java @@ -664,7 +664,6 @@ public void testMetadataWithPercentInValue() throws Exception { assertThat(store.getLayerMetadata("testLayer", "testKey"), equalTo("test%Value")); } - @SuppressWarnings("unchecked") @Test public void testParameterList() throws Exception { Map params1 = Collections.singletonMap("testKey", "testValue1"); diff --git a/geowebcache/sqlite/src/test/java/org/geowebcache/sqlite/MbtilesBlobStoreTest.java b/geowebcache/sqlite/src/test/java/org/geowebcache/sqlite/MbtilesBlobStoreTest.java index bb479435c..d760e4864 100644 --- a/geowebcache/sqlite/src/test/java/org/geowebcache/sqlite/MbtilesBlobStoreTest.java +++ b/geowebcache/sqlite/src/test/java/org/geowebcache/sqlite/MbtilesBlobStoreTest.java @@ -270,7 +270,7 @@ public void testRenameOperation() throws Exception { } @Test - @SuppressWarnings("unchecked") // TODO: remove when upgrading to Hamcrest 2 + // TODO: remove when upgrading to Hamcrest 2 public void testOpeningDatabaseFileWithMbtilesMetadata() throws Exception { // create and instantiate mbtiles metadata File mbtilesMetadataDirectory = buildRootFile("mbtiles-metadata"); diff --git a/geowebcache/wms/src/test/java/org/geowebcache/config/wms/GetCapabilitiesConfigurationTest.java b/geowebcache/wms/src/test/java/org/geowebcache/config/wms/GetCapabilitiesConfigurationTest.java index f110b3cc7..410a94df0 100644 --- a/geowebcache/wms/src/test/java/org/geowebcache/config/wms/GetCapabilitiesConfigurationTest.java +++ b/geowebcache/wms/src/test/java/org/geowebcache/config/wms/GetCapabilitiesConfigurationTest.java @@ -171,7 +171,7 @@ WebMapServer getWMS() { } @Test - @SuppressWarnings("unchecked") // to be removed once we upgrade to Hamcrest 2, @SafeVarArgs + // to be removed once we upgrade to Hamcrest 2, @SafeVarArgs public void testDelegateInitializingLayers() throws Exception { GridSetBroker broker = new GridSetBroker(Collections.singletonList(new DefaultGridsets(false, false))); String url = "http://test/wms"; diff --git a/geowebcache/wmts/src/test/java/org/geowebcache/service/wmts/WMTSServiceTest.java b/geowebcache/wmts/src/test/java/org/geowebcache/service/wmts/WMTSServiceTest.java index 0a2100fcf..215fa5348 100644 --- a/geowebcache/wmts/src/test/java/org/geowebcache/service/wmts/WMTSServiceTest.java +++ b/geowebcache/wmts/src/test/java/org/geowebcache/service/wmts/WMTSServiceTest.java @@ -295,7 +295,6 @@ public void testGetCap() throws Exception { service = new WMTSService(sb, tld, null, mock(RuntimeStats.class)); - @SuppressWarnings("unchecked") Map kvp = new CaseInsensitiveMap<>(); kvp.put("service", new String[] {"WMTS"}); kvp.put("version", new String[] {"1.0.0"}); @@ -553,7 +552,6 @@ public ServiceInformation getServiceInformation() { when(gwcd.getServletPrefix()).thenReturn(null); service = new WMTSService(sb, tld, null, mock(RuntimeStats.class)); extensions.forEach(service::addExtension); - @SuppressWarnings("unchecked") Map kvp = new CaseInsensitiveMap<>(); kvp.put("service", new String[] {"WMTS"}); kvp.put("version", new String[] {"1.0.0"}); @@ -625,7 +623,6 @@ public void testGetCapServiceInfo() throws Exception { service = new WMTSService(sb, tldx, null, mock(RuntimeStats.class)); - @SuppressWarnings("unchecked") Map kvp = new CaseInsensitiveMap<>(); kvp.put("service", new String[] {"WMTS"}); kvp.put("version", new String[] {"1.0.0"}); @@ -690,7 +687,6 @@ public void testGetCapOneWGS84BBox() throws Exception { service = new WMTSService(sb, tld, null, mock(RuntimeStats.class)); - @SuppressWarnings("unchecked") Map kvp = new CaseInsensitiveMap<>(); kvp.put("service", new String[] {"WMTS"}); kvp.put("version", new String[] {"1.0.0"}); @@ -758,7 +754,6 @@ public void testGetCapUnboundedStyleFilter() throws Exception { service = new WMTSService(sb, tld, null, mock(RuntimeStats.class)); - @SuppressWarnings("unchecked") Map kvp = new CaseInsensitiveMap<>(); kvp.put("service", new String[] {"WMTS"}); kvp.put("version", new String[] {"1.0.0"}); @@ -820,7 +815,6 @@ public void testGetCapEmptyStyleFilter() throws Exception { service = new WMTSService(sb, tld, null, mock(RuntimeStats.class)); - @SuppressWarnings("unchecked") Map kvp = new CaseInsensitiveMap<>(); kvp.put("service", new String[] {"WMTS"}); kvp.put("version", new String[] {"1.0.0"}); @@ -882,7 +876,6 @@ public void testGetCapMultipleStyles() throws Exception { service = new WMTSService(sb, tld, null, mock(RuntimeStats.class)); - @SuppressWarnings("unchecked") Map kvp = new CaseInsensitiveMap<>(); kvp.put("service", new String[] {"WMTS"}); kvp.put("version", new String[] {"1.0.0"}); @@ -979,7 +972,6 @@ private static XpathEngine buildWMTSXPath() { * , "text/html" , "application/vnd.ogc.gml" then checks if in the capabilities documents each * elements contains both the dimensions components. */ - @SuppressWarnings("unchecked") @Test public void testGetCapWithMultipleDimensions() throws Exception { @@ -1053,7 +1045,6 @@ public void testGetCapWithMultipleDimensions() throws Exception { assertEquals("2", xpath.evaluate("count(//wmts:Contents/wmts:Layer/wmts:Dimension/ows:Identifier)", doc)); } - @SuppressWarnings("unchecked") @Test public void testGetTileWithStyle() throws Exception { @@ -1124,7 +1115,6 @@ public void testDispatchCustomOperations() throws Exception { GeoWebCacheDispatcher gwcd = mock(GeoWebCacheDispatcher.class); when(gwcd.getServletPrefix()).thenReturn(null); service = new WMTSService(sb, tld, null, mock(RuntimeStats.class)); - @SuppressWarnings("unchecked") Map kvp = new CaseInsensitiveMap<>(); kvp.put("service", new String[] {"WMTS"}); kvp.put("version", new String[] {"1.0.0"}); @@ -1384,7 +1374,6 @@ public void testGetCapWithTileJSONDifferentUrls() throws Exception { service = new WMTSService(sb, tld, null, mock(RuntimeStats.class)); - @SuppressWarnings("unchecked") Map kvp = new CaseInsensitiveMap<>(); kvp.put("service", new String[] {"WMTS"}); kvp.put("version", new String[] {"1.0.0"}); From f58b20a659361d7fff3f40e62dab32e7ce5a714d Mon Sep 17 00:00:00 2001 From: Andrea Aime Date: Sat, 7 Jun 2025 12:16:03 +0200 Subject: [PATCH 2/2] Update to PMD 7.14 and remove unecessary suppressions --- .../azure/tests/online/TemporaryAzureFolder.java | 1 - .../java/org/geowebcache/io/ByteArrayResource.java | 4 ++-- .../src/main/java/org/geowebcache/io/FileResource.java | 2 +- .../blobstore/file/FileBlobStoreComformanceTest.java | 3 --- .../java/org/geowebcache/config/ConfigurationTest.java | 5 +---- .../java/org/geowebcache/layer/wms/WMSLayerTest.java | 1 - .../org/geowebcache/storage/TileRangeIteratorTest.java | 1 - .../org/geowebcache/georss/GeoRSSReaderFactory.java | 1 - geowebcache/pmd-ruleset.xml | 10 ++++++++-- geowebcache/pom.xml | 2 +- .../sqlite/SqliteConnectionManagerTest.java | 1 - .../test/java/org/geowebcache/sqlite/SqlitlePerf.java | 4 ---- .../java/org/geowebcache/swift/SwiftBlobStoreTest.java | 1 - .../org/geowebcache/jetty/RestIntegrationTest.java | 2 +- .../java/org/geowebcache/service/wms/WMSService.java | 1 - 15 files changed, 14 insertions(+), 25 deletions(-) diff --git a/geowebcache/azureblob/src/test/java/org/geowebcache/azure/tests/online/TemporaryAzureFolder.java b/geowebcache/azureblob/src/test/java/org/geowebcache/azure/tests/online/TemporaryAzureFolder.java index 234401174..4ecaaf20b 100644 --- a/geowebcache/azureblob/src/test/java/org/geowebcache/azure/tests/online/TemporaryAzureFolder.java +++ b/geowebcache/azureblob/src/test/java/org/geowebcache/azure/tests/online/TemporaryAzureFolder.java @@ -60,7 +60,6 @@ protected void before() throws Throwable { } @Override - @SuppressWarnings("PMD.UseTryWithResources") // client is a field, not created here protected void after() { if (!isConfigured()) { return; diff --git a/geowebcache/core/src/main/java/org/geowebcache/io/ByteArrayResource.java b/geowebcache/core/src/main/java/org/geowebcache/io/ByteArrayResource.java index f746932c7..48c7c2a35 100644 --- a/geowebcache/core/src/main/java/org/geowebcache/io/ByteArrayResource.java +++ b/geowebcache/core/src/main/java/org/geowebcache/io/ByteArrayResource.java @@ -90,7 +90,7 @@ public long getSize() { /** @see org.geowebcache.io.Resource#transferTo(java.nio.channels.WritableByteChannel) */ @Override - @SuppressWarnings({"PMD.UnusedLocalVariable", "PMD.EmptyControlStatement"}) + @SuppressWarnings("PMD.EmptyControlStatement") public long transferTo(WritableByteChannel channel) throws IOException { if (length > 0) { ByteBuffer buffer = ByteBuffer.wrap(data, offset, length); @@ -103,7 +103,7 @@ public long transferTo(WritableByteChannel channel) throws IOException { /** @see org.geowebcache.io.Resource#transferFrom(java.nio.channels.ReadableByteChannel) */ @Override - @SuppressWarnings({"PMD.UnusedLocalVariable", "PMD.EmptyControlStatement"}) + @SuppressWarnings("PMD.EmptyControlStatement") public long transferFrom(ReadableByteChannel channel) throws IOException { if (channel instanceof FileChannel) { FileChannel fc = (FileChannel) channel; diff --git a/geowebcache/core/src/main/java/org/geowebcache/io/FileResource.java b/geowebcache/core/src/main/java/org/geowebcache/io/FileResource.java index 53a3f6a7f..1271b57f1 100644 --- a/geowebcache/core/src/main/java/org/geowebcache/io/FileResource.java +++ b/geowebcache/core/src/main/java/org/geowebcache/io/FileResource.java @@ -48,7 +48,7 @@ public long getSize() { } @Override - @SuppressWarnings({"PMD.UnusedLocalVariable", "PMD.EmptyControlStatement"}) + @SuppressWarnings("PMD.EmptyControlStatement") public long transferTo(WritableByteChannel target) throws IOException { // FileLock lock = in.lock(); diff --git a/geowebcache/core/src/test/java/org/geowebcache/blobstore/file/FileBlobStoreComformanceTest.java b/geowebcache/core/src/test/java/org/geowebcache/blobstore/file/FileBlobStoreComformanceTest.java index d556619f5..71a5b7228 100644 --- a/geowebcache/core/src/test/java/org/geowebcache/blobstore/file/FileBlobStoreComformanceTest.java +++ b/geowebcache/core/src/test/java/org/geowebcache/blobstore/file/FileBlobStoreComformanceTest.java @@ -49,7 +49,6 @@ public void createTestUnit() throws Exception { private void putLayerMetadataConcurrently(final int srcStoreKey, final FileBlobStore srcStore, int numberOfThreads) throws InterruptedException { - @SuppressWarnings("PMD.CloseResource") // implements AutoCloseable in Java 21 ExecutorService service = Executors.newFixedThreadPool(numberOfThreads); CountDownLatch latch = new CountDownLatch(numberOfThreads); for (int i = 0; i < numberOfThreads; i++) { @@ -72,7 +71,6 @@ private void putLayerMetadataConcurrently(final int srcStoreKey, final FileBlobS } private void executeStoresConcurrently(int numberOfStores, int numberOfThreads) throws InterruptedException { - @SuppressWarnings("PMD.CloseResource") // implements AutoCloseable in Java 21 ExecutorService service = Executors.newFixedThreadPool(numberOfStores); CountDownLatch latch = new CountDownLatch(numberOfStores); for (int i = 0; i < numberOfStores; i++) { @@ -102,7 +100,6 @@ public void testMetadataWithPointInKey() throws Exception { public void testConcurrentMetadataWithPointInKey() throws InterruptedException { assertThat(store.getLayerMetadata("testLayer", "test.Key"), nullValue()); int numberOfThreads = 2; - @SuppressWarnings("PMD.CloseResource") // implements AutoCloseable in Java 21 ExecutorService service = Executors.newFixedThreadPool(numberOfThreads); CountDownLatch latch = new CountDownLatch(numberOfThreads); for (int i = 0; i < numberOfThreads; i++) { diff --git a/geowebcache/core/src/test/java/org/geowebcache/config/ConfigurationTest.java b/geowebcache/core/src/test/java/org/geowebcache/config/ConfigurationTest.java index 9dbb0ce9e..c4d138a99 100644 --- a/geowebcache/core/src/test/java/org/geowebcache/config/ConfigurationTest.java +++ b/geowebcache/core/src/test/java/org/geowebcache/config/ConfigurationTest.java @@ -217,7 +217,7 @@ public void testGetExisting() throws Exception { assertThat(retrieved, isPresent()); } - @SuppressWarnings({"unchecked", "PMD.UnnecessaryCast"}) + @SuppressWarnings("unchecked") @Test public void testCantModifyReturnedCollection() throws Exception { I info = getGoodInfo("test", 1); @@ -322,7 +322,6 @@ public void testConcurrentAdds() throws Exception { defaultCount + 10, getInfoNames(config).size()); // get a thread pool - @SuppressWarnings("PMD.CloseResource") // implements AutoCloseable in Java 21 ExecutorService pool = Executors.newFixedThreadPool(16, (Runnable r) -> new Thread(r, "Info Concurrency Test for ADD")); // create a bunch of concurrent adds @@ -364,7 +363,6 @@ public void testConcurrentDeletes() throws Exception { defaultCount + 100, getInfoNames(config).size()); // get a thread pool - @SuppressWarnings("PMD.CloseResource") // implements AutoCloseable in Java 21 ExecutorService pool = Executors.newFixedThreadPool(16, (Runnable r) -> new Thread(r, "Info Concurrency Test for DELETE")); // create a bunch of concurrent deletes @@ -404,7 +402,6 @@ public void testConcurrentModifies() throws Exception { defaultCount + 100, getInfoNames(config).size()); // get a thread pool - @SuppressWarnings("PMD.CloseResource") // implements AutoCloseable in Java 21 ExecutorService pool = Executors.newFixedThreadPool(16, (Runnable r) -> new Thread(r, "Info Concurrency Test for MODIFY")); // create a bunch of concurrent modifies diff --git a/geowebcache/core/src/test/java/org/geowebcache/layer/wms/WMSLayerTest.java b/geowebcache/core/src/test/java/org/geowebcache/layer/wms/WMSLayerTest.java index 8f1cba5b3..31014d784 100644 --- a/geowebcache/core/src/test/java/org/geowebcache/layer/wms/WMSLayerTest.java +++ b/geowebcache/core/src/test/java/org/geowebcache/layer/wms/WMSLayerTest.java @@ -546,7 +546,6 @@ private List getTiles(StorageBroker storageBroker, TileRange tr, f long[] gridLoc = trIter.nextMetaGridLocation(new long[3]); // six concurrent requests max - @SuppressWarnings("PMD.CloseResource") // implements AutoCloseable in Java 21 ExecutorService requests = Executors.newFixedThreadPool(6); ExecutorCompletionService completer = new ExecutorCompletionService<>(requests); diff --git a/geowebcache/core/src/test/java/org/geowebcache/storage/TileRangeIteratorTest.java b/geowebcache/core/src/test/java/org/geowebcache/storage/TileRangeIteratorTest.java index dc543139e..93c69da91 100644 --- a/geowebcache/core/src/test/java/org/geowebcache/storage/TileRangeIteratorTest.java +++ b/geowebcache/core/src/test/java/org/geowebcache/storage/TileRangeIteratorTest.java @@ -188,7 +188,6 @@ private long traverseTileRangeIter( final int[] metaTilingFactors) throws Exception { - @SuppressWarnings("PMD.CloseResource") // implements AutoCloseable in Java 21 final ExecutorService executorService = Executors.newFixedThreadPool(nThreads); final TileRange tileRange; diff --git a/geowebcache/georss/src/main/java/org/geowebcache/georss/GeoRSSReaderFactory.java b/geowebcache/georss/src/main/java/org/geowebcache/georss/GeoRSSReaderFactory.java index 6f689bd25..08d45b0c6 100644 --- a/geowebcache/georss/src/main/java/org/geowebcache/georss/GeoRSSReaderFactory.java +++ b/geowebcache/georss/src/main/java/org/geowebcache/georss/GeoRSSReaderFactory.java @@ -59,7 +59,6 @@ public GeoRSSReader createReader(final URL url, final String username, final Str contentEncoding = "UTF-8"; } - @SuppressWarnings("PMD.CloseResource") // The stream will be kept open to get new events Reader reader = new BufferedReader(new InputStreamReader(response.getEntity().getContent(), contentEncoding)); if (log.isLoggable(Level.FINE)) { diff --git a/geowebcache/pmd-ruleset.xml b/geowebcache/pmd-ruleset.xml index 190ac5095..4031bf176 100644 --- a/geowebcache/pmd-ruleset.xml +++ b/geowebcache/pmd-ruleset.xml @@ -19,13 +19,18 @@ under the License. --> -GeoTools ruleset. See https://pmd.github.io/latest/pmd_userdocs_understanding_rulesets.html +GeoWebCache ruleset. See https://pmd.github.io/pmd/pmd_userdocs_making_rulesets.html - + + + + + + @@ -45,6 +50,7 @@ GeoTools ruleset. See https://pmd.github.io/latest/pmd_userdocs_understanding_ru + diff --git a/geowebcache/pom.xml b/geowebcache/pom.xml index 713e562c2..6f9767fca 100644 --- a/geowebcache/pom.xml +++ b/geowebcache/pom.xml @@ -89,7 +89,7 @@ 2.31.0 9+181-r4173-1 - 7.13.0 + 7.14.0 false false deprecation,unchecked diff --git a/geowebcache/sqlite/src/test/java/org/geowebcache/sqlite/SqliteConnectionManagerTest.java b/geowebcache/sqlite/src/test/java/org/geowebcache/sqlite/SqliteConnectionManagerTest.java index 20507555d..6a8105a59 100644 --- a/geowebcache/sqlite/src/test/java/org/geowebcache/sqlite/SqliteConnectionManagerTest.java +++ b/geowebcache/sqlite/src/test/java/org/geowebcache/sqlite/SqliteConnectionManagerTest.java @@ -146,7 +146,6 @@ private void genericMultiThreadsTest(int threadsNumber, int workersNumber, long throws Exception { SqliteConnectionManager connectionManager = new SqliteConnectionManager(poolSize, 10); connectionManagersToClean.add(connectionManager); - @SuppressWarnings("PMD.CloseResource") // implements AutoCloseable in Java 21 ExecutorService executor = Executors.newFixedThreadPool(threadsNumber); Random random = new Random(); List>> results = new ArrayList<>(); diff --git a/geowebcache/sqlite/src/test/java/org/geowebcache/sqlite/SqlitlePerf.java b/geowebcache/sqlite/src/test/java/org/geowebcache/sqlite/SqlitlePerf.java index 7c90de2f3..12b115895 100644 --- a/geowebcache/sqlite/src/test/java/org/geowebcache/sqlite/SqlitlePerf.java +++ b/geowebcache/sqlite/src/test/java/org/geowebcache/sqlite/SqlitlePerf.java @@ -78,7 +78,6 @@ private static void rawSqlitle(File rootDirectory, File seedFile, long[][] tiles } FileUtils.copyFile(seedFile, databaseFile); // submitting the select tasks - @SuppressWarnings("PMD.CloseResource") // implements AutoCloseable in Java 21 ExecutorService executor = Executors.newFixedThreadPool(WORKERS); long startTime = System.currentTimeMillis(); try (Connection connection = DriverManager.getConnection("jdbc:sqlite:" + seedFile.getPath())) { @@ -119,7 +118,6 @@ private static void pooledSqlitle(File rootDirectory, File seedFile, long[][] ti } FileUtils.copyFile(seedFile, databaseFile); // submitting the select tasks - @SuppressWarnings("PMD.CloseResource") // implements AutoCloseable in Java 21 ExecutorService executor = Executors.newFixedThreadPool(WORKERS); SqliteConnectionManager connectionManager = new SqliteConnectionManager(10, 2000); long startTime = System.currentTimeMillis(); @@ -165,7 +163,6 @@ private static void mbtilesStore(File rootDirectory, File seedFile, long[][] til } FileUtils.copyFile(seedFile, databaseFile); // submitting the select tasks - @SuppressWarnings("PMD.CloseResource") // implements AutoCloseable in Java 21 ExecutorService executor = Executors.newFixedThreadPool(WORKERS); long startTime = System.currentTimeMillis(); // mbtiles store configuration @@ -219,7 +216,6 @@ private static void fileStore(File seedDirectory, long[][] tiles) throws Excepti LOGGER.info(String.format("Start reading from directory'%s'.", seedDirectory)); } // submitting the read tasks - @SuppressWarnings("PMD.CloseResource") // implements AutoCloseable in Java 21 ExecutorService executor = Executors.newFixedThreadPool(WORKERS); long startTime = System.currentTimeMillis(); // instantiate the file blobstore diff --git a/geowebcache/swiftblob/src/test/java/org/geowebcache/swift/SwiftBlobStoreTest.java b/geowebcache/swiftblob/src/test/java/org/geowebcache/swift/SwiftBlobStoreTest.java index c80a44f41..aad501297 100644 --- a/geowebcache/swiftblob/src/test/java/org/geowebcache/swift/SwiftBlobStoreTest.java +++ b/geowebcache/swiftblob/src/test/java/org/geowebcache/swift/SwiftBlobStoreTest.java @@ -680,7 +680,6 @@ public void deleteByParametersId() { @Ignore // unreliable test timing public void deleteWhenUploadExists() throws Exception { BlockingQueue taskQueue = spy(new LinkedBlockingQueue<>(1000)); - @SuppressWarnings("PMD.CloseResource") // implements AutoCloseable in Java 21 ThreadPoolExecutor executor = spy(new ThreadPoolExecutor( 1, 1, 60L, TimeUnit.SECONDS, taskQueue, new ThreadPoolExecutor.CallerRunsPolicy())); diff --git a/geowebcache/web/src/test/java/org/geowebcache/jetty/RestIntegrationTest.java b/geowebcache/web/src/test/java/org/geowebcache/jetty/RestIntegrationTest.java index 1242c0303..79d6e7b04 100644 --- a/geowebcache/web/src/test/java/org/geowebcache/jetty/RestIntegrationTest.java +++ b/geowebcache/web/src/test/java/org/geowebcache/jetty/RestIntegrationTest.java @@ -585,7 +585,7 @@ client, equalTo(401), doc -> { * Check that the given request gives a 401 Forbidden when not authenticated, and otherwise has a response matching * the given matcher */ - @SuppressWarnings({"PMD.CloseResource", "PMD.UnusedLocalVariable"}) + @SuppressWarnings("PMD.UnusedLocalVariable") protected void testSecured(HttpUriRequest request, Matcher authenticatedStatus) throws Exception { { CloseableHttpClient client = admin.getClient(); diff --git a/geowebcache/wms/src/main/java/org/geowebcache/service/wms/WMSService.java b/geowebcache/wms/src/main/java/org/geowebcache/service/wms/WMSService.java index f8e6d7718..1505f1421 100644 --- a/geowebcache/wms/src/main/java/org/geowebcache/service/wms/WMSService.java +++ b/geowebcache/wms/src/main/java/org/geowebcache/service/wms/WMSService.java @@ -491,7 +491,6 @@ protected Collection getDefaultProxyRequestWhitelist() { } } - @SuppressWarnings("PMD.UnnecessaryCast") protected Collection getProxyRequestWhitelist() { return Optional.ofNullable(GeoWebCacheExtensions.getProperty(GEOWEBCACHE_WMS_PROXY_REQUEST_WHITELIST)) .map(list -> list.split(";"))