Skip to content

Commit 721ac92

Browse files
Switched from @Autowired to constructor injection
1 parent 04a1361 commit 721ac92

16 files changed

+54
-86
lines changed

src/main/java/hexlet/code/component/DataInitializer.java

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
import hexlet.code.service.UserService;
1212
import lombok.AllArgsConstructor;
1313
import net.datafaker.Faker;
14-
import org.springframework.beans.factory.annotation.Autowired;
1514
import org.springframework.boot.ApplicationArguments;
1615
import org.springframework.boot.ApplicationRunner;
1716
import org.springframework.stereotype.Component;
@@ -23,22 +22,11 @@
2322
@Component
2423
@AllArgsConstructor
2524
public class DataInitializer implements ApplicationRunner {
26-
@Autowired
2725
private final UserRepository userRepository;
28-
29-
@Autowired
3026
private final UserService userService;
31-
32-
@Autowired
3327
private final TaskStatusService taskStatusService;
34-
35-
@Autowired
3628
private final TaskService taskService;
37-
38-
@Autowired
3929
private final LabelService labelService;
40-
41-
@Autowired
4230
private final Faker faker;
4331

4432
@Override

src/main/java/hexlet/code/config/EncodersConfig.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
import com.nimbusds.jose.jwk.source.JWKSource;
88
import com.nimbusds.jose.proc.SecurityContext;
99
import hexlet.code.component.RsaKeyProperties;
10-
import org.springframework.beans.factory.annotation.Autowired;
10+
import lombok.AllArgsConstructor;
1111
import org.springframework.context.annotation.Bean;
1212
import org.springframework.context.annotation.Configuration;
1313
import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
@@ -18,9 +18,9 @@
1818
import org.springframework.security.oauth2.jwt.NimbusJwtEncoder;
1919

2020
@Configuration
21+
@AllArgsConstructor
2122
public class EncodersConfig {
22-
@Autowired
23-
private RsaKeyProperties rsaKeys;
23+
private final RsaKeyProperties rsaKeys;
2424

2525
@Bean
2626
public PasswordEncoder passwordEncoder() {

src/main/java/hexlet/code/config/SecurityConfig.java

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package hexlet.code.config;
22

33
import hexlet.code.service.CustomUserDetailsService;
4-
import org.springframework.beans.factory.annotation.Autowired;
4+
import lombok.AllArgsConstructor;
55
import org.springframework.context.annotation.Bean;
66
import org.springframework.context.annotation.Configuration;
77
import org.springframework.security.authentication.AuthenticationManager;
@@ -21,16 +21,12 @@
2121

2222
@Configuration
2323
@EnableWebSecurity
24+
@AllArgsConstructor
2425
@EnableMethodSecurity
2526
public class SecurityConfig {
26-
@Autowired
27-
private JwtDecoder jwtDecoder;
28-
29-
@Autowired
30-
private PasswordEncoder passwordEncoder;
31-
32-
@Autowired
33-
private CustomUserDetailsService userDetailsService;
27+
private final JwtDecoder jwtDecoder;
28+
private final PasswordEncoder passwordEncoder;
29+
private final CustomUserDetailsService userDetailsService;
3430

3531
@Bean
3632
public SecurityFilterChain securityFilterChain(HttpSecurity http, HandlerMappingIntrospector introspector)

src/main/java/hexlet/code/controller/api/AuthenticationController.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,17 @@
22

33
import hexlet.code.model.AuthRequest;
44
import hexlet.code.service.AuthenticationService;
5-
import org.springframework.beans.factory.annotation.Autowired;
5+
import lombok.AllArgsConstructor;
66
import org.springframework.web.bind.annotation.PostMapping;
77
import org.springframework.web.bind.annotation.RequestBody;
88
import org.springframework.web.bind.annotation.RequestMapping;
99
import org.springframework.web.bind.annotation.RestController;
1010

1111
@RestController
12+
@AllArgsConstructor
1213
@RequestMapping("/api/login")
1314
public class AuthenticationController {
14-
@Autowired
15-
private AuthenticationService authenticationService;
15+
private final AuthenticationService authenticationService;
1616

1717
@PostMapping
1818
public String create(@RequestBody AuthRequest authRequest) {

src/main/java/hexlet/code/controller/api/LabelController.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
import hexlet.code.dto.label.LabelUpdateDTO;
66
import hexlet.code.service.LabelService;
77
import jakarta.validation.Valid;
8-
import org.springframework.beans.factory.annotation.Autowired;
8+
import lombok.AllArgsConstructor;
99
import org.springframework.http.HttpStatus;
1010
import org.springframework.http.ResponseEntity;
1111
import org.springframework.web.bind.annotation.DeleteMapping;
@@ -21,10 +21,10 @@
2121
import java.util.List;
2222

2323
@RestController
24+
@AllArgsConstructor
2425
@RequestMapping("/api/labels")
2526
public class LabelController {
26-
@Autowired
27-
private LabelService labelService;
27+
private final LabelService labelService;
2828

2929
@GetMapping
3030
ResponseEntity<List<LabelDTO>> index() {

src/main/java/hexlet/code/controller/api/TaskController.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
import hexlet.code.dto.task.TaskUpdateDTO;
77
import hexlet.code.service.TaskService;
88
import jakarta.validation.Valid;
9-
import org.springframework.beans.factory.annotation.Autowired;
9+
import lombok.AllArgsConstructor;
1010
import org.springframework.http.HttpStatus;
1111
import org.springframework.http.ResponseEntity;
1212
import org.springframework.web.bind.annotation.DeleteMapping;
@@ -22,10 +22,10 @@
2222
import java.util.List;
2323

2424
@RestController
25+
@AllArgsConstructor
2526
@RequestMapping("/api/tasks")
2627
public class TaskController {
27-
@Autowired
28-
private TaskService taskService;
28+
private final TaskService taskService;
2929

3030
@GetMapping
3131
ResponseEntity<List<TaskDTO>> index(TaskParamsDTO params) {

src/main/java/hexlet/code/controller/api/TaskStatusController.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
import hexlet.code.dto.taskStatus.TaskStatusUpdateDTO;
66
import hexlet.code.service.TaskStatusService;
77
import jakarta.validation.Valid;
8-
import org.springframework.beans.factory.annotation.Autowired;
8+
import lombok.AllArgsConstructor;
99
import org.springframework.http.HttpStatus;
1010
import org.springframework.http.ResponseEntity;
1111
import org.springframework.web.bind.annotation.DeleteMapping;
@@ -21,10 +21,10 @@
2121
import java.util.List;
2222

2323
@RestController
24+
@AllArgsConstructor
2425
@RequestMapping("/api/task_statuses")
2526
public class TaskStatusController {
26-
@Autowired
27-
private TaskStatusService taskStatusService;
27+
private final TaskStatusService taskStatusService;
2828

2929
@GetMapping
3030
ResponseEntity<List<TaskStatusDTO>> index() {

src/main/java/hexlet/code/controller/api/UserController.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
import hexlet.code.dto.user.UserUpdateDTO;
66
import hexlet.code.service.UserService;
77
import jakarta.validation.Valid;
8-
import org.springframework.beans.factory.annotation.Autowired;
8+
import lombok.AllArgsConstructor;
99
import org.springframework.http.HttpStatus;
1010
import org.springframework.http.ResponseEntity;
1111
import org.springframework.web.bind.annotation.DeleteMapping;
@@ -21,10 +21,10 @@
2121
import java.util.List;
2222

2323
@RestController
24+
@AllArgsConstructor
2425
@RequestMapping("/api/users")
2526
public class UserController {
26-
@Autowired
27-
private UserService userService;
27+
private final UserService userService;
2828

2929
@GetMapping
3030
ResponseEntity<List<UserDTO>> index() {

src/main/java/hexlet/code/service/AuthenticationService.java

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,16 @@
22

33
import hexlet.code.model.AuthRequest;
44
import hexlet.code.util.JWTUtils;
5-
import org.springframework.beans.factory.annotation.Autowired;
5+
import lombok.AllArgsConstructor;
66
import org.springframework.security.authentication.AuthenticationManager;
77
import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
88
import org.springframework.stereotype.Service;
99

1010
@Service
11+
@AllArgsConstructor
1112
public class AuthenticationService {
12-
@Autowired
13-
private JWTUtils jwtUtils;
14-
15-
@Autowired
16-
private AuthenticationManager authenticationManager;
13+
private final JWTUtils jwtUtils;
14+
private final AuthenticationManager authenticationManager;
1715

1816
public String createAuthentication(AuthRequest authRequest) {
1917
var authentication = new UsernamePasswordAuthenticationToken(

src/main/java/hexlet/code/service/CustomUserDetailsService.java

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,21 +2,18 @@
22

33
import hexlet.code.exception.ResourceNotFoundException;
44
import hexlet.code.repository.UserRepository;
5-
import org.springframework.beans.factory.annotation.Autowired;
5+
import lombok.AllArgsConstructor;
66
import org.springframework.security.core.userdetails.UserDetails;
77
import org.springframework.security.core.userdetails.UsernameNotFoundException;
88
import org.springframework.security.crypto.password.PasswordEncoder;
99
import org.springframework.security.provisioning.UserDetailsManager;
1010
import org.springframework.stereotype.Service;
1111

1212
@Service
13+
@AllArgsConstructor
1314
public class CustomUserDetailsService implements UserDetailsManager {
14-
15-
@Autowired
16-
private UserRepository userRepository;
17-
18-
@Autowired
19-
private PasswordEncoder passwordEncoder;
15+
private final UserRepository userRepository;
16+
private final PasswordEncoder passwordEncoder;
2017

2118
@Override
2219
public UserDetails loadUserByUsername(String email) throws UsernameNotFoundException {

0 commit comments

Comments
 (0)