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 <rmannibu...@gmail.com>
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<Class<?>> deserializationPredicate,
                          final Predicate<Class<?>> serializationPredicate,
                          final Function<Class<?>, 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> T findObjectConverter(final Class clazz,
--                                                final Map<Class<?>, T> from,
--                                                final Map<Class<?>, T> cache) 
{
++                                      final Map<Class<?>, T> from,
++                                      final Map<Class<?>, T> cache) {
          if (clazz == null) {
              throw new IllegalArgumentException("clazz must not be null");
          }

Reply via email to