Skip to content

Commit deaa34a

Browse files
committed
update Java version
1 parent 092ecab commit deaa34a

File tree

2 files changed

+33
-23
lines changed

2 files changed

+33
-23
lines changed

api/com.upokecenter.cbor.CBORObject.md

Lines changed: 14 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2541,8 +2541,9 @@ Converts an arbitrary object to a string in JavaScript object Notation
25412541
to a data stream in UTF-8. If the object is convertible to a CBOR
25422542
map, or to a CBOR object that contains CBOR maps, the keys to those
25432543
maps are written out to the JSON string in an undefined order. The
2544-
example code given in <see cref='PeterO.Cbor.CBORObject.ToJSONString(&#10; PeterO.Cbor.JSONOptions)'/> can be used to write out certain keys of
2545-
a CBOR map in a given order to a JSON string.
2544+
example code given in <see cref='PeterO.Cbor.CBORObject.ToJSONString(PeterO.Cbor.JSONOptions)'/>
2545+
can be used to write out certain keys of a CBOR map in a given order
2546+
to a JSON string.
25462547

25472548
**Parameters:**
25482549

@@ -3668,8 +3669,9 @@ Converts this object to a string in JavaScript object Notation (JSON)
36683669
example, <code>22("Test")</code> is converted to <code>"Test"</code> and
36693670
<code>true</code> is converted to <code>"true"</code>). If, after such
36703671
conversion, two or more map keys are identical, this method throws a
3671-
CBORException. The example code given in <see cref='PeterO.Cbor.CBORObject.ToJSONString(&#10; PeterO.Cbor.JSONOptions)'/> can be used to write out certain keys of
3672-
a CBOR map in a given order to a JSON string.</p>
3672+
CBORException. The example code given in <see cref='PeterO.Cbor.CBORObject.ToJSONString(PeterO.Cbor.JSONOptions)'/>
3673+
can be used to write out certain keys of a CBOR map in a given order
3674+
to a JSON string.</p>
36733675

36743676
**Returns:**
36753677

@@ -3751,7 +3753,8 @@ Returns this CBOR object in string form. The format is intended to be
37513753
human-readable, not machine-readable, the format is not intended to
37523754
be parsed, and the format may change at any time. The returned
37533755
string is not necessarily in JavaScript object Notation (JSON); to
3754-
convert CBOR objects to JSON strings, use the <see cref='PeterO.Cbor.CBORObject.ToJSONString(&#10; PeterO.Cbor.JSONOptions)'/> method instead.
3756+
convert CBOR objects to JSON strings, use the <see cref='PeterO.Cbor.CBORObject.ToJSONString(PeterO.Cbor.JSONOptions)'/>
3757+
method instead.
37553758

37563759
**Overrides:**
37573760

@@ -3789,8 +3792,9 @@ Converts this object to a string in JavaScript object Notation (JSON)
37893792
format, as in the ToJSONString method, and writes that string to a
37903793
data stream in UTF-8. If the CBOR object contains CBOR maps, or is a
37913794
CBOR map, the keys to the map are written out to the JSON string in
3792-
an undefined order. The example code given in <see cref='PeterO.Cbor.CBORObject.ToJSONString(&#10; PeterO.Cbor.JSONOptions)'/> can be used to write out certain keys of
3793-
a CBOR map in a given order to a JSON string.
3795+
an undefined order. The example code given in <see cref='PeterO.Cbor.CBORObject.ToJSONString(PeterO.Cbor.JSONOptions)'/>
3796+
can be used to write out certain keys of a CBOR map in a given order
3797+
to a JSON string.
37943798

37953799
**Parameters:**
37963800

@@ -3809,8 +3813,9 @@ Converts this object to a string in JavaScript object Notation (JSON)
38093813
data stream in UTF-8, using the given JSON options to control the
38103814
encoding process. If the CBOR object contains CBOR maps, or is a
38113815
CBOR map, the keys to the map are written out to the JSON string in
3812-
an undefined order. The example code given in <see cref='PeterO.Cbor.CBORObject.ToJSONString(&#10; PeterO.Cbor.JSONOptions)'/> can be used to write out certain keys of
3813-
a CBOR map in a given order to a JSON string.
3816+
an undefined order. The example code given in <see cref='PeterO.Cbor.CBORObject.ToJSONString(PeterO.Cbor.JSONOptions)'/>
3817+
can be used to write out certain keys of a CBOR map in a given order
3818+
to a JSON string.
38143819

38153820
**Parameters:**
38163821

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

Lines changed: 19 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -2890,9 +2890,10 @@ public static void Write(
28902890
* map, or to a CBOR object that contains CBOR maps, the keys to those
28912891
* maps are written out to the JSON string in an undefined order. The
28922892
* example code given in <see
2893-
* cref='PeterO.Cbor.CBORObject.ToJSONString(
2894-
* PeterO.Cbor.JSONOptions)'/> can be used to write out certain keys of
2895-
* a CBOR map in a given order to a JSON string.
2893+
*
2894+
cref='PeterO.Cbor.CBORObject.ToJSONString(PeterO.Cbor.JSONOptions)'/>
2895+
* can be used to write out certain keys of a CBOR map in a given order
2896+
* to a JSON string.
28962897
* @param obj The parameter {@code obj} is an arbitrary object. Can be null.
28972898
* <p><b>NOTE:</b> For security reasons, whenever possible, an
28982899
* application should not base this parameter on user input or other
@@ -4505,9 +4506,10 @@ public CBORObject Set(Object key, Object valueOb) {
45054506
* <code>true</code> is converted to <code>"true"</code>). If, after such
45064507
* conversion, two or more map keys are identical, this method throws a
45074508
* CBORException. The example code given in <see
4508-
* cref='PeterO.Cbor.CBORObject.ToJSONString(
4509-
* PeterO.Cbor.JSONOptions)'/> can be used to write out certain keys of
4510-
* a CBOR map in a given order to a JSON string.</p>
4509+
*
4510+
cref='PeterO.Cbor.CBORObject.ToJSONString(PeterO.Cbor.JSONOptions)'/>
4511+
* can be used to write out certain keys of a CBOR map in a given order
4512+
* to a JSON string.</p>
45114513
* @return A text string.
45124514
*/
45134515
public String ToJSONString() {
@@ -4608,8 +4610,9 @@ public String ToJSONString(JSONOptions options) {
46084610
* be parsed, and the format may change at any time. The returned
46094611
* string is not necessarily in JavaScript object Notation (JSON); to
46104612
* convert CBOR objects to JSON strings, use the <see
4611-
* cref='PeterO.Cbor.CBORObject.ToJSONString(
4612-
* PeterO.Cbor.JSONOptions)'/> method instead.
4613+
*
4614+
cref='PeterO.Cbor.CBORObject.ToJSONString(PeterO.Cbor.JSONOptions)'/>
4615+
* method instead.
46134616
* @return A text representation of this object.
46144617
*/
46154618
@Override public String toString() {
@@ -4788,9 +4791,10 @@ public CBORObject UntagOne() {
47884791
* data stream in UTF-8. If the CBOR object contains CBOR maps, or is a
47894792
* CBOR map, the keys to the map are written out to the JSON string in
47904793
* an undefined order. The example code given in <see
4791-
* cref='PeterO.Cbor.CBORObject.ToJSONString(
4792-
* PeterO.Cbor.JSONOptions)'/> can be used to write out certain keys of
4793-
* a CBOR map in a given order to a JSON string.
4794+
*
4795+
cref='PeterO.Cbor.CBORObject.ToJSONString(PeterO.Cbor.JSONOptions)'/>
4796+
* can be used to write out certain keys of a CBOR map in a given order
4797+
* to a JSON string.
47944798
* @param outputStream A writable data stream.
47954799
* @throws java.io.IOException An I/O error occurred.
47964800
* @throws NullPointerException The parameter {@code outputStream} is null.
@@ -4812,9 +4816,10 @@ public void WriteJSONTo(OutputStream outputStream) throws java.io.IOException {
48124816
* encoding process. If the CBOR object contains CBOR maps, or is a
48134817
* CBOR map, the keys to the map are written out to the JSON string in
48144818
* an undefined order. The example code given in <see
4815-
* cref='PeterO.Cbor.CBORObject.ToJSONString(
4816-
* PeterO.Cbor.JSONOptions)'/> can be used to write out certain keys of
4817-
* a CBOR map in a given order to a JSON string.
4819+
*
4820+
cref='PeterO.Cbor.CBORObject.ToJSONString(PeterO.Cbor.JSONOptions)'/>
4821+
* can be used to write out certain keys of a CBOR map in a given order
4822+
* to a JSON string.
48184823
* @param outputStream A writable data stream.
48194824
* @param options An object containing the options to control writing the CBOR
48204825
* object to JSON.

0 commit comments

Comments
 (0)