Fix Java 25 javadoc parsing issue (#6370)

* Fix Java 25 javadoc parsing issue

* Add testcase

* Reduce test

* Polish test

* Apply suggestions from code review

---------

Co-authored-by: Tim te Beek <tim@moderne.io>

Author: Laurens Westerlaken

rewrite-java-25/src/main/java/org/openrewrite/java/isolated/ReloadableJava25JavadocVisitor.java

@@ -44,6 +44,7 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.function.Predicate;
 
 import static java.util.Collections.*;
 import static java.util.stream.Collectors.toList;
@@ -981,7 +982,7 @@ public List<Javadoc> visitText(String node) {
             // The AST contained unnecessary whitespace for Javadoc, and they got rid of this with Java 25.
             // So now have to manually account for this.
             if (i+1 <= node.length() -1 && node.charAt(i+1) != source.charAt(cursor) && Character.isWhitespace(source.charAt(cursor))) {
-                text.append(whitespaceBeforeAsString());
+                text.append(whitespaceBeforeAsString(Character::isSpaceChar));
             }
         }
 
@@ -1085,13 +1086,17 @@ private List<Javadoc> sourceBefore(String delim) {
     }
 
     private String whitespaceBeforeAsString() {
+        return whitespaceBeforeAsString(Character::isWhitespace);
+    }
+
+    private String whitespaceBeforeAsString(Predicate<Character> whitespace) {
         if (cursor >= source.length()) {
             return "";
         }
 
         int i = cursor;
         for (; i < source.length(); i++) {
-            if (!Character.isWhitespace(source.charAt(i))) {
+            if (!whitespace.test(source.charAt(i))) {
                 break;
             }
         }

rewrite-java-tck/src/main/java/org/openrewrite/java/tree/JavadocTest.java

@@ -2200,6 +2200,22 @@ public void methodC(String aString) {
         );
     }
 
+    @Test
+    void redundantSpacing() {
+        rewriteRun(
+          java(
+            """
+            /**
+            * <p>Some text.
+            *\s
+            * <p>More text.
+            */
+            class SomeClass {}
+            """
+          )
+        );
+    }
+
     @Issue("https://github.com/openrewrite/rewrite/issues/5855")
     @Nested
     class GenericWildcard {