Merge branch 'main' into import-pkg

Author: SentryMan

blackbox-test/src/test/java/example/avaje/nested/MyPatterns.java

@@ -0,0 +1,22 @@
+package example.avaje.nested;
+
+import io.avaje.validation.constraints.Valid;
+import io.avaje.validation.constraints.Pattern;
+
+@Valid
+public class MyPatterns {
+
+  @Pattern(
+    regexp = "^(?=^.{1,16}$)^\\d+\\.\\d{2}$",
+    message = "Not a valid amount. please add 2 decimal behind")
+  private final String one;
+
+  public MyPatterns(String one) {
+    this.one = one;
+  }
+
+  public String one() {
+    return one;
+  }
+
+}

blackbox-test/src/test/java/example/avaje/nested/MyPatternsTest.java

@@ -0,0 +1,49 @@
+package example.avaje.nested;
+
+import io.avaje.validation.ConstraintViolation;
+import io.avaje.validation.ConstraintViolationException;
+import io.avaje.validation.Validator;
+import org.junit.jupiter.api.Test;
+
+import java.util.ArrayList;
+import java.util.Locale;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.fail;
+
+class MyPatternsTest {
+
+  final Validator validator = Validator.builder().addLocales(Locale.GERMAN).build();
+
+  @Test
+  void patternWithEscapes_valid() {
+    var bean = new MyPatterns("34.23");
+    validator.validate(bean);
+  }
+
+  @Test
+  void patternWithEscapes_invalid_tooFew() {
+    var bean = new MyPatterns("34.2");
+    var violation = one(bean, Locale.ENGLISH);
+    assertThat(violation.message()).isEqualTo("Not a valid amount. please add 2 decimal behind");
+  }
+
+  @Test
+  void patternWithEscapes_invalid_tooMany() {
+    var bean = new MyPatterns("34.234");
+    var violation = one(bean, Locale.ENGLISH);
+    assertThat(violation.message()).isEqualTo("Not a valid amount. please add 2 decimal behind");
+  }
+
+  ConstraintViolation one(Object any, Locale locale) {
+    try {
+      validator.validate(any, locale);
+      fail("not expected");
+      return null;
+    } catch (ConstraintViolationException e) {
+      var violations = new ArrayList<>(e.violations());
+      assertThat(violations).hasSize(1);
+      return violations.get(0);
+    }
+  }
+}

validator-generator/src/main/java/io/avaje/validation/generator/AnnotationUtil.java

@@ -247,7 +247,7 @@ String writeAttributes(AnnotationMirror annotationMirror) {
     }
 
     private static void pattern(StringBuilder sb, PatternPrism prism) {
-      sb.append("\"regexp\",\"").append(prism.regexp()).append("\"");
+      sb.append("\"regexp\",\"").append(escape(prism.regexp())).append("\"");
       if (prism.message() != null) {
         sb.append(", \"message\",\"").append(avajeKey(prism.message())).append("\"");
       }
@@ -261,6 +261,18 @@ private static void pattern(StringBuilder sb, PatternPrism prism) {
       }
       sb.append(")");
     }
+
+    private static String escape(String value) {
+      if (value == null) return "";
+      return value
+          .replace("\\", "\\\\")
+          .replace("\"", "\\\"")
+          .replace("\'", "\\\'")
+          .replace("\n", "\\n")
+          .replace("\b", "\\b")
+          .replace("\t", "\\t")
+          .replace("\r", "\\r");
+    }
   }
 
   static class StandardHandler extends BaseHandler {

validator-generator/src/test/java/io/avaje/validation/generator/models/valid/Address.java

@@ -1,7 +1,7 @@
 package io.avaje.validation.generator.models.valid;
 
-public class Address {
 
+public class Address {
   public String line1;
   public String line2;
   @PrimitiveTest public long longValue;