Skip to content

Commit a259a14

Browse files
committed
UserServiceImpl: use NOPLogger for unit tests to reduce output to console.
No functional changes.
1 parent ae6cd4f commit a259a14

File tree

3 files changed

+13
-6
lines changed

3 files changed

+13
-6
lines changed

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -152,6 +152,7 @@ public SiteService getSiteService() {
152152
@Bean
153153
public UserService getUserService() {
154154
return new UserServiceImpl(
155+
LoggerFactory.getLogger(UserServiceImpl.class),
155156
daoConfig.getUserDao(),
156157
getUsersActivationService(),
157158
getCollectionService(),

src/main/java/ru/mystamps/web/service/UserServiceImpl.java

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424
import org.apache.commons.lang3.Validate;
2525

2626
import org.slf4j.Logger;
27-
import org.slf4j.LoggerFactory;
2827

2928
import org.springframework.transaction.annotation.Transactional;
3029

@@ -43,8 +42,7 @@
4342
@RequiredArgsConstructor
4443
public class UserServiceImpl implements UserService {
4544

46-
private static final Logger LOG = LoggerFactory.getLogger(UserServiceImpl.class);
47-
45+
private final Logger log;
4846
private final UserDao userDao;
4947
private final UsersActivationService usersActivationService;
5048
private final CollectionService collectionService;
@@ -71,7 +69,7 @@ public void registerUser(ActivateAccountDto dto) {
7169
String activationKey = dto.getActivationKey();
7270
UsersActivationDto activation = usersActivationService.findByActivationKey(activationKey);
7371
if (activation == null) {
74-
LOG.warn("Cannot find registration request for activation key '{}'", activationKey);
72+
log.warn("Cannot find registration request for activation key '{}'", activationKey);
7573
return;
7674
}
7775

@@ -95,7 +93,7 @@ public void registerUser(ActivateAccountDto dto) {
9593
Integer id = userDao.add(user);
9694
usersActivationService.remove(activationKey);
9795

98-
LOG.info("User #{} has been created ({})", id, user);
96+
log.info("User #{} has been created ({})", id, user);
9997

10098
collectionService.createCollection(id, user.getLogin());
10199
}

src/test/groovy/ru/mystamps/web/service/UserServiceImplTest.groovy

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,8 @@ import org.springframework.security.crypto.password.PasswordEncoder
2121

2222
import spock.lang.Specification
2323

24+
import org.slf4j.helpers.NOPLogger
25+
2426
import ru.mystamps.web.dao.UserDao
2527
import ru.mystamps.web.dao.dto.AddUserDbDto
2628
import ru.mystamps.web.dao.dto.UserDetails
@@ -55,7 +57,13 @@ class UserServiceImplTest extends Specification {
5557
activationForm.setName(user.name)
5658
activationForm.setActivationKey(TestObjects.TEST_ACTIVATION_KEY)
5759

58-
service = new UserServiceImpl(userDao, usersActivationService, collectionService, encoder)
60+
service = new UserServiceImpl(
61+
NOPLogger.NOP_LOGGER,
62+
userDao,
63+
usersActivationService,
64+
collectionService,
65+
encoder
66+
)
5967
}
6068

6169
//

0 commit comments

Comments
 (0)