Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jan 23, 2025
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c666346
Move CBORMapper, SmileMapper to main Java package (from under `.datab…
cowtowncoder Jan 23, 2025
25a360e
update release notes
cowtowncoder Jan 23, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions cbor/src/main/java/module-info.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
5 changes: 1 addition & 4 deletions .../dataformat/cbor/databind/CBORMapper.java → ...s/jackson/dataformat/cbor/CBORMapper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;

/**
Expand Down
2 changes: 0 additions & 2 deletions cbor/src/test/java/tools/jackson/dataformat/cbor/CBORTestBase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 0 additions & 2 deletions cbor/src/test/java/tools/jackson/dataformat/cbor/GeneratorDeepNestingTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion cbor/src/test/java/tools/jackson/dataformat/cbor/ParserWithJsonOrgSampleTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
1 change: 0 additions & 1 deletion cbor/src/test/java/tools/jackson/dataformat/cbor/filter/StreamingDecoratorsTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
1 change: 0 additions & 1 deletion cbor/src/test/java/tools/jackson/dataformat/cbor/gen/ArrayGenerationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.*;

Expand Down
2 changes: 1 addition & 1 deletion cbor/src/test/java/tools/jackson/dataformat/cbor/gen/GeneratorBinaryTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
2 changes: 1 addition & 1 deletion cbor/src/test/java/tools/jackson/dataformat/cbor/mapper/BiggerDataTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion cbor/src/test/java/tools/jackson/dataformat/cbor/mapper/CBORMapperTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.*;

Expand Down
2 changes: 1 addition & 1 deletion cbor/src/test/java/tools/jackson/dataformat/cbor/mapper/JDKSerializabilityTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.*;

Expand Down
1 change: 0 additions & 1 deletion cbor/src/test/java/tools/jackson/dataformat/cbor/parse/SymbolTableTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.*;

Expand Down
2 changes: 2 additions & 0 deletions release-notes/VERSION
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
3 changes: 1 addition & 2 deletions smile/src/main/java/module-info.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
5 changes: 1 addition & 4 deletions ...ataformat/smile/databind/SmileMapper.java → ...jackson/dataformat/smile/SmileMapper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
2 changes: 0 additions & 2 deletions smile/src/test/java/tools/jackson/dataformat/smile/BaseTestForSmile.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion smile/src/test/java/tools/jackson/dataformat/smile/VersionsTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
3 changes: 1 addition & 2 deletions smile/src/test/java/tools/jackson/dataformat/smile/async/ConcurrentAsyncTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
{
Expand Down
1 change: 0 additions & 1 deletion smile/src/test/java/tools/jackson/dataformat/smile/async/SimpleStringArrayTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.*;

Expand Down
2 changes: 1 addition & 1 deletion .../test/java/tools/jackson/dataformat/smile/constraints/DeeplyNestedSmileReadWriteTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.*;
Expand Down
2 changes: 1 addition & 1 deletion ...e/src/test/java/tools/jackson/dataformat/smile/constraints/LongDocumentSmileReadTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.*;
Expand Down
2 changes: 1 addition & 1 deletion smile/src/test/java/tools/jackson/dataformat/smile/dos/DeepNestingSmileParserTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.*;

Expand Down
1 change: 0 additions & 1 deletion smile/src/test/java/tools/jackson/dataformat/smile/filter/StreamingDecoratorsTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
2 changes: 1 addition & 1 deletion smile/src/test/java/tools/jackson/dataformat/smile/gen/ArrayGenerationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
1 change: 0 additions & 1 deletion ...e/src/test/java/tools/jackson/dataformat/smile/gen/LenientUnicodeSmileGenerationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.*;

Expand Down
1 change: 0 additions & 1 deletion smile/src/test/java/tools/jackson/dataformat/smile/mapper/BinaryReadTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.*;
Expand Down
2 changes: 1 addition & 1 deletion smile/src/test/java/tools/jackson/dataformat/smile/mapper/JDKSerializabilityTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.*;

Expand Down
2 changes: 1 addition & 1 deletion smile/src/test/java/tools/jackson/dataformat/smile/mapper/MapperFeaturesTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
1 change: 0 additions & 1 deletion smile/src/test/java/tools/jackson/dataformat/smile/mapper/MapperSimpleReadTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.*;

Expand Down
1 change: 0 additions & 1 deletion smile/src/test/java/tools/jackson/dataformat/smile/parse/SmileNumberParsingTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.*;

Expand Down
1 change: 0 additions & 1 deletion smile/src/test/java/tools/jackson/dataformat/smile/parse/SymbolTableTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.*;

Expand Down