Fix Javadocs with a trailing end */.

fixes #2139

Author: traceyyoshima

rewrite-java-11/src/main/java/org/openrewrite/java/isolated/ReloadableJava11JavadocVisitor.java

@@ -347,9 +347,14 @@ public Tree visitDocComment(DocCommentTree node, List<Javadoc> body) {
                     if (!part.isEmpty()) {
                         body.add(new Javadoc.Text(randomId(), Markers.EMPTY, part));
                     }
-                    int pos = Collections.min(lineBreaks.keySet());
-                    body.add(lineBreaks.get(pos));
-                    lineBreaks.remove(pos);
+                    // Add trailing linebreaks if they exist.
+                    if (!lineBreaks.isEmpty()) {
+                        int pos = Collections.min(lineBreaks.keySet());
+                        if (lineBreaks.containsKey(pos)) {
+                            body.add(lineBreaks.get(pos));
+                            lineBreaks.remove(pos);
+                        }
+                    }
                 }
             } else {
                 // The Javadoc ends with trailing whitespace.

rewrite-java-17/src/main/java/org/openrewrite/java/isolated/ReloadableJava17JavadocVisitor.java

@@ -347,9 +347,14 @@ public Tree visitDocComment(DocCommentTree node, List<Javadoc> body) {
                     if (!part.isEmpty()) {
                         body.add(new Javadoc.Text(randomId(), Markers.EMPTY, part));
                     }
-                    int pos = Collections.min(lineBreaks.keySet());
-                    body.add(lineBreaks.get(pos));
-                    lineBreaks.remove(pos);
+                    // Add trailing linebreaks if they exist.
+                    if (!lineBreaks.isEmpty()) {
+                        int pos = Collections.min(lineBreaks.keySet());
+                        if (lineBreaks.containsKey(pos)) {
+                            body.add(lineBreaks.get(pos));
+                            lineBreaks.remove(pos);
+                        }
+                    }
                 }
             } else {
                 // The Javadoc ends with trailing whitespace.

rewrite-java-8/src/main/java/org/openrewrite/java/ReloadableJava8JavadocVisitor.java

@@ -360,9 +360,14 @@ public Tree visitDocComment(DocCommentTree node, List<Javadoc> body) {
                     if (!part.isEmpty()) {
                         body.add(new Javadoc.Text(randomId(), Markers.EMPTY, part));
                     }
-                    int pos = Collections.min(lineBreaks.keySet());
-                    body.add(lineBreaks.get(pos));
-                    lineBreaks.remove(pos);
+                    // Add trailing linebreaks if they exist.
+                    if (!lineBreaks.isEmpty()) {
+                        int pos = Collections.min(lineBreaks.keySet());
+                        if (lineBreaks.containsKey(pos)) {
+                            body.add(lineBreaks.get(pos));
+                            lineBreaks.remove(pos);
+                        }
+                    }
                 }
             } else {
                 // The Javadoc ends with trailing whitespace.

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

@@ -56,30 +56,6 @@ interface JavadocTest : JavaTreeTest {
         """.trimIndent()
     )
 
-    @Test
-    @Issue("https://github.com/openrewrite/rewrite/issues/2139")
-    @Disabled
-    fun javadocEndingOnSameLine(jp: JavaParser) = assertParsePrintAndProcess(
-        jp,
-        CompilationUnit,
-        """
-            package an.example.error;
-                        
-            import java.util.ArrayList;
-            import java.util.List;
-            
-            public class Test {
-            
-                /**
-                 * A doc
-                 *
-                 * **/
-                public void aMethod() throws Exception, RuntimeException{
-                }
-            }
-        """
-    )
-
     @Test
     fun singleLineJavadocText(jp: JavaParser) = assertParsePrintAndProcess(
         jp,
@@ -1141,6 +1117,22 @@ interface JavadocTest : JavaTreeTest {
         """.trimIndent()
     )
 
+    @Issue("https://github.com/openrewrite/rewrite/issues/2139")
+    @Test
+    fun javaDocEndsOnSameLine(jp: JavaParser) = assertParsePrintAndProcess(
+        jp,
+        CompilationUnit,
+        """
+            class Test {
+                /**
+                 * Javadoc
+                 *
+                 * **/
+                void method() {}
+            }
+        """.trimIndent()
+    )
+
     @Issue("https://github.com/openrewrite/rewrite/issues/1409")
     @Test
     fun trailingWhitespaceWithWhitespaceOnEmptyLine(jp: JavaParser) = assertParsePrintAndProcess(