From dc9295a434f1c60436bfdde818443cf803549313 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ren=C3=A9=20Pfeuffer?= Date: Mon, 4 Jun 2018 12:43:57 +0200 Subject: [PATCH] Add all value constructor for proper deserialization of empty optional --- .../src/main/java/sonia/scm/api/v2/resources/UserDto.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/UserDto.java b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/UserDto.java index 9b43d98ec8..508b615f82 100644 --- a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/UserDto.java +++ b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/UserDto.java @@ -2,19 +2,21 @@ package sonia.scm.api.v2.resources; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.AllArgsConstructor; import lombok.Data; +import lombok.NoArgsConstructor; import java.time.Instant; import java.util.Map; import java.util.Optional; -@Data -@JsonInclude(JsonInclude.Include.NON_EMPTY) +@Data @AllArgsConstructor @NoArgsConstructor public class UserDto { private boolean active; private boolean admin; private Instant creationDate; private String displayName; + @JsonInclude(JsonInclude.Include.NON_EMPTY) private Optional lastModified; private String mail; private String name;