From f9d6c3ae4ef25fddfb1e281f352e64fa501f62c8 Mon Sep 17 00:00:00 2001 From: Peter Occil Date: Mon, 23 Dec 2024 14:26:07 -0500 Subject: [PATCH] update Java version --- api/com.upokecenter.cbor.CBORObject.md | 16 +++++++------- .../java/com/upokecenter/cbor/CBORObject.java | 22 +++++++++---------- 2 files changed, 19 insertions(+), 19 deletions(-) diff --git a/api/com.upokecenter.cbor.CBORObject.md b/api/com.upokecenter.cbor.CBORObject.md index 1e833f0..be20ecb 100644 --- a/api/com.upokecenter.cbor.CBORObject.md +++ b/api/com.upokecenter.cbor.CBORObject.md @@ -1640,7 +1640,7 @@ Converts this object to a byte array in JavaScript object Notation (JSON) method (such as int or string) or a plain-old-data type (POCO or POJO type) within the control of the application. If the plain-old-data type references other data types, those types should likewise - meet either criterion above.

+ meet either criterion given earlier.

**Returns:** @@ -1670,7 +1670,7 @@ Converts this CBOR object to an object of an arbitrary type. See the method (such as int or string) or a plain-old-data type (POCO or POJO type) within the control of the application. If the plain-old-data type references other data types, those types should likewise - meet either criterion above.

+ meet either criterion given earlier.

* mapper - This parameter controls which data types are eligible for Plain-Old-Data deserialization and includes custom converters from CBOR @@ -1706,7 +1706,7 @@ Converts this CBOR object to an object of an arbitrary type. See the method (such as int or string) or a plain-old-data type (POCO or POJO type) within the control of the application. If the plain-old-data type references other data types, those types should likewise - meet either criterion above.

+ meet either criterion given earlier.

* options - Specifies options for controlling deserialization of CBOR objects. @@ -1909,7 +1909,7 @@ Converts this CBOR object to an object of an arbitrary type. See the method, such as int or string , or a plain-old-data type (POCO or POJO type) within the control of the application. If the plain-old-data type references other data types, those types should likewise - meet either criterion above.

+ meet either criterion given earlier.

* mapper - This parameter controls which data types are eligible for Plain-Old-Data deserialization and includes custom converters from CBOR @@ -1953,7 +1953,7 @@ Generates an object of an arbitrary type from an array of CBOR-encoded method, such as int or string, or a plain-old-data type (POCO or POJO type) within the control of the application. If the plain-old-data type references other data types, those types should likewise - meet either criterion above.

+ meet either criterion given earlier.

* mapper - This parameter controls which data types are eligible for Plain-Old-Data deserialization and includes custom converters from CBOR @@ -2004,7 +2004,7 @@ Generates an object of an arbitrary type from an array of CBOR-encoded method, such as int or string, or a plain-old-data type (POCO or POJO type) within the control of the application. If the plain-old-data type references other data types, those types should likewise - meet either criterion above.

+ meet either criterion given earlier.

**Returns:** @@ -2043,7 +2043,7 @@ Generates an object of an arbitrary type from an array of CBOR-encoded method, such as int or string, or a plain-old-data type (POCO or POJO type) within the control of the application. If the plain-old-data type references other data types, those types should likewise - meet either criterion above.

+ meet either criterion given earlier.

* mapper - This parameter controls which data types are eligible for Plain-Old-Data deserialization and includes custom converters from CBOR @@ -2089,7 +2089,7 @@ Generates an object of an arbitrary type from an array of CBOR-encoded method, such as int or string, or a plain-old-data type (POCO or POJO type) within the control of the application. If the plain-old-data type references other data types, those types should likewise - meet either criterion above.

+ meet either criterion given earlier.

**Returns:** diff --git a/src/main/java/com/upokecenter/cbor/CBORObject.java b/src/main/java/com/upokecenter/cbor/CBORObject.java index 56cd9b0..898ecb2 100644 --- a/src/main/java/com/upokecenter/cbor/CBORObject.java +++ b/src/main/java/com/upokecenter/cbor/CBORObject.java @@ -1153,7 +1153,7 @@ public static CBORObject FromJSONString( * method (such as {@code int} or {@code string}) or a plain-old-data type * (POCO or POJO type) within the control of the application. If the * plain-old-data type references other data types, those types should likewise - * meet either criterion above.

+ * meet either criterion given earlier.

* @return The converted object. * @throws com.upokecenter.cbor.CBORException The given type {@code t} , or * this object's CBOR type, is not supported, or the given object's nesting is @@ -1178,7 +1178,7 @@ public T ToObject(java.lang.reflect.Type t) { * method (such as {@code int} or {@code string}) or a plain-old-data type * (POCO or POJO type) within the control of the application. If the * plain-old-data type references other data types, those types should likewise - * meet either criterion above.

+ * meet either criterion given earlier.

* @param mapper This parameter controls which data types are eligible for * Plain-Old-Data deserialization and includes custom converters from CBOR * objects to certain data types. @@ -1211,7 +1211,7 @@ public T ToObject(java.lang.reflect.Type t, CBORTypeMapper mapper) { * method (such as {@code int} or {@code string}) or a plain-old-data type * (POCO or POJO type) within the control of the application. If the * plain-old-data type references other data types, those types should likewise - * meet either criterion above.

+ * meet either criterion given earlier.

* @param options Specifies options for controlling deserialization of CBOR * objects. * @return The converted object. @@ -1412,7 +1412,7 @@ public T ToObject(java.lang.reflect.Type t, PODOptions options) { * method, such as {@code int} or {@code string} , or a plain-old-data type * (POCO or POJO type) within the control of the application. If the * plain-old-data type references other data types, those types should likewise - * meet either criterion above.

+ * meet either criterion given earlier.

* @param mapper This parameter controls which data types are eligible for * Plain-Old-Data deserialization and includes custom converters from CBOR * objects to certain data types. Can be null. @@ -1451,7 +1451,7 @@ public T ToObject(java.lang.reflect.Type t, CBORTypeMapper mapper, PODOption * method, such as {@code int} or {@code string}, or a plain-old-data type * (POCO or POJO type) within the control of the application. If the * plain-old-data type references other data types, those types should likewise - * meet either criterion above.

+ * meet either criterion given earlier.

* @param mapper This parameter controls which data types are eligible for * Plain-Old-Data deserialization and includes custom converters from CBOR * objects to certain data types. Can be null. @@ -1504,7 +1504,7 @@ public static T DecodeObjectFromBytes( * method, such as {@code int} or {@code string}, or a plain-old-data type * (POCO or POJO type) within the control of the application. If the * plain-old-data type references other data types, those types should likewise - * meet either criterion above.

+ * meet either criterion given earlier.

* @return An object of the given type decoded from the given byte array. * Returns null (as opposed to CBORObject.Null) if {@code data} is empty and * the AllowEmpty property is set on the given CBOREncodeOptions object. @@ -1540,7 +1540,7 @@ public static T DecodeObjectFromBytes( * method, such as {@code int} or {@code string}, or a plain-old-data type * (POCO or POJO type) within the control of the application. If the * plain-old-data type references other data types, those types should likewise - * meet either criterion above.

+ * meet either criterion given earlier.

* @param mapper This parameter controls which data types are eligible for * Plain-Old-Data deserialization and includes custom converters from CBOR * objects to certain data types. Can be null. @@ -1582,7 +1582,7 @@ public static T DecodeObjectFromBytes( * method, such as {@code int} or {@code string}, or a plain-old-data type * (POCO or POJO type) within the control of the application. If the * plain-old-data type references other data types, those types should likewise - * meet either criterion above.

+ * meet either criterion given earlier.

* @return An object of the given type decoded from the given byte array. * Returns null (as opposed to CBORObject.Null) if {@code data} is empty and * the AllowEmpty property is set on the given CBOREncodeOptions object. @@ -7108,7 +7108,7 @@ private static void WriteStreamedString(String str, OutputStream stream) throws } else if (c <= 0x7ff) { if (byteIndex + 2 > StreamedStringBufferLength) { // Write bytes retrieved so far - the next two bytes - // would exceed the length, and the CBOR spec forbids + // would exceed the length, and the CBOR specification forbids // splitting characters when generating text strings if (!streaming) { stream.write(0x7f); @@ -7133,7 +7133,7 @@ private static void WriteStreamedString(String str, OutputStream stream) throws if (c <= 0xffff) { if (byteIndex + 3 > StreamedStringBufferLength) { // Write bytes retrieved so far - the next three bytes - // would exceed the length, and the CBOR spec forbids + // would exceed the length, and the CBOR specification forbids // splitting characters when generating text strings if (!streaming) { stream.write(0x7f); @@ -7149,7 +7149,7 @@ private static void WriteStreamedString(String str, OutputStream stream) throws } else { if (byteIndex + 4 > StreamedStringBufferLength) { // Write bytes retrieved so far - the next four bytes - // would exceed the length, and the CBOR spec forbids + // would exceed the length, and the CBOR specification forbids // splitting characters when generating text strings if (!streaming) { stream.write(0x7f);