Skip to content

Commit d5b3e48

Browse files
committed
1 parent 6a0cda4 commit d5b3e48

File tree

10 files changed

+45
-54
lines changed

10 files changed

+45
-54
lines changed

src/main/java/ru/mystamps/web/config/ControllersConfig.java

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,22 +17,21 @@
1717
*/
1818
package ru.mystamps.web.config;
1919

20-
import org.springframework.beans.factory.annotation.Autowired;
2120
import org.springframework.context.MessageSource;
2221
import org.springframework.context.annotation.Bean;
2322
import org.springframework.context.annotation.Configuration;
2423

24+
import lombok.RequiredArgsConstructor;
25+
2526
// CheckStyle: ignore AvoidStarImportCheck for next 1 line
2627
import ru.mystamps.web.controller.*; // NOPMD: UnusedImports
2728

2829
@Configuration
30+
@RequiredArgsConstructor
2931
public class ControllersConfig {
3032

31-
@Autowired
32-
private ServicesConfig servicesConfig;
33-
34-
@Autowired
35-
private MessageSource messageSource;
33+
private final ServicesConfig servicesConfig;
34+
private final MessageSource messageSource;
3635

3736
@Bean
3837
public AccountController getAccountController() {

src/main/java/ru/mystamps/web/config/DaoConfig.java

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,26 +17,25 @@
1717
*/
1818
package ru.mystamps.web.config;
1919

20-
import org.springframework.beans.factory.annotation.Autowired;
2120
import org.springframework.context.annotation.Bean;
2221
import org.springframework.context.annotation.Configuration;
2322
import org.springframework.context.annotation.PropertySource;
2423
import org.springframework.core.env.Environment;
2524
import org.springframework.jdbc.core.namedparam.NamedParameterJdbcTemplate;
2625

26+
import lombok.RequiredArgsConstructor;
27+
2728
// CheckStyle: ignore AvoidStarImportCheck for next 2 lines
2829
import ru.mystamps.web.dao.*; // NOPMD: UnusedImports
2930
import ru.mystamps.web.dao.impl.*; // NOPMD: UnusedImports
3031

3132
@Configuration
3233
@PropertySource("classpath:/sql/stamps_catalog_dao_queries.properties")
34+
@RequiredArgsConstructor
3335
public class DaoConfig {
3436

35-
@Autowired
36-
private NamedParameterJdbcTemplate jdbcTemplate;
37-
38-
@Autowired
39-
private Environment env;
37+
private final NamedParameterJdbcTemplate jdbcTemplate;
38+
private final Environment env;
4039

4140
@Bean
4241
public CategoryDao getCategoryDao() {

src/main/java/ru/mystamps/web/config/MvcConfig.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
import java.util.List;
2121
import java.util.Locale;
2222

23-
import org.springframework.beans.factory.annotation.Autowired;
2423
import org.springframework.context.annotation.Bean;
2524
import org.springframework.context.annotation.Configuration;
2625
import org.springframework.context.annotation.Import;
@@ -41,17 +40,19 @@
4140
import org.springframework.web.servlet.i18n.LocaleChangeInterceptor;
4241
import org.springframework.web.servlet.i18n.SessionLocaleResolver;
4342

43+
import lombok.RequiredArgsConstructor;
44+
4445
import ru.mystamps.web.Url;
4546
import ru.mystamps.web.controller.converter.LinkEntityDtoGenericConverter;
4647
import ru.mystamps.web.support.spring.security.CurrentUserArgumentResolver;
4748

4849
@Configuration
4950
@EnableScheduling
5051
@Import(ControllersConfig.class)
52+
@RequiredArgsConstructor
5153
public class MvcConfig extends WebMvcConfigurerAdapter {
5254

53-
@Autowired
54-
private ServicesConfig servicesConfig;
55+
private final ServicesConfig servicesConfig;
5556

5657
@Override
5758
public void addFormatters(FormatterRegistry registry) {

src/main/java/ru/mystamps/web/config/ServicesConfig.java

Lines changed: 9 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -19,39 +19,30 @@
1919

2020
import java.util.Locale;
2121

22-
import org.springframework.beans.factory.annotation.Autowired;
2322
import org.springframework.context.MessageSource;
2423
import org.springframework.context.annotation.Bean;
2524
import org.springframework.context.annotation.Configuration;
2625
import org.springframework.core.env.Environment;
2726
import org.springframework.mail.javamail.JavaMailSender;
2827
import org.springframework.scheduling.annotation.EnableAsync;
2928

29+
import lombok.RequiredArgsConstructor;
30+
3031
// CheckStyle: ignore AvoidStarImportCheck for next 1 line
3132
import ru.mystamps.web.service.*; // NOPMD: UnusedImports
3233
import ru.mystamps.web.support.spring.security.SecurityConfig;
3334

3435
@Configuration
3536
@EnableAsync
37+
@RequiredArgsConstructor
3638
public class ServicesConfig {
3739

38-
@Autowired
39-
private DaoConfig daoConfig;
40-
41-
@Autowired
42-
private SecurityConfig securityConfig;
43-
44-
@Autowired
45-
private StrategiesConfig strategiesConfig;
46-
47-
@Autowired
48-
private JavaMailSender mailSender;
49-
50-
@Autowired
51-
private Environment env;
52-
53-
@Autowired
54-
private MessageSource messageSource;
40+
private final DaoConfig daoConfig;
41+
private final SecurityConfig securityConfig;
42+
private final StrategiesConfig strategiesConfig;
43+
private final JavaMailSender mailSender;
44+
private final Environment env;
45+
private final MessageSource messageSource;
5546

5647
@Bean
5748
public SuspiciousActivityService getSuspiciousActivityService() {

src/main/java/ru/mystamps/web/config/StrategiesConfig.java

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,13 @@
1717
*/
1818
package ru.mystamps.web.config;
1919

20-
import org.springframework.beans.factory.annotation.Autowired;
2120
import org.springframework.context.annotation.Bean;
2221
import org.springframework.context.annotation.Configuration;
2322
import org.springframework.context.annotation.Profile;
2423
import org.springframework.core.env.Environment;
2524

25+
import lombok.RequiredArgsConstructor;
26+
2627
import ru.mystamps.web.service.DatabaseImagePersistenceStrategy;
2728
import ru.mystamps.web.service.FilesystemImagePersistenceStrategy;
2829
import ru.mystamps.web.service.ImagePersistenceStrategy;
@@ -33,10 +34,10 @@ public interface StrategiesConfig {
3334
ImagePersistenceStrategy getImagePersistenceStrategy();
3435

3536
@Profile("test")
37+
@RequiredArgsConstructor
3638
class DbStrategiesConfig implements StrategiesConfig {
3739

38-
@Autowired
39-
private DaoConfig daoConfig;
40+
private final DaoConfig daoConfig;
4041

4142
@Bean
4243
@Override
@@ -47,10 +48,10 @@ public ImagePersistenceStrategy getImagePersistenceStrategy() {
4748
}
4849

4950
@Profile({ "prod", "travis" })
51+
@RequiredArgsConstructor
5052
class FsStrategiesConfig implements StrategiesConfig {
5153

52-
@Autowired
53-
private Environment env;
54+
private final Environment env;
5455

5556
@Bean
5657
@Override

src/main/java/ru/mystamps/web/support/togglz/TogglzConfig.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121

2222
import javax.sql.DataSource;
2323

24-
import org.springframework.beans.factory.annotation.Autowired;
2524
import org.springframework.context.annotation.Bean;
2625
import org.springframework.context.annotation.Configuration;
2726

@@ -35,14 +34,15 @@
3534
import org.togglz.core.repository.jdbc.JDBCStateRepository;
3635
import org.togglz.spring.security.SpringSecurityUserProvider;
3736

37+
import lombok.RequiredArgsConstructor;
38+
3839
import ru.mystamps.web.Url;
3940
import ru.mystamps.web.support.spring.security.StringAuthority;
4041

4142
@Configuration
43+
@RequiredArgsConstructor
4244
public class TogglzConfig {
43-
44-
@Autowired
45-
private DataSource dataSource;
45+
private final DataSource dataSource;
4646

4747
@Bean
4848
public FeatureManager getFeatureManager() {

src/main/java/ru/mystamps/web/validation/jsr303/ExistingActivationKeyValidator.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,15 +20,15 @@
2020
import javax.validation.ConstraintValidator;
2121
import javax.validation.ConstraintValidatorContext;
2222

23-
import org.springframework.beans.factory.annotation.Autowired;
23+
import lombok.RequiredArgsConstructor;
2424

2525
import ru.mystamps.web.service.UsersActivationService;
2626

27+
@RequiredArgsConstructor
2728
public class ExistingActivationKeyValidator
2829
implements ConstraintValidator<ExistingActivationKey, String> {
2930

30-
@Autowired
31-
private UsersActivationService usersActivationService;
31+
private final UsersActivationService usersActivationService;
3232

3333
@Override
3434
public void initialize(ExistingActivationKey annotation) {

src/main/java/ru/mystamps/web/validation/jsr303/UniqueCategoryNameValidator.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,16 +20,16 @@
2020
import javax.validation.ConstraintValidator;
2121
import javax.validation.ConstraintValidatorContext;
2222

23-
import org.springframework.beans.factory.annotation.Autowired;
23+
import lombok.RequiredArgsConstructor;
2424

2525
import ru.mystamps.web.service.CategoryService;
2626
import ru.mystamps.web.validation.jsr303.UniqueCategoryName.Lang;
2727

28+
@RequiredArgsConstructor
2829
public class UniqueCategoryNameValidator
2930
implements ConstraintValidator<UniqueCategoryName, String> {
3031

31-
@Autowired
32-
private CategoryService categoryService;
32+
private final CategoryService categoryService;
3333

3434
private Lang lang;
3535

src/main/java/ru/mystamps/web/validation/jsr303/UniqueCountryNameValidator.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,15 +20,15 @@
2020
import javax.validation.ConstraintValidator;
2121
import javax.validation.ConstraintValidatorContext;
2222

23-
import org.springframework.beans.factory.annotation.Autowired;
23+
import lombok.RequiredArgsConstructor;
2424

2525
import ru.mystamps.web.service.CountryService;
2626
import ru.mystamps.web.validation.jsr303.UniqueCountryName.Lang;
2727

28+
@RequiredArgsConstructor
2829
public class UniqueCountryNameValidator implements ConstraintValidator<UniqueCountryName, String> {
2930

30-
@Autowired
31-
private CountryService countryService;
31+
private final CountryService countryService;
3232

3333
private Lang lang;
3434

src/main/java/ru/mystamps/web/validation/jsr303/UniqueLoginValidator.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,14 +20,14 @@
2020
import javax.validation.ConstraintValidator;
2121
import javax.validation.ConstraintValidatorContext;
2222

23-
import org.springframework.beans.factory.annotation.Autowired;
23+
import lombok.RequiredArgsConstructor;
2424

2525
import ru.mystamps.web.service.UserService;
2626

27+
@RequiredArgsConstructor
2728
public class UniqueLoginValidator implements ConstraintValidator<UniqueLogin, String> {
2829

29-
@Autowired
30-
private UserService userService;
30+
private final UserService userService;
3131

3232
@Override
3333
public void initialize(UniqueLogin annotation) {

0 commit comments

Comments
 (0)