[johnzon] branch master updated: JOHNZON-244 ensure jsonb property for unknown properties is used (as well as our johnzon specific one)

[rmannibucau]

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 ab25e90  JOHNZON-244 ensure jsonb property for unknown properties is 
used (as well as our johnzon specific one)
ab25e90 is described below

commit ab25e903f59ef0fc1ebb7eccb32076adb5159c6a
Author: Romain Manni-Bucau <rmannibu...@apache.org>
AuthorDate: Sun Aug 11 21:48:23 2019 +0200

    JOHNZON-244 ensure jsonb property for unknown properties is used (as well 
as our johnzon specific one)
---
 .../src/main/java/org/apache/johnzon/jsonb/JohnzonBuilder.java       | 3 ++-
 .../java/org/apache/johnzon/jsonb/FailOnUnknownPropertiesTest.java   | 5 ++++-
 2 files changed, 6 insertions(+), 2 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 b02a445..dc72159 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
@@ -245,7 +245,8 @@ public class JohnzonBuilder implements JsonbBuilder {
             defaultConverters.put(new AdapterKey(args[0], args[1]), 
johnzonJsonbAdapter);
         }));
 
-        config.getProperty("johnzon.fail-on-unknown-properties")
+        ofNullable(config.getProperty("johnzon.fail-on-unknown-properties")
+                .orElseGet(() -> 
config.getProperty("jsonb.fail-on-unknown-properties").orElse(null)))
                 .map(v -> Boolean.class.isInstance(v) ? Boolean.class.cast(v) 
: Boolean.parseBoolean(String.valueOf(v)))
                 .ifPresent(builder::setFailOnUnknownProperties);
 
diff --git 
a/johnzon-jsonb/src/test/java/org/apache/johnzon/jsonb/FailOnUnknownPropertiesTest.java
 
b/johnzon-jsonb/src/test/java/org/apache/johnzon/jsonb/FailOnUnknownPropertiesTest.java
index 90f3bf1..36b5740 100644
--- 
a/johnzon-jsonb/src/test/java/org/apache/johnzon/jsonb/FailOnUnknownPropertiesTest.java
+++ 
b/johnzon-jsonb/src/test/java/org/apache/johnzon/jsonb/FailOnUnknownPropertiesTest.java
@@ -31,8 +31,11 @@ import static org.junit.Assert.fail;
 public class FailOnUnknownPropertiesTest {
     @Test
     public void failOnUnknownProperties() {
-        final Jsonb jsonb = JsonbBuilder.create(new 
JsonbConfig().setProperty("johnzon.fail-on-unknown-properties", true));
+        doValidate(JsonbBuilder.create(new 
JsonbConfig().setProperty("johnzon.fail-on-unknown-properties", true)));
+        doValidate(JsonbBuilder.create(new 
JsonbConfig().setProperty("jsonb.fail-on-unknown-properties", true)));
+    }
 
+    private void doValidate(final Jsonb jsonb) {
         // valid
         assertEquals("ok", jsonb.fromJson("{\"known\":\"ok\"}", 
Model.class).known);