Skip to content

Commit 65f346c

Browse files
committed
update Java version
1 parent efbd805 commit 65f346c

File tree

2 files changed

+26
-22
lines changed

2 files changed

+26
-22
lines changed

api/com.upokecenter.cbor.CBORObject.md

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -3159,7 +3159,7 @@ Generates a CBOR object from a data stream in JavaScript object Notation
31593159
a nonzero basic character (U+0001 to U+007F). (This behavior may
31603160
change to supporting only UTF-8, with or without a byte order mark,
31613161
in version 5.0 or later, perhaps with an option to restore the
3162-
previous behavior of also supporting UTF-16 and UTF-32.)
3162+
previous behavior of also supporting UTF-16 and UTF-32.).
31633163

31643164
**Returns:**
31653165

@@ -3192,7 +3192,7 @@ Generates a CBOR object from a byte array in JavaScript object Notation
31923192
a nonzero basic character (U+0001 to U+007F). (This behavior may
31933193
change to supporting only UTF-8, with or without a byte order mark,
31943194
in version 5.0 or later, perhaps with an option to restore the
3195-
previous behavior of also supporting UTF-16 and UTF-32.)
3195+
previous behavior of also supporting UTF-16 and UTF-32.).
31963196

31973197
* <code>jsonoptions</code> - Specifies options to control how the JSON data is decoded
31983198
to CBOR. See the JSONOptions class.
@@ -3231,7 +3231,7 @@ Generates a CBOR object from a byte array in JavaScript object Notation
32313231
character (U+0001 to U+007F). (This behavior may change to
32323232
supporting only UTF-8, with or without a byte order mark, in version
32333233
5.0 or later, perhaps with an option to restore the previous
3234-
behavior of also supporting UTF-16 and UTF-32.)
3234+
behavior of also supporting UTF-16 and UTF-32.).
32353235

32363236
* <code>offset</code> - An index, starting at 0, showing where the desired portion of
32373237
<code>bytes</code> begins.
@@ -3275,7 +3275,7 @@ Generates a CBOR object from a byte array in JavaScript object Notation
32753275
character (U+0001 to U+007F). (This behavior may change to
32763276
supporting only UTF-8, with or without a byte order mark, in version
32773277
5.0 or later, perhaps with an option to restore the previous
3278-
behavior of also supporting UTF-16 and UTF-32.)
3278+
behavior of also supporting UTF-16 and UTF-32.).
32793279

32803280
* <code>offset</code> - An index, starting at 0, showing where the desired portion of
32813281
<code>bytes</code> begins.
@@ -4377,10 +4377,11 @@ Gets the CBOR object referred to by a JSON Pointer according to RFC6901. For
43774377

43784378
**Throws:**
43794379

4380-
* <code>CBORException</code> - Thrown if the pointer is null, or if the pointer is
4381-
invalid, or if there is no object at the given pointer, or the
4382-
special key "-" appears in the pointer, or if the pointer is
4383-
non-empty and this object has a CBOR type other than array or map.
4380+
* <code>CBORException</code> - Thrown if the pointer is null, or
4381+
if the pointer is invalid, or if there is no object at the given
4382+
pointer, or the special key "-" appears in the pointer, or if the
4383+
pointer is non-empty and this object has a CBOR type other than
4384+
array or map.
43844385

43854386
### AtJSONPointer
43864387
public CBORObject AtJSONPointer​(java.lang.String pointer, CBORObject defaultValue)
@@ -4403,7 +4404,8 @@ Gets the CBOR object referred to by a JSON Pointer according to RFC6901, or
44034404

44044405
* <code>pointer</code> - A JSON pointer according to RFC 6901.
44054406

4406-
* <code>defaultValue</code> -
4407+
* <code>defaultValue</code> - The parameter <code>defaultValue</code> is a Cbor.CBORObject
4408+
object.
44074409

44084410
**Returns:**
44094411

@@ -4448,8 +4450,8 @@ Returns a copy of this object after applying the operations in a JSON patch,
44484450

44494451
**Throws:**
44504452

4451-
* <code>CBORException</code> - The parameter "patch" is null or the patch operation
4452-
failed.
4453+
* <code>CBORException</code> - The parameter <code>patch</code> is
4454+
null or the patch operation failed.
44534455

44544456
### equals
44554457
public boolean equals​(java.lang.Object obj)

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

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -3292,7 +3292,7 @@ public static CBORObject ReadJSON(
32923292
* a nonzero basic character (U+0001 to U+007F). (This behavior may
32933293
* change to supporting only UTF-8, with or without a byte order mark,
32943294
* in version 5.0 or later, perhaps with an option to restore the
3295-
* previous behavior of also supporting UTF-16 and UTF-32.)
3295+
* previous behavior of also supporting UTF-16 and UTF-32.).
32963296
* @return A CBOR object containing the JSON data decoded.
32973297
* @throws NullPointerException The parameter {@code bytes} is null.
32983298
* @throws com.upokecenter.cbor.CBORException The byte array contains invalid
@@ -3319,7 +3319,7 @@ public static CBORObject FromJSONBytes(byte[] bytes) {
33193319
* a nonzero basic character (U+0001 to U+007F). (This behavior may
33203320
* change to supporting only UTF-8, with or without a byte order mark,
33213321
* in version 5.0 or later, perhaps with an option to restore the
3322-
* previous behavior of also supporting UTF-16 and UTF-32.)
3322+
* previous behavior of also supporting UTF-16 and UTF-32.).
33233323
* @param jsonoptions Specifies options to control how the JSON data is decoded
33243324
* to CBOR. See the JSONOptions class.
33253325
* @return A CBOR object containing the JSON data decoded.
@@ -3362,7 +3362,7 @@ public static CBORObject FromJSONBytes(
33623362
* character (U+0001 to U+007F). (This behavior may change to
33633363
* supporting only UTF-8, with or without a byte order mark, in version
33643364
* 5.0 or later, perhaps with an option to restore the previous
3365-
* behavior of also supporting UTF-16 and UTF-32.)
3365+
* behavior of also supporting UTF-16 and UTF-32.).
33663366
* @param offset An index, starting at 0, showing where the desired portion of
33673367
* {@code bytes} begins.
33683368
* @param count The length, in bytes, of the desired portion of {@code bytes}
@@ -3397,7 +3397,7 @@ public static CBORObject FromJSONBytes(byte[] bytes, int offset, int
33973397
* character (U+0001 to U+007F). (This behavior may change to
33983398
* supporting only UTF-8, with or without a byte order mark, in version
33993399
* 5.0 or later, perhaps with an option to restore the previous
3400-
* behavior of also supporting UTF-16 and UTF-32.)
3400+
* behavior of also supporting UTF-16 and UTF-32.).
34013401
* @param offset An index, starting at 0, showing where the desired portion of
34023402
* {@code bytes} begins.
34033403
* @param count The length, in bytes, of the desired portion of {@code bytes}
@@ -5187,10 +5187,11 @@ public byte[] EncodeToBytes(CBOREncodeOptions options) {
51875187
* @return An object within this CBOR object. Returns this object if pointer is
51885188
* the empty string (even if this object has a CBOR type other than
51895189
* array or map).
5190-
* @throws CBORException Thrown if the pointer is null, or if the pointer is
5191-
* invalid, or if there is no object at the given pointer, or the
5192-
* special key "-" appears in the pointer, or if the pointer is
5193-
* non-empty and this object has a CBOR type other than array or map.
5190+
* @throws com.upokecenter.cbor.CBORException Thrown if the pointer is null, or
5191+
* if the pointer is invalid, or if there is no object at the given
5192+
* pointer, or the special key "-" appears in the pointer, or if the
5193+
* pointer is non-empty and this object has a CBOR type other than
5194+
* array or map.
51945195
*/
51955196
public CBORObject AtJSONPointer(String pointer) {
51965197
CBORObject ret = this.AtJSONPointer(pointer, null);
@@ -5216,7 +5217,8 @@ public CBORObject AtJSONPointer(String pointer) {
52165217
* published before JSON was extended to support top-level values other
52175218
* than arrays and key-value dictionaries.).
52185219
* @param pointer A JSON pointer according to RFC 6901.
5219-
* @param defaultValue
5220+
* @param defaultValue The parameter {@code defaultValue} is a Cbor.CBORObject
5221+
* object.
52205222
* @return An object within the specified JSON object. Returns this object if
52215223
* pointer is the empty string (even if this object has a CBOR type
52225224
* other than array or map). Returns {@code defaultValue} if the
@@ -5252,8 +5254,8 @@ public CBORObject AtJSONPointer(String pointer, CBORObject defaultValue) {
52525254
* @param patch A JSON patch in the form of a CBOR object; it has the form
52535255
* summarized in the remarks.
52545256
* @return The result of the patch operation.
5255-
* @throws CBORException The parameter "patch" is null or the patch operation
5256-
* failed.
5257+
* @throws com.upokecenter.cbor.CBORException The parameter {@code patch} is
5258+
* null or the patch operation failed.
52575259
*/
52585260
public CBORObject ApplyJSONPatch(CBORObject patch) {
52595261
return JSONPatch.Patch(this, patch);

0 commit comments

Comments
 (0)