Skip to content

Commit f9d6c3a

Browse files
committed
update Java version
1 parent 350107a commit f9d6c3a

File tree

2 files changed

+19
-19
lines changed

2 files changed

+19
-19
lines changed

api/com.upokecenter.cbor.CBORObject.md

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1640,7 +1640,7 @@ Converts this object to a byte array in JavaScript object Notation (JSON)
16401640
method (such as <code>int</code> or <code>string</code>) or a plain-old-data type
16411641
(POCO or POJO type) within the control of the application. If the
16421642
plain-old-data type references other data types, those types should likewise
1643-
meet either criterion above.</p>
1643+
meet either criterion given earlier.</p>
16441644

16451645
**Returns:**
16461646

@@ -1670,7 +1670,7 @@ Converts this CBOR object to an object of an arbitrary type. See the
16701670
method (such as <code>int</code> or <code>string</code>) or a plain-old-data type
16711671
(POCO or POJO type) within the control of the application. If the
16721672
plain-old-data type references other data types, those types should likewise
1673-
meet either criterion above.</p>
1673+
meet either criterion given earlier.</p>
16741674

16751675
* <code>mapper</code> - This parameter controls which data types are eligible for
16761676
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
17061706
method (such as <code>int</code> or <code>string</code>) or a plain-old-data type
17071707
(POCO or POJO type) within the control of the application. If the
17081708
plain-old-data type references other data types, those types should likewise
1709-
meet either criterion above.</p>
1709+
meet either criterion given earlier.</p>
17101710

17111711
* <code>options</code> - Specifies options for controlling deserialization of CBOR
17121712
objects.
@@ -1909,7 +1909,7 @@ Converts this CBOR object to an object of an arbitrary type. See the
19091909
method, such as <code>int</code> or <code>string</code> , or a plain-old-data type
19101910
(POCO or POJO type) within the control of the application. If the
19111911
plain-old-data type references other data types, those types should likewise
1912-
meet either criterion above.</p>
1912+
meet either criterion given earlier.</p>
19131913

19141914
* <code>mapper</code> - This parameter controls which data types are eligible for
19151915
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
19531953
method, such as <code>int</code> or <code>string</code>, or a plain-old-data type
19541954
(POCO or POJO type) within the control of the application. If the
19551955
plain-old-data type references other data types, those types should likewise
1956-
meet either criterion above.</p>
1956+
meet either criterion given earlier.</p>
19571957

19581958
* <code>mapper</code> - This parameter controls which data types are eligible for
19591959
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
20042004
method, such as <code>int</code> or <code>string</code>, or a plain-old-data type
20052005
(POCO or POJO type) within the control of the application. If the
20062006
plain-old-data type references other data types, those types should likewise
2007-
meet either criterion above.</p>
2007+
meet either criterion given earlier.</p>
20082008

20092009
**Returns:**
20102010

@@ -2043,7 +2043,7 @@ Generates an object of an arbitrary type from an array of CBOR-encoded
20432043
method, such as <code>int</code> or <code>string</code>, or a plain-old-data type
20442044
(POCO or POJO type) within the control of the application. If the
20452045
plain-old-data type references other data types, those types should likewise
2046-
meet either criterion above.</p>
2046+
meet either criterion given earlier.</p>
20472047

20482048
* <code>mapper</code> - This parameter controls which data types are eligible for
20492049
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
20892089
method, such as <code>int</code> or <code>string</code>, or a plain-old-data type
20902090
(POCO or POJO type) within the control of the application. If the
20912091
plain-old-data type references other data types, those types should likewise
2092-
meet either criterion above.</p>
2092+
meet either criterion given earlier.</p>
20932093

20942094
**Returns:**
20952095

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

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1153,7 +1153,7 @@ public static CBORObject FromJSONString(
11531153
* method (such as {@code int} or {@code string}) or a plain-old-data type
11541154
* (POCO or POJO type) within the control of the application. If the
11551155
* plain-old-data type references other data types, those types should likewise
1156-
* meet either criterion above.</p>
1156+
* meet either criterion given earlier.</p>
11571157
* @return The converted object.
11581158
* @throws com.upokecenter.cbor.CBORException The given type {@code t} , or
11591159
* this object's CBOR type, is not supported, or the given object's nesting is
@@ -1178,7 +1178,7 @@ public <T> T ToObject(java.lang.reflect.Type t) {
11781178
* method (such as {@code int} or {@code string}) or a plain-old-data type
11791179
* (POCO or POJO type) within the control of the application. If the
11801180
* plain-old-data type references other data types, those types should likewise
1181-
* meet either criterion above.</p>
1181+
* meet either criterion given earlier.</p>
11821182
* @param mapper This parameter controls which data types are eligible for
11831183
* Plain-Old-Data deserialization and includes custom converters from CBOR
11841184
* objects to certain data types.
@@ -1211,7 +1211,7 @@ public <T> T ToObject(java.lang.reflect.Type t, CBORTypeMapper mapper) {
12111211
* method (such as {@code int} or {@code string}) or a plain-old-data type
12121212
* (POCO or POJO type) within the control of the application. If the
12131213
* plain-old-data type references other data types, those types should likewise
1214-
* meet either criterion above.</p>
1214+
* meet either criterion given earlier.</p>
12151215
* @param options Specifies options for controlling deserialization of CBOR
12161216
* objects.
12171217
* @return The converted object.
@@ -1412,7 +1412,7 @@ public <T> T ToObject(java.lang.reflect.Type t, PODOptions options) {
14121412
* method, such as {@code int} or {@code string} , or a plain-old-data type
14131413
* (POCO or POJO type) within the control of the application. If the
14141414
* plain-old-data type references other data types, those types should likewise
1415-
* meet either criterion above.</p>
1415+
* meet either criterion given earlier.</p>
14161416
* @param mapper This parameter controls which data types are eligible for
14171417
* Plain-Old-Data deserialization and includes custom converters from CBOR
14181418
* objects to certain data types. Can be null.
@@ -1451,7 +1451,7 @@ public <T> T ToObject(java.lang.reflect.Type t, CBORTypeMapper mapper, PODOption
14511451
* method, such as {@code int} or {@code string}, or a plain-old-data type
14521452
* (POCO or POJO type) within the control of the application. If the
14531453
* plain-old-data type references other data types, those types should likewise
1454-
* meet either criterion above.</p>
1454+
* meet either criterion given earlier.</p>
14551455
* @param mapper This parameter controls which data types are eligible for
14561456
* Plain-Old-Data deserialization and includes custom converters from CBOR
14571457
* objects to certain data types. Can be null.
@@ -1504,7 +1504,7 @@ public static <T> T DecodeObjectFromBytes(
15041504
* method, such as {@code int} or {@code string}, or a plain-old-data type
15051505
* (POCO or POJO type) within the control of the application. If the
15061506
* plain-old-data type references other data types, those types should likewise
1507-
* meet either criterion above.</p>
1507+
* meet either criterion given earlier.</p>
15081508
* @return An object of the given type decoded from the given byte array.
15091509
* Returns null (as opposed to CBORObject.Null) if {@code data} is empty and
15101510
* the AllowEmpty property is set on the given CBOREncodeOptions object.
@@ -1540,7 +1540,7 @@ public static <T> T DecodeObjectFromBytes(
15401540
* method, such as {@code int} or {@code string}, or a plain-old-data type
15411541
* (POCO or POJO type) within the control of the application. If the
15421542
* plain-old-data type references other data types, those types should likewise
1543-
* meet either criterion above.</p>
1543+
* meet either criterion given earlier.</p>
15441544
* @param mapper This parameter controls which data types are eligible for
15451545
* Plain-Old-Data deserialization and includes custom converters from CBOR
15461546
* objects to certain data types. Can be null.
@@ -1582,7 +1582,7 @@ public static <T> T DecodeObjectFromBytes(
15821582
* method, such as {@code int} or {@code string}, or a plain-old-data type
15831583
* (POCO or POJO type) within the control of the application. If the
15841584
* plain-old-data type references other data types, those types should likewise
1585-
* meet either criterion above.</p>
1585+
* meet either criterion given earlier.</p>
15861586
* @return An object of the given type decoded from the given byte array.
15871587
* Returns null (as opposed to CBORObject.Null) if {@code data} is empty and
15881588
* the AllowEmpty property is set on the given CBOREncodeOptions object.
@@ -7108,7 +7108,7 @@ private static void WriteStreamedString(String str, OutputStream stream) throws
71087108
} else if (c <= 0x7ff) {
71097109
if (byteIndex + 2 > StreamedStringBufferLength) {
71107110
// Write bytes retrieved so far - the next two bytes
7111-
// would exceed the length, and the CBOR spec forbids
7111+
// would exceed the length, and the CBOR specification forbids
71127112
// splitting characters when generating text strings
71137113
if (!streaming) {
71147114
stream.write(0x7f);
@@ -7133,7 +7133,7 @@ private static void WriteStreamedString(String str, OutputStream stream) throws
71337133
if (c <= 0xffff) {
71347134
if (byteIndex + 3 > StreamedStringBufferLength) {
71357135
// Write bytes retrieved so far - the next three bytes
7136-
// would exceed the length, and the CBOR spec forbids
7136+
// would exceed the length, and the CBOR specification forbids
71377137
// splitting characters when generating text strings
71387138
if (!streaming) {
71397139
stream.write(0x7f);
@@ -7149,7 +7149,7 @@ private static void WriteStreamedString(String str, OutputStream stream) throws
71497149
} else {
71507150
if (byteIndex + 4 > StreamedStringBufferLength) {
71517151
// Write bytes retrieved so far - the next four bytes
7152-
// would exceed the length, and the CBOR spec forbids
7152+
// would exceed the length, and the CBOR specification forbids
71537153
// splitting characters when generating text strings
71547154
if (!streaming) {
71557155
stream.write(0x7f);

0 commit comments

Comments
 (0)