You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@johnzon.apache.org by rm...@apache.org on 2022/08/17 07:45:27 UTC
[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(-)
[johnzon] 01/02: fixing all args constructor, fluent setter indentation+returned type for pojo generator
Posted by rm...@apache.org.
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 <rm...@gmail.com>
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] 02/02: reverting version after rolling back the release
Posted by rm...@apache.org.
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 <rm...@gmail.com>
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 @@
<parent>
<artifactId>johnzon</artifactId>
<groupId>org.apache.johnzon</groupId>
- <version>1.2.20-SNAPSHOT</version>
+ <version>1.2.19-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
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 @@
<parent>
<artifactId>johnzon</artifactId>
<groupId>org.apache.johnzon</groupId>
- <version>1.2.20-SNAPSHOT</version>
+ <version>1.2.19-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
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 @@
<parent>
<artifactId>johnzon</artifactId>
<groupId>org.apache.johnzon</groupId>
- <version>1.2.20-SNAPSHOT</version>
+ <version>1.2.19-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
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 @@
<parent>
<artifactId>johnzon</artifactId>
<groupId>org.apache.johnzon</groupId>
- <version>1.2.20-SNAPSHOT</version>
+ <version>1.2.19-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
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 @@
<parent>
<artifactId>johnzon</artifactId>
<groupId>org.apache.johnzon</groupId>
- <version>1.2.20-SNAPSHOT</version>
+ <version>1.2.19-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
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 @@
<parent>
<artifactId>johnzon</artifactId>
<groupId>org.apache.johnzon</groupId>
- <version>1.2.20-SNAPSHOT</version>
+ <version>1.2.19-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
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 @@
<parent>
<artifactId>johnzon</artifactId>
<groupId>org.apache.johnzon</groupId>
- <version>1.2.20-SNAPSHOT</version>
+ <version>1.2.19-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
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 @@
<parent>
<artifactId>johnzon</artifactId>
<groupId>org.apache.johnzon</groupId>
- <version>1.2.20-SNAPSHOT</version>
+ <version>1.2.19-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
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 @@
<parent>
<artifactId>johnzon</artifactId>
<groupId>org.apache.johnzon</groupId>
- <version>1.2.20-SNAPSHOT</version>
+ <version>1.2.19-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
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 @@
<parent>
<artifactId>johnzon</artifactId>
<groupId>org.apache.johnzon</groupId>
- <version>1.2.20-SNAPSHOT</version>
+ <version>1.2.19-SNAPSHOT</version>
</parent>
<artifactId>johnzon-maven-plugin</artifactId>
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 @@
<parent>
<artifactId>johnzon</artifactId>
<groupId>org.apache.johnzon</groupId>
- <version>1.2.20-SNAPSHOT</version>
+ <version>1.2.19-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
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 @@
<parent>
<artifactId>johnzon</artifactId>
<groupId>org.apache.johnzon</groupId>
- <version>1.2.20-SNAPSHOT</version>
+ <version>1.2.19-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/pom.xml b/pom.xml
index 75689dcd..c5ef5793 100644
--- a/pom.xml
+++ b/pom.xml
@@ -29,7 +29,7 @@
<groupId>org.apache.johnzon</groupId>
<artifactId>johnzon</artifactId>
<packaging>pom</packaging>
- <version>1.2.20-SNAPSHOT</version>
+ <version>1.2.19-SNAPSHOT</version>
<name>Apache Johnzon</name>
<description>Apache Johnzon is an implementation of JSR-353 (JavaTM API for JSON Processing).</description>
<inceptionYear>2014</inceptionYear>