Use LinkedHashMap for deterministic iterations (OpenFeign#1165)

contextshuffling · web-flow · commit e4d0f7662064 · 2020-01-30T07:37:27.000+13:00
diff --git a/mock/src/main/java/feign/mock/RequestHeaders.java b/mock/src/main/java/feign/mock/RequestHeaders.java
@@ -1,5 +1,5 @@
 /**
- * Copyright 2012-2019 The Feign Authors
+ * Copyright 2012-2020 The Feign Authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
  * in compliance with the License. You may obtain a copy of the License at
@@ -17,14 +17,15 @@
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
-import java.util.HashMap;
+import java.util.LinkedHashMap;
 import java.util.Map;
 
 public class RequestHeaders {
 
   public static class Builder {
 
-    private Map<String, Collection<String>> headers = new HashMap<String, Collection<String>>();
+    private Map<String, Collection<String>> headers =
+        new LinkedHashMap<String, Collection<String>>();
 
     private Builder() {}
 
diff --git a/mock/src/test/java/feign/mock/RequestHeadersTest.java b/mock/src/test/java/feign/mock/RequestHeadersTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright 2012-2019 The Feign Authors
+ * Copyright 2012-2020 The Feign Authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
  * in compliance with the License. You may obtain a copy of the License at
@@ -83,6 +83,6 @@ public void shouldPrintHeaders() {
         .add("other header", "val2")
         .add("header", Arrays.asList("val3", "val4"))
         .build();
-    assertThat(headers.toString()).isEqualTo("other header=[val2], header=[val, val3, val4]");
+    assertThat(headers.toString()).isEqualTo("header=[val, val3, val4], other header=[val2]");
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`/**`
`2`		`- * Copyright 2012-2019 The Feign Authors`
	`2`	`+ * Copyright 2012-2020 The Feign Authors`
`3`	`3`	`*`
`4`	`4`	`* Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except`
`5`	`5`	`* in compliance with the License. You may obtain a copy of the License at`
`@@ -83,6 +83,6 @@ public void shouldPrintHeaders() {`
`83`	`83`	`.add("other header", "val2")`
`84`	`84`	`.add("header", Arrays.asList("val3", "val4"))`
`85`	`85`	`.build();`
`86`		`- assertThat(headers.toString()).isEqualTo("other header=[val2], header=[val, val3, val4]");`
	`86`	`+ assertThat(headers.toString()).isEqualTo("header=[val, val3, val4], other header=[val2]");`
`87`	`87`	`}`
`88`	`88`	`}`