Adjust format by spotlessApply task

Signed-off-by: Tianli Feng <[email protected]>
opensearch-project · Mar 30, 2022 · 95c64a3 · 95c64a3
1 parent befebfe
commit 95c64a3
Show file tree

Hide file tree

Showing 8 changed files with 17 additions and 13 deletions.
diff --git a/server/src/main/java/org/opensearch/rest/BaseRestHandler.java b/server/src/main/java/org/opensearch/rest/BaseRestHandler.java
@@ -214,13 +214,13 @@ protected Set<String> responseParams() {
      */
     @Deprecated
     protected static void parseDeprecatedMasterTimeoutParameter(
-            MasterNodeRequest mnr,
-            RestRequest request,
-            DeprecationLogger logger,
-            String logMsgKeyPrefix
+        MasterNodeRequest mnr,
+        RestRequest request,
+        DeprecationLogger logger,
+        String logMsgKeyPrefix
     ) {
         final String MASTER_TIMEOUT_DEPRECATED_MESSAGE =
-                "Deprecated parameter [master_timeout] used. To promote inclusive language, please use [cluster_manager_timeout] instead. It will be unsupported in a future major version.";
+            "Deprecated parameter [master_timeout] used. To promote inclusive language, please use [cluster_manager_timeout] instead. It will be unsupported in a future major version.";
         if (request.hasParam("master_timeout")) {
             logger.deprecate(logMsgKeyPrefix + "_master_timeout_parameter", MASTER_TIMEOUT_DEPRECATED_MESSAGE);
             request.validateParamValuesAreEqual("master_timeout", "cluster_manager_timeout");

diff --git a/...java/org/opensearch/rest/action/admin/cluster/dangling/RestDeleteDanglingIndexAction.java b/...java/org/opensearch/rest/action/admin/cluster/dangling/RestDeleteDanglingIndexAction.java
@@ -40,7 +40,6 @@
 import org.opensearch.rest.RestRequest;
 import org.opensearch.rest.RestStatus;
 import org.opensearch.rest.action.RestToXContentListener;
-import org.opensearch.rest.action.admin.indices.RestAddIndexBlockAction;
 
 import java.io.IOException;
 import java.util.List;
@@ -52,7 +51,7 @@
 public class RestDeleteDanglingIndexAction extends BaseRestHandler {
 
     private static final DeprecationLogger deprecationLogger = DeprecationLogger.getLogger(RestDeleteDanglingIndexAction.class);
-    
+
     @Override
     public List<Route> routes() {
         return singletonList(new Route(DELETE, "/_dangling/{index_uuid}"));

diff --git a/...src/main/java/org/opensearch/rest/action/admin/indices/RestDeleteIndexTemplateAction.java b/...src/main/java/org/opensearch/rest/action/admin/indices/RestDeleteIndexTemplateAction.java
@@ -61,7 +61,9 @@ public String getName() {
     @Override
     public RestChannelConsumer prepareRequest(final RestRequest request, final NodeClient client) throws IOException {
         DeleteIndexTemplateRequest deleteIndexTemplateRequest = new DeleteIndexTemplateRequest(request.param("name"));
-        deleteIndexTemplateRequest.masterNodeTimeout(request.paramAsTime("cluster_manager_timeout", deleteIndexTemplateRequest.masterNodeTimeout()));
+        deleteIndexTemplateRequest.masterNodeTimeout(
+            request.paramAsTime("cluster_manager_timeout", deleteIndexTemplateRequest.masterNodeTimeout())
+        );
         parseDeprecatedMasterTimeoutParameter(deleteIndexTemplateRequest, request, deprecationLogger, getName());
         return channel -> client.admin().indices().deleteTemplate(deleteIndexTemplateRequest, new RestToXContentListener<>(channel));
     }

diff --git a/...n/java/org/opensearch/rest/action/admin/indices/RestGetComposableIndexTemplateAction.java b/...n/java/org/opensearch/rest/action/admin/indices/RestGetComposableIndexTemplateAction.java
@@ -54,7 +54,7 @@
 public class RestGetComposableIndexTemplateAction extends BaseRestHandler {
 
     private static final DeprecationLogger deprecationLogger = DeprecationLogger.getLogger(RestGetComposableIndexTemplateAction.class);
-    
+
     @Override
     public List<Route> routes() {
         return Arrays.asList(

diff --git a/...er/src/main/java/org/opensearch/rest/action/admin/indices/RestGetIndexTemplateAction.java b/...er/src/main/java/org/opensearch/rest/action/admin/indices/RestGetIndexTemplateAction.java
@@ -79,7 +79,9 @@ public RestChannelConsumer prepareRequest(final RestRequest request, final NodeC
 
         final GetIndexTemplatesRequest getIndexTemplatesRequest = new GetIndexTemplatesRequest(names);
         getIndexTemplatesRequest.local(request.paramAsBoolean("local", getIndexTemplatesRequest.local()));
-        getIndexTemplatesRequest.masterNodeTimeout(request.paramAsTime("cluster_manager_timeout", getIndexTemplatesRequest.masterNodeTimeout()));
+        getIndexTemplatesRequest.masterNodeTimeout(
+            request.paramAsTime("cluster_manager_timeout", getIndexTemplatesRequest.masterNodeTimeout())
+        );
         parseDeprecatedMasterTimeoutParameter(getIndexTemplatesRequest, request, deprecationLogger, getName());
 
         final boolean implicitAll = getIndexTemplatesRequest.names().length == 0;

diff --git a/server/src/main/java/org/opensearch/rest/action/admin/indices/RestIndicesAliasesAction.java b/server/src/main/java/org/opensearch/rest/action/admin/indices/RestIndicesAliasesAction.java
@@ -48,7 +48,7 @@
 
 public class RestIndicesAliasesAction extends BaseRestHandler {
     private static final DeprecationLogger deprecationLogger = DeprecationLogger.getLogger(RestIndicesAliasesAction.class);
-    
+
     @Override
     public String getName() {
         return "indices_aliases_action";

diff --git a/...c/main/java/org/opensearch/rest/action/admin/indices/RestSimulateIndexTemplateAction.java b/...c/main/java/org/opensearch/rest/action/admin/indices/RestSimulateIndexTemplateAction.java
@@ -64,7 +64,9 @@ public String getName() {
     @Override
     public RestChannelConsumer prepareRequest(final RestRequest request, final NodeClient client) throws IOException {
         SimulateIndexTemplateRequest simulateIndexTemplateRequest = new SimulateIndexTemplateRequest(request.param("name"));
-        simulateIndexTemplateRequest.masterNodeTimeout(request.paramAsTime("cluster_manager_timeout", simulateIndexTemplateRequest.masterNodeTimeout()));
+        simulateIndexTemplateRequest.masterNodeTimeout(
+            request.paramAsTime("cluster_manager_timeout", simulateIndexTemplateRequest.masterNodeTimeout())
+        );
         parseDeprecatedMasterTimeoutParameter(simulateIndexTemplateRequest, request, deprecationLogger, getName());
         if (request.hasContent()) {
             PutComposableIndexTemplateAction.Request indexTemplateRequest = new PutComposableIndexTemplateAction.Request(

diff --git a/...er/src/main/java/org/opensearch/rest/action/admin/indices/RestSimulateTemplateAction.java b/...er/src/main/java/org/opensearch/rest/action/admin/indices/RestSimulateTemplateAction.java
@@ -40,7 +40,6 @@
 import org.opensearch.rest.BaseRestHandler;
 import org.opensearch.rest.RestRequest;
 import org.opensearch.rest.action.RestToXContentListener;
-import org.opensearch.rest.action.admin.cluster.dangling.RestDeleteDanglingIndexAction;
 
 import java.io.IOException;
 import java.util.Arrays;