Merge pull request #3122 from swagger-api/guava-update-v1

ref #3079 - update guava for v1

Author: frantuma

modules/swagger-servlet/src/main/java/io/swagger/servlet/extensions/ServletReaderExtension.java

@@ -300,24 +300,24 @@ public void applyTags(ReaderContext context, Operation operation, Method method)
         final List<String> tags = new ArrayList<>();
 
         final Api apiAnnotation = context.getCls().getAnnotation(Api.class);
+        Predicate predicate = new Predicate<String>() {
+            @Override
+            public boolean apply(String input) {
+                return StringUtils.isNotBlank(input);
+            }
+
+            public boolean test(String input) {
+                return apply(input);
+            }
+        };
         if (apiAnnotation != null) {
-            tags.addAll(Collections2.filter(Arrays.asList(apiAnnotation.tags()), new Predicate<String>() {
-                @Override
-                public boolean apply(String input) {
-                    return StringUtils.isNotBlank(input);
-                }
-            }));
+            tags.addAll(Collections2.filter(Arrays.asList(apiAnnotation.tags()), predicate));
         }
         tags.addAll(context.getParentTags());
 
         final ApiOperation apiOperation = ReflectionUtils.getAnnotation(method, ApiOperation.class);
         if (apiOperation != null) {
-            tags.addAll(Collections2.filter(Arrays.asList(apiOperation.tags()), new Predicate<String>() {
-                @Override
-                public boolean apply(String input) {
-                    return StringUtils.isNotBlank(input);
-                }
-            }));
+            tags.addAll(Collections2.filter(Arrays.asList(apiOperation.tags()), predicate));
         }
 
         for (String tag : tags) {

pom.xml

@@ -231,6 +231,7 @@
                         <exclude>**/io/swagger/servlet/config/ServletScanner.*</exclude>
                         <exclude>**/io/swagger/servlet/config/DefaultServletConfig.*</exclude>
                         <exclude>**/io/swagger/servlet/listing/ApiDeclarationServlet.*</exclude>
+                        <exclude>**/*ServletReaderExtension$*.*</exclude>
                     </excludes>
                     <rules>
                         <rule>
@@ -602,10 +603,10 @@
         <jackson-version>2.9.8</jackson-version>
         <logback-version>1.2.3</logback-version>
         <reflections-version>0.9.11</reflections-version>
-        <guava-version>20.0</guava-version>
+        <guava-version>27.0.1-android</guava-version>
         <javassist-version>3.21.0-GA</javassist-version>
 
-        <testng-version>6.10</testng-version>
+        <testng-version>6.14.3</testng-version>
         <mockito-version>1.9.5</mockito-version>
         <rest-assured-version>2.8.0</rest-assured-version>
         <surefire-version>2.18.1</surefire-version>