Remove hashCode and equals from base class, support null default value

mziccard · mziccard · commit 996bae5b4251 · 2016-06-03T08:19:33.000+02:00
diff --git a/gcloud-java-core/src/main/java/com/google/cloud/WaitForOption.java b/gcloud-java-core/src/main/java/com/google/cloud/WaitForOption.java
@@ -16,7 +16,6 @@
 
 package com.google.cloud;
 
-import static com.google.common.base.MoreObjects.firstNonNull;
 import static com.google.common.base.Preconditions.checkArgument;
 
 import com.google.common.base.MoreObjects;
@@ -185,26 +184,10 @@ final boolean baseEquals(WaitForOption option) {
     return Objects.equals(option.optionType, option.optionType);
   }
 
-  @Override
-  public boolean equals(Object obj) {
-    if (obj == this) {
-      return true;
-    }
-    if (obj == null || !(obj.getClass().equals(WaitForOption.class))) {
-      return false;
-    }
-    return baseEquals((WaitForOption) obj);
-  }
-
   final int baseHashCode() {
     return Objects.hash(optionType);
   }
 
-  @Override
-  public int hashCode() {
-    return baseHashCode();
-  }
-
   @SuppressWarnings("unchecked")
   private static <T extends WaitForOption> T getOrDefaultInternal(OptionType optionType,
       T defaultValue, WaitForOption... options) {
@@ -215,7 +198,7 @@ private static <T extends WaitForOption> T getOrDefaultInternal(OptionType optio
         foundOption = (T) option;
       }
     }
-    return firstNonNull(foundOption, defaultValue);
+    return foundOption != null ? foundOption : defaultValue;
   }
 
   /**
