Upgrading to ErrorProne 2.18

GeoWebCache · Apr 15, 2023 · 847251e · 847251e
1 parent e171490
commit 847251e
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 5 deletions.
diff --git a/geowebcache/diskquota/jdbc/src/main/java/org/geowebcache/diskquota/jdbc/SQLDialect.java b/geowebcache/diskquota/jdbc/src/main/java/org/geowebcache/diskquota/jdbc/SQLDialect.java
@@ -49,9 +49,10 @@ public class SQLDialect {
     protected static final int TILESET_KEY_SIZE = 320;
     protected static final int TILEPAGE_KEY_SIZE = TILESET_KEY_SIZE;
 
-    @SuppressWarnings("serial")
+    // in this case we need a mutable, order preserving map, so keeping the double brace init
+    @SuppressWarnings({"serial", "DoubleBraceInitialization"})
     protected final Map<String, List<String>> TABLE_CREATION_MAP =
-            new LinkedHashMap<String, List<String>>() {
+            new LinkedHashMap<>() {
                 {
                     put(
                             "TILESET",

diff --git a/...iskquota/jdbc/src/test/java/org/geowebcache/diskquota/jdbc/JDBCQuotaStoreFactoryTest.java b/...iskquota/jdbc/src/test/java/org/geowebcache/diskquota/jdbc/JDBCQuotaStoreFactoryTest.java
@@ -29,7 +29,7 @@
 public class JDBCQuotaStoreFactoryTest {
 
     @Test
-    @SuppressWarnings("PMD.CloseResource")
+    @SuppressWarnings({"PMD.CloseResource", "BanJNDI"})
     public void testJNDILookup() throws Exception {
         // setup mock initial context (need a JNDI provider otherwise, like simple-jndi)
         InitialContext ctx = Mockito.mock(InitialContext.class);

diff --git a/geowebcache/pom.xml b/geowebcache/pom.xml
@@ -85,7 +85,7 @@
     <jackson.databind.version>2.13.4.1</jackson.databind.version>
     <jetty.version>9.4.18.v20190429</jetty.version>
     <errorProneFlags></errorProneFlags>
-    <errorProne.version>2.10.0</errorProne.version>
+    <errorProne.version>2.18.0</errorProne.version>
     <javac.version>9+181-r4173-1</javac.version>
     <pmd.version>6.42.0</pmd.version>
     <checkstyle.skip>false</checkstyle.skip>

diff --git a/geowebcache/web/src/test/java/org/geowebcache/jetty/Start.java b/geowebcache/web/src/test/java/org/geowebcache/jetty/Start.java
@@ -88,7 +88,7 @@ public void run() {
                         }
                     };
             stopThread.setDaemon(true);
-            stopThread.run();
+            stopThread.start();
         } catch (Exception e) {
             log.log(Level.SEVERE, "Could not start the Jetty server: " + e.getMessage(), e);