Skip to content

Commit e9b24b6

Browse files
Make authentication request parameter order to be deterministic (#8185)
1 parent 2bb182c commit e9b24b6

File tree

3 files changed

+6
-5
lines changed

3 files changed

+6
-5
lines changed

plugins/network-elements/nicira-nvp/src/main/java/com/cloud/network/nicira/NiciraRestClient.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
package com.cloud.network.nicira;
2121

2222
import java.io.IOException;
23-
import java.util.HashMap;
23+
import java.util.LinkedHashMap;
2424
import java.util.Map;
2525

2626
import org.apache.http.HttpEntity;
@@ -120,7 +120,7 @@ private CloseableHttpResponse handleSuccessResponse(final HttpUriRequest request
120120
}
121121

122122
private HttpUriRequest createAuthenticationRequest() {
123-
final Map<String, String> parameters = new HashMap<>();
123+
final Map<String, String> parameters = new LinkedHashMap<>();
124124
parameters.put("username", username);
125125
parameters.put("password", password);
126126
return HttpUriRequestBuilder.create()

plugins/network-elements/nicira-nvp/src/test/java/com/cloud/network/nicira/NiciraRestClientTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
import static org.mockito.Mockito.verify;
3333
import static org.mockito.Mockito.when;
3434

35-
import java.util.HashMap;
35+
import java.util.LinkedHashMap;
3636
import java.util.Map;
3737

3838
import org.apache.http.HttpHost;
@@ -70,7 +70,7 @@ public class NiciraRestClientTest {
7070
private static final StatusLine HTTP_200_STATUSLINE = new BasicStatusLine(new ProtocolVersion(HTTPS, 1, 1), 200, "OK");
7171
private static final StatusLine HTTP_401_STATUSLINE = new BasicStatusLine(new ProtocolVersion(HTTPS, 1, 1), 401, "Unauthorized");
7272

73-
private static final Map<String, String> loginParameters = new HashMap<String, String>();
73+
private static final Map<String, String> loginParameters = new LinkedHashMap<String, String>();
7474
private static HttpUriRequest request;
7575
private static HttpUriRequest loginRequest;
7676
private final CloseableHttpClient httpClient = mock(CloseableHttpClient.class);

utils/src/main/java/com/cloud/utils/rest/HttpUriRequestBuilder.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
import java.net.URI;
2323
import java.net.URISyntaxException;
2424
import java.util.HashMap;
25+
import java.util.LinkedHashMap;
2526
import java.util.Map;
2627
import java.util.Map.Entry;
2728

@@ -47,7 +48,7 @@ public class HttpUriRequestBuilder {
4748
private String path;
4849
private Optional<String> jsonPayload = ABSENT;
4950
private final Map<String, String> parameters = new HashMap<String, String>();
50-
private final Map<String, String> methodParameters = new HashMap<String, String>();
51+
private final Map<String, String> methodParameters = new LinkedHashMap<String, String>();
5152

5253
private HttpUriRequestBuilder() {
5354

0 commit comments

Comments
 (0)