Remove Redundant Request Wrappers from RepositoryService (elastic#40192…

…) (elastic#40404)
original-brownbear · Mar 25, 2019 · 3968d46 · 3968d46
1 parent 61f49af
commit 3968d46
Show file tree

Hide file tree

Showing 5 changed files with 86 additions and 198 deletions.
diff --git a/...asticsearch/action/admin/cluster/repositories/delete/TransportDeleteRepositoryAction.java b/...asticsearch/action/admin/cluster/repositories/delete/TransportDeleteRepositoryAction.java
@@ -69,18 +69,17 @@ protected ClusterBlockException checkBlock(DeleteRepositoryRequest request, Clus
     protected void masterOperation(final DeleteRepositoryRequest request, ClusterState state,
                                    final ActionListener<AcknowledgedResponse> listener) {
         repositoriesService.unregisterRepository(
-                new RepositoriesService.UnregisterRepositoryRequest("delete_repository [" + request.name() + "]", request.name())
-                        .masterNodeTimeout(request.masterNodeTimeout()).ackTimeout(request.timeout()),
-                new ActionListener<ClusterStateUpdateResponse>() {
-                    @Override
-                    public void onResponse(ClusterStateUpdateResponse unregisterRepositoryResponse) {
-                        listener.onResponse(new AcknowledgedResponse(unregisterRepositoryResponse.isAcknowledged()));
-                    }
+            request,
+            new ActionListener<ClusterStateUpdateResponse>() {
+                @Override
+                public void onResponse(ClusterStateUpdateResponse unregisterRepositoryResponse) {
+                    listener.onResponse(new AcknowledgedResponse(unregisterRepositoryResponse.isAcknowledged()));
+                }
 
-                    @Override
-                    public void onFailure(Exception e) {
-                        listener.onFailure(e);
-                    }
-                });
+                @Override
+                public void onFailure(Exception e) {
+                    listener.onFailure(e);
+                }
+            });
     }
 }
diff --git a/...org/elasticsearch/action/admin/cluster/repositories/put/TransportPutRepositoryAction.java b/...org/elasticsearch/action/admin/cluster/repositories/put/TransportPutRepositoryAction.java
@@ -68,13 +68,7 @@ protected ClusterBlockException checkBlock(PutRepositoryRequest request, Cluster
     @Override
     protected void masterOperation(final PutRepositoryRequest request, ClusterState state,
                                    final ActionListener<AcknowledgedResponse> listener) {
-
-        repositoriesService.registerRepository(
-                new RepositoriesService.RegisterRepositoryRequest("put_repository [" + request.name() + "]",
-                        request.name(), request.type(), request.verify())
-                .settings(request.settings())
-                .masterNodeTimeout(request.masterNodeTimeout())
-                .ackTimeout(request.timeout()), new ActionListener<ClusterStateUpdateResponse>() {
+        repositoriesService.registerRepository(request, new ActionListener<ClusterStateUpdateResponse>() {
 
             @Override
             public void onResponse(ClusterStateUpdateResponse response) {
@@ -87,5 +81,4 @@ public void onFailure(Exception e) {
             }
         });
     }
-
 }
diff --git a/...asticsearch/action/admin/cluster/repositories/verify/TransportVerifyRepositoryAction.java b/...asticsearch/action/admin/cluster/repositories/verify/TransportVerifyRepositoryAction.java
@@ -26,13 +26,15 @@
 import org.elasticsearch.cluster.block.ClusterBlockException;
 import org.elasticsearch.cluster.block.ClusterBlockLevel;
 import org.elasticsearch.cluster.metadata.IndexNameExpressionResolver;
+import org.elasticsearch.cluster.node.DiscoveryNode;
 import org.elasticsearch.cluster.service.ClusterService;
 import org.elasticsearch.common.inject.Inject;
 import org.elasticsearch.repositories.RepositoriesService;
-import org.elasticsearch.repositories.RepositoryVerificationException;
 import org.elasticsearch.threadpool.ThreadPool;
 import org.elasticsearch.transport.TransportService;
 
+import java.util.List;
+
 /**
  * Transport action for verifying repository operation
  */
@@ -68,14 +70,10 @@ protected ClusterBlockException checkBlock(VerifyRepositoryRequest request, Clus
     @Override
     protected void masterOperation(final VerifyRepositoryRequest request, ClusterState state,
                                    final ActionListener<VerifyRepositoryResponse> listener) {
-        repositoriesService.verifyRepository(request.name(), new  ActionListener<RepositoriesService.VerifyResponse>() {
+        repositoriesService.verifyRepository(request.name(), new ActionListener<List<DiscoveryNode>>() {
             @Override
-            public void onResponse(RepositoriesService.VerifyResponse verifyResponse) {
-                if (verifyResponse.failed()) {
-                    listener.onFailure(new RepositoryVerificationException(request.name(), verifyResponse.failureDescription()));
-                } else {
-                    listener.onResponse(new VerifyRepositoryResponse(verifyResponse.nodes()));
-                }
+            public void onResponse(List<DiscoveryNode> verifyResponse) {
+                listener.onResponse(new VerifyRepositoryResponse(verifyResponse.toArray(new DiscoveryNode[0])));
             }
 
             @Override