Skip to content

Commit 668ee50

Browse files
committed
[MJAVADOC-814] handle parameters such packages with multi lines
Signed-off-by: Olivier Lamy <[email protected]>
1 parent 76826c8 commit 668ee50

File tree

2 files changed

+19
-3
lines changed

2 files changed

+19
-3
lines changed

src/main/java/org/apache/maven/plugins/javadoc/JavadocUtil.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,7 @@
5757
import java.util.regex.Matcher;
5858
import java.util.regex.Pattern;
5959
import java.util.regex.PatternSyntaxException;
60+
import java.util.stream.Collectors;
6061

6162
import org.apache.http.HttpHeaders;
6263
import org.apache.http.HttpHost;
@@ -223,12 +224,12 @@ protected static List<String> getExcludedPackages(
223224
protected static String quotedArgument(String value) {
224225
String arg = value;
225226

227+
List<String> list = Arrays.stream(arg.split("\n")).map(String::trim).collect(Collectors.toList());
228+
arg = String.join("", list);
229+
226230
if (arg != null && !arg.isEmpty()) {
227231
arg = arg.replace("'", "\\'");
228232
arg = "'" + arg + "'";
229-
230-
// To prevent javadoc error
231-
arg = arg.replace("\n", " ");
232233
}
233234

234235
return arg;

src/test/java/org/apache/maven/plugins/javadoc/JavadocUtilTest.java

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -675,4 +675,19 @@ private void stopSilently(Server server) {
675675
// ignored
676676
}
677677
}
678+
679+
public void testQuotedArgument() throws Exception {
680+
681+
String value = " org.apache.uima.analysis_component:\n" +
682+
" org.apache.uima.analysis_engine\n";
683+
684+
String arg = JavadocUtil.quotedArgument(value);
685+
assertThat(arg).isEqualTo("'org.apache.uima.analysis_component:org.apache.uima.analysis_engine'");
686+
687+
value = "org.apache.uima.analysis_component:org.apache.uima.analysis_engine";
688+
689+
arg = JavadocUtil.quotedArgument(value);
690+
assertThat(arg).isEqualTo("'org.apache.uima.analysis_component:org.apache.uima.analysis_engine'");
691+
692+
}
678693
}

0 commit comments

Comments
 (0)