o Improved the Build class which now contains the queueId

khmarbaise · khmarbaise · commit 254955c71d43 · 2016-02-05T22:43:47.000+01:00
o JobWithDetails
  o Added QueueItem
  o Added inQueue
diff --git a/src/main/java/com/offbytwo/jenkins/model/Build.java b/src/main/java/com/offbytwo/jenkins/model/Build.java
@@ -13,6 +13,7 @@
 public class Build extends BaseModel {
 
     int number;
+    int queueId;
     String url;
 
     public Build() {}
@@ -29,6 +30,10 @@ public Build(int number, String url) {
     public int getNumber() {
         return number;
     }
+    
+    public int getQueueId() {
+        return queueId;
+    }
 
     public String getUrl() {
         return url;
diff --git a/src/main/java/com/offbytwo/jenkins/model/BuildWithDetails.java b/src/main/java/com/offbytwo/jenkins/model/BuildWithDetails.java
@@ -18,7 +18,7 @@
 
 public class BuildWithDetails extends Build {
 
-    List actions;
+    List actions; //Should be improved.
     boolean building;
     String description;
     int duration;
@@ -125,6 +125,11 @@ public boolean apply(Map<String, Object> action) {
         return params;
     }
 
+    /**
+     * @return The console output of the build. The
+     * line separation is done by {@code CR+LF}.
+     * @throws IOException in case of a failure.
+     */
     public String getConsoleOutputText() throws IOException {
         return client.get(url + "/logText/progressiveText");
     }
diff --git a/src/main/java/com/offbytwo/jenkins/model/Executable.java b/src/main/java/com/offbytwo/jenkins/model/Executable.java
@@ -2,24 +2,65 @@
 
 public class Executable
 {
-  Long number;
-  String url;
-  public Long getNumber()
-  {
-    return number;
-  }
-  public void setNumber(Long number)
-  {
-    this.number = number;
-  }
-  public String getUrl()
-  {
-    return url;
-  }
-  public void setUrl(String url)
-  {
-    this.url = url;
-  }
-  
-  
+    Long number;
+
+    String url;
+
+    public Long getNumber()
+    {
+        return number;
+    }
+
+    public void setNumber( Long number )
+    {
+        this.number = number;
+    }
+
+    public String getUrl()
+    {
+        return url;
+    }
+
+    public void setUrl( String url )
+    {
+        this.url = url;
+    }
+
+    @Override
+    public int hashCode()
+    {
+        final int prime = 31;
+        int result = 1;
+        result = prime * result + ( ( number == null ) ? 0 : number.hashCode() );
+        result = prime * result + ( ( url == null ) ? 0 : url.hashCode() );
+        return result;
+    }
+
+    @Override
+    public boolean equals( Object obj )
+    {
+        if ( this == obj )
+            return true;
+        if ( obj == null )
+            return false;
+        if ( getClass() != obj.getClass() )
+            return false;
+        Executable other = (Executable) obj;
+        if ( number == null )
+        {
+            if ( other.number != null )
+                return false;
+        }
+        else if ( !number.equals( other.number ) )
+            return false;
+        if ( url == null )
+        {
+            if ( other.url != null )
+                return false;
+        }
+        else if ( !url.equals( other.url ) )
+            return false;
+        return true;
+    }
+
 }
diff --git a/src/main/java/com/offbytwo/jenkins/model/Job.java b/src/main/java/com/offbytwo/jenkins/model/Job.java
@@ -45,6 +45,7 @@ public JobWithDetails details() throws IOException {
      * Trigger a build without parameters
      */
     public void build() throws IOException {
+        System.out.println( "URL:" + url );
         client.post(url + "build", true);
     }
 
diff --git a/src/main/java/com/offbytwo/jenkins/model/JobWithDetails.java b/src/main/java/com/offbytwo/jenkins/model/JobWithDetails.java
diff --git a/src/main/java/com/offbytwo/jenkins/model/QueueItem.java b/src/main/java/com/offbytwo/jenkins/model/QueueItem.java

Original file line number	Diff line number	Diff line change
`@@ -45,6 +45,7 @@ public JobWithDetails details() throws IOException {`
`45`	`45`	`* Trigger a build without parameters`
`46`	`46`	`*/`
`47`	`47`	`public void build() throws IOException {`
	`48`	`+ System.out.println( "URL:" + url );`
`48`	`49`	`client.post(url + "build", true);`
`49`	`50`	`}`
`50`	`51`