Upgrade to Guava 18.0

dropwizard · Sep 28, 2014 · a876b65 · a876b65
1 parent 3bfc940
commit a876b65
Show file tree

Hide file tree

Showing 6 changed files with 60 additions and 46 deletions.
diff --git a/dropwizard-auth/src/main/java/io/dropwizard/auth/basic/BasicCredentials.java b/dropwizard-auth/src/main/java/io/dropwizard/auth/basic/BasicCredentials.java
@@ -1,9 +1,8 @@
 package io.dropwizard.auth.basic;
 
-import com.google.common.base.Charsets;
-import com.google.common.base.Objects;
+import com.google.common.base.MoreObjects;
 
-import java.security.MessageDigest;
+import java.util.Objects;
 
 import static com.google.common.base.Preconditions.checkNotNull;
 
@@ -45,26 +44,27 @@ public String getPassword() {
     }
 
     @Override
-    public boolean equals(Object obj) {
-        if (this == obj) { return true; }
-        if ((obj == null) || (getClass() != obj.getClass())) { return false; }
-        final BasicCredentials that = (BasicCredentials) obj;
-        // N.B.: Doing a constant-time comparison here to prevent timing attacks.
-        final byte[] thisBytes = password.getBytes(Charsets.UTF_8);
-        final byte[] thatBytes = that.password.getBytes(Charsets.UTF_8);
-        return username.equals(that.username) && MessageDigest.isEqual(thisBytes, thatBytes);
+    public int hashCode() {
+        return Objects.hash(username, password);
     }
 
     @Override
-    public int hashCode() {
-        return (31 * username.hashCode()) + password.hashCode();
+    public boolean equals(Object obj) {
+        if (this == obj) {
+            return true;
+        }
+        if (obj == null || getClass() != obj.getClass()) {
+            return false;
+        }
+        final BasicCredentials other = (BasicCredentials) obj;
+        return Objects.equals(this.username, other.username) && Objects.equals(this.password, other.password);
     }
 
     @Override
     public String toString() {
-        return Objects.toStringHelper(this)
-                      .add("username", username)
-                      .add("password", "**********")
-                      .toString();
+        return MoreObjects.toStringHelper(this)
+                .add("username", username)
+                .add("password", "**********")
+                .toString();
     }
 }
diff --git a/dropwizard-core/src/main/java/io/dropwizard/Configuration.java b/dropwizard-core/src/main/java/io/dropwizard/Configuration.java
@@ -1,7 +1,7 @@
 package io.dropwizard;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.google.common.base.Objects;
+import com.google.common.base.MoreObjects;
 import io.dropwizard.logging.LoggingFactory;
 import io.dropwizard.metrics.MetricsFactory;
 import io.dropwizard.server.DefaultServerFactory;
@@ -119,9 +119,9 @@ public void setMetricsFactory(MetricsFactory metrics) {
 
     @Override
     public String toString() {
-        return Objects.toStringHelper(this)
-                      .add("server", server)
-                      .add("logging", logging)
-                      .toString();
+        return MoreObjects.toStringHelper(this)
+                .add("server", server)
+                .add("logging", logging)
+                .toString();
     }
 }
diff --git a/dropwizard-example/src/main/java/com/example/helloworld/core/Saying.java b/dropwizard-example/src/main/java/com/example/helloworld/core/Saying.java
@@ -1,7 +1,7 @@
 package com.example.helloworld.core;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.google.common.base.Objects;
+import com.google.common.base.MoreObjects;
 import org.hibernate.validator.constraints.Length;
 
 public class Saying {
@@ -29,10 +29,9 @@ public String getContent() {
         return content;
     }
 
-
     @Override
     public String toString() {
-        return Objects.toStringHelper(this)
+        return MoreObjects.toStringHelper(this)
                 .add("id", id)
                 .add("content", content)
                 .toString();

diff --git a/...ard-jersey/src/test/java/io/dropwizard/jersey/jackson/JacksonMessageBodyProviderTest.java b/...ard-jersey/src/test/java/io/dropwizard/jersey/jackson/JacksonMessageBodyProviderTest.java
@@ -4,9 +4,7 @@
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
-import com.google.common.base.Objects;
 import com.google.common.reflect.TypeToken;
-import javax.ws.rs.core.MultivaluedHashMap;
 import io.dropwizard.jackson.Jackson;
 import io.dropwizard.validation.ConstraintViolations;
 import io.dropwizard.validation.Validated;
@@ -21,12 +19,19 @@
 import javax.validation.constraints.NotNull;
 import javax.ws.rs.WebApplicationException;
 import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.MultivaluedHashMap;
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Type;
-import java.util.*;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Set;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.failBecauseExceptionWasNotThrown;
@@ -37,8 +42,6 @@
 import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.when;
 
-// TODO: 4/24/13 <coda> -- move JacksonMessageBodyProviderTest to JerseyTest
-
 @SuppressWarnings("unchecked")
 public class JacksonMessageBodyProviderTest {
     private static final Annotation[] NONE = new Annotation[0];
@@ -50,12 +53,19 @@ public static class Example {
 
         @Override
         public int hashCode() {
-            return id;
+            return Objects.hash(id);
         }
 
         @Override
         public boolean equals(Object obj) {
-            return Objects.equal(this.id, obj);
+            if (this == obj) {
+                return true;
+            }
+            if (obj == null || getClass() != obj.getClass()) {
+                return false;
+            }
+            final Example other = (Example) obj;
+            return Objects.equals(this.id, other.id);
         }
     }
 

diff --git a/dropwizard-testing/src/test/java/io/dropwizard/testing/Person.java b/dropwizard-testing/src/test/java/io/dropwizard/testing/Person.java
@@ -1,6 +1,8 @@
 package io.dropwizard.testing;
 
-import com.google.common.base.Objects;
+import com.google.common.base.MoreObjects;
+
+import java.util.Objects;
 
 public class Person {
     private String name;
@@ -30,24 +32,27 @@ public void setEmail(String email) {
     }
 
     @Override
-    public boolean equals(Object obj) {
-        if (this == obj) { return true; }
-        if ((obj == null) || (getClass() != obj.getClass())) { return false; }
-
-        final Person person = (Person) obj;
-        return !((email != null) ? !email.equals(person.email) : (person.email != null)) &&
-                !((name != null) ? !name.equals(person.name) : (person.name != null));
+    public int hashCode() {
+        return Objects.hash(name, email);
     }
 
     @Override
-    public int hashCode() {
-        int result = (name != null) ? name.hashCode() : 0;
-        result = (31 * result) + ((email != null) ? email.hashCode() : 0);
-        return result;
+    public boolean equals(Object obj) {
+        if (this == obj) {
+            return true;
+        }
+        if (obj == null || getClass() != obj.getClass()) {
+            return false;
+        }
+        final Person other = (Person) obj;
+        return Objects.equals(this.name, other.name) && Objects.equals(this.email, other.email);
     }
 
     @Override
     public String toString() {
-        return Objects.toStringHelper(this).add("name", name).add("email", email).toString();
+        return MoreObjects.toStringHelper(this)
+                .add("name", name)
+                .add("email", email)
+                .toString();
     }
 }
diff --git a/pom.xml b/pom.xml
@@ -60,7 +60,7 @@
         <slf4j.version>1.7.7</slf4j.version>
         <servlet.version>3.0.0.v201112011016</servlet.version>
         <jetty.version>9.2.3.v20140905</jetty.version>
-        <guava.version>17.0</guava.version>
+        <guava.version>18.0</guava.version>
         <h2.version>1.4.178</h2.version>
         <assertj.version>1.6.1</assertj.version>
     </properties>