#358

Author: wnm3

README.md

@@ -14,7 +14,7 @@ The easiest way to use this library is to include it as a dependency in your Mav
 <dependency>
   <groupId>com.ibm.jsonata4java</groupId>
   <artifactId>JSONata4Java</artifactId>
-  <version>2.5.3</version>
+  <version>2.5.4</version>
 </dependency>
 ```
 
@@ -51,8 +51,8 @@ Note: to build and deploy the jars to Maven Central you need to use a command li
 `mvn clean install deploy -Prelease`
 
 Once you have run the launcher, you can find the jar files in the /target directory. There are two&colon;
-* **JSONata4Java-2.5.3-jar-with-dependencies.jar** (thinks includes dependent jar files)
-* **JSONata4Java-2.5.3.jar** (only the JSONata4Java code)
+* **JSONata4Java-2.5.4-jar-with-dependencies.jar** (thinks includes dependent jar files)
+* **JSONata4Java-2.5.4.jar** (only the JSONata4Java code)
 
 The com.api.jsonata4java.Tester program enables you to enter an expression and run it 
 against the same JSON as is used at the https://try.jsonata.org site. You can also 

makeRelease.sh

@@ -3,6 +3,9 @@ export OLD_JAVA_HOME=$JAVA_HOME
 export OLD_PATH=$PATH
 export JAVA_HOME=/Library/Java/JavaVirtualMachines/ibm-semeru-open-17.jdk/Contents/Home
 export PATH=$JAVA_HOME:$PATH
+gpg --version
+echo "test" | gpg --clearsign
+
 mvn clean install deploy -Prelease
 export JAVA_HOME=$OLD_JAVA_HOME
 export PATH=$OLD_PATH

pom.xml

@@ -14,7 +14,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.ibm.jsonata4java</groupId>
   <artifactId>JSONata4Java</artifactId>
-  <version>2.5.3</version>
+  <version>2.5.4</version>
   <name>JSONata4Java</name>
   <description>Port of jsonata.js to Java to enable rules for JSON content</description>
   <url>https://github.com/IBM/JSONata4Java</url>

src/main/java/com/api/jsonata4java/expressions/ExpressionsVisitor.java

@@ -2223,7 +2223,7 @@ public JsonNode visitObject(ObjectContext ctx) {
                     for (JsonNode element : context) {
                         _environment.pushContext(element);
                         final JsonNode fieldList = visit(ctx.fieldList());
-                        fieldList.fields().forEachRemaining(e -> grouping
+                        fieldList.properties().forEach(e -> grouping
                             .computeIfAbsent(e.getKey(), ignore -> factory.arrayNode()).add(e.getValue()));
                         _environment.popContext();
                     }

src/main/java/com/api/jsonata4java/expressions/utils/FunctionUtils.java

@@ -408,7 +408,7 @@ public static Object_constructorContext getObjectConstructorContext(ExprContext
         int count = 0;
         CommonToken token = null;
         TerminalNode tn = null;
-        for (Iterator<Entry<String, JsonNode>> it = object.fields(); it.hasNext();) {
+        for (Iterator<Entry<String, JsonNode>> it = object.properties().iterator(); it.hasNext();) {
             Entry<String, JsonNode> field = it.next();
             count++;
             if (count > 1) {

src/main/java/com/api/jsonata4java/expressions/utils/JsonMergeUtils.java

@@ -78,7 +78,7 @@ public static JsonNode merge(JsonNode x, JsonNode y) {
 
     private static ObjectNode merge(ObjectNode x, ObjectNode y) {
 
-        final Iterator<Map.Entry<String, JsonNode>> yit = y.fields();
+        final Iterator<Map.Entry<String, JsonNode>> yit = y.properties().iterator();
         while (yit.hasNext()) {
             final Map.Entry<String, JsonNode> ye = yit.next();
             final String f = ye.getKey();

src/test/java/com/api/jsonata4java/expressions/utils/TestLogFormatter.java

@@ -71,7 +71,7 @@ public String format(LogRecord r) {
         sb.append('[');
         sb.append(date);
         sb.append("] ");
-        sb.append(r.getThreadID());
+        sb.append(r.getLongThreadID());
         sb.append("    ");
         sb.append(className);
         sb.append(' ');

src/test/java/com/api/jsonata4java/expressions/utils/Utils.java

@@ -195,7 +195,7 @@ public static <X extends JsonNode> X ensureAllIntegralsAreLongs(JsonNode input)
         switch (input.getNodeType()) {
             case OBJECT: {
                 ObjectNode output = JsonNodeFactory.instance.objectNode();
-                Iterator<Entry<String, JsonNode>> it = ((ObjectNode) input).fields();
+                Iterator<Entry<String, JsonNode>> it = ((ObjectNode) input).properties().iterator();
                 while (it.hasNext()) {
                     Entry<String, JsonNode> e = it.next();
                     String field = e.getKey();

src/test/java/testmanually/ThreadTester.java

@@ -1,4 +1,5 @@
 package testmanually;
+
 import org.junit.Test;
 import org.springframework.core.task.SimpleAsyncTaskExecutor;
 import org.springframework.core.task.TaskExecutor;
@@ -8,55 +9,59 @@
 
 public class ThreadTester {
 
-    static boolean showError = false;
-
-    @Test
-    public void threadSafeTest() throws Exception {
-        String json1 = "{ \"a\":\"aaa\" }";
-        String json2 = "{ \"a\":\"bbb\" }";
-        Expressions exp = Expressions.parse("a");
-        TaskExecutor theExecutor = new SimpleAsyncTaskExecutor();
-        if (showError) {
-            theExecutor.execute(new ThreadTest(exp, new ObjectMapper().readTree(json1)));
-            theExecutor.execute(new ThreadTest(exp, new ObjectMapper().readTree(json2)));
-        } else {
-            theExecutor.execute(new ThreadTest(Expressions.parse("a"), new ObjectMapper().readTree(json1)));
-            theExecutor.execute(new ThreadTest(Expressions.parse("a"), new ObjectMapper().readTree(json2)));
-
-        }
-
-        while (true) {
-            Thread.sleep(1000);
-        }
-    }
-
-    public class ThreadTest implements Runnable {
-
-        JsonNode data;
-        Expressions exp;
-
-        public ThreadTest(Expressions exp, JsonNode data) {
-            this.data = data;
-            this.exp = exp;
-        }
-
-        @Override
-        public void run() {
-            while (true) {
-                try {
-                    JsonNode result = exp.evaluate(data);
-                    if (result != null) {
-                        if (!this.data.get("a").asText().equals(result.asText())) {
-                            System.out.println(String.format("\n%s %s", this.data.get("a").asText(), result.asText()));
-                        }
-                    } else {
-                        System.out.println("Got null result from " + exp.hashCode() + " data: " + data);
-                    }
-                } catch (Exception ex) {
-                    // System.out.println(ex);
-                    ex.printStackTrace();
-                }
-            }
-        }
-    }
+	static boolean showError = false;
+
+	@Test
+	public void threadSafeTest() throws Exception {
+		String json1 = "{ \"a\":\"aaa\" }";
+		String json2 = "{ \"a\":\"bbb\" }";
+		Expressions exp = Expressions.parse("a");
+		TaskExecutor theExecutor = new SimpleAsyncTaskExecutor();
+		try {
+			if (showError) {
+				theExecutor.execute(new ThreadTest(exp, new ObjectMapper().readTree(json1)));
+				theExecutor.execute(new ThreadTest(exp, new ObjectMapper().readTree(json2)));
+			} else {
+				theExecutor.execute(new ThreadTest(Expressions.parse("a"), new ObjectMapper().readTree(json1)));
+				theExecutor.execute(new ThreadTest(Expressions.parse("a"), new ObjectMapper().readTree(json2)));
+
+			}
+
+			while (true) {
+				Thread.sleep(1000);
+			}
+		} finally {
+			((SimpleAsyncTaskExecutor) theExecutor).close();
+		}
+	}
+
+	public class ThreadTest implements Runnable {
+
+		JsonNode data;
+		Expressions exp;
+
+		public ThreadTest(Expressions exp, JsonNode data) {
+			this.data = data;
+			this.exp = exp;
+		}
+
+		@Override
+		public void run() {
+			while (true) {
+				try {
+					JsonNode result = exp.evaluate(data);
+					if (result != null) {
+						if (!this.data.get("a").asText().equals(result.asText())) {
+							System.out.println(String.format("\n%s %s", this.data.get("a").asText(), result.asText()));
+						}
+					} else {
+						System.out.println("Got null result from " + exp.hashCode() + " data: " + data);
+					}
+				} catch (Exception ex) {
+					// System.out.println(ex);
+					ex.printStackTrace();
+				}
+			}
+		}
+	}
 }

tester.sh

@@ -1,2 +1,2 @@
 #! /bin/bash
-java -cp target/JSONata4Java-2.5.3-jar-with-dependencies.jar com.api.jsonata4java.Tester $1
+java -cp target/JSONata4Java-2.5.4-jar-with-dependencies.jar com.api.jsonata4java.Tester $1