Applying spotless check

Signed-off-by: Rishab Nahata <rnnahata@amazon.com>
opensearch-project · Aug 22, 2022 · f3f3063 · f3f3063
1 parent c5dc07a
commit f3f3063
Show file tree

Hide file tree

Showing 11 changed files with 40 additions and 74 deletions.
diff --git a/...rg/opensearch/action/admin/cluster/decommission/awareness/get/GetDecommissionRequest.java b/...rg/opensearch/action/admin/cluster/decommission/awareness/get/GetDecommissionRequest.java
@@ -22,8 +22,7 @@
  */
 public class GetDecommissionRequest extends ClusterManagerNodeReadRequest<GetDecommissionRequest> {
 
-    public GetDecommissionRequest() {
-    }
+    public GetDecommissionRequest() {}
 
     public GetDecommissionRequest(StreamInput in) throws IOException {
         super(in);

diff --git a/...g/opensearch/action/admin/cluster/decommission/awareness/get/GetDecommissionResponse.java b/...g/opensearch/action/admin/cluster/decommission/awareness/get/GetDecommissionResponse.java
@@ -74,7 +74,10 @@ public static GetDecommissionResponse fromXContent(XContentParser parser) throws
                 String currentFieldName = parser.currentName();
                 if (attributeType.equals(currentFieldName)) {
                     if (parser.nextToken() != XContentParser.Token.START_OBJECT) {
-                        throw new OpenSearchParseException("failed to parse decommission attribute type [{}], expected object", attributeType);
+                        throw new OpenSearchParseException(
+                            "failed to parse decommission attribute type [{}], expected object",
+                            attributeType
+                        );
                     }
                     token = parser.nextToken();
                     if (token != XContentParser.Token.END_OBJECT) {
@@ -85,7 +88,10 @@ public static GetDecommissionResponse fromXContent(XContentParser parser) throws
                             if (token == XContentParser.Token.VALUE_STRING) {
                                 value = parser.text();
                             } else {
-                                throw new OpenSearchParseException("failed to parse attribute [{}], expected string for attribute value", fieldName);
+                                throw new OpenSearchParseException(
+                                    "failed to parse attribute [{}], expected string for attribute value",
+                                    fieldName
+                                );
                             }
                             decommissionAttribute = new DecommissionAttribute(fieldName, value);
                             token = parser.nextToken();
@@ -97,7 +103,9 @@ public static GetDecommissionResponse fromXContent(XContentParser parser) throws
                     }
                 } else if ("status".equals(currentFieldName)) {
                     if (parser.nextToken() != XContentParser.Token.VALUE_STRING) {
-                        throw new OpenSearchParseException("failed to parse status of decommissioning, expected string but found unknown type");
+                        throw new OpenSearchParseException(
+                            "failed to parse status of decommissioning, expected string but found unknown type"
+                        );
                     }
                     status = DecommissionStatus.fromString(parser.text());
                 } else {

diff --git a/...earch/action/admin/cluster/decommission/awareness/get/TransportGetDecommissionAction.java b/...earch/action/admin/cluster/decommission/awareness/get/TransportGetDecommissionAction.java
@@ -26,9 +26,7 @@
 
 import java.io.IOException;
 
-public class TransportGetDecommissionAction extends TransportClusterManagerNodeReadAction<
-    GetDecommissionRequest,
-    GetDecommissionResponse> {
+public class TransportGetDecommissionAction extends TransportClusterManagerNodeReadAction<GetDecommissionRequest, GetDecommissionResponse> {
 
     @Inject
     public TransportGetDecommissionAction(
@@ -66,14 +64,9 @@ protected void clusterManagerOperation(
         ActionListener<GetDecommissionResponse> listener
     ) throws Exception {
         Metadata metadata = state.metadata();
-//        DecommissionAttributeMetadata decommissionedAttributes = metadata.custom(DecommissionAttributeMetadata.TYPE);
+        // DecommissionAttributeMetadata decommissionedAttributes = metadata.custom(DecommissionAttributeMetadata.TYPE);
         // TODO - update once service layer changes are merged
-        listener.onResponse(
-            new GetDecommissionResponse(
-                new DecommissionAttribute("zone", "zone-1"),
-                DecommissionStatus.DECOMMISSIONED
-            )
-        );
+        listener.onResponse(new GetDecommissionResponse(new DecommissionAttribute("zone", "zone-1"), DecommissionStatus.DECOMMISSIONED));
     }
 
     @Override

diff --git a/...rg/opensearch/action/admin/cluster/decommission/awareness/put/PutDecommissionRequest.java b/...rg/opensearch/action/admin/cluster/decommission/awareness/put/PutDecommissionRequest.java
@@ -24,8 +24,7 @@ public class PutDecommissionRequest extends ClusterManagerNodeRequest<PutDecommi
     private DecommissionAttribute decommissionAttribute;
     private TimeValue timeout;
 
-    public PutDecommissionRequest() {
-    }
+    public PutDecommissionRequest() {}
 
     public PutDecommissionRequest(DecommissionAttribute decommissionAttribute, TimeValue timeout) {
         this.decommissionAttribute = decommissionAttribute;
@@ -92,11 +91,6 @@ public ActionRequestValidationException validate() {
 
     @Override
     public String toString() {
-        return "PutDecommissionRequest{"
-            + "decommissionAttribute="
-            + decommissionAttribute
-            + ", timeout="
-            + timeout
-            + '}';
+        return "PutDecommissionRequest{" + "decommissionAttribute=" + decommissionAttribute + ", timeout=" + timeout + '}';
     }
 }
diff --git a/...search/action/admin/cluster/decommission/awareness/put/PutDecommissionRequestBuilder.java b/...search/action/admin/cluster/decommission/awareness/put/PutDecommissionRequestBuilder.java
@@ -19,7 +19,11 @@ public class PutDecommissionRequestBuilder extends ClusterManagerNodeOperationRe
     PutDecommissionResponse,
     PutDecommissionRequestBuilder> {
 
-    public PutDecommissionRequestBuilder(OpenSearchClient client, ActionType<PutDecommissionResponse> action, PutDecommissionRequest request) {
+    public PutDecommissionRequestBuilder(
+        OpenSearchClient client,
+        ActionType<PutDecommissionResponse> action,
+        PutDecommissionRequest request
+    ) {
         super(client, action, request);
     }
 

diff --git a/...g/opensearch/action/admin/cluster/decommission/awareness/put/PutDecommissionResponse.java b/...g/opensearch/action/admin/cluster/decommission/awareness/put/PutDecommissionResponse.java
@@ -12,7 +12,6 @@
 import org.opensearch.common.io.stream.StreamInput;
 import org.opensearch.common.io.stream.StreamOutput;
 import org.opensearch.common.xcontent.ToXContentObject;
-import org.opensearch.common.xcontent.XContentBuilder;
 
 import java.io.IOException;
 

diff --git a/...earch/action/admin/cluster/decommission/awareness/put/TransportPutDecommissionAction.java b/...earch/action/admin/cluster/decommission/awareness/put/TransportPutDecommissionAction.java
@@ -25,17 +25,15 @@
 
 import java.io.IOException;
 
-public class TransportPutDecommissionAction extends TransportClusterManagerNodeAction<
-    PutDecommissionRequest,
-    PutDecommissionResponse> {
+public class TransportPutDecommissionAction extends TransportClusterManagerNodeAction<PutDecommissionRequest, PutDecommissionResponse> {
 
     private static final Logger logger = LogManager.getLogger(TransportPutDecommissionAction.class);
 
     @Inject
     public TransportPutDecommissionAction(
         TransportService transportService,
         ClusterService clusterService,
-//        DecommissionService decommissionService,
+        // DecommissionService decommissionService,
         ThreadPool threadPool,
         ActionFilters actionFilters,
         IndexNameExpressionResolver indexNameExpressionResolver
@@ -49,8 +47,8 @@ public TransportPutDecommissionAction(
             PutDecommissionRequest::new,
             indexNameExpressionResolver
         );
-        //TODO - uncomment when integrating with the service
-//        this.decommissionService = decommissionService;
+        // TODO - uncomment when integrating with the service
+        // this.decommissionService = decommissionService;
     }
 
     @Override
@@ -77,10 +75,10 @@ protected void clusterManagerOperation(
         logger.info("initiating awareness attribute [{}] decommissioning", request.getDecommissionAttribute().toString());
         listener.onResponse(new PutDecommissionResponse(true)); // TODO - remove after integration
         // TODO - uncomment when integrating with the service
-//        decommissionService.initiateAttributeDecommissioning(
-//            request.getDecommissionAttribute(),
-//            listener,
-//            state
-//        );
+        // decommissionService.initiateAttributeDecommissioning(
+        // request.getDecommissionAttribute(),
+        // listener,
+        // state
+        // );
     }
 }
diff --git a/server/src/main/java/org/opensearch/cluster/decommission/DecommissionAttribute.java b/server/src/main/java/org/opensearch/cluster/decommission/DecommissionAttribute.java
@@ -100,12 +100,8 @@ public int hashCode() {
         return Objects.hash(attributeName, attributeValue);
     }
 
-
     @Override
     public String toString() {
-        return "DecommissionAttribute{" +
-            "attributeName='" + attributeName + '\'' +
-            ", attributeValue='" + attributeValue + '\'' +
-            '}';
+        return "DecommissionAttribute{" + "attributeName='" + attributeName + '\'' + ", attributeValue='" + attributeValue + '\'' + '}';
     }
 }
diff --git a/server/src/main/java/org/opensearch/rest/action/admin/cluster/RestGetDecommissionAction.java b/server/src/main/java/org/opensearch/rest/action/admin/cluster/RestGetDecommissionAction.java
@@ -8,8 +8,6 @@
 
 package org.opensearch.rest.action.admin.cluster;
 
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
 import org.opensearch.action.admin.cluster.decommission.awareness.get.GetDecommissionRequest;
 import org.opensearch.client.Requests;
 import org.opensearch.client.node.NodeClient;
@@ -46,8 +44,6 @@ public RestChannelConsumer prepareRequest(final RestRequest request, final NodeC
         getDecommissionRequest.clusterManagerNodeTimeout(
             request.paramAsTime("cluster_manager_timeout", getDecommissionRequest.clusterManagerNodeTimeout())
         );
-        return channel -> client.admin()
-            .cluster()
-            .getDecommission(getDecommissionRequest, new RestToXContentListener<>(channel));
+        return channel -> client.admin().cluster().getDecommission(getDecommissionRequest, new RestToXContentListener<>(channel));
     }
 }
diff --git a/server/src/main/java/org/opensearch/rest/action/admin/cluster/RestPutDecommissionAction.java b/server/src/main/java/org/opensearch/rest/action/admin/cluster/RestPutDecommissionAction.java
@@ -8,8 +8,6 @@
 
 package org.opensearch.rest.action.admin.cluster;
 
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
 import org.opensearch.action.admin.cluster.decommission.awareness.put.PutDecommissionRequest;
 import org.opensearch.client.Requests;
 import org.opensearch.client.node.NodeClient;
@@ -42,9 +40,7 @@ public String getName() {
     @Override
     protected RestChannelConsumer prepareRequest(RestRequest request, NodeClient client) throws IOException {
         PutDecommissionRequest putDecommissionRequest = createRequest(request);
-        return channel -> client.admin()
-            .cluster()
-            .putDecommission(putDecommissionRequest, new RestToXContentListener<>(channel));
+        return channel -> client.admin().cluster().putDecommission(putDecommissionRequest, new RestToXContentListener<>(channel));
     }
 
     PutDecommissionRequest createRequest(RestRequest request) throws IOException {
@@ -58,8 +54,7 @@ PutDecommissionRequest createRequest(RestRequest request) throws IOException {
         if (request.hasParam("awareness_attribute_value")) {
             attributeValue = request.param("awareness_attribute_value");
         }
-        return putDecommissionRequest
-            .setDecommissionAttribute(new DecommissionAttribute(attributeName, attributeValue))
+        return putDecommissionRequest.setDecommissionAttribute(new DecommissionAttribute(attributeName, attributeValue))
             .setTimeout(TimeValue.parseTimeValue(request.param("timeout"), DEFAULT_TIMEOUT, getClass().getSimpleName() + ".timeout"));
     }
 }
diff --git a/...ensearch/action/admin/cluster/decommission/awareness/put/PutDecommissionRequestTests.java b/...ensearch/action/admin/cluster/decommission/awareness/put/PutDecommissionRequestTests.java
@@ -22,16 +22,9 @@ public void testSerialization() throws IOException {
         String attributeValue = "zone-1";
         DecommissionAttribute decommissionAttribute = new DecommissionAttribute(attributeName, attributeValue);
         TimeValue timeout = TimeValue.timeValueMillis(between(0, 30000));
-        final PutDecommissionRequest originalRequest = new PutDecommissionRequest(
-            decommissionAttribute,
-            timeout
-        );
+        final PutDecommissionRequest originalRequest = new PutDecommissionRequest(decommissionAttribute, timeout);
 
-        final PutDecommissionRequest deserialized = copyWriteable(
-            originalRequest,
-            writableRegistry(),
-            PutDecommissionRequest::new
-        );
+        final PutDecommissionRequest deserialized = copyWriteable(originalRequest, writableRegistry(), PutDecommissionRequest::new);
 
         assertEquals(deserialized.getDecommissionAttribute(), originalRequest.getDecommissionAttribute());
         assertEquals(deserialized.getTimeout(), originalRequest.getTimeout());
@@ -44,10 +37,7 @@ public void testValidation() {
             DecommissionAttribute decommissionAttribute = new DecommissionAttribute(attributeName, attributeValue);
             TimeValue timeout = TimeValue.timeValueMillis(between(0, 30000));
 
-            final PutDecommissionRequest request = new PutDecommissionRequest(
-                decommissionAttribute,
-                timeout
-            );
+            final PutDecommissionRequest request = new PutDecommissionRequest(decommissionAttribute, timeout);
             ActionRequestValidationException e = request.validate();
             assertNotNull(e);
             assertTrue(e.getMessage().contains("attribute name is missing"));
@@ -58,10 +48,7 @@ public void testValidation() {
             DecommissionAttribute decommissionAttribute = new DecommissionAttribute(attributeName, attributeValue);
             TimeValue timeout = TimeValue.timeValueMillis(between(0, 30000));
 
-            final PutDecommissionRequest request = new PutDecommissionRequest(
-                decommissionAttribute,
-                timeout
-            );
+            final PutDecommissionRequest request = new PutDecommissionRequest(decommissionAttribute, timeout);
             ActionRequestValidationException e = request.validate();
             assertNotNull(e);
             assertTrue(e.getMessage().contains("attribute value is missing"));
@@ -72,10 +59,7 @@ public void testValidation() {
             DecommissionAttribute decommissionAttribute = new DecommissionAttribute(attributeName, attributeValue);
             TimeValue timeout = TimeValue.timeValueMillis(between(0, 30000));
 
-            final PutDecommissionRequest request = new PutDecommissionRequest(
-                decommissionAttribute,
-                timeout
-            );
+            final PutDecommissionRequest request = new PutDecommissionRequest(decommissionAttribute, timeout);
             ActionRequestValidationException e = request.validate();
             assertNull(e);
         }