Remove Optional<Boolean> constructor.

Signed-off-by: Daniel (dB.) Doubrovkine <dblock@amazon.com>
opensearch-project · Jul 13, 2022 · 718ce21 · 718ce21
1 parent 0cb85a4
commit 718ce21
Show file tree

Hide file tree

Showing 2 changed files with 39 additions and 48 deletions.
diff --git a/client/rest/src/main/java/org/opensearch/client/RestClient.java b/client/rest/src/main/java/org/opensearch/client/RestClient.java
@@ -134,29 +134,6 @@ public class RestClient implements Closeable {
     private final boolean compressionEnabled;
     private final Optional<Boolean> chunkedEnabled;
 
-    RestClient(
-        CloseableHttpAsyncClient client,
-        Header[] defaultHeaders,
-        List<Node> nodes,
-        String pathPrefix,
-        FailureListener failureListener,
-        NodeSelector nodeSelector,
-        boolean strictDeprecationMode,
-        boolean compressionEnabled
-    ) {
-        this(
-            client,
-            defaultHeaders,
-            nodes,
-            pathPrefix,
-            failureListener,
-            nodeSelector,
-            strictDeprecationMode,
-            compressionEnabled,
-            null // use Entity.isChunked
-        );
-    }
-
     RestClient(
         CloseableHttpAsyncClient client,
         Header[] defaultHeaders,
@@ -168,17 +145,15 @@ public class RestClient implements Closeable {
         boolean compressionEnabled,
         boolean chunkedEnabled
     ) {
-        this(
-            client,
-            defaultHeaders,
-            nodes,
-            pathPrefix,
-            failureListener,
-            nodeSelector,
-            strictDeprecationMode,
-            compressionEnabled,
-            Optional.of(chunkedEnabled)
-        );
+        this.client = client;
+        this.defaultHeaders = Collections.unmodifiableList(Arrays.asList(defaultHeaders));
+        this.failureListener = failureListener;
+        this.pathPrefix = pathPrefix;
+        this.nodeSelector = nodeSelector;
+        this.warningsHandler = strictDeprecationMode ? WarningsHandler.STRICT : WarningsHandler.PERMISSIVE;
+        this.compressionEnabled = compressionEnabled;
+        this.chunkedEnabled = Optional.of(chunkedEnabled);
+        setNodes(nodes);
     }
 
     RestClient(
@@ -189,8 +164,7 @@ public class RestClient implements Closeable {
         FailureListener failureListener,
         NodeSelector nodeSelector,
         boolean strictDeprecationMode,
-        boolean compressionEnabled,
-        Optional<Boolean> chunkedEnabled
+        boolean compressionEnabled
     ) {
         this.client = client;
         this.defaultHeaders = Collections.unmodifiableList(Arrays.asList(defaultHeaders));
@@ -199,7 +173,7 @@ public class RestClient implements Closeable {
         this.nodeSelector = nodeSelector;
         this.warningsHandler = strictDeprecationMode ? WarningsHandler.STRICT : WarningsHandler.PERMISSIVE;
         this.compressionEnabled = compressionEnabled;
-        this.chunkedEnabled = chunkedEnabled;
+        this.chunkedEnabled = null;
         setNodes(nodes);
     }
 

diff --git a/client/rest/src/main/java/org/opensearch/client/RestClientBuilder.java b/client/rest/src/main/java/org/opensearch/client/RestClientBuilder.java
@@ -260,17 +260,34 @@ public RestClient build() {
         CloseableHttpAsyncClient httpClient = AccessController.doPrivileged(
             (PrivilegedAction<CloseableHttpAsyncClient>) this::createHttpClient
         );
-        RestClient restClient = new RestClient(
-            httpClient,
-            defaultHeaders,
-            nodes,
-            pathPrefix,
-            failureListener,
-            nodeSelector,
-            strictDeprecationMode,
-            compressionEnabled,
-            chunkedEnabled
-        );
+
+        RestClient restClient = null;
+
+        if (chunkedEnabled != null) {
+            restClient = new RestClient(
+                httpClient,
+                defaultHeaders,
+                nodes,
+                pathPrefix,
+                failureListener,
+                nodeSelector,
+                strictDeprecationMode,
+                compressionEnabled,
+                chunkedEnabled.get()
+            );
+        } else {
+            restClient = new RestClient(
+                httpClient,
+                defaultHeaders,
+                nodes,
+                pathPrefix,
+                failureListener,
+                nodeSelector,
+                strictDeprecationMode,
+                compressionEnabled
+            );
+        }
+
         httpClient.start();
         return restClient;
     }