diff --git a/src/main/java/org/gitlab4j/api/utils/DurationUtils.java b/src/main/java/org/gitlab4j/api/utils/DurationUtils.java index 9f222cb89d9d8f27d1f2a3641420c4d31de47566..241928c7328aed31b40371ac069bd244428d30eb 100644 --- a/src/main/java/org/gitlab4j/api/utils/DurationUtils.java +++ b/src/main/java/org/gitlab4j/api/utils/DurationUtils.java @@ -107,7 +107,7 @@ public class DurationUtils { } } else { - buf.append(' ').append(seconds).append('s'); + buf.append(seconds).append('s'); } return (buf.toString()); diff --git a/src/main/java/org/gitlab4j/api/webhook/EventMergeRequest.java b/src/main/java/org/gitlab4j/api/webhook/EventMergeRequest.java index 970df4ef1dd7b084703fa7d168417d6156c5b9bf..652c73e7a46da6598f2c1250e38a2cade2501733 100644 --- a/src/main/java/org/gitlab4j/api/webhook/EventMergeRequest.java +++ b/src/main/java/org/gitlab4j/api/webhook/EventMergeRequest.java @@ -29,6 +29,7 @@ public class EventMergeRequest { private String stCommits; private String stDiffs; private String state; + private Long stateId; private String targetBranch; private Long targetProjectId; private String title; @@ -54,17 +55,20 @@ public class EventMergeRequest { private String inProgressMergeCommitSha; private Integer lockVersion; - private Date last_editedAt; + private Date lastEditedAt; private Long lastEditedById; private Long headPipelineId; private Boolean refFetched; private Long mergeIid; private Integer totalTimeSpent; private Duration humanTotalTimeSpent; + private Integer timeChange; private Integer timeEstimate; private Duration humanTimeEstimate; + private Duration humanTimeChange; private List assigneeIds; private List reviewerIds; + private String oldrev; public Long getAssigneeId() { return this.assigneeId; @@ -218,6 +222,14 @@ public class EventMergeRequest { this.state = state; } + public Long getStateId() { + return stateId; + } + + public void setStateId(Long stateId) { + this.stateId = stateId; + } + public String getTargetBranch() { return this.targetBranch; } @@ -394,12 +406,12 @@ public class EventMergeRequest { this.lockVersion = lockVersion; } - public Date getLast_editedAt() { - return last_editedAt; + public Date getLastEditedAt() { + return lastEditedAt; } - public void setLast_editedAt(Date last_editedAt) { - this.last_editedAt = last_editedAt; + public void setLastEditedAt(Date lastEditedAt) { + this.lastEditedAt = lastEditedAt; } public Long getLastEditedById() { @@ -450,6 +462,14 @@ public class EventMergeRequest { this.humanTotalTimeSpent = humanTotalTimeSpent; } + public Integer getTimeChange() { + return timeChange; + } + + public void setTimeChange(Integer timeChange) { + this.timeChange = timeChange; + } + public Integer getTimeEstimate() { return timeEstimate; } @@ -466,6 +486,14 @@ public class EventMergeRequest { this.humanTimeEstimate = humanTimeEstimate; } + public Duration getHumanTimeChange() { + return humanTimeChange; + } + + public void setHumanTimeChange(Duration humanTimeChange) { + this.humanTimeChange = humanTimeChange; + } + public List getAssigneeIds() { return assigneeIds; } @@ -482,6 +510,14 @@ public class EventMergeRequest { this.reviewerIds = reviewerIds; } + public String getOldrev() { + return oldrev; + } + + public void setOldrev(String oldrev) { + this.oldrev = oldrev; + } + @Override public String toString() { return (JacksonJson.toJsonString(this)); diff --git a/src/test/java/org/gitlab4j/api/TestDuration.java b/src/test/java/org/gitlab4j/api/TestDuration.java index 071306892bf4c7aed1c0809958b2de40c92cc75f..3c0c45d2369d1d7c3442cd52750a6728d82cf5f1 100644 --- a/src/test/java/org/gitlab4j/api/TestDuration.java +++ b/src/test/java/org/gitlab4j/api/TestDuration.java @@ -112,7 +112,10 @@ public class TestDuration { @Test public void testToString() { - String duration = DurationUtils.toString(60 + 1); + String duration = DurationUtils.toString(5); + assertEquals("5s", duration); + + duration = DurationUtils.toString(60 + 1); assertEquals("1m1s", duration); duration = DurationUtils.toString(60 * 60 + 60 + 1); diff --git a/src/test/resources/org/gitlab4j/api/merge-request-event.json b/src/test/resources/org/gitlab4j/api/merge-request-event.json index 5d9d836d4c117657ecf4e14f7a786a9b290c8516..831d36bfcde7bb479aafb5ac7b38afeec6913157 100644 --- a/src/test/resources/org/gitlab4j/api/merge-request-event.json +++ b/src/test/resources/org/gitlab4j/api/merge-request-event.json @@ -112,8 +112,23 @@ "group_id": 41 } ], + "head_pipeline_id": 848574, + "last_edited_at": "2014-04-03T17:23:34Z", + "last_edited_by_id": 59, + "merge_commit_sha": "e3b7e97417fd6318a5c31b21b29d2acc5c86c3ae", + "merge_user_id": 59, + "merge_when_pipeline_succeeds": false, + "state_id": 1, + "time_estimate": 0, + "updated_by_id": 6, + "total_time_spent": 0, + "time_change": 0, + "human_total_time_spent": "30m", + "human_time_change": "30s", + "human_time_estimate": "30m", "action": "open", - "detailed_merge_status": "mergeable" + "detailed_merge_status": "mergeable", + "oldrev": "8ad9e9f37b007d15c102da002c2a7133a5ca3737" }, "labels": [ {