redid autowiring c annotation on the constructor

Author: mistaru

.idea/workspace.xml

@@ -18,10 +18,20 @@
 public class WebSecurityConfig extends WebSecurityConfigurerAdapter {
 
     @Autowired
-    private UserServiceImpl userServiceImpl;
+    private  UserServiceImpl userServiceImpl;
 
     @Autowired
-    private PasswordEncoder passwordEncoder;
+    private  PasswordEncoder passwordEncoder;
+
+    @Autowired
+    public void setUserServiceImpl(UserServiceImpl userServiceImpl) {
+        this.userServiceImpl = userServiceImpl;
+    }
+
+    @Autowired
+    public void setPasswordEncoder(PasswordEncoder passwordEncoder) {
+        this.passwordEncoder = passwordEncoder;
+    }
 
     @Bean
     public PasswordEncoder getPasswordEncoder() {

src/main/java/org/example/argen/configuration/WebSecurityConfig.java

@@ -15,7 +15,7 @@
 @RequestMapping("/user")
 public class AdminController {
 
-    private UserService userService;
+    private final UserService userService;
 
     public AdminController(@NotNull UserService userService) {
         this.userService = userService;

src/main/java/org/example/argen/controller/AdminController.java

@@ -16,7 +16,7 @@
 @Controller
 public class RegistrationController {
 
-    private UserService userService;
+    private final UserService userService;
 
     public RegistrationController(@NotNull UserService userService) {
         this.userService = userService;

src/main/java/org/example/argen/controller/RegistrationController.java

@@ -21,7 +21,7 @@
 @RequestMapping("/todo")
 public class TodoController {
 
-    private TodoService todoService;
+    private final TodoService todoService;
 
     public TodoController(@NotNull TodoService todoService) {
         this.todoService = todoService;

src/main/java/org/example/argen/controller/TodoController.java

@@ -3,27 +3,25 @@
 import org.example.argen.entity.Todo;
 import org.example.argen.service.EmailService;
 import org.example.argen.service.TodoService;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.mail.SimpleMailMessage;
 import org.springframework.mail.javamail.JavaMailSender;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Service;
 
+import javax.validation.constraints.NotNull;
 import java.time.LocalDate;
 
 import static org.example.argen.constants.Constants.*;
 
 @Service
 public class EmailServiceImpl implements EmailService {
 
-    @Autowired
-    private JavaMailSender mailSender;
+    private final JavaMailSender mailSender;
+    private final TodoService todoService;
 
-    private TodoService todoService;
-    private LocalDate date = LocalDate.now();
-
-    public EmailServiceImpl(TodoService todoService) {
+    public EmailServiceImpl(@NotNull JavaMailSender mailSender, @NotNull TodoService todoService) {
+        this.mailSender = mailSender;
         this.todoService = todoService;
     }
 
@@ -44,10 +42,10 @@ public void send(String emailTo, String subject, String message) {
     @Scheduled(cron = CRON)
     public void sendNotify() {
 
-        for (Todo todo : todoService.ListIsNotDoneTodo(date)) {
+        for (Todo todo : todoService.ListIsNotDoneTodo(LocalDate.now())) {
             send(todo.getAuthor().getEmail(), SUBJECT_TODO_EXPIRATION,
-                    String.format(TODO_EXPIRATION_MESSAGE, todo.getAuthor().getFullName(),
-                            todo.getTitle()));
+                    String.format(TODO_EXPIRATION_MESSAGE, todo.getAuthor().
+                                    getFullName(), todo.getTitle()));
         }
     }
 

src/main/java/org/example/argen/service/Impl/EmailServiceImpl.java

@@ -7,15 +7,16 @@
 import org.example.argen.service.TodoService;
 import org.springframework.stereotype.Service;
 
+import javax.validation.constraints.NotNull;
 import java.time.LocalDate;
 import java.util.List;
 
 @Service
 public class TodoServiceImpl implements TodoService {
 
-    private TodoRepository todoRepository;
+    private final TodoRepository todoRepository;
 
-    public TodoServiceImpl(TodoRepository todoRepository) {
+    public TodoServiceImpl(@NotNull TodoRepository todoRepository) {
         this.todoRepository = todoRepository;
     }
 

src/main/java/org/example/argen/service/Impl/TodoServiceImpl.java

@@ -4,25 +4,24 @@
 import org.example.argen.entity.User;
 import org.example.argen.repository.UserRepository;
 import org.example.argen.service.UserService;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.core.userdetails.UserDetails;
 import org.springframework.security.core.userdetails.UserDetailsService;
 import org.springframework.security.core.userdetails.UsernameNotFoundException;
 import org.springframework.security.crypto.password.PasswordEncoder;
 import org.springframework.stereotype.Service;
 
+import javax.validation.constraints.NotNull;
 import java.util.*;
 import java.util.stream.Collectors;
 
 @Service
 public class UserServiceImpl implements UserDetailsService, UserService {
 
-    @Autowired
-    private PasswordEncoder passwordEncoder;
+    private final PasswordEncoder passwordEncoder;
+    private final UserRepository userRepository;
 
-    private UserRepository userRepository;
-
-    public UserServiceImpl(UserRepository userRepository) {
+    public UserServiceImpl(@NotNull PasswordEncoder passwordEncoder, @NotNull UserRepository userRepository) {
+        this.passwordEncoder = passwordEncoder;
         this.userRepository = userRepository;
     }