Merge pull request OpenFeign#103 from wnagele/6.x

Adrian Cole · Adrian Cole · commit 314229871f77 · 2014-03-31T19:50:19.000-07:00
Fix for bug OpenFeign#85
diff --git a/CHANGES.md b/CHANGES.md
@@ -1,3 +1,6 @@
+### Version 6.1.2
+* Named query parameters on GET request result in POST request (bug #85)
+
 ### Version 6.0.2
 * Fix for BasicAuthRequestInterceptor when username and/or password are long.
 
diff --git a/core/src/main/java/feign/Contract.java b/core/src/main/java/feign/Contract.java
@@ -22,6 +22,7 @@
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
+import java.util.Map;
 
 import static feign.Util.checkState;
 import static feign.Util.emptyToNull;
@@ -165,14 +166,28 @@ protected boolean processAnnotationsOnParameter(MethodMetadata data, Annotation[
           checkState(emptyToNull(name) != null, "Named annotation was empty on param %s.", paramIndex);
           nameParam(data, name, paramIndex);
           isHttpAnnotation = true;
-          if (data.template().url().indexOf('{' + name + '}') == -1 && //
-              !(data.template().queries().containsKey(name)
-                  || data.template().headers().containsKey(name))) {
+          String varName = '{' + name + '}';
+          if (data.template().url().indexOf(varName) == -1 &&
+              !searchMapValues(data.template().queries(), varName) &&
+              !searchMapValues(data.template().headers(), varName)) {
             data.formParams().add(name);
           }
         }
       }
       return isHttpAnnotation;
     }
+
+    private <K, V> boolean searchMapValues(Map<K, Collection<V>> map, V search) {
+      Collection<Collection<V>> values = map.values();
+      if (values == null)
+        return false;
+
+      for (Collection<V> entry : values) {
+        if (entry.contains(search))
+          return true;
+      }
+
+      return false;
+    }
   }
 }
