Eliminate bson dependency on mongo

bosk-bson/build.gradle

@@ -31,7 +31,6 @@ dependencies {
 
     testImplementation project(":bosk-logback")
     testImplementation project(":bosk-testing")
-    testImplementation project(":bosk-mongo") // No surprise that MongoDB is handy for testing BSON
     testImplementation project(":lib-testing")
 }
 

bosk-bson/src/main/java/works/bosk/bson/BsonFormatter.java

@@ -1,32 +1,61 @@
 package works.bosk.bson;
 
+import java.lang.reflect.Type;
 import java.net.URLDecoder;
 import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.function.Function;
 import java.util.function.UnaryOperator;
+import org.bson.BsonDocument;
+import org.bson.BsonDocumentWriter;
+import org.bson.BsonReader;
+import org.bson.BsonValue;
+import org.bson.codecs.Codec;
+import org.bson.codecs.DecoderContext;
+import org.bson.codecs.DocumentCodecProvider;
+import org.bson.codecs.EncoderContext;
+import org.bson.codecs.ValueCodecProvider;
+import org.bson.codecs.configuration.CodecRegistries;
+import org.bson.codecs.configuration.CodecRegistry;
+import works.bosk.BoskInfo;
 import works.bosk.Listing;
 import works.bosk.Reference;
+import works.bosk.SerializationPlugin;
 import works.bosk.SideTable;
 
-public class BsonSurgeonFormatter {
+import static works.bosk.ReferenceUtils.rawClass;
+
+public class BsonFormatter {
 	protected static final UnaryOperator<String> DECODER;
 	protected static final UnaryOperator<String> ENCODER;
+	protected final CodecRegistry simpleCodecs;
+	protected final Function<Type, Codec<?>> preferredBoskCodecs;
+	protected final Function<Reference<?>, SerializationPlugin.DeserializationScope> deserializationScopeFunction;
+
+	public BsonFormatter(BoskInfo<?> boskInfo, BsonPlugin bsonPlugin) {
+		this.simpleCodecs = CodecRegistries.fromProviders(
+			bsonPlugin.codecProviderFor(boskInfo),
+			new ValueCodecProvider(),
+			new DocumentCodecProvider());
+		this.preferredBoskCodecs = type -> bsonPlugin.getCodec(type, rawClass(type), simpleCodecs, boskInfo);
+		this.deserializationScopeFunction = bsonPlugin::newDeserializationScope;
+	}
 
 	/**
 	 * @param refLength behave as though <code>ref</code> were truncated to this length without actually having to do it
 	 */
 	private static <T> void buildDottedFieldNameOf(Reference<T> ref, int startLength, int refLength, ArrayList<String> segments) {
 		if (ref.path().length() > startLength) {
 			Reference<?> enclosingReference = ref.enclosingReference(Object.class);
-			BsonSurgeonFormatter.buildDottedFieldNameOf(enclosingReference, startLength, refLength, segments);
+			BsonFormatter.buildDottedFieldNameOf(enclosingReference, startLength, refLength, segments);
 			if (ref.path().length() <= refLength) {
 				if (Listing.class.isAssignableFrom(enclosingReference.targetClass())) {
 					segments.add("ids");
 				} else if (SideTable.class.isAssignableFrom(enclosingReference.targetClass())) {
 					segments.add("valuesById");
 				}
-				segments.add(BsonSurgeonFormatter.dottedFieldNameSegment(ref.path().lastSegment()));
+				segments.add(BsonFormatter.dottedFieldNameSegment(ref.path().lastSegment()));
 			}
 		}
 	}
@@ -95,6 +124,55 @@ private static char hexCharForDigit(int value) {
 		}
 	}
 
+	protected Codec<?> codecFor(Type type) {
+		// BsonPlugin gives better codecs than CodecRegistry, because BsonPlugin is aware of generics,
+		// so we always try that first. The CodecSupplier protocol uses "null" to indicate that another
+		// CodecSupplier should be used, so we follow that protocol and fall back on the CodecRegistry.
+		// TODO: Should this logic be in BsonPlugin? It has nothing to do with MongoDriver really.
+		Codec<?> result = preferredBoskCodecs.apply(type);
+		if (result == null) {
+			return simpleCodecs.get(rawClass(type));
+		} else {
+			return result;
+		}
+	}
+
+	/**
+	 * @see #bsonValue2object(BsonValue, Reference)
+	 */
+	@SuppressWarnings("unchecked")
+	public <T> BsonValue object2bsonValue(T object, Type type) {
+		rawClass(type).cast(object);
+		Codec<T> objectCodec = (Codec<T>) codecFor(type);
+		BsonDocument document = new BsonDocument();
+		try (BsonDocumentWriter writer = new BsonDocumentWriter(document)) {
+			// To support arbitrary values, not just whole documents, we put the result INSIDE a document.
+			writer.writeStartDocument();
+			writer.writeName("value");
+			objectCodec.encode(writer, object, EncoderContext.builder().build());
+			writer.writeEndDocument();
+		}
+		return document.get("value");
+	}
+
+	/**
+	 * @see #object2bsonValue(Object, Type)
+	 */
+	@SuppressWarnings("unchecked")
+	public <T> T bsonValue2object(BsonValue bson, Reference<T> target) {
+		Codec<T> objectCodec = (Codec<T>) codecFor(target.targetType());
+		BsonDocument document = new BsonDocument();
+		document.append("value", bson);
+		try (
+			@SuppressWarnings("unused") SerializationPlugin.DeserializationScope scope = deserializationScopeFunction.apply(target);
+			BsonReader reader = document.asBsonReader()
+		) {
+			reader.readStartDocument();
+			reader.readName("value");
+			return objectCodec.decode(reader, DecoderContext.builder().build());
+		}
+	}
+
 	/**
 	 * The fields of the main MongoDB document.  Case-sensitive.
 	 *

bosk-bson/src/main/java/works/bosk/bson/BsonPlugin.java

@@ -65,8 +65,8 @@
 import static works.bosk.ReferenceUtils.getterMethod;
 import static works.bosk.ReferenceUtils.parameterType;
 import static works.bosk.ReferenceUtils.rawClass;
-import static works.bosk.bson.BsonSurgeonFormatter.dottedFieldNameSegment;
-import static works.bosk.bson.BsonSurgeonFormatter.undottedFieldNameSegment;
+import static works.bosk.bson.BsonFormatter.dottedFieldNameSegment;
+import static works.bosk.bson.BsonFormatter.undottedFieldNameSegment;
 
 public final class BsonPlugin extends SerializationPlugin {
 	private final ValueCodecProvider valueCodecProvider = new ValueCodecProvider();

bosk-bson/src/main/java/works/bosk/bson/BsonSurgeon.java

@@ -17,16 +17,16 @@
 import works.bosk.Path;
 import works.bosk.Reference;
 import works.bosk.SideTable;
-import works.bosk.bson.BsonSurgeonFormatter.DocumentFields;
+import works.bosk.bson.BsonFormatter.DocumentFields;
 import works.bosk.exceptions.InvalidTypeException;
 
 import static java.util.Collections.emptyList;
 import static java.util.Collections.unmodifiableList;
 import static java.util.Comparator.comparing;
 import static java.util.Objects.requireNonNull;
-import static works.bosk.bson.BsonSurgeonFormatter.containerSegments;
-import static works.bosk.bson.BsonSurgeonFormatter.dottedFieldNameSegments;
-import static works.bosk.bson.BsonSurgeonFormatter.undottedFieldNameSegment;
+import static works.bosk.bson.BsonFormatter.containerSegments;
+import static works.bosk.bson.BsonFormatter.dottedFieldNameSegments;
+import static works.bosk.bson.BsonFormatter.undottedFieldNameSegment;
 
 /**
  * Splits up a single large BSON document into multiple self-describing pieces,

bosk-bson/src/test/java/works/bosk/bson/BsonFormatterTest.java

@@ -7,18 +7,18 @@
 
 import static org.junit.jupiter.api.Assertions.*;
 
-class BsonSurgeonFormatterTest {
+class BsonFormatterTest {
 
 	@ParameterizedTest
 	@MethodSource("dottedNameCases")
 	void dottedFieldNameSegment(String plain, String dotted) {
-		assertEquals(dotted, BsonSurgeonFormatter.dottedFieldNameSegment(plain));
+		assertEquals(dotted, BsonFormatter.dottedFieldNameSegment(plain));
 	}
 
 	@ParameterizedTest
 	@MethodSource("dottedNameCases")
 	void undottedFieldNameSegment(String plain, String dotted) {
-		assertEquals(plain, BsonSurgeonFormatter.undottedFieldNameSegment(dotted));
+		assertEquals(plain, BsonFormatter.undottedFieldNameSegment(dotted));
 	}
 
 	static Stream<Arguments> dottedNameCases() {

bosk-bson/src/test/java/works/bosk/bson/BsonSurgeonTest.java

@@ -21,7 +21,6 @@
 import works.bosk.SideTableReference;
 import works.bosk.annotations.ReferencePath;
 import works.bosk.drivers.AbstractDriverTest;
-import works.bosk.drivers.mongo.Formatter;
 import works.bosk.drivers.state.TestEntity;
 import works.bosk.exceptions.InvalidTypeException;
 
@@ -33,7 +32,7 @@
 public class BsonSurgeonTest extends AbstractDriverTest {
 	BsonSurgeon surgeon;
 	BsonPlugin bsonPlugin;
-	Formatter formatter;
+	BsonFormatter formatter;
 	private List<Reference<? extends EnumerableByIdentifier<?>>> graftPoints;
 
 	Refs refs;
@@ -55,7 +54,7 @@ public interface Refs {
 	void setup() throws InvalidTypeException, IOException, InterruptedException {
 		setupBosksAndReferences(Bosk.simpleDriver());
 		bsonPlugin = new BsonPlugin();
-		formatter = new Formatter(bosk, bsonPlugin);
+		formatter = new BsonFormatter(bosk, bsonPlugin);
 
 		refs = bosk.buildReferences(Refs.class);
 

bosk-mongo/src/main/java/works/bosk/drivers/mongo/Formatter.java

@@ -11,26 +11,19 @@
 import java.util.Map;
 import java.util.NoSuchElementException;
 import java.util.Set;
-import java.util.function.Function;
 import java.util.regex.Pattern;
 import lombok.NonNull;
 import org.bson.BsonBinaryWriter;
 import org.bson.BsonDocument;
 import org.bson.BsonDocumentReader;
-import org.bson.BsonDocumentWriter;
 import org.bson.BsonInt32;
 import org.bson.BsonInt64;
-import org.bson.BsonReader;
 import org.bson.BsonString;
 import org.bson.BsonValue;
 import org.bson.codecs.BsonValueCodec;
 import org.bson.codecs.Codec;
 import org.bson.codecs.DecoderContext;
-import org.bson.codecs.DocumentCodecProvider;
 import org.bson.codecs.EncoderContext;
-import org.bson.codecs.ValueCodecProvider;
-import org.bson.codecs.configuration.CodecRegistries;
-import org.bson.codecs.configuration.CodecRegistry;
 import org.bson.io.BasicOutputBuffer;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -41,7 +34,7 @@
 import works.bosk.SerializationPlugin;
 import works.bosk.SideTable;
 import works.bosk.bson.BsonPlugin;
-import works.bosk.bson.BsonSurgeonFormatter;
+import works.bosk.bson.BsonFormatter;
 import works.bosk.exceptions.InvalidTypeException;
 
 import static java.util.Arrays.asList;
@@ -53,10 +46,7 @@
  *
  * @author pdoyle
  */
-public final class Formatter extends BsonSurgeonFormatter {
-	private final CodecRegistry simpleCodecs;
-	private final Function<Type, Codec<?>> preferredBoskCodecs;
-	private final Function<Reference<?>, SerializationPlugin.DeserializationScope> deserializationScopeFunction;
+public final class Formatter extends BsonFormatter {
 
 	/**
 	 * If the diagnostic attributes are identical from one update to the next,
@@ -66,12 +56,7 @@ public final class Formatter extends BsonSurgeonFormatter {
 	private volatile MapValue<String> lastEventDiagnosticAttributes = MapValue.empty();
 
 	public Formatter(BoskInfo<?> boskInfo, BsonPlugin bsonPlugin) {
-		this.simpleCodecs = CodecRegistries.fromProviders(
-			bsonPlugin.codecProviderFor(boskInfo),
-			new ValueCodecProvider(),
-			new DocumentCodecProvider());
-		this.preferredBoskCodecs = type -> bsonPlugin.getCodec(type, rawClass(type), simpleCodecs, boskInfo);
-		this.deserializationScopeFunction = bsonPlugin::newDeserializationScope;
+		super(boskInfo, bsonPlugin);
 	}
 
 	/**
@@ -103,19 +88,6 @@ public Formatter(BoskInfo<?> boskInfo, BsonPlugin bsonPlugin) {
 	// Helpers to translate Bosk <-> MongoDB
 	//
 
-	Codec<?> codecFor(Type type) {
-		// BsonPlugin gives better codecs than CodecRegistry, because BsonPlugin is aware of generics,
-		// so we always try that first. The CodecSupplier protocol uses "null" to indicate that another
-		// CodecSupplier should be used, so we follow that protocol and fall back on the CodecRegistry.
-		// TODO: Should this logic be in BsonPlugin? It has nothing to do with MongoDriver really.
-		Codec<?> result = preferredBoskCodecs.apply(type);
-		if (result == null) {
-			return simpleCodecs.get(rawClass(type));
-		} else {
-			return result;
-		}
-	}
-
 	@SuppressWarnings("unchecked")
 	<T> T document2object(BsonDocument doc, Reference<T> target) {
 		Type type = target.targetType();
@@ -187,42 +159,6 @@ MapValue<String> decodeDiagnosticAttributes(BsonDocument diagnostics) {
 		return result;
 	}
 
-	/**
-	 * @see #bsonValue2object(BsonValue, Reference)
-	 */
-	@SuppressWarnings("unchecked")
-	public <T> BsonValue object2bsonValue(T object, Type type) {
-		rawClass(type).cast(object);
-		Codec<T> objectCodec = (Codec<T>) codecFor(type);
-		BsonDocument document = new BsonDocument();
-		try (BsonDocumentWriter writer = new BsonDocumentWriter(document)) {
-			// To support arbitrary values, not just whole documents, we put the result INSIDE a document.
-			writer.writeStartDocument();
-			writer.writeName("value");
-			objectCodec.encode(writer, object, EncoderContext.builder().build());
-			writer.writeEndDocument();
-		}
-		return document.get("value");
-	}
-
-	/**
-	 * @see #object2bsonValue(Object, Type)
-	 */
-	@SuppressWarnings("unchecked")
-	<T> T bsonValue2object(BsonValue bson, Reference<T> target) {
-		Codec<T> objectCodec = (Codec<T>) codecFor(target.targetType());
-		BsonDocument document = new BsonDocument();
-		document.append("value", bson);
-		try (
-			@SuppressWarnings("unused") SerializationPlugin.DeserializationScope scope = deserializationScopeFunction.apply(target);
-			BsonReader reader = document.asBsonReader()
-		) {
-			reader.readStartDocument();
-			reader.readName("value");
-			return objectCodec.decode(reader, DecoderContext.builder().build());
-		}
-	}
-
 	@SuppressWarnings("unchecked")
 	long bsonValueBinarySize(BsonValue bson) {
 		Codec<BsonValue> codec = new BsonValueCodec();

bosk-mongo/src/main/java/works/bosk/drivers/mongo/MainDriver.java

@@ -30,7 +30,7 @@
 import works.bosk.Reference;
 import works.bosk.StateTreeNode;
 import works.bosk.bson.BsonPlugin;
-import works.bosk.bson.BsonSurgeonFormatter.DocumentFields;
+import works.bosk.bson.BsonFormatter.DocumentFields;
 import works.bosk.drivers.mongo.MappedDiagnosticContext.MDCScope;
 import works.bosk.drivers.mongo.MongoDriverSettings.DatabaseFormat;
 import works.bosk.drivers.mongo.MongoDriverSettings.InitialDatabaseUnavailableMode;

bosk-mongo/src/main/java/works/bosk/drivers/mongo/SequoiaFormatDriver.java

@@ -29,7 +29,7 @@
 import works.bosk.Reference;
 import works.bosk.StateTreeNode;
 import works.bosk.bson.BsonPlugin;
-import works.bosk.bson.BsonSurgeonFormatter.DocumentFields;
+import works.bosk.bson.BsonFormatter.DocumentFields;
 import works.bosk.exceptions.FlushFailureException;
 import works.bosk.exceptions.InvalidTypeException;
 

bosk-mongo/src/test/java/works/bosk/drivers/mongo/FormatterTest.java

@@ -15,7 +15,7 @@
 import works.bosk.Reference;
 import works.bosk.TestEntityBuilder;
 import works.bosk.bson.BsonPlugin;
-import works.bosk.bson.BsonSurgeonFormatter;
+import works.bosk.bson.BsonFormatter;
 import works.bosk.exceptions.InvalidTypeException;
 import works.bosk.util.Types;
 
@@ -72,7 +72,7 @@ void object2bsonValue() {
 			)
 			;
 
-		ArrayList<String> dottedName = BsonSurgeonFormatter.dottedFieldNameSegments(weirdRef, weirdRef.path().length(), bosk.rootReference());
+		ArrayList<String> dottedName = BsonFormatter.dottedFieldNameSegments(weirdRef, weirdRef.path().length(), bosk.rootReference());
 		BsonDocument expected = new BsonDocument()
 			.append(dottedName.get(dottedName.size()-1), weirdDoc);
 		assertEquals(expected, actual);