Jackson v3 was developed a few months ago after a fork of the Jackson v2 codec, since there have been changes in the code, this catches up with the changes and bring it on par.

Author: vietj

vertx-core/src/main/java/io/vertx/core/json/jackson/JacksonCodec.java

@@ -13,6 +13,7 @@
 
 import com.fasterxml.jackson.core.*;
 import com.fasterxml.jackson.core.io.SegmentedStringWriter;
+import com.fasterxml.jackson.core.json.JsonReadFeature;
 import com.fasterxml.jackson.core.util.BufferRecycler;
 import com.fasterxml.jackson.core.util.ByteArrayBuilder;
 import io.netty.buffer.ByteBufInputStream;
@@ -109,17 +110,16 @@ private static JsonFactory buildFactory() {
     }
 
     tsfBuilder.streamReadConstraints(readConstraintsBuilder.build());
+
+    // Non-standard JSON but we allow C style comments in our JSON
+    tsfBuilder.configure(JsonReadFeature.ALLOW_JAVA_COMMENTS, true);
+
     tsfBuilder.recyclerPool(HybridJacksonPool.getInstance());
     return tsfBuilder.build();
   }
 
   static final JsonFactory factory = buildFactory();
 
-  static {
-    // Non-standard JSON but we allow C style comments in our JSON
-    JacksonCodec.factory.configure(JsonParser.Feature.ALLOW_COMMENTS, true);
-  }
-
   @Override
   public <T> T fromString(String json, Class<T> clazz) throws DecodeException {
     return fromParser(createParser(json), clazz);

vertx-core/src/main/java25/io/vertx/core/json/jackson/v3/JacksonCodec.java

@@ -1,3 +1,13 @@
+/*
+ * Copyright (c) 2011-2019 Contributors to the Eclipse Foundation
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+ * which is available at https://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
+ */
 package io.vertx.core.json.jackson.v3;
 
 import io.netty.buffer.ByteBufInputStream;
@@ -30,9 +40,12 @@
 import static io.vertx.core.json.impl.JsonUtil.BASE64_ENCODER;
 import static java.time.format.DateTimeFormatter.ISO_INSTANT;
 
+/**
+ * @author <a href="mailto:julien@julienviet.com">Julien Viet</a>
+ */
 public class JacksonCodec implements JsonCodec {
 
-  private static final Logger log = LoggerFactory.getLogger(io.vertx.core.json.jackson.JacksonCodec.class);
+  private static final Logger log = LoggerFactory.getLogger(JacksonCodec.class);
 
   private static JsonFactory buildFactory() {
     JsonFactoryBuilder tsfBuilder = JsonFactory.builder();
@@ -102,38 +115,7 @@ private static JsonFactory buildFactory() {
     return tsfBuilder.build();
   }
 
-  private static final JsonFactory factory = buildFactory();
-
-  public JacksonCodec() {
-  }
-
-  private static JsonParser createParser(Buffer buf) {
-    return factory.createParser(ObjectReadContext.empty(), (InputStream) new ByteBufInputStream(((BufferInternal)buf).getByteBuf()));
-  }
-
-  private static JsonParser createParser(String str) {
-    return factory.createParser(ObjectReadContext.empty(), str);
-  }
-
-  private static ObjectWriteContext owc(boolean pretty) {
-    if (pretty) {
-      PrettyPrinter prettyPrinter = new DefaultPrettyPrinter();
-      return new ObjectWriteContext.Base() {
-        @Override
-        public PrettyPrinter getPrettyPrinter() { return prettyPrinter; }
-      };
-    } else {
-      return ObjectWriteContext.empty();
-    }
-  }
-
-  private static JsonGenerator createGenerator(OutputStream out, boolean pretty) {
-    return factory.createGenerator(owc(pretty), out);
-  }
-
-  private static JsonGenerator createGenerator(Writer out, boolean pretty) {
-    return factory.createGenerator(owc(pretty), out);
-  }
+  static final JsonFactory factory = buildFactory();
 
   @Override
   public <T> T fromString(String json, Class<T> clazz) throws DecodeException {
@@ -182,12 +164,28 @@ public Buffer toBuffer(Object object, boolean pretty) throws EncodeException {
     }
   }
 
+  public static JsonParser createParser(String str) {
+    return factory.createParser(ObjectReadContext.empty(), str);
+  }
+
+  public static JsonParser createParser(Buffer buf) {
+    return factory.createParser(ObjectReadContext.empty(), (InputStream) new ByteBufInputStream(((BufferInternal)buf).getByteBuf()));
+  }
+
+  private static JsonGenerator createGenerator(Writer out, boolean pretty) {
+    return factory.createGenerator(owc(pretty), out);
+  }
+
+  private static JsonGenerator createGenerator(OutputStream out, boolean pretty) {
+    return factory.createGenerator(owc(pretty), out);
+  }
+
   public static <T> T fromParser(JsonParser parser, Class<T> type) throws DecodeException {
     Object res;
     JsonToken remaining;
     try {
       parser.nextToken();
-      res = parseAny(parser);
+      res = parseValue(parser);
       remaining = parser.nextToken();
     } catch (JacksonException | IOException e) {
       throw new DecodeException(e.getMessage(), e);
@@ -200,7 +198,7 @@ public static <T> T fromParser(JsonParser parser, Class<T> type) throws DecodeEx
     return cast(res, type);
   }
 
-  private static Object parseAny(JsonParser parser) throws IOException, DecodeException {
+  private static Object parseValue(JsonParser parser) throws IOException, DecodeException {
     switch (parser.currentTokenId()) {
       case JsonTokenId.ID_START_OBJECT:
         return parseObject(parser);
@@ -222,21 +220,34 @@ private static Object parseAny(JsonParser parser) throws IOException, DecodeExce
     }
   }
 
-  private static Map<String, Object> parseObject(JsonParser parser) throws IOException {
+  /**
+   * Parse a JSON object given the {@code parser}, the parser current token must be {@link JsonTokenId#ID_START_OBJECT}
+   *
+   * @param parser the parser
+   * @return the parsed object
+   */
+  public static Map<String, Object> parseObject(JsonParser parser) throws IOException {
+    if (parser.currentTokenId() != JsonTokenId.ID_START_OBJECT) {
+      throw new DecodeException("Expecting the current parser token to be the start of an object");
+    }
+    return internalParseObject(parser);
+  }
+
+  private static Map<String, Object> internalParseObject(JsonParser parser) throws IOException {
     String key1 = parser.nextName();
     if (key1 == null) {
       return new LinkedHashMap<>(2);
     }
     parser.nextToken();
-    Object value1 = parseAny(parser);
+    Object value1 = parseValue(parser);
     String key2 = parser.nextName();
     if (key2 == null) {
       LinkedHashMap<String, Object> obj = new LinkedHashMap<>(2);
       obj.put(key1, value1);
       return obj;
     }
     parser.nextToken();
-    Object value2 = parseAny(parser);
+    Object value2 = parseValue(parser);
     String key = parser.nextName();
     if (key == null) {
       LinkedHashMap<String, Object> obj = new LinkedHashMap<>(2);
@@ -250,14 +261,27 @@ private static Map<String, Object> parseObject(JsonParser parser) throws IOExcep
     obj.put(key2, value2);
     do {
       parser.nextToken();
-      Object value = parseAny(parser);
+      Object value = parseValue(parser);
       obj.put(key, value);
       key = parser.nextName();
     } while (key != null);
     return obj;
   }
 
-  private static List<Object> parseArray(JsonParser parser) throws IOException {
+  /**
+   * Parse a JSON array given the {@code parser}, the parser current token must be {@link JsonTokenId#ID_START_ARRAY}
+   *
+   * @param parser the parser
+   * @return the parsed array
+   */
+  public static List<Object> parseArray(JsonParser parser) throws IOException {
+    if (parser.currentTokenId() != JsonTokenId.ID_START_ARRAY) {
+      throw new DecodeException("Expecting the current parser token to be the start of an array");
+    }
+    return internalParseArray(parser);
+  }
+
+  private static List<Object> internalParseArray(JsonParser parser) throws IOException {
     List<Object> array = new ArrayList<>();
     while (true) {
       parser.nextToken();
@@ -267,7 +291,7 @@ private static List<Object> parseArray(JsonParser parser) throws IOException {
       } else if (tokenId == JsonTokenId.ID_END_ARRAY) {
         return array;
       }
-      Object value = parseAny(parser);
+      Object value = parseValue(parser);
       array.add(value);
     }
   }
@@ -451,4 +475,16 @@ private static <T> T cast(Object o, Class<T> clazz) {
       return clazz.cast(o);
     }
   }
+
+  private static ObjectWriteContext owc(boolean pretty) {
+    if (pretty) {
+      PrettyPrinter prettyPrinter = new DefaultPrettyPrinter();
+      return new ObjectWriteContext.Base() {
+        @Override
+        public PrettyPrinter getPrettyPrinter() { return prettyPrinter; }
+      };
+    } else {
+      return ObjectWriteContext.empty();
+    }
+  }
 }