This is an automated email from the ASF dual-hosted git repository.
jamesnetherton pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
The following commit(s) were added to refs/heads/main by this push:
new 9a6e2cee2c Fix compilation warnings in Azure Vert.x HTTP Client
9a6e2cee2c is described below
commit 9a6e2cee2c6625cdf834ed4f292ed099b53b4dd9
Author: James Netherton <jamesnether...@gmail.com>
AuthorDate: Fri Apr 22 15:38:57 2022 +0100
Fix compilation warnings in Azure Vert.x HTTP Client
---
.../http/vertx/VertxHttpClientBuilderTests.java | 26 +++++++++++-----------
.../core/http/vertx/BufferedVertxHttpResponse.java | 4 ++--
.../core/http/vertx/VertxHttpAsyncResponse.java | 4 ++--
.../core/http/vertx/VertxHttpClientBuilder.java | 5 ++---
.../core/http/vertx/VertxHttpClientProvider.java | 2 +-
.../azure/core/http/vertx/VertxHttpResponse.java | 7 +++---
6 files changed, 24 insertions(+), 24 deletions(-)
diff --git
a/extensions-support/azure-core-http-client-vertx/deployment/src/test/java/org/apache/camel/quarkus/support/azure/core/http/vertx/VertxHttpClientBuilderTests.java
b/extensions-support/azure-core-http-client-vertx/deployment/src/test/java/org/apache/camel/quarkus/support/azure/core/http/vertx/VertxHttpClientBuilderTests.java
index 03f609979d..a995da64b7 100644
---
a/extensions-support/azure-core-http-client-vertx/deployment/src/test/java/org/apache/camel/quarkus/support/azure/core/http/vertx/VertxHttpClientBuilderTests.java
+++
b/extensions-support/azure-core-http-client-vertx/deployment/src/test/java/org/apache/camel/quarkus/support/azure/core/http/vertx/VertxHttpClientBuilderTests.java
@@ -112,10 +112,10 @@ public class VertxHttpClientBuilderTests {
.assertNext(response -> assertEquals(200,
response.getStatusCode()))
.verifyComplete();
- assertEquals(options.getConnectTimeout(), 10000);
- assertEquals(options.getIdleTimeout(), 60);
- assertEquals(options.getReadIdleTimeout(), 60);
- assertEquals(options.getWriteIdleTimeout(), 60);
+ assertEquals(10000, options.getConnectTimeout());
+ assertEquals(60, options.getIdleTimeout());
+ assertEquals(60, options.getReadIdleTimeout());
+ assertEquals(60, options.getWriteIdleTimeout());
} finally {
((VertxHttpClient) client).close();
}
@@ -138,10 +138,10 @@ public class VertxHttpClientBuilderTests {
.assertNext(response -> assertEquals(200,
response.getStatusCode()))
.verifyComplete();
- assertEquals(options.getConnectTimeout(), 10000);
- assertEquals(options.getIdleTimeout(), 20);
- assertEquals(options.getReadIdleTimeout(), 30);
- assertEquals(options.getWriteIdleTimeout(), 40);
+ assertEquals(10000, options.getConnectTimeout());
+ assertEquals(20, options.getIdleTimeout());
+ assertEquals(30, options.getReadIdleTimeout());
+ assertEquals(40, options.getWriteIdleTimeout());
} finally {
((VertxHttpClient) client).close();
}
@@ -163,11 +163,11 @@ public class VertxHttpClientBuilderTests {
try {
io.vertx.core.net.ProxyOptions vertxProxyOptions =
options.getProxyOptions();
- assertEquals(vertxProxyOptions.getHost(), address.getHostName());
- assertEquals(vertxProxyOptions.getPort(), address.getPort());
- assertEquals(vertxProxyOptions.getType().name(), type.name());
- assertEquals(vertxProxyOptions.getUsername(), PROXY_USER);
- assertEquals(vertxProxyOptions.getPassword(), PROXY_PASSWORD);
+ assertEquals(address.getHostName(), vertxProxyOptions.getHost());
+ assertEquals(address.getPort(), vertxProxyOptions.getPort());
+ assertEquals(type.name(), vertxProxyOptions.getType().name());
+ assertEquals(PROXY_USER, vertxProxyOptions.getUsername());
+ assertEquals(PROXY_PASSWORD, vertxProxyOptions.getPassword());
List<String> proxyHosts = new ArrayList<>();
proxyHosts.add("foo*");
diff --git
a/extensions-support/azure-core-http-client-vertx/runtime/src/main/java/org/apache/camel/quarkus/support/azure/core/http/vertx/BufferedVertxHttpResponse.java
b/extensions-support/azure-core-http-client-vertx/runtime/src/main/java/org/apache/camel/quarkus/support/azure/core/http/vertx/BufferedVertxHttpResponse.java
index 344251fba7..07cfcbf4db 100644
---
a/extensions-support/azure-core-http-client-vertx/runtime/src/main/java/org/apache/camel/quarkus/support/azure/core/http/vertx/BufferedVertxHttpResponse.java
+++
b/extensions-support/azure-core-http-client-vertx/runtime/src/main/java/org/apache/camel/quarkus/support/azure/core/http/vertx/BufferedVertxHttpResponse.java
@@ -26,11 +26,11 @@ import io.vertx.core.buffer.Buffer;
import reactor.core.publisher.Flux;
import reactor.core.publisher.Mono;
-public final class BufferedVertxHttpResponse extends VertxHttpAsyncResponse {
+final class BufferedVertxHttpResponse extends VertxHttpAsyncResponse {
private final Buffer body;
- BufferedVertxHttpResponse(HttpRequest request,
io.vertx.ext.web.client.HttpResponse response, Buffer body) {
+ BufferedVertxHttpResponse(HttpRequest request,
io.vertx.ext.web.client.HttpResponse<Buffer> response, Buffer body) {
super(request, response);
this.body = body;
}
diff --git
a/extensions-support/azure-core-http-client-vertx/runtime/src/main/java/org/apache/camel/quarkus/support/azure/core/http/vertx/VertxHttpAsyncResponse.java
b/extensions-support/azure-core-http-client-vertx/runtime/src/main/java/org/apache/camel/quarkus/support/azure/core/http/vertx/VertxHttpAsyncResponse.java
index 740c44257e..99bc421d82 100644
---
a/extensions-support/azure-core-http-client-vertx/runtime/src/main/java/org/apache/camel/quarkus/support/azure/core/http/vertx/VertxHttpAsyncResponse.java
+++
b/extensions-support/azure-core-http-client-vertx/runtime/src/main/java/org/apache/camel/quarkus/support/azure/core/http/vertx/VertxHttpAsyncResponse.java
@@ -24,9 +24,9 @@ import io.vertx.ext.web.client.HttpResponse;
import reactor.core.publisher.Flux;
import reactor.core.publisher.Mono;
-public class VertxHttpAsyncResponse extends VertxHttpResponse {
+class VertxHttpAsyncResponse extends VertxHttpResponse {
- VertxHttpAsyncResponse(HttpRequest request, HttpResponse response) {
+ VertxHttpAsyncResponse(HttpRequest request, HttpResponse<Buffer> response)
{
super(request, response);
}
diff --git
a/extensions-support/azure-core-http-client-vertx/runtime/src/main/java/org/apache/camel/quarkus/support/azure/core/http/vertx/VertxHttpClientBuilder.java
b/extensions-support/azure-core-http-client-vertx/runtime/src/main/java/org/apache/camel/quarkus/support/azure/core/http/vertx/VertxHttpClientBuilder.java
index 0cb5a145cb..32d540896b 100644
---
a/extensions-support/azure-core-http-client-vertx/runtime/src/main/java/org/apache/camel/quarkus/support/azure/core/http/vertx/VertxHttpClientBuilder.java
+++
b/extensions-support/azure-core-http-client-vertx/runtime/src/main/java/org/apache/camel/quarkus/support/azure/core/http/vertx/VertxHttpClientBuilder.java
@@ -229,11 +229,10 @@ public class VertxHttpClientBuilder {
}
}
- String nonProxyHostsString = proxyOptions.getNonProxyHosts();
+ String nonProxyHostsString = buildProxyOptions.getNonProxyHosts();
if (nonProxyHostsString != null) {
// Undo Azure ProxyOptions string sanitization since Vert.x
has its own logic
- List<String> nonProxyHosts =
Arrays.asList(nonProxyHostsString.split("\\|"))
- .stream()
+ List<String> nonProxyHosts =
Arrays.stream(nonProxyHostsString.split("\\|"))
.map(host -> host.replaceAll("\\\\E", "")
.replaceAll("\\\\Q", "")
.replaceAll("\\.\\.", ""))
diff --git
a/extensions-support/azure-core-http-client-vertx/runtime/src/main/java/org/apache/camel/quarkus/support/azure/core/http/vertx/VertxHttpClientProvider.java
b/extensions-support/azure-core-http-client-vertx/runtime/src/main/java/org/apache/camel/quarkus/support/azure/core/http/vertx/VertxHttpClientProvider.java
index 73120d341b..0d33604ffe 100644
---
a/extensions-support/azure-core-http-client-vertx/runtime/src/main/java/org/apache/camel/quarkus/support/azure/core/http/vertx/VertxHttpClientProvider.java
+++
b/extensions-support/azure-core-http-client-vertx/runtime/src/main/java/org/apache/camel/quarkus/support/azure/core/http/vertx/VertxHttpClientProvider.java
@@ -71,6 +71,6 @@ public class VertxHttpClientProvider implements
HttpClientProvider {
Bean<?> bean = beanManager.resolve(beans);
Object reference = beanManager.getReference(bean, Vertx.class,
beanManager.createCreationalContext(bean));
- return Vertx.class.cast(reference);
+ return (Vertx) reference;
}
}
diff --git
a/extensions-support/azure-core-http-client-vertx/runtime/src/main/java/org/apache/camel/quarkus/support/azure/core/http/vertx/VertxHttpResponse.java
b/extensions-support/azure-core-http-client-vertx/runtime/src/main/java/org/apache/camel/quarkus/support/azure/core/http/vertx/VertxHttpResponse.java
index 7d7196493d..a9c269a123 100644
---
a/extensions-support/azure-core-http-client-vertx/runtime/src/main/java/org/apache/camel/quarkus/support/azure/core/http/vertx/VertxHttpResponse.java
+++
b/extensions-support/azure-core-http-client-vertx/runtime/src/main/java/org/apache/camel/quarkus/support/azure/core/http/vertx/VertxHttpResponse.java
@@ -23,14 +23,15 @@ import com.azure.core.http.HttpRequest;
import com.azure.core.http.HttpResponse;
import com.azure.core.util.CoreUtils;
import io.vertx.core.MultiMap;
+import io.vertx.core.buffer.Buffer;
import reactor.core.publisher.Mono;
abstract class VertxHttpResponse extends HttpResponse {
- private final io.vertx.ext.web.client.HttpResponse response;
+ private final io.vertx.ext.web.client.HttpResponse<Buffer> response;
private final HttpHeaders headers;
- VertxHttpResponse(HttpRequest request,
io.vertx.ext.web.client.HttpResponse response) {
+ VertxHttpResponse(HttpRequest request,
io.vertx.ext.web.client.HttpResponse<Buffer> response) {
super(request);
this.response = response;
this.headers = fromVertxHttpHeaders(response.headers());
@@ -42,7 +43,7 @@ abstract class VertxHttpResponse extends HttpResponse {
return azureHeaders;
}
- protected io.vertx.ext.web.client.HttpResponse getVertxHttpResponse() {
+ protected io.vertx.ext.web.client.HttpResponse<Buffer>
getVertxHttpResponse() {
return this.response;
}
