04d6e83fc2
* Missed JSONArray optFloat and optDouble for the revert
...
* prevents erasure of stack trace for rethrown exceptions
2017-05-19 09:49:22 -04:00
849b392c01
updates the getNumber/optNumber to not return invalid Doubles
2017-05-18 19:49:50 -04:00
a7f8ff24df
correct string check for JSONObject optBigDecimal and optBigInteger
2017-05-18 14:41:42 -04:00
1ab5260a7a
* Adds methods getNUmber and getFloat to JSONArray and JSONObject
...
* Extracts the stringToNumber logic that the optNumber method uses to reuse it between classes
* Fixes -0 issue with optNumber/getNumber
2017-05-18 14:24:34 -04:00
c28a2bdf39
* reverts changes to getDouble and related optDouble and optFloat
...
* Updates optNumber to be smarter about which object it uses to parse strings
2017-05-18 13:07:32 -04:00
382f62e781
* Prevent exceptions in cases where the value is not a string.
...
* Don't call toString when we know it's a string, just cast
2017-05-18 11:41:51 -04:00
0c7bd725a6
fixes for javadoc
2017-05-17 11:34:37 -04:00
fcdb8671b2
grr, forgot to save changes on last commit
2017-05-17 11:32:44 -04:00
c46774cf13
* Update opt* methods for JSONArray
...
* Add support to JSONArray and JSONObject to optionally get raw number values
* Add support to JSONArray and JSONObject to optionally get float values
2017-05-17 11:29:26 -04:00
bd4b180f4e
Support for float to BigDecimal in optBigDecimal
2017-05-17 10:51:06 -04:00
a8d4e4734f
adjustments to opt methods in reference to https://github.com/stleary/JSON-java/issues/334
2017-05-16 19:38:01 -04:00
cbd8b18c4a
Update README
2017-05-16 00:29:00 -05:00
f12fa9ba5f
Update LICENSE
2017-04-18 08:32:10 -05:00
80e2ea2a80
Merge pull request #324 from dtalex/JSONPointerOnBeans
...
Allow user to invoke query and optQuery ,with a JSONPointer
2017-03-27 20:04:18 -05:00
2917104b53
Allow user to invoke query and optQuery ,with a JSONPointer,directly
...
from JSONArray or JSONObject fix JSONArray
2017-02-25 14:35:02 +01:00
9e0fc5e680
Allow user to invoke query and optQuery ,with a JSONPointer,directly
...
from JSONArray or JSONObject
2017-02-25 13:27:50 +01:00
724fb888f7
Merge pull request #317 from johnjaylward/fixLocale
...
make sure locale independent data is not upper/lowercased incorrectly…
2017-02-19 21:34:17 -06:00
eb806f4c14
make sure locale independent data is not upper/lowercased incorrectly. See #315
2017-02-10 10:07:28 -05:00
5ff8b4cb08
Merge pull request #304 from omarzina/master
...
[FIX] Update README
2016-12-05 08:58:35 -06:00
5ef4f58ef1
[FIX] Update README
...
Fixed C&P typo
2016-12-05 11:55:24 -03:00
413bb53b48
Merge pull request #288 from johnjaylward/XmlEscape
...
Bug fixes for XML Encoding and Decoding
2016-11-24 10:01:14 -06:00
237376eca6
Merge pull request #292 from erosb/master
...
Provides "#" string evaluation support for JSON Pointer
2016-10-08 10:07:31 -05:00
e0616a129e
fixing #291
2016-10-05 14:57:42 +02:00
93ffca36c3
fixes spacing
2016-09-28 20:23:30 -04:00
e477d7002b
fixes object comparison
2016-09-28 20:22:12 -04:00
fb1db9341e
Changes encoding to better match the XML spec section 2.2
2016-09-28 20:15:58 -04:00
adb0478f66
properly unescape tokens in JSONML for reversability.
2016-09-22 16:23:09 -04:00
f58a0f4684
fixes code point appends to string builder
2016-09-22 16:10:49 -04:00
c11e09959c
Fixes code point output when unescaping code points. XML escapes are an entire code point, not surrogate pairs like in JSON.
2016-09-22 15:40:26 -04:00
68f92eb395
Adds more javadoc.
2016-09-22 14:40:39 -04:00
34652a8706
Updates to iterate on code points instead of characters and changes the encoding to only encode control characters as defined by ISO standard.
2016-09-22 14:13:14 -04:00
a2d3b59394
Implements unicode escaping similar to JSONObject.
...
* Removes deprecation on XML.stringToValue(). It now provides unescaping for strings to convert XML entities back into values.
* New unescape function to handle XML entities -> value conversion.
2016-09-22 12:38:06 -04:00
c24be0e4ea
Merge pull request #274 from johnjaylward/NumberOutputFix
...
Fix for number output bug.
2016-09-09 11:42:35 -05:00
88f65c5bea
Merge branch 'master' of github.com:stleary/JSON-java into NumberOutputFix
...
# Conflicts:
# JSONObject.java
2016-08-26 11:32:35 -04:00
ebe69df8e4
Merge pull request #271 from johnjaylward/EnumCleanup
...
Update enum support to be more fully featured.
2016-08-19 10:28:04 -05:00
2f2cd4dfc5
Fix for number output bug.
...
java.lang.Number is currently output without any validation. For all java.* Numbers, this is fine, but for custom Number implementations like Complex or Fraction, the resulting JSON output may be invalid.
For example: If a Fraction implementation defines its' toString method as `return numerator + "/" + denominator`, then the resulting JSON output would be something like this:
```json
{ "fraction" : 1/2 }
```
This is not valid JSON.
This commit verifies that the string representation of the number is close to a JSON formatted number by use of the BigDecimal constructor. If the constructor throws a NumberFormatException, then the string value is instead quoted as a string. The example above would instead output like the following:
```json
{ "fraction" : "1/2" }
```
2016-08-17 12:54:30 -04:00
349a209df3
Merge remote-tracking branch 'upstream/master' into EnumCleanup
2016-08-15 10:25:27 -04:00
7851e9b2e8
revert back changes to Number support
2016-08-15 10:24:38 -04:00
7232a95c0b
Update JSONObject.java
...
Fixed some typos committed in #249 , since reverted, tracking issue is #263
2016-08-15 01:58:54 -05:00
f96f505188
Update JSONArray.java
...
Fixed a Javadoc typo, originally fixed in #249 , since reverted. This is to address issue #263
2016-08-15 01:53:08 -05:00
91107e3e82
Adds support to JSONObject wrap and write methods to explicitly handle Enums.
...
The new way enums are handled is to always place the actual enum in the
JSONObject/JSONArray. When writing, we always write the actual "name"
of the enum, so even with a toString override on the enum class, the
value remains consistant and compatible with the optEnum/getEnum methods.
The constructor JSONObject(Object) functions the same way as before when
passing an enum and is consistent with other "value" types. For example,
when creating a JSONObject with Long, Boolean, BigDecimal as the constructor
parameter, the value will be treated as a "bean".
2016-08-11 12:22:31 -04:00
4e8e24d49d
Merge pull request #259 from run2000/appendable_v2
...
JSONWriter uses Appendable (v2)
2016-08-10 21:55:10 -05:00
f881b61c81
Update XML.java
...
Removed a problematic JavaDoc in the header comment to a deprecated method
2016-08-10 15:35:26 -05:00
37582a44ad
Update README
2016-08-10 09:13:22 -05:00
154cfda9aa
Merge pull request #261 from stleary/revert-249-master
...
Revert "reduces the use of unnecessary exceptions"
2016-08-10 09:03:57 -05:00
45a7decba4
Revert "reduces the use of unnecessary exceptions"
2016-08-09 14:22:06 -05:00
0c157cae75
JSONWriter uses Appendable.
2016-08-08 19:40:10 +10:00
8e079599c4
Update README
2016-08-07 15:19:44 -05:00
3080b8beeb
Merge pull request #253 from johnjaylward/OptionalTypeConversion
...
Optional type conversion for XML reading
2016-07-31 21:09:07 -05:00
2c228ecf1a
Merge pull request #249 from Simulant87/master
...
reduces the use of unnecessary exceptions
2016-07-26 23:04:49 -05:00
John J. Aylward
Sean Leary
alessandro rao
joumar
Bence Erős
John J. Aylward
Nicholas Cull