From 5e2eab6f32bc76918aa17791b688d1df27d6ddfc Mon Sep 17 00:00:00 2001 From: realtradam Date: Sat, 20 Jul 2024 00:51:37 -0400 Subject: code cleanup --- src/main/java/com/blog/web/models/UserEntity.java | 21 ++++++--------------- 1 file changed, 6 insertions(+), 15 deletions(-) (limited to 'src/main/java/com/blog/web/models/UserEntity.java') diff --git a/src/main/java/com/blog/web/models/UserEntity.java b/src/main/java/com/blog/web/models/UserEntity.java index d121580..c94db6b 100644 --- a/src/main/java/com/blog/web/models/UserEntity.java +++ b/src/main/java/com/blog/web/models/UserEntity.java @@ -18,25 +18,15 @@ public class UserEntity { private String email; private String password; @ManyToMany(fetch = FetchType.EAGER, cascade = CascadeType.ALL) - @JoinTable( - name = "user_roles", - joinColumns = {@JoinColumn(name = "user_id", referencedColumnName = "id")}, - inverseJoinColumns = {@JoinColumn(name = "role_id", referencedColumnName = "id")} - ) - private List roles = new ArrayList<>(); + @JoinTable(name = "user_roles", joinColumns = {@JoinColumn(name = "user_id", referencedColumnName = "id")}, inverseJoinColumns = {@JoinColumn(name = "role_id", referencedColumnName = "id")}) + private final List roles = new ArrayList<>(); - public boolean equals(UserEntity user) - { + public boolean equals(UserEntity user) { return this.id == user.getId(); } public User toSecurityUser() { - return new User( - this.getEmail(), - this.getPassword(), - this.getRoles().stream().map((role) -> new SimpleGrantedAuthority(role.getName())) - .collect(Collectors.toList()) - ); + return new User(this.getEmail(), this.getPassword(), this.getRoles().stream().map((role) -> new SimpleGrantedAuthority(role.getName())).collect(Collectors.toList())); } public Long getId() { @@ -76,6 +66,7 @@ public class UserEntity { } public void setRoles(List roles) { - this.roles = roles; + this.roles.clear(); + this.roles.addAll(roles); } } -- cgit v1.2.3