Fix test failure

shijinglu · Apr 26, 2019 · 9b08338 · 9b08338
1 parent 8a8ac03
commit 9b08338
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 8 deletions.
diff --git a/src/main/java/org/shijinglu/lure/Expr.java b/src/main/java/org/shijinglu/lure/Expr.java
@@ -89,9 +89,7 @@ public ContextBuilder addStringContext(String ctxKey, String ctxVal) {
 
         public ContextBuilder addCustomizedContext(
                 String ctxKey, String ctxValRaw, String typeName) {
-            _context.put(
-                    ctxKey,
-                    ExtensionManager.EXT_DATA_TYPES.get(typeName).create(ctxValRaw, typeName));
+            _context.put(ctxKey, ExtensionManager.getDataFactor(typeName).create(ctxValRaw));
             return this;
         }
 

diff --git a/src/main/java/org/shijinglu/lure/core/NodeFunction.java b/src/main/java/org/shijinglu/lure/core/NodeFunction.java
@@ -34,7 +34,7 @@ public IData evaluate(final Map<String, IData> context) {
                         .collect(Collectors.toList());
         // left node string serves as the function name
         final String fname = left.data.toString();
-        IFunction function = ExtensionManager.FUNCTIONS.get(fname);
+        IFunction function = ExtensionManager.getFunction(fname);
         if (function == null) {
             return BoolData.FALSE;
         }

diff --git a/src/main/java/org/shijinglu/lure/extensions/ExtensionManager.java b/src/main/java/org/shijinglu/lure/extensions/ExtensionManager.java
@@ -4,8 +4,8 @@
 import java.util.concurrent.ConcurrentMap;
 
 public class ExtensionManager {
-    public static final ConcurrentMap<String, IFunction> FUNCTIONS;
-    public static final ConcurrentMap<String, IDataFactory> EXT_DATA_TYPES;
+    private static final ConcurrentMap<String, IFunction> FUNCTIONS;
+    private static final ConcurrentMap<String, IDataFactory> EXT_DATA_TYPES;
 
     static {
         FUNCTIONS = new ConcurrentHashMap<>();
@@ -14,7 +14,11 @@ public class ExtensionManager {
         addDataFactory(new VersionData.VersionDataBuilder());
     }
 
-    static void addFunction(IFunction f) {
+    public static IFunction getFunction(String fname) {
+        return FUNCTIONS.get(fname);
+    }
+
+    public static void addFunction(IFunction f) {
         String fname = f.functionName();
         if (FUNCTIONS.containsKey(fname)) {
             throw new IllegalArgumentException(
@@ -25,7 +29,11 @@ static void addFunction(IFunction f) {
         FUNCTIONS.put(fname, f);
     }
 
-    static void addDataFactory(IDataFactory df) {
+    public static IDataFactory getDataFactor(String dfName) {
+        return EXT_DATA_TYPES.get(dfName);
+    }
+
+    public static void addDataFactory(IDataFactory df) {
         String extKey = df.extKey();
         if (EXT_DATA_TYPES.containsKey(extKey)) {
             throw new IllegalArgumentException(