Merge pull request jenkinsci#63 from synopsys-arc-oss/release_prep

towards 1.3.30 release
rpetti · Dec 7, 2014 · 9038bd0 · 9038bd0
2 parents 1cc76a1 + 084f68e
commit 9038bd0
Show file tree

Hide file tree

Showing 33 changed files with 62 additions and 121 deletions.
diff --git a/src/main/java/com/perforce/api/Cacheable.java b/src/main/java/com/perforce/api/Cacheable.java
@@ -1,8 +1,5 @@
 package com.perforce.api;
 
-import java.io.*;
-import java.util.*;
-
 /*
  * Copyright (c) 2001, Perforce Software, All rights reserved.
  *

diff --git a/src/main/java/com/perforce/api/CommitException.java b/src/main/java/com/perforce/api/CommitException.java
@@ -1,7 +1,5 @@
 package com.perforce.api;
 
-import java.io.*;
-
 /*
  * Copyright (c) 2001, Perforce Software, All rights reserved.
  *

diff --git a/src/main/java/com/perforce/api/EventLog.java b/src/main/java/com/perforce/api/EventLog.java
@@ -2,7 +2,6 @@
 
 import java.io.*;
 import java.util.*;
-import java.net.*;
 import java.text.*;
 
 /*

diff --git a/src/main/java/com/perforce/api/Mapping.java b/src/main/java/com/perforce/api/Mapping.java
@@ -1,6 +1,5 @@
 package com.perforce.api;
 
-import java.io.*;
 import java.util.*;
 
 /*

diff --git a/src/main/java/com/perforce/api/P4JNI.java b/src/main/java/com/perforce/api/P4JNI.java
@@ -1,7 +1,6 @@
 package com.perforce.api;
 
 import java.io.*;
-import java.util.*;
 
 /*
  * Copyright (c) 2001, Perforce Software, All rights reserved.

diff --git a/src/main/java/com/perforce/api/P4Process.java b/src/main/java/com/perforce/api/P4Process.java
@@ -2,7 +2,6 @@
 
 import java.io.*;
 import java.util.*;
-import java.text.DateFormat;
 
 /*
  * Copyright (c) 2001, Perforce Software, All rights reserved.

diff --git a/src/main/java/com/perforce/api/SourceControlObject.java b/src/main/java/com/perforce/api/SourceControlObject.java
@@ -1,6 +1,5 @@
 package com.perforce.api;
 
-import java.io.*;
 import java.util.*;
 
 /*

diff --git a/src/main/java/com/perforce/api/SubmitException.java b/src/main/java/com/perforce/api/SubmitException.java
@@ -1,7 +1,5 @@
 package com.perforce.api;
 
-import java.io.*;
-
 /*
  * Copyright (c) 2001, Perforce Software, All rights reserved.
  *

diff --git a/src/main/java/com/tek42/perforce/Depot.java b/src/main/java/com/tek42/perforce/Depot.java
@@ -41,6 +41,7 @@
 import com.tek42.perforce.process.DefaultExecutorFactory;
 import com.tek42.perforce.process.Executor;
 import com.tek42.perforce.process.ExecutorFactory;
+import javax.annotation.CheckForNull;
 
 /**
  * Represents the root object from which to interact with a Perforce server.
@@ -542,23 +543,34 @@ public String getP4Ticket() {
 		return p4Ticket;
 	}
 
-	public String getServerTimezone() throws PerforceException {
-		if(serverTimeZone == null) {
-			StringTokenizer infoTokens = new StringTokenizer(info(), "\n");
-			while(infoTokens.hasMoreTokens()) {
-				String infoLine = infoTokens.nextToken();
-				if(infoLine.startsWith("Server date: ")) {
-					/* the returned date is in the usual "Perforce format", but
-					 * includes the GMT offset and a three-letter timezone code
-					 * at its end. we're interested only in the offset, which
-					 * is located at positions 33-37. */
-					serverTimeZone = infoLine.substring(33, 38);
-					break;
-				}
-			}
-		}
-		return serverTimeZone;
-	}
+        /**
+         * Get the timezone of the server.
+         * @return 
+         *      The returned date is in the usual "Perforce format", but
+	 *      includes the GMT offset and a three-letter timezone code
+	 *      at its end. 
+         *      The value may be null if cannot retrieve the info from the server response.
+         * @since 1.3.30 (JENKINS-24401)
+         */
+	 public @CheckForNull String getServerTimezone() {
+            if (serverTimeZone == null) {
+                StringTokenizer infoTokens;
+                try {
+                    infoTokens = new StringTokenizer(info(), "\n");
+                } catch (PerforceException ex) {
+                    return null;
+                }
+                while (infoTokens.hasMoreTokens()) {
+                    String infoLine = infoTokens.nextToken();
+                    if (infoLine.startsWith("Server date: ")) {
+                        /* we're interested only in the offset, which is located at positions 33-37. */
+                        serverTimeZone = infoLine.substring(33, 38);
+                        break;
+                    }
+                }
+            }
+            return serverTimeZone;
+        }
 
 	/**
 	 * If using tickets, set the value of the ticket for this depot's user. Example value would be:

diff --git a/src/main/java/com/tek42/perforce/parse/AbstractPerforceTemplate.java b/src/main/java/com/tek42/perforce/parse/AbstractPerforceTemplate.java
@@ -46,10 +46,7 @@
 import hudson.plugins.perforce.PerforceSCM;
 import hudson.plugins.perforce.utils.TimedStreamCloser;
 import java.io.InputStream;
-import java.util.concurrent.TimeoutException;
-import java.util.logging.Level;
 import org.slf4j.LoggerFactory;
-import org.apache.commons.lang.time.StopWatch;
 
 /**
  * Provides default functionality for interacting with Perforce using the template design pattern.
@@ -84,17 +81,15 @@ public AbstractPerforceTemplate(Depot depot) {
             this.depot = depot;
     }
 
-    public Logger getLogger()
-    {
+    public Logger getLogger() {
         if(depot.getLogger() != null){
             return depot.getLogger();
         } else {
             return LoggerFactory.getLogger(this.getClass());
         }
     }
 
-    protected Depot getDepot()
-    {
+    protected Depot getDepot() {
         return depot;
     }
 

diff --git a/src/main/java/com/tek42/perforce/parse/ChangelistBuilder.java b/src/main/java/com/tek42/perforce/parse/ChangelistBuilder.java
@@ -43,6 +43,7 @@
 import com.tek42.perforce.Depot;
 import com.tek42.perforce.PerforceException;
 import com.tek42.perforce.model.Changelist;
+import javax.annotation.CheckForNull;
 
 /**
  * Responsible for building and saving changelists.
@@ -53,7 +54,7 @@ public class ChangelistBuilder implements Builder<Changelist> {
 	private final Logger logger = LoggerFactory.getLogger("perforce");
 	//Maximum amount of files to be recorded to a changelist
 	private int maxFiles;
-	private final Depot depot;
+	private final @CheckForNull Depot depot;
 	private static final SimpleDateFormat dateParser = new
 			SimpleDateFormat("yyyy/MM/dd HH:mm:ss ZZZZZ", Locale.ENGLISH);
 
@@ -103,8 +104,9 @@ public Changelist build(StringBuilder sb) throws PerforceException {
 
 					// check if we have a reference to the depot containing the changelists.
 					// if so, use it in order to get information about the server's timezone.
-					if(depot != null) {
-						change.setDate(parseDateWithTimezone(date + " " + time + " " + depot.getServerTimezone()));
+                                        final String serverTimezone = depot != null ? depot.getServerTimezone() : null;
+					if(serverTimezone != null) {
+						change.setDate(parseDateWithTimezone(date + " " + time + " " + serverTimezone));
 					}
 					else {
 						change.setDate(parseDate(date + " " + time));
@@ -277,13 +279,13 @@ public void save(Changelist obj, Writer out) throws PerforceException {
 	 * expects the same format on input.
 	 * @throws PerforceException When the string passed into the function could
 	 * not be parsed according to the format specified in {@code dateParser}.
+         * @since 1.3.30 (JENKINS-24401)
 	 */
 	private static java.util.Date parseDateWithTimezone(String newDate) throws PerforceException {
 		try {
 			return dateParser.parse(newDate);
-		}
-		catch(ParseException e) {
-			throw new PerforceException("Cannot parse changelist timestamp : " + newDate);
+		} catch(ParseException e) {
+			throw new PerforceException("Cannot parse changelist timestamp : " + newDate, e);
 		}
 	}
 

diff --git a/src/main/java/com/tek42/perforce/parse/Changes.java b/src/main/java/com/tek42/perforce/parse/Changes.java
@@ -39,7 +39,6 @@
 import com.tek42.perforce.model.Changelist;
 import com.tek42.perforce.model.Workspace;
 import hudson.plugins.perforce.PerforceSCMHelper;
-import java.io.IOException;
 
 /**
  * Base API object for interacting with changelists.

diff --git a/src/main/java/com/tek42/perforce/parse/Groups.java b/src/main/java/com/tek42/perforce/parse/Groups.java
@@ -33,8 +33,6 @@
 import com.tek42.perforce.Depot;
 import com.tek42.perforce.PerforceException;
 import com.tek42.perforce.model.Group;
-import com.tek42.perforce.model.Workspace;
-import com.tek42.perforce.model.Changelist;
 
 /**
  * Object for working with perforce groups.

diff --git a/src/main/java/hudson/plugins/perforce/HudsonP4DefaultExecutor.java b/src/main/java/hudson/plugins/perforce/HudsonP4DefaultExecutor.java
@@ -5,7 +5,6 @@
 import java.util.Set;
 
 import com.tek42.perforce.PerforceException;
-import com.tek42.perforce.process.Executor;
 import hudson.FilePath;
 import hudson.Launcher;
 import hudson.Proc;

diff --git a/src/main/java/hudson/plugins/perforce/HudsonP4Executor.java b/src/main/java/hudson/plugins/perforce/HudsonP4Executor.java
@@ -7,8 +7,6 @@
 
 import com.tek42.perforce.PerforceException;
 import com.tek42.perforce.process.Executor;
-import java.io.BufferedReader;
-import java.io.BufferedWriter;
 import java.io.InputStream;
 import java.io.OutputStream;
 

diff --git a/src/main/java/hudson/plugins/perforce/HudsonP4RemoteExecutor.java b/src/main/java/hudson/plugins/perforce/HudsonP4RemoteExecutor.java
@@ -10,8 +10,6 @@
 import java.util.Set;
 
 import com.tek42.perforce.PerforceException;
-import com.tek42.perforce.process.Executor;
-import hudson.CloseProofOutputStream;
 import hudson.FilePath;
 import hudson.Launcher;
 import hudson.Launcher.LocalLauncher;
@@ -20,8 +18,6 @@
 import hudson.model.Hudson;
 import hudson.model.TaskListener;
 import hudson.remoting.Callable;
-import hudson.remoting.Channel;
-import hudson.remoting.Channel.Listener;
 import hudson.remoting.FastPipedInputStream;
 import hudson.remoting.FastPipedOutputStream;
 import hudson.remoting.Future;

diff --git a/src/main/java/hudson/plugins/perforce/HudsonPipedOutputStream.java b/src/main/java/hudson/plugins/perforce/HudsonPipedOutputStream.java
@@ -1,7 +1,6 @@
 package hudson.plugins.perforce;
 
 import java.io.IOException;
-import java.io.PipedOutputStream;
 
 import hudson.Proc;
 import hudson.remoting.FastPipedOutputStream;

diff --git a/src/main/java/hudson/plugins/perforce/PerforceChangeLogEntry.java b/src/main/java/hudson/plugins/perforce/PerforceChangeLogEntry.java
@@ -1,9 +1,6 @@
 package hudson.plugins.perforce;
 
-import java.io.IOException;
 import java.util.*;
-import java.util.logging.Level;
-import java.util.logging.Logger;
 
 import org.kohsuke.stapler.export.Exported;
 

diff --git a/src/main/java/hudson/plugins/perforce/PerforceChangeLogSet.java b/src/main/java/hudson/plugins/perforce/PerforceChangeLogSet.java
@@ -1,7 +1,6 @@
 package hudson.plugins.perforce;
 
 import com.tek42.perforce.model.Changelist;
-import hudson.Util;
 import hudson.model.AbstractBuild;
 import hudson.scm.ChangeLogSet;
 import java.io.IOException;

diff --git a/src/main/java/hudson/plugins/perforce/PerforceMailResolver.java b/src/main/java/hudson/plugins/perforce/PerforceMailResolver.java
@@ -1,14 +1,11 @@
 package hudson.plugins.perforce;
 
-import com.tek42.perforce.PerforceException;
 import hudson.Extension;
 import hudson.FilePath;
 import hudson.Launcher;
-import hudson.matrix.MatrixConfiguration;
 import hudson.model.*;
 import hudson.tasks.MailAddressResolver;
 import hudson.util.StreamTaskListener;
-import java.io.File;
 import java.util.logging.Logger;
 
 /**

diff --git a/src/main/java/hudson/plugins/perforce/PerforcePasswordEncryptor.java b/src/main/java/hudson/plugins/perforce/PerforcePasswordEncryptor.java
@@ -1,6 +1,5 @@
 package hudson.plugins.perforce;
 
-import java.io.IOException;
 import java.io.UnsupportedEncodingException;
 import java.security.InvalidKeyException;
 import java.security.NoSuchAlgorithmException;