#18 -- proctor now builds and passes unit tests with guava 21 and java 8

indeedeng · Jan 22, 2017 · 119b3d3 · 119b3d3
1 parent e8b89aa
commit 119b3d3
Show file tree

Hide file tree

Showing 17 changed files with 29 additions and 19 deletions.
diff --git a/pom.xml b/pom.xml
@@ -4,12 +4,12 @@
     <parent>
         <groupId>com.indeed</groupId>
         <artifactId>oss-parent</artifactId>
-        <version>17</version>
+        <version>18-SNAPSHOT</version>
     </parent>
 
     <groupId>com.indeed</groupId>
     <artifactId>proctor-parent</artifactId>
-    <version>1.1.28-SNAPSHOT</version>
+    <version>2.0.0-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <licenses>

diff --git a/proctor-ant-plugin/pom.xml b/proctor-ant-plugin/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.indeed</groupId>
         <artifactId>proctor-parent</artifactId>
-        <version>1.1.28-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>proctor-ant-plugin</artifactId>

diff --git a/proctor-builder/pom.xml b/proctor-builder/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.indeed</groupId>
         <artifactId>proctor-parent</artifactId>
-        <version>1.1.28-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>proctor-builder</artifactId>

diff --git a/proctor-codegen-test/pom.xml b/proctor-codegen-test/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.indeed</groupId>
         <artifactId>proctor-parent</artifactId>
-        <version>1.1.28-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>proctor-codegen-test</artifactId>

diff --git a/proctor-codegen/pom.xml b/proctor-codegen/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.indeed</groupId>
         <artifactId>proctor-parent</artifactId>
-        <version>1.1.28-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>proctor-codegen</artifactId>

diff --git a/proctor-common/pom.xml b/proctor-common/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.indeed</groupId>
         <artifactId>proctor-parent</artifactId>
-        <version>1.1.28-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>proctor-common</artifactId>

diff --git a/proctor-common/src/main/java/com/indeed/proctor/common/Proctor.java b/proctor-common/src/main/java/com/indeed/proctor/common/Proctor.java
@@ -227,6 +227,11 @@ public boolean apply(TestChooser<?> input) {
                 assert null != input;
                 return type == input.getTestDefinition().getTestType();
             }
+
+            @Override
+            public boolean test(TestChooser<?> input) {
+                return apply(input);
+            }
         });
     }
 

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,6 @@
 package com.indeed.proctor.common.model;
 
-import com.google.common.base.Objects;
+import com.google.common.base.MoreObjects;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.Maps;
 import com.fasterxml.jackson.core.JsonGenerator;
@@ -31,7 +31,7 @@ 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);
+        return MoreObjects.firstNonNull(TYPES.putIfAbsent(testType.name(), testType), testType);
     }
 
     // Emulate enum

diff --git a/proctor-consumer/pom.xml b/proctor-consumer/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.indeed</groupId>
         <artifactId>proctor-parent</artifactId>
-        <version>1.1.28-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>proctor-consumer</artifactId>

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,6 @@
 package com.indeed.proctor.consumer;
 
-import com.google.common.base.Objects;
+import com.google.common.base.MoreObjects;
 import com.google.common.collect.Maps;
 import com.indeed.proctor.common.ProctorResult;
 import com.indeed.proctor.common.model.ConsumableTestDefinition;
@@ -114,7 +114,7 @@ protected Payload getPayload(final String testName, @Nonnull final Bucket<?> fal
             }
         }
 
-        return Objects.firstNonNull(payload, Payload.EMPTY_PAYLOAD);
+        return MoreObjects.firstNonNull(payload, Payload.EMPTY_PAYLOAD);
     }
 
 

diff --git a/proctor-maven-plugin/pom.xml b/proctor-maven-plugin/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.indeed</groupId>
         <artifactId>proctor-parent</artifactId>
-        <version>1.1.28-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>proctor-maven-plugin</artifactId>
@@ -49,7 +49,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-plugin-plugin</artifactId>
-                <version>3.2</version>
+                <version>3.3</version>
                 <configuration>
                     <skipErrorNoDescriptorsFound>true</skipErrorNoDescriptorsFound>
                 </configuration>

diff --git a/proctor-store-git/pom.xml b/proctor-store-git/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.indeed</groupId>
         <artifactId>proctor-parent</artifactId>
-        <version>1.1.28-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>proctor-store-git</artifactId>

diff --git a/proctor-store-svn/pom.xml b/proctor-store-svn/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.indeed</groupId>
         <artifactId>proctor-parent</artifactId>
-        <version>1.1.28-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>proctor-store-svn</artifactId>

diff --git a/proctor-store/pom.xml b/proctor-store/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.indeed</groupId>
         <artifactId>proctor-parent</artifactId>
-        <version>1.1.28-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>proctor-store</artifactId>

diff --git a/proctor-store/src/test/java/com/indeed/proctor/store/InMemoryProctorStore.java b/proctor-store/src/test/java/com/indeed/proctor/store/InMemoryProctorStore.java
@@ -329,6 +329,11 @@ private static List<Revision> filterRevisionByTest(final List<RevisionAndTest> r
                     public boolean apply(@Nullable final RevisionAndTest revisionAndTest) {
                         return revisionAndTest.getTestName().equals(test);
                     }
+
+                    @Override
+                    public boolean test(@Nullable final RevisionAndTest revisionAndTest) {
+                        return apply(revisionAndTest);
+                    }
                 })
                 .transform(castToRevision)
                 .toList();

diff --git a/proctor-tomcat-deps-provided/pom.xml b/proctor-tomcat-deps-provided/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.indeed</groupId>
         <artifactId>proctor-parent</artifactId>
-        <version>1.1.28-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>proctor-tomcat-deps-provided</artifactId>

diff --git a/proctor-tomcat-deps/pom.xml b/proctor-tomcat-deps/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.indeed</groupId>
         <artifactId>proctor-parent</artifactId>
-        <version>1.1.28-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>proctor-tomcat-deps</artifactId>