Refactor code

Signed-off-by: Rishab Nahata <rnnahata@amazon.com>

server/src/main/java/org/opensearch/action/admin/cluster/decommission/awareness/put/DecommissionRequest.java

@@ -27,7 +27,6 @@
  */
 public class DecommissionRequest extends ClusterManagerNodeRequest<DecommissionRequest> {
 
-    public static final TimeValue DEFAULT_REQUEST_TIMEOUT = TimeValue.timeValueSeconds(120);
     public static final TimeValue DEFAULT_NODE_DRAINING_TIMEOUT = TimeValue.timeValueSeconds(120);
 
     private DecommissionAttribute decommissionAttribute;

server/src/main/java/org/opensearch/rest/action/admin/cluster/RestDecommissionAction.java

@@ -19,10 +19,8 @@
 
 import java.io.IOException;
 import java.util.List;
-import java.util.Locale;
 
 import static java.util.Collections.singletonList;
-import static org.opensearch.action.admin.cluster.decommission.awareness.put.DecommissionRequest.DEFAULT_REQUEST_TIMEOUT;
 import static org.opensearch.rest.RestRequest.Method.PUT;
 
 /**
@@ -61,14 +59,6 @@ DecommissionRequest createRequest(RestRequest request) throws IOException {
             decommissionRequest.setDelayTimeout(delayTimeout);
         }
 
-        if (request.hasParam("timeout")) {
-            TimeValue requestTimeout = request.paramAsTime("timeout", DEFAULT_REQUEST_TIMEOUT);
-            if (requestTimeout.getMillis() < DEFAULT_REQUEST_TIMEOUT.getMillis()) {
-                throw new IllegalArgumentException(
-                    String.format(Locale.ROOT, "default request timeout has to be at least [%s]", DEFAULT_REQUEST_TIMEOUT)
-                );
-            }
-        }
         return decommissionRequest.setDecommissionAttribute(new DecommissionAttribute(attributeName, attributeValue))
             .originalRequest(false);
     }

server/src/test/java/org/opensearch/cluster/decommission/DecommissionControllerTests.java

@@ -16,7 +16,6 @@
 import org.opensearch.action.ActionListener;
 import org.opensearch.action.admin.cluster.configuration.TransportAddVotingConfigExclusionsAction;
 import org.opensearch.action.admin.cluster.configuration.TransportClearVotingConfigExclusionsAction;
-import org.opensearch.action.admin.cluster.decommission.awareness.put.TransportDecommissionAction;
 import org.opensearch.action.support.ActionFilters;
 import org.opensearch.cluster.ClusterName;
 import org.opensearch.cluster.ClusterState;
@@ -116,22 +115,6 @@ public void setTransportServiceAndDefaultClusterState() {
             new IndexNameExpressionResolver(new ThreadContext(Settings.EMPTY))
         ); // registers action
 
-        new TransportDecommissionAction(
-            transportService,
-            clusterService,
-            new DecommissionService(
-                nodeSettingsBuilder.build(),
-                clusterSettings,
-                clusterService,
-                transportService,
-                threadPool,
-                allocationService
-            ),
-            threadPool,
-            new ActionFilters(emptySet()),
-            new IndexNameExpressionResolver(new ThreadContext(Settings.EMPTY))
-        ); // registers action
-
         transportService.start();
         transportService.acceptIncomingRequests();
         decommissionController = new DecommissionController(clusterService, transportService, allocationService, threadPool);

server/src/test/java/org/opensearch/rest/action/admin/cluster/RestDecommissionActionTests.java

@@ -87,17 +87,6 @@ public void testCreateRequestWithDelayTimeout() throws IOException {
         assertEquals(deprecatedRequest.getHttpRequest().method(), RestRequest.Method.PUT);
     }
 
-    public void testCreateRequestWithInvalidTimeout() throws IOException {
-        Map<String, String> params = new HashMap<>();
-        params.put("awareness_attribute_name", "zone");
-        params.put("awareness_attribute_value", "zone-1");
-        params.put("timeout", "1m");
-
-        RestRequest request = buildRestRequest(params);
-        IllegalArgumentException e = expectThrows(IllegalArgumentException.class, () -> action.createRequest(request));
-        assertEquals("default request timeout has to be at least [2m]", e.getMessage());
-    }
-
     private FakeRestRequest buildRestRequest(Map<String, String> params) {
         return new FakeRestRequest.Builder(xContentRegistry()).withMethod(RestRequest.Method.PUT)
             .withPath("/_cluster/decommission/awareness/{awareness_attribute_name}/{awareness_attribute_value}")