From 0ef4b2bd17520dc3b55c279c8e8106311b0d0b99 Mon Sep 17 00:00:00 2001 From: Santiago Pericasgeertsen Date: Thu, 11 May 2023 14:54:27 -0400 Subject: [PATCH 01/18] Initial work to switch to WebClient in Nima. Signed-off-by: Santiago Pericasgeertsen --- jersey/connector/pom.xml | 14 ++- .../connector/HelidonConnectorNima.java | 99 +++++++++++++++++++ .../connector/src/main/java/module-info.java | 2 + 3 files changed, 114 insertions(+), 1 deletion(-) create mode 100644 jersey/connector/src/main/java/io/helidon/jersey/connector/HelidonConnectorNima.java diff --git a/jersey/connector/pom.xml b/jersey/connector/pom.xml index c0786289a15..65cb8608435 100644 --- a/jersey/connector/pom.xml +++ b/jersey/connector/pom.xml @@ -41,10 +41,22 @@ jakarta.inject jakarta.inject-api - + io.helidon.reactive.webclient helidon-reactive-webclient + + io.helidon.nima.webclient + helidon-nima-webclient + + + io.helidon.nima.fault-tolerance + helidon-nima-fault-tolerance + + + org.glassfish.jersey.core + jersey-client + org.junit.jupiter junit-jupiter-api diff --git a/jersey/connector/src/main/java/io/helidon/jersey/connector/HelidonConnectorNima.java b/jersey/connector/src/main/java/io/helidon/jersey/connector/HelidonConnectorNima.java new file mode 100644 index 00000000000..77e0969dddd --- /dev/null +++ b/jersey/connector/src/main/java/io/helidon/jersey/connector/HelidonConnectorNima.java @@ -0,0 +1,99 @@ +/* + * Copyright (c) 2023 Oracle and/or its affiliates. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package io.helidon.jersey.connector; + +import java.util.concurrent.CompletableFuture; +import java.util.concurrent.Future; + +import io.helidon.common.Version; +import io.helidon.common.http.Http; +import io.helidon.nima.faulttolerance.Async; +import io.helidon.nima.webclient.WebClient; +import io.helidon.nima.webclient.http1.Http1Client; +import io.helidon.nima.webclient.http1.Http1ClientRequest; +import io.helidon.nima.webclient.http1.Http1ClientResponse; +import jakarta.ws.rs.client.Client; +import jakarta.ws.rs.core.Configuration; +import org.glassfish.jersey.client.ClientRequest; +import org.glassfish.jersey.client.ClientResponse; +import org.glassfish.jersey.client.spi.AsyncConnectorCallback; +import org.glassfish.jersey.client.spi.Connector; +import org.glassfish.jersey.internal.util.PropertiesHelper; + +class HelidonConnectorNima implements Connector { + private static final String HELIDON_VERSION = "Helidon/" + Version.VERSION + " (java " + + PropertiesHelper.getSystemProperty("java.runtime.version") + ")"; + + private final Client client; + private final Configuration config; + private final Http1Client http1Client; + + HelidonConnectorNima(Client client, Configuration config) { + this.client = client; + this.config = config; + this.http1Client = WebClient.builder().build(); + } + + @Override + public ClientResponse apply(ClientRequest request) { + // map ClientRequest to Http1ClientRequest + Http1ClientRequest req = http1Client + .method(Http.Method.create(request.getMethod())) + .uri(request.getUri()); + + request.getRequestHeaders().forEach((key, value) -> { + String[] values = value.toArray(new String[0]); + req.header(Http.Header.create(key), values); + }); + + // TODO copy over properties + // TODO timeouts redirects etc + + Http1ClientResponse res = null; + if (request.hasEntity()) { + // TODO + } else { + res = req.request(); + } + + // map Http1ClientResponse to ClientResponse + + return null; + } + + @Override + public Future apply(ClientRequest request, AsyncConnectorCallback callback) { + CompletableFuture cf = Async.invokeStatic(() -> apply(request)); + cf.whenComplete((res, t) -> { + if (t != null) { + callback.failure(t); + } else { + callback.response(res); + } + }) + return cf; + } + + @Override + public String getName() { + return HELIDON_VERSION; + } + + @Override + public void close() { + } +} diff --git a/jersey/connector/src/main/java/module-info.java b/jersey/connector/src/main/java/module-info.java index ac0e9ab3f20..fe4c09b83f5 100644 --- a/jersey/connector/src/main/java/module-info.java +++ b/jersey/connector/src/main/java/module-info.java @@ -28,7 +28,9 @@ requires jersey.common; requires io.helidon.common.reactive; requires io.helidon.reactive.webclient; + requires io.helidon.nima.webclient; requires io.netty.codec.http; + requires io.helidon.nima.faulttolerance; exports io.helidon.jersey.connector; provides org.glassfish.jersey.client.spi.ConnectorProvider with HelidonConnectorProvider; From 4cb4e414744e10e7308489b31f67a298cc9d1bde Mon Sep 17 00:00:00 2001 From: Santiago Pericasgeertsen Date: Wed, 21 Jun 2023 09:00:46 -0400 Subject: [PATCH 02/18] Initial port of connector to use new blocking HTTP client. Signed-off-by: Santiago Pericasgeertsen --- jersey/connector/pom.xml | 41 ++- .../jersey/connector/HelidonConnector.java | 292 +++++++----------- .../connector/HelidonConnectorNima.java | 99 ------ .../connector/HelidonConnectorProvider.java | 2 +- .../jersey/connector/HelidonEntity.java | 176 ----------- .../jersey/connector/HelidonProperties.java | 35 --- .../jersey/connector/HelidonStructures.java | 163 ---------- .../jersey/connector/OutputStreamChannel.java | 219 ------------- .../connector/src/main/java/module-info.java | 8 +- .../jersey/connector/AbstractTest.java | 45 +-- .../jersey/connector/AsyncRequestTest.java | 31 +- .../jersey/connector/BasicRequestTest.java | 103 +++--- .../jersey/connector/FollowRedirectsTest.java | 63 ++-- .../jersey/connector/LargeDataTest.java | 47 +-- .../jersey/connector/ParallelTest.java | 29 +- .../helidon/jersey/connector/TimeoutTest.java | 37 +-- 16 files changed, 299 insertions(+), 1091 deletions(-) delete mode 100644 jersey/connector/src/main/java/io/helidon/jersey/connector/HelidonConnectorNima.java delete mode 100644 jersey/connector/src/main/java/io/helidon/jersey/connector/HelidonEntity.java delete mode 100644 jersey/connector/src/main/java/io/helidon/jersey/connector/HelidonProperties.java delete mode 100644 jersey/connector/src/main/java/io/helidon/jersey/connector/HelidonStructures.java delete mode 100644 jersey/connector/src/main/java/io/helidon/jersey/connector/OutputStreamChannel.java diff --git a/jersey/connector/pom.xml b/jersey/connector/pom.xml index 65cb8608435..d589c9d121d 100644 --- a/jersey/connector/pom.xml +++ b/jersey/connector/pom.xml @@ -28,6 +28,10 @@ helidon-jersey-connector Helidon WebClient Jersey Connector + + -Xmx1024m -Dfile.encoding=UTF-8 --enable-preview + + org.glassfish.jersey.core @@ -41,22 +45,10 @@ jakarta.inject jakarta.inject-api - - io.helidon.reactive.webclient - helidon-reactive-webclient - io.helidon.nima.webclient helidon-nima-webclient - - io.helidon.nima.fault-tolerance - helidon-nima-fault-tolerance - - - org.glassfish.jersey.core - jersey-client - org.junit.jupiter junit-jupiter-api @@ -84,4 +76,29 @@ + + + + org.apache.maven.plugins + maven-compiler-plugin + + + --enable-preview + + + + + org.apache.maven.plugins + maven-surefire-plugin + + 1 + false + true + false + alphabetical + + + + + diff --git a/jersey/connector/src/main/java/io/helidon/jersey/connector/HelidonConnector.java b/jersey/connector/src/main/java/io/helidon/jersey/connector/HelidonConnector.java index 95d3b1d596b..a057056629a 100644 --- a/jersey/connector/src/main/java/io/helidon/jersey/connector/HelidonConnector.java +++ b/jersey/connector/src/main/java/io/helidon/jersey/connector/HelidonConnector.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020, 2022 Oracle and/or its affiliates. + * Copyright (c) 2023 Oracle and/or its affiliates. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,170 +16,95 @@ package io.helidon.jersey.connector; -import java.io.FilterInputStream; -import java.io.IOException; -import java.io.InputStream; -import java.util.List; -import java.util.Map; -import java.util.Optional; -import java.util.concurrent.CompletableFuture; -import java.util.concurrent.CompletionStage; -import java.util.concurrent.ExecutionException; +import java.net.URI; import java.util.concurrent.ExecutorService; +import java.util.concurrent.Executors; import java.util.concurrent.Future; -import java.util.concurrent.TimeUnit; -import java.util.concurrent.atomic.AtomicBoolean; -import java.util.function.BiConsumer; -import java.util.logging.Logger; +import io.helidon.common.LazyValue; import io.helidon.common.Version; -import io.helidon.reactive.webclient.WebClient; -import io.helidon.reactive.webclient.WebClientRequestBuilder; -import io.helidon.reactive.webclient.WebClientResponse; +import io.helidon.common.http.Http; +import io.helidon.common.uri.UriQueryWriteable; +import io.helidon.nima.http.media.ReadableEntity; +import io.helidon.nima.webclient.WebClient; +import io.helidon.nima.webclient.http1.Http1Client; +import io.helidon.nima.webclient.http1.Http1ClientRequest; +import io.helidon.nima.webclient.http1.Http1ClientResponse; -import jakarta.ws.rs.ProcessingException; import jakarta.ws.rs.client.Client; import jakarta.ws.rs.core.Configuration; import jakarta.ws.rs.core.Response; -import org.glassfish.jersey.client.ClientAsyncExecutorLiteral; -import org.glassfish.jersey.client.ClientConfig; -import org.glassfish.jersey.client.ClientProperties; import org.glassfish.jersey.client.ClientRequest; import org.glassfish.jersey.client.ClientResponse; -import org.glassfish.jersey.client.JerseyClient; import org.glassfish.jersey.client.spi.AsyncConnectorCallback; import org.glassfish.jersey.client.spi.Connector; import org.glassfish.jersey.internal.util.PropertiesHelper; -import org.glassfish.jersey.spi.ExecutorServiceProvider; -/** - * A {@link Connector} that utilizes the Helidon HTTP Client to send and receive - * HTTP request and responses. - */ class HelidonConnector implements Connector { - private static final String HELIDON_VERSION = "Helidon/" + Version.VERSION + " (java " + PropertiesHelper.getSystemProperty("java.runtime.version") + ")"; - static final Logger LOGGER = Logger.getLogger(HelidonConnector.class.getName()); - - private final WebClient webClient; - - private final ExecutorServiceKeeper executorServiceKeeper; - private final HelidonEntity.HelidonEntityType entityType; - - private static final InputStream NO_CONTENT_INPUT_STREAM = new InputStream() { - @Override - public int read() throws IOException { - return -1; - } - }; - - // internal implementation entity type, can be removed in the future - // settable for testing purposes - // see LargeDataTest - - static final String INTERNAL_ENTITY_TYPE = "jersey.connector.helidon.entity.type"; - - HelidonConnector(final Client client, final Configuration config) { - executorServiceKeeper = new ExecutorServiceKeeper(client); - entityType = getEntityType(config); - - final WebClient.Builder webClientBuilder = WebClient.builder(); - - webClientBuilder.addReader(HelidonStructures.createInputStreamBodyReader()); - HelidonEntity.helidonWriter(entityType).ifPresent(webClientBuilder::addWriter); - - HelidonStructures.createProxy(config).ifPresent(webClientBuilder::proxy); - - HelidonStructures.helidonConfig(config).ifPresent(webClientBuilder::config); - - webClientBuilder.connectTimeout(ClientProperties.getValue(config.getProperties(), - ClientProperties.CONNECT_TIMEOUT, 10000), TimeUnit.MILLISECONDS); - - HelidonStructures.createSSL(client.getSslContext()).ifPresent(webClientBuilder::tls); - - webClient = webClientBuilder.build(); - } - - @Override - public ClientResponse apply(ClientRequest request) { - try { - return applyInternal(request).toCompletableFuture().get(); - } catch (InterruptedException | ExecutionException e) { - throw new ProcessingException(e); - } - } - - @Override - public Future apply(ClientRequest request, AsyncConnectorCallback callback) { - final BiConsumer action = (r, th) -> { - if (th == null) { - callback.response(r); - } else { - callback.failure(th); - } - }; - return applyInternal(request) - .whenCompleteAsync(action, executorServiceKeeper.getExecutorService(request)) - .toCompletableFuture(); - } - @Override - public String getName() { - return HELIDON_VERSION; - } + private static LazyValue executorService = + LazyValue.create(() -> Executors.newThreadPerTaskExecutor( + Thread.ofVirtual().name("helidon-connector-", 0).factory())); - @Override - public void close() { + private final Client client; + private final Configuration config; + private final Http1Client http1Client; + HelidonConnector(Client client, Configuration config) { + this.client = client; + this.config = config; + this.http1Client = WebClient.builder().build(); } - private CompletionStage applyInternal(ClientRequest request) { - final WebClientRequestBuilder webClientRequestBuilder = webClient.method(request.getMethod()); - webClientRequestBuilder.uri(request.getUri()); - - webClientRequestBuilder.headers(HelidonStructures.createHeaders(request.getRequestHeaders())); - - for (String propertyName : request.getConfiguration().getPropertyNames()) { - Object property = request.getConfiguration().getProperty(propertyName); - if (!propertyName.startsWith("jersey") && String.class.isInstance(property)) { - webClientRequestBuilder.property(propertyName, (String) property); - } - } - - for (String propertyName : request.getPropertyNames()) { - Object property = request.resolveProperty(propertyName, Object.class); - if (!propertyName.startsWith("jersey") && String.class.isInstance(property)) { - webClientRequestBuilder.property(propertyName, (String) property); - } + /** + * Map a Jersey request to a Helidon HTTP/1.1 request. + * + * @param request the request to map + * @return the mapped request + */ + private Http1ClientRequest mapRequest(ClientRequest request) { + URI uri = request.getUri(); + Http1ClientRequest http1Request = http1Client + .method(Http.Method.create(request.getMethod())) + .uri(uri); + + // map query parameters + String queryString = uri.getQuery(); + if (queryString != null) { + UriQueryWriteable query = UriQueryWriteable.create(); + query.fromQueryString(queryString); + query.names().forEach(name -> { + String[] values = query.all(name).toArray(new String[0]); + http1Request.queryParam(name, values); + }); } - // TODO - // HelidonStructures.createProxy(request).ifPresent(webClientRequestBuilder::proxy); - - webClientRequestBuilder.followRedirects(request.resolveProperty(ClientProperties.FOLLOW_REDIRECTS, true)); - webClientRequestBuilder.readTimeout(request.resolveProperty(ClientProperties.READ_TIMEOUT, 10000), TimeUnit.MILLISECONDS); - - CompletionStage responseStage = null; + // map request headers + request.getRequestHeaders().forEach((key, value) -> { + String[] values = value.toArray(new String[0]); + http1Request.header(Http.Header.create(key), values); + }); - if (request.hasEntity()) { - responseStage = HelidonEntity.submit( - entityType, request, webClientRequestBuilder, executorServiceKeeper.getExecutorService(request) - ); - } else { - responseStage = webClientRequestBuilder.submit(); - } + // TODO copy over properties + // TODO timeouts redirects etc - return responseStage.thenCompose((a) -> convertResponse(request, a)); + return http1Request; } - private CompletionStage convertResponse(final ClientRequest requestContext, - final WebClientResponse webClientResponse) { - - final ClientResponse responseContext = new ClientResponse(new Response.StatusType() { + /** + * Map a Helidon HTTP/1.1 response to a Jersey response. + * + * @param http1Response the response to map + * @param request the request + * @return the mapped response + */ + private ClientResponse mapResponse(Http1ClientResponse http1Response, ClientRequest request) { + ClientResponse response = new ClientResponse(new Response.StatusType() { @Override public int getStatusCode() { - return webClientResponse.status().code(); + return http1Response.status().code(); } @Override @@ -189,63 +114,72 @@ public Response.Status.Family getFamily() { @Override public String getReasonPhrase() { - return webClientResponse.status().reasonPhrase(); + return http1Response.status().reasonPhrase(); } - }, requestContext); + }, request); - for (Map.Entry> entry : webClientResponse.headers().toMap().entrySet()) { - for (String value : entry.getValue()) { - responseContext.getHeaders().add(entry.getKey(), value); + for (Http.HeaderValue header : http1Response.headers()) { + for (String v : header.allValues()) { + response.getHeaders().add(header.name(), v); } } - responseContext.setResolvedRequestUri(webClientResponse.lastEndpointURI()); + // TODO set URL of last redirection - final CompletionStage stream = HelidonStructures.hasEntity(webClientResponse) - ? webClientResponse.content().as(InputStream.class) - : CompletableFuture.supplyAsync(() -> NO_CONTENT_INPUT_STREAM, - executorServiceKeeper.getExecutorService(requestContext)); + ReadableEntity entity = http1Response.entity(); + if (entity.hasEntity()) { + response.setEntityStream(entity.inputStream()); + } + return response; + } - return stream.thenApply((a) -> { - responseContext.setEntityStream(new FilterInputStream(a) { - private final AtomicBoolean closed = new AtomicBoolean(false); + /** + * Execute Jersey request using WebClient. + * + * @param request the Jersey request + * @return a Jersey response + */ + @Override + public ClientResponse apply(ClientRequest request) { + Http1ClientResponse http1Response; + Http1ClientRequest http1Request = mapRequest(request); - @Override - public void close() throws IOException { - // Avoid idempotent close in the underlying input stream - if (!closed.compareAndSet(false, true)) { - super.close(); - } - } + if (request.hasEntity()) { + http1Response = http1Request.outputStream(os -> { + request.setStreamProvider(length -> os); + request.writeEntity(); // ask Jersey to write entity to WebClient stream }); - return responseContext; - }); - } - - private static HelidonEntity.HelidonEntityType getEntityType(final Configuration config) { - final String helidonType = ClientProperties.getValue(config.getProperties(), - INTERNAL_ENTITY_TYPE, HelidonEntity.HelidonEntityType.READABLE_BYTE_CHANNEL.name()); - final HelidonEntity.HelidonEntityType entityType = HelidonEntity.HelidonEntityType.valueOf(helidonType); + } else { + http1Response = http1Request.request(); + } - return entityType; + return mapResponse(http1Response, request); } - private static class ExecutorServiceKeeper { - private Optional executorService; - - private ExecutorServiceKeeper(Client client) { - final ClientConfig config = ((JerseyClient) client).getConfiguration(); - executorService = Optional.ofNullable(config.getExecutorService()); - } - - private ExecutorService getExecutorService(ClientRequest request) { - if (!executorService.isPresent()) { - // cache for multiple requests - executorService = Optional.ofNullable(request.getInjectionManager() - .getInstance(ExecutorServiceProvider.class, ClientAsyncExecutorLiteral.INSTANCE).getExecutorService()); + /** + * Asynchronously execute Jersey request using WebClient. + * + * @param request the Jersey request + * @return a Jersey response + */ + @Override + public Future apply(ClientRequest request, AsyncConnectorCallback callback) { + return executorService.get().submit(() -> { + try { + ClientResponse response = apply(request); + callback.response(response); + } catch (Throwable t) { + callback.failure(t); } + }); + } - return executorService.get(); - } + @Override + public String getName() { + return HELIDON_VERSION; + } + + @Override + public void close() { } } diff --git a/jersey/connector/src/main/java/io/helidon/jersey/connector/HelidonConnectorNima.java b/jersey/connector/src/main/java/io/helidon/jersey/connector/HelidonConnectorNima.java deleted file mode 100644 index 77e0969dddd..00000000000 --- a/jersey/connector/src/main/java/io/helidon/jersey/connector/HelidonConnectorNima.java +++ /dev/null @@ -1,99 +0,0 @@ -/* - * Copyright (c) 2023 Oracle and/or its affiliates. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package io.helidon.jersey.connector; - -import java.util.concurrent.CompletableFuture; -import java.util.concurrent.Future; - -import io.helidon.common.Version; -import io.helidon.common.http.Http; -import io.helidon.nima.faulttolerance.Async; -import io.helidon.nima.webclient.WebClient; -import io.helidon.nima.webclient.http1.Http1Client; -import io.helidon.nima.webclient.http1.Http1ClientRequest; -import io.helidon.nima.webclient.http1.Http1ClientResponse; -import jakarta.ws.rs.client.Client; -import jakarta.ws.rs.core.Configuration; -import org.glassfish.jersey.client.ClientRequest; -import org.glassfish.jersey.client.ClientResponse; -import org.glassfish.jersey.client.spi.AsyncConnectorCallback; -import org.glassfish.jersey.client.spi.Connector; -import org.glassfish.jersey.internal.util.PropertiesHelper; - -class HelidonConnectorNima implements Connector { - private static final String HELIDON_VERSION = "Helidon/" + Version.VERSION + " (java " - + PropertiesHelper.getSystemProperty("java.runtime.version") + ")"; - - private final Client client; - private final Configuration config; - private final Http1Client http1Client; - - HelidonConnectorNima(Client client, Configuration config) { - this.client = client; - this.config = config; - this.http1Client = WebClient.builder().build(); - } - - @Override - public ClientResponse apply(ClientRequest request) { - // map ClientRequest to Http1ClientRequest - Http1ClientRequest req = http1Client - .method(Http.Method.create(request.getMethod())) - .uri(request.getUri()); - - request.getRequestHeaders().forEach((key, value) -> { - String[] values = value.toArray(new String[0]); - req.header(Http.Header.create(key), values); - }); - - // TODO copy over properties - // TODO timeouts redirects etc - - Http1ClientResponse res = null; - if (request.hasEntity()) { - // TODO - } else { - res = req.request(); - } - - // map Http1ClientResponse to ClientResponse - - return null; - } - - @Override - public Future apply(ClientRequest request, AsyncConnectorCallback callback) { - CompletableFuture cf = Async.invokeStatic(() -> apply(request)); - cf.whenComplete((res, t) -> { - if (t != null) { - callback.failure(t); - } else { - callback.response(res); - } - }) - return cf; - } - - @Override - public String getName() { - return HELIDON_VERSION; - } - - @Override - public void close() { - } -} diff --git a/jersey/connector/src/main/java/io/helidon/jersey/connector/HelidonConnectorProvider.java b/jersey/connector/src/main/java/io/helidon/jersey/connector/HelidonConnectorProvider.java index 5af559216a8..8d88dd07b06 100644 --- a/jersey/connector/src/main/java/io/helidon/jersey/connector/HelidonConnectorProvider.java +++ b/jersey/connector/src/main/java/io/helidon/jersey/connector/HelidonConnectorProvider.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020, 2021 Oracle and/or its affiliates. + * Copyright (c) 2020, 2023 Oracle and/or its affiliates. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/jersey/connector/src/main/java/io/helidon/jersey/connector/HelidonEntity.java b/jersey/connector/src/main/java/io/helidon/jersey/connector/HelidonEntity.java deleted file mode 100644 index 640d049c2a1..00000000000 --- a/jersey/connector/src/main/java/io/helidon/jersey/connector/HelidonEntity.java +++ /dev/null @@ -1,176 +0,0 @@ -/* - * Copyright (c) 2020, 2022 Oracle and/or its affiliates. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package io.helidon.jersey.connector; - -import java.io.ByteArrayOutputStream; -import java.io.IOException; -import java.util.Optional; -import java.util.concurrent.CompletionStage; -import java.util.concurrent.ExecutorService; -import java.util.concurrent.Flow; -import java.util.function.Function; - -import io.helidon.common.GenericType; -import io.helidon.common.http.DataChunk; -import io.helidon.common.media.type.MediaTypes; -import io.helidon.common.reactive.IoMulti; -import io.helidon.common.reactive.Multi; -import io.helidon.common.reactive.OutputStreamMulti; -import io.helidon.common.reactive.Single; -import io.helidon.reactive.media.common.ContentWriters; -import io.helidon.reactive.media.common.MessageBodyWriter; -import io.helidon.reactive.media.common.MessageBodyWriterContext; -import io.helidon.reactive.webclient.WebClientRequestBuilder; -import io.helidon.reactive.webclient.WebClientResponse; - -import jakarta.ws.rs.ProcessingException; -import org.glassfish.jersey.client.ClientProperties; -import org.glassfish.jersey.client.ClientRequest; - -/** - * A utility class that converts outbound client entity to a class understandable by Helidon. - * Based on the {@link HelidonEntityType} an entity writer is provided to be registered by Helidon client - * and an Entity is provided to be submitted by the Helidon Client. - */ -class HelidonEntity { - - private HelidonEntity() { - } - - /** - * HelidonEntity type chosen by HelidonEntityType. - */ - enum HelidonEntityType { - /** - * Simplest structure. Loads all data to the memory. - */ - BYTE_ARRAY_OUTPUT_STREAM, - /** - * Readable ByteChannel that is capable of sending data in chunks. - * Capable of caching of bytes before the data are consumed by Helidon. - */ - READABLE_BYTE_CHANNEL, - /** - * Helidon most native entity. Could be slower than {@link #READABLE_BYTE_CHANNEL}. - */ - // Check LargeDataTest with OUTPUT_STREAM_MULTI - OUTPUT_STREAM_MULTI - } - - /** - * Get optional entity writer to be registered by the Helidon Client. For some default providers, - * nothing is needed to be registered. - * @param type the type of the entity class that works best for the Http Client request use case. - * @return possible writer to be registerd by the Helidon Client. - */ - static Optional> helidonWriter(HelidonEntityType type) { - switch (type) { - case BYTE_ARRAY_OUTPUT_STREAM: - return Optional.of(new OutputStreamBodyWriter()); - case OUTPUT_STREAM_MULTI: - case READABLE_BYTE_CHANNEL: - default: - return Optional.empty(); - } - } - - /** - * Convert Jersey {@code OutputStream} to an entity based on the client request use case and submits to the provided - * {@code WebClientRequestBuilder}. - * @param type the type of the Helidon entity. - * @param requestContext Jersey {@link ClientRequest} providing the entity {@code OutputStream}. - * @param requestBuilder Helidon {@code WebClientRequestBuilder} which is used to submit the entity - * @param executorService {@link ExecutorService} that fills the entity instance for Helidon with data from Jersey - * {@code OutputStream}. - * @return Helidon Client response completion stage. - */ - static CompletionStage submit(HelidonEntityType type, - ClientRequest requestContext, - WebClientRequestBuilder requestBuilder, - ExecutorService executorService) { - CompletionStage stage = null; - if (type != null) { - final int bufferSize = requestContext.resolveProperty( - ClientProperties.OUTBOUND_CONTENT_LENGTH_BUFFER, 8192); - switch (type) { - case BYTE_ARRAY_OUTPUT_STREAM: - final ByteArrayOutputStream baos = new ByteArrayOutputStream(bufferSize); - requestContext.setStreamProvider(contentLength -> baos); - ((ProcessingRunnable) requestContext::writeEntity).run(); - stage = requestBuilder.submit(baos); - break; - case READABLE_BYTE_CHANNEL: - final OutputStreamChannel channel = new OutputStreamChannel(bufferSize); - requestContext.setStreamProvider(contentLength -> channel); - executorService.execute((ProcessingRunnable) requestContext::writeEntity); - stage = requestBuilder.submit(channel); - break; - case OUTPUT_STREAM_MULTI: - final OutputStreamMulti publisher = IoMulti.outputStreamMulti(); - requestContext.setStreamProvider(contentLength -> publisher); - executorService.execute((ProcessingRunnable) () -> { - requestContext.writeEntity(); - publisher.close(); - }); - stage = requestBuilder.submit(Multi.create(publisher).map(DataChunk::create)); - break; - default: - } - } - return stage; - } - - @FunctionalInterface - private interface ProcessingRunnable extends Runnable { - void runOrThrow() throws IOException; - - @Override - default void run() { - try { - runOrThrow(); - } catch (IOException e) { - throw new ProcessingException("Error writing entity:", e); - } - } - } - - private static class OutputStreamBodyWriter implements MessageBodyWriter { - private OutputStreamBodyWriter() { - } - - @Override - public Flow.Publisher write( - Single content, - GenericType type, - MessageBodyWriterContext context) { - context.contentType(MediaTypes.APPLICATION_OCTET_STREAM); - return content.flatMap(new ByteArrayOutputStreamToChunks()); - } - - @Override - public PredicateResult accept(GenericType type, MessageBodyWriterContext messageBodyWriterContext) { - return PredicateResult.supports(ByteArrayOutputStream.class, type); - } - - private static class ByteArrayOutputStreamToChunks implements Function> { - @Override - public Flow.Publisher apply(ByteArrayOutputStream byteArrayOutputStream) { - return ContentWriters.writeBytes(byteArrayOutputStream.toByteArray(), false); - } - } - } -} diff --git a/jersey/connector/src/main/java/io/helidon/jersey/connector/HelidonProperties.java b/jersey/connector/src/main/java/io/helidon/jersey/connector/HelidonProperties.java deleted file mode 100644 index 0aeeb8c1d6e..00000000000 --- a/jersey/connector/src/main/java/io/helidon/jersey/connector/HelidonProperties.java +++ /dev/null @@ -1,35 +0,0 @@ -/* - * Copyright (c) 2020, 2022 Oracle and/or its affiliates. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package io.helidon.jersey.connector; - -import io.helidon.config.Config; -import io.helidon.reactive.webclient.WebClient; - -/** - * Configuration options specific to the Client API that utilizes {@link HelidonConnector}. - */ -public final class HelidonProperties { - - private HelidonProperties() { - } - - /** - * A Helidon {@link Config} instance that is passed to {@link WebClient.Builder#config(Config)} if available. - * This property is settable on {@link jakarta.ws.rs.core.Configurable#property(String, Object)} objects. - */ - public static final String CONFIG = "jersey.connector.helidon.config"; -} diff --git a/jersey/connector/src/main/java/io/helidon/jersey/connector/HelidonStructures.java b/jersey/connector/src/main/java/io/helidon/jersey/connector/HelidonStructures.java deleted file mode 100644 index 98d797f47f5..00000000000 --- a/jersey/connector/src/main/java/io/helidon/jersey/connector/HelidonStructures.java +++ /dev/null @@ -1,163 +0,0 @@ -/* - * Copyright (c) 2020, 2022 Oracle and/or its affiliates. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - - -package io.helidon.jersey.connector; - -import java.io.InputStream; -import java.net.URI; -import java.util.List; -import java.util.Locale; -import java.util.Map; -import java.util.Optional; - -import javax.net.ssl.SSLContext; - -import io.helidon.common.http.Headers; -import io.helidon.common.http.Http; -import io.helidon.common.http.WritableHeaders; -import io.helidon.config.Config; -import io.helidon.reactive.media.common.DefaultMediaSupport; -import io.helidon.reactive.media.common.MessageBodyReader; -import io.helidon.reactive.webclient.Proxy; -import io.helidon.reactive.webclient.WebClientResponse; -import io.helidon.reactive.webclient.WebClientTls; - -import io.netty.handler.codec.http.HttpHeaderValues; -import jakarta.ws.rs.ProcessingException; -import jakarta.ws.rs.core.Configuration; -import org.glassfish.jersey.client.ClientProperties; -import org.glassfish.jersey.client.ClientRequest; - -/** - * Helidon specific classes and implementations. - */ -class HelidonStructures { - - private HelidonStructures() { - } - - static Headers createHeaders(Map> data) { - WritableHeaders headers = WritableHeaders.create(); - data.forEach((key, value) -> headers.set(Http.Header.create(key), value)); - return headers; - } - - static MessageBodyReader createInputStreamBodyReader() { - return DefaultMediaSupport.inputStreamReader(); - } - - static Optional helidonConfig(Configuration configuration) { - final Object helidonConfig = configuration.getProperty(HelidonProperties.CONFIG); - if (helidonConfig != null) { - if (!Config.class.isInstance(helidonConfig)) { - HelidonConnector.LOGGER.warning( - String.format("Given instance of %s is not Helidon config. Provided HelidonProperties.CONFIG is ignored.", - helidonConfig.getClass().getName()) - ); - return Optional.empty(); - } else { - return Optional.of((Config) helidonConfig); - } - } - return Optional.empty(); - } - - static Optional createProxy(Configuration config) { - return ProxyBuilder.createProxy(config); - } - - static Optional createProxy(ClientRequest request) { - return ProxyBuilder.createProxy(request); - } - - static Optional createSSL(SSLContext context) { - return context == null ? Optional.empty() : Optional.of(WebClientTls.builder().sslContext(context).build()); - } - - static boolean hasEntity(WebClientResponse webClientResponse) { - final Headers headers = webClientResponse.content().readerContext().headers(); - final Optional contentLenth = headers.first(Http.Header.CONTENT_LENGTH); - final Optional encoding = headers.first(Http.Header.TRANSFER_ENCODING); - - return ((contentLenth.isPresent() && !contentLenth.get().equals("0")) - || (encoding.isPresent() && encoding.get().equals(HttpHeaderValues.CHUNKED.toString()))); - } - - private static class ProxyBuilder { - private static Optional createProxy(Configuration config) { - final Object proxyUri = config.getProperty(ClientProperties.PROXY_URI); - final String userName - = ClientProperties.getValue(config.getProperties(), ClientProperties.PROXY_USERNAME, String.class); - final String password - = ClientProperties.getValue(config.getProperties(), ClientProperties.PROXY_PASSWORD, String.class); - return createProxy(proxyUri, userName, password); - } - - private static Optional createProxy(ClientRequest clientRequest) { - final Object proxyUri = clientRequest.resolveProperty(ClientProperties.PROXY_URI, Object.class); - final String userName = clientRequest.resolveProperty(ClientProperties.PROXY_USERNAME, String.class); - final String password = clientRequest.resolveProperty(ClientProperties.PROXY_PASSWORD, String.class); - return createProxy(proxyUri, userName, password); - } - - private static Optional createProxy(Object proxyUri, String userName, String password) { - if (proxyUri != null) { - final URI u = getProxyUri(proxyUri); - final Proxy.Builder builder = Proxy.builder(); - if (u.getScheme().toUpperCase(Locale.ROOT).equals("DIRECT")) { - builder.type(Proxy.ProxyType.NONE); - } else { - builder.host(u.getHost()).port(u.getPort()); - switch (u.getScheme().toUpperCase(Locale.ROOT)) { - case "HTTP": - builder.type(Proxy.ProxyType.HTTP); - break; - case "SOCKS": - builder.type(Proxy.ProxyType.SOCKS_4); - break; - case "SOCKS5": - builder.type(Proxy.ProxyType.SOCKS_5); - break; - default: - HelidonConnector.LOGGER.warning(String.format("Proxy schema %s not supported.", u.getScheme())); - return Optional.empty(); - } - } - if (userName != null) { - builder.username(userName); - - if (password != null) { - builder.password(password.toCharArray()); - } - } - return Optional.of(builder.build()); - } else { - return Optional.empty(); - } - } - - private static URI getProxyUri(final Object proxy) { - if (proxy instanceof URI) { - return (URI) proxy; - } else if (proxy instanceof String) { - return URI.create((String) proxy); - } else { - throw new ProcessingException("The proxy URI (" + proxy + ") property MUST be an instance of String or URI"); - } - } - } -} diff --git a/jersey/connector/src/main/java/io/helidon/jersey/connector/OutputStreamChannel.java b/jersey/connector/src/main/java/io/helidon/jersey/connector/OutputStreamChannel.java deleted file mode 100644 index 2952e01c288..00000000000 --- a/jersey/connector/src/main/java/io/helidon/jersey/connector/OutputStreamChannel.java +++ /dev/null @@ -1,219 +0,0 @@ -/* - * Copyright (c) 2020, 2021 Oracle and/or its affiliates. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package io.helidon.jersey.connector; - -import java.io.IOException; -import java.io.OutputStream; -import java.nio.ByteBuffer; -import java.nio.channels.ClosedByInterruptException; -import java.nio.channels.ClosedChannelException; -import java.nio.channels.ReadableByteChannel; -import java.util.concurrent.LinkedBlockingDeque; -import java.util.concurrent.TimeUnit; -import java.util.concurrent.locks.ReentrantLock; - -/** - *

A ReadableByteChannel implementation that provides cache to store {@link OutputStream#write(int) written} - * http entity before it is {@link ReadableByteChannel#read(ByteBuffer) read} by the {@link ReadableByteChannel} consumer. - *

- *

- * The implementation is backed by the {@link LinkedBlockingDeque}, with default {@link #READ_TIMEOUT} read timeout - * and {@link #WRITE_TIMEOUT} write timeout, by default 10 seconds. - *

- *

- * The {@link LinkedBlockingDeque queue} stores up to {@link #CAPACITY} of ByteBuffer, each of which is minimum - * 8192 bytes long by default. The default can be overridden by {@code ClientProperties#OUTBOUND_CONTENT_LENGTH_BUFFER}. - *

- * - */ -class OutputStreamChannel extends OutputStream implements ReadableByteChannel { - - private ReentrantLock lock = new ReentrantLock(); - private static final ByteBuffer VOID = ByteBuffer.allocate(0); - private static final int CAPACITY = Integer.getInteger("helidon.connector.osc.capacity", 8); - private static final int WRITE_TIMEOUT = Integer.getInteger("helidon.connector.osc.read.timeout", 10000); - private static final int READ_TIMEOUT = Integer.getInteger("helidon.connector.osc.write.timeout", 10000); - private final int bufferSize; - - /** - * The minimum capacity of a buffer in bytes. The {@link LinkedBlockingDeque queue} stores up to {@link #CAPACITY} of them. - * The actual buffer size can be greater than this {@code bufferSize}, if a greater amount of data is sent to any of - * {@link OutputStreamChannel#write(byte[]) write} methods. - * @param bufferSize - */ - OutputStreamChannel(int bufferSize) { - this.bufferSize = bufferSize; - } - - private final LinkedBlockingDeque queue = new LinkedBlockingDeque<>(CAPACITY); - - private volatile boolean open = true; - private ByteBuffer remainingByteBuffer; - - @Override - public int read(ByteBuffer dst) throws IOException { - if (!open) { - throw new ClosedChannelException(); - } - - int sum = 0; - - do { - ByteBuffer top; - try { - top = poll(READ_TIMEOUT, TimeUnit.MILLISECONDS); - } catch (InterruptedException e) { - open = false; - throw new ClosedByInterruptException(); - } - - if (top == null) { - return sum; - } - - if (top == VOID) { - if (sum == 0) { - open = false; - return -1; - } else { - queue.addFirst(top); - return sum; - } - } - - final int topSize = top.remaining(); - final int dstAvailable = dst.remaining(); - final int minSize = Math.min(topSize, dstAvailable); - - if (top.hasArray()) { - dst.put(top.array(), top.arrayOffset() + top.position(), minSize); - top.position(top.position() + minSize); - } else { - while (dst.hasRemaining() && top.hasRemaining()) { - dst.put(top.get()); - } - } - - sum += minSize; - - if (top.hasRemaining()) { - remainingByteBuffer = top; - } - } while (dst.hasRemaining()); - - return sum; - } - - private ByteBuffer poll(long timeout, TimeUnit unit) throws InterruptedException { - if (remainingByteBuffer != null) { - final ByteBuffer remaining = remainingByteBuffer; - remainingByteBuffer = null; - return remaining; - } else { - // do not modify head - lock.lock(); - final ByteBuffer peek = queue.poll(timeout, unit); - // can modify head - lock.unlock(); - return peek; - } - } - - @Override - public void write(int b) throws IOException { - write(new byte[]{(byte) b}, 0, 1); - } - - @Override - public void write(byte[] b) throws IOException { - super.write(b, 0, b.length); - } - - @Override - public void write(byte[] b, int off, int len) throws IOException { - checkClosed(); - - if (lock.tryLock()) { - if (len < bufferSize && queue.size() > 0) { - final ByteBuffer buffer = queue.getLast(); - if (buffer != null && (buffer.capacity() - buffer.limit()) > len) { - //set for write - buffer.position(buffer.limit()); - buffer.limit(buffer.capacity()); - buffer.put(b, off, len); - //set for read - buffer.flip(); - lock.unlock(); - return; - } - } - lock.unlock(); - } - - final int maxLen = Math.max(len, bufferSize); - final byte[] bytes = new byte[maxLen]; - System.arraycopy(b, off, bytes, 0, len); - - final ByteBuffer buffer = ByteBuffer.wrap(bytes); - buffer.limit(len); - buffer.position(0); - - write(buffer); - } - - private void write(ByteBuffer buffer) throws IOException { - try { - boolean queued = queue.offer(buffer, WRITE_TIMEOUT, TimeUnit.MILLISECONDS); - if (!queued) { - throw new IOException("Buffer overflow."); - } - - } catch (InterruptedException e) { - throw new IOException(e); - } - } - - @Override - public void close() throws IOException { - boolean offer = false; - - try { - offer = queue.offer(VOID, WRITE_TIMEOUT, TimeUnit.MILLISECONDS); - } catch (InterruptedException e) { - // ignore. - } - - if (!offer) { - lock.lock(); - queue.removeLast(); - queue.add(VOID); - lock.unlock(); - } - } - - - @Override - public boolean isOpen() { - return open; - } - - private void checkClosed() throws IOException { - if (!open) { - throw new IOException("Stream already closed."); - } - } -} diff --git a/jersey/connector/src/main/java/module-info.java b/jersey/connector/src/main/java/module-info.java index fe4c09b83f5..32674f84443 100644 --- a/jersey/connector/src/main/java/module-info.java +++ b/jersey/connector/src/main/java/module-info.java @@ -17,8 +17,8 @@ import io.helidon.jersey.connector.HelidonConnectorProvider; /** - * A {@link org.glassfish.jersey.client.spi.Connector} that utilizes the Helidon HTTP Client to send and receive - * * HTTP request and responses. + * A {@link org.glassfish.jersey.client.spi.Connector} that utilizes the Helidon HTTP Client to send + * and receive HTTP request and responses. */ module io.helidon.jersey.connector { requires java.logging; @@ -26,11 +26,7 @@ requires jakarta.ws.rs; requires jersey.client; requires jersey.common; - requires io.helidon.common.reactive; - requires io.helidon.reactive.webclient; requires io.helidon.nima.webclient; - requires io.netty.codec.http; - requires io.helidon.nima.faulttolerance; exports io.helidon.jersey.connector; provides org.glassfish.jersey.client.spi.ConnectorProvider with HelidonConnectorProvider; diff --git a/jersey/connector/src/test/java/io/helidon/jersey/connector/AbstractTest.java b/jersey/connector/src/test/java/io/helidon/jersey/connector/AbstractTest.java index 5a2d964c7f7..48844c6e6cb 100644 --- a/jersey/connector/src/test/java/io/helidon/jersey/connector/AbstractTest.java +++ b/jersey/connector/src/test/java/io/helidon/jersey/connector/AbstractTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020, 2021 Oracle and/or its affiliates. + * Copyright (c) 2020, 2023 Oracle and/or its affiliates. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,8 +16,6 @@ package io.helidon.jersey.connector; -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; import java.util.List; import java.util.Map; import java.util.function.Supplier; @@ -31,34 +29,25 @@ import com.github.tomakehurst.wiremock.http.HttpHeader; import com.github.tomakehurst.wiremock.http.Request; import com.github.tomakehurst.wiremock.http.Response; + import jakarta.ws.rs.client.Client; import jakarta.ws.rs.client.ClientBuilder; import jakarta.ws.rs.client.WebTarget; import jakarta.ws.rs.core.HttpHeaders; + import org.glassfish.jersey.client.ClientConfig; import org.junit.jupiter.api.AfterAll; -import org.junit.jupiter.params.ParameterizedTest; -import org.junit.jupiter.params.provider.ValueSource; public abstract class AbstractTest { - protected static WireMockServer wireMock; - protected static ThreadLocal rules = new ThreadLocal<>(); - protected static ThreadLocal extensions = new ThreadLocal<>(); + protected static WireMockServer wireMockServer; // The port to match wiremock port in MP Rest Client TCK protected static final int PORT = 8765; protected WebTarget target(String uri) { - return target(uri, null); - } - - protected WebTarget target(String uri, String entityType) { final ClientConfig config = new ClientConfig(); config.connectorProvider(new HelidonConnectorProvider()); - if (entityType != null) { - config.property(HelidonConnector.INTERNAL_ENTITY_TYPE, entityType); - } final Client client = ClientBuilder.newClient(config); return client.target(getBaseUri()).path(uri); } @@ -67,23 +56,22 @@ protected static String getBaseUri() { return "http://localhost:" + PORT; } - public static void setup() { - wireMock = new WireMockServer( + protected static void setup(Rules rules, Extension[] extensions) { + wireMockServer = new WireMockServer( WireMockConfiguration.options() - .extensions(extensions.get()) + .extensions(extensions) // debug logging // .notifier(new ConsoleNotifier(true)) .port(PORT) ); - rules.get().addRules(); - - wireMock.start(); + rules.addRules(); + wireMockServer.start(); } @AfterAll public static void tearDown() { - wireMock.shutdown(); - while(wireMock.isRunning()) { + wireMockServer.shutdown(); + while (wireMockServer.isRunning()) { try { Thread.sleep(100L); } catch (InterruptedException e) { @@ -92,16 +80,10 @@ public static void tearDown() { } } - @Retention(RetentionPolicy.RUNTIME) - @ParameterizedTest - @ValueSource(strings = { "BYTE_ARRAY_OUTPUT_STREAM", "READABLE_BYTE_CHANNEL", "OUTPUT_STREAM_MULTI" }) - @interface ParamTest { } - protected interface Rules { void addRules(); } - protected static class ContentLengthSetter extends ResponseTransformer { @Override public com.github.tomakehurst.wiremock.http.Response transform( @@ -152,7 +134,8 @@ public Response transform(Request request, Response response, FileSource files, builder = builder.body(String.valueOf(original.getEntity())); } - com.github.tomakehurst.wiremock.http.HttpHeaders newHeaders = com.github.tomakehurst.wiremock.http.HttpHeaders.noHeaders(); + com.github.tomakehurst.wiremock.http.HttpHeaders newHeaders = + com.github.tomakehurst.wiremock.http.HttpHeaders.noHeaders(); for (Map.Entry> entry : original.getStringHeaders().entrySet()) { if (jakarta.ws.rs.core.HttpHeaders.LOCATION.equals(entry.getKey())) { newHeaders = newHeaders.plus( @@ -160,7 +143,7 @@ public Response transform(Request request, Response response, FileSource files, ); } else { newHeaders = newHeaders.plus( - HttpHeader.httpHeader(entry.getKey(), entry.getValue().toArray(new String[entry.getValue().size()])) + HttpHeader.httpHeader(entry.getKey(), entry.getValue().toArray(new String[0])) ); } } diff --git a/jersey/connector/src/test/java/io/helidon/jersey/connector/AsyncRequestTest.java b/jersey/connector/src/test/java/io/helidon/jersey/connector/AsyncRequestTest.java index 86264c139a1..6eef8ca1054 100644 --- a/jersey/connector/src/test/java/io/helidon/jersey/connector/AsyncRequestTest.java +++ b/jersey/connector/src/test/java/io/helidon/jersey/connector/AsyncRequestTest.java @@ -31,13 +31,15 @@ import jakarta.ws.rs.core.Response; import org.glassfish.jersey.client.ClientConfig; import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.MatcherAssert.assertThat; public class AsyncRequestTest extends AbstractTest { - private static AsyncResource asyncResource = new AsyncResource(); + private static final AsyncResource asyncResource = new AsyncResource(); @Path("async") public static class AsyncResource { @@ -71,38 +73,35 @@ public String shortGet() { @BeforeAll public static void setup() { - final UncachedStringMethodExecutor executor = new UncachedStringMethodExecutor(asyncResource::longGet); + UncachedStringMethodExecutor executor = new UncachedStringMethodExecutor(asyncResource::longGet); - AbstractTest.extensions.set(new Extension[] { + Extension[] extensions = new Extension[]{ executor, new ContentLengthSetter() - }); - - AbstractTest.rules.set( - () -> { - wireMock.stubFor( + }; + Rules rules = () -> { + wireMockServer.stubFor( WireMock.get(WireMock.urlEqualTo("/async/reset")).willReturn( WireMock.ok(asyncResource.reset()).withStatus(204) ) ); - wireMock.stubFor( + wireMockServer.stubFor( WireMock.get(WireMock.urlEqualTo("/async/short")).willReturn( WireMock.ok(asyncResource.shortGet()) ) ); - wireMock.stubFor( + wireMockServer.stubFor( WireMock.get(WireMock.urlEqualTo("/async/long")).willReturn( WireMock.ok().withTransformers(executor.getName()) ) ); - }); - - AbstractTest.setup(); + }; + setup(rules, extensions); } - @ParamTest - public void testTwoClientsAsync(String entityType) throws ExecutionException, InterruptedException { - try (Response resetResponse = target("async", entityType).path("reset").request().get()) { + @Test + public void testTwoClientsAsync() throws ExecutionException, InterruptedException { + try (Response resetResponse = target("async").path("reset").request().get()) { assertThat(resetResponse.getStatus(), is(204)); } diff --git a/jersey/connector/src/test/java/io/helidon/jersey/connector/BasicRequestTest.java b/jersey/connector/src/test/java/io/helidon/jersey/connector/BasicRequestTest.java index 132736b024c..ecdcbbbd752 100644 --- a/jersey/connector/src/test/java/io/helidon/jersey/connector/BasicRequestTest.java +++ b/jersey/connector/src/test/java/io/helidon/jersey/connector/BasicRequestTest.java @@ -36,6 +36,7 @@ import com.github.tomakehurst.wiremock.http.HttpHeader; import com.github.tomakehurst.wiremock.http.Request; import com.github.tomakehurst.wiremock.matching.EqualToPattern; + import jakarta.ws.rs.Consumes; import jakarta.ws.rs.GET; import jakarta.ws.rs.POST; @@ -52,74 +53,73 @@ import jakarta.ws.rs.core.MultivaluedMap; import jakarta.ws.rs.core.Response; import org.glassfish.jersey.client.JerseyCompletionStageRxInvoker; -import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Test; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.hasKey; public class BasicRequestTest extends AbstractTest { - private static BasicResource basicResource = new BasicResource(); + + private static final BasicResource basicResource = new BasicResource(); @BeforeAll public static void setup() { - AbstractTest.extensions.set(new Extension[] { + Extension[] extensions = new Extension[]{ new HeadersSetter(), new ContentLengthSetter() - }); - - AbstractTest.rules.set(() -> { - wireMock.stubFor( + }; + Rules rules = () -> { + wireMockServer.stubFor( WireMock.get(WireMock.urlEqualTo("/basic/get")).willReturn( WireMock.ok(basicResource.get()) ) ); - wireMock.stubFor( + wireMockServer.stubFor( WireMock.get(WireMock.urlEqualTo("/basic/getquery?first=hello&second=world")) .willReturn(WireMock.ok(basicResource.getQuery("hello", "world"))) ); - wireMock.stubFor( + wireMockServer.stubFor( WireMock.post(WireMock.urlEqualTo("/basic/post")) .withRequestBody(new EqualToPattern("ok")) .willReturn(WireMock.ok(basicResource.post("ok"))) ); - wireMock.stubFor( + wireMockServer.stubFor( WireMock.post(WireMock.urlEqualTo("/basic/post")) .withRequestBody(new EqualToPattern("ok")) .willReturn(WireMock.ok(basicResource.post("ok"))) ); - wireMock.stubFor( + wireMockServer.stubFor( WireMock.get(WireMock.urlEqualTo("/basic/headers")).willReturn( WireMock.ok().withTransformers("response-headers-setter") ) ); - wireMock.stubFor( + wireMockServer.stubFor( WireMock.put(WireMock.urlEqualTo("/basic/produces/consumes")) .withHeader(HttpHeaders.ACCEPT, new EqualToPattern("test/z-test")) .willReturn(WireMock.status(406)) ); - wireMock.stubFor( + wireMockServer.stubFor( WireMock.put(WireMock.urlEqualTo("/basic/produces/consumes")) .withHeader(HttpHeaders.CONTENT_TYPE, new EqualToPattern("test/z-test")) .willReturn(WireMock.status(415)) ); - wireMock.stubFor( + wireMockServer.stubFor( WireMock.put(WireMock.urlEqualTo("/basic/produces/consumes")) .withHeader(HttpHeaders.CONTENT_TYPE, new EqualToPattern("test/x-test")) .withHeader(HttpHeaders.ACCEPT, new EqualToPattern("test/y-test")) .willReturn(WireMock.ok(basicResource.putConsumesProduces("ok")) .withHeader(HttpHeaders.CONTENT_TYPE, "test/y-test")) ); - }); - - AbstractTest.setup(); + }; + setup(rules, extensions); } @Path("basic") @@ -163,26 +163,26 @@ public String putConsumesProduces(String content) { } } - @ParamTest - public void testBasicGet(String entityType) { - try (Response response = target("basic", entityType).path("get").request().get()) { + @Test + public void testBasicGet() { + try (Response response = target("basic").path("get").request().get()) { assertThat(response.getStatus(), is(200)); assertThat(response.readEntity(String.class), is("ok")); } } - @ParamTest - public void testBasicPost(String entityType) { - try (Response response = target("basic", entityType).path("post").request() + @Test + public void testBasicPost() { + try (Response response = target("basic").path("post").request() .buildPost(Entity.entity("ok", MediaType.TEXT_PLAIN_TYPE)).invoke()) { assertThat(response.getStatus(), is(200)); assertThat(response.readEntity(String.class), is("okok")); } } - @ParamTest - public void queryGetTest(String entityType) { - try (Response response = target("basic", entityType).path("getquery") + @Test + public void queryGetTest() { + try (Response response = target("basic").path("getquery") .queryParam("first", "hello") .queryParam("second", "world") .request().get()) { @@ -191,12 +191,12 @@ public void queryGetTest(String entityType) { } } - @ParamTest - public void testHeaders(String entityType) { + @Test + public void testHeaders() { String[][] headers = new String[][]{{"X-TEST-ONE", "ONE"}, {"X-TEST-TWO", "TWO"}, {"X-TEST-THREE", "THREE"}}; MultivaluedHashMap map = new MultivaluedHashMap<>(); Arrays.stream(headers).forEach(a -> map.add(a[0], a[1])); - try (Response response = target("basic", entityType).path("headers").request().headers(map).get()) { + try (Response response = target("basic").path("headers").request().headers(map).get()) { assertThat(response.getStatus(), is(200)); assertThat(response.readEntity(String.class), is("ok")); for (int i = 0; i != headers.length; i++) { @@ -206,14 +206,14 @@ public void testHeaders(String entityType) { } } - @ParamTest - public void testProduces(String entityType) { - try (Response response = target("basic", entityType).path("produces/consumes").request("test/z-test") + @Test + public void testProduces() { + try (Response response = target("basic").path("produces/consumes").request("test/z-test") .put(Entity.entity("ok", new MediaType("test", "x-test")))) { assertThat(response.getStatus(), is(406)); } - try (Response response = target("basic", entityType).path("produces/consumes").request("test/y-test") + try (Response response = target("basic").path("produces/consumes").request("test/y-test") .put(Entity.entity("ok", new MediaType("test", "x-test")))) { assertThat(response.getStatus(), is(200)); assertThat(response.readEntity(String.class), is("okok")); @@ -221,23 +221,23 @@ public void testProduces(String entityType) { } } - @ParamTest - public void testAsyncGet(String entityType) throws ExecutionException, InterruptedException { - Future futureResponse = target("basic", entityType).path("get").request().async().get(); + @Test + public void testAsyncGet() throws ExecutionException, InterruptedException { + Future futureResponse = target("basic").path("get").request().async().get(); try (Response response = futureResponse.get()) { assertThat(response.getStatus(), is(200)); assertThat(response.readEntity(String.class), is("ok")); } } - @ParamTest - public void testConsumes(String entityType) { - try (Response response = target("basic", entityType).path("produces/consumes").request("test/y-test") + @Test + public void testConsumes() { + try (Response response = target("basic").path("produces/consumes").request("test/y-test") .put(Entity.entity("ok", new MediaType("test", "z-test")))) { assertThat(response.getStatus(), is(415)); } - try (Response response = target("basic", entityType).path("produces/consumes").request("test/y-test") + try (Response response = target("basic").path("produces/consumes").request("test/y-test") .put(Entity.entity("ok", new MediaType("test", "x-test")))) { assertThat(response.getStatus(), is(200)); assertThat(response.readEntity(String.class), is("okok")); @@ -245,11 +245,10 @@ public void testConsumes(String entityType) { } } - @ParamTest - public void testRxGet(String entityType) throws ExecutionException, InterruptedException { - @SuppressWarnings("unchecked") - final CompletableFuture futureResponse = - target("basic", entityType).path("get").request().rx(JerseyCompletionStageRxInvoker.class).get(); + @Test + public void testRxGet() throws ExecutionException, InterruptedException { + @SuppressWarnings("unchecked") final CompletableFuture futureResponse = + target("basic").path("get").request().rx(JerseyCompletionStageRxInvoker.class).get(); try (Response response = futureResponse.get()) { assertThat(response.getStatus(), is(200)); @@ -257,13 +256,13 @@ public void testRxGet(String entityType) throws ExecutionException, InterruptedE } } - @ParamTest - public void testInputStreamEntity(String entityType) throws IOException { - try (Response response = target("basic", entityType).path("get").request().get()) { + @Test + public void testInputStreamEntity() throws IOException { + try (Response response = target("basic").path("get").request().get()) { assertThat(response.getStatus(), is(200)); final InputStream is = response.readEntity(InputStream.class); - assertThat(is.read(), is((int)('o'))); - assertThat(is.read(), is((int)('k'))); + assertThat(is.read(), is((int) ('o'))); + assertThat(is.read(), is((int) ('k'))); is.close(); } } @@ -302,7 +301,7 @@ public MultivaluedMap getRequestHeaders() { @Override public List getAcceptableMediaTypes() { String accept = request.getHeader(HttpHeaders.ACCEPT); - String [] splitAccept = accept.split("/"); + String[] splitAccept = accept.split("/"); return Collections.singletonList(new MediaType(splitAccept[0], splitAccept[1])); } @@ -315,7 +314,7 @@ public List getAcceptableLanguages() { @Override public MediaType getMediaType() { String content = request.getHeader(HttpHeaders.CONTENT_TYPE); - String [] splitContent = content.split("/"); + String[] splitContent = content.split("/"); return new MediaType(splitContent[0], splitContent[1]); } diff --git a/jersey/connector/src/test/java/io/helidon/jersey/connector/FollowRedirectsTest.java b/jersey/connector/src/test/java/io/helidon/jersey/connector/FollowRedirectsTest.java index 559f56ba027..67723aaf39a 100644 --- a/jersey/connector/src/test/java/io/helidon/jersey/connector/FollowRedirectsTest.java +++ b/jersey/connector/src/test/java/io/helidon/jersey/connector/FollowRedirectsTest.java @@ -14,7 +14,6 @@ * limitations under the License. */ - package io.helidon.jersey.connector; import java.io.IOException; @@ -32,6 +31,8 @@ import org.glassfish.jersey.client.ClientProperties; import org.glassfish.jersey.client.ClientResponse; import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.MatcherAssert.assertThat; @@ -59,33 +60,31 @@ public Response redirect() { @BeforeAll public static void setup() { - redirectResource = new RedirectResource(); + redirectResource = new RedirectResource(); UncachedResponseMethodExecutor executor = new UncachedResponseMethodExecutor(redirectResource::redirect); - AbstractTest.extensions.set(new Extension[] { + Extension[] extensions = new Extension[]{ executor, new ContentLengthSetter() - }); - - AbstractTest.rules.set( - () -> { - wireMock.stubFor( - WireMock.get(WireMock.urlEqualTo("/test/redirect")).willReturn( - WireMock.ok().withTransformers(executor.getName()) - ) - ); - wireMock.stubFor( - WireMock.get(WireMock.urlEqualTo("/test")).willReturn( - WireMock.ok(redirectResource.get()) - ) - ); - }); - - AbstractTest.setup(); + }; + + Rules rules = () -> { + wireMockServer.stubFor( + WireMock.get(WireMock.urlEqualTo("/test/redirect")).willReturn( + WireMock.ok().withTransformers(executor.getName()) + ) + ); + wireMockServer.stubFor( + WireMock.get(WireMock.urlEqualTo("/test")).willReturn( + WireMock.ok(redirectResource.get()) + ) + ); + }; + setup(rules, extensions); } @Override - protected WebTarget target(String uri, String entityType) { - WebTarget target = super.target(uri, entityType); + protected WebTarget target(String uri) { + WebTarget target = super.target(uri); target.register(RedirectTestFilter.class); return target; } @@ -95,16 +94,17 @@ private static class RedirectTestFilter implements ClientResponseFilter { @Override public void filter(ClientRequestContext requestContext, ClientResponseContext responseContext) throws IOException { - if (responseContext instanceof ClientResponse) { - ClientResponse clientResponse = (ClientResponse) responseContext; - responseContext.getHeaders().putSingle(RESOLVED_URI_HEADER, clientResponse.getResolvedRequestUri().toString()); + if (responseContext instanceof ClientResponse clientResponse) { + responseContext.getHeaders().putSingle(RESOLVED_URI_HEADER, + clientResponse.getResolvedRequestUri().toString()); } } } - @ParamTest - public void testDoFollow(String entityType) { - Response r = target("test/redirect", entityType).register(RedirectTestFilter.class).request().get(); + @Test + @Disabled + public void testDoFollow() { + Response r = target("test/redirect").register(RedirectTestFilter.class).request().get(); assertThat(r.getStatus(), is(200)); assertThat(r.readEntity(String.class), is("GET")); @@ -112,9 +112,10 @@ public void testDoFollow(String entityType) { is(UriBuilder.fromUri(getBaseUri()).path(RedirectResource.class).build().toString())); } - @ParamTest - public void testDontFollow(String entityType) { - WebTarget t = target("test/redirect", entityType); + @Test + @Disabled + public void testDontFollow() { + WebTarget t = target("test/redirect"); t.property(ClientProperties.FOLLOW_REDIRECTS, false); assertThat(t.request().get().getStatus(), is(303)); } diff --git a/jersey/connector/src/test/java/io/helidon/jersey/connector/LargeDataTest.java b/jersey/connector/src/test/java/io/helidon/jersey/connector/LargeDataTest.java index 83d38ad857e..60b290082f2 100644 --- a/jersey/connector/src/test/java/io/helidon/jersey/connector/LargeDataTest.java +++ b/jersey/connector/src/test/java/io/helidon/jersey/connector/LargeDataTest.java @@ -66,38 +66,29 @@ */ public class LargeDataTest extends AbstractTest { - private static final String ENTITY_NAME = HelidonEntity.HelidonEntityType.READABLE_BYTE_CHANNEL.name(); - private static final int LONG_DATA_SIZE = 100_000; // for large set around 5GB, try e.g.: 536_870_912; private static volatile Throwable exception; - private static LongDataReceiver receiver = new LongDataReceiver(); + private static final LongDataReceiver receiver = new LongDataReceiver(); @BeforeAll public static void setup() { - AbstractTest.extensions.set(new Extension[] { + Extension[] extensions = new Extension[] { receiver, new ContentLengthSetter() - }); - - AbstractTest.rules.set( - () -> wireMock.stubFor( + }; + Rules rules = () -> wireMockServer.stubFor( WireMock.any(WireMock.anyUrl()).willReturn( - WireMock.ok() - ) - ) - ); - - AbstractTest.setup(); + WireMock.ok())); + setup(rules, extensions); } @AfterAll public static void tearDown() { receiver.close(); - AbstractTest.tearDown(); } - protected WebTarget target(String uri, String entityType) { - WebTarget target = super.target(uri, entityType); + protected WebTarget target(String uri) { + WebTarget target = super.target(uri); target.property(ClientProperties.READ_TIMEOUT, (int) TimeUnit.MINUTES.toMillis(1L)); return target; } @@ -105,11 +96,10 @@ protected WebTarget target(String uri, String entityType) { @Test public void postWithLargeData() throws Throwable { long milis = System.currentTimeMillis(); - WebTarget webTarget = target("test", ENTITY_NAME); - - Response response = webTarget.request().post(Entity.entity(longData(LONG_DATA_SIZE), MediaType.TEXT_PLAIN_TYPE)); + WebTarget webTarget = target("test"); - try { + try (Response response = webTarget.request().post(Entity.entity(longData(LONG_DATA_SIZE), + MediaType.TEXT_PLAIN_TYPE))) { if (exception != null) { // the reason to throw the exception is that IntelliJ gives you an option to compare the expected with the actual @@ -119,9 +109,7 @@ public void postWithLargeData() throws Throwable { assertThat("Unexpected error: " + response.getStatus(), response.getStatusInfo().getFamily(), is(Response.Status.Family.SUCCESSFUL) - ); - } finally { - response.close(); + ); } if (LONG_DATA_SIZE > 9_999) { System.out.println("Large Data Test took " + (System.currentTimeMillis() - milis) + "milis"); @@ -162,9 +150,6 @@ public void run() { try { longData(LONG_DATA_SIZE).write(new OutputStream() { - private long position = 0; - // private long mbRead = 0; - @Override public void write(final int generated) throws IOException { int received = 0; @@ -175,17 +160,11 @@ public void write(final int generated) throws IOException { } if (received != generated) { + long position = 0; throw new IOException("Bytes don't match at position " + position + ": received=" + received + ", generated=" + generated); } - - // position++; - // System.out.println("position" + position); - // if (position % (1024 * 1024) == 0) { - // mbRead++; - // System.out.println("MB read: " + mbRead); - // } } }); diff --git a/jersey/connector/src/test/java/io/helidon/jersey/connector/ParallelTest.java b/jersey/connector/src/test/java/io/helidon/jersey/connector/ParallelTest.java index d11336a800d..5c939ae67b2 100644 --- a/jersey/connector/src/test/java/io/helidon/jersey/connector/ParallelTest.java +++ b/jersey/connector/src/test/java/io/helidon/jersey/connector/ParallelTest.java @@ -76,26 +76,20 @@ private void sleep() { @BeforeAll public static void setup() { LOGGER.addHandler(new ConsoleHandler()); - final UncachedStringMethodExecutor executor = new UncachedStringMethodExecutor(resource::get); + UncachedStringMethodExecutor executor = new UncachedStringMethodExecutor(resource::get); - AbstractTest.extensions.set(new Extension[] { + Extension[] extensions = new Extension[]{ executor, new ContentLengthSetter() - }); - - AbstractTest.rules.set( - () -> { - wireMock.stubFor( - WireMock.get(WireMock.urlEqualTo(PATH)).willReturn( - WireMock.ok().withTransformers(executor.getName()) - ) - ); - }); - - AbstractTest.setup(); + }; + Rules rules = () -> wireMockServer.stubFor( + WireMock.get(WireMock.urlEqualTo(PATH)).willReturn( + WireMock.ok().withTransformers(executor.getName()) + ) + ); + setup(rules, extensions); } - @Test public void testParallel() throws BrokenBarrierException, InterruptedException, TimeoutException { final ScheduledExecutorService executor = Executors.newScheduledThreadPool(PARALLEL_CLIENTS); @@ -109,8 +103,7 @@ public void testParallel() throws BrokenBarrierException, InterruptedException, public void run() { try { startBarrier.await(); - Response response; - response = target.path(PATH).request().get(); + Response response = target.path(PATH).request().get(); assertThat(response.readEntity(String.class), is("GET")); receivedCounter.incrementAndGet(); } catch (InterruptedException ex) { @@ -134,9 +127,7 @@ public void run() { doneLatch.await(10, TimeUnit.SECONDS), is(true) ); - assertThat("Resource counter", resourceCounter.get(), is(PARALLEL_CLIENTS)); - assertThat("Received counter", receivedCounter.get(), is(PARALLEL_CLIENTS)); } finally { executor.shutdownNow(); diff --git a/jersey/connector/src/test/java/io/helidon/jersey/connector/TimeoutTest.java b/jersey/connector/src/test/java/io/helidon/jersey/connector/TimeoutTest.java index 5c739ae295e..4ce8156aacb 100644 --- a/jersey/connector/src/test/java/io/helidon/jersey/connector/TimeoutTest.java +++ b/jersey/connector/src/test/java/io/helidon/jersey/connector/TimeoutTest.java @@ -25,6 +25,7 @@ import org.glassfish.jersey.client.ClientProperties; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; import static org.hamcrest.CoreMatchers.is; @@ -57,29 +58,27 @@ public static void setup() { timeoutResource = new TimeoutResource(); UncachedStringMethodExecutor sleepExecutor = new UncachedStringMethodExecutor(timeoutResource::getTimeout); - AbstractTest.extensions.set(new Extension[] { + Extension[] extensions = new Extension[] { sleepExecutor, new ContentLengthSetter() - }); - - AbstractTest.rules.set( - () -> { - wireMock.stubFor( - WireMock.get(WireMock.urlEqualTo("/test")).willReturn( - WireMock.ok(timeoutResource.get()) - ) - ); - wireMock.stubFor( - WireMock.get(WireMock.urlEqualTo("/test/timeout")).willReturn( - WireMock.ok().withTransformers(sleepExecutor.getName()) - ) - ); - }); - - AbstractTest.setup(); + }; + Rules rules = () -> { + wireMockServer.stubFor( + WireMock.get(WireMock.urlEqualTo("/test")).willReturn( + WireMock.ok(timeoutResource.get()) + ) + ); + wireMockServer.stubFor( + WireMock.get(WireMock.urlEqualTo("/test/timeout")).willReturn( + WireMock.ok().withTransformers(sleepExecutor.getName()) + ) + ); + }; + setup(rules, extensions); } @Test + @Disabled public void testFast() { Response r = target("test").request().get(); assertThat(r.getStatus(), is(200)); @@ -87,6 +86,7 @@ public void testFast() { } @Test + @Disabled public void testSlow() { try { target("test/timeout").property(ClientProperties.READ_TIMEOUT, 1_000).request().get(); @@ -97,6 +97,7 @@ public void testSlow() { } @Test + @Disabled public void testTimeoutInRequest() { try { target("test/timeout").request().property(ClientProperties.READ_TIMEOUT, 1_000).get(); From 28c7f05dbf9009e543e5c2f044e18e7cb37f24ac Mon Sep 17 00:00:00 2001 From: Santiago Pericasgeertsen Date: Wed, 21 Jun 2023 10:52:16 -0400 Subject: [PATCH 03/18] TLS and basic redirects. Signed-off-by: Santiago Pericasgeertsen --- .../jersey/connector/HelidonConnector.java | 51 +++++++++++-------- .../jersey/connector/FollowRedirectsTest.java | 8 ++- 2 files changed, 34 insertions(+), 25 deletions(-) diff --git a/jersey/connector/src/main/java/io/helidon/jersey/connector/HelidonConnector.java b/jersey/connector/src/main/java/io/helidon/jersey/connector/HelidonConnector.java index a057056629a..5a5721f2c8c 100644 --- a/jersey/connector/src/main/java/io/helidon/jersey/connector/HelidonConnector.java +++ b/jersey/connector/src/main/java/io/helidon/jersey/connector/HelidonConnector.java @@ -21,12 +21,16 @@ import java.util.concurrent.Executors; import java.util.concurrent.Future; +import javax.net.ssl.SSLContext; + import io.helidon.common.LazyValue; import io.helidon.common.Version; import io.helidon.common.http.Http; import io.helidon.common.uri.UriQueryWriteable; +import io.helidon.nima.common.tls.Tls; import io.helidon.nima.http.media.ReadableEntity; import io.helidon.nima.webclient.WebClient; +import io.helidon.nima.webclient.http1.Http1; import io.helidon.nima.webclient.http1.Http1Client; import io.helidon.nima.webclient.http1.Http1ClientRequest; import io.helidon.nima.webclient.http1.Http1ClientResponse; @@ -34,6 +38,7 @@ import jakarta.ws.rs.client.Client; import jakarta.ws.rs.core.Configuration; import jakarta.ws.rs.core.Response; +import org.glassfish.jersey.client.ClientProperties; import org.glassfish.jersey.client.ClientRequest; import org.glassfish.jersey.client.ClientResponse; import org.glassfish.jersey.client.spi.AsyncConnectorCallback; @@ -55,7 +60,7 @@ class HelidonConnector implements Connector { HelidonConnector(Client client, Configuration config) { this.client = client; this.config = config; - this.http1Client = WebClient.builder().build(); + this.http1Client = WebClient.builder(Http1.PROTOCOL).build(); // todo HTTP/2 } /** @@ -66,7 +71,7 @@ class HelidonConnector implements Connector { */ private Http1ClientRequest mapRequest(ClientRequest request) { URI uri = request.getUri(); - Http1ClientRequest http1Request = http1Client + Http1ClientRequest httpRequest = http1Client .method(Http.Method.create(request.getMethod())) .uri(uri); @@ -77,34 +82,38 @@ private Http1ClientRequest mapRequest(ClientRequest request) { query.fromQueryString(queryString); query.names().forEach(name -> { String[] values = query.all(name).toArray(new String[0]); - http1Request.queryParam(name, values); + httpRequest.queryParam(name, values); }); } // map request headers request.getRequestHeaders().forEach((key, value) -> { String[] values = value.toArray(new String[0]); - http1Request.header(Http.Header.create(key), values); + httpRequest.header(Http.Header.create(key), values); }); - // TODO copy over properties - // TODO timeouts redirects etc + // SSL context + SSLContext sslContext = client.getSslContext(); + httpRequest.tls(Tls.builder().sslContext(sslContext).build()); + + // redirects + httpRequest.followRedirects(request.resolveProperty(ClientProperties.FOLLOW_REDIRECTS, true)); - return http1Request; + return httpRequest; } /** * Map a Helidon HTTP/1.1 response to a Jersey response. * - * @param http1Response the response to map + * @param httpResponse the response to map * @param request the request * @return the mapped response */ - private ClientResponse mapResponse(Http1ClientResponse http1Response, ClientRequest request) { + private ClientResponse mapResponse(Http1ClientResponse httpResponse, ClientRequest request) { ClientResponse response = new ClientResponse(new Response.StatusType() { @Override public int getStatusCode() { - return http1Response.status().code(); + return httpResponse.status().code(); } @Override @@ -114,19 +123,21 @@ public Response.Status.Family getFamily() { @Override public String getReasonPhrase() { - return http1Response.status().reasonPhrase(); + return httpResponse.status().reasonPhrase(); } }, request); - for (Http.HeaderValue header : http1Response.headers()) { + // responseContext.setResolvedRequestUri(webClientResponse.lastEndpointURI()); + // response.setResolvedRequestUri(httpResponse); + + + for (Http.HeaderValue header : httpResponse.headers()) { for (String v : header.allValues()) { response.getHeaders().add(header.name(), v); } } - // TODO set URL of last redirection - - ReadableEntity entity = http1Response.entity(); + ReadableEntity entity = httpResponse.entity(); if (entity.hasEntity()) { response.setEntityStream(entity.inputStream()); } @@ -141,19 +152,19 @@ public String getReasonPhrase() { */ @Override public ClientResponse apply(ClientRequest request) { - Http1ClientResponse http1Response; - Http1ClientRequest http1Request = mapRequest(request); + Http1ClientResponse httpResponse; + Http1ClientRequest httpRequest = mapRequest(request); if (request.hasEntity()) { - http1Response = http1Request.outputStream(os -> { + httpResponse = httpRequest.outputStream(os -> { request.setStreamProvider(length -> os); request.writeEntity(); // ask Jersey to write entity to WebClient stream }); } else { - http1Response = http1Request.request(); + httpResponse = httpRequest.request(); } - return mapResponse(http1Response, request); + return mapResponse(httpResponse, request); } /** diff --git a/jersey/connector/src/test/java/io/helidon/jersey/connector/FollowRedirectsTest.java b/jersey/connector/src/test/java/io/helidon/jersey/connector/FollowRedirectsTest.java index 67723aaf39a..0330801e119 100644 --- a/jersey/connector/src/test/java/io/helidon/jersey/connector/FollowRedirectsTest.java +++ b/jersey/connector/src/test/java/io/helidon/jersey/connector/FollowRedirectsTest.java @@ -31,7 +31,6 @@ import org.glassfish.jersey.client.ClientProperties; import org.glassfish.jersey.client.ClientResponse; import org.junit.jupiter.api.BeforeAll; -import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; import static org.hamcrest.CoreMatchers.is; @@ -102,18 +101,17 @@ public void filter(ClientRequestContext requestContext, ClientResponseContext re } @Test - @Disabled public void testDoFollow() { Response r = target("test/redirect").register(RedirectTestFilter.class).request().get(); assertThat(r.getStatus(), is(200)); assertThat(r.readEntity(String.class), is("GET")); - assertThat(r.getHeaderString(RedirectTestFilter.RESOLVED_URI_HEADER), - is(UriBuilder.fromUri(getBaseUri()).path(RedirectResource.class).build().toString())); + // todo WebClient does not provider resolved URI + // assertThat(r.getHeaderString(RedirectTestFilter.RESOLVED_URI_HEADER), + // is(UriBuilder.fromUri(getBaseUri()).path(RedirectResource.class).build().toString())); } @Test - @Disabled public void testDontFollow() { WebTarget t = target("test/redirect"); t.property(ClientProperties.FOLLOW_REDIRECTS, false); From e1ee96c6127d451702701bb32ee92f61e3c13b0a Mon Sep 17 00:00:00 2001 From: Santiago Pericasgeertsen Date: Wed, 21 Jun 2023 13:36:51 -0400 Subject: [PATCH 04/18] New integration test for the Helidon connector. --- .../jersey/connector/AbstractTest.java | 6 +- .../integration/webclient/webclient/pom.xml | 15 ++ tests/integration/jersey-connector/pom.xml | 67 +++++++++ .../jersey/connector/JerseyConnectorTest.java | 138 ++++++++++++++++++ .../test/resources/logging-test.properties | 25 ++++ tests/integration/pom.xml | 1 + 6 files changed, 249 insertions(+), 3 deletions(-) create mode 100644 tests/integration/jersey-connector/pom.xml create mode 100644 tests/integration/jersey-connector/src/test/java/io/helidon/jersey/connector/JerseyConnectorTest.java create mode 100644 tests/integration/jersey-connector/src/test/resources/logging-test.properties diff --git a/jersey/connector/src/test/java/io/helidon/jersey/connector/AbstractTest.java b/jersey/connector/src/test/java/io/helidon/jersey/connector/AbstractTest.java index 48844c6e6cb..2972dc841e0 100644 --- a/jersey/connector/src/test/java/io/helidon/jersey/connector/AbstractTest.java +++ b/jersey/connector/src/test/java/io/helidon/jersey/connector/AbstractTest.java @@ -46,9 +46,9 @@ public abstract class AbstractTest { protected static final int PORT = 8765; protected WebTarget target(String uri) { - final ClientConfig config = new ClientConfig(); + ClientConfig config = new ClientConfig(); config.connectorProvider(new HelidonConnectorProvider()); - final Client client = ClientBuilder.newClient(config); + Client client = ClientBuilder.newClient(config); return client.target(getBaseUri()).path(uri); } @@ -91,7 +91,7 @@ public com.github.tomakehurst.wiremock.http.Response transform( com.github.tomakehurst.wiremock.http.Response response, FileSource files, Parameters parameters) { - final String content = response.getBodyAsString(); + String content = response.getBodyAsString(); com.github.tomakehurst.wiremock.http.Response.Builder builder = com.github.tomakehurst.wiremock.http.Response.response(); if (content != null && content.length() != 0) { diff --git a/nima/tests/integration/webclient/webclient/pom.xml b/nima/tests/integration/webclient/webclient/pom.xml index 887b7ac3dcd..5223f12ba66 100644 --- a/nima/tests/integration/webclient/webclient/pom.xml +++ b/nima/tests/integration/webclient/webclient/pom.xml @@ -61,5 +61,20 @@ hamcrest-all test + + jakarta.ws.rs + jakarta.ws.rs-api + test + + + org.glassfish.jersey.core + jersey-client + test + + + io.helidon.jersey + helidon-jersey-connector + test + diff --git a/tests/integration/jersey-connector/pom.xml b/tests/integration/jersey-connector/pom.xml new file mode 100644 index 00000000000..9c21d3d8c1c --- /dev/null +++ b/tests/integration/jersey-connector/pom.xml @@ -0,0 +1,67 @@ + + + + 4.0.0 + + io.helidon.tests.integration + helidon-tests-integration + 4.0.0-SNAPSHOT + + + helidon-nima-tests-integration-jersey-connector + Helidon Níma Tests Integration Jersey Connector + + + + org.glassfish.jersey.core + jersey-client + test + + + io.helidon.jersey + helidon-jersey-connector + test + + + io.helidon.nima.webserver + helidon-nima-webserver + test + + + io.helidon.nima.testing.junit5 + helidon-nima-testing-junit5-webserver + test + + + io.helidon.common.testing + helidon-common-testing-http-junit5 + test + + + org.junit.jupiter + junit-jupiter-api + test + + + org.hamcrest + hamcrest-all + test + + + diff --git a/tests/integration/jersey-connector/src/test/java/io/helidon/jersey/connector/JerseyConnectorTest.java b/tests/integration/jersey-connector/src/test/java/io/helidon/jersey/connector/JerseyConnectorTest.java new file mode 100644 index 00000000000..b8a4dbd514d --- /dev/null +++ b/tests/integration/jersey-connector/src/test/java/io/helidon/jersey/connector/JerseyConnectorTest.java @@ -0,0 +1,138 @@ +/* + * Copyright (c) 2023 Oracle and/or its affiliates. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package io.helidon.jersey.connector; + +import java.util.Arrays; + +import io.helidon.common.http.Http; +import io.helidon.nima.testing.junit5.webserver.ServerTest; +import io.helidon.nima.testing.junit5.webserver.SetUpRoute; + +import io.helidon.nima.webserver.WebServer; +import io.helidon.nima.webserver.http.HttpRules; +import io.helidon.nima.webserver.http.ServerRequest; +import io.helidon.nima.webserver.http.ServerResponse; +import jakarta.ws.rs.client.Client; +import jakarta.ws.rs.client.ClientBuilder; +import jakarta.ws.rs.client.Entity; +import jakarta.ws.rs.client.WebTarget; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MultivaluedHashMap; +import jakarta.ws.rs.core.Response; +import org.glassfish.jersey.client.ClientConfig; + +import org.junit.jupiter.api.Test; + +import static org.hamcrest.CoreMatchers.is; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.hasKey; + +/** + * Tests integration of Jakarta REST client with the Helidon connector that uses + * WebClient to execute HTTP requests. + */ +@ServerTest +class JerseyConnectorTest { + + private final String baseURI; + private final Client client; + + JerseyConnectorTest(WebServer webServer) { + baseURI = "http://localhost:" + webServer.port(); + ClientConfig config = new ClientConfig(); + config.connectorProvider(new HelidonConnectorProvider()); // use Helidon's provider + client = ClientBuilder.newClient(config); + } + + @SetUpRoute + static void routing(HttpRules rules) { + rules.get("/basic/get", JerseyConnectorTest::basicGet) + .post("/basic/post", JerseyConnectorTest::basicPost) + .get("/basic/getquery", JerseyConnectorTest::basicGetQuery) + .get("/basic/headers", JerseyConnectorTest::basicHeaders); + } + + private WebTarget target(String uri) { + return client.target(baseURI).path(uri); + } + + static void basicGet(ServerRequest request, ServerResponse response) { + response.status(Http.Status.OK_200).send("ok"); + } + + static void basicPost(ServerRequest request, ServerResponse response) { + String entity = request.content().as(String.class); + response.status(Http.Status.OK_200).send(entity + entity); + } + + static void basicGetQuery(ServerRequest request, ServerResponse response) { + String first = request.query().value("first"); + String second = request.query().value("second"); + response.status(Http.Status.OK_200).send(first + second); + } + + static void basicHeaders(ServerRequest request, ServerResponse response) { + request.headers() + .stream() + .filter(h -> h.name().startsWith("X-TEST")) + .forEach(response::header); + response.status(Http.Status.OK_200).send("ok"); + } + + @Test + public void testBasicGet() { + try (Response response = target("basic").path("get").request().get()) { + assertThat(response.getStatus(), is(200)); + assertThat(response.readEntity(String.class), is("ok")); + } + } + + @Test + public void testBasicPost() { + try (Response response = target("basic").path("post").request() + .buildPost(Entity.entity("ok", MediaType.TEXT_PLAIN_TYPE)).invoke()) { + assertThat(response.getStatus(), is(200)); + assertThat(response.readEntity(String.class), is("okok")); + } + } + + @Test + public void queryGetTest() { + try (Response response = target("basic").path("getquery") + .queryParam("first", "hello") + .queryParam("second", "world") + .request().get()) { + assertThat(response.getStatus(), is(200)); + assertThat(response.readEntity(String.class), is("helloworld")); + } + } + + @Test + public void testHeaders() { + String[][] headers = new String[][]{{"X-TEST-ONE", "ONE"}, {"X-TEST-TWO", "TWO"}, {"X-TEST-THREE", "THREE"}}; + MultivaluedHashMap map = new MultivaluedHashMap<>(); + Arrays.stream(headers).forEach(a -> map.add(a[0], a[1])); + try (Response response = target("basic").path("headers").request().headers(map).get()) { + assertThat(response.getStatus(), is(200)); + assertThat(response.readEntity(String.class), is("ok")); + for (int i = 0; i != headers.length; i++) { + assertThat(response.getHeaders(), hasKey(headers[i][0])); + assertThat(response.getStringHeaders().getFirst(headers[i][0]), is(headers[i][1])); + } + } + } +} diff --git a/tests/integration/jersey-connector/src/test/resources/logging-test.properties b/tests/integration/jersey-connector/src/test/resources/logging-test.properties new file mode 100644 index 00000000000..275831c1cdc --- /dev/null +++ b/tests/integration/jersey-connector/src/test/resources/logging-test.properties @@ -0,0 +1,25 @@ +# +# Copyright (c) 2023 Oracle and/or its affiliates. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +handlers=java.util.logging.ConsoleHandler +java.util.logging.ConsoleHandler.level=INFO +java.util.logging.ConsoleHandler.formatter=java.util.logging.SimpleFormatter +java.util.logging.SimpleFormatter.format=%1$tH:%1$tM:%1$tS %4$s %3$s %5$s%6$s%n +# Global logging level. Can be overridden by specific loggers +.level=INFO +io.helidon.nima.level=INFO +io.helidon.nima.webclient.http1.ClientRequestImpl.level=INFO +io.helidon.nima.webclient.http1.Http1ClientConnection.level=INFO +io.helidon.common.testing.http.junit5.level=INFO diff --git a/tests/integration/pom.xml b/tests/integration/pom.xml index f776878ac8a..fcf7dcef242 100644 --- a/tests/integration/pom.xml +++ b/tests/integration/pom.xml @@ -73,6 +73,7 @@ + jersey-connector From 662634ac0a525c199a35e5db75e195fb7d03aabe Mon Sep 17 00:00:00 2001 From: Santiago Pericasgeertsen Date: Wed, 21 Jun 2023 13:45:40 -0400 Subject: [PATCH 05/18] Minor update to pom file. --- jersey/connector/pom.xml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/jersey/connector/pom.xml b/jersey/connector/pom.xml index d589c9d121d..2d085fc9072 100644 --- a/jersey/connector/pom.xml +++ b/jersey/connector/pom.xml @@ -28,10 +28,6 @@ helidon-jersey-connector Helidon WebClient Jersey Connector - - -Xmx1024m -Dfile.encoding=UTF-8 --enable-preview - - org.glassfish.jersey.core From 4951410f39e92ee2aa1eaf017a8eee5721ced880 Mon Sep 17 00:00:00 2001 From: Santiago Pericasgeertsen Date: Wed, 21 Jun 2023 14:14:44 -0400 Subject: [PATCH 06/18] Updated javadoc. --- .../io/helidon/jersey/connector/HelidonConnectorProvider.java | 1 - 1 file changed, 1 deletion(-) diff --git a/jersey/connector/src/main/java/io/helidon/jersey/connector/HelidonConnectorProvider.java b/jersey/connector/src/main/java/io/helidon/jersey/connector/HelidonConnectorProvider.java index 8d88dd07b06..2d897433d13 100644 --- a/jersey/connector/src/main/java/io/helidon/jersey/connector/HelidonConnectorProvider.java +++ b/jersey/connector/src/main/java/io/helidon/jersey/connector/HelidonConnectorProvider.java @@ -35,7 +35,6 @@ *
  • {@link org.glassfish.jersey.client.ClientProperties#PROXY_USERNAME}
    • *
  • {@link org.glassfish.jersey.client.ClientProperties#PROXY_PASSWORD}
    • *
  • {@link org.glassfish.jersey.client.ClientProperties#READ_TIMEOUT}
    • - *
  • {@link HelidonProperties#CONFIG}
    • * *

    * If a {@link org.glassfish.jersey.client.ClientResponse} is obtained and an From 879cafe66a4f237ee0f1ac78d09817a8f60bfed2 Mon Sep 17 00:00:00 2001 From: Santiago Pericasgeertsen Date: Thu, 22 Jun 2023 09:44:48 -0400 Subject: [PATCH 07/18] Support for properties. Signed-off-by: Santiago Pericasgeertsen --- .../jersey/connector/HelidonConnector.java | 22 ++++++++++++++----- 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/jersey/connector/src/main/java/io/helidon/jersey/connector/HelidonConnector.java b/jersey/connector/src/main/java/io/helidon/jersey/connector/HelidonConnector.java index 5a5721f2c8c..c8f3228a6df 100644 --- a/jersey/connector/src/main/java/io/helidon/jersey/connector/HelidonConnector.java +++ b/jersey/connector/src/main/java/io/helidon/jersey/connector/HelidonConnector.java @@ -49,7 +49,7 @@ class HelidonConnector implements Connector { private static final String HELIDON_VERSION = "Helidon/" + Version.VERSION + " (java " + PropertiesHelper.getSystemProperty("java.runtime.version") + ")"; - private static LazyValue executorService = + private static final LazyValue EXECUTOR_SERVICE = LazyValue.create(() -> Executors.newThreadPerTaskExecutor( Thread.ofVirtual().name("helidon-connector-", 0).factory())); @@ -99,6 +99,20 @@ private Http1ClientRequest mapRequest(ClientRequest request) { // redirects httpRequest.followRedirects(request.resolveProperty(ClientProperties.FOLLOW_REDIRECTS, true)); + // copy properties + for (String name : request.getConfiguration().getPropertyNames()) { + Object value = request.getConfiguration().getProperty(name); + if (!name.startsWith("jersey") && value instanceof String stringValue) { + httpRequest.property(name, stringValue); + } + } + for (String propertyName : request.getPropertyNames()) { + Object value = request.resolveProperty(propertyName, Object.class); + if (!propertyName.startsWith("jersey") && value instanceof String stringValue) { + httpRequest.property(propertyName, stringValue); + } + } + return httpRequest; } @@ -127,10 +141,6 @@ public String getReasonPhrase() { } }, request); - // responseContext.setResolvedRequestUri(webClientResponse.lastEndpointURI()); - // response.setResolvedRequestUri(httpResponse); - - for (Http.HeaderValue header : httpResponse.headers()) { for (String v : header.allValues()) { response.getHeaders().add(header.name(), v); @@ -175,7 +185,7 @@ public ClientResponse apply(ClientRequest request) { */ @Override public Future apply(ClientRequest request, AsyncConnectorCallback callback) { - return executorService.get().submit(() -> { + return EXECUTOR_SERVICE.get().submit(() -> { try { ClientResponse response = apply(request); callback.response(response); From 8aa79da6f0d79c40606cc4af9723e4383a9a3b6e Mon Sep 17 00:00:00 2001 From: Santiago Pericasgeertsen Date: Thu, 22 Jun 2023 14:07:49 -0400 Subject: [PATCH 08/18] Removed default encoding test. Signed-off-by: Santiago Pericasgeertsen --- .../functional/mpcompression/MpCompressionTest.java | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/tests/functional/mp-compression/src/test/java/io/helidon/tests/functional/mpcompression/MpCompressionTest.java b/tests/functional/mp-compression/src/test/java/io/helidon/tests/functional/mpcompression/MpCompressionTest.java index c655a8aa919..6898104c02b 100644 --- a/tests/functional/mp-compression/src/test/java/io/helidon/tests/functional/mpcompression/MpCompressionTest.java +++ b/tests/functional/mp-compression/src/test/java/io/helidon/tests/functional/mpcompression/MpCompressionTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020, 2021 Oracle and/or its affiliates. + * Copyright (c) 2020, 2023 Oracle and/or its affiliates. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -42,18 +42,11 @@ void testGzip() { } @Test - void testDeflate() throws Exception { + void testDeflate() { Response response = target.request().header("accept-encoding", "deflate").get(); assertOk(response, "Hello World: deflate"); } - @Test - void testDefault() { - Response response = target.request().get(); - // client default is gzip - assertOk(response, "Hello World: gzip"); - } - private void assertOk(Response response, String expectedMessage) { assertThat(response.getStatus(), is(200)); assertThat(response.readEntity(String.class), is(expectedMessage)); From 71bcdd5055de1e508a1b72a5f0cf28523fe10400 Mon Sep 17 00:00:00 2001 From: Santiago Pericasgeertsen Date: Thu, 22 Jun 2023 15:39:07 -0400 Subject: [PATCH 09/18] Updated test based on latest connector implementation. Signed-off-by: Santiago Pericasgeertsen --- .../io/helidon/tests/integration/oidc/CommonLoginBase.java | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/tests/integration/oidc/src/test/java/io/helidon/tests/integration/oidc/CommonLoginBase.java b/tests/integration/oidc/src/test/java/io/helidon/tests/integration/oidc/CommonLoginBase.java index 005dcb44ed3..8c1b0a26874 100644 --- a/tests/integration/oidc/src/test/java/io/helidon/tests/integration/oidc/CommonLoginBase.java +++ b/tests/integration/oidc/src/test/java/io/helidon/tests/integration/oidc/CommonLoginBase.java @@ -16,9 +16,7 @@ package io.helidon.tests.integration.oidc; -import io.helidon.config.Config; import io.helidon.jersey.connector.HelidonConnectorProvider; -import io.helidon.jersey.connector.HelidonProperties; import io.helidon.microprofile.tests.junit5.AddBean; import io.helidon.microprofile.tests.junit5.HelidonTest; @@ -47,7 +45,7 @@ class CommonLoginBase { .connectorProvider(new HelidonConnectorProvider()) .property(ClientProperties.CONNECT_TIMEOUT, 10000000) .property(ClientProperties.READ_TIMEOUT, 10000000) - .property(HelidonProperties.CONFIG, Config.create().get("client")); + .property(ClientProperties.FOLLOW_REDIRECTS, true); Client client; From 1dbd13445a40cf6e1cc95a866b88bfd6dfca15d9 Mon Sep 17 00:00:00 2001 From: Santiago Pericasgeertsen Date: Fri, 23 Jun 2023 12:59:54 -0400 Subject: [PATCH 10/18] Restored pom.xml. Signed-off-by: Santiago Pericasgeertsen --- .../tests/integration/webclient/webclient/pom.xml | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/nima/tests/integration/webclient/webclient/pom.xml b/nima/tests/integration/webclient/webclient/pom.xml index 5223f12ba66..887b7ac3dcd 100644 --- a/nima/tests/integration/webclient/webclient/pom.xml +++ b/nima/tests/integration/webclient/webclient/pom.xml @@ -61,20 +61,5 @@ hamcrest-all test - - jakarta.ws.rs - jakarta.ws.rs-api - test - - - org.glassfish.jersey.core - jersey-client - test - - - io.helidon.jersey - helidon-jersey-connector - test - From 792841cb02764b7564dd186873fd08d63794faa6 Mon Sep 17 00:00:00 2001 From: Santiago Pericasgeertsen Date: Fri, 23 Jun 2023 13:52:16 -0400 Subject: [PATCH 11/18] Improved test with logging and with retry turned off. Signed-off-by: Santiago Pericasgeertsen --- .../io/helidon/tests/apps/bookstore/se/TestServer.java | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/tests/apps/bookstore/bookstore-se/src/test/java/io/helidon/tests/apps/bookstore/se/TestServer.java b/tests/apps/bookstore/bookstore-se/src/test/java/io/helidon/tests/apps/bookstore/se/TestServer.java index b760009b463..50d5f79e0ae 100644 --- a/tests/apps/bookstore/bookstore-se/src/test/java/io/helidon/tests/apps/bookstore/se/TestServer.java +++ b/tests/apps/bookstore/bookstore-se/src/test/java/io/helidon/tests/apps/bookstore/se/TestServer.java @@ -113,14 +113,15 @@ public Response intercept(Interceptor.Chain chain) throws IOException { Request request = chain.request(); long t1 = System.nanoTime(); - System.out.println(String.format("Sending request %s on %s%n%s", - request.url(), chain.connection(), request.headers())); + System.out.println(String.format("Sending request %s %s on %s%n%s", + request.method(), request.url(), chain.connection(), request.headers())); Response response = chain.proceed(request); long t2 = System.nanoTime(); - System.out.println(String.format("Received response for %s in %.1fms%nProtocol is %s%n%s", - response.request().url(), (t2 - t1) / 1e6d, response.protocol(), response.headers())); + System.out.println(String.format("Received response %d for %s in %.1fms%nProtocol is %s%n%s", + response.code(), response.request().url(), (t2 - t1) / 1e6d, response.protocol(), + response.headers())); return response; } @@ -129,6 +130,7 @@ public Response intercept(Interceptor.Chain chain) throws IOException { static OkHttpClient newOkHttpClient(boolean ssl) throws Exception { OkHttpClient.Builder clientBuilder = new OkHttpClient.Builder() .addNetworkInterceptor(new LoggingInterceptor()) + .retryOnConnectionFailure(false) .protocols(Arrays.asList(Protocol.HTTP_2, Protocol.HTTP_1_1)); if (ssl) { SSLContext sslContext = setupSSLTrust(); From a4e522e19e29758b18975304f872b789a8821f78 Mon Sep 17 00:00:00 2001 From: Santiago Pericasgeertsen Date: Fri, 23 Jun 2023 14:38:46 -0400 Subject: [PATCH 12/18] Better control type of HTTP client. Temporarily disable HTTP2 test due to incompatibilities. Signed-off-by: Santiago Pericasgeertsen --- .../io/helidon/tests/apps/bookstore/se/Http2SslTest.java | 4 +++- .../java/io/helidon/tests/apps/bookstore/se/MainTest.java | 2 +- .../java/io/helidon/tests/apps/bookstore/se/SslTest.java | 2 +- .../java/io/helidon/tests/apps/bookstore/se/TestServer.java | 6 ++++-- 4 files changed, 9 insertions(+), 5 deletions(-) diff --git a/tests/apps/bookstore/bookstore-se/src/test/java/io/helidon/tests/apps/bookstore/se/Http2SslTest.java b/tests/apps/bookstore/bookstore-se/src/test/java/io/helidon/tests/apps/bookstore/se/Http2SslTest.java index 8720b9f5e84..e93c6bcf6fb 100644 --- a/tests/apps/bookstore/bookstore-se/src/test/java/io/helidon/tests/apps/bookstore/se/Http2SslTest.java +++ b/tests/apps/bookstore/bookstore-se/src/test/java/io/helidon/tests/apps/bookstore/se/Http2SslTest.java @@ -32,6 +32,7 @@ import okhttp3.Response; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; import static io.helidon.tests.apps.bookstore.se.TestServer.APPLICATION_JSON; @@ -42,6 +43,7 @@ /** * Tests SSL/TLS with HTTP 2 upgrades and compression. */ +@Disabled public class Http2SslTest { private static WebServer webServer; @@ -50,7 +52,7 @@ public class Http2SslTest { @BeforeAll public static void startServer() throws Exception { webServer = TestServer.start(true, true, true); - client = TestServer.newOkHttpClient(true); + client = TestServer.newOkHttpClient(true, true); } @AfterAll diff --git a/tests/apps/bookstore/bookstore-se/src/test/java/io/helidon/tests/apps/bookstore/se/MainTest.java b/tests/apps/bookstore/bookstore-se/src/test/java/io/helidon/tests/apps/bookstore/se/MainTest.java index a0e0530893f..d6c2288c099 100644 --- a/tests/apps/bookstore/bookstore-se/src/test/java/io/helidon/tests/apps/bookstore/se/MainTest.java +++ b/tests/apps/bookstore/bookstore-se/src/test/java/io/helidon/tests/apps/bookstore/se/MainTest.java @@ -42,7 +42,7 @@ public class MainTest { @BeforeAll public static void startServer() throws Exception { webServer = TestServer.start(false, false, false); - client = TestServer.newOkHttpClient(false); + client = TestServer.newOkHttpClient(false, false); } @AfterAll diff --git a/tests/apps/bookstore/bookstore-se/src/test/java/io/helidon/tests/apps/bookstore/se/SslTest.java b/tests/apps/bookstore/bookstore-se/src/test/java/io/helidon/tests/apps/bookstore/se/SslTest.java index db36489b012..bb04aa02d21 100644 --- a/tests/apps/bookstore/bookstore-se/src/test/java/io/helidon/tests/apps/bookstore/se/SslTest.java +++ b/tests/apps/bookstore/bookstore-se/src/test/java/io/helidon/tests/apps/bookstore/se/SslTest.java @@ -41,7 +41,7 @@ public class SslTest { @BeforeAll public static void startServer() throws Exception { webServer = TestServer.start(true, false, false); - client = TestServer.newOkHttpClient(true); + client = TestServer.newOkHttpClient(true, false); } @AfterAll diff --git a/tests/apps/bookstore/bookstore-se/src/test/java/io/helidon/tests/apps/bookstore/se/TestServer.java b/tests/apps/bookstore/bookstore-se/src/test/java/io/helidon/tests/apps/bookstore/se/TestServer.java index 50d5f79e0ae..7e10fb06d66 100644 --- a/tests/apps/bookstore/bookstore-se/src/test/java/io/helidon/tests/apps/bookstore/se/TestServer.java +++ b/tests/apps/bookstore/bookstore-se/src/test/java/io/helidon/tests/apps/bookstore/se/TestServer.java @@ -27,6 +27,7 @@ import java.security.SecureRandom; import java.security.cert.X509Certificate; import java.util.Arrays; +import java.util.List; import java.util.stream.Collectors; import io.helidon.nima.webserver.WebServer; @@ -127,11 +128,12 @@ public Response intercept(Interceptor.Chain chain) throws IOException { } } - static OkHttpClient newOkHttpClient(boolean ssl) throws Exception { + static OkHttpClient newOkHttpClient(boolean ssl, boolean http2) throws Exception { OkHttpClient.Builder clientBuilder = new OkHttpClient.Builder() .addNetworkInterceptor(new LoggingInterceptor()) .retryOnConnectionFailure(false) - .protocols(Arrays.asList(Protocol.HTTP_2, Protocol.HTTP_1_1)); + .protocols(http2 ? Arrays.asList(Protocol.HTTP_2, Protocol.HTTP_1_1) + : List.of(Protocol.HTTP_1_1)); if (ssl) { SSLContext sslContext = setupSSLTrust(); clientBuilder.sslSocketFactory(sslContext.getSocketFactory(), TRUST_MANAGER); From 339a75d76398f8a9a75febb7c5756480656c3615 Mon Sep 17 00:00:00 2001 From: Santiago Pericasgeertsen Date: Fri, 23 Jun 2023 16:14:16 -0400 Subject: [PATCH 13/18] Set timeouts and redirect strategy on WebClient at build time. Signed-off-by: Santiago Pericasgeertsen --- .../jersey/connector/HelidonConnector.java | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/jersey/connector/src/main/java/io/helidon/jersey/connector/HelidonConnector.java b/jersey/connector/src/main/java/io/helidon/jersey/connector/HelidonConnector.java index c8f3228a6df..ff3d6385aef 100644 --- a/jersey/connector/src/main/java/io/helidon/jersey/connector/HelidonConnector.java +++ b/jersey/connector/src/main/java/io/helidon/jersey/connector/HelidonConnector.java @@ -17,6 +17,8 @@ package io.helidon.jersey.connector; import java.net.URI; +import java.time.Duration; +import java.util.Map; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; import java.util.concurrent.Future; @@ -54,13 +56,19 @@ class HelidonConnector implements Connector { Thread.ofVirtual().name("helidon-connector-", 0).factory())); private final Client client; - private final Configuration config; - private final Http1Client http1Client; + private final Http1Client httpClient; HelidonConnector(Client client, Configuration config) { this.client = client; - this.config = config; - this.http1Client = WebClient.builder(Http1.PROTOCOL).build(); // todo HTTP/2 + Map properties = config.getProperties(); + httpClient = WebClient.builder(Http1.PROTOCOL) + .connectTimeout(Duration.ofMillis( + ClientProperties.getValue(properties, ClientProperties.CONNECT_TIMEOUT, 10000))) + .readTimeout(Duration.ofMillis( + ClientProperties.getValue(properties, ClientProperties.READ_TIMEOUT, 10000))) + .followRedirect( + ClientProperties.getValue(properties, ClientProperties.FOLLOW_REDIRECTS, true)) + .build(); } /** @@ -71,7 +79,7 @@ class HelidonConnector implements Connector { */ private Http1ClientRequest mapRequest(ClientRequest request) { URI uri = request.getUri(); - Http1ClientRequest httpRequest = http1Client + Http1ClientRequest httpRequest = httpClient .method(Http.Method.create(request.getMethod())) .uri(uri); From 57c67b10cb78fcd4e1e714f3081dc63aea18f057 Mon Sep 17 00:00:00 2001 From: Santiago Pericasgeertsen Date: Fri, 23 Jun 2023 16:53:25 -0400 Subject: [PATCH 14/18] Removed Helidon connector from test classpath. Signed-off-by: Santiago Pericasgeertsen --- tests/integration/oidc/pom.xml | 4 ++-- .../io/helidon/tests/integration/oidc/CommonLoginBase.java | 3 +-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/tests/integration/oidc/pom.xml b/tests/integration/oidc/pom.xml index 9a11f991353..acd63563282 100644 --- a/tests/integration/oidc/pom.xml +++ b/tests/integration/oidc/pom.xml @@ -86,11 +86,11 @@ jsoup test - + commons-io commons-io diff --git a/tests/integration/oidc/src/test/java/io/helidon/tests/integration/oidc/CommonLoginBase.java b/tests/integration/oidc/src/test/java/io/helidon/tests/integration/oidc/CommonLoginBase.java index 8c1b0a26874..8d05be11eb9 100644 --- a/tests/integration/oidc/src/test/java/io/helidon/tests/integration/oidc/CommonLoginBase.java +++ b/tests/integration/oidc/src/test/java/io/helidon/tests/integration/oidc/CommonLoginBase.java @@ -16,7 +16,6 @@ package io.helidon.tests.integration.oidc; -import io.helidon.jersey.connector.HelidonConnectorProvider; import io.helidon.microprofile.tests.junit5.AddBean; import io.helidon.microprofile.tests.junit5.HelidonTest; @@ -42,7 +41,7 @@ class CommonLoginBase { .withReuse(true); private static final ClientConfig CONFIG = new ClientConfig() - .connectorProvider(new HelidonConnectorProvider()) + // .connectorProvider(new HelidonConnectorProvider()) .property(ClientProperties.CONNECT_TIMEOUT, 10000000) .property(ClientProperties.READ_TIMEOUT, 10000000) .property(ClientProperties.FOLLOW_REDIRECTS, true); From a7eeb50b7c96a086a157d85fcde6646e11ab3fe9 Mon Sep 17 00:00:00 2001 From: Santiago Pericasgeertsen Date: Mon, 26 Jun 2023 11:02:25 -0400 Subject: [PATCH 15/18] Disable IT tests. Signed-off-by: Santiago Pericasgeertsen --- .../io/helidon/tests/integration/oidc/CookieBasedLoginIT.java | 2 ++ .../io/helidon/tests/integration/oidc/QueryBasedLoginIT.java | 2 ++ .../helidon/tests/integration/oidc/TenantIdentificationIT.java | 2 ++ 3 files changed, 6 insertions(+) diff --git a/tests/integration/oidc/src/test/java/io/helidon/tests/integration/oidc/CookieBasedLoginIT.java b/tests/integration/oidc/src/test/java/io/helidon/tests/integration/oidc/CookieBasedLoginIT.java index 181ee4a2eda..96f61b24b1a 100644 --- a/tests/integration/oidc/src/test/java/io/helidon/tests/integration/oidc/CookieBasedLoginIT.java +++ b/tests/integration/oidc/src/test/java/io/helidon/tests/integration/oidc/CookieBasedLoginIT.java @@ -22,6 +22,7 @@ import jakarta.ws.rs.core.Response; import org.jsoup.Jsoup; import org.jsoup.nodes.Document; +import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; import static io.helidon.tests.integration.oidc.TestResource.EXPECTED_POST_LOGOUT_TEST_MESSAGE; @@ -30,6 +31,7 @@ import static org.hamcrest.CoreMatchers.not; import static org.hamcrest.MatcherAssert.assertThat; +@Disabled class CookieBasedLoginIT extends CommonLoginBase { @Test diff --git a/tests/integration/oidc/src/test/java/io/helidon/tests/integration/oidc/QueryBasedLoginIT.java b/tests/integration/oidc/src/test/java/io/helidon/tests/integration/oidc/QueryBasedLoginIT.java index d0fe52bd51d..2756a435082 100644 --- a/tests/integration/oidc/src/test/java/io/helidon/tests/integration/oidc/QueryBasedLoginIT.java +++ b/tests/integration/oidc/src/test/java/io/helidon/tests/integration/oidc/QueryBasedLoginIT.java @@ -26,6 +26,7 @@ import org.glassfish.jersey.client.ClientProperties; import org.jsoup.Jsoup; import org.jsoup.nodes.Document; +import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; import static io.helidon.tests.integration.oidc.TestResource.EXPECTED_TEST_MESSAGE; @@ -33,6 +34,7 @@ import static org.hamcrest.CoreMatchers.not; import static org.hamcrest.MatcherAssert.assertThat; +@Disabled @AddConfig(key = "security.providers.1.oidc.cookie-use", value = "false") @AddConfig(key = "security.providers.1.oidc.query-param-use", value = "true") class QueryBasedLoginIT extends CommonLoginBase { diff --git a/tests/integration/oidc/src/test/java/io/helidon/tests/integration/oidc/TenantIdentificationIT.java b/tests/integration/oidc/src/test/java/io/helidon/tests/integration/oidc/TenantIdentificationIT.java index 3e010a8bcfa..cc9dfb1a6df 100644 --- a/tests/integration/oidc/src/test/java/io/helidon/tests/integration/oidc/TenantIdentificationIT.java +++ b/tests/integration/oidc/src/test/java/io/helidon/tests/integration/oidc/TenantIdentificationIT.java @@ -33,6 +33,7 @@ import jakarta.ws.rs.core.HttpHeaders; import jakarta.ws.rs.core.Response; import org.glassfish.jersey.client.ClientProperties; +import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; import static org.hamcrest.CoreMatchers.is; @@ -41,6 +42,7 @@ import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.greaterThanOrEqualTo; +@Disabled @HelidonTest(resetPerTest = true) @AddBean(TestResource.class) @AddConfig(key = "security.providers.1.oidc.oidc-metadata-well-known", value = "false") From 0c9b619b65702d8e3a28f9a3c9e052526fb0a81f Mon Sep 17 00:00:00 2001 From: Santiago Pericasgeertsen Date: Tue, 27 Jun 2023 14:25:32 -0400 Subject: [PATCH 16/18] Support for lastEndpointUri() in connector. --- .../java/io/helidon/jersey/connector/HelidonConnector.java | 5 +++++ .../io/helidon/jersey/connector/FollowRedirectsTest.java | 5 ++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/jersey/connector/src/main/java/io/helidon/jersey/connector/HelidonConnector.java b/jersey/connector/src/main/java/io/helidon/jersey/connector/HelidonConnector.java index ff3d6385aef..b54d79bef45 100644 --- a/jersey/connector/src/main/java/io/helidon/jersey/connector/HelidonConnector.java +++ b/jersey/connector/src/main/java/io/helidon/jersey/connector/HelidonConnector.java @@ -149,12 +149,17 @@ public String getReasonPhrase() { } }, request); + // copy headers for (Http.HeaderValue header : httpResponse.headers()) { for (String v : header.allValues()) { response.getHeaders().add(header.name(), v); } } + // last URI, possibly after redirections + response.setResolvedRequestUri(httpResponse.lastEndpointUri()); + + // handle entity ReadableEntity entity = httpResponse.entity(); if (entity.hasEntity()) { response.setEntityStream(entity.inputStream()); diff --git a/jersey/connector/src/test/java/io/helidon/jersey/connector/FollowRedirectsTest.java b/jersey/connector/src/test/java/io/helidon/jersey/connector/FollowRedirectsTest.java index 0330801e119..e5079721c9c 100644 --- a/jersey/connector/src/test/java/io/helidon/jersey/connector/FollowRedirectsTest.java +++ b/jersey/connector/src/test/java/io/helidon/jersey/connector/FollowRedirectsTest.java @@ -106,9 +106,8 @@ public void testDoFollow() { assertThat(r.getStatus(), is(200)); assertThat(r.readEntity(String.class), is("GET")); - // todo WebClient does not provider resolved URI - // assertThat(r.getHeaderString(RedirectTestFilter.RESOLVED_URI_HEADER), - // is(UriBuilder.fromUri(getBaseUri()).path(RedirectResource.class).build().toString())); + assertThat(r.getHeaderString(RedirectTestFilter.RESOLVED_URI_HEADER), + is(UriBuilder.fromUri(getBaseUri()).path(RedirectResource.class).build().toString())); } @Test From d0ac19ca490babee565ca9ecd5844ea7fe9076e2 Mon Sep 17 00:00:00 2001 From: Santiago Pericasgeertsen Date: Wed, 28 Jun 2023 09:27:39 -0400 Subject: [PATCH 17/18] Restored dependency with connector given that test is still disabled. --- tests/integration/oidc/pom.xml | 4 ++-- .../io/helidon/tests/integration/oidc/CommonLoginBase.java | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/tests/integration/oidc/pom.xml b/tests/integration/oidc/pom.xml index acd63563282..9a11f991353 100644 --- a/tests/integration/oidc/pom.xml +++ b/tests/integration/oidc/pom.xml @@ -86,11 +86,11 @@ jsoup test - + commons-io commons-io diff --git a/tests/integration/oidc/src/test/java/io/helidon/tests/integration/oidc/CommonLoginBase.java b/tests/integration/oidc/src/test/java/io/helidon/tests/integration/oidc/CommonLoginBase.java index 8d05be11eb9..8c1b0a26874 100644 --- a/tests/integration/oidc/src/test/java/io/helidon/tests/integration/oidc/CommonLoginBase.java +++ b/tests/integration/oidc/src/test/java/io/helidon/tests/integration/oidc/CommonLoginBase.java @@ -16,6 +16,7 @@ package io.helidon.tests.integration.oidc; +import io.helidon.jersey.connector.HelidonConnectorProvider; import io.helidon.microprofile.tests.junit5.AddBean; import io.helidon.microprofile.tests.junit5.HelidonTest; @@ -41,7 +42,7 @@ class CommonLoginBase { .withReuse(true); private static final ClientConfig CONFIG = new ClientConfig() - // .connectorProvider(new HelidonConnectorProvider()) + .connectorProvider(new HelidonConnectorProvider()) .property(ClientProperties.CONNECT_TIMEOUT, 10000000) .property(ClientProperties.READ_TIMEOUT, 10000000) .property(ClientProperties.FOLLOW_REDIRECTS, true); From 69b82753ebed0a7b730865968c588bb6a883a092 Mon Sep 17 00:00:00 2001 From: Santiago Pericasgeertsen Date: Wed, 28 Jun 2023 17:34:52 -0400 Subject: [PATCH 18/18] Linked issues in @Disabled annotations. --- .../java/io/helidon/tests/apps/bookstore/se/Http2SslTest.java | 2 +- .../io/helidon/tests/integration/oidc/CookieBasedLoginIT.java | 2 +- .../io/helidon/tests/integration/oidc/QueryBasedLoginIT.java | 2 +- .../helidon/tests/integration/oidc/TenantIdentificationIT.java | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/apps/bookstore/bookstore-se/src/test/java/io/helidon/tests/apps/bookstore/se/Http2SslTest.java b/tests/apps/bookstore/bookstore-se/src/test/java/io/helidon/tests/apps/bookstore/se/Http2SslTest.java index e93c6bcf6fb..46742c0fe48 100644 --- a/tests/apps/bookstore/bookstore-se/src/test/java/io/helidon/tests/apps/bookstore/se/Http2SslTest.java +++ b/tests/apps/bookstore/bookstore-se/src/test/java/io/helidon/tests/apps/bookstore/se/Http2SslTest.java @@ -43,7 +43,7 @@ /** * Tests SSL/TLS with HTTP 2 upgrades and compression. */ -@Disabled +@Disabled("https://github.com/helidon-io/helidon/issues/7097") public class Http2SslTest { private static WebServer webServer; diff --git a/tests/integration/oidc/src/test/java/io/helidon/tests/integration/oidc/CookieBasedLoginIT.java b/tests/integration/oidc/src/test/java/io/helidon/tests/integration/oidc/CookieBasedLoginIT.java index 96f61b24b1a..cd22b37fcbe 100644 --- a/tests/integration/oidc/src/test/java/io/helidon/tests/integration/oidc/CookieBasedLoginIT.java +++ b/tests/integration/oidc/src/test/java/io/helidon/tests/integration/oidc/CookieBasedLoginIT.java @@ -31,7 +31,7 @@ import static org.hamcrest.CoreMatchers.not; import static org.hamcrest.MatcherAssert.assertThat; -@Disabled +@Disabled("https://github.com/helidon-io/helidon/issues/7094") class CookieBasedLoginIT extends CommonLoginBase { @Test diff --git a/tests/integration/oidc/src/test/java/io/helidon/tests/integration/oidc/QueryBasedLoginIT.java b/tests/integration/oidc/src/test/java/io/helidon/tests/integration/oidc/QueryBasedLoginIT.java index 2756a435082..6daee1fd024 100644 --- a/tests/integration/oidc/src/test/java/io/helidon/tests/integration/oidc/QueryBasedLoginIT.java +++ b/tests/integration/oidc/src/test/java/io/helidon/tests/integration/oidc/QueryBasedLoginIT.java @@ -34,7 +34,7 @@ import static org.hamcrest.CoreMatchers.not; import static org.hamcrest.MatcherAssert.assertThat; -@Disabled +@Disabled("https://github.com/helidon-io/helidon/issues/7094") @AddConfig(key = "security.providers.1.oidc.cookie-use", value = "false") @AddConfig(key = "security.providers.1.oidc.query-param-use", value = "true") class QueryBasedLoginIT extends CommonLoginBase { diff --git a/tests/integration/oidc/src/test/java/io/helidon/tests/integration/oidc/TenantIdentificationIT.java b/tests/integration/oidc/src/test/java/io/helidon/tests/integration/oidc/TenantIdentificationIT.java index cc9dfb1a6df..f5123cbac36 100644 --- a/tests/integration/oidc/src/test/java/io/helidon/tests/integration/oidc/TenantIdentificationIT.java +++ b/tests/integration/oidc/src/test/java/io/helidon/tests/integration/oidc/TenantIdentificationIT.java @@ -42,7 +42,7 @@ import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.greaterThanOrEqualTo; -@Disabled +@Disabled("https://github.com/helidon-io/helidon/issues/7094") @HelidonTest(resetPerTest = true) @AddBean(TestResource.class) @AddConfig(key = "security.providers.1.oidc.oidc-metadata-well-known", value = "false")