Skip to content

Update Deployment API #774

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.

Sign up for GitHub

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 1 commit into from
Mar 14, 2022
Merged

Update Deployment API #774

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion src/main/java/org/gitlab4j/api/DeploymentsApi.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -219,7 +219,7 @@ public List<MergeRequest> getMergeRequests(Object projectIdOrPath, Integer deplo
*/
public Pager<MergeRequest> getMergeRequests(Object projectIdOrPath, Integer deploymentId, int itemsPerPage) throws GitLabApiException {
return (new Pager<MergeRequest>(this, MergeRequest.class, itemsPerPage, null,
"projects", getProjectIdOrPath(projectIdOrPath), "repository", "commits", deploymentId, "merge_requests"));
"projects", getProjectIdOrPath(projectIdOrPath), "deployments", deploymentId, "merge_requests"));
}

/**
Expand Down
32 changes: 16 additions & 16 deletions src/main/java/org/gitlab4j/api/models/DeploymentFilter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,12 +26,12 @@ public class DeploymentFilter {
/**
* Return deployments updated after the specified date. Expected in ISO 8601 format (2019-03-15T08:00:00Z).
*/
private Date finishedAfter;
private Date updatedAfter;

/**
* Return deployments updated before the specified date. Expected in ISO 8601 format (2019-03-15T08:00:00Z).
*/
private Date finishedBefore;
private Date updatedBefore;

/**
* The name of the environment to filter deployments by.
Expand Down Expand Up @@ -59,20 +59,20 @@ public void setSortOrder(SortOrder sortOrder) {
this.sortOrder = sortOrder;
}

public Date getFinishedAfter() {
return finishedAfter;
public Date getUpdatedAfter() {
return updatedAfter;
}

public void setFinishedAfter(Date finishedAfter) {
this.finishedAfter = finishedAfter;
public void setUpdatedAfter(Date updatedAfter) {
this.updatedAfter = updatedAfter;
}

public Date getFinishedBefore() {
return finishedBefore;
public Date getUpdatedBefore() {
return updatedBefore;
}

public void setFinishedBefore(Date finishedBefore) {
this.finishedBefore = finishedBefore;
public void setUpdatedBefore(Date updatedBefore) {
this.updatedBefore = updatedBefore;
}

public String getEnvironment() {
Expand Down Expand Up @@ -101,13 +101,13 @@ public DeploymentFilter withSortOrder(SortOrder sortOrder) {
return (this);
}

public DeploymentFilter withFinishedAfter(Date finishedAfter) {
this.finishedAfter = finishedAfter;
public DeploymentFilter withUpdatedAfter(Date updatedAfter) {
this.updatedAfter = updatedAfter;
return (this);
}

public DeploymentFilter withFinishedBefore(Date finishedBefore) {
this.finishedBefore = finishedBefore;
public DeploymentFilter withUpdatedBefore(Date updatedBefore) {
this.updatedBefore = updatedBefore;
return (this);
}

Expand All @@ -133,8 +133,8 @@ public GitLabApiForm getQueryParams() {
return (new GitLabApiForm()
.withParam("order_by", orderBy)
.withParam("sort", sortOrder)
.withParam("finished_after", ISO8601.toString(finishedAfter, false))
.withParam("finished_before", ISO8601.toString(finishedBefore, false))
.withParam("updated_after", ISO8601.toString(updatedAfter, false))
.withParam("updated_before", ISO8601.toString(updatedBefore, false))
.withParam("environment", environment)
.withParam("status", status));
}
Expand Down