FilesystemImagePersistenceStrategy: 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

@@ -62,6 +62,7 @@ class FsStrategiesConfig implements StrategiesConfig {
 		@Override
 		public ImagePersistenceStrategy getImagePersistenceStrategy() {
 			return new FilesystemImagePersistenceStrategy(
+				LoggerFactory.getLogger(FilesystemImagePersistenceStrategy.class),
 				env.getRequiredProperty("app.upload.dir"),
 				env.getRequiredProperty("app.preview.dir")
 			);

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

@@ -27,7 +27,6 @@
 import javax.annotation.PostConstruct;
 
 import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 import org.springframework.web.multipart.MultipartFile;
 
@@ -37,44 +36,44 @@
 import ru.mystamps.web.service.exception.ImagePersistenceException;
 
 public class FilesystemImagePersistenceStrategy implements ImagePersistenceStrategy {
-	private static final Logger LOG =
-		LoggerFactory.getLogger(FilesystemImagePersistenceStrategy.class);
 
+	private final Logger log;
 	private final File storageDir;
 	private final File previewDir;
 
-	public FilesystemImagePersistenceStrategy(String storageDir, String previewDir) {
+	public FilesystemImagePersistenceStrategy(Logger logger, String storageDir, String previewDir) {
+		this.log = logger;
 		this.storageDir = new File(storageDir);
 		this.previewDir = new File(previewDir);
 	}
 
 	@PostConstruct
 	public void init() {
-		LOG.info("Images will be saved into {} directory", storageDir);
+		log.info("Images will be saved into {} directory", storageDir);
 
 		if (!storageDir.exists()) { // NOPMD: ConfusingTernary (it's ok for me)
-			LOG.warn("Directory '{}' doesn't exist! Image uploading won't work.", storageDir);
+			log.warn("Directory '{}' doesn't exist! Image uploading won't work.", storageDir);
 
 		} else if (!storageDir.canWrite()) {
-			LOG.warn(
+			log.warn(
 				// TODO(java9): log also user: ProcessHandle.current().info().user()
 				"Directory '{}' exists but isn't writable for the current user! "
 				+ "Image uploading won't work.",
 				storageDir
 			);
 		}
 
-		LOG.info("Image previews will be saved into {} directory", previewDir);
+		log.info("Image previews will be saved into {} directory", previewDir);
 
 		if (!previewDir.exists()) { // NOPMD: ConfusingTernary (it's ok for me)
-			LOG.warn(
+			log.warn(
 				"Directory '{}' doesn't exist! Image preview generation won't work",
 				previewDir
 			);
 
 		} else if (!previewDir.canWrite()) {
 			// TODO(java9): log also user: ProcessHandle.current().info().user()
-			LOG.warn(
+			log.warn(
 				"Directory '{}' exists but isn't writable for the current user! "
 				+ "Image preview generation won't work",
 				previewDir
@@ -88,7 +87,7 @@ public void save(MultipartFile file, ImageInfoDto image) {
 			Path dest = generateFilePath(storageDir, image);
 			writeToFile(file, dest);
 
-			LOG.info("Image data has been written into file {}", dest);
+			log.info("Image data has been written into file {}", dest);
 
 		} catch (IOException ex) {
 			throw new ImagePersistenceException(ex);
@@ -101,7 +100,7 @@ public void savePreview(byte[] data, ImageInfoDto image) {
 			Path dest = generateFilePath(previewDir, image);
 			writeToFile(data, dest);
 
-			LOG.info("Image preview data has been written into file {}", dest);
+			log.info("Image preview data has been written into file {}", dest);
 
 		} catch (IOException ex) {
 			throw new ImagePersistenceException(ex);
@@ -124,7 +123,7 @@ public void removeIfPossible(ImageInfoDto image) {
 		try {
 			Files.deleteIfExists(dest);
 		} catch (Exception ex) { // NOPMD: AvoidCatchingGenericException
-			LOG.warn("Couldn't delete file {}: {}", dest, ex.getMessage());
+			log.warn("Couldn't delete file {}: {}", dest, ex.getMessage());
 		}
 	}
 
@@ -164,7 +163,7 @@ private ImageDto get(File dir, ImageInfoDto image, boolean logWarning) {
 		Path dest = generateFilePath(dir, image);
 		if (!exists(dest)) {
 			if (logWarning) {
-				LOG.warn(
+				log.warn(
 					"Image #{}: content not found ({} doesn't exist)",
 					image.getId(),
 					dest

src/test/groovy/ru/mystamps/web/service/FilesystemImagePersistenceStrategyTest.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
@@ -36,8 +38,10 @@ class FilesystemImagePersistenceStrategyTest extends Specification {
 	private final ImageInfoDto imageInfoDto = TestObjects.createImageInfoDto()
 	private final Path mockFile = Mock(Path)
 
-	private final ImagePersistenceStrategy strategy =
-		Spy(FilesystemImagePersistenceStrategy, constructorArgs:[STORAGE_DIR, PREVIEW_DIR])
+	private final ImagePersistenceStrategy strategy = Spy(
+		FilesystemImagePersistenceStrategy,
+		constructorArgs:[NOPLogger.NOP_LOGGER, STORAGE_DIR, PREVIEW_DIR]
+	)
 
 	//
 	// Tests for save()