Fix CBOR/SmileMapper refs

FasterXML · Jan 23, 2025 · ae4cbc8 · ae4cbc8
1 parent e8d7492
commit ae4cbc8
Show file tree

Hide file tree

Showing 10 changed files with 16 additions and 9 deletions.
diff --git a/cbor/src/main/java/tools/jackson/jakarta/rs/cbor/CBORMapperConfigurator.java b/cbor/src/main/java/tools/jackson/jakarta/rs/cbor/CBORMapperConfigurator.java
@@ -3,7 +3,7 @@
 import tools.jackson.databind.*;
 import tools.jackson.databind.cfg.MapperBuilder;
 import tools.jackson.dataformat.cbor.CBORFactory;
-import tools.jackson.dataformat.cbor.databind.CBORMapper;
+import tools.jackson.dataformat.cbor.CBORMapper;
 import tools.jackson.jakarta.rs.cfg.MapperConfiguratorBase;
 
 /**

diff --git a/cbor/src/main/java/tools/jackson/jakarta/rs/cbor/JacksonCBORProvider.java b/cbor/src/main/java/tools/jackson/jakarta/rs/cbor/JacksonCBORProvider.java
@@ -10,7 +10,8 @@
 
 import tools.jackson.databind.*;
 
-import tools.jackson.dataformat.cbor.databind.CBORMapper;
+import tools.jackson.dataformat.cbor.CBORMapper;
+
 import tools.jackson.jakarta.rs.base.ProviderBase;
 
 /**

diff --git a/cbor/src/main/java/tools/jackson/jakarta/rs/cbor/JacksonXmlBindCBORProvider.java b/cbor/src/main/java/tools/jackson/jakarta/rs/cbor/JacksonXmlBindCBORProvider.java
@@ -7,7 +7,7 @@
 
 import tools.jackson.databind.AnnotationIntrospector;
 
-import tools.jackson.dataformat.cbor.databind.CBORMapper;
+import tools.jackson.dataformat.cbor.CBORMapper;
 
 import tools.jackson.module.jakarta.xmlbind.JakartaXmlBindAnnotationIntrospector;
 

diff --git a/cbor/src/test/java/tools/jackson/jakarta/rs/cbor/dw/SimpleEndpointTestBase.java b/cbor/src/test/java/tools/jackson/jakarta/rs/cbor/dw/SimpleEndpointTestBase.java
@@ -12,7 +12,7 @@
 
 import tools.jackson.databind.ObjectMapper;
 
-import tools.jackson.dataformat.cbor.databind.CBORMapper;
+import tools.jackson.dataformat.cbor.CBORMapper;
 import tools.jackson.jakarta.rs.cbor.CBORMediaTypes;
 
 public abstract class SimpleEndpointTestBase extends ResourceTestBase

diff --git a/cbor/src/test/java/tools/jackson/jakarta/rs/cbor/jersey/SimpleEndpointTest.java b/cbor/src/test/java/tools/jackson/jakarta/rs/cbor/jersey/SimpleEndpointTest.java
@@ -1,6 +1,7 @@
 package tools.jackson.jakarta.rs.cbor.jersey;
 
 import jakarta.servlet.Servlet;
+
 import tools.jackson.jakarta.rs.cbor.dw.SimpleEndpointTestBase;
 
 import org.glassfish.jersey.servlet.ServletContainer;

diff --git a/smile/src/main/java/tools/jackson/jakarta/rs/smile/JacksonSmileProvider.java b/smile/src/main/java/tools/jackson/jakarta/rs/smile/JacksonSmileProvider.java
@@ -17,7 +17,8 @@
 import tools.jackson.databind.ObjectReader;
 import tools.jackson.databind.ObjectWriter;
 
-import tools.jackson.dataformat.smile.databind.SmileMapper;
+import tools.jackson.dataformat.smile.SmileMapper;
+
 import tools.jackson.jakarta.rs.base.ProviderBase;
 
 /**

diff --git a/smile/src/main/java/tools/jackson/jakarta/rs/smile/JacksonXmlBindSmileProvider.java b/smile/src/main/java/tools/jackson/jakarta/rs/smile/JacksonXmlBindSmileProvider.java
@@ -7,7 +7,7 @@
 
 import tools.jackson.databind.AnnotationIntrospector;
 
-import tools.jackson.dataformat.smile.databind.SmileMapper;
+import tools.jackson.dataformat.smile.SmileMapper;
 
 import tools.jackson.module.jakarta.xmlbind.JakartaXmlBindAnnotationIntrospector;
 

diff --git a/smile/src/main/java/tools/jackson/jakarta/rs/smile/SmileMapperConfigurator.java b/smile/src/main/java/tools/jackson/jakarta/rs/smile/SmileMapperConfigurator.java
@@ -4,7 +4,8 @@
 import tools.jackson.databind.cfg.MapperBuilder;
 
 import tools.jackson.dataformat.smile.SmileFactory;
-import tools.jackson.dataformat.smile.databind.SmileMapper;
+import tools.jackson.dataformat.smile.SmileMapper;
+
 import tools.jackson.jakarta.rs.cfg.MapperConfiguratorBase;
 
 /**

diff --git a/smile/src/test/java/tools/jackson/jakarta/rs/smile/dw/SimpleEndpointTestBase.java b/smile/src/test/java/tools/jackson/jakarta/rs/smile/dw/SimpleEndpointTestBase.java
@@ -10,7 +10,8 @@
 
 import tools.jackson.databind.ObjectMapper;
 
-import tools.jackson.dataformat.smile.databind.SmileMapper;
+import tools.jackson.dataformat.smile.SmileMapper;
+
 import tools.jackson.jakarta.rs.smile.SmileMediaTypes;
 
 public abstract class SimpleEndpointTestBase extends ResourceTestBase

diff --git a/yaml/src/test/java/tools/jackson/jakarta/rs/yaml/dw/SimpleEndpointTestBase.java b/yaml/src/test/java/tools/jackson/jakarta/rs/yaml/dw/SimpleEndpointTestBase.java
@@ -15,8 +15,10 @@
 
 import tools.jackson.databind.ObjectMapper;
 
-import tools.jackson.dataformat.smile.databind.SmileMapper;
+import tools.jackson.dataformat.smile.SmileMapper;
+
 import tools.jackson.dataformat.yaml.YAMLMapper;
+
 import tools.jackson.jakarta.rs.json.JacksonJsonProvider;
 import tools.jackson.jakarta.rs.smile.JacksonSmileProvider;
 import tools.jackson.jakarta.rs.smile.SmileMediaTypes;