Refactor code

Signed-off-by: Anshu Agarwal <anshukag@amazon.com>
opensearch-project · Sep 26, 2022 · 0240ff0 · 0240ff0
1 parent 006600c
commit 0240ff0
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 15 deletions.
diff --git a/server/src/main/java/org/opensearch/action/ActionModule.java b/server/src/main/java/org/opensearch/action/ActionModule.java
@@ -79,7 +79,7 @@
 import org.opensearch.action.admin.cluster.settings.TransportClusterUpdateSettingsAction;
 import org.opensearch.action.admin.cluster.shards.ClusterSearchShardsAction;
 import org.opensearch.action.admin.cluster.shards.TransportClusterSearchShardsAction;
-import org.opensearch.action.admin.cluster.shards.routing.weighted.put.ClusterPutWeightedRoutingAction;
+import org.opensearch.action.admin.cluster.shards.routing.weighted.put.ClusterAddWeightedRoutingAction;
 import org.opensearch.action.admin.cluster.shards.routing.weighted.put.TransportAddWeightedRoutingAction;
 import org.opensearch.action.admin.cluster.snapshots.clone.CloneSnapshotAction;
 import org.opensearch.action.admin.cluster.snapshots.clone.TransportCloneSnapshotAction;
@@ -566,7 +566,7 @@ public <Request extends ActionRequest, Response extends ActionResponse> void reg
         actions.register(RestoreSnapshotAction.INSTANCE, TransportRestoreSnapshotAction.class);
         actions.register(SnapshotsStatusAction.INSTANCE, TransportSnapshotsStatusAction.class);
 
-        actions.register(ClusterPutWeightedRoutingAction.INSTANCE, TransportAddWeightedRoutingAction.class);
+        actions.register(ClusterAddWeightedRoutingAction.INSTANCE, TransportAddWeightedRoutingAction.class);
         actions.register(IndicesStatsAction.INSTANCE, TransportIndicesStatsAction.class);
         actions.register(IndicesSegmentsAction.INSTANCE, TransportIndicesSegmentsAction.class);
         actions.register(IndicesShardStoresAction.INSTANCE, TransportIndicesShardStoresAction.class);

diff --git a/.../put/ClusterPutWeightedRoutingAction.java → .../put/ClusterAddWeightedRoutingAction.java b/.../put/ClusterPutWeightedRoutingAction.java → .../put/ClusterAddWeightedRoutingAction.java
@@ -15,12 +15,12 @@
  *
  * @opensearch.internal
  */
-public final class ClusterPutWeightedRoutingAction extends ActionType<ClusterPutWeightedRoutingResponse> {
+public final class ClusterAddWeightedRoutingAction extends ActionType<ClusterPutWeightedRoutingResponse> {
 
-    public static final ClusterPutWeightedRoutingAction INSTANCE = new ClusterPutWeightedRoutingAction();
+    public static final ClusterAddWeightedRoutingAction INSTANCE = new ClusterAddWeightedRoutingAction();
     public static final String NAME = "cluster:admin/routing/awareness/weights/put";
 
-    private ClusterPutWeightedRoutingAction() {
+    private ClusterAddWeightedRoutingAction() {
         super(NAME, ClusterPutWeightedRoutingResponse::new);
     }
 }
diff --git a/...on/admin/cluster/shards/routing/weighted/put/ClusterPutWeightedRoutingRequestBuilder.java b/...on/admin/cluster/shards/routing/weighted/put/ClusterPutWeightedRoutingRequestBuilder.java
@@ -21,7 +21,7 @@ public class ClusterPutWeightedRoutingRequestBuilder extends ClusterManagerNodeO
     ClusterPutWeightedRoutingRequest,
     ClusterPutWeightedRoutingResponse,
     ClusterPutWeightedRoutingRequestBuilder> {
-    public ClusterPutWeightedRoutingRequestBuilder(OpenSearchClient client, ClusterPutWeightedRoutingAction action) {
+    public ClusterPutWeightedRoutingRequestBuilder(OpenSearchClient client, ClusterAddWeightedRoutingAction action) {
         super(client, action, new ClusterPutWeightedRoutingRequest());
     }
 

diff --git a/...h/action/admin/cluster/shards/routing/weighted/put/TransportAddWeightedRoutingAction.java b/...h/action/admin/cluster/shards/routing/weighted/put/TransportAddWeightedRoutingAction.java
@@ -55,7 +55,7 @@ public TransportAddWeightedRoutingAction(
         IndexNameExpressionResolver indexNameExpressionResolver
     ) {
         super(
-            ClusterPutWeightedRoutingAction.NAME,
+            ClusterAddWeightedRoutingAction.NAME,
             transportService,
             clusterService,
             threadPool,

diff --git a/server/src/main/java/org/opensearch/client/support/AbstractClient.java b/server/src/main/java/org/opensearch/client/support/AbstractClient.java
@@ -110,7 +110,7 @@
 import org.opensearch.action.admin.cluster.shards.ClusterSearchShardsRequest;
 import org.opensearch.action.admin.cluster.shards.ClusterSearchShardsRequestBuilder;
 import org.opensearch.action.admin.cluster.shards.ClusterSearchShardsResponse;
-import org.opensearch.action.admin.cluster.shards.routing.weighted.put.ClusterPutWeightedRoutingAction;
+import org.opensearch.action.admin.cluster.shards.routing.weighted.put.ClusterAddWeightedRoutingAction;
 import org.opensearch.action.admin.cluster.shards.routing.weighted.put.ClusterPutWeightedRoutingRequest;
 import org.opensearch.action.admin.cluster.shards.routing.weighted.put.ClusterPutWeightedRoutingRequestBuilder;
 import org.opensearch.action.admin.cluster.shards.routing.weighted.put.ClusterPutWeightedRoutingResponse;
@@ -1270,20 +1270,20 @@ public ActionFuture<AcknowledgedResponse> deleteDanglingIndex(DeleteDanglingInde
 
         @Override
         public ActionFuture<ClusterPutWeightedRoutingResponse> putWeightedRouting(ClusterPutWeightedRoutingRequest request) {
-            return execute(ClusterPutWeightedRoutingAction.INSTANCE, request);
+            return execute(ClusterAddWeightedRoutingAction.INSTANCE, request);
         }
 
         @Override
         public void putWeightedRouting(
             ClusterPutWeightedRoutingRequest request,
             ActionListener<ClusterPutWeightedRoutingResponse> listener
         ) {
-            execute(ClusterPutWeightedRoutingAction.INSTANCE, request, listener);
+            execute(ClusterAddWeightedRoutingAction.INSTANCE, request, listener);
         }
 
         @Override
         public ClusterPutWeightedRoutingRequestBuilder prepareWeightedRouting() {
-            return new ClusterPutWeightedRoutingRequestBuilder(this, ClusterPutWeightedRoutingAction.INSTANCE);
+            return new ClusterPutWeightedRoutingRequestBuilder(this, ClusterAddWeightedRoutingAction.INSTANCE);
         }
 
         @Override

diff --git a/server/src/test/java/org/opensearch/cluster/routing/WeightedRoutingServiceTests.java b/server/src/test/java/org/opensearch/cluster/routing/WeightedRoutingServiceTests.java
@@ -12,7 +12,7 @@
 import org.junit.Before;
 import org.opensearch.Version;
 import org.opensearch.action.ActionListener;
-import org.opensearch.action.admin.cluster.shards.routing.weighted.put.ClusterPutWeightedRoutingAction;
+import org.opensearch.action.admin.cluster.shards.routing.weighted.put.ClusterAddWeightedRoutingAction;
 import org.opensearch.action.admin.cluster.shards.routing.weighted.put.ClusterPutWeightedRoutingRequestBuilder;
 import org.opensearch.client.node.NodeClient;
 import org.opensearch.cluster.ClusterName;
@@ -179,7 +179,7 @@ public void testRegisterWeightedRoutingMetadataWithChangedWeights() throws Inter
 
         ClusterPutWeightedRoutingRequestBuilder request = new ClusterPutWeightedRoutingRequestBuilder(
             client,
-            ClusterPutWeightedRoutingAction.INSTANCE
+            ClusterAddWeightedRoutingAction.INSTANCE
         );
         WeightedRouting updatedWeightedRouting = new WeightedRouting("zone", Map.of("zone_A", 1.0, "zone_B", 0.0, "zone_C", 0.0));
         request.setWeightedRouting(updatedWeightedRouting);
@@ -210,7 +210,7 @@ public void testRegisterWeightedRoutingMetadataWithSameWeights() throws Interrup
 
         ClusterPutWeightedRoutingRequestBuilder request = new ClusterPutWeightedRoutingRequestBuilder(
             client,
-            ClusterPutWeightedRoutingAction.INSTANCE
+            ClusterAddWeightedRoutingAction.INSTANCE
         );
         WeightedRouting updatedWeightedRouting = new WeightedRouting("zone", weights);
         request.setWeightedRouting(updatedWeightedRouting);

diff --git a/...ClusterPutWeightedRoutingActionTests.java → ...ClusterAddWeightedRoutingActionTests.java b/...ClusterPutWeightedRoutingActionTests.java → ...ClusterAddWeightedRoutingActionTests.java
@@ -24,7 +24,7 @@
 
 import static java.util.Collections.singletonMap;
 
-public class RestClusterPutWeightedRoutingActionTests extends RestActionTestCase {
+public class RestClusterAddWeightedRoutingActionTests extends RestActionTestCase {
     private RestClusterPutWeightedRoutingAction action;
 
     @Before