Cleaning up code

khmarbaise · khmarbaise · commit 6105dcdb8e73 · 2015-12-06T19:29:39.000+01:00
Removed literal status values and replaced them with status constant.
Removed unused imports.
diff --git a/src/main/java/com/offbytwo/jenkins/JenkinsServer.java b/src/main/java/com/offbytwo/jenkins/JenkinsServer.java
@@ -13,6 +13,7 @@
 
 import javax.xml.bind.JAXBException;
 
+import org.apache.commons.httpclient.HttpStatus;
 import org.apache.http.client.HttpResponseException;
 import org.apache.http.entity.ContentType;
 import org.dom4j.DocumentException;
@@ -237,7 +238,7 @@ public JobWithDetails getJob(FolderJob folder, String jobName) throws IOExceptio
 
             return job;
         } catch (HttpResponseException e) {
-            if (e.getStatusCode() == 404) {
+            if (e.getStatusCode() == HttpStatus.SC_NOT_FOUND) {
                 return null;
             }
             throw e;
@@ -259,7 +260,7 @@ public MavenJobWithDetails getMavenJob(FolderJob folder, String jobName) throws
 
             return job;
         } catch (HttpResponseException e) {
-            if (e.getStatusCode() == 404) {
+            if (e.getStatusCode() == HttpStatus.SC_NOT_FOUND) {
                 return null;
             }
             throw e;
@@ -276,7 +277,7 @@ public Optional<FolderJob> getFolderJob(Job job) throws IOException {
 
             return Optional.of(folder);
         } catch (HttpResponseException e) {
-            if (e.getStatusCode() == 404) {
+            if (e.getStatusCode() == HttpStatus.SC_NOT_FOUND) {
                 return null;
             }
             throw e;
@@ -523,7 +524,7 @@ public QueueItem getQueueItem(QueueReference ref) throws IOException
 
         return job;
       } catch (HttpResponseException e) {
-          if (e.getStatusCode() == 404) {
+          if (e.getStatusCode() == HttpStatus.SC_NOT_FOUND) {
               return null;
           }
           throw e;
@@ -541,7 +542,7 @@ public Build getBuild(QueueItem q)  throws IOException
 
         return job;
       } catch (HttpResponseException e) {
-          if (e.getStatusCode() == 404) {
+          if (e.getStatusCode() == HttpStatus.SC_NOT_FOUND) {
               return null;
           }
           throw e;
diff --git a/src/main/java/com/offbytwo/jenkins/client/JenkinsHttpClient.java b/src/main/java/com/offbytwo/jenkins/client/JenkinsHttpClient.java
@@ -15,15 +15,12 @@
 import java.util.List;
 import java.util.Map;
 
-import net.sf.json.JSONObject;
-
 import org.apache.commons.io.IOUtils;
 import org.apache.commons.lang.StringUtils;
 import org.apache.http.HttpResponse;
 import org.apache.http.auth.AuthScope;
 import org.apache.http.auth.UsernamePasswordCredentials;
 import org.apache.http.client.CredentialsProvider;
-import org.apache.http.client.config.RequestConfig;
 import org.apache.http.client.methods.HttpGet;
 import org.apache.http.client.methods.HttpPost;
 import org.apache.http.client.methods.HttpRequestBase;
@@ -51,6 +48,8 @@
 import com.offbytwo.jenkins.model.Crumb;
 import com.offbytwo.jenkins.model.ExtractHeader;
 
+import net.sf.json.JSONObject;
+
 public class JenkinsHttpClient {
 
     private static final int SO_TIMEOUT_IN_MILLISECONDS = 3000;
