#819

project/gradle.properties

@@ -1,2 +1,2 @@
 group=org.babyfish.jimmer
-version=0.9.23
+version=0.9.24

project/jimmer-apt/src/main/java/org/babyfish/jimmer/apt/dto/InputBuilderGenerator.java

@@ -10,12 +10,14 @@
 import javax.lang.model.element.AnnotationMirror;
 import javax.lang.model.element.Modifier;
 import javax.lang.model.element.TypeElement;
-import java.util.HashSet;
-import java.util.Set;
+import java.util.*;
 
 public class InputBuilderGenerator {
 
-    private static final String JACKSON_ANNO_PREFIX = "com.fasterxml.jackson.databind.annotation.";
+    private static final String[] JACKSON_ANNO_PREFIXIES = new String[] {
+            "com.fasterxml.jackson.databind.annotation.",
+            "com.fasterxml.jackson.annotation."
+    };
 
     private final DtoGenerator parentGenerator;
 
@@ -145,8 +147,7 @@ private void addJacksonAnnotations(
     ) {
         Set<String> typeNames = new HashSet<>();
         for (Anno anno : prop.getAnnotations()) {
-            if (anno.getQualifiedName().startsWith(JACKSON_ANNO_PREFIX) &&
-                    typeNames.add(anno.getQualifiedName())) {
+            if (isJacksonQualifiedName(anno.getQualifiedName()) && typeNames.add(anno.getQualifiedName())) {
                 builder.addAnnotation(DtoGenerator.annotationOf(anno));
             }
         }
@@ -157,8 +158,7 @@ private void addJacksonAnnotations(
                         .asElement())
                         .getQualifiedName()
                         .toString();
-                if (qualifiedName.startsWith(JACKSON_ANNO_PREFIX) &&
-                        typeNames.add(qualifiedName)) {
+                if (isJacksonQualifiedName(qualifiedName) && typeNames.add(qualifiedName)) {
                     builder.addAnnotation(AnnotationSpec.get(mirror));
                 }
             }
@@ -247,4 +247,13 @@ private static boolean isFieldNullable(AbstractProp prop) {
         }
         return true;
     }
+
+    private static boolean isJacksonQualifiedName(String qualifiedName) {
+        for (String prefix : JACKSON_ANNO_PREFIXIES) {
+            if (qualifiedName.startsWith(prefix)) {
+                return true;
+            }
+        }
+        return false;
+    }
 }

project/jimmer-core/src/main/resources/META-INF/jimmer/code_generation

@@ -1 +1 @@
-0.9.23
+0.9.24

project/jimmer-ksp/src/main/kotlin/org/babyfish/jimmer/ksp/dto/InputBuilderGenerator.kt

@@ -195,7 +195,10 @@ class InputBuilderGenerator(
 
     companion object {
 
-        private val JACKSON_ANNO_PREFIX = "com.fasterxml.jackson.databind.annotation."
+        private val JACKSON_ANNO_PREFIXIES = arrayOf(
+            "com.fasterxml.jackson.databind.annotation.",
+            "com.fasterxml.jackson.annotation."
+        )
 
         private fun isFieldNullable(prop: AbstractProp): Boolean =
             prop !is DtoProp<*, *> || (prop.funcName != "null" && prop.funcName != "notNull")
@@ -204,18 +207,19 @@ class InputBuilderGenerator(
         private fun FunSpec.Builder.addJacksonAnnotations(prop: AbstractProp) {
             val typeNames = mutableSetOf<String>()
             for (anno in prop.annotations) {
-                if (anno.qualifiedName.startsWith(JACKSON_ANNO_PREFIX) &&
+                if (JACKSON_ANNO_PREFIXIES.any { anno.qualifiedName.startsWith(it) } &&
                     typeNames.add(anno.qualifiedName)) {
                     addAnnotation(DtoGenerator.annotationOf(anno))
                 }
             }
             if (prop is DtoProp<*, *>) {
                 val dtoProp = prop as DtoProp<*, ImmutableProp>
-                for (anno in dtoProp.toTailProp().baseProp.annotations {
-                    it.fullName.startsWith(JACKSON_ANNO_PREFIX) &&
-                        typeNames.add(it.fullName)
+                for (anno in dtoProp.toTailProp().baseProp.annotations { an ->
+                    JACKSON_ANNO_PREFIXIES.any { an.fullName.startsWith(it) }
                 }) {
-                    addAnnotation(anno.toAnnotationSpec())
+                    if (typeNames.add(anno.fullName)) {
+                        addAnnotation(anno.toAnnotationSpec())
+                    }
                 }
             }
         }

project/jimmer-spring-boot-starter/src/main/java/org/babyfish/jimmer/spring/dialect/DialectDetector.java

@@ -85,6 +85,8 @@ private static Dialect getDialectOrNullForDriver(@NotNull DatabaseDriver driver)
                     return new SqlServerDialect();
                 case H2:
                     return new H2Dialect();
+                case SQLITE:
+                    return new SQLiteDialect();
                 default:
                     return null;
             }

project/jimmer-sql-kotlin/src/test/dto/Administrator.dto

@@ -1,8 +1,20 @@
 export org.babyfish.jimmer.sql.kt.model.inheritance.Administrator
     -> package org.babyfish.jimmer.sql.kt.model.inheritance.dto
 
+import com.fasterxml.jackson.annotation.JsonFormat
+
 static input AdministratorInputForIssue684 {
     fuzzy metadata {
         name
     }
 }
+
+input AdministratorInputForIssue819 {
+    #allScalars
+
+    @JsonFormat(pattern = "yyyy/MM/dd HH-mm-ss")
+    createdTime
+
+    @JsonFormat(pattern = "yyyy/MM/dd HH-mm-ss")
+    modifiedTime
+}

project/jimmer-sql-kotlin/src/test/kotlin/org/babyfish/jimmer/sql/kt/dto/AdministratorInputTest.kt

@@ -0,0 +1,65 @@
+package org.babyfish.jimmer.sql.kt.dto
+
+import com.fasterxml.jackson.databind.ObjectMapper
+import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule
+import org.babyfish.jimmer.sql.kt.common.assertContent
+import org.babyfish.jimmer.sql.kt.model.inheritance.dto.AdministratorInputForIssue684
+import org.babyfish.jimmer.sql.kt.model.inheritance.dto.AdministratorInputForIssue819
+import org.junit.Test
+import java.time.LocalDateTime
+import java.time.format.DateTimeFormatter
+import kotlin.test.expect
+
+class AdministratorInputTest {
+
+    @Test
+    fun testNullForIssue684() {
+        expect(
+            "{}"
+        ) {
+            AdministratorInputForIssue684().toEntity().toString()
+        }
+    }
+
+    @Test
+    fun testNonNullForIssue684() {
+        expect(
+            "{\"metadata\":{\"name\":\"Metadata\"}}"
+        ) {
+            AdministratorInputForIssue684(
+                metadata = AdministratorInputForIssue684.TargetOf_metadata("Metadata")
+            ).toEntity().toString()
+        }
+    }
+
+    @Test
+    fun testIssueFor819() {
+        val formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")
+        val mapper = ObjectMapper().registerModule(JavaTimeModule())
+        val input = AdministratorInputForIssue819(
+            id = 10L,
+            name = "SuperAdmin",
+            createdTime = LocalDateTime.parse("2024-12-02 13:07:24", formatter),
+            modifiedTime = LocalDateTime.parse("2024-12-03 02:00:14", formatter),
+        )
+        val json = mapper.writeValueAsString(input)
+        assertContent(
+            """{"
+                |--->id":10,
+                |--->"name":"SuperAdmin",
+                |--->"createdTime":"2024/12/02 13-07-24",
+                |--->"modifiedTime":"2024/12/03 02-00-14"
+                |}""".trimMargin(),
+            json
+        )
+        val input2 = mapper.readValue(json, AdministratorInputForIssue819::class.java)
+        assertContent(
+            """AdministratorInputForIssue819(
+                |--->id=10, 
+                |--->name=SuperAdmin, 
+                |--->createdTime=2024-12-02T13:07:24, 
+                |--->modifiedTime=2024-12-03T02:00:14)""".trimMargin(),
+            input2
+        )
+    }
+}