Skip to content

Added missing attributes for webhook events #1240

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Apr 22, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
161 changes: 161 additions & 0 deletions gitlab4j-models/src/main/java/org/gitlab4j/api/models/Build.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,161 @@
package org.gitlab4j.api.models;

import java.util.Date;

import org.gitlab4j.models.utils.JacksonJson;

/**
* @author Yaris van Thiel
*/
public class Build {

private Long id;
private String stage;
private String name;
private BuildStatus status;
private Date createdAt;
private Date startedAt;
private Date finishedAt;
private Float duration;
private Float queuedDuration;
private String failureReason;
private String when;
private Boolean manual;
private Boolean allowFailure;
private User user;
private Runner runner;
private ArtifactsFile artifactsFile;

public Long getId() {
return id;
}

public void setId(Long id) {
this.id = id;
}

public String getStage() {
return stage;
}

public void setStage(String stage) {
this.stage = stage;
}

public String getName() {
return name;
}

public void setName(String name) {
this.name = name;
}

public BuildStatus getStatus() {
return status;
}

public void setStatus(BuildStatus status) {
this.status = status;
}

public Date getCreatedAt() {
return createdAt;
}

public void setCreatedAt(Date createdAt) {
this.createdAt = createdAt;
}

public Date getStartedAt() {
return startedAt;
}

public void setStartedAt(Date startedAt) {
this.startedAt = startedAt;
}

public Date getFinishedAt() {
return finishedAt;
}

public void setFinishedAt(Date finishedAt) {
this.finishedAt = finishedAt;
}

public Float getDuration() {
return duration;
}

public void setDuration(Float duration) {
this.duration = duration;
}

public Float getQueuedDuration() {
return queuedDuration;
}

public void setQueuedDuration(Float queuedDuration) {
this.queuedDuration = queuedDuration;
}

public String getFailureReason() {
return failureReason;
}

public void setFailureReason(String failureReason) {
this.failureReason = failureReason;
}

public String getWhen() {
return when;
}

public void setWhen(String when) {
this.when = when;
}

public Boolean getManual() {
return manual;
}

public void setManual(Boolean manual) {
this.manual = manual;
}

public Boolean getAllowFailure() {
return allowFailure;
}

public void setAllowFailure(Boolean allowFailure) {
this.allowFailure = allowFailure;
}

public User getUser() {
return user;
}

public void setUser(User user) {
this.user = user;
}

public Runner getRunner() {
return runner;
}

public void setRunner(Runner runner) {
this.runner = runner;
}

public ArtifactsFile getArtifactsFile() {
return artifactsFile;
}

public void setArtifactsFile(ArtifactsFile artifactsFile) {
this.artifactsFile = artifactsFile;
}

@Override
public String toString() {
return (JacksonJson.toJsonString(this));
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,60 @@
/*
* The MIT License (MIT)
*
* Copyright (c) 2017 Greg Messner <[email protected]>
*
* 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.gitlab4j.api.models;

import org.gitlab4j.models.utils.JacksonJsonEnumHelper;

import com.fasterxml.jackson.annotation.JsonCreator;
import com.fasterxml.jackson.annotation.JsonValue;

/**
* Enum for the various Build status values.
*/
public enum BuildStatus {
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I am wondering if this is not a duplication of the enum Constants.JobScope that we already have.

But BuildStatus seems a better name and feels more natural.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I actually copied JobStatus into BuildStatus, they're the same except for the name. But I figured it's more clear to distinguish between jobs and builds

CREATED,
RUNNING,
PENDING,
SUCCESS,
FAILED,
CANCELED,
SKIPPED,
MANUAL;

private static JacksonJsonEnumHelper<BuildStatus> enumHelper = new JacksonJsonEnumHelper<>(BuildStatus.class);

@JsonCreator
public static BuildStatus forValue(String value) {
return enumHelper.forValue(value);
}

@JsonValue
public String toValue() {
return (enumHelper.toString(this));
}

@Override
public String toString() {
return (enumHelper.toString(this));
}
}
19 changes: 19 additions & 0 deletions gitlab4j-models/src/main/java/org/gitlab4j/api/models/Runner.java
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package org.gitlab4j.api.models;

import java.io.Serializable;
import java.util.List;

import org.gitlab4j.models.utils.JacksonJson;
import org.gitlab4j.models.utils.JacksonJsonEnumHelper;
Expand All @@ -13,8 +14,10 @@ public class Runner implements Serializable {

private Long id;
private String description;
private RunnerType runnerType;
private Boolean active;
private Boolean isShared;
private List<String> tags;
private String name;
private Boolean online;
private RunnerStatus status;
Expand Down Expand Up @@ -88,6 +91,14 @@ public void setDescription(String description) {
this.description = description;
}

public RunnerType getRunnerType() {
return runnerType;
}

public void setRunnerType(RunnerType runnerType) {
this.runnerType = runnerType;
}

public Boolean getActive() {
return active;
}
Expand All @@ -104,6 +115,14 @@ public void setIs_shared(Boolean is_shared) {
this.isShared = is_shared;
}

public List<String> getTags() {
return tags;
}

public void setTags(List<String> tags) {
this.tags = tags;
}

public String getName() {
return name;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ public abstract class AbstractPushEvent {
private String after;
private String before;
private String ref;
private Boolean refProtected;
private String checkoutSha;

private Long userId;
Expand Down Expand Up @@ -61,6 +62,14 @@ public void setRef(String ref) {
this.ref = ref;
}

public Boolean getRefProtected() {
return refProtected;
}

public void setRefProtected(Boolean refProtected) {
this.refProtected = refProtected;
}

public String getCheckoutSha() {
return checkoutSha;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
public class BuildCommit {

private Long id;
private String name;
private String sha;
private String message;
private String authorName;
Expand All @@ -25,6 +26,14 @@ public void setId(Long id) {
this.id = id;
}

public String getName() {
return name;
}

public void setName(String name) {
this.name = name;
}

public String getSha() {
return sha;
}
Expand Down
Loading