fix optional checktype (#344)

Author: SentryMan

validator-constraints/src/main/java/io/avaje/validation/constraints/NotBlank.java

@@ -18,7 +18,7 @@
  * @author Hardy Ferentschik
  * @see Character#isWhitespace(char)
  */
-@Constraint
+@Constraint(targets = CharSequence.class)
 @Documented
 @Target({METHOD, FIELD, ANNOTATION_TYPE, PARAMETER, TYPE_USE})
 @Retention(RUNTIME)

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

@@ -106,10 +106,10 @@ void write() {
       if (hasValid) {
         if (mainType.param0().fullWithoutAnnotations().equals(recursiveType)) {
           // cascade validate
-          writer.eol().append("%s    .andThen(this)", indent, mainType.param0().shortType());
+          writer.eol().append("%s    .andThen(this)", indent, mainType.param0().shortWithoutAnnotations());
         } else {
           // cascade validate
-          writer.eol().append("%s    .andThen(ctx.adapter(%s.class))", indent, mainType.param0().shortType());
+          writer.eol().append("%s    .andThen(ctx.adapter(%s.class))", indent, mainType.param0().shortWithoutAnnotations());
         }
       }
       writer.eol().append("%s    .optional()", indent);

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

@@ -86,7 +86,10 @@ private static AnnotationMirror checkType(Element element, UType uType, Annotati
       .map(ConstraintPrism::targets)
       .filter(l -> !l.isEmpty())
       .ifPresent(l -> {
-        if (l.stream().noneMatch(t -> APContext.types().isAssignable(uType.mirror(), t))) {
+        if (l.stream().noneMatch(t ->
+          APContext.types().isAssignable(uType.mirror(), t)
+            || "java.util.Optional".equals(uType.mainType())
+            && APContext.types().isAssignable(uType.param0().mirror(), t))) {
           APContext.logError(
             element,
             "@%s cannot be used on %s",

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

@@ -10,10 +10,7 @@
 @Valid
 public record Ship(
     @NotEmpty(message = "sus ", groups = Ship.class)
-        Map<
-                @NotEmpty(groups = Ship.class) @NotBlank String,
-                @NotBlank(groups = Ship.class) @Valid CrewMate>
-            crew,
+        Map<@NotEmpty(groups = Ship.class) @NotBlank String, @Valid CrewMate> crew,
     @NotEmpty(message = "tasks,=(testing wierd chars&rparen; ")
         List<
                 @NotEmpty(groups = List.class)