Merge pull request #42 from ikedam/feature/JENKINS-29357_FixFindBugsW…

…arnings [JENKINS-29357] Fixed findbugs warnings in DeadlineTimeoutStrategy
jenkinsci · Jul 18, 2015 · c3156ed · c3156ed
2 parents 86b154b + 7d5a730
commit c3156ed
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 8 deletions.
diff --git a/pom.xml b/pom.xml
@@ -52,6 +52,11 @@
       </dependency>
   </dependencies>
 
+  <properties>
+    <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+  </properties>
+
     <repositories>
         <repository>
             <id>repo.jenkins-ci.org</id>

diff --git a/src/main/java/hudson/plugins/build_timeout/impl/DeadlineTimeOutStrategy.java b/src/main/java/hudson/plugins/build_timeout/impl/DeadlineTimeOutStrategy.java
@@ -26,11 +26,11 @@ public class DeadlineTimeOutStrategy extends BuildTimeOutStrategy {
 
     public static final int MINIMUM_DEADLINE_TOLERANCE_IN_MINUTES = 1;
 
-    protected static final String DEADLINE_REGEXP = new String("[0-2]?[0-9]:[0-5][0-9](:[0-5][0-9])?");
+    protected static final String DEADLINE_REGEXP = "[0-2]?[0-9]:[0-5][0-9](:[0-5][0-9])?";
 
-    protected static final SimpleDateFormat TIME_LONG_FORMAT = new SimpleDateFormat("H:mm:ss");
-    protected static final SimpleDateFormat TIME_SHORT_FORMAT = new SimpleDateFormat("H:mm");
-    protected static final SimpleDateFormat TIMESTAMP_FORMAT = new SimpleDateFormat("yyyy-MM-dd H:mm:ss");
+    protected static final String TIME_LONG_FORMAT_PATTERN = "H:mm:ss";
+    protected static final String TIME_SHORT_FORMAT_PATTERN = "H:mm";
+    protected static final String TIMESTAMP_FORMAT_PATTERN = "yyyy-MM-dd H:mm:ss";
 
     private final String deadlineTime;
     private final int deadlineToleranceInMinutes;
@@ -87,7 +87,7 @@ public long getTimeOut(AbstractBuild<?, ?> build, BuildListener listener) throws
         }
 
         listener.getLogger().println(
-                Messages.DeadlineTimeOutStrategy_NextDeadline(TIMESTAMP_FORMAT.format(deadlineTimestamp
+                Messages.DeadlineTimeOutStrategy_NextDeadline(new SimpleDateFormat(TIMESTAMP_FORMAT_PATTERN).format(deadlineTimestamp
                         .getTime())));
 
         return deadlineTimestamp.getTimeInMillis() - now.getTimeInMillis();
@@ -98,9 +98,9 @@ private static Date parseDeadline(String deadline) throws IllegalArgumentExcepti
         if (deadline.matches(DEADLINE_REGEXP)) {
             try {
                 if (deadline.length() > 5) {
-                    return TIME_LONG_FORMAT.parse(deadline);
+                    return new SimpleDateFormat(TIME_LONG_FORMAT_PATTERN).parse(deadline);
                 } else {
-                    return TIME_SHORT_FORMAT.parse(deadline);
+                    return new SimpleDateFormat(TIME_SHORT_FORMAT_PATTERN).parse(deadline);
                 }
             } catch (ParseException e) {
             }

diff --git a/src/test/java/hudson/plugins/build_timeout/impl/DeadlineTimeOutStrategyTest.java b/src/test/java/hudson/plugins/build_timeout/impl/DeadlineTimeOutStrategyTest.java
@@ -35,6 +35,7 @@
 import hudson.plugins.build_timeout.BuildTimeoutWrapperIntegrationTest;
 import hudson.plugins.build_timeout.operations.AbortOperation;
 
+import java.text.SimpleDateFormat;
 import java.util.Arrays;
 import java.util.Calendar;
 
@@ -100,6 +101,6 @@ private String getDeadlineTimeFromNow(int offsetInSeconds) {
         Calendar deadline = Calendar.getInstance();
         deadline.add(Calendar.SECOND, offsetInSeconds);
 
-        return DeadlineTimeOutStrategy.TIME_LONG_FORMAT.format(deadline.getTime());
+        return new SimpleDateFormat(DeadlineTimeOutStrategy.TIME_LONG_FORMAT_PATTERN).format(deadline.getTime());
     }
 }