From 30dd2c1f4ec1563459974ac3e9dc72a31436648f Mon Sep 17 00:00:00 2001 From: Maxim Nesen Date: Thu, 17 Aug 2023 12:44:46 +0200 Subject: [PATCH] resticting access Signed-off-by: Maxim Nesen --- .../jersey/jetty/connector/JettyConnector.java | 10 +++++----- .../http2/connector/JettyHttp2ClientSupplier.java | 2 +- .../jetty/http2/connector/JettyHttp2Connector.java | 8 ++++---- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/connectors/jetty-connector/src/main/java/org/glassfish/jersey/jetty/connector/JettyConnector.java b/connectors/jetty-connector/src/main/java/org/glassfish/jersey/jetty/connector/JettyConnector.java index b6bb917974..c8df611304 100644 --- a/connectors/jetty-connector/src/main/java/org/glassfish/jersey/jetty/connector/JettyConnector.java +++ b/connectors/jetty-connector/src/main/java/org/glassfish/jersey/jetty/connector/JettyConnector.java @@ -144,7 +144,7 @@ public class JettyConnector implements Connector { * @param jaxrsClient JAX-RS client instance, for which the connector is created. * @param config client configuration. */ - public JettyConnector(final Client jaxrsClient, final Configuration config) { + protected JettyConnector(final Client jaxrsClient, final Configuration config) { this.configuration = config; HttpClient httpClient = getRegisteredHttpClient(config); @@ -226,9 +226,9 @@ public JettyConnector(final Client jaxrsClient, final Configuration config) { * the default transport is {@link HttpClientTransportOverHTTP} * * @return instance of {@link HttpClientTransport} - * @since 2.40 + * @since 2.41 */ - public HttpClientTransport initClientTransport() { + protected HttpClientTransport initClientTransport() { return new HttpClientTransportOverHTTP(); } @@ -238,9 +238,9 @@ public HttpClientTransport initClientTransport() { * @param config configuration where {@link HttpClient} could be registered * @return {@link HttpClient} instance if any was previously registered or NULL * - * @since 2.40 + * @since 2.41 */ - public HttpClient getRegisteredHttpClient(Configuration config) { + protected HttpClient getRegisteredHttpClient(Configuration config) { if (config.isRegistered(JettyHttpClientSupplier.class)) { Optional contract = config.getInstances().stream() .filter(a-> JettyHttpClientSupplier.class.isInstance(a)).findFirst(); diff --git a/connectors/jetty-http2-connector/src/main/java/org/glassfish/jersey/jetty/http2/connector/JettyHttp2ClientSupplier.java b/connectors/jetty-http2-connector/src/main/java/org/glassfish/jersey/jetty/http2/connector/JettyHttp2ClientSupplier.java index 69da3f6533..454efd0db8 100644 --- a/connectors/jetty-http2-connector/src/main/java/org/glassfish/jersey/jetty/http2/connector/JettyHttp2ClientSupplier.java +++ b/connectors/jetty-http2-connector/src/main/java/org/glassfish/jersey/jetty/http2/connector/JettyHttp2ClientSupplier.java @@ -27,7 +27,7 @@ /** * HTTP/2 enabled version of the {@link JettyHttpClientSupplier} * - * @since 2.40 + * @since 2.41 */ public class JettyHttp2ClientSupplier implements JettyHttpClientContract { private final HttpClient http2Client; diff --git a/connectors/jetty-http2-connector/src/main/java/org/glassfish/jersey/jetty/http2/connector/JettyHttp2Connector.java b/connectors/jetty-http2-connector/src/main/java/org/glassfish/jersey/jetty/http2/connector/JettyHttp2Connector.java index e0e2219f74..c51b41da57 100644 --- a/connectors/jetty-http2-connector/src/main/java/org/glassfish/jersey/jetty/http2/connector/JettyHttp2Connector.java +++ b/connectors/jetty-http2-connector/src/main/java/org/glassfish/jersey/jetty/http2/connector/JettyHttp2Connector.java @@ -51,10 +51,10 @@ class JettyHttp2Connector extends JettyConnector { * The overriden method provides {@link HttpClientTransportOverHTTP2} with initialized {@link HTTP2Client} * * @return {@link HttpClientTransportOverHTTP2} - * @since 2.40 + * @since 2.41 */ @Override - public HttpClientTransport initClientTransport() { + protected HttpClientTransport initClientTransport() { return new HttpClientTransportOverHTTP2(new HTTP2Client()); } @@ -64,10 +64,10 @@ public HttpClientTransport initClientTransport() { * @param config configuration where {@link HttpClient} could be registered * @return {@link HttpClient} instance if any was previously registered or NULL * - * @since 2.40 + * @since 2.41 */ @Override - public HttpClient getRegisteredHttpClient(Configuration config) { + protected HttpClient getRegisteredHttpClient(Configuration config) { if (config.isRegistered(JettyHttp2ClientSupplier.class)) { Optional contract = config.getInstances().stream() .filter(a-> JettyHttp2ClientSupplier.class.isInstance(a)).findFirst();