OpelLogicalExpressionException extracted

allegro · Dec 22, 2020 · 190d927 · 190d927
1 parent 0483450
commit 190d927
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 8 deletions.
diff --git a/src/main/java/pl/allegro/tech/opel/LogicalOperatorExpressionNode.java b/src/main/java/pl/allegro/tech/opel/LogicalOperatorExpressionNode.java
@@ -40,21 +40,15 @@ private <T> T wrappingExceptionsWithOpelException(Object left, Supplier<T> wrapp
         try {
             return wrappedBody.get();
         } catch (Exception e) {
-            String msg = String.format("Error on evaluating left side of logical expression. " +
-                                       "operator: '%s', left: '%s', class: '%s'",
-                    logicalOperator, left, left.getClass());
-            throw new OpelException(msg, e);
+            throw new OpelLogicalExpressionException(logicalOperator, left, e);
         }
     }
 
     private <T> T wrappingExceptionsWithOpelException(Object left, Object right, Supplier<T> wrappedBody) {
         try {
             return wrappedBody.get();
         } catch (Exception e) {
-            String msg = String.format("Error on evaluating logical expression. " +
-                                       "operator: '%s', left: '%s', class: '%s' right: '%s', class: '%s'",
-                    logicalOperator, left, left.getClass(), right, right.getClass());
-            throw new OpelException(msg, e);
+            throw new OpelLogicalExpressionException(logicalOperator, left, right, e);
         }
     }
 }
diff --git a/src/main/java/pl/allegro/tech/opel/OpelLogicalExpressionException.java b/src/main/java/pl/allegro/tech/opel/OpelLogicalExpressionException.java
@@ -0,0 +1,26 @@
+package pl.allegro.tech.opel;
+
+public class OpelLogicalExpressionException extends OpelException {
+
+    public OpelLogicalExpressionException(Operator logicalOperator, Object left, Exception exception) {
+        super(getMessage(logicalOperator, left), exception);
+    }
+
+    public OpelLogicalExpressionException(Operator logicalOperator, Object left, Object right, Exception exception) {
+        super(getMessage(logicalOperator, left, right), exception);
+    }
+
+    private static String getMessage(Operator logicalOperator, Object left) {
+        return String.format(
+                "Error on evaluating left side of logical expression. " +
+                "Operator: '%s', left: '%s', class: '%s'",
+                logicalOperator, left, left.getClass());
+    }
+
+    private static String getMessage(Operator logicalOperator, Object left, Object right) {
+        return String.format(
+                "Error on evaluating logical expression. " +
+                "Operator: '%s', left: '%s', class: '%s' right: '%s', class: '%s'",
+                logicalOperator, left, left.getClass(), right, right.getClass());
+    }
+}