2018 | Upgrade of guava from 15.0 to 31.1-jre

hystrix-contrib/hystrix-javanica/build.gradle

@@ -100,7 +100,7 @@ dependencies {
     compileApi "org.aspectj:aspectjweaver:$aspectjVersion"
     compile "org.aspectj:aspectjrt:$aspectjVersion"
 
-    compileApi 'com.google.guava:guava:15.0'
+    compileApi 'com.google.guava:guava:31.1-jre'
     compile 'org.apache.commons:commons-lang3:3.1'
     compileApi 'com.google.code.findbugs:jsr305:2.0.0'
     compile 'org.ow2.asm:asm:5.0.4'

hystrix-contrib/hystrix-javanica/src/main/java/com/netflix/hystrix/contrib/javanica/cache/CacheInvocationContext.java

@@ -75,6 +75,11 @@ public CacheInvocationContext(A cacheAnnotation, MethodExecutionAction cacheKeyM
                 public boolean apply(CacheInvocationParameter input) {
                     return input.hasCacheKeyAnnotation();
                 }
+
+                @Override
+                public boolean test(CacheInvocationParameter input) {
+                    return apply(input);
+                }
             });
             if (filtered.iterator().hasNext()) {
                 keyParameters = ImmutableList.<CacheInvocationParameter>builder().addAll(filtered).build();

hystrix-contrib/hystrix-javanica/src/main/java/com/netflix/hystrix/contrib/javanica/cache/CacheInvocationParameter.java

@@ -106,6 +106,10 @@ private Annotation cacheKeyAnnotation() {
             public boolean apply(Annotation input) {
                 return input.annotationType().equals(CacheKey.class);
             }
+            @Override
+            public boolean test(Annotation input) {
+                return apply(input);
+            }
         }).orNull();
     }
 

hystrix-contrib/hystrix-javanica/src/main/java/com/netflix/hystrix/contrib/javanica/command/MetaHolder.java

@@ -333,6 +333,10 @@ private <T> Predicate<List<T>> nonEmptyList() {
             public boolean apply(@Nullable List<T> input) {
                 return input != null && !input.isEmpty();
             }
+            @Override
+            public boolean test(List<T> input) {
+                return apply(input);
+            }
         };
     }
 

hystrix-contrib/hystrix-javanica/src/test/java/com/netflix/hystrix/contrib/javanica/cache/CacheInvocationContextFactoryTest.java

@@ -155,6 +155,10 @@ private static boolean isAnnotationPresent(CacheInvocationParameter parameter, f
             public boolean apply(Annotation input) {
                 return input.annotationType().equals(annotation);
             }
+            @Override
+            public boolean test(Annotation input) {
+                return apply(input);
+            }
         }).isPresent();
     }
 }

hystrix-contrib/hystrix-javanica/src/test/java/com/netflix/hystrix/contrib/javanica/test/common/cache/BasicCacheTest.java

@@ -267,6 +267,10 @@ public User getUserByEmail(final String email) {
                 public boolean apply(User input) {
                     return input.getProfile().getEmail().equalsIgnoreCase(email);
                 }
+                @Override
+                public boolean test(User input) {
+                    return apply(input);
+                }
             }).orNull();
         }