StampsCatalogServiceImpl: introduce and replace MichelCatalogServiceImpl.

Addressed to #491

No functional changes.

Author: php-coder

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

@@ -131,7 +131,7 @@ public UserService getUserService() {
 
 	@Bean
 	public StampsCatalogService getMichelCatalogService() {
-		return new MichelCatalogServiceImpl(daoConfig.getMichelCatalogDao());
+		return new StampsCatalogServiceImpl("Michel", daoConfig.getMichelCatalogDao());
 	}
 
 	@Bean

src/main/java/ru/mystamps/web/service/MichelCatalogServiceImpl.java renamed to src/main/java/ru/mystamps/web/service/StampsCatalogServiceImpl.java

@@ -35,44 +35,45 @@
 import ru.mystamps.web.support.spring.security.HasAuthority;
 
 @RequiredArgsConstructor
-public class MichelCatalogServiceImpl implements StampsCatalogService {
-	private static final Logger LOG = LoggerFactory.getLogger(MichelCatalogServiceImpl.class);
+public class StampsCatalogServiceImpl implements StampsCatalogService {
+	private static final Logger LOG = LoggerFactory.getLogger(StampsCatalogServiceImpl.class);
 
-	private final StampsCatalogDao michelCatalogDao;
+	private final String catalogName;
+	private final StampsCatalogDao stampsCatalogDao;
 
 	@Override
 	@Transactional
 	@PreAuthorize(HasAuthority.CREATE_SERIES)
-	public void add(Set<String> michelNumbers) {
-		Validate.isTrue(michelNumbers != null, "Michel numbers must be non null");
-		Validate.isTrue(!michelNumbers.isEmpty(), "Michel numbers must be non empty");
+	public void add(Set<String> catalogNumbers) {
+		Validate.isTrue(catalogNumbers != null, "%s numbers must be non null", catalogName);
+		Validate.isTrue(!catalogNumbers.isEmpty(), "%s numbers must be non empty", catalogName);
 
-		List<String> insertedNumbers = michelCatalogDao.add(michelNumbers);
+		List<String> insertedNumbers = stampsCatalogDao.add(catalogNumbers);
 
 		if (!insertedNumbers.isEmpty()) {
-			LOG.info("Michel numbers {} were created", insertedNumbers);
+			LOG.info("{} numbers {} were created", catalogName, insertedNumbers);
 		}
 	}
 
 	@Override
 	@Transactional
 	@PreAuthorize(HasAuthority.CREATE_SERIES)
-	public void addToSeries(Integer seriesId, Set<String> michelNumbers) {
+	public void addToSeries(Integer seriesId, Set<String> catalogNumbers) {
 		Validate.isTrue(seriesId != null, "Series id must be non null");
-		Validate.isTrue(michelNumbers != null, "Michel numbers must be non null");
-		Validate.isTrue(!michelNumbers.isEmpty(), "Michel numbers must be non empty");
+		Validate.isTrue(catalogNumbers != null, "%s numbers must be non null", catalogName);
+		Validate.isTrue(!catalogNumbers.isEmpty(), "%s numbers must be non empty", catalogName);
 
-		michelCatalogDao.addToSeries(seriesId, michelNumbers);
+		stampsCatalogDao.addToSeries(seriesId, catalogNumbers);
 
-		LOG.info("Series #{}: michel numbers {} were added", seriesId, michelNumbers);
+		LOG.info("Series #{}: {} numbers {} were added", seriesId, catalogName, catalogNumbers);
 	}
 
 	@Override
 	@Transactional(readOnly = true)
 	public List<String> findBySeriesId(Integer seriesId) {
 		Validate.isTrue(seriesId != null, "Series id must be non null");
 
-		return michelCatalogDao.findBySeriesId(seriesId);
+		return stampsCatalogDao.findBySeriesId(seriesId);
 	}
 
 }

src/test/groovy/ru/mystamps/web/service/MichelCatalogServiceImplTest.groovy renamed to src/test/groovy/ru/mystamps/web/service/StampsCatalogServiceImplTest.groovy

@@ -22,11 +22,11 @@ import spock.lang.Specification
 import ru.mystamps.web.dao.StampsCatalogDao
 
 @SuppressWarnings(['ClassJavadoc', 'MethodName', 'NoDef', 'NoTabCharacter', 'TrailingWhitespace'])
-class MichelCatalogServiceImplTest extends Specification {
+class StampsCatalogServiceImplTest extends Specification {
 
-	private final StampsCatalogDao michelCatalogDao = Mock()
+	private final StampsCatalogDao stampsCatalogDao = Mock()
 
-	private final StampsCatalogService service = new MichelCatalogServiceImpl(michelCatalogDao)
+	private final StampsCatalogService service = new StampsCatalogServiceImpl("TestCatalog", stampsCatalogDao)
 
 	//
 	// Tests for findBySeriesId()
@@ -48,7 +48,7 @@ class MichelCatalogServiceImplTest extends Specification {
 		when:
 			List<String> result = service.findBySeriesId(expectedSeriesId)
 		then:
-			1 * michelCatalogDao.findBySeriesId({ Integer seriesId ->
+			1 * stampsCatalogDao.findBySeriesId({ Integer seriesId ->
 				assert seriesId == expectedSeriesId
 				return true
 			}) >> expectedResult