refactor: rename Jackson 2.x package to jackson2 to avoid conflicts

mariuszs · mariuszs · commit 9a6285fc1d60 · 2025-12-21T14:47:11.000+01:00
diff --git a/friendly-id-jackson2-datatype/src/main/java/com/devskiller/friendly_id/jackson2/FriendlyIdAnnotationIntrospector.java b/friendly-id-jackson2-datatype/src/main/java/com/devskiller/friendly_id/jackson2/FriendlyIdAnnotationIntrospector.java
@@ -1,4 +1,4 @@
-package com.devskiller.friendly_id.jackson;
+package com.devskiller.friendly_id.jackson2;
 
 import java.util.UUID;
 
diff --git a/friendly-id-jackson2-datatype/src/main/java/com/devskiller/friendly_id/jackson2/FriendlyIdDeserializer.java b/friendly-id-jackson2-datatype/src/main/java/com/devskiller/friendly_id/jackson2/FriendlyIdDeserializer.java
@@ -1,4 +1,4 @@
-package com.devskiller.friendly_id.jackson;
+package com.devskiller.friendly_id.jackson2;
 
 import java.io.IOException;
 import java.util.UUID;
diff --git a/friendly-id-jackson2-datatype/src/main/java/com/devskiller/friendly_id/jackson2/FriendlyIdFormat.java b/friendly-id-jackson2-datatype/src/main/java/com/devskiller/friendly_id/jackson2/FriendlyIdFormat.java
@@ -1,4 +1,4 @@
-package com.devskiller.friendly_id.jackson;
+package com.devskiller.friendly_id.jackson2;
 
 /**
  * Friendly ID format
diff --git a/friendly-id-jackson2-datatype/src/main/java/com/devskiller/friendly_id/jackson2/FriendlyIdModule.java b/friendly-id-jackson2-datatype/src/main/java/com/devskiller/friendly_id/jackson2/FriendlyIdModule.java
@@ -1,4 +1,4 @@
-package com.devskiller.friendly_id.jackson;
+package com.devskiller.friendly_id.jackson2;
 
 import java.util.UUID;
 
diff --git a/friendly-id-jackson2-datatype/src/main/java/com/devskiller/friendly_id/jackson2/FriendlyIdSerializer.java b/friendly-id-jackson2-datatype/src/main/java/com/devskiller/friendly_id/jackson2/FriendlyIdSerializer.java
@@ -1,4 +1,4 @@
-package com.devskiller.friendly_id.jackson;
+package com.devskiller.friendly_id.jackson2;
 
 import java.io.IOException;
 import java.util.UUID;
diff --git a/friendly-id-jackson2-datatype/src/main/java/com/devskiller/friendly_id/jackson2/FriendlyIdValueDeserializer.java b/friendly-id-jackson2-datatype/src/main/java/com/devskiller/friendly_id/jackson2/FriendlyIdValueDeserializer.java
@@ -1,4 +1,4 @@
-package com.devskiller.friendly_id.jackson;
+package com.devskiller.friendly_id.jackson2;
 
 import java.io.IOException;
 
diff --git a/friendly-id-jackson2-datatype/src/main/java/com/devskiller/friendly_id/jackson2/FriendlyIdValueSerializer.java b/friendly-id-jackson2-datatype/src/main/java/com/devskiller/friendly_id/jackson2/FriendlyIdValueSerializer.java
@@ -1,4 +1,4 @@
-package com.devskiller.friendly_id.jackson;
+package com.devskiller.friendly_id.jackson2;
 
 import java.io.IOException;
 
diff --git a/friendly-id-jackson2-datatype/src/main/java/com/devskiller/friendly_id/jackson2/IdFormat.java b/friendly-id-jackson2-datatype/src/main/java/com/devskiller/friendly_id/jackson2/IdFormat.java
@@ -1,4 +1,4 @@
-package com.devskiller.friendly_id.jackson;
+package com.devskiller.friendly_id.jackson2;
 
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
diff --git a/friendly-id-jackson2-datatype/src/main/resources/META-INF/services/com.fasterxml.jackson.databind.Module b/friendly-id-jackson2-datatype/src/main/resources/META-INF/services/com.fasterxml.jackson.databind.Module
@@ -1 +1 @@
-com.devskiller.friendly_id.jackson.FriendlyIdModule
+com.devskiller.friendly_id.jackson2.FriendlyIdModule
diff --git a/friendly-id-jackson2-datatype/src/test/java/com/devskiller/friendly_id/spring/Bar.java b/friendly-id-jackson2-datatype/src/test/java/com/devskiller/friendly_id/spring/Bar.java
@@ -2,8 +2,8 @@
 
 import java.util.UUID;
 
-import com.devskiller.friendly_id.jackson.FriendlyIdFormat;
-import com.devskiller.friendly_id.jackson.IdFormat;
+import com.devskiller.friendly_id.jackson2.FriendlyIdFormat;
+import com.devskiller.friendly_id.jackson2.IdFormat;
 
 public class Bar {
 
diff --git a/friendly-id-jackson2-datatype/src/test/java/com/devskiller/friendly_id/spring/Foo.java b/friendly-id-jackson2-datatype/src/test/java/com/devskiller/friendly_id/spring/Foo.java
@@ -2,8 +2,8 @@
 
 import java.util.UUID;
 
-import com.devskiller.friendly_id.jackson.FriendlyIdFormat;
-import com.devskiller.friendly_id.jackson.IdFormat;
+import com.devskiller.friendly_id.jackson2.FriendlyIdFormat;
+import com.devskiller.friendly_id.jackson2.IdFormat;
 
 public class Foo {
 
diff --git a/friendly-id-jackson2-datatype/src/test/java/com/devskiller/friendly_id/spring/ObjectMapperConfiguration.java b/friendly-id-jackson2-datatype/src/test/java/com/devskiller/friendly_id/spring/ObjectMapperConfiguration.java
@@ -3,7 +3,7 @@
 import com.fasterxml.jackson.databind.Module;
 import com.fasterxml.jackson.databind.ObjectMapper;
 
-import com.devskiller.friendly_id.jackson.FriendlyIdModule;
+import com.devskiller.friendly_id.jackson2.FriendlyIdModule;
 
 public class ObjectMapperConfiguration {
 
diff --git a/friendly-id-samples/friendly-id-spring-boot3-simple/src/main/java/com/devskiller/friendly_id/sample/spring3/FriendlyIdConfig.java b/friendly-id-samples/friendly-id-spring-boot3-simple/src/main/java/com/devskiller/friendly_id/sample/spring3/FriendlyIdConfig.java
@@ -9,7 +9,7 @@
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
 
 import com.devskiller.friendly_id.FriendlyId;
-import com.devskiller.friendly_id.jackson.FriendlyIdModule;
+import com.devskiller.friendly_id.jackson2.FriendlyIdModule;
 
 @Configuration
 public class FriendlyIdConfig implements WebMvcConfigurer {

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package com.devskiller.friendly_id.jackson;`
	`1`	`+package com.devskiller.friendly_id.jackson2;`
`2`	`2`
`3`	`3`	`import java.util.UUID;`
`4`	`4`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-com.devskiller.friendly_id.jackson.FriendlyIdModule`
	`1`	`+com.devskiller.friendly_id.jackson2.FriendlyIdModule`