From d111338b4c67e90a3a2b3737af783d08a8175cf6 Mon Sep 17 00:00:00 2001 From: Stefan Spieker Date: Sun, 1 Oct 2023 19:49:34 +0200 Subject: [PATCH] Minor refactoring and character set cleanup (#242) * use switch, StandardCharsets, diamond operator and removed obsolete semicolons and imports * add default statement to switch --- .../plugins/badge/EmbeddableBadgeConfig.java | 3 +- .../plugins/badge/ImageResolver.java | 3 +- .../jenkinsci/plugins/badge/StatusImage.java | 11 ++--- .../actions/EmbeddableBadgeConfigsAction.java | 6 +-- .../dsl/AddEmbeddableBadgeConfigStep.java | 2 +- .../BuildIdRunSelectorExtension.java | 49 +++++++++++-------- .../BuildParameterRunSelectorExtension.java | 33 ++++++++----- .../badge/JobBadgeActionFactoryTest.java | 1 - ...uildParameterRunSelectorExtensionTest.java | 1 - 9 files changed, 60 insertions(+), 49 deletions(-) diff --git a/src/main/java/org/jenkinsci/plugins/badge/EmbeddableBadgeConfig.java b/src/main/java/org/jenkinsci/plugins/badge/EmbeddableBadgeConfig.java index a5cd92fd..5b517d73 100644 --- a/src/main/java/org/jenkinsci/plugins/badge/EmbeddableBadgeConfig.java +++ b/src/main/java/org/jenkinsci/plugins/badge/EmbeddableBadgeConfig.java @@ -11,7 +11,7 @@ public class EmbeddableBadgeConfig implements Serializable { private static final long serialVersionUID = 1L; - private final Map colors = new HashMap() { + private final Map colors = new HashMap<>() { private static final long serialVersionUID = 1L; { @@ -21,7 +21,6 @@ public class EmbeddableBadgeConfig implements Serializable { put("aborted", "aborted"); put("running", "blue"); } - ; }; private final String id; diff --git a/src/main/java/org/jenkinsci/plugins/badge/ImageResolver.java b/src/main/java/org/jenkinsci/plugins/badge/ImageResolver.java index ca9b03ce..38946f5b 100644 --- a/src/main/java/org/jenkinsci/plugins/badge/ImageResolver.java +++ b/src/main/java/org/jenkinsci/plugins/badge/ImageResolver.java @@ -29,7 +29,7 @@ import java.util.Map; public class ImageResolver { - private final Map statuses = new HashMap() { + private final Map statuses = new HashMap<>() { private static final long serialVersionUID = 1L; { @@ -41,7 +41,6 @@ public class ImageResolver { put("disabled", "disabled"); put("notbuilt", "not run"); } - ; }; public StatusImage getImage( diff --git a/src/main/java/org/jenkinsci/plugins/badge/StatusImage.java b/src/main/java/org/jenkinsci/plugins/badge/StatusImage.java index 54b84dfd..08c4b154 100644 --- a/src/main/java/org/jenkinsci/plugins/badge/StatusImage.java +++ b/src/main/java/org/jenkinsci/plugins/badge/StatusImage.java @@ -16,7 +16,7 @@ import java.io.InputStream; import java.net.MalformedURLException; import java.net.URL; -import java.nio.charset.Charset; +import java.nio.charset.StandardCharsets; import java.util.Arrays; import java.util.HashMap; import java.util.Map; @@ -60,7 +60,7 @@ class StatusImage implements HttpResponse { private final String length; private String contentType = null; - private final Map colors = new HashMap() { + private final Map colors = new HashMap<>() { private static final long serialVersionUID = 1L; { @@ -73,7 +73,6 @@ class StatusImage implements HttpResponse { put("lightgrey", "#9f9f9f"); put("blue", "#007ec6"); } - ; }; StatusImage() { @@ -166,7 +165,7 @@ class StatusImage implements HttpResponse { if (animatedSnippet != null) { String reducedStatusWidth = String.valueOf(widths[1] - 4.0); try (InputStream animatedOverlayStream = animatedSnippet.openStream()) { - animatedOverlay = IOUtils.toString(animatedOverlayStream, "utf-8") + animatedOverlay = IOUtils.toString(animatedOverlayStream, StandardCharsets.UTF_8) .replace("{{reducedStatusWidth}}", reducedStatusWidth) .replace("{{animatedColor}}", animatedColor); } @@ -189,7 +188,7 @@ class StatusImage implements HttpResponse { } try (InputStream s = image.openStream()) { - payload = IOUtils.toString(s, "utf-8") + payload = IOUtils.toString(s, StandardCharsets.UTF_8) .replace("{{animatedOverlayColor}}", animatedOverlay) .replace("{{fullwidth}}", fullwidth) .replace("{{subjectWidth}}", subjectWidth) @@ -200,7 +199,7 @@ class StatusImage implements HttpResponse { .replace("{{status}}", status) .replace("{{color}}", color) .replace(" badgeConfigs = new HashMap(); + private Map badgeConfigs = new HashMap<>(); public EmbeddableBadgeConfigsAction() {} @@ -63,8 +63,6 @@ public EmbeddableBadgeConfig getConfig(String id) { @Exported public void addConfig(EmbeddableBadgeConfig config) { String id = config.getID(); - if (badgeConfigs.get(id) == null) { - badgeConfigs.put(id, config); - } + badgeConfigs.putIfAbsent(id, config); } } diff --git a/src/main/java/org/jenkinsci/plugins/badge/dsl/AddEmbeddableBadgeConfigStep.java b/src/main/java/org/jenkinsci/plugins/badge/dsl/AddEmbeddableBadgeConfigStep.java index 1b95df76..0c0280b3 100644 --- a/src/main/java/org/jenkinsci/plugins/badge/dsl/AddEmbeddableBadgeConfigStep.java +++ b/src/main/java/org/jenkinsci/plugins/badge/dsl/AddEmbeddableBadgeConfigStep.java @@ -108,7 +108,7 @@ public String getDisplayName() { @Override public Set> getRequiredContext() { - Set> set = new HashSet>(); + Set> set = new HashSet<>(); set.add(TaskListener.class); return set; } diff --git a/src/main/java/org/jenkinsci/plugins/badge/extensions/BuildIdRunSelectorExtension.java b/src/main/java/org/jenkinsci/plugins/badge/extensions/BuildIdRunSelectorExtension.java index bd80974b..c6877d16 100644 --- a/src/main/java/org/jenkinsci/plugins/badge/extensions/BuildIdRunSelectorExtension.java +++ b/src/main/java/org/jenkinsci/plugins/badge/extensions/BuildIdRunSelectorExtension.java @@ -32,26 +32,35 @@ public Run select(Job project, String build, Run run) { run = run.getPreviousBuild(); } } else { - if (build.equals("last")) { - run = project.getLastBuild(); - } else if (build.equals("lastFailed")) { - run = project.getLastFailedBuild(); - } else if (build.equals("lastSuccessful")) { - run = project.getLastSuccessfulBuild(); - } else if (build.equals("lastUnsuccessful")) { - run = project.getLastUnsuccessfulBuild(); - } else if (build.equals("lastStable")) { - run = project.getLastStableBuild(); - } else if (build.equals("lastUnstable")) { - run = project.getLastUnstableBuild(); - } else if (build.equals("lastCompleted")) { - run = project.getLastCompletedBuild(); - } else { - // try to get build via ID - run = project.getBuild(build); - if (run == null && buildIdIsInteger) { - run = project.getBuildByNumber(buildNr); - } + switch (build) { + case "last": + run = project.getLastBuild(); + break; + case "lastFailed": + run = project.getLastFailedBuild(); + break; + case "lastSuccessful": + run = project.getLastSuccessfulBuild(); + break; + case "lastUnsuccessful": + run = project.getLastUnsuccessfulBuild(); + break; + case "lastStable": + run = project.getLastStableBuild(); + break; + case "lastUnstable": + run = project.getLastUnstableBuild(); + break; + case "lastCompleted": + run = project.getLastCompletedBuild(); + break; + default: + // try to get build via ID + run = project.getBuild(build); + if (run == null && buildIdIsInteger) { + run = project.getBuildByNumber(buildNr); + } + break; } } return run; diff --git a/src/main/java/org/jenkinsci/plugins/badge/extensions/BuildParameterRunSelectorExtension.java b/src/main/java/org/jenkinsci/plugins/badge/extensions/BuildParameterRunSelectorExtension.java index f33c8761..3f774398 100644 --- a/src/main/java/org/jenkinsci/plugins/badge/extensions/BuildParameterRunSelectorExtension.java +++ b/src/main/java/org/jenkinsci/plugins/badge/extensions/BuildParameterRunSelectorExtension.java @@ -52,18 +52,27 @@ private Run findSpecific(Job job, Run run, String what, String specific) { run = findSpecific(job, job.getFirstBuild(), what, specific); } else { if (specific != null) { - if (specific.equals("Failed")) { - run = job.getLastFailedBuild(); - } else if (specific.equals("Successful")) { - run = job.getLastSuccessfulBuild(); - } else if (specific.equals("Unsuccessful")) { - run = job.getLastUnsuccessfulBuild(); - } else if (specific.equals("Stable")) { - run = job.getLastStableBuild(); - } else if (specific.equals("Unstable")) { - run = job.getLastUnstableBuild(); - } else if (specific.equals("Completed")) { - run = job.getLastCompletedBuild(); + switch (specific) { + case "Failed": + run = job.getLastFailedBuild(); + break; + case "Successful": + run = job.getLastSuccessfulBuild(); + break; + case "Unsuccessful": + run = job.getLastUnsuccessfulBuild(); + break; + case "Stable": + run = job.getLastStableBuild(); + break; + case "Unstable": + run = job.getLastUnstableBuild(); + break; + case "Completed": + run = job.getLastCompletedBuild(); + break; + default: + break; } } diff --git a/src/test/java/org/jenkinsci/plugins/badge/JobBadgeActionFactoryTest.java b/src/test/java/org/jenkinsci/plugins/badge/JobBadgeActionFactoryTest.java index c709dd7d..7d2bf331 100644 --- a/src/test/java/org/jenkinsci/plugins/badge/JobBadgeActionFactoryTest.java +++ b/src/test/java/org/jenkinsci/plugins/badge/JobBadgeActionFactoryTest.java @@ -2,7 +2,6 @@ import static org.hamcrest.CoreMatchers.*; import static org.hamcrest.MatcherAssert.assertThat; -import static org.junit.jupiter.api.Assertions.*; import hudson.model.Action; import hudson.model.Job; diff --git a/src/test/java/org/jenkinsci/plugins/badge/extensions/BuildParameterRunSelectorExtensionTest.java b/src/test/java/org/jenkinsci/plugins/badge/extensions/BuildParameterRunSelectorExtensionTest.java index 3083e402..97b86875 100644 --- a/src/test/java/org/jenkinsci/plugins/badge/extensions/BuildParameterRunSelectorExtensionTest.java +++ b/src/test/java/org/jenkinsci/plugins/badge/extensions/BuildParameterRunSelectorExtensionTest.java @@ -2,7 +2,6 @@ import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.MatcherAssert.assertThat; -import static org.junit.jupiter.api.Assertions.*; import static org.mockito.Mockito.when; import hudson.model.Job;