Merge branch 'shawnsmith-guava21' into 'master'

#21 See merge request !59
indeedeng · Apr 24, 2017 · 0b2dbf1 · 0b2dbf1
2 parents 5fd57b3 + 614912b
commit 0b2dbf1
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/proctor-common/src/main/java/com/indeed/proctor/common/model/TestType.java b/proctor-common/src/main/java/com/indeed/proctor/common/model/TestType.java
@@ -1,6 +1,5 @@
 package com.indeed.proctor.common.model;
 
-import com.google.common.base.Objects;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.Maps;
 import com.fasterxml.jackson.core.JsonGenerator;
@@ -31,7 +30,8 @@ private TestType(@Nonnull final String id) {
     @Nonnull
     public static TestType register(@Nonnull final String name) {
         final TestType testType = new TestType(name);
-        return Objects.firstNonNull(TYPES.putIfAbsent(testType.name(), testType), testType);
+        final TestType previous = TYPES.putIfAbsent(testType.name(), testType);
+        return previous != null ? previous : testType;
     }
 
     // Emulate enum

diff --git a/proctor-consumer/src/main/java/com/indeed/proctor/consumer/AbstractGroups.java b/proctor-consumer/src/main/java/com/indeed/proctor/consumer/AbstractGroups.java
@@ -1,6 +1,5 @@
 package com.indeed.proctor.consumer;
 
-import com.google.common.base.Objects;
 import com.google.common.collect.Maps;
 import com.indeed.proctor.common.ProctorResult;
 import com.indeed.proctor.common.model.ConsumableTestDefinition;
@@ -119,7 +118,7 @@ protected Payload getPayload(final String testName, @Nonnull final Bucket<?> fal
             }
         }
 
-        return Objects.firstNonNull(payload, Payload.EMPTY_PAYLOAD);
+        return payload != null ? payload : Payload.EMPTY_PAYLOAD;
     }
 
     /**