#870

babyfish-ct · Jan 8, 2025 · 4019b15 · 4019b15
1 parent cb4accb
commit 4019b15
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 3 deletions.
diff --git a/project/gradle.properties b/project/gradle.properties
@@ -1,2 +1,2 @@
 group=org.babyfish.jimmer
-version=0.9.42
+version=0.9.43
diff --git a/project/jimmer-apt/src/main/java/org/babyfish/jimmer/apt/dto/DtoGenerator.java b/project/jimmer-apt/src/main/java/org/babyfish/jimmer/apt/dto/DtoGenerator.java
@@ -1729,7 +1729,7 @@ private static CodeBlock codeBlockOf(Anno.Value value) {
                     ((Anno.EnumValue)value).constant
             );
         } else if (value instanceof Anno.LiteralValue) {
-            builder.add(((Anno.LiteralValue)value).value);
+            builder.add(((Anno.LiteralValue)value).value.replace("$", "$$"));
         }
         return builder.build();
     }

diff --git a/project/jimmer-ksp/src/main/kotlin/org/babyfish/jimmer/ksp/dto/DtoGenerator.kt b/project/jimmer-ksp/src/main/kotlin/org/babyfish/jimmer/ksp/dto/DtoGenerator.kt
@@ -1822,7 +1822,7 @@ class DtoGenerator private constructor(
                     ClassName.bestGuess(value.qualifiedName),
                     value.constant
                 )
-                else -> add((value as LiteralValue).value)
+                else -> add((value as LiteralValue).value.replace("%", "%%"))
             }
         }
 

diff --git a/project/jimmer-sql-kotlin/src/test/dto/Employee.dto b/project/jimmer-sql-kotlin/src/test/dto/Employee.dto
@@ -1,6 +1,7 @@
 export org.babyfish.jimmer.sql.kt.model.hr.Employee
     -> package org.babyfish.jimmer.sql.kt.model.hr.dto
 
+import com.fasterxml.jackson.annotation.JsonFormat
 import com.fasterxml.jackson.databind.annotation.{JsonSerialize, JsonDeserialize}
 import org.babyfish.jimmer.sql.kt.model.hr.{MagicStringSerializer, MagicStringDeserializer}
 
@@ -17,5 +18,6 @@ input EmployeeInput {
 
     @JsonSerialize(using = MagicStringSerializer::class)
     @JsonDeserialize(using = MagicStringDeserializer::class)
+    @JsonFormat(pattern = "[^%]+")
     name
 }
diff --git a/project/jimmer-sql/src/test/dto/Personal.dto b/project/jimmer-sql/src/test/dto/Personal.dto
@@ -6,5 +6,7 @@ PersonalPhoneView {
 }
 
 input PersonalPhoneInput {
+
+    @com.fasterxml.jackson.annotation.JsonFormat(pattern = "^\\d+$")
     phone
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -6,5 +6,7 @@ PersonalPhoneView { @@
     }
     input PersonalPhoneInput {
+        @com.fasterxml.jackson.annotation.JsonFormat(pattern = "^\\d+$")
         phone
     }