From 76770fc4a0983220eee6d673a7a187a9e26ce0f8 Mon Sep 17 00:00:00 2001 From: Tavian Barnes Date: Mon, 15 Sep 2014 21:05:42 -0400 Subject: Don't use Guava's Objects. --- .../com/tavianator/sangria/contextual/ContextSensitiveBinder.java | 7 +++---- .../main/java/com/tavianator/sangria/listbinder/ListBinder.java | 3 +-- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/sangria-contextual/src/main/java/com/tavianator/sangria/contextual/ContextSensitiveBinder.java b/sangria-contextual/src/main/java/com/tavianator/sangria/contextual/ContextSensitiveBinder.java index ec2d7a7..6d5e502 100644 --- a/sangria-contextual/src/main/java/com/tavianator/sangria/contextual/ContextSensitiveBinder.java +++ b/sangria-contextual/src/main/java/com/tavianator/sangria/contextual/ContextSensitiveBinder.java @@ -21,7 +21,6 @@ import java.lang.annotation.Annotation; import java.util.*; import javax.inject.Inject; -import com.google.common.base.Objects; import com.google.inject.AbstractModule; import com.google.inject.Binder; import com.google.inject.Binding; @@ -236,7 +235,7 @@ public class ContextSensitiveBinder { @Override public int hashCode() { - return Objects.hashCode(providerKey); + return providerKey.hashCode(); } } @@ -296,7 +295,7 @@ public class ContextSensitiveBinder { @Override public int hashCode() { - return Objects.hashCode(instance); + return instance.hashCode(); } } @@ -358,7 +357,7 @@ public class ContextSensitiveBinder { @Override public int hashCode() { - return Objects.hashCode(key); + return key.hashCode(); } } } diff --git a/sangria-listbinder/src/main/java/com/tavianator/sangria/listbinder/ListBinder.java b/sangria-listbinder/src/main/java/com/tavianator/sangria/listbinder/ListBinder.java index 003e25e..ec36d1d 100644 --- a/sangria-listbinder/src/main/java/com/tavianator/sangria/listbinder/ListBinder.java +++ b/sangria-listbinder/src/main/java/com/tavianator/sangria/listbinder/ListBinder.java @@ -23,7 +23,6 @@ import javax.inject.Inject; import javax.inject.Provider; import com.google.common.base.Function; -import com.google.common.base.Objects; import com.google.common.collect.ArrayListMultimap; import com.google.common.collect.FluentIterable; import com.google.common.collect.ListMultimap; @@ -396,7 +395,7 @@ public class ListBinder { @Override public int hashCode() { - return Objects.hashCode(providerListKey); + return providerListKey.hashCode(); } } -- cgit v1.2.3