Skip to content

Commit be2e1b6

Browse files
reapply format and add ChangeContainerSerialization
1 parent dfc01ca commit be2e1b6

File tree

101 files changed

+724
-298
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

101 files changed

+724
-298
lines changed

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -107,20 +107,23 @@ public String toString() {
107107
*/
108108
@JsonProperty("created_at")
109109
@JsonDeserialize(using = MultiDateFormatDeserializer.class)
110+
@JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX")
110111
private Date createdAt;
111112

112113
/**
113114
* The date when the epic was last updated.
114115
*/
115116
@JsonProperty("updated_at")
116117
@JsonDeserialize(using = MultiDateFormatDeserializer.class)
118+
@JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX")
117119
private Date updatedAt;
118120

119121
/**
120122
* The date when the epic was closed.
121123
*/
122124
@JsonProperty("closed_at")
123125
@JsonDeserialize(using = MultiDateFormatDeserializer.class)
126+
@JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX")
124127
private Date closedAt;
125128

126129
/**

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
import org.gitlab4j.models.utils.JacksonJson;
99
import org.gitlab4j.models.utils.MultiDateFormatDeserializer;
1010

11+
import com.fasterxml.jackson.annotation.JsonFormat;
1112
import com.fasterxml.jackson.annotation.JsonIgnore;
1213
import com.fasterxml.jackson.annotation.JsonProperty;
1314
import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
@@ -77,20 +78,23 @@ public String toString() {
7778
*/
7879
@JsonProperty("created_at")
7980
@JsonDeserialize(using = MultiDateFormatDeserializer.class)
81+
@JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX")
8082
private Date createdAt;
8183

8284
/**
8385
* The date when the issue was last updated.
8486
*/
8587
@JsonProperty("updated_at")
8688
@JsonDeserialize(using = MultiDateFormatDeserializer.class)
89+
@JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX")
8790
private Date updatedAt;
8891

8992
/**
9093
* The date when the issue was closed.
9194
*/
9295
@JsonProperty("closed_at")
9396
@JsonDeserialize(using = MultiDateFormatDeserializer.class)
97+
@JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX")
9498
private Date closedAt;
9599

96100
/**

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
import org.gitlab4j.models.utils.JacksonJson;
77
import org.gitlab4j.models.utils.MultiDateFormatDeserializer;
88

9+
import com.fasterxml.jackson.annotation.JsonFormat;
910
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
1011
import com.fasterxml.jackson.annotation.JsonProperty;
1112
import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
@@ -25,6 +26,7 @@ public abstract class AbstractUser<U extends AbstractUser<U>> implements Seriali
2526
*/
2627
@JsonProperty("created_at")
2728
@JsonDeserialize(using = MultiDateFormatDeserializer.class)
29+
@JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX")
2830
private Date createdAt;
2931

3032
/**

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44

55
import org.gitlab4j.models.utils.MultiDateFormatDeserializer;
66

7+
import com.fasterxml.jackson.annotation.JsonFormat;
78
import com.fasterxml.jackson.annotation.JsonProperty;
89
import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
910

@@ -15,6 +16,7 @@ public class AccessRequest extends AbstractUser<AccessRequest> {
1516
*/
1617
@JsonProperty("requested_at")
1718
@JsonDeserialize(using = MultiDateFormatDeserializer.class)
19+
@JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX")
1820
private Date requestedAt;
1921

2022
/**

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
import org.gitlab4j.models.utils.JacksonJson;
88
import org.gitlab4j.models.utils.MultiDateFormatDeserializer;
99

10+
import com.fasterxml.jackson.annotation.JsonFormat;
1011
import com.fasterxml.jackson.annotation.JsonIgnore;
1112
import com.fasterxml.jackson.annotation.JsonProperty;
1213
import com.fasterxml.jackson.databind.JsonNode;
@@ -28,13 +29,15 @@ public class ApplicationSettings implements Serializable {
2829
*/
2930
@JsonProperty("created_at")
3031
@JsonDeserialize(using = MultiDateFormatDeserializer.class)
32+
@JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX")
3133
private Date createdAt;
3234

3335
/**
3436
* The date when the application settings were last updated.
3537
*/
3638
@JsonProperty("updated_at")
3739
@JsonDeserialize(using = MultiDateFormatDeserializer.class)
40+
@JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX")
3841
private Date updatedAt;
3942

4043
/**

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
import org.gitlab4j.models.utils.JacksonJson;
77
import org.gitlab4j.models.utils.MultiDateFormatDeserializer;
88

9+
import com.fasterxml.jackson.annotation.JsonFormat;
910
import com.fasterxml.jackson.annotation.JsonProperty;
1011
import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
1112

@@ -47,6 +48,7 @@ public class AuditEvent implements Serializable {
4748
*/
4849
@JsonProperty("created_at")
4950
@JsonDeserialize(using = MultiDateFormatDeserializer.class)
51+
@JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX")
5052
private Date createdAt;
5153

5254
public Long getId() {

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
import org.gitlab4j.models.utils.MultiDateFormatDeserializer;
99

1010
import com.fasterxml.jackson.annotation.JsonCreator;
11+
import com.fasterxml.jackson.annotation.JsonFormat;
1112
import com.fasterxml.jackson.annotation.JsonProperty;
1213
import com.fasterxml.jackson.annotation.JsonValue;
1314
import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
@@ -63,13 +64,15 @@ public String toString() {
6364
*/
6465
@JsonProperty("created_at")
6566
@JsonDeserialize(using = MultiDateFormatDeserializer.class)
67+
@JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX")
6668
private Date createdAt;
6769

6870
/**
6971
* The date when the award emoji was last updated.
7072
*/
7173
@JsonProperty("updated_at")
7274
@JsonDeserialize(using = MultiDateFormatDeserializer.class)
75+
@JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX")
7376
private Date updatedAt;
7477

7578
/**

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
import org.gitlab4j.models.utils.JacksonJson;
77
import org.gitlab4j.models.utils.MultiDateFormatDeserializer;
88

9+
import com.fasterxml.jackson.annotation.JsonFormat;
910
import com.fasterxml.jackson.annotation.JsonProperty;
1011
import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
1112

@@ -29,27 +30,31 @@ public class Bridge implements Serializable {
2930
*/
3031
@JsonProperty("created_at")
3132
@JsonDeserialize(using = MultiDateFormatDeserializer.class)
33+
@JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX")
3234
private Date createdAt;
3335

3436
/**
3537
* The start date of the bridge.
3638
*/
3739
@JsonProperty("started_at")
3840
@JsonDeserialize(using = MultiDateFormatDeserializer.class)
41+
@JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX")
3942
private Date startedAt;
4043

4144
/**
4245
* The finish date of the bridge.
4346
*/
4447
@JsonProperty("finished_at")
4548
@JsonDeserialize(using = MultiDateFormatDeserializer.class)
49+
@JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX")
4650
private Date finishedAt;
4751

4852
/**
4953
* The date the bridge was erased.
5054
*/
5155
@JsonProperty("erased_at")
5256
@JsonDeserialize(using = MultiDateFormatDeserializer.class)
57+
@JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX")
5358
private Date erasedAt;
5459

5560
/**

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
import org.gitlab4j.models.utils.JacksonJson;
66
import org.gitlab4j.models.utils.MultiDateFormatDeserializer;
77

8+
import com.fasterxml.jackson.annotation.JsonFormat;
89
import com.fasterxml.jackson.annotation.JsonProperty;
910
import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
1011

@@ -27,14 +28,17 @@ public class Build {
2728

2829
@JsonProperty("created_at")
2930
@JsonDeserialize(using = MultiDateFormatDeserializer.class)
31+
@JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX")
3032
private Date createdAt;
3133

3234
@JsonProperty("started_at")
3335
@JsonDeserialize(using = MultiDateFormatDeserializer.class)
36+
@JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX")
3437
private Date startedAt;
3538

3639
@JsonProperty("finished_at")
3740
@JsonDeserialize(using = MultiDateFormatDeserializer.class)
41+
@JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX")
3842
private Date finishedAt;
3943

4044
@JsonProperty("duration")

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
import org.gitlab4j.models.utils.JacksonJson;
99
import org.gitlab4j.models.utils.MultiDateFormatDeserializer;
1010

11+
import com.fasterxml.jackson.annotation.JsonFormat;
1112
import com.fasterxml.jackson.annotation.JsonIgnore;
1213
import com.fasterxml.jackson.annotation.JsonProperty;
1314
import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
@@ -38,6 +39,7 @@ public class ChangelogPayload implements Serializable {
3839
*/
3940
@JsonProperty("date")
4041
@JsonDeserialize(using = MultiDateFormatDeserializer.class)
42+
@JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX")
4143
private Date date;
4244

4345
/**

0 commit comments

Comments
 (0)