Merge pull request #67 from Xenorith/bugfix/removeFluentIterableOf

inline FluentIterable.of to be compatible with guava <18
palantir · Feb 24, 2016 · bf30cc0 · bf30cc0
2 parents a935e27 + 1c0d906
commit bf30cc0
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/http-clients/src/main/java/com/palantir/remoting/http/GuavaOptionalAwareContract.java b/http-clients/src/main/java/com/palantir/remoting/http/GuavaOptionalAwareContract.java
@@ -19,6 +19,7 @@
 import com.google.common.base.Function;
 import com.google.common.base.Optional;
 import com.google.common.collect.FluentIterable;
+import com.google.common.collect.Lists;
 import feign.Contract;
 import feign.Feign;
 import feign.MethodMetadata;
@@ -67,7 +68,7 @@ public List<MethodMetadata> parseAndValidatateMetadata(Class<?> targetType) {
                     Class<?> cls = parameterTypes[i];
                     if (cls.equals(Optional.class)) {
                         FluentIterable<Class<?>> paramAnnotations =
-                                FluentIterable.of(annotations[i]).transform(EXTRACT_CLASS);
+                                FluentIterable.from(Lists.newArrayList(annotations[i])).transform(EXTRACT_CLASS);
                         if (paramAnnotations.contains(HeaderParam.class)) {
                             md.indexToExpanderClass().put(i, GuavaEmptyOptionalExpander.class);
                         } else if (paramAnnotations.contains(QueryParam.class)) {