WIP fixing errorporne reported errors

Author: groldan

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

@@ -21,6 +21,7 @@
 import java.net.URL;
 import java.nio.channels.Channels;
 import java.nio.channels.ReadableByteChannel;
+import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -285,7 +286,7 @@ public ServletOutputStream getOutputStream() throws IOException {
                     response,
                     e.getErrorCode(),
                     "text/plain",
-                    new ByteArrayResource(e.getMessage().getBytes()),
+                    new ByteArrayResource(e.getMessage().getBytes(StandardCharsets.UTF_8)),
                     CacheResult.OTHER,
                     runtimeStats);
         } catch (RequestFilterException e) {
@@ -313,7 +314,7 @@ public ServletOutputStream getOutputStream() throws IOException {
                     response,
                     403,
                     "text/plain",
-                    new ByteArrayResource("Not Authorized".getBytes()),
+                    new ByteArrayResource("Not Authorized".getBytes(StandardCharsets.UTF_8)),
                     CacheResult.OTHER,
                     runtimeStats);
             LOG.warning(e.getMessage());
@@ -377,7 +378,7 @@ private String[] parseRequest(String servletPath) throws GeoWebCacheException {
     private void handleServiceRequest(String serviceStr, HttpServletRequest request, HttpServletResponse response)
             throws Exception {
 
-        Conveyor conv = null;
+        Conveyor conv;
 
         // 1) Figure out what Service should handle this request
         Service service = findService(serviceStr);

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

@@ -26,7 +26,7 @@ public interface GridSetConfiguration extends BaseConfiguration {
     /**
      * Get a GridSet by name
      *
-     * @throw NoSuchElementException if the named gridset is not available.
+     * @throws NoSuchElementException if the named gridset is not available.
      */
     Optional<GridSet> getGridSet(final String name);
 

geowebcache/core/src/main/java/org/geowebcache/layer/TileLayerDispatcher.java

@@ -14,12 +14,11 @@
 package org.geowebcache.layer;
 
 import com.google.common.base.Preconditions;
+import com.google.common.collect.Iterables;
 import java.io.IOException;
 import java.util.ArrayList;
-import java.util.Collection;
 import java.util.Collections;
 import java.util.HashSet;
-import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
@@ -28,7 +27,6 @@
 import java.util.Optional;
 import java.util.Set;
 import java.util.stream.Collectors;
-import java.util.stream.Stream;
 import java.util.stream.StreamSupport;
 import org.geowebcache.GeoWebCacheException;
 import org.geowebcache.GeoWebCacheExtensions;
@@ -65,8 +63,9 @@ public class TileLayerDispatcher
     private ApplicationContext applicationContext;
 
     /**
-     * Used for testing only, in production use {@link #TileLayerDispatcher(GridSetBroker)} instead, configurations are
-     * loaded from the application context, the {@code config} parameter will be overwritten
+     * Used for testing only, in production use {@link #TileLayerDispatcher(GridSetBroker, TileLayerDispatcherFilter)}
+     * instead, configurations are loaded from the application context, the {@code configs} parameter will be
+     * overwritten
      */
     public TileLayerDispatcher(
             GridSetBroker gridSetBroker,
@@ -154,13 +153,10 @@ public Iterable<TileLayer> getLayerList() {
      *
      * @return all layers, but filtered based on the tileLayerDispatcherFilter.
      */
-    @SuppressWarnings("unchecked")
     public Iterable<TileLayer> getLayerListFiltered() {
         Iterable<TileLayer> result = getLayerList();
         if (tileLayerDispatcherFilter != null) {
-            Stream s = StreamSupport.stream(result.spliterator(), false)
-                    .filter(x -> !tileLayerDispatcherFilter.exclude(x));
-            result = s::iterator;
+            result = Iterables.filter(result, x -> !tileLayerDispatcherFilter.exclude(x));
         }
         return result;
     }
@@ -270,7 +266,7 @@ public synchronized void removeGridSet(String gridsetToRemove) {
     }
 
     public synchronized void removeGridSetRecursive(String gridsetToRemove) {
-        Collection<TileLayer> deletedLayers = new LinkedList<>();
+        List<TileLayer> deletedLayers = new ArrayList<>();
         try {
             for (TileLayer tl : getLayerList()) {
                 if (Objects.nonNull(tl.getGridSubset(gridsetToRemove))) {
@@ -334,6 +330,7 @@ public void setApplicationContext(ApplicationContext applicationContext) throws
     }
 
     /** @deprecated use GeoWebCacheExtensions.reinitializeConfigurations instead */
+    @Deprecated
     public void reInit() { // do not know how to get rid of it, it's used in mock testing...
         GeoWebCacheExtensions.reinitialize(this.applicationContext);
     }

geowebcache/core/src/main/java/org/geowebcache/stats/RuntimeStats.java

@@ -72,7 +72,7 @@ public class RuntimeStats {
      * @param intervalDescs the description for each of the previously defined intervals
      */
     public RuntimeStats(int pollInterval, List<Integer> intervals, List<String> intervalDescs) {
-        this(pollInterval, intervals, intervalDescs, Clock.systemDefaultZone());
+        this(pollInterval, intervals, intervalDescs, Clock.systemUTC());
     }
     /**
      * @param pollInterval seconds between recording aggregate values
@@ -122,6 +122,8 @@ public void start() {
         statsThread.start();
     }
 
+    @SuppressWarnings(
+            "ThreadPriorityCheck") // errorprone complaint on Thread.yield(), revisit, might indeed be unnecessary
     public void destroy() {
         if (this.statsThread != null) {
             statsThread.run = false;
@@ -177,18 +179,18 @@ public String getHTMLStats() {
 
                 str.append("<tr><th colspan=\"2\" scope=\"row\">Total number of requests:</th><td colspan=\"3\">"
                         + totalRequests);
-                str.append(" (" + totalRequests / (runningTime) + "/s ) ");
+                str.append(" (" + totalRequests / runningTime + "/s ) ");
                 str.append("</td></tr>\n");
 
                 str.append(
                         "<tr><th colspan=\"2\" scope=\"row\">Total number of untiled WMS requests:</th><td colspan=\"3\">"
                                 + totalWMS);
-                str.append(" (" + totalWMS / (runningTime) + "/s ) ");
+                str.append(" (" + totalWMS / runningTime + "/s ) ");
                 str.append("</td></tr>\n");
 
                 str.append("<tr><th colspan=\"2\" scope=\"row\">Total number of bytes:</th><td colspan=\"3\">"
                         + totalBytes);
-                str.append(" (" + formatBits((totalBytes * 8.0) / (runningTime)) + ") ");
+                str.append(" (" + formatBits((totalBytes * 8.0) / runningTime) + ") ");
                 str.append("</td></tr>\n");
 
                 str.append("</tbody>");
@@ -379,7 +381,7 @@ private RuntimeStatsThread(RuntimeStats runtimeStats) {
         public void run() {
             try {
                 while (run) {
-                    Thread.sleep(stats.pollInterval * 1000);
+                    Thread.sleep(stats.pollInterval * 1000L);
                     updateLists();
                 }
             } catch (InterruptedException e) {

geowebcache/core/src/main/java/org/geowebcache/storage/BlobStoreAggregator.java

@@ -71,7 +71,9 @@ public void addConfiguration(BlobStoreConfiguration config) {
 
     /**
      * Indicates if this configurations contains a {@link BlobStoreInfo) identified by a given name.
+     *
      * @param blobStoreInfoName the name of a {@link BlobStoreInfo} for which existence is desired.
+     *
      * @return True if a {@link BlobStoreInfo} currently exists with the unique name provided, false otherwise.
      */
     public boolean blobStoreExists(final String blobStoreInfoName) {

geowebcache/pom.xml

@@ -979,6 +979,7 @@
                 -Xep:SelfAssertion:OFF \
                 -Xep:MissingSummary:OFF \
                 -Xep:StringSplitter:OFF \
+                -Xep:UnrecognisedJavadocTag:OFF \
                 ${errorProneFlags}</arg>
                 <arg>-Xlint:${lint}</arg>
                 <arg>-Werror</arg>