Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
佳 邓
Gitlab4j Api
Commits
bc9353ae
Commit
bc9353ae
authored
Jun 22, 2017
by
Greg Messner
Browse files
Added created_at and updated_at fields.
parent
555a18e1
Changes
2
Hide whitespace changes
Inline
Side-by-side
src/main/java/org/gitlab4j/api/models/MergeRequest.java
View file @
bc9353ae
package
org.gitlab4j.api.models
;
package
org.gitlab4j.api.models
;
import
java.util.Date
;
import
java.util.List
;
import
java.util.List
;
import
javax.xml.bind.annotation.XmlAccessType
;
import
javax.xml.bind.annotation.XmlAccessType
;
...
@@ -14,6 +15,7 @@ public class MergeRequest {
...
@@ -14,6 +15,7 @@ public class MergeRequest {
private
Assignee
assignee
;
private
Assignee
assignee
;
private
Author
author
;
private
Author
author
;
private
Changes
changes
;
private
Changes
changes
;
private
Date
createdAt
;
private
String
description
;
private
String
description
;
private
Integer
downvotes
;
private
Integer
downvotes
;
private
Boolean
forceRemoveSourceBranch
;
private
Boolean
forceRemoveSourceBranch
;
...
@@ -35,6 +37,7 @@ public class MergeRequest {
...
@@ -35,6 +37,7 @@ public class MergeRequest {
private
String
targetBranch
;
private
String
targetBranch
;
private
Integer
targetProjectId
;
private
Integer
targetProjectId
;
private
String
title
;
private
String
title
;
private
Date
updatedAt
;
private
Integer
upvotes
;
private
Integer
upvotes
;
private
Integer
userNotesCount
;
private
Integer
userNotesCount
;
private
String
webUrl
;
private
String
webUrl
;
...
@@ -72,6 +75,14 @@ public class MergeRequest {
...
@@ -72,6 +75,14 @@ public class MergeRequest {
this
.
changes
=
changes
;
this
.
changes
=
changes
;
}
}
public
Date
getCreatedAt
()
{
return
createdAt
;
}
public
void
setCreatedAt
(
Date
createdAt
)
{
this
.
createdAt
=
createdAt
;
}
public
String
getDescription
()
{
public
String
getDescription
()
{
return
description
;
return
description
;
}
}
...
@@ -240,6 +251,14 @@ public class MergeRequest {
...
@@ -240,6 +251,14 @@ public class MergeRequest {
this
.
title
=
title
;
this
.
title
=
title
;
}
}
public
Date
getUpdatedAt
()
{
return
updatedAt
;
}
public
void
setUpdatedAt
(
Date
updatedAt
)
{
this
.
updatedAt
=
updatedAt
;
}
public
Integer
getUpvotes
()
{
public
Integer
getUpvotes
()
{
return
upvotes
;
return
upvotes
;
}
}
...
...
src/test/resources/org/gitlab4j/api/merge-request.json
View file @
bc9353ae
...
@@ -8,6 +8,8 @@
...
@@ -8,6 +8,8 @@
"state"
:
"merged"
,
"state"
:
"merged"
,
"upvotes"
:
0
,
"upvotes"
:
0
,
"downvotes"
:
0
,
"downvotes"
:
0
,
"created_at"
:
"2016-12-03T17:23:34Z"
,
"updated_at"
:
"2016-12-03T17:23:34Z"
,
"author"
:{
"author"
:{
"id"
:
1
,
"id"
:
1
,
"username"
:
"admin"
,
"username"
:
"admin"
,
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment