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
3b1f02eb
Commit
3b1f02eb
authored
Apr 24, 2018
by
Greg Messner
Browse files
Mods to support new fields in v4 project events (#177).
parent
8b1d9863
Changes
4
Hide whitespace changes
Inline
Side-by-side
src/main/java/org/gitlab4j/api/Constants.java
View file @
3b1f02eb
...
...
@@ -282,7 +282,7 @@ public interface Constants {
/** Enum to use for specifying the event action_type. */
public
enum
ActionType
{
CREATED
,
UPDATED
,
CLOSED
,
REOPENED
,
PUSHED
,
COMMENTED
,
MERGED
,
JOINED
,
LEFT
,
DESTROYED
,
EXPIRED
;
CREATED
,
UPDATED
,
CLOSED
,
REOPENED
,
PUSHED
,
COMMENTED
,
MERGED
,
JOINED
,
LEFT
,
DESTROYED
,
EXPIRED
,
REMOVED
;
private
static
JacksonJsonEnumHelper
<
ActionType
>
enumHelper
=
new
JacksonJsonEnumHelper
<>(
ActionType
.
class
);
...
...
src/main/java/org/gitlab4j/api/models/Event.java
View file @
3b1f02eb
package
org.gitlab4j.api.models
;
import
java.util.Date
;
import
javax.xml.bind.annotation.XmlAccessType
;
import
javax.xml.bind.annotation.XmlAccessorType
;
import
javax.xml.bind.annotation.XmlRootElement
;
...
...
@@ -18,9 +20,14 @@ public class Event {
private
EventData
data
;
private
Integer
projectId
;
private
Integer
targetId
;
private
Integer
targetIid
;
private
String
targetTitle
;
private
TargetType
targetType
;
private
String
title
;
private
Date
createdAt
;
private
Note
note
;
private
PushData
pushData
;
public
String
getActionName
()
{
return
actionName
;
...
...
@@ -78,6 +85,14 @@ public class Event {
this
.
targetId
=
targetId
;
}
public
Integer
getTargetIid
()
{
return
targetIid
;
}
public
void
setTargetIid
(
Integer
targetIid
)
{
this
.
targetIid
=
targetIid
;
}
public
String
getTargetTitle
()
{
return
targetTitle
;
}
...
...
@@ -101,4 +116,28 @@ public class Event {
public
void
setTitle
(
String
title
)
{
this
.
title
=
title
;
}
public
Date
getCreatedAt
()
{
return
createdAt
;
}
public
void
setCreatedAt
(
Date
createdAt
)
{
this
.
createdAt
=
createdAt
;
}
public
Note
getNote
()
{
return
note
;
}
public
void
setNote
(
Note
note
)
{
this
.
note
=
note
;
}
public
PushData
getPushData
()
{
return
pushData
;
}
public
void
setPushData
(
PushData
pushData
)
{
this
.
pushData
=
pushData
;
}
}
src/main/java/org/gitlab4j/api/models/Note.java
View file @
3b1f02eb
...
...
@@ -39,7 +39,7 @@ public class Note {
public
static
enum
NoteableType
{
ISSUE
,
MERGE_REQUEST
,
SNIPPET
;
COMMIT
,
ISSUE
,
MERGE_REQUEST
,
SNIPPET
;
private
static
JacksonJsonEnumHelper
<
NoteableType
>
enumHelper
=
new
JacksonJsonEnumHelper
<>(
NoteableType
.
class
,
true
,
true
);
@JsonCreator
...
...
src/test/java/org/gitlab4j/api/TestGitLabApiBeans.java
View file @
3b1f02eb
...
...
@@ -296,6 +296,21 @@ public class TestGitLabApiBeans {
}
}
@Test
public
void
testProjectEvents
()
{
try
{
InputStreamReader
reader
=
new
InputStreamReader
(
GitLabApi
.
class
.
getResourceAsStream
(
"project-events.json"
));
ObjectMapper
objectMapper
=
jacksonJson
.
getContext
(
null
);
List
<
Event
>
events
=
objectMapper
.
readValue
(
reader
,
new
TypeReference
<
List
<
Event
>>()
{});
assertTrue
(
compareJson
(
events
,
"project-events"
));
}
catch
(
Exception
e
)
{
e
.
printStackTrace
();
}
}
@Test
public
void
testProtectedBranch
()
{
...
...
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