add missing fields

Author: Crim

src/main/java/org/sourcelab/buildkite/api/client/response/Build.java

@@ -46,6 +46,7 @@ public class Build {
     private final Creator creator;
     private final Pipeline pipeline;
     private final List<Job> jobs;
+    private final RebuiltFrom rebuiltFrom;
 
     /**
      * Constructor.
@@ -70,7 +71,8 @@ public Build(
         @JsonProperty("author") final Author author,
         @JsonProperty("creator") final Creator creator,
         @JsonProperty("pipeline") final Pipeline pipeline,
-        @JsonProperty("jobs") final List<Job> jobs
+        @JsonProperty("jobs") final List<Job> jobs,
+        @JsonProperty("rebuilt_from") final RebuiltFrom rebuiltFrom
     ) {
         this.id = id;
         this.graphqlId = graphqlId;
@@ -91,6 +93,7 @@ public Build(
         this.creator = creator;
         this.pipeline = pipeline;
         this.jobs = jobs;
+        this.rebuiltFrom = rebuiltFrom;
     }
 
     public String getId() {
@@ -169,6 +172,10 @@ public List<Job> getJobs() {
         return jobs;
     }
 
+    public RebuiltFrom getRebuiltFrom() {
+        return rebuiltFrom;
+    }
+
     @Override
     public String toString() {
         return "Build{"
@@ -191,6 +198,7 @@ public String toString() {
             + ", creator=" + creator
             + ", pipeline=" + pipeline
             + ", jobs=" + jobs
+            + ", rebuiltFrom=" + rebuiltFrom
             + '}';
     }
 

src/main/java/org/sourcelab/buildkite/api/client/response/Pipeline.java

@@ -20,6 +20,9 @@
 import com.fasterxml.jackson.annotation.JsonProperty;
 
 import java.time.ZonedDateTime;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
 
 public class Pipeline {
     // TODO Fields
@@ -51,31 +54,33 @@ public class Pipeline {
     private final long waitingJobsCount;
 
     private final Provider provider;
+    private final List<Step> steps;
 
     /**
      * Constructor.
      */
     public Pipeline(
-            @JsonProperty("id") final String id,
-            @JsonProperty("graphql_id") final String graphqlId,
-            @JsonProperty("url") final String url,
-            @JsonProperty("name") final String name,
-            @JsonProperty("description") final String description,
-            @JsonProperty("slug") final String slug,
-            @JsonProperty("repository") final String repository,
-            @JsonProperty("cluster_id") final String clusterId,
-            @JsonProperty("skip_queued_branch_builds") final Boolean skipQueuedBranchBuilds,
-            @JsonProperty("cancel_running_branch_builds") final Boolean cancelRunningBranchBuilds,
-            @JsonProperty("allow_rebuilds") final Boolean allowRebuilds,
-            @JsonProperty("builds_url") final String buildsUrl,
-            @JsonProperty("badge_url") final String badgeUrl,
-            @JsonProperty("created_at") final ZonedDateTime createdAt,
-            @JsonProperty("scheduled_builds_count") final Long scheduledBuildsCount,
-            @JsonProperty("running_builds_count") final Long runningBuildsCount,
-            @JsonProperty("scheduled_jobs_count") final Long scheduledJobsCount,
-            @JsonProperty("running_jobs_count") final Long runningJobsCount,
-            @JsonProperty("waiting_jobs_count") final Long waitingJobsCount,
-            @JsonProperty("provider") final Provider provider
+        @JsonProperty("id") final String id,
+        @JsonProperty("graphql_id") final String graphqlId,
+        @JsonProperty("url") final String url,
+        @JsonProperty("name") final String name,
+        @JsonProperty("description") final String description,
+        @JsonProperty("slug") final String slug,
+        @JsonProperty("repository") final String repository,
+        @JsonProperty("cluster_id") final String clusterId,
+        @JsonProperty("skip_queued_branch_builds") final Boolean skipQueuedBranchBuilds,
+        @JsonProperty("cancel_running_branch_builds") final Boolean cancelRunningBranchBuilds,
+        @JsonProperty("allow_rebuilds") final Boolean allowRebuilds,
+        @JsonProperty("builds_url") final String buildsUrl,
+        @JsonProperty("badge_url") final String badgeUrl,
+        @JsonProperty("created_at") final ZonedDateTime createdAt,
+        @JsonProperty("scheduled_builds_count") final Long scheduledBuildsCount,
+        @JsonProperty("running_builds_count") final Long runningBuildsCount,
+        @JsonProperty("scheduled_jobs_count") final Long scheduledJobsCount,
+        @JsonProperty("running_jobs_count") final Long runningJobsCount,
+        @JsonProperty("waiting_jobs_count") final Long waitingJobsCount,
+        @JsonProperty("provider") final Provider provider,
+        @JsonProperty("steps") final List<Step> steps
     ) {
         this.id = id;
         this.graphqlId = graphqlId;
@@ -97,6 +102,12 @@ public Pipeline(
         this.runningJobsCount = runningJobsCount == null ? 0 : runningJobsCount;
         this.waitingJobsCount = waitingJobsCount == null ? 0 : waitingJobsCount;
         this.provider = provider;
+
+        final List<Step> stepList = new ArrayList<>();
+        if (steps != null) {
+            stepList.addAll(steps);
+        }
+        this.steps = Collections.unmodifiableList(stepList);
     }
 
     public String getId() {
@@ -179,6 +190,10 @@ public boolean isAllowRebuilds() {
         return allowRebuilds;
     }
 
+    public List<Step> getSteps() {
+        return steps;
+    }
+
     @Override
     public String toString() {
         return "Pipeline{"
@@ -202,6 +217,7 @@ public String toString() {
             + ", runningJobsCount=" + runningJobsCount
             + ", waitingJobsCount=" + waitingJobsCount
             + ", provider=" + provider
+            + ", steps=" + steps
             + '}';
     }
 }

src/main/java/org/sourcelab/buildkite/api/client/response/Provider.java

@@ -20,9 +20,14 @@
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
+
 public class Provider {
     private final String id;
     private final String webhookUrl;
+    private final Map<String, String> settings;
 
     /**
      * Constructor.
@@ -32,10 +37,17 @@ public class Provider {
     @JsonCreator
     public Provider(
         @JsonProperty("id") final String id,
-        @JsonProperty("webhook_url") final String webhookUrl
+        @JsonProperty("webhook_url") final String webhookUrl,
+        @JsonProperty("settings") final Map<String, String> settings
     ) {
         this.id = id;
         this.webhookUrl = webhookUrl;
+
+        final Map<String, String> settingsMap = new HashMap<>();
+        if (settings != null) {
+            settingsMap.putAll(settings);
+        }
+        this.settings = Collections.unmodifiableMap(settingsMap);
     }
 
     public String getId() {
@@ -46,11 +58,16 @@ public String getWebhookUrl() {
         return webhookUrl;
     }
 
+    public Map<String, String> getSettings() {
+        return settings;
+    }
+
     @Override
     public String toString() {
         return "Provider{"
             + "id='" + id + '\''
             + ", webhookUrl='" + webhookUrl + '\''
+            + ", settings=" + settings
             + '}';
     }
 }

src/main/java/org/sourcelab/buildkite/api/client/response/RebuiltFrom.java

@@ -0,0 +1,62 @@
+/**
+ * Copyright 2023 SourceLab.org https://github.com/SourceLabOrg/Buildkite-Api-Client
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated
+ * documentation files (the "Software"), to deal in the Software without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit
+ * persons to whom the Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+ * WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+ * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+ * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+package org.sourcelab.buildkite.api.client.response;
+
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+public class RebuiltFrom {
+    private final String id;
+    private final long number;
+    private final String url;
+
+    /**
+     * Constructor.
+     */
+    @JsonCreator
+    public RebuiltFrom(
+        @JsonProperty("id") final String id,
+        @JsonProperty("number") final long number,
+        @JsonProperty("url") final String url
+    ) {
+        this.id = id;
+        this.number = number;
+        this.url = url;
+    }
+
+    public String getId() {
+        return id;
+    }
+
+    public long getNumber() {
+        return number;
+    }
+
+    public String getUrl() {
+        return url;
+    }
+
+    @Override
+    public String toString() {
+        return "RebuiltFrom{"
+            + "id='" + id + '\''
+            + ", number=" + number
+            + ", url='" + url + '\''
+            + '}';
+    }
+}

src/test/java/org/sourcelab/buildkite/api/client/BuildkiteClientTest.java

@@ -337,6 +337,10 @@ void listBuilds() {
         assertEquals("Run Tests", build.getPipeline().getName());
         assertNotNull(build.getPipeline().getProvider());
         assertEquals("github", build.getPipeline().getProvider().getId());
+        assertNotNull(build.getRebuiltFrom());
+        assertEquals("build-id", build.getRebuiltFrom().getId());
+        assertEquals(46, build.getRebuiltFrom().getNumber());
+        assertEquals("https://api.buildkite.com/v2/organizations/orgSlug/pipelines/pipelineSlug/builds/46", build.getRebuiltFrom().getUrl());
 
         build = response.getBuilds().get(1);
         assertEquals("01858542", build.getId());
@@ -355,6 +359,7 @@ void listBuilds() {
         assertEquals("Run Tests", build.getPipeline().getName());
         assertNotNull(build.getPipeline().getProvider());
         assertEquals("github", build.getPipeline().getProvider().getId());
+        assertNull(build.getRebuiltFrom());
     }
 
     /**
@@ -580,8 +585,35 @@ void listPipelines() {
         pipeline = response.getPipelines().get(1);
         assertEquals("pipeline-id-2", pipeline.getId());
         assertEquals("pipeline-name-2", pipeline.getName());
+
+        // Spot check provider
         assertNotNull(pipeline.getProvider());
         assertEquals("github", pipeline.getProvider().getId());
+        assertEquals("https://webhook.buildkite.com/deliver/webook-hash2", pipeline.getProvider().getWebhookUrl());
+        assertNotNull(pipeline.getProvider().getSettings());
+        assertEquals(20, pipeline.getProvider().getSettings().size());
+        assertEquals("true", pipeline.getProvider().getSettings().get("build_pull_requests"));
+        assertEquals("code", pipeline.getProvider().getSettings().get("trigger_mode"));
+
+        // Spot Check Steps
+        assertNotNull(pipeline.getSteps());
+        assertEquals(4, pipeline.getSteps().size());
+        assertEquals("script", pipeline.getSteps().get(0).getType());
+        assertEquals("Compile & Verify", pipeline.getSteps().get(0).getName());
+        assertEquals("mvn clean compile", pipeline.getSteps().get(0).getCommand());
+
+        assertEquals("script", pipeline.getSteps().get(1).getType());
+        assertEquals("Run tests", pipeline.getSteps().get(1).getName());
+        assertEquals("mvn test", pipeline.getSteps().get(1).getCommand());
+
+        assertEquals("waiter", pipeline.getSteps().get(2).getType());
+        assertEquals(null, pipeline.getSteps().get(2).getName());
+        assertEquals(null, pipeline.getSteps().get(2).getCommand());
+
+        assertEquals("script", pipeline.getSteps().get(3).getType());
+        assertEquals("Annotate", pipeline.getSteps().get(3).getName());
+        assertEquals(null, pipeline.getSteps().get(3).getCommand());
+        assertFalse(pipeline.getSteps().get(3).getEnv().isEmpty());
     }
 
     /**

src/test/resources/mockResponses/listBuilds.json

@@ -32,7 +32,11 @@
   "finished_at": null,
   "meta_data": {},
   "pull_request": null,
-  "rebuilt_from": null,
+  "rebuilt_from": {
+    "id": "build-id",
+    "number": 46,
+    "url": "https://api.buildkite.com/v2/organizations/orgSlug/pipelines/pipelineSlug/builds/46"
+  },
   "pipeline": {
     "id": "pipeline-id",
     "graphql_id": "pipeline-graphql-id",