fix padding Project: http://git-wip-us.apache.org/repos/asf/johnzon/repo Commit: http://git-wip-us.apache.org/repos/asf/johnzon/commit/30024a39 Tree: http://git-wip-us.apache.org/repos/asf/johnzon/tree/30024a39 Diff: http://git-wip-us.apache.org/repos/asf/johnzon/diff/30024a39
Branch: refs/heads/master Commit: 30024a399469f5c5f23940df76b3bcf42e772699 Parents: da9e52a Author: amoscatelli <[email protected]> Authored: Fri Mar 30 16:19:28 2018 +0200 Committer: amoscatelli <[email protected]> Committed: Fri Mar 30 16:19:28 2018 +0200 ---------------------------------------------------------------------- .../org/apache/johnzon/jsonb/JohnzonBuilder.java | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/johnzon/blob/30024a39/johnzon-jsonb/src/main/java/org/apache/johnzon/jsonb/JohnzonBuilder.java ---------------------------------------------------------------------- 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 71bea04..00e991a 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 @@ -238,13 +238,13 @@ public class JohnzonBuilder implements JsonbBuilder { final AccessMode accessMode = config.getProperty("johnzon.accessMode") .map(this::toAccessMode) .orElseGet(() -> new JsonbAccessMode( - propertyNamingStrategy, orderValue, visibilityStrategy, - !namingStrategyValue.orElse("").equals(PropertyNamingStrategy.CASE_INSENSITIVE), - defaultConverters, - factory, parserFactoryProvider, - config.getProperty("johnzon.accessModeDelegate") - .map(this::toAccessMode) - .orElseGet(() -> new FieldAndMethodAccessMode(true, true, false)))); + propertyNamingStrategy, orderValue, visibilityStrategy, + !namingStrategyValue.orElse("").equals(PropertyNamingStrategy.CASE_INSENSITIVE), + defaultConverters, + factory, parserFactoryProvider, + config.getProperty("johnzon.accessModeDelegate") + .map(this::toAccessMode) + .orElseGet(() -> new FieldAndMethodAccessMode(true, true, false)))); builder.setAccessMode(accessMode); @@ -320,7 +320,7 @@ public class JohnzonBuilder implements JsonbBuilder { final ParameterizedType pt = findPT(s, JsonbSerializer.class); if (pt == null) { throw new IllegalArgumentException(s + " doesn't implement JsonbSerializer"); - } + } final Type[] args = pt.getActualTypeArguments(); // TODO: support PT in ObjectConverter (list) if (args.length != 1 || !Class.class.isInstance(args[0])) { @@ -336,7 +336,7 @@ public class JohnzonBuilder implements JsonbBuilder { final ParameterizedType pt = findPT(d, JsonbDeserializer.class); if (pt == null) { throw new IllegalArgumentException(d + " doesn't implement JsonbDeserializer"); - } + } final Type[] args = pt.getActualTypeArguments(); if (args.length != 1 || !Class.class.isInstance(args[0])) { throw new IllegalArgumentException("We only support deserializer on Class for now"); @@ -630,6 +630,7 @@ public class JohnzonBuilder implements JsonbBuilder { })); addDateFormatConfigConverters(converters, zoneIDUTC); + converters.forEach((k, v) -> builder.addAdapter(k.getFrom(), k.getTo(), v)); return converters; }
