Merge https://github.com/IBM/JSONata4Java

Pulling latest version from IBM source

Author: mattbrain

README.md

@@ -8,21 +8,21 @@ JSONata was created by Andrew Coleman to provide many of the features that XPath
 * [JSONata Documentation](http://docs.jsonata.org/overview.html)
 * [JavaScript JSONata github repository](https://github.com/jsonata-js/jsonata)
 
-JSONata4Java is an attempt to port the jsonata.js capabilities to Java v1.8. 
+JSONata4Java is an attempt to port the jsonata.js 1.8.4 capabilities to Java v1.8. 
 The easiest way to use this library is to include it as a dependency in your Maven pom.xml using these line:
 ```
 <dependency>
   <groupId>com.ibm.jsonata4java</groupId>
   <artifactId>JSONata4Java</artifactId>
-  <version>1.5.2</version>
+  <version>1.5.5</version>
 </dependency>
 ```
 
 You can also opt to clone this repository using the command line below and build the jars yourself:
 ```
 git clone https://github.com/IBM/JSONata4Java.git
 ```
-The code was created using OpenJDK Runtime Environment (build 1.8.0_242-b08). You can import the project into Eclipse 2020-03 or newer. 
+The code was created using OpenJDK Runtime Environment (build 1.8.0_252-b09). You can import the project into Eclipse 2021-03 or newer. 
 
 ### Building the jar files
 
@@ -34,8 +34,8 @@ you can right click on the pom.xml file and select **Run as... / Maven build...*
 ![Launcher Image](images/Launcher.png)
 
 Once you have run the launcher, you can find the jar files in the /target directory. There are two:
-* **JSONata4Java-1.5.2-jar-with-dependencies.jar** (thinks includes dependent jar files)
-* **JSONata4Java-1.5.2.jar** (only the JSONata4Java code)
+* **JSONata4Java-1.5.5-jar-with-dependencies.jar** (thinks includes dependent jar files)
+* **JSONata4Java-1.5.5.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 
@@ -158,4 +158,6 @@ From: https://docs.jsonata.org/numeric-functions we did not implement:
 * $formatInteger()
 * $parseInteger()
 
+There are some jsonata.org 1.8.4 tests that we skip because we fail on them in the AgnosticTestSuite.java.
+
 

dataobject_8.json

@@ -0,0 +1,43 @@
+{
+    "var1": "val1",
+    "var2": {
+        "firstName": "John",
+        "lastName": "doe",
+        "age": 26,
+        "address": {
+            "streetAddress": "naist street",
+            "city": "Nara",
+            "postalCode": "630-0192"
+        },
+        "phoneNumbers": [
+            {
+                "type": "iPhone",
+                "number": "0123-4567-8888"
+            },
+            {
+                "type": "home",
+                "number": "0123-4567-8910"
+            }
+        ]
+    },
+    "var3": {
+        "firstName": "Paul",
+        "lastName": "Smith",
+        "age": 32,
+        "address": {
+            "streetAddress": "main avenue",
+            "city": "Smart City",
+            "postalCode": "234-234"
+        },
+        "phoneNumbers": [
+            {
+                "type": "Android",
+                "number": "0123-4567-9999"
+            },
+            {
+                "type": "office",
+                "number": "0123-4567-2222"
+            }
+        ]
+    }
+}

dataset_case025.json

@@ -0,0 +1,247 @@
+{
+	"jsonata": {
+		"2019-01-01": 889,
+		"2019-01-02": 1792,
+		"2019-01-03": 2236,
+		"2019-01-04": 2544,
+		"2019-01-05": 1448,
+		"2019-01-06": 1544,
+		"2019-01-07": 2351,
+		"2019-01-08": 2513,
+		"2019-01-09": 2709,
+		"2019-01-10": 2573,
+		"2019-01-11": 2776,
+		"2019-01-12": 1366,
+		"2019-01-13": 1423,
+		"2019-01-14": 2372,
+		"2019-01-15": 2420,
+		"2019-01-16": 2438,
+		"2019-01-17": 2420,
+		"2019-01-18": 2658,
+		"2019-01-19": 1424,
+		"2019-01-20": 1260,
+		"2019-01-21": 2466,
+		"2019-01-22": 2708,
+		"2019-01-23": 2991,
+		"2019-01-24": 2429,
+		"2019-01-25": 2491,
+		"2019-01-26": 1459,
+		"2019-01-27": 1444,
+		"2019-01-28": 2722,
+		"2019-01-29": 2987,
+		"2019-01-30": 2670,
+		"2019-01-31": 2758,
+		"2019-02-01": 2757,
+		"2019-02-02": 1418,
+		"2019-02-03": 1626,
+		"2019-02-04": 2541,
+		"2019-02-05": 2600,
+		"2019-02-06": 2595,
+		"2019-02-07": 2627,
+		"2019-02-08": 2290,
+		"2019-02-09": 1301,
+		"2019-02-10": 1491,
+		"2019-02-11": 2731,
+		"2019-02-12": 2789,
+		"2019-02-13": 2522,
+		"2019-02-14": 2757,
+		"2019-02-15": 2462,
+		"2019-02-16": 1485,
+		"2019-02-17": 1585,
+		"2019-02-18": 2243,
+		"2019-02-19": 2865,
+		"2019-02-20": 2714,
+		"2019-02-21": 2631,
+		"2019-02-22": 2532,
+		"2019-02-23": 1408,
+		"2019-02-24": 1301,
+		"2019-02-25": 2502,
+		"2019-02-26": 2731,
+		"2019-02-27": 2616,
+		"2019-02-28": 2552,
+		"2019-03-01": 2462,
+		"2019-03-02": 1647,
+		"2019-03-03": 1319,
+		"2019-03-04": 2788,
+		"2019-03-05": 3008,
+		"2019-03-06": 2528,
+		"2019-03-07": 2662,
+		"2019-03-08": 2521,
+		"2019-03-09": 1536,
+		"2019-03-10": 1400,
+		"2019-03-11": 2617,
+		"2019-03-12": 3258,
+		"2019-03-13": 3424,
+		"2019-03-14": 3267,
+		"2019-03-15": 2940,
+		"2019-03-16": 1976,
+		"2019-03-17": 1709,
+		"2019-03-18": 1281,
+		"2019-03-19": 3484,
+		"2019-03-20": 3555,
+		"2019-03-21": 3223,
+		"2019-03-22": 3011,
+		"2019-03-23": 1847,
+		"2019-03-24": 1942,
+		"2019-03-25": 3015,
+		"2019-03-26": 3372,
+		"2019-03-27": 3518,
+		"2019-03-28": 3150,
+		"2019-03-29": 3015,
+		"2019-03-30": 1645,
+		"2019-03-31": 1505,
+		"2019-04-01": 3215,
+		"2019-04-02": 3165,
+		"2019-04-03": 3117,
+		"2019-04-04": 3009,
+		"2019-04-05": 3452,
+		"2019-04-06": 1628,
+		"2019-04-07": 1555,
+		"2019-04-08": 3156,
+		"2019-04-09": 2875,
+		"2019-04-10": 2986,
+		"2019-04-11": 2985,
+		"2019-04-12": 2789,
+		"2019-04-13": 1415,
+		"2019-04-14": 1442,
+		"2019-04-15": 2661,
+		"2019-04-16": 3073,
+		"2019-04-17": 2975,
+		"2019-04-18": 2672,
+		"2019-04-19": 1930,
+		"2019-04-20": 1203,
+		"2019-04-21": 1170,
+		"2019-04-22": 2534,
+		"2019-04-23": 3070,
+		"2019-04-24": 3800,
+		"2019-04-25": 3131,
+		"2019-04-26": 3073,
+		"2019-04-27": 1520,
+		"2019-04-28": 1390,
+		"2019-04-29": 2756,
+		"2019-04-30": 2758,
+		"2019-05-01": 2507,
+		"2019-05-02": 3208,
+		"2019-05-03": 3445,
+		"2019-05-04": 1685,
+		"2019-05-05": 1495,
+		"2019-05-06": 3269,
+		"2019-05-07": 3426,
+		"2019-05-08": 3258,
+		"2019-05-09": 3178,
+		"2019-05-10": 2997,
+		"2019-05-11": 1627,
+		"2019-05-12": 1223,
+		"2019-05-13": 3102,
+		"2019-05-14": 3587,
+		"2019-05-15": 3100,
+		"2019-05-16": 3367,
+		"2019-05-17": 3221,
+		"2019-05-18": 1530,
+		"2019-05-19": 1182,
+		"2019-05-20": 2957,
+		"2019-05-21": 3311,
+		"2019-05-22": 3661,
+		"2019-05-23": 3577,
+		"2019-05-24": 3053,
+		"2019-05-25": 1328,
+		"2019-05-26": 1204,
+		"2019-05-27": 2641,
+		"2019-05-28": 8328,
+		"2019-05-29": 17660,
+		"2019-05-30": 15634,
+		"2019-05-31": 15599,
+		"2019-06-01": 4822,
+		"2019-06-02": 5264,
+		"2019-06-03": 19349,
+		"2019-06-04": 21550,
+		"2019-06-05": 36310,
+		"2019-06-06": 18592,
+		"2019-06-07": 17869,
+		"2019-06-08": 4877,
+		"2019-06-09": 4324,
+		"2019-06-10": 17473,
+		"2019-06-11": 20640,
+		"2019-06-12": 20604,
+		"2019-06-13": 20963,
+		"2019-06-14": 16736,
+		"2019-06-15": 4112,
+		"2019-06-16": 4349,
+		"2019-06-17": 23274,
+		"2019-06-18": 25012,
+		"2019-06-19": 21058,
+		"2019-06-20": 20439,
+		"2019-06-21": 21925,
+		"2019-06-22": 4618,
+		"2019-06-23": 4925,
+		"2019-06-24": 24140,
+		"2019-06-25": 23948,
+		"2019-06-26": 22750,
+		"2019-06-27": 23307,
+		"2019-06-28": 21104,
+		"2019-06-29": 4903,
+		"2019-06-30": 5007,
+		"2019-07-01": 23655,
+		"2019-07-02": 27579,
+		"2019-07-03": 27072,
+		"2019-07-04": 23840,
+		"2019-07-05": 19827,
+		"2019-07-06": 5015,
+		"2019-07-07": 5914,
+		"2019-07-08": 27916,
+		"2019-07-09": 29980,
+		"2019-07-10": 30276,
+		"2019-07-11": 30459,
+		"2019-07-12": 24334,
+		"2019-07-13": 6853,
+		"2019-07-14": 7217,
+		"2019-07-15": 28602,
+		"2019-07-16": 29082,
+		"2019-07-17": 31428,
+		"2019-07-18": 29343,
+		"2019-07-19": 28385,
+		"2019-07-20": 5610,
+		"2019-07-21": 5980,
+		"2019-07-22": 29996,
+		"2019-07-23": 31486,
+		"2019-07-24": 31543,
+		"2019-07-25": 28539,
+		"2019-07-26": 26029,
+		"2019-07-27": 5169,
+		"2019-07-28": 5936,
+		"2019-07-29": 31774,
+		"2019-07-30": 27629,
+		"2019-07-31": 32280,
+		"2019-08-01": 32947,
+		"2019-08-02": 28920,
+		"2019-08-03": 6538,
+		"2019-08-04": 7263,
+		"2019-08-05": 32893,
+		"2019-08-06": 33360,
+		"2019-08-07": 31727,
+		"2019-08-08": 32074,
+		"2019-08-09": 27695,
+		"2019-08-10": 7007,
+		"2019-08-11": 7640,
+		"2019-08-12": 29802,
+		"2019-08-13": 35060,
+		"2019-08-14": 34097,
+		"2019-08-15": 27904,
+		"2019-08-16": 28759,
+		"2019-08-17": 6614,
+		"2019-08-18": 8024,
+		"2019-08-19": 33020,
+		"2019-08-20": 35527,
+		"2019-08-21": 34475,
+		"2019-08-22": 33838,
+		"2019-08-23": 29362,
+		"2019-08-24": 7680,
+		"2019-08-25": 9561,
+		"2019-08-26": 32594,
+		"2019-08-27": 38115,
+		"2019-08-28": 37219,
+		"2019-08-29": 38805,
+		"2019-08-30": 31773,
+		"2019-08-31": 8029
+	}
+}

pom.xml

@@ -27,7 +27,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>com.ibm.jsonata4java</groupId>
 	<artifactId>JSONata4Java</artifactId>
-	<version>1.5.2</version>
+	<version>1.5.5</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>
@@ -214,10 +214,14 @@
 							<goal>wget</goal>
 						</goals>
 						<configuration>
-							<url>https://github.com/jsonata-js/jsonata/archive/v1.8.3.zip</url>
+							<url>https://github.com/jsonata-js/jsonata/archive/v1.8.4.zip</url>
 							<unpack>true</unpack>
 							<outputDirectory>${project.build.directory}/jsonata</outputDirectory>
-							<md5>3db67b7aec88d9b542d42e88547a1e26</md5>
+							<md5>c8f057d10e659c27a5aa79f11d961947</md5> 
+							<!--
+							<url>https://github.com/jsonata-js/jsonata/archive/v1.8.3.zip</url> 
+							<md5>3db67b7aec88d9b542d42e88547a1e26</md5>  
+							-->
 						</configuration>
 					</execution>
 				</executions>
@@ -246,7 +250,7 @@
 			<plugin>
 				<groupId>org.antlr</groupId>
 				<artifactId>antlr4-maven-plugin</artifactId>
-				<version>4.8-1</version>
+				<version>4.9.2</version>
 				<configuration>
 					<sourceDirectory>src/main/antlr4</sourceDirectory>
 					<outputDirectory>src/main/java</outputDirectory>

src/main/antlr4/com/api/jsonata4java/expressions/generated/MappingExpression.g4

@@ -21,7 +21,7 @@
  */
 
 /* Antlr grammar defining the mapping expression language */
-
+ 
 grammar MappingExpression;
 
 //options {

src/main/antlr4/com/api/jsonata4java/expressions/path/generated/PathExpressionLexer.g4

@@ -19,7 +19,7 @@
  * limitations under the License.
  *
  */
-
+ 
 /* Grammar defining the subset of JSONata we support on the LHS of mapping expressions */
 
 lexer grammar PathExpressionLexer;

src/main/antlr4/com/api/jsonata4java/expressions/path/generated/PathExpressionParser.g4

@@ -21,7 +21,7 @@
  */
 
 /* Grammar defining the subset of JSONata we support on the LHS of mapping expressions */
-
+ 
 parser grammar PathExpressionParser;
 
 options {tokenVocab = PathExpressionLexer;}