Code Improvements (#291)

jenkinsci · Aug 13, 2021 · 06c671c · 06c671c
1 parent 0cb6356
commit 06c671c
Show file tree

Hide file tree

Showing 41 changed files with 127 additions and 155 deletions.
diff --git a/pom.xml b/pom.xml
@@ -196,7 +196,7 @@
                 <scope>import</scope>
                 <type>pom</type>
             </dependency>
-            <!-- mockito and hibernete are conflicting (both test dependencies) -->
+            <!-- mockito and hibernate are conflicting (both test dependencies) -->
             <dependency>
                 <groupId>net.bytebuddy</groupId>
                 <artifactId>byte-buddy</artifactId>

diff --git a/src/main/java/hudson/tasks/junit/CaseResult.java b/src/main/java/hudson/tasks/junit/CaseResult.java
@@ -366,7 +366,7 @@ public float getDuration() {
             if(!Character.isJavaIdentifierPart(ch))
                 buf.setCharAt(i,'_');
         }
-        Collection<CaseResult> siblings = classResult ==null ? Collections.<CaseResult>emptyList(): classResult.getChildren();
+        Collection<CaseResult> siblings = classResult ==null ? Collections.emptyList(): classResult.getChildren();
         return safeName = uniquifyName(siblings, buf.toString());
     }
 
@@ -791,11 +791,7 @@ public boolean isRegression() {
     /**
      * For sorting errors by age.
      */
-    /*package*/ static final Comparator<CaseResult> BY_AGE = new Comparator<CaseResult>() {
-        public int compare(CaseResult lhs, CaseResult rhs) {
-            return lhs.getAge()-rhs.getAge();
-        }
-    };
+    /*package*/ static final Comparator<CaseResult> BY_AGE = Comparator.comparingInt(CaseResult::getAge);
 
     private static final long serialVersionUID = 1L;
 

diff --git a/src/main/java/hudson/tasks/junit/ClassResult.java b/src/main/java/hudson/tasks/junit/ClassResult.java
@@ -24,13 +24,9 @@
 package hudson.tasks.junit;
 
 import hudson.model.Run;
-import io.jenkins.plugins.junit.storage.FileJunitTestResultStorage;
-import io.jenkins.plugins.junit.storage.TestResultImpl;
-import io.jenkins.plugins.junit.storage.JunitTestResultStorage;
 import hudson.tasks.test.TabulatedResult;
 import hudson.tasks.test.TestResult;
 import hudson.tasks.test.TestObject;
-import org.kohsuke.stapler.Stapler;
 import org.kohsuke.stapler.StaplerRequest;
 import org.kohsuke.stapler.StaplerResponse;
 import org.kohsuke.stapler.export.Exported;
@@ -48,7 +44,7 @@ public final class ClassResult extends TabulatedResult implements Comparable<Cla
     private final String className; // simple name
     private transient String safeName;
 
-    private final List<CaseResult> cases = new ArrayList<CaseResult>();
+    private final List<CaseResult> cases = new ArrayList<>();
 
     private int passCount,failCount,skipCount;
 
@@ -91,12 +87,8 @@ public hudson.tasks.test.TestResult findCorrespondingResult(String id) {
 			if (id.length() > caseNameStart) {
             	caseName = id.substring(caseNameStart);
             }
-        } 
-        CaseResult child = getCaseResult(caseName);
-        if (child != null) {
-            return child;
         }
-        return null;
+        return getCaseResult(caseName);
     }
 
     public String getTitle() {

diff --git a/src/main/java/hudson/tasks/junit/JUnitResultArchiver.java b/src/main/java/hudson/tasks/junit/JUnitResultArchiver.java
@@ -132,7 +132,7 @@ public JUnitResultArchiver(
             double healthScaleFactor) {
         this.testResults = testResults;
         setKeepLongStdio(keepLongStdio);
-        setTestDataPublishers(testDataPublishers == null ? Collections.<TestDataPublisher>emptyList() : testDataPublishers);
+        setTestDataPublishers(testDataPublishers == null ? Collections.emptyList() : testDataPublishers);
         setHealthScaleFactor(healthScaleFactor);
         setAllowEmptyResults(false);
     }
@@ -347,7 +347,7 @@ public double getHealthScaleFactor() {
     }
 
     public @Nonnull List<TestDataPublisher> getTestDataPublishers() {
-        return testDataPublishers == null ? Collections.<TestDataPublisher>emptyList() : testDataPublishers;
+        return testDataPublishers == null ? Collections.emptyList() : testDataPublishers;
     }
 
     /**
@@ -356,7 +356,7 @@ public double getHealthScaleFactor() {
      * @since 1.2
      */
     @DataBoundSetter public final void setTestDataPublishers(@Nonnull List<TestDataPublisher> testDataPublishers) {
-        this.testDataPublishers = new DescribableList<TestDataPublisher,Descriptor<TestDataPublisher>>(Saveable.NOOP);
+        this.testDataPublishers = new DescribableList<>(Saveable.NOOP);
         this.testDataPublishers.addAll(testDataPublishers);
     }
 

diff --git a/src/main/java/hudson/tasks/junit/PackageResult.java b/src/main/java/hudson/tasks/junit/PackageResult.java
@@ -45,7 +45,7 @@ public final class PackageResult extends MetaTabulatedResult implements Comparab
     /**
      * All {@link ClassResult}s keyed by their short name.
      */
-    private final Map<String,ClassResult> classes = new TreeMap<String,ClassResult>();
+    private final Map<String,ClassResult> classes = new TreeMap<>();
     private int passCount,failCount,skipCount;
     private final hudson.tasks.junit.TestResult parent;
     private float duration; 
@@ -181,7 +181,7 @@ public List<CaseResult> getFailedTests() {
            return pluggableStorage.getFailedTestsByPackage(packageName);
        }
 
-        List<CaseResult> r = new ArrayList<CaseResult>();
+        List<CaseResult> r = new ArrayList<>();
         for (ClassResult clr : classes.values()) {
             for (CaseResult cr : clr.getChildren()) {
                 if (cr.isFailed()) {
@@ -199,7 +199,7 @@ public List<CaseResult> getFailedTests() {
      */
     public List<CaseResult> getFailedTestsSortedByAge() {
         List<CaseResult> failedTests = getFailedTests();
-        Collections.sort(failedTests, CaseResult.BY_AGE);
+        failedTests.sort(CaseResult.BY_AGE);
         return failedTests;
     }
 
@@ -215,15 +215,15 @@ public List<CaseResult> getPassedTests() {
             return pluggableStorage.getPassedTestsByPackage(packageName);
         }
 
-        List<CaseResult> r = new ArrayList<CaseResult>();
+        List<CaseResult> r = new ArrayList<>();
         for (ClassResult clr : classes.values()) {
             for (CaseResult cr : clr.getChildren()) {
                 if (cr.isPassed()) {
                     r.add(cr);
                 }
             }
         }
-        Collections.sort(r,CaseResult.BY_AGE);
+        r.sort(CaseResult.BY_AGE);
         return r;
     }
 
@@ -239,15 +239,15 @@ public List<CaseResult> getSkippedTests() {
             return pluggableStorage.getSkippedTestsByPackage(packageName);
         } 
 
-        List<CaseResult> r = new ArrayList<CaseResult>();
+        List<CaseResult> r = new ArrayList<>();
         for (ClassResult clr : classes.values()) {
             for (CaseResult cr : clr.getChildren()) {
                 if (cr.isSkipped()) {
                     r.add(cr);
                 }
             }
         }
-        Collections.sort(r, CaseResult.BY_AGE);
+        r.sort(CaseResult.BY_AGE);
         return r;
     }
 

diff --git a/src/main/java/hudson/tasks/junit/SuiteResult.java b/src/main/java/hudson/tasks/junit/SuiteResult.java
@@ -100,7 +100,7 @@ public final class SuiteResult implements Serializable {
     /**
      * All test cases.
      */
-    private final List<CaseResult> cases = new ArrayList<CaseResult>();
+    private final List<CaseResult> cases = new ArrayList<>();
     private transient Map<String, CaseResult> casesByName;
     private transient hudson.tasks.junit.TestResult parent;
 
@@ -159,7 +159,7 @@ public static class SuiteResultParserConfigurationContext {
      */
     static List<SuiteResult> parse(File xmlReport, boolean keepLongStdio, PipelineTestDetails pipelineTestDetails)
             throws DocumentException, IOException, InterruptedException {
-        List<SuiteResult> r = new ArrayList<SuiteResult>();
+        List<SuiteResult> r = new ArrayList<>();
 
         // parse into DOM
         SAXReader saxReader = new SAXReader();
@@ -173,14 +173,11 @@ static List<SuiteResult> parse(File xmlReport, boolean keepLongStdio, PipelineTe
 
         saxReader.setEntityResolver(new XMLEntityResolver());
 
-        FileInputStream xmlReportStream = new FileInputStream(xmlReport);
-        try {
+        try (FileInputStream xmlReportStream = new FileInputStream(xmlReport)) {
             Document result = saxReader.read(xmlReportStream);
             Element root = result.getRootElement();
 
             parseSuite(xmlReport, keepLongStdio, r, root, pipelineTestDetails);
-        } finally {
-            xmlReportStream.close();
         }
 
         return r;
@@ -198,8 +195,7 @@ private static void setFeatureQuietly(SAXReader reader, String feature, boolean
     private static void parseSuite(File xmlReport, boolean keepLongStdio, List<SuiteResult> r, Element root,
                                    PipelineTestDetails pipelineTestDetails) throws DocumentException, IOException {
         // nested test suites
-        @SuppressWarnings("unchecked")
-        List<Element> testSuites = (List<Element>) root.elements("testsuite");
+        List<Element> testSuites = root.elements("testsuite");
         for (Element suite : testSuites)
             parseSuite(xmlReport, keepLongStdio, r, suite, pipelineTestDetails);
 
@@ -245,8 +241,7 @@ private SuiteResult(File xmlReport, Element suite, boolean keepLongStdio, @Check
             addCase(new CaseResult(this, suite, "<init>", keepLongStdio));
         }
 
-        @SuppressWarnings("unchecked")
-        List<Element> testCases = (List<Element>) suite.elements("testcase");
+        List<Element> testCases = suite.elements("testcase");
         for (Element e : testCases) {
             // https://issues.jenkins-ci.org/browse/JENKINS-1233 indicates that
             // when <testsuites> is present, we are better off using @classname on the
@@ -433,7 +428,7 @@ public CaseResult getCase(String caseResultFullDisplayName) {
     }
 
     public Set<String> getClassNames() {
-        Set<String> result = new HashSet<String>();
+        Set<String> result = new HashSet<>();
         for (CaseResult c : cases) {
             result.add(c.getClassName());
         }

diff --git a/src/main/java/hudson/tasks/junit/TestDataPublisher.java b/src/main/java/hudson/tasks/junit/TestDataPublisher.java
@@ -94,7 +94,7 @@ public TestResultAction.Data getTestData(
     }
 
 	public static DescriptorExtensionList<TestDataPublisher, Descriptor<TestDataPublisher>> all() {
-		return Jenkins.get().<TestDataPublisher, Descriptor<TestDataPublisher>>getDescriptorList(TestDataPublisher.class);
+		return Jenkins.get().getDescriptorList(TestDataPublisher.class);
 	}
 
 }
diff --git a/src/main/java/hudson/tasks/junit/TestDurationResultSummary.java b/src/main/java/hudson/tasks/junit/TestDurationResultSummary.java
@@ -5,10 +5,6 @@
 import java.util.Map;
 
 import static hudson.tasks.test.TestDurationTrendSeriesBuilder.SECONDS;
-import static hudson.tasks.test.TestResultTrendSeriesBuilder.FAILED_KEY;
-import static hudson.tasks.test.TestResultTrendSeriesBuilder.PASSED_KEY;
-import static hudson.tasks.test.TestResultTrendSeriesBuilder.SKIPPED_KEY;
-import static hudson.tasks.test.TestResultTrendSeriesBuilder.TOTALS_KEY;
 
 public class TestDurationResultSummary implements Serializable {
 

diff --git a/src/main/java/hudson/tasks/junit/TestResult.java b/src/main/java/hudson/tasks/junit/TestResult.java
@@ -377,9 +377,7 @@ public void parse(File reportFile, PipelineTestDetails pipelineTestDetails) thro
         try {
             for (SuiteResult suiteResult : SuiteResult.parse(reportFile, keepLongStdio, pipelineTestDetails))
                 add(suiteResult);
-        } catch (InterruptedException e) {
-            throw new IOException("Failed to read "+reportFile,e);
-        } catch (RuntimeException e) {
+        } catch (InterruptedException | RuntimeException e) {
             throw new IOException("Failed to read "+reportFile,e);
         } catch (DocumentException e) {
             if (!reportFile.getPath().endsWith(".xml")) {
@@ -547,7 +545,7 @@ public synchronized List<CaseResult> getPassedTests() {
         }
 
         if(passedTests == null){
-            passedTests = new ArrayList<CaseResult>();
+            passedTests = new ArrayList<>();
             for(SuiteResult s : suites) {
                 for(CaseResult cr : s.getCases()) {
                     if (cr.isPassed()) {
@@ -572,7 +570,7 @@ public synchronized List<CaseResult> getSkippedTests() {
         }
 
         if(skippedTests == null){
-            skippedTests = new ArrayList<CaseResult>();
+            skippedTests = new ArrayList<>();
             for(SuiteResult s : suites) {
                 for(CaseResult cr : s.getCases()) {
                     if (cr.isSkipped()) {
@@ -668,8 +666,7 @@ public boolean isPassed() {
     @Override
     public Collection<PackageResult> getChildren() {
         if (impl != null) {
-            List<PackageResult> allPackageResults = impl.getAllPackageResults();
-            return allPackageResults;
+            return impl.getAllPackageResults();
         }
 
         return byPackages.values();
@@ -864,14 +861,14 @@ public void freeze(TestResultAction parent) {
             }
         }
 
-        Collections.sort(failedTests,CaseResult.BY_AGE);
+        failedTests.sort(CaseResult.BY_AGE);
 
         if(passedTests != null) {
-            Collections.sort(passedTests,CaseResult.BY_AGE);
+            passedTests.sort(CaseResult.BY_AGE);
         }
 
         if(skippedTests != null) {
-            Collections.sort(skippedTests,CaseResult.BY_AGE);
+            skippedTests.sort(CaseResult.BY_AGE);
         }
 
         for (PackageResult pr : byPackages.values())
@@ -884,7 +881,7 @@ private void addSuiteByNode(SuiteResult s) {
         if (nodeId != null) {
             // If we don't already have an entry for this node, initialize a list for it.
             if (suitesByNode.get(nodeId) == null) {
-                suitesByNode.put(nodeId, new ArrayList<SuiteResult>());
+                suitesByNode.put(nodeId, new ArrayList<>());
             }
             // Add the suite to the list for the node in the map. Phew.
             suitesByNode.get(nodeId).add(s);

diff --git a/src/main/java/hudson/tasks/junit/TestResultAction.java b/src/main/java/hudson/tasks/junit/TestResultAction.java
@@ -127,7 +127,7 @@ public synchronized void setResult(TestResult result, TaskListener listener) {
         }
         }
 
-        this.result = new WeakReference<TestResult>(result);
+        this.result = new WeakReference<>(result);
     }
 
     @Deprecated
@@ -148,14 +148,14 @@ public synchronized TestResult getResult() {
         TestResult r;
         if(result==null) {
             r = load();
-            result = new WeakReference<TestResult>(r);
+            result = new WeakReference<>(r);
         } else {
             r = result.get();
         }
 
         if(r==null) {
             r = load();
-            result = new WeakReference<TestResult>(r);
+            result = new WeakReference<>(r);
         }
         if(totalCount==null) {
             totalCount = r.getTotalCount();
@@ -244,7 +244,7 @@ public Object getTarget() {
     }
 
     public List<TestAction> getActions(TestObject object) {
-        List<TestAction> result = new ArrayList<TestAction>();
+        List<TestAction> result = new ArrayList<>();
         // Added check for null testData to avoid NPE from issue 4257.
         if (testData != null) {
             synchronized (testData) {
@@ -316,7 +316,7 @@ public static abstract class Data {
     public Object readResolve() {
         super.readResolve(); // let it do the post-deserialization work
     	if (testData == null) {
-    		testData = new ArrayList<Data>(0);
+    		testData = new ArrayList<>(0);
     	}
 
     	return this;

diff --git a/src/main/java/hudson/tasks/junit/pipeline/JUnitResultsStep.java b/src/main/java/hudson/tasks/junit/pipeline/JUnitResultsStep.java
@@ -85,7 +85,7 @@ public final void setHealthScaleFactor(double healthScaleFactor) {
 
     public @Nonnull
     List<TestDataPublisher> getTestDataPublishers() {
-        return testDataPublishers == null ? Collections.<TestDataPublisher>emptyList() : testDataPublishers;
+        return testDataPublishers == null ? Collections.emptyList() : testDataPublishers;
     }
 
     /**
@@ -94,7 +94,7 @@ List<TestDataPublisher> getTestDataPublishers() {
      * @since 1.2
      */
     @DataBoundSetter public final void setTestDataPublishers(@Nonnull List<TestDataPublisher> testDataPublishers) {
-        this.testDataPublishers = new DescribableList<TestDataPublisher,Descriptor<TestDataPublisher>>(Saveable.NOOP);
+        this.testDataPublishers = new DescribableList<>(Saveable.NOOP);
         this.testDataPublishers.addAll(testDataPublishers);
     }
 

diff --git a/src/main/java/hudson/tasks/test/AbstractTestResultAction.java b/src/main/java/hudson/tasks/test/AbstractTestResultAction.java
@@ -80,7 +80,7 @@ public abstract class AbstractTestResultAction<T extends AbstractTestResultActio
     @Deprecated
     public transient AbstractBuild<?,?> owner;
 
-    private Map<String,String> descriptions = new ConcurrentHashMap<String, String>();
+    private Map<String,String> descriptions = new ConcurrentHashMap<>();
 
     /** @since 1.545 */
     protected AbstractTestResultAction() {}
@@ -340,10 +340,10 @@ private Area calcDefaultSize() {
     }
 
     private CategoryDataset buildDataSet(StaplerRequest req) {
-        boolean failureOnly = Boolean.valueOf(req.getParameter("failureOnly"));
+        boolean failureOnly = Boolean.parseBoolean(req.getParameter("failureOnly"));
 
         // TODO stop using ChartUtil.NumberOnlyBuildLabel as it forces loading of a Run; create a plainer Comparable
-        DataSetBuilder<String,NumberOnlyBuildLabel> dsb = new DataSetBuilder<String,NumberOnlyBuildLabel>();
+        DataSetBuilder<String,NumberOnlyBuildLabel> dsb = new DataSetBuilder<>();
 
         int cap = Integer.getInteger(AbstractTestResultAction.class.getName() + ".test.trend.max", Integer.MAX_VALUE);
         int count = 0;
@@ -465,7 +465,7 @@ protected void setDescription(TestObject object, String description) {
 
     public Object readResolve() {
     	if (descriptions == null) {
-    		descriptions = new ConcurrentHashMap<String, String>();
+    		descriptions = new ConcurrentHashMap<>();
     	}
 
     	return this;