Merge pull request #40 from melniknow/fix/redundant_storage_of_operations

Removed the redundant storage of operations

Author: jamsesso

src/main/java/io/github/jamsesso/jsonlogic/JsonLogic.java

@@ -12,14 +12,11 @@
 import java.util.function.Function;
 
 public final class JsonLogic {
-  private final List<JsonLogicExpression> expressions;
-  private final Map<String, JsonLogicNode> parseCache;
+  private final Map<String, JsonLogicNode> parseCache = new ConcurrentHashMap<>();
+  private final Map<String, JsonLogicExpression> expressions = new ConcurrentHashMap<>();
   private JsonLogicEvaluator evaluator;
 
   public JsonLogic() {
-    this.expressions = new ArrayList<>();
-    this.parseCache = new ConcurrentHashMap<>();
-
     // Add default operations
     addOperation(MathExpression.ADD);
     addOperation(MathExpression.SUBTRACT);
@@ -72,7 +69,7 @@ public String key() {
   }
 
   public JsonLogic addOperation(JsonLogicExpression expression) {
-    expressions.add(expression);
+    expressions.put(expression.key(), expression);
     evaluator = null;
 
     return this;

src/main/java/io/github/jamsesso/jsonlogic/evaluator/JsonLogicEvaluator.java

@@ -6,14 +6,20 @@
 import java.util.*;
 
 public class JsonLogicEvaluator {
-  private final Map<String, JsonLogicExpression> expressions = new HashMap<>();
+  private final Map<String, JsonLogicExpression> expressions;
 
   public JsonLogicEvaluator(Collection<JsonLogicExpression> expressions) {
+    this.expressions = new HashMap<>();
+
     for (JsonLogicExpression expression : expressions) {
       this.expressions.put(expression.key(), expression);
     }
   }
 
+  public JsonLogicEvaluator(Map<String, JsonLogicExpression> expressions) {
+    this.expressions = Collections.unmodifiableMap(expressions);
+  }
+
   public Object evaluate(JsonLogicNode node, Object data) throws JsonLogicEvaluationException {
     switch (node.getType()) {
       case PRIMITIVE: return evaluate((JsonLogicPrimitive) node);
@@ -139,4 +145,4 @@ public static Object transform(Object value) {
 
     return value;
   }
-}
+}