From f3f3063ae177a03fb0bf6c10060bfdba194b127a Mon Sep 17 00:00:00 2001 From: Rishab Nahata Date: Mon, 22 Aug 2022 16:51:55 +0530 Subject: [PATCH] Applying spotless check Signed-off-by: Rishab Nahata --- .../awareness/get/GetDecommissionRequest.java | 3 +-- .../get/GetDecommissionResponse.java | 14 +++++++--- .../get/TransportGetDecommissionAction.java | 13 +++------- .../awareness/put/PutDecommissionRequest.java | 10 ++----- .../put/PutDecommissionRequestBuilder.java | 6 ++++- .../put/PutDecommissionResponse.java | 1 - .../put/TransportPutDecommissionAction.java | 20 +++++++------- .../decommission/DecommissionAttribute.java | 6 +---- .../cluster/RestGetDecommissionAction.java | 6 +---- .../cluster/RestPutDecommissionAction.java | 9 ++----- .../put/PutDecommissionRequestTests.java | 26 ++++--------------- 11 files changed, 40 insertions(+), 74 deletions(-) diff --git a/server/src/main/java/org/opensearch/action/admin/cluster/decommission/awareness/get/GetDecommissionRequest.java b/server/src/main/java/org/opensearch/action/admin/cluster/decommission/awareness/get/GetDecommissionRequest.java index 63114cfa8ec25..fa979544129c2 100644 --- a/server/src/main/java/org/opensearch/action/admin/cluster/decommission/awareness/get/GetDecommissionRequest.java +++ b/server/src/main/java/org/opensearch/action/admin/cluster/decommission/awareness/get/GetDecommissionRequest.java @@ -22,8 +22,7 @@ */ public class GetDecommissionRequest extends ClusterManagerNodeReadRequest { - public GetDecommissionRequest() { - } + public GetDecommissionRequest() {} public GetDecommissionRequest(StreamInput in) throws IOException { super(in); diff --git a/server/src/main/java/org/opensearch/action/admin/cluster/decommission/awareness/get/GetDecommissionResponse.java b/server/src/main/java/org/opensearch/action/admin/cluster/decommission/awareness/get/GetDecommissionResponse.java index 1b3aa32c18393..343868894620a 100644 --- a/server/src/main/java/org/opensearch/action/admin/cluster/decommission/awareness/get/GetDecommissionResponse.java +++ b/server/src/main/java/org/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/server/src/main/java/org/opensearch/action/admin/cluster/decommission/awareness/get/TransportGetDecommissionAction.java b/server/src/main/java/org/opensearch/action/admin/cluster/decommission/awareness/get/TransportGetDecommissionAction.java index 6627b78d664f0..1f875d2df96df 100644 --- a/server/src/main/java/org/opensearch/action/admin/cluster/decommission/awareness/get/TransportGetDecommissionAction.java +++ b/server/src/main/java/org/opensearch/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 { @Inject public TransportGetDecommissionAction( @@ -66,14 +64,9 @@ protected void clusterManagerOperation( ActionListener 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/server/src/main/java/org/opensearch/action/admin/cluster/decommission/awareness/put/PutDecommissionRequest.java b/server/src/main/java/org/opensearch/action/admin/cluster/decommission/awareness/put/PutDecommissionRequest.java index fd78deb86614b..c570791003199 100644 --- a/server/src/main/java/org/opensearch/action/admin/cluster/decommission/awareness/put/PutDecommissionRequest.java +++ b/server/src/main/java/org/opensearch/action/admin/cluster/decommission/awareness/put/PutDecommissionRequest.java @@ -24,8 +24,7 @@ public class PutDecommissionRequest extends ClusterManagerNodeRequest 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 index 9ad6d04703e60..458d73a6e8dd8 100644 --- 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/server/src/test/java/org/opensearch/action/admin/cluster/decommission/awareness/put/PutDecommissionRequestTests.java b/server/src/test/java/org/opensearch/action/admin/cluster/decommission/awareness/put/PutDecommissionRequestTests.java index 7f1be10232f3e..606158725c955 100644 --- a/server/src/test/java/org/opensearch/action/admin/cluster/decommission/awareness/put/PutDecommissionRequestTests.java +++ b/server/src/test/java/org/opensearch/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); }