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

Merge branch 'replace-commons-io' into pmd7-replace-commons-io

Browse Source
This commit is contained in:
Andreas Dangel
2022-05-13 16:00:19 +02:00
parent 8e90891b28 1c9096809d
commit 309d1dea28
59 changed files with 768 additions and 190 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pmd-lang-test/pom.xml
View File

@@ -112,10 +112,6 @@
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
</dependency>
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
</dependency>
<!--
the following dependencies are all scope compile,

6
pmd-lang-test/src/main/kotlin/net/sourceforge/pmd/lang/ast/test/BaseParsingHelper.kt
View File

@@ -11,8 +11,8 @@ import net.sourceforge.pmd.lang.LanguageVersionHandler
import net.sourceforge.pmd.lang.ast.*
import net.sourceforge.pmd.processor.AbstractPMDProcessor
import net.sourceforge.pmd.reporting.GlobalAnalysisListener
import net.sourceforge.pmd.util.IOUtil
import net.sourceforge.pmd.util.datasource.DataSource
import org.apache.commons.io.IOUtils
import java.io.InputStream
import java.nio.charset.StandardCharsets
import java.nio.file.Files
@@ -150,7 +150,7 @@ abstract class BaseParsingHelper<Self : BaseParsingHelper<Self, T>, T : RootNode
*/
@JvmOverloads
open fun parseFile(path: Path, version: String? = null): T =
parse(IOUtils.toString(Files.newBufferedReader(path)), version, fileName = path.toAbsolutePath().toString())
parse(IOUtil.readToString(Files.newBufferedReader(path)), version, fileName = path.toAbsolutePath().toString())
/**
* Fetches the source of the given [clazz].
@@ -168,7 +168,7 @@ abstract class BaseParsingHelper<Self : BaseParsingHelper<Self, T>, T : RootNode
}
private fun consume(input: InputStream) =
IOUtils.toString(input, StandardCharsets.UTF_8)
IOUtil.readToString(input, StandardCharsets.UTF_8)
.replace(Regex("\\R"), "\n") // normalize line-endings
/**