Move CBORMapper, SmileMapper to main Java package (from under .databind sub-package` (#559)

cowtowncoder · web-flow · commit c43a6cba00f4 · 2025-01-22T18:36:54.000-08:00
diff --git a/cbor/src/main/java/module-info.java b/cbor/src/main/java/module-info.java
@@ -5,10 +5,9 @@
     requires tools.jackson.databind;
 
     exports tools.jackson.dataformat.cbor;
-    exports tools.jackson.dataformat.cbor.databind;
 
     provides tools.jackson.core.TokenStreamFactory with
         tools.jackson.dataformat.cbor.CBORFactory;
     provides tools.jackson.databind.ObjectMapper with
-        tools.jackson.dataformat.cbor.databind.CBORMapper;
+        tools.jackson.dataformat.cbor.CBORMapper;
 }
diff --git a/cbor/src/main/java/tools/jackson/dataformat/cbor/CBORMapper.java b/cbor/src/main/java/tools/jackson/dataformat/cbor/CBORMapper.java
@@ -1,13 +1,10 @@
-package tools.jackson.dataformat.cbor.databind;
+package tools.jackson.dataformat.cbor;
 
 import tools.jackson.core.Version;
 
 import tools.jackson.databind.ObjectMapper;
 import tools.jackson.databind.cfg.MapperBuilder;
 import tools.jackson.databind.cfg.MapperBuilderState;
-
-import tools.jackson.dataformat.cbor.CBORFactory;
-import tools.jackson.dataformat.cbor.CBORWriteFeature;
 import tools.jackson.dataformat.cbor.PackageVersion;
 
 /**
diff --git a/cbor/src/test/java/tools/jackson/dataformat/cbor/CBORTestBase.java b/cbor/src/test/java/tools/jackson/dataformat/cbor/CBORTestBase.java
@@ -11,8 +11,6 @@
 import tools.jackson.databind.ObjectWriter;
 import tools.jackson.databind.json.JsonMapper;
 
-import tools.jackson.dataformat.cbor.databind.CBORMapper;
-
 import static org.junit.jupiter.api.Assertions.*;
 
 public abstract class CBORTestBase
diff --git a/cbor/src/test/java/tools/jackson/dataformat/cbor/GeneratorDeepNestingTest.java b/cbor/src/test/java/tools/jackson/dataformat/cbor/GeneratorDeepNestingTest.java
@@ -10,8 +10,6 @@
 
 import tools.jackson.databind.ObjectMapper;
 
-import tools.jackson.dataformat.cbor.databind.CBORMapper;
-
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class GeneratorDeepNestingTest extends CBORTestBase
diff --git a/cbor/src/test/java/tools/jackson/dataformat/cbor/ParserWithJsonOrgSampleTest.java b/cbor/src/test/java/tools/jackson/dataformat/cbor/ParserWithJsonOrgSampleTest.java
@@ -6,7 +6,6 @@
 
 import tools.jackson.core.JsonParser;
 import tools.jackson.core.JsonToken;
-import tools.jackson.dataformat.cbor.databind.CBORMapper;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.fail;
diff --git a/cbor/src/test/java/tools/jackson/dataformat/cbor/filter/StreamingDecoratorsTest.java b/cbor/src/test/java/tools/jackson/dataformat/cbor/filter/StreamingDecoratorsTest.java
@@ -6,7 +6,6 @@
 
 import tools.jackson.core.*;
 import tools.jackson.dataformat.cbor.*;
-import tools.jackson.dataformat.cbor.databind.CBORMapper;
 import tools.jackson.dataformat.cbor.testutil.PrefixInputDecorator;
 import tools.jackson.dataformat.cbor.testutil.PrefixOutputDecorator;
 
diff --git a/cbor/src/test/java/tools/jackson/dataformat/cbor/gen/ArrayGenerationTest.java b/cbor/src/test/java/tools/jackson/dataformat/cbor/gen/ArrayGenerationTest.java
@@ -9,7 +9,6 @@
 import tools.jackson.core.JsonParser.NumberType;
 import tools.jackson.databind.ObjectMapper;
 import tools.jackson.dataformat.cbor.*;
-import tools.jackson.dataformat.cbor.databind.CBORMapper;
 
 import static org.junit.jupiter.api.Assertions.*;
 
diff --git a/cbor/src/test/java/tools/jackson/dataformat/cbor/gen/GeneratorBinaryTest.java b/cbor/src/test/java/tools/jackson/dataformat/cbor/gen/GeneratorBinaryTest.java
@@ -11,7 +11,7 @@
 import tools.jackson.core.JsonGenerator;
 import tools.jackson.core.JsonParser;
 import tools.jackson.databind.ObjectMapper;
-import tools.jackson.dataformat.cbor.databind.CBORMapper;
+import tools.jackson.dataformat.cbor.CBORMapper;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
diff --git a/cbor/src/test/java/tools/jackson/dataformat/cbor/mapper/BiggerDataTest.java b/cbor/src/test/java/tools/jackson/dataformat/cbor/mapper/BiggerDataTest.java
@@ -6,9 +6,9 @@
 
 import tools.jackson.databind.*;
 import tools.jackson.databind.json.JsonMapper;
+import tools.jackson.dataformat.cbor.CBORMapper;
 import tools.jackson.dataformat.cbor.CBORTestBase;
 import tools.jackson.dataformat.cbor.CBORWriteFeature;
-import tools.jackson.dataformat.cbor.databind.CBORMapper;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
diff --git a/cbor/src/test/java/tools/jackson/dataformat/cbor/mapper/CBORMapperTest.java b/cbor/src/test/java/tools/jackson/dataformat/cbor/mapper/CBORMapperTest.java
@@ -2,9 +2,9 @@
 
 import org.junit.jupiter.api.Test;
 
+import tools.jackson.dataformat.cbor.CBORMapper;
 import tools.jackson.dataformat.cbor.CBORTestBase;
 import tools.jackson.dataformat.cbor.CBORWriteFeature;
-import tools.jackson.dataformat.cbor.databind.CBORMapper;
 
 import static org.junit.jupiter.api.Assertions.*;
 
diff --git a/cbor/src/test/java/tools/jackson/dataformat/cbor/mapper/JDKSerializabilityTest.java b/cbor/src/test/java/tools/jackson/dataformat/cbor/mapper/JDKSerializabilityTest.java
@@ -5,8 +5,8 @@
 
 import org.junit.jupiter.api.Test;
 
+import tools.jackson.dataformat.cbor.CBORMapper;
 import tools.jackson.dataformat.cbor.CBORTestBase;
-import tools.jackson.dataformat.cbor.databind.CBORMapper;
 
 import static org.junit.jupiter.api.Assertions.*;
 
diff --git a/cbor/src/test/java/tools/jackson/dataformat/cbor/parse/SymbolTableTest.java b/cbor/src/test/java/tools/jackson/dataformat/cbor/parse/SymbolTableTest.java
@@ -9,7 +9,6 @@
 import tools.jackson.core.io.SerializedString;
 import tools.jackson.core.sym.ByteQuadsCanonicalizer;
 import tools.jackson.dataformat.cbor.*;
-import tools.jackson.dataformat.cbor.databind.CBORMapper;
 
 import static org.junit.jupiter.api.Assertions.*;
 
diff --git a/release-notes/VERSION b/release-notes/VERSION
@@ -30,6 +30,8 @@ implementations)
 #543: (avro) Enable "logical types" support in `AvroSchemaGenerator`
   by default (3.0)
 #557: Change 3.0 to use `module-info.java` directly [JSTEP-11]
+#559 (cbor, smile) Move `CBORMapper` and `SmileMapper` into main-level
+  Java package from under `MAIN.databind`
 - Minimum Java baseline: Java 17
 - (protobuf) Remove shading of `protoparser` dependency (and change
   Maven packaging type to "jar" from "bundle")
diff --git a/smile/src/main/java/module-info.java b/smile/src/main/java/module-info.java
@@ -6,10 +6,9 @@
 
     exports tools.jackson.dataformat.smile;
     exports tools.jackson.dataformat.smile.async;
-    exports tools.jackson.dataformat.smile.databind;
 
     provides tools.jackson.core.TokenStreamFactory with
         tools.jackson.dataformat.smile.SmileFactory;
     provides tools.jackson.databind.ObjectMapper with
-        tools.jackson.dataformat.smile.databind.SmileMapper;
+        tools.jackson.dataformat.smile.SmileMapper;
 }
diff --git a/smile/src/main/java/tools/jackson/dataformat/smile/SmileMapper.java b/smile/src/main/java/tools/jackson/dataformat/smile/SmileMapper.java
@@ -1,14 +1,11 @@
-package tools.jackson.dataformat.smile.databind;
+package tools.jackson.dataformat.smile;
 
 import tools.jackson.core.Version;
 
 import tools.jackson.databind.ObjectMapper;
 import tools.jackson.databind.cfg.MapperBuilder;
 import tools.jackson.databind.cfg.MapperBuilderState;
 import tools.jackson.dataformat.smile.PackageVersion;
-import tools.jackson.dataformat.smile.SmileFactory;
-import tools.jackson.dataformat.smile.SmileReadFeature;
-import tools.jackson.dataformat.smile.SmileWriteFeature;
 
 /**
  * Specialized {@link ObjectMapper} to use with Smile format backend.
diff --git a/smile/src/test/java/tools/jackson/dataformat/smile/BaseTestForSmile.java b/smile/src/test/java/tools/jackson/dataformat/smile/BaseTestForSmile.java
@@ -10,8 +10,6 @@
 
 import tools.jackson.databind.*;
 
-import tools.jackson.dataformat.smile.databind.SmileMapper;
-
 import static org.junit.jupiter.api.Assertions.*;
 
 public abstract class BaseTestForSmile
diff --git a/smile/src/test/java/tools/jackson/dataformat/smile/VersionsTest.java b/smile/src/test/java/tools/jackson/dataformat/smile/VersionsTest.java
@@ -7,7 +7,6 @@
 
 import tools.jackson.core.Versioned;
 import tools.jackson.databind.ObjectMapper;
-import tools.jackson.dataformat.smile.databind.SmileMapper;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
diff --git a/smile/src/test/java/tools/jackson/dataformat/smile/async/ConcurrentAsyncTest.java b/smile/src/test/java/tools/jackson/dataformat/smile/async/ConcurrentAsyncTest.java
@@ -11,8 +11,7 @@
 
 import tools.jackson.databind.*;
 import tools.jackson.databind.util.TokenBuffer;
-
-import tools.jackson.dataformat.smile.databind.SmileMapper;
+import tools.jackson.dataformat.smile.SmileMapper;
 
 public class ConcurrentAsyncTest extends AsyncTestBase
 {
diff --git a/smile/src/test/java/tools/jackson/dataformat/smile/async/SimpleStringArrayTest.java b/smile/src/test/java/tools/jackson/dataformat/smile/async/SimpleStringArrayTest.java
@@ -10,7 +10,6 @@
 import tools.jackson.databind.ObjectWriter;
 
 import tools.jackson.dataformat.smile.*;
-import tools.jackson.dataformat.smile.databind.SmileMapper;
 
 import static org.junit.jupiter.api.Assertions.*;
 
diff --git a/smile/src/test/java/tools/jackson/dataformat/smile/constraints/DeeplyNestedSmileReadWriteTest.java b/smile/src/test/java/tools/jackson/dataformat/smile/constraints/DeeplyNestedSmileReadWriteTest.java
@@ -11,7 +11,7 @@
 import tools.jackson.databind.node.ObjectNode;
 
 import tools.jackson.dataformat.smile.SmileFactory;
-import tools.jackson.dataformat.smile.databind.SmileMapper;
+import tools.jackson.dataformat.smile.SmileMapper;
 import tools.jackson.dataformat.smile.BaseTestForSmile;
 
 import static org.junit.jupiter.api.Assertions.*;
diff --git a/smile/src/test/java/tools/jackson/dataformat/smile/constraints/LongDocumentSmileReadTest.java b/smile/src/test/java/tools/jackson/dataformat/smile/constraints/LongDocumentSmileReadTest.java
@@ -11,7 +11,7 @@
 
 import tools.jackson.databind.ObjectMapper;
 import tools.jackson.dataformat.smile.SmileFactory;
-import tools.jackson.dataformat.smile.databind.SmileMapper;
+import tools.jackson.dataformat.smile.SmileMapper;
 import tools.jackson.dataformat.smile.BaseTestForSmile;
 
 import static org.junit.jupiter.api.Assertions.*;
diff --git a/smile/src/test/java/tools/jackson/dataformat/smile/dos/DeepNestingSmileParserTest.java b/smile/src/test/java/tools/jackson/dataformat/smile/dos/DeepNestingSmileParserTest.java
@@ -8,7 +8,7 @@
 import tools.jackson.core.exc.StreamConstraintsException;
 import tools.jackson.dataformat.smile.BaseTestForSmile;
 import tools.jackson.dataformat.smile.SmileFactory;
-import tools.jackson.dataformat.smile.databind.SmileMapper;
+import tools.jackson.dataformat.smile.SmileMapper;
 
 import static org.junit.jupiter.api.Assertions.*;
 
diff --git a/smile/src/test/java/tools/jackson/dataformat/smile/filter/StreamingDecoratorsTest.java b/smile/src/test/java/tools/jackson/dataformat/smile/filter/StreamingDecoratorsTest.java
@@ -6,7 +6,6 @@
 
 import tools.jackson.core.*;
 import tools.jackson.dataformat.smile.*;
-import tools.jackson.dataformat.smile.databind.SmileMapper;
 import tools.jackson.dataformat.smile.testutil.PrefixInputDecorator;
 import tools.jackson.dataformat.smile.testutil.PrefixOutputDecorator;
 
diff --git a/smile/src/test/java/tools/jackson/dataformat/smile/gen/ArrayGenerationTest.java b/smile/src/test/java/tools/jackson/dataformat/smile/gen/ArrayGenerationTest.java
@@ -7,7 +7,7 @@
 import tools.jackson.core.*;
 import tools.jackson.databind.ObjectMapper;
 import tools.jackson.dataformat.smile.BaseTestForSmile;
-import tools.jackson.dataformat.smile.databind.SmileMapper;
+import tools.jackson.dataformat.smile.SmileMapper;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.fail;
diff --git a/smile/src/test/java/tools/jackson/dataformat/smile/gen/LenientUnicodeSmileGenerationTest.java b/smile/src/test/java/tools/jackson/dataformat/smile/gen/LenientUnicodeSmileGenerationTest.java
@@ -8,7 +8,6 @@
 import tools.jackson.core.exc.StreamWriteException;
 import tools.jackson.databind.ObjectWriter;
 import tools.jackson.dataformat.smile.*;
-import tools.jackson.dataformat.smile.databind.SmileMapper;
 
 import static org.junit.jupiter.api.Assertions.*;
 
diff --git a/smile/src/test/java/tools/jackson/dataformat/smile/mapper/BinaryReadTest.java b/smile/src/test/java/tools/jackson/dataformat/smile/mapper/BinaryReadTest.java
@@ -16,7 +16,6 @@
 import tools.jackson.databind.ObjectMapper;
 import tools.jackson.databind.node.BinaryNode;
 import tools.jackson.dataformat.smile.*;
-import tools.jackson.dataformat.smile.databind.SmileMapper;
 import tools.jackson.dataformat.smile.testutil.ThrottledInputStream;
 
 import static org.junit.jupiter.api.Assertions.*;
diff --git a/smile/src/test/java/tools/jackson/dataformat/smile/mapper/JDKSerializabilityTest.java b/smile/src/test/java/tools/jackson/dataformat/smile/mapper/JDKSerializabilityTest.java
@@ -6,7 +6,7 @@
 import org.junit.jupiter.api.Test;
 
 import tools.jackson.dataformat.smile.BaseTestForSmile;
-import tools.jackson.dataformat.smile.databind.SmileMapper;
+import tools.jackson.dataformat.smile.SmileMapper;
 
 import static org.junit.jupiter.api.Assertions.*;
 
diff --git a/smile/src/test/java/tools/jackson/dataformat/smile/mapper/MapperFeaturesTest.java b/smile/src/test/java/tools/jackson/dataformat/smile/mapper/MapperFeaturesTest.java
@@ -5,7 +5,7 @@
 import tools.jackson.databind.*;
 import tools.jackson.dataformat.smile.BaseTestForSmile;
 import tools.jackson.dataformat.smile.SmileFactory;
-import tools.jackson.dataformat.smile.databind.SmileMapper;
+import tools.jackson.dataformat.smile.SmileMapper;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
diff --git a/smile/src/test/java/tools/jackson/dataformat/smile/mapper/MapperSimpleReadTest.java b/smile/src/test/java/tools/jackson/dataformat/smile/mapper/MapperSimpleReadTest.java
@@ -17,7 +17,6 @@
 import tools.jackson.databind.exc.MismatchedInputException;
 import tools.jackson.databind.node.ArrayNode;
 import tools.jackson.dataformat.smile.*;
-import tools.jackson.dataformat.smile.databind.SmileMapper;
 
 import static org.junit.jupiter.api.Assertions.*;
 
diff --git a/smile/src/test/java/tools/jackson/dataformat/smile/parse/SmileNumberParsingTest.java b/smile/src/test/java/tools/jackson/dataformat/smile/parse/SmileNumberParsingTest.java
@@ -12,7 +12,6 @@
 import tools.jackson.core.exc.StreamConstraintsException;
 
 import tools.jackson.dataformat.smile.*;
-import tools.jackson.dataformat.smile.databind.SmileMapper;
 
 import static org.junit.jupiter.api.Assertions.*;
 
diff --git a/smile/src/test/java/tools/jackson/dataformat/smile/parse/SymbolTableTest.java b/smile/src/test/java/tools/jackson/dataformat/smile/parse/SymbolTableTest.java
@@ -13,7 +13,6 @@
 import tools.jackson.core.sym.ByteQuadsCanonicalizer;
 
 import tools.jackson.dataformat.smile.*;
-import tools.jackson.dataformat.smile.databind.SmileMapper;
 
 import static org.junit.jupiter.api.Assertions.*;
 
