X Tutup
Skip to content

add isEmpty and isNotEmpty methods #421

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
stleary merged 3 commits into from
May 26, 2018
Merged

add isEmpty and isNotEmpty methods #421

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a490ebd
add isEmpty and isNotEmpty methods
strkkk May 19, 2018
0507438
change length comparison to isEmpty method
May 21, 2018
7cad4c3
partially revert changes
strkkk May 25, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 11 additions & 1 deletion JSONArray.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1352,7 +1352,7 @@ public boolean similar(Object other) {
* If any of the names are null.
*/
public JSONObject toJSONObject(JSONArray names) throws JSONException {
if (names == null || names.length() == 0 || this.length() == 0) {
if (names == null || names.isEmpty() || this.isEmpty()) {
return null;
}
JSONObject jo = new JSONObject(names.length());
Expand Down Expand Up @@ -1528,4 +1528,14 @@ public List<Object> toList() {
}
return results;
}

/**
* Check if JSONArray is empty.
*
* @return true if JSONArray is empty, otherwise false.
*/
public boolean isEmpty() {
return myArrayList.isEmpty();
}

}
18 changes: 13 additions & 5 deletions JSONObject.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -810,11 +810,10 @@ public long getLong(String key) throws JSONException {
* @return An array of field names, or null if there are no names.
*/
public static String[] getNames(JSONObject jo) {
int length = jo.length();
if (length == 0) {
if (jo.isEmpty()) {
return null;
}
return jo.keySet().toArray(new String[length]);
return jo.keySet().toArray(new String[jo.length()]);
}

/**
Expand Down Expand Up @@ -963,6 +962,15 @@ public int length() {
return this.map.size();
}

/**
* Check if JSONObject is empty.
*
* @return true if JSONObject is empty, otherwise false.
*/
public boolean isEmpty() {
return map.isEmpty();
}

/**
* Produce a JSONArray containing the names of the elements of this
* JSONObject.
Expand Down Expand Up @@ -1948,7 +1956,7 @@ public static String quote(String string) {
}

public static Writer quote(String string, Writer w) throws IOException {
if (string == null || string.length() == 0) {
if (string == null || string.isEmpty()) {
w.write("\"\"");
return w;
}
Expand Down Expand Up @@ -2227,7 +2235,7 @@ public static void testValidity(Object o) throws JSONException {
* If any of the values are non-finite numbers.
*/
public JSONArray toJSONArray(JSONArray names) throws JSONException {
if (names == null || names.length() == 0) {
if (names == null || names.isEmpty()) {
return null;
}
JSONArray ja = new JSONArray();
Expand Down
X Tutup