(johnzon) branch master updated: Integrate TCK test execution in jsonb/core modules (#125)
This is an automated email from the ASF dual-hosted git repository. jungm pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/johnzon.git The following commit(s) were added to refs/heads/master by this push: new d5665b91 Integrate TCK test execution in jsonb/core modules (#125) d5665b91 is described below commit d5665b9180b580f0594a269ce14fcec07d7d4ffa Author: Markus Jung AuthorDate: Fri May 3 21:23:03 2024 +0200 Integrate TCK test execution in jsonb/core modules (#125) * run TCK tests by default * Move tck execution from separate modules to core/jsonb * Attempt to fix build * Run tests with junit-vintage-engine * remove ManualTckTest * explicitly declare junit-vintage usage in each module --- johnzon-core/pom.xml | 141 .../org/apache/johnzon/core/ManualTckTest.java | 60 - johnzon-jaxrs/pom.xml | 5 + johnzon-json-extras/pom.xml| 6 + johnzon-jsonb/pom.xml | 109 +++ .../johnzon/jsonb/tck/JohnzonOwbCDIProvider.java | 0 .../jakarta.enterprise.inject.spi.CDIProvider | 0 johnzon-jsonlogic/pom.xml | 5 + johnzon-jsonschema/pom.xml | 5 + johnzon-mapper/pom.xml | 5 + johnzon-maven-plugin/pom.xml | 6 + johnzon-websocket/pom.xml | 6 +- .../org/apache/johnzon/websocket/JsrCodecTest.java | 12 +- .../apache/johnzon/websocket/MapperCodecTest.java | 12 +- pom.xml| 30 +++-- tck/jsonb/pom.xml | 121 - tck/jsonp/pom.xml | 148 - tck/pom.xml| 82 18 files changed, 288 insertions(+), 465 deletions(-) diff --git a/johnzon-core/pom.xml b/johnzon-core/pom.xml index 9a78b373..b8c0f2d9 100644 --- a/johnzon-core/pom.xml +++ b/johnzon-core/pom.xml @@ -33,6 +33,42 @@ ${project.parent.reporting.outputDirectory} + + + + org.junit.vintage + junit-vintage-engine + test + + + + jakarta.json + jakarta.json-tck-tests + 2.1.1 + test + + + jakarta.json + jakarta.json-tck-tests-pluggability + 2.1.1 + test + + + + org.netbeans.tools + sigtest-maven-plugin + 1.7 + test + + + + org.netbeans.tools + ct-sym + + + + + @@ -46,31 +82,86 @@ + + +org.apache.maven.plugins +maven-dependency-plugin + + + +copy +generate-test-resources + + copy + + + + + + jakarta.json + jakarta.json-api + ${jakarta-jsonp-api.version} + jar + true + ${project.build.directory}/signaturedirectory + jakarta.json-api.jar + + + + + + + + +org.apache.maven.plugins +maven-surefire-plugin +${surefire.plugin.version} + + + +tck-test + + + test + + + + jakarta.json:jakarta.json-tck-tests + + + +**/org/apache/johnzon/** + + + +${project.build.directory}/jimage + ${project.build.directory}/signaturedirectory/jakarta.json-api.jar:${project.build.directory}/jimage/java.base:${project.build.directory}/jimage/java.rmi:${project.build.directory}/jimage/java.sql:${project.build.directory}/jimage/java.naming + + + + + +tck-test-pluggability + + + test + + + + jakarta.json:jakarta.json-tck-tests-pluggability + + + +**/org/apache/johnzon/** + + + + ${project.build.outputDirectory}/nowhere + + + + - - diff --git a/johnzon-core/src/test/java/org/apache/johnzon/core/ManualTckTest.java b/johnzon-core/src/test/java/org/apache/johnzon/core/ManualTckTest.java deleted file mode 100644 index afb152d5.. --- a/johnzon-core/src/test/java/org/apache/johnzon/core/ManualTckTest.java +++ /dev/null @@ -1,60 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work
(johnzon) branch master updated: reduce enum array allocation (#127)
This is an automated email from the ASF dual-hosted git repository. jungm pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/johnzon.git The following commit(s) were added to refs/heads/master by this push: new 5db4b28d reduce enum array allocation (#127) 5db4b28d is described below commit 5db4b28d512119b54cfea2fea04f1b21671912e7 Author: sullis AuthorDate: Wed Apr 24 10:51:39 2024 -0500 reduce enum array allocation (#127) --- .../src/main/java/org/apache/johnzon/core/JsonStreamParserImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/johnzon-core/src/main/java/org/apache/johnzon/core/JsonStreamParserImpl.java b/johnzon-core/src/main/java/org/apache/johnzon/core/JsonStreamParserImpl.java index b4eb5542..5743639d 100644 --- a/johnzon-core/src/main/java/org/apache/johnzon/core/JsonStreamParserImpl.java +++ b/johnzon-core/src/main/java/org/apache/johnzon/core/JsonStreamParserImpl.java @@ -384,8 +384,8 @@ public class JsonStreamParserImpl extends JohnzonJsonParserImpl implements JsonC @Override public Event currentEvent() { -return previousEvent >= 0 && previousEvent < Event.values().length -? Event.values()[previousEvent] +return previousEvent >= 0 && previousEvent < EVT_MAP.length +? EVT_MAP[previousEvent] : null; }
(johnzon) branch master updated: Bump org.apache.tomcat:tomcat-websocket in /johnzon-websocket (#126)
This is an automated email from the ASF dual-hosted git repository. jungm pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/johnzon.git The following commit(s) were added to refs/heads/master by this push: new cd3aafc1 Bump org.apache.tomcat:tomcat-websocket in /johnzon-websocket (#126) cd3aafc1 is described below commit cd3aafc1e720f6cf0bc8c0ceacbce96ecd106139 Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> AuthorDate: Fri Apr 12 07:55:37 2024 +0200 Bump org.apache.tomcat:tomcat-websocket in /johnzon-websocket (#126) Bumps org.apache.tomcat:tomcat-websocket from 10.1.4 to 10.1.19. --- updated-dependencies: - dependency-name: org.apache.tomcat:tomcat-websocket dependency-type: direct:development ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- johnzon-websocket/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/johnzon-websocket/pom.xml b/johnzon-websocket/pom.xml index de2862cb..c0d41394 100644 --- a/johnzon-websocket/pom.xml +++ b/johnzon-websocket/pom.xml @@ -29,7 +29,7 @@ Johnzon :: WebSocket -10.1.4 +10.1.19 9.0.0 ${project.parent.reporting.outputDirectory}
(johnzon) branch master updated: fix version in tck modules after release
This is an automated email from the ASF dual-hosted git repository. jungm pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/johnzon.git The following commit(s) were added to refs/heads/master by this push: new 9ea3c930 fix version in tck modules after release 9ea3c930 is described below commit 9ea3c9300745a0bb47a8f4933e8353a657bb Author: Markus Jung AuthorDate: Mon Apr 1 21:21:19 2024 +0200 fix version in tck modules after release --- tck/jsonb/pom.xml | 2 +- tck/jsonp/pom.xml | 2 +- tck/pom.xml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tck/jsonb/pom.xml b/tck/jsonb/pom.xml index 578adb54..33802f96 100644 --- a/tck/jsonb/pom.xml +++ b/tck/jsonb/pom.xml @@ -21,7 +21,7 @@ tck org.apache.johnzon -2.0.1-SNAPSHOT +2.0.2-SNAPSHOT 4.0.0 diff --git a/tck/jsonp/pom.xml b/tck/jsonp/pom.xml index 012b3ce1..879c9e12 100644 --- a/tck/jsonp/pom.xml +++ b/tck/jsonp/pom.xml @@ -21,7 +21,7 @@ tck org.apache.johnzon -2.0.1-SNAPSHOT +2.0.2-SNAPSHOT 4.0.0 diff --git a/tck/pom.xml b/tck/pom.xml index 0b253f1d..46442eda 100644 --- a/tck/pom.xml +++ b/tck/pom.xml @@ -21,7 +21,7 @@ johnzon org.apache.johnzon -2.0.1-SNAPSHOT +2.0.2-SNAPSHOT 4.0.0
svn commit: r1916722 - in /johnzon/site/publish: ./ apidocs/ apidocs/jquery/ apidocs/jquery/external/ apidocs/jquery/external/jquery/ apidocs/jquery/jszip-utils/ apidocs/jquery/jszip-utils/dist/ apido
Author: jungm Date: Mon Apr 1 19:00:58 2024 New Revision: 1916722 URL: http://svn.apache.org/viewvc?rev=1916722=rev Log: Site checkin for project Apache Johnzon [This commit notification would consist of 362 parts, which exceeds the limit of 50 ones, so it was shortened to the summary.]
svn commit: r1916721 - in /johnzon/site/publish: ./ apidocs/ apidocs/jquery/ apidocs/legal/ apidocs/org/apache/johnzon/core/ apidocs/org/apache/johnzon/core/class-use/ apidocs/org/apache/johnzon/core/
Author: jungm Date: Mon Apr 1 18:52:45 2024 New Revision: 1916721 URL: http://svn.apache.org/viewvc?rev=1916721=rev Log: Site checkin for project Apache Johnzon [This commit notification would consist of 321 parts, which exceeds the limit of 50 ones, so it was shortened to the summary.]
(johnzon) branch master updated: johnzon 2.0.1 released
This is an automated email from the ASF dual-hosted git repository. jungm pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/johnzon.git The following commit(s) were added to refs/heads/master by this push: new 21f3165c johnzon 2.0.1 released 21f3165c is described below commit 21f3165c499e23e254da888d04dc0930adc3a8d0 Author: Markus Jung AuthorDate: Mon Apr 1 20:50:30 2024 +0200 johnzon 2.0.1 released --- src/site/markdown/download.md | 12 ++-- 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/site/markdown/download.md b/src/site/markdown/download.md index a89f09c7..30b00d73 100644 --- a/src/site/markdown/download.md +++ b/src/site/markdown/download.md @@ -46,12 +46,12 @@ Binaries should be obtained from [maven central](https://repo.maven.apache.org/m Source Should you want to build any of the above binaries, this source bundle is the right one and covers them all. -* [apache-johnzon-2.0.0-src.zip](https://www.apache.org/dyn/closer.lua/johnzon/johnzon-2.0.0/apache-johnzon-2.0.0-src.zip) -* [apache-johnzon-2.0.0-src.zip.sha512](https://www.apache.org/dyn/closer.lua/johnzon/johnzon-2.0.0/apache-johnzon-2.0.0-src.zip.sha512) -* [apache-johnzon-2.0.0-src.zip.asc](https://www.apache.org/dyn/closer.lua/johnzon/johnzon-2.0.0/apache-johnzon-2.0.0-src.zip.asc) -* [apache-johnzon-2.0.0-src.tar.gz](https://www.apache.org/dyn/closer.lua/johnzon/johnzon-2.0.0/apache-johnzon-2.0.0-src.tar.gz) -* [apache-johnzon-2.0.0-src.tar.gz.sha512](https://www.apache.org/dyn/closer.lua/johnzon/johnzon-2.0.0/apache-johnzon-2.0.0-src.tar.gz.sha512) -* [apache-johnzon-2.0.0-src.tar.gz.asc](https://www.apache.org/dyn/closer.lua/johnzon/johnzon-2.0.0/apache-johnzon-2.0.0-src.tar.gz.asc) +* [apache-johnzon-2.0.1-src.zip](https://www.apache.org/dyn/closer.lua/johnzon/johnzon-2.0.1/apache-johnzon-2.0.1-src.zip) +* [apache-johnzon-2.0.1-src.zip.sha512](https://www.apache.org/dyn/closer.lua/johnzon/johnzon-2.0.1/apache-johnzon-2.0.1-src.zip.sha512) +* [apache-johnzon-2.0.1-src.zip.asc](https://www.apache.org/dyn/closer.lua/johnzon/johnzon-2.0.1/apache-johnzon-2.0.1-src.zip.asc) +* [apache-johnzon-2.0.1-src.tar.gz](https://www.apache.org/dyn/closer.lua/johnzon/johnzon-2.0.1/apache-johnzon-2.0.1-src.tar.gz) +* [apache-johnzon-2.0.1-src.tar.gz.sha512](https://www.apache.org/dyn/closer.lua/johnzon/johnzon-2.0.1/apache-johnzon-2.0.1-src.tar.gz.sha512) +* [apache-johnzon-2.0.1-src.tar.gz.asc](https://www.apache.org/dyn/closer.lua/johnzon/johnzon-2.0.1/apache-johnzon-2.0.1-src.tar.gz.asc) ## Johnzon-1.2.x
(johnzon) branch johnzon-2.0.1-release deleted (was 9b4e43b4)
This is an automated email from the ASF dual-hosted git repository. jungm pushed a change to branch johnzon-2.0.1-release in repository https://gitbox.apache.org/repos/asf/johnzon.git was 9b4e43b4 [maven-release-plugin] prepare for next development iteration The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
(johnzon) 01/01: Merge branch 'johnzon-2.0.1-release'
This is an automated email from the ASF dual-hosted git repository. jungm pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/johnzon.git commit d8f1ea69e5f983440f6aa0f21677a1fa07926661 Merge: 856e3b26 9b4e43b4 Author: Markus Jung AuthorDate: Sat Mar 30 19:17:54 2024 +0100 Merge branch 'johnzon-2.0.1-release' johnzon-core/pom.xml | 2 +- johnzon-distribution/pom.xml | 2 +- johnzon-jaxrs/pom.xml| 2 +- johnzon-json-extras/pom.xml | 2 +- johnzon-jsonb/pom.xml| 2 +- johnzon-jsonlogic/pom.xml| 2 +- johnzon-jsonschema/pom.xml | 2 +- johnzon-mapper/pom.xml | 2 +- johnzon-maven-plugin/pom.xml | 2 +- johnzon-osgi/pom.xml | 2 +- johnzon-websocket/pom.xml| 2 +- pom.xml | 4 ++-- 12 files changed, 13 insertions(+), 13 deletions(-)
(johnzon) branch master updated (856e3b26 -> d8f1ea69)
This is an automated email from the ASF dual-hosted git repository. jungm pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/johnzon.git from 856e3b26 Add jungm code signing key add 69d8185b [maven-release-plugin] prepare release v2.0.1 add 9b4e43b4 [maven-release-plugin] prepare for next development iteration new d8f1ea69 Merge branch 'johnzon-2.0.1-release' The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: johnzon-core/pom.xml | 2 +- johnzon-distribution/pom.xml | 2 +- johnzon-jaxrs/pom.xml| 2 +- johnzon-json-extras/pom.xml | 2 +- johnzon-jsonb/pom.xml| 2 +- johnzon-jsonlogic/pom.xml| 2 +- johnzon-jsonschema/pom.xml | 2 +- johnzon-mapper/pom.xml | 2 +- johnzon-maven-plugin/pom.xml | 2 +- johnzon-osgi/pom.xml | 2 +- johnzon-websocket/pom.xml| 2 +- pom.xml | 4 ++-- 12 files changed, 13 insertions(+), 13 deletions(-)
(johnzon) branch master updated: Add jungm code signing key
This is an automated email from the ASF dual-hosted git repository. jungm pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/johnzon.git The following commit(s) were added to refs/heads/master by this push: new 856e3b26 Add jungm code signing key 856e3b26 is described below commit 856e3b26446454a3002333963580c87517a60589 Author: Markus Jung AuthorDate: Sat Mar 23 21:01:43 2024 +0100 Add jungm code signing key --- KEYS | 57 + 1 file changed, 57 insertions(+) diff --git a/KEYS b/KEYS index 6d510e16..9862b58d 100644 --- a/KEYS +++ b/KEYS @@ -694,3 +694,60 @@ yn1jp3nhm6Kfq+BJ7IS+Wv1+62KFlCXdVT99iFFVai0BdQFSeU/jXP/3CKXzI0Bp 37GxCTv4l6k/XuMEuxehMENYeQO3EoNG86k= =sGcz -END PGP PUBLIC KEY BLOCK- + +ASF ID: jungm +LDAP PGP key: 85FBBE98D6C37CDA8A7D8FF9F9FF83A48D339D37 + +85FB BE98 D6C3 7CDA 8A7D 8FF9 F9FF 83A4 8D33 9D37 +-BEGIN PGP PUBLIC KEY BLOCK- + +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 ++h/HL4yfY1bkOI41wQ== +=16jo +-END PGP PUBLIC KEY BLOCK-
(johnzon) 01/01: [maven-release-plugin] prepare for next development iteration
This is an automated email from the ASF dual-hosted git repository. jungm pushed a commit to branch johnzon-2.0.1-release in repository https://gitbox.apache.org/repos/asf/johnzon.git commit 9b4e43b43cdfd7ffcd4274d958e02da7e9243572 Author: Markus Jung AuthorDate: Sat Mar 23 08:25:58 2024 +0100 [maven-release-plugin] prepare for next development iteration --- johnzon-core/pom.xml | 2 +- johnzon-distribution/pom.xml | 2 +- johnzon-jaxrs/pom.xml| 2 +- johnzon-json-extras/pom.xml | 2 +- johnzon-jsonb/pom.xml| 2 +- johnzon-jsonlogic/pom.xml| 2 +- johnzon-jsonschema/pom.xml | 2 +- johnzon-mapper/pom.xml | 2 +- johnzon-maven-plugin/pom.xml | 2 +- johnzon-osgi/pom.xml | 2 +- johnzon-websocket/pom.xml| 2 +- pom.xml | 6 +++--- 12 files changed, 14 insertions(+), 14 deletions(-) diff --git a/johnzon-core/pom.xml b/johnzon-core/pom.xml index 8a437557..9a78b373 100644 --- a/johnzon-core/pom.xml +++ b/johnzon-core/pom.xml @@ -21,7 +21,7 @@ johnzon org.apache.johnzon -2.0.1 +2.0.2-SNAPSHOT 4.0.0 diff --git a/johnzon-distribution/pom.xml b/johnzon-distribution/pom.xml index 4ed6c382..5d2074c5 100644 --- a/johnzon-distribution/pom.xml +++ b/johnzon-distribution/pom.xml @@ -21,7 +21,7 @@ johnzon org.apache.johnzon -2.0.1 +2.0.2-SNAPSHOT 4.0.0 diff --git a/johnzon-jaxrs/pom.xml b/johnzon-jaxrs/pom.xml index 70c8c705..19dcb23b 100644 --- a/johnzon-jaxrs/pom.xml +++ b/johnzon-jaxrs/pom.xml @@ -21,7 +21,7 @@ johnzon org.apache.johnzon -2.0.1 +2.0.2-SNAPSHOT 4.0.0 diff --git a/johnzon-json-extras/pom.xml b/johnzon-json-extras/pom.xml index f54ada60..5317536b 100644 --- a/johnzon-json-extras/pom.xml +++ b/johnzon-json-extras/pom.xml @@ -21,7 +21,7 @@ johnzon org.apache.johnzon -2.0.1 +2.0.2-SNAPSHOT 4.0.0 diff --git a/johnzon-jsonb/pom.xml b/johnzon-jsonb/pom.xml index 543164d9..1c89b42b 100644 --- a/johnzon-jsonb/pom.xml +++ b/johnzon-jsonb/pom.xml @@ -21,7 +21,7 @@ johnzon org.apache.johnzon -2.0.1 +2.0.2-SNAPSHOT 4.0.0 diff --git a/johnzon-jsonlogic/pom.xml b/johnzon-jsonlogic/pom.xml index 2328cefa..dd4f6607 100644 --- a/johnzon-jsonlogic/pom.xml +++ b/johnzon-jsonlogic/pom.xml @@ -21,7 +21,7 @@ johnzon org.apache.johnzon -2.0.1 +2.0.2-SNAPSHOT 4.0.0 diff --git a/johnzon-jsonschema/pom.xml b/johnzon-jsonschema/pom.xml index 3a0b718c..f8b5fb7a 100644 --- a/johnzon-jsonschema/pom.xml +++ b/johnzon-jsonschema/pom.xml @@ -21,7 +21,7 @@ johnzon org.apache.johnzon -2.0.1 +2.0.2-SNAPSHOT 4.0.0 diff --git a/johnzon-mapper/pom.xml b/johnzon-mapper/pom.xml index c90e3723..4bb20cea 100644 --- a/johnzon-mapper/pom.xml +++ b/johnzon-mapper/pom.xml @@ -21,7 +21,7 @@ johnzon org.apache.johnzon -2.0.1 +2.0.2-SNAPSHOT 4.0.0 diff --git a/johnzon-maven-plugin/pom.xml b/johnzon-maven-plugin/pom.xml index 9e8ecdd3..5e5039ce 100644 --- a/johnzon-maven-plugin/pom.xml +++ b/johnzon-maven-plugin/pom.xml @@ -23,7 +23,7 @@ johnzon org.apache.johnzon -2.0.1 +2.0.2-SNAPSHOT johnzon-maven-plugin diff --git a/johnzon-osgi/pom.xml b/johnzon-osgi/pom.xml index cba52b61..ff963f1a 100644 --- a/johnzon-osgi/pom.xml +++ b/johnzon-osgi/pom.xml @@ -21,7 +21,7 @@ johnzon org.apache.johnzon -2.0.1 +2.0.2-SNAPSHOT 4.0.0 diff --git a/johnzon-websocket/pom.xml b/johnzon-websocket/pom.xml index 2b8494a5..de2862cb 100644 --- a/johnzon-websocket/pom.xml +++ b/johnzon-websocket/pom.xml @@ -21,7 +21,7 @@ johnzon org.apache.johnzon -2.0.1 +2.0.2-SNAPSHOT 4.0.0 diff --git a/pom.xml b/pom.xml index 9333579e..e6f15465 100644 --- a/pom.xml +++ b/pom.xml @@ -29,7 +29,7 @@ org.apache.johnzon johnzon pom - 2.0.1 + 2.0.2-SNAPSHOT Apache Johnzon Apache Johnzon is an implementation of JSR-353 (JavaTM API for JSON Processing). 2014 @@ -38,7 +38,7 @@ UTF-8 UTF-8 -1711178726 +1711178757 11 ${maven.compiler.release} @@ -520,7 +520,7 @@ scm:git:https://git-wip-us.apache.org/repos/asf/johnzon.git scm:git:https://git-wip-us.apache.org/repos/asf/johnzon.git https://git-wip-us.apache.org/repos/asf?p=johnzon.git -v2.0.1 +HEAD
(johnzon) annotated tag v2.0.1 updated (69d8185b -> 61577274)
This is an automated email from the ASF dual-hosted git repository. jungm pushed a change to annotated tag v2.0.1 in repository https://gitbox.apache.org/repos/asf/johnzon.git *** WARNING: tag v2.0.1 was modified! *** from 69d8185b (commit) to 61577274 (tag) tagging 69d8185b99b1fcaf91ac77d9e309a3d6e0e1383c (commit) replaces v2.0.0 by Markus Jung on Sat Mar 23 08:25:57 2024 +0100 - Log - [maven-release-plugin] copy for tag v2.0.1 --- No new revisions were added by this update. Summary of changes:
(johnzon) branch johnzon-2.0.1-release created (now 9b4e43b4)
This is an automated email from the ASF dual-hosted git repository. jungm pushed a change to branch johnzon-2.0.1-release in repository https://gitbox.apache.org/repos/asf/johnzon.git at 9b4e43b4 [maven-release-plugin] prepare for next development iteration This branch includes the following new commits: new 9b4e43b4 [maven-release-plugin] prepare for next development iteration The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
svn commit: r68075 - /dev/johnzon/johnzon-2.0.1/
Author: jungm Date: Sat Mar 23 13:56:27 2024 New Revision: 68075 Log: Apache Johnzon 2.0.1 staging artifacts Added: dev/johnzon/johnzon-2.0.1/ dev/johnzon/johnzon-2.0.1/apache-johnzon-2.0.1-bin.tar.gz (with props) dev/johnzon/johnzon-2.0.1/apache-johnzon-2.0.1-bin.tar.gz.asc dev/johnzon/johnzon-2.0.1/apache-johnzon-2.0.1-bin.tar.gz.sha512 dev/johnzon/johnzon-2.0.1/apache-johnzon-2.0.1-bin.zip (with props) dev/johnzon/johnzon-2.0.1/apache-johnzon-2.0.1-bin.zip.asc dev/johnzon/johnzon-2.0.1/apache-johnzon-2.0.1-bin.zip.sha512 dev/johnzon/johnzon-2.0.1/apache-johnzon-2.0.1-src.tar.gz (with props) dev/johnzon/johnzon-2.0.1/apache-johnzon-2.0.1-src.tar.gz.asc dev/johnzon/johnzon-2.0.1/apache-johnzon-2.0.1-src.tar.gz.sha512 dev/johnzon/johnzon-2.0.1/apache-johnzon-2.0.1-src.zip (with props) dev/johnzon/johnzon-2.0.1/apache-johnzon-2.0.1-src.zip.asc dev/johnzon/johnzon-2.0.1/apache-johnzon-2.0.1-src.zip.sha512 Added: dev/johnzon/johnzon-2.0.1/apache-johnzon-2.0.1-bin.tar.gz == Binary file - no diff available. Propchange: dev/johnzon/johnzon-2.0.1/apache-johnzon-2.0.1-bin.tar.gz -- svn:mime-type = application/octet-stream Added: dev/johnzon/johnzon-2.0.1/apache-johnzon-2.0.1-bin.tar.gz.asc == --- dev/johnzon/johnzon-2.0.1/apache-johnzon-2.0.1-bin.tar.gz.asc (added) +++ dev/johnzon/johnzon-2.0.1/apache-johnzon-2.0.1-bin.tar.gz.asc Sat Mar 23 13:56:27 2024 @@ -0,0 +1,16 @@ +-BEGIN PGP SIGNATURE- + +iQIzBAABCgAdFiEEhfu+mNbDfNqKfY/5+f+DpI0znTcFAmX+hEMACgkQ+f+DpI0z +nTec5g//dFdvyuAMiU9uT+fPAp8x9jqSRoj067c2qPmOFx9gMhe8K2Zy7QpnSmQo +KRs1q52/juHsIhyQgn8ZNt5TzyCGvBlrwTRvgkx2EAHemoM/WSzw39Ay/qyOVaq4 +dxP0qrjCkzuDzZFvztVx7Y1zN2SfLXRP2xZ584DTl8X6TyZrTbl3rxuwMLkqtj43 +QS3HQ6kt8p5W/GQlWxgKqq/f7ArdVvu2FY2RHIZ+JWJAo/4nYKq3y4vuPZ35IfkE +9u3YX35od87ov20Zy88JzPav6Ms7UuRIi7TWoY8vh2x+cdfxCXnJhO56LQYjK5vK +BdKCCk9wdn3Z6HU0PDN3Fp1kP3CdhoYSCLW46nLvl7zkYyTJtMJfrQjL8hKKHiOb +39WnAd5J1CIq0fpjjCUczh6R6Ukcku315Rd6+pHS41GeAVOujyXkkAdueg6pS9zn +dYttm2WEGmz36GkPBK0pyJDwFW3WhsLuZ/3n/qc8VI/isfzINKx5+0tVOMybt6MY +dh9Kisl9+RgJTrTGi+QmCRigoA2445EVRc7q697Vg6YrQk472Y8K3C+F0spIzOkr +UR0ooU9fMC+oCEZC8pbVrBL177MpqaVnB048vlmHVeK6HEuWGZ+C12+rkHJtBy8P +taSjHLsKXTl4k7ceQnYqUgcqJD3jWjmgyIT7H4Xhb3x/GjL39i8= +=W5KD +-END PGP SIGNATURE- Added: dev/johnzon/johnzon-2.0.1/apache-johnzon-2.0.1-bin.tar.gz.sha512 == --- dev/johnzon/johnzon-2.0.1/apache-johnzon-2.0.1-bin.tar.gz.sha512 (added) +++ dev/johnzon/johnzon-2.0.1/apache-johnzon-2.0.1-bin.tar.gz.sha512 Sat Mar 23 13:56:27 2024 @@ -0,0 +1 @@ +1532e024dec6c32e0e06f463ba6889dffe2946637310e45790b28c391ab0c99ba0bf29e161becc6266ba3a076089ef291e908d8ab392101bb7531000d6c76a58 apache-johnzon-2.0.1-bin.tar.gz Added: dev/johnzon/johnzon-2.0.1/apache-johnzon-2.0.1-bin.zip == Binary file - no diff available. Propchange: dev/johnzon/johnzon-2.0.1/apache-johnzon-2.0.1-bin.zip -- svn:mime-type = application/octet-stream Added: dev/johnzon/johnzon-2.0.1/apache-johnzon-2.0.1-bin.zip.asc == --- dev/johnzon/johnzon-2.0.1/apache-johnzon-2.0.1-bin.zip.asc (added) +++ dev/johnzon/johnzon-2.0.1/apache-johnzon-2.0.1-bin.zip.asc Sat Mar 23 13:56:27 2024 @@ -0,0 +1,16 @@ +-BEGIN PGP SIGNATURE- + +iQIzBAABCgAdFiEEhfu+mNbDfNqKfY/5+f+DpI0znTcFAmX+hEMACgkQ+f+DpI0z +nTdYhg/+JPo+kmR+P9lqwJtxwJNir1ILDMtGxyJnI0jE1tA1dxHKmD0VPV9SdSci +6X72J/s+uCpb9oam4AIqtpTgKhmZsE9kHRdahR/2rwaPiyF9fyVGoxIkVOfCYzO2 +TVzJ524daD8sd9rHiRQrjgobGldqfmpGExociDClXQYlV1OJkpF/GJnPo14YzSQU +1Dm0U1MOD65eZ4icZdLFlBOBTD6hlZOFDQ/U3lKu91J95ZKpJ6gHzY1RfWmdBkas +0AOPUVgXjqI0gpfyZc4KjP5o7HxmIq29H4tqWNRIVaGc+lGcPd3mjl4mYa6vWR92 +63fbeWefnB0shbi3rjDVbwJY/sVj4jd2eXgKcLBCuA3uVY7FPMlEbMB10Nnqq0Nm +KkbwdHxqyajNNTM535HDVhIHHYcNSevYHUpPC437X43ToPTHhACqu30MFG16dy5Q +tGE4jyZ8j9nvf75K5sHYBMXW1MiEZ/3WA1v7QFp+sNf6d2c03Qu7s9CdQ2PTiDqv +Ek+PhPWTa4ZVH9vrAHYOSypHRSTj9U0SBnrCQs8ny058Xc3ObWCcZ3n5Ds7WZLQx +wsdDflahUI3ATJ8gaoJfgHVzVT9nTV51aw0sQ45I6W2UEkoUSgEMB0MZqzBLXqc4 +y1pu8CAT5D918B4l3D5WShENmeZbGSdKNU64H3TtJhvkvJva5XQ= +=YJjf +-END PGP SIGNATURE- Added: dev/johnzon/johnzon-2.0.1/apache-johnzon-2.0.1-bin.zip.sha512 == --- dev/johnzon/johnzon-2.0.1/apache-johnzon-2.0.1-bin.zip.sha512 (added) +++ dev/johnzon/johnzon-2.0.1/apache-johnzon-2.0.1-bin.zip.sha512 Sat Mar 23 13:56:27 2024 @@ -0,0 +1
(johnzon) branch master updated: Guard Mapper.write against null writer (#123)
This is an automated email from the ASF dual-hosted git repository. jungm pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/johnzon.git The following commit(s) were added to refs/heads/master by this push: new baa4f3d4 Guard Mapper.write against null writer (#123) baa4f3d4 is described below commit baa4f3d47f79b048b5d473124e2e479fe8b8ec6c Author: Heewon Lee <94441510+pingpin...@users.noreply.github.com> AuthorDate: Tue Mar 19 22:44:02 2024 +0900 Guard Mapper.write against null writer (#123) * Expose anonymous classes to DelegatingX classes Applies the suggestions by @jungm and @rmannibucau * Modify code style --- .../mapper/internal/DelegatingInputStream.java | 75 + .../mapper/internal/DelegatingOutputStream.java| 55 +++ .../johnzon/mapper/internal/DelegatingReader.java | 81 ++ .../johnzon/mapper/internal/DelegatingWriter.java | 79 ++ .../apache/johnzon/mapper/internal/Streams.java| 171 ++--- 5 files changed, 300 insertions(+), 161 deletions(-) diff --git a/johnzon-mapper/src/main/java/org/apache/johnzon/mapper/internal/DelegatingInputStream.java b/johnzon-mapper/src/main/java/org/apache/johnzon/mapper/internal/DelegatingInputStream.java new file mode 100644 index ..f083ba30 --- /dev/null +++ b/johnzon-mapper/src/main/java/org/apache/johnzon/mapper/internal/DelegatingInputStream.java @@ -0,0 +1,75 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + *http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.johnzon.mapper.internal; + +import java.io.IOException; +import java.io.InputStream; +import java.util.Objects; + +public class DelegatingInputStream extends InputStream { + +private final InputStream inputStream; + +public DelegatingInputStream(InputStream inputStream) { +this.inputStream = Objects.requireNonNull(inputStream, "delegate inputStream must not be null"); +} + +@Override +public void close() throws IOException { +inputStream.close(); +} + +@Override +public int read(final byte[] b) throws IOException { +return inputStream.read(b); +} + +@Override +public int read(final byte[] b, final int off, final int len) throws IOException { +return inputStream.read(b, off, len); +} + +@Override +public long skip(final long n) throws IOException { +return inputStream.skip(n); +} + +@Override +public int available() throws IOException { +return inputStream.available(); +} + +@Override +public void mark(final int readlimit) { +inputStream.mark(readlimit); +} + +@Override +public void reset() throws IOException { +inputStream.reset(); +} + +@Override +public boolean markSupported() { +return inputStream.markSupported(); +} + +@Override +public int read() throws IOException { +return inputStream.read(); +} +} \ No newline at end of file diff --git a/johnzon-mapper/src/main/java/org/apache/johnzon/mapper/internal/DelegatingOutputStream.java b/johnzon-mapper/src/main/java/org/apache/johnzon/mapper/internal/DelegatingOutputStream.java new file mode 100644 index ..cf5c1689 --- /dev/null +++ b/johnzon-mapper/src/main/java/org/apache/johnzon/mapper/internal/DelegatingOutputStream.java @@ -0,0 +1,55 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + *http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or im
(johnzon) branch master updated: Bump org.apache.maven:maven-core in /johnzon-maven-plugin (#124)
This is an automated email from the ASF dual-hosted git repository. jungm pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/johnzon.git The following commit(s) were added to refs/heads/master by this push: new 3f600cfc Bump org.apache.maven:maven-core in /johnzon-maven-plugin (#124) 3f600cfc is described below commit 3f600cfca70c75fd6447b83a14f39754d574b5f5 Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> AuthorDate: Sun Mar 17 18:45:07 2024 +0100 Bump org.apache.maven:maven-core in /johnzon-maven-plugin (#124) Bumps [org.apache.maven:maven-core](https://github.com/apache/maven) from 3.6.0 to 3.8.1. - [Release notes](https://github.com/apache/maven/releases) - [Commits](https://github.com/apache/maven/compare/maven-3.6.0...maven-3.8.1) --- updated-dependencies: - dependency-name: org.apache.maven:maven-core dependency-type: direct:production ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- johnzon-maven-plugin/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/johnzon-maven-plugin/pom.xml b/johnzon-maven-plugin/pom.xml index 2b28f36c..164012d8 100644 --- a/johnzon-maven-plugin/pom.xml +++ b/johnzon-maven-plugin/pom.xml @@ -31,7 +31,7 @@ maven-plugin -3.6.0 +3.8.1
(johnzon) branch master updated: Bump h2 from 2.1.214 to 2.2.220 in /johnzon-mapper (#108)
This is an automated email from the ASF dual-hosted git repository. jungm pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/johnzon.git The following commit(s) were added to refs/heads/master by this push: new eb2362ae Bump h2 from 2.1.214 to 2.2.220 in /johnzon-mapper (#108) eb2362ae is described below commit eb2362aed4606fd7d8740fc750cafe79a1252c6c Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> AuthorDate: Sun Mar 17 18:16:55 2024 +0100 Bump h2 from 2.1.214 to 2.2.220 in /johnzon-mapper (#108) Bumps [h2](https://github.com/h2database/h2database) from 2.1.214 to 2.2.220. - [Release notes](https://github.com/h2database/h2database/releases) - [Commits](https://github.com/h2database/h2database/compare/version-2.1.214...version-2.2.220) --- updated-dependencies: - dependency-name: com.h2database:h2 dependency-type: direct:development ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- johnzon-mapper/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/johnzon-mapper/pom.xml b/johnzon-mapper/pom.xml index e40b9b6e..209de6f5 100644 --- a/johnzon-mapper/pom.xml +++ b/johnzon-mapper/pom.xml @@ -63,7 +63,7 @@ com.h2database h2 - 2.1.214 + 2.2.220 test
(johnzon) branch master updated: upgrade Felix maven-bundle-plugin (#114)
This is an automated email from the ASF dual-hosted git repository. jungm pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/johnzon.git The following commit(s) were added to refs/heads/master by this push: new 86acf0f5 upgrade Felix maven-bundle-plugin (#114) 86acf0f5 is described below commit 86acf0f57e0ccc23b571fffa5220e4dde816a389 Author: Hervé Boutemy AuthorDate: Sun Mar 17 18:16:40 2024 +0100 upgrade Felix maven-bundle-plugin (#114) --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index bbb4da70..202ccdf5 100644 --- a/pom.xml +++ b/pom.xml @@ -49,7 +49,7 @@ https://svn.apache.org/repos/asf/johnzon/site/publish/ scm:svn:${johnzon.site.url} ${project.build.directory}/site -5.1.8 +5.1.9 [$(version;==;$(@)),$(version;+;$(@))) 6.1.0 4.0.0
(johnzon) branch johnzon-1.2.x updated: ensure all buffers get released again in JsonStreamParserImpl
This is an automated email from the ASF dual-hosted git repository. jungm pushed a commit to branch johnzon-1.2.x in repository https://gitbox.apache.org/repos/asf/johnzon.git The following commit(s) were added to refs/heads/johnzon-1.2.x by this push: new 664cb73f ensure all buffers get released again in JsonStreamParserImpl 664cb73f is described below commit 664cb73f629fd0190902a0f1080c420a509e66b0 Author: Markus Jung AuthorDate: Tue Feb 13 15:33:06 2024 +0100 ensure all buffers get released again in JsonStreamParserImpl --- .../apache/johnzon/core/JsonStreamParserImpl.java | 9 ++- .../org/apache/johnzon/core/HugeStringTest.java| 52 -- .../johnzon/core/JsonStreamParserImplTest.java | 84 ++ 3 files changed, 91 insertions(+), 54 deletions(-) diff --git a/johnzon-core/src/main/java/org/apache/johnzon/core/JsonStreamParserImpl.java b/johnzon-core/src/main/java/org/apache/johnzon/core/JsonStreamParserImpl.java index a3cfde66..a1ef78a6 100644 --- a/johnzon-core/src/main/java/org/apache/johnzon/core/JsonStreamParserImpl.java +++ b/johnzon-core/src/main/java/org/apache/johnzon/core/JsonStreamParserImpl.java @@ -74,7 +74,7 @@ public class JsonStreamParserImpl extends JohnzonJsonParserImpl implements JsonC //this buffer is used to store current String or Number value in case that //within the value a buffer boundary is crossed or the string contains escaped characters private char[] fallBackCopyBuffer; -private boolean releaseFallBackCopyBufferLength = true; +private boolean releaseFallBackCopyBuffer = true; private int fallBackCopyBufferLength; // when boundaries of fallBackCopyBuffer have been reached private List previousFallBackCopyBuffers; @@ -936,6 +936,11 @@ public class JsonStreamParserImpl extends JohnzonJsonParserImpl implements JsonC index += fallBackCopyBufferLength; releasePreviousFallBackCopyBuffers(); +if (releaseFallBackCopyBuffer) { +valueProvider.release(fallBackCopyBuffer); +releaseFallBackCopyBuffer = false; +} + fallBackCopyBuffer = newBuffer; fallBackCopyBufferLength = index; } @@ -1038,7 +1043,7 @@ public class JsonStreamParserImpl extends JohnzonJsonParserImpl implements JsonC } bufferProvider.release(buffer); -if (releaseFallBackCopyBufferLength) { +if (releaseFallBackCopyBuffer) { valueProvider.release(fallBackCopyBuffer); } releasePreviousFallBackCopyBuffers(); diff --git a/johnzon-core/src/test/java/org/apache/johnzon/core/HugeStringTest.java b/johnzon-core/src/test/java/org/apache/johnzon/core/HugeStringTest.java deleted file mode 100644 index 5e0bf8b0.. --- a/johnzon-core/src/test/java/org/apache/johnzon/core/HugeStringTest.java +++ /dev/null @@ -1,52 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.johnzon.core; - -import org.junit.Ignore; -import org.junit.Test; - -import javax.json.Json; -import javax.json.JsonReader; -import java.io.StringReader; - -@Ignore -public class HugeStringTest { -@Test -public void test() { -StringBuilder jsonBuilder = new StringBuilder("{\"data\":\""); -for (int i = 0; i < 50 * 1024 * 1024 + 1; i++) { -jsonBuilder.append("a"); -} -jsonBuilder.append("\"}"); -String json = jsonBuilder.toString(); - -// Warmup -for (int i = 0; i < 10; i++) { -try (JsonReader reader = Json.createReader(new StringReader(json))) { -reader.readObject(); -} -} - -long start = System.currentTimeMillis(); -try (JsonReader reader = Json.createReader(new StringReader(json))) { -reader.readObject(); -} -System.err.println("Took " + (System.currentTimeMillis() - start) + "ms"); -} -} diff --git a/johnzon-core/src/test/java/org/apache/johnzon/core/JsonStreamParserImplTest.java b/johnzon-core/src/test/java/org/apache/johnzon/core/JsonStreamParserImplTes
(johnzon) branch master updated: ensure all buffers get released again in JsonStreamParserImpl
This is an automated email from the ASF dual-hosted git repository. jungm pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/johnzon.git The following commit(s) were added to refs/heads/master by this push: new e41f969e ensure all buffers get released again in JsonStreamParserImpl e41f969e is described below commit e41f969ead5cf6e0105d975e1a7df20f37c109ce Author: Markus Jung AuthorDate: Tue Feb 13 13:18:13 2024 +0100 ensure all buffers get released again in JsonStreamParserImpl --- .../apache/johnzon/core/JsonStreamParserImpl.java | 9 ++- .../org/apache/johnzon/core/HugeStringTest.java| 47 -- .../johnzon/core/JsonStreamParserImplTest.java | 74 ++ 3 files changed, 81 insertions(+), 49 deletions(-) diff --git a/johnzon-core/src/main/java/org/apache/johnzon/core/JsonStreamParserImpl.java b/johnzon-core/src/main/java/org/apache/johnzon/core/JsonStreamParserImpl.java index dede892d..b4eb5542 100644 --- a/johnzon-core/src/main/java/org/apache/johnzon/core/JsonStreamParserImpl.java +++ b/johnzon-core/src/main/java/org/apache/johnzon/core/JsonStreamParserImpl.java @@ -74,7 +74,7 @@ public class JsonStreamParserImpl extends JohnzonJsonParserImpl implements JsonC //this buffer is used to store current String or Number value in case that //within the value a buffer boundary is crossed or the string contains escaped characters private char[] fallBackCopyBuffer; -private boolean releaseFallBackCopyBufferLength = true; +private boolean releaseFallBackCopyBuffer = true; private int fallBackCopyBufferLength; // when boundaries of fallBackCopyBuffer have been reached private List previousFallBackCopyBuffers; @@ -942,6 +942,11 @@ public class JsonStreamParserImpl extends JohnzonJsonParserImpl implements JsonC index += fallBackCopyBufferLength; releasePreviousFallBackCopyBuffers(); +if (releaseFallBackCopyBuffer) { +valueProvider.release(fallBackCopyBuffer); +releaseFallBackCopyBuffer = false; +} + fallBackCopyBuffer = newBuffer; fallBackCopyBufferLength = index; } @@ -1044,7 +1049,7 @@ public class JsonStreamParserImpl extends JohnzonJsonParserImpl implements JsonC } bufferProvider.release(buffer); -if (releaseFallBackCopyBufferLength) { +if (releaseFallBackCopyBuffer) { valueProvider.release(fallBackCopyBuffer); } releasePreviousFallBackCopyBuffers(); diff --git a/johnzon-core/src/test/java/org/apache/johnzon/core/HugeStringTest.java b/johnzon-core/src/test/java/org/apache/johnzon/core/HugeStringTest.java deleted file mode 100644 index 72ce072a.. --- a/johnzon-core/src/test/java/org/apache/johnzon/core/HugeStringTest.java +++ /dev/null @@ -1,47 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.johnzon.core; - -import jakarta.json.Json; -import jakarta.json.JsonReader; -import org.junit.Ignore; -import org.junit.Test; - -import java.io.StringReader; - -@Ignore -public class HugeStringTest { -@Test -public void test() { -String json = "{\"data\":\"" + "a".repeat(50 * 1024 * 1024 + 1) + "\"}"; - -// Warmup -for (int i = 0; i < 10; i++) { -try (JsonReader reader = Json.createReader(new StringReader(json))) { -reader.readObject(); -} -} - -long start = System.currentTimeMillis(); -try (JsonReader reader = Json.createReader(new StringReader(json))) { -reader.readObject(); -} -System.err.println("Took " + (System.currentTimeMillis() - start) + "ms"); -} -} diff --git a/johnzon-core/src/test/java/org/apache/johnzon/core/JsonStreamParserImplTest.java b/johnzon-core/src/test/java/org/apache/johnzon/core/JsonStreamParserImplTest.java index bf767ab4..965d6e96 100644 --- a/johnzon-core/src/test/java/org/apache/johnzon/core/JsonStreamParserImplTest.java +++ b/johnzon-core/src/test/java/org/apache/johnzon/core/JsonStreamParserImplTes
svn commit: r1915717 - in /johnzon/site/publish: ./ apidocs/ apidocs/jquery/ apidocs/jquery/external/ apidocs/jquery/external/jquery/ apidocs/jquery/jszip-utils/ apidocs/jquery/jszip-utils/dist/ apido
Author: jungm Date: Sat Feb 10 21:00:32 2024 New Revision: 1915717 URL: http://svn.apache.org/viewvc?rev=1915717=rev Log: Site checkin for project Apache Johnzon [This commit notification would consist of 496 parts, which exceeds the limit of 50 ones, so it was shortened to the summary.]
(johnzon) branch master updated: fix site generation on newer java/maven versions
This is an automated email from the ASF dual-hosted git repository. jungm pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/johnzon.git The following commit(s) were added to refs/heads/master by this push: new 5677e426 fix site generation on newer java/maven versions 5677e426 is described below commit 5677e42698f24984474e2b1739fdac19f02a311b Author: Markus Jung AuthorDate: Sat Feb 10 21:39:43 2024 +0100 fix site generation on newer java/maven versions --- pom.xml | 24 +++- 1 file changed, 23 insertions(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index d0709e65..bbb4da70 100644 --- a/pom.xml +++ b/pom.xml @@ -127,7 +127,7 @@ org.apache.maven.plugins maven-javadoc-plugin - 3.5.0 + 3.6.3 org.apache.maven.plugins @@ -541,6 +541,24 @@ org.apache.maven.plugins maven-pmd-plugin + + + + + + pmd + cpd + + + +false + + aggregate-pmd-no-fork + aggregate-cpd + + + org.apache.maven.plugins @@ -555,6 +573,10 @@ true private + + + true
(johnzon) branch johnzon-1.2.x updated: [JOHNZON-403] improved long string perfomance
This is an automated email from the ASF dual-hosted git repository. jungm pushed a commit to branch johnzon-1.2.x in repository https://gitbox.apache.org/repos/asf/johnzon.git The following commit(s) were added to refs/heads/johnzon-1.2.x by this push: new e00c928b [JOHNZON-403] improved long string perfomance e00c928b is described below commit e00c928b09a591aa96789b186800abb9b3da8d86 Author: Markus Jung AuthorDate: Sat Feb 10 14:56:53 2024 +0100 [JOHNZON-403] improved long string perfomance --- .../apache/johnzon/core/JsonStreamParserImpl.java | 86 -- .../org/apache/johnzon/core/HugeStringTest.java| 52 + 2 files changed, 117 insertions(+), 21 deletions(-) diff --git a/johnzon-core/src/main/java/org/apache/johnzon/core/JsonStreamParserImpl.java b/johnzon-core/src/main/java/org/apache/johnzon/core/JsonStreamParserImpl.java index 7619ad8d..a3cfde66 100644 --- a/johnzon-core/src/main/java/org/apache/johnzon/core/JsonStreamParserImpl.java +++ b/johnzon-core/src/main/java/org/apache/johnzon/core/JsonStreamParserImpl.java @@ -28,6 +28,8 @@ import java.io.InputStreamReader; import java.io.Reader; import java.math.BigDecimal; import java.nio.charset.Charset; +import java.util.LinkedList; +import java.util.List; import java.util.NoSuchElementException; //This class represents either the Json tokenizer and the Json parser. @@ -74,6 +76,8 @@ public class JsonStreamParserImpl extends JohnzonJsonParserImpl implements JsonC private char[] fallBackCopyBuffer; private boolean releaseFallBackCopyBufferLength = true; private int fallBackCopyBufferLength; +// when boundaries of fallBackCopyBuffer have been reached +private List previousFallBackCopyBuffers; // location (line, column, offset) // We try to calculate this efficiently so we do not just increment the values per char read @@ -115,6 +119,16 @@ public class JsonStreamParserImpl extends JohnzonJsonParserImpl implements JsonC } } +private static final class Buffer { +private char[] buffer; +private int length; + +public Buffer(char[] buffer, int length) { +this.buffer = buffer; +this.length = length; +} +} + //detect charset according to RFC 4627 public JsonStreamParserImpl(final InputStream inputStream, final int maxStringLength, final BufferStrategy.BufferProvider bufferProvider, final BufferStrategy.BufferProvider valueBuffer, @@ -165,7 +179,7 @@ public class JsonStreamParserImpl extends JohnzonJsonParserImpl implements JsonC //append a single char to the value buffer private void appendToCopyBuffer(final char c) { if (fallBackCopyBufferLength >= fallBackCopyBuffer.length - 1) { -doAutoAdjust(1); +createNewFallBackCopyBuffer(); } fallBackCopyBuffer[fallBackCopyBufferLength++] = c; } @@ -180,40 +194,39 @@ public class JsonStreamParserImpl extends JohnzonJsonParserImpl implements JsonC } if (fallBackCopyBufferLength >= fallBackCopyBuffer.length - length) { // not good at runtime but handled -doAutoAdjust(length); -} else { -System.arraycopy(buffer, startOfValueInBuffer, fallBackCopyBuffer, fallBackCopyBufferLength, length); +createNewFallBackCopyBuffer(); } + +System.arraycopy(buffer, startOfValueInBuffer, fallBackCopyBuffer, fallBackCopyBufferLength, length); fallBackCopyBufferLength += length; } startOfValueInBuffer = endOfValueInBuffer = -1; } -private void doAutoAdjust(final int length) { +// Creates new fallBackCopyBuffer and stores the old instance in previousFallBackCopyBuffers, +// this is much faster than resizing (recreating + copying) fallBackCopyBuffer +private void createNewFallBackCopyBuffer() { if (!autoAdjust) { throw new ArrayIndexOutOfBoundsException("Buffer too small for such a long string"); } -final char[] newArray = new char[fallBackCopyBuffer.length + Math.max(getBufferExtends(fallBackCopyBuffer.length), length)]; -// TODO: log to adjust size once? -System.arraycopy(fallBackCopyBuffer, 0, newArray, 0, fallBackCopyBufferLength); -if (startOfValueInBuffer != -1) { -System.arraycopy(buffer, startOfValueInBuffer, newArray, fallBackCopyBufferLength, length); +if (previousFallBackCopyBuffers == null) { +previousFallBackCopyBuffers = new LinkedList<>(); } -if (releaseFallBackCopyBufferLength) { -bufferProvider.release(fallBackCopyBuffer); -releaseFallBackCopyBufferLength = false; -} -fallBackCopyBuffer = newArray; + +previousFallBackCopyBuffers.add(new Buffer(fallBackCopyBuffer, fa
(johnzon) branch master updated: [JOHNZON-403] improved long string perfomance (#121)
This is an automated email from the ASF dual-hosted git repository. jungm pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/johnzon.git The following commit(s) were added to refs/heads/master by this push: new c7afc7b5 [JOHNZON-403] improved long string perfomance (#121) c7afc7b5 is described below commit c7afc7b56b079fdd7e29fcb9bb31623fcd18509a Author: Markus Jung AuthorDate: Fri Feb 9 19:42:03 2024 +0100 [JOHNZON-403] improved long string perfomance (#121) * prototype improved large string parsing * fix regression, fix build * properly close JsonReader in test --- .../apache/johnzon/core/JsonStreamParserImpl.java | 86 -- .../org/apache/johnzon/core/HugeStringTest.java| 47 2 files changed, 112 insertions(+), 21 deletions(-) diff --git a/johnzon-core/src/main/java/org/apache/johnzon/core/JsonStreamParserImpl.java b/johnzon-core/src/main/java/org/apache/johnzon/core/JsonStreamParserImpl.java index d9b5338f..dede892d 100644 --- a/johnzon-core/src/main/java/org/apache/johnzon/core/JsonStreamParserImpl.java +++ b/johnzon-core/src/main/java/org/apache/johnzon/core/JsonStreamParserImpl.java @@ -28,6 +28,8 @@ import java.io.InputStreamReader; import java.io.Reader; import java.math.BigDecimal; import java.nio.charset.Charset; +import java.util.LinkedList; +import java.util.List; import java.util.NoSuchElementException; //This class represents either the Json tokenizer and the Json parser. @@ -74,6 +76,8 @@ public class JsonStreamParserImpl extends JohnzonJsonParserImpl implements JsonC private char[] fallBackCopyBuffer; private boolean releaseFallBackCopyBufferLength = true; private int fallBackCopyBufferLength; +// when boundaries of fallBackCopyBuffer have been reached +private List previousFallBackCopyBuffers; // location (line, column, offset) // We try to calculate this efficiently so we do not just increment the values per char read @@ -115,6 +119,16 @@ public class JsonStreamParserImpl extends JohnzonJsonParserImpl implements JsonC } } +private static final class Buffer { +private char[] buffer; +private int length; + +public Buffer(char[] buffer, int length) { +this.buffer = buffer; +this.length = length; +} +} + //detect charset according to RFC 4627 public JsonStreamParserImpl(final InputStream inputStream, final int maxStringLength, final BufferStrategy.BufferProvider bufferProvider, final BufferStrategy.BufferProvider valueBuffer, @@ -165,7 +179,7 @@ public class JsonStreamParserImpl extends JohnzonJsonParserImpl implements JsonC //append a single char to the value buffer private void appendToCopyBuffer(final char c) { if (fallBackCopyBufferLength >= fallBackCopyBuffer.length - 1) { -doAutoAdjust(1); +createNewFallBackCopyBuffer(); } fallBackCopyBuffer[fallBackCopyBufferLength++] = c; } @@ -180,40 +194,39 @@ public class JsonStreamParserImpl extends JohnzonJsonParserImpl implements JsonC } if (fallBackCopyBufferLength >= fallBackCopyBuffer.length - length) { // not good at runtime but handled -doAutoAdjust(length); -} else { -System.arraycopy(buffer, startOfValueInBuffer, fallBackCopyBuffer, fallBackCopyBufferLength, length); +createNewFallBackCopyBuffer(); } + +System.arraycopy(buffer, startOfValueInBuffer, fallBackCopyBuffer, fallBackCopyBufferLength, length); fallBackCopyBufferLength += length; } startOfValueInBuffer = endOfValueInBuffer = -1; } -private void doAutoAdjust(final int length) { +// Creates new fallBackCopyBuffer and stores the old instance in previousFallBackCopyBuffers, +// this is much faster than resizing (recreating + copying) fallBackCopyBuffer +private void createNewFallBackCopyBuffer() { if (!autoAdjust) { throw new ArrayIndexOutOfBoundsException("Buffer too small for such a long string"); } -final char[] newArray = new char[fallBackCopyBuffer.length + Math.max(getBufferExtends(fallBackCopyBuffer.length), length)]; -// TODO: log to adjust size once? -System.arraycopy(fallBackCopyBuffer, 0, newArray, 0, fallBackCopyBufferLength); -if (startOfValueInBuffer != -1) { -System.arraycopy(buffer, startOfValueInBuffer, newArray, fallBackCopyBufferLength, length); +if (previousFallBackCopyBuffers == null) { +previousFallBackCopyBuffers = new LinkedList<>(); } -if (releaseFallBackCopyBufferLength) { -bufferProvider.release(fallBackCopyBuffer); -releaseFallBackCopyBufferLength = false; -} -
(johnzon) branch master updated: set compiler source/release version as well to fix PMD report
This is an automated email from the ASF dual-hosted git repository. jungm pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/johnzon.git The following commit(s) were added to refs/heads/master by this push: new 9cafc428 set compiler source/release version as well to fix PMD report 9cafc428 is described below commit 9cafc42873cc3ba3d11a0c08707e2ea006e3749f Author: Markus Jung AuthorDate: Thu Feb 8 09:39:31 2024 +0100 set compiler source/release version as well to fix PMD report --- pom.xml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pom.xml b/pom.xml index 74a2c59f..d0709e65 100644 --- a/pom.xml +++ b/pom.xml @@ -39,7 +39,10 @@ UTF-8 UTF-8 1698151225 + 11 +${maven.compiler.release} +${maven.compiler.release} 2.1.1 3.0.0
(johnzon) branch master updated: Bump actions/checkout and actions/setup-java to v4 See https://github.blog/changelog/2023-09-22-github-actions-transitioning-from-node-16-to-node-20/
This is an automated email from the ASF dual-hosted git repository. jungm pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/johnzon.git The following commit(s) were added to refs/heads/master by this push: new 2d322e1c Bump actions/checkout and actions/setup-java to v4 See https://github.blog/changelog/2023-09-22-github-actions-transitioning-from-node-16-to-node-20/ 2d322e1c is described below commit 2d322e1cce41884050de522943a880acf5540453 Author: Markus Jung AuthorDate: Tue Feb 6 14:31:33 2024 +0100 Bump actions/checkout and actions/setup-java to v4 See https://github.blog/changelog/2023-09-22-github-actions-transitioning-from-node-16-to-node-20/ --- .github/workflows/maven.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index 99cb8ca4..19cb2ddd 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -14,9 +14,9 @@ jobs: dist: [ 'zulu' ] steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Set up JDK ${{ matrix.jdk }} -uses: actions/setup-java@v3 +uses: actions/setup-java@v4 with: java-version: ${{ matrix.jdk }} distribution: ${{ matrix.dist }}
(johnzon) branch master updated (b4e8e76f -> 86dfce17)
This is an automated email from the ASF dual-hosted git repository. jungm pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/johnzon.git from b4e8e76f update committers add 3788e51b Build on JDK 21 new 86dfce17 Merge pull request #112 from jungm/jdk-21 The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .github/workflows/maven.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
(johnzon) 01/01: Merge pull request #112 from jungm/jdk-21
This is an automated email from the ASF dual-hosted git repository. jungm pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/johnzon.git commit 86dfce17e661064ea250883071a0fd1b0b318a3c Merge: b4e8e76f 3788e51b Author: Markus Jung AuthorDate: Tue Feb 6 09:05:19 2024 +0100 Merge pull request #112 from jungm/jdk-21 Build on JDK 21 .github/workflows/maven.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
(johnzon) branch master updated: update committers
This is an automated email from the ASF dual-hosted git repository. jungm pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/johnzon.git The following commit(s) were added to refs/heads/master by this push: new b4e8e76f update committers b4e8e76f is described below commit b4e8e76f1ee717157c4bc517957bebcfbf95a7ef Author: Markus Jung AuthorDate: Tue Feb 6 08:43:04 2024 +0100 update committers --- pom.xml | 6 ++ 1 file changed, 6 insertions(+) diff --git a/pom.xml b/pom.xml index ce8aced8..74a2c59f 100644 --- a/pom.xml +++ b/pom.xml @@ -760,6 +760,12 @@ PMC + + + jungm + Markus Jung + jungm AT apache.org +