KYLO-1288: change services to be guava 23.0

xiciliu · Jan 4, 2018 · 6967cc8 · 6967cc8
1 parent 064e693
commit 6967cc8
Show file tree

Hide file tree

Showing 5 changed files with 91 additions and 5 deletions.
diff --git a/commons/commons-util/pom.xml b/commons/commons-util/pom.xml
@@ -86,6 +86,36 @@
           <target>${java.version}</target>
         </configuration>
       </plugin>
+
+    <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>license-maven-plugin</artifactId>
+        <configuration>
+          <roots>
+            <root>src/main/java</root>
+            <root>src/test</root>
+          </roots>
+          <excludes>
+            <exclude>**/PredicateImpl.java</exclude>
+          </excludes>
+        </configuration>
+        <executions>
+          <execution>
+            <id>first</id>
+           <goals>
+              <goal>update-file-header</goal>
+            </goals>
+            <phase>process-sources</phase>
+            <configuration>
+              <roots>
+                <root>src/main/java</root>
+                <root>src/test/java</root>
+              </roots>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+
     </plugins>
   </build>
 </project>
diff --git a/commons/commons-util/src/main/java/com/thinkbiganalytics/guava/PredicateImpl.java b/commons/commons-util/src/main/java/com/thinkbiganalytics/guava/PredicateImpl.java
@@ -0,0 +1,40 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to you under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.thinkbiganalytics.guava;
+
+import com.google.common.base.Predicate;
+
+/**
+ * Abstract implementation of {@link com.google.common.base.Predicate}.
+ *
+ * <p>Derived class needs to implement the {@link #test} method.
+ *
+ * <p>Helps with the transition to {@code java.util.function.Predicate},
+ * which was introduced in JDK 1.8, and is required in Guava 21.0 and higer,
+ * but still works on JDK 1.7.
+ *
+ * @param <T> the type of the input to the predicate
+ * @implNote Copied from Apache licensed org/apache/calcite/runtime/PredicateImpl.java
+ */
+public abstract class PredicateImpl<T> implements Predicate<T> {
+    public final boolean apply(T input) {
+        return test(input);
+    }
+
+    /** Overrides {@code java.util.function.Predicate#test} in JDK8 and higher. */
+    public abstract boolean test( T t);
+}
diff --git a/license.ftl b/license.ftl
@@ -124,6 +124,8 @@
   <@antlrLicense/>
 <#elseif project.groupId == "org.bouncycastle">
   <@bouncyCastleLicense/>
+<#elseif project.groupId == "org.codehaus.mojo" && project.artifactId == "animal-sniffer-annotations">
+  <@animalSnifferLicense/>
 <#elseif project.groupId == "org.codehaus.jettison">
   <@apache2License/>
 <#elseif project.groupId == "org.codehaus.woodstox">
@@ -228,6 +230,16 @@ Copyright (c) 2000 - 2016 The Legion of the Bouncy Castle Inc. (https://www.boun
   <@mitLicense/>
 </#macro>
 
+<#-- Bouncy Castle License -->
+<#macro animalSnifferLicense>
+  <@projectInfo project/>
+
+Copyright (c) 2009 codehaus.org.
+
+  <@mitLicense/>
+</#macro>
+
+
 <#-- BSD 3-Clause License -->
 <#macro bsd3License>
 Redistribution and use in source and binary forms, with or without

diff --git a/...ore/src/test/java/com/thinkbiganalytics/standardization/TestStandardizationTransform.java b/...ore/src/test/java/com/thinkbiganalytics/standardization/TestStandardizationTransform.java
@@ -20,8 +20,8 @@
  * #L%
  */
 
-import com.google.common.base.Predicate;
 import com.google.common.collect.Iterables;
+import com.thinkbiganalytics.guava.PredicateImpl;
 import com.thinkbiganalytics.policy.AvailablePolicies;
 import com.thinkbiganalytics.policy.PolicyTransformException;
 import com.thinkbiganalytics.policy.rest.model.FieldStandardizationRule;
@@ -115,9 +115,9 @@ public void testSimpleRegexReplacer() throws IOException {
     @Test
     public void testUiCreation() {
         List<FieldStandardizationRule> standardizationRules = AvailablePolicies.discoverStandardizationRules();
-        FieldStandardizationRule defaultValue = Iterables.tryFind(standardizationRules, new Predicate<FieldStandardizationRule>() {
+        FieldStandardizationRule defaultValue = Iterables.tryFind(standardizationRules, new PredicateImpl<FieldStandardizationRule>() {
             @Override
-            public boolean apply(FieldStandardizationRule fieldStandardizationRule) {
+            public boolean test(FieldStandardizationRule fieldStandardizationRule) {
                 return fieldStandardizationRule.getName().equalsIgnoreCase("Default Value");
             }
         }).orNull();

diff --git a/services/service-app/pom.xml b/services/service-app/pom.xml
@@ -16,11 +16,16 @@
     <timestamp>${maven.build.timestamp}</timestamp>
     <maven.build.timestamp.format>yyyy-MM-dd HH:mm</maven.build.timestamp.format>
     <plugin.license.parentRelative>../../</plugin.license.parentRelative>
+    <guava.version>23.0</guava.version>
   </properties>
 
   <dependencyManagement>
     <dependencies>
-
+      <dependency>
+        <groupId>com.google.guava</groupId>
+        <artifactId>guava</artifactId>
+        <version>${guava.version}</version>
+      </dependency>
     </dependencies>
   </dependencyManagement>
 
@@ -496,7 +501,6 @@
 
   </dependencies>
 
-
   <build>
 
     <resources>