Skip to content

Commit 0341b4d

Browse files
elharoelharo
committed
more fixes
1 parent 7cb2271 commit 0341b4d

File tree

4 files changed

+34
-38
lines changed

4 files changed

+34
-38
lines changed

‎src/main/java/org/apache/maven/plugins/javadoc/AbstractFixJavadocMojo.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ public abstract class AbstractFixJavadocMojo extends AbstractMojo {
9797
/**
9898
* The vm line separator
9999
*/
100-
private static final String EOL = System.getProperty("line.separator");
100+
private static final String EOL = System.lineSeparator();
101101

102102
/**
103103
* Tag name for @author *

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -885,9 +885,9 @@ protected static String readFile(final File javaFile, final String encoding) {
885885
* splitPath( "C:/home;C:/tmp" ) = ["C:/home", "C:/tmp"]
886886
* </pre>
887887
*
888-
* @param path which can contain multiple paths separated with a colon (<code>:</code>) or a semi-colon
888+
* @param path which can contain multiple paths separated with a colon (<code>:</code>) or a semicolon
889889
* (<code>;</code>), platform independent. Could be null.
890-
* @return the path split by colon or semi-colon or <code>null</code> if path was <code>null</code>.
890+
* @return the path split by colon or semicolon or <code>null</code> if path was <code>null</code>.
891891
* @since 2.6.1
892892
*/
893893
protected static String[] splitPath(final String path) {
@@ -912,7 +912,7 @@ protected static String[] splitPath(final String path) {
912912
* unifyPathSeparator( "/home:/tmp" ) = "/home;/tmp" (Windows box)
913913
* </pre>
914914
*
915-
* @param path which can contain multiple paths by separating them with a colon (<code>:</code>) or a semi-colon
915+
* @param path which can contain multiple paths by separating them with a colon (<code>:</code>) or a semicolon
916916
* (<code>;</code>), platform independent. Could be null.
917917
* @return the same path but separated with the current System path separator or <code>null</code> if path was
918918
* <code>null</code>.

‎src/test/java/org/apache/maven/plugins/javadoc/FixJavadocMojoTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050
*/
5151
public class FixJavadocMojoTest extends AbstractMojoTestCase {
5252
/** The vm line separator */
53-
private static final String EOL = System.getProperty("line.separator");
53+
private static final String EOL = System.lineSeparator();
5454

5555
/** flag to copy repo only one time */
5656
private static boolean testRepoCreated = false;

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

Lines changed: 29 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
*/
1919
package org.apache.maven.plugins.javadoc;
2020

21-
import javax.servlet.ServletException;
2221
import javax.servlet.http.HttpServletRequest;
2322
import javax.servlet.http.HttpServletResponse;
2423

@@ -113,17 +112,17 @@ public void testParseJavadocVersion() {
113112
assertEquals("1.5.0", JavadocUtil.extractJavadocVersion(version));
114113

115114
// Other tests
116-
version = "java full version \"1.5.0_07-164\"" + System.getProperty("line.separator");
115+
version = "java full version \"1.5.0_07-164\"" + System.lineSeparator();
117116
assertEquals("1.5.0", JavadocUtil.extractJavadocVersion(version));
118117

119-
version = System.getProperty("line.separator") + "java full version \"1.5.0_07-164\"";
118+
version = System.lineSeparator() + "java full version \"1.5.0_07-164\"";
120119
assertEquals("1.5.0", JavadocUtil.extractJavadocVersion(version));
121120

122-
version = System.getProperty("line.separator") + "java full version \"1.5.0_07-164\""
123-
+ System.getProperty("line.separator");
121+
version = System.lineSeparator() + "java full version \"1.5.0_07-164\""
122+
+ System.lineSeparator();
124123
assertEquals("1.5.0", JavadocUtil.extractJavadocVersion(version));
125124

126-
version = "java full" + System.getProperty("line.separator") + " version \"1.5.0_07-164\"";
125+
version = "java full" + System.lineSeparator() + " version \"1.5.0_07-164\"";
127126
assertEquals("1.5.0", JavadocUtil.extractJavadocVersion(version));
128127

129128
version = "java full version \"1.99.123-b01\"";
@@ -186,37 +185,37 @@ public void testParseJavadocMemoryEmpty() {
186185
*/
187186
public void testParseJavadocMemory() {
188187
String memory = "128";
189-
assertEquals(JavadocUtil.parseJavadocMemory(memory), "128m");
188+
assertEquals("128m", JavadocUtil.parseJavadocMemory(memory));
190189

191190
memory = "128k";
192-
assertEquals(JavadocUtil.parseJavadocMemory(memory), "128k");
191+
assertEquals("128k", JavadocUtil.parseJavadocMemory(memory));
193192
memory = "128kb";
194-
assertEquals(JavadocUtil.parseJavadocMemory(memory), "128k");
193+
assertEquals("128k", JavadocUtil.parseJavadocMemory(memory));
195194

196195
memory = "128m";
197-
assertEquals(JavadocUtil.parseJavadocMemory(memory), "128m");
196+
assertEquals("128m", JavadocUtil.parseJavadocMemory(memory));
198197
memory = "128mb";
199-
assertEquals(JavadocUtil.parseJavadocMemory(memory), "128m");
198+
assertEquals("128m", JavadocUtil.parseJavadocMemory(memory));
200199

201200
memory = "1g";
202-
assertEquals(JavadocUtil.parseJavadocMemory(memory), "1024m");
201+
assertEquals("1024m", JavadocUtil.parseJavadocMemory(memory));
203202
memory = "1gb";
204-
assertEquals(JavadocUtil.parseJavadocMemory(memory), "1024m");
203+
assertEquals("1024m", JavadocUtil.parseJavadocMemory(memory));
205204

206205
memory = "1t";
207-
assertEquals(JavadocUtil.parseJavadocMemory(memory), "1048576m");
206+
assertEquals("1048576m", JavadocUtil.parseJavadocMemory(memory));
208207
memory = "1tb";
209-
assertEquals(JavadocUtil.parseJavadocMemory(memory), "1048576m");
208+
assertEquals("1048576m", JavadocUtil.parseJavadocMemory(memory));
210209

211-
memory = System.getProperty("line.separator") + "128m";
212-
assertEquals(JavadocUtil.parseJavadocMemory(memory), "128m");
213-
memory = System.getProperty("line.separator") + "128m" + System.getProperty("line.separator");
214-
assertEquals(JavadocUtil.parseJavadocMemory(memory), "128m");
210+
memory = System.lineSeparator() + "128m";
211+
assertEquals("128m", JavadocUtil.parseJavadocMemory(memory));
212+
memory = System.lineSeparator() + "128m" + System.lineSeparator();
213+
assertEquals("128m", JavadocUtil.parseJavadocMemory(memory));
215214

216215
memory = " 128m";
217-
assertEquals(JavadocUtil.parseJavadocMemory(memory), "128m");
216+
assertEquals("128m", JavadocUtil.parseJavadocMemory(memory));
218217
memory = " 128m ";
219-
assertEquals(JavadocUtil.parseJavadocMemory(memory), "128m");
218+
assertEquals("128m", JavadocUtil.parseJavadocMemory(memory));
220219

221220
memory = "1m28m";
222221
try {
@@ -236,14 +235,13 @@ public void testParseJavadocMemory() {
236235

237236
/**
238237
* Method to test the validate encoding parsing.
239-
*
240238
*/
241239
public void testValidateEncoding() {
242240
assertFalse("Not catch null", JavadocUtil.validateEncoding(null));
243-
assertTrue("UTF-8 not supported on this plateform", JavadocUtil.validateEncoding("UTF-8"));
244-
assertTrue("ISO-8859-1 not supported on this plateform", JavadocUtil.validateEncoding("ISO-8859-1"));
245-
assertFalse("latin is supported on this plateform???", JavadocUtil.validateEncoding("latin"));
246-
assertFalse("WRONG is supported on this plateform???", JavadocUtil.validateEncoding("WRONG"));
241+
assertTrue("UTF-8 not supported on this platform", JavadocUtil.validateEncoding("UTF-8"));
242+
assertTrue("ISO-8859-1 not supported on this platform", JavadocUtil.validateEncoding("ISO-8859-1"));
243+
assertFalse("latin is supported on this platform???", JavadocUtil.validateEncoding("latin"));
244+
assertFalse("WRONG is supported on this platform???", JavadocUtil.validateEncoding("WRONG"));
247245
}
248246

249247
/**
@@ -412,7 +410,7 @@ public void testGetRedirectUrl() throws Exception {
412410
@Override
413411
public void handle(
414412
String target, Request baseRequest, HttpServletRequest request, HttpServletResponse response)
415-
throws IOException, ServletException {
413+
throws IOException {
416414
response.setStatus(HttpServletResponse.SC_OK);
417415
ByteArrayISO8859Writer writer = new ByteArrayISO8859Writer(100);
418416
writer.write("<html>Hello world</html>");
@@ -456,7 +454,7 @@ public void testGetRedirectUrlWithNoRedirects() throws Exception {
456454
@Override
457455
public void handle(
458456
String target, Request baseRequest, HttpServletRequest request, HttpServletResponse response)
459-
throws IOException, ServletException {
457+
throws IOException {
460458
response.setStatus(HttpServletResponse.SC_OK);
461459
ByteArrayISO8859Writer writer = new ByteArrayISO8859Writer(100);
462460
writer.write("<html>Hello world</html>");
@@ -492,7 +490,7 @@ public void testGetRedirectUrlVerifyHeaders() throws Exception {
492490
@Override
493491
public void handle(
494492
String target, Request baseRequest, HttpServletRequest request, HttpServletResponse response)
495-
throws IOException, ServletException {
493+
throws IOException {
496494

497495
if (request.getHeader("Accept") == null) {
498496
response.setStatus(HttpServletResponse.SC_FORBIDDEN);
@@ -567,7 +565,6 @@ public void testCopyJavadocResources() throws Exception {
567565

568566
/**
569567
* Method to test pruneDirs()
570-
*
571568
*/
572569
public void testPruneDirs() {
573570
List<String> list = new ArrayList<>();
@@ -612,7 +609,6 @@ public void testPrunePaths() {
612609

613610
/**
614611
* Method to test unifyPathSeparator()
615-
*
616612
*/
617613
public void testUnifyPathSeparator() {
618614
assertNull(JavadocUtil.unifyPathSeparator(null));
@@ -668,7 +664,7 @@ private void stopSilently(Server server) {
668664
}
669665
}
670666

671-
public void testQuotedArgument() throws Exception {
667+
public void testQuotedArgument() {
672668

673669
String value = " org.apache.uima.analysis_component:\n org.apache.uima.analysis_engine\n";
674670

@@ -681,7 +677,7 @@ public void testQuotedArgument() throws Exception {
681677
assertEquals("'org.apache.uima.analysis_component:org.apache.uima.analysis_engine'", arg);
682678
}
683679

684-
public void testToList() throws Exception {
680+
public void testToList() {
685681
String value = " *.internal:org.acme.exclude1.*:\n org.acme.exclude2\n ";
686682
List<String> values = JavadocUtil.toList(value);
687683
assertThat(values).containsExactly("*.internal", "org.acme.exclude1.*", "org.acme.exclude2");

0 commit comments

Comments
 (0)