DatabaseImagePersistenceStrategy use NOPLogger for unit tests to reduce output to console.

No functional changes.

Author: php-coder

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

@@ -17,6 +17,8 @@
  */
 package ru.mystamps.web.config;
 
+import org.slf4j.LoggerFactory;
+
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Profile;
@@ -42,7 +44,10 @@ class DbStrategiesConfig implements StrategiesConfig {
 		@Bean
 		@Override
 		public ImagePersistenceStrategy getImagePersistenceStrategy() {
-			return new DatabaseImagePersistenceStrategy(daoConfig.getImageDataDao());
+			return new DatabaseImagePersistenceStrategy(
+				LoggerFactory.getLogger(DatabaseImagePersistenceStrategy.class),
+				daoConfig.getImageDataDao()
+			);
 		}
 
 	}

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

@@ -22,7 +22,6 @@
 import javax.annotation.PostConstruct;
 
 import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 import org.springframework.web.multipart.MultipartFile;
 
@@ -37,14 +36,13 @@
 
 @RequiredArgsConstructor
 public class DatabaseImagePersistenceStrategy implements ImagePersistenceStrategy {
-	private static final Logger LOG =
-		LoggerFactory.getLogger(DatabaseImagePersistenceStrategy.class);
 
+	private final Logger log;
 	private final ImageDataDao imageDataDao;
 
 	@PostConstruct
 	public void init() {
-		LOG.info("Images will be saved into in-memory database");
+		log.info("Images will be saved into in-memory database");
 	}
 
 	@Override
@@ -56,7 +54,7 @@ public void save(MultipartFile file, ImageInfoDto image) {
 			imageData.setPreview(false);
 
 			Integer id = imageDataDao.add(imageData);
-			LOG.info("Image #{}: meta data has been saved to #{}", image.getId(), id);
+			log.info("Image #{}: meta data has been saved to #{}", image.getId(), id);
 
 		} catch (IOException e) {
 			// throw RuntimeException for rolling back transaction
@@ -73,14 +71,14 @@ public void savePreview(byte[] data, ImageInfoDto image) {
 
 		imageDataDao.add(imageData);
 
-		LOG.info("Image #{}: preview has been saved", image.getId());
+		log.info("Image #{}: preview has been saved", image.getId());
 	}
 
 	@Override
 	public ImageDto get(ImageInfoDto image) {
 		DbImageDto imageDto = imageDataDao.findByImageId(image.getId(), false);
 		if (imageDto == null) {
-			LOG.warn("Image #{}: content not found", image.getId());
+			log.warn("Image #{}: content not found", image.getId());
 			return null;
 		}
 
@@ -91,7 +89,7 @@ public ImageDto get(ImageInfoDto image) {
 	public ImageDto getPreview(ImageInfoDto image) {
 		DbImageDto imageDto = imageDataDao.findByImageId(image.getId(), true);
 		if (imageDto == null) {
-			LOG.info("Image #{}: preview not found", image.getId());
+			log.info("Image #{}: preview not found", image.getId());
 			return null;
 		}
 

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

@@ -17,6 +17,8 @@
  */
 package ru.mystamps.web.service
 
+import org.slf4j.helpers.NOPLogger
+
 import org.springframework.web.multipart.MultipartFile
 
 import spock.lang.Specification
@@ -34,7 +36,10 @@ class DatabaseImagePersistenceStrategyTest extends Specification {
 	private final MultipartFile multipartFile = Mock()
 	private final ImageInfoDto imageInfoDto = TestObjects.createImageInfoDto()
 
-	private final ImagePersistenceStrategy strategy = new DatabaseImagePersistenceStrategy(imageDataDao)
+	private final ImagePersistenceStrategy strategy = new DatabaseImagePersistenceStrategy(
+		NOPLogger.NOP_LOGGER,
+		imageDataDao
+	)
 
 	//
 	// Tests for save()