From fc34d9853386b6dbf270a10862a47a052f1fb151 Mon Sep 17 00:00:00 2001
From: realtradam <github@tradam.dev>
Date: Sun, 28 Jul 2024 20:00:49 -0400
Subject: code cleanup

---
 .../main/java/com/blog/web/services/impl/UserServiceImpl.java    | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

(limited to 'backend/src/main/java/com/blog/web/services/impl/UserServiceImpl.java')

diff --git a/backend/src/main/java/com/blog/web/services/impl/UserServiceImpl.java b/backend/src/main/java/com/blog/web/services/impl/UserServiceImpl.java
index b39d15e..9ca8b0b 100644
--- a/backend/src/main/java/com/blog/web/services/impl/UserServiceImpl.java
+++ b/backend/src/main/java/com/blog/web/services/impl/UserServiceImpl.java
@@ -10,7 +10,8 @@ import com.blog.web.services.UserService;
 import org.springframework.security.crypto.password.PasswordEncoder;
 import org.springframework.stereotype.Service;
 
-import java.util.*;
+import java.util.HashSet;
+import java.util.Optional;
 
 @Service
 public class UserServiceImpl implements UserService {
@@ -26,7 +27,9 @@ public class UserServiceImpl implements UserService {
 
     @Override
     public void saveUser(RegistrationDto registrationDto) {
-        final HashSet<Role> roles = (HashSet<Role>) Set.of(roleRepository.findByName("User").orElse(new Role()));
+        final HashSet<Role> roles = new HashSet<Role>() {{
+            add(roleRepository.findByName("User").get());
+        }};
         userRepository.save(new UserEntity(registrationDto.getUsername(), registrationDto.getEmail(), passwordEncoder.encode(registrationDto.getPassword()), roles));
     }
 
@@ -43,7 +46,7 @@ public class UserServiceImpl implements UserService {
     public Optional<UserEntity> getLoggedInUser() {
         final Optional<UserEntity> user;
         Optional<String> optUsername = Optional.ofNullable(SecurityUtil.getSessionUser());
-        if(optUsername.isPresent()) {
+        if (optUsername.isPresent()) {
             user = this.findByUsername(optUsername.get());
         } else {
             user = Optional.empty();
-- 
cgit v1.2.3