Skip to content

Commit dfc01ca

Browse files
add correct deserializers
1 parent 4f7408b commit dfc01ca

File tree

4 files changed

+14
-1
lines changed

4 files changed

+14
-1
lines changed

gitlab4j-models/src/main/java/org/gitlab4j/api/models/User.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88

99
import com.fasterxml.jackson.annotation.JsonProperty;
1010
import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
11+
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
1112

1213
public class User extends AbstractUser<User> {
1314
private static final long serialVersionUID = 1L;
@@ -54,7 +55,7 @@ public class User extends AbstractUser<User> {
5455
private Boolean isAdmin;
5556

5657
@JsonProperty("last_activity_on")
57-
@JsonDeserialize(using = MultiDateFormatDeserializer.class)
58+
@JsonSerialize(using = JacksonJson.DateOnlySerializer.class)
5859
private Date lastActivityOn;
5960

6061
@JsonProperty("last_sign_in_at")

gitlab4j-models/src/main/java/org/gitlab4j/api/webhook/EventChanges.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,20 +7,24 @@
77

88
import org.gitlab4j.api.models.Assignee;
99
import org.gitlab4j.models.utils.JacksonJson;
10+
import org.gitlab4j.models.utils.MultiDateFormatDeserializer;
1011

1112
import com.fasterxml.jackson.annotation.JsonAnyGetter;
1213
import com.fasterxml.jackson.annotation.JsonAnySetter;
1314
import com.fasterxml.jackson.annotation.JsonProperty;
15+
import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
1416

1517
public abstract class EventChanges {
1618

1719
@JsonProperty("author_id")
1820
private ChangeContainer<Long> authorId;
1921

2022
@JsonProperty("created_at")
23+
@JsonDeserialize(using = MultiDateFormatDeserializer.class)
2124
private ChangeContainer<Date> createdAt;
2225

2326
@JsonProperty("updated_at")
27+
@JsonDeserialize(using = MultiDateFormatDeserializer.class)
2428
private ChangeContainer<Date> updatedAt;
2529

2630
@JsonProperty("updated_by_id")

gitlab4j-models/src/main/java/org/gitlab4j/api/webhook/IssueChanges.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,15 @@
22

33
import java.util.Date;
44

5+
import org.gitlab4j.models.utils.JacksonJson;
6+
57
import com.fasterxml.jackson.annotation.JsonProperty;
8+
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
69

710
public class IssueChanges extends EventChanges {
811

912
@JsonProperty("due_date")
13+
@JsonSerialize(using = JacksonJson.DateOnlySerializer.class)
1014
private ChangeContainer<Date> dueDate;
1115

1216
@JsonProperty("confidential")

gitlab4j-models/src/main/java/org/gitlab4j/api/webhook/WorkItemChanges.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,17 @@
22

33
import java.util.Date;
44

5+
import org.gitlab4j.models.utils.MultiDateFormatDeserializer;
6+
57
import com.fasterxml.jackson.annotation.JsonProperty;
8+
import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
69

710
public class WorkItemChanges extends EventChanges {
811
@JsonProperty("health_status")
912
private ChangeContainer<String> healthStatus;
1013

1114
@JsonProperty("last_edited_at")
15+
@JsonDeserialize(using = MultiDateFormatDeserializer.class)
1216
private ChangeContainer<Date> lastEditedAt;
1317

1418
public ChangeContainer<String> getHealthStatus() {

0 commit comments

Comments
 (0)