0.5.0 - revert lazy evaluation for switch function

Author: elisherer

java/json-transform/build.gradle

@@ -9,7 +9,7 @@ plugins {
 }
 
 group 'co.nlighten'
-version = '0.4.0'
+version = '0.5.0'
 
 ext {
     gsonVersion = "2.10.1"

java/json-transform/src/main/java/co/nlighten/jsontransform/functions/TransformerFunctionSwitch.java

@@ -30,21 +30,14 @@ public TransformerFunctionSwitch(JsonAdapter<JE, JA, JO> adapter) {
     public Object apply(FunctionContext<JE, JA, JO> context) {
         var alias = context.getAlias();
         var value = context.getString(null);
-        var transformed = false;
-        var caseMapEl = context.getJsonElement("cases", false);
-        if (adapter.isJsonString(caseMapEl)) {
-            caseMapEl = context.transform(caseMapEl);
-            transformed = true;
-        }
+        var caseMapEl = context.getJsonElement("cases");
         if (!jObject.is(caseMapEl)) {
             logger.warn("{}.cases was not specified with an object as case map", alias);
             return null;
         }
         var caseMap = jObject.convert(caseMapEl);
-        if (!jObject.has(caseMap, value)) {
-            return context.getJsonElement("default");
-        }
-        var caseValue = jObject.get(caseMap, value);
-        return transformed ? caseValue : context.transform(caseValue);
+        return jObject.has(caseMap, value)
+                ? jObject.get(caseMap, value)
+                : context.getJsonElement("default");
     }
 }

java/json-transform/src/test/java/co/nlighten/jsontransform/functions/TransformerFunctionSwitchTest.java

@@ -56,38 +56,4 @@ void inline() {
         assertTransformation(fromJson("{ \"a\": 1, \"B\": 2, \"c\": 3 }"),
                              "$$switch($,'$$decimal:4'):C", fromJson("4"));
     }
-
-
-    @Test
-    void lazyEval() {
-        var transformer = fromJson("""
-{
-  "$$switch": "$",
-  "cases": {
-    "a": "$$switchLazyEval:1",
-    "B": "$$switchLazyEval:2",
-    "c": "$$switchLazyEval:3"
-  }
-}
-""");
-
-        var callCount = new AtomicInteger();
-        GsonJsonTransformer.FUNCTIONS.registerFunctions(Map.entry("switchLazyEval", new TransformerFunction<>(GsonJsonTransformer.ADAPTER) {
-            @Override
-            public Object apply(FunctionContext<JsonElement, JsonArray, JsonObject> context) {
-                callCount.incrementAndGet();
-                return context.get(null);
-            }
-        }));
-
-        callCount.set(0);
-        assertTransformation("B", transformer, "2");
-        // assert that "c" was called twice (check A, check B, break)
-        Assertions.assertEquals(1, callCount.get());
-
-        callCount.set(0);
-        assertTransformation("c", transformer, "3");
-        // assert that "c" was called once (check A, break)
-        Assertions.assertEquals(1, callCount.get());
-    }
 }