Remove ObjectCodec dependency from Jackson BsonGenerator (as construc…

…tor arg). jackson4bson

criteria/mongo/src/org/immutables/criteria/mongo/bson4jackson/BsonGenerator.java

@@ -38,8 +38,8 @@ public class BsonGenerator extends GeneratorBase implements Wrapper<BsonWriter>
 
   private final BsonWriter writer;
 
-  BsonGenerator(int jsonFeatures, ObjectCodec codec, BsonWriter writer) {
-    super(jsonFeatures, codec);
+  BsonGenerator(int jsonFeatures, BsonWriter writer) {
+    super(jsonFeatures, null);
     this.writer = Objects.requireNonNull(writer, "writer");
   }
 

criteria/mongo/src/org/immutables/criteria/mongo/bson4jackson/JacksonCodecRegistry.java

@@ -64,14 +64,13 @@ public <T> Codec<T> get(Class<T> clazz) {
   private static class JacksonCodec<T> implements Codec<T> {
 
     private final Class<T> clazz;
-    private final ObjectMapper mapper;
     private final ObjectReader reader;
     private final ObjectWriter writer;
     private final IOContext ioContext;
 
     JacksonCodec(Class<T> clazz, ObjectMapper mapper) {
       this.clazz = Objects.requireNonNull(clazz, "clazz");
-      this.mapper = Objects.requireNonNull(mapper, "mapper");
+      Objects.requireNonNull(mapper, "mapper");
       this.reader = mapper.readerFor(clazz);
       this.writer = mapper.writerFor(clazz);
       this.ioContext =  new IOContext(new BufferRecycler(), null, false);
@@ -92,7 +91,7 @@ public T decode(BsonReader reader, DecoderContext decoderContext) {
 
     @Override
     public void encode(BsonWriter writer, T value, EncoderContext encoderContext) {
-      final BsonGenerator generator = new BsonGenerator(0, mapper, writer);
+      final BsonGenerator generator = new BsonGenerator(0, writer);
       try {
         this.writer.writeValue(generator, value);
       } catch (IOException e) {

criteria/mongo/test/org/immutables/criteria/mongo/bson4jackson/BsonGeneratorTest.java

@@ -16,11 +16,11 @@
 
 package org.immutables.criteria.mongo.bson4jackson;
 
-import com.fasterxml.jackson.databind.ObjectMapper;
 import org.bson.BsonDocument;
 import org.bson.BsonDocumentWriter;
 import org.bson.BsonNull;
 import org.bson.BsonValue;
+import org.bson.BsonWriter;
 import org.junit.jupiter.api.Test;
 
 import java.io.IOException;
@@ -34,12 +34,10 @@
  */
 class BsonGeneratorTest {
 
-  private final ObjectMapper mapper = new ObjectMapper();
-
   @Test
   void emptyObject() throws IOException {
     BsonDocumentWriter writer = new BsonDocumentWriter(new BsonDocument());
-    BsonGenerator generator = new BsonGenerator(0, mapper, writer);
+    BsonGenerator generator = generatorFor(writer);
     generator.writeStartObject();
     generator.writeEndObject();
 
@@ -50,7 +48,7 @@ void emptyObject() throws IOException {
   @Test
   void binary() throws IOException {
     BsonDocumentWriter writer = new BsonDocumentWriter(new BsonDocument());
-    BsonGenerator generator = new BsonGenerator(0, mapper, writer);
+    BsonGenerator generator = generatorFor(writer);
     check(generator.canWriteBinaryNatively());
     check(writeAndReturnValue(gen -> gen.writeBinary(new byte[] {})).asBinary().getData()).isEmpty();
     check(writeAndReturnValue(gen -> gen.writeBinary(new byte[] {1})).asBinary().getData()).isOf((byte) 1);
@@ -61,7 +59,7 @@ void binary() throws IOException {
   @Test
   void checkClosed() throws IOException {
     BsonDocumentWriter writer = new BsonDocumentWriter(new BsonDocument());
-    BsonGenerator generator = new BsonGenerator(0, mapper, writer);
+    BsonGenerator generator = generatorFor(writer);
 
     check(!generator.isClosed());
     generator.close();
@@ -74,7 +72,7 @@ void checkClosed() throws IOException {
   @Test
   void nulls() throws IOException {
     BsonDocumentWriter writer = new BsonDocumentWriter(new BsonDocument());
-    BsonGenerator generator = new BsonGenerator(0, mapper, writer);
+    BsonGenerator generator = generatorFor(writer);
     generator.writeStartObject();
 
     generator.writeFieldName("null");
@@ -101,7 +99,7 @@ void nulls() throws IOException {
 
   private BsonValue writeAndReturnValue(IoConsumer<BsonGenerator> consumer) throws IOException {
     BsonDocumentWriter writer = new BsonDocumentWriter(new BsonDocument());
-    BsonGenerator generator = new BsonGenerator(0, mapper, writer);
+    BsonGenerator generator = generatorFor(writer);
     generator.writeStartObject();
     generator.writeFieldName("value");
     consumer.accept(generator);
@@ -115,5 +113,9 @@ private interface IoConsumer<T> {
     void accept(T value) throws IOException;
   }
 
+  private BsonGenerator generatorFor(BsonWriter writer) {
+    return new BsonGenerator(0, writer);
+  }
+
 
 }

criteria/mongo/test/org/immutables/criteria/mongo/bson4jackson/BsonParserTest.java

@@ -145,7 +145,7 @@ private void jacksonThenBson(String json) throws IOException {
 
     BasicOutputBuffer buffer = new BasicOutputBuffer();
     BsonWriter writer = new BsonBinaryWriter(buffer);
-    BsonGenerator generator = new BsonGenerator(0, mapper, writer);
+    BsonGenerator generator = new BsonGenerator(0, writer);
     // write with jackson
     mapper.writeValue(generator, toWrite);
     BsonBinaryReader reader = new BsonBinaryReader(ByteBuffer.wrap(buffer.toByteArray()));
@@ -200,7 +200,7 @@ private void jacksonThenJackson(String json) throws IOException {
     BasicOutputBuffer buffer = new BasicOutputBuffer();
     BsonWriter writer = new BsonBinaryWriter(buffer);
 
-    BsonGenerator generator = new BsonGenerator(0, mapper, writer);
+    BsonGenerator generator = new BsonGenerator(0, writer);
     // write with Jackson
     mapper.writeValue(generator, expected);
 

criteria/mongo/test/org/immutables/criteria/mongo/bson4jackson/Parsers.java

@@ -24,6 +24,7 @@
 import org.bson.BsonBinaryWriter;
 import org.bson.BsonDocument;
 import org.bson.BsonValue;
+import org.bson.BsonWriter;
 import org.bson.codecs.EncoderContext;
 import org.bson.codecs.configuration.CodecRegistry;
 import org.bson.io.BasicOutputBuffer;