Fixed throwing an IllegalStateException on duplicate HeaderMap

Dmytro Kostiuchenko · Dmytro Kostiuchenko · commit ecafb83cb494 · 2016-06-22T14:47:54.000+02:00
diff --git a/core/src/main/java/feign/Contract.java b/core/src/main/java/feign/Contract.java
@@ -267,7 +267,7 @@ protected boolean processAnnotationsOnParameter(MethodMetadata data, Annotation[
           data.queryMapIndex(paramIndex);
           isHttpAnnotation = true;
         } else if (annotationType == HeaderMap.class) {
-          checkState(data.queryMapIndex() == null, "HeaderMap annotation was present on multiple parameters.");
+          checkState(data.headerMapIndex() == null, "HeaderMap annotation was present on multiple parameters.");
           data.headerMapIndex(paramIndex);
           isHttpAnnotation = true;
         }
diff --git a/core/src/test/java/feign/DefaultContractTest.java b/core/src/test/java/feign/DefaultContractTest.java
@@ -308,6 +308,16 @@ public void slashAreEncodedWhenNeeded() throws Exception {
     assertThat(md.template().decodeSlash()).isTrue();
   }
 
+  @Test
+  public void onlyOneHeaderMapAnnotationPermitted() throws Exception {
+    try {
+      parseAndValidateMetadata(HeaderMapInterface.class, "multipleHeaderMap", Map.class, Map.class);
+      Fail.failBecauseExceptionWasNotThrown(IllegalStateException.class);
+    } catch (IllegalStateException ex) {
+      assertThat(ex).hasMessage("HeaderMap annotation was present on multiple parameters.");
+    }
+  }
+
   interface Methods {
 
     @RequestLine("POST /")
@@ -400,6 +410,12 @@ void login(
         @Param("user_name") String user, @Param("password") String password);
   }
 
+  interface HeaderMapInterface {
+
+    @RequestLine("POST /")
+    void multipleHeaderMap(@HeaderMap Map<String, String> headers, @HeaderMap Map<String,String> queries);
+  }
+
   interface HeaderParams {
 
     @RequestLine("POST /")

Original file line number	Diff line number	Diff line change
`@@ -267,7 +267,7 @@ protected boolean processAnnotationsOnParameter(MethodMetadata data, Annotation[`
`267`	`267`	`data.queryMapIndex(paramIndex);`
`268`	`268`	`isHttpAnnotation = true;`
`269`	`269`	`} else if (annotationType == HeaderMap.class) {`
`270`		`- checkState(data.queryMapIndex() == null, "HeaderMap annotation was present on multiple parameters.");`
	`270`	`+ checkState(data.headerMapIndex() == null, "HeaderMap annotation was present on multiple parameters.");`
`271`	`271`	`data.headerMapIndex(paramIndex);`
`272`	`272`	`isHttpAnnotation = true;`
`273`	`273`	`}`