Skip to content

Commit 350107a

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

File tree

6 files changed

+44
-45
lines changed

6 files changed

+44
-45
lines changed

api/com.upokecenter.cbor.CBORObject.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1863,7 +1863,7 @@ Converts this CBOR object to an object of an arbitrary type. See the
18631863
fields with the same name, those properties and fields are
18641864
ignored.</li><li>(*) In the Java version, eligible setters are public,
18651865
nonstatic methods starting with "set" followed by a character other than a
1866-
basic digit or lower-case letter, that is, other than "a" to "z" or "0" to
1866+
basic digit or lowercase letter, that is, other than "a" to "z" or "0" to
18671867
"9", that take one parameter. The class containing an eligible setter must
18681868
have a public, nonstatic method with the same name, but starting with "get"
18691869
or "is" rather than "set", that takes no parameters and does not return
@@ -2722,7 +2722,7 @@ Generates a CBORObject from an arbitrary object. See the overload of this
27222722
multiple properties and/or fields with the same name, those properties and
27232723
fields are ignored.</li><li>(*) In the Java version, eligible getters are
27242724
public, nonstatic methods starting with "get" or "is" (either word followed
2725-
by a character other than a basic digit or lower-case letter, that is, other
2725+
by a character other than a basic digit or lowercase letter, that is, other
27262726
than "a" to "z" or "0" to "9"), that take no parameters and do not return
27272727
void, except that methods named "getClass" are not eligible getters. In
27282728
addition, public, nonstatic, nonfinal fields are also eligible getters. If a
@@ -4273,7 +4273,7 @@ Gets the CBOR object referred to by a JSON Pointer according to RFC6901. For
42734273
A JSON patch is an array with one or more maps. Each map has the following
42744274
keys: </p> <ul> <li>"op" - Required. This key's value is the patch operation
42754275
and must be "add", "remove", "move", "copy", "test", or "replace", in basic
4276-
lower case letters and no other case combination.</li><li>"value" - Required
4276+
lowercase letters and no other case combination.</li><li>"value" - Required
42774277
if the operation is "add", "replace", or "test" and specifies the item to
42784278
add (insert), or that will replace the existing item, or to check an
42794279
existing item for equality, respectively. (For "test", the operation fails

api/com.upokecenter.cbor.PODOptions.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ Gets the values of this options object's properties in text form.
5050
the behavior of key name serialization as follows. If "useCamelCase" is
5151
<code>false</code> :</p> <ul> <li>In the .NET version, all key names are
5252
capitalized, meaning the first letter in the name is converted to a basic
53-
upper-case letter if it's a basic lower-case letter ("a" to "z"). (For
53+
uppercase letter if it's a basic lowercase letter ("a" to "z"). (For
5454
example, "Name" and "IsName" both remain unchanged.)</li><li>In the Java
5555
version, all field names are capitalized, and for each eligible method name,
5656
the word "get" or "set" is removed from the name if the name starts with
@@ -59,8 +59,8 @@ Gets the values of this options object's properties in text form.
5959
<p>If "useCamelCase" is <code>true</code> :</p> <ul> <li>In the .NET version, for
6060
each eligible property or field name, the word "Is" is removed from the name
6161
if the name starts with that word, then the name is converted to camel case,
62-
meaning the first letter in the name is converted to a basic lower-case
63-
letter if it's a basic upper-case letter ("A" to "Z"). (For example, "Name"
62+
meaning the first letter in the name is converted to a basic lowercase
63+
letter if it's a basic uppercase letter ("A" to "Z"). (For example, "Name"
6464
and "IsName" both become "name", and "IsIsName" becomes
6565
"isName".)</li><li>In the Java version: For each eligible method name, the
6666
word "get", "set", or "is" is removed from the name if the name starts with
@@ -70,8 +70,8 @@ Gets the values of this options object's properties in text form.
7070
that word, then the name is converted to camel case. (For example, "name"
7171
and "isName" both become "name".)</li></ul> <p>In the description above, a
7272
name "starts with" a word if that word begins the name and is followed by a
73-
character other than a basic digit or basic lower-case letter, that is,
74-
other than "a" to "z" or "0" to "9".</p>
73+
character other than a basic digit or basic lowercase letter, that is, other
74+
than "a" to "z" or "0" to "9".</p>
7575

7676
**Returns:**
7777

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

Lines changed: 18 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -79,25 +79,24 @@ public CBOREncodeOptions(
7979
* the string begin or end with whitespace. The string can be empty, but cannot
8080
* be null. The following is an example of this parameter: {@code
8181
* allowduplicatekeys = true;ctap2Canonical = true}. The key can be any one of the
82-
* following where the letters can be any combination of basic upper-case
83-
* and/or basic lower-case letters: {@code allowduplicatekeys}, {@code
84-
* ctap2canonical}, {@code resolvereferences}, {@code useindeflengthstrings},
85-
* {@code allowempty}, {@code float64}, {@code keepkeyorder}. Keys other than
86-
* these are ignored in this version of the CBOR library. The key {@code
87-
* float64} was introduced in version 4.4 of this library. The key {@code
88-
* keepkeyorder} was introduced in version 4.5 of this library.(Keys are
89-
* compared using a basic case-insensitive comparison, in which two strings are
90-
* equal if they match after converting the basic upper-case letters A to Z
91-
* (U+0041 to U+005A) in both strings to basic lower-case letters.) If two or
92-
* more key/value pairs have equal keys (in a basic case-insensitive
93-
* comparison), the value given for the last such key is used. The four keys
94-
* just given can have a value of {@code 1}, {@code true}, {@code yes}, or
95-
* {@code on} (where the letters can be any combination of basic upper-case
96-
* and/or basic lower-case letters), which means true, and any other value
97-
* meaning false. For example, {@code allowduplicatekeys = Yes} and {@code
98-
* allowduplicatekeys = 1} both set the {@code AllowDuplicateKeys} property to
99-
* true. In the future, this class may allow other keys to store other kinds of
100-
* values, not just true or false.
82+
* following where the letters can be any combination of basic uppercase and/or
83+
* basic lowercase letters: {@code allowduplicatekeys}, {@code ctap2canonical},
84+
* {@code resolvereferences}, {@code useindeflengthstrings}, {@code
85+
* allowempty}, {@code float64}, {@code keepkeyorder}. Keys other than these
86+
* are ignored in this version of the CBOR library. The key {@code float64} was
87+
* introduced in version 4.4 of this library. The key {@code keepkeyorder} was
88+
* introduced in version 4.5 of this library.(Keys are compared using a basic
89+
* case-insensitive comparison, in which two strings are equal if they match
90+
* after converting the basic uppercase letters A to Z (U+0041 to U+005A) in
91+
* both strings to basic lowercase letters.) If two or more key/value pairs
92+
* have equal keys (in a basic case-insensitive comparison), the value given
93+
* for the last such key is used. The four keys just given can have a value of
94+
* {@code 1}, {@code true}, {@code yes}, or {@code on} (where the letters can
95+
* be any combination of basic uppercase and/or basic lowercase letters), which
96+
* means true, and any other value meaning false. For example, {@code
97+
* allowduplicatekeys = Yes} and {@code allowduplicatekeys = 1} both set the {@code
98+
* AllowDuplicateKeys} property to true. In the future, this class may allow
99+
* other keys to store other kinds of values, not just true or false.
101100
* @throws NullPointerException The parameter {@code paramString} is null.
102101
*/
103102
public CBOREncodeOptions(String paramString) {

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1369,7 +1369,7 @@ public <T> T ToObject(java.lang.reflect.Type t, PODOptions options) {
13691369
* fields with the same name, those properties and fields are
13701370
* ignored.</li><li>(*) In the Java version, eligible setters are public,
13711371
* nonstatic methods starting with "set" followed by a character other than a
1372-
* basic digit or lower-case letter, that is, other than "a" to "z" or "0" to
1372+
* basic digit or lowercase letter, that is, other than "a" to "z" or "0" to
13731373
* "9", that take one parameter. The class containing an eligible setter must
13741374
* have a public, nonstatic method with the same name, but starting with "get"
13751375
* or "is" rather than "set", that takes no parameters and does not return
@@ -2467,7 +2467,7 @@ public static CBORObject FromObject(
24672467
* multiple properties and/or fields with the same name, those properties and
24682468
* fields are ignored.</li><li>(*) In the Java version, eligible getters are
24692469
* public, nonstatic methods starting with "get" or "is" (either word followed
2470-
* by a character other than a basic digit or lower-case letter, that is, other
2470+
* by a character other than a basic digit or lowercase letter, that is, other
24712471
* than "a" to "z" or "0" to "9"), that take no parameters and do not return
24722472
* void, except that methods named "getClass" are not eligible getters. In
24732473
* addition, public, nonstatic, nonfinal fields are also eligible getters. If a
@@ -4833,7 +4833,7 @@ public CBORObject AtJSONPointer(String pointer, CBORObject defaultValue) {
48334833
* A JSON patch is an array with one or more maps. Each map has the following
48344834
* keys: </p> <ul> <li>"op" - Required. This key's value is the patch operation
48354835
* and must be "add", "remove", "move", "copy", "test", or "replace", in basic
4836-
* lower case letters and no other case combination.</li><li>"value" - Required
4836+
* lowercase letters and no other case combination.</li><li>"value" - Required
48374837
* if the operation is "add", "replace", or "test" and specifies the item to
48384838
* add (insert), or that will replace the existing item, or to check an
48394839
* existing item for equality, respectively. (For "test", the operation fails

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -109,22 +109,22 @@ public JSONOptions() {
109109
* the string begin or end with whitespace. The string can be empty, but cannot
110110
* be null. The following is an example of this parameter: {@code
111111
* writebasic = false;replacesurrogates = true}. The key can be any one of the
112-
* following where the letters can be any combination of basic upper-case
113-
* and/or basic lower-case letters: {@code replacesurrogates}, {@code
112+
* following where the letters can be any combination of basic uppercase and/or
113+
* basic lowercase letters: {@code replacesurrogates}, {@code
114114
* allowduplicatekeys}, {@code preservenegativezero}, {@code numberconversion},
115115
* {@code writebasic}, {@code keepkeyorder}. Other keys are ignored in this
116116
* version of the CBOR library. (Keys are compared using a basic
117117
* case-insensitive comparison, in which two strings are equal if they match
118-
* after converting the basic upper-case letters A to Z (U+0041 to U+005A) in
119-
* both strings to basic lower-case letters.) If two or more key/value pairs
118+
* after converting the basic uppercase letters A to Z (U+0041 to U+005A) in
119+
* both strings to basic lowercase letters.) If two or more key/value pairs
120120
* have equal keys (in a basic case-insensitive comparison), the value given
121121
* for the last such key is used. The first four keys just given can have a
122122
* value of {@code 1}, {@code true}, {@code yes}, or {@code on} (where the
123-
* letters can be any combination of basic upper-case and/or basic lower-case
123+
* letters can be any combination of basic uppercase and/or basic lowercase
124124
* letters), which means true, and any other value meaning false. The last key,
125125
* {@code numberconversion}, can have a value of any name given in the {@code
126126
* JSONOptions.ConversionMode} enumeration (where the letters can be any
127-
* combination of basic upper-case and/or basic lower-case letters), and any
127+
* combination of basic uppercase and/or basic lowercase letters), and any
128128
* other value is unrecognized. (If the {@code numberconversion} key is not
129129
* given, its value is treated as {@code intorfloat} (formerly {@code full} in
130130
* versions earlier than 5.0). If that key is given, but has an unrecognized

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

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -36,16 +36,16 @@ public PODOptions(boolean removeIsPrefix, boolean useCamelCase) {
3636
* the string begin or end with whitespace. The string can be empty, but cannot
3737
* be null. The following is an example of this parameter: {@code
3838
* usecamelcase = true}. The key can be any one of the following where the
39-
* letters can be any combination of basic upper-case and/or basic lower-case
39+
* letters can be any combination of basic uppercase and/or basic lowercase
4040
* letters: {@code usecamelcase}. Other keys are ignored in this version of the
4141
* CBOR library. (Keys are compared using a basic case-insensitive comparison,
4242
* in which two strings are equal if they match after converting the basic
43-
* upper-case letters A to Z (U+0041 to U+005A) in both strings to basic
44-
* lower-case letters.) If two or more key/value pairs have equal keys (in a
43+
* uppercase letters A to Z (U+0041 to U+005A) in both strings to basic
44+
* lowercase letters.) If two or more key/value pairs have equal keys (in a
4545
* basic case-insensitive comparison), the value given for the last such key is
4646
* used. The key just given can have a value of {@code 1}, {@code true}, {@code
4747
* yes}, or {@code on} (where the letters can be any combination of basic
48-
* upper-case and/or basic lower-case letters), which means true, and any other
48+
* uppercase and/or basic lowercase letters), which means true, and any other
4949
* value meaning false. For example, {@code usecamelcase = Yes} and {@code
5050
* usecamelcase = 1} both set the {@code UseCamelCase} property to true. In the
5151
* future, this class may allow other keys to store other kinds of values, not
@@ -84,7 +84,7 @@ public PODOptions(String paramString) {
8484
* the behavior of key name serialization as follows. If "useCamelCase" is
8585
* {@code false} :</p> <ul> <li>In the .NET version, all key names are
8686
* capitalized, meaning the first letter in the name is converted to a basic
87-
* upper-case letter if it's a basic lower-case letter ("a" to "z"). (For
87+
* uppercase letter if it's a basic lowercase letter ("a" to "z"). (For
8888
* example, "Name" and "IsName" both remain unchanged.)</li><li>In the Java
8989
* version, all field names are capitalized, and for each eligible method name,
9090
* the word "get" or "set" is removed from the name if the name starts with
@@ -93,8 +93,8 @@ public PODOptions(String paramString) {
9393
* <p>If "useCamelCase" is {@code true} :</p> <ul> <li>In the .NET version, for
9494
* each eligible property or field name, the word "Is" is removed from the name
9595
* if the name starts with that word, then the name is converted to camel case,
96-
* meaning the first letter in the name is converted to a basic lower-case
97-
* letter if it's a basic upper-case letter ("A" to "Z"). (For example, "Name"
96+
* meaning the first letter in the name is converted to a basic lowercase
97+
* letter if it's a basic uppercase letter ("A" to "Z"). (For example, "Name"
9898
* and "IsName" both become "name", and "IsIsName" becomes
9999
* "isName".)</li><li>In the Java version: For each eligible method name, the
100100
* word "get", "set", or "is" is removed from the name if the name starts with
@@ -104,8 +104,8 @@ public PODOptions(String paramString) {
104104
* that word, then the name is converted to camel case. (For example, "name"
105105
* and "isName" both become "name".)</li></ul> <p>In the description above, a
106106
* name "starts with" a word if that word begins the name and is followed by a
107-
* character other than a basic digit or basic lower-case letter, that is,
108-
* other than "a" to "z" or "0" to "9".</p>
107+
* character other than a basic digit or basic lowercase letter, that is, other
108+
* than "a" to "z" or "0" to "9".</p>
109109
* @return {@code true} If the names are converted to camel case; otherwise,
110110
* {@code false}. This property is {@code true} by default.
111111
*/

0 commit comments

Comments
 (0)