Properly enabling Error Prone and disabling its usage in community mo…

…dules
geoserver · Dec 30, 2018 · 1de976d · 1de976d
1 parent 80e59fd
commit 1de976d
Show file tree

Hide file tree

Showing 56 changed files with 182 additions and 138 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -30,9 +30,9 @@ notifications:
 matrix:
   include:
     - jdk: oraclejdk8
-      env: ARGS="-Dfmt.skip=true"
+      env: ARGS="-Dfmt.skip=true" COMMUNITY_ARGS=$ARGS
     - jdk: oraclejdk11
-      env: ARGS="-Dfmt.skip=true"
+      env: ARGS="-Dfmt.skip=true" COMMUNITY_ARGS=$ARGS
     - jdk: oraclejdk11
-      env: ARGS="-Dfmt.action=check -Ppmd -Perrorprone -DskipTests=true"
+      env: ARGS="-Dfmt.action=check -Ppmd -Perrorprone -DskipTests=true" COMMUNITY_ARGS="-Dfmt.action=check -DskipTests=true"
 
diff --git a/...sion/app-schema/app-schema-test/src/test/java/org/geoserver/test/ConnectionUsageTest.java b/...sion/app-schema/app-schema-test/src/test/java/org/geoserver/test/ConnectionUsageTest.java
@@ -177,6 +177,7 @@ public void testConnectionNotSharedIfTransactionIsNot() throws Exception {
      * @throws Exception
      */
     @Test
+    @SuppressWarnings("TryFailThrowable")
     public void testNoConnectionLeakIfExceptionThrown() throws Exception {
         FilterFactoryImplNamespaceAware ff = new FilterFactoryImplNamespaceAware();
         ff.setNamepaceContext(mappingFs.getMapping().getNamespaces());

diff --git a/...ension/app-schema/app-schema-test/src/test/java/org/geoserver/test/RestconfigWfsTest.java b/...ension/app-schema/app-schema-test/src/test/java/org/geoserver/test/RestconfigWfsTest.java
@@ -63,7 +63,7 @@ protected void onSetUp(org.geoserver.data.test.SystemTestData testData) throws E
     }
 
     @Override
-    @SuppressWarnings("deprecated")
+    @SuppressWarnings("deprecation")
     protected void onTearDown(SystemTestData testData) throws Exception {
         super.onTearDown(testData);
         DataAccessRegistry.unregisterAll();

diff --git a/...hema-test/src/test/java/org/geoserver/test/onlineTest/setup/AppSchemaTestOracleSetup.java b/...hema-test/src/test/java/org/geoserver/test/onlineTest/setup/AppSchemaTestOracleSetup.java
@@ -267,7 +267,7 @@ private void createTables(Map<String, File> propertyFiles, String parser)
                             // be supported if present.
                             Geometry geom = (Geometry) value;
                             value =
-                                    new WKTWriter(geom.getCoordinate().z == Double.NaN ? 2 : 3)
+                                    new WKTWriter(Double.isNaN(geom.getCoordinate().z) ? 2 : 3)
                                             .write(geom);
                         }
                         if (value == null || value.toString().equalsIgnoreCase("null")) {

diff --git a/...ema-test/src/test/java/org/geoserver/test/onlineTest/setup/AppSchemaTestPostgisSetup.java b/...ema-test/src/test/java/org/geoserver/test/onlineTest/setup/AppSchemaTestPostgisSetup.java
@@ -209,7 +209,7 @@ private void createTables(Map<String, File> propertyFiles)
                             // be supported if present.
                             Geometry geom = (Geometry) value;
                             value =
-                                    new WKTWriter(geom.getCoordinate().z == Double.NaN ? 2 : 3)
+                                    new WKTWriter(Double.isNaN(geom.getCoordinate().z) ? 2 : 3)
                                             .write(geom);
                         }
                         if (value == null || value.toString().equalsIgnoreCase("null")) {

diff --git a/src/extension/csw/core/src/test/java/org/geoserver/csw/CSWRecordResponseTest.java b/src/extension/csw/core/src/test/java/org/geoserver/csw/CSWRecordResponseTest.java
@@ -100,6 +100,7 @@ public void setUp() throws Exception {
         XMLUnit.setXpathNamespaceContext(new SimpleNamespaceContext(namespaces));
     }
 
+    @Test
     public void testEncodeBrief() throws Exception {
         // setup the request
         CSWRecordsResult response = getCSWResponse();
@@ -168,6 +169,7 @@ public void testEncodeBrief() throws Exception {
                 dom);
     }
 
+    @Test
     public void testEncodeSummary() throws Exception {
         // setup the request
         CSWRecordsResult response = getCSWResponse();
@@ -218,6 +220,7 @@ public void testEncodeSummary() throws Exception {
                 dom);
     }
 
+    @Test
     public void testEncodeFull() throws Exception {
         // setup the request
         CSWRecordsResult response = getCSWResponse();

diff --git a/...csw/simple-store/src/test/java/org/geoserver/csw/store/simple/SimpleCatalogStoreTest.java b/...csw/simple-store/src/test/java/org/geoserver/csw/store/simple/SimpleCatalogStoreTest.java
@@ -36,6 +36,7 @@
 import org.geotools.feature.NameImpl;
 import org.geotools.filter.SortByImpl;
 import org.geotools.util.factory.Hints;
+import org.junit.BeforeClass;
 import org.junit.Test;
 import org.opengis.feature.Attribute;
 import org.opengis.feature.ComplexAttribute;
@@ -54,7 +55,8 @@ public class SimpleCatalogStoreTest {
     File root = new File("./src/test/resources/org/geoserver/csw/store/simple");
     SimpleCatalogStore store = new SimpleCatalogStore(Files.asResource(root));
 
-    protected void setUp() throws Exception {
+    @BeforeClass
+    public static void setUp() {
         Hints.putSystemDefault(Hints.FORCE_LONGITUDE_FIRST_AXIS_ORDER, true);
     }
 

diff --git a/.../importer/rest/src/main/java/org/geoserver/importer/rest/converters/ImportJSONReader.java b/.../importer/rest/src/main/java/org/geoserver/importer/rest/converters/ImportJSONReader.java
@@ -10,6 +10,7 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 import net.sf.json.JSONArray;
 import net.sf.json.JSONObject;
@@ -462,7 +463,7 @@ Mosaic mosaic(JSONObject json) throws IOException {
                 throw new IllegalArgumentException(
                         "time object must specific mode property as "
                                 + "one of "
-                                + TimeMode.values());
+                                + Arrays.asList(TimeMode.values()));
             }
 
             m.setTimeMode(TimeMode.valueOf(time.getString("mode").toUpperCase()));
@@ -483,7 +484,7 @@ public Directory directory(JSONObject json) throws IOException {
         }
     }
 
-    Database database(JSONObject json) throws IOException {
+    Database database(JSONObject json) {
         throw new UnsupportedOperationException("TODO: implement");
     }
 

diff --git a/src/extension/inspire/src/test/java/org/geoserver/inspire/web/InspirePanelTest.java b/src/extension/inspire/src/test/java/org/geoserver/inspire/web/InspirePanelTest.java
@@ -55,6 +55,7 @@ public Component buildComponent(String id) {
     }
 
     @Test
+    @SuppressWarnings("TryFailThrowable")
     public void testNoInspireSettingsWMS() {
         final ServiceInfo serviceInfo = getGeoServer().getService(WMSInfo.class);
         final MetadataMap metadata = serviceInfo.getMetadata();
@@ -142,6 +143,7 @@ public void testCreateExtCapsOffWCS() {
     }
 
     @Test
+    @SuppressWarnings("TryFailThrowable")
     public void testWithFullSettingsWMS() {
         final ServiceInfo serviceInfo = getGeoServer().getService(WMSInfo.class);
         final MetadataMap metadata = serviceInfo.getMetadata();

diff --git a/...tension/libjpeg-turbo/src/test/java/org/geoserver/map/turbojpeg/TurboImageWorkerTest.java b/...tension/libjpeg-turbo/src/test/java/org/geoserver/map/turbojpeg/TurboImageWorkerTest.java
@@ -130,6 +130,7 @@ public void writer() throws IOException {
         new ImageWorker(output).getBufferedImage().flush();
     }
 
+    @Test
     public void testWriterBandSelect() throws IOException {
         if (SKIP_TESTS) {
             LOGGER.warning(ERROR_LIB_MESSAGE);

diff --git a/...on/monitor/core/src/test/java/org/geoserver/monitor/ows/ControlFlowCallbackProxyTest.java b/...on/monitor/core/src/test/java/org/geoserver/monitor/ows/ControlFlowCallbackProxyTest.java
@@ -78,46 +78,9 @@ public void finished(Request request) {}
         assertEquals(Status.RUNNING, data.getStatus());
     }
 
+    @Test
     public void testGetRunningAndBlockedRequests() throws Exception {
-        DispatcherCallback callback =
-                new DispatcherCallback() {
-
-                    public long getRunningRequests() {
-                        return 10;
-                    }
-
-                    public long getBlockedRequests() {
-                        return 2;
-                    }
-
-                    public Service serviceDispatched(Request request, Service service)
-                            throws ServiceException {
-                        return null;
-                    }
-
-                    public Response responseDispatched(
-                            Request request,
-                            Operation operation,
-                            Object result,
-                            Response response) {
-                        return null;
-                    }
-
-                    public Object operationExecuted(
-                            Request request, Operation operation, Object result) {
-                        return null;
-                    }
-
-                    public Operation operationDispatched(Request request, Operation operation) {
-                        return null;
-                    }
-
-                    public Request init(Request request) {
-                        return null;
-                    }
-
-                    public void finished(Request request) {}
-                };
+        DispatcherCallback callback = new MyDispatcherCallback();
         callback = createProxy(callback);
         ControlFlowCallbackProxy proxy =
                 (ControlFlowCallbackProxy) Proxy.getInvocationHandler(callback);
@@ -132,4 +95,38 @@ DispatcherCallback createProxy(DispatcherCallback callback) {
                 Proxy.newProxyInstance(
                         getClass().getClassLoader(), new Class[] {DispatcherCallback.class}, proxy);
     }
+
+    public static class MyDispatcherCallback implements DispatcherCallback {
+
+        public long getRunningRequests() {
+            return 10;
+        }
+
+        public long getBlockedRequests() {
+            return 2;
+        }
+
+        public Service serviceDispatched(Request request, Service service) throws ServiceException {
+            return null;
+        }
+
+        public Response responseDispatched(
+                Request request, Operation operation, Object result, Response response) {
+            return null;
+        }
+
+        public Object operationExecuted(Request request, Operation operation, Object result) {
+            return null;
+        }
+
+        public Operation operationDispatched(Request request, Operation operation) {
+            return null;
+        }
+
+        public Request init(Request request) {
+            return null;
+        }
+
+        public void finished(Request request) {}
+    }
 }
diff --git a/src/extension/monitor/core/src/test/java/org/geoserver/monitor/ows/MonitorCallbackTest.java b/src/extension/monitor/core/src/test/java/org/geoserver/monitor/ows/MonitorCallbackTest.java
@@ -68,6 +68,7 @@
 import org.geotools.geometry.jts.ReferencedEnvelope;
 import org.geotools.referencing.CRS;
 import org.geotools.util.Version;
+import org.junit.After;
 import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.Test;
@@ -153,6 +154,7 @@ public void setUp() throws Exception {
         data = monitor.start();
     }
 
+    @After
     public void tearDown() throws Exception {
         monitor.complete();
     }

diff --git a/...ension/monitor/core/src/test/java/org/geoserver/monitor/rest/RESTMonitorCallbackTest.java b/...ension/monitor/core/src/test/java/org/geoserver/monitor/rest/RESTMonitorCallbackTest.java
@@ -26,6 +26,7 @@
 import org.geoserver.test.GeoServerSystemTestSupport;
 import org.geotools.filter.text.cql2.CQL;
 import org.geotools.filter.text.cql2.CQLException;
+import org.junit.After;
 import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.Test;
@@ -107,6 +108,7 @@ public void setUp() throws Exception {
         data = monitor.start();
     }
 
+    @After
     public void tearDown() throws Exception {
         monitor.complete();
     }

diff --git a/src/extension/ogr/ogr-wps/src/test/java/org/geoserver/wps/ogr/WPSOgrTest.java b/src/extension/ogr/ogr-wps/src/test/java/org/geoserver/wps/ogr/WPSOgrTest.java
@@ -13,7 +13,6 @@
 import java.io.ByteArrayInputStream;
 import java.io.File;
 import java.io.FileOutputStream;
-import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.zip.ZipEntry;
@@ -84,8 +83,6 @@ public void testConfigurationLoad() throws Exception {
             assertTrue(formatNames.contains("OGR-MIF"));
             assertTrue(formatNames.contains("OGR-CSV"));
             assertTrue(formatNames.contains("OGR-KML"));
-        } catch (IOException e) {
-            System.err.println(e.getStackTrace());
         } finally {
             if (configuration != null) {
                 configuration.delete();
@@ -132,9 +129,6 @@ public void testOGRKMLOutputExecuteRaw() throws Exception {
                             getWpsRawXML("application/vnd.google-earth.kml; subtype=OGR-KML"));
             assertEquals("application/vnd.google-earth.kml; subtype=OGR-KML", r.getContentType());
             assertTrue(r.getContentAsString().length() > 0);
-
-        } catch (IOException e) {
-            System.err.println(e.getStackTrace());
         } finally {
             if (configuration != null) {
                 configuration.delete();
@@ -158,8 +152,6 @@ public void testOGRKMLOutputExecuteDocument() throws Exception {
                     d,
                     xml.hasOneNode(
                             "//kml:kml/kml:Document/kml:Schema | //kml:kml/kml:Document/kml:Folder/kml:Schema"));
-        } catch (IOException e) {
-            System.err.println(e.getStackTrace());
         } finally {
             if (configuration != null) {
                 configuration.delete();
@@ -182,8 +174,6 @@ public void testOGRCSVOutputExecuteDocument() throws Exception {
             assertTrue(
                     r.getContentAsString().contains("WKT,gml_id,STATE_NAME")
                             || r.getContentAsString().contains("geometry,gml_id,STATE_NAME"));
-        } catch (IOException e) {
-            System.err.println(e.getStackTrace());
         } finally {
             if (configuration != null) {
                 configuration.delete();
@@ -216,8 +206,6 @@ public void testOGRBinaryOutputExecuteDocument() throws Exception {
             }
             zis.close();
             assertTrue(found);
-        } catch (IOException e) {
-            System.err.println(e.getStackTrace());
         } finally {
             if (configuration != null) {
                 configuration.delete();

diff --git a/src/extension/wps/wps-core/src/main/java/org/geoserver/wps/ppio/BoundingBoxPPIO.java b/src/extension/wps/wps-core/src/main/java/org/geoserver/wps/ppio/BoundingBoxPPIO.java
@@ -7,6 +7,7 @@
 
 import java.util.Arrays;
 import java.util.List;
+import java.util.stream.Collectors;
 import net.opengis.ows11.BoundingBoxType;
 import net.opengis.ows11.Ows11Factory;
 import org.geoserver.wps.WPSException;
@@ -109,8 +110,8 @@ BoundingBoxType fromTargetType(Object object) throws WPSException {
         } else if (org.opengis.geometry.Envelope.class.isAssignableFrom(getType())) {
             org.opengis.geometry.Envelope env = (org.opengis.geometry.Envelope) object;
             crs = env.getCoordinateReferenceSystem();
-            bbox.setLowerCorner(Arrays.asList(env.getLowerCorner().getCoordinate()));
-            bbox.setUpperCorner(Arrays.asList(env.getUpperCorner().getCoordinate()));
+            bbox.setLowerCorner(doubleArrayToList(env.getLowerCorner().getCoordinate()));
+            bbox.setUpperCorner(doubleArrayToList(env.getUpperCorner().getCoordinate()));
         } else {
             throw new WPSException(
                     "Failed to convert from " + object + " to an OWS 1.1 Bounding box type");
@@ -130,4 +131,8 @@ BoundingBoxType fromTargetType(Object object) throws WPSException {
 
         return bbox;
     }
+
+    private List<Double> doubleArrayToList(double[] coordinate) {
+        return Arrays.stream(coordinate).boxed().collect(Collectors.toList());
+    }
 }
diff --git a/src/gwc/src/test/java/org/geoserver/gwc/GWCIntegrationTest.java b/src/gwc/src/test/java/org/geoserver/gwc/GWCIntegrationTest.java
@@ -925,7 +925,7 @@ private void waitTileBreederCompletion() throws InterruptedException {
             if (now - start > MAX_WAIT_SECS * 1000) {
                 String message =
                         format(
-                                "Waited for tile breeder to finish its tasks for more than % seconds",
+                                "Waited for tile breeder to finish its tasks for more than %d seconds",
                                 MAX_WAIT_SECS);
                 fail(message);
             }

diff --git a/src/gwc/src/test/java/org/geoserver/gwc/GWCTest.java b/src/gwc/src/test/java/org/geoserver/gwc/GWCTest.java
@@ -372,6 +372,7 @@ private void mockTileLayerDispatcher() throws Exception {
         when(tld.layerExists(eq(tileLayerGroup.getName()))).thenReturn(true);
     }
 
+    @Test
     public void testAddTileLayer() throws Exception {
 
         doThrow(new IllegalArgumentException("fake")).when(tld).addLayer(same(tileLayer));

diff --git a/src/kml/src/main/java/org/geoserver/kml/utils/LookAtOptions.java b/src/kml/src/main/java/org/geoserver/kml/utils/LookAtOptions.java
@@ -6,6 +6,7 @@
 package org.geoserver.kml.utils;
 
 import de.micromata.opengis.kml.v_2_2_0.AltitudeMode;
+import java.util.Arrays;
 import java.util.Collections;
 import java.util.Map;
 import java.util.logging.Level;
@@ -165,7 +166,7 @@ private AltitudeMode parseAltitudeMode(final Object object) {
                             "Illegal value for KML format option 'altitudeMode': '"
                                     + object
                                     + "'. Expected one of "
-                                    + AltitudeMode.values());
+                                    + Arrays.toString(AltitudeMode.values()));
                 }
             }
         }

diff --git a/src/main/src/main/java/org/geoserver/catalog/util/ReaderUtils.java b/src/main/src/main/java/org/geoserver/catalog/util/ReaderUtils.java
@@ -416,22 +416,6 @@ public static String getChildAttribute(
         return elem.getAttribute(attName);
     }
 
-    public static boolean getChildAttributeAsBoolean(
-            Element root, String childName, String attName) {
-        String value = getChildAttribute(root, childName, attName);
-        return value != null ? Boolean.parseBoolean(value) : null;
-    }
-
-    public static int getChildAttributeAsInt(Element root, String childName, String attName) {
-        String value = getChildAttribute(root, childName, attName);
-        return value != null ? Integer.parseInt(value) : null;
-    }
-
-    public static double getChildAttributeAsDouble(Element root, String childName, String attName) {
-        String value = getChildAttribute(root, childName, attName);
-        return value != null ? Double.parseDouble(value) : null;
-    }
-
     /**
      * getChildText purpose.
      *