Fix spotless check

Signed-off-by: Rishab Nahata <rnnahata@amazon.com>
opensearch-project · Dec 22, 2022 · 7564cb2 · 7564cb2
1 parent 69e0361
commit 7564cb2
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 4 deletions.
diff --git a/...ch/action/admin/cluster/shards/routing/weighted/put/ClusterPutWeightedRoutingRequest.java b/...ch/action/admin/cluster/shards/routing/weighted/put/ClusterPutWeightedRoutingRequest.java
@@ -147,7 +147,15 @@ public ActionRequestValidationException validate() {
         }
         if (countValueWithZeroWeights > weightedRouting.weights().size() / 2) {
             validationException = addValidationError(
-                (String.format(Locale.ROOT, "There are too many attribute values [%s] given zero weight [%d]. Maximum expected number of routing weights having zero weight is [%d]", weightedRouting.weights().toString(), countValueWithZeroWeights, weightedRouting.weights().size() / 2)), null);
+                (String.format(
+                    Locale.ROOT,
+                    "There are too many attribute values [%s] given zero weight [%d]. Maximum expected number of routing weights having zero weight is [%d]",
+                    weightedRouting.weights().toString(),
+                    countValueWithZeroWeights,
+                    weightedRouting.weights().size() / 2
+                )),
+                null
+            );
         }
         return validationException;
     }

diff --git a/server/src/main/java/org/opensearch/cluster/routing/WeightedRoutingService.java b/server/src/main/java/org/opensearch/cluster/routing/WeightedRoutingService.java
@@ -223,7 +223,15 @@ private void ensureWeightsSetForAllDiscoveredAndForcedAwarenessValues(ClusterSta
         // discovered awareness values has weight zero
         if (countWithZeroWeight.get() > allAwarenessValues.size() / 2) {
             throw addValidationError(
-                (String.format(Locale.ROOT, "There are too many discovered attribute values [%s] given zero weight [%d]. Maximum expected number of routing weights having zero weight is [%d]", request.getWeightedRouting().weights().toString(), countWithZeroWeight.get(), allAwarenessValues.size() / 2)), null);
+                (String.format(
+                    Locale.ROOT,
+                    "There are too many discovered attribute values [%s] given zero weight [%d]. Maximum expected number of routing weights having zero weight is [%d]",
+                    request.getWeightedRouting().weights().toString(),
+                    countWithZeroWeight.get(),
+                    allAwarenessValues.size() / 2
+                )),
+                null
+            );
         }
     }
 

diff --git a/...tion/admin/cluster/shards/routing/weighted/put/ClusterPutWeightedRoutingRequestTests.java b/...tion/admin/cluster/shards/routing/weighted/put/ClusterPutWeightedRoutingRequestTests.java
@@ -59,6 +59,8 @@ public void testValidate_MoreThanHalfWithZeroWeight() {
         request.setWeightedRouting(new BytesArray(reqString), XContentType.JSON);
         ActionRequestValidationException actionRequestValidationException = request.validate();
         assertNotNull(actionRequestValidationException);
-        assertTrue(actionRequestValidationException.getMessage().contains("Maximum expected number of routing weights having zero weight is [1]"));
+        assertTrue(
+            actionRequestValidationException.getMessage().contains("Maximum expected number of routing weights having zero weight is [1]")
+        );
     }
 }
diff --git a/server/src/test/java/org/opensearch/cluster/routing/WeightedRoutingServiceTests.java b/server/src/test/java/org/opensearch/cluster/routing/WeightedRoutingServiceTests.java
@@ -353,7 +353,10 @@ public void onFailure(Exception e) {
         assertTrue(countDownLatch.await(30, TimeUnit.SECONDS));
         MatcherAssert.assertThat("Expected onFailure to be called", exceptionReference.get(), notNullValue());
         MatcherAssert.assertThat(exceptionReference.get(), instanceOf(ActionRequestValidationException.class));
-        MatcherAssert.assertThat(exceptionReference.get().getMessage(), containsString("Maximum expected number of routing weights having zero weight is [1]"));
+        MatcherAssert.assertThat(
+            exceptionReference.get().getMessage(),
+            containsString("Maximum expected number of routing weights having zero weight is [1]")
+        );
     }
 
     public void testAddWeightedRoutingFailsWhenDecommissionOngoing() throws InterruptedException {