diff --git a/src/main/java/org/ntlab/acanthus_server/entities/Account.java b/src/main/java/org/ntlab/acanthus_server/entities/Account.java index f59afb1..7be09f3 100644 --- a/src/main/java/org/ntlab/acanthus_server/entities/Account.java +++ b/src/main/java/org/ntlab/acanthus_server/entities/Account.java @@ -21,19 +21,34 @@ package org.ntlab.acanthus_server.entities; import com.fasterxml.jackson.annotation.JsonIgnore; +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonPropertyOrder; import java.util.ArrayList; import java.util.HashMap; import java.util.UUID; +@JsonInclude(JsonInclude.Include.NON_NULL) +@JsonPropertyOrder({ + "name", + "email", + "work" +}) + +// public class Account { - private Integer uid; + @JsonProperty("name") private String name; + @JsonProperty("email") private String email; + @JsonProperty("work") private HashMap workHashMap = new HashMap<>(); @JsonIgnore + private Integer uid; + @JsonIgnore private String token; @JsonIgnore private String password;