Add explicit count in request validation error message

Signed-off-by: Anshu Agarwal <[email protected]>
opensearch-project · Sep 27, 2022 · f3cf04d · f3cf04d
1 parent 703d918
commit f3cf04d
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 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
@@ -28,6 +28,7 @@
 
 import java.io.IOException;
 import java.util.HashMap;
+import java.util.Locale;
 import java.util.Map;
 
 import static org.opensearch.action.ValidateActions.addValidationError;
@@ -141,7 +142,10 @@ public ActionRequestValidationException validate() {
             validationException = addValidationError(("Weight is not a number"), validationException);
         }
         if (countValueWithZeroWeights > 1) {
-            validationException = addValidationError(("More than one value has weight set as 0 "), validationException);
+            validationException = addValidationError(
+                (String.format(Locale.ROOT, "More than one [%d] value has weight set as 0", countValueWithZeroWeights)),
+                validationException
+            );
         }
         return validationException;
     }

diff --git a/...tion/admin/cluster/shards/routing/weighted/put/ClusterPutWeightedRoutingRequestTests.java b/...tion/admin/cluster/shards/routing/weighted/put/ClusterPutWeightedRoutingRequestTests.java
@@ -41,7 +41,7 @@ public void testValidate_TwoZonesWithZeroWeight() {
         request.setWeightedRouting(new BytesArray(reqString), XContentType.JSON);
         ActionRequestValidationException actionRequestValidationException = request.validate();
         assertNotNull(actionRequestValidationException);
-        assertTrue(actionRequestValidationException.getMessage().contains("More than one value has weight set as 0"));
+        assertTrue(actionRequestValidationException.getMessage().contains("More than one [2] value has weight set as " + "0"));
     }
 
     public void testValidate_MissingWeights() {