Return empty string on empty content response from backend (#7347)

Azure · Jan 11, 2020 · 409efc5 · 409efc5
1 parent 574f7bc
commit 409efc5
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/...re-cosmos/src/main/java/com/azure/data/cosmos/internal/directconnectivity/ErrorUtils.java b/...re-cosmos/src/main/java/com/azure/data/cosmos/internal/directconnectivity/ErrorUtils.java
@@ -17,7 +17,7 @@ public class ErrorUtils {
     private static final Logger logger = LoggerFactory.getLogger(ErrorUtils.class);
 
     static Mono<String> getErrorResponseAsync(HttpResponse responseMessage, HttpRequest request) {
-        Mono<String> responseAsString = responseMessage.bodyAsString();
+        Mono<String> responseAsString = responseMessage.bodyAsString().switchIfEmpty(Mono.just(StringUtils.EMPTY));
         if (request.httpMethod() == HttpMethod.DELETE) {
             return Mono.just(StringUtils.EMPTY);
         }

diff --git a/...smos/src/main/java/com/azure/data/cosmos/internal/directconnectivity/HttpClientUtils.java b/...smos/src/main/java/com/azure/data/cosmos/internal/directconnectivity/HttpClientUtils.java
@@ -10,6 +10,7 @@
 import com.azure.data.cosmos.internal.RxDocumentServiceResponse;
 import com.azure.data.cosmos.internal.http.HttpRequest;
 import com.azure.data.cosmos.internal.http.HttpResponse;
+import org.apache.commons.lang3.StringUtils;
 import reactor.core.publisher.Mono;
 
 public class HttpClientUtils {
@@ -31,7 +32,7 @@ static Mono<RxDocumentServiceResponse> parseResponseAsync(Mono<HttpResponse> htt
     }
 
     private static Mono<CosmosClientException> createDocumentClientException(HttpResponse httpResponse) {
-        Mono<String> readStream = httpResponse.bodyAsString();
+        Mono<String> readStream = httpResponse.bodyAsString().switchIfEmpty(Mono.just(StringUtils.EMPTY));
 
         return readStream.map(body -> {
             CosmosError cosmosError = BridgeInternal.createCosmosError(body);

diff --git a/...cosmos/src/main/java/com/azure/data/cosmos/internal/directconnectivity/ResponseUtils.java b/...cosmos/src/main/java/com/azure/data/cosmos/internal/directconnectivity/ResponseUtils.java
@@ -22,7 +22,7 @@ static Mono<StoreResponse> toStoreResponse(HttpResponse httpClientResponse, Http
             // for delete we don't expect any body
             contentObservable = Mono.just(StringUtils.EMPTY);
         } else {
-            contentObservable = httpClientResponse.bodyAsString();
+            contentObservable = httpClientResponse.bodyAsString().switchIfEmpty(Mono.just(StringUtils.EMPTY));
         }
 
         return contentObservable.flatMap(content -> {