cleanup: wrap -> wrapExceptions

Signed-off-by: Calum Murray <cmurray@redhat.com>
cloudevents · Jun 19, 2024 · cfcff87 · cfcff87
1 parent dd7fee5
commit cfcff87
Show file tree

Hide file tree

Showing 8 changed files with 12 additions and 17 deletions.
diff --git a/sql/src/main/java/io/cloudevents/sql/impl/expressions/AndExpression.java b/sql/src/main/java/io/cloudevents/sql/impl/expressions/AndExpression.java
@@ -3,7 +3,6 @@
 import io.cloudevents.CloudEvent;
 import io.cloudevents.sql.EvaluationRuntime;
 import io.cloudevents.sql.ExceptionFactory;
-import io.cloudevents.sql.Type;
 import io.cloudevents.sql.impl.ExpressionInternal;
 import io.cloudevents.sql.impl.runtime.EvaluationResult;
 import org.antlr.v4.runtime.misc.Interval;
@@ -24,6 +23,6 @@ public EvaluationResult evaluate(EvaluationRuntime runtime, CloudEvent event, Ex
         }
 
         EvaluationResult right = this.getRightOperand().evaluate(runtime, event, exceptionFactory);
-        return castToBoolean(exceptionFactory, right).wrap(left);
+        return castToBoolean(exceptionFactory, right).wrapExceptions(left);
     }
 }
diff --git a/sql/src/main/java/io/cloudevents/sql/impl/expressions/BaseIntegerBinaryExpression.java b/sql/src/main/java/io/cloudevents/sql/impl/expressions/BaseIntegerBinaryExpression.java
@@ -4,7 +4,6 @@
 import io.cloudevents.sql.EvaluationRuntime;
 import io.cloudevents.sql.ExceptionFactory;
 import io.cloudevents.sql.Type;
-import io.cloudevents.sql.impl.ExceptionFactoryImpl;
 import io.cloudevents.sql.impl.ExpressionInternal;
 import io.cloudevents.sql.impl.runtime.EvaluationResult;
 import org.antlr.v4.runtime.misc.Interval;
@@ -23,7 +22,7 @@ public EvaluationResult evaluate(EvaluationRuntime runtime, CloudEvent event, Ex
         EvaluationResult right = this.getRightOperand().evaluate(runtime, event, exceptionFactory);
 
         if (left.isMissingAttributeException() || right.isMissingAttributeException()) {
-            return left.wrap(right).copyWithDefaultValueForType(Type.INTEGER);
+            return left.wrapExceptions(right).copyWithDefaultValueForType(Type.INTEGER);
         }
 
         EvaluationResult x = castToInteger(exceptionFactory, left);
@@ -34,7 +33,7 @@ public EvaluationResult evaluate(EvaluationRuntime runtime, CloudEvent event, Ex
             (Integer)x.value(),
             (Integer)y.value(),
             exceptionFactory
-        ).wrap(x).wrap(y);
+        ).wrapExceptions(x).wrapExceptions(y);
     }
 
 }
diff --git a/sql/src/main/java/io/cloudevents/sql/impl/expressions/ComparisonExpression.java b/sql/src/main/java/io/cloudevents/sql/impl/expressions/ComparisonExpression.java
@@ -42,7 +42,7 @@ public EvaluationResult evaluate(EvaluationRuntime runtime, CloudEvent event, Ex
         EvaluationResult right = this.getRightOperand().evaluate(runtime, event, exceptionFactory);
 
         if (left.isMissingAttributeException() || right.isMissingAttributeException()) {
-            return left.wrap(right).copyWithDefaultValueForType(Type.BOOLEAN);
+            return left.wrapExceptions(right).copyWithDefaultValueForType(Type.BOOLEAN);
         }
 
         left = TypeCastingProvider.cast(

diff --git a/sql/src/main/java/io/cloudevents/sql/impl/expressions/FunctionInvocationExpression.java b/sql/src/main/java/io/cloudevents/sql/impl/expressions/FunctionInvocationExpression.java
@@ -52,7 +52,7 @@ public EvaluationResult evaluate(EvaluationRuntime runtime, CloudEvent event, Ex
             runtime,
             event,
             computedArguments
-        ).wrap(exceptions);
+        ).wrapExceptions(exceptions);
     }
 
     @Override

diff --git a/sql/src/main/java/io/cloudevents/sql/impl/expressions/InExpression.java b/sql/src/main/java/io/cloudevents/sql/impl/expressions/InExpression.java
@@ -40,7 +40,7 @@ public EvaluationResult evaluate(EvaluationRuntime runtime, CloudEvent event, Ex
             if (Objects.equals(leftValue.value(), rightValue.value())) {
                 return new EvaluationResult(true, null, leftValue, rightValue);
             } else {
-                leftValue.wrap(rightValue);
+                leftValue.wrapExceptions(rightValue);
             }
         }
         return leftValue.copyWithValue(false);

diff --git a/sql/src/main/java/io/cloudevents/sql/impl/expressions/IntegerComparisonBinaryExpression.java b/sql/src/main/java/io/cloudevents/sql/impl/expressions/IntegerComparisonBinaryExpression.java
@@ -4,7 +4,6 @@
 import io.cloudevents.sql.EvaluationRuntime;
 import io.cloudevents.sql.ExceptionFactory;
 import io.cloudevents.sql.Type;
-import io.cloudevents.sql.impl.ExceptionFactoryImpl;
 import io.cloudevents.sql.impl.ExpressionInternal;
 import io.cloudevents.sql.impl.runtime.EvaluationResult;
 import org.antlr.v4.runtime.misc.Interval;
@@ -43,7 +42,7 @@ public EvaluationResult evaluate(EvaluationRuntime runtime, CloudEvent event, Ex
         EvaluationResult right = this.getRightOperand().evaluate(runtime, event, exceptionFactory);
 
         if (left.isMissingAttributeException() || right.isMissingAttributeException()) {
-            return left.wrap(right).copyWithDefaultValueForType(Type.BOOLEAN);
+            return left.wrapExceptions(right).copyWithDefaultValueForType(Type.BOOLEAN);
         }
 
         EvaluationResult x = castToInteger(exceptionFactory, left);
@@ -52,7 +51,7 @@ public EvaluationResult evaluate(EvaluationRuntime runtime, CloudEvent event, Ex
         return new EvaluationResult(this.operation.evaluate(
             (Integer)x.value(),
             (Integer)y.value()
-        )).wrap(x).wrap(y);
+        )).wrapExceptions(x).wrapExceptions(y);
     }
 
 }
diff --git a/sql/src/main/java/io/cloudevents/sql/impl/expressions/XorExpression.java b/sql/src/main/java/io/cloudevents/sql/impl/expressions/XorExpression.java
@@ -3,8 +3,6 @@
 import io.cloudevents.CloudEvent;
 import io.cloudevents.sql.EvaluationRuntime;
 import io.cloudevents.sql.ExceptionFactory;
-import io.cloudevents.sql.Type;
-import io.cloudevents.sql.impl.ExceptionFactoryImpl;
 import io.cloudevents.sql.impl.ExpressionInternal;
 import io.cloudevents.sql.impl.runtime.EvaluationResult;
 import org.antlr.v4.runtime.misc.Interval;
@@ -25,6 +23,6 @@ public EvaluationResult evaluate(EvaluationRuntime runtime, CloudEvent event, Ex
         return new EvaluationResult(Boolean.logicalXor(
             (Boolean)x.value(),
             (Boolean)y.value()
-        )).wrap(x).wrap(y);
+        )).wrapExceptions(x).wrapExceptions(y);
     }
 }
diff --git a/sql/src/main/java/io/cloudevents/sql/impl/runtime/EvaluationResult.java b/sql/src/main/java/io/cloudevents/sql/impl/runtime/EvaluationResult.java
@@ -38,14 +38,14 @@ public EvaluationResult(Object value) {
         this.latestException = null;
     }
 
-    public EvaluationResult wrap(EvaluationResult other) {
+    public EvaluationResult wrapExceptions(EvaluationResult other) {
         if (other != null && other.exceptions != null) {
-            return this.wrap(other.exceptions);
+            return this.wrapExceptions(other.exceptions);
         }
         return this;
     }
 
-    public EvaluationResult wrap(List<EvaluationException> exceptions) {
+    public EvaluationResult wrapExceptions(List<EvaluationException> exceptions) {
         if (!exceptions.isEmpty()) {
             this.exceptions.addAll(exceptions);
         }