diff --git a/src/main/java/com/koliving/api/config/DatabaseConfig.java b/src/main/java/com/koliving/api/config/DatabaseConfig.java index 47afef66..4e3fe758 100644 --- a/src/main/java/com/koliving/api/config/DatabaseConfig.java +++ b/src/main/java/com/koliving/api/config/DatabaseConfig.java @@ -3,7 +3,7 @@ import com.koliving.api.properties.DatasourceProperties; import com.zaxxer.hikari.HikariConfig; import com.zaxxer.hikari.HikariDataSource; -import lombok.AllArgsConstructor; +import lombok.RequiredArgsConstructor; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.data.jpa.repository.config.EnableJpaRepositories; @@ -17,8 +17,8 @@ @Configuration -@AllArgsConstructor @EnableJpaRepositories(basePackages = "com.koliving.api") +@RequiredArgsConstructor public class DatabaseConfig { private final DatasourceProperties datasourceProperties; diff --git a/src/main/java/com/koliving/api/config/EmailConfig.java b/src/main/java/com/koliving/api/config/EmailConfig.java index 390d14f3..775f49df 100644 --- a/src/main/java/com/koliving/api/config/EmailConfig.java +++ b/src/main/java/com/koliving/api/config/EmailConfig.java @@ -1,7 +1,7 @@ package com.koliving.api.config; import com.koliving.api.properties.EmailProperties; -import lombok.AllArgsConstructor; +import lombok.RequiredArgsConstructor; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.mail.javamail.JavaMailSender; @@ -9,8 +9,8 @@ import java.util.Properties; -@AllArgsConstructor @Configuration +@RequiredArgsConstructor public class EmailConfig { private final EmailProperties emailProperties; diff --git a/src/main/java/com/koliving/api/email/EmailTemplateUtil.java b/src/main/java/com/koliving/api/email/EmailTemplateUtil.java index 5da55cd7..4e19ff7c 100644 --- a/src/main/java/com/koliving/api/email/EmailTemplateUtil.java +++ b/src/main/java/com/koliving/api/email/EmailTemplateUtil.java @@ -1,6 +1,6 @@ package com.koliving.api.email; -import lombok.AllArgsConstructor; +import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Component; import org.thymeleaf.TemplateEngine; import org.thymeleaf.context.Context; @@ -8,7 +8,7 @@ import java.util.Map; @Component -@AllArgsConstructor +@RequiredArgsConstructor public class EmailTemplateUtil { private final TemplateEngine templateEngine; diff --git a/src/main/java/com/koliving/api/event/EventListener.java b/src/main/java/com/koliving/api/event/EventListener.java index bcda0382..deddd9c6 100644 --- a/src/main/java/com/koliving/api/event/EventListener.java +++ b/src/main/java/com/koliving/api/event/EventListener.java @@ -1,14 +1,14 @@ package com.koliving.api.event; import com.koliving.api.token.confirmation.IConfirmationTokenService; -import lombok.AllArgsConstructor; +import lombok.RequiredArgsConstructor; import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Component; import org.springframework.transaction.event.TransactionPhase; import org.springframework.transaction.event.TransactionalEventListener; @Component -@AllArgsConstructor +@RequiredArgsConstructor public class EventListener { private final IConfirmationTokenService confirmationTokenService; diff --git a/src/main/java/com/koliving/api/i18n/MessageSource.java b/src/main/java/com/koliving/api/i18n/MessageSource.java index ab382cd2..a6e90f1f 100644 --- a/src/main/java/com/koliving/api/i18n/MessageSource.java +++ b/src/main/java/com/koliving/api/i18n/MessageSource.java @@ -1,6 +1,6 @@ package com.koliving.api.i18n; -import org.springframework.beans.factory.annotation.Autowired; +import lombok.RequiredArgsConstructor; import org.springframework.context.support.AbstractMessageSource; import org.springframework.context.support.ResourceBundleMessageSource; import org.springframework.stereotype.Component; @@ -9,13 +9,11 @@ import java.util.Locale; @Component +@RequiredArgsConstructor public class MessageSource extends AbstractMessageSource { - @Autowired - private ResourceBundleMessageSource resourceBundleMessageSource; - - @Autowired - private LanguageRepository languageRepository; + private final ResourceBundleMessageSource resourceBundleMessageSource; + private final LanguageRepository languageRepository; @Override protected MessageFormat resolveCode(String key, Locale locale) { diff --git a/src/main/java/com/koliving/api/provider/JwtProvider.java b/src/main/java/com/koliving/api/provider/JwtProvider.java index 9edac1b3..c196baca 100644 --- a/src/main/java/com/koliving/api/provider/JwtProvider.java +++ b/src/main/java/com/koliving/api/provider/JwtProvider.java @@ -26,9 +26,9 @@ @Component public class JwtProvider { - private String jwtSecret; - private long expiration; - private IClock clock; + private final IClock clock; + private final String jwtSecret; + private final long expiration; public JwtProvider(@Value("${jwt.secret}") String jwtSecret, @Value("${jwt.expiration:24}") long expiration, diff --git a/src/main/java/com/koliving/api/s3/ObjectStorageService.java b/src/main/java/com/koliving/api/s3/ObjectStorageService.java index 37beed59..bf3c0328 100644 --- a/src/main/java/com/koliving/api/s3/ObjectStorageService.java +++ b/src/main/java/com/koliving/api/s3/ObjectStorageService.java @@ -7,6 +7,7 @@ import com.amazonaws.services.s3.model.ObjectMetadata; import com.amazonaws.services.s3.model.PutObjectRequest; import com.koliving.api.properties.ObjectStorageProperties; +import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; import org.springframework.web.multipart.MultipartFile; @@ -15,15 +16,11 @@ @Slf4j @Service +@RequiredArgsConstructor public class ObjectStorageService { - private final ObjectStorageProperties objectStorageProperties; private final AmazonS3Client client; - - public ObjectStorageService(ObjectStorageProperties objectStorageProperties, AmazonS3Client client) { - this.objectStorageProperties = objectStorageProperties; - this.client = client; - } + private final ObjectStorageProperties objectStorageProperties; public String getFileUrl(String filePath) { String string = null; diff --git a/src/main/java/com/koliving/api/token/JwtService.java b/src/main/java/com/koliving/api/token/JwtService.java index 7db28873..9f500c3e 100644 --- a/src/main/java/com/koliving/api/token/JwtService.java +++ b/src/main/java/com/koliving/api/token/JwtService.java @@ -19,10 +19,10 @@ @Service public class JwtService implements IJwtService { - private String jwtSecret; private final UserDetailsService userService; - private final BlackListRepository blackListRepository; private final RefreshTokenRepository refreshTokenRepository; + private final BlackListRepository blackListRepository; + private final String jwtSecret; public JwtService(@Value("${jwt.secret}") String jwtSecret, UserDetailsService userService, diff --git a/src/main/java/com/koliving/api/token/confirmation/ConfirmationTokenService.java b/src/main/java/com/koliving/api/token/confirmation/ConfirmationTokenService.java index 968e0856..09801646 100644 --- a/src/main/java/com/koliving/api/token/confirmation/ConfirmationTokenService.java +++ b/src/main/java/com/koliving/api/token/confirmation/ConfirmationTokenService.java @@ -13,12 +13,12 @@ @Service public class ConfirmationTokenService implements IConfirmationTokenService { - private final ConfirmationTokenRepository confirmationTokenRepository; private final IEmailService emailService; + private final ConfirmationTokenRepository confirmationTokenRepository; private final IClock clock; - private String origin; - private String currentVersion; - private long validityPeriod; + private final String origin; + private final String currentVersion; + private final long validityPeriod; public ConfirmationTokenService(ConfirmationTokenRepository confirmationTokenRepository, IEmailService emailService, diff --git a/src/main/java/com/koliving/api/user/UserService.java b/src/main/java/com/koliving/api/user/UserService.java index bacd039f..3e6d97d1 100644 --- a/src/main/java/com/koliving/api/user/UserService.java +++ b/src/main/java/com/koliving/api/user/UserService.java @@ -1,6 +1,6 @@ package com.koliving.api.user; -import lombok.AllArgsConstructor; +import lombok.RequiredArgsConstructor; import org.springframework.security.core.userdetails.UserDetails; import org.springframework.security.core.userdetails.UserDetailsService; import org.springframework.security.core.userdetails.UsernameNotFoundException; @@ -8,9 +8,9 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -@AllArgsConstructor -@Transactional @Service +@Transactional +@RequiredArgsConstructor public class UserService implements IUserService, UserDetailsService { private final UserRepository userRepository;