comparison: src/main/java/de/uapcore/lightpit/entities/User.java
src/main/java/de/uapcore/lightpit/entities/User.java
- changeset 51
- dd0a45ae25d7
- parent 47
- 57cfb94ab99f
- child 72
- 0646c14e36fb
equal
deleted
inserted
replaced
| 50:2a90d105edec | 51:dd0a45ae25d7 |
|---|---|
| 32 | 32 |
| 33 public final class User { | 33 public final class User { |
| 34 | 34 |
| 35 public static final int ANONYMOUS_USERID = -1; | 35 public static final int ANONYMOUS_USERID = -1; |
| 36 | 36 |
| 37 private final int userID; | 37 private final int id; |
| 38 private String username; | 38 private String username; |
| 39 private String mail; | 39 private String mail; |
| 40 private String givenname; | 40 private String givenname; |
| 41 private String lastname; | 41 private String lastname; |
| 42 | 42 |
| 43 public User(int userID) { | 43 public User(int id) { |
| 44 this.userID = userID; | 44 this.id = id; |
| 45 } | 45 } |
| 46 | 46 |
| 47 public int getUserID() { | 47 public int getId() { |
| 48 return userID; | 48 return id; |
| 49 } | 49 } |
| 50 | 50 |
| 51 public String getUsername() { | 51 public String getUsername() { |
| 52 return username; | 52 return username; |
| 53 } | 53 } |
| 80 this.lastname = lastname; | 80 this.lastname = lastname; |
| 81 } | 81 } |
| 82 | 82 |
| 83 public String getDisplayname() { | 83 public String getDisplayname() { |
| 84 StringBuilder dn = new StringBuilder(); | 84 StringBuilder dn = new StringBuilder(); |
| 85 dn.append(givenname); | 85 if (givenname != null) |
| 86 dn.append(givenname); | |
| 86 dn.append(' '); | 87 dn.append(' '); |
| 87 dn.append(lastname); | 88 if (lastname != null) |
| 89 dn.append(lastname); | |
| 88 dn.append(' '); | 90 dn.append(' '); |
| 89 if (mail != null && !mail.isBlank()) { | 91 if (mail != null && !mail.isBlank()) { |
| 90 dn.append("<"+mail+">"); | 92 dn.append("<"+mail+">"); |
| 91 } | 93 } |
| 92 final var str = dn.toString().trim(); | 94 final var str = dn.toString().trim(); |
| 96 @Override | 98 @Override |
| 97 public boolean equals(Object o) { | 99 public boolean equals(Object o) { |
| 98 if (this == o) return true; | 100 if (this == o) return true; |
| 99 if (o == null || getClass() != o.getClass()) return false; | 101 if (o == null || getClass() != o.getClass()) return false; |
| 100 User user = (User) o; | 102 User user = (User) o; |
| 101 return userID == user.userID; | 103 return id == user.id; |
| 102 } | 104 } |
| 103 | 105 |
| 104 @Override | 106 @Override |
| 105 public int hashCode() { | 107 public int hashCode() { |
| 106 return Objects.hash(userID); | 108 return Objects.hash(id); |
| 107 } | 109 } |
| 108 } | 110 } |
