From a791f68b7fdc2bc07e1354069d022f5523e6dc6b Mon Sep 17 00:00:00 2001
From: Josiah Noel <32279667+SentryMan@users.noreply.github.com>
Date: Fri, 14 Mar 2025 14:35:56 -0400
Subject: [PATCH 1/2] Fix cut annotations JDT issue

Not sure why, but it seems cut annotations can't handle single annotations with eclipse
---
 .../test/java/io/avaje/prisms/test/ProcessorUtilsTest.java   | 4 ++++
 .../src/main/java/io/avaje/prism/internal/UtilWriter.java    | 5 +----
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/blackbox-test-prism/src/test/java/io/avaje/prisms/test/ProcessorUtilsTest.java b/blackbox-test-prism/src/test/java/io/avaje/prisms/test/ProcessorUtilsTest.java
index a746c04..4229114 100644
--- a/blackbox-test-prism/src/test/java/io/avaje/prisms/test/ProcessorUtilsTest.java
+++ b/blackbox-test-prism/src/test/java/io/avaje/prisms/test/ProcessorUtilsTest.java
@@ -8,6 +8,10 @@ class ProcessorUtilsTest {
 
   @Test
   void trimmedAnnotation() {
+    assertEquals(
+        "java.lang.String",
+        ProcessorUtils.trimAnnotations(
+            "@io.avaje.validation.constraints.Length(min = 5) java.lang.String"));
 
     assertEquals(
         "java.ProcessorUtils.Map<java.lang.String,java.lang.String>",
diff --git a/prism-core/src/main/java/io/avaje/prism/internal/UtilWriter.java b/prism-core/src/main/java/io/avaje/prism/internal/UtilWriter.java
index 278bb93..9dd2fc7 100644
--- a/prism-core/src/main/java/io/avaje/prism/internal/UtilWriter.java
+++ b/prism-core/src/main/java/io/avaje/prism/internal/UtilWriter.java
@@ -26,8 +26,6 @@ public static void write(PrintWriter out, String packageName) {
             + "\n"
             + "  private static final Pattern WHITE_SPACE_REGEX =\n"
             + "      Pattern.compile(\"\\\\s+(?=([^\\\"]*\\\"[^\\\"]*\\\")*[^\\\"]*$)\");\n"
-            + "  private static final Pattern COMMA_PATTERN =\n"
-            + "      Pattern.compile(\", (?=(?:[^\\\\\\\"]*\\\\\\\"[^\\\\\\\"]*\\\\\\\")*[^\\\\\\\"]*$)\");\n"
             + "  private static final Pattern PARENTHESIS_CONTENT = Pattern.compile(\"\\\\((.*?)\\\\)\");\n"
             + "\n"
             + "  private ProcessorUtils() {}\n"
@@ -112,8 +110,7 @@ public static void write(PrintWriter out, String packageName) {
             + "   * @return input free of annotations\n"
             + "   */\n"
             + "  public static String trimAnnotations(String input) {\n"
-            + "    input = COMMA_PATTERN.matcher(input).replaceAll(\",\");\n"
-            + "    return cutAnnotations(input);\n"
+            + "    return cutAnnotations(PARENTHESIS_CONTENT.matcher(input).replaceAll(\"\"));\n"
             + "  }\n"
             + "\n"
             + "  private static String cutAnnotations(String input) {\n"

From 81e118ecbb62a6e72da2872d782e73557e25c577 Mon Sep 17 00:00:00 2001
From: Josiah Noel <32279667+SentryMan@users.noreply.github.com>
Date: Fri, 14 Mar 2025 14:43:37 -0400
Subject: [PATCH 2/2] add back comma regex

---
 .../src/main/java/io/avaje/prism/internal/UtilWriter.java      | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/prism-core/src/main/java/io/avaje/prism/internal/UtilWriter.java b/prism-core/src/main/java/io/avaje/prism/internal/UtilWriter.java
index 9dd2fc7..89898ca 100644
--- a/prism-core/src/main/java/io/avaje/prism/internal/UtilWriter.java
+++ b/prism-core/src/main/java/io/avaje/prism/internal/UtilWriter.java
@@ -26,6 +26,8 @@ public static void write(PrintWriter out, String packageName) {
             + "\n"
             + "  private static final Pattern WHITE_SPACE_REGEX =\n"
             + "      Pattern.compile(\"\\\\s+(?=([^\\\"]*\\\"[^\\\"]*\\\")*[^\\\"]*$)\");\n"
+            + "  private static final Pattern COMMA_PATTERN =\n"
+            + "      Pattern.compile(\", (?=(?:[^\\\\\\\"]*\\\\\\\"[^\\\\\\\"]*\\\\\\\")*[^\\\\\\\"]*$)\");\n"
             + "  private static final Pattern PARENTHESIS_CONTENT = Pattern.compile(\"\\\\((.*?)\\\\)\");\n"
             + "\n"
             + "  private ProcessorUtils() {}\n"
@@ -110,6 +112,7 @@ public static void write(PrintWriter out, String packageName) {
             + "   * @return input free of annotations\n"
             + "   */\n"
             + "  public static String trimAnnotations(String input) {\n"
+            + "    input = COMMA_PATTERN.matcher(input).replaceAll(\",\");\n"
             + "    return cutAnnotations(PARENTHESIS_CONTENT.matcher(input).replaceAll(\"\"));\n"
             + "  }\n"
             + "\n"