Fix typeuse annotations not getting trimmed properly

inject-generator/src/main/java/io/avaje/inject/generator/Util.java

@@ -1,14 +1,18 @@
 package io.avaje.inject.generator;
 
-import java.util.Optional;
 import static io.avaje.inject.generator.ProcessingContext.isImportedType;
 
+import java.util.Optional;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
 import javax.lang.model.element.AnnotationMirror;
 import javax.lang.model.element.Element;
 import javax.lang.model.type.DeclaredType;
 import javax.lang.model.type.TypeMirror;
 
 final class Util {
+  private static final Pattern ANNOTATION_REGEX = Pattern.compile("(@.*?)(?=(?:[^\"]*\"[^\"]*\")*[^\"]*$)\\s");
 
   static final String ASPECT_PROVIDER_PREFIX = "io.avaje.inject.aop.AspectProvider<";
   static final String PROVIDER_PREFIX = "jakarta.inject.Provider<";
@@ -49,23 +53,27 @@ static String trimGenerics(String type) {
     return type.substring(0, i);
   }
 
-
   /** Trim off annotations from the raw type if present. */
-  public static String trimAnnotations(String type) {
-    final int pos = type.indexOf(".@");
-    if (pos == -1) {
-      return type;
+  public static String trimAnnotations(String input) {
+
+    // Use a pattern matcher to find the first occurrence of the pattern
+    final Matcher matcher = ANNOTATION_REGEX.matcher(input);
+    String result = input;
+    while (matcher.find()) {
+      final String matchedSubstring = matcher.group();
+      result = result.replace(matchedSubstring, "");
     }
-    return type.substring(0, pos + 1) + type.substring(type.lastIndexOf(' ') + 1);
+
+    return result.toString();
   }
 
   public static String sanitizeImports(String type) {
     final int pos = type.indexOf("@");
     if (pos == -1) {
-      return type.replace("[]", "");
+      return type.replaceAll("[^\\n\\r\\t $;\\w.]", "");
     }
     final var start = pos == 0 ? type.substring(0, pos) : "";
-    return start + type.substring(type.lastIndexOf(' ') + 1).replace("[]", "");
+    return start + type.substring(type.lastIndexOf(' ') + 1).replaceAll("[^\\n\\r\\t $;\\w.]", "");
   }
 
   static String nestedPackageOf(String cls) {

inject-generator/src/test/java/io/avaje/inject/generator/UtilTest.java

@@ -120,6 +120,19 @@ void validImportType() {
     assertTrue(Util.validImportType("other.pack.Foo"));
   }
 
+  @Test
+  void trimmedAnnotation() {
+    assertEquals(
+        "java.util.List<java.lang.String>",
+        Util.trimAnnotations(
+            "java.util.@jakarta.validation.constraints.NotEmpty(\"message(); ,\") List<java.lang.@jakarta.validation.constraints.NotNull String>"));
+    assertEquals("int", Util.trimAnnotations("@jakarta.validation.constraints.Positive int"));
+    assertEquals(
+        "java.util.Map<String,String>",
+        Util.trimAnnotations(
+            "java.util.Map<@jakarta.validation.constraints.Positive String,String>"));
+  }
+
   @Test
   void validImportType_not() {
     assertFalse(Util.validImportType("void"));
@@ -159,5 +172,6 @@ void sanitizeImports() {
     assertEquals("my.Foo", Util.sanitizeImports("@annotationMcgee my.Foo"));
     assertEquals("my.Foo", Util.sanitizeImports("@org.bar.annotationMcgee my.Foo[]"));
     assertEquals("my.Foo", Util.sanitizeImports("@org.bar.annotationMcgee my.Foo"));
+    assertEquals("java.util.String", Util.sanitizeImports("java.util.String>"));
   }
 }

inject-generator/src/test/java/io/avaje/inject/generator/models/valid/aspect/MethodTest.java

@@ -0,0 +1,13 @@
+package io.avaje.inject.generator.models.valid.aspect;
+
+import java.util.Map;
+
+import io.avaje.inject.Component;
+import io.avaje.inject.generator.models.valid.Timed;
+
+@Component
+public class MethodTest {
+
+  @Timed
+  void test(@Param Map<@TypeUse String, String> str, @Param int inty, String regular) {}
+}

inject-generator/src/test/java/io/avaje/inject/generator/models/valid/aspect/Param.java

@@ -0,0 +1,3 @@
+package io.avaje.inject.generator.models.valid.aspect;
+
+public @interface Param {}

inject-generator/src/test/java/io/avaje/inject/generator/models/valid/aspect/TypeUse.java

@@ -0,0 +1,11 @@
+package io.avaje.inject.generator.models.valid.aspect;
+
+import static java.lang.annotation.ElementType.TYPE_USE;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+
+@Target(TYPE_USE)
+@Retention(RUNTIME)
+public @interface TypeUse {}