From aa28890d8441986233bfaea56029cb53ba4dd808 Mon Sep 17 00:00:00 2001
From: Stefan Spieker <S.Spieker@gmx.net>
Date: Thu, 19 Sep 2019 22:31:01 +0200
Subject: [PATCH] simplified code and removed unused imports

---
 src/main/java/htmlpublisher/HtmlPublisher.java             | 3 ++-
 src/main/java/htmlpublisher/HtmlPublisherTarget.java       | 7 ++++---
 .../htmlpublisher/workflow/PublishHTMLStepExecution.java   | 6 +++---
 src/test/java/htmlpublisher/HtmlPublisherTest.java         | 1 -
 src/test/java/htmlpublisher/Security784Test.java           | 1 -
 .../java/htmlpublisher/workflow/PublishHTMLStepTest.java   | 3 +--
 6 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/src/main/java/htmlpublisher/HtmlPublisher.java b/src/main/java/htmlpublisher/HtmlPublisher.java
index 68d8e46..f751b5d 100644
--- a/src/main/java/htmlpublisher/HtmlPublisher.java
+++ b/src/main/java/htmlpublisher/HtmlPublisher.java
@@ -34,6 +34,7 @@
 import java.io.PrintStream;
 import java.io.Reader;
 import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
 import java.util.ArrayList;
@@ -108,7 +109,7 @@ private static String writeFile(List<String> lines, File path) throws IOExceptio
             for (int i = 0; i < lines.size(); i++) {
                 String line = lines.get(i) + "\n";
                 bw.write(line);
-                sha1.update(line.getBytes("UTF-8"));
+                sha1.update(line.getBytes(StandardCharsets.UTF_8));
             }
         }
 
diff --git a/src/main/java/htmlpublisher/HtmlPublisherTarget.java b/src/main/java/htmlpublisher/HtmlPublisherTarget.java
index 7e60711..b364e49 100644
--- a/src/main/java/htmlpublisher/HtmlPublisherTarget.java
+++ b/src/main/java/htmlpublisher/HtmlPublisherTarget.java
@@ -2,6 +2,7 @@
 
 import java.io.File;
 import java.io.IOException;
+import java.util.Objects;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
@@ -540,13 +541,13 @@ public boolean equals(Object obj) {
             return false;
         }
         final HtmlPublisherTarget other = (HtmlPublisherTarget) obj;
-        if ((this.reportName == null) ? (other.reportName != null) : !this.reportName.equals(other.reportName)) {
+        if (!Objects.equals(this.reportName, other.reportName)) {
             return false;
         }
-        if ((this.reportDir == null) ? (other.reportDir != null) : !this.reportDir.equals(other.reportDir)) {
+        if (!Objects.equals(this.reportDir, other.reportDir)) {
             return false;
         }
-        if ((this.reportFiles == null) ? (other.reportFiles != null) : !this.reportFiles.equals(other.reportFiles)) {
+        if (!Objects.equals(this.reportFiles, other.reportFiles)) {
             return false;
         }
         if (this.alwaysLinkToLastBuild != other.alwaysLinkToLastBuild) {
diff --git a/src/main/java/htmlpublisher/workflow/PublishHTMLStepExecution.java b/src/main/java/htmlpublisher/workflow/PublishHTMLStepExecution.java
index 416fae8..7778ecb 100644
--- a/src/main/java/htmlpublisher/workflow/PublishHTMLStepExecution.java
+++ b/src/main/java/htmlpublisher/workflow/PublishHTMLStepExecution.java
@@ -23,7 +23,7 @@
  */
 package htmlpublisher.workflow;
 
-import java.util.Arrays;
+import java.util.Collections;
 
 import javax.inject.Inject;
 
@@ -67,8 +67,8 @@ protected Void run() throws Exception {
             throw new AbortException("Cannot publish the report. Target is not specified");
         }
         
-        boolean res = HtmlPublisher.publishReports(build, ws, listener, 
-                Arrays.asList(target), HtmlPublisher.class);
+        boolean res = HtmlPublisher.publishReports(build, ws, listener,
+                Collections.singletonList(target), HtmlPublisher.class);
         if (!res) {
             throw new AbortException("Cannot publish HTML files");
         }      
diff --git a/src/test/java/htmlpublisher/HtmlPublisherTest.java b/src/test/java/htmlpublisher/HtmlPublisherTest.java
index d9b4a94..68edf48 100644
--- a/src/test/java/htmlpublisher/HtmlPublisherTest.java
+++ b/src/test/java/htmlpublisher/HtmlPublisherTest.java
@@ -1,6 +1,5 @@
 package htmlpublisher;
 
-import org.junit.Assert;
 import org.junit.Test;
 
 import static org.junit.Assert.assertEquals;
diff --git a/src/test/java/htmlpublisher/Security784Test.java b/src/test/java/htmlpublisher/Security784Test.java
index 98606aa..c60cdac 100644
--- a/src/test/java/htmlpublisher/Security784Test.java
+++ b/src/test/java/htmlpublisher/Security784Test.java
@@ -2,7 +2,6 @@
 
 import com.gargoylesoftware.htmlunit.html.HtmlPage;
 import hudson.model.FreeStyleProject;
-import hudson.model.Job;
 import org.junit.Assert;
 import org.junit.Rule;
 import org.junit.Test;
diff --git a/src/test/java/htmlpublisher/workflow/PublishHTMLStepTest.java b/src/test/java/htmlpublisher/workflow/PublishHTMLStepTest.java
index 355eee3..ba9fc7b 100644
--- a/src/test/java/htmlpublisher/workflow/PublishHTMLStepTest.java
+++ b/src/test/java/htmlpublisher/workflow/PublishHTMLStepTest.java
@@ -26,7 +26,6 @@
 
 import edu.umd.cs.findbugs.annotations.NonNull;
 import htmlpublisher.HtmlPublisherTarget;
-import hudson.model.Action;
 import hudson.model.FreeStyleProject;
 import hudson.model.Node;
 import hudson.model.Result;
@@ -208,7 +207,7 @@ private void setupAndRunProject(@NonNull HtmlPublisherTarget target) throws Exce
                   ", keepAll: " + target.getKeepAll() + ", reportDir: '" + target.getReportDir() +
                   "', reportFiles: '" + target.getReportFiles() + "', reportName: '" + target.getReportName() + "']) \n"
                 + "}", true));
-        QueueTaskFuture<WorkflowRun> runFuture = job.scheduleBuild2(0, new Action[0]);
+        QueueTaskFuture<WorkflowRun> runFuture = job.scheduleBuild2(0);
         assertThat("build was actually scheduled", runFuture, Matchers.notNullValue());
         run = runFuture.get();
     }