Fix various Error Prone compiler warnings

dropwizard-configuration/pom.xml

@@ -53,7 +53,8 @@
                 <artifactId>maven-surefire-plugin</artifactId>
                 <!-- Required for tests related to environment variables -->
                 <configuration>
-                    <forkMode>always</forkMode>
+                    <forkCount>1</forkCount>
+                    <reuseForks>false</reuseForks>
                     <environmentVariables>
                         <TEST>test_value</TEST>
                         <TEST_SUFFIX>2</TEST_SUFFIX>

dropwizard-configuration/src/main/java/io/dropwizard/configuration/BaseConfigurationFactory.java

@@ -1,19 +1,5 @@
 package io.dropwizard.configuration;
 
-import static java.util.Objects.requireNonNull;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.regex.Pattern;
-import java.util.stream.Collectors;
-
-import javax.annotation.Nullable;
-import javax.validation.ConstraintViolation;
-import javax.validation.Validator;
-
 import com.fasterxml.jackson.core.JsonFactory;
 import com.fasterxml.jackson.core.JsonParseException;
 import com.fasterxml.jackson.core.JsonParser;
@@ -29,6 +15,20 @@
 import com.google.common.base.Joiner;
 import com.google.common.base.Splitter;
 
+import javax.annotation.Nullable;
+import javax.validation.ConstraintViolation;
+import javax.validation.Validator;
+import java.io.IOException;
+import java.io.InputStream;
+import java.lang.reflect.InvocationTargetException;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.regex.Pattern;
+import java.util.stream.Collectors;
+
+import static java.util.Objects.requireNonNull;
+
 /**
  * A generic factory class for loading configuration files, binding them to configuration objects, and
  * validating their constraints. Allows for overriding configuration parameters from system properties.
@@ -104,9 +104,11 @@ protected JsonParser createParser(InputStream input) throws IOException {
     @Override
     public T build() throws IOException, ConfigurationException {
         try {
-            final JsonNode node = mapper.valueToTree(klass.newInstance());
+            final T instance = klass.getDeclaredConstructor().newInstance();
+            final JsonNode node = mapper.valueToTree(instance);
             return build(node, "default configuration");
-        } catch (InstantiationException | IllegalAccessException | IllegalArgumentException | SecurityException e) {
+        } catch (InstantiationException | IllegalAccessException | IllegalArgumentException | SecurityException
+                | NoSuchMethodException | InvocationTargetException e) {
             throw new IllegalArgumentException("Unable create an instance " +
                 "of the configuration class: '" + klass.getCanonicalName() + "'", e);
         }

dropwizard-configuration/src/main/java/io/dropwizard/configuration/SubstitutingSourceProvider.java

@@ -12,7 +12,7 @@
 
 /**
  * A delegating {@link ConfigurationSourceProvider} which replaces variables in the underlying configuration
- * source according to the rules of a custom {@link org.apache.commons.lang3.text.StrSubstitutor}.
+ * source according to the rules of a custom {@link org.apache.commons.text.StrSubstitutor}.
  */
 public class SubstitutingSourceProvider implements ConfigurationSourceProvider {
     private final ConfigurationSourceProvider delegate;

dropwizard-configuration/src/test/java/io/dropwizard/configuration/JsonConfigurationFactoryTest.java

@@ -1,16 +1,14 @@
 package io.dropwizard.configuration;
 
-import static org.assertj.core.api.Assertions.assertThat;
+import com.fasterxml.jackson.core.JsonParser.Feature;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import io.dropwizard.jackson.Jackson;
+import org.junit.Test;
 
 import java.io.File;
 import java.io.IOException;
 
-import org.junit.Test;
-
-import com.fasterxml.jackson.core.JsonParser.Feature;
-import com.fasterxml.jackson.databind.ObjectMapper;
-
-import io.dropwizard.jackson.Jackson;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
 public class JsonConfigurationFactoryTest extends BaseConfigurationFactoryTest {
 
@@ -28,50 +26,38 @@ public void setUp() throws Exception {
         this.wrongTypeFile = resourceFileName("factory-test-wrong-type.json");
         this.malformedAdvancedFile = resourceFileName("factory-test-malformed-advanced.json");
     }
-    
+
     @Override
-    public void throwsAnExceptionOnMalformedFiles() throws Exception {
-        try {
-            super.throwsAnExceptionOnMalformedFiles();
-        } catch (ConfigurationParsingException e) {
-            assertThat(e)
-                    .hasMessageContaining("* Malformed JSON at line:");
-        }
+    public void throwsAnExceptionOnMalformedFiles() {
+        assertThatThrownBy(super::throwsAnExceptionOnMalformedFiles)
+                .hasMessageContaining("* Malformed JSON at line:");
     }
 
     @Override
-    public void printsDetailedInformationOnMalformedContent() throws Exception {
-        try {
-            super.printsDetailedInformationOnMalformedContent();
-        } catch (ConfigurationParsingException e) {
-            assertThat(e)
-                    .hasMessageContaining(String.format(
-                            "%s has an error:%n" +
-                                "  * Malformed JSON at line: 7, column: 3; Unexpected close marker '}': expected ']'",
-                                malformedAdvancedFile.getName()));
-        }
+    public void printsDetailedInformationOnMalformedContent() {
+        assertThatThrownBy(super::printsDetailedInformationOnMalformedContent)
+                .isInstanceOf(ConfigurationParsingException.class)
+                .hasMessageContaining(String.format(
+                        "%s has an error:%n" +
+                        "  * Malformed JSON at line: 7, column: 3; Unexpected close marker '}': expected ']'",
+                        malformedAdvancedFile.getName()));
     }
-
-    @Test(expected = ConfigurationParsingException.class)
-    public void defaultJsonFactoryFailsOnComment() throws IOException, ConfigurationException {
-        try {
-            factory.build(commentFile);
-        } catch (ConfigurationParsingException e) {
-            assertThat(e)
+
+    @Test
+    public void defaultJsonFactoryFailsOnComment() {
+        assertThatThrownBy(() -> factory.build(commentFile))
                 .hasMessageContaining(String.format(
-                    "%s has an error:%n" +
+                        "%s has an error:%n" +
                         "  * Malformed JSON at line: 4, column: 4; Unexpected character ('/' (code 47)): maybe a (non-standard) comment? (not recognized as one since Feature 'ALLOW_COMMENTS' not enabled for parser)",
                         commentFile.getName()));
-            throw e;
-        }
     }
-    
+
     @Test
     public void configuredMapperAllowsComment() throws IOException, ConfigurationException {
         ObjectMapper mapper = Jackson
             .newObjectMapper()
             .configure(Feature.ALLOW_COMMENTS, true);
-        
+
         JsonConfigurationFactory<Example> factory = new JsonConfigurationFactory<>(Example.class, validator, mapper, "dw");
         factory.build(commentFile);
     }

dropwizard-configuration/src/test/java/io/dropwizard/configuration/YamlConfigurationFactoryTest.java

@@ -1,9 +1,9 @@
 package io.dropwizard.configuration;
 
-import static org.assertj.core.api.Assertions.assertThat;
-
 import io.dropwizard.jackson.Jackson;
 
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+
 public class YamlConfigurationFactoryTest extends BaseConfigurationFactoryTest {
 
     @Override
@@ -19,30 +19,23 @@ public void setUp() throws Exception {
     }
 
     @Override
-    public void throwsAnExceptionOnMalformedFiles() throws Exception {
-        try {
-            super.throwsAnExceptionOnMalformedFiles();
-        } catch (ConfigurationParsingException e) {
-            assertThat(e)
-                .hasMessageContaining(" * Failed to parse configuration; Cannot construct instance of `io.dropwizard.configuration.BaseConfigurationFactoryTest$Example`");
-        }
+    public void throwsAnExceptionOnMalformedFiles() {
+        assertThatThrownBy(super::throwsAnExceptionOnMalformedFiles)
+            .hasMessageContaining(" * Failed to parse configuration; Cannot construct instance of `io.dropwizard.configuration.BaseConfigurationFactoryTest$Example`");
     }
 
     @Override
     public void printsDetailedInformationOnMalformedContent() throws Exception {
-        try {
-            super.printsDetailedInformationOnMalformedContent();
-        } catch (Throwable t) {
-            assertThat(t).hasMessageContaining(String.format(
-                    "%s has an error:%n" +
-                    "  * Malformed YAML at line: 3, column: 22; while parsing a flow sequence\n" +
-                    " in 'reader', line 2, column 7:\n" +
-                    "    type: [ coder,wizard\n" +
-                    "          ^\n" +
-                    "expected ',' or ']', but got StreamEnd\n" +
-                    " in 'reader', line 2, column 21:\n" +
-                    "    wizard\n" +
-                    "          ^", malformedAdvancedFile.getName()));
-        }
+        assertThatThrownBy(super::printsDetailedInformationOnMalformedContent)
+            .hasMessageContaining(String.format(
+                "%s has an error:%n" +
+                "  * Malformed YAML at line: 3, column: 22; while parsing a flow sequence\n" +
+                " in 'reader', line 2, column 7:\n" +
+                "    type: [ coder,wizard\n" +
+                "          ^\n" +
+                "expected ',' or ']', but got StreamEnd\n" +
+                " in 'reader', line 2, column 21:\n" +
+                "    wizard\n" +
+                "          ^", malformedAdvancedFile.getName()));
     }
 }

dropwizard-hibernate/src/main/java/io/dropwizard/hibernate/UnitOfWork.java

@@ -13,7 +13,7 @@
 /**
  * When annotating a Jersey resource method, wraps the method in a Hibernate session.
  * <p>To be used outside Jersey, one need to create a proxy of the component with the
- * annotated method.</p.
+ * annotated method.</p>
  *
  * @see UnitOfWorkApplicationListener
  * @see UnitOfWorkAwareProxyFactory

dropwizard-http2/src/main/java/io/dropwizard/http2/Http2ConnectorFactory.java

@@ -36,7 +36,7 @@
  *     </tr>
  *     <tr>
  *         <td>{@code maxConcurrentStreams}</td>
- *         <td><1024</td>
+ *         <td>1024</td>
  *         <td>
  *             The maximum number of concurrently open streams allowed on a single HTTP/2 connection.
  *             Larger values increase parallelism, but cost a memory commitment.

dropwizard-jersey/src/main/java/io/dropwizard/jersey/filter/RequestIdFilter.java

@@ -21,7 +21,7 @@
  * information: request method, request path, request ID, response status,
  * response length (or -1 if not known).
  *
- * @see https://devcenter.heroku.com/articles/http-request-id
+ * @see <a href="https://devcenter.heroku.com/articles/http-request-id">Heroku - HTTP Request IDs</a>
  */
 @Provider
 @Priority(Priorities.USER)

dropwizard-jersey/src/main/java/io/dropwizard/jersey/filter/RuntimeFilter.java

@@ -17,7 +17,7 @@
  * taken to execute the request, in seconds (based on the implementation from
  * Ruby on Rails).
  *
- * @see https://github.com/rack/rack/blob/master/lib/rack/runtime.rb
+ * @see <a href="https://github.com/rack/rack/blob/2.0.0/lib/rack/runtime.rb">Rack::Runtime</a>
  */
 @Provider
 @PreMatching

dropwizard-jersey/src/test/java/io/dropwizard/jersey/gzip/ConfiguredGZipEncoderTest.java

@@ -76,7 +76,7 @@ public void noEncodingwillNotAroundWrite() throws IOException, WebApplicationExc
         assertThat(context.isProceedCalled(), is(true));
     }
 
-    private class WriterInterceptorContextMock implements WriterInterceptorContext {
+    private static class WriterInterceptorContextMock implements WriterInterceptorContext {
         private final MultivaluedMap<String, Object> headers;
         private OutputStream os = new OutputStream() {
             @Override

dropwizard-jersey/src/test/java/io/dropwizard/jersey/validation/FuzzyEnumParamConverterProviderTest.java

@@ -25,6 +25,7 @@ private enum WithToString {
         A_1,
         A_2;
 
+        @Override
         public String toString() {
             return "<" + this.name() + ">";
         }

dropwizard-jetty/src/main/java/io/dropwizard/jetty/BiDiGzipHandler.java

@@ -30,7 +30,7 @@
  */
 public class BiDiGzipHandler extends GzipHandler {
 
-    private final ThreadLocal<Inflater> localInflater = new ThreadLocal<>();
+    private static final ThreadLocal<Inflater> localInflater = new ThreadLocal<>();
 
     /**
      * Size of the buffer for decompressing requests
@@ -51,9 +51,6 @@ public void setInflateNoWrap(boolean inflateNoWrap) {
         this.inflateNoWrap = inflateNoWrap;
     }
 
-    public BiDiGzipHandler() {
-    }
-
     public void setInputBufferSize(int inputBufferSize) {
         this.inputBufferSize = inputBufferSize;
     }

dropwizard-jetty/src/main/java/io/dropwizard/jetty/LocalIpFilter.java

@@ -20,10 +20,8 @@
 import java.net.SocketException;
 
 /**
- * @see https://github.com/apache/curator/blob/master/curator-x-discovery/src/main/java/org/apache/curator/x/discovery/LocalIpFilter.java
+ * @see <a href="https://github.com/apache/curator/blob/master/curator-x-discovery/src/main/java/org/apache/curator/x/discovery/LocalIpFilter.java">LocalIpFilter</a>
  */
 public interface LocalIpFilter {
-
-    public boolean use(NetworkInterface networkInterface,
-                       InetAddress address) throws SocketException;
+    boolean use(NetworkInterface networkInterface, InetAddress address) throws SocketException;
 }

dropwizard-lifecycle/src/main/java/io/dropwizard/lifecycle/AutoCloseableManager.java

@@ -35,7 +35,8 @@ public void start() throws Exception {
     }
 
     /**
-     * Calls {@link AutoCloseable#close()} given in the {@link AutoCloseableManager(AutoCloseable)}
+     * Calls {@link AutoCloseable#close()} on the closable provided in
+     * {@link AutoCloseableManager#AutoCloseableManager(AutoCloseable)}.
      *
      * @throws Exception propagates {@link AutoCloseable#close()} exception
      */

dropwizard-logging/src/main/java/io/dropwizard/logging/AbstractAppenderFactory.java

@@ -154,7 +154,7 @@ public String getLogFormat() {
     }
 
     @JsonProperty
-    public void setLogFormat(String logFormat) {
+    public void setLogFormat(@Nullable String logFormat) {
         this.logFormat = logFormat;
     }
 

dropwizard-logging/src/main/java/io/dropwizard/logging/SyslogAppenderFactory.java

@@ -19,6 +19,8 @@
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
+import static com.google.common.base.Strings.isNullOrEmpty;
+
 /**
  * An {@link AppenderFactory} implementation which provides an appender that sends events to a
  * syslog server.
@@ -124,28 +126,11 @@ public enum Facility {
     @NotNull
     private String stackTracePrefix = SyslogAppender.DEFAULT_STACKTRACE_PATTERN;
 
-    // prefix the logFormat with the application name and PID (if available)
-    private String logFormat = LOG_TOKEN_NAME + LOG_TOKEN_PID + ": " +
-            SyslogAppender.DEFAULT_SUFFIX_PATTERN;
-
     private boolean includeStackTrace = true;
 
-    /**
-     * Returns the Logback pattern with which events will be formatted.
-     */
-    @Override
-    @JsonProperty
-    public String getLogFormat() {
-        return logFormat;
-    }
-
-    /**
-     * Sets the Logback pattern with which events will be formatted.
-     */
-    @Override
-    @JsonProperty
-    public void setLogFormat(String logFormat) {
-        this.logFormat = logFormat;
+    public SyslogAppenderFactory() {
+        // prefix the logFormat with the application name and PID (if available)
+        this.logFormat = LOG_TOKEN_NAME + LOG_TOKEN_PID + ": " + SyslogAppender.DEFAULT_SUFFIX_PATTERN;
     }
 
     /**
@@ -207,9 +192,11 @@ public Appender<ILoggingEvent> build(LoggerContext context, String applicationNa
         final SyslogAppender appender = new SyslogAppender();
         appender.setName("syslog-appender");
         appender.setContext(context);
-        appender.setSuffixPattern(logFormat
-                .replaceAll(LOG_TOKEN_PID, pid)
-                .replaceAll(LOG_TOKEN_NAME, Matcher.quoteReplacement(applicationName)));
+        if (!isNullOrEmpty(logFormat)) {
+            appender.setSuffixPattern(logFormat
+                    .replaceAll(LOG_TOKEN_PID, pid)
+                    .replaceAll(LOG_TOKEN_NAME, Matcher.quoteReplacement(applicationName)));
+        }
         appender.setSyslogHost(host);
         appender.setPort(port);
         appender.setFacility(facility.toString().toLowerCase(Locale.ENGLISH));

dropwizard-logging/src/test/java/io/dropwizard/logging/UdpSocketAppenderFactoryTest.java

@@ -17,6 +17,7 @@
 import java.net.DatagramPacket;
 import java.net.DatagramSocket;
 import java.net.SocketException;
+import java.nio.charset.StandardCharsets;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
 
@@ -41,7 +42,7 @@ public void setUp() throws Exception {
                 try {
                     DatagramPacket datagramPacket = new DatagramPacket(buffer, buffer.length);
                     datagramSocket.receive(datagramPacket);
-                    assertThat(new String(buffer, 0, datagramPacket.getLength()))
+                    assertThat(new String(buffer, 0, datagramPacket.getLength(), StandardCharsets.UTF_8))
                         .startsWith("INFO").contains("com.example.app: Application log " + i);
                     countDownLatch.countDown();
                 } catch (SocketException e) {