diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Build.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Build.java index 1bc55b233..ea0dea43f 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Build.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Build.java @@ -2,6 +2,7 @@ import java.util.Date; +import org.gitlab4j.api.webhook.EventEnvironment; import org.gitlab4j.models.utils.JacksonJson; /** @@ -25,6 +26,7 @@ public class Build { private User user; private Runner runner; private ArtifactsFile artifactsFile; + private EventEnvironment environment; public Long getId() { return id; @@ -154,6 +156,14 @@ public void setArtifactsFile(ArtifactsFile artifactsFile) { this.artifactsFile = artifactsFile; } + public EventEnvironment getEnvironment() { + return environment; + } + + public void setEnvironment(EventEnvironment environment) { + this.environment = environment; + } + @Override public String toString() { return (JacksonJson.toJsonString(this)); diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/webhook/BuildEvent.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/webhook/BuildEvent.java index d316843d2..bb4e35463 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/webhook/BuildEvent.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/webhook/BuildEvent.java @@ -42,6 +42,8 @@ public class BuildEvent extends AbstractEvent { private EventProject project; private Runner runner; + private EventEnvironment environment; + @Override public String getObjectKind() { return (OBJECT_KIND); @@ -244,6 +246,14 @@ public void setRunner(Runner runner) { this.runner = runner; } + public EventEnvironment getEnvironment() { + return environment; + } + + public void setEnvironment(EventEnvironment environment) { + this.environment = environment; + } + @Override public String toString() { return (JacksonJson.toJsonString(this)); diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/webhook/EventEnvironment.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/webhook/EventEnvironment.java new file mode 100644 index 000000000..bdbdd7acd --- /dev/null +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/webhook/EventEnvironment.java @@ -0,0 +1,38 @@ +package org.gitlab4j.api.webhook; + +import org.gitlab4j.models.utils.JacksonJson; + +public class EventEnvironment { + private String name; + private String action; + private String deploymentTier; + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getAction() { + return action; + } + + public void setAction(String action) { + this.action = action; + } + + public String getDeploymentTier() { + return deploymentTier; + } + + public void setDeploymentTier(String deploymentTier) { + this.deploymentTier = deploymentTier; + } + + @Override + public String toString() { + return (JacksonJson.toJsonString(this)); + } +} diff --git a/gitlab4j-models/src/test/resources/org/gitlab4j/models/build-event.json b/gitlab4j-models/src/test/resources/org/gitlab4j/models/build-event.json index dff8db041..e85df1337 100644 --- a/gitlab4j-models/src/test/resources/org/gitlab4j/models/build-event.json +++ b/gitlab4j-models/src/test/resources/org/gitlab4j/models/build-event.json @@ -54,6 +54,11 @@ "path_with_namespace": "gitlab-org/gitlab-test", "default_branch": "master" }, + "environment": { + "name": "Test Env", + "action": "start", + "deployment_tier": "testing" + }, "runner": { "active": true, "runner_type": "project_type", diff --git a/gitlab4j-models/src/test/resources/org/gitlab4j/models/pipeline-event.json b/gitlab4j-models/src/test/resources/org/gitlab4j/models/pipeline-event.json index ad5b4ae58..b45f204ae 100644 --- a/gitlab4j-models/src/test/resources/org/gitlab4j/models/pipeline-event.json +++ b/gitlab4j-models/src/test/resources/org/gitlab4j/models/pipeline-event.json @@ -189,6 +189,11 @@ "username": "root", "avatar_url": "http://www.gravatar.com/avatar/e32bd13e2add097461cb96824b7a829c?s=80\u0026d=identicon", "email": "admin@example.com" + }, + "environment": { + "name": "production", + "action": "start", + "deployment_tier": "production" } }, { @@ -304,6 +309,11 @@ "username": "root", "avatar_url": "http://www.gravatar.com/avatar/e32bd13e2add097461cb96824b7a829c?s=80\u0026d=identicon", "email": "admin@example.com" + }, + "environment": { + "name": "staging", + "action": "start", + "deployment_tier": "staging" } } ]