Merge pull request #1868 from dropwizard/errorprone-2.0.15

Upgrade to Errorprone 2.0.15
dropwizard · Jan 13, 2017 · 2cf422d · 2cf422d
2 parents bd6eb1e + f0885c2
commit 2cf422d
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 11 deletions.
diff --git a/dropwizard-auth/src/test/java/io/dropwizard/auth/basic/BasicCredentialsTest.java b/dropwizard-auth/src/test/java/io/dropwizard/auth/basic/BasicCredentialsTest.java
@@ -20,12 +20,12 @@ public void hasAPassword() throws Exception {
     @Test
     @SuppressWarnings({ "ObjectEqualsNull", "EqualsBetweenInconvertibleTypes", "LiteralAsArgToStringEquals" })
     public void hasAWorkingEqualsMethod() throws Exception {
-        assertThat(credentials.equals(credentials)).isTrue();
-        assertThat(credentials.equals(new BasicCredentials("u", "p"))).isTrue();
-        assertThat(credentials.equals(null)).isFalse();
-        assertThat(credentials.equals("string")).isFalse();
-        assertThat(credentials.equals(new BasicCredentials("u1", "p"))).isFalse();
-        assertThat(credentials.equals(new BasicCredentials("u", "p1"))).isFalse();
+        assertThat(credentials).isEqualTo(credentials);
+        assertThat(credentials).isEqualTo(new BasicCredentials("u", "p"));
+        assertThat(credentials).isNotEqualTo(null);
+        assertThat(credentials).isNotEqualTo("string");
+        assertThat(credentials).isNotEqualTo(new BasicCredentials("u1", "p"));
+        assertThat(credentials).isNotEqualTo(new BasicCredentials("u", "p1"));
     }
 
     @Test

diff --git a/dropwizard-client/src/test/java/io/dropwizard/client/JerseyClientIntegrationTest.java b/dropwizard-client/src/test/java/io/dropwizard/client/JerseyClientIntegrationTest.java
@@ -90,7 +90,7 @@ public void testBufferedGzipPost() {
                 assertThat(requestHeaders.get(HttpHeaders.CONTENT_LENGTH)).containsExactly("58");
                 assertThat(requestHeaders.get(TRANSFER_ENCODING)).isNull();
                 assertThat(requestHeaders.get(HttpHeaders.CONTENT_ENCODING)).containsExactly(GZIP);
-                assertThat(requestHeaders.get(HttpHeaders.ACCEPT_ENCODING));
+                assertThat(requestHeaders.get(HttpHeaders.ACCEPT_ENCODING)).containsExactly(GZIP_DEFLATE);
 
                 checkBody(httpExchange, true);
                 postResponse(httpExchange);

diff --git a/...ient/src/test/java/io/dropwizard/client/JerseyIgnoreRequestUserAgentHeaderFilterTest.java b/...ient/src/test/java/io/dropwizard/client/JerseyIgnoreRequestUserAgentHeaderFilterTest.java
@@ -62,7 +62,6 @@ public void clientIsNotSetRequestIsSet() {
 
     @Test
     public void clientIsNotSetRequestIsNotSet() {
-        assertThat(false);
         assertThat(
                 clientBuilder.build("ClientName").target(testUri + "/user_agent")
                         .request()

diff --git a/dropwizard-db/src/test/java/io/dropwizard/db/DataSourceFactoryTest.java b/dropwizard-db/src/test/java/io/dropwizard/db/DataSourceFactoryTest.java
@@ -100,7 +100,7 @@ public void testCustomValidator() throws Exception {
         try (Connection connection = dataSource().getConnection()) {
             try (PreparedStatement statement = connection.prepareStatement("select 1")) {
                 try (ResultSet rs = statement.executeQuery()) {
-                    assertThat(rs.next());
+                    assertThat(rs.next()).isTrue();
                     assertThat(rs.getInt(1)).isEqualTo(1);
                 }
             }

diff --git a/pom.xml b/pom.xml
@@ -467,12 +467,12 @@
                     <dependency>
                         <groupId>org.codehaus.plexus</groupId>
                         <artifactId>plexus-compiler-javac-errorprone</artifactId>
-                        <version>2.8</version>
+                        <version>2.8.1</version>
                     </dependency>
                     <dependency>
                         <groupId>com.google.errorprone</groupId>
                         <artifactId>error_prone_core</artifactId>
-                        <version>2.0.11</version>
+                        <version>2.0.15</version>
                     </dependency>
                 </dependencies>
             </plugin>