Merge pull request #63 from basil/cleanup

Cleanup

src/main/java/com/tikal/hudson/plugins/notification/Format.java

@@ -19,6 +19,7 @@
 import com.thoughtworks.xstream.XStream;
 import com.tikal.hudson.plugins.notification.model.JobState;
 import java.io.IOException;
+import java.nio.charset.StandardCharsets;
 
 public enum Format {
     XML {
@@ -27,7 +28,7 @@ public enum Format {
         @Override
         protected byte[] serialize(JobState jobState) throws IOException {
             xstream.processAnnotations(JobState.class);
-            return xstream.toXML(jobState).getBytes("UTF-8");
+            return xstream.toXML(jobState).getBytes(StandardCharsets.UTF_8);
         }
     },
     JSON {
@@ -37,7 +38,7 @@ protected byte[] serialize(JobState jobState) throws IOException {
 
         @Override
         protected byte[] serialize(JobState jobState) throws IOException {
-            return gson.toJson(jobState).getBytes("UTF-8");
+            return gson.toJson(jobState).getBytes(StandardCharsets.UTF_8);
         }
     };
 

src/main/java/com/tikal/hudson/plugins/notification/HudsonNotificationProperty.java

@@ -25,7 +25,7 @@ public class HudsonNotificationProperty extends JobProperty<Job<?, ?>> {
 
     @DataBoundConstructor
     public HudsonNotificationProperty(List<Endpoint> endpoints) {
-        this.endpoints = new ArrayList<Endpoint>(endpoints);
+        this.endpoints = new ArrayList<>(endpoints);
     }
 
     public List<Endpoint> getEndpoints() {

src/main/java/com/tikal/hudson/plugins/notification/Phase.java

@@ -69,7 +69,6 @@ private Result findLastBuildThatFinished(Run run) {
         return null;
     }
 
-    @SuppressWarnings("CastToConcreteClass")
     public void handle(Run run, TaskListener listener, long timestamp) {
         handle(run, listener, timestamp, false, null, 0, this);
     }

src/main/java/com/tikal/hudson/plugins/notification/Protocol.java

@@ -67,16 +67,17 @@ protected void send(String url, byte[] data, int timeout, boolean isJson) throws
             // Verifying if the HTTP_PROXY is available
             final String httpProxyUrl = System.getenv().get("http_proxy");
             URL proxyUrl = null;
-            if (httpProxyUrl != null && httpProxyUrl.length() > 0) {
+            if (httpProxyUrl != null && !httpProxyUrl.isEmpty()) {
                 proxyUrl = new URL(httpProxyUrl);
                 if (!proxyUrl.getProtocol().startsWith("http")) {
                     throw new IllegalArgumentException("Not an http(s) url: " + httpProxyUrl);
                 }
             }
 
             Proxy proxy = Proxy.NO_PROXY;
-            if (Jenkins.getInstance() != null && Jenkins.getInstance().proxy != null) {
-                proxy = Jenkins.getInstance().proxy.createProxy(targetUrl.getHost());
+            Jenkins jenkins = Jenkins.getInstanceOrNull();
+            if (jenkins != null && jenkins.proxy != null) {
+                proxy = jenkins.proxy.createProxy(targetUrl.getHost());
             } else if (proxyUrl != null) {
                 // Proxy connection to the address provided
                 final int proxyPort = proxyUrl.getPort() > 0 ? proxyUrl.getPort() : 80;
@@ -101,12 +102,9 @@ protected void send(String url, byte[] data, int timeout, boolean isJson) throws
             connection.setReadTimeout(timeout);
             connection.connect();
             try {
-                OutputStream output = connection.getOutputStream();
-                try {
+                try (OutputStream output = connection.getOutputStream()) {
                     output.write(data);
                     output.flush();
-                } finally {
-                    output.close();
                 }
             } finally {
                 // Follow an HTTP Temporary Redirect if we get one,
@@ -156,6 +154,6 @@ public void validateUrl(String url) {
     }
 
     private static boolean isEmpty(String s) {
-        return ((s == null) || (s.trim().length() < 1));
+        return ((s == null) || (s.trim().isEmpty()));
     }
 }

src/main/java/com/tikal/hudson/plugins/notification/Utils.java

@@ -27,7 +27,7 @@ public static boolean isEmpty(String... strings) {
         }
 
         for (String s : strings) {
-            if ((s == null) || (s.trim().length() < 1)) {
+            if ((s == null) || (s.trim().isEmpty())) {
                 return true;
             }
         }
@@ -40,7 +40,6 @@ public static boolean isEmpty(String... strings) {
      * @param strings Strings to check for empty (whitespace is trimmed) or null.
      * @throws java.lang.IllegalArgumentException Throws this exception if any string is empty.
      */
-    @SuppressWarnings("ReturnOfNull")
     public static void verifyNotEmpty(String... strings) {
         if (isEmpty(strings)) {
             throw new IllegalArgumentException(

src/main/java/com/tikal/hudson/plugins/notification/model/BuildState.java

@@ -69,7 +69,7 @@ public class BuildState {
      *   notification.jar:
      *     archive: http://localhost:8080/job/notification-plugin/78/artifact/target/notification.jar
      */
-    private final Map<String, Map<String, String>> artifacts = new HashMap<String, Map<String, String>>();
+    private final Map<String, Map<String, String>> artifacts = new HashMap<>();
 
     public int getNumber() {
         return number;
@@ -140,7 +140,7 @@ public Map<String, String> getParameters() {
     }
 
     public void setParameters(Map<String, String> params) {
-        this.parameters = new HashMap<String, String>(params);
+        this.parameters = new HashMap<>(params);
     }
 
     public Map<String, Map<String, String>> getArtifacts() {
@@ -202,13 +202,13 @@ private void updateArchivedArtifacts(Run run) {
         List<Run.Artifact> buildArtifacts = run.getArtifacts();
 
         for (Run.Artifact a : buildArtifacts) {
-            String artifactUrl = Jenkins.getInstance().getRootUrl() + run.getUrl() + "artifact/" + a.getHref();
+            String artifactUrl = Jenkins.get().getRootUrl() + run.getUrl() + "artifact/" + a.getHref();
             updateArtifact(a.relativePath, "archive", artifactUrl);
         }
     }
 
     private void updateS3Artifacts(Job job, Run run) {
-        if (Jenkins.getInstance().getPlugin("s3") == null) {
+        if (Jenkins.get().getPlugin("s3") == null) {
             return;
         }
         if (!(run instanceof AbstractBuild)) {
@@ -263,7 +263,7 @@ private void updateArtifact(String fileName, String locationName, String locatio
         verifyNotEmpty(fileName, locationName, locationUrl);
 
         if (!artifacts.containsKey(fileName)) {
-            artifacts.put(fileName, new HashMap<String, String>());
+            artifacts.put(fileName, new HashMap<>());
         }
 
         if (artifacts.get(fileName).containsKey(locationName)) {

src/test/java/com/tikal/hudson/plugins/notification/PhaseTest.java

@@ -2,7 +2,6 @@
 
 import static com.tikal.hudson.plugins.notification.UrlType.PUBLIC;
 import static com.tikal.hudson.plugins.notification.UrlType.SECRET;
-import static java.util.Arrays.asList;
 import static org.junit.Assert.assertEquals;
 import static org.mockito.Mockito.any;
 import static org.mockito.Mockito.anyBoolean;
@@ -26,6 +25,7 @@
 import java.io.IOException;
 import java.io.PrintStream;
 import java.lang.reflect.Method;
+import java.util.List;
 import jenkins.model.Jenkins;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -184,7 +184,7 @@ public void testRunNoProperty() {
     public void testRunNoPreviousRunUrlNull() {
         when(run.getParent()).thenReturn(job);
         when(job.getProperty(HudsonNotificationProperty.class)).thenReturn(property);
-        when(property.getEndpoints()).thenReturn(asList(endpoint));
+        when(property.getEndpoints()).thenReturn(List.of(endpoint));
         when(endpoint.getUrlInfo()).thenReturn(urlInfo);
 
         Phase.STARTED.handle(run, listener, 0L);
@@ -197,7 +197,7 @@ public void testRunNoPreviousRunUrlNull() {
     public void testRunNoPreviousRunUrlTypePublicUnresolvedUrl() throws IOException, InterruptedException {
         when(run.getParent()).thenReturn(job);
         when(job.getProperty(HudsonNotificationProperty.class)).thenReturn(property);
-        when(property.getEndpoints()).thenReturn(asList(endpoint));
+        when(property.getEndpoints()).thenReturn(List.of(endpoint));
         when(endpoint.getUrlInfo()).thenReturn(urlInfo);
         when(run.getEnvironment(listener)).thenReturn(environment);
         when(urlInfo.getUrlOrId()).thenReturn("$someUrl");
@@ -216,7 +216,7 @@ public void testRunPreviousRunUrlTypePublic() throws IOException, InterruptedExc
         byte[] data = "data".getBytes();
         try (MockedStatic<Jenkins> jenkinsMockedStatic = mockStatic(Jenkins.class)) {
             jenkinsMockedStatic.when(Jenkins::getInstanceOrNull).thenReturn(jenkins);
-            jenkinsMockedStatic.when(Jenkins::getInstance).thenReturn(jenkins);
+            jenkinsMockedStatic.when(Jenkins::get).thenReturn(jenkins);
 
             Protocol httpProtocolSpy = spy(Protocol.HTTP);
             when(endpoint.getProtocol()).thenReturn(httpProtocolSpy);
@@ -230,7 +230,7 @@ public void testRunPreviousRunUrlTypePublic() throws IOException, InterruptedExc
 
             when(run.getParent()).thenReturn(job);
             when(job.getProperty(HudsonNotificationProperty.class)).thenReturn(property);
-            when(property.getEndpoints()).thenReturn(asList(endpoint));
+            when(property.getEndpoints()).thenReturn(List.of(endpoint));
             when(endpoint.getUrlInfo()).thenReturn(urlInfo);
             when(endpoint.getBranch()).thenReturn("branchName");
             when(run.getEnvironment(listener)).thenReturn(environment);
@@ -256,7 +256,7 @@ public void testRunPreviousRunUrlTypeSecret() throws IOException, InterruptedExc
         try (MockedStatic<Jenkins> jenkinsMockedStatic = mockStatic(Jenkins.class);
                 MockedStatic<Utils> utilsMockedStatic = mockStatic(Utils.class)) {
             jenkinsMockedStatic.when(Jenkins::getInstanceOrNull).thenReturn(jenkins);
-            jenkinsMockedStatic.when(Jenkins::getInstance).thenReturn(jenkins);
+            jenkinsMockedStatic.when(Jenkins::get).thenReturn(jenkins);
             utilsMockedStatic
                     .when(() -> Utils.getSecretUrl("credentialsId", jenkins))
                     .thenReturn("$secretUrl");
@@ -273,7 +273,7 @@ public void testRunPreviousRunUrlTypeSecret() throws IOException, InterruptedExc
 
             when(run.getParent()).thenReturn(job);
             when(job.getProperty(HudsonNotificationProperty.class)).thenReturn(property);
-            when(property.getEndpoints()).thenReturn(asList(endpoint));
+            when(property.getEndpoints()).thenReturn(List.of(endpoint));
             when(endpoint.getUrlInfo()).thenReturn(urlInfo);
             when(endpoint.getBranch()).thenReturn(".*");
             when(run.getEnvironment(listener)).thenReturn(environment);

src/test/java/com/tikal/hudson/plugins/notification/ProtocolTest.java

@@ -133,7 +133,7 @@ protected void doPost(HttpServletRequest httpRequest, HttpServletResponse httpRe
             doPost(request, httpResponse);
         }
 
-        protected void doPost(Request request, HttpServletResponse httpResponse) throws IOException {
+        protected void doPost(Request request, HttpServletResponse httpResponse) {
             // noop
         }
     }
@@ -147,7 +147,7 @@ static class RedirectHandler extends RecordingServlet {
         }
 
         @Override
-        protected void doPost(Request request, HttpServletResponse httpResponse) throws IOException {
+        protected void doPost(Request request, HttpServletResponse httpResponse) {
             httpResponse.setStatus(HttpServletResponse.SC_TEMPORARY_REDIRECT);
             httpResponse.setHeader("Location", redirectURI);
         }
@@ -194,7 +194,7 @@ public String getUrl(String path) {
     }
 
     @Override
-    public void setUp() throws Exception {
+    public void setUp() {
         servers = new LinkedList<>();
     }
 
@@ -206,7 +206,7 @@ public void tearDown() throws Exception {
     }
 
     public void testHttpPost() throws Exception {
-        BlockingQueue<Request> requests = new LinkedBlockingQueue<Request>();
+        BlockingQueue<Request> requests = new LinkedBlockingQueue<>();
 
         UrlFactory urlFactory = startServer(new RecordingServlet(requests), "/realpath");
 
@@ -220,7 +220,7 @@ public void testHttpPost() throws Exception {
     }
 
     public void testHttpPostWithBasicAuth() throws Exception {
-        BlockingQueue<Request> requests = new LinkedBlockingQueue<Request>();
+        BlockingQueue<Request> requests = new LinkedBlockingQueue<>();
 
         UrlFactory urlFactory = startSecureServer(new RecordingServlet(requests), "/realpath", "fred:foo");
 
@@ -235,7 +235,7 @@ public void testHttpPostWithBasicAuth() throws Exception {
     }
 
     public void testHttpPostWithRedirects() throws Exception {
-        BlockingQueue<Request> requests = new LinkedBlockingQueue<Request>();
+        BlockingQueue<Request> requests = new LinkedBlockingQueue<>();
 
         UrlFactory urlFactory = startServer(new RecordingServlet(requests), "/realpath");
 

src/test/java/com/tikal/hudson/plugins/notification/test/HostnamePortTest.java

@@ -14,7 +14,7 @@
 package com.tikal.hudson.plugins.notification.test;
 
 import com.tikal.hudson.plugins.notification.HostnamePort;
-import junit.framework.Assert;
+import org.junit.Assert;
 import org.junit.Test;
 
 public class HostnamePortTest {