svn commit: r56335 - in /dev/johnzon: apache-johnzon-1.2.19-src.zip apache-johnzon-1.2.19-src.zip.asc apache-johnzon-1.2.19-src.zip.sha512
Author: rmannibucau Date: Wed Aug 17 08:46:09 2022 New Revision: 56335 Log: johnzon 1.2.19 staging artifacts Added: dev/johnzon/apache-johnzon-1.2.19-src.zip (with props) dev/johnzon/apache-johnzon-1.2.19-src.zip.asc dev/johnzon/apache-johnzon-1.2.19-src.zip.sha512 Added: dev/johnzon/apache-johnzon-1.2.19-src.zip == Binary file - no diff available. Propchange: dev/johnzon/apache-johnzon-1.2.19-src.zip -- svn:mime-type = application/octet-stream Added: dev/johnzon/apache-johnzon-1.2.19-src.zip.asc == --- dev/johnzon/apache-johnzon-1.2.19-src.zip.asc (added) +++ dev/johnzon/apache-johnzon-1.2.19-src.zip.asc Wed Aug 17 08:46:09 2022 @@ -0,0 +1,11 @@ +-BEGIN PGP SIGNATURE- + +iQEzBAABCgAdFiEEz4CgVaKtKOnvv5QqcxKfWN5h7L0FAmL8qDwACgkQcxKfWN5h +7L346gf8CvwsZ3Sz9bWdFt5AbVEta92vYme+dbAAPyWLPH1ZM5UUE/FKFb9BwzmH +ddQcl2Nbaka+3kBm2Frr/mfdBJ/ULVJBdVq6XuQ7e6t3LH2vpPAP6IIIkomAeFzZ +iP2RtUvkNh49cBCFscaEnDoMluxPkw0ipaPiHZFpRWdoPxuVu9Ot9pm0M2uw01Sx +tE1JVCE3wfm6cfwIjy0b81Mm5qOVBvlF99Dk+K24jsRuc6QHVhPiiVT881HwCuyW +3WmHyKKBCWYEqSfxxJrYKVgVHQaAzaQ2hUuQ2lK3MEDB4l+JvG3H10drbZnk3A+W +olQwQqEFS+deem3s9MobQ3LNc8O1Sw== +=ld4S +-END PGP SIGNATURE- Added: dev/johnzon/apache-johnzon-1.2.19-src.zip.sha512 == --- dev/johnzon/apache-johnzon-1.2.19-src.zip.sha512 (added) +++ dev/johnzon/apache-johnzon-1.2.19-src.zip.sha512 Wed Aug 17 08:46:09 2022 @@ -0,0 +1 @@ +e6067e07e3a15cfe133b478f32ce1566152cb1051fff174640cebaad53f535c80f54f23e7feef57bcccb61f4936235346fd2b36d5eaf5e2064f088093332f568 apache-johnzon-1.2.19-src.zip
[johnzon] 01/02: [maven-release-plugin] prepare release v1.2.19
This is an automated email from the ASF dual-hosted git repository. rmannibucau pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/johnzon.git commit a438327965a4a22d1238b28cbbd9f86d6a9cc707 Author: Romain Manni-Bucau AuthorDate: Wed Aug 17 10:26:30 2022 +0200 [maven-release-plugin] prepare release v1.2.19 --- 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-jsonp-strict/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 ++-- 13 files changed, 14 insertions(+), 14 deletions(-) diff --git a/johnzon-core/pom.xml b/johnzon-core/pom.xml index 483340b0..86b8634e 100644 --- a/johnzon-core/pom.xml +++ b/johnzon-core/pom.xml @@ -21,7 +21,7 @@ johnzon org.apache.johnzon -1.2.19-SNAPSHOT +1.2.19 4.0.0 diff --git a/johnzon-distribution/pom.xml b/johnzon-distribution/pom.xml index 2923ee0d..c8b3d0fe 100644 --- a/johnzon-distribution/pom.xml +++ b/johnzon-distribution/pom.xml @@ -21,7 +21,7 @@ johnzon org.apache.johnzon -1.2.19-SNAPSHOT +1.2.19 4.0.0 diff --git a/johnzon-jaxrs/pom.xml b/johnzon-jaxrs/pom.xml index 111ae929..84f811ae 100644 --- a/johnzon-jaxrs/pom.xml +++ b/johnzon-jaxrs/pom.xml @@ -21,7 +21,7 @@ johnzon org.apache.johnzon -1.2.19-SNAPSHOT +1.2.19 4.0.0 diff --git a/johnzon-json-extras/pom.xml b/johnzon-json-extras/pom.xml index 01ad93fc..62a6e1d8 100644 --- a/johnzon-json-extras/pom.xml +++ b/johnzon-json-extras/pom.xml @@ -21,7 +21,7 @@ johnzon org.apache.johnzon -1.2.19-SNAPSHOT +1.2.19 4.0.0 diff --git a/johnzon-jsonb/pom.xml b/johnzon-jsonb/pom.xml index 86afd25f..0eb19eb9 100644 --- a/johnzon-jsonb/pom.xml +++ b/johnzon-jsonb/pom.xml @@ -21,7 +21,7 @@ johnzon org.apache.johnzon -1.2.19-SNAPSHOT +1.2.19 4.0.0 diff --git a/johnzon-jsonlogic/pom.xml b/johnzon-jsonlogic/pom.xml index a9d7643f..e8e74184 100644 --- a/johnzon-jsonlogic/pom.xml +++ b/johnzon-jsonlogic/pom.xml @@ -21,7 +21,7 @@ johnzon org.apache.johnzon -1.2.19-SNAPSHOT +1.2.19 4.0.0 diff --git a/johnzon-jsonp-strict/pom.xml b/johnzon-jsonp-strict/pom.xml index 9b4192bd..c5c4e416 100644 --- a/johnzon-jsonp-strict/pom.xml +++ b/johnzon-jsonp-strict/pom.xml @@ -21,7 +21,7 @@ johnzon org.apache.johnzon -1.2.19-SNAPSHOT +1.2.19 4.0.0 diff --git a/johnzon-jsonschema/pom.xml b/johnzon-jsonschema/pom.xml index 38464977..ac91796c 100644 --- a/johnzon-jsonschema/pom.xml +++ b/johnzon-jsonschema/pom.xml @@ -21,7 +21,7 @@ johnzon org.apache.johnzon -1.2.19-SNAPSHOT +1.2.19 4.0.0 diff --git a/johnzon-mapper/pom.xml b/johnzon-mapper/pom.xml index 03403814..3f71731b 100644 --- a/johnzon-mapper/pom.xml +++ b/johnzon-mapper/pom.xml @@ -21,7 +21,7 @@ johnzon org.apache.johnzon -1.2.19-SNAPSHOT +1.2.19 4.0.0 diff --git a/johnzon-maven-plugin/pom.xml b/johnzon-maven-plugin/pom.xml index c3bad907..0fc4df96 100644 --- a/johnzon-maven-plugin/pom.xml +++ b/johnzon-maven-plugin/pom.xml @@ -23,7 +23,7 @@ johnzon org.apache.johnzon -1.2.19-SNAPSHOT +1.2.19 johnzon-maven-plugin diff --git a/johnzon-osgi/pom.xml b/johnzon-osgi/pom.xml index d87fe655..3d77d5ab 100644 --- a/johnzon-osgi/pom.xml +++ b/johnzon-osgi/pom.xml @@ -21,7 +21,7 @@ johnzon org.apache.johnzon -1.2.19-SNAPSHOT +1.2.19 4.0.0 diff --git a/johnzon-websocket/pom.xml b/johnzon-websocket/pom.xml index f3fd9c4f..2e717af2 100644 --- a/johnzon-websocket/pom.xml +++ b/johnzon-websocket/pom.xml @@ -21,7 +21,7 @@ johnzon org.apache.johnzon -1.2.19-SNAPSHOT +1.2.19 4.0.0 diff --git a/pom.xml b/pom.xml index c5ef5793..0a188e19 100644 --- a/pom.xml +++ b/pom.xml @@ -29,7 +29,7 @@ org.apache.johnzon johnzon pom - 1.2.19-SNAPSHOT + 1.2.19 Apache Johnzon Apache Johnzon is an implementation of JSR-353 (JavaTM API for JSON Processing). 2014 @@ -510,7 +510,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 -HEAD +v1.2.19
[johnzon] 02/02: [maven-release-plugin] prepare for next development iteration
This is an automated email from the ASF dual-hosted git repository. rmannibucau pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/johnzon.git commit b550cb2ac2097c2a934f94ac0328a9ba8e6f1499 Author: Romain Manni-Bucau AuthorDate: Wed Aug 17 10:29:04 2022 +0200 [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-jsonp-strict/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 ++-- 13 files changed, 14 insertions(+), 14 deletions(-) diff --git a/johnzon-core/pom.xml b/johnzon-core/pom.xml index 86b8634e..03d084e5 100644 --- a/johnzon-core/pom.xml +++ b/johnzon-core/pom.xml @@ -21,7 +21,7 @@ johnzon org.apache.johnzon -1.2.19 +1.2.20-SNAPSHOT 4.0.0 diff --git a/johnzon-distribution/pom.xml b/johnzon-distribution/pom.xml index c8b3d0fe..9630f5bb 100644 --- a/johnzon-distribution/pom.xml +++ b/johnzon-distribution/pom.xml @@ -21,7 +21,7 @@ johnzon org.apache.johnzon -1.2.19 +1.2.20-SNAPSHOT 4.0.0 diff --git a/johnzon-jaxrs/pom.xml b/johnzon-jaxrs/pom.xml index 84f811ae..5ffaa968 100644 --- a/johnzon-jaxrs/pom.xml +++ b/johnzon-jaxrs/pom.xml @@ -21,7 +21,7 @@ johnzon org.apache.johnzon -1.2.19 +1.2.20-SNAPSHOT 4.0.0 diff --git a/johnzon-json-extras/pom.xml b/johnzon-json-extras/pom.xml index 62a6e1d8..522fa81f 100644 --- a/johnzon-json-extras/pom.xml +++ b/johnzon-json-extras/pom.xml @@ -21,7 +21,7 @@ johnzon org.apache.johnzon -1.2.19 +1.2.20-SNAPSHOT 4.0.0 diff --git a/johnzon-jsonb/pom.xml b/johnzon-jsonb/pom.xml index 0eb19eb9..51c53d53 100644 --- a/johnzon-jsonb/pom.xml +++ b/johnzon-jsonb/pom.xml @@ -21,7 +21,7 @@ johnzon org.apache.johnzon -1.2.19 +1.2.20-SNAPSHOT 4.0.0 diff --git a/johnzon-jsonlogic/pom.xml b/johnzon-jsonlogic/pom.xml index e8e74184..cecae60d 100644 --- a/johnzon-jsonlogic/pom.xml +++ b/johnzon-jsonlogic/pom.xml @@ -21,7 +21,7 @@ johnzon org.apache.johnzon -1.2.19 +1.2.20-SNAPSHOT 4.0.0 diff --git a/johnzon-jsonp-strict/pom.xml b/johnzon-jsonp-strict/pom.xml index c5c4e416..9720adfd 100644 --- a/johnzon-jsonp-strict/pom.xml +++ b/johnzon-jsonp-strict/pom.xml @@ -21,7 +21,7 @@ johnzon org.apache.johnzon -1.2.19 +1.2.20-SNAPSHOT 4.0.0 diff --git a/johnzon-jsonschema/pom.xml b/johnzon-jsonschema/pom.xml index ac91796c..61e7e6cc 100644 --- a/johnzon-jsonschema/pom.xml +++ b/johnzon-jsonschema/pom.xml @@ -21,7 +21,7 @@ johnzon org.apache.johnzon -1.2.19 +1.2.20-SNAPSHOT 4.0.0 diff --git a/johnzon-mapper/pom.xml b/johnzon-mapper/pom.xml index 3f71731b..05bc495f 100644 --- a/johnzon-mapper/pom.xml +++ b/johnzon-mapper/pom.xml @@ -21,7 +21,7 @@ johnzon org.apache.johnzon -1.2.19 +1.2.20-SNAPSHOT 4.0.0 diff --git a/johnzon-maven-plugin/pom.xml b/johnzon-maven-plugin/pom.xml index 0fc4df96..899dafc6 100644 --- a/johnzon-maven-plugin/pom.xml +++ b/johnzon-maven-plugin/pom.xml @@ -23,7 +23,7 @@ johnzon org.apache.johnzon -1.2.19 +1.2.20-SNAPSHOT johnzon-maven-plugin diff --git a/johnzon-osgi/pom.xml b/johnzon-osgi/pom.xml index 3d77d5ab..7c4e041f 100644 --- a/johnzon-osgi/pom.xml +++ b/johnzon-osgi/pom.xml @@ -21,7 +21,7 @@ johnzon org.apache.johnzon -1.2.19 +1.2.20-SNAPSHOT 4.0.0 diff --git a/johnzon-websocket/pom.xml b/johnzon-websocket/pom.xml index 2e717af2..f845ab60 100644 --- a/johnzon-websocket/pom.xml +++ b/johnzon-websocket/pom.xml @@ -21,7 +21,7 @@ johnzon org.apache.johnzon -1.2.19 +1.2.20-SNAPSHOT 4.0.0 diff --git a/pom.xml b/pom.xml index 0a188e19..75689dcd 100644 --- a/pom.xml +++ b/pom.xml @@ -29,7 +29,7 @@ org.apache.johnzon johnzon pom - 1.2.19 + 1.2.20-SNAPSHOT Apache Johnzon Apache Johnzon is an implementation of JSR-353 (JavaTM API for JSON Processing). 2014 @@ -510,7 +510,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 -v1.2.19 +HEAD
[johnzon] annotated tag v1.2.19 created (now 37f9cabc)
This is an automated email from the ASF dual-hosted git repository. rmannibucau pushed a change to annotated tag v1.2.19 in repository https://gitbox.apache.org/repos/asf/johnzon.git at 37f9cabc (tag) tagging a438327965a4a22d1238b28cbbd9f86d6a9cc707 (commit) replaces v1.2.18 by Romain Manni-Bucau on Wed Aug 17 10:29:03 2022 +0200 - Log - [maven-release-plugin] copy for tag v1.2.19 --- This annotated tag includes the following new commits: new a4383279 [maven-release-plugin] prepare release v1.2.19 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.
[johnzon] branch master updated (10444f1f -> b550cb2a)
This is an automated email from the ASF dual-hosted git repository. rmannibucau pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/johnzon.git from 10444f1f [JOHNZON-387] basic support of enums in PojoGenerator new a4383279 [maven-release-plugin] prepare release v1.2.19 new b550cb2a [maven-release-plugin] prepare for next development iteration The 2 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-jsonp-strict/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 | 2 +- 13 files changed, 13 insertions(+), 13 deletions(-)
[johnzon] annotated tag v1.2.19 deleted (was 79cbbe59)
This is an automated email from the ASF dual-hosted git repository. rmannibucau pushed a change to annotated tag v1.2.19 in repository https://gitbox.apache.org/repos/asf/johnzon.git *** WARNING: tag v1.2.19 was deleted! *** tag was 79cbbe59 The revisions that were on this annotated tag are still contained in other references; therefore, this change does not discard any commits from the repository.
[johnzon] branch master updated: [JOHNZON-387] basic support of enums in PojoGenerator
This is an automated email from the ASF dual-hosted git repository.
rmannibucau 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 10444f1f [JOHNZON-387] basic support of enums in PojoGenerator
10444f1f is described below
commit 10444f1f338d430dadbad430b5b029c4ad38fefa
Author: Romain Manni-Bucau
AuthorDate: Wed Aug 17 10:22:38 2022 +0200
[JOHNZON-387] basic support of enums in PojoGenerator
---
.../johnzon/jsonschema/generator/PojoGenerator.java | 17 -
1 file changed, 16 insertions(+), 1 deletion(-)
diff --git
a/johnzon-jsonschema/src/main/java/org/apache/johnzon/jsonschema/generator/PojoGenerator.java
b/johnzon-jsonschema/src/main/java/org/apache/johnzon/jsonschema/generator/PojoGenerator.java
index 8835b45f..45022f85 100644
---
a/johnzon-jsonschema/src/main/java/org/apache/johnzon/jsonschema/generator/PojoGenerator.java
+++
b/johnzon-jsonschema/src/main/java/org/apache/johnzon/jsonschema/generator/PojoGenerator.java
@@ -53,6 +53,7 @@ public class PojoGenerator {
protected final Set imports = new TreeSet<>(String::compareTo);
protected final List attributes = new ArrayList<>();
protected final Map nested = new
TreeMap<>(String::compareTo);
+private boolean isEnum;
public PojoGenerator(final PojoConfiguration configuration) {
this.configuration = configuration;
@@ -64,6 +65,10 @@ public class PojoGenerator {
}
public Map generate() {
+if (isEnum) {
+return nested;
+}
+
final String name = configuration.getPackageName() + '.' +
configuration.getClassName();
final String path = name.replace('.', '/') + ".java";
attributes.sort(comparing(a -> a.javaName));
@@ -169,6 +174,12 @@ public class PojoGenerator {
public PojoGenerator visitSchema(final JsonObject schema) {
if (!schema.containsKey("properties")) {
+if (schema.containsKey("enum")) {
+isEnum = true;
+doEnum(schema.getJsonArray("enum"),
configuration.getClassName());
+return this;
+}
+
throw new IllegalArgumentException("Unsupported schema since it
does not contain any properties: " + schema);
}
@@ -334,6 +345,11 @@ public class PojoGenerator {
protected String onEnum(final String javaName, final JsonValue enumList,
final JsonObject schema) {
final String className = enumName(javaName, schema);
+doEnum(enumList, className);
+return className;
+}
+
+private void doEnum(final JsonValue enumList, final String className) {
final Map values = enumList.asJsonArray().stream()
.map(JsonString.class::cast)
.map(JsonString::getString)
@@ -370,7 +386,6 @@ public class PojoGenerator {
"") +
beforeEnumEnd() +
"}\n");
-return className;
}
protected String enumName(final String javaName, final JsonObject schema) {
[johnzon] 02/02: reverting version after rolling back the release
This is an automated email from the ASF dual-hosted git repository. rmannibucau pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/johnzon.git commit 5f3aa3f1a673de2dbf5e371ee0ff9c12bdee02b0 Author: Romain Manni-Bucau AuthorDate: Wed Aug 17 09:45:22 2022 +0200 reverting version after rolling back the 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-jsonp-strict/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 | 2 +- 13 files changed, 13 insertions(+), 13 deletions(-) diff --git a/johnzon-core/pom.xml b/johnzon-core/pom.xml index 03d084e5..483340b0 100644 --- a/johnzon-core/pom.xml +++ b/johnzon-core/pom.xml @@ -21,7 +21,7 @@ johnzon org.apache.johnzon -1.2.20-SNAPSHOT +1.2.19-SNAPSHOT 4.0.0 diff --git a/johnzon-distribution/pom.xml b/johnzon-distribution/pom.xml index 9630f5bb..2923ee0d 100644 --- a/johnzon-distribution/pom.xml +++ b/johnzon-distribution/pom.xml @@ -21,7 +21,7 @@ johnzon org.apache.johnzon -1.2.20-SNAPSHOT +1.2.19-SNAPSHOT 4.0.0 diff --git a/johnzon-jaxrs/pom.xml b/johnzon-jaxrs/pom.xml index 5ffaa968..111ae929 100644 --- a/johnzon-jaxrs/pom.xml +++ b/johnzon-jaxrs/pom.xml @@ -21,7 +21,7 @@ johnzon org.apache.johnzon -1.2.20-SNAPSHOT +1.2.19-SNAPSHOT 4.0.0 diff --git a/johnzon-json-extras/pom.xml b/johnzon-json-extras/pom.xml index 522fa81f..01ad93fc 100644 --- a/johnzon-json-extras/pom.xml +++ b/johnzon-json-extras/pom.xml @@ -21,7 +21,7 @@ johnzon org.apache.johnzon -1.2.20-SNAPSHOT +1.2.19-SNAPSHOT 4.0.0 diff --git a/johnzon-jsonb/pom.xml b/johnzon-jsonb/pom.xml index 51c53d53..86afd25f 100644 --- a/johnzon-jsonb/pom.xml +++ b/johnzon-jsonb/pom.xml @@ -21,7 +21,7 @@ johnzon org.apache.johnzon -1.2.20-SNAPSHOT +1.2.19-SNAPSHOT 4.0.0 diff --git a/johnzon-jsonlogic/pom.xml b/johnzon-jsonlogic/pom.xml index cecae60d..a9d7643f 100644 --- a/johnzon-jsonlogic/pom.xml +++ b/johnzon-jsonlogic/pom.xml @@ -21,7 +21,7 @@ johnzon org.apache.johnzon -1.2.20-SNAPSHOT +1.2.19-SNAPSHOT 4.0.0 diff --git a/johnzon-jsonp-strict/pom.xml b/johnzon-jsonp-strict/pom.xml index 9720adfd..9b4192bd 100644 --- a/johnzon-jsonp-strict/pom.xml +++ b/johnzon-jsonp-strict/pom.xml @@ -21,7 +21,7 @@ johnzon org.apache.johnzon -1.2.20-SNAPSHOT +1.2.19-SNAPSHOT 4.0.0 diff --git a/johnzon-jsonschema/pom.xml b/johnzon-jsonschema/pom.xml index 61e7e6cc..38464977 100644 --- a/johnzon-jsonschema/pom.xml +++ b/johnzon-jsonschema/pom.xml @@ -21,7 +21,7 @@ johnzon org.apache.johnzon -1.2.20-SNAPSHOT +1.2.19-SNAPSHOT 4.0.0 diff --git a/johnzon-mapper/pom.xml b/johnzon-mapper/pom.xml index 05bc495f..03403814 100644 --- a/johnzon-mapper/pom.xml +++ b/johnzon-mapper/pom.xml @@ -21,7 +21,7 @@ johnzon org.apache.johnzon -1.2.20-SNAPSHOT +1.2.19-SNAPSHOT 4.0.0 diff --git a/johnzon-maven-plugin/pom.xml b/johnzon-maven-plugin/pom.xml index 899dafc6..c3bad907 100644 --- a/johnzon-maven-plugin/pom.xml +++ b/johnzon-maven-plugin/pom.xml @@ -23,7 +23,7 @@ johnzon org.apache.johnzon -1.2.20-SNAPSHOT +1.2.19-SNAPSHOT johnzon-maven-plugin diff --git a/johnzon-osgi/pom.xml b/johnzon-osgi/pom.xml index 7c4e041f..d87fe655 100644 --- a/johnzon-osgi/pom.xml +++ b/johnzon-osgi/pom.xml @@ -21,7 +21,7 @@ johnzon org.apache.johnzon -1.2.20-SNAPSHOT +1.2.19-SNAPSHOT 4.0.0 diff --git a/johnzon-websocket/pom.xml b/johnzon-websocket/pom.xml index f845ab60..f3fd9c4f 100644 --- a/johnzon-websocket/pom.xml +++ b/johnzon-websocket/pom.xml @@ -21,7 +21,7 @@ johnzon org.apache.johnzon -1.2.20-SNAPSHOT +1.2.19-SNAPSHOT 4.0.0 diff --git a/pom.xml b/pom.xml index 75689dcd..c5ef5793 100644 --- a/pom.xml +++ b/pom.xml @@ -29,7 +29,7 @@ org.apache.johnzon johnzon pom - 1.2.20-SNAPSHOT + 1.2.19-SNAPSHOT Apache Johnzon Apache Johnzon is an implementation of JSR-353 (JavaTM API for JSON Processing). 2014
[johnzon] 01/02: fixing all args constructor, fluent setter indentation+returned type for pojo generator
This is an automated email from the ASF dual-hosted git repository.
rmannibucau pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/johnzon.git
commit 645fa23fd595dbe1ed00b8894c5c9f2f5a67fe0a
Author: Romain Manni-Bucau
AuthorDate: Wed Aug 17 09:45:13 2022 +0200
fixing all args constructor, fluent setter indentation+returned type for
pojo generator
---
.../apache/johnzon/jsonschema/generator/PojoGenerator.java| 11 ++-
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git
a/johnzon-jsonschema/src/main/java/org/apache/johnzon/jsonschema/generator/PojoGenerator.java
b/johnzon-jsonschema/src/main/java/org/apache/johnzon/jsonschema/generator/PojoGenerator.java
index 2b36e3cd..8835b45f 100644
---
a/johnzon-jsonschema/src/main/java/org/apache/johnzon/jsonschema/generator/PojoGenerator.java
+++
b/johnzon-jsonschema/src/main/java/org/apache/johnzon/jsonschema/generator/PojoGenerator.java
@@ -89,8 +89,7 @@ public class PojoGenerator {
"@Override\n" +
"public boolean equals(final Object other)
{\n" +
"return other instanceof " +
configuration.getClassName() + ";\n" +
-"}\n" +
-"}\n") :
+"}\n") :
(attributes.stream()
.map(a -> "" +
(configuration.isAddJsonbProperty() &&
!Objects.equals(a.javaName, a.jsonName) ?
@@ -115,7 +114,9 @@ public class PojoGenerator {
.collect(joining()),
"",
") {\n" +
-"
// no-op\n" +
+
attributes.stream()
+
.map(a -> "this." + a.getJavaName() + " = " + a.javaName + ";\n")
+
.collect(joining()) +
"
}\n\n")) :
"") +
attributes.stream()
@@ -127,10 +128,10 @@ public class PojoGenerator {
"}\n" +
"\n" +
"public " +
-
(configuration.isFluentSetters() ? a.type : "void") +
+
(configuration.isFluentSetters() ? configuration.getClassName() : "void") +
" set" + marker + "(final
" + a.type + " " + a.javaName + ") {\n" +
"this." +
a.javaName + " = " + a.javaName + ";\n" +
-
(configuration.isFluentSetters() ? "return this;\n" : "") +
+
(configuration.isFluentSetters() ? "return this;\n" : "") +
"}\n" +
"";
})
[johnzon] branch master updated (c8a58309 -> 5f3aa3f1)
This is an automated email from the ASF dual-hosted git repository. rmannibucau pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/johnzon.git from c8a58309 [maven-release-plugin] prepare for next development iteration new 645fa23f fixing all args constructor, fluent setter indentation+returned type for pojo generator new 5f3aa3f1 reverting version after rolling back the release The 2 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-jsonp-strict/pom.xml | 2 +- johnzon-jsonschema/pom.xml| 2 +- .../apache/johnzon/jsonschema/generator/PojoGenerator.java| 11 ++- johnzon-mapper/pom.xml| 2 +- johnzon-maven-plugin/pom.xml | 2 +- johnzon-osgi/pom.xml | 2 +- johnzon-websocket/pom.xml | 2 +- pom.xml | 2 +- 14 files changed, 19 insertions(+), 18 deletions(-)
