svn commit: r68228 - in /release/johnzon: johnzon-2.0.0/ johnzon-2.0.1/
Author: rmannibucau Date: Mon Apr 1 18:27:01 2024 New Revision: 68228 Log: johnzon 2.0.1 (release) Added: release/johnzon/johnzon-2.0.1/ release/johnzon/johnzon-2.0.1/apache-johnzon-2.0.1-bin.tar.gz (with props) release/johnzon/johnzon-2.0.1/apache-johnzon-2.0.1-bin.tar.gz.asc release/johnzon/johnzon-2.0.1/apache-johnzon-2.0.1-bin.tar.gz.sha512 release/johnzon/johnzon-2.0.1/apache-johnzon-2.0.1-bin.zip (with props) release/johnzon/johnzon-2.0.1/apache-johnzon-2.0.1-bin.zip.asc release/johnzon/johnzon-2.0.1/apache-johnzon-2.0.1-bin.zip.sha512 release/johnzon/johnzon-2.0.1/apache-johnzon-2.0.1-src.tar.gz (with props) release/johnzon/johnzon-2.0.1/apache-johnzon-2.0.1-src.tar.gz.asc release/johnzon/johnzon-2.0.1/apache-johnzon-2.0.1-src.tar.gz.sha512 release/johnzon/johnzon-2.0.1/apache-johnzon-2.0.1-src.zip (with props) release/johnzon/johnzon-2.0.1/apache-johnzon-2.0.1-src.zip.asc release/johnzon/johnzon-2.0.1/apache-johnzon-2.0.1-src.zip.sha512 Removed: release/johnzon/johnzon-2.0.0/ Added: release/johnzon/johnzon-2.0.1/apache-johnzon-2.0.1-bin.tar.gz == Binary file - no diff available. Propchange: release/johnzon/johnzon-2.0.1/apache-johnzon-2.0.1-bin.tar.gz -- svn:mime-type = application/octet-stream Added: release/johnzon/johnzon-2.0.1/apache-johnzon-2.0.1-bin.tar.gz.asc == --- release/johnzon/johnzon-2.0.1/apache-johnzon-2.0.1-bin.tar.gz.asc (added) +++ release/johnzon/johnzon-2.0.1/apache-johnzon-2.0.1-bin.tar.gz.asc Mon Apr 1 18:27:01 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: release/johnzon/johnzon-2.0.1/apache-johnzon-2.0.1-bin.tar.gz.sha512 == --- release/johnzon/johnzon-2.0.1/apache-johnzon-2.0.1-bin.tar.gz.sha512 (added) +++ release/johnzon/johnzon-2.0.1/apache-johnzon-2.0.1-bin.tar.gz.sha512 Mon Apr 1 18:27:01 2024 @@ -0,0 +1 @@ +1532e024dec6c32e0e06f463ba6889dffe2946637310e45790b28c391ab0c99ba0bf29e161becc6266ba3a076089ef291e908d8ab392101bb7531000d6c76a58 apache-johnzon-2.0.1-bin.tar.gz Added: release/johnzon/johnzon-2.0.1/apache-johnzon-2.0.1-bin.zip == Binary file - no diff available. Propchange: release/johnzon/johnzon-2.0.1/apache-johnzon-2.0.1-bin.zip -- svn:mime-type = application/octet-stream Added: release/johnzon/johnzon-2.0.1/apache-johnzon-2.0.1-bin.zip.asc == --- release/johnzon/johnzon-2.0.1/apache-johnzon-2.0.1-bin.zip.asc (added) +++ release/johnzon/johnzon-2.0.1/apache-johnzon-2.0.1-bin.zip.asc Mon Apr 1 18:27:01 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: release/johnzon/johnzon-2.0.1/apache-johnzon-2.0.1-bin.zip.sha512 == --- release/johnzon/johnzon-2.0.1/apache-johnzon-2.0.1-bin.zip.sha512 (added) +++ release/johnzon/johnzon-2.0.1/apache-johnzon-2.0.1
svn commit: r68229 - /dev/johnzon/johnzon-2.0.1/
Author: rmannibucau Date: Mon Apr 1 18:27:13 2024 New Revision: 68229 Log: johnzon 2.0.1 (release passed) Removed: dev/johnzon/johnzon-2.0.1/
svn commit: r68080 - /release/johnzon/KEYS
Author: rmannibucau Date: Sat Mar 23 19:42:41 2024 New Revision: 68080 Log: adding jungm key to johnzon's KEYS Modified: release/johnzon/KEYS Modified: release/johnzon/KEYS == --- release/johnzon/KEYS (original) +++ release/johnzon/KEYS Sat Mar 23 19:42:41 2024 @@ -694,3 +694,61 @@ yn1jp3nhm6Kfq+BJ7IS+Wv1+62KFlCXdVT99iFFV 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- + +mQINBGX9PKgBEACtG33YnimzNcN+0FRzW3jkZ6pj3o7KqF7y895OdOeQuPxuPelc +QGVeimi96K2fKQ43PpBAAhbGuQ/ZLiOp/c/8TPhCTWgcyb+isBvYLp0BjX8WeZ9f +Pna9tG1B3i+5ChWtEqRqcJREOqo+irBwDq8yvkd8C5GLNHSKovpdQWbMyuxAAOlX +heDTVUYxhtk+13YM77hVHIhgOudHt8029Q9DcS1FZ+ebZEh3T14g9Mp1DK4EfELo +RndbxXbwXMG2vsFNf95AvrP9LcMh1clicB/8moyGtfb9ItDbOCnVlWUb5KfFoz1g +T0hmRix1hn38jUy10yWChrpKfs+impF/rhNljcZFAtoCgY5vy5aN/xz5vUdnx1ld +9scXXdgm9shz1kAIz5JyCMv+Cfu4M6k5wHlohpyy7uhpVd/ys8ZL5Oipt6P+HvXI +Bh/ZtBWbB7UMbambE3J9N3y6+/2bGHJmbN1/+fXMAm8pw7O0IufFskKfD2rdsEP9 +eMr0iIBvcaXUR7VxcqSewLpWi/YdIFpp+LX2sJMxmNhpcKOtRPqs7AR3vedapvJP +jCx5yruFZnZNsO/PW5d7hKX+VsOdxAsJdEV7KKPN9MQqjDgRhwqxv9EbMV4PHuWn +1shV3szs66pPVMdgVg+bxozh6pNkhEmsYpl5GQIKXVaHuGpgoqs6gBmamQARAQAB +tDFNYXJrdXMgSnVuZyAoQ09ERSBTSUdOSU5HIEtFWSkgPGp1bmdtQGFwYWNoZS5v +cmc+iQJOBBMBCgA4FiEEhfu+mNbDfNqKfY/5+f+DpI0znTcFAmX9PKgCGwMFCwkI +BwIGFQoJCAsCBBYCAwECHgECF4AACgkQ+f+DpI0znTfBFRAAlE4EgE2npMzMH8AC +IAYar5p72Db/bzAanGPJAlMMkxhnZ04QNds1YEn7b6qrYz5R6oWaQ0bUMgxJthkb +wC1/J7tY6H5pHmdBMLfHIwRr1bkPEdP2NhdP14tCwAprC9GCy7mEBSbc8C9F4TzG +IZlXdjwDsNzv265son0AJhyyC97aO6Q2NfX+zQC6fo+nKhVD7F4bp7fuDe3S+jn5 +rMlmh0r+lhQmArgoYr8Lgixuks5xY5izPUxKBi1JawUIntmGLZptFErKGpHh2taU +dXWxK0q/ds6aDpFUq5qKFOHMAm3IDx50WLtB/Hug6Rf2ad6NX6F2kPPVljeOhswX +7uz2mK/ExSBs6maSTM62T9dEaIBFG1VPkNDIqUYpLzem1Vk3V6FT0YtGWaHU9Ekd +RQ53tBPwXEMk3/psJFTTLU52MUd+B4uH14NMHZ5fXRbqoZUdV69E6uYtbLyjWzw9 +utmzMWE9khy8uNZR35jMyOEm0zSq5IxJrP39n7PO6FYxiOtx8x+9iwKh9JYma7Ud +nla+O40sVM/RFPixtz/g7g6lxbx4Ar9K9pa0zVRttxiyW30ZXI1deBJdukxiA5Oq +vRp0diG+ppWPMVPJGJ0aJJhD9OaaV8KUCylkzY29Ktbav8+/vIiQ+y8FWLChTTYU +0wxQeGxmNfYdo+87k9EfjtMxdlq5Ag0EZf08qAEQALf4OGOCr7bUbu/vudIRDgs5 +GRum6zPD2T2qwocLNYq6EQ/boWy4vFRw/W8opuYYY2tDQxVUtDmRUmfEBjZg00Kn +kgQ9ilibMbfhEjqm2374EDn5u7lzCZSxgDrgY9HmT5OkRro5UFIKbT1vRI0muYKY +FzwCTvSEaTcBqWC4vzefDDBPc+T4GDK+ZMY6HxVnr2et1roLXLiHqqLa4exaikwV +FLYKW3YczcWS4leKa6p7SOYDd+Snj+O30whrj+tJEXTO08wfQoAoAzsllQ2RrmvQ +EpdPg0qhTszotZ4c9IguUfmSVhogwCpHjH+jpbTcYKjf/iF8XCg3vcr5mbqC7nxk +RpgZAAMAOi3E5Eysx41xZ3oj585aGrCn1X5w6wT9zRBXGbx03hDfuHRD42e82jph +o4p3PoalfSnBiRcr8VdJ8Ool+/+NlNEvf8TSHelONodYRkvjfdapmfIhy7UF8LpG +mZ7jUuF3s2DQn7u8pStnJle/iBnimsWwkv5HNApsgDQpiH1ucFY0d+bhsYYo6gEF +DAt8FIOAunbEjqRF08n7qHoxy3N6JZvTSVVdxbQBcpUmbR+MSRyH8ckKbQ/BSegg +8ES39rKgdtq9z8ITbeSlr1uFzf6SRKnvO7PQwpfYz8VAPkdWpu1aqCOfBLBBmzBV +mmZU4x7ee/ITw6myBS01ABEBAAGJAjYEGAEKACAWIQSF+76Y1sN82op9j/n5/4Ok +jTOdNwUCZf08qAIbDAAKCRD5/4OkjTOdNwzhD/94lNOB/D+WHVn44cg3TvyoEmBm +M+tJjXRMdAPuqKHS59OM0BKhA0375E8fqi8/7bK1vNSQC3r11NTPCnXwIjwbgje0 +DCl5F618E9A3q3mrkpmT8/BP0V8Nv076aAXJz/1hfi2myEonGljJxHToFuuW7dcb +gJ62RupR0F5v3ZykkOcgZPjKr9NPQbLDHJ3laV6/HYZW2aacemUDXr8DB+pz34ay +ayHNz9y6eIuMEtfsNLufX9KbnI/Oaqjk0sm4cg3+3tBuGMukoh9wPh31zHkSsrji +mJDhKPhsSZiRWSG/3/QyL3zZDopazijD7T2Z/Nk7fPG5Wk1nUmHtj+U2Yb8mEyZF +CF/YnkyK2i7UrE1PHIu9q7FiofwoCdfuIprzQ5QdcsxflTNaFXkXGkw77vIVFMyN +uAf52OiC4dYKxJ6+bFQNy9xZhG+zD2n5vZP7JLdNdvhcuGiiSXrcFacwhcx0xkaR +eEPCu71qiCOW2RiYWKwqXm9GYeBkC5qT05K6tzQF0Vg1BGfnIt0hurzMalq755KV +gKCJIQSIjGYHQ5ewcEpOH0LAihk9HH21xI9jTkmyQP5ZKiJb1Gvh5QM1SAKOsBiA +gfEo+VdksgycXpFuZs0I7QNQi6uWn9Tu5/0rgt54wV1p5mxljxNydAT5FY86vJqp ++h/HL4yfY1bkOI41wQ== +=16jo +-END PGP PUBLIC KEY BLOCK- +
(johnzon) branch master updated: [JOHNZON-401] fix serialization of nested polymorphic objects
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 904c0810 [JOHNZON-401] fix serialization of nested polymorphic objects
904c0810 is described below
commit 904c08102d82e4fb5ca443e13d3a9251787f4899
Author: Markus Jung
AuthorDate: Fri Jan 26 08:15:49 2024 +0100
[JOHNZON-401] fix serialization of nested polymorphic objects
---
.../johnzon/jsonb/polymorphism/JsonbPolymorphismTest.java | 15 +++
.../org/apache/johnzon/mapper/MappingGeneratorImpl.java | 12 ++--
2 files changed, 21 insertions(+), 6 deletions(-)
diff --git
a/johnzon-jsonb/src/test/java/org/apache/johnzon/jsonb/polymorphism/JsonbPolymorphismTest.java
b/johnzon-jsonb/src/test/java/org/apache/johnzon/jsonb/polymorphism/JsonbPolymorphismTest.java
index 87d83899..52351430 100644
---
a/johnzon-jsonb/src/test/java/org/apache/johnzon/jsonb/polymorphism/JsonbPolymorphismTest.java
+++
b/johnzon-jsonb/src/test/java/org/apache/johnzon/jsonb/polymorphism/JsonbPolymorphismTest.java
@@ -41,6 +41,17 @@ public class JsonbPolymorphismTest {
@Rule public JsonbRule jsonb = new JsonbRule();
+@Test
+public void testNestedSerialization() {
+Labrador labrador = new Labrador();
+labrador.dogAge = 3;
+labrador.labradorName = "john";
+AnimalWrapper wrapper = new AnimalWrapper();
+wrapper.animal = labrador;
+
+
assertEquals("{\"animal\":{\"@animal\":\"dog\",\"@dog\":\"labrador\",\"dogAge\":3,\"labradorName\":\"john\"}}",
jsonb.toJson(wrapper));
+}
+
@Test
public void testSerialization() {
Labrador labrador = new Labrador();
@@ -100,6 +111,10 @@ public class JsonbPolymorphismTest {
}
+public static class AnimalWrapper {
+public Animal animal;
+}
+
@JsonbTypeInfo(key = "@animal", value = @JsonbSubtype(alias = "dog", type
= Dog.class))
public interface Animal {
}
diff --git
a/johnzon-mapper/src/main/java/org/apache/johnzon/mapper/MappingGeneratorImpl.java
b/johnzon-mapper/src/main/java/org/apache/johnzon/mapper/MappingGeneratorImpl.java
index cf44c5c7..c06f38df 100644
---
a/johnzon-mapper/src/main/java/org/apache/johnzon/mapper/MappingGeneratorImpl.java
+++
b/johnzon-mapper/src/main/java/org/apache/johnzon/mapper/MappingGeneratorImpl.java
@@ -192,12 +192,6 @@ public class MappingGeneratorImpl implements
MappingGenerator {
generator.writeStartObject();
}
-if (classMapping.serializedPolymorphicProperties != null) {
-for (Map.Entry polymorphicProperty :
classMapping.serializedPolymorphicProperties) {
-generator.write(polymorphicProperty.getKey(),
polymorphicProperty.getValue());
-}
-}
-
final boolean writeEnd = doWriteObjectBody(object,
ignoredProperties, jsonPointer, generator);
if (writeEnd && writeBody) {
generator.writeEnd();
@@ -376,6 +370,12 @@ public class MappingGeneratorImpl implements
MappingGenerator {
return true;
}
+if (classMapping.serializedPolymorphicProperties != null) {
+for (Map.Entry polymorphicProperty :
classMapping.serializedPolymorphicProperties) {
+generator.write(polymorphicProperty.getKey(),
polymorphicProperty.getValue());
+}
+}
+
for (final Map.Entry getterEntry :
classMapping.getters.entrySet()) {
final Mappings.Getter getter = getterEntry.getValue();
if (ignored != null && ignored.contains(getterEntry.getKey())) {
[johnzon] branch master updated: Fixing persistence and transaction api scopes (they are not intended to come with johnzon)
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 f6a8bc89 Fixing persistence and transaction api scopes (they are not intended to come with johnzon) f6a8bc89 is described below commit f6a8bc8901ca64bcef277bb23db39a1da48866b7 Author: Romain Manni-Bucau AuthorDate: Wed Oct 4 16:19:44 2023 +0400 Fixing persistence and transaction api scopes (they are not intended to come with johnzon) --- johnzon-mapper/pom.xml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/johnzon-mapper/pom.xml b/johnzon-mapper/pom.xml index d808dcad..a97e6868 100644 --- a/johnzon-mapper/pom.xml +++ b/johnzon-mapper/pom.xml @@ -39,11 +39,13 @@ jakarta.persistence jakarta.persistence-api 3.1.0 + test jakarta.transaction jakarta.transaction-api 2.0.1 + test org.apache.openjpa
[johnzon] branch master updated: [JOHNZON-400] ensure we always set the locale when changing the case
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 d9d6d2f8 [JOHNZON-400] ensure we always set the locale when changing
the case
d9d6d2f8 is described below
commit d9d6d2f82285c236d3cdb2eea7adb86365fa78d4
Author: Romain Manni-Bucau
AuthorDate: Mon Sep 4 06:37:43 2023 +0400
[JOHNZON-400] ensure we always set the locale when changing the case
---
johnzon-core/src/main/java/org/apache/johnzon/core/JsonPatchImpl.java | 4 +++-
.../src/main/java/org/apache/johnzon/mapper/ExceptionMessages.java| 3 ++-
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git
a/johnzon-core/src/main/java/org/apache/johnzon/core/JsonPatchImpl.java
b/johnzon-core/src/main/java/org/apache/johnzon/core/JsonPatchImpl.java
index afd34f9c..76a9edb9 100644
--- a/johnzon-core/src/main/java/org/apache/johnzon/core/JsonPatchImpl.java
+++ b/johnzon-core/src/main/java/org/apache/johnzon/core/JsonPatchImpl.java
@@ -34,6 +34,8 @@ import jakarta.json.JsonStructure;
import jakarta.json.JsonValue;
import jakarta.json.spi.JsonProvider;
+import static java.util.Locale.ROOT;
+
class JsonPatchImpl implements JsonPatch {
private final JsonProvider provider;
@@ -238,7 +240,7 @@ class JsonPatchImpl implements JsonPatch {
synchronized (this) {
if (json == null) {
JsonObjectBuilder builder =
provider.createObjectBuilder()
-.add("op", operation.name().toLowerCase())
+.add("op", operation.name().toLowerCase(ROOT))
.add("path", path);
if (fromPointer != null) {
diff --git
a/johnzon-mapper/src/main/java/org/apache/johnzon/mapper/ExceptionMessages.java
b/johnzon-mapper/src/main/java/org/apache/johnzon/mapper/ExceptionMessages.java
index 33690c0c..7745af37 100644
---
a/johnzon-mapper/src/main/java/org/apache/johnzon/mapper/ExceptionMessages.java
+++
b/johnzon-mapper/src/main/java/org/apache/johnzon/mapper/ExceptionMessages.java
@@ -28,6 +28,7 @@ import static jakarta.json.JsonValue.ValueType.NUMBER;
import static jakarta.json.JsonValue.ValueType.OBJECT;
import static jakarta.json.JsonValue.ValueType.STRING;
import static jakarta.json.JsonValue.ValueType.TRUE;
+import static java.util.Locale.ROOT;
public final class ExceptionMessages {
@@ -79,7 +80,7 @@ public final class ExceptionMessages {
public static String description(final JsonValue.ValueType type) {
if (type == OBJECT || type == ARRAY || type == STRING) {
-return "json " + type.toString().toLowerCase() + " value";
+return "json " + type.toString().toLowerCase(ROOT) + " value";
}
if (type == NUMBER) {
return "json numeric value";
[johnzon] branch master updated: [doc] a word on BigDecimal/BigInteger
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 5eb2c7ff [doc] a word on BigDecimal/BigInteger 5eb2c7ff is described below commit 5eb2c7ff643700a8ba77dbe9c29d6500f54031ef Author: Romain Manni-Bucau AuthorDate: Tue Jul 25 12:19:55 2023 +0200 [doc] a word on BigDecimal/BigInteger --- src/site/markdown/security.md | 10 ++ 1 file changed, 10 insertions(+) diff --git a/src/site/markdown/security.md b/src/site/markdown/security.md index f072a33b..0b554bb0 100644 --- a/src/site/markdown/security.md +++ b/src/site/markdown/security.md @@ -37,3 +37,13 @@ If you need to report a bug that isn't an undisclosed security vulnerability, pl should be addressed to the [mailing list](http://johnzon.apache.org/mail-lists.html). The private security mailing address is: security (at) apache (dot) org + +## BigInteger and Java + +JSON-P/JSON-B exposes API using `BigDecimal` and `BigInteger`. +The bridge between these two types is `BigDecimal#toBigInteger` which has a slow implementation in Java without careness or scale max validation. + +Johnzon does some sanity checks on this value but at some point we recommend you to stay away from these API and handle big numbers using `String` type and parse them yourself since you are the only ones knowing the correct functional and relevant validation of the scale before a instantiation. + +If you know you don't need such big types, prefer using plain primitives (or wrappers). +
[johnzon] branch master updated: switch packaging to pom (#102)
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 20d6e572 switch packaging to pom (#102) 20d6e572 is described below commit 20d6e57242588d7d7a1724d188e262b42fbc0699 Author: Hervé Boutemy AuthorDate: Mon Apr 24 20:01:21 2023 +0200 switch packaging to pom (#102) instead of manually disabling plugins from jar packaging --- johnzon-distribution/pom.xml | 22 +- 1 file changed, 1 insertion(+), 21 deletions(-) diff --git a/johnzon-distribution/pom.xml b/johnzon-distribution/pom.xml index e77d1ee5..f91dc176 100644 --- a/johnzon-distribution/pom.xml +++ b/johnzon-distribution/pom.xml @@ -26,6 +26,7 @@ 4.0.0 apache-johnzon + pom Johnzon :: Distribution @@ -195,27 +196,6 @@ - -org.apache.maven.plugins -maven-source-plugin - - true - - - -org.apache.maven.plugins -maven-jar-plugin - - false - - - -org.apache.maven.plugins -maven-javadoc-plugin - - true - - org.apache.maven.plugins maven-site-plugin
[johnzon] branch master updated: minor fixes in reflection usage for JSON-B polymorphism (no functional change except complete meta support)
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 fcdd26e2 minor fixes in reflection usage for JSON-B polymorphism (no
functional change except complete meta support)
fcdd26e2 is described below
commit fcdd26e2dcbdba51ef08d83f5a2c6606b12686f3
Author: Romain Manni-Bucau
AuthorDate: Thu Apr 20 14:13:38 2023 +0200
minor fixes in reflection usage for JSON-B polymorphism (no functional
change except complete meta support)
---
johnzon-distribution/pom.xml | 10 ++--
.../polymorphism/JsonbPolymorphismHandler.java | 53 --
.../polymorphism/JsonbPolymorphismTypeInfo.java| 4 +-
pom.xml| 4 +-
4 files changed, 36 insertions(+), 35 deletions(-)
diff --git a/johnzon-distribution/pom.xml b/johnzon-distribution/pom.xml
index 69576e2b..e77d1ee5 100644
--- a/johnzon-distribution/pom.xml
+++ b/johnzon-distribution/pom.xml
@@ -161,7 +161,9 @@
+org.apache.maven.plugins
maven-assembly-plugin
+3.4.2
source-assembly
@@ -203,14 +205,8 @@
org.apache.maven.plugins
maven-jar-plugin
-
-
-default-jar
-
-
-
- true
+ false
diff --git
a/johnzon-jsonb/src/main/java/org/apache/johnzon/jsonb/polymorphism/JsonbPolymorphismHandler.java
b/johnzon-jsonb/src/main/java/org/apache/johnzon/jsonb/polymorphism/JsonbPolymorphismHandler.java
index 5710ed0b..36f1aed5 100644
---
a/johnzon-jsonb/src/main/java/org/apache/johnzon/jsonb/polymorphism/JsonbPolymorphismHandler.java
+++
b/johnzon-jsonb/src/main/java/org/apache/johnzon/jsonb/polymorphism/JsonbPolymorphismHandler.java
@@ -26,6 +26,8 @@ import jakarta.json.JsonValue;
import jakarta.json.bind.JsonbException;
import jakarta.json.bind.annotation.JsonbSubtype;
import jakarta.json.bind.annotation.JsonbTypeInfo;
+
+import java.lang.reflect.AnnotatedElement;
import java.util.ArrayList;
import java.util.Collection;
import java.util.HashMap;
@@ -36,7 +38,7 @@ public class JsonbPolymorphismHandler {
private final Map, JsonbPolymorphismTypeInfo> typeInfoCache = new
HashMap<>();
public boolean hasPolymorphism(Class clazz) {
-return clazz.isAnnotationPresent(JsonbTypeInfo.class) ||
getParentWithTypeInfo(clazz) != null;
+return Meta.getAnnotation((AnnotatedElement) clazz,
JsonbTypeInfo.class) != null || getParentWithTypeInfo(clazz) != null;
}
public Map.Entry[]
getPolymorphismPropertiesToSerialize(Class clazz, Collection
otherProperties) {
@@ -47,8 +49,8 @@ public class JsonbPolymorphismHandler {
// Only try to resolve types when there's a JsonbTypeInfo
Annotation present on the current type, Meta.getAnnotation tries to
// walk up parents by itself until it finds the given Annotation
and could incorrectly cause JsonbExceptions to be thrown
// (multiple JsonbTypeInfos with same key found even if thats not
actually the case)
-if (current.isAnnotationPresent(JsonbTypeInfo.class)) {
-JsonbTypeInfo typeInfo = Meta.getAnnotation(current,
JsonbTypeInfo.class);
+JsonbTypeInfo typeInfo = Meta.getAnnotation((AnnotatedElement)
current, JsonbTypeInfo.class);
+if (typeInfo != null) {
if (otherProperties.contains(typeInfo.key())) {
throw new JsonbException("JsonbTypeInfo key '" +
typeInfo.key() + "' collides with other properties in json");
}
@@ -76,34 +78,38 @@ public class JsonbPolymorphismHandler {
}
public Class getTypeToDeserialize(JsonObject jsonObject, Class
clazz) {
-if (!typeInfoCache.containsKey(clazz)) {
+JsonbPolymorphismTypeInfo typeInfo = typeInfoCache.get(clazz);
+if (typeInfo == null) {
return clazz;
}
-JsonbPolymorphismTypeInfo typeInfo = typeInfoCache.get(clazz);
-if (!jsonObject.containsKey(typeInfo.getTypeKey())) {
+JsonValue typeValue = jsonObject.get(typeInfo.getTypeKey());
+if (typeValue == null) {
return clazz;
}
-JsonValue typeValue = jsonObject.get(typeInfo.getTypeKey());
if (typeValue.getValueType() != JsonValue.ValueType.STRING) {
throw new JsonbException("Property '" + typeInfo.getTypeKey() + "'
isn't a String, resolving JsonbSubtype is impossible");
}
String typeValueString = ((JsonString) typeValue).getString();
-if (!typeInfo.getAliases().containsKey(typeValueString)) {
+final Class result = typeInfo.getAliases().get(typeValueString);
[johnzon] branch master updated: Implement JSON-B 3 Polymorphism (#100)
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 9080e292 Implement JSON-B 3 Polymorphism (#100)
9080e292 is described below
commit 9080e292749b5157cae0ad6b0e7c1de3a7ace275
Author: Markus Jung <54570207+ju...@users.noreply.github.com>
AuthorDate: Thu Apr 20 13:54:34 2023 +0200
Implement JSON-B 3 Polymorphism (#100)
* Implement JSON-B 3 polymorphism (WIP)
* Implement more JSON-B 3 polymorphism validations
* JSON-B 3 polymorphism tests
* Allow JsonbSubtype for type=annotated type
* MapperBuilder#setPolymorphismHandler javadoc
* use JsonbRule in tests
* Allow custom Mappings to be used
* Implement JsonbMappings for polymorphism
* create Mappings via Function instead of using reflection
* use Meta.getAnnotation instead of Class.getAnnotation
* restore old ClassMapping constructor for better backwards compatibility
* update docs on jsonb-extras polymorphism
* restore MapperConfig constructor
* cache JsonbTypeInfos to avoid reflections
---
.../org/apache/johnzon/jsonb/JohnzonBuilder.java | 9 +-
.../org/apache/johnzon/jsonb/JsonbMappings.java| 74
.../polymorphism/JsonbPolymorphismHandler.java | 203 +
.../polymorphism/JsonbPolymorphismTypeInfo.java| 46 +
.../jsonb/polymorphism/JsonbPolymorphismTest.java | 92 ++
.../JsonbPolymorphismValidationTest.java | 143 +++
.../java/org/apache/johnzon/mapper/Mapper.java | 2 +-
.../org/apache/johnzon/mapper/MapperBuilder.java | 10 +-
.../org/apache/johnzon/mapper/MapperConfig.java| 13 +-
.../johnzon/mapper/MappingGeneratorImpl.java | 29 +--
.../apache/johnzon/mapper/MappingParserImpl.java | 14 +-
.../java/org/apache/johnzon/mapper/Mappings.java | 24 ++-
.../org/apache/johnzon/mapper/access/Meta.java | 2 +-
.../test/java/org/superbiz/ExtendMappingTest.java | 4 +-
pom.xml| 4 +-
src/site/markdown/index.md | 4 +-
16 files changed, 638 insertions(+), 35 deletions(-)
diff --git
a/johnzon-jsonb/src/main/java/org/apache/johnzon/jsonb/JohnzonBuilder.java
b/johnzon-jsonb/src/main/java/org/apache/johnzon/jsonb/JohnzonBuilder.java
index 4e32ed97..278e814a 100644
--- a/johnzon-jsonb/src/main/java/org/apache/johnzon/jsonb/JohnzonBuilder.java
+++ b/johnzon-jsonb/src/main/java/org/apache/johnzon/jsonb/JohnzonBuilder.java
@@ -31,6 +31,7 @@ import org.apache.johnzon.mapper.Converter;
import org.apache.johnzon.mapper.Mapper;
import org.apache.johnzon.mapper.MapperBuilder;
import org.apache.johnzon.mapper.MapperConfig;
+import org.apache.johnzon.mapper.Mappings;
import org.apache.johnzon.mapper.ObjectConverter;
import org.apache.johnzon.mapper.SerializeValueFilter;
import org.apache.johnzon.mapper.access.AccessMode;
@@ -58,6 +59,7 @@ import java.lang.reflect.Type;
import java.nio.charset.StandardCharsets;
import java.util.*;
import java.util.concurrent.atomic.AtomicReference;
+import java.util.function.Function;
import java.util.function.Supplier;
import java.util.stream.Stream;
@@ -336,6 +338,11 @@ public class JohnzonBuilder implements JsonbBuilder {
if (Closeable.class.isInstance(accessMode)) {
builder.addCloseable(Closeable.class.cast(accessMode));
}
+
+
builder.setMappingsFactory(config.getProperty("johnzon.mappings-factory")
+.map(it -> (Function) it)
+.orElse(JsonbMappings::new));
+
return doCreateJsonb(skipCdi, ijson, builder.build());
}
@@ -469,4 +476,4 @@ public class JohnzonBuilder implements JsonbBuilder {
protected abstract T doCreate();
}
-}
+}
\ No newline at end of file
diff --git
a/johnzon-jsonb/src/main/java/org/apache/johnzon/jsonb/JsonbMappings.java
b/johnzon-jsonb/src/main/java/org/apache/johnzon/jsonb/JsonbMappings.java
new file mode 100644
index ..b399eb85
--- /dev/null
+++ b/johnzon-jsonb/src/main/java/org/apache/johnzon/jsonb/JsonbMappings.java
@@ -0,0 +1,74 @@
+/*
+ * 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, eit
[johnzon] branch master updated: JOHNZON-305 : Java Modules (#99)
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 157cedb5 JOHNZON-305 : Java Modules (#99)
157cedb5 is described below
commit 157cedb52c8b4245e60af6dec88a144fc6595814
Author: Samael
AuthorDate: Fri Jan 27 09:05:43 2023 +
JOHNZON-305 : Java Modules (#99)
* JOHNZON-305: Add Automatic-Module-Name to manifest
* JOHNZON-305: core and jaxrs now use module-info
* configure Automatic-Module-Name in other modules
* set Automatic-Module-Name using bundle plugin
---
johnzon-core/pom.xml | 1 +
johnzon-jaxrs/pom.xml | 9 +
johnzon-jsonb/pom.xml | 1 +
johnzon-jsonlogic/pom.xml | 9 +
johnzon-jsonschema/pom.xml | 9 +
johnzon-mapper/pom.xml | 1 +
johnzon-websocket/pom.xml | 27 ++-
pom.xml| 1 +
8 files changed, 49 insertions(+), 9 deletions(-)
diff --git a/johnzon-core/pom.xml b/johnzon-core/pom.xml
index e17434d7..00cf51c4 100644
--- a/johnzon-core/pom.xml
+++ b/johnzon-core/pom.xml
@@ -40,6 +40,7 @@
maven-bundle-plugin
+
org.apache.johnzon.core
osgi.extender;filter:="(osgi.extender=osgi.serviceloader.registrar)"
osgi.serviceloader;osgi.serviceloader=jakarta.json.spi.JsonProvider
diff --git a/johnzon-jaxrs/pom.xml b/johnzon-jaxrs/pom.xml
index c408766c..3ca4a654 100644
--- a/johnzon-jaxrs/pom.xml
+++ b/johnzon-jaxrs/pom.xml
@@ -65,6 +65,15 @@
+
+org.apache.felix
+maven-bundle-plugin
+
+
+
org.apache.johnzon.jaxrs
+
+
+
org.apache.maven.plugins
maven-shade-plugin
diff --git a/johnzon-jsonb/pom.xml b/johnzon-jsonb/pom.xml
index 7bcfd30b..5ad89d04 100644
--- a/johnzon-jsonb/pom.xml
+++ b/johnzon-jsonb/pom.xml
@@ -144,6 +144,7 @@
maven-bundle-plugin
+
org.apache.johnzon.jsonb
javax.ws.rs.*;resolution:=optional,
*
diff --git a/johnzon-jsonlogic/pom.xml b/johnzon-jsonlogic/pom.xml
index 48cffa60..e2a47521 100644
--- a/johnzon-jsonlogic/pom.xml
+++ b/johnzon-jsonlogic/pom.xml
@@ -40,6 +40,15 @@
+
+org.apache.felix
+maven-bundle-plugin
+
+
+
org.apache.johnzon.jsonlogic
+
+
+
org.apache.maven.plugins
maven-shade-plugin
diff --git a/johnzon-jsonschema/pom.xml b/johnzon-jsonschema/pom.xml
index 21347f86..d4e65049 100644
--- a/johnzon-jsonschema/pom.xml
+++ b/johnzon-jsonschema/pom.xml
@@ -54,6 +54,15 @@
+
+org.apache.felix
+maven-bundle-plugin
+
+
+
org.apache.johnzon.jsonschema
+
+
+
org.apache.maven.plugins
maven-shade-plugin
diff --git a/johnzon-mapper/pom.xml b/johnzon-mapper/pom.xml
index 312b5343..c4666137 100644
--- a/johnzon-mapper/pom.xml
+++ b/johnzon-mapper/pom.xml
@@ -78,6 +78,7 @@
maven-bundle-plugin
+
org.apache.johnzon.mapper
{local-packages};-split-package:=error,org.apache.johnzon.mapper.internal
diff --git a/johnzon-websocket/pom.xml b/johnzon-websocket/pom.xml
index d8adbf69..a86963ea 100644
--- a/johnzon-websocket/pom.xml
+++ b/johnzon-websocket/pom.xml
@@ -144,15 +144,24 @@
-
- org.apache.maven.plugins
- maven-surefire-plugin
-
-
-
https://repo1.maven.org/maven2/
-
-
-
+
+org.apache.maven.plugins
+maven-surefire-plugin
+
+
+
https://repo1.maven.org/maven2/
+
+
+
+
+org.apache.felix
+maven-bundle-plugin
+
+
+
org.apache.johnzon.websocket
+
+
+
org.apache.maven.plugins
maven-shade-plugin
diff --git a/pom.xml b/pom.xml
index 521f2d10..86e68aa2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -304,6 +304,7 @@
UTF-8
+ **/module-info*
true
true
true
[johnzon] branch master updated: [JOHNZON-390] ensure jsonb creator/constructor parameters respect naming strategy
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 b25243b2 [JOHNZON-390] ensure jsonb creator/constructor parameters
respect naming strategy
b25243b2 is described below
commit b25243b23f36f257e47d8fce9b914bb5c882889c
Author: Romain Manni-Bucau
AuthorDate: Thu Dec 8 11:39:58 2022 +0100
[JOHNZON-390] ensure jsonb creator/constructor parameters respect naming
strategy
---
.../org/apache/johnzon/jsonb/JsonbAccessMode.java | 6 +--
.../java/org/apache/johnzon/jsonb/NamingTest.java | 61 ++
.../org/apache/johnzon/jsonb/test/JsonbRule.java | 5 ++
.../jsonschema/JsonSchemaValidatorFactory.java | 15 +++---
.../jsonschema/JsonSchemaValidatorTest.java| 29 ++
pom.xml| 1 +
6 files changed, 108 insertions(+), 9 deletions(-)
diff --git
a/johnzon-jsonb/src/main/java/org/apache/johnzon/jsonb/JsonbAccessMode.java
b/johnzon-jsonb/src/main/java/org/apache/johnzon/jsonb/JsonbAccessMode.java
index a0d0d8c6..49411f56 100644
--- a/johnzon-jsonb/src/main/java/org/apache/johnzon/jsonb/JsonbAccessMode.java
+++ b/johnzon-jsonb/src/main/java/org/apache/johnzon/jsonb/JsonbAccessMode.java
@@ -252,13 +252,13 @@ public class JsonbAccessMode implements AccessMode,
Closeable, Cleanable
naming.translateName(parameter.getName())) :
+naming.translateName(parameter.getName()));
final JsonbTypeAdapter adapter = getAnnotation(parameter,
JsonbTypeAdapter.class);
final JsonbDateFormat dateFormat = getAnnotation(parameter,
JsonbDateFormat.class);
diff --git
a/johnzon-jsonb/src/test/java/org/apache/johnzon/jsonb/NamingTest.java
b/johnzon-jsonb/src/test/java/org/apache/johnzon/jsonb/NamingTest.java
new file mode 100644
index ..715523af
--- /dev/null
+++ b/johnzon-jsonb/src/test/java/org/apache/johnzon/jsonb/NamingTest.java
@@ -0,0 +1,61 @@
+/*
+ * 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.jsonb;
+
+import org.apache.johnzon.jsonb.test.JsonbRule;
+import org.junit.Rule;
+import org.junit.Test;
+
+import javax.json.bind.annotation.JsonbCreator;
+import javax.json.bind.config.PropertyNamingStrategy;
+import java.util.StringJoiner;
+
+import static org.junit.Assert.assertEquals;
+
+public class NamingTest {
+@Rule
+public final JsonbRule jsonb = new JsonbRule()
+
.withPropertyNamingStrategy(PropertyNamingStrategy.LOWER_CASE_WITH_UNDERSCORES);
+
+@Test
+public void lower() {
+assertEquals("{\"first_name\":\"test\"}", jsonb.toJson(new
Model("test")));
+assertEquals("Model[firstName='test']",
jsonb.fromJson("{\"first_name\":\"test\"}", Model.class).toString());
+}
+
+public static class Model {
+public final String firstName;
+
+private Model(final String firstName) {
+this.firstName = firstName;
+}
+
+@Override
+public String toString() {
+return new StringJoiner(", ", Model.class.getSimpleName() + "[",
"]")
+.add("firstName='" + firstName + "'")
+.toString();
+}
+
+@JsonbCreator
+public static Model create(final String firstName) {
+return new Model(firstName);
+}
+}
+}
diff --git
a/johnzon-jsonb/src/test/java/org/apache/johnzon/jsonb/test/JsonbRule.java
b/johnzon-jsonb/src/test/java/org/apache/johnzon/jsonb/test/JsonbRule.java
index 62779863..f617fe1e 100644
--- a/johnzon-jsonb/src/test/java/org/apache/johnzon/jsonb/test/JsonbRule.java
+++ b/johnzon-jsonb/src/test/java/org/apache/johnzon/jsonb/test/JsonbRule.java
@@ -47,6 +47,11 @@ public class JsonbRule implements TestRule, Jsonb,
JsonbExtension {
return this;
}
+public JsonbRule withPropertyNamingStrategy(final String
propertyorderstrategy) {
+
[johnzon] branch master updated: update maven plugins (#96)
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 039fe142 update maven plugins (#96)
039fe142 is described below
commit 039fe142944de529fbe8c84badea67b848dc2ff8
Author: Samael
AuthorDate: Mon Nov 14 16:04:14 2022 +
update maven plugins (#96)
* Update Maven Plugins (except those from base pom)
* Fix Javadoc errors
* Replace findbugs with spotbugs
---
.github/workflows/maven.yml| 3 -
.../org/apache/johnzon/jsonb/JsonbRecordTest.java | 2 +-
.../java/org/apache/johnzon/mapper/Adapter.java| 10 +-
.../org/apache/johnzon/mapper/JohnzonRecord.java | 2 +-
.../mapper/internal/JsonPointerTracker.java| 2 +-
.../org/apache/johnzon/mapper/util/BeanUtil.java | 10 +-
johnzon-maven-plugin/pom.xml | 26 ++-
johnzon-osgi/pom.xml | 4 +
johnzon-websocket/pom.xml | 7 -
pom.xml| 202 -
10 files changed, 157 insertions(+), 111 deletions(-)
diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
index 8a0ad739..4fe88968 100644
--- a/.github/workflows/maven.yml
+++ b/.github/workflows/maven.yml
@@ -26,6 +26,3 @@ jobs:
env:
MAVEN_OPTS: -Dmaven.artifact.threads=64
run: mvn -V package --no-transfer-progress
-
- #- name: Maven javadoc
- # run: mvn javadoc:javadoc -Ddoclint=all --no-transfer-progress
diff --git
a/johnzon-jsonb/src/test/java/org/apache/johnzon/jsonb/JsonbRecordTest.java
b/johnzon-jsonb/src/test/java/org/apache/johnzon/jsonb/JsonbRecordTest.java
index 81e28e3d..8560ee9c 100644
--- a/johnzon-jsonb/src/test/java/org/apache/johnzon/jsonb/JsonbRecordTest.java
+++ b/johnzon-jsonb/src/test/java/org/apache/johnzon/jsonb/JsonbRecordTest.java
@@ -46,7 +46,7 @@ public class JsonbRecordTest {
private final String name;
public Record(@JohnzonRecord.Name("age") final int age,
- @JohnzonRecord.Name("name") @JsonbProperty("_name")
final String name) { // simulate custom constructor
+ @JohnzonRecord.Name("name") @JsonbProperty("_name")
final String name) { // simulate custom constructor
this.age = age;
this.name = name;
}
diff --git
a/johnzon-mapper/src/main/java/org/apache/johnzon/mapper/Adapter.java
b/johnzon-mapper/src/main/java/org/apache/johnzon/mapper/Adapter.java
index abbd25c7..0ffad873 100644
--- a/johnzon-mapper/src/main/java/org/apache/johnzon/mapper/Adapter.java
+++ b/johnzon-mapper/src/main/java/org/apache/johnzon/mapper/Adapter.java
@@ -29,25 +29,23 @@ package org.apache.johnzon.mapper;
* Our {@code Mapper} should treat it as a {@code java.util.Date}.
* For doing so we create a {@code DateHolderAdapter} like the following
example shows:
*
- * {@code
- * public static class DateHolderAdapter implements Adapter {
- * @Override
+ * {@code public static class DateHolderAdapter implements Adapter} {
+ * {@code @Override}
* public DateHolder to(Date date) {
* DateHolder dh = new DateHolder(date.getTime());
* return dh;
* }
*
- * @Override
+ * {@code @Override}
* public Date from(DateHolder dateHolder) {
*return new Date(dateHolder.getDate());
* }
* }
- * }
*
*
* Consider a POJO has a DateHolder.
* When serialising the {@code Mapper} will first use the {@code
DateHolderAdapter#from(DateHolder)} and from there to JSON.
- * When reading JSON the {@code to(Date}} method will be used.
+ * When reading JSON the {@code to(Date)} method will be used.
*
* @param The Java type in the POJO (Plain Old Java Object)
* @param The Java Type which will be used to transform to JSON.
diff --git
a/johnzon-mapper/src/main/java/org/apache/johnzon/mapper/JohnzonRecord.java
b/johnzon-mapper/src/main/java/org/apache/johnzon/mapper/JohnzonRecord.java
index d57a0b8c..8516a0f1 100644
--- a/johnzon-mapper/src/main/java/org/apache/johnzon/mapper/JohnzonRecord.java
+++ b/johnzon-mapper/src/main/java/org/apache/johnzon/mapper/JohnzonRecord.java
@@ -28,7 +28,7 @@ import java.lang.annotation.Target;
/**
* Forces method named as properties to be used as getters (String foo() will
match the attribute foo).
* Also enables a constructor with all properties even if not marked as
@ConstructorProperties or equivalent.
- * It simulates java >= 14 record style.
+ * It simulates Java 14+ records.
*/
@Target({ TYPE })
@Retention(RUNTIME)
diff --git
a/johnzon-mapper/src/main/java/org/apache/johnzon/mapper/internal/JsonPointerTracker.java
b/johnzon-mapper/src/main/java/org/apache/johnzon/mapper/internal/Js
[johnzon] branch master updated: fixes for Javadoc errors and some warnings (#95)
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 e7418157 fixes for Javadoc errors and some warnings (#95)
e7418157 is described below
commit e7418157680f3fbd29fa7a5e79b269565d24f7fc
Author: Samael
AuthorDate: Mon Nov 14 10:23:29 2022 +
fixes for Javadoc errors and some warnings (#95)
---
.../main/java/org/apache/johnzon/core/BufferStrategyFactory.java | 2 ++
johnzon-core/src/main/java/org/apache/johnzon/core/Buffered.java | 3 ++-
.../main/java/org/apache/johnzon/core/JsonStreamParserImpl.java | 1 +
.../src/main/java/org/apache/johnzon/core/util/ArrayUtil.java | 2 ++
.../src/main/java/org/apache/johnzon/mapper/Adapter.java | 8 +++-
.../src/main/java/org/apache/johnzon/mapper/Converter.java| 4 ++--
.../java/org/apache/johnzon/mapper/JohnzonDeduplicateObjects.java | 2 +-
7 files changed, 17 insertions(+), 5 deletions(-)
diff --git
a/johnzon-core/src/main/java/org/apache/johnzon/core/BufferStrategyFactory.java
b/johnzon-core/src/main/java/org/apache/johnzon/core/BufferStrategyFactory.java
index 62556a57..dd092a53 100644
---
a/johnzon-core/src/main/java/org/apache/johnzon/core/BufferStrategyFactory.java
+++
b/johnzon-core/src/main/java/org/apache/johnzon/core/BufferStrategyFactory.java
@@ -51,6 +51,8 @@ public class BufferStrategyFactory {
*
* You can also pass in a fully qualified class name of a custom {@link
BufferStrategy}.
*
+ * @param strategyName one of the supported BufferStrategies as per above
+ * @return an instance of the chosen BufferStrategy
* @throws IllegalArgumentException if the given strategyName does not
resolve to a BufferStrategy.
*/
public static BufferStrategy valueOf(String strategyName) {
diff --git a/johnzon-core/src/main/java/org/apache/johnzon/core/Buffered.java
b/johnzon-core/src/main/java/org/apache/johnzon/core/Buffered.java
index 40cabfb7..17f29f39 100644
--- a/johnzon-core/src/main/java/org/apache/johnzon/core/Buffered.java
+++ b/johnzon-core/src/main/java/org/apache/johnzon/core/Buffered.java
@@ -17,7 +17,7 @@
package org.apache.johnzon.core;
/**
- * A Buffered is a source or destination of data that is buffered
+ * A Buffered is a source or destination of data that is buffered
* before writing or reading. The bufferSize method allows all participants
* in the underlying stream to align on this buffer size for optimization.
*
@@ -31,6 +31,7 @@ public interface Buffered { //
https://github.com/apache/johnzon/pull/84#discuss
/**
* The buffer size used by this stream while reading input or before
writing
* output to the underlying stream.
+ * @return the size of the buffer
*/
int bufferSize();
}
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 c511e0d4..c854069d 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
@@ -208,6 +208,7 @@ public class JsonStreamParserImpl extends
JohnzonJsonParserImpl implements JsonC
}
/**
+ * @param currentLength length of the buffer
* @return the amount of bytes the current buffer should get extended with
*/
protected int getBufferExtends(int currentLength) {
diff --git
a/johnzon-core/src/main/java/org/apache/johnzon/core/util/ArrayUtil.java
b/johnzon-core/src/main/java/org/apache/johnzon/core/util/ArrayUtil.java
index 22904d31..b1942387 100644
--- a/johnzon-core/src/main/java/org/apache/johnzon/core/util/ArrayUtil.java
+++ b/johnzon-core/src/main/java/org/apache/johnzon/core/util/ArrayUtil.java
@@ -146,6 +146,8 @@ public final class ArrayUtil {
/**
* Take the given array object and fill a fresh Collection with it.
+ * @param array an array that is to be duplicated
+ * @return a new collection of the original array elements
* @throws IllegalArgumentException if the given value this is not an
array.
*/
public static Collection newCollection(Object array) {
diff --git
a/johnzon-mapper/src/main/java/org/apache/johnzon/mapper/Adapter.java
b/johnzon-mapper/src/main/java/org/apache/johnzon/mapper/Adapter.java
index fd635492..abbd25c7 100644
--- a/johnzon-mapper/src/main/java/org/apache/johnzon/mapper/Adapter.java
+++ b/johnzon-mapper/src/main/java/org/apache/johnzon/mapper/Adapter.java
@@ -22,13 +22,14 @@ package org.apache.johnzon.mapper;
* An Adapter is similar to a {@link Converter}.
* The main difference is that a Converter always converts from/to a String.
* An adapter might e.g. convert to a Date or any other Object which will
- * then be json-ified.
+ * then be json-ified
[johnzon] branch master updated: make build reproducible (#93)
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 514250ad make build reproducible (#93)
514250ad is described below
commit 514250adb46fc13fa42c5e48d1151f6cb83f6429
Author: Hervé Boutemy
AuthorDate: Sun Nov 13 17:22:09 2022 +0100
make build reproducible (#93)
---
johnzon-core/pom.xml | 1 -
johnzon-jaxrs/pom.xml| 1 -
johnzon-json-extras/pom.xml | 1 -
johnzon-jsonb/pom.xml| 1 -
johnzon-jsonlogic/pom.xml| 1 -
johnzon-jsonp-strict/pom.xml | 1 -
johnzon-jsonschema/pom.xml | 1 -
johnzon-mapper/pom.xml | 1 -
johnzon-websocket/pom.xml| 1 -
pom.xml | 9 -
10 files changed, 4 insertions(+), 14 deletions(-)
diff --git a/johnzon-core/pom.xml b/johnzon-core/pom.xml
index 03d084e5..4128b995 100644
--- a/johnzon-core/pom.xml
+++ b/johnzon-core/pom.xml
@@ -48,7 +48,6 @@
org.apache.maven.plugins
maven-shade-plugin
-3.2.2
diff --git a/johnzon-jaxrs/pom.xml b/johnzon-jaxrs/pom.xml
index 5ffaa968..32d9b2ac 100644
--- a/johnzon-jaxrs/pom.xml
+++ b/johnzon-jaxrs/pom.xml
@@ -68,7 +68,6 @@
org.apache.maven.plugins
maven-shade-plugin
-3.2.2
diff --git a/johnzon-json-extras/pom.xml b/johnzon-json-extras/pom.xml
index 522fa81f..ea9918b7 100644
--- a/johnzon-json-extras/pom.xml
+++ b/johnzon-json-extras/pom.xml
@@ -53,7 +53,6 @@
org.apache.maven.plugins
maven-shade-plugin
-3.2.2
diff --git a/johnzon-jsonb/pom.xml b/johnzon-jsonb/pom.xml
index 51c53d53..f5b99c1e 100644
--- a/johnzon-jsonb/pom.xml
+++ b/johnzon-jsonb/pom.xml
@@ -110,7 +110,6 @@
org.apache.maven.plugins
maven-shade-plugin
-3.2.2
org.apache.felix
diff --git a/johnzon-jsonlogic/pom.xml b/johnzon-jsonlogic/pom.xml
index cecae60d..c1760532 100644
--- a/johnzon-jsonlogic/pom.xml
+++ b/johnzon-jsonlogic/pom.xml
@@ -43,7 +43,6 @@
org.apache.maven.plugins
maven-shade-plugin
-3.2.2
diff --git a/johnzon-jsonp-strict/pom.xml b/johnzon-jsonp-strict/pom.xml
index 9720adfd..5733925e 100644
--- a/johnzon-jsonp-strict/pom.xml
+++ b/johnzon-jsonp-strict/pom.xml
@@ -46,7 +46,6 @@
org.apache.maven.plugins
maven-shade-plugin
-3.2.2
org.apache.felix
diff --git a/johnzon-jsonschema/pom.xml b/johnzon-jsonschema/pom.xml
index 61e7e6cc..7b3a796e 100644
--- a/johnzon-jsonschema/pom.xml
+++ b/johnzon-jsonschema/pom.xml
@@ -57,7 +57,6 @@
org.apache.maven.plugins
maven-shade-plugin
-3.2.2
diff --git a/johnzon-mapper/pom.xml b/johnzon-mapper/pom.xml
index 05bc495f..3390665a 100644
--- a/johnzon-mapper/pom.xml
+++ b/johnzon-mapper/pom.xml
@@ -68,7 +68,6 @@
org.apache.maven.plugins
maven-shade-plugin
-3.2.2
diff --git a/johnzon-websocket/pom.xml b/johnzon-websocket/pom.xml
index f845ab60..1dc39f11 100644
--- a/johnzon-websocket/pom.xml
+++ b/johnzon-websocket/pom.xml
@@ -143,7 +143,6 @@
org.apache.maven.plugins
maven-shade-plugin
-3.2.2
org.codehaus.mojo
diff --git a/pom.xml b/pom.xml
index 75689dcd..7af69dc6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@
org.apache
apache
-21
+27
org.apache.johnzon
@@ -39,10 +39,11 @@
1.5
1.4
UTF-8
+10
https://svn.apache.org/repos/asf/johnzon/site/publish/
scm:svn:${johnzon.site.url}
${project.build.directory}/site
-5.1.4
+5.1.8
[$(version;==;$(@)),$(version;+;$(@)))
6.1.0
1.8
@@ -102,7 +103,7 @@
org.apache.maven.plugins
maven-shade-plugin
- 3.2.2
+ 3.2.3
jakarta
@@ -353,7 +354,6 @@
org.apache.maven.plugins
maven-source-plugin
-2.3
generate-sources
@@ -367,7 +367,6 @@
org.apache.maven.plugins
maven-jar-plugin
-2.5
true
[johnzon] branch master updated (b550cb2a -> e8c504f2)
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 b550cb2a [maven-release-plugin] prepare for next development iteration new a25349d0 add github action new 017dae0a adopt version for JDK 1.8 should be '8' new 0c123b09 changes as per PR comments new b707cff7 changes as per PR comments new e8c504f2 Merge pull request #94 from SingingBush/github_actions The 952 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 | 31 +++ .travis.yml | 10 -- 2 files changed, 31 insertions(+), 10 deletions(-) create mode 100644 .github/workflows/maven.yml delete mode 100644 .travis.yml
svn commit: r1903623 - in /johnzon/site/publish: ./ apidocs/ apidocs/org/apache/johnzon/core/ apidocs/org/apache/johnzon/core/class-use/ apidocs/org/apache/johnzon/core/io/ apidocs/org/apache/johnzon/
Author: rmannibucau Date: Mon Aug 22 07:08:46 2022 New Revision: 1903623 URL: http://svn.apache.org/viewvc?rev=1903623=rev Log: Site checkin for project Apache Johnzon [This commit notification would consist of 88 parts, which exceeds the limit of 50 ones, so it was shortened to the summary.]
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(-)
[johnzon] branch master updated: PojoGenerator extension point before declaration
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 60ba23ca PojoGenerator extension point before declaration
60ba23ca is described below
commit 60ba23cac6ac770e9f7edb4301c4ec5d492d2481
Author: Romain Manni-Bucau
AuthorDate: Tue Aug 9 10:44:55 2022 +0200
PojoGenerator extension point before declaration
---
.../org/apache/johnzon/jsonschema/generator/PojoGenerator.java | 10 ++
1 file changed, 10 insertions(+)
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 5db62394..0f0ba037 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
@@ -77,6 +77,7 @@ public class PojoGenerator {
.sorted()
.map(it -> "import " + it + ";")
.collect(joining("\n", "", "\n\n"))) +
+beforeClassDeclaration() +
"public class " + configuration.getClassName() +
afterClassName() + " {\n" +
(attributes.isEmpty() ?
("" +
@@ -223,6 +224,14 @@ public class PojoGenerator {
return "";
}
+protected String beforeEnumDeclaration() {
+return "";
+}
+
+protected String beforeClassDeclaration() {
+return "";
+}
+
protected String asType(final String javaName, final JsonObject schema,
final boolean required) {
final JsonValue ref = schema.get("$ref");
if (ref != null && ref.getValueType() == JsonValue.ValueType.STRING) {
@@ -334,6 +343,7 @@ public class PojoGenerator {
"package " + configuration.getPackageName() + ";\n" +
"\n" +
enumImports() +
+beforeEnumDeclaration() +
"public enum " + className + afterEnumName(values,
injectValues) + " {\n" +
values.entrySet().stream()
.map(it -> "" +
[johnzon] 02/02: [JOHNZON-387] inject more data in afterEnumName to avoid subclasses to recompute it
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 f4d074be27122e7bf022c64b1f37704fcb84b42c
Author: Romain Manni-Bucau
AuthorDate: Tue Aug 9 10:31:33 2022 +0200
[JOHNZON-387] inject more data in afterEnumName to avoid subclasses to
recompute it
---
.../org/apache/johnzon/jsonschema/generator/PojoGenerator.java | 9 +++--
1 file changed, 7 insertions(+), 2 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 7264ddc5..5db62394 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
@@ -210,7 +210,12 @@ public class PojoGenerator {
return "";
}
-protected String afterEnumName() {
+/**
+ * @param values the enum values (key is json name, value is java name).
+ * @param valuesAreInjected is there a toString() with json name or is the
enum anemic (only values, no method)
+ * @return the data to add after enum name and before the opening brace in
enum declaration.
+ */
+protected String afterEnumName(final Map values, final
boolean valuesAreInjected) {
return "";
}
@@ -329,7 +334,7 @@ public class PojoGenerator {
"package " + configuration.getPackageName() + ";\n" +
"\n" +
enumImports() +
-"public enum " + className + afterEnumName() + " {\n" +
+"public enum " + className + afterEnumName(values,
injectValues) + " {\n" +
values.entrySet().stream()
.map(it -> "" +
(injectValues &&
configuration.isAddJsonbProperty() ?
[johnzon] 01/02: [JOHNZON-387] expose toJavaName to subclasses 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
commit c98558803b72a5ddf32c62ca1cdd523a95ca72cb
Author: Romain Manni-Bucau
AuthorDate: Tue Aug 9 10:29:54 2022 +0200
[JOHNZON-387] expose toJavaName to subclasses in PojoGenerator
---
.../java/org/apache/johnzon/jsonschema/generator/PojoGenerator.java | 2 +-
1 file changed, 1 insertion(+), 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 c50c4af2..7264ddc5 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
@@ -544,7 +544,7 @@ public class PojoGenerator {
return JsonValue.class.getSimpleName();
}
-private String toJavaName(final String key) {
+protected String toJavaName(final String key) {
String name = key.chars()
.mapToObj(i ->
Character.toString(!Character.isJavaIdentifierPart(i) ? '_' : (char) i))
.collect(joining());
[johnzon] branch master updated (ca39ffc8 -> f4d074be)
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 ca39ffc8 [JOHNZON-387] enum extension points in PojoGenerator new c9855880 [JOHNZON-387] expose toJavaName to subclasses in PojoGenerator new f4d074be [JOHNZON-387] inject more data in afterEnumName to avoid subclasses to recompute it 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: .../apache/johnzon/jsonschema/generator/PojoGenerator.java| 11 --- 1 file changed, 8 insertions(+), 3 deletions(-)
[johnzon] branch master updated: [JOHNZON-387] enum extension points 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 ca39ffc8 [JOHNZON-387] enum extension points in PojoGenerator
ca39ffc8 is described below
commit ca39ffc8e45b0c9d4e407a35297e3740b6342737
Author: Romain Manni-Bucau
AuthorDate: Tue Aug 9 10:25:28 2022 +0200
[JOHNZON-387] enum extension points in PojoGenerator
---
.../johnzon/jsonschema/generator/PojoGenerator.java | 16 +++-
1 file changed, 15 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 00989c38..c50c4af2 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
@@ -198,6 +198,10 @@ public class PojoGenerator {
return null; // todo: check if already in nested for ex
}
+protected String beforeEnumEnd() {
+return "";
+}
+
protected String beforeClassEnd() {
return "";
}
@@ -206,6 +210,14 @@ public class PojoGenerator {
return "";
}
+protected String afterEnumName() {
+return "";
+}
+
+protected String enumImports() {
+return "";
+}
+
protected String asType(final String javaName, final JsonObject schema,
final boolean required) {
final JsonValue ref = schema.get("$ref");
if (ref != null && ref.getValueType() == JsonValue.ValueType.STRING) {
@@ -316,7 +328,8 @@ public class PojoGenerator {
configuration.getPackageName().replace('.', '/') + '/' +
className + ".java", "" +
"package " + configuration.getPackageName() + ";\n" +
"\n" +
-"public enum " + className + " {\n" +
+enumImports() +
+"public enum " + className + afterEnumName() + " {\n" +
values.entrySet().stream()
.map(it -> "" +
(injectValues &&
configuration.isAddJsonbProperty() ?
@@ -338,6 +351,7 @@ public class PojoGenerator {
"}\n" +
"" :
"") +
+beforeEnumEnd() +
"}\n");
return className;
}
[johnzon] branch master updated: ensure sub pojogenerators can have the schema they relate to
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 19764534 ensure sub pojogenerators can have the schema they relate to
19764534 is described below
commit 197645342ff8d844765886dd15a0f2b69a3111ff
Author: Romain Manni-Bucau
AuthorDate: Mon Aug 8 19:19:07 2022 +0200
ensure sub pojogenerators can have the schema they relate to
---
.../java/org/apache/johnzon/jsonschema/generator/PojoGenerator.java | 6 +++---
1 file changed, 3 insertions(+), 3 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 5b02aed8..00989c38 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
@@ -425,7 +425,7 @@ public class PojoGenerator {
.setClassName(className)
.setAddJsonbProperty(configuration.isAddJsonbProperty())
.setAddAllArgsConstructor(configuration.isAddAllArgsConstructor())
-.setOnRef(configuration.getOnRef()))
+.setOnRef(configuration.getOnRef()), schema)
.visitSchema(schema)
.generate());
return className;
@@ -435,7 +435,7 @@ public class PojoGenerator {
return JsonObject.class.getSimpleName();
}
-protected PojoGenerator newSubPojoGenerator(final PojoConfiguration
pojoConfiguration) {
+protected PojoGenerator newSubPojoGenerator(final PojoConfiguration
pojoConfiguration, final JsonObject schema) {
return new PojoGenerator(pojoConfiguration);
}
@@ -467,7 +467,7 @@ public class PojoGenerator {
.setClassName(className)
.setAddJsonbProperty(configuration.isAddJsonbProperty())
.setAddAllArgsConstructor(configuration.isAddAllArgsConstructor())
-.setOnRef(configuration.getOnRef()))
+.setOnRef(configuration.getOnRef()), schema)
.visitSchema(schema)
.generate());
return className;
[johnzon] branch master updated: Expose PojoGenerator#Attribute attributesfields to subclasses
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 cfdf37a5 Expose PojoGenerator#Attribute attributesfields to subclasses
cfdf37a5 is described below
commit cfdf37a5d16a42a0e8e254d61af7e5628cad82a2
Author: Romain Manni-Bucau
AuthorDate: Mon Aug 8 19:17:23 2022 +0200
Expose PojoGenerator#Attribute attributesfields to subclasses
---
.../johnzon/jsonschema/generator/PojoGenerator.java| 18 +++---
1 file changed, 15 insertions(+), 3 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 f63761ba..5b02aed8 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
@@ -670,15 +670,27 @@ public class PojoGenerator {
}
protected static class Attribute {
-private final String javaName;
-private final String jsonName;
-private final String type;
+protected final String javaName;
+protected final String jsonName;
+protected final String type;
protected Attribute(final String javaName, final String jsonName,
final String type) {
this.javaName = javaName;
this.jsonName = jsonName;
this.type = type;
}
+
+public String getJavaName() {
+return javaName;
+}
+
+public String getJsonName() {
+return jsonName;
+}
+
+public String getType() {
+return type;
+}
}
public static class Ref {
[johnzon] branch master updated: fixing field name in PojoGenerator (starting uppercase)
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 dde6cd7d fixing field name in PojoGenerator (starting uppercase)
dde6cd7d is described below
commit dde6cd7df6f1bbecb5bf8b3ac8f29121e1e003ac
Author: Romain Manni-Bucau
AuthorDate: Mon Aug 8 17:47:40 2022 +0200
fixing field name in PojoGenerator (starting uppercase)
---
.../java/org/apache/johnzon/jsonschema/generator/PojoGenerator.java | 2 +-
1 file changed, 1 insertion(+), 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 9fd9f4c4..f63761ba 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
@@ -560,7 +560,7 @@ public class PojoGenerator {
protected String toCamelCase(final String name) {
final StringBuilder out = new StringBuilder(name.length());
-boolean up = true;
+boolean up = false;
for (final char c : name.toCharArray()) {
if (up) {
out.append(Character.toUpperCase(c));
[johnzon] branch master updated: try to have more java friendly names in PojoGenerator - bad completion
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 62dbff7b try to have more java friendly names in PojoGenerator - bad
completion
62dbff7b is described below
commit 62dbff7b08764c98bf7b1dff8e437322d073a51d
Author: Romain Manni-Bucau
AuthorDate: Mon Aug 8 17:33:26 2022 +0200
try to have more java friendly names in PojoGenerator - bad completion
---
.../java/org/apache/johnzon/jsonschema/generator/PojoGenerator.java | 2 +-
1 file changed, 1 insertion(+), 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 29316bec..9fd9f4c4 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
@@ -563,7 +563,7 @@ public class PojoGenerator {
boolean up = true;
for (final char c : name.toCharArray()) {
if (up) {
-out.append(Character.isUpperCase(c));
+out.append(Character.toUpperCase(c));
up = false;
} else if (c == '_') {
up = true;
[johnzon] branch master updated: try to have more java friendly names 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 544311af try to have more java friendly names in PojoGenerator
544311af is described below
commit 544311af11052adaa686368c8cf8b1a57935c024
Author: Romain Manni-Bucau
AuthorDate: Mon Aug 8 17:31:53 2022 +0200
try to have more java friendly names in PojoGenerator
---
.../johnzon/jsonschema/generator/PojoGenerator.java | 20
1 file changed, 20 insertions(+)
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 62bb2ccb..29316bec 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
@@ -548,12 +548,32 @@ public class PojoGenerator {
name += "Value";
}
+if (name.contains("_")) {
+name = toCamelCase(name);
+}
+
if (!Objects.equals(key, name) && configuration.isAddJsonbProperty()) {
imports.add(JsonbProperty.class.getName());
}
return name;
}
+protected String toCamelCase(final String name) {
+final StringBuilder out = new StringBuilder(name.length());
+boolean up = true;
+for (final char c : name.toCharArray()) {
+if (up) {
+out.append(Character.isUpperCase(c));
+up = false;
+} else if (c == '_') {
+up = true;
+} else {
+out.append(c);
+}
+}
+return out.toString();
+}
+
protected boolean isReserved(final String name) {
return "continue".equals(name) || "break".equals(name) ||
"default".equals(name) ||
"do".equals(name) || "while".equals(name) ||
[johnzon] branch master updated: adding enum to reserved words for pojo generator and being stricter on forbidden starting chars for fields
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 af7a399c adding enum to reserved words for pojo generator and being
stricter on forbidden starting chars for fields
af7a399c is described below
commit af7a399ce876d98be44f60d7834c0e47f0d07530
Author: Romain Manni-Bucau
AuthorDate: Mon Aug 8 16:48:38 2022 +0200
adding enum to reserved words for pojo generator and being stricter on
forbidden starting chars for fields
---
.../java/org/apache/johnzon/jsonschema/generator/PojoGenerator.java| 3 ++-
1 file changed, 2 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 28dbd705..62bb2ccb 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
@@ -537,7 +537,7 @@ public class PojoGenerator {
if (Character.isDigit(name.charAt(0))) {
name = "a" + name;
}
-while (name.startsWith("_")) {
+while (!name.isEmpty() &&
(!Character.isJavaIdentifierStart(name.charAt(0)) || name.charAt(0) == '_' ||
name.charAt(0) == '$')) {
name = name.substring(1);
}
if (name.isEmpty()) {
@@ -559,6 +559,7 @@ public class PojoGenerator {
"do".equals(name) || "while".equals(name) ||
"for".equals(name) ||
"if".equals(name) || "else".equals(name) ||
+"enum".equals(name) ||
"int".equals(name) ||
"long".equals(name) ||
"float".equals(name) ||
[johnzon] branch master updated: [JOHNZON-387] ensure ref has enclosing name - wrong param order
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 f908ae55 [JOHNZON-387] ensure ref has enclosing name - wrong param
order
f908ae55 is described below
commit f908ae55b818f7c231a36e7bf3931773016f7900
Author: Romain Manni-Bucau
AuthorDate: Mon Aug 8 16:16:13 2022 +0200
[JOHNZON-387] ensure ref has enclosing name - wrong param order
---
.../java/org/apache/johnzon/jsonschema/generator/PojoGenerator.java | 4 ++--
1 file changed, 2 insertions(+), 2 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 7f058ad9..28dbd705 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
@@ -443,8 +443,8 @@ public class PojoGenerator {
final JsonValue ref = schema.get("$ref");
if (ref != null && ref.getValueType() == JsonValue.ValueType.STRING) {
final String name = onRef(new Ref(
-configuration.getClassName(),
-JsonString.class.cast(ref).getString(), imports,
attributes, nested));
+JsonString.class.cast(ref).getString(),
configuration.getClassName(),
+imports, attributes, nested));
if (name != null) {
return name;
}
[johnzon] 02/02: [JOHNZON-387] ensure ref has enclosing name
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 e70c27e5c0f0b8cb93a2cf3b64ecdb790c625686
Author: Romain Manni-Bucau
AuthorDate: Mon Aug 8 16:12:41 2022 +0200
[JOHNZON-387] ensure ref has enclosing name
---
.../johnzon/jsonschema/generator/PojoGenerator.java | 15 ---
1 file changed, 12 insertions(+), 3 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 7625a2fb..7f058ad9 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
@@ -209,7 +209,8 @@ public class PojoGenerator {
protected String asType(final String javaName, final JsonObject schema,
final boolean required) {
final JsonValue ref = schema.get("$ref");
if (ref != null && ref.getValueType() == JsonValue.ValueType.STRING) {
-final String name = onRef(new
Ref(JsonString.class.cast(ref).getString(), imports, attributes, nested));
+final String name = onRef(new Ref(
+JsonString.class.cast(ref).getString(),
configuration.getClassName(), imports, attributes, nested));
if (name != null) {
return name;
}
@@ -441,7 +442,9 @@ public class PojoGenerator {
protected String onItemSchema(final String javaName, final JsonObject
schema) {
final JsonValue ref = schema.get("$ref");
if (ref != null && ref.getValueType() == JsonValue.ValueType.STRING) {
-final String name = onRef(new
Ref(JsonString.class.cast(ref).getString(), imports, attributes, nested));
+final String name = onRef(new Ref(
+configuration.getClassName(),
+JsonString.class.cast(ref).getString(), imports,
attributes, nested));
if (name != null) {
return name;
}
@@ -659,18 +662,24 @@ public class PojoGenerator {
public static class Ref {
private final String ref;
+private final String enclosingClass;
private final Set imports;
private final List attributes;
private final Map nested;
-private Ref(final String ref, final Set imports,
+private Ref(final String ref, final String enclosingClass, final
Set imports,
final List attributes, final Map nested) {
this.ref = ref;
+this.enclosingClass = enclosingClass;
this.imports = imports;
this.attributes = attributes;
this.nested = nested;
}
+public String getEnclosingClass() {
+return enclosingClass;
+}
+
public String getRef() {
return ref;
}
[johnzon] 01/02: adding int64 and int32 format support
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 2dfde39e5421a3719d0a90f76f92d92df6d415ef
Author: Romain Manni-Bucau
AuthorDate: Mon Aug 8 15:10:48 2022 +0200
adding int64 and int32 format support
---
.../java/org/apache/johnzon/jsonschema/generator/PojoGenerator.java | 6 ++
1 file changed, 6 insertions(+)
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 7c3a9a63..7625a2fb 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
@@ -258,8 +258,10 @@ public class PojoGenerator {
return required ? "double" : "Double";
// openapi types
case "int":
+case "int32":
case "integer":
return required ? "int" : "Integer";
+case "int64":
case "long":
return required ? "long" : "Long";
case "float":
@@ -383,9 +385,11 @@ public class PojoGenerator {
imports.add(Map.class.getName());
return "Map";
case "int":
+case "int32":
case "integer":
imports.add(Map.class.getName());
return "Map";
+case "int64":
case "long":
imports.add(Map.class.getName());
return "Map";
@@ -492,8 +496,10 @@ public class PojoGenerator {
case "double":
return "Double";
case "int":
+case "int32":
case "integer":
return "Integer";
+case "int64":
case "long":
return "Long";
case "float":
[johnzon] branch master updated (e6316ce9 -> e70c27e5)
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 e6316ce9 [JOHNZON-387] better modelisation of ref in pojo generator new 2dfde39e adding int64 and int32 format support new e70c27e5 [JOHNZON-387] ensure ref has enclosing name 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/jsonschema/generator/PojoGenerator.java | 21 ++--- 1 file changed, 18 insertions(+), 3 deletions(-)
[johnzon] branch master updated: [JOHNZON-387] better modelisation of ref in 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
The following commit(s) were added to refs/heads/master by this push:
new e6316ce9 [JOHNZON-387] better modelisation of ref in pojo generator
e6316ce9 is described below
commit e6316ce90b60e6c9e5f79b6d6dc390aa718e6512
Author: Romain Manni-Bucau
AuthorDate: Mon Aug 8 15:01:53 2022 +0200
[JOHNZON-387] better modelisation of ref in pojo generator
---
.../jsonschema/generator/PojoGenerator.java| 65 +++---
1 file changed, 58 insertions(+), 7 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 d7b161ad..7c3a9a63 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
@@ -35,6 +35,7 @@ import java.util.Objects;
import java.util.Set;
import java.util.TreeMap;
import java.util.TreeSet;
+import java.util.function.Function;
import java.util.stream.IntStream;
import java.util.stream.Stream;
@@ -190,7 +191,10 @@ public class PojoGenerator {
* @param ref the reference to resolve.
* @return the reference class name if resolved else null.
*/
-protected String onRef(final String ref) {
+protected String onRef(final Ref ref) {
+if (configuration.getOnRef() != null) {
+return configuration.getOnRef().apply(ref);
+}
return null; // todo: check if already in nested for ex
}
@@ -205,7 +209,7 @@ public class PojoGenerator {
protected String asType(final String javaName, final JsonObject schema,
final boolean required) {
final JsonValue ref = schema.get("$ref");
if (ref != null && ref.getValueType() == JsonValue.ValueType.STRING) {
-final String name = onRef(JsonString.class.cast(ref).getString());
+final String name = onRef(new
Ref(JsonString.class.cast(ref).getString(), imports, attributes, nested));
if (name != null) {
return name;
}
@@ -411,11 +415,12 @@ public class PojoGenerator {
}
} else if (hasProperties) {
final String className = configuration.getClassName() +
Character.toUpperCase(javaName.charAt(0)) + javaName.substring(1);
-nested.putAll(new PojoGenerator(new PojoConfiguration()
+nested.putAll(newSubPojoGenerator(new PojoConfiguration()
.setPackageName(configuration.getPackageName())
.setClassName(className)
.setAddJsonbProperty(configuration.isAddJsonbProperty())
-
.setAddAllArgsConstructor(configuration.isAddAllArgsConstructor()))
+
.setAddAllArgsConstructor(configuration.isAddAllArgsConstructor())
+.setOnRef(configuration.getOnRef()))
.visitSchema(schema)
.generate());
return className;
@@ -425,10 +430,14 @@ public class PojoGenerator {
return JsonObject.class.getSimpleName();
}
+protected PojoGenerator newSubPojoGenerator(final PojoConfiguration
pojoConfiguration) {
+return new PojoGenerator(pojoConfiguration);
+}
+
protected String onItemSchema(final String javaName, final JsonObject
schema) {
final JsonValue ref = schema.get("$ref");
if (ref != null && ref.getValueType() == JsonValue.ValueType.STRING) {
-final String name = onRef(JsonString.class.cast(ref).getString());
+final String name = onRef(new
Ref(JsonString.class.cast(ref).getString(), imports, attributes, nested));
if (name != null) {
return name;
}
@@ -446,11 +455,12 @@ public class PojoGenerator {
throw new IllegalStateException("Array of array
unsupported");
case "object":
final String className = configuration.getClassName() +
Character.toUpperCase(javaName.charAt(0)) + javaName.substring(1);
-nested.putAll(new PojoGenerator(new PojoConfiguration()
+nested.putAll(newSubPojoGenerator(new PojoConfiguration()
.setPackageName(configuration.getPackageName())
.setClassName(className)
.setAddJsonbProperty(configuration.isAddJsonbProperty())
-
.setAddAllArgsConstructor(configuration.isAddAllArgsConstructor()))
+
.setAddAllArgsConstructor(configuration.isAddAllArgsConstructor())
+
[johnzon] branch master updated: [JOHNZON-387] fixing ref name in jsonschema
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 58fd2082 [JOHNZON-387] fixing ref name in jsonschema
58fd2082 is described below
commit 58fd208253d555e67bb2a867153a5aa9c12ca132
Author: Romain Manni-Bucau
AuthorDate: Mon Aug 8 14:46:03 2022 +0200
[JOHNZON-387] fixing ref name in jsonschema
---
.../java/org/apache/johnzon/jsonschema/generator/PojoGenerator.java | 4 ++--
1 file changed, 2 insertions(+), 2 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 1cb7193c..d7b161ad 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
@@ -203,7 +203,7 @@ public class PojoGenerator {
}
protected String asType(final String javaName, final JsonObject schema,
final boolean required) {
-final JsonValue ref = schema.get("ref");
+final JsonValue ref = schema.get("$ref");
if (ref != null && ref.getValueType() == JsonValue.ValueType.STRING) {
final String name = onRef(JsonString.class.cast(ref).getString());
if (name != null) {
@@ -426,7 +426,7 @@ public class PojoGenerator {
}
protected String onItemSchema(final String javaName, final JsonObject
schema) {
-final JsonValue ref = schema.get("ref");
+final JsonValue ref = schema.get("$ref");
if (ref != null && ref.getValueType() == JsonValue.ValueType.STRING) {
final String name = onRef(JsonString.class.cast(ref).getString());
if (name != null) {
[johnzon] branch master updated: adding default to reserved keywords
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 7295128a adding default to reserved keywords
7295128a is described below
commit 7295128a94fd0b4cc829c22353c42e5db0bc19e1
Author: Romain Manni-Bucau
AuthorDate: Mon Aug 8 12:12:15 2022 +0200
adding default to reserved keywords
---
.../java/org/apache/johnzon/jsonschema/generator/PojoGenerator.java | 2 +-
1 file changed, 1 insertion(+), 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 b410e848..1cb7193c 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
@@ -536,7 +536,7 @@ public class PojoGenerator {
}
protected boolean isReserved(final String name) {
-return "continue".equals(name) || "break".equals(name) ||
+return "continue".equals(name) || "break".equals(name) ||
"default".equals(name) ||
"do".equals(name) || "while".equals(name) ||
"for".equals(name) ||
"if".equals(name) || "else".equals(name) ||
[johnzon] branch master updated: [JOHNZON-387] basic jsonschema to pojo generation logic
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 5ca42f7f [JOHNZON-387] basic jsonschema to pojo generation logic
5ca42f7f is described below
commit 5ca42f7f9013b5aaf31ec66803929be35f98152d
Author: Romain Manni-Bucau
AuthorDate: Mon Aug 8 11:56:06 2022 +0200
[JOHNZON-387] basic jsonschema to pojo generation logic
---
johnzon-jsonschema/pom.xml | 2 +-
.../jsonschema/generator/PojoGenerator.java| 633
.../jsonschema/generator/PojoGeneratorTest.java| 624
.../src/test/resources/ConfigMap.json | 193 +++
johnzon-jsonschema/src/test/resources/Node.json| 634 +
.../johnzon/maven/plugin/JsonSchemaToPojoMojo.java | 129 +
pom.xml| 4 +-
7 files changed, 2216 insertions(+), 3 deletions(-)
diff --git a/johnzon-jsonschema/pom.xml b/johnzon-jsonschema/pom.xml
index a03ba174..38464977 100644
--- a/johnzon-jsonschema/pom.xml
+++ b/johnzon-jsonschema/pom.xml
@@ -32,7 +32,7 @@
org.jruby.joni
joni
- 2.1.16
+ 2.1.41
provided
true
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
new file mode 100644
index ..b410e848
--- /dev/null
+++
b/johnzon-jsonschema/src/main/java/org/apache/johnzon/jsonschema/generator/PojoGenerator.java
@@ -0,0 +1,633 @@
+/*
+ * 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.jsonschema.generator;
+
+import javax.json.JsonObject;
+import javax.json.JsonString;
+import javax.json.JsonValue;
+import javax.json.bind.annotation.JsonbProperty;
+import java.time.Duration;
+import java.time.LocalDate;
+import java.time.LocalTime;
+import java.time.OffsetDateTime;
+import java.util.AbstractMap;
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Set;
+import java.util.TreeMap;
+import java.util.TreeSet;
+import java.util.stream.IntStream;
+import java.util.stream.Stream;
+
+import static java.util.Collections.singletonMap;
+import static java.util.Comparator.comparing;
+import static java.util.function.Function.identity;
+import static java.util.stream.Collectors.joining;
+import static java.util.stream.Collectors.toList;
+import static java.util.stream.Collectors.toMap;
+
+// todo: support ref resolution for schema and avoid to generate as much
classes as attributes
+public class PojoGenerator {
+private final PojoConfiguration configuration;
+
+protected final Set imports = new TreeSet<>(String::compareTo);
+protected final List attributes = new ArrayList<>();
+protected final Map nested = new
TreeMap<>(String::compareTo);
+
+public PojoGenerator(final PojoConfiguration configuration) {
+this.configuration = configuration;
+}
+
+public PojoGenerator setNested(final Map nested) {
+this.nested.putAll(nested);
+return this;
+}
+
+public Map generate() {
+final String name = configuration.getPackageName() + '.' +
configuration.getClassName();
+final String path = name.replace('.', '/') + ".java";
+attributes.sort(comparing(a -> a.javaName));
+if (!attributes.isEmpty()) {
+imports.add(Objects.class.getName());
+}
+final String content = "" +
+"package " + configuration.getPackageName() + ";\n" +
+"\n" +
+(imports.isEmpty() ? "" : imports.stream()
+.sorted()
+.map(it -> "import " + it + ";")
+.collect(joining("\n", "",
[johnzon] branch master updated: fixing too much exception wrapping test and impl
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 87fd97f9 fixing too much exception wrapping test and impl
87fd97f9 is described below
commit 87fd97f91321eb269537ae72047512b7bb1ca5d5
Author: Romain Manni-Bucau
AuthorDate: Thu Aug 4 07:58:23 2022 +0200
fixing too much exception wrapping test and impl
---
.../apache/johnzon/mapper/MappingParserImpl.java | 80 +++---
.../MapperBeanConstructorExceptionsTest.java | 8 +--
2 files changed, 43 insertions(+), 45 deletions(-)
diff --git
a/johnzon-mapper/src/main/java/org/apache/johnzon/mapper/MappingParserImpl.java
b/johnzon-mapper/src/main/java/org/apache/johnzon/mapper/MappingParserImpl.java
index f98edb6d..711453d8 100644
---
a/johnzon-mapper/src/main/java/org/apache/johnzon/mapper/MappingParserImpl.java
+++
b/johnzon-mapper/src/main/java/org/apache/johnzon/mapper/MappingParserImpl.java
@@ -69,12 +69,14 @@ import java.util.TreeSet;
import java.util.concurrent.ArrayBlockingQueue;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentMap;
+import java.util.function.Function;
import java.util.stream.DoubleStream;
import java.util.stream.IntStream;
import java.util.stream.LongStream;
import java.util.stream.Stream;
import static java.util.Arrays.asList;
+import static java.util.stream.Collectors.joining;
import static java.util.stream.Collectors.toList;
import static java.util.stream.Collectors.toMap;
import static javax.json.JsonValue.ValueType.ARRAY;
@@ -253,13 +255,8 @@ public class MappingParserImpl implements MappingParser {
private Object buildObject(final Type inType, final JsonObject object,
final boolean applyObjectConverter,
final JsonPointerTracker jsonPointer, final
Collection> skippedConverters) {
-Type type = inType;
-if (inType == Object.class) {
-type = new JohnzonParameterizedType(Map.class, String.class,
Object.class);
-}
-
+final Type type = inType == Object.class ? new
JohnzonParameterizedType(Map.class, String.class, Object.class) : inType;
if (applyObjectConverter && !(type instanceof ParameterizedType)) {
-
if (!(type instanceof Class)) {
throw new MapperException("ObjectConverters are only supported
for Classes not Types");
}
@@ -295,7 +292,6 @@ public class MappingParserImpl implements MappingParser {
final Type[] fieldArgTypes = aType.getActualTypeArguments();
if (fieldArgTypes.length >= 2) {
final Class raw = Class.class.cast(aType.getRawType());
-
final Map map;
if (SortedMap.class.isAssignableFrom(raw) ||
NavigableMap.class == raw || TreeMap.class == raw) {
map = config.getAttributeOrder() == null ? new
TreeMap() : new TreeMap(config.getAttributeOrder());
@@ -314,14 +310,7 @@ public class MappingParserImpl implements MappingParser {
}
if (map != null) {
-
-Type keyType;
-if
(ParameterizedType.class.isInstance(fieldArgTypes[0])) {
-keyType = fieldArgTypes[0];
-} else {
-keyType = fieldArgTypes[0];
-}
-
+final Type keyType = fieldArgTypes[0];
final boolean any = fieldArgTypes.length < 2 ||
fieldArgTypes[1] == Object.class;
for (final Map.Entry value :
object.entrySet()) {
final JsonValue jsonValue = value.getValue();
@@ -367,12 +356,10 @@ public class MappingParserImpl implements MappingParser {
if (classMapping.factory == null) {
throw new MissingFactoryException(classMapping.clazz, object,
config.getSnippet().of(object));
}
-
if (config.isFailOnUnknown()) {
if (!classMapping.setters.keySet().containsAll(object.keySet())) {
-throw new MapperException("(fail on unknown properties): " +
new HashSet(object.keySet()) {{
-removeAll(classMapping.setters.keySet());
-}});
+throw new MapperException("(fail on unknown properties): " +
+object.keySet().stream().filter(it ->
!classMapping.setters.containsKey(it)).collect(joining(", ", "[", "]")));
}
}
@@ -381,13 +368,17 @@ public class MappingParserImpl implements MappingParser {
if (classMapping.factory.getParameterTypes() == null ||
classMapping.factory.getParameterTypes().length ==
[johnzon] branch master updated: checkstyle fix
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 f655ae33 checkstyle fix
f655ae33 is described below
commit f655ae33f7fe56136ee2f04a5c62f0728559591f
Author: Romain Manni-Bucau
AuthorDate: Tue Jul 19 13:42:03 2022 +0200
checkstyle fix
---
.../src/main/java/org/apache/johnzon/jsonb/JohnzonBuilder.java | 1 -
.../src/test/java/org/apache/johnzon/jsonb/JsonbAdapterTest.java| 2 +-
.../src/test/java/org/apache/johnzon/jsonb/test/JsonbRule.java | 1 -
3 files changed, 1 insertion(+), 3 deletions(-)
diff --git
a/johnzon-jsonb/src/main/java/org/apache/johnzon/jsonb/JohnzonBuilder.java
b/johnzon-jsonb/src/main/java/org/apache/johnzon/jsonb/JohnzonBuilder.java
index bbeb2d46..400dfcfa 100644
--- a/johnzon-jsonb/src/main/java/org/apache/johnzon/jsonb/JohnzonBuilder.java
+++ b/johnzon-jsonb/src/main/java/org/apache/johnzon/jsonb/JohnzonBuilder.java
@@ -55,7 +55,6 @@ import java.io.Closeable;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.ParameterizedType;
import java.lang.reflect.Type;
-import java.lang.reflect.TypeVariable;
import java.nio.charset.StandardCharsets;
import java.util.*;
import java.util.concurrent.atomic.AtomicReference;
diff --git
a/johnzon-jsonb/src/test/java/org/apache/johnzon/jsonb/JsonbAdapterTest.java
b/johnzon-jsonb/src/test/java/org/apache/johnzon/jsonb/JsonbAdapterTest.java
index e690f211..256f855a 100644
--- a/johnzon-jsonb/src/test/java/org/apache/johnzon/jsonb/JsonbAdapterTest.java
+++ b/johnzon-jsonb/src/test/java/org/apache/johnzon/jsonb/JsonbAdapterTest.java
@@ -32,7 +32,7 @@ public class JsonbAdapterTest {
public JsonbRule jsonbRule = new JsonbRule().withTypeAdapter(new
ColorIdAdapter());
@Test
-public void test_inherited_adapter_recognized() {
+public void testInheritedAdapterRecognized() {
// given
ColorId colorId = new ColorId("#336699");
diff --git
a/johnzon-jsonb/src/test/java/org/apache/johnzon/jsonb/test/JsonbRule.java
b/johnzon-jsonb/src/test/java/org/apache/johnzon/jsonb/test/JsonbRule.java
index 43575ed4..62779863 100644
--- a/johnzon-jsonb/src/test/java/org/apache/johnzon/jsonb/test/JsonbRule.java
+++ b/johnzon-jsonb/src/test/java/org/apache/johnzon/jsonb/test/JsonbRule.java
@@ -18,7 +18,6 @@
*/
package org.apache.johnzon.jsonb.test;
-import org.apache.johnzon.jsonb.JsonbAdapterTest;
import org.apache.johnzon.jsonb.api.experimental.JsonbExtension;
import org.junit.rules.TestRule;
import org.junit.runner.Description;
[johnzon] branch master updated: [JOHNZON-386] Make JsonbAdapter inheritable
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 6b106280 [JOHNZON-386] Make JsonbAdapter inheritable
new a6ae280c Merge pull request #92 from
bmarwell/JOHNZON-386_inherited_jsonbadapter
6b106280 is described below
commit 6b106280436466fe7b920a97c774075b98d34832
Author: Benjamin Marwell
AuthorDate: Tue Jul 19 12:32:15 2022 +0200
[JOHNZON-386] Make JsonbAdapter inheritable
Co-authored-by: Romain Manni-Bucau
---
.../org/apache/johnzon/jsonb/JohnzonBuilder.java | 15 ++--
.../org/apache/johnzon/jsonb/JsonbAdapterTest.java | 79 ++
.../org/apache/johnzon/jsonb/test/JsonbRule.java | 8 +++
3 files changed, 92 insertions(+), 10 deletions(-)
diff --git
a/johnzon-jsonb/src/main/java/org/apache/johnzon/jsonb/JohnzonBuilder.java
b/johnzon-jsonb/src/main/java/org/apache/johnzon/jsonb/JohnzonBuilder.java
index 2e2f2a48..bbeb2d46 100644
--- a/johnzon-jsonb/src/main/java/org/apache/johnzon/jsonb/JohnzonBuilder.java
+++ b/johnzon-jsonb/src/main/java/org/apache/johnzon/jsonb/JohnzonBuilder.java
@@ -55,13 +55,9 @@ import java.io.Closeable;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.ParameterizedType;
import java.lang.reflect.Type;
+import java.lang.reflect.TypeVariable;
import java.nio.charset.StandardCharsets;
-import java.util.Base64;
-import java.util.Comparator;
-import java.util.HashMap;
-import java.util.Locale;
-import java.util.Map;
-import java.util.Optional;
+import java.util.*;
import java.util.concurrent.atomic.AtomicReference;
import java.util.function.Supplier;
import java.util.stream.Stream;
@@ -238,10 +234,10 @@ public class JohnzonBuilder implements JsonbBuilder {
.ifPresent(builder::setSnippetMaxLength);
// user adapters
+final Types types = new Types();
+
config.getProperty(JsonbConfig.ADAPTERS).ifPresent(adapters ->
Stream.of(JsonbAdapter[].class.cast(adapters)).forEach(adapter -> {
-final ParameterizedType pt = ParameterizedType.class.cast(
-Stream.of(adapter.getClass().getGenericInterfaces())
- .filter(i -> ParameterizedType.class.isInstance(i)
&& ParameterizedType.class.cast(i).getRawType() ==
JsonbAdapter.class).findFirst().orElse(null));
+final ParameterizedType pt =
types.findParameterizedType(adapter.getClass(), JsonbAdapter.class);
if (pt == null) {
throw new IllegalArgumentException(adapter + " doesn't
implement JsonbAdapter");
}
@@ -286,7 +282,6 @@ public class JohnzonBuilder implements JsonbBuilder {
getBeanManager(); // force detection
}
-final Types types = new Types();
builder.setReadAttributeBeforeWrite(
config.getProperty("johnzon.readAttributeBeforeWrite").map(Boolean.class::cast).orElse(false));
builder.setAutoAdjustStringBuffers(
diff --git
a/johnzon-jsonb/src/test/java/org/apache/johnzon/jsonb/JsonbAdapterTest.java
b/johnzon-jsonb/src/test/java/org/apache/johnzon/jsonb/JsonbAdapterTest.java
new file mode 100644
index ..e690f211
--- /dev/null
+++ b/johnzon-jsonb/src/test/java/org/apache/johnzon/jsonb/JsonbAdapterTest.java
@@ -0,0 +1,79 @@
+/*
+ * 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.jsonb;
+
+import org.apache.johnzon.jsonb.test.JsonbRule;
+import org.junit.Rule;
+import org.junit.Test;
+
+import javax.json.bind.adapter.JsonbAdapter;
+
+import static org.junit.Assert.assertEquals;
+
+public class JsonbAdapterTest {
+
+@Rule
+public JsonbRule jsonbRule = new JsonbRule().withTypeAdapter(new
ColorIdAdapter());
+
+@Test
+public void test_inherited_adapter_recognized() {
+// given
+ColorId colorId = new ColorId("#336699");
+
+// when
+String json = jsonbRule.toJson(colorId);
+
+// then
+assertEquals("\"#336699\"", js
[johnzon] branch master updated: adding a test showing the PR review comment and why current exception handling is not yet release ready
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 c2bf6945 adding a test showing the PR review comment and why current
exception handling is not yet release ready
c2bf6945 is described below
commit c2bf6945c2ca43befa93e15d821e0dee439aa8de
Author: Romain Manni-Bucau
AuthorDate: Mon May 16 08:53:12 2022 +0200
adding a test showing the PR review comment and why current exception
handling is not yet release ready
---
.../MapperBeanConstructorExceptionsTest.java | 66 ++
1 file changed, 66 insertions(+)
diff --git
a/johnzon-mapper/src/test/java/org/apache/johnzon/mapper/MapperBeanConstructorExceptionsTest.java
b/johnzon-mapper/src/test/java/org/apache/johnzon/mapper/MapperBeanConstructorExceptionsTest.java
index 2615fe0a..3abb1ce6 100644
---
a/johnzon-mapper/src/test/java/org/apache/johnzon/mapper/MapperBeanConstructorExceptionsTest.java
+++
b/johnzon-mapper/src/test/java/org/apache/johnzon/mapper/MapperBeanConstructorExceptionsTest.java
@@ -20,11 +20,50 @@ import org.junit.Test;
import java.beans.ConstructorProperties;
import java.lang.reflect.Type;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.Spliterator;
+
+import static java.util.Spliterators.spliteratorUnknownSize;
+import static java.util.stream.Collectors.toList;
+import static java.util.stream.StreamSupport.stream;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.fail;
public class MapperBeanConstructorExceptionsTest {
private static final RuntimeException USER_EXCEPTION = new
RuntimeException("I am user, hear me roar");
+@Test
+public void singleExceptionMapperInCause() {
+try (final Mapper mapper = new
MapperBuilder().setSnippetMaxLength(20).build()) {
+mapper.readObject("{ \"string\" : \"whatever\" }",
Rectangle.class);
+fail("should have failed");
+} catch (final MapperException me) {
+final Collection exceptionStack =
stream(spliteratorUnknownSize(new Iterator() {
+private Throwable current = me;
+
+@Override
+public boolean hasNext() {
+return current != null;
+}
+
+@Override
+public Throwable next() {
+final Throwable throwable = current;
+current = current.getCause() == current ? null :
current.getCause();
+return throwable;
+}
+}, Spliterator.IMMUTABLE), false).collect(toList());
+assertEquals(3, exceptionStack.size());
+
+// warn: this *must* be 1 which requires to ensure the
MapperException thrown by
+// org.apache.johnzon.mapper.MappingParserImpl.toValue is
mutable to add the context/right message
+// (no need to strip it, an alternative could be to use
addSuppressed but it would keep creating stacks for nothing)
+assertEquals(2,
exceptionStack.stream().filter(MapperException.class::isInstance).count());
+}
+}
+
@Test
public void constructor() {
ExceptionAsserts.fromMapperReadObject("{ \"string\" :
\"Supercalifragilisticexpialidocious\" }", Circle.class)
@@ -105,6 +144,23 @@ public class MapperBeanConstructorExceptionsTest {
}
}
+public static class Rectangle {
+private String string;
+
+@ConstructorProperties({"string"})
+public Rectangle(@JohnzonConverter(FailingConverter.class) final
String string) {
+fail("shouldn't be reached");
+}
+
+public String getString() {
+return string;
+}
+
+public void setString(final String string) {
+this.string = string;
+}
+}
+
public static class Oval {
private String s;
@@ -128,5 +184,15 @@ public class MapperBeanConstructorExceptionsTest {
public interface Sphere {
}
+public static class FailingConverter implements Converter {
+@Override
+public String toString(final T instance) {
+throw USER_EXCEPTION;
+}
+@Override
+public T fromString(final String text) {
+throw USER_EXCEPTION;
+}
+}
}
[johnzon] branch master updated (62fc2346 -> 877fe134)
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 62fc2346 support jakarta classifier for jsonlogic module
new 3250243a Catalog of deserialization error messages as they are now
new ee3fc2f4 Merge branch 'master' of github.com:apache/johnzon into
exception-messages
new fd91756d JOHNZON-370 Include class, property, type and json value in
mapping exceptions
new 7d43052d JOHNZON-372 Entire json value serialized in exception
new 70441979 JOHNZON-372 Entire json value serialized in exception
new c7b6ce5f JOHNZON-372 Entire json value serialized in exception
new 2312ec83 Align wording in "Can't map JSON Object" exception with other
exceptions
new 11603885 Test cases for all primitive arrays show handling as-is Prior
to fixing JOHNZON-371
new e743eed6 JOHNZON-371 NullPointerException thrown when null value
present in primitive arrays
new 0f6c80eb Add final to static-utility class
new c797e133 JOHNZON-376 Mapper API Bean setter user exceptions tests
new 21fd9dd3 JOHNZON-376 Mapper API Bean getter user exceptions tests
new 9a0f70a2 JOHNZON-382 Diagnose and guide users on invalid bean
constructors JOHNZON-376 Mapper API Bean constructor exceptions tests
new e49def40 JOHNZON-374 Mapper API Adapter method exception tests
new 19fa465a JOHNZON-375 Mapper API Converter methods and constructor
exceptions tests
new 550bbb1a JOHNZON-381 JsonbAdapter methods and constructor exceptions
tests
new d8bb51e6 JOHNZON-377 Jsonb bean setter user exceptions test
new b0b10cb1 JOHNZON-377 Jsonb bean getter and constructor exception tests
new 014889d8 JOHNZON-379 & JOHNZON-380 Jsonb{De}Serializer methods and
constructor
new 95e8b23a JOHNZON-378 JsonbCreator constructor and factory method
exceptions tests
new 5e38eda6 Use ExceptionAsserts
new 3621f9bd JOHNZON-370 Deserialization Exception message tests for
Mapper API
new befd7f5a Add Wildcard and GenericArray handling to
ExceptionMessages.simpleName
new f6e918a1 Prevent recursive wrapping
new 877fe134 Merge pull request #91 from
dblevins/exception-message-improvements
The 916 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:
.../DeserializationExceptionMessagesTest.java | 1540
.../org/apache/johnzon/jsonb/ExceptionAsserts.java | 123 ++
.../johnzon/jsonb/JsonbAdapterExceptionsTest.java | 261
.../jsonb/JsonbBeanConstructorExceptionsTest.java | 133 ++
.../jsonb/JsonbBeanGetterUserExceptionsTest.java | 47 +
.../jsonb/JsonbBeanSetterUserExceptionsTest.java | 479 ++
.../johnzon/jsonb/JsonbCreatorExceptionsTest.java | 82 ++
.../jsonb/JsonbSerializerExceptionsTest.java | 212 +++
.../apache/johnzon/jsonb/SnippetMaxLengthTest.java | 24 +-
.../apache/johnzon/mapper/ExceptionMessages.java | 108 ++
.../johnzon/mapper/FactoryCreateException.java | 27 +-
.../apache/johnzon/mapper/MappingParserImpl.java | 141 +-
.../johnzon/mapper/MissingFactoryException.java| 65 +
.../johnzon/mapper/SetterMappingException.java | 42 +
.../DeserializationExceptionMessagesTest.java | 1539 +++
.../apache/johnzon/mapper/ExceptionAsserts.java| 106 ++
.../mapper/MapperAdapterExceptionsTest.java| 193 +++
.../MapperBeanConstructorExceptionsTest.java | 132 ++
.../mapper/MapperBeanGetterUserExceptionsTest.java | 45 +
.../mapper/MapperBeanSetterUserExceptionsTest.java | 478 ++
.../mapper/MapperConverterExceptionsTest.java | 215 +++
.../apache/johnzon/mapper/TypeSimpleNameTest.java | 88 ++
22 files changed, 6015 insertions(+), 65 deletions(-)
create mode 100644
johnzon-jsonb/src/test/java/org/apache/johnzon/jsonb/DeserializationExceptionMessagesTest.java
create mode 100644
johnzon-jsonb/src/test/java/org/apache/johnzon/jsonb/ExceptionAsserts.java
create mode 100644
johnzon-jsonb/src/test/java/org/apache/johnzon/jsonb/JsonbAdapterExceptionsTest.java
create mode 100644
johnzon-jsonb/src/test/java/org/apache/johnzon/jsonb/JsonbBeanConstructorExceptionsTest.java
create mode 100644
johnzon-jsonb/src/test/java/org/apache/johnzon/jsonb/JsonbBeanGetterUserExceptionsTest.java
create mode 100644
johnzon-jsonb/src/test/java/org/apache/johnzon/jsonb/JsonbBeanSetterUserExceptionsTest.java
create mode 100644
johnzon-jsonb/src/test/java/org/apache/johnzon/jsonb/JsonbCreatorExceptionsTest.java
create mode 100644
johnzon-jsonb/src/test/java/org/apache/johnzon/jsonb/JsonbSerializerExceptionsTest.java
create mode 100644
johnzon-mapper/src/main/java/org/apache/johnzon/m
[johnzon] branch master updated: support jakarta classifier for jsonlogic module
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 62fc2346 support jakarta classifier for jsonlogic module 62fc2346 is described below commit 62fc2346a750743bf935c6ae19b2ac2e64fe5d61 Author: Romain Manni-Bucau AuthorDate: Thu May 12 17:35:09 2022 +0200 support jakarta classifier for jsonlogic module --- johnzon-jsonlogic/pom.xml | 10 ++ 1 file changed, 10 insertions(+) diff --git a/johnzon-jsonlogic/pom.xml b/johnzon-jsonlogic/pom.xml index 1710bfa0..a9d7643f 100644 --- a/johnzon-jsonlogic/pom.xml +++ b/johnzon-jsonlogic/pom.xml @@ -37,4 +37,14 @@ test + + + + +org.apache.maven.plugins +maven-shade-plugin +3.2.2 + + +
[johnzon] 01/01: ensure johnzon-core is not used in mapper/jsonb + minor fixed on Snippet buffering
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 cc3a51197a21298f0e44aec358df8a1e9cbaed30
Merge: 133273d5 ab20eea0
Author: Romain Manni-Bucau
AuthorDate: Thu Apr 28 10:06:49 2022 +0200
ensure johnzon-core is not used in mapper/jsonb + minor fixed on Snippet
buffering
.../java/org/apache/johnzon/core/Buffered.java | 2 +-
.../johnzon/core/JsonGeneratorFactoryImpl.java | 42 +++---
.../main/java/org/apache/johnzon/core/Snippet.java | 163 -
.../main/java/org/apache/johnzon/core/Types.java | 15 --
.../java/org/apache/johnzon/core/SnippetTest.java | 2 +-
.../org/apache/johnzon/jsonb/JohnzonBuilder.java | 18 +--
.../org/apache/johnzon/jsonb/JsonbAccessMode.java | 2 +-
.../org/apache/johnzon/jsonb/reflect}/Types.java | 43 ++
.../org/apache/johnzon/mapper/JohnzonCores.java| 32 +++-
.../johnzon/mapper/JohnzonVirtualObject.java | 3 -
.../org/apache/johnzon/mapper/MapperBuilder.java | 5 +-
.../org/apache/johnzon/mapper/MapperConfig.java| 15 +-
...hnzonVirtualObject.java => SnippetFactory.java} | 35 +
.../mapper/internal/JsonPointerTracker.java| 55 ---
14 files changed, 208 insertions(+), 224 deletions(-)
diff --cc
johnzon-mapper/src/main/java/org/apache/johnzon/mapper/MapperConfig.java
index eb8affc5,824c6707..1bc01752
--- a/johnzon-mapper/src/main/java/org/apache/johnzon/mapper/MapperConfig.java
+++ b/johnzon-mapper/src/main/java/org/apache/johnzon/mapper/MapperConfig.java
@@@ -158,8 -157,8 +157,8 @@@ public /* DON'T MAKE IT HIDDEN */ clas
final Predicate> deserializationPredicate,
final Predicate> serializationPredicate,
final Function, CustomEnumConverter>
enumConverterFactory,
- final Snippet snippet) {
- //CHECKSTYLE:ON
+ final SnippetFactory snippet) {
-//CHECKSTYLE:ON
++//CHECKSTYLE:ON
this.objectConverterWriters = objectConverterWriters;
this.objectConverterReaders = objectConverterReaders;
this.version = version;
@@@ -312,8 -311,8 +311,8 @@@
}
private T findObjectConverter(final Class clazz,
--final Map, T> from,
--final Map, T> cache)
{
++ final Map, T> from,
++ final Map, T> cache) {
if (clazz == null) {
throw new IllegalArgumentException("clazz must not be null");
}
[johnzon] branch master updated (133273d5 -> cc3a5119)
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 133273d5 Merge pull request #84 from
dblevins/improved-exception-message
add 01c1eeb8 JOHNZON-367 Show a chunk of json when mapping the object fails
add 2a8d3f21 JOHNZON-367 Snippet accepts a JsonGeneratorFactory and is
reusable
add 6589e679 JOHNZON-367 Allow Snippet size to be configurable (via
@rmannibucau) All code written by Romain Manni-Bucau
add 90519216 JOHNZON-367 Tests that johnzon.snippetMaxLength works as
expected
add 391025cc JOHNZON-367 Fix Snippet buffering issues and expand tests
add 4f24814d JOHNZON-367 Allow true, false and null json constants to be
trimmed Not my preference, but implementing in the hope of compromise
add 4dd7763c JOHNZON-367 Reduce calls to flush() to the bare minimum Call
flush only before snippet.terminate() and snippet.get() Reduce calls to
snippet.terminate() to only what is needed
add 2ab67a96 rebase
add dbe6a0d9 rename Buffered to IODescriptor
add ab20eea0 fix the johnzon-core dependency in mapper/jsonb module + use
BoundedOutputStreamWriter in Snippet
new cc3a5119 ensure johnzon-core is not used in mapper/jsonb + minor fixed
on Snippet buffering
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:
.../java/org/apache/johnzon/core/Buffered.java | 2 +-
.../johnzon/core/JsonGeneratorFactoryImpl.java | 42 +++---
.../main/java/org/apache/johnzon/core/Snippet.java | 163 -
.../main/java/org/apache/johnzon/core/Types.java | 15 --
.../java/org/apache/johnzon/core/SnippetTest.java | 2 +-
.../org/apache/johnzon/jsonb/JohnzonBuilder.java | 18 +--
.../org/apache/johnzon/jsonb/JsonbAccessMode.java | 2 +-
.../org/apache/johnzon/jsonb/reflect}/Types.java | 43 ++
.../org/apache/johnzon/mapper/JohnzonCores.java| 32 +++-
.../johnzon/mapper/JohnzonVirtualObject.java | 3 -
.../org/apache/johnzon/mapper/MapperBuilder.java | 5 +-
.../org/apache/johnzon/mapper/MapperConfig.java| 15 +-
.../mapper/{Cleanable.java => SnippetFactory.java} | 6 +-
.../mapper/internal/JsonPointerTracker.java| 55 ---
14 files changed, 209 insertions(+), 194 deletions(-)
copy {johnzon-core/src/main/java/org/apache/johnzon/core =>
johnzon-jsonb/src/main/java/org/apache/johnzon/jsonb/reflect}/Types.java (74%)
copy johnzon-mapper/src/main/java/org/apache/johnzon/mapper/{Cleanable.java =>
SnippetFactory.java} (89%)
[johnzon] branch master updated (6571c776 -> 133273d5)
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 6571c776 [JOHNZON-369] adding org.apache.johnzon.boundedoutputstreamwriter support new 18d94b8b JOHNZON-367 Show a chunk of json when mapping the object fails new 39249323 JOHNZON-367 Snippet accepts a JsonGeneratorFactory and is reusable new 2ac98b78 JOHNZON-367 Allow Snippet size to be configurable (via @rmannibucau) All code written by Romain Manni-Bucau new 04196910 JOHNZON-367 Tests that johnzon.snippetMaxLength works as expected new 77936bb9 JOHNZON-367 Fix Snippet buffering issues and expand tests new fb227bdd JOHNZON-367 Allow true, false and null json constants to be trimmed Not my preference, but implementing in the hope of compromise new ddd0f241 JOHNZON-367 Reduce calls to flush() to the bare minimum Call flush only before snippet.terminate() and snippet.get() Reduce calls to snippet.terminate() to only what is needed new bc8b05e1 JOHNZON-367 Optimize buffering when new Buffered interface is supported new 076c610c Merge branch 'master' of github.com:apache/johnzon into improved-exception-message new d5d0fc79 JOHNZON-367 Incorporate PR feedback new 133273d5 Merge pull request #84 from dblevins/improved-exception-message The 877 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: .../java/org/apache/johnzon/core/Buffered.java | 36 ++ .../johnzon/core/JsonGeneratorFactoryImpl.java | 40 +- .../main/java/org/apache/johnzon/core/Snippet.java | 422 + .../java/org/apache/johnzon/core/SnippetTest.java | 517 + .../johnzon/jaxrs/ConfigurableJohnzonProvider.java | 4 + .../jaxrs/WildcardConfigurableJohnzonProvider.java | 4 + .../org/apache/johnzon/jsonb/JohnzonBuilder.java | 6 + .../apache/johnzon/jsonb/SnippetMaxLengthTest.java | 103 .../org/apache/johnzon/mapper/MapperBuilder.java | 10 +- .../org/apache/johnzon/mapper/MapperConfig.java| 47 +- .../apache/johnzon/mapper/MappingParserImpl.java | 4 +- 11 files changed, 1183 insertions(+), 10 deletions(-) create mode 100644 johnzon-core/src/main/java/org/apache/johnzon/core/Buffered.java create mode 100644 johnzon-core/src/main/java/org/apache/johnzon/core/Snippet.java create mode 100644 johnzon-core/src/test/java/org/apache/johnzon/core/SnippetTest.java create mode 100644 johnzon-jsonb/src/test/java/org/apache/johnzon/jsonb/SnippetMaxLengthTest.java
[johnzon] branch master updated: [JOHNZON-369] adding org.apache.johnzon.boundedoutputstreamwriter support
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 6571c776 [JOHNZON-369] adding
org.apache.johnzon.boundedoutputstreamwriter support
6571c776 is described below
commit 6571c7768b4897034a134b8664068b0f8bb2b02e
Author: Romain Manni-Bucau
AuthorDate: Wed Apr 27 09:48:53 2022 +0200
[JOHNZON-369] adding org.apache.johnzon.boundedoutputstreamwriter support
---
.../johnzon/core/JsonGeneratorFactoryImpl.java | 20 -
.../org/apache/johnzon/core/JsonGeneratorImpl.java | 9 --
.../johnzon/core/io/BoundedOutputStreamWriter.java | 98 ++
.../johnzon/core/JsonGeneratorFactoryImplTest.java | 70
.../core/io/BoundedOutputStreamWriterTest.java | 64 ++
src/site/markdown/index.md | 11 +++
6 files changed, 260 insertions(+), 12 deletions(-)
diff --git
a/johnzon-core/src/main/java/org/apache/johnzon/core/JsonGeneratorFactoryImpl.java
b/johnzon-core/src/main/java/org/apache/johnzon/core/JsonGeneratorFactoryImpl.java
index c4748697..af1b905d 100644
---
a/johnzon-core/src/main/java/org/apache/johnzon/core/JsonGeneratorFactoryImpl.java
+++
b/johnzon-core/src/main/java/org/apache/johnzon/core/JsonGeneratorFactoryImpl.java
@@ -18,6 +18,8 @@
*/
package org.apache.johnzon.core;
+import org.apache.johnzon.core.io.BoundedOutputStreamWriter;
+
import static java.nio.charset.StandardCharsets.UTF_8;
import static java.util.Arrays.asList;
import static java.util.Optional.ofNullable;
@@ -35,21 +37,24 @@ import javax.json.stream.JsonGeneratorFactory;
public class JsonGeneratorFactoryImpl extends AbstractJsonFactory implements
JsonGeneratorFactory {
public static final String GENERATOR_BUFFER_LENGTH =
"org.apache.johnzon.default-char-buffer-generator";
+public static final String BOUNDED_OUTPUT_STREAM_WRITER_LEN =
"org.apache.johnzon.boundedoutputstreamwriter";
public static final int DEFAULT_GENERATOR_BUFFER_LENGTH =
Integer.getInteger(GENERATOR_BUFFER_LENGTH, 64 * 1024); //64k
static final Collection SUPPORTED_CONFIG_KEYS = asList(
-JsonGenerator.PRETTY_PRINTING, GENERATOR_BUFFER_LENGTH,
BUFFER_STRATEGY, ENCODING
+JsonGenerator.PRETTY_PRINTING, GENERATOR_BUFFER_LENGTH,
BUFFER_STRATEGY, ENCODING, BOUNDED_OUTPUT_STREAM_WRITER_LEN
);
private final Charset defaultEncoding;
//key caching currently disabled
private final boolean pretty;
+private final int boundedOutputStreamWriter;
private final BufferStrategy.BufferProvider bufferProvider;
public JsonGeneratorFactoryImpl(final Map config) {
super(config, SUPPORTED_CONFIG_KEYS, null);
this.pretty = getBool(JsonGenerator.PRETTY_PRINTING, false);
+this.boundedOutputStreamWriter =
getInt(BOUNDED_OUTPUT_STREAM_WRITER_LEN, -1);
this.defaultEncoding = ofNullable(getString(ENCODING, null))
.map(Charset::forName)
.orElse(UTF_8);
@@ -68,12 +73,21 @@ public class JsonGeneratorFactoryImpl extends
AbstractJsonFactory implements Jso
@Override
public JsonGenerator createGenerator(final OutputStream out) {
-return new JsonGeneratorImpl(new OutputStreamWriter(out,
defaultEncoding), bufferProvider, pretty);
+return new JsonGeneratorImpl(
+boundedOutputStreamWriter <= 0 ?
+new OutputStreamWriter(out, defaultEncoding) :
+new BoundedOutputStreamWriter(out, defaultEncoding,
boundedOutputStreamWriter),
+bufferProvider, pretty);
}
@Override
public JsonGenerator createGenerator(final OutputStream out, final Charset
charset) {
-return new JsonGeneratorImpl(out,charset, bufferProvider, pretty);
+final Charset cs = charset == null ? defaultEncoding : charset;
+return new JsonGeneratorImpl(
+boundedOutputStreamWriter <= 0 ?
+new OutputStreamWriter(out, cs) :
+new BoundedOutputStreamWriter(out, cs,
boundedOutputStreamWriter),
+bufferProvider, pretty);
}
@Override
diff --git
a/johnzon-core/src/main/java/org/apache/johnzon/core/JsonGeneratorImpl.java
b/johnzon-core/src/main/java/org/apache/johnzon/core/JsonGeneratorImpl.java
index 0913804f..c011b1f6 100644
--- a/johnzon-core/src/main/java/org/apache/johnzon/core/JsonGeneratorImpl.java
+++ b/johnzon-core/src/main/java/org/apache/johnzon/core/JsonGeneratorImpl.java
@@ -27,13 +27,10 @@ import javax.json.JsonValue;
import javax.json.stream.JsonGenerationException;
import javax.json.stream.JsonGenerator;
import java.io.IOException;
-import java.io.OutputStream;
-import java.io.OutputStreamWriter;
import java.io.Serializable;
impo
[johnzon] branch master updated: [JOHNZON-368] ensure JsonGeneratorFactory respects the configured encoding
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 a20a8e57 [JOHNZON-368] ensure JsonGeneratorFactory respects the
configured encoding
a20a8e57 is described below
commit a20a8e570d4623147d86a05610310c99ed1d355b
Author: Romain Manni-Bucau
AuthorDate: Wed Apr 27 09:05:04 2022 +0200
[JOHNZON-368] ensure JsonGeneratorFactory respects the configured encoding
---
.../apache/johnzon/core/AbstractJsonFactory.java | 2 +-
.../johnzon/core/JsonGeneratorFactoryImpl.java | 30 +-
.../org/apache/johnzon/core/JsonGeneratorImpl.java | 8 --
.../apache/johnzon/core/JsonParserFactoryImpl.java | 1 -
.../apache/johnzon/core/JsonWriterFactoryImpl.java | 4 +--
.../org/apache/johnzon/mapper/MapperBuilder.java | 6 ++---
6 files changed, 24 insertions(+), 27 deletions(-)
diff --git
a/johnzon-core/src/main/java/org/apache/johnzon/core/AbstractJsonFactory.java
b/johnzon-core/src/main/java/org/apache/johnzon/core/AbstractJsonFactory.java
index c8517173..9b448a6f 100644
---
a/johnzon-core/src/main/java/org/apache/johnzon/core/AbstractJsonFactory.java
+++
b/johnzon-core/src/main/java/org/apache/johnzon/core/AbstractJsonFactory.java
@@ -26,7 +26,7 @@ import java.util.Map;
import java.util.logging.Logger;
public abstract class AbstractJsonFactory implements Serializable {
-
+public static final String ENCODING = "org.apache.johnzon.encoding";
public static final String BUFFER_STRATEGY =
"org.apache.johnzon.buffer-strategy";
public static final BufferStrategy DEFAULT_BUFFER_STRATEGY =
BufferStrategyFactory.valueOf(System.getProperty(BUFFER_STRATEGY, "QUEUE"));
diff --git
a/johnzon-core/src/main/java/org/apache/johnzon/core/JsonGeneratorFactoryImpl.java
b/johnzon-core/src/main/java/org/apache/johnzon/core/JsonGeneratorFactoryImpl.java
index 8d1f6ec2..c4748697 100644
---
a/johnzon-core/src/main/java/org/apache/johnzon/core/JsonGeneratorFactoryImpl.java
+++
b/johnzon-core/src/main/java/org/apache/johnzon/core/JsonGeneratorFactoryImpl.java
@@ -18,9 +18,12 @@
*/
package org.apache.johnzon.core;
+import static java.nio.charset.StandardCharsets.UTF_8;
import static java.util.Arrays.asList;
+import static java.util.Optional.ofNullable;
import java.io.OutputStream;
+import java.io.OutputStreamWriter;
import java.io.Writer;
import java.nio.charset.Charset;
import java.util.Collection;
@@ -35,24 +38,27 @@ public class JsonGeneratorFactoryImpl extends
AbstractJsonFactory implements Jso
public static final int DEFAULT_GENERATOR_BUFFER_LENGTH =
Integer.getInteger(GENERATOR_BUFFER_LENGTH, 64 * 1024); //64k
static final Collection SUPPORTED_CONFIG_KEYS = asList(
-JsonGenerator.PRETTY_PRINTING, GENERATOR_BUFFER_LENGTH, BUFFER_STRATEGY
+JsonGenerator.PRETTY_PRINTING, GENERATOR_BUFFER_LENGTH,
BUFFER_STRATEGY, ENCODING
);
+
+private final Charset defaultEncoding;
+
//key caching currently disabled
private final boolean pretty;
private final BufferStrategy.BufferProvider bufferProvider;
public JsonGeneratorFactoryImpl(final Map config) {
-
- super(config, SUPPORTED_CONFIG_KEYS, null);
-
- this.pretty = getBool(JsonGenerator.PRETTY_PRINTING, false);
-
- final int bufferSize = getInt(GENERATOR_BUFFER_LENGTH,
DEFAULT_GENERATOR_BUFFER_LENGTH);
- if (bufferSize <= 0) {
- throw new IllegalArgumentException("buffer length must be
greater than zero");
- }
+super(config, SUPPORTED_CONFIG_KEYS, null);
+this.pretty = getBool(JsonGenerator.PRETTY_PRINTING, false);
+this.defaultEncoding = ofNullable(getString(ENCODING, null))
+.map(Charset::forName)
+.orElse(UTF_8);
- this.bufferProvider =
getBufferProvider().newCharProvider(bufferSize);
+final int bufferSize = getInt(GENERATOR_BUFFER_LENGTH,
DEFAULT_GENERATOR_BUFFER_LENGTH);
+if (bufferSize <= 0) {
+throw new IllegalArgumentException("buffer length must be greater
than zero");
+}
+this.bufferProvider = getBufferProvider().newCharProvider(bufferSize);
}
@Override
@@ -62,7 +68,7 @@ public class JsonGeneratorFactoryImpl extends
AbstractJsonFactory implements Jso
@Override
public JsonGenerator createGenerator(final OutputStream out) {
-return new JsonGeneratorImpl(out, bufferProvider, pretty);
+return new JsonGeneratorImpl(new OutputStreamWriter(out,
defaultEncoding), bufferProvider, pretty);
}
@Override
diff --git
a/johnzon-core/src/main/java/org/apache/johnzon/core/JsonGeneratorImpl.java
b/johnzon-core/src/main/java/org/apache/johnzon/cor
[johnzon] branch master updated: upgrading to junit 4.13.1
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 b0088061 upgrading to junit 4.13.1 b0088061 is described below commit b0088061f4d5eb697121dea08465522c7d5c8ae8 Author: Romain Manni-Bucau AuthorDate: Mon Apr 25 09:03:47 2022 +0200 upgrading to junit 4.13.1 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index b2f91b17..e2ae870e 100644 --- a/pom.xml +++ b/pom.xml @@ -91,7 +91,7 @@ junit junit - 4.12 + 4.13.1 test
[johnzon] branch master updated: simplifying some mappe dependencies, no main code change
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 8cb5377 simplifying some mappe dependencies, no main code change
8cb5377 is described below
commit 8cb53770e58cc2bdd26c26bdade4eae9cb995544
Author: Romain Manni-Bucau
AuthorDate: Mon Apr 25 09:02:24 2022 +0200
simplifying some mappe dependencies, no main code change
---
johnzon-mapper/pom.xml | 22 +--
.../org/apache/johnzon/mapper/NoWarningTest.java | 73 +-
johnzon-mapper/src/test/resources/JPATest.xml | 2 +-
3 files changed, 61 insertions(+), 36 deletions(-)
diff --git a/johnzon-mapper/pom.xml b/johnzon-mapper/pom.xml
index acaa20f..f4e3427 100644
--- a/johnzon-mapper/pom.xml
+++ b/johnzon-mapper/pom.xml
@@ -35,34 +35,16 @@
${project.version}
-
- com.github.stefanbirkner
- system-rules
- 1.8.0
- test
-
-
- commons-io
- commons-io
-
-
-
-
- commons-io
- commons-io
- 2.4
- test
-
org.apache.openjpa
openjpa
- 2.4.0
+ 3.2.2
test
com.h2database
h2
- 1.3.166
+ 2.1.210
test
diff --git
a/johnzon-mapper/src/test/java/org/apache/johnzon/mapper/NoWarningTest.java
b/johnzon-mapper/src/test/java/org/apache/johnzon/mapper/NoWarningTest.java
index fcb3656..3ffb94e 100644
--- a/johnzon-mapper/src/test/java/org/apache/johnzon/mapper/NoWarningTest.java
+++ b/johnzon-mapper/src/test/java/org/apache/johnzon/mapper/NoWarningTest.java
@@ -19,29 +19,68 @@
package org.apache.johnzon.mapper;
import java.io.ByteArrayOutputStream;
+import java.io.PrintStream;
+import java.io.UnsupportedEncodingException;
import java.util.HashMap;
import java.util.Map;
+import java.util.logging.Handler;
+import java.util.logging.LogRecord;
+import java.util.logging.Logger;
import javax.json.Json;
-import org.junit.Rule;
+import org.junit.After;
+import org.junit.Before;
import org.junit.Test;
-import org.junit.contrib.java.lang.system.StandardErrorStreamLog;
-import org.junit.contrib.java.lang.system.StandardOutputStreamLog;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.assertFalse;
public class NoWarningTest {
-
-@Rule
-public final StandardOutputStreamLog out = new StandardOutputStreamLog();
+public ByteArrayOutputStream out;
+public ByteArrayOutputStream err;
+private PrintStream oldOut;
+private PrintStream oldErr;
+private Handler handler;
+
+@Before
+public void capture() {
+out = new ByteArrayOutputStream();
+err = new ByteArrayOutputStream();
+oldOut = System.out;
+oldErr = System.err;
+System.setOut(new PrintStream(out));
+final PrintStream stderr = new PrintStream(err);
+System.setErr(stderr);
+handler = new Handler() {
+@Override
+public void publish(final LogRecord record) {
+stderr.println(record.getMessage());
+oldErr.println(record.getMessage());
+}
+
+@Override
+public void flush() {
+// no-op
+}
-@Rule
-public final StandardErrorStreamLog err = new StandardErrorStreamLog();
+@Override
+public void close() throws SecurityException {
+flush();
+}
+};
+Logger.getLogger("").addHandler(handler);
+}
+
+@After
+public void reset() {
+System.setOut(oldOut);
+System.setErr(oldErr);
+Logger.getLogger("").removeHandler(handler);
+}
@Test
-public void noWarn() {
+public void noWarn() throws UnsupportedEncodingException {
new MapperBuilder()
.setEncoding("UTF-8")
.setSupportConstructors(true)
@@ -52,19 +91,23 @@ public class NoWarningTest {
.setMaxSize(789465)
.setSkipNull(true)
.setSupportsComments(true)
-.build();
+.build()
+.close();
// no warn log
-assertTrue(out.getLog().isEmpty());
-assertTrue(err.getLog().isEmpty());
+assertTrue(out.toString("UTF-8").isEmpty());
+assertTrue(err.toString("UTF-8").isEmpty());
}
@Test
-public void warn() {
+public void warn() throws UnsupportedEncodingException {
Map unsupportedConfig = new HashMap();
unsupportedConfig.put("xxx.yyy.zzz", "");
-Json.createGeneratorFactory(unsupportedConfig).createGenerator(new
ByteArrayOutputStream());
+Json.createGeneratorFactory(unsuppor
[johnzon] branch master updated: JOHNZON-359 Fix lost OSGi metadata (#78)
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 6b37e52 JOHNZON-359 Fix lost OSGi metadata (#78)
6b37e52 is described below
commit 6b37e521f9c50e76a269a9846d122d423d9a9de1
Author: Raymond Augé
AuthorDate: Sun Feb 20 12:32:14 2022 -0500
JOHNZON-359 Fix lost OSGi metadata (#78)
Reverts the packaging change from b221d9db923c142afcddde056abd9301acbf9af1
Signed-off-by: Raymond Augé
---
johnzon-core/pom.xml | 1 +
johnzon-json-extras/pom.xml | 1 +
johnzon-jsonb/pom.xml| 2 +-
johnzon-jsonlogic/pom.xml| 2 +-
johnzon-jsonp-strict/pom.xml | 2 +-
johnzon-mapper/pom.xml | 1 +
johnzon-osgi/pom.xml | 4 ++--
7 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/johnzon-core/pom.xml b/johnzon-core/pom.xml
index 56f0e98..8273fd0 100644
--- a/johnzon-core/pom.xml
+++ b/johnzon-core/pom.xml
@@ -27,6 +27,7 @@
johnzon-core
Johnzon :: Core
+ bundle
${project.parent.reporting.outputDirectory}
diff --git a/johnzon-json-extras/pom.xml b/johnzon-json-extras/pom.xml
index 030ab6a..e311560 100644
--- a/johnzon-json-extras/pom.xml
+++ b/johnzon-json-extras/pom.xml
@@ -27,6 +27,7 @@
johnzon-jsonb-extras
Johnzon :: JSON-B Extensions
+ bundle
${project.parent.reporting.outputDirectory}
diff --git a/johnzon-jsonb/pom.xml b/johnzon-jsonb/pom.xml
index 97b7a45..8a7bdf1 100644
--- a/johnzon-jsonb/pom.xml
+++ b/johnzon-jsonb/pom.xml
@@ -27,7 +27,7 @@
johnzon-jsonb
Johnzon :: JSON-B Implementation
-
+ bundle
${project.parent.reporting.outputDirectory}
diff --git a/johnzon-jsonlogic/pom.xml b/johnzon-jsonlogic/pom.xml
index 33beb03..12e266d 100644
--- a/johnzon-jsonlogic/pom.xml
+++ b/johnzon-jsonlogic/pom.xml
@@ -27,7 +27,7 @@
johnzon-jsonlogic
Johnzon :: JSON Logic
-
+ bundle
diff --git a/johnzon-jsonp-strict/pom.xml b/johnzon-jsonp-strict/pom.xml
index 6acd306..55029a8 100644
--- a/johnzon-jsonp-strict/pom.xml
+++ b/johnzon-jsonp-strict/pom.xml
@@ -27,7 +27,7 @@
johnzon-jsonp-strict
Johnzon :: JSON-P Strict JSON Pointer Implementation (spec
compliant)
-
+ bundle
${project.parent.reporting.outputDirectory}
diff --git a/johnzon-mapper/pom.xml b/johnzon-mapper/pom.xml
index 0c1bf54..72aa972 100644
--- a/johnzon-mapper/pom.xml
+++ b/johnzon-mapper/pom.xml
@@ -70,6 +70,7 @@
${project.parent.reporting.outputDirectory}
+ bundle
diff --git a/johnzon-osgi/pom.xml b/johnzon-osgi/pom.xml
index c462fb8..2dfdbbd 100644
--- a/johnzon-osgi/pom.xml
+++ b/johnzon-osgi/pom.xml
@@ -27,7 +27,7 @@
johnzon-osgi
Johnzon :: Support for OSGI Jaxrs Whiteboard
-
+ bundle
@@ -128,4 +128,4 @@
-
+
\ No newline at end of file
[johnzon] branch master updated: JOHNZON-362 johnzon maven plugin tests fail on windows (#81)
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 48a6c5f JOHNZON-362 johnzon maven plugin tests fail on windows (#81)
48a6c5f is described below
commit 48a6c5f60ad891b4118edf40ffc2e7eb7789ada9
Author: Raymond Augé
AuthorDate: Sun Feb 20 12:30:54 2022 -0500
JOHNZON-362 johnzon maven plugin tests fail on windows (#81)
Signed-off-by: Raymond Augé
---
.../johnzon/maven/plugin/ExampleToModelMojo.java | 6 ++-
.../maven/plugin/ExampleToModelMojoTest.java | 43 ++
2 files changed, 39 insertions(+), 10 deletions(-)
diff --git
a/johnzon-maven-plugin/src/main/java/org/apache/johnzon/maven/plugin/ExampleToModelMojo.java
b/johnzon-maven-plugin/src/main/java/org/apache/johnzon/maven/plugin/ExampleToModelMojo.java
index af34fbd..03c7ff7 100644
---
a/johnzon-maven-plugin/src/main/java/org/apache/johnzon/maven/plugin/ExampleToModelMojo.java
+++
b/johnzon-maven-plugin/src/main/java/org/apache/johnzon/maven/plugin/ExampleToModelMojo.java
@@ -18,6 +18,7 @@
*/
package org.apache.johnzon.maven.plugin;
+import static java.nio.charset.StandardCharsets.UTF_8;
import org.apache.maven.plugin.AbstractMojo;
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.plugins.annotations.Mojo;
@@ -32,9 +33,10 @@ import javax.json.JsonReaderFactory;
import javax.json.JsonStructure;
import javax.json.JsonValue;
import java.io.File;
+import java.io.FileOutputStream;
import java.io.FileReader;
-import java.io.FileWriter;
import java.io.IOException;
+import java.io.OutputStreamWriter;
import java.io.StringWriter;
import java.io.Writer;
import java.util.Collection;
@@ -342,7 +344,7 @@ public class ExampleToModelMojo extends AbstractMojo {
final File outputFile = new File(target, jsonToClass.replace('.', '/')
+ ".java");
outputFile.getParentFile().mkdirs();
-try (final FileWriter writer = new FileWriter(outputFile)) {
+try (final OutputStreamWriter writer = new OutputStreamWriter(new
FileOutputStream(outputFile), UTF_8.name())) {
generate(readerFactory, source, writer, javaName);
} catch (IOException e) {
throw new MojoExecutionException(e.getMessage(), e);
diff --git
a/johnzon-maven-plugin/src/test/java/org/apache/johnzon/maven/plugin/ExampleToModelMojoTest.java
b/johnzon-maven-plugin/src/test/java/org/apache/johnzon/maven/plugin/ExampleToModelMojoTest.java
index 5a32199..b04bfd7 100644
---
a/johnzon-maven-plugin/src/test/java/org/apache/johnzon/maven/plugin/ExampleToModelMojoTest.java
+++
b/johnzon-maven-plugin/src/test/java/org/apache/johnzon/maven/plugin/ExampleToModelMojoTest.java
@@ -18,15 +18,18 @@
*/
package org.apache.johnzon.maven.plugin;
+import static java.util.stream.Collectors.joining;
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.plugin.MojoFailureException;
-import org.codehaus.plexus.util.IOUtil;
import org.junit.Test;
+import java.io.BufferedReader;
import java.io.File;
-import java.io.FileReader;
+import java.io.FileInputStream;
import java.io.FileWriter;
import java.io.IOException;
+import java.io.InputStreamReader;
+import java.nio.charset.StandardCharsets;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
@@ -110,9 +113,21 @@ public class ExampleToModelMojoTest {
final File output = new File(targetFolder,
"org/test/apache/johnzon/mojo/SomeValue.java");
assertTrue(output.isFile());
-assertEquals(
-new
String(IOUtil.toByteArray(Thread.currentThread().getContextClassLoader().getResourceAsStream("SomeValue.java"))),
-new String(IOUtil.toByteArray(new
FileReader(output))).replace(File.separatorChar, '/'));
+
+try (
+BufferedReader expectedBR = new BufferedReader(
+new InputStreamReader(
+
Thread.currentThread().getContextClassLoader().getResourceAsStream("SomeValue.java"),
+StandardCharsets.UTF_8));
+BufferedReader resultBR = new BufferedReader(
+new InputStreamReader(
+new FileInputStream(output), StandardCharsets.UTF_8))) {
+
+String expected = expectedBR.lines().collect(joining("\n")).trim();
+String result = resultBR.lines().collect(joining("\n")).trim();
+
+assertEquals(expected, result);
+}
}
@Test
@@ -195,8 +210,20 @@ public class ExampleToModelMojoTest {
final File output = new File(targetFolder,
"org/test/apache/johnzon/mojo/SomeValue.java");
assertTrue(output.isFile());
-assertEquals(
-new
String(IOUtil.toByteAr
[johnzon] branch master updated: JOHNZON-361 Johnzon maven plugin generates invalid record classes (#80)
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 a4e708e JOHNZON-361 Johnzon maven plugin generates invalid record
classes (#80)
a4e708e is described below
commit a4e708e0c175977d850d79ce15c7d4999188911a
Author: Raymond Augé
AuthorDate: Sun Feb 20 12:29:55 2022 -0500
JOHNZON-361 Johnzon maven plugin generates invalid record classes (#80)
Signed-off-by: Raymond Augé
---
.../johnzon/maven/plugin/ExampleToModelMojo.java | 19 +++
.../src/test/resources/SomeValue.record.java | 2 +-
2 files changed, 16 insertions(+), 5 deletions(-)
diff --git
a/johnzon-maven-plugin/src/main/java/org/apache/johnzon/maven/plugin/ExampleToModelMojo.java
b/johnzon-maven-plugin/src/main/java/org/apache/johnzon/maven/plugin/ExampleToModelMojo.java
index 2ce7ee7..af34fbd 100644
---
a/johnzon-maven-plugin/src/main/java/org/apache/johnzon/maven/plugin/ExampleToModelMojo.java
+++
b/johnzon-maven-plugin/src/main/java/org/apache/johnzon/maven/plugin/ExampleToModelMojo.java
@@ -129,10 +129,10 @@ public class ExampleToModelMojo extends AbstractMojo {
}
if (useRecord) {
-writer.write("public record " + javaName + "(\n");
+writer.write("public record " + javaName + "(");
writer.write(memBuffer.toString());
} else {
-writer.write("public class " + javaName + " {\n");
+writer.write("public class " + javaName + " {");
writer.write(memBuffer.toString());
}
writer.write("}\n");
@@ -146,6 +146,9 @@ public class ExampleToModelMojo extends AbstractMojo {
final Map nestedTypes = new TreeMap<>();
{
final Iterator> iterator =
object.entrySet().iterator();
+if (!object.isEmpty()) {
+writer.write("\n");
+}
while (iterator.hasNext()) {
final Map.Entry entry = iterator.next();
final String key = entry.getKey();
@@ -190,6 +193,14 @@ public class ExampleToModelMojo extends AbstractMojo {
}
}
+if (object.isEmpty()) {
+if (useRecord) {
+writer.write(") {\n");
+} else {
+writer.write("\n");
+}
+}
+
if (!object.isEmpty() && !nestedTypes.isEmpty()) {
writer.write("\n");
}
@@ -198,9 +209,9 @@ public class ExampleToModelMojo extends AbstractMojo {
while (entries.hasNext()) {
final Map.Entry entry = entries.next();
if (useRecord) {
-writer.write(prefix + "public static record " + entry.getKey()
+ "(\n");
+writer.write(prefix + "public static record " + entry.getKey()
+ "(");
} else {
-writer.write(prefix + "public static class " + entry.getKey()
+ " {\n");
+writer.write(prefix + "public static class " + entry.getKey()
+ " {");
}
generateFieldsAndMethods(writer, entry.getValue(), "" +
prefix, imports);
writer.write(prefix + "}\n");
diff --git a/johnzon-maven-plugin/src/test/resources/SomeValue.record.java
b/johnzon-maven-plugin/src/test/resources/SomeValue.record.java
index 120d2bd..7d59a64 100644
--- a/johnzon-maven-plugin/src/test/resources/SomeValue.record.java
+++ b/johnzon-maven-plugin/src/test/resources/SomeValue.record.java
@@ -55,6 +55,6 @@ public record SomeValue(
}
}
-public static record SecondaryMetrics(
+public static record SecondaryMetrics() {
}
}
[johnzon] branch master updated: JOHNZON-360 Make buildable and testable on Java 17 (#79)
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 dd94ec3 JOHNZON-360 Make buildable and testable on Java 17 (#79)
dd94ec3 is described below
commit dd94ec343b49d817e4e282f93b1a226ff2000260
Author: Raymond Augé
AuthorDate: Sun Feb 20 12:29:20 2022 -0500
JOHNZON-360 Make buildable and testable on Java 17 (#79)
Signed-off-by: Raymond Augé
---
johnzon-jsonb/pom.xml | 7
johnzon-jsonp-strict/pom.xml | 7
johnzon-jsonschema/pom.xml | 17 ++
.../src/test/resources/arquillian.xml | 1 +
pom.xml| 37 +-
5 files changed, 54 insertions(+), 15 deletions(-)
diff --git a/johnzon-jsonb/pom.xml b/johnzon-jsonb/pom.xml
index 0ee3162..97b7a45 100644
--- a/johnzon-jsonb/pom.xml
+++ b/johnzon-jsonb/pom.xml
@@ -134,13 +134,6 @@
osgi.serviceloader;osgi.serviceloader=javax.json.bind.spi.JsonbProvider
-
-
-biz.aQute.bnd
-biz.aQute.bndlib
-4.3.1
-
-
diff --git a/johnzon-jsonp-strict/pom.xml b/johnzon-jsonp-strict/pom.xml
index aca67c3..6acd306 100644
--- a/johnzon-jsonp-strict/pom.xml
+++ b/johnzon-jsonp-strict/pom.xml
@@ -68,13 +68,6 @@
osgi.serviceloader;osgi.serviceloader=org.apache.johnzon.core.spi.JsonPointerFactory
-
-
-biz.aQute.bnd
-biz.aQute.bndlib
-4.3.1
-
-
diff --git a/johnzon-jsonschema/pom.xml b/johnzon-jsonschema/pom.xml
index 8ada11f..24f0f7f 100644
--- a/johnzon-jsonschema/pom.xml
+++ b/johnzon-jsonschema/pom.xml
@@ -61,4 +61,21 @@
+
+
+
+jdk15+
+
+[15,)
+
+
+
+org.openjdk.nashorn
+nashorn-core
+15.3
+test
+
+
+
+
diff --git a/johnzon-websocket/src/test/resources/arquillian.xml
b/johnzon-websocket/src/test/resources/arquillian.xml
index 1f2d9d0..6312b91 100644
--- a/johnzon-websocket/src/test/resources/arquillian.xml
+++ b/johnzon-websocket/src/test/resources/arquillian.xml
@@ -32,6 +32,7 @@
true
target/apache-tomee-remote
target/arquillian-test-working-dir
+ ${arquillian.jvm.args}
diff --git a/pom.xml b/pom.xml
index 4e77fa7..6d0cdbb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -42,14 +42,16 @@
https://svn.apache.org/repos/asf/johnzon/site/publish/
scm:svn:${johnzon.site.url}
${project.build.directory}/site
-4.0.0
+5.1.4
[$(version;==;$(@)),$(version;+;$(@)))
+6.1.0
1.8
3.4.1
2.15
-Xms1024m -Xmx2048m
-Dfile.encoding=UTF-8
2.0.23
+
@@ -447,6 +449,13 @@
http://johnzon.apache.org/
+
+
+biz.aQute.bnd
+biz.aQute.bndlib
+${bnd.version}
+
+
@@ -786,5 +795,31 @@
2.17
+
+
+jdk9+
+
+[9,)
+
+
+
+--add-opens=java.base/java.lang=ALL-UNNAMED
+
+
+
+
+
+jdk18+
+
+[18,)
+
+
+
+--add-opens=java.base/java.lang=ALL-UNNAMED
+-Xmx512m -Xms256m -XX:ReservedCodeCacheSize=64m
-Dtomee.httpPort=38383
+-Djava.opts=
+
+
+
[johnzon] branch master updated: fixing naming of source artifacts on download page
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 0cbcb70 fixing naming of source artifacts on download page 0cbcb70 is described below commit 0cbcb70a6cf4d847d5af255394a4df0c4b5ddac3 Author: Romain Manni-Bucau AuthorDate: Tue Feb 8 11:15:26 2022 +0100 fixing naming of source artifacts on download page --- src/site/markdown/download.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/site/markdown/download.md b/src/site/markdown/download.md index c81d2b5..1788244 100644 --- a/src/site/markdown/download.md +++ b/src/site/markdown/download.md @@ -41,9 +41,9 @@ Apache Johnzon 1.2.x implements the JSON-P 1.1 and JSON-B 1.0 specifications whi Source Should you want to build any of the above binaries, this source bundle is the right one and covers them all. -* [johnzon-1.2.16-source-release.zip](https://www.apache.org/dyn/closer.lua/1.2.16/apache-johnzon-1.2.16-source-release.zip) -* [johnzon-1.2.16-source-release.zip.sha512](https://www.apache.org/dist/johnzon/1.2.16/apache-johnzon-1.2.16-source-release.zip.sha512) -* [johnzon-1.2.16-source-release.zip.asc](https://www.apache.org/dist/johnzon/1.2.16/apache-johnzon-1.2.16-source-release.zip.asc) +* [johnzon-1.2.16-source-release.zip](https://www.apache.org/dyn/closer.lua/1.2.16/johnzon-1.2.16-source-release.zip) +* [johnzon-1.2.16-source-release.zip.sha512](https://www.apache.org/dist/johnzon/1.2.16/johnzon-1.2.16-source-release.zip.sha512) +* [johnzon-1.2.16-source-release.zip.asc](https://www.apache.org/dist/johnzon/1.2.16/johnzon-1.2.16-source-release.zip.asc) ## Johnzon-1.0.x
[johnzon] branch master updated: source links should point to sources and not bin
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 76cf7d1 source links should point to sources and not bin 76cf7d1 is described below commit 76cf7d19961efc25aa70db1f90b3f770398eb12d Author: Romain Manni-Bucau AuthorDate: Tue Feb 8 11:14:06 2022 +0100 source links should point to sources and not bin --- src/site/markdown/download.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/site/markdown/download.md b/src/site/markdown/download.md index 6f601e5..c81d2b5 100644 --- a/src/site/markdown/download.md +++ b/src/site/markdown/download.md @@ -41,9 +41,9 @@ Apache Johnzon 1.2.x implements the JSON-P 1.1 and JSON-B 1.0 specifications whi Source Should you want to build any of the above binaries, this source bundle is the right one and covers them all. -* [johnzon-1.2.16-source-release.zip](https://www.apache.org/dyn/closer.lua/1.2.16/apache-johnzon-1.2.16-bin.zip) -* [johnzon-1.2.16-source-release.zip.sha512](https://www.apache.org/dist/johnzon/1.2.16/apache-johnzon-1.2.16-bin.zip.sha512) -* [johnzon-1.2.16-source-release.zip.asc](https://www.apache.org/dist/johnzon/1.2.16/apache-johnzon-1.2.16-bin.zip.asc) +* [johnzon-1.2.16-source-release.zip](https://www.apache.org/dyn/closer.lua/1.2.16/apache-johnzon-1.2.16-source-release.zip) +* [johnzon-1.2.16-source-release.zip.sha512](https://www.apache.org/dist/johnzon/1.2.16/apache-johnzon-1.2.16-source-release.zip.sha512) +* [johnzon-1.2.16-source-release.zip.asc](https://www.apache.org/dist/johnzon/1.2.16/apache-johnzon-1.2.16-source-release.zip.asc) ## Johnzon-1.0.x
svn commit: r1897846 - in /johnzon/site/publish: ./ apidocs/ apidocs/org/apache/johnzon/core/ apidocs/org/apache/johnzon/core/class-use/ apidocs/org/apache/johnzon/core/spi/ apidocs/org/apache/johnzon
Author: rmannibucau Date: Tue Feb 8 09:11:26 2022 New Revision: 1897846 URL: http://svn.apache.org/viewvc?rev=1897846=rev Log: syncing site after 1.2.16 upgrade [This commit notification would consist of 54 parts, which exceeds the limit of 50 ones, so it was shortened to the summary.]
[johnzon] branch master updated: since only sources are put on dist dont link bin
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 482512e since only sources are put on dist dont link bin 482512e is described below commit 482512ecd93901b6ebe9a02c635bc298ef6023ad Author: Romain Manni-Bucau AuthorDate: Tue Feb 8 09:41:05 2022 +0100 since only sources are put on dist dont link bin --- src/site/markdown/download.md | 7 --- 1 file changed, 7 deletions(-) diff --git a/src/site/markdown/download.md b/src/site/markdown/download.md index 2557b07..6f601e5 100644 --- a/src/site/markdown/download.md +++ b/src/site/markdown/download.md @@ -38,13 +38,6 @@ Read more about [how we sign Apache Releases](http://www.apache.org/info/verific Apache Johnzon 1.2.x implements the JSON-P 1.1 and JSON-B 1.0 specifications which on a level of JavaEE 8. - Binaries -The binary distribution contains all Johnzon modules. - -* [apache-johnzon-1.2.16-bin.zip](https://www.apache.org/dyn/closer.lua/johnzon/1.2.16/apache-johnzon-1.2.16-src.zip) -* [apache-johnzon-1.2.16-bin.zip.sha512](https://www.apache.org/dist/johnzon/1.2.16/apache-johnzon-1.2.16-src.zip.sha512) -* [apache-johnzon-1.2.16-bin.zip.asc](https://www.apache.org/dist/johnzon/1.2.16/apache-johnzon-1.2.16-src.zip.asc) - Source Should you want to build any of the above binaries, this source bundle is the right one and covers them all.
[johnzon] branch master updated: updating downloads
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 f8a7188 updating downloads f8a7188 is described below commit f8a71881f7656f7158e8815524033954880c1959 Author: Romain Manni-Bucau AuthorDate: Tue Feb 8 09:29:09 2022 +0100 updating downloads --- 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 de0bace..2557b07 100644 --- a/src/site/markdown/download.md +++ b/src/site/markdown/download.md @@ -41,16 +41,16 @@ Apache Johnzon 1.2.x implements the JSON-P 1.1 and JSON-B 1.0 specifications whi Binaries The binary distribution contains all Johnzon modules. -* [apache-johnzon-1.2.14-bin.zip](https://www.apache.org/dyn/closer.lua/johnzon/1.2.14/apache-johnzon-1.2.14-src.zip) -* [apache-johnzon-1.2.14-bin.zip.sha512](https://www.apache.org/dist/johnzon/1.2.14/apache-johnzon-1.2.14-src.zip.sha512) -* [apache-johnzon-1.2.14-bin.zip.asc](https://www.apache.org/dist/johnzon/1.2.14/apache-johnzon-1.2.14-src.zip.asc) +* [apache-johnzon-1.2.16-bin.zip](https://www.apache.org/dyn/closer.lua/johnzon/1.2.16/apache-johnzon-1.2.16-src.zip) +* [apache-johnzon-1.2.16-bin.zip.sha512](https://www.apache.org/dist/johnzon/1.2.16/apache-johnzon-1.2.16-src.zip.sha512) +* [apache-johnzon-1.2.16-bin.zip.asc](https://www.apache.org/dist/johnzon/1.2.16/apache-johnzon-1.2.16-src.zip.asc) Source Should you want to build any of the above binaries, this source bundle is the right one and covers them all. -* [johnzon-1.2.14-source-release.zip](https://www.apache.org/dyn/closer.lua/1.2.14/apache-johnzon-1.2.14-bin.zip) -* [johnzon-1.2.14-source-release.zip.sha512](https://www.apache.org/dist/johnzon/1.2.14/apache-johnzon-1.2.14-bin.zip.sha512) -* [johnzon-1.2.14-source-release.zip.asc](https://www.apache.org/dist/johnzon/1.2.14/apache-johnzon-1.2.14-bin.zip.asc) +* [johnzon-1.2.16-source-release.zip](https://www.apache.org/dyn/closer.lua/1.2.16/apache-johnzon-1.2.16-bin.zip) +* [johnzon-1.2.16-source-release.zip.sha512](https://www.apache.org/dist/johnzon/1.2.16/apache-johnzon-1.2.16-bin.zip.sha512) +* [johnzon-1.2.16-source-release.zip.asc](https://www.apache.org/dist/johnzon/1.2.16/apache-johnzon-1.2.16-bin.zip.asc) ## Johnzon-1.0.x
svn commit: r52445 - in /dev/johnzon: johnzon-1.2.16-source-release.zip johnzon-1.2.16-source-release.zip.asc johnzon-1.2.16-source-release.zip.sha512
Author: rmannibucau Date: Tue Feb 8 07:56:54 2022 New Revision: 52445 Log: johnzon 1.2.16 (dev cleanup) Removed: dev/johnzon/johnzon-1.2.16-source-release.zip dev/johnzon/johnzon-1.2.16-source-release.zip.asc dev/johnzon/johnzon-1.2.16-source-release.zip.sha512
svn commit: r52444 - in /release/johnzon: 1.2.14/ 1.2.16/ 1.2.16/johnzon-1.2.16-source-release.zip 1.2.16/johnzon-1.2.16-source-release.zip.asc 1.2.16/johnzon-1.2.16-source-release.zip.sha512
Author: rmannibucau Date: Tue Feb 8 07:56:46 2022 New Revision: 52444 Log: johnzon 1.2.16 (release) Added: release/johnzon/1.2.16/ release/johnzon/1.2.16/johnzon-1.2.16-source-release.zip (with props) release/johnzon/1.2.16/johnzon-1.2.16-source-release.zip.asc release/johnzon/1.2.16/johnzon-1.2.16-source-release.zip.sha512 Removed: release/johnzon/1.2.14/ Added: release/johnzon/1.2.16/johnzon-1.2.16-source-release.zip == Binary file - no diff available. Propchange: release/johnzon/1.2.16/johnzon-1.2.16-source-release.zip -- svn:mime-type = application/octet-stream Added: release/johnzon/1.2.16/johnzon-1.2.16-source-release.zip.asc == --- release/johnzon/1.2.16/johnzon-1.2.16-source-release.zip.asc (added) +++ release/johnzon/1.2.16/johnzon-1.2.16-source-release.zip.asc Tue Feb 8 07:56:46 2022 @@ -0,0 +1,11 @@ +-BEGIN PGP SIGNATURE- + +iQEzBAABCgAdFiEEz4CgVaKtKOnvv5QqcxKfWN5h7L0FAmH7oEQACgkQcxKfWN5h +7L3xEAgAi4j1AUFGJlhtYgMak2TDQze6O9afr42gvk/FP4x7RF8QyOw7va1hZuIt +/vRE4yX49JCcr9SL8uQOKPBizr/NAMZowrr+79TtiNt+AoVK7chWNqXSuPwuweEW +wmIH3Pzlh3cSP7pAAnFF96oHQw8GfQzpyi8wVmijSD6r63Nf3HeCVJW6ThGlUVXs +2b0VI31ZcWV7iT3i20nlp15/qSLvleFTf+5LrKMcYUe2ZKWWdwyw7fRan96gPEU8 +TbHTGRKKbTbZZHRFwOOJDfozKs+j4zWH0YLKfASB+KFxn1P988YwbdiQftOdiz4P +Mj6fmHc8m6zdqVfuH5zZVtXsS5/0FQ== +=/fqZ +-END PGP SIGNATURE- Added: release/johnzon/1.2.16/johnzon-1.2.16-source-release.zip.sha512 == --- release/johnzon/1.2.16/johnzon-1.2.16-source-release.zip.sha512 (added) +++ release/johnzon/1.2.16/johnzon-1.2.16-source-release.zip.sha512 Tue Feb 8 07:56:46 2022 @@ -0,0 +1 @@ +e2342d2d641b1960f7a4676718047cc7c76fb68958604f49117a11aa5856b25d642a90478d5142c08b4577e8751031302058891d87d78169b97a2569f4d385e0 johnzon-1.2.16-source-release.zip
svn commit: r52375 - in /dev/johnzon: johnzon-1.2.16-source-release.zip johnzon-1.2.16-source-release.zip.asc johnzon-1.2.16-source-release.zip.sha512
Author: rmannibucau Date: Thu Feb 3 09:30:44 2022 New Revision: 52375 Log: johnzon 1.2.16 dev area Added: dev/johnzon/johnzon-1.2.16-source-release.zip (with props) dev/johnzon/johnzon-1.2.16-source-release.zip.asc dev/johnzon/johnzon-1.2.16-source-release.zip.sha512 Added: dev/johnzon/johnzon-1.2.16-source-release.zip == Binary file - no diff available. Propchange: dev/johnzon/johnzon-1.2.16-source-release.zip -- svn:mime-type = application/octet-stream Added: dev/johnzon/johnzon-1.2.16-source-release.zip.asc == --- dev/johnzon/johnzon-1.2.16-source-release.zip.asc (added) +++ dev/johnzon/johnzon-1.2.16-source-release.zip.asc Thu Feb 3 09:30:44 2022 @@ -0,0 +1,11 @@ +-BEGIN PGP SIGNATURE- + +iQEzBAABCgAdFiEEz4CgVaKtKOnvv5QqcxKfWN5h7L0FAmH7oEQACgkQcxKfWN5h +7L3xEAgAi4j1AUFGJlhtYgMak2TDQze6O9afr42gvk/FP4x7RF8QyOw7va1hZuIt +/vRE4yX49JCcr9SL8uQOKPBizr/NAMZowrr+79TtiNt+AoVK7chWNqXSuPwuweEW +wmIH3Pzlh3cSP7pAAnFF96oHQw8GfQzpyi8wVmijSD6r63Nf3HeCVJW6ThGlUVXs +2b0VI31ZcWV7iT3i20nlp15/qSLvleFTf+5LrKMcYUe2ZKWWdwyw7fRan96gPEU8 +TbHTGRKKbTbZZHRFwOOJDfozKs+j4zWH0YLKfASB+KFxn1P988YwbdiQftOdiz4P +Mj6fmHc8m6zdqVfuH5zZVtXsS5/0FQ== +=/fqZ +-END PGP SIGNATURE- Added: dev/johnzon/johnzon-1.2.16-source-release.zip.sha512 == --- dev/johnzon/johnzon-1.2.16-source-release.zip.sha512 (added) +++ dev/johnzon/johnzon-1.2.16-source-release.zip.sha512 Thu Feb 3 09:30:44 2022 @@ -0,0 +1 @@ +e2342d2d641b1960f7a4676718047cc7c76fb68958604f49117a11aa5856b25d642a90478d5142c08b4577e8751031302058891d87d78169b97a2569f4d385e0 johnzon-1.2.16-source-release.zip
[johnzon] annotated tag v1.2.16 created (now 2b7bf44)
This is an automated email from the ASF dual-hosted git repository. rmannibucau pushed a change to annotated tag v1.2.16 in repository https://gitbox.apache.org/repos/asf/johnzon.git. at 2b7bf44 (tag) tagging ab7fb42c1bbbfb3b954993a1526888ac99f0f130 (commit) replaces v1.2.14 by Romain Manni-Bucau on Thu Feb 3 10:28:31 2022 +0100 - Log - [maven-release-plugin] copy for tag v1.2.16 --- This annotated tag includes the following new commits: new ab7fb42 [maven-release-plugin] prepare release v1.2.16 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] 01/02: [maven-release-plugin] prepare release v1.2.16
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 ab7fb42c1bbbfb3b954993a1526888ac99f0f130 Author: Romain Manni-Bucau AuthorDate: Thu Feb 3 10:28:21 2022 +0100 [maven-release-plugin] prepare release v1.2.16 --- 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 9bcd1cd..8fe6cfc 100644 --- a/johnzon-core/pom.xml +++ b/johnzon-core/pom.xml @@ -21,7 +21,7 @@ johnzon org.apache.johnzon -1.2.15-SNAPSHOT +1.2.16 4.0.0 diff --git a/johnzon-distribution/pom.xml b/johnzon-distribution/pom.xml index 3ef5900..42ffb14 100644 --- a/johnzon-distribution/pom.xml +++ b/johnzon-distribution/pom.xml @@ -21,7 +21,7 @@ johnzon org.apache.johnzon -1.2.15-SNAPSHOT +1.2.16 4.0.0 diff --git a/johnzon-jaxrs/pom.xml b/johnzon-jaxrs/pom.xml index c8a22d1..a41f894 100644 --- a/johnzon-jaxrs/pom.xml +++ b/johnzon-jaxrs/pom.xml @@ -21,7 +21,7 @@ johnzon org.apache.johnzon -1.2.15-SNAPSHOT +1.2.16 4.0.0 diff --git a/johnzon-json-extras/pom.xml b/johnzon-json-extras/pom.xml index d460f04..cd310a8 100644 --- a/johnzon-json-extras/pom.xml +++ b/johnzon-json-extras/pom.xml @@ -21,7 +21,7 @@ johnzon org.apache.johnzon -1.2.15-SNAPSHOT +1.2.16 4.0.0 diff --git a/johnzon-jsonb/pom.xml b/johnzon-jsonb/pom.xml index 82c367e..333b97a 100644 --- a/johnzon-jsonb/pom.xml +++ b/johnzon-jsonb/pom.xml @@ -21,7 +21,7 @@ johnzon org.apache.johnzon -1.2.15-SNAPSHOT +1.2.16 4.0.0 diff --git a/johnzon-jsonlogic/pom.xml b/johnzon-jsonlogic/pom.xml index cb0c3fe..4c1591b 100644 --- a/johnzon-jsonlogic/pom.xml +++ b/johnzon-jsonlogic/pom.xml @@ -21,7 +21,7 @@ johnzon org.apache.johnzon -1.2.15-SNAPSHOT +1.2.16 4.0.0 diff --git a/johnzon-jsonp-strict/pom.xml b/johnzon-jsonp-strict/pom.xml index 12d0a10..ae8b62b 100644 --- a/johnzon-jsonp-strict/pom.xml +++ b/johnzon-jsonp-strict/pom.xml @@ -21,7 +21,7 @@ johnzon org.apache.johnzon -1.2.15-SNAPSHOT +1.2.16 4.0.0 diff --git a/johnzon-jsonschema/pom.xml b/johnzon-jsonschema/pom.xml index 8c7fd8b..b96d4c9 100644 --- a/johnzon-jsonschema/pom.xml +++ b/johnzon-jsonschema/pom.xml @@ -21,7 +21,7 @@ johnzon org.apache.johnzon -1.2.15-SNAPSHOT +1.2.16 4.0.0 diff --git a/johnzon-mapper/pom.xml b/johnzon-mapper/pom.xml index d6d4e49..8dda39c 100644 --- a/johnzon-mapper/pom.xml +++ b/johnzon-mapper/pom.xml @@ -21,7 +21,7 @@ johnzon org.apache.johnzon -1.2.15-SNAPSHOT +1.2.16 4.0.0 diff --git a/johnzon-maven-plugin/pom.xml b/johnzon-maven-plugin/pom.xml index e92e48c..1c07df3 100644 --- a/johnzon-maven-plugin/pom.xml +++ b/johnzon-maven-plugin/pom.xml @@ -23,7 +23,7 @@ johnzon org.apache.johnzon -1.2.15-SNAPSHOT +1.2.16 johnzon-maven-plugin diff --git a/johnzon-osgi/pom.xml b/johnzon-osgi/pom.xml index 68420bf..bb82d8e 100644 --- a/johnzon-osgi/pom.xml +++ b/johnzon-osgi/pom.xml @@ -21,7 +21,7 @@ johnzon org.apache.johnzon -1.2.15-SNAPSHOT +1.2.16 4.0.0 diff --git a/johnzon-websocket/pom.xml b/johnzon-websocket/pom.xml index a3aab22..585fbc8 100644 --- a/johnzon-websocket/pom.xml +++ b/johnzon-websocket/pom.xml @@ -21,7 +21,7 @@ johnzon org.apache.johnzon -1.2.15-SNAPSHOT +1.2.16 4.0.0 diff --git a/pom.xml b/pom.xml index 0686c80..1b04aa4 100644 --- a/pom.xml +++ b/pom.xml @@ -29,7 +29,7 @@ org.apache.johnzon johnzon pom - 1.2.15-SNAPSHOT + 1.2.16 Apache Johnzon Apache Johnzon is an implementation of JSR-353 (JavaTM API for JSON Processing). 2014 @@ -491,7 +491,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.16
[johnzon] branch master updated (c955174 -> 0f3ee62)
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 c955174 [JOHNZON-358][JOHNZON-357] enhance (de)serializer support on list/map types new ab7fb42 [maven-release-plugin] prepare release v1.2.16 new 0f3ee62 [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] 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 0f3ee62d2d4b4d402da9001316826b65a69b1c97 Author: Romain Manni-Bucau AuthorDate: Thu Feb 3 10:28:31 2022 +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-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 8fe6cfc..56f0e98 100644 --- a/johnzon-core/pom.xml +++ b/johnzon-core/pom.xml @@ -21,7 +21,7 @@ johnzon org.apache.johnzon -1.2.16 +1.2.17-SNAPSHOT 4.0.0 diff --git a/johnzon-distribution/pom.xml b/johnzon-distribution/pom.xml index 42ffb14..c99e728 100644 --- a/johnzon-distribution/pom.xml +++ b/johnzon-distribution/pom.xml @@ -21,7 +21,7 @@ johnzon org.apache.johnzon -1.2.16 +1.2.17-SNAPSHOT 4.0.0 diff --git a/johnzon-jaxrs/pom.xml b/johnzon-jaxrs/pom.xml index a41f894..b3f9cc3 100644 --- a/johnzon-jaxrs/pom.xml +++ b/johnzon-jaxrs/pom.xml @@ -21,7 +21,7 @@ johnzon org.apache.johnzon -1.2.16 +1.2.17-SNAPSHOT 4.0.0 diff --git a/johnzon-json-extras/pom.xml b/johnzon-json-extras/pom.xml index cd310a8..030ab6a 100644 --- a/johnzon-json-extras/pom.xml +++ b/johnzon-json-extras/pom.xml @@ -21,7 +21,7 @@ johnzon org.apache.johnzon -1.2.16 +1.2.17-SNAPSHOT 4.0.0 diff --git a/johnzon-jsonb/pom.xml b/johnzon-jsonb/pom.xml index 333b97a..0ee3162 100644 --- a/johnzon-jsonb/pom.xml +++ b/johnzon-jsonb/pom.xml @@ -21,7 +21,7 @@ johnzon org.apache.johnzon -1.2.16 +1.2.17-SNAPSHOT 4.0.0 diff --git a/johnzon-jsonlogic/pom.xml b/johnzon-jsonlogic/pom.xml index 4c1591b..33beb03 100644 --- a/johnzon-jsonlogic/pom.xml +++ b/johnzon-jsonlogic/pom.xml @@ -21,7 +21,7 @@ johnzon org.apache.johnzon -1.2.16 +1.2.17-SNAPSHOT 4.0.0 diff --git a/johnzon-jsonp-strict/pom.xml b/johnzon-jsonp-strict/pom.xml index ae8b62b..aca67c3 100644 --- a/johnzon-jsonp-strict/pom.xml +++ b/johnzon-jsonp-strict/pom.xml @@ -21,7 +21,7 @@ johnzon org.apache.johnzon -1.2.16 +1.2.17-SNAPSHOT 4.0.0 diff --git a/johnzon-jsonschema/pom.xml b/johnzon-jsonschema/pom.xml index b96d4c9..8ada11f 100644 --- a/johnzon-jsonschema/pom.xml +++ b/johnzon-jsonschema/pom.xml @@ -21,7 +21,7 @@ johnzon org.apache.johnzon -1.2.16 +1.2.17-SNAPSHOT 4.0.0 diff --git a/johnzon-mapper/pom.xml b/johnzon-mapper/pom.xml index 8dda39c..0c1bf54 100644 --- a/johnzon-mapper/pom.xml +++ b/johnzon-mapper/pom.xml @@ -21,7 +21,7 @@ johnzon org.apache.johnzon -1.2.16 +1.2.17-SNAPSHOT 4.0.0 diff --git a/johnzon-maven-plugin/pom.xml b/johnzon-maven-plugin/pom.xml index 1c07df3..45ea1d1 100644 --- a/johnzon-maven-plugin/pom.xml +++ b/johnzon-maven-plugin/pom.xml @@ -23,7 +23,7 @@ johnzon org.apache.johnzon -1.2.16 +1.2.17-SNAPSHOT johnzon-maven-plugin diff --git a/johnzon-osgi/pom.xml b/johnzon-osgi/pom.xml index bb82d8e..c462fb8 100644 --- a/johnzon-osgi/pom.xml +++ b/johnzon-osgi/pom.xml @@ -21,7 +21,7 @@ johnzon org.apache.johnzon -1.2.16 +1.2.17-SNAPSHOT 4.0.0 diff --git a/johnzon-websocket/pom.xml b/johnzon-websocket/pom.xml index 585fbc8..e72a463 100644 --- a/johnzon-websocket/pom.xml +++ b/johnzon-websocket/pom.xml @@ -21,7 +21,7 @@ johnzon org.apache.johnzon -1.2.16 +1.2.17-SNAPSHOT 4.0.0 diff --git a/pom.xml b/pom.xml index 1b04aa4..4e77fa7 100644 --- a/pom.xml +++ b/pom.xml @@ -29,7 +29,7 @@ org.apache.johnzon johnzon pom - 1.2.16 + 1.2.17-SNAPSHOT Apache Johnzon Apache Johnzon is an implementation of JSR-353 (JavaTM API for JSON Processing). 2014 @@ -491,7 +491,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.16 +HEAD
[johnzon] branch generated-bindings updated: trivial flat support of 15869JohnzonJsonb
This is an automated email from the ASF dual-hosted git repository.
rmannibucau pushed a commit to branch generated-bindings
in repository https://gitbox.apache.org/repos/asf/johnzon.git
The following commit(s) were added to refs/heads/generated-bindings by this
push:
new 6f59875 trivial flat support of 15869JohnzonJsonb
6f59875 is described below
commit 6f59875a18f23f58ac94aa3e2914974c20a77ed8
Author: Romain Manni-Bucau
AuthorDate: Thu Feb 3 09:58:02 2022 +0100
trivial flat support of 15869JohnzonJsonb
---
.../jsonb/generator/GeneratedJohnzonJsonb.java | 23 ++
.../jsonb/generator/JsonbMapperGenerator.java | 75 +--
.../jsonb/generator/GeneratedJsonbTest.java| 87 +-
3 files changed, 160 insertions(+), 25 deletions(-)
diff --git
a/johnzon-jsonb/src/main/java/org/apache/johnzon/jsonb/generator/GeneratedJohnzonJsonb.java
b/johnzon-jsonb/src/main/java/org/apache/johnzon/jsonb/generator/GeneratedJohnzonJsonb.java
index df3b42d..305cfc0 100644
---
a/johnzon-jsonb/src/main/java/org/apache/johnzon/jsonb/generator/GeneratedJohnzonJsonb.java
+++
b/johnzon-jsonb/src/main/java/org/apache/johnzon/jsonb/generator/GeneratedJohnzonJsonb.java
@@ -20,6 +20,9 @@ package org.apache.johnzon.jsonb.generator;
import org.apache.johnzon.jsonb.JohnzonJsonb;
+import javax.json.JsonNumber;
+import javax.json.JsonString;
+import javax.json.JsonValue;
import java.io.Reader;
import java.io.Writer;
@@ -33,4 +36,24 @@ public abstract class GeneratedJohnzonJsonb {
public abstract T fromJson(Reader reader);
public abstract void toJson(Object object, Writer writer);
+
+protected static String json2String(final JsonValue value) {
+switch (value.getValueType()) {
+case STRING:
+return JsonString.class.cast(value).getString();
+case NULL:
+return null;
+default:
+throw new IllegalArgumentException("expected a string, got " +
value.getValueType());
+}
+}
+
+protected static int json2Int(final JsonValue value) {
+switch (value.getValueType()) {
+case NUMBER:
+return JsonNumber.class.cast(value).intValue();
+default:
+throw new IllegalArgumentException("expected an int, got " +
value.getValueType());
+}
+}
}
diff --git
a/johnzon-jsonb/src/main/java/org/apache/johnzon/jsonb/generator/JsonbMapperGenerator.java
b/johnzon-jsonb/src/main/java/org/apache/johnzon/jsonb/generator/JsonbMapperGenerator.java
index ad0917e..04e51b2 100644
---
a/johnzon-jsonb/src/main/java/org/apache/johnzon/jsonb/generator/JsonbMapperGenerator.java
+++
b/johnzon-jsonb/src/main/java/org/apache/johnzon/jsonb/generator/JsonbMapperGenerator.java
@@ -29,9 +29,13 @@ import javax.json.bind.JsonbConfig;
import java.io.IOException;
import java.io.Writer;
import java.lang.reflect.Field;
+import java.lang.reflect.Type;
+import java.math.BigDecimal;
+import java.math.BigInteger;
import java.nio.file.Files;
import java.nio.file.Path;
import java.util.Collection;
+import java.util.Map;
import java.util.function.Supplier;
import java.util.logging.Logger;
import java.util.stream.Stream;
@@ -95,18 +99,14 @@ public class JsonbMapperGenerator implements Runnable {
out.append("final
").append(clazz.getSimpleName()).append(suffix).append(" instance = new ")
.append(clazz.getSimpleName()).append(suffix).append("();\n");
out.append(mapping.setters.entrySet().stream()
+.sorted(Map.Entry.comparingByKey())
.map(setter -> toSetter(setter.getValue(),
setter.getKey()))
.collect(joining("\n", "", "\n")));
-out.append("return null;\n");
+out.append("return instance;\n");
out.append("}\n");
out.append("case NULL:\n");
-out.append("case ARRAY:\n");
-out.append("case STRING:\n");
-out.append("case NUMBER:\n");
-out.append("case TRUE:\n");
-out.append("case FALSE:\n");
+out.append("return null;\n");
out.append("default:\n");
-// todo: check if there is an adapter or alike
out.append("throw new
IllegalStateException(\"invalid value type: '\" + val
[johnzon] 01/01: start a binding generator from our classmapping
This is an automated email from the ASF dual-hosted git repository.
rmannibucau pushed a commit to branch generated-bindings
in repository https://gitbox.apache.org/repos/asf/johnzon.git
commit 30ccfb92428c647114b20a2a352a127988d733e6
Author: Romain Manni-Bucau
AuthorDate: Wed Feb 2 21:02:58 2022 +0100
start a binding generator from our classmapping
---
.../org/apache/johnzon/jsonb/JohnzonJsonb.java | 4 +
.../jsonb/generator/GeneratedJohnzonJsonb.java | 36 +++
.../jsonb/generator/JsonbMapperGenerator.java | 284 +
.../jsonb/generator/GeneratedJsonbTest.java| 89 +++
.../java/org/apache/johnzon/mapper/Mapper.java | 16 ++
5 files changed, 429 insertions(+)
diff --git
a/johnzon-jsonb/src/main/java/org/apache/johnzon/jsonb/JohnzonJsonb.java
b/johnzon-jsonb/src/main/java/org/apache/johnzon/jsonb/JohnzonJsonb.java
index 69c4816..2cb3b63 100644
--- a/johnzon-jsonb/src/main/java/org/apache/johnzon/jsonb/JohnzonJsonb.java
+++ b/johnzon-jsonb/src/main/java/org/apache/johnzon/jsonb/JohnzonJsonb.java
@@ -69,6 +69,10 @@ public class JohnzonJsonb implements Jsonb, AutoCloseable,
JsonbExtension {
this.onClose = onClose;
}
+public Mapper getDelegate() {
+return delegate;
+}
+
@Override
public T fromJson(final String str, final Class type) throws
JsonbException {
try {
diff --git
a/johnzon-jsonb/src/main/java/org/apache/johnzon/jsonb/generator/GeneratedJohnzonJsonb.java
b/johnzon-jsonb/src/main/java/org/apache/johnzon/jsonb/generator/GeneratedJohnzonJsonb.java
new file mode 100644
index 000..df3b42d
--- /dev/null
+++
b/johnzon-jsonb/src/main/java/org/apache/johnzon/jsonb/generator/GeneratedJohnzonJsonb.java
@@ -0,0 +1,36 @@
+/*
+ * 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.jsonb.generator;
+
+import org.apache.johnzon.jsonb.JohnzonJsonb;
+
+import java.io.Reader;
+import java.io.Writer;
+
+public abstract class GeneratedJohnzonJsonb {
+protected final JohnzonJsonb root;
+
+protected GeneratedJohnzonJsonb(final JohnzonJsonb root) {
+this.root = root;
+}
+
+public abstract T fromJson(Reader reader);
+
+public abstract void toJson(Object object, Writer writer);
+}
diff --git
a/johnzon-jsonb/src/main/java/org/apache/johnzon/jsonb/generator/JsonbMapperGenerator.java
b/johnzon-jsonb/src/main/java/org/apache/johnzon/jsonb/generator/JsonbMapperGenerator.java
new file mode 100644
index 000..ad0917e
--- /dev/null
+++
b/johnzon-jsonb/src/main/java/org/apache/johnzon/jsonb/generator/JsonbMapperGenerator.java
@@ -0,0 +1,284 @@
+/*
+ * 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.jsonb.generator;
+
+import org.apache.johnzon.jsonb.JohnzonBuilder;
+import org.apache.johnzon.jsonb.JohnzonJsonb;
+import org.apache.johnzon.mapper.Mappings;
+import org.apache.johnzon.mapper.access.AccessMode;
+import org.apache.johnzon.mapper.access.FieldAndMethodAccessMode;
+import org.apache.johnzon.mapper.access.MethodAccessMode;
+
+import javax.json.bind.JsonbConfig;
+import java.io.IOException;
+import java.io.Writer;
+import java.lang.reflect.Field;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.Collection;
+import java.util.function.Supplier;
+import java.util.logging.Logger;
+import java.util.stream.Stream;
+
+import static java.nio.charse
[johnzon] branch generated-bindings created (now 30ccfb9)
This is an automated email from the ASF dual-hosted git repository. rmannibucau pushed a change to branch generated-bindings in repository https://gitbox.apache.org/repos/asf/johnzon.git. at 30ccfb9 start a binding generator from our classmapping This branch includes the following new commits: new 30ccfb9 start a binding generator from our classmapping 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: [JOHNZON-358][JOHNZON-357] enhance (de)serializer support on list/map types
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 c955174 [JOHNZON-358][JOHNZON-357] enhance (de)serializer support on
list/map types
c955174 is described below
commit c95517479aab2c3934e54f1cdbf5fc9b449925e5
Author: Romain Manni-Bucau
AuthorDate: Tue Jan 25 17:17:59 2022 +0100
[JOHNZON-358][JOHNZON-357] enhance (de)serializer support on list/map types
---
.../org/apache/johnzon/core/JsonGeneratorImpl.java | 17 ++--
johnzon-jsonb/pom.xml | 2 +-
.../apache/johnzon/jsonb/SerializersMapTest.java | 106 +
.../SerializersObjectWithEmbeddedListTest.java | 87 +
.../org/apache/johnzon/jsonb/test/JsonbRule.java | 24 +++--
.../johnzon/mapper/DynamicMappingGenerator.java| 1 +
.../johnzon/mapper/MappingGeneratorImpl.java | 66 +++--
7 files changed, 252 insertions(+), 51 deletions(-)
diff --git
a/johnzon-core/src/main/java/org/apache/johnzon/core/JsonGeneratorImpl.java
b/johnzon-core/src/main/java/org/apache/johnzon/core/JsonGeneratorImpl.java
index 7520243..f15078b 100644
--- a/johnzon-core/src/main/java/org/apache/johnzon/core/JsonGeneratorImpl.java
+++ b/johnzon-core/src/main/java/org/apache/johnzon/core/JsonGeneratorImpl.java
@@ -34,11 +34,12 @@ import java.io.Writer;
import java.math.BigDecimal;
import java.math.BigInteger;
import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
import java.util.Iterator;
import java.util.Map;
class JsonGeneratorImpl implements JsonGenerator, JsonChars, Serializable {
-private static final Charset UTF8_CHARSET = Charset.forName("UTF-8");
+private static final Charset UTF8_CHARSET = StandardCharsets.UTF_8;
private final transient Writer writer;
private final BufferStrategy.BufferProvider bufferProvider;
@@ -184,20 +185,17 @@ class JsonGeneratorImpl implements JsonGenerator,
JsonChars, Serializable {
switch (value.getValueType()) {
case ARRAY:
writeStartArray(name);
-final JsonArray array = JsonArray.class.cast(value);
-final Iterator ait = array.iterator();
-while (ait.hasNext()) {
-write(ait.next());
+final JsonArray array = value.asJsonArray();
+for (final JsonValue jsonValue : array) {
+write(jsonValue);
}
writeEnd();
break;
case OBJECT:
writeStartObject(name);
-final JsonObject object = JsonObject.class.cast(value);
-final Iterator> oit =
object.entrySet().iterator();
-while (oit.hasNext()) {
-final Map.Entry keyval = oit.next();
+final JsonObject object = value.asJsonObject();
+for (final Map.Entry keyval :
object.entrySet()) {
write(keyval.getKey(), keyval.getValue());
}
writeEnd();
@@ -828,5 +826,4 @@ class JsonGeneratorImpl implements JsonGenerator,
JsonChars, Serializable {
}
}
*/
-
}
diff --git a/johnzon-jsonb/pom.xml b/johnzon-jsonb/pom.xml
index dcbd370..82c367e 100644
--- a/johnzon-jsonb/pom.xml
+++ b/johnzon-jsonb/pom.xml
@@ -37,7 +37,7 @@
org.apache.geronimo.specs
geronimo-annotation_1.3_spec
- 1.1
+ 1.3
provided
true
diff --git
a/johnzon-jsonb/src/test/java/org/apache/johnzon/jsonb/SerializersMapTest.java
b/johnzon-jsonb/src/test/java/org/apache/johnzon/jsonb/SerializersMapTest.java
new file mode 100644
index 000..4e14592
--- /dev/null
+++
b/johnzon-jsonb/src/test/java/org/apache/johnzon/jsonb/SerializersMapTest.java
@@ -0,0 +1,106 @@
+/*
+ * 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.jsonb;
+
+import org.apache.johnzon.jsonb.test.JsonbRule;
+import org.junit.Before;
+import org.junit.Rule;
[johnzon] branch master updated: [JOHNZON-355]: Find class level Adapter even when used in collection. (#76)
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 97c047d [JOHNZON-355]: Find class level Adapter even when used in
collection. (#76)
97c047d is described below
commit 97c047d6c0d2cd1f76925310f1ecc7a4fae22dd3
Author: Arne Limburg
AuthorDate: Wed Nov 24 08:41:44 2021 +0100
[JOHNZON-355]: Find class level Adapter even when used in collection. (#76)
---
.../org/apache/johnzon/jsonb/JsonbAccessMode.java | 18 +++---
.../java/org/apache/johnzon/jsonb/AdapterTest.java | 40 ++
2 files changed, 53 insertions(+), 5 deletions(-)
diff --git
a/johnzon-jsonb/src/main/java/org/apache/johnzon/jsonb/JsonbAccessMode.java
b/johnzon-jsonb/src/main/java/org/apache/johnzon/jsonb/JsonbAccessMode.java
index 3204101..4bf1911 100644
--- a/johnzon-jsonb/src/main/java/org/apache/johnzon/jsonb/JsonbAccessMode.java
+++ b/johnzon-jsonb/src/main/java/org/apache/johnzon/jsonb/JsonbAccessMode.java
@@ -977,7 +977,7 @@ public class JsonbAccessMode implements AccessMode,
Closeable {
final boolean hasRawType = hasRawType(annotationHolder.getType());
final JsonbTypeDeserializer deserializer =
annotationHolder.getAnnotation(JsonbTypeDeserializer.class);
final JsonbTypeAdapter adapter =
annotationHolder.getAnnotation(JsonbTypeAdapter.class);
-final JsonbTypeAdapter typeAdapter = hasRawType ?
getRawType(annotationHolder.getType()).getDeclaredAnnotation(JsonbTypeAdapter.class)
: null;
+final JsonbTypeAdapter typeAdapter = hasRawType ?
getRawTargetType(annotationHolder.getType()).getDeclaredAnnotation(JsonbTypeAdapter.class)
: null;
JsonbDateFormat dateFormat = dateType ?
annotationHolder.getAnnotation(JsonbDateFormat.class) : null;
JsonbNumberFormat numberFormat = numberType ?
annotationHolder.getAnnotation(JsonbNumberFormat.class) : null;
final JohnzonConverter johnzonConverter =
annotationHolder.getAnnotation(JohnzonConverter.class);
@@ -1077,7 +1077,7 @@ public class JsonbAccessMode implements AccessMode,
Closeable {
final boolean hasRawType = hasRawType(reader.getType());
final JsonbTypeSerializer serializer =
reader.getAnnotation(JsonbTypeSerializer.class);
final JsonbTypeAdapter adapter =
reader.getAnnotation(JsonbTypeAdapter.class);
-final JsonbTypeAdapter typeAdapter = hasRawType ?
getRawType(reader.getType()).getDeclaredAnnotation(JsonbTypeAdapter.class) :
null;
+final JsonbTypeAdapter typeAdapter = hasRawType ?
getRawTargetType(reader.getType()).getDeclaredAnnotation(JsonbTypeAdapter.class)
: null;
JsonbDateFormat dateFormat = dateType ?
reader.getAnnotation(JsonbDateFormat.class) : null;
JsonbNumberFormat numberFormat = numberType ?
reader.getAnnotation(JsonbNumberFormat.class) : null;
final JohnzonConverter johnzonConverter =
reader.getAnnotation(JohnzonConverter.class);
@@ -1149,12 +1149,20 @@ public class JsonbAccessMode implements AccessMode,
Closeable {
Class.class.isInstance(ParameterizedType.class.cast(type).getRawType()));
}
-private Class getRawType(final Type type) { // only intended to be used
after hasRawType check
+private Class getRawTargetType(final Type type) { // only intended to
be used after hasRawType check
if (Class.class.isInstance(type)) {
return Class.class.cast(type);
}
-// ParameterizedType + Class raw type
-return
Class.class.cast(ParameterizedType.class.cast(type).getRawType());
+ParameterizedType parameterizedType =
ParameterizedType.class.cast(type);
+Class rawType = Class.class.cast(parameterizedType.getRawType());
+if (Collection.class.isAssignableFrom(rawType) ||
Map.class.isAssignableFrom(rawType)) {
+Type[] actualTypeArguments =
parameterizedType.getActualTypeArguments();
+Type itemType = actualTypeArguments[actualTypeArguments.length -
1];
+if (Class.class.isInstance(itemType)) {
+return Class.class.cast(itemType);
+}
+}
+return rawType;
}
private static class ClassDecoratedType implements DecoratedType {
diff --git
a/johnzon-jsonb/src/test/java/org/apache/johnzon/jsonb/AdapterTest.java
b/johnzon-jsonb/src/test/java/org/apache/johnzon/jsonb/AdapterTest.java
index 862c10e..840273f 100644
--- a/johnzon-jsonb/src/test/java/org/apache/johnzon/jsonb/AdapterTest.java
+++ b/johnzon-jsonb/src/test/java/org/apache/johnzon/jsonb/AdapterTest.java
@@ -167,6 +167,46 @@ public class AdapterTest {
assertEquals(22, Bar2.class.cast(read.bars.get(1)).value2);
}
+@Test
+public void adaptCollectionValue() {
+final
[johnzon] branch master updated: [JOHNZON-354] reverse johnzon.failOnMissingCreatorValues default and support jsonb.creator-parameters-required prop
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 b221d9d [JOHNZON-354] reverse johnzon.failOnMissingCreatorValues
default and support jsonb.creator-parameters-required prop
b221d9d is described below
commit b221d9db923c142afcddde056abd9301acbf9af1
Author: Romain Manni-Bucau
AuthorDate: Tue Nov 23 11:19:11 2021 +0100
[JOHNZON-354] reverse johnzon.failOnMissingCreatorValues default and
support jsonb.creator-parameters-required prop
---
johnzon-core/pom.xml | 1 -
johnzon-json-extras/pom.xml | 1 -
johnzon-jsonb/pom.xml| 2 +-
.../src/main/java/org/apache/johnzon/jsonb/JohnzonBuilder.java | 5 -
.../java/org/apache/johnzon/jsonb/DynamicBufferResizingTest.java | 2 +-
johnzon-jsonlogic/pom.xml| 2 +-
johnzon-jsonp-strict/pom.xml | 2 +-
johnzon-mapper/pom.xml | 1 -
johnzon-osgi/pom.xml | 4 ++--
9 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/johnzon-core/pom.xml b/johnzon-core/pom.xml
index 6b9b407..9bcd1cd 100644
--- a/johnzon-core/pom.xml
+++ b/johnzon-core/pom.xml
@@ -27,7 +27,6 @@
johnzon-core
Johnzon :: Core
- bundle
${project.parent.reporting.outputDirectory}
diff --git a/johnzon-json-extras/pom.xml b/johnzon-json-extras/pom.xml
index 4c88d86..d460f04 100644
--- a/johnzon-json-extras/pom.xml
+++ b/johnzon-json-extras/pom.xml
@@ -27,7 +27,6 @@
johnzon-jsonb-extras
Johnzon :: JSON-B Extensions
- bundle
${project.parent.reporting.outputDirectory}
diff --git a/johnzon-jsonb/pom.xml b/johnzon-jsonb/pom.xml
index 5c6ff3c..dcbd370 100644
--- a/johnzon-jsonb/pom.xml
+++ b/johnzon-jsonb/pom.xml
@@ -27,7 +27,7 @@
johnzon-jsonb
Johnzon :: JSON-B Implementation
- bundle
+
${project.parent.reporting.outputDirectory}
diff --git
a/johnzon-jsonb/src/main/java/org/apache/johnzon/jsonb/JohnzonBuilder.java
b/johnzon-jsonb/src/main/java/org/apache/johnzon/jsonb/JohnzonBuilder.java
index d21bb18..24966cc 100644
--- a/johnzon-jsonb/src/main/java/org/apache/johnzon/jsonb/JohnzonBuilder.java
+++ b/johnzon-jsonb/src/main/java/org/apache/johnzon/jsonb/JohnzonBuilder.java
@@ -222,9 +222,12 @@ public class JohnzonBuilder implements JsonbBuilder {
config.getProperty("johnzon.accessModeDelegate")
.map(this::toAccessMode)
.orElseGet(() -> new
FieldAndMethodAccessMode(true, true, false, true)),
+// this changes in v3 of the spec so let's use this
behavior which makes everyone happy by default
config.getProperty("johnzon.failOnMissingCreatorValues")
.map(this::toBool)
-.orElse(true) /*spec 1.0 requirement*/,
+.orElseGet(() ->
config.getProperty("jsonb.creator-parameters-required")
+.map(this::toBool)
+.orElse(false)),
isNillable,
config.getProperty("johnzon.supportsPrivateAccess")
.map(this::toBool)
diff --git
a/johnzon-jsonb/src/test/java/org/apache/johnzon/jsonb/DynamicBufferResizingTest.java
b/johnzon-jsonb/src/test/java/org/apache/johnzon/jsonb/DynamicBufferResizingTest.java
index 6e4d378..22c6e78 100644
---
a/johnzon-jsonb/src/test/java/org/apache/johnzon/jsonb/DynamicBufferResizingTest.java
+++
b/johnzon-jsonb/src/test/java/org/apache/johnzon/jsonb/DynamicBufferResizingTest.java
@@ -56,7 +56,7 @@ public class DynamicBufferResizingTest {
@Test(expected = JsonbException.class)
public void failOnMissingProp() throws Exception {
-try (final Jsonb jsonb = JsonbBuilder.create()) {
+try (final Jsonb jsonb = JsonbBuilder.create(new
JsonbConfig().setProperty("jsonb.creator-parameters-required", true))) {
jsonb.fromJson(jsonb.toJson(new Request("Screenshot.png", null,
null)), Request.class);
}
}
diff --git a/johnzon-jsonlogic/pom.xml b/johnzon-jsonlogic/pom.xml
index b51aa4b..cb0c3fe 100644
--- a/johnzon-jsonlogic/pom.xml
+++ b/johnzon-jsonlogic/pom.xml
@@ -27,7 +27,7 @@
johnzon-jsonlogic
Johnzon :: JSON Logic
- bundle
+
diff --git a/johnzon-jsonp-strict/pom.xml b/johnzon-jsonp-strict/pom.xml
index 9981a61..12d0a10 100644
--- a/johnzon-jsonp-strict/pom.xml
+++ b/johnzo
[johnzon] branch master updated: JOHNZON-353 enum jsonschema validation nulable fix
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 c3360bd JOHNZON-353 enum jsonschema validation nulable fix
c3360bd is described below
commit c3360bd35e98ff951f19c4eb99a5ff2d567a4673
Author: Romain Manni-Bucau
AuthorDate: Fri Oct 8 10:53:14 2021 +0200
JOHNZON-353 enum jsonschema validation nulable fix
---
.../jsonschema/spi/builtin/BaseValidation.java | 4 +-
.../jsonschema/spi/builtin/EnumValidation.java | 8 +--
.../jsonschema/JsonSchemaValidatorTest.java| 2 +-
.../jsonschema/spi/builtin/EnumValidationTest.java | 60 ++
4 files changed, 68 insertions(+), 6 deletions(-)
diff --git
a/johnzon-jsonschema/src/main/java/org/apache/johnzon/jsonschema/spi/builtin/BaseValidation.java
b/johnzon-jsonschema/src/main/java/org/apache/johnzon/jsonschema/spi/builtin/BaseValidation.java
index bb52fbb..35bc621 100644
---
a/johnzon-jsonschema/src/main/java/org/apache/johnzon/jsonschema/spi/builtin/BaseValidation.java
+++
b/johnzon-jsonschema/src/main/java/org/apache/johnzon/jsonschema/spi/builtin/BaseValidation.java
@@ -29,13 +29,13 @@ import javax.json.JsonValue;
import org.apache.johnzon.jsonschema.ValidationResult;
-abstract class BaseValidation implements Function> {
+public abstract class BaseValidation implements Function> {
protected final String pointer;
protected final Function extractor;
private final JsonValue.ValueType validType;
private final boolean rootCanBeNull;
-BaseValidation(final String pointer, final Function
extractor, final JsonValue.ValueType validType) {
+public BaseValidation(final String pointer, final Function extractor, final JsonValue.ValueType validType) {
this.pointer = pointer;
this.extractor = extractor != null ? extractor : v -> v;
this.rootCanBeNull = extractor != null;
diff --git
a/johnzon-jsonschema/src/main/java/org/apache/johnzon/jsonschema/spi/builtin/EnumValidation.java
b/johnzon-jsonschema/src/main/java/org/apache/johnzon/jsonschema/spi/builtin/EnumValidation.java
index 39e6d78..0185841 100644
---
a/johnzon-jsonschema/src/main/java/org/apache/johnzon/jsonschema/spi/builtin/EnumValidation.java
+++
b/johnzon-jsonschema/src/main/java/org/apache/johnzon/jsonschema/spi/builtin/EnumValidation.java
@@ -37,15 +37,17 @@ public class EnumValidation implements ValidationExtension {
return ofNullable(model.getSchema().get("enum"))
.filter(it -> it.getValueType() == JsonValue.ValueType.ARRAY)
.map(JsonValue::asJsonArray)
-.map(values -> new Impl(values, model.getValueProvider(),
model.toPointer()));
+.map(values -> new Impl(values, model.getValueProvider(),
model.toPointer(), JsonValue.TRUE.equals(model.getSchema().get("nullable";
}
private static class Impl extends BaseValidation {
private final Collection valid;
+private final boolean nullable;
-private Impl(final Collection valid, final
Function extractor, final String pointer) {
+private Impl(final Collection valid, final
Function extractor, final String pointer, final boolean
nullable) {
super(pointer, extractor, JsonValue.ValueType.OBJECT /* ignored
*/);
this.valid = valid;
+this.nullable = nullable;
}
@Override
@@ -54,7 +56,7 @@ public class EnumValidation implements ValidationExtension {
return Stream.empty();
}
final JsonValue value = extractor.apply(root);
-if (value != null && JsonValue.ValueType.NULL !=
value.getValueType()) {
+if (nullable && (value == null || JsonValue.ValueType.NULL ==
value.getValueType())) {
return Stream.empty();
}
if (valid.contains(value)) {
diff --git
a/johnzon-jsonschema/src/test/java/org/apache/johnzon/jsonschema/JsonSchemaValidatorTest.java
b/johnzon-jsonschema/src/test/java/org/apache/johnzon/jsonschema/JsonSchemaValidatorTest.java
index cefd77b..3331ed3 100644
---
a/johnzon-jsonschema/src/test/java/org/apache/johnzon/jsonschema/JsonSchemaValidatorTest.java
+++
b/johnzon-jsonschema/src/test/java/org/apache/johnzon/jsonschema/JsonSchemaValidatorTest.java
@@ -208,7 +208,7 @@ public class JsonSchemaValidatorTest {
final ValidationResult failure =
validator.apply(jsonFactory.createObjectBuilder().add("name", 5).build());
assertFalse(failure.isSuccess());
final Collection errors =
failure.getErrors();
-assertEquals(1, errors.size());
+assertEquals(2, errors.size());
final ValidationResult.ValidationError error =
errors.iterator().next();
assertEquals(&
[johnzon] branch master updated: fixing some download links
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 df58d15 fixing some download links df58d15 is described below commit df58d158825cc315c59251ab171d6600fa621172 Author: Romain Manni-Bucau AuthorDate: Thu Sep 30 19:54:26 2021 +0200 fixing some download links --- src/site/markdown/download.md | 18 +- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/src/site/markdown/download.md b/src/site/markdown/download.md index f61db2d..de0bace 100644 --- a/src/site/markdown/download.md +++ b/src/site/markdown/download.md @@ -41,16 +41,16 @@ Apache Johnzon 1.2.x implements the JSON-P 1.1 and JSON-B 1.0 specifications whi Binaries The binary distribution contains all Johnzon modules. -* [apache-johnzon-1.2.14-bin.zip](https://www.apache.org/dyn/closer.lua/johnzon/johnzon-1.2.14/apache-johnzon-1.2.14-bin.zip) -* [apache-johnzon-1.2.14-bin.zip.sha1](https://www.apache.org/dist/johnzon/johnzon-1.2.14/apache-johnzon-1.2.14-bin.zip.sha1) -* [apache-johnzon-1.2.14-bin.zip.asc](https://www.apache.org/dist/johnzon/johnzon-1.2.14/apache-johnzon-1.2.14-bin.zip.asc) +* [apache-johnzon-1.2.14-bin.zip](https://www.apache.org/dyn/closer.lua/johnzon/1.2.14/apache-johnzon-1.2.14-src.zip) +* [apache-johnzon-1.2.14-bin.zip.sha512](https://www.apache.org/dist/johnzon/1.2.14/apache-johnzon-1.2.14-src.zip.sha512) +* [apache-johnzon-1.2.14-bin.zip.asc](https://www.apache.org/dist/johnzon/1.2.14/apache-johnzon-1.2.14-src.zip.asc) Source Should you want to build any of the above binaries, this source bundle is the right one and covers them all. -* [johnzon-1.2.14-source-release.zip](https://www.apache.org/dyn/closer.lua/johnzon/johnzon-1.2.14/johnzon-1.2.14-source-release.zip) -* [johnzon-1.2.14-source-release.zip.sha1](https://www.apache.org/dist/johnzon/johnzon-1.2.14/johnzon-1.2.14-source-release.zip.sha1) -* [johnzon-1.2.14-source-release.zip.asc](https://www.apache.org/dist/johnzon/johnzon-1.2.14/johnzon-1.2.14-source-release.zip.asc) +* [johnzon-1.2.14-source-release.zip](https://www.apache.org/dyn/closer.lua/1.2.14/apache-johnzon-1.2.14-bin.zip) +* [johnzon-1.2.14-source-release.zip.sha512](https://www.apache.org/dist/johnzon/1.2.14/apache-johnzon-1.2.14-bin.zip.sha512) +* [johnzon-1.2.14-source-release.zip.asc](https://www.apache.org/dist/johnzon/1.2.14/apache-johnzon-1.2.14-bin.zip.asc) ## Johnzon-1.0.x @@ -68,9 +68,9 @@ The binary distribution contains all Johnzon modules. Source Should you want to build any of the above binaries, this source bundle is the right one and covers them all. -* [johnzon-1.0.2-source-release.zip](https://www.apache.org/dyn/closer.lua/johnzon/johnzon-1.0.2/johnzon-1.0.2-source-release.zip) -* [johnzon-1.0.2-source-release.zip.sha256](https://www.apache.org/dist/johnzon/johnzon-1.0.2/johnzon-1.0.2-source-release.zip.sha256) -* [johnzon-1.0.2-source-release.zip.asc](https://www.apache.org/dist/johnzon/johnzon-1.0.2/johnzon-1.0.2-source-release.zip.asc) +* [johnzon-1.0.2-source-release.zip](https://www.apache.org/dyn/closer.lua/johnzon/johnzon-1.0.2/apache-johnzon-1.0.2-source-release.zip) +* [johnzon-1.0.2-source-release.zip.sha256](https://www.apache.org/dist/johnzon/johnzon-1.0.2/apache-johnzon-1.0.2-source-release.zip.sha256) +* [johnzon-1.0.2-source-release.zip.asc](https://www.apache.org/dist/johnzon/johnzon-1.0.2/apache-johnzon-1.0.2-source-release.zip.asc) ---
svn commit: r1893761 [1/2] - in /johnzon/site/publish: ./ cobertura/ johnzon-core/ johnzon-core/cobertura/ johnzon-jaxrs/cobertura/ johnzon-jsonb-extras/cobertura/ johnzon-jsonb/cobertura/ johnzon-jso
Author: rmannibucau Date: Thu Sep 30 17:54:23 2021 New Revision: 1893761 URL: http://svn.apache.org/viewvc?rev=1893761=rev Log: Site checkin for project Apache Johnzon Modified: johnzon/site/publish/cobertura/frame-summary.html johnzon/site/publish/download.html johnzon/site/publish/johnzon-core/cobertura/frame-summary.html johnzon/site/publish/johnzon-core/pmd.html johnzon/site/publish/johnzon-jaxrs/cobertura/frame-summary.html johnzon/site/publish/johnzon-jsonb-extras/cobertura/frame-summary.html johnzon/site/publish/johnzon-jsonb/cobertura/frame-summary.html johnzon/site/publish/johnzon-jsonp-strict/cobertura/frame-summary.html johnzon/site/publish/johnzon-mapper/cobertura/frame-summary.html johnzon/site/publish/surefire-report.html Modified: johnzon/site/publish/cobertura/frame-summary.html URL: http://svn.apache.org/viewvc/johnzon/site/publish/cobertura/frame-summary.html?rev=1893761=1893760=1893761=diff == --- johnzon/site/publish/cobertura/frame-summary.html (original) +++ johnzon/site/publish/cobertura/frame-summary.html Thu Sep 30 17:54:23 2021 @@ -24,6 +24,6 @@ var packageTable = new SortableTable(doc ["String", "Number", "Percentage", "Percentage", "FormattedNumber"]); packageTable.sort(0); -Report generated by http://cobertura.sourceforge.net/; target="_top">Cobertura 2.0.3 on 30/09/21 19:38. +Report generated by http://cobertura.sourceforge.net/; target="_top">Cobertura 2.0.3 on 30/09/21 19:47. \ No newline at end of file Modified: johnzon/site/publish/download.html URL: http://svn.apache.org/viewvc/johnzon/site/publish/download.html?rev=1893761=1893760=1893761=diff == --- johnzon/site/publish/download.html (original) +++ johnzon/site/publish/download.html Thu Sep 30 17:54:23 2021 @@ -402,9 +402,9 @@ under the License. https://www.apache.org/dyn/closer.lua/johnzon/1.2.14/apache-johnzon-1.2.14-src.zip;>apache-johnzon-1.2.14-bin.zip -https://www.apache.org/dist/johnzon/1.2.14/apache-johnzon-1.2.14-src.zip.sha512;>apache-johnzon-1.2.14-bin.zip.sha1 +https://www.apache.org/dist/johnzon/1.2.14/apache-johnzon-1.2.14-src.zip.sha512;>apache-johnzon-1.2.14-bin.zip.sha512 -https://www.apache.org/dist/johnzon/1.2.14/apache-johnzon-1.2.14-src.zip.sha512.asc;>apache-johnzon-1.2.14-bin.zip.asc +https://www.apache.org/dist/johnzon/1.2.14/apache-johnzon-1.2.14-src.zip.asc;>apache-johnzon-1.2.14-bin.zip.asc Source @@ -412,11 +412,11 @@ under the License. -https://www.apache.org/dyn/closer.lua/1.2.14/apache-johnzon-1.2.14-src.zip;>johnzon-1.2.14-source-release.zip +https://www.apache.org/dyn/closer.lua/1.2.14/apache-johnzon-1.2.14-bin.zip;>johnzon-1.2.14-source-release.zip -https://www.apache.org/dist/johnzon/1.2.14/apache-johnzon-1.2.14-src.zip.sha512;>johnzon-1.2.14-source-release.zip.sha1 +https://www.apache.org/dist/johnzon/1.2.14/apache-johnzon-1.2.14-bin.zip.sha512;>johnzon-1.2.14-source-release.zip.sha512 -https://www.apache.org/dist/johnzon/1.2.14/apache-johnzon-1.2.14-src.zip.sha512.asc;>johnzon-1.2.14-source-release.zip.asc +https://www.apache.org/dist/johnzon/1.2.14/apache-johnzon-1.2.14-bin.zip.asc;>johnzon-1.2.14-source-release.zip.asc Johnzon-1.0.x @@ -440,11 +440,11 @@ under the License. -https://www.apache.org/dyn/closer.lua/johnzon/johnzon-1.0.2/johnzon-1.0.2-source-release.zip;>johnzon-1.0.2-source-release.zip +https://www.apache.org/dyn/closer.lua/johnzon/johnzon-1.0.2/apache-johnzon-1.0.2-source-release.zip;>johnzon-1.0.2-source-release.zip -https://www.apache.org/dist/johnzon/johnzon-1.0.2/johnzon-1.0.2-source-release.zip.sha256;>johnzon-1.0.2-source-release.zip.sha256 +https://www.apache.org/dist/johnzon/johnzon-1.0.2/apache-johnzon-1.0.2-source-release.zip.sha256;>johnzon-1.0.2-source-release.zip.sha256 -https://www.apache.org/dist/johnzon/johnzon-1.0.2/johnzon-1.0.2-source-release.zip.asc;>johnzon-1.0.2-source-release.zip.asc +https://www.apache.org/dist/johnzon/johnzon-1.0.2/apache-johnzon-1.0.2-source-release.zip.asc;>johnzon-1.0.2-source-release.zip.asc Modified: johnzon/site/publish/johnzon-core/cobertura/frame-summary.html URL: http://svn.apache.org/viewvc/johnzon/site/publish/johnzon-core/cobertura/frame-summary.html?rev=1893761=1893760=1893761=diff == --- johnzon/site/publish/johnzon-core/cobertura/frame-summary.html (original) +++ johnzon/site/publish/johnzon-core/cobertura/frame-summary.html Thu Sep 30 17:54:23 2021 @@ -24,6 +24,6 @@ var packageTable = new SortableTable(doc ["String", "Number", "Percentage", "Percentage", "FormattedNumber"]); packag
svn commit: r1893760 [11/13] - in /johnzon/site/publish: ./ apidocs/ apidocs/org/apache/johnzon/core/ apidocs/org/apache/johnzon/core/class-use/ apidocs/org/apache/johnzon/jsonb/ cobertura/ johnzon-co
Modified: johnzon/site/publish/johnzon-websocket/source-repository.html URL: http://svn.apache.org/viewvc/johnzon/site/publish/johnzon-websocket/source-repository.html?rev=1893760=1893759=1893760=diff == --- johnzon/site/publish/johnzon-websocket/source-repository.html (original) +++ johnzon/site/publish/johnzon-websocket/source-repository.html Thu Sep 30 17:39:30 2021 @@ -1,13 +1,13 @@ http://www.w3.org/1999/xhtml; xml:lang="en" lang="en"> - + Johnzon :: WebSocket Source Code Management @@ -147,7 +147,7 @@ - Last Published: 2021-07-05 + Last Published: 2021-09-30 | Version: 1.2.15-SNAPSHOT Modified: johnzon/site/publish/johnzon-websocket/team-list.html URL: http://svn.apache.org/viewvc/johnzon/site/publish/johnzon-websocket/team-list.html?rev=1893760=1893759=1893760=diff == --- johnzon/site/publish/johnzon-websocket/team-list.html (original) +++ johnzon/site/publish/johnzon-websocket/team-list.html Thu Sep 30 17:39:30 2021 @@ -1,13 +1,13 @@ http://www.w3.org/1999/xhtml; xml:lang="en" lang="en"> - + Johnzon :: WebSocket Project Team @@ -147,7 +147,7 @@ - Last Published: 2021-07-05 + Last Published: 2021-09-30 | Version: 1.2.15-SNAPSHOT Modified: johnzon/site/publish/license.html URL: http://svn.apache.org/viewvc/johnzon/site/publish/license.html?rev=1893760=1893759=1893760=diff == --- johnzon/site/publish/license.html (original) +++ johnzon/site/publish/license.html Thu Sep 30 17:39:30 2021 @@ -1,13 +1,13 @@ http://www.w3.org/1999/xhtml; xml:lang="en" lang="en"> - + Apache Johnzon Project Licenses @@ -213,7 +213,7 @@ - Last Published: 2021-07-05 + Last Published: 2021-09-30 | Version: 1.2.15-SNAPSHOT @@ -485,11 +485,210 @@ Project Licenses -The Apache Software License, Version 2.0http://www.apache.org/licenses/LICENSE-2.0.txt;>[Original text] -Copy of the license follows: -Moved Permanently -The document has moved https://www.apache.org/licenses/LICENSE-2.0.txt;>here. - +The Apache Software License, Version 2.0 + + Apache License + Version 2.0, January 2004 +http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + License shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + Licensor shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + Legal Entity shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + control means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + You (or Your) shall mean an individual or Legal Entity + exercising permissions granted by this License. + + Source form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + Object form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + Work shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + Derivative Works shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or
svn commit: r1893760 [8/13] - in /johnzon/site/publish: ./ apidocs/ apidocs/org/apache/johnzon/core/ apidocs/org/apache/johnzon/core/class-use/ apidocs/org/apache/johnzon/jsonb/ cobertura/ johnzon-cor
Modified: johnzon/site/publish/johnzon-jsonb/checkstyle.rss URL: http://svn.apache.org/viewvc/johnzon/site/publish/johnzon-jsonb/checkstyle.rss?rev=1893760=1893759=1893760=diff == --- johnzon/site/publish/johnzon-jsonb/checkstyle.rss (original) +++ johnzon/site/publish/johnzon-jsonb/checkstyle.rss Thu Sep 30 17:39:30 2021 @@ -26,7 +26,7 @@ under the License. 2014 - 2021 The Apache Software Foundation File: 32, - Errors: 1170, + Errors: 1171, Warnings: 0, Infos: 0 @@ -265,7 +265,7 @@ under the License. 0 - 117 + 118 Modified: johnzon/site/publish/johnzon-jsonb/cobertura/frame-summary.html URL: http://svn.apache.org/viewvc/johnzon/site/publish/johnzon-jsonb/cobertura/frame-summary.html?rev=1893760=1893759=1893760=diff == --- johnzon/site/publish/johnzon-jsonb/cobertura/frame-summary.html (original) +++ johnzon/site/publish/johnzon-jsonb/cobertura/frame-summary.html Thu Sep 30 17:39:30 2021 @@ -24,6 +24,6 @@ var packageTable = new SortableTable(doc ["String", "Number", "Percentage", "Percentage", "FormattedNumber"]); packageTable.sort(0); -Report generated by http://cobertura.sourceforge.net/; target="_top">Cobertura 2.0.3 on 05/07/21 08:58. +Report generated by http://cobertura.sourceforge.net/; target="_top">Cobertura 2.0.3 on 30/09/21 19:37. \ No newline at end of file Modified: johnzon/site/publish/johnzon-jsonb/cpd.html URL: http://svn.apache.org/viewvc/johnzon/site/publish/johnzon-jsonb/cpd.html?rev=1893760=1893759=1893760=diff == --- johnzon/site/publish/johnzon-jsonb/cpd.html (original) +++ johnzon/site/publish/johnzon-jsonb/cpd.html Thu Sep 30 17:39:30 2021 @@ -1,13 +1,13 @@ http://www.w3.org/1999/xhtml; xml:lang="en" lang="en"> - + Johnzon :: JSON-B Implementation CPD Results @@ -149,7 +149,7 @@ - Last Published: 2021-07-05 + Last Published: 2021-09-30 | Version: 1.2.15-SNAPSHOT Modified: johnzon/site/publish/johnzon-jsonb/dependencies.html URL: http://svn.apache.org/viewvc/johnzon/site/publish/johnzon-jsonb/dependencies.html?rev=1893760=1893759=1893760=diff == --- johnzon/site/publish/johnzon-jsonb/dependencies.html (original) +++ johnzon/site/publish/johnzon-jsonb/dependencies.html Thu Sep 30 17:39:30 2021 @@ -1,13 +1,13 @@ http://www.w3.org/1999/xhtml; xml:lang="en" lang="en"> - + Johnzon :: JSON-B Implementation Project Dependencies @@ -149,7 +149,7 @@ - Last Published: 2021-07-05 + Last Published: 2021-09-30 | Version: 1.2.15-SNAPSHOT @@ -1073,9 +1073,9 @@ SAX2 and Stax2 APIs Yes johnzon-core-1.2.15-SNAPSHOT.jar -142.3 kB -106 -88 +144.7 kB +108 +90 3 1.8 Yes @@ -1202,16 +1202,16 @@ SAX2 and Stax2 APIs 33 8.6 MB -6409 -5249 +6411 +5251 402 1.8 32 compile: 2 -compile: 388.1 kB -compile: 293 -compile: 253 +compile: 390.5 kB +compile: 295 +compile: 255 compile: 12 - compile: 2 Modified: johnzon/site/publish/johnzon-jsonb/dependency-info.html URL: http://svn.apache.org/viewvc/johnzon/site/publish/johnzon-jsonb/dependency-info.html?rev=1893760=1893759=1893760=diff == --- johnzon/site/publish/johnzon-jsonb/dependency-info.html (original) +++ johnzon/site/publish/johnzon-jsonb/dependency-info.html Thu Sep 30 17:39:30 2021 @@ -1,13 +1,13 @@ http://www.w3.org/1999/xhtml; xml:lang="en" lang="en"> - + Johnzon :: JSON-B Implementation Dependency Information @@ -149,7 +149,7 @@ - Last Published: 2021-07-05 + Last Published: 2021-09-30 | Version: 1.2.15-SNAPSHOT Modified: johnzon/site/publish/johnzon-jsonb/dependency-management.html URL: http://svn.apache.org/viewvc/johnzon/site/publish/johnzon-jsonb/dependency-management.html?rev=1893760=1893759=1893760=diff == --- johnzon/site/publish/johnzon-jsonb/dependency-management.html (original) +++ johnzon/site/publish/johnzon-jsonb/dependency-management.html Thu Sep 30 17:39:30 2021 @@ -1,13 +1,13 @@
svn commit: r1893760 [6/13] - in /johnzon/site/publish: ./ apidocs/ apidocs/org/apache/johnzon/core/ apidocs/org/apache/johnzon/core/class-use/ apidocs/org/apache/johnzon/jsonb/ cobertura/ johnzon-cor
Modified: johnzon/site/publish/johnzon-jsonb-extras/license.html URL: http://svn.apache.org/viewvc/johnzon/site/publish/johnzon-jsonb-extras/license.html?rev=1893760=1893759=1893760=diff == --- johnzon/site/publish/johnzon-jsonb-extras/license.html (original) +++ johnzon/site/publish/johnzon-jsonb-extras/license.html Thu Sep 30 17:39:30 2021 @@ -1,13 +1,13 @@ http://www.w3.org/1999/xhtml; xml:lang="en" lang="en"> - + Johnzon :: JSON-B Extensions Project Licenses @@ -145,7 +145,7 @@ - Last Published: 2021-07-05 + Last Published: 2021-09-30 | Version: 1.2.15-SNAPSHOT @@ -301,11 +301,210 @@ Project Licenses -The Apache Software License, Version 2.0http://www.apache.org/licenses/LICENSE-2.0.txt;>[Original text] -Copy of the license follows: -Moved Permanently -The document has moved https://www.apache.org/licenses/LICENSE-2.0.txt;>here. - +The Apache Software License, Version 2.0 + + Apache License + Version 2.0, January 2004 +http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + License shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + Licensor shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + Legal Entity shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + control means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + You (or Your) shall mean an individual or Legal Entity + exercising permissions granted by this License. + + Source form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + Object form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + Work shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + Derivative Works shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + Contribution shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, submitted + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as Not a Contribution. + + Contributor shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, +
svn commit: r1893760 [9/13] - in /johnzon/site/publish: ./ apidocs/ apidocs/org/apache/johnzon/core/ apidocs/org/apache/johnzon/core/class-use/ apidocs/org/apache/johnzon/jsonb/ cobertura/ johnzon-cor
Modified: johnzon/site/publish/johnzon-jsonp-strict/license.html URL: http://svn.apache.org/viewvc/johnzon/site/publish/johnzon-jsonp-strict/license.html?rev=1893760=1893759=1893760=diff == --- johnzon/site/publish/johnzon-jsonp-strict/license.html (original) +++ johnzon/site/publish/johnzon-jsonp-strict/license.html Thu Sep 30 17:39:30 2021 @@ -1,13 +1,13 @@ http://www.w3.org/1999/xhtml; xml:lang="en" lang="en"> - + Johnzon :: JSON-P Strict JSON Pointer Implementation (spec compliant) Project Licenses @@ -145,7 +145,7 @@ - Last Published: 2021-07-05 + Last Published: 2021-09-30 | Version: 1.2.15-SNAPSHOT @@ -301,11 +301,210 @@ Project Licenses -The Apache Software License, Version 2.0http://www.apache.org/licenses/LICENSE-2.0.txt;>[Original text] -Copy of the license follows: -Moved Permanently -The document has moved https://www.apache.org/licenses/LICENSE-2.0.txt;>here. - +The Apache Software License, Version 2.0 + + Apache License + Version 2.0, January 2004 +http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + License shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + Licensor shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + Legal Entity shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + control means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + You (or Your) shall mean an individual or Legal Entity + exercising permissions granted by this License. + + Source form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + Object form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + Work shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + Derivative Works shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + Contribution shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, submitted + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as Not a Contribution. + + Contributor shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce,
svn commit: r1893760 [10/13] - in /johnzon/site/publish: ./ apidocs/ apidocs/org/apache/johnzon/core/ apidocs/org/apache/johnzon/core/class-use/ apidocs/org/apache/johnzon/jsonb/ cobertura/ johnzon-co
Modified: johnzon/site/publish/johnzon-mapper/pmd.html URL: http://svn.apache.org/viewvc/johnzon/site/publish/johnzon-mapper/pmd.html?rev=1893760=1893759=1893760=diff == --- johnzon/site/publish/johnzon-mapper/pmd.html (original) +++ johnzon/site/publish/johnzon-mapper/pmd.html Thu Sep 30 17:39:30 2021 @@ -1,13 +1,13 @@ http://www.w3.org/1999/xhtml; xml:lang="en" lang="en"> - + Johnzon :: Mapper PMD Results @@ -147,7 +147,7 @@ - Last Published: 2021-07-05 + Last Published: 2021-09-30 | Version: 1.2.15-SNAPSHOT Modified: johnzon/site/publish/johnzon-mapper/project-info.html URL: http://svn.apache.org/viewvc/johnzon/site/publish/johnzon-mapper/project-info.html?rev=1893760=1893759=1893760=diff == --- johnzon/site/publish/johnzon-mapper/project-info.html (original) +++ johnzon/site/publish/johnzon-mapper/project-info.html Thu Sep 30 17:39:30 2021 @@ -1,13 +1,13 @@ http://www.w3.org/1999/xhtml; xml:lang="en" lang="en"> - + Johnzon :: Mapper Project Information @@ -147,7 +147,7 @@ - Last Published: 2021-07-05 + Last Published: 2021-09-30 | Version: 1.2.15-SNAPSHOT Modified: johnzon/site/publish/johnzon-mapper/project-reports.html URL: http://svn.apache.org/viewvc/johnzon/site/publish/johnzon-mapper/project-reports.html?rev=1893760=1893759=1893760=diff == --- johnzon/site/publish/johnzon-mapper/project-reports.html (original) +++ johnzon/site/publish/johnzon-mapper/project-reports.html Thu Sep 30 17:39:30 2021 @@ -1,13 +1,13 @@ http://www.w3.org/1999/xhtml; xml:lang="en" lang="en"> - + Johnzon :: Mapper Generated Reports @@ -147,7 +147,7 @@ - Last Published: 2021-07-05 + Last Published: 2021-09-30 | Version: 1.2.15-SNAPSHOT Modified: johnzon/site/publish/johnzon-mapper/project-summary.html URL: http://svn.apache.org/viewvc/johnzon/site/publish/johnzon-mapper/project-summary.html?rev=1893760=1893759=1893760=diff == --- johnzon/site/publish/johnzon-mapper/project-summary.html (original) +++ johnzon/site/publish/johnzon-mapper/project-summary.html Thu Sep 30 17:39:30 2021 @@ -1,13 +1,13 @@ http://www.w3.org/1999/xhtml; xml:lang="en" lang="en"> - + Johnzon :: Mapper Project Summary @@ -147,7 +147,7 @@ - Last Published: 2021-07-05 + Last Published: 2021-09-30 | Version: 1.2.15-SNAPSHOT Modified: johnzon/site/publish/johnzon-mapper/property-updates-report.html URL: http://svn.apache.org/viewvc/johnzon/site/publish/johnzon-mapper/property-updates-report.html?rev=1893760=1893759=1893760=diff == --- johnzon/site/publish/johnzon-mapper/property-updates-report.html (original) +++ johnzon/site/publish/johnzon-mapper/property-updates-report.html Thu Sep 30 17:39:30 2021 @@ -1,13 +1,13 @@ http://www.w3.org/1999/xhtml; xml:lang="en" lang="en"> - + Johnzon :: Mapper Property Updates Report @@ -147,7 +147,7 @@ - Last Published: 2021-07-05 + Last Published: 2021-09-30 | Version: 1.2.15-SNAPSHOT Modified: johnzon/site/publish/johnzon-mapper/source-repository.html URL: http://svn.apache.org/viewvc/johnzon/site/publish/johnzon-mapper/source-repository.html?rev=1893760=1893759=1893760=diff == --- johnzon/site/publish/johnzon-mapper/source-repository.html (original) +++ johnzon/site/publish/johnzon-mapper/source-repository.html Thu Sep 30 17:39:30 2021 @@ -1,13 +1,13 @@ http://www.w3.org/1999/xhtml; xml:lang="en" lang="en"> - + Johnzon :: Mapper Source Code Management @@ -147,7 +147,7 @@ - Last Published: 2021-07-05 + Last Published: 2021-09-30 | Version: 1.2.15-SNAPSHOT Modified:
svn commit: r1893760 [7/13] - in /johnzon/site/publish: ./ apidocs/ apidocs/org/apache/johnzon/core/ apidocs/org/apache/johnzon/core/class-use/ apidocs/org/apache/johnzon/jsonb/ cobertura/ johnzon-cor
Modified: johnzon/site/publish/johnzon-jsonb/checkstyle.html URL: http://svn.apache.org/viewvc/johnzon/site/publish/johnzon-jsonb/checkstyle.html?rev=1893760=1893759=1893760=diff == --- johnzon/site/publish/johnzon-jsonb/checkstyle.html (original) +++ johnzon/site/publish/johnzon-jsonb/checkstyle.html Thu Sep 30 17:39:30 2021 @@ -1,13 +1,13 @@ http://www.w3.org/1999/xhtml; xml:lang="en" lang="en"> - + Johnzon :: JSON-B Implementation Checkstyle Results @@ -149,7 +149,7 @@ - Last Published: 2021-07-05 + Last Published: 2021-09-30 | Version: 1.2.15-SNAPSHOT @@ -307,7 +307,7 @@ 32 0 0 -1170 +1171 Files @@ -335,7 +335,7 @@ org/apache/johnzon/jsonb/JohnzonJsonb.java 0 0 -117 +118 org/apache/johnzon/jsonb/JohnzonProvider.java 0 @@ -522,7 +522,7 @@ javadoc http://checkstyle.sourceforge.net/config_javadoc.html#JavadocMethod;>JavadocMethod -170 +171 Error @@ -2338,7 +2338,7 @@ Error sizes LineLength -Line is longer than 80 characters (found 117). +Line is longer than 80 characters (found 105). 139 Error @@ -2915,23 +2915,29 @@ sizes LineLength Line is longer than 80 characters (found 116). -614 +614 + +Error +javadoc +JavadocMethod +Missing a Javadoc comment. +617 org/apache/johnzon/jsonb/JohnzonProvider.java - + Severity Category Rule Message Line - + Error javadoc JavadocType Missing a Javadoc comment. 24 - + Error design DesignForExtension @@ -2940,241 +2946,241 @@ org/apache/johnzon/jsonb/JsonValueParserAdapter.java - + Severity Category Rule Message Line - + Error javadoc JavadocPackage Missing package-info.java file. - + Error javadoc JavadocType Missing a Javadoc comment. 33 - + Error regexp RegexpSingleline Line has trailing spaces. 34 - + Error sizes LineLength Line is longer than 80 characters (found 93). 35 - + Error javadoc JavadocType Missing a Javadoc comment. 35 - + Error javadoc JavadocMethod Missing a Javadoc comment. 37 - + Error modifier RedundantModifier Redundant 'public' modifier. 37 - + Error misc FinalParameters Parameter jsonValue should be final. 37 - + Error regexp RegexpSingleline Line has trailing spaces. 40 - + Error regexp RegexpSingleline Line has trailing spaces. 46 - + Error sizes LineLength Line is longer than 80 characters (found 93). 47 - + Error javadoc JavadocType Missing a Javadoc comment. 47 - + Error regexp RegexpSingleline Line has trailing spaces. 48 - + Error javadoc JavadocMethod Missing a Javadoc comment. 49 - + Error modifier RedundantModifier Redundant 'public' modifier. 49 - + Error misc FinalParameters Parameter jsonValue should be final. 49 - + Error regexp RegexpSingleline Line has trailing spaces. 73 - + Error javadoc JavadocMethod Missing a Javadoc comment. 74 - + Error sizes LineLength Line is longer than 80 characters (found 97). 75 - + Error sizes LineLength Line is longer than 80 characters (found 84). 76 - + Error javadoc JavadocMethod Missing a Javadoc comment. 79 - + Error sizes LineLength Line is longer than 80 characters (found 97). 80 - + Error sizes LineLength Line is longer than 80 characters (found 99). 82 - + Error sizes LineLength Line is longer than 80 characters (found 97). 83 - + Error sizes LineLength Line is longer than 80 characters (found 84). 84 - + Error sizes LineLength Line is longer than 80 characters (found 84). 85 - + Error javadoc JavadocVariable Missing a Javadoc comment. 90 - + Error regexp RegexpSingleline Line has trailing spaces. 91 - + Error javadoc JavadocMethod Missing a Javadoc comment. 92 - + Error misc FinalParameters Parameter jsonValue should be final. 92 - + Error coding HiddenField 'jsonValue' hides a field. 92 - + Error sizes LineLength Line is longer than 80 characters (found 103). 103 - + Error sizes LineLength Line is longer than 80 characters (found 103). 108 - + Error sizes LineLength Line is longer than 80 characters (found 116). 113 - + Error sizes LineLength Line is longer than 80 characters (found 106). 118 - + Error sizes LineLength Line is longer than 80 characters (found 107). 123 - + Error sizes LineLength Line is longer than 80 characters (found 113). 128 - + Error sizes LineLength Line is longer than 80 characters (found 111). 133 - + Error regexp RegexpSingleline @@ -3183,2335 +3189,2335 @@ org/apache/johnzon/jsonb/JsonbAccessMode.java - + Severity Category Rule Message Line - + Error sizes LineLength Line is longer than 80 characters (found 89). 30 - + Error javadoc JavadocType Missing a Javadoc comment. 130 - + Error javadoc JavadocVariable Missing a Javadoc comment. 131
svn commit: r1893760 [12/13] - in /johnzon/site/publish: ./ apidocs/ apidocs/org/apache/johnzon/core/ apidocs/org/apache/johnzon/core/class-use/ apidocs/org/apache/johnzon/jsonb/ cobertura/ johnzon-co
Modified: johnzon/site/publish/surefire-report.html
URL:
http://svn.apache.org/viewvc/johnzon/site/publish/surefire-report.html?rev=1893760=1893759=1893760=diff
==
--- johnzon/site/publish/surefire-report.html (original)
+++ johnzon/site/publish/surefire-report.html Thu Sep 30 17:39:30 2021
@@ -1,13 +1,13 @@
http://www.w3.org/1999/xhtml; xml:lang="en" lang="en">
-
+
Apache Johnzon Surefire Report
@@ -213,7 +213,7 @@
- Last Published: 2021-07-05
+ Last Published: 2021-09-30
|
Version: 1.2.15-SNAPSHOT
@@ -482,12 +482,12 @@ function toggleDisplay(elementId) {
Success Rate
Time
-1024
+1029
0
0
5
-99.512%
-10.752
+99.514%
+9.273
Note: failures are anticipated and checked for with assertions while errors
are unanticipated.
Package List
@@ -503,12 +503,12 @@ function toggleDisplay(elementId) {
Time
org.apache.johnzon.jsonb
-151
+152
0
0
1
-99.338%
-1.167
+99.342%
+0.957
org.apache.johnzon.jsonp.strict
10
@@ -516,7 +516,7 @@ function toggleDisplay(elementId) {
0
0
100%
-0.076
+0.081
org.apache.johnzon.jsonschema
25
@@ -524,7 +524,7 @@ function toggleDisplay(elementId) {
0
0
100%
-0.105
+0.102
org.apache.johnzon.maven.plugin
3
@@ -532,7 +532,7 @@ function toggleDisplay(elementId) {
0
0
100%
-0.229
+0.209
org.apache.johnzon.jsonlogic
41
@@ -540,7 +540,7 @@ function toggleDisplay(elementId) {
0
0
100%
-0.175
+0.151
org.apache.johnzon.jaxrs.jsonb.jaxrs
5
@@ -548,7 +548,7 @@ function toggleDisplay(elementId) {
0
0
100%
-0.006
+0.01
org.apache.johnzon.jsonb.serializer
1
@@ -556,7 +556,7 @@ function toggleDisplay(elementId) {
0
0
100%
-0.012
+0.009
org.apache.johnzon.jsonb.jaxrs
8
@@ -564,7 +564,7 @@ function toggleDisplay(elementId) {
0
0
100%
-0.314
+0.26
org.apache.johnzon.mapper.internal
1
@@ -580,7 +580,7 @@ function toggleDisplay(elementId) {
0
0
100%
-0.025
+0.029
org.apache.johnzon
2
@@ -588,7 +588,7 @@ function toggleDisplay(elementId) {
0
0
100%
-0.01
+0.009
org.apache.johnzon.mapper.converter
5
@@ -596,7 +596,7 @@ function toggleDisplay(elementId) {
0
0
100%
-0.007
+0.001
org.apache.johnzon.jaxrs
14
@@ -604,7 +604,7 @@ function toggleDisplay(elementId) {
0
0
100%
-0.414
+0.593
org.apache.johnzon.jsonschema.regex
2
@@ -612,7 +612,7 @@ function toggleDisplay(elementId) {
0
0
100%
-0.521
+0.402
org.apache.johnzon.mapper
231
@@ -620,7 +620,7 @@ function toggleDisplay(elementId) {
0
2
99.134%
-2.061
+1.688
org.apache.johnzon.jaxrs.xml
1
@@ -628,7 +628,7 @@ function toggleDisplay(elementId) {
0
0
100%
-0.096
+0.108
org.superbiz
1
@@ -636,7 +636,7 @@ function toggleDisplay(elementId) {
0
0
100%
-0.002
+0.001
org.apache.johnzon.jsonb.extras.polymorphism
2
@@ -644,7 +644,7 @@ function toggleDisplay(elementId) {
0
0
100%
-0.171
+0.199
org.apache.johnzon.websocket
2
@@ -652,15 +652,15 @@ function toggleDisplay(elementId) {
0
0
100%
-4.111
+3.27
org.apache.johnzon.core
-512
+516
0
0
2
-99.609%
-1.25
+99.612%
+1.194
Note: package statistics are not computed recursively, they only sum up all
of its testsuites numbers.
org.apache.johnzon.jsonb
@@ -682,7 +682,7 @@ function toggleDisplay(elementId) {
0
0
100%
-0.003
+0.005
CustomParameterizedTypeTest
@@ -691,7 +691,7 @@ function toggleDisplay(elementId) {
0
0
100%
-0.005
+0.006
JsonbTransientTest
@@ -709,7 +709,7 @@ function toggleDisplay(elementId) {
0
0
100%
-0.004
+0.001
DefaultMappingTest
@@ -718,7 +718,7 @@ function toggleDisplay(elementId) {
0
1
93.333%
-0.045
+0.039
AdapterTest
@@ -727,7 +727,7 @@ function toggleDisplay(elementId) {
0
0
100%
-0.026
+0.024
EnumTest
@@ -736,7 +736,7 @@ function toggleDisplay(elementId) {
0
0
100%
-0.005
+0.003
JohnzonIgnoreNestedTest
@@ -745,7 +745,7 @@ function toggleDisplay(elementId) {
0
0
100%
-0.004
+0.003
NillableTest
@@ -754,7 +754,7 @@ function toggleDisplay(elementId) {
0
0
100%
-0.005
+0.008
GenericsTest
@@ -763,7 +763,7 @@ function toggleDisplay(elementId) {
0
0
100%
-0.005
+0.012
OrderTest
@@ -772,7 +772,7 @@ function toggleDisplay(elementId) {
0
0
100%
-0.012
+0.011
AnnotationOrderTest
@@ -781,7 +781,7 @@ function toggleDisplay(elementId) {
0
0
100%
-0.007
+0.002
DateFormatTest
@@ -790,7 +790,7 @@ function toggleDisplay(elementId) {
0
0
100%
-0.047
+0.069
ObjectSerializationTest
@@ -799,7 +799,7 @@ function toggleDisplay(elementId) {
0
0
100%
-0.01
+0.008
JsonbJsonValueTest
@@ -808,7 +808,7 @@ function toggleDisplay(elementId) {
0
0
100%
-0.007
+0.004
TimezoneTest
@@ -817,7 +817,7 @@ function toggleDisplay(elementId) {
0
0
100%
-0.004
+0.002
JsonbWriteTest
@@ -826,7 +826,7 @@ function toggleDisplay(elementId) {
svn commit: r1893760 [13/13] - in /johnzon/site/publish: ./ apidocs/ apidocs/org/apache/johnzon/core/ apidocs/org/apache/johnzon/core/class-use/ apidocs/org/apache/johnzon/jsonb/ cobertura/ johnzon-co
Modified: johnzon/site/publish/taglist.html URL: http://svn.apache.org/viewvc/johnzon/site/publish/taglist.html?rev=1893760=1893759=1893760=diff == --- johnzon/site/publish/taglist.html (original) +++ johnzon/site/publish/taglist.html Thu Sep 30 17:39:30 2021 @@ -1,13 +1,13 @@ http://www.w3.org/1999/xhtml; xml:lang="en" lang="en"> - + Apache Johnzon Tag List report @@ -213,7 +213,7 @@ - Last Published: 2021-07-05 + Last Published: 2021-09-30 | Version: 1.2.15-SNAPSHOT Modified: johnzon/site/publish/team-list.html URL: http://svn.apache.org/viewvc/johnzon/site/publish/team-list.html?rev=1893760=1893759=1893760=diff == --- johnzon/site/publish/team-list.html (original) +++ johnzon/site/publish/team-list.html Thu Sep 30 17:39:30 2021 @@ -1,13 +1,13 @@ http://www.w3.org/1999/xhtml; xml:lang="en" lang="en"> - + Apache Johnzon Project Team @@ -213,7 +213,7 @@ - Last Published: 2021-07-05 + Last Published: 2021-09-30 | Version: 1.2.15-SNAPSHOT
svn commit: r1893760 [5/13] - in /johnzon/site/publish: ./ apidocs/ apidocs/org/apache/johnzon/core/ apidocs/org/apache/johnzon/core/class-use/ apidocs/org/apache/johnzon/jsonb/ cobertura/ johnzon-cor
Modified: johnzon/site/publish/johnzon-core/team-list.html URL: http://svn.apache.org/viewvc/johnzon/site/publish/johnzon-core/team-list.html?rev=1893760=1893759=1893760=diff == --- johnzon/site/publish/johnzon-core/team-list.html (original) +++ johnzon/site/publish/johnzon-core/team-list.html Thu Sep 30 17:39:30 2021 @@ -1,13 +1,13 @@ http://www.w3.org/1999/xhtml; xml:lang="en" lang="en"> - + Johnzon :: Core Project Team @@ -147,7 +147,7 @@ - Last Published: 2021-07-05 + Last Published: 2021-09-30 | Version: 1.2.15-SNAPSHOT Modified: johnzon/site/publish/johnzon-jaxrs/changelog.html URL: http://svn.apache.org/viewvc/johnzon/site/publish/johnzon-jaxrs/changelog.html?rev=1893760=1893759=1893760=diff == --- johnzon/site/publish/johnzon-jaxrs/changelog.html (original) +++ johnzon/site/publish/johnzon-jaxrs/changelog.html Thu Sep 30 17:39:30 2021 @@ -1,13 +1,13 @@ http://www.w3.org/1999/xhtml; xml:lang="en" lang="en"> - + Johnzon :: JAX-RS Change Log Report @@ -147,7 +147,7 @@ - Last Published: 2021-07-05 + Last Published: 2021-09-30 | Version: 1.2.15-SNAPSHOT @@ -287,21 +287,13 @@ Change Log Report Total number of changed sets: 1 -Changes between 05 Jun, 2021 and 06 Jul, 2021 -Total commits: 2Total number of files changed: 1 +Changes between 31 Aug, 2021 and 01 Oct, 2021 +Total commits: 0Total number of files changed: 0 Timestamp Author -Details - -2021-07-01 07:30:14 -Romain Manni-Bucau rmannibu...@gmail.com -https://git-wip-us.apache.org/repos/asf?p=johnzon.git/johnzon-jaxrs/pom.xml?p=johnzon.git/johnzon-jaxrs;>johnzon-jaxrs/pom.xml https://git-wip-us.apache.org/repos/asf?p=johnzon.git/johnzon-jaxrs/pom.xml?rev=d9d1f3c1de6ea2105e424718b11d2af6813af915content-type=text/vnd.viewcvs-markupp=johnzon.git/johnzon-jaxrs;>v d9d1f3c1de6ea2105e424718b11d2af6813af915[maven-release-plugin] prepare for next development iteration - -2021-07-01 07:30:04 -Romain Manni-Bucau rmannibu...@gmail.com -https://git-wip-us.apache.org/repos/asf?p=johnzon.git/johnzon-jaxrs/pom.xml?p=johnzon.git/johnzon-jaxrs;>johnzon-jaxrs/pom.xml https://git-wip-us.apache.org/repos/asf?p=johnzon.git/johnzon-jaxrs/pom.xml?rev=ae0d296baeb84596cde5f69db80ed13bda047ed9content-type=text/vnd.viewcvs-markupp=johnzon.git/johnzon-jaxrs;>v ae0d296baeb84596cde5f69db80ed13bda047ed9[maven-release-plugin] prepare release v1.2.14 +Details Modified: johnzon/site/publish/johnzon-jaxrs/checkstyle.html URL: http://svn.apache.org/viewvc/johnzon/site/publish/johnzon-jaxrs/checkstyle.html?rev=1893760=1893759=1893760=diff == --- johnzon/site/publish/johnzon-jaxrs/checkstyle.html (original) +++ johnzon/site/publish/johnzon-jaxrs/checkstyle.html Thu Sep 30 17:39:30 2021 @@ -1,13 +1,13 @@ http://www.w3.org/1999/xhtml; xml:lang="en" lang="en"> - + Johnzon :: JAX-RS Checkstyle Results @@ -147,7 +147,7 @@ - Last Published: 2021-07-05 + Last Published: 2021-09-30 | Version: 1.2.15-SNAPSHOT Modified: johnzon/site/publish/johnzon-jaxrs/cobertura/frame-summary.html URL: http://svn.apache.org/viewvc/johnzon/site/publish/johnzon-jaxrs/cobertura/frame-summary.html?rev=1893760=1893759=1893760=diff == --- johnzon/site/publish/johnzon-jaxrs/cobertura/frame-summary.html (original) +++ johnzon/site/publish/johnzon-jaxrs/cobertura/frame-summary.html Thu Sep 30 17:39:30 2021 @@ -24,6 +24,6 @@ var packageTable = new SortableTable(doc ["String", "Number", "Percentage", "Percentage", "FormattedNumber"]); packageTable.sort(0); -Report generated by http://cobertura.sourceforge.net/; target="_top">Cobertura 2.0.3 on 05/07/21 08:58. +Report generated by http://cobertura.sourceforge.net/; target="_top">Cobertura 2.0.3 on 30/09/21 19:36. \ No newline at end of file Modified: johnzon/site/publish/johnzon-jaxrs/cpd.html URL: http://svn.apache.org/viewvc/johnzon/site/publish/johnzon-jaxrs/cpd.html?rev=1893760=1893759=1893760=diff == --- johnzon/site/publish/johnzon-jaxrs/cpd.html (original) +++ johnzon/site/publish/johnzon-jaxrs/cpd.html Thu Sep 30 17:39:30 2021 @@ -1,13 +1,13 @@ http://www.w3.org/1999/xhtml;
svn commit: r1893760 [4/13] - in /johnzon/site/publish: ./ apidocs/ apidocs/org/apache/johnzon/core/ apidocs/org/apache/johnzon/core/class-use/ apidocs/org/apache/johnzon/jsonb/ cobertura/ johnzon-cor
Added: johnzon/site/publish/johnzon-core/apidocs/org/apache/johnzon/core/class-use/JohnzonJsonParserImpl.ObjectStreamSpliterator.html URL: http://svn.apache.org/viewvc/johnzon/site/publish/johnzon-core/apidocs/org/apache/johnzon/core/class-use/JohnzonJsonParserImpl.ObjectStreamSpliterator.html?rev=1893760=auto == --- johnzon/site/publish/johnzon-core/apidocs/org/apache/johnzon/core/class-use/JohnzonJsonParserImpl.ObjectStreamSpliterator.html (added) +++ johnzon/site/publish/johnzon-core/apidocs/org/apache/johnzon/core/class-use/JohnzonJsonParserImpl.ObjectStreamSpliterator.html Thu Sep 30 17:39:30 2021 @@ -0,0 +1,125 @@ +http://www.w3.org/TR/html4/loose.dtd;> + + + + + +Uses of Class org.apache.johnzon.core.JohnzonJsonParserImpl.ObjectStreamSpliterator (Johnzon :: Core 1.2.15-SNAPSHOT API) + + + + + + + +JavaScript is disabled on your browser. + + + + + +Skip navigation links + + + + +Overview +Package +Class +Use +Tree +Deprecated +Index +Help + + + + +Prev +Next + + +Frames +NoFrames + + +AllClasses + + + + + + + + + + +Uses of Classorg.apache.johnzon.core.JohnzonJsonParserImpl.ObjectStreamSpliterator + +No usage of org.apache.johnzon.core.JohnzonJsonParserImpl.ObjectStreamSpliterator + + + + +Skip navigation links + + + + +Overview +Package +Class +Use +Tree +Deprecated +Index +Help + + + + +Prev +Next + + +Frames +NoFrames + + +AllClasses + + + + + + + + + +Copyright 20142021 https://www.apache.org/;>The Apache Software Foundation. All rights reserved. + + \ No newline at end of file Modified: johnzon/site/publish/johnzon-core/apidocs/org/apache/johnzon/core/class-use/JohnzonJsonParserImpl.html URL: http://svn.apache.org/viewvc/johnzon/site/publish/johnzon-core/apidocs/org/apache/johnzon/core/class-use/JohnzonJsonParserImpl.html?rev=1893760=1893759=1893760=diff == --- johnzon/site/publish/johnzon-core/apidocs/org/apache/johnzon/core/class-use/JohnzonJsonParserImpl.html (original) +++ johnzon/site/publish/johnzon-core/apidocs/org/apache/johnzon/core/class-use/JohnzonJsonParserImpl.html Thu Sep 30 17:39:30 2021 @@ -116,6 +116,37 @@ + +Fields in org.apache.johnzon.core declared as JohnzonJsonParserImpl + +Modifier and Type +Field and Description + + + +private JohnzonJsonParserImpl +JohnzonJsonParserImpl.ArrayStreamSpliterator.parser + + +private JohnzonJsonParserImpl +JohnzonJsonParserImpl.ObjectStreamSpliterator.parser + + + + +Constructors in org.apache.johnzon.core with parameters of type JohnzonJsonParserImpl + +Constructor and Description + + + +ArrayStreamSpliterator(JohnzonJsonParserImplparser) + + +ObjectStreamSpliterator(JohnzonJsonParserImplparser) + + + Modified: johnzon/site/publish/johnzon-core/apidocs/org/apache/johnzon/core/package-frame.html URL: http://svn.apache.org/viewvc/johnzon/site/publish/johnzon-core/apidocs/org/apache/johnzon/core/package-frame.html?rev=1893760=1893759=1893760=diff == --- johnzon/site/publish/johnzon-core/apidocs/org/apache/johnzon/core/package-frame.html (original) +++ johnzon/site/publish/johnzon-core/apidocs/org/apache/johnzon/core/package-frame.html Thu Sep 30 17:39:30 2021 @@ -37,6 +37,8 @@ HStack.Node JohnzonJsonParser.JohnzonJsonParserWrapper JohnzonJsonParserImpl +JohnzonJsonParserImpl.ArrayStreamSpliterator +JohnzonJsonParserImpl.ObjectStreamSpliterator JsonArrayBuilderImpl JsonArrayImpl JsonBuilderFactoryImpl Modified: johnzon/site/publish/johnzon-core/apidocs/org/apache/johnzon/core/package-summary.html URL: http://svn.apache.org/viewvc/johnzon/site/publish/johnzon-core/apidocs/org/apache/johnzon/core/package-summary.html?rev=1893760=1893759=1893760=diff == --- johnzon/site/publish/johnzon-core/apidocs/org/apache/johnzon/core/package-summary.html (original) +++ johnzon/site/publish/johnzon-core/apidocs/org/apache/johnzon/core/package-summary.html Thu Sep 30 17:39:30 2021 @@ -189,6 +189,14 @@ +JohnzonJsonParserImpl.ArrayStreamSpliterator + + + +JohnzonJsonParserImpl.ObjectStreamSpliterator
svn commit: r1893760 [3/13] - in /johnzon/site/publish: ./ apidocs/ apidocs/org/apache/johnzon/core/ apidocs/org/apache/johnzon/core/class-use/ apidocs/org/apache/johnzon/jsonb/ cobertura/ johnzon-cor
Modified: johnzon/site/publish/file-activity.html URL: http://svn.apache.org/viewvc/johnzon/site/publish/file-activity.html?rev=1893760=1893759=1893760=diff == --- johnzon/site/publish/file-activity.html (original) +++ johnzon/site/publish/file-activity.html Thu Sep 30 17:39:30 2021 @@ -1,13 +1,13 @@ http://www.w3.org/1999/xhtml; xml:lang="en" lang="en"> - + Apache Johnzon File Activity Report @@ -213,7 +213,7 @@ - Last Published: 2021-07-05 + Last Published: 2021-09-30 | Version: 1.2.15-SNAPSHOT @@ -454,107 +454,20 @@ File Activity Report -Changes between 05 Jun, 2021 and 06 Jul, 2021 -Total commits: 8Total number of files changed: 32 +Changes between 31 Aug, 2021 and 01 Oct, 2021 +Total commits: 2Total number of files changed: 3 Filename Number of Times Changed -https://git-wip-us.apache.org/repos/asf?p=johnzon.git/pom.xml?p=johnzon.git;>pom.xml -3 - -https://git-wip-us.apache.org/repos/asf?p=johnzon.git/src/site/markdown/download.md?p=johnzon.git;>src/site/markdown/download.md -2 - -https://git-wip-us.apache.org/repos/asf?p=johnzon.git/johnzon-mapper/src/main/java/org/apache/johnzon/mapper/Mapper.java?p=johnzon.git;>johnzon-mapper/src/main/java/org/apache/johnzon/mapper/Mapper.java -2 - -https://git-wip-us.apache.org/repos/asf?p=johnzon.git/johnzon-mapper/src/main/java/org/apache/johnzon/mapper/Mappings.java?p=johnzon.git;>johnzon-mapper/src/main/java/org/apache/johnzon/mapper/Mappings.java -2 - -https://git-wip-us.apache.org/repos/asf?p=johnzon.git/johnzon-core/pom.xml?p=johnzon.git;>johnzon-core/pom.xml -2 - -https://git-wip-us.apache.org/repos/asf?p=johnzon.git/johnzon-distribution/pom.xml?p=johnzon.git;>johnzon-distribution/pom.xml -2 - -https://git-wip-us.apache.org/repos/asf?p=johnzon.git/johnzon-jaxrs/pom.xml?p=johnzon.git;>johnzon-jaxrs/pom.xml -2 - -https://git-wip-us.apache.org/repos/asf?p=johnzon.git/johnzon-json-extras/pom.xml?p=johnzon.git;>johnzon-json-extras/pom.xml -2 - -https://git-wip-us.apache.org/repos/asf?p=johnzon.git/johnzon-jsonb/pom.xml?p=johnzon.git;>johnzon-jsonb/pom.xml -2 - -https://git-wip-us.apache.org/repos/asf?p=johnzon.git/johnzon-jsonlogic/pom.xml?p=johnzon.git;>johnzon-jsonlogic/pom.xml -2 - -https://git-wip-us.apache.org/repos/asf?p=johnzon.git/johnzon-jsonp-strict/pom.xml?p=johnzon.git;>johnzon-jsonp-strict/pom.xml -2 - -https://git-wip-us.apache.org/repos/asf?p=johnzon.git/johnzon-jsonschema/pom.xml?p=johnzon.git;>johnzon-jsonschema/pom.xml -2 - -https://git-wip-us.apache.org/repos/asf?p=johnzon.git/johnzon-mapper/pom.xml?p=johnzon.git;>johnzon-mapper/pom.xml -2 - -https://git-wip-us.apache.org/repos/asf?p=johnzon.git/johnzon-maven-plugin/pom.xml?p=johnzon.git;>johnzon-maven-plugin/pom.xml -2 - -https://git-wip-us.apache.org/repos/asf?p=johnzon.git/johnzon-osgi/pom.xml?p=johnzon.git;>johnzon-osgi/pom.xml -2 - -https://git-wip-us.apache.org/repos/asf?p=johnzon.git/johnzon-websocket/pom.xml?p=johnzon.git;>johnzon-websocket/pom.xml -2 - -https://git-wip-us.apache.org/repos/asf?p=johnzon.git/johnzon-maven-plugin/src/main/java/org/apache/johnzon/maven/plugin/ExampleToModelMojo.java?p=johnzon.git;>johnzon-maven-plugin/src/main/java/org/apache/johnzon/maven/plugin/ExampleToModelMojo.java -1 - -https://git-wip-us.apache.org/repos/asf?p=johnzon.git/johnzon-maven-plugin/src/test/java/org/apache/johnzon/maven/plugin/ExampleToModelMojoTest.java?p=johnzon.git;>johnzon-maven-plugin/src/test/java/org/apache/johnzon/maven/plugin/ExampleToModelMojoTest.java -1 - -https://git-wip-us.apache.org/repos/asf?p=johnzon.git/johnzon-maven-plugin/src/test/resources/SomeValue.record.java?p=johnzon.git;>johnzon-maven-plugin/src/test/resources/SomeValue.record.java -1 - -https://git-wip-us.apache.org/repos/asf?p=johnzon.git/johnzon-mapper/src/main/java/org/apache/johnzon/mapper/access/FieldAccessMode.java?p=johnzon.git;>johnzon-mapper/src/main/java/org/apache/johnzon/mapper/access/FieldAccessMode.java -1 - -https://git-wip-us.apache.org/repos/asf?p=johnzon.git/johnzon-jsonb/src/main/java/org/apache/johnzon/jsonb/converter/JsonbOffsetDateTimeConverter.java?p=johnzon.git;>johnzon-jsonb/src/main/java/org/apache/johnzon/jsonb/converter/JsonbOffsetDateTimeConverter.java -1 - -https://git-wip-us.apache.org/repos/asf?p=johnzon.git/johnzon-jsonb/src/test/java/org/apache/johnzon/jsonb/CdiAdapterTest.java?p=johnzon.git;>johnzon-jsonb/src/test/java/org/apache/johnzon/jsonb/CdiAdapterTest.java -1 - -https://git-wip-us.apache.org/repos/asf?p=johnzon.git/johnzon-jsonschema/src/main/java/org/apache/johnzon/jsonschema/JsonSchemaValidatorFactory.java?p=johnzon.git;>johnzon-jsonschema/src/main/java/org/apache/johnzon/jsonschema/JsonSchemaValidatorFactory.java -1 -
svn commit: r1893760 [1/13] - in /johnzon/site/publish: ./ apidocs/ apidocs/org/apache/johnzon/core/ apidocs/org/apache/johnzon/core/class-use/ apidocs/org/apache/johnzon/jsonb/ cobertura/ johnzon-cor
Author: rmannibucau Date: Thu Sep 30 17:39:30 2021 New Revision: 1893760 URL: http://svn.apache.org/viewvc?rev=1893760=rev Log: Site checkin for project Apache Johnzon Added: johnzon/site/publish/apidocs/org/apache/johnzon/core/JohnzonJsonParserImpl.ArrayStreamSpliterator.html johnzon/site/publish/apidocs/org/apache/johnzon/core/JohnzonJsonParserImpl.ObjectStreamSpliterator.html johnzon/site/publish/apidocs/org/apache/johnzon/core/class-use/JohnzonJsonParserImpl.ArrayStreamSpliterator.html johnzon/site/publish/apidocs/org/apache/johnzon/core/class-use/JohnzonJsonParserImpl.ObjectStreamSpliterator.html johnzon/site/publish/johnzon-core/apidocs/org/apache/johnzon/core/JohnzonJsonParserImpl.ArrayStreamSpliterator.html johnzon/site/publish/johnzon-core/apidocs/org/apache/johnzon/core/JohnzonJsonParserImpl.ObjectStreamSpliterator.html johnzon/site/publish/johnzon-core/apidocs/org/apache/johnzon/core/class-use/JohnzonJsonParserImpl.ArrayStreamSpliterator.html johnzon/site/publish/johnzon-core/apidocs/org/apache/johnzon/core/class-use/JohnzonJsonParserImpl.ObjectStreamSpliterator.html Modified: johnzon/site/publish/apidocs/allclasses-frame.html johnzon/site/publish/apidocs/allclasses-noframe.html johnzon/site/publish/apidocs/index-all.html johnzon/site/publish/apidocs/org/apache/johnzon/core/JohnzonJsonParserImpl.html johnzon/site/publish/apidocs/org/apache/johnzon/core/JsonArrayBuilderImpl.html johnzon/site/publish/apidocs/org/apache/johnzon/core/class-use/JohnzonJsonParserImpl.html johnzon/site/publish/apidocs/org/apache/johnzon/core/package-frame.html johnzon/site/publish/apidocs/org/apache/johnzon/core/package-summary.html johnzon/site/publish/apidocs/org/apache/johnzon/core/package-tree.html johnzon/site/publish/apidocs/org/apache/johnzon/jsonb/JohnzonJsonb.html johnzon/site/publish/apidocs/overview-tree.html johnzon/site/publish/changelog.html johnzon/site/publish/checkstyle.html johnzon/site/publish/cobertura/frame-summary.html johnzon/site/publish/dependencies.html johnzon/site/publish/dependency-convergence.html johnzon/site/publish/dependency-info.html johnzon/site/publish/dependency-management.html johnzon/site/publish/dependency-updates-report.html johnzon/site/publish/dev-activity.html johnzon/site/publish/distribution-management.html johnzon/site/publish/download.html johnzon/site/publish/file-activity.html johnzon/site/publish/index.html johnzon/site/publish/integration.html johnzon/site/publish/issue-tracking.html johnzon/site/publish/jira-report.html johnzon/site/publish/johnzon-core/apidocs/allclasses-frame.html johnzon/site/publish/johnzon-core/apidocs/allclasses-noframe.html johnzon/site/publish/johnzon-core/apidocs/index-all.html johnzon/site/publish/johnzon-core/apidocs/org/apache/johnzon/core/JohnzonJsonParserImpl.html johnzon/site/publish/johnzon-core/apidocs/org/apache/johnzon/core/JsonArrayBuilderImpl.html johnzon/site/publish/johnzon-core/apidocs/org/apache/johnzon/core/class-use/JohnzonJsonParserImpl.html johnzon/site/publish/johnzon-core/apidocs/org/apache/johnzon/core/package-frame.html johnzon/site/publish/johnzon-core/apidocs/org/apache/johnzon/core/package-summary.html johnzon/site/publish/johnzon-core/apidocs/org/apache/johnzon/core/package-tree.html johnzon/site/publish/johnzon-core/apidocs/overview-tree.html johnzon/site/publish/johnzon-core/changelog.html johnzon/site/publish/johnzon-core/checkstyle.html johnzon/site/publish/johnzon-core/checkstyle.rss johnzon/site/publish/johnzon-core/cobertura/frame-summary.html johnzon/site/publish/johnzon-core/dependencies.html johnzon/site/publish/johnzon-core/dependency-info.html johnzon/site/publish/johnzon-core/dependency-management.html johnzon/site/publish/johnzon-core/dependency-updates-report.html johnzon/site/publish/johnzon-core/dev-activity.html johnzon/site/publish/johnzon-core/distribution-management.html johnzon/site/publish/johnzon-core/file-activity.html johnzon/site/publish/johnzon-core/findbugs.html johnzon/site/publish/johnzon-core/index.html johnzon/site/publish/johnzon-core/integration.html johnzon/site/publish/johnzon-core/issue-tracking.html johnzon/site/publish/johnzon-core/jira-report.html johnzon/site/publish/johnzon-core/license.html johnzon/site/publish/johnzon-core/mail-lists.html johnzon/site/publish/johnzon-core/plugin-management.html johnzon/site/publish/johnzon-core/plugin-updates-report.html johnzon/site/publish/johnzon-core/plugins.html johnzon/site/publish/johnzon-core/pmd.html johnzon/site/publish/johnzon-core/project-info.html johnzon/site/publish/johnzon-core/project-reports.html johnzon/site/publish/johnzon-core/project-summary.html johnzon/site/publish/johnzon-core/property-updates-report.html
svn commit: r1893760 [2/13] - in /johnzon/site/publish: ./ apidocs/ apidocs/org/apache/johnzon/core/ apidocs/org/apache/johnzon/core/class-use/ apidocs/org/apache/johnzon/jsonb/ cobertura/ johnzon-cor
Added: johnzon/site/publish/apidocs/org/apache/johnzon/core/class-use/JohnzonJsonParserImpl.ObjectStreamSpliterator.html URL: http://svn.apache.org/viewvc/johnzon/site/publish/apidocs/org/apache/johnzon/core/class-use/JohnzonJsonParserImpl.ObjectStreamSpliterator.html?rev=1893760=auto == --- johnzon/site/publish/apidocs/org/apache/johnzon/core/class-use/JohnzonJsonParserImpl.ObjectStreamSpliterator.html (added) +++ johnzon/site/publish/apidocs/org/apache/johnzon/core/class-use/JohnzonJsonParserImpl.ObjectStreamSpliterator.html Thu Sep 30 17:39:30 2021 @@ -0,0 +1,125 @@ +http://www.w3.org/TR/html4/loose.dtd;> + + + + + +Uses of Class org.apache.johnzon.core.JohnzonJsonParserImpl.ObjectStreamSpliterator (Apache Johnzon 1.2.15-SNAPSHOT API) + + + + + + + +JavaScript is disabled on your browser. + + + + + +Skip navigation links + + + + +Overview +Package +Class +Use +Tree +Deprecated +Index +Help + + + + +Prev +Next + + +Frames +NoFrames + + +AllClasses + + + + + + + + + + +Uses of Classorg.apache.johnzon.core.JohnzonJsonParserImpl.ObjectStreamSpliterator + +No usage of org.apache.johnzon.core.JohnzonJsonParserImpl.ObjectStreamSpliterator + + + + +Skip navigation links + + + + +Overview +Package +Class +Use +Tree +Deprecated +Index +Help + + + + +Prev +Next + + +Frames +NoFrames + + +AllClasses + + + + + + + + + +Copyright 20142021 https://www.apache.org/;>The Apache Software Foundation. All rights reserved. + + \ No newline at end of file Modified: johnzon/site/publish/apidocs/org/apache/johnzon/core/class-use/JohnzonJsonParserImpl.html URL: http://svn.apache.org/viewvc/johnzon/site/publish/apidocs/org/apache/johnzon/core/class-use/JohnzonJsonParserImpl.html?rev=1893760=1893759=1893760=diff == --- johnzon/site/publish/apidocs/org/apache/johnzon/core/class-use/JohnzonJsonParserImpl.html (original) +++ johnzon/site/publish/apidocs/org/apache/johnzon/core/class-use/JohnzonJsonParserImpl.html Thu Sep 30 17:39:30 2021 @@ -116,6 +116,37 @@ + +Fields in org.apache.johnzon.core declared as JohnzonJsonParserImpl + +Modifier and Type +Field and Description + + + +private JohnzonJsonParserImpl +JohnzonJsonParserImpl.ArrayStreamSpliterator.parser + + +private JohnzonJsonParserImpl +JohnzonJsonParserImpl.ObjectStreamSpliterator.parser + + + + +Constructors in org.apache.johnzon.core with parameters of type JohnzonJsonParserImpl + +Constructor and Description + + + +ArrayStreamSpliterator(JohnzonJsonParserImplparser) + + +ObjectStreamSpliterator(JohnzonJsonParserImplparser) + + + Modified: johnzon/site/publish/apidocs/org/apache/johnzon/core/package-frame.html URL: http://svn.apache.org/viewvc/johnzon/site/publish/apidocs/org/apache/johnzon/core/package-frame.html?rev=1893760=1893759=1893760=diff == --- johnzon/site/publish/apidocs/org/apache/johnzon/core/package-frame.html (original) +++ johnzon/site/publish/apidocs/org/apache/johnzon/core/package-frame.html Thu Sep 30 17:39:30 2021 @@ -37,6 +37,8 @@ HStack.Node JohnzonJsonParser.JohnzonJsonParserWrapper JohnzonJsonParserImpl +JohnzonJsonParserImpl.ArrayStreamSpliterator +JohnzonJsonParserImpl.ObjectStreamSpliterator JsonArrayBuilderImpl JsonArrayImpl JsonBuilderFactoryImpl Modified: johnzon/site/publish/apidocs/org/apache/johnzon/core/package-summary.html URL: http://svn.apache.org/viewvc/johnzon/site/publish/apidocs/org/apache/johnzon/core/package-summary.html?rev=1893760=1893759=1893760=diff == --- johnzon/site/publish/apidocs/org/apache/johnzon/core/package-summary.html (original) +++ johnzon/site/publish/apidocs/org/apache/johnzon/core/package-summary.html Thu Sep 30 17:39:30 2021 @@ -189,6 +189,14 @@ +JohnzonJsonParserImpl.ArrayStreamSpliterator + + + +JohnzonJsonParserImpl.ObjectStreamSpliterator + + + JsonArrayBuilderImpl Modified: johnzon/site/publish/apidocs/org/apache/johnzon/core/package-tree.html URL:
[johnzon] branch master updated (7751e96 -> 1759351)
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 7751e96 True object and array streaming (#74) new 3b56f6b download 1.2.14 new 1759351 JOHNZON-351 support collection raw classes cast to Type in JSON-B 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: .../main/java/org/apache/johnzon/jsonb/JohnzonJsonb.java| 9 - .../test/java/org/apache/johnzon/jsonb/JsonbReadTest.java | 13 + src/site/markdown/download.md | 12 ++-- 3 files changed, 27 insertions(+), 7 deletions(-)
[johnzon] 01/02: download 1.2.14
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 3b56f6b0811577c58a10bfb8086b63644304e1dc Author: Romain Manni-Bucau AuthorDate: Mon Jul 5 08:55:01 2021 +0200 download 1.2.14 --- 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 48ebb0d..f61db2d 100644 --- a/src/site/markdown/download.md +++ b/src/site/markdown/download.md @@ -41,16 +41,16 @@ Apache Johnzon 1.2.x implements the JSON-P 1.1 and JSON-B 1.0 specifications whi Binaries The binary distribution contains all Johnzon modules. -* [apache-johnzon-1.2.13-bin.zip](https://www.apache.org/dyn/closer.lua/johnzon/johnzon-1.2.13/apache-johnzon-1.2.13-bin.zip) -* [apache-johnzon-1.2.13-bin.zip.sha1](https://www.apache.org/dist/johnzon/johnzon-1.2.13/apache-johnzon-1.2.13-bin.zip.sha1) -* [apache-johnzon-1.2.13-bin.zip.asc](https://www.apache.org/dist/johnzon/johnzon-1.2.13/apache-johnzon-1.2.13-bin.zip.asc) +* [apache-johnzon-1.2.14-bin.zip](https://www.apache.org/dyn/closer.lua/johnzon/johnzon-1.2.14/apache-johnzon-1.2.14-bin.zip) +* [apache-johnzon-1.2.14-bin.zip.sha1](https://www.apache.org/dist/johnzon/johnzon-1.2.14/apache-johnzon-1.2.14-bin.zip.sha1) +* [apache-johnzon-1.2.14-bin.zip.asc](https://www.apache.org/dist/johnzon/johnzon-1.2.14/apache-johnzon-1.2.14-bin.zip.asc) Source Should you want to build any of the above binaries, this source bundle is the right one and covers them all. -* [johnzon-1.2.13-source-release.zip](https://www.apache.org/dyn/closer.lua/johnzon/johnzon-1.2.13/johnzon-1.2.13-source-release.zip) -* [johnzon-1.2.13-source-release.zip.sha1](https://www.apache.org/dist/johnzon/johnzon-1.2.13/johnzon-1.2.13-source-release.zip.sha1) -* [johnzon-1.2.13-source-release.zip.asc](https://www.apache.org/dist/johnzon/johnzon-1.2.13/johnzon-1.2.13-source-release.zip.asc) +* [johnzon-1.2.14-source-release.zip](https://www.apache.org/dyn/closer.lua/johnzon/johnzon-1.2.14/johnzon-1.2.14-source-release.zip) +* [johnzon-1.2.14-source-release.zip.sha1](https://www.apache.org/dist/johnzon/johnzon-1.2.14/johnzon-1.2.14-source-release.zip.sha1) +* [johnzon-1.2.14-source-release.zip.asc](https://www.apache.org/dist/johnzon/johnzon-1.2.14/johnzon-1.2.14-source-release.zip.asc) ## Johnzon-1.0.x
[johnzon] 02/02: JOHNZON-351 support collection raw classes cast to Type in JSON-B
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 17593519c58eb07c4a7d8bc2a07d09ba11a51c00
Author: Romain Manni-Bucau
AuthorDate: Tue Sep 21 10:58:09 2021 +0200
JOHNZON-351 support collection raw classes cast to Type in JSON-B
---
.../main/java/org/apache/johnzon/jsonb/JohnzonJsonb.java| 9 -
.../test/java/org/apache/johnzon/jsonb/JsonbReadTest.java | 13 +
2 files changed, 21 insertions(+), 1 deletion(-)
diff --git
a/johnzon-jsonb/src/main/java/org/apache/johnzon/jsonb/JohnzonJsonb.java
b/johnzon-jsonb/src/main/java/org/apache/johnzon/jsonb/JohnzonJsonb.java
index 1d6f1b1..bd9e9bc 100644
--- a/johnzon-jsonb/src/main/java/org/apache/johnzon/jsonb/JohnzonJsonb.java
+++ b/johnzon-jsonb/src/main/java/org/apache/johnzon/jsonb/JohnzonJsonb.java
@@ -136,7 +136,7 @@ public class JohnzonJsonb implements Jsonb, AutoCloseable,
JsonbExtension {
} else if (JsonArray.class == runtimeType) {
return (T) delegate.readJsonArray(new StringReader(str));
} else if (isCollection(runtimeType)) {
-return (T) delegate.readCollection(new StringReader(str),
ParameterizedType.class.cast(runtimeType));
+return (T) delegate.readCollection(new StringReader(str),
toCollectionType(runtimeType));
}
final Type mappingType = unwrapPrimitiveOptional(runtimeType);
final Object object = delegate.readObject(str, mappingType);
@@ -613,4 +613,11 @@ public class JohnzonJsonb implements Jsonb, AutoCloseable,
JsonbExtension {
Class.class.isInstance(pt.getActualTypeArguments()[0]) &&
JsonValue.class.isAssignableFrom(Class.class.cast(pt.getActualTypeArguments()[0])));
}
+
+private ParameterizedType toCollectionType(final Type runtimeType) {
+if (ParameterizedType.class.isInstance(runtimeType)) {
+return ParameterizedType.class.cast(runtimeType);
+}
+return new JohnzonParameterizedType(runtimeType, Object.class);
+}
}
diff --git
a/johnzon-jsonb/src/test/java/org/apache/johnzon/jsonb/JsonbReadTest.java
b/johnzon-jsonb/src/test/java/org/apache/johnzon/jsonb/JsonbReadTest.java
index bd63127..3ac7a48 100644
--- a/johnzon-jsonb/src/test/java/org/apache/johnzon/jsonb/JsonbReadTest.java
+++ b/johnzon-jsonb/src/test/java/org/apache/johnzon/jsonb/JsonbReadTest.java
@@ -20,6 +20,8 @@ package org.apache.johnzon.jsonb;
import org.junit.Test;
+import javax.json.bind.Jsonb;
+import javax.json.bind.JsonbBuilder;
import javax.json.bind.JsonbConfig;
import javax.json.bind.JsonbException;
import javax.json.bind.annotation.JsonbDateFormat;
@@ -29,15 +31,26 @@ import javax.json.bind.spi.JsonbProvider;
import java.io.ByteArrayInputStream;
import java.io.StringReader;
+import java.lang.reflect.Type;
import java.nio.charset.StandardCharsets;
import java.time.LocalDate;
import java.time.format.DateTimeFormatter;
import java.util.Base64;
+import java.util.List;
+import static java.util.Arrays.asList;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
public class JsonbReadTest {
+@Test
+public void simpleArrayMapping() throws Exception {
+final List expectedResult = asList("Test String");
+try (final Jsonb jsonb = JsonbBuilder.create()) {
+final Object unmarshalledObject = jsonb.fromJson("[ \"Test
String\" ]", (Type) List.class);
+assertEquals(expectedResult, unmarshalledObject);
+}
+}
@Test
public void boolFromString() {
