Skip to content

Commit bf30cc0

Browse files
committed
Merge pull request #67 from Xenorith/bugfix/removeFluentIterableOf
inline FluentIterable.of to be compatible with guava <18
2 parents a935e27 + 1c0d906 commit bf30cc0

1 file changed

Lines changed: 2 additions & 1 deletion

File tree

http-clients/src/main/java/com/palantir/remoting/http/GuavaOptionalAwareContract.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
import com.google.common.base.Function;
2020
import com.google.common.base.Optional;
2121
import com.google.common.collect.FluentIterable;
22+
import com.google.common.collect.Lists;
2223
import feign.Contract;
2324
import feign.Feign;
2425
import feign.MethodMetadata;
@@ -67,7 +68,7 @@ public List<MethodMetadata> parseAndValidatateMetadata(Class<?> targetType) {
6768
Class<?> cls = parameterTypes[i];
6869
if (cls.equals(Optional.class)) {
6970
FluentIterable<Class<?>> paramAnnotations =
70-
FluentIterable.of(annotations[i]).transform(EXTRACT_CLASS);
71+
FluentIterable.from(Lists.newArrayList(annotations[i])).transform(EXTRACT_CLASS);
7172
if (paramAnnotations.contains(HeaderParam.class)) {
7273
md.indexToExpanderClass().put(i, GuavaEmptyOptionalExpander.class);
7374
} else if (paramAnnotations.contains(QueryParam.class)) {

0 commit comments

Comments
 (0)