Fixed jenkinsci#159

khmarbaise · khmarbaise · commit 57d19e687dec · 2016-05-14T21:45:30.000+02:00
o getAllBuilds(), getAllBuilds(Range range) and getBuilds()
   will return Collections.emptyList() instead of null in case
   of no build has been executed before.
diff --git a/ReleaseNotes.md b/ReleaseNotes.md
@@ -4,6 +4,17 @@
 
 ### API Changes
 
+  [Fixed issue 159][issue-159]
+
+  The following methods have been changed to return `Collections.emtpyList()` if 
+  no builds exists or have ran before.
+
+```java
+getAllBuilds(Range range);
+getAllBuilds(), 
+getBuilds()
+```
+
   [Fixed NPE][issue-147]
 
   The JobWithDetails class contains several methods which could
@@ -407,6 +418,7 @@ TestReport testReport = mavenJob.getLastSuccessfulBuild().getTestReport();
 [issue-154]: https://github.com/RisingOak/jenkins-client/issues/154
 [issue-155]: https://github.com/RisingOak/jenkins-client/issues/155
 [issue-157]: https://github.com/RisingOak/jenkins-client/issues/157
+[issue-159]: https://github.com/RisingOak/jenkins-client/issues/159
 [pull-123]: https://github.com/RisingOak/jenkins-client/pull/123
 [pull-149]: https://github.com/RisingOak/jenkins-client/pull/149
 [pull-158]: https://github.com/RisingOak/jenkins-client/pull/158
diff --git a/src/main/java/com/offbytwo/jenkins/model/JobWithDetails.java b/src/main/java/com/offbytwo/jenkins/model/JobWithDetails.java
@@ -75,15 +75,21 @@ public boolean isInQueue() {
      * won't get back all builds via this method. In such cases you need to use
      * {@link #getAllBuilds()}.
      * 
-     * @return the list of {@link Build}.
+     * @return the list of {@link Build}. In case of no builds have been 
+     * executed yet return {@link Collections#emptyList()}.
      */
     public List<Build> getBuilds() {
-        return transform(builds, new Function<Build, Build>() {
-            @Override
-            public Build apply(Build from) {
-                return buildWithClient(from);
-            }
-        });
+        if (builds == null) {
+            return Collections.emptyList();
+        }
+        else {
+            return transform(builds, new Function<Build, Build>() {
+                @Override
+                public Build apply(Build from) {
+                    return buildWithClient(from);
+                }
+            });
+        }
     }
 
     /**
@@ -95,7 +101,8 @@ public Build apply(Build from) {
      * particular build {@link Build#details()} to reduce the amount of data
      * which needed to be transfered.
      * 
-     * @return the list of {@link Build}.
+     * @return the list of {@link Build}. In case of no builds have been 
+     * executed yet return {@link Collections#emptyList()}.
      * @throws IOException
      *             In case of failure.
      * @see <a href="https://issues.jenkins-ci.org/browse/JENKINS-30238">Jenkins
@@ -108,12 +115,16 @@ public List<Build> getAllBuilds() throws IOException {
             List<Build> builds = client.get(path + "job/" + EncodingUtils.encode(this.getName())
                     + "?tree=allBuilds[number[*],url[*],queueId[*]]", AllBuilds.class).getAllBuilds();
 
-            return transform(builds, new Function<Build, Build>() {
-                @Override
-                public Build apply(Build from) {
-                    return buildWithClient(from);
-                }
-            });
+            if (builds == null) {
+                return Collections.emptyList();
+            } else {
+                return transform(builds, new Function<Build, Build>() {
+                    @Override
+                    public Build apply(Build from) {
+                        return buildWithClient(from);
+                    }
+                });
+            }
         } catch (HttpResponseException e) {
             // TODO: Thinks about a better handline if the job does not exist?
             if (e.getStatusCode() == HttpStatus.SC_NOT_FOUND) {
@@ -142,7 +153,8 @@ public Build apply(Build from) {
      * {@link #getAllBuilds()}.</b>
      * 
      * @param range {@link Range}
-     * @return The list of builds defined by the given range.
+     * @return the list of {@link Build}. In case of no builds have been 
+     * executed yet return {@link Collections#emptyList()}.
      * @throws IOException in case of an error.
      */
     public List<Build> getAllBuilds(Range range) throws IOException {
@@ -152,12 +164,16 @@ public List<Build> getAllBuilds(Range range) throws IOException {
         try {
             List<Build> builds = client.get(path + range.getRangeString(), AllBuilds.class).getAllBuilds();
 
-            return transform(builds, new Function<Build, Build>() {
-                @Override
-                public Build apply(Build from) {
-                    return buildWithClient(from);
-                }
-            });
+            if (builds == null) {
+                return Collections.emptyList();
+            } else {
+                return transform(builds, new Function<Build, Build>() {
+                    @Override
+                    public Build apply(Build from) {
+                        return buildWithClient(from);
+                    }
+                });
+            }
         } catch (HttpResponseException e) {
             // TODO: Thinks about a better handline if the job does not exist?
             if (e.getStatusCode() == HttpStatus.SC_NOT_FOUND) {
@@ -292,6 +308,7 @@ public boolean apply(Build input) {
         };
 
         Optional<Build> optionalBuild = Iterables.tryFind(builds, isMatchingBuildNumber);
+        //TODO: Check if we could use Build#NO...instead of Null?
         return optionalBuild.orNull() == null ? null : buildWithClient(optionalBuild.orNull());
     }
 
