Prepare accessors to be not accessible by customer

Signed-off-by: jansupol <[email protected]>

Author: jansupol

connectors/netty-connector/src/main/java/org/glassfish/jersey/netty/connector/ConfigurationExposer.java

@@ -31,9 +31,9 @@
 class Expect100ContinueConnectorExtension
         implements ConnectorExtension<HttpRequest, IOException> {
 
-    private final NettyConnectorProvider.Config requestConfiguration;
+    private final NettyConnectorProvider.Config.RW requestConfiguration;
 
-    Expect100ContinueConnectorExtension(NettyConnectorProvider.Config requestConfiguration) {
+    Expect100ContinueConnectorExtension(NettyConnectorProvider.Config.RW requestConfiguration) {
         this.requestConfiguration = requestConfiguration;
     }
 

connectors/netty-connector/src/main/java/org/glassfish/jersey/netty/connector/Expect100ContinueConnectorExtension.java

@@ -59,7 +59,7 @@ class JerseyClientHandler extends SimpleChannelInboundHandler<HttpObject> {
     private final CompletableFuture<?> responseDone;
     private final NettyConnector connector;
     private final NettyHttpRedirectController redirectController;
-    private final NettyConnectorProvider.Config requestConfiguration;
+    private final NettyConnectorProvider.Config.RW requestConfiguration;
 
     private NettyInputStream nis;
     private ClientResponse jerseyResponse;
@@ -68,7 +68,7 @@ class JerseyClientHandler extends SimpleChannelInboundHandler<HttpObject> {
 
     JerseyClientHandler(ClientRequest request, CompletableFuture<ClientResponse> responseAvailable,
                         CompletableFuture<?> responseDone, Set<URI> redirectUriHistory, NettyConnector connector,
-                        NettyConnectorProvider.Config requestConfiguration) {
+                        NettyConnectorProvider.Config.RW requestConfiguration) {
         this.redirectUriHistory = redirectUriHistory;
         this.jerseyRequest = request;
         this.responseAvailable = responseAvailable;
@@ -106,7 +106,7 @@ protected void notifyResponse(ChannelHandlerContext ctx) {
           ClientResponse cr = jerseyResponse;
           jerseyResponse = null;
           int responseStatus = cr.getStatus();
-          if (Boolean.TRUE.equals(requestConfiguration.followRedirects.get())
+          if (Boolean.TRUE.equals(requestConfiguration.followRedirects())
                   && (responseStatus == ResponseStatus.Redirect3xx.MOVED_PERMANENTLY_301.getStatusCode()
                           || responseStatus == ResponseStatus.Redirect3xx.FOUND_302.getStatusCode()
                           || responseStatus == ResponseStatus.Redirect3xx.SEE_OTHER_303.getStatusCode()

connectors/netty-connector/src/main/java/org/glassfish/jersey/netty/connector/JerseyClientHandler.java

@@ -96,7 +96,7 @@ class NettyConnector implements Connector {
     final EventLoopGroup group;
     final Client client;
     final HashMap<String, ArrayList<Channel>> connections = new HashMap<>();
-    final NettyConnectorProvider.Config connectorConfiguration;
+    final NettyConnectorProvider.Config.RW connectorConfiguration;
 
     private static final LazyValue<String> NETTY_VERSION = Values.lazy(
         (Value<String>) () -> {
@@ -116,16 +116,16 @@ class NettyConnector implements Connector {
     private static final String EXPECT_100_CONTINUE_HANDLER = "expect_100_continue_handler";
 
     NettyConnector(Client client) { // TODO drop
-        this(client, NettyConnectorProvider.config());
+        this(client, NettyConnectorProvider.config().rw());
     }
 
-    NettyConnector(Client client, NettyConnectorProvider.Config connectorConfiguration) {
+    NettyConnector(Client client, NettyConnectorProvider.Config.RW connectorConfiguration) {
         this.client = client;
         this.connectorConfiguration = connectorConfiguration.fromClient(client);
 
         final Configuration configuration = client.getConfiguration();
-        final Integer threadPoolSize = this.connectorConfiguration.threadPoolSize.get();
-        if (threadPoolSize != null && threadPoolSize > 0) {
+        final int threadPoolSize = this.connectorConfiguration.asyncThreadPoolSize();
+        if (threadPoolSize > 0) {
             executorService = VirtualThreadUtil.withConfig(configuration).newFixedThreadPool(threadPoolSize);
             this.group = new NioEventLoopGroup(threadPoolSize);
         } else {
@@ -164,13 +164,14 @@ public Future<?> apply(final ClientRequest jerseyRequest, final AsyncConnectorCa
 
     protected void execute(final ClientRequest jerseyRequest, final Set<URI> redirectUriHistory,
             final CompletableFuture<ClientResponse> responseAvailable) {
-        final NettyConnectorProvider.Config requestConfiguration =
+        final NettyConnectorProvider.Config.RW requestConfiguration =
                 connectorConfiguration
-                    .copy()
-                    .readTimeout(jerseyRequest)
-                    .expect100ContinueTimeout(jerseyRequest);
-        if (requestConfiguration.readTimeout.get() < 0) {
-            throw new ProcessingException(LocalizationMessages.WRONG_READ_TIMEOUT(requestConfiguration.readTimeout.get()));
+                        .copy()
+                        .readTimeout(jerseyRequest)
+                        .expect100ContinueTimeout(jerseyRequest);
+        final int readTimeout = requestConfiguration.readTimeout();
+        if (readTimeout < 0) {
+            throw new ProcessingException(LocalizationMessages.WRONG_READ_TIMEOUT(readTimeout));
         }
 
         final CompletableFuture<?> responseDone = new CompletableFuture<>();
@@ -247,7 +248,7 @@ protected void initChannel(SocketChannel ch) throws Exception {
                      if ("https".equals(requestUri.getScheme())) {
                          // making client authentication optional for now; it could be extracted to configurable property
                          JdkSslContext jdkSslContext = new JdkSslContext(
-                                 requestConfiguration.getSslContext(client, jerseyRequest),
+                                 requestConfiguration.sslContext(client, jerseyRequest),
                                  true,
                                  (Iterable) null,
                                  IdentityCipherSuiteFilter.INSTANCE,
@@ -279,8 +280,8 @@ protected void initChannel(SocketChannel ch) throws Exception {
                 });
 
                // connect timeout
-               if (requestConfiguration.connectTimeout.get() > 0) {
-                   b.option(ChannelOption.CONNECT_TIMEOUT_MILLIS, requestConfiguration.connectTimeout.get());
+               if (requestConfiguration.connectTimeout() > 0) {
+                   b.option(ChannelOption.CONNECT_TIMEOUT_MILLIS, requestConfiguration.connectTimeout());
                }
 
                // Make the connection attempt.
@@ -304,7 +305,7 @@ protected void initChannel(SocketChannel ch) throws Exception {
 
             // read timeout makes sense really as an inactivity timeout
             ch.pipeline().addLast(READ_TIMEOUT_HANDLER,
-                                  new IdleStateHandler(0, 0, requestConfiguration.readTimeout.get(), TimeUnit.MILLISECONDS));
+                                  new IdleStateHandler(0, 0, requestConfiguration.readTimeout(), TimeUnit.MILLISECONDS));
             ch.pipeline().addLast(REQUEST_HANDLER, clientHandler);
 
             responseDone.whenComplete((_r, th) -> {
@@ -489,8 +490,8 @@ public void run() {
     }
 
     /* package */ NettyEntityWriter nettyEntityWriter(
-            ClientRequest clientRequest, Channel channel, NettyConnectorProvider.Config requestConfiguration) {
-        return NettyEntityWriter.getInstance(clientRequest, channel, new ConfigurationExposer(requestConfiguration));
+            ClientRequest clientRequest, Channel channel, NettyConnectorProvider.Config.RW requestConfiguration) {
+        return NettyEntityWriter.getInstance(clientRequest, channel, requestConfiguration);
     }
 
     private String buildPathWithQueryParameters(URI requestUri) {