auto-cleanup

9 files changed, 10 insertions, 22 deletions

diff --git a/backend/src/main/java/com/blog/web/controllers/ArticleController.java b/backend/src/main/java/com/blog/web/controllers/ArticleController.java
index 0df26a2..0429084 100644
--- a/backend/src/main/java/com/blog/web/controllers/ArticleController.java
+++ b/backend/src/main/java/com/blog/web/controllers/ArticleController.java
@@ -18,8 +18,8 @@ import java.util.HashSet;
 @RestController
 @RequestMapping("/api/v1")
 public class ArticleController {
-    private ArticleService articleService;
-    private UserService userService;
+    private final ArticleService articleService;
+    private final UserService userService;
 
     public ArticleController(ArticleService articleService, UserService userService) {
         this.articleService = articleService;
@@ -42,10 +42,9 @@ public class ArticleController {
     @GetMapping("/articles")
     public HashSet<ArticlePublicDto> listArticles(@RequestParam(value = "search", required = false) String search) {
         HashSet<ArticlePublicDto> articles;
-        if(search != null) {
+        if (search != null) {
             articles = articleService.searchPublicArticles(search);
-        }
-        else {
+        } else {
             articles = new HashSet<ArticlePublicDto>(articleService.findAllArticles());
         }
         return articles;
diff --git a/backend/src/main/java/com/blog/web/dto/ArticleDto.java b/backend/src/main/java/com/blog/web/dto/ArticleDto.java
index beede12..755b1f6 100644
--- a/backend/src/main/java/com/blog/web/dto/ArticleDto.java
+++ b/backend/src/main/java/com/blog/web/dto/ArticleDto.java
@@ -42,8 +42,6 @@ public class ArticleDto {
     public ArticleDto() {
     }
 
-    ;
-
     public ArticleDto(Article article) {
         this.id = article.getId();
         this.title = article.getTitle();
diff --git a/backend/src/main/java/com/blog/web/dto/ArticlePublicDto.java b/backend/src/main/java/com/blog/web/dto/ArticlePublicDto.java
index ecf27eb..5dac4fe 100644
--- a/backend/src/main/java/com/blog/web/dto/ArticlePublicDto.java
+++ b/backend/src/main/java/com/blog/web/dto/ArticlePublicDto.java
@@ -26,8 +26,6 @@ public class ArticlePublicDto {
     public ArticlePublicDto() {
     }
 
-    ;
-
     public ArticlePublicDto(Article article) {
         this.id = article.getId();
         this.title = article.getTitle();
diff --git a/backend/src/main/java/com/blog/web/models/Role.java b/backend/src/main/java/com/blog/web/models/Role.java
index 2b7143f..7eaec6b 100644
--- a/backend/src/main/java/com/blog/web/models/Role.java
+++ b/backend/src/main/java/com/blog/web/models/Role.java
@@ -12,7 +12,7 @@ public class Role {
     private long id;
     private String name;
     @ManyToMany(mappedBy = "roles")
-    private List<UserEntity> users = new ArrayList<>();
+    private final List<UserEntity> users = new ArrayList<>();
 
     public long getId() {
         return id;
diff --git a/backend/src/main/java/com/blog/web/security/CustomUserDetailsService.java b/backend/src/main/java/com/blog/web/security/CustomUserDetailsService.java
index ee3e950..b681659 100644
--- a/backend/src/main/java/com/blog/web/security/CustomUserDetailsService.java
+++ b/backend/src/main/java/com/blog/web/security/CustomUserDetailsService.java
@@ -7,8 +7,6 @@ import org.springframework.security.core.userdetails.UserDetailsService;
 import org.springframework.security.core.userdetails.UsernameNotFoundException;
 import org.springframework.stereotype.Service;
 
-import java.util.stream.Collectors;
-
 @Service
 public class CustomUserDetailsService implements UserDetailsService {
     private final UserRepository userRepository;
diff --git a/backend/src/main/java/com/blog/web/security/SecurityConfig.java b/backend/src/main/java/com/blog/web/security/SecurityConfig.java
index e562041..a49f0f4 100644
--- a/backend/src/main/java/com/blog/web/security/SecurityConfig.java
+++ b/backend/src/main/java/com/blog/web/security/SecurityConfig.java
@@ -10,17 +10,12 @@ import org.springframework.security.config.annotation.web.configuration.EnableWe
 import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
 import org.springframework.security.crypto.password.PasswordEncoder;
 import org.springframework.security.web.SecurityFilterChain;
-import org.springframework.web.cors.CorsConfiguration;
-import org.springframework.web.cors.CorsConfigurationSource;
-import org.springframework.web.cors.UrlBasedCorsConfigurationSource;
-
-import java.util.Arrays;
 
 @Configuration
 @EnableWebSecurity
 @EnableMethodSecurity(securedEnabled = true)
 public class SecurityConfig {
-    private CustomUserDetailsService userDetailsService;
+    private final CustomUserDetailsService userDetailsService;
 
     public SecurityConfig(CustomUserDetailsService userDetailsService) {
         this.userDetailsService = userDetailsService;
diff --git a/backend/src/main/java/com/blog/web/services/UserService.java b/backend/src/main/java/com/blog/web/services/UserService.java
index b9c231b..772ff40 100644
--- a/backend/src/main/java/com/blog/web/services/UserService.java
+++ b/backend/src/main/java/com/blog/web/services/UserService.java
@@ -12,5 +12,5 @@ public interface UserService {
 
     Optional<UserEntity> findByUsername(String username);
 
-    public Optional<UserEntity> getLoggedInUser();
+    Optional<UserEntity> getLoggedInUser();
 }
diff --git a/backend/src/main/java/com/blog/web/services/impl/ArticleServiceImpl.java b/backend/src/main/java/com/blog/web/services/impl/ArticleServiceImpl.java
index 993d798..aaf1044 100644
--- a/backend/src/main/java/com/blog/web/services/impl/ArticleServiceImpl.java
+++ b/backend/src/main/java/com/blog/web/services/impl/ArticleServiceImpl.java
@@ -2,6 +2,7 @@ package com.blog.web.services.impl;
 
 import com.blog.web.dto.ArticleDto;
 import com.blog.web.dto.ArticlePublicDto;
+import com.blog.web.mappers.ArticleMapper;
 import com.blog.web.models.Article;
 import com.blog.web.models.UserEntity;
 import com.blog.web.repository.ArticleRepository;
@@ -16,8 +17,6 @@ import java.util.List;
 import java.util.Optional;
 import java.util.stream.Collectors;
 
-import com.blog.web.mappers.ArticleMapper;
-
 import static com.blog.web.mappers.ArticleMapper.*;
 
 @Service
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 859e72c..9c3eaa8 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
@@ -11,6 +11,7 @@ import org.springframework.security.crypto.password.PasswordEncoder;
 import org.springframework.stereotype.Service;
 
 import java.util.Arrays;
+import java.util.List;
 import java.util.Optional;
 
 @Service
@@ -33,7 +34,7 @@ public class UserServiceImpl implements UserService {
         user.setPassword(passwordEncoder.encode(registrationDto.getPassword()));
 
         final Role role = roleRepository.findByName("User").orElse(new Role());
-        user.setRoles(Arrays.asList(role));
+        user.setRoles(List.of(role));
         userRepository.save(user);
     }