Backups/JSON-java
1
0
Fork 0
mirror of https://github.com/stleary/JSON-java.git synced 2025-08-02 19:15:27 -04:00
Code Issues Projects Releases Wiki Activity
1,141 Commits 9 Branches 24 Tags
Commit Graph

1141 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
John J. Aylward
3894483560 Add build badges to README 2023-10-16 15:44:02 -04:00
John J. Aylward
be115059e9 Correct supported java versions 2023-10-16 15:44:02 -04:00
John J. Aylward
2b41cf44b5 include jar in job artifacts 2023-10-16 15:43:55 -04:00
John J. Aylward
9a9efac2af Correct moditect configuration to work on java8 2023-10-16 15:36:33 -04:00
John J. Aylward
134074aeaa Revert "Reverting #761" 
This reverts commit b180dbedbc99bb177e5b277f1bff2a1b79cebda6.
 2023-10-16 15:36:33 -04:00
John J. Aylward
8540bb80c0 Validate that the mvn package step completes 2023-10-16 15:36:33 -04:00
simonh5
4dfd779b1c fix: flakiness in org.json.junit.XMLTest#testIndentComplicatedJsonObjectWithArrayAndWithConfig 2023-10-14 17:21:06 -05:00
rudrajyoti biswas
7b2677ac5a #790 - Update XML with changes for string to number conversion. 
Moved the code logic to a common utility to de-duplicate.
 2023-10-14 10:05:36 +05:30
simonh5
29a7f4622d remove JSONAssert 2023-10-13 21:23:09 -05:00
Sean Leary
f346203cd6
Merge pull request #793 from stleary/revert-761 
Reverting #761
20231013 		2023-10-13 16:10:17 -05:00
Sean Leary
b180dbedbc Reverting #761 2023-10-13 16:04:14 -05:00
Sean Leary
cca6d1020f
Merge pull request #792 from stleary/pre-release-20231013 
update the docs for release 20231013
 2023-10-13 15:40:19 -05:00
Sean Leary
af5f780d5b update the docs for release 20231013 2023-10-13 15:30:31 -05:00
Sean Leary
495cec9037
Merge pull request #783 from rudrajyotib/master 
optLong vs getLong inconsistencies
 2023-10-12 22:06:11 -05:00
simonh5
e4aa7f1308 fix: change from JSONAssert to checking the similarity of JSONObjects 2023-10-12 21:09:27 -05:00
rudrajyoti biswas
56cb5f84c4 #653 - review comments updated. 2023-10-12 11:03:13 +05:30
rudrajyoti biswas
0cdc38ac24 #653 - review comments updated. 2023-10-12 00:53:36 +05:30
Rudrajyoti Biswas
d5277b126b
Merge branch 'stleary:master' into master 2023-10-11 19:17:21 +00:00
Simon Hofbauer
228598ca84
Merge pull request #6 from hofi1/bugfix/fix-flakyness-testToJSONObject_reversibility 
fix: flakiness in JSONMLTest#testToJSONObject_reversibility
 2023-10-10 18:20:20 -05:00
Simon Hofbauer
0a6fb1d578
Merge pull request #5 from hofi1/bugfix/fix-flakyness-org.json.junit.JSONObjectTest#valueToString 
fix: flakiness in org.json.junit.JSONObjectTest#valueToString
 2023-10-10 18:19:28 -05:00
Sean Leary
c4cd526c53
Merge pull request #779 from Madjosz/713_jsonobject_nonfinite 
add validity check for JSONObject constructors
 2023-10-08 17:08:32 -05:00
Sean Leary
776b5ccb85
Merge pull request #778 from Madjosz/fix_xml_test 
Fix XMLTest.testIndentComplicatedJsonObjectWithArrayAndWithConfig() for Windows - in the test
 2023-10-08 17:06:55 -05:00
Sean Leary
fb99c06bad
Merge branch 'master' into fix_xml_test 2023-10-08 17:03:35 -05:00
Sean Leary
bc09f90e90
Merge pull request #782 from mureinik/XMLTest-windows 
Fix XMLTest.testIndentComplicatedJsonObjectWithArrayAndWithConfig() for Windows - in the test
 2023-10-08 17:00:25 -05:00
Madjosz
c93014cb53 add validity check for JSONObject constructors 
* fixes #713
* document JSONException in JavaDoc
* remove unused Comparable<T> boundary to reuse GenericBean in test
 2023-10-07 09:38:54 +02:00
Madjosz
0e4a94d91d fix failing test XML test on Windows machines 2023-10-07 09:38:07 +02:00
rudrajyoti biswas
1a38879c90 #653 - optLong vs getLong inconsistencies 
For exponential decimal conversion, number is not touched.
Leading zeros removed from numeric number strings before converting to number.
 2023-10-06 21:34:00 +05:30
Allon Mureinik
4c8cac22a8 Use System.lineSeparator() 
Use the built-in System.lineSeparator() instead of implementing it
ourselves with System.getProperty("line.separator") in order to clean
up the code and make it easier to maintain.
 2023-10-05 19:47:33 +03:00
Allon Mureinik
fe45fa9cfb Fix XMLTest on Windows 
XMLTest.testIndentComplicatedJsonObjectWithArrayAndWithConfig fails
when run on Windows due to mismatching linebreaks (that aren't
important for the test's functionality) between the actual and
expected strings.

For the actual strings, linebreaks are canonized to the platform's
native linebreak using `replaceAll("\\n|\\r\\n",
System.getProperty("line.separator")`. However, the expected result is
read from a file, and is left with the linebreaks that were originally
used to create it.

The solution is to perform the same canonization on both strings.

Closes #781
 2023-10-05 15:36:07 +03:00
Sean Leary
79af389f7a
Merge pull request #774 from mccartney/removing-synchronized 
Removing excessive synchronization
 2023-10-04 07:40:10 -05:00
Sean Leary
1726b6cf55
Merge pull request #776 from mccartney/junit-4-13-2 
JUnit 4.13.2
 2023-10-04 07:39:26 -05:00
Sean Leary
beb2fb5706
Merge pull request #772 from eamonnmcmanus/complexkey 
Disallow nested objects and arrays as keys in objects.
 2023-10-01 11:04:40 -05:00
Grzegorz Olędzki
ff921db783 Junit 4.13.2 2023-09-30 21:53:36 +02:00
Grzegorz Olędzki
61bb60e752 Removing excessive synchronization 2023-09-30 21:36:11 +02:00
Sean Leary
ef68cdf810
Merge pull request #773 from eedijs/master 
Add optJSONArray method to JSONObject with a default value
 2023-09-30 11:47:01 -05:00
Éamonn McManus
eaa5611ba3
Merge branch 'stleary:master' into complexkey 2023-09-28 11:33:08 -07:00
Éamonn McManus
dbb113176b Add more test cases for unquoted text in objects and arrays. 2023-09-28 11:05:50 -07:00
Éamonn McManus
16967f322e Simplify the check for object keys that are themselves objects. 
For object keys, we can just skip the part of `nextValue()` that parses values
that are objects or arrays. Then the existing logic for unquoted values will
already stop at `{` or `[`, and that will produce a `Missing value` exception.
 2023-09-27 12:42:04 -07:00
Edijs
284a316838 Add optJSONArray and optJSONObject methods to JSONArray with a default value 2023-09-27 19:30:45 +03:00
Sean Leary
4e8231c512
Merge pull request #770 from eamonnmcmanus/testfixes 
Small test fixes.
 2023-09-25 20:37:44 -05:00
Edijs
db0fde2a56 Add optJSONArray method to JSONObject with a default value 2023-09-25 20:31:58 +03:00
Éamonn McManus
661114c50d Generalize the logic to disallow nested objects and arrays as keys in objects. 
Fixes #771.
 2023-09-20 10:50:48 -07:00
simonh5
ca88454f1c fix: flakiness in org.json.junit.JSONObjectTest#valueToString 2023-09-19 14:28:06 -05:00
Éamonn McManus
3e688afc66 Small test fixes. 
One test method was missing `@Test` so it was never run.

One test method used another test class as the base for finding a test
resource. While this works in practice with Maven, it is not strictly
right.
 2023-09-19 07:38:13 -07:00
simonh5
becc1631e6 fix: flakiness in JSONMLTest#testToJSONObject_reversibility 2023-09-18 20:20:13 -05:00
Sean Leary
01727fd0ed
Merge pull request #769 from jscrdev/fixed-warnings 
Addressed Java 17 compile warnings
 2023-09-16 08:30:44 -05:00
Valentyn Kolesnikov
74cd73f97c Addressed compile warnings 2023-09-08 07:34:00 +03:00
Sean Leary
c29d4881e0
Merge pull request #741 from jscrdev/setup-java-11 
Configure Java 8 as the minimum required version
 2023-09-03 17:17:04 -05:00
Sean Leary
7c1b6531e7
Update CONTRIBUTING.md 
Updated for Hacktoberfest 2023
 2023-09-03 11:35:15 -05:00
Valentyn Kolesnikov
db122e5d3a
Merge branch 'master' into setup-java-11 2023-09-03 18:40:40 +03:00