diff options
Diffstat (limited to 'ufund-api/src/main/java/com/ufund/api/ufundapi/model')
| -rw-r--r-- | ufund-api/src/main/java/com/ufund/api/ufundapi/model/User.java | 27 | 
1 files changed, 16 insertions, 11 deletions
diff --git a/ufund-api/src/main/java/com/ufund/api/ufundapi/model/User.java b/ufund-api/src/main/java/com/ufund/api/ufundapi/model/User.java index 2871916..d04d8b7 100644 --- a/ufund-api/src/main/java/com/ufund/api/ufundapi/model/User.java +++ b/ufund-api/src/main/java/com/ufund/api/ufundapi/model/User.java @@ -12,18 +12,23 @@ public class User {          MANAGER      } -    @JsonProperty("username") private final String username; -    @JsonProperty("passwordHash") private int passwordHash; -    @JsonProperty("basket") private final List<Integer> basket; -    @JsonProperty("type") private final UserType type; +    @JsonProperty("username") +    private final String username; +    @JsonProperty("passwordHash") +    private int passwordHash; +    @JsonProperty("basket") +    private final List<Integer> basket; +    @JsonProperty("type") +    private final UserType type;      /**       * Create a new user       *  -     * @param username   The name of the user -     * @param basket A basket to copy from +     * @param username The name of the user +     * @param basket   A basket to copy from       */ -    public User(@JsonProperty("username") String username, @JsonProperty("passwordHash") int passwordHash, @JsonProperty("basket") List<Integer> basket, @JsonProperty("type") UserType userType) { +    public User(@JsonProperty("username") String username, @JsonProperty("passwordHash") int passwordHash, +            @JsonProperty("basket") List<Integer> basket, @JsonProperty("type") UserType userType) {          this.username = username;          this.basket = basket;          this.passwordHash = passwordHash; @@ -35,8 +40,7 @@ public class User {                  username,                  password.hashCode(),                  new ArrayList<>(), -                UserType.HELPER -        ); +                UserType.HELPER);      }      public String getUsername() { @@ -44,7 +48,8 @@ public class User {      }      /** -     * Verifies if the provided password's hash is the same as the user's actual hash +     * Verifies if the provided password's hash is the same as the user's actual +     * hash       *        * @param password The password to check if valid       * @return True or false depending on if it's equal @@ -62,7 +67,7 @@ public class User {          basket.add(need.getId());      } -    public Integer[] getNeeds() { +    public Integer[] getBasket() {          return basket.toArray(Integer[]::new);      }  | 
