Merge pull request #158 from ProjectMapK/fix/ann-name

Rename annotation
ProjectMapK · Oct 27, 2023 · 6b249f6 · 6b249f6
2 parents e9111c2 + f79be47
commit 6b249f6
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 18 deletions.
diff --git a/...son/module/kogera/annotation/JsonUnbox.kt → ...on/module/kogera/annotation/JsonKUnbox.kt b/...son/module/kogera/annotation/JsonUnbox.kt → ...on/module/kogera/annotation/JsonKUnbox.kt
@@ -9,4 +9,4 @@ package io.github.projectmapk.jackson.module.kogera.annotation
 @Retention(AnnotationRetention.RUNTIME)
 @MustBeDocumented
 @Target(AnnotationTarget.CLASS, AnnotationTarget.PROPERTY_GETTER)
-public annotation class JsonUnbox
+public annotation class JsonKUnbox
diff --git a/...apk/jackson/module/kogera/annotation_introspector/KotlinFallbackAnnotationIntrospector.kt b/...apk/jackson/module/kogera/annotation_introspector/KotlinFallbackAnnotationIntrospector.kt
@@ -12,7 +12,7 @@ import com.fasterxml.jackson.databind.util.Converter
 import io.github.projectmapk.jackson.module.kogera.KotlinDuration
 import io.github.projectmapk.jackson.module.kogera.ReflectionCache
 import io.github.projectmapk.jackson.module.kogera.ValueClassUnboxConverter
-import io.github.projectmapk.jackson.module.kogera.annotation.JsonUnbox
+import io.github.projectmapk.jackson.module.kogera.annotation.JsonKUnbox
 import io.github.projectmapk.jackson.module.kogera.deser.CollectionValueStrictNullChecksConverter
 import io.github.projectmapk.jackson.module.kogera.deser.MapValueStrictNullChecksConverter
 import io.github.projectmapk.jackson.module.kogera.isNullable
@@ -85,7 +85,7 @@ internal class KotlinFallbackAnnotationIntrospector(
                 }
             } else {
                 // If JsonUnbox is specified, the unboxed getter is used as is.
-                if (a.hasAnnotation(JsonUnbox::class.java) || it.getAnnotation(JsonUnbox::class.java) != null) {
+                if (a.hasAnnotation(JsonKUnbox::class.java) || it.getAnnotation(JsonKUnbox::class.java) != null) {
                     null
                 } else {
                     cache.getValueClassBoxConverter(a.rawReturnType, it)

diff --git a/...hub/projectmapk/jackson/module/kogera/_integration/ser/value_class/json_unbox/ForClass.kt b/...hub/projectmapk/jackson/module/kogera/_integration/ser/value_class/json_unbox/ForClass.kt
@@ -1,21 +1,21 @@
 package io.github.projectmapk.jackson.module.kogera._integration.ser.value_class.json_unbox
 
-import io.github.projectmapk.jackson.module.kogera.annotation.JsonUnbox
+import io.github.projectmapk.jackson.module.kogera.annotation.JsonKUnbox
 import io.github.projectmapk.jackson.module.kogera.jacksonObjectMapper
 import org.junit.jupiter.api.Assertions.assertEquals
 import org.junit.jupiter.api.Test
 
 class ForClass {
     @JvmInline
-    @JsonUnbox
+    @JsonKUnbox
     value class Primitive(val v: Int)
 
     @JvmInline
-    @JsonUnbox
+    @JsonKUnbox
     value class NonNullObject(val v: String)
 
     @JvmInline
-    @JsonUnbox
+    @JsonKUnbox
     value class NullableObject(val v: String?)
 
     data class Dto(

diff --git a/.../projectmapk/jackson/module/kogera/_integration/ser/value_class/json_unbox/ForProperty.kt b/.../projectmapk/jackson/module/kogera/_integration/ser/value_class/json_unbox/ForProperty.kt
@@ -1,6 +1,6 @@
 package io.github.projectmapk.jackson.module.kogera._integration.ser.value_class.json_unbox
 
-import io.github.projectmapk.jackson.module.kogera.annotation.JsonUnbox
+import io.github.projectmapk.jackson.module.kogera.annotation.JsonKUnbox
 import io.github.projectmapk.jackson.module.kogera.jacksonObjectMapper
 import org.junit.jupiter.api.Assertions.assertEquals
 import org.junit.jupiter.api.Test
@@ -16,25 +16,25 @@ class ForProperty {
     value class NullableObject(val v: String?)
 
     data class Dto(
-        @get:JsonUnbox
+        @get:JsonKUnbox
         val p0: Primitive = Primitive(0),
-        @get:JsonUnbox
+        @get:JsonKUnbox
         val p1: Primitive? = Primitive(1),
-        @get:JsonUnbox
+        @get:JsonKUnbox
         val p2: Primitive? = null,
-        @get:JsonUnbox
+        @get:JsonKUnbox
         val nno0: NonNullObject = NonNullObject("0"),
-        @get:JsonUnbox
+        @get:JsonKUnbox
         val nno1: NonNullObject? = NonNullObject("1"),
-        @get:JsonUnbox
+        @get:JsonKUnbox
         val nno2: NonNullObject? = null,
-        @get:JsonUnbox
+        @get:JsonKUnbox
         val no0: NullableObject = NullableObject("0"),
-        @get:JsonUnbox
+        @get:JsonKUnbox
         val no1: NullableObject = NullableObject(null),
-        @get:JsonUnbox
+        @get:JsonKUnbox
         val no2: NullableObject? = NullableObject("2"),
-        @get:JsonUnbox
+        @get:JsonKUnbox
         val no3: NullableObject? = null
     )