CountryServiceImpl: use NOPLogger for unit tests to reduce output to console.

No functional changes.

Author: php-coder

src/main/config/pmd.xml

@@ -26,7 +26,9 @@
 	<rule ref="rulesets/java/basic.xml" />
 	<rule ref="rulesets/java/strictexception.xml" />
 	<rule ref="rulesets/java/sunsecure.xml" />
-	<rule ref="rulesets/java/logging-java.xml" />
+	<rule ref="rulesets/java/logging-java.xml">
+		<exclude name="LoggerIsNotStaticFinal" />
+	</rule>
 	<rule ref="rulesets/java/controversial.xml">
 		<exclude name="AtLeastOneConstructor" />
 		<exclude name="OnlyOneReturn" />

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

@@ -19,6 +19,8 @@
 
 import java.util.Locale;
 
+import org.slf4j.LoggerFactory;
+
 import org.springframework.context.MessageSource;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -49,7 +51,10 @@ public SuspiciousActivityService getSuspiciousActivityService() {
 
 	@Bean
 	public CountryService getCountryService() {
-		return new CountryServiceImpl(daoConfig.getCountryDao());
+		return new CountryServiceImpl(
+			LoggerFactory.getLogger(CountryServiceImpl.class),
+			daoConfig.getCountryDao()
+		);
 	}
 
 	@Bean

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

@@ -25,7 +25,6 @@
 import org.apache.commons.lang3.Validate;
 
 import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 import org.springframework.transaction.annotation.Transactional;
 
@@ -44,8 +43,8 @@
 @RequiredArgsConstructor
 @SuppressWarnings("PMD.TooManyMethods")
 public class CountryServiceImpl implements CountryService {
-	private static final Logger LOG = LoggerFactory.getLogger(CountryServiceImpl.class);
 
+	private final Logger log;
 	private final CountryDao countryDao;
 
 	@Override
@@ -76,7 +75,7 @@ public String add(AddCountryDto dto, Integer userId) {
 
 		Integer id = countryDao.add(country);
 
-		LOG.info("Country #{} has been created ({})", id, country);
+		log.info("Country #{} has been created ({})", id, country);
 
 		return slug;
 	}
@@ -177,7 +176,7 @@ public String suggestCountryForUser(Integer userId) {
 		// if user created a series with a country, let's suggest this country to him
 		String slug = countryDao.findCountryOfLastCreatedSeriesByUser(userId);
 		if (slug != null) {
-			LOG.info(
+			log.info(
 				"Country {} has been suggested to user #{} from a recently created series",
 				slug,
 				userId
@@ -189,7 +188,7 @@ public String suggestCountryForUser(Integer userId) {
 		// belong to a specific country, let's suggest this country to him
 		slug = countryDao.findPopularCountryInCollection(userId);
 		if (slug != null) {
-			LOG.info(
+			log.info(
 				"Country {} has been suggested to user #{} as popular in his collection",
 				slug,
 				userId

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

@@ -20,6 +20,8 @@ package ru.mystamps.web.service
 import spock.lang.Specification
 import spock.lang.Unroll
 
+import org.slf4j.helpers.NOPLogger
+
 import ru.mystamps.web.dao.CountryDao
 import ru.mystamps.web.dao.dto.AddCountryDbDto
 import ru.mystamps.web.controller.dto.AddCountryForm
@@ -33,7 +35,7 @@ class CountryServiceImplTest extends Specification {
 	private static final Integer USER_ID = 321
 
 	private final CountryDao countryDao = Mock()
-	private final CountryService service = new CountryServiceImpl(countryDao)
+	private final CountryService service = new CountryServiceImpl(NOPLogger.NOP_LOGGER, countryDao)
 
 	private AddCountryForm form