Update validation of row metadata to allow non-numeric numbers

Author: cezarfx

driver/pom.xml

@@ -47,7 +47,7 @@
     <java.apidoc>http://docs.oracle.com/javase/8/docs/api</java.apidoc>
     <maven.deploy.skip>false</maven.deploy.skip>
     <netty.version>4.1.118.Final</netty.version>
-    <jackson.version>2.15.2</jackson.version>
+    <jackson.version>2.18.2</jackson.version>
    <!-- by default, skip tests; tests require a profile -->
    <maven.test.skip>true</maven.test.skip>
    <javac>javac</javac>

driver/src/main/java/oracle/nosql/driver/values/JsonUtils.java

@@ -763,26 +763,59 @@ public static String convertBytesToHex(byte[] byteArray) {
      * Validates input is a valid JSON construct: object, array, string, number,
      * true, false or null. Throws IllegalArgumentException if not valid.
      * Multiple JSON Objects are not allowed. Strings must use only double
-     * quotes (").
+     * quotes ("). Allows non-numeric values: NaN, Infinity, -Infinity (and -INF).
      */
     public static void validateJsonConstruct(String jsonInput) {
-        try (JsonParser jp = createParserWithOptions(jsonInput, null)) {
+        JsonOptions options = new JsonOptions()
+            .setAllowNonNumericNumbers(true);
+        validateJsonConstruct(jsonInput, options);
+    }
+
+    /**
+     * Validates input is a valid JSON construct: object, array, string, number,
+     * true, false or null. Throws IllegalArgumentException if not valid.
+     * Multiple JSON Objects are not allowed. Strings must use only double
+     * quotes (").
+     */    public static void validateJsonConstruct(String jsonInput,
+        JsonOptions options) {
+
+        try (JsonParser jp = createParserWithOptions(jsonInput, options)) {
+            int s = 0;
+            int i = 0;
             JsonToken token = jp.nextToken();
             if (token == null) {
-                throw new IllegalArgumentException("Value is not a valid JSON construct.");
+                throw new IllegalArgumentException(
+                    "Value is not a valid JSON construct.");
+            } else if (JsonToken.START_OBJECT.equals(token) ||
+                JsonToken.START_ARRAY.equals(token)) {
+                s += 1;
+            } else {
+                i += ( s == 0 ? 1 : 0);
             }
-            int s = 1;
+
             while (!jp.isClosed()) {
                 token = jp.nextToken();
-                if (token != null && JsonToken.START_OBJECT.equals(token)) {
-                    if (s == 0) {
-                        throw new IllegalArgumentException("Multiple JSON " +
-                            "Objects not allowed.");
+                if (token != null) {
+                    if(JsonToken.FIELD_NAME.equals(token)) {
+                        // skip
+                    } else if (JsonToken.START_OBJECT.equals(token) ||
+                        JsonToken.START_ARRAY.equals(token) ) {
+                        if (s == 0) {
+                            throw new IllegalArgumentException(
+                                "Multiple JSON " +
+                                    "Objects not allowed.");
+                        }
+                        s++;
+                    } else if (JsonToken.END_OBJECT.equals(token) ||
+                        JsonToken.END_ARRAY.equals(token)) {
+                        s--;
+                        i += ( s == 0 ? 1 : 0);
+                    } else {
+                        i += ( s == 0 ? 1 : 0);
+                    }
+                    if (i > 1) {
+                        throw new IllegalArgumentException("Multiple top level JSON constructs not allowed");
                     }
-                    s++;
-                }
-                if (token != null && JsonToken.END_OBJECT.equals(token)) {
-                    s--;
                 }
             }
         } catch (IOException ioe) {