Skip to content

refactor: remove usage of NumberUtils #80

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
basil merged 3 commits into from
Jul 31, 2025
Merged

refactor: remove usage of NumberUtils #80

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
576142a
refactor: remove usage of NumberUtils
BobDu Jul 31, 2025
7766191
Merge branch 'jenkinsci:master' into remove-number-utils
BobDu Jul 31, 2025
e25d157
fix: run mvn spotless:apply
BobDu Jul 31, 2025
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
8 changes: 6 additions & 2 deletions src/main/java/net/sf/json/util/JSONTokener.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@
import net.sf.json.JSONObject;
import net.sf.json.JsonConfig;
import net.sf.json.regexp.RegexpUtils;
import org.apache.commons.lang.math.NumberUtils;

/**
* A JSONTokener takes a source string and extracts characters and tokens from
Expand Down Expand Up @@ -414,7 +413,12 @@ public Object nextValue(JsonConfig jsonConfig) {
}

try {
return NumberUtils.createNumber(s);
if (s.contains(".") || s.contains("e") || s.contains("E")) {
return Double.parseDouble(s);
} else {
long l = Long.parseLong(s);
return l >= Integer.MIN_VALUE && l <= Integer.MAX_VALUE ? (int) l : l;
}
} catch (Exception e) {
return s;
}
Expand Down
31 changes: 31 additions & 0 deletions src/test/java/net/sf/json/TestJSONObject.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -285,6 +285,37 @@ public void testElement_JSONTokener() {
Assertions.assertEquals(JSONObject.fromObject(tok), jsonObject.getJSONObject("obj"));
}

public void testJSONTokener_ParseNumber() {
String jsonStr =
"{\"int\":42,\"negInt\":-17,\"long\":9223372036854775807,\"negLong\":-9223372036854775808,\"float\":3.1415,\"negFloat\":-0.01,\"exp\":1.23e4,\"negExp\":-1.23e4,\"expNeg\":1.23e-4,\"negExpNeg\":-1.23e-4,\"zero\":0}";
JSONTokener jsonTokener = new JSONTokener(jsonStr);
JSONObject json = JSONObject.fromObject(jsonTokener);

assertTrue(json.get("int") instanceof Integer);
assertTrue(json.get("negInt") instanceof Integer);
assertTrue(json.get("long") instanceof Long);
assertTrue(json.get("negLong") instanceof Long);
assertTrue(json.get("float") instanceof Double);
assertTrue(json.get("negFloat") instanceof Double);
assertTrue(json.get("exp") instanceof Double);
assertTrue(json.get("negExp") instanceof Double);
assertTrue(json.get("expNeg") instanceof Double);
assertTrue(json.get("negExpNeg") instanceof Double);
assertTrue(json.get("zero") instanceof Integer);

assertEquals(42, json.get("int"));
assertEquals(-17, json.get("negInt"));
assertEquals(9223372036854775807L, json.get("long"));
assertEquals(-9223372036854775808L, json.get("negLong"));
assertEquals(3.1415, (Double) json.get("float"), 1e-10);
assertEquals(-0.01, (Double) json.get("negFloat"), 1e-10);
assertEquals(1.23e4, (Double) json.get("exp"), 1e-10);
assertEquals(-1.23e4, (Double) json.get("negExp"), 1e-10);
assertEquals(1.23e-4, (Double) json.get("expNeg"), 1e-10);
assertEquals(-1.23e-4, (Double) json.get("negExpNeg"), 1e-10);
assertEquals(0, json.get("zero"));
}

public void testElement_long() {
JSONObject jsonObject = new JSONObject();
jsonObject.element("long", 1L);
Expand Down