phoedos/pmd
1
1
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Replace IOUtils with IOUtil

Browse Source 
plsql, xml, apex, html, javascript, scala
This commit is contained in:
Andreas Dangel
2022-05-13 10:46:11 +02:00
parent abfc463ef9
commit a4ebb66769
6 changed files with 11 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ApexParser.java
View File

@ -8,12 +8,11 @@ import java.io.IOException;
import java.io.Reader;
import java.util.Map;
import org.apache.commons.io.IOUtils;
import net.sourceforge.pmd.annotation.InternalApi;
import net.sourceforge.pmd.lang.apex.ApexJorjeLogging;
import net.sourceforge.pmd.lang.apex.ApexParserOptions;
import net.sourceforge.pmd.lang.ast.ParseException;
import net.sourceforge.pmd.util.IOUtil;
import apex.jorje.data.Locations;
import apex.jorje.semantic.ast.compilation.Compilation;
@ -50,7 +49,7 @@ public class ApexParser {
public ApexNode<Compilation> parse(final Reader reader) {
try {
final String sourceCode = IOUtils.toString(reader);
final String sourceCode = IOUtil.readToString(reader);
final Compilation astRoot = parseApex(sourceCode);
final ApexTreeBuilder treeBuilder = new ApexTreeBuilder(sourceCode, parserOptions);
suppressMap = treeBuilder.getSuppressMap();

4
pmd-html/src/main/java/net/sourceforge/pmd/lang/html/ast/HtmlParser.java
View File

@ -10,7 +10,6 @@ import java.io.Reader;
import java.util.HashMap;
import java.util.Map;
import org.apache.commons.io.IOUtils;
import org.jsoup.nodes.Document;
import org.jsoup.parser.Parser;
@ -18,6 +17,7 @@ import net.sourceforge.pmd.lang.ParserOptions;
import net.sourceforge.pmd.lang.TokenManager;
import net.sourceforge.pmd.lang.ast.Node;
import net.sourceforge.pmd.lang.ast.ParseException;
import net.sourceforge.pmd.util.IOUtil;
public final class HtmlParser implements net.sourceforge.pmd.lang.Parser {
@ -29,7 +29,7 @@ public final class HtmlParser implements net.sourceforge.pmd.lang.Parser {
@Override
public Node parse(String fileName, Reader source) throws ParseException {
try {
String data = IOUtils.toString(source);
String data = IOUtil.readToString(source);
Document doc = Parser.xmlParser().parseInput(data, "");
HtmlTreeBuilder builder = new HtmlTreeBuilder();
return builder.build(doc, data);

4
pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/EcmascriptParser.java
View File

@ -11,7 +11,6 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
import org.apache.commons.io.IOUtils;
import org.mozilla.javascript.CompilerEnvirons;
import org.mozilla.javascript.Parser;
import org.mozilla.javascript.ast.AstRoot;
@ -22,6 +21,7 @@ import org.mozilla.javascript.ast.ParseProblem;
import net.sourceforge.pmd.annotation.InternalApi;
import net.sourceforge.pmd.lang.ast.ParseException;
import net.sourceforge.pmd.lang.ecmascript.EcmascriptParserOptions;
import net.sourceforge.pmd.util.IOUtil;
public class EcmascriptParser {
@Deprecated
@ -64,7 +64,7 @@ public class EcmascriptParser {
public EcmascriptNode<AstRoot> parse(final Reader reader) {
try {
final List<ParseProblem> parseProblems = new ArrayList<>();
final String sourceCode = IOUtils.toString(reader);
final String sourceCode = IOUtil.readToString(reader);
final AstRoot astRoot = parseEcmascript(sourceCode, parseProblems);
final EcmascriptTreeBuilder treeBuilder = new EcmascriptTreeBuilder(sourceCode, parseProblems);
EcmascriptNode<AstRoot> tree = treeBuilder.build(astRoot);

4
pmd-plsql/src/main/java/net/sourceforge/pmd/lang/plsql/PLSQLParser.java
View File

@ -10,8 +10,6 @@ import java.io.StringReader;
import java.util.HashMap;
import java.util.Map;
import org.apache.commons.io.IOUtils;
import net.sourceforge.pmd.annotation.InternalApi;
import net.sourceforge.pmd.lang.AbstractParser;
import net.sourceforge.pmd.lang.LanguageVersionHandler;
@ -56,7 +54,7 @@ public class PLSQLParser extends AbstractParser {
@Override
public Node parse(String fileName, Reader source) throws ParseException {
try {
String sourcecode = IOUtils.toString(source);
String sourcecode = IOUtil.readToString(source);
AbstractTokenManager.setFileName(fileName);
return createPLSQLParser(new StringReader(sourcecode)).Input(sourcecode);
} catch (IOException e) {

5
pmd-scala-modules/pmd-scala-common/src/main/java/net/sourceforge/pmd/lang/scala/ScalaParser.java
View File

@ -9,13 +9,12 @@ import java.io.Reader;
import java.util.HashMap;
import java.util.Map;
import org.apache.commons.io.IOUtils;
import net.sourceforge.pmd.lang.AbstractParser;
import net.sourceforge.pmd.lang.ParserOptions;
import net.sourceforge.pmd.lang.TokenManager;
import net.sourceforge.pmd.lang.ast.ParseException;
import net.sourceforge.pmd.lang.scala.ast.ASTSource;
import net.sourceforge.pmd.util.IOUtil;
import scala.meta.Dialect;
import scala.meta.Source;
@ -52,7 +51,7 @@ public class ScalaParser extends AbstractParser {
public ASTSource parse(String fileName, Reader source) throws ParseException {
Input.VirtualFile virtualFile;
try {
String sourceString = IOUtils.toString(source);
String sourceString = IOUtil.readToString(source);
virtualFile = new Input.VirtualFile(fileName, sourceString);
} catch (IOException e) {
throw new ParseException(e);

4
pmd-xml/src/main/java/net/sourceforge/pmd/lang/xml/ast/XmlParser.java
View File

@ -13,7 +13,6 @@ import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory;
import javax.xml.parsers.ParserConfigurationException;
import org.apache.commons.io.IOUtils;
import org.w3c.dom.Document;
import org.w3c.dom.Node;
import org.xml.sax.InputSource;
@ -22,6 +21,7 @@ import org.xml.sax.SAXException;
import net.sourceforge.pmd.lang.ast.ParseException;
import net.sourceforge.pmd.lang.ast.RootNode;
import net.sourceforge.pmd.lang.xml.XmlParserOptions;
import net.sourceforge.pmd.util.IOUtil;
public class XmlParser {
@ -37,7 +37,7 @@ public class XmlParser {
protected Document parseDocument(Reader reader) throws ParseException {
nodeCache.clear();
try {
String xmlData = IOUtils.toString(reader);
String xmlData = IOUtil.readToString(reader);
DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
dbf.setNamespaceAware(parserOptions.isNamespaceAware());