Merge pull request #147 from jianghaolu/guavafix

[Azure/azure-sdk-for-java#1322] Upgrade guava to 20.0
Azure · Feb 14, 2017 · 95ddf9c · 95ddf9c
2 parents 0d02ae5 + 3121e52
commit 95ddf9c
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 311 deletions.
diff --git a/azure-client-authentication/build.gradle b/azure-client-authentication/build.gradle
diff --git a/azure-client-runtime/build.gradle b/azure-client-runtime/build.gradle
diff --git a/client-runtime/build.gradle b/client-runtime/build.gradle
diff --git a/client-runtime/src/main/java/com/microsoft/rest/Validator.java b/client-runtime/src/main/java/com/microsoft/rest/Validator.java
@@ -48,11 +48,11 @@ public static void validate(Object parameter) {
         }
         if (parameterToken.isPrimitive()
                 || parameterType.isEnum()
-                || parameterToken.isAssignableFrom(LocalDate.class)
-                || parameterToken.isAssignableFrom(DateTime.class)
-                || parameterToken.isAssignableFrom(String.class)
-                || parameterToken.isAssignableFrom(DateTimeRfc1123.class)
-                || parameterToken.isAssignableFrom(Period.class)) {
+                || parameterToken.isSupertypeOf(LocalDate.class)
+                || parameterToken.isSupertypeOf(DateTime.class)
+                || parameterToken.isSupertypeOf(String.class)
+                || parameterToken.isSupertypeOf(DateTimeRfc1123.class)
+                || parameterToken.isSupertypeOf(Period.class)) {
             return;
         }
 
@@ -86,13 +86,13 @@ public static void validate(Object parameter) {
                 } else {
                     try {
                         Class<?> propertyType = property.getClass();
-                        if (TypeToken.of(List.class).isAssignableFrom(propertyType)) {
+                        if (TypeToken.of(List.class).isSupertypeOf(propertyType)) {
                             List<?> items = (List<?>) property;
                             for (Object item : items) {
                                 Validator.validate(item);
                             }
                         }
-                        else if (TypeToken.of(Map.class).isAssignableFrom(propertyType)) {
+                        else if (TypeToken.of(Map.class).isSupertypeOf(propertyType)) {
                             Map<?, ?> entries = (Map<?, ?>) property;
                             for (Map.Entry<?, ?> entry : entries.entrySet()) {
                                 Validator.validate(entry.getKey());

diff --git a/pom.xml b/pom.xml
@@ -56,7 +56,7 @@
       <dependency>
         <groupId>com.google.guava</groupId>
         <artifactId>guava</artifactId>
-        <version>18.0</version>
+        <version>20.0</version>
       </dependency>
       <dependency>
         <groupId>com.squareup.retrofit2</groupId>