Fix bug in parsing of jobs

Author: Crim

CHANGELOG.md

@@ -2,5 +2,8 @@
 The format is based on [Keep a Changelog](http://keepachangelog.com/)
 and this project adheres to [Semantic Versioning](http://semver.org/).
 
+## 0.1.1 (02/06/2023)
+- Fixed bug in parsing of Jobs.
+
 ## 0.1.0 (01/29/2023)
 - Initial Release!

README.md

@@ -12,7 +12,7 @@ This client library is released on Maven Central.  Add a new dependency to your
 <dependency>
     <groupId>org.sourcelab</groupId>
     <artifactId>buildkite-api-client</artifactId>
-    <version>0.1.0</version>
+    <version>0.1.1</version>
 </dependency>
 ```
 

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>org.sourcelab</groupId>
     <artifactId>buildkite-api-client</artifactId>
-    <version>0.1.0</version>
+    <version>0.1.1</version>
     <packaging>jar</packaging>
 
     <!-- Require Maven 3.3.9 -->

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

@@ -77,15 +77,15 @@ public Job(
         @JsonProperty("exit_status") final int exitStatus,
         @JsonProperty("artifact_paths") final String artifactPaths,
         @JsonProperty("agent") final Agent agent,
-        @JsonProperty("createdAt") final ZonedDateTime createdAt,
-        @JsonProperty("scheduledAt") final ZonedDateTime scheduledAt,
-        @JsonProperty("runnableAt") final ZonedDateTime runnableAt,
-        @JsonProperty("startedAt") final ZonedDateTime startedAt,
-        @JsonProperty("finishedAt") final ZonedDateTime finishedAt,
+        @JsonProperty("created_at") final ZonedDateTime createdAt,
+        @JsonProperty("scheduled_at") final ZonedDateTime scheduledAt,
+        @JsonProperty("runnable_at") final ZonedDateTime runnableAt,
+        @JsonProperty("started_at") final ZonedDateTime startedAt,
+        @JsonProperty("finished_at") final ZonedDateTime finishedAt,
         @JsonProperty("retried") final Boolean retried,
-        @JsonProperty("retriedInJobId") final String retriedInJobId,
-        @JsonProperty("retriesCount") final Long retriesCount,
-        @JsonProperty("retryType") final String retryType,
+        @JsonProperty("retried_in_job_id") final String retriedInJobId,
+        @JsonProperty("retries_count") final Long retriesCount,
+        @JsonProperty("retry_type") final String retryType,
         @JsonProperty("parallel_group_index") final Integer parallelGroupIndex,
         @JsonProperty("parallel_group_total") final Integer parallelGroupTotal
     ) {

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

@@ -37,6 +37,7 @@
 import org.sourcelab.buildkite.api.client.response.Build;
 import org.sourcelab.buildkite.api.client.response.CurrentUserResponse;
 import org.sourcelab.buildkite.api.client.response.Emoji;
+import org.sourcelab.buildkite.api.client.response.Job;
 import org.sourcelab.buildkite.api.client.response.ListBuildsResponse;
 import org.sourcelab.buildkite.api.client.response.ListPipelinesResponse;
 import org.sourcelab.buildkite.api.client.response.MetaResponse;
@@ -504,12 +505,46 @@ void getBuild() {
         // Spot check
         assertEquals("build-id", build.getId());
         assertEquals("failed", build.getState());
+        assertNotNull(build.getCreatedAt());
+        assertNotNull(build.getScheduledAt());
+        assertNotNull(build.getStartedAt());
+        assertNotNull(build.getFinishedAt());
+
+        // Creator
         assertEquals("creator-id", build.getCreator().getId());
+
+        // Pipeline
         assertEquals("pipeline-id", build.getPipeline().getId());
         assertEquals("Run Tests", build.getPipeline().getName());
+
+        // Jobs
         assertEquals(4, build.getJobs().size());
-        assertEquals("Compile & Verify", build.getJobs().get(0).getName());
+
+        // Job 0
+        Job job = build.getJobs().get(0);
+        assertEquals("Compile & Verify", job.getName());
+        assertNotNull(job.getCreatedAt());
+        assertNotNull(job.getScheduledAt());
+        assertNotNull(job.getFinishedAt());
+        assertNotNull(job.getStartedAt());
+        assertEquals(0, job.getExitStatus());
+        assertFalse(job.isRetried());
+        assertNull(job.getRetriedInJobId());
+        assertEquals(0, job.getRetriesCount());
+
+        // Job 1
+        job = build.getJobs().get(1);
         assertEquals("Run tests", build.getJobs().get(1).getName());
+        assertNotNull(job.getCreatedAt());
+        assertNotNull(job.getScheduledAt());
+        assertNotNull(job.getFinishedAt());
+        assertNotNull(job.getStartedAt());
+        assertEquals(0, job.getExitStatus());
+        assertFalse(job.isRetried());
+        assertNull(job.getRetriedInJobId());
+        assertEquals(4, job.getRetriesCount());
+
+
         assertEquals(null, build.getJobs().get(2).getName());
         assertEquals("Annotate", build.getJobs().get(3).getName());
     }

src/test/resources/mockResponses/getBuild.json

@@ -229,7 +229,7 @@
     "expired_at": null,
     "retried": false,
     "retried_in_job_id": null,
-    "retries_count": null,
+    "retries_count": 4,
     "retry_type": null,
     "parallel_group_index": null,
     "parallel_group_total": null,