update Java version

Author: peteroupc

api/com.upokecenter.cbor.CBORDateConverter.md

@@ -47,10 +47,6 @@
 
 ## Methods
 
-* `CBORObject DateTimeFieldsToCBORObject​(int year,
-                          int[] lesserFields)`<br>
- Converts a date/time in the form of a year, month, day, hour, minute,
- second, fractional seconds, and time offset to a CBOR object.
 * `CBORObject DateTimeFieldsToCBORObject​(int smallYear,
                           int month,
                           int day)`<br>
@@ -239,38 +235,14 @@ Converts a date/time in the form of a year, month, day, hour, minute, and
 
 * <code>CBORException</code> - An error occurred in conversion.
 
-### DateTimeFieldsToCBORObject
-    public CBORObject DateTimeFieldsToCBORObject​(int year, int[] lesserFields)
-Converts a date/time in the form of a year, month, day, hour, minute,
- second, fractional seconds, and time offset to a CBOR object.
-
-**Parameters:**
-
-* <code>year</code> - The year.
-
-* <code>lesserFields</code> - An array that will store the fields (other than the
- year) of the date and time. See the TryGetDateTimeFields method for
-  information on the "lesserFields" parameter.
-
-**Returns:**
-
-* A CBOR object encoding the given date fields according to the
- conversion type used to create this date converter.
-
-**Throws:**
-
-* <code>java.lang.NullPointerException</code> - The parameter <code>lesserFields</code> is null.
-
-* <code>CBORException</code> - An error occurred in conversion.
-
 ### DateTimeFieldsToCBORObject
     public CBORObject DateTimeFieldsToCBORObject​(com.upokecenter.numbers.EInteger bigYear, int[] lesserFields)
 Converts a date/time in the form of a year, month, day, hour, minute,
  second, fractional seconds, and time offset to a CBOR object.
 
 **Parameters:**
 
-* <code>bigYear</code> - The year.
+* <code>bigYear</code> - The parameter <code>bigYear</code> is a Numbers.EInteger object.
 
 * <code>lesserFields</code> - An array that will store the fields (other than the
  year) of the date and time. See the TryGetDateTimeFields method for

api/com.upokecenter.cbor.CBORObject.md

@@ -117,9 +117,6 @@ Instead, convert both CBOR objects to numbers (with .AsNumber()), and
  use the first number's.Add() method.
  Instead, convert both CBOR objects to numbers (with .AsNumber()), and
  use the first number's.Add() method.
-* `CBORObject ApplyJSONPatch​(CBORObject patch)`<br>
- Returns a copy of this object after applying the operations in a JSON patch,
- in the form of a CBOR object.
 * `boolean AsBoolean()`<br>
  Returns false if this object is a CBOR false, null, or undefined value
  (whether or not the object has tags); otherwise, true.
@@ -202,12 +199,6 @@ Instead, use the following: (cbor.AsNumber().ToInt64Checked()), or
  Converts this object to a 32-bit floating point number.
 * `java.lang.String AsString()`<br>
  Gets the value of this object as a text string.
-* `CBORObject AtJSONPointer​(java.lang.String pointer)`<br>
- Gets the CBOR object referred to by a JSON Pointer according to RFC6901.
-* `CBORObject AtJSONPointer​(java.lang.String pointer,
-             CBORObject defaultValue)`<br>
- Gets the CBOR object referred to by a JSON Pointer according to RFC6901, or
- a default value if the operation fails.
 * `long CalcEncodedSize() EncodeToBytes()`<br>
  Calculates the number of bytes this CBOR object takes when serialized as a
  byte array using the EncodeToBytes() method.
@@ -1127,9 +1118,7 @@ Gets the value of a CBOR object by integer index in this array or by integer
 
 * The CBOR object referred to by index or key in this array or map. If
  this is a CBOR map, returns <code>null</code> (not <code>
- CBORObject.Null</code>) if an item with the given key doesn't exist (but
- this behavior may change to throwing an exception in version 5.0 or
- later).
+ CBORObject.Null</code>) if an item with the given key doesn't exist.
 
 **Throws:**
 
@@ -2980,10 +2969,7 @@ Generates a CBOR object from a data stream in JavaScript object Notation
  UTF-16, or UTF-32 encoding; the encoding is detected by assuming
  that the first character read must be a byte-order mark or a nonzero
  basic character (U+0001 to U+007F). (In previous versions, only
- UTF-8 was allowed.). (This behavior may change to supporting only
- UTF-8, with or without a byte order mark, in version 5.0 or later,
- perhaps with an option to restore the previous behavior of also
- supporting UTF-16 and UTF-32.).
+ UTF-8 was allowed.).
 
 **Parameters:**
 
@@ -3111,10 +3097,7 @@ Generates a CBOR object from a data stream in JavaScript object Notation
  UTF-32 encoding; the encoding is detected by assuming that the first
  character read must be a byte-order mark or a nonzero basic
  character (U+0001 to U+007F). (In previous versions, only UTF-8 was
- allowed.). (This behavior may change to supporting only UTF-8, with
- or without a byte order mark, in version 5.0 or later, perhaps with
- an option to restore the previous behavior of also supporting UTF-16
- and UTF-32.).
+ allowed.).
 
 **Parameters:**
 
@@ -3156,10 +3139,7 @@ Generates a CBOR object from a data stream in JavaScript object Notation
  begin with a byte-order mark (U+FEFF). The byte array can be in
  UTF-8, UTF-16, or UTF-32 encoding; the encoding is detected by
  assuming that the first character read must be a byte-order mark or
- a nonzero basic character (U+0001 to U+007F). (This behavior may
- change to supporting only UTF-8, with or without a byte order mark,
- in version 5.0 or later, perhaps with an option to restore the
- previous behavior of also supporting UTF-16 and UTF-32.).
+ a nonzero basic character (U+0001 to U+007F).
 
 **Returns:**
 
@@ -3189,10 +3169,7 @@ Generates a CBOR object from a byte array in JavaScript object Notation
  begin with a byte-order mark (U+FEFF). The byte array can be in
  UTF-8, UTF-16, or UTF-32 encoding; the encoding is detected by
  assuming that the first character read must be a byte-order mark or
- a nonzero basic character (U+0001 to U+007F). (This behavior may
- change to supporting only UTF-8, with or without a byte order mark,
- in version 5.0 or later, perhaps with an option to restore the
- previous behavior of also supporting UTF-16 and UTF-32.).
+ a nonzero basic character (U+0001 to U+007F).
 
 * <code>jsonoptions</code> - Specifies options to control how the JSON data is decoded
  to CBOR. See the JSONOptions class.
@@ -3228,10 +3205,7 @@ Generates a CBOR object from a byte array in JavaScript object Notation
  byte-order mark (U+FEFF). The portion can be in UTF-8, UTF-16, or
  UTF-32 encoding; the encoding is detected by assuming that the first
  character read must be a byte-order mark or a nonzero basic
- character (U+0001 to U+007F). (This behavior may change to
- supporting only UTF-8, with or without a byte order mark, in version
- 5.0 or later, perhaps with an option to restore the previous
- behavior of also supporting UTF-16 and UTF-32.).
+ character (U+0001 to U+007F).
 
 * <code>offset</code> - An index, starting at 0, showing where the desired portion of
  <code>bytes</code> begins.
@@ -3272,10 +3246,7 @@ Generates a CBOR object from a byte array in JavaScript object Notation
  byte-order mark (U+FEFF). The portion can be in UTF-8, UTF-16, or
  UTF-32 encoding; the encoding is detected by assuming that the first
  character read must be a byte-order mark or a nonzero basic
- character (U+0001 to U+007F). (This behavior may change to
- supporting only UTF-8, with or without a byte order mark, in version
- 5.0 or later, perhaps with an option to restore the previous
- behavior of also supporting UTF-16 and UTF-32.).
+ character (U+0001 to U+007F).
 
 * <code>offset</code> - An index, starting at 0, showing where the desired portion of
  <code>bytes</code> begins.
@@ -4360,99 +4331,6 @@ Writes the binary representation of this CBOR object and returns a byte
 
 * <code>java.lang.NullPointerException</code> - The parameter <code>options</code> is null.
 
-### AtJSONPointer
-    public CBORObject AtJSONPointer​(java.lang.String pointer)
-Gets the CBOR object referred to by a JSON Pointer according to RFC6901. For
- more information, see the overload taking a default value parameter.
-
-**Parameters:**
-
-* <code>pointer</code> - A JSON pointer according to RFC 6901.
-
-**Returns:**
-
-* An object within this CBOR object. Returns this object if pointer is
- the empty string (even if this object has a CBOR type other than
- array or map).
-
-**Throws:**
-
-* <code>CBORException</code> - Thrown if the pointer is null, or
- if the pointer is invalid, or if there is no object at the given
-  pointer, or the special key "-" appears in the pointer, or if the
- pointer is non-empty and this object has a CBOR type other than
- array or map.
-
-### AtJSONPointer
-    public CBORObject AtJSONPointer​(java.lang.String pointer, CBORObject defaultValue)
-Gets the CBOR object referred to by a JSON Pointer according to RFC6901, or
- a default value if the operation fails. The syntax for a JSON
- Pointer is: <pre>'/' KEY '/' KEY.get(...)</pre> where KEY represents
- a key into the JSON object or its sub-objects in the hierarchy. For
- example, <pre>/foo/2/bar</pre> means the same as
-  <pre>obj.get('foo')[2]['bar']</pre> in JavaScript. If "~" and/or "/"
-  occurs in a key, it must be escaped with "~0" or "~1", respectively,
-  in a JSON pointer. JSON pointers also support the special key "-"
-  (as in "/foo/-") to indicate the end of an array, but this method
- treats this key as an error since it refers to a nonexistent item.
- Indices to arrays (such as 2 in the example) must contain only basic
- digits 0 to 9 and no leading zeros. (Note that RFC 6901 was
- published before JSON was extended to support top-level values other
- than arrays and key-value dictionaries.).
-
-**Parameters:**
-
-* <code>pointer</code> - A JSON pointer according to RFC 6901.
-
-* <code>defaultValue</code> - The parameter <code>defaultValue</code> is a Cbor.CBORObject
- object.
-
-**Returns:**
-
-* An object within the specified JSON object. Returns this object if
- pointer is the empty string (even if this object has a CBOR type
- other than array or map). Returns <code>defaultValue</code> if the
- pointer is null, or if the pointer is invalid, or if there is no
-  object at the given pointer, or the special key "-" appears in the
- pointer, or if the pointer is non-empty and this object has a CBOR
- type other than array or map.
-
-### ApplyJSONPatch
-    public CBORObject ApplyJSONPatch​(CBORObject patch)
-Returns a copy of this object after applying the operations in a JSON patch,
- in the form of a CBOR object. JSON patches are specified in RFC 6902
- and their format is summarized in the remarks below.<p><b>Remarks:</b>
- A JSON patch is an array with one or more maps. Each map has the
-  following keys: </p><ul> <li>"op" - Required. This key's value is the
-  patch operation and must be "add", "remove", "move", "copy", "test",
-  or "replace", in basic lower case letters and no other case
-  combination.</li> <li>"value" - Required if the operation is "add",
-  "replace", or "test" and specifies the item to add (insert), or that
- will replace the existing item, or to check an existing item for
-  equality, respectively. (For "test", the operation fails if the
-  existing item doesn't match the specified value.)</li> <li>"path" -
- Required for all operations. A JSON Pointer (RFC 6901) specifying the
- destination path in the CBOR object for the operation. For more
- information, see RFC 6901 or the documentation for
-  AtJSONPointer(pointer, defaultValue).</li> <li>"from" - Required if
-  the operation is "move" or "copy". A JSON Pointer (RFC 6901)
- specifying the path in the CBOR object where the source value is
- located.</li></ul>
-
-**Parameters:**
-
-* <code>patch</code> - A JSON patch in the form of a CBOR object; it has the form
- summarized in the remarks.
-
-**Returns:**
-
-* The result of the patch operation.
-
-**Throws:**
-
-* <code>CBORException</code> - The parameter <code>patch</code> is
- null or the patch operation failed.
-
 ### equals
     public boolean equals​(java.lang.Object obj)
 Determines whether this object and another object are equal and have the

src/main/java/com/upokecenter/cbor/CBORDateConverter.java

@@ -201,6 +201,8 @@ public boolean TryGetDateTimeFields(CBORObject obj, EInteger[] year, int[]
       // TODO: In next major version, return false instead of throwing an
       // exception if the arguments are invalid, to conform to convention
       // with Try* methods in DotNet.
+      // TODO: In next minor version, add overload that takes an out parameter
+      // for year to DotNet version.
       if (year == null) {
         throw new NullPointerException("year");
       }
@@ -370,25 +372,7 @@ public CBORObject DateTimeFieldsToCBORObject(
     /**
      * Converts a date/time in the form of a year, month, day, hour, minute,
      * second, fractional seconds, and time offset to a CBOR object.
-     * @param year The year.
-     * @param lesserFields An array that will store the fields (other than the
-     * year) of the date and time. See the TryGetDateTimeFields method for
-     *  information on the "lesserFields" parameter.
-     * @return A CBOR object encoding the given date fields according to the
-     * conversion type used to create this date converter.
-     * @throws NullPointerException The parameter {@code lesserFields} is null.
-     * @throws com.upokecenter.cbor.CBORException An error occurred in conversion.
-     */
-    public CBORObject DateTimeFieldsToCBORObject(int year, int[]
-      lesserFields) {
-      return this.DateTimeFieldsToCBORObject(EInteger.FromInt32(year),
-  lesserFields);
-    }
-
-    /**
-     * Converts a date/time in the form of a year, month, day, hour, minute,
-     * second, fractional seconds, and time offset to a CBOR object.
-     * @param bigYear The year.
+     * @param bigYear The parameter {@code bigYear} is a Numbers.EInteger object.
      * @param lesserFields An array that will store the fields (other than the
      * year) of the date and time. See the TryGetDateTimeFields method for
      *  information on the "lesserFields" parameter.
@@ -400,6 +384,8 @@ public CBORObject DateTimeFieldsToCBORObject(int year, int[]
      */
     public CBORObject DateTimeFieldsToCBORObject(EInteger bigYear, int[]
       lesserFields) {
+      // TODO: In next minor version, add overload that takes int rather than
+      // EInteger
       if (bigYear == null) {
         throw new NullPointerException("bigYear");
       }

src/main/java/com/upokecenter/cbor/CBORJson.java

@@ -423,12 +423,6 @@ private CBORObject NextJSONValue(
               String errstr = (str.length() <= 100) ? str : (str.substring(0,100) + "...");
               this.RaiseError("JSON number can't be parsed. " + errstr);
             }
-          } else {
-            // check if character can validly appear after a JSON number
-            if (c != ',' && c != ']' && c != '}' && c != -1 &&
-              c != 0x20 && c != 0x0a && c != 0x0d && c != 0x09) {
-              this.RaiseError("Invalid character after JSON number");
-            }
           }
           if (c == 0x20 || c == 0x0a || c == 0x0d || c == 0x09) {
             nextChar[0] = this.SkipWhitespaceJSON();

src/main/java/com/upokecenter/cbor/CBORJson2.java

@@ -430,12 +430,6 @@ private CBORObject NextJSONNonnegativeNumber(int c, int[] nextChar) {
           // errstr = (str.length() <= 100) ? str : (str.substring(0, // 100) + "...");
           this.RaiseError("JSON number can't be parsed. " + errstr);
         }
-      } else {
-        // check if character can validly appear after a JSON number
-        if (c != ',' && c != ']' && c != '}' && c != -1 &&
-          c != 0x20 && c != 0x0a && c != 0x0d && c != 0x09) {
-          this.RaiseError("Invalid character after JSON number");
-        }
       }
       if (c == -1 || (c != 0x20 && c != 0x0a && c != 0x0d && c != 0x09)) {
         nextChar[0] = c;

src/main/java/com/upokecenter/cbor/CBORJson3.java

@@ -333,12 +333,6 @@ private CBORObject NextJSONNonnegativeNumber(int c, int[] nextChar) {
         }
         // System.out.println("endIndex="+endIndex[0]+", "+
         // this.jstring.substring(endIndex[0], (endIndex[0])+(// Math.min(20, this.endPos-endIndex[0]))));
-      } else {
-        // check if character can validly appear after a JSON number
-        if (c != ',' && c != ']' && c != '}' && c != -1 &&
-          c != 0x20 && c != 0x0a && c != 0x0d && c != 0x09) {
-          this.RaiseError("Invalid character after JSON number");
-        }
       }
       if (c == -1 || (c != 0x20 && c != 0x0a && c != 0x0d && c != 0x09)) {
         nextChar[0] = c;