Repository: johnzon Updated Branches: refs/heads/master b0af96e6d -> 389dfe1fc
removing unused reverseAdaptersRegistry and ensuring to lookup JohnzonCdiExtension with a creationalcontext Project: http://git-wip-us.apache.org/repos/asf/johnzon/repo Commit: http://git-wip-us.apache.org/repos/asf/johnzon/commit/389dfe1f Tree: http://git-wip-us.apache.org/repos/asf/johnzon/tree/389dfe1f Diff: http://git-wip-us.apache.org/repos/asf/johnzon/diff/389dfe1f Branch: refs/heads/master Commit: 389dfe1fcd9ed3d92ce4ad788fd5159fd88d02e1 Parents: b0af96e Author: rmannibucau <[email protected]> Authored: Sun Dec 4 22:57:11 2016 +0100 Committer: rmannibucau <[email protected]> Committed: Sun Dec 4 22:57:11 2016 +0100 ---------------------------------------------------------------------- .../src/main/java/org/apache/johnzon/jsonb/cdi/CDIs.java | 2 +- .../src/main/java/org/apache/johnzon/mapper/Mapper.java | 4 ---- 2 files changed, 1 insertion(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/johnzon/blob/389dfe1f/johnzon-jsonb/src/main/java/org/apache/johnzon/jsonb/cdi/CDIs.java ---------------------------------------------------------------------- diff --git a/johnzon-jsonb/src/main/java/org/apache/johnzon/jsonb/cdi/CDIs.java b/johnzon-jsonb/src/main/java/org/apache/johnzon/jsonb/cdi/CDIs.java index 50e2d5f..9f92c9a 100644 --- a/johnzon-jsonb/src/main/java/org/apache/johnzon/jsonb/cdi/CDIs.java +++ b/johnzon-jsonb/src/main/java/org/apache/johnzon/jsonb/cdi/CDIs.java @@ -48,7 +48,7 @@ public final class CDIs { private static JohnzonCdiExtension load(final Object beanManager) { final javax.enterprise.inject.spi.BeanManager bm = javax.enterprise.inject.spi.BeanManager.class.cast(beanManager); return JohnzonCdiExtension.class.cast( - bm.getReference(bm.resolve(bm.getBeans(JohnzonCdiExtension.class)), JohnzonCdiExtension.class, null)); + bm.getReference(bm.resolve(bm.getBeans(JohnzonCdiExtension.class)), JohnzonCdiExtension.class, bm.createCreationalContext(null))); } } } http://git-wip-us.apache.org/repos/asf/johnzon/blob/389dfe1f/johnzon-mapper/src/main/java/org/apache/johnzon/mapper/Mapper.java ---------------------------------------------------------------------- diff --git a/johnzon-mapper/src/main/java/org/apache/johnzon/mapper/Mapper.java b/johnzon-mapper/src/main/java/org/apache/johnzon/mapper/Mapper.java index b9ebf50..58aed8b 100644 --- a/johnzon-mapper/src/main/java/org/apache/johnzon/mapper/Mapper.java +++ b/johnzon-mapper/src/main/java/org/apache/johnzon/mapper/Mapper.java @@ -18,7 +18,6 @@ */ package org.apache.johnzon.mapper; -import org.apache.johnzon.mapper.internal.AdapterKey; import org.apache.johnzon.mapper.reflection.JohnzonCollectionType; import javax.json.JsonException; @@ -42,8 +41,6 @@ import java.lang.reflect.Type; import java.nio.charset.Charset; import java.util.ArrayList; import java.util.Collection; -import java.util.concurrent.ConcurrentHashMap; -import java.util.concurrent.ConcurrentMap; import static java.util.Arrays.asList; import static org.apache.johnzon.mapper.internal.Streams.noClose; @@ -54,7 +51,6 @@ public class Mapper implements Closeable { protected final Mappings mappings; protected final JsonReaderFactory readerFactory; protected final JsonGeneratorFactory generatorFactory; - protected final ConcurrentMap<Adapter<?, ?>, AdapterKey> reverseAdaptersRegistry = new ConcurrentHashMap<Adapter<?, ?>, AdapterKey>(); protected final ReaderHandler readerHandler; protected final Collection<Closeable> closeables; protected final Charset charset;
