JSON-java

Backups/JSON-java

Fork 0

mirror of https://github.com/stleary/JSON-java.git synced 2026-04-24 00:03:14 -04:00

Commit Graph

Select branches

Hide Pull Requests

20240303-pre-release-updates

gh-pages

license-clarification

master

pre-release-20230618

pre-release-20231013

pre-release-20241224

pre-release-20250107

pre-release-20250517

pre-release-20251224

tech-debt-20250701

#1

#100

#100

#1000

#1001

#1002

#1004

#1005

#1006

#1008

#1009

#101

#101

#1011

#1013

#1014

#1017

#1018

#1019

#102

#102

#1020

#1021

#1022

#1022

#1027

#1028

#1029

#103

#103

#1030

#1037

#1038

#1039

#104

#1041

#1044

#1046

#1047

#105

#105

#1050

#1050

#106

#106

#107

#107

#108

#108

#109

#109

#110

#110

#111

#111

#112

#112

#113

#113

#114

#114

#115

#115

#116

#116

#117

#117

#118

#119

#119

#120

#121

#121

#122

#123

#123

#127

#127

#128

#128

#130

#130

#131

#131

#132

#133

#133

#135

#136

#136

#138

#138

#140

#142

#142

#143

#143

#146

#146

#15

#151

#151

#152

#152

#153

#154

#155

#155

#158

#158

#159

#16

#16

#160

#161

#161

#164

#164

#168

#169

#169

#17

#170

#173

#173

#175

#179

#18

#18

#180

#181

#181

#185

#186

#188

#19

#190

#190

#193

#193

#195

#20

#20

#200

#200

#201

#201

#202

#202

#203

#206

#206

#208

#208

#21

#21

#214

#214

#215

#215

#216

#216

#219

#222

#226

#229

#229

#23

#23

#234

#236

#239

#239

#241

#241

#242

#244

#244

#246

#247

#247

#249

#251

#251

#253

#256

#256

#259

#261

#262

#262

#271

#272

#272

#274

#277

#277

#283

#283

#288

#292

#297

#297

#299

#299

#30

#30

#301

#301

#304

#306

#306

#310

#310

#312

#312

#313

#313

#316

#316

#317

#321

#321

#322

#322

#324

#326

#326

#329

#329

#33

#33

#336

#337

#338

#338

#34

#34

#341

#345

#346

#346

#347

#348

#35

#35

#350

#351

#351

#352

#354

#355

#355

#357

#358

#358

#360

#362

#364

#364

#365

#365

#371

#371

#373

#375

#376

#376

#377

#377

#380

#381

#386

#386

#389

#389

#390

#390

#392

#4

#400

#403

#404

#404

#405

#406

#41

#41

#411

#412

#414

#414

#417

#421

#430

#432

#439

#439

#44

#44

#440

#447

#45

#45

#452

#453

#46

#46

#460

#461

#467

#47

#47

#470

#474

#475

#48

#48

#481

#482

#483

#485

#486

#488

#489

#492

#494

#495

#499

#502

#507

#515

#518

#519

#52

#52

#521

#524

#525

#526

#527

#529

#53

#53

#532

#538

#539

#540

#542

#543

#549

#552

#558

#562

#565

#568

#570

#575

#577

#581

#583

#585

#587

#588

#594

#596

#597

#6

#60

#60

#601

#604

#606

#607

#608

#610

#613

#617

#621

#622

#623

#626

#629

#630

#631

#633

#634

#637

#638

#639

#640

#645

#646

#651

#655

#658

#660

#661

#662

#663

#665

#668

#671

#675

#68

#68

#683

#684

#685

#687

#688

#690

#691

#692

#693

#694

#696

#699

#70

#70

#703

#704

#707

#71

#71

#711

#712

#715

#717

#72

#72

#720

#721

#723

#725

#726

#727

#729

#730

#731

#733

#734

#735

#736

#738

#740

#741

#744

#747

#749

#75

#75

#752

#753

#754

#755

#759

#76

#76

#761

#764

#768

#769

#77

#77

#770

#772

#773

#774

#775

#776

#777

#778

#779

#78

#78

#782

#783

#784

#785

#787

#787

#788

#79

#79

#791

#792

#793

#794

#795

#797

#798

#8

#8

#80

#80

#801

#802

#803

#804

#805

#806

#807

#808

#809

#81

#81

#810

#812

#814

#815

#816

#817

#818

#819

#82

#82

#820

#823

#824

#827

#828

#83

#83

#830

#831

#832

#833

#835

#839

#84

#84

#845

#846

#848

#85

#85

#851

#854

#855

#856

#857

#858

#86

#86

#860

#862

#864

#867

#869

#87

#87

#870

#872

#874

#875

#876

#877

#879

#88

#88

#880

#881

#882

#886

#888

#889

#89

#89

#894

#9

#9

#90

#90

#900

#903

#907

#91

#91

#911

#913

#914

#916

#917

#918

#919

#92

#92

#921

#924

#929

#93

#93

#930

#931

#934

#936

#937

#938

#94

#94

#942

#946

#948

#949

#95

#95

#950

#951

#955

#957

#96

#96

#960

#961

#962

#963

#964

#965

#966

#968

#969

#97

#97

#973

#974

#978

#979

#98

#98

#981

#983

#985

#987

#988

#989

#99

#99

#990

#991

#992

#993

#994

#995

#996

#997

#998

#999

20150729

20151123

20160212

20160807

20160810

20170516

20171018

20180130

20180813

20190722

20200518

20201115

20210307

20211205

20220320

20220924

20230227

20230618

20231013

20240205

20240303

20241224

20250107

20250517

20251224

f4201cf318 Test cases for issue described in https://github.com/stleary/JSON-java/issues/410. John J. Aylward 2018-03-19 09:34:13 -04:00
770cb9c4e5 Merge pull request #84 from johnjaylward/FixBeanKeyNameing Sean Leary 2018-03-14 21:19:11 -05:00
2a6b5bacc5 Merge pull request #406 from johnjaylward/FixBeanKeyNameing Sean Leary 2018-03-14 21:18:23 -05:00
a509a28ed4 Cleans up the name check a little to be more permissive on what can be tagged with the new JSONPropertyName annotation. Also updates the javadoc to reflect the new name allowances John J. Aylward 2018-03-11 16:59:34 -04:00
37f1f4c8ca Merge pull request #83 from johnjaylward/FixNPE Sean Leary 2018-03-11 15:59:21 -05:00
1c1ef5b211 Merge pull request #405 from johnjaylward/FixNPE Sean Leary 2018-03-11 15:57:23 -05:00
193a3823b5 new test cases to support bean annotation John J. Aylward 2018-03-07 14:52:50 -05:00
74b9a60f98 Adds annotation to support custom field names during Bean serialization John J. Aylward 2018-03-07 14:51:37 -05:00
b63b976acb Updates javadoc to match actual exceptions thrown. Also optimizes some boxing statements and returns. John J. Aylward 2018-03-07 12:14:32 -05:00
aa5e80bc8d add test cases for null keys John J. Aylward 2018-03-07 12:11:17 -05:00
97e180444d ignore Intellij Idea project files Pavel Polushkin 2018-02-25 13:08:58 +03:00
d402a99fd8 Merge pull request #400 from foldvari/master Sean Leary 2018-02-10 11:09:26 -06:00
7073bc8c47 XML toJSONObject(Readre reader) György Földvári 2018-02-04 18:43:35 +01:00
fc881e2631 Merge pull request #82 from billdeng/master Sean Leary 2018-02-02 23:56:36 -06:00
cc2ed79e57 Correct the message to match the function dengjianbao 2018-02-02 22:54:08 +08:00
61cdfefc36 Update README.md 20180130 Sean Leary 2018-01-30 19:46:24 -06:00
fbad2d0017 Merge pull request #392 from philippgille/patch-1 Sean Leary 2018-01-20 03:39:07 -06:00
15719886f7 Remove wrong apostrophe Philipp Gillé 2018-01-17 18:41:48 +01:00
ca45b02ffc Merge pull request #381 from fleipold/maven-badge Sean Leary 2018-01-14 10:18:46 -06:00
b6efbabc32 Making links markdown links Felix Leipold 2017-11-17 12:46:01 +01:00
9eb8c27724 Marking up class and method names as inline code Felix Leipold 2017-11-17 12:33:50 +01:00
195963357c Make file names bold Felix Leipold 2017-11-17 12:24:17 +01:00
28efdb4860 Moving Badge below title Felix Leipold 2017-11-17 12:24:03 +01:00
c88653ca2e History with fixed font Felix Leipold 2017-11-14 17:16:51 +01:00
b3068d9fe4 Marking file and class names with single quotes Felix Leipold 2017-11-14 17:05:27 +01:00
dba4afd0cf Adding maven repo badge Felix Leipold 2017-11-14 16:51:14 +01:00
26160e1619 Remove trailing whitespace Felix Leipold 2017-11-14 17:01:22 +01:00
b7e2eee4d6 Renaming README to README.md Felix Leipold 2017-11-14 16:52:03 +01:00
77d142d494 Merge pull request #81 from johnjaylward/FixFalsePositiveSimilar Sean Leary 2017-11-11 16:12:26 -06:00
28e09dc493 Merge pull request #380 from johnjaylward/FixFalsePositiveSimilar Sean Leary 2017-11-11 16:12:06 -06:00
dae88d7c5c fix method names John J. Aylward 2017-11-06 10:35:49 -05:00
4a4b2db8c1 fix for issue #379 John J. Aylward 2017-11-06 10:28:28 -05:00
08d93f3eb5 test cases for issue https://github.com/stleary/JSON-java/issues/379 John J. Aylward 2017-11-06 10:27:45 -05:00
f16682bf44 Merge pull request #375 from johnjaylward/FixExceptionWrapping Sean Leary 2017-11-02 21:42:29 -05:00
18952b5ac0 fixes wrapped exceptions John J. Aylward 2017-11-02 22:32:24 -04:00
bf26eba0d2 Merge pull request #80 from johnjaylward/UnclosedJSONArray Sean Leary 2017-11-02 20:03:00 -05:00
d2a66a4287 Merge pull request #373 from johnjaylward/UnclosedJSONArray Sean Leary 2017-11-02 20:02:26 -05:00
722003d479 Merge pull request #350 from johnjaylward/AndroidSupport Sean Leary 2017-10-30 11:33:10 -05:00
936db93445 Update README.md Sean Leary 2017-10-30 08:46:43 -05:00
e0801befe5 Update README.md Sean Leary 2017-10-30 08:45:41 -05:00
ee3aa03da1 Update README.md Sean Leary 2017-10-30 08:44:21 -05:00
578a442ef7 Update README.md Sean Leary 2017-10-30 08:43:56 -05:00
dfa37a298f Add more tests for unclosed arrays John J. Aylward 2017-10-30 08:09:42 -04:00
bde6ba1c52 Updates exception expected message John J. Aylward 2017-10-30 07:41:11 -04:00
52ecc89702 New test to verify unclosed array John J. Aylward 2017-10-30 07:27:42 -04:00
ed8745cd63 fixes #372. Corrects behavior of unclosed arrays John J. Aylward 2017-10-30 08:10:06 -04:00
057e0c75ca Merge remote-tracking branch 'origin/master' into AndroidSupport John J. Aylward 2017-10-27 13:28:20 -04:00
cdf3cf7f81 Update README 20171018 Sean Leary 2017-10-17 20:05:29 -05:00
af3b7dc443 Merge pull request #79 from johnjaylward/FixXMLUnescape Sean Leary 2017-08-27 10:59:36 -05:00
2565abdaaa Merge pull request #362 from johnjaylward/FixXMLUnescape Sean Leary 2017-08-27 10:59:26 -05:00
2713f2e2a4 Adds testing for unicode entities John J. Aylward 2017-08-19 18:45:53 -04:00
de855c50aa Fixes #361. * Removes unescape from the XML class calls * fixes bug with unescape method * moves unescape logic into the XMLTokener class for more consistency John J. Aylward 2017-08-19 18:21:56 -04:00
cb61bbf720 New tests for XML unescaping John J. Aylward 2017-08-19 18:19:22 -04:00
4cb1ae802a Merge pull request #360 from migueltt/tokener-fix Sean Leary 2017-08-17 21:30:01 -05:00
d0e2cf41a3 Merge pull request #78 from migueltt/tokener-error-message Sean Leary 2017-08-17 21:29:13 -05:00
b90bee0f22 Update error message location (+1) Miguel 2017-08-14 13:05:23 -04:00
2e0a8137bd Removed JSONTokener.back() Miguel 2017-08-14 13:01:31 -04:00
f177c97258 Replacing tabs with 4-spaces Miguel 2017-08-10 19:12:41 -04:00
68b262914d JSONObject(JSONTokener) now points to last character of duplicate key Miguel 2017-08-10 19:06:55 -04:00
7d8353401a Adding JSONTokener.back() just before throwing JSONException Miguel 2017-08-10 19:05:57 -04:00
c365e2a774 Remov slf4j reference Miguel 2017-08-09 22:03:09 -04:00
df466db7b9 Replacing tabs with 4 spaces Miguel 2017-08-09 21:59:08 -04:00
1acb18091a Remove System.out.println Miguel 2017-08-09 21:57:10 -04:00
7fed023080 Update to include error location when creating JSONObject from string/text Miguel 2017-08-09 21:52:36 -04:00
fefd616d73 Unit tests for JSONTokener Miguel 2017-08-09 21:51:46 -04:00
44c3e321b5 Merge pull request #77 from johnjaylward/FixJUnitGradleConfig Sean Leary 2017-07-20 06:51:14 -05:00
f2f6ad3b1f * Fixes Gradle config so tests are only run once * Adds missing test to the test suite John J. Aylward 2017-07-19 20:34:59 -04:00
cf411b3187 Merge pull request #75 from johnjaylward/PopulateMapMoreStrict Sean Leary 2017-07-19 18:57:55 -05:00
d9b8507e6a Merge pull request #354 from johnjaylward/PopulateMapMoreStrict Sean Leary 2017-07-19 18:57:32 -05:00
d345bc528e Merge pull request #357 from johnjaylward/WriteJavadocUpdate Sean Leary 2017-07-15 18:51:18 -05:00
1aeadd1765 Merge pull request #76 from johnjaylward/WriteJavadocUpdate Sean Leary 2017-07-15 18:46:58 -05:00
aa562b5ec3 Update test for issue https://github.com/stleary/JSON-java/issues/356 John J. Aylward 2017-07-15 12:19:02 -04:00
6f238a3698 Update javadoc according to issue #356. John J. Aylward 2017-07-15 12:17:27 -04:00
38d11227ee Adds exception tests John J. Aylward 2017-07-09 19:05:00 -04:00
4dbc5ef803 fixes malformed javadoc John J. Aylward 2017-07-09 18:48:40 -04:00
5c80c9157d fixes malformed javadoc John J. Aylward 2017-07-09 18:47:09 -04:00
e94783f91b Updates javadocs John J. Aylward 2017-07-09 18:19:27 -04:00
7bc8f41023 Add override of the generic getter to generate a Bridge method. John J. Aylward 2017-07-09 18:07:11 -04:00
a129ebe8e4 Adds check for resources opened by our bean mapping John J. Aylward 2017-07-09 17:36:36 -04:00
49117f33dc Adds new tests for testing bean->JSONObject mapping John J. Aylward 2017-07-09 17:35:46 -04:00
0e3f23d7a1 reorganize classes so test data is separate from test cases John J. Aylward 2017-07-09 16:33:39 -04:00
641b68dd55 updates javadoc. John J. Aylward 2017-07-07 21:15:11 -04:00
643b25140f Updates for populateMap based on discussion in #279 and #264 John J. Aylward 2017-07-07 20:48:42 -04:00
3997a90d58 update constructor call to match Android implementation John J. Aylward 2017-07-07 12:24:27 -04:00
1736a60ffe adds comment for the API change John J. Aylward 2017-06-21 12:22:23 -04:00
e8b1b66888 Updates for supporting the Android API John J. Aylward 2017-06-21 11:52:15 -04:00
974a5f7d5d Merge pull request #74 from johnjaylward/AndroidSupport Sean Leary 2017-07-06 18:08:20 -05:00
5024f2d210 Merge pull request #352 from johnjaylward/ErrorMessagePositionFixes Sean Leary 2017-07-06 18:07:50 -05:00
16baa323cf adds comments John J. Aylward 2017-06-26 10:32:02 -04:00
52845366bd Fixes more position errors from stepping to new lines and then back. John J. Aylward 2017-06-23 23:27:28 -04:00
899cf528df More test cases for position information John J. Aylward 2017-06-24 13:10:14 -04:00
47ff774f5c Updates test coverage table John J. Aylward 2017-06-23 23:55:22 -04:00
af39376d92 more fixes for testing postition information John J. Aylward 2017-06-23 23:25:11 -04:00
e7e6ed9205 Fixes position reports on errors John J. Aylward 2017-06-23 13:40:41 -04:00
0e612ba8a4 More test corrections for correct position reports in error messages John J. Aylward 2017-06-21 19:56:00 -04:00
971614ac8b fix expected exception message John J. Aylward 2017-06-21 18:28:04 -04:00
3081b4bd96 Fixes for failing tests due to android integration John J. Aylward 2017-06-21 14:59:42 -04:00
1add1247fa Merge pull request #348 from johnjaylward/ArrayPerformance Sean Leary 2017-06-12 02:05:26 -05:00
5b2e5e7579 Merge pull request #347 from ttulka/master Sean Leary 2017-06-11 23:32:06 -05:00
441fec7498 Merge pull request #73 from johnjaylward/BetterErrorHandling Sean Leary 2017-06-11 14:12:56 -05:00

... 7 8 9 10 11 ...