From c66634602f1602e9ca4ad0388ee16446d20b7084 Mon Sep 17 00:00:00 2001 From: Tatu Saloranta Date: Wed, 22 Jan 2025 18:33:39 -0800 Subject: [PATCH 1/2] Move CBORMapper, SmileMapper to main Java package (from under `.databind` sub-package) --- cbor/src/main/java/module-info.java | 3 +-- .../jackson/dataformat/cbor/{databind => }/CBORMapper.java | 5 +---- .../java/tools/jackson/dataformat/cbor/CBORTestBase.java | 2 -- .../jackson/dataformat/cbor/GeneratorDeepNestingTest.java | 2 -- .../jackson/dataformat/cbor/ParserWithJsonOrgSampleTest.java | 1 - .../dataformat/cbor/filter/StreamingDecoratorsTest.java | 1 - .../jackson/dataformat/cbor/gen/ArrayGenerationTest.java | 1 - .../jackson/dataformat/cbor/gen/GeneratorBinaryTest.java | 2 +- .../tools/jackson/dataformat/cbor/mapper/BiggerDataTest.java | 2 +- .../tools/jackson/dataformat/cbor/mapper/CBORMapperTest.java | 2 +- .../dataformat/cbor/mapper/JDKSerializabilityTest.java | 2 +- .../tools/jackson/dataformat/cbor/parse/SymbolTableTest.java | 1 - release-notes/VERSION | 2 ++ smile/src/main/java/module-info.java | 3 +-- .../jackson/dataformat/smile/{databind => }/SmileMapper.java | 5 +---- .../tools/jackson/dataformat/smile/BaseTestForSmile.java | 2 -- .../java/tools/jackson/dataformat/smile/VersionsTest.java | 1 - .../jackson/dataformat/smile/async/ConcurrentAsyncTest.java | 3 +-- .../dataformat/smile/async/SimpleStringArrayTest.java | 1 - .../smile/constraints/DeeplyNestedSmileReadWriteTest.java | 2 +- .../smile/constraints/LongDocumentSmileReadTest.java | 2 +- .../dataformat/smile/dos/DeepNestingSmileParserTest.java | 2 +- .../dataformat/smile/filter/StreamingDecoratorsTest.java | 1 - .../jackson/dataformat/smile/gen/ArrayGenerationTest.java | 2 +- .../smile/gen/LenientUnicodeSmileGenerationTest.java | 1 - .../jackson/dataformat/smile/mapper/BinaryReadTest.java | 1 - .../dataformat/smile/mapper/JDKSerializabilityTest.java | 2 +- .../jackson/dataformat/smile/mapper/MapperFeaturesTest.java | 2 +- .../dataformat/smile/mapper/MapperSimpleReadTest.java | 1 - .../dataformat/smile/parse/SmileNumberParsingTest.java | 1 - .../jackson/dataformat/smile/parse/SymbolTableTest.java | 1 - 31 files changed, 17 insertions(+), 42 deletions(-) rename cbor/src/main/java/tools/jackson/dataformat/cbor/{databind => }/CBORMapper.java (97%) rename smile/src/main/java/tools/jackson/dataformat/smile/{databind => }/SmileMapper.java (96%) diff --git a/cbor/src/main/java/module-info.java b/cbor/src/main/java/module-info.java index 1c27f7791..35b04d59d 100644 --- 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/databind/CBORMapper.java b/cbor/src/main/java/tools/jackson/dataformat/cbor/CBORMapper.java similarity index 97% rename from cbor/src/main/java/tools/jackson/dataformat/cbor/databind/CBORMapper.java rename to cbor/src/main/java/tools/jackson/dataformat/cbor/CBORMapper.java index 338b3a6e6..21f7365a1 100644 --- a/cbor/src/main/java/tools/jackson/dataformat/cbor/databind/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 index 3586b3404..00b168af5 100644 --- 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 index d1244d8c7..6bf658752 100644 --- 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 index a3a66a950..eec88260b 100644 --- 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 index ffbe1088d..394b0adaf 100644 --- 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 index 1146c1c94..99cb99d2e 100644 --- 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 index 3b2d0de09..43d8aa41f 100644 --- 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 index 9ea3b3dee..9f90a1a04 100644 --- 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 index 67e5e54a2..296634d5e 100644 --- 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 index d91394cb5..35e58aa3e 100644 --- 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 index f4596e406..5d9332486 100644 --- 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 index 59715ac9c..2da7a5d00 100644 --- a/release-notes/VERSION +++ b/release-notes/VERSION @@ -33,3 +33,5 @@ implementations) - Minimum Java baseline: Java 17 - (protobuf) Remove shading of `protoparser` dependency (and change Maven packaging type to "jar" from "bundle") +- (cbor, smile) Move `CBORMapper` and `SmileMapper` into main-level + Java package from under `MAIN.databind` diff --git a/smile/src/main/java/module-info.java b/smile/src/main/java/module-info.java index 6e5e2f41a..2d863d6c3 100644 --- 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/databind/SmileMapper.java b/smile/src/main/java/tools/jackson/dataformat/smile/SmileMapper.java similarity index 96% rename from smile/src/main/java/tools/jackson/dataformat/smile/databind/SmileMapper.java rename to smile/src/main/java/tools/jackson/dataformat/smile/SmileMapper.java index 9e08bdc5c..21f838c4d 100644 --- a/smile/src/main/java/tools/jackson/dataformat/smile/databind/SmileMapper.java +++ b/smile/src/main/java/tools/jackson/dataformat/smile/SmileMapper.java @@ -1,4 +1,4 @@ -package tools.jackson.dataformat.smile.databind; +package tools.jackson.dataformat.smile; import tools.jackson.core.Version; @@ -6,9 +6,6 @@ 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 index 276c06ec4..a032a86c4 100644 --- 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 index cecacd541..816b989bd 100644 --- 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 index 85acadc7d..0de896468 100644 --- 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 index 73d12151d..4fcfb54bd 100644 --- 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 index 785d9b6d2..a66c19639 100644 --- 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 index 3a920077f..1ad134fc9 100644 --- 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 index 447b3464b..a046f3eb2 100644 --- 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 index 960aa7793..df2eea2d9 100644 --- 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 index 0b3001f6a..e9b9de520 100644 --- 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 index 76ce83af6..05fdaeb7f 100644 --- 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 index 90eb9820c..786fa39c9 100644 --- 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 index 46a7ec83e..6a36ebf40 100644 --- 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 index ad97189b6..63830fd4a 100644 --- 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 index 0b615814a..7c853e240 100644 --- 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 index 60bd21034..cff46c539 100644 --- 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 index 0faed1ad1..01f846962 100644 --- 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.*; From 25a360e14e6fb5b86fff448171c9d2145e1c602e Mon Sep 17 00:00:00 2001 From: Tatu Saloranta Date: Wed, 22 Jan 2025 18:34:55 -0800 Subject: [PATCH 2/2] update release notes --- release-notes/VERSION | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/release-notes/VERSION b/release-notes/VERSION index 2da7a5d00..a4dfc7a56 100644 --- a/release-notes/VERSION +++ b/release-notes/VERSION @@ -30,8 +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") -- (cbor, smile) Move `CBORMapper` and `SmileMapper` into main-level - Java package from under `MAIN.databind`