diff --git a/eng/jacoco-test-coverage/pom.xml b/eng/jacoco-test-coverage/pom.xml index d252c556578e..4f9bd6da73c8 100644 --- a/eng/jacoco-test-coverage/pom.xml +++ b/eng/jacoco-test-coverage/pom.xml @@ -39,7 +39,7 @@ com.azure azure-core - 1.1.0 + 1.1.1 com.azure diff --git a/eng/spotbugs-aggregate-report/pom.xml b/eng/spotbugs-aggregate-report/pom.xml index 4d616ae4e111..da64cbddde23 100644 --- a/eng/spotbugs-aggregate-report/pom.xml +++ b/eng/spotbugs-aggregate-report/pom.xml @@ -144,7 +144,7 @@ com.azure azure-core - 1.1.0 + 1.1.1 com.azure diff --git a/eng/versioning/version_client.txt b/eng/versioning/version_client.txt index 52d0793b5158..1614648a27b4 100644 --- a/eng/versioning/version_client.txt +++ b/eng/versioning/version_client.txt @@ -3,7 +3,7 @@ com.azure:azure-sdk-parent;1.6.0;1.6.0 com.azure:azure-client-sdk-parent;1.7.0;1.7.0 -com.azure:azure-core;1.1.0;1.1.0 +com.azure:azure-core;1.1.0;1.1.1 com.azure:azure-core-amqp;1.0.0-beta.8;1.0.0-beta.8 com.azure:azure-core-http-netty;1.1.0;1.1.0 com.azure:azure-core-http-okhttp;1.1.0-beta.1;1.1.0-beta.1 diff --git a/sdk/core/azure-core-amqp/pom.xml b/sdk/core/azure-core-amqp/pom.xml index 176b0b0a73ab..86836ba8d0c4 100644 --- a/sdk/core/azure-core-amqp/pom.xml +++ b/sdk/core/azure-core-amqp/pom.xml @@ -57,7 +57,7 @@ com.azure azure-core - 1.1.0 + 1.1.1 com.microsoft.azure diff --git a/sdk/core/azure-core-http-netty/pom.xml b/sdk/core/azure-core-http-netty/pom.xml index 92a8fc2abb83..7f9b75a23278 100644 --- a/sdk/core/azure-core-http-netty/pom.xml +++ b/sdk/core/azure-core-http-netty/pom.xml @@ -58,7 +58,7 @@ com.azure azure-core - 1.1.0 + 1.1.1 @@ -109,7 +109,7 @@ com.azure azure-core - 1.1.0 + 1.1.1 test-jar test diff --git a/sdk/core/azure-core-http-okhttp/pom.xml b/sdk/core/azure-core-http-okhttp/pom.xml index 1161f46d0e18..85328910d682 100644 --- a/sdk/core/azure-core-http-okhttp/pom.xml +++ b/sdk/core/azure-core-http-okhttp/pom.xml @@ -59,7 +59,7 @@ com.azure azure-core - 1.1.0 + 1.1.1 @@ -72,7 +72,7 @@ com.azure azure-core - 1.1.0 + 1.1.1 test-jar test diff --git a/sdk/core/azure-core-management/pom.xml b/sdk/core/azure-core-management/pom.xml index d07b1b640436..1206099811fd 100644 --- a/sdk/core/azure-core-management/pom.xml +++ b/sdk/core/azure-core-management/pom.xml @@ -57,7 +57,7 @@ com.azure azure-core - 1.1.0 + 1.1.1 diff --git a/sdk/core/azure-core/README.md b/sdk/core/azure-core/README.md index 9d3e946a097a..b5c345c12219 100644 --- a/sdk/core/azure-core/README.md +++ b/sdk/core/azure-core/README.md @@ -15,7 +15,7 @@ Typically, you will not need to install or specifically depend on Azure Core, in com.azure azure-core - 1.0.0 + 1.1.1 ``` [//]: # ({x-version-update-end}) diff --git a/sdk/core/azure-core/pom.xml b/sdk/core/azure-core/pom.xml index 28ff43d3d3a2..ecdb614bec93 100644 --- a/sdk/core/azure-core/pom.xml +++ b/sdk/core/azure-core/pom.xml @@ -14,7 +14,7 @@ com.azure azure-core jar - 1.1.0 + 1.1.1 Microsoft Azure Java Core Library This package contains core types for Azure Java clients. diff --git a/sdk/core/azure-core/src/main/java/com/azure/core/http/policy/HttpLoggingPolicy.java b/sdk/core/azure-core/src/main/java/com/azure/core/http/policy/HttpLoggingPolicy.java index 78916a4b2072..958a88324356 100644 --- a/sdk/core/azure-core/src/main/java/com/azure/core/http/policy/HttpLoggingPolicy.java +++ b/sdk/core/azure-core/src/main/java/com/azure/core/http/policy/HttpLoggingPolicy.java @@ -17,7 +17,6 @@ import com.fasterxml.jackson.databind.SerializationFeature; import reactor.core.publisher.Mono; -import java.net.MalformedURLException; import java.net.URL; import java.nio.charset.StandardCharsets; import java.util.Locale; @@ -83,13 +82,9 @@ public Mono process(HttpPipelineCallContext context, HttpPipelineN private Mono logRequest(final ClientLogger logger, final HttpRequest request) { final HttpLogDetailLevel httpLogLevel = httpLogOptions.getLogLevel(); if (httpLogLevel.shouldLogUrl()) { - try { - UrlBuilder requestUrl = UrlBuilder.parse(request.getUrl()); - requestUrl.setQuery(getAllowedQueryString(request.getUrl().getQuery())); - logger.info("--> {} {}", request.getHttpMethod(), requestUrl.toUrl()); - } catch (MalformedURLException ex) { - return Mono.error(logger.logExceptionAsWarning(new IllegalStateException("Invalid request URL."))); - } + UrlBuilder requestUrl = UrlBuilder.parse(request.getUrl()); + requestUrl.setQuery(getAllowedQueryString(request.getUrl().getQuery())); + logger.info("--> {} {}", request.getHttpMethod(), requestUrl.toString()); } if (httpLogLevel.shouldLogHeaders()) { @@ -196,9 +191,11 @@ private Function> logResponseDelegate(final Cli bodySize = contentLengthString + "-byte"; } HttpLogDetailLevel httpLogLevel = httpLogOptions.getLogLevel(); - // HttpResponseStatus responseStatus = HttpResponseStatus.valueOf(response.statusCode()); if (httpLogLevel.shouldLogUrl()) { - logger.info("<-- {} {} ({} ms, {} body)", response.getStatusCode(), url, tookMs, bodySize); + UrlBuilder requestUrl = UrlBuilder.parse(url); + requestUrl.setQuery(getAllowedQueryString(url.getQuery())); + logger.info("<-- {} {} ({} ms, {} body)", response.getStatusCode(), requestUrl.toString(), tookMs, + bodySize); } if (httpLogLevel.shouldLogHeaders()) {