From 681420bb4fa8ca94985bc4166419f8cca525fbfe Mon Sep 17 00:00:00 2001 From: Stefan Spieker Date: Sun, 28 Jul 2019 10:36:32 +0200 Subject: [PATCH] JENKINS-36720: Fixed some spotbugs findings (SE_NO_SERIALVERSIONID, CO_COMPARETO_INCORRECT_FLOATING, VA_FORMAT_STRING_USES_NEWLINE) --- core/src/main/java/hudson/ExtensionComponent.java | 4 ++-- .../java/hudson/cli/SetBuildDescriptionCommand.java | 2 ++ .../src/main/java/hudson/model/FileParameterValue.java | 1 + core/src/main/java/hudson/model/HealthReport.java | 2 ++ core/src/main/java/hudson/model/JDK.java | 1 + .../security/HudsonAuthenticationEntryPoint.java | 10 +++++----- core/src/test/java/hudson/model/TaskActionTest.java | 4 +++- 7 files changed, 16 insertions(+), 8 deletions(-) diff --git a/core/src/main/java/hudson/ExtensionComponent.java b/core/src/main/java/hudson/ExtensionComponent.java index 98e03969f3..d274e11204 100644 --- a/core/src/main/java/hudson/ExtensionComponent.java +++ b/core/src/main/java/hudson/ExtensionComponent.java @@ -88,8 +88,8 @@ public class ExtensionComponent implements Comparable> public int compareTo(ExtensionComponent that) { double a = this.ordinal(); double b = that.ordinal(); - if (a>b) return -1; - if (a 0) return -1; + if (Double.compare(a, b) < 0) return 1; // make the order bit more deterministic among extensions of the same ordinal if (this.instance instanceof Descriptor && that.instance instanceof Descriptor) { diff --git a/core/src/main/java/hudson/cli/SetBuildDescriptionCommand.java b/core/src/main/java/hudson/cli/SetBuildDescriptionCommand.java index 3322929125..920c74198a 100644 --- a/core/src/main/java/hudson/cli/SetBuildDescriptionCommand.java +++ b/core/src/main/java/hudson/cli/SetBuildDescriptionCommand.java @@ -12,6 +12,8 @@ import org.kohsuke.args4j.Argument; @Extension public class SetBuildDescriptionCommand extends CLICommand implements Serializable { + private static final long serialVersionUID = 2690066739899830515L; + @Override public String getShortDescription() { return Messages.SetBuildDescriptionCommand_ShortDescription(); diff --git a/core/src/main/java/hudson/model/FileParameterValue.java b/core/src/main/java/hudson/model/FileParameterValue.java index 33336cd6b2..4e059196e6 100644 --- a/core/src/main/java/hudson/model/FileParameterValue.java +++ b/core/src/main/java/hudson/model/FileParameterValue.java @@ -67,6 +67,7 @@ import org.kohsuke.stapler.StaplerResponse; public class FileParameterValue extends ParameterValue { private static final String FOLDER_NAME = "fileParameters"; private static final Pattern PROHIBITED_DOUBLE_DOT = Pattern.compile(".*[\\\\/]\\.\\.[\\\\/].*"); + private static final long serialVersionUID = -143427023159076073L; /** * Escape hatch for SECURITY-1074, fileParameter used to escape their expected folder. diff --git a/core/src/main/java/hudson/model/HealthReport.java b/core/src/main/java/hudson/model/HealthReport.java index 7b67538272..6f82347b37 100644 --- a/core/src/main/java/hudson/model/HealthReport.java +++ b/core/src/main/java/hudson/model/HealthReport.java @@ -63,6 +63,8 @@ public class HealthReport implements Serializable, Comparable { private static final String HEALTH_UNKNOWN_IMG = "empty.png"; private static final Map iconIMGToClassMap = new HashMap<>(); + private static final long serialVersionUID = 7451361788415642230L; + static { iconIMGToClassMap.put(HEALTH_OVER_80_IMG, HEALTH_OVER_80); iconIMGToClassMap.put(HEALTH_61_TO_80_IMG, HEALTH_61_TO_80); diff --git a/core/src/main/java/hudson/model/JDK.java b/core/src/main/java/hudson/model/JDK.java index 2aaf9463d5..9a243cb2ba 100644 --- a/core/src/main/java/hudson/model/JDK.java +++ b/core/src/main/java/hudson/model/JDK.java @@ -64,6 +64,7 @@ public final class JDK extends ToolInstallation implements NodeSpecific, En * @since 1.577 */ public static final String DEFAULT_NAME = "(System)"; + private static final long serialVersionUID = -3318291200160313357L; @Restricted(NoExternalUse.class) public static boolean isDefaultName(String name) { diff --git a/core/src/main/java/hudson/security/HudsonAuthenticationEntryPoint.java b/core/src/main/java/hudson/security/HudsonAuthenticationEntryPoint.java index b590dce408..4b86333f62 100644 --- a/core/src/main/java/hudson/security/HudsonAuthenticationEntryPoint.java +++ b/core/src/main/java/hudson/security/HudsonAuthenticationEntryPoint.java @@ -105,16 +105,16 @@ public class HudsonAuthenticationEntryPoint extends AuthenticationProcessingFilt "" + "" + "" + - "\n" + - "\n\n"+ - "Authentication required\n"+ - "\n\n"+ + "-->%n%n"+ ""); // Turn Off "Show Friendly HTTP Error Messages" Feature on the Server Side. // See http://support.microsoft.com/kb/294807 diff --git a/core/src/test/java/hudson/model/TaskActionTest.java b/core/src/test/java/hudson/model/TaskActionTest.java index bfcf679cad..258fc67bb9 100644 --- a/core/src/test/java/hudson/model/TaskActionTest.java +++ b/core/src/test/java/hudson/model/TaskActionTest.java @@ -1,5 +1,6 @@ package hudson.model; +import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; import java.io.ByteArrayOutputStream; @@ -58,7 +59,8 @@ public class TaskActionTest { Thread.sleep(10); } ByteArrayOutputStream os = new ByteArrayOutputStream(); - annotatedText.writeLogTo(0, os); + final long length = annotatedText.writeLogTo(0, os); + assertEquals(220, length); assertTrue(os.toString("UTF-8").startsWith("a linkCompleted")); } }