Merge pull request boskworks#39 from prdoyle/merge-back-bson

Merge bosk-bson back into bosk-mongo

bosk-mongo/build.gradle

@@ -26,7 +26,6 @@ compileTestJava {
 
 dependencies {
 	api project(":bosk-core")
-	implementation project(":bosk-bson")
 	api 'org.mongodb:mongodb-driver-sync:5.1.2'
 	implementation 'com.github.spotbugs:spotbugs-annotations:4.8.6' // To stop warnings about When from MongoDB driver
 

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

@@ -26,8 +26,8 @@
 import works.bosk.MapValue;
 import works.bosk.Reference;
 import works.bosk.SerializationPlugin;
-import works.bosk.bson.BsonPlugin;
-import works.bosk.bson.BsonFormatter;
+import works.bosk.drivers.mongo.bson.BsonPlugin;
+import works.bosk.drivers.mongo.bson.BsonFormatter;
 
 import static java.util.Arrays.asList;
 import static java.util.Collections.singletonList;

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

@@ -29,8 +29,8 @@
 import works.bosk.Identifier;
 import works.bosk.Reference;
 import works.bosk.StateTreeNode;
-import works.bosk.bson.BsonPlugin;
-import works.bosk.bson.BsonFormatter.DocumentFields;
+import works.bosk.drivers.mongo.bson.BsonPlugin;
+import works.bosk.drivers.mongo.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/MongoDriver.java

@@ -7,7 +7,7 @@
 import works.bosk.BoskInfo;
 import works.bosk.DriverFactory;
 import works.bosk.StateTreeNode;
-import works.bosk.bson.BsonPlugin;
+import works.bosk.drivers.mongo.bson.BsonPlugin;
 import works.bosk.drivers.mongo.status.MongoStatus;
 
 /**

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

@@ -40,9 +40,9 @@
 import works.bosk.Reference;
 import works.bosk.RootReference;
 import works.bosk.StateTreeNode;
-import works.bosk.bson.BsonFormatter;
-import works.bosk.bson.BsonPlugin;
-import works.bosk.bson.BsonSurgeon;
+import works.bosk.drivers.mongo.bson.BsonFormatter;
+import works.bosk.drivers.mongo.bson.BsonPlugin;
+import works.bosk.drivers.mongo.bson.BsonSurgeon;
 import works.bosk.exceptions.FlushFailureException;
 import works.bosk.exceptions.InvalidTypeException;
 import works.bosk.exceptions.NotYetImplementedException;
@@ -60,7 +60,7 @@
 import static java.util.stream.Collectors.toList;
 import static org.bson.BsonBoolean.TRUE;
 import static works.bosk.Path.parseParameterized;
-import static works.bosk.bson.BsonFormatter.docBsonPath;
+import static works.bosk.drivers.mongo.bson.BsonFormatter.docBsonPath;
 import static works.bosk.util.Classes.enumerableByIdentifier;
 
 /**

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

@@ -28,8 +28,8 @@
 import works.bosk.MapValue;
 import works.bosk.Reference;
 import works.bosk.StateTreeNode;
-import works.bosk.bson.BsonPlugin;
-import works.bosk.bson.BsonFormatter.DocumentFields;
+import works.bosk.drivers.mongo.bson.BsonPlugin;
+import works.bosk.drivers.mongo.bson.BsonFormatter.DocumentFields;
 import works.bosk.exceptions.FlushFailureException;
 import works.bosk.exceptions.InvalidTypeException;
 
@@ -43,7 +43,7 @@
 import static org.bson.BsonBoolean.FALSE;
 import static works.bosk.drivers.mongo.Formatter.REVISION_ZERO;
 import static works.bosk.drivers.mongo.Formatter.dottedFieldNameOf;
-import static works.bosk.bson.BsonFormatter.referenceTo;
+import static works.bosk.drivers.mongo.bson.BsonFormatter.referenceTo;
 import static works.bosk.drivers.mongo.MainDriver.MANIFEST_ID;
 import static works.bosk.drivers.mongo.MongoDriverSettings.ManifestMode.CREATE_IF_ABSENT;
 

bosk-bson/src/main/java/works/bosk/bson/BsonFormatException.java → bosk-mongo/src/main/java/works/bosk/drivers/mongo/bson/BsonFormatException.java

@@ -1,4 +1,4 @@
-package works.bosk.bson;
+package works.bosk.drivers.mongo.bson;
 
 class BsonFormatException extends IllegalStateException {
 	public BsonFormatException(String s) { super(s); }

bosk-bson/src/main/java/works/bosk/bson/BsonFormatter.java → bosk-mongo/src/main/java/works/bosk/drivers/mongo/bson/BsonFormatter.java

@@ -1,4 +1,4 @@
-package works.bosk.bson;
+package works.bosk.drivers.mongo.bson;
 
 import java.lang.reflect.Type;
 import java.net.URLDecoder;

bosk-bson/src/main/java/works/bosk/bson/BsonPlugin.java → bosk-mongo/src/main/java/works/bosk/drivers/mongo/bson/BsonPlugin.java

@@ -1,4 +1,4 @@
-package works.bosk.bson;
+package works.bosk.drivers.mongo.bson;
 
 import java.lang.invoke.MethodHandle;
 import java.lang.invoke.MethodHandles.Lookup;
@@ -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.BsonFormatter.dottedFieldNameSegment;
-import static works.bosk.bson.BsonFormatter.undottedFieldNameSegment;
+import static works.bosk.drivers.mongo.bson.BsonFormatter.dottedFieldNameSegment;
+import static works.bosk.drivers.mongo.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 → bosk-mongo/src/main/java/works/bosk/drivers/mongo/bson/BsonSurgeon.java

@@ -1,4 +1,4 @@
-package works.bosk.bson;
+package works.bosk.drivers.mongo.bson;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -15,15 +15,14 @@
 import works.bosk.Identifier;
 import works.bosk.Path;
 import works.bosk.Reference;
-import works.bosk.bson.BsonFormatter.DocumentFields;
+import works.bosk.drivers.mongo.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.BsonFormatter.containerSegments;
-import static works.bosk.bson.BsonFormatter.undottedFieldNameSegment;
+import static works.bosk.drivers.mongo.bson.BsonFormatter.containerSegments;
+import static works.bosk.drivers.mongo.bson.BsonFormatter.undottedFieldNameSegment;
 
 /**
  * Splits up a single large BSON document into multiple self-describing pieces,

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

@@ -26,7 +26,7 @@
 import works.bosk.Reference;
 import works.bosk.SideTable;
 import works.bosk.annotations.ReferencePath;
-import works.bosk.bson.BsonPlugin;
+import works.bosk.drivers.mongo.bson.BsonPlugin;
 import works.bosk.drivers.mongo.MongoDriverSettings.MongoDriverSettingsBuilder;
 import works.bosk.drivers.state.TestEntity;
 import works.bosk.drivers.state.TestValues;

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

@@ -8,7 +8,7 @@
 import org.junit.jupiter.api.BeforeEach;
 import works.bosk.DriverFactory;
 import works.bosk.StateTreeNode;
-import works.bosk.bson.BsonPlugin;
+import works.bosk.drivers.mongo.bson.BsonPlugin;
 import works.bosk.drivers.DriverConformanceTest;
 import works.bosk.drivers.mongo.TestParameters.EventTiming;
 import works.bosk.drivers.mongo.TestParameters.ParameterSet;

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

@@ -8,7 +8,7 @@
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.TestInfo;
 import works.bosk.DriverStack;
-import works.bosk.bson.BsonPlugin;
+import works.bosk.drivers.mongo.bson.BsonPlugin;
 import works.bosk.drivers.HanoiTest;
 import works.bosk.junit.ParametersByName;
 import works.bosk.junit.Slow;

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

@@ -30,7 +30,7 @@
 import works.bosk.Reference;
 import works.bosk.SideTable;
 import works.bosk.annotations.Polyfill;
-import works.bosk.bson.BsonPlugin;
+import works.bosk.drivers.mongo.bson.BsonPlugin;
 import works.bosk.drivers.BufferingDriver;
 import works.bosk.drivers.state.TestEntity;
 import works.bosk.drivers.state.TestValues;

bosk-bson/src/test/java/works/bosk/bson/BsonFormatterTest.java → bosk-mongo/src/test/java/works/bosk/drivers/mongo/bson/BsonFormatterTest.java

@@ -1,4 +1,4 @@
-package works.bosk.bson;
+package works.bosk.drivers.mongo.bson;
 
 import java.io.IOException;
 import java.util.ArrayList;
@@ -18,7 +18,6 @@
 import works.bosk.util.Types;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
-import static works.bosk.TypeValidation.validateType;
 
 class BsonFormatterTest extends AbstractBoskTest {
 	Bosk<TestRoot> bosk;

bosk-bson/src/test/java/works/bosk/bson/BsonPluginTest.java → bosk-mongo/src/test/java/works/bosk/drivers/mongo/bson/BsonPluginTest.java

@@ -1,4 +1,4 @@
-package works.bosk.bson;
+package works.bosk.drivers.mongo.bson;
 
 import lombok.experimental.FieldNameConstants;
 import org.bson.BsonDocument;

bosk-bson/src/test/java/works/bosk/bson/BsonSurgeonTest.java → bosk-mongo/src/test/java/works/bosk/drivers/mongo/bson/BsonSurgeonTest.java

@@ -1,4 +1,4 @@
-package works.bosk.bson;
+package works.bosk.drivers.mongo.bson;
 
 import java.io.IOException;
 import java.util.LinkedHashSet;
@@ -28,7 +28,7 @@
 import static java.util.stream.Collectors.toList;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertThrows;
-import static works.bosk.bson.BsonFormatter.docBsonPath;
+import static works.bosk.drivers.mongo.bson.BsonFormatter.docBsonPath;
 
 public class BsonSurgeonTest extends AbstractDriverTest {
 	BsonSurgeon surgeon;

bosk-bson/src/test/java/works/bosk/bson/DottedFieldNameTest.java → bosk-mongo/src/test/java/works/bosk/drivers/mongo/bson/DottedFieldNameTest.java

@@ -1,4 +1,4 @@
-package works.bosk.bson;
+package works.bosk.drivers.mongo.bson;
 
 import java.util.stream.Stream;
 import org.junit.jupiter.api.BeforeEach;

bosk-bson/src/test/java/works/bosk/bson/DottedFieldNameTest2.java → bosk-mongo/src/test/java/works/bosk/drivers/mongo/bson/DottedFieldNameTest2.java

@@ -1,11 +1,11 @@
-package works.bosk.bson;
+package works.bosk.drivers.mongo.bson;
 
 import java.util.stream.Stream;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.Arguments;
 import org.junit.jupiter.params.provider.MethodSource;
 
-import static org.junit.jupiter.api.Assertions.*;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 class DottedFieldNameTest2 {
 

bosk-mongo/src/test/java/works/bosk/drivers/mongo/example/ExampleBosk.java

@@ -5,7 +5,7 @@
 import works.bosk.DriverFactory;
 import works.bosk.Reference;
 import works.bosk.annotations.ReferencePath;
-import works.bosk.bson.BsonPlugin;
+import works.bosk.drivers.mongo.bson.BsonPlugin;
 import works.bosk.drivers.mongo.MongoDriver;
 import works.bosk.drivers.mongo.MongoDriverSettings;
 import works.bosk.exceptions.InvalidTypeException;

lib-testing/build.gradle

@@ -18,7 +18,7 @@ dependencies {
 	implementation project(":bosk-testing")
 	// These are for AbstractRoundTripTest. That logic ought to be moved to their respective sub-projects
 	implementation project(":bosk-jackson")
-	implementation project(":bosk-bson")
+	implementation project(":bosk-mongo")
 
 	// The bosk.development plugin brings these in as test dependencies,
 	// but we need them as main dependencies.

lib-testing/src/main/java/works/bosk/AbstractRoundTripTest.java

@@ -28,7 +28,7 @@
 import org.bson.codecs.configuration.CodecRegistry;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import works.bosk.bson.BsonPlugin;
+import works.bosk.drivers.mongo.bson.BsonPlugin;
 import works.bosk.exceptions.InvalidTypeException;
 import works.bosk.jackson.JacksonPlugin;
 import works.bosk.jackson.JacksonPluginConfiguration;

settings.gradle

@@ -1,7 +1,6 @@
 
 rootProject.name = 'bosk'
 include 'bosk-annotations'
-include 'bosk-bson'
 include 'bosk-core'
 include 'bosk-jackson'
 include 'bosk-logback'