Skip to content

Commit 39857ea

Browse files
authored
Remove usages of deprecated ReaderFactory class (#339)
1 parent 314203a commit 39857ea

File tree

2 files changed

+12
-29
lines changed

2 files changed

+12
-29
lines changed

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

+7-25
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,9 @@
2929
import java.net.URISyntaxException;
3030
import java.net.URL;
3131
import java.net.URLClassLoader;
32+
import java.nio.charset.Charset;
33+
import java.nio.charset.StandardCharsets;
34+
import java.nio.file.Files;
3235
import java.nio.file.Paths;
3336
import java.util.ArrayList;
3437
import java.util.Arrays;
@@ -82,7 +85,6 @@
8285
import org.codehaus.plexus.components.interactivity.InputHandler;
8386
import org.codehaus.plexus.languages.java.version.JavaVersion;
8487
import org.codehaus.plexus.util.FileUtils;
85-
import org.codehaus.plexus.util.ReaderFactory;
8688
import org.codehaus.plexus.util.StringUtils;
8789

8890
/**
@@ -532,10 +534,10 @@ private void init() {
532534
// encoding
533535
if (encoding == null || encoding.isEmpty()) {
534536
if (getLog().isWarnEnabled()) {
535-
getLog().warn("File encoding has not been set, using platform encoding " + ReaderFactory.FILE_ENCODING
537+
getLog().warn("File encoding has not been set, using platform encoding " + Charset.defaultCharset()
536538
+ ", i.e. build is platform dependent!");
537539
}
538-
encoding = ReaderFactory.FILE_ENCODING;
540+
encoding = Charset.defaultCharset().name();
539541
}
540542

541543
// level
@@ -689,13 +691,13 @@ private void parseClirrTextOutputFile(File clirrTextOutputFile) throws IOExcepti
689691
clirrNewClasses = new LinkedList<>();
690692
clirrNewMethods = new LinkedHashMap<>();
691693

692-
try (BufferedReader reader = new BufferedReader(ReaderFactory.newReader(clirrTextOutputFile, "UTF-8"))) {
694+
try (BufferedReader reader = Files.newBufferedReader(clirrTextOutputFile.toPath(), StandardCharsets.UTF_8)) {
693695

694696
for (String line = reader.readLine(); line != null; line = reader.readLine()) {
695697
String[] split = StringUtils.split(line, ":");
696698
if (split.length != 4) {
697699
if (getLog().isDebugEnabled()) {
698-
getLog().debug("Unable to parse the clirr line: " + line);
700+
getLog().debug("Unable to parse the Clirr line: " + line);
699701
}
700702
continue;
701703
}
@@ -2098,26 +2100,6 @@ private void appendDefaultSinceTag(final StringBuilder sb, final String indent)
20982100
sb.append(EOL);
20992101
}
21002102

2101-
/**
2102-
* @param sb not null
2103-
* @param indent not null
2104-
* @param separatorAdded
2105-
* @return true if separator has been added.
2106-
*/
2107-
private boolean appendDefaultVersionTag(final StringBuilder sb, final String indent, boolean separatorAdded) {
2108-
if (!fixTag(VERSION_TAG) || StringUtils.isEmpty(defaultVersion)) {
2109-
return separatorAdded;
2110-
}
2111-
2112-
if (!separatorAdded) {
2113-
appendSeparator(sb, indent);
2114-
separatorAdded = true;
2115-
}
2116-
2117-
appendDefaultVersionTag(sb, indent);
2118-
return separatorAdded;
2119-
}
2120-
21212103
/**
21222104
* @param sb not null
21232105
* @param indent not null

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

+5-4
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,6 @@
122122
import org.codehaus.plexus.util.DirectoryScanner;
123123
import org.codehaus.plexus.util.FileUtils;
124124
import org.codehaus.plexus.util.IOUtil;
125-
import org.codehaus.plexus.util.ReaderFactory;
126125
import org.codehaus.plexus.util.WriterFactory;
127126
import org.codehaus.plexus.util.cli.CommandLineException;
128127
import org.codehaus.plexus.util.cli.CommandLineUtils;
@@ -1836,14 +1835,16 @@ private String getCharset() {
18361835
* @return the docencoding attribute or <code>UTF-8</code> if <code>null</code>.
18371836
*/
18381837
private String getDocencoding() {
1839-
return (docencoding == null || docencoding.isEmpty()) ? ReaderFactory.UTF_8 : docencoding;
1838+
return (docencoding == null || docencoding.isEmpty()) ? StandardCharsets.UTF_8.name() : docencoding;
18401839
}
18411840

18421841
/**
18431842
* @return the encoding attribute or the value of <code>file.encoding</code> system property if <code>null</code>.
18441843
*/
18451844
private String getEncoding() {
1846-
return (encoding == null || encoding.isEmpty()) ? ReaderFactory.FILE_ENCODING : encoding;
1845+
return (encoding == null || encoding.isEmpty())
1846+
? Charset.defaultCharset().name()
1847+
: encoding;
18471848
}
18481849

18491850
@Override
@@ -4596,7 +4597,7 @@ private void addJavadocOptions(
45964597

45974598
if (encoding == null || encoding.isEmpty()) {
45984599
getLog().warn("Source files encoding has not been set, using platform encoding "
4599-
+ ReaderFactory.FILE_ENCODING + ", i.e. build is platform dependent!");
4600+
+ Charset.defaultCharset().name() + ", i.e. build is platform dependent!");
46004601
}
46014602
addArgIfNotEmpty(arguments, "-encoding", JavadocUtil.quotedArgument(getEncoding()));
46024603

0 commit comments

Comments
 (0)