From be01c378f46e8a37a0df4b2ece0da39ba582c9e0 Mon Sep 17 00:00:00 2001 From: Vinod Sridharan Date: Sun, 9 Aug 2020 14:27:33 -0700 Subject: [PATCH 1/2] Headers Tests --- .../internal/RxDocumentServiceResponse.java | 8 +-- .../RxDocumentServiceResponseTest.java | 55 +++++++++++++++++++ 2 files changed, 58 insertions(+), 5 deletions(-) create mode 100644 commons/src/test/java/com/microsoft/azure/cosmosdb/rx/internal/RxDocumentServiceResponseTest.java diff --git a/commons/src/main/java/com/microsoft/azure/cosmosdb/rx/internal/RxDocumentServiceResponse.java b/commons/src/main/java/com/microsoft/azure/cosmosdb/rx/internal/RxDocumentServiceResponse.java index 0cc618257..7e52ad921 100644 --- a/commons/src/main/java/com/microsoft/azure/cosmosdb/rx/internal/RxDocumentServiceResponse.java +++ b/commons/src/main/java/com/microsoft/azure/cosmosdb/rx/internal/RxDocumentServiceResponse.java @@ -52,10 +52,7 @@ import java.io.IOException; import java.io.InputStream; import java.lang.reflect.InvocationTargetException; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; +import java.util.*; /** * This is core Transport/Connection agnostic response for the Azure Cosmos DB database service. @@ -69,7 +66,8 @@ public RxDocumentServiceResponse(StoreResponse response) { String[] headerNames = response.getResponseHeaderNames(); String[] headerValues = response.getResponseHeaderValues(); - this.headersMap = new HashMap<>(headerNames.length); + // headers in CosmosDB are case insensitive. + this.headersMap = new TreeMap<>(String.CASE_INSENSITIVE_ORDER); // Gets status code. this.statusCode = response.getStatus(); diff --git a/commons/src/test/java/com/microsoft/azure/cosmosdb/rx/internal/RxDocumentServiceResponseTest.java b/commons/src/test/java/com/microsoft/azure/cosmosdb/rx/internal/RxDocumentServiceResponseTest.java new file mode 100644 index 000000000..468d8eaf3 --- /dev/null +++ b/commons/src/test/java/com/microsoft/azure/cosmosdb/rx/internal/RxDocumentServiceResponseTest.java @@ -0,0 +1,55 @@ +/* + * The MIT License (MIT) + * Copyright (c) 2018 Microsoft Corporation + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + */ + +package com.microsoft.azure.cosmosdb.rx.internal; + +import static org.assertj.core.api.Assertions.assertThat; + +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.Map; + +import com.microsoft.azure.cosmosdb.internal.directconnectivity.StoreResponse; +import org.apache.commons.io.IOUtils; +import org.testng.annotations.Test; + +public class RxDocumentServiceResponseTest { + @Test(groups = { "unit" }) + public void headerCasingDocumentServiceResponse() { + String content = "I am body"; + HashMap headerMap = new HashMap<>(); + headerMap.put("key1", "value1"); + headerMap.put("key2", "value2"); + + StoreResponse sp = new StoreResponse(200, new ArrayList<>(headerMap.entrySet()), content); + RxDocumentServiceResponse response = new RxDocumentServiceResponse(sp); + Map headers = response.getResponseHeaders(); + + assertThat(headers.get("key1")).isEqualTo("value1"); + assertThat(headers.get("Key1")).isEqualTo("value1"); + assertThat(headers.get("KEy1")).isEqualTo("value1"); + assertThat(headers.get("Key2")).isEqualTo("value2"); + } +} From 4bd284eedd7193ad0f88c59a5bfb37f9580279a5 Mon Sep 17 00:00:00 2001 From: Vinod Sridharan Date: Sun, 9 Aug 2020 19:06:21 -0700 Subject: [PATCH 2/2] Update imports to not use wildcard. --- .../cosmosdb/rx/internal/RxDocumentServiceResponse.java | 5 ++++- .../cosmosdb/rx/internal/RxDocumentServiceResponseTest.java | 3 --- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/commons/src/main/java/com/microsoft/azure/cosmosdb/rx/internal/RxDocumentServiceResponse.java b/commons/src/main/java/com/microsoft/azure/cosmosdb/rx/internal/RxDocumentServiceResponse.java index 7e52ad921..e85d1c347 100644 --- a/commons/src/main/java/com/microsoft/azure/cosmosdb/rx/internal/RxDocumentServiceResponse.java +++ b/commons/src/main/java/com/microsoft/azure/cosmosdb/rx/internal/RxDocumentServiceResponse.java @@ -52,7 +52,10 @@ import java.io.IOException; import java.io.InputStream; import java.lang.reflect.InvocationTargetException; -import java.util.*; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.TreeMap; /** * This is core Transport/Connection agnostic response for the Azure Cosmos DB database service. diff --git a/commons/src/test/java/com/microsoft/azure/cosmosdb/rx/internal/RxDocumentServiceResponseTest.java b/commons/src/test/java/com/microsoft/azure/cosmosdb/rx/internal/RxDocumentServiceResponseTest.java index 468d8eaf3..3e55e85c7 100644 --- a/commons/src/test/java/com/microsoft/azure/cosmosdb/rx/internal/RxDocumentServiceResponseTest.java +++ b/commons/src/test/java/com/microsoft/azure/cosmosdb/rx/internal/RxDocumentServiceResponseTest.java @@ -25,14 +25,11 @@ import static org.assertj.core.api.Assertions.assertThat; -import java.io.ByteArrayInputStream; -import java.io.ByteArrayOutputStream; import java.util.ArrayList; import java.util.HashMap; import java.util.Map; import com.microsoft.azure.cosmosdb.internal.directconnectivity.StoreResponse; -import org.apache.commons.io.IOUtils; import org.testng.annotations.Test; public class RxDocumentServiceResponseTest {