Remove deprecated API calls in commons-io and commons-lang.

jenkinsci · Jan 18, 2024 · 5f6136f · 5f6136f
1 parent 6ca4852
commit 5f6136f
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 11 deletions.
diff --git a/src/main/java/edu/hm/hafner/analysis/AbstractPackageDetector.java b/src/main/java/edu/hm/hafner/analysis/AbstractPackageDetector.java
@@ -58,7 +58,7 @@ public String detectPackageName(final String fileName, final Charset charset) {
 
     @VisibleForTesting
     String detectPackageName(final InputStream stream, final Charset charset) throws IOException {
-        try (BufferedReader buffer = new BufferedReader(new InputStreamReader(new BOMInputStream(stream), charset))) {
+        try (BufferedReader buffer = new BufferedReader(new InputStreamReader(BOMInputStream.builder().setInputStream(stream).get(), charset))) {
             return detectPackageName(buffer.lines());
         }
     }

diff --git a/src/main/java/edu/hm/hafner/analysis/FileReaderFactory.java b/src/main/java/edu/hm/hafner/analysis/FileReaderFactory.java
@@ -65,9 +65,9 @@ public Reader create() {
             if (isCharsetUndetected) {
                 charset = detectCharset(Files.newInputStream(file));
             }
-            InputStream inputStream = Files.newInputStream(file);
-
-            return new InputStreamReader(new BOMInputStream(inputStream), getCharset());
+            var inputStream = Files.newInputStream(file);
+            var bomInputStream = BOMInputStream.builder().setInputStream(inputStream).get();
+            return new InputStreamReader(bomInputStream, getCharset());
         }
         catch (FileNotFoundException | InvalidPathException exception) {
             throw new ParsingException(exception, "Can't find file '%s'", fileName);

diff --git a/src/main/java/edu/hm/hafner/analysis/FingerprintGenerator.java b/src/main/java/edu/hm/hafner/analysis/FingerprintGenerator.java
@@ -37,7 +37,6 @@ public void run(final FullTextFingerprint algorithm, final Report report, final
                 sum += computeFingerprint(issue, algorithm, charset, log);
             }
         }
-        log.logSummary();
         report.mergeLogMessages(log);
         report.logInfo("-> created fingerprints for %d issues (skipped %d issues)", sum, report.size() - sum);
     }

diff --git a/src/main/java/edu/hm/hafner/analysis/RevApiInfoExtension.java b/src/main/java/edu/hm/hafner/analysis/RevApiInfoExtension.java
@@ -4,8 +4,7 @@
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
-
-import org.apache.commons.lang3.StringUtils;
+import java.util.Objects;
 
 import edu.umd.cs.findbugs.annotations.CheckForNull;
 
@@ -34,7 +33,7 @@ public final class RevApiInfoExtension implements Serializable {
      */
     public RevApiInfoExtension(@CheckForNull final String code, final String oldFile,
             final String newFile, final Map<String, String> severities) {
-        this.issueName = StringUtils.defaultString(code, "-");
+        this.issueName = Objects.toString(code, "-");
         this.oldFile = oldFile;
         this.newFile = newFile;
         this.severities.putAll(severities);

diff --git a/src/main/java/edu/hm/hafner/analysis/parser/JavacParser.java b/src/main/java/edu/hm/hafner/analysis/parser/JavacParser.java
@@ -1,10 +1,10 @@
 package edu.hm.hafner.analysis.parser;
 
+import java.util.Objects;
 import java.util.Optional;
 import java.util.regex.Matcher;
 
 import org.apache.commons.lang3.RegExUtils;
-import org.apache.commons.lang3.StringUtils;
 
 import edu.hm.hafner.analysis.Issue;
 import edu.hm.hafner.analysis.IssueBuilder;
@@ -77,7 +77,7 @@ protected Optional<Issue> createIssue(final Matcher matcher, final LookaheadStre
         // get rid of leading / from windows compiler output JENKINS-66738
         return builder.setFileName(RegExUtils.replaceAll(matcher.group(2), "^/([a-zA-Z]):", "$1:"))
                 .setLineStart(matcher.group(7))
-                .setType(StringUtils.defaultString(getGoal(), DEFAULT_GOAL))
+                .setType(Objects.toString(getGoal(), DEFAULT_GOAL))
                 .setColumnStart(matcher.group(8))
                 .setCategory(category)
                 .setMessage(message)

diff --git a/src/main/java/edu/hm/hafner/analysis/parser/SimulinkCheckParser.java b/src/main/java/edu/hm/hafner/analysis/parser/SimulinkCheckParser.java
@@ -39,7 +39,7 @@ public class SimulinkCheckParser extends IssueParser {
     public Report parse(final ReaderFactory readerFactory) throws ParsingException {
         try (IssueBuilder issueBuilder = new IssueBuilder();
                 Reader reader = readerFactory.create();
-                InputStream targetStream = new ReaderInputStream(reader, readerFactory.getCharset())) {
+                InputStream targetStream = ReaderInputStream.builder().setReader(reader).setCharset(readerFactory.getCharset()).get()) {
             Document document = Jsoup.parse(targetStream, readerFactory.getCharset().name(), EMPTY_BASE_URI);
 
             Elements systemElements = document.select(REPORT_CONTENT);