Address PR Comments

Signed-off-by: Andre Kurait <[email protected]>
opensearch-project · Oct 24, 2024 · 5f64ef7 · 5f64ef7
1 parent 590f6b0
commit 5f64ef7
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 7 deletions.
diff --git a/...eTransformer/src/main/java/org/opensearch/migrations/transform/JsonJMESPathPredicate.java b/...eTransformer/src/main/java/org/opensearch/migrations/transform/JsonJMESPathPredicate.java
@@ -16,7 +16,7 @@ public JsonJMESPathPredicate(BaseRuntime<Object> runtime, String script) {
     }
 
     @Override
-    public boolean evaluatePredicate(Map<String, Object> incomingJson) {
+    public boolean test(Map<String, Object> incomingJson) {
         var output = expression.search(incomingJson);
         log.atDebug().setMessage("output={}").addArgument(output).log();
         return (Boolean) output;

diff --git a/...ransformerInterface/src/main/java/org/opensearch/migrations/transform/IJsonPredicate.java b/...ransformerInterface/src/main/java/org/opensearch/migrations/transform/IJsonPredicate.java
@@ -1,8 +1,7 @@
 package org.opensearch.migrations.transform;
 
 import java.util.Map;
+import java.util.function.Predicate;
 
-
-public interface IJsonPredicate {
-    boolean evaluatePredicate(Map<String, Object> incomingJson);
+public interface IJsonPredicate extends Predicate<Map<String, Object>> {
 }
diff --git a/...erInterface/src/main/java/org/opensearch/migrations/transform/JsonCompositePredicate.java b/...erInterface/src/main/java/org/opensearch/migrations/transform/JsonCompositePredicate.java
@@ -23,9 +23,9 @@ public JsonCompositePredicate(@NonNull CompositeOperation operation,
     }
 
     @Override
-    public boolean evaluatePredicate(Map<String, Object> incomingJson) {
+    public boolean test(Map<String, Object> incomingJson) {
         var Predicates = jsonPredicateList.stream();
-        Predicate<IJsonPredicate> predicate = p -> p.evaluatePredicate(incomingJson);
+        Predicate<IJsonPredicate> predicate = p -> p.test(incomingJson);
         switch (operation) {
             case ALL:
                 return Predicates.allMatch(predicate);

diff --git a/...terface/src/main/java/org/opensearch/migrations/transform/JsonConditionalTransformer.java b/...terface/src/main/java/org/opensearch/migrations/transform/JsonConditionalTransformer.java
@@ -13,7 +13,7 @@ public JsonConditionalTransformer(IJsonPredicate jsonPredicate, IJsonTransformer
 
     @Override
     public Map<String, Object> transformJson(Map<String, Object> incomingJson) {
-        if (jsonPredicate.evaluatePredicate(incomingJson)) {
+        if (jsonPredicate.test(incomingJson)) {
             return jsonTransformer.transformJson(incomingJson);
         }
         return incomingJson;