Revert JobEvent and update BuildEvent

Author: yarisvt

gitlab4j-models/src/main/java/org/gitlab4j/api/webhook/BuildEvent.java

@@ -2,6 +2,7 @@
 
 import java.util.Date;
 
+import org.gitlab4j.api.models.Runner;
 import org.gitlab4j.models.utils.JacksonJson;
 
 /**
@@ -18,10 +19,12 @@ public class BuildEvent extends AbstractEvent {
     private Boolean tag;
     private String beforeSha;
     private String sha;
+    private Integer retriesCount;
     private Long buildId;
     private String buildName;
     private String buildStage;
     private String buildStatus;
+    private Date buildCreatedAt;
     private Date buildStartedAt;
     private Date buildFinishedAt;
     private Float buildDuration;
@@ -36,6 +39,8 @@ public class BuildEvent extends AbstractEvent {
     private EventUser user;
     private BuildCommit commit;
     private EventRepository repository;
+    private EventProject project;
+    private Runner runner;
 
     @Override
     public String getObjectKind() {
@@ -79,6 +84,14 @@ public void setSha(String sha) {
         this.sha = sha;
     }
 
+    public Integer getRetriesCount() {
+        return retriesCount;
+    }
+
+    public void setRetriesCount(Integer retriesCount) {
+        this.retriesCount = retriesCount;
+    }
+
     public Long getBuildId() {
         return buildId;
     }
@@ -111,6 +124,14 @@ public void setBuildStatus(String buildStatus) {
         this.buildStatus = buildStatus;
     }
 
+    public Date getBuildCreatedAt() {
+        return buildCreatedAt;
+    }
+
+    public void setBuildCreatedAt(Date buildCreatedAt) {
+        this.buildCreatedAt = buildCreatedAt;
+    }
+
     public Date getBuildStartedAt() {
         return buildStartedAt;
     }
@@ -207,6 +228,22 @@ public void setRepository(EventRepository repository) {
         this.repository = repository;
     }
 
+    public EventProject getProject() {
+        return project;
+    }
+
+    public void setProject(EventProject project) {
+        this.project = project;
+    }
+
+    public Runner getRunner() {
+        return runner;
+    }
+
+    public void setRunner(Runner runner) {
+        this.runner = runner;
+    }
+
     @Override
     public String toString() {
         return (JacksonJson.toJsonString(this));

gitlab4j-models/src/main/java/org/gitlab4j/api/webhook/JobEvent.java

@@ -2,14 +2,13 @@
 
 import java.util.Date;
 
-import org.gitlab4j.api.models.Runner;
 import org.gitlab4j.models.utils.JacksonJson;
 
 public class JobEvent extends AbstractEvent {
     private static final long serialVersionUID = 1L;
 
     public static final String JOB_HOOK_X_GITLAB_EVENT = "Job Hook";
-    public static final String OBJECT_KIND = "build";
+    public static final String OBJECT_KIND = "job";
 
     private String ref;
     private Boolean tag;
@@ -24,26 +23,11 @@ public class JobEvent extends AbstractEvent {
     private Integer jobDuration;
     private Boolean jobAllowFailure;
     private String jobFailureReason;
-    private Long buildId;
-    private String buildName;
-    private String buildStage;
-    private String buildStatus;
-    private Date buildCreatedAt;
-    private Date buildStartedAt;
-    private Date buildFinishedAt;
-    private Integer buildDuration;
-    private Double buildQueuedDuration;
-    private Boolean buildAllowFailure;
-    private String buildFailureReason;
-    private Integer retriesCount;
-    private Integer pipelineId;
     private Long projectId;
     private String projectName;
     private EventUser user;
     private BuildCommit commit;
     private EventRepository repository;
-    private EventProject project;
-    private Runner runner;
 
     @Override
     public String getObjectKind() {
@@ -159,110 +143,6 @@ public void setJobFailureReason(String jobFailureReason) {
         this.jobFailureReason = jobFailureReason;
     }
 
-    public Long getBuildId() {
-        return buildId;
-    }
-
-    public void setBuildId(Long buildId) {
-        this.buildId = buildId;
-    }
-
-    public String getBuildName() {
-        return buildName;
-    }
-
-    public void setBuildName(String buildName) {
-        this.buildName = buildName;
-    }
-
-    public String getBuildStage() {
-        return buildStage;
-    }
-
-    public void setBuildStage(String buildStage) {
-        this.buildStage = buildStage;
-    }
-
-    public String getBuildStatus() {
-        return buildStatus;
-    }
-
-    public void setBuildStatus(String buildStatus) {
-        this.buildStatus = buildStatus;
-    }
-
-    public Date getBuildCreatedAt() {
-        return buildCreatedAt;
-    }
-
-    public void setBuildCreatedAt(Date buildCreatedAt) {
-        this.buildCreatedAt = buildCreatedAt;
-    }
-
-    public Date getBuildStartedAt() {
-        return buildStartedAt;
-    }
-
-    public void setBuildStartedAt(Date buildStartedAt) {
-        this.buildStartedAt = buildStartedAt;
-    }
-
-    public Date getBuildFinishedAt() {
-        return buildFinishedAt;
-    }
-
-    public void setBuildFinishedAt(Date buildFinishedAt) {
-        this.buildFinishedAt = buildFinishedAt;
-    }
-
-    public Integer getBuildDuration() {
-        return buildDuration;
-    }
-
-    public void setBuildDuration(Integer buildDuration) {
-        this.buildDuration = buildDuration;
-    }
-
-    public Double getBuildQueuedDuration() {
-        return buildQueuedDuration;
-    }
-
-    public void setBuildQueuedDuration(Double buildQueuedDuration) {
-        this.buildQueuedDuration = buildQueuedDuration;
-    }
-
-    public Boolean getBuildAllowFailure() {
-        return buildAllowFailure;
-    }
-
-    public void setBuildAllowFailure(Boolean buildAllowFailure) {
-        this.buildAllowFailure = buildAllowFailure;
-    }
-
-    public String getBuildFailureReason() {
-        return buildFailureReason;
-    }
-
-    public void setBuildFailureReason(String buildFailureReason) {
-        this.buildFailureReason = buildFailureReason;
-    }
-
-    public Integer getRetriesCount() {
-        return retriesCount;
-    }
-
-    public void setRetriesCount(Integer retriesCount) {
-        this.retriesCount = retriesCount;
-    }
-
-    public Integer getPipelineId() {
-        return pipelineId;
-    }
-
-    public void setPipelineId(Integer pipelineId) {
-        this.pipelineId = pipelineId;
-    }
-
     public Long getProjectId() {
         return projectId;
     }
@@ -303,22 +183,6 @@ public void setRepository(EventRepository repository) {
         this.repository = repository;
     }
 
-    public EventProject getProject() {
-        return project;
-    }
-
-    public void setProject(EventProject project) {
-        this.project = project;
-    }
-
-    public Runner getRunner() {
-        return runner;
-    }
-
-    public void setRunner(Runner runner) {
-        this.runner = runner;
-    }
-
     @Override
     public String toString() {
         return (JacksonJson.toJsonString(this));

gitlab4j-models/src/test/resources/org/gitlab4j/models/build-event.json

@@ -4,16 +4,19 @@
 	"tag": false,
 	"before_sha": "8a49a94f1a7cd64985074cb11b1a42a7ab2d9b46",
 	"sha": "a890bee24574603c522c756b9346649fbec4c812",
+	"retries_count": 2,
 	"build_id": 214655258,
 	"build_name": "build1",
 	"build_stage": "build",
 	"build_status": "running",
+	"build_created_at": "2019-05-17T17:09:21Z",
 	"build_started_at": "2019-05-17T18:09:21Z",
+	"build_finished_at": "2019-05-17T19:09:21Z",
 	"build_duration": 0.05880817,
 	"build_queued_duration": 1095.5887,
 	"build_allow_failure": false,
 	"build_failure_reason": "unknown_failure",
-	"pipeline_id": 2366,	
+	"pipeline_id": 2366,
 	"project_id": 3115610,
 	"project_name": "GitLab4J / test-project",
 	"user": {
@@ -38,5 +41,28 @@
 		"git_http_url": "https://gitlab.com/gitlab4j/test-project.git",
 		"git_ssh_url": "git@gitlab.com:gitlab4j/test-project.git",
 		"visibility_level": 20
+	},
+	"project":{
+		"id": 380,
+		"name": "Gitlab Test",
+		"description": "Atque in sunt eos similique dolores voluptatem.",
+		"web_url": "http://192.168.64.1:3005/gitlab-org/gitlab-test",
+		"git_ssh_url": "git@192.168.64.1:gitlab-org/gitlab-test.git",
+		"git_http_url": "http://192.168.64.1:3005/gitlab-org/gitlab-test.git",
+		"namespace": "Gitlab Org",
+		"visibility_level": 20,
+		"path_with_namespace": "gitlab-org/gitlab-test",
+		"default_branch": "master"
+	},
+	"runner": {
+		"active": true,
+		"runner_type": "project_type",
+		"is_shared": false,
+		"id": 380987,
+		"description": "shared-runners-manager-6.gitlab.com",
+		"tags": [
+			"linux",
+			"docker"
+		]
 	}
-}
+}

gitlab4j-models/src/test/resources/org/gitlab4j/models/job-event.json

@@ -10,19 +10,6 @@
   "job_status": "created",
   "job_allow_failure": false,
   "job_failure_reason": "script_failure",
-  "build_id": 1977,
-  "build_name": "test",
-  "build_stage": "test",
-  "build_status": "created",
-  "build_created_at": "2021-02-23T02:41:37.886Z",
-  "build_started_at": "2021-02-23T02:41:37.886Z",
-  "build_finished_at": "2021-02-23T02:41:37.886Z",
-  "build_duration": 2224,
-  "build_queued_duration": 1095.588715,
-  "build_allow_failure": false,
-  "build_failure_reason": "script_failure",
-  "retries_count": 2,
-  "pipeline_id": 2366,
   "project_id": 380,
   "project_name": "gitlab-org/gitlab-test",
   "user": {
@@ -32,15 +19,11 @@
   },
   "commit": {
     "id": 2366,
-    "name": "Build pipeline",
     "sha": "2293ada6b400935a1378653304eaf6221e0fdb8f",
     "message": "test\n",
     "author_name": "User",
     "author_email": "user@gitlab.com",
-    "status": "created",
-    "duration": 2264.0,
-    "started_at": "2025-04-09T17:00:09.082Z",
-    "finished_at": "2025-04-09T18:00:09.082Z"
+    "status": "created"
   },
   "repository": {
     "name": "gitlab_test",
@@ -49,28 +32,5 @@
     "git_ssh_url": "git@192.168.64.1:gitlab-org/gitlab-test.git",
     "git_http_url": "http://192.168.64.1:3005/gitlab-org/gitlab-test.git",
     "visibility_level": 20
-  },
-  "project":{
-    "id": 380,
-    "name": "Gitlab Test",
-    "description": "Atque in sunt eos similique dolores voluptatem.",
-    "web_url": "http://192.168.64.1:3005/gitlab-org/gitlab-test",
-    "git_ssh_url": "git@192.168.64.1:gitlab-org/gitlab-test.git",
-    "git_http_url": "http://192.168.64.1:3005/gitlab-org/gitlab-test.git",
-    "namespace": "Gitlab Org",
-    "visibility_level": 20,
-    "path_with_namespace": "gitlab-org/gitlab-test",
-    "default_branch": "master"
-  },
-  "runner": {
-    "active": true,
-    "runner_type": "project_type",
-    "is_shared": false,
-    "id": 380987,
-    "description": "shared-runners-manager-6.gitlab.com",
-    "tags": [
-      "linux",
-      "docker"
-    ]
   }
 }