Modify existing client classes to be abstract base classes

Signed-off-by: Thomas Farr <tsfarr@amazon.com>
opensearch-project · Jun 26, 2024 · bb5523f · bb5523f
1 parent c2d9004
commit bb5523f
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 44 deletions.
diff --git a/...ent/opensearch/OpenSearchAsyncClient.java → ...opensearch/OpenSearchAsyncClientBase.java b/...ent/opensearch/OpenSearchAsyncClient.java → ...opensearch/OpenSearchAsyncClientBase.java
@@ -140,21 +140,13 @@
 /**
  * Client for the namespace.
  */
-public class OpenSearchAsyncClient extends ApiClient<OpenSearchTransport, OpenSearchAsyncClient> {
+public abstract class OpenSearchAsyncClientBase<Self extends OpenSearchAsyncClientBase<Self>>
+        extends ApiClient<OpenSearchTransport, Self> {
 
-    public OpenSearchAsyncClient(OpenSearchTransport transport) {
-        super(transport, null);
-    }
-
-    public OpenSearchAsyncClient(OpenSearchTransport transport, @Nullable TransportOptions transportOptions) {
+    public OpenSearchAsyncClientBase(OpenSearchTransport transport, @Nullable TransportOptions transportOptions) {
         super(transport, transportOptions);
     }
 
-    @Override
-    public OpenSearchAsyncClient withTransportOptions(@Nullable TransportOptions transportOptions) {
-        return new OpenSearchAsyncClient(this.transport, transportOptions);
-    }
-
     // ----- Child clients
 
     public OpenSearchCatAsyncClient cat() {
@@ -897,17 +889,6 @@ public final <TDocument> CompletableFuture<IndexResponse> index(
         return index(fn.apply(new IndexRequest.Builder<TDocument>()).build());
     }
 
-    // ----- Endpoint: info
-
-    /**
-     * Returns basic information about the cluster.
-     *
-     *
-     */
-    public CompletableFuture<InfoResponse> info() throws IOException, OpenSearchException {
-        return this.transport.performRequestAsync(InfoRequest._INSTANCE, InfoRequest._ENDPOINT, this.transportOptions);
-    }
-
     // ----- Endpoint: list_point_in_time
 
     /**

diff --git a/...h/client/opensearch/OpenSearchClient.java → ...ient/opensearch/OpenSearchClientBase.java b/...h/client/opensearch/OpenSearchClient.java → ...ient/opensearch/OpenSearchClientBase.java
@@ -140,21 +140,13 @@
 /**
  * Client for the namespace.
  */
-public class OpenSearchClient extends ApiClient<OpenSearchTransport, OpenSearchClient> {
+public abstract class OpenSearchClientBase<Self extends OpenSearchClientBase<Self>>
+        extends ApiClient<OpenSearchTransport, Self> {
 
-    public OpenSearchClient(OpenSearchTransport transport) {
-        super(transport, null);
-    }
-
-    public OpenSearchClient(OpenSearchTransport transport, @Nullable TransportOptions transportOptions) {
+    public OpenSearchClientBase(OpenSearchTransport transport, @Nullable TransportOptions transportOptions) {
         super(transport, transportOptions);
     }
 
-    @Override
-    public OpenSearchClient withTransportOptions(@Nullable TransportOptions transportOptions) {
-        return new OpenSearchClient(this.transport, transportOptions);
-    }
-
     // ----- Child clients
     public OpenSearchGenericClient generic() {
         return new OpenSearchGenericClient(this.transport, this.transportOptions);
@@ -883,17 +875,6 @@ public final <TDocument> IndexResponse index(Function<IndexRequest.Builder<TDocu
         return index(fn.apply(new IndexRequest.Builder<TDocument>()).build());
     }
 
-    // ----- Endpoint: info
-
-    /**
-     * Returns basic information about the cluster.
-     *
-     *
-     */
-    public InfoResponse info() throws IOException, OpenSearchException {
-        return this.transport.performRequest(InfoRequest._INSTANCE, InfoRequest._ENDPOINT, this.transportOptions);
-    }
-
     // ----- Endpoint: list_point_in_time
 
     /**