ImagePersistenceStrategy.save(): replace usage of Image.

php-coder · php-coder · commit b19bcef89611 · 2016-04-16T20:01:28.000+02:00
Addressed to #120 No functional changes.
diff --git a/src/main/java/ru/mystamps/web/service/DatabaseImagePersistenceStrategy.java b/src/main/java/ru/mystamps/web/service/DatabaseImagePersistenceStrategy.java
@@ -33,6 +33,7 @@
 import ru.mystamps.web.entity.Image;
 import ru.mystamps.web.service.dto.DbImageDto;
 import ru.mystamps.web.service.dto.ImageDto;
+import ru.mystamps.web.service.dto.ImageInfoDto;
 import ru.mystamps.web.service.exception.ImagePersistenceException;
 
 @RequiredArgsConstructor
@@ -48,7 +49,7 @@ public void init() {
 	}
 	
 	@Override
-	public void save(MultipartFile file, Image image) {
+	public void save(MultipartFile file, ImageInfoDto image) {
 		try {
 			AddImageDataDbDto imageData = new AddImageDataDbDto();
 			imageData.setImageId(image.getId());
diff --git a/src/main/java/ru/mystamps/web/service/FilesystemImagePersistenceStrategy.java b/src/main/java/ru/mystamps/web/service/FilesystemImagePersistenceStrategy.java
@@ -32,6 +32,7 @@
 import ru.mystamps.web.entity.Image;
 import ru.mystamps.web.service.dto.FsImageDto;
 import ru.mystamps.web.service.dto.ImageDto;
+import ru.mystamps.web.service.dto.ImageInfoDto;
 import ru.mystamps.web.service.exception.ImagePersistenceException;
 
 public class FilesystemImagePersistenceStrategy implements ImagePersistenceStrategy {
@@ -62,7 +63,7 @@ public void init() {
 	}
 	
 	@Override
-	public void save(MultipartFile file, Image image) {
+	public void save(MultipartFile file, ImageInfoDto image) {
 		try {
 			Path dest = createFile(image);
 			writeToFile(file, dest);
@@ -76,7 +77,12 @@ public void save(MultipartFile file, Image image) {
 	
 	@Override
 	public ImageDto get(Image image) {
-		Path dest = createFile(image);
+		Path dest = createFile(
+			new ImageInfoDto(
+				image.getId(),
+				image.getType().toString()
+			)
+		);
 		if (!exists(dest)) {
 			LOG.warn("Found image without content: #{} ({} doesn't exist)", image.getId(), dest);
 			return null;
@@ -92,7 +98,7 @@ public ImageDto get(Image image) {
 	}
 	
 	// protected to allow spying
-	protected Path createFile(Image image) {
+	protected Path createFile(ImageInfoDto image) {
 		return new File(storageDir, generateFileName(image)).toPath();
 	}
 	
@@ -114,12 +120,12 @@ protected byte[] toByteArray(Path dest) throws IOException {
 		return Files.readAllBytes(dest);
 	}
 
-	private static String generateFileName(Image image) {
+	private static String generateFileName(ImageInfoDto image) {
 		// TODO(performance): specify initial capacity explicitly
 		return new StringBuilder()
 			.append(image.getId())
 			.append('.')
-			.append(image.getType().toString().toLowerCase())
+			.append(image.getType().toLowerCase())
 			.toString();
 	}
 	
diff --git a/src/main/java/ru/mystamps/web/service/ImagePersistenceStrategy.java b/src/main/java/ru/mystamps/web/service/ImagePersistenceStrategy.java
@@ -21,8 +21,9 @@
 
 import ru.mystamps.web.entity.Image;
 import ru.mystamps.web.service.dto.ImageDto;
+import ru.mystamps.web.service.dto.ImageInfoDto;
 
 public interface ImagePersistenceStrategy {
-	void save(MultipartFile file, Image image);
+	void save(MultipartFile file, ImageInfoDto image);
 	ImageDto get(Image image);
 }
diff --git a/src/main/java/ru/mystamps/web/service/ImageServiceImpl.java b/src/main/java/ru/mystamps/web/service/ImageServiceImpl.java
@@ -36,6 +36,7 @@
 import ru.mystamps.web.dao.JdbcImageDao;
 import ru.mystamps.web.entity.Image;
 import ru.mystamps.web.service.dto.ImageDto;
+import ru.mystamps.web.service.dto.ImageInfoDto;
 import ru.mystamps.web.service.exception.ImagePersistenceException;
 
 import static org.apache.commons.lang3.StringUtils.substringAfter;
@@ -75,7 +76,10 @@ public Integer save(MultipartFile file) {
 		
 		LOG.info("Image entity was saved to database ({})", entity);
 		
-		imagePersistenceStrategy.save(file, entity);
+		imagePersistenceStrategy.save(
+			file,
+			new ImageInfoDto(entity.getId(), image.getType().toString())
+		);
 		
 		return entity.getId();
 	}
diff --git a/src/main/java/ru/mystamps/web/service/dto/ImageInfoDto.java b/src/main/java/ru/mystamps/web/service/dto/ImageInfoDto.java
@@ -0,0 +1,28 @@
+/*
+ * Copyright (C) 2009-2016 Slava Semushin <slava.semushin@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+package ru.mystamps.web.service.dto;
+
+import lombok.Getter;
+import lombok.RequiredArgsConstructor;
+
+@Getter
+@RequiredArgsConstructor
+public class ImageInfoDto {
+	private final Integer id;
+	private final String type;
+}
diff --git a/src/test/groovy/ru/mystamps/web/service/DatabaseImagePersistenceStrategyTest.groovy b/src/test/groovy/ru/mystamps/web/service/DatabaseImagePersistenceStrategyTest.groovy
@@ -25,13 +25,15 @@ import ru.mystamps.web.dao.JdbcImageDataDao
 import ru.mystamps.web.dao.dto.AddImageDataDbDto
 import ru.mystamps.web.entity.Image
 import ru.mystamps.web.service.dto.ImageDto
+import ru.mystamps.web.service.dto.ImageInfoDto
 import ru.mystamps.web.service.exception.ImagePersistenceException
 
 class DatabaseImagePersistenceStrategyTest extends Specification {
 	
 	private JdbcImageDataDao imageDataDao = Mock()
 	private MultipartFile multipartFile = Mock()
 	private Image image = TestObjects.createImage()
+	private ImageInfoDto imageInfoDto = TestObjects.createImageInfoDto()
 	
 	private ImagePersistenceStrategy strategy = new DatabaseImagePersistenceStrategy(imageDataDao)
 	
@@ -43,7 +45,7 @@ class DatabaseImagePersistenceStrategyTest extends Specification {
 		given:
 			multipartFile.getBytes() >> { throw new IOException() }
 		when:
-			strategy.save(multipartFile, image)
+			strategy.save(multipartFile, imageInfoDto)
 		then:
 			ImagePersistenceException ex = thrown()
 		and:
@@ -55,7 +57,7 @@ class DatabaseImagePersistenceStrategyTest extends Specification {
 			byte[] expected = 'test'.getBytes()
 			multipartFile.getBytes() >> expected
 		when:
-			strategy.save(multipartFile, image)
+			strategy.save(multipartFile, imageInfoDto)
 		then:
 			1 * imageDataDao.add({ AddImageDataDbDto imageData ->
 				assert imageData?.content == expected
@@ -65,9 +67,9 @@ class DatabaseImagePersistenceStrategyTest extends Specification {
 	
 	def "save() should pass image to image data dao"() {
 		given:
-			Integer expectedImageId = image.getId()
+			Integer expectedImageId = imageInfoDto.getId()
 		when:
-			strategy.save(multipartFile, image)
+			strategy.save(multipartFile, imageInfoDto)
 		then:
 			1 * imageDataDao.add({ AddImageDataDbDto imageData ->
 				assert imageData?.imageId == expectedImageId
diff --git a/src/test/groovy/ru/mystamps/web/service/FilesystemImagePersistenceStrategyTest.groovy b/src/test/groovy/ru/mystamps/web/service/FilesystemImagePersistenceStrategyTest.groovy
@@ -23,6 +23,7 @@ import spock.lang.Specification
 
 import ru.mystamps.web.entity.Image
 import ru.mystamps.web.service.dto.ImageDto
+import ru.mystamps.web.service.dto.ImageInfoDto
 import ru.mystamps.web.service.exception.ImagePersistenceException
 
 import java.nio.file.Path
@@ -32,6 +33,7 @@ class FilesystemImagePersistenceStrategyTest extends Specification {
 	
 	private MultipartFile multipartFile = Mock()
 	private Image image = TestObjects.createImage()
+	private ImageInfoDto imageInfoDto = TestObjects.createImageInfoDto()
 	private Path mockFile = Mock(Path)
 	
 	private ImagePersistenceStrategy strategy = Spy(FilesystemImagePersistenceStrategy, constructorArgs: [STORAGE_DIR])
@@ -42,7 +44,7 @@ class FilesystemImagePersistenceStrategyTest extends Specification {
 	
 	def "save() should saves file onto the filesystem"() {
 		when:
-			strategy.save(multipartFile, image)
+			strategy.save(multipartFile, imageInfoDto)
 		then:
 			1 * strategy.writeToFile(_ as MultipartFile, _ as Path) >> {}
 	}
@@ -51,7 +53,7 @@ class FilesystemImagePersistenceStrategyTest extends Specification {
 		given:
 			String expectedDirectoryName = STORAGE_DIR
 		when:
-			strategy.save(multipartFile, image)
+			strategy.save(multipartFile, imageInfoDto)
 		then:
 			1 * strategy.writeToFile(_ as MultipartFile, { Path path ->
 				assert path.parent.toString() == expectedDirectoryName
@@ -61,11 +63,11 @@ class FilesystemImagePersistenceStrategyTest extends Specification {
 	
 	def "save() should gives proper name to the file"() {
 		given:
-			String expectedExtension = image.type.toString().toLowerCase()
-			String expectedName = image.id
+			String expectedExtension = imageInfoDto.type.toLowerCase()
+			String expectedName = imageInfoDto.id
 			String expectedFileName = expectedName + '.' + expectedExtension
 		when:
-			strategy.save(multipartFile, image)
+			strategy.save(multipartFile, imageInfoDto)
 		then:
 			1 * strategy.writeToFile(_ as MultipartFile, { Path path ->
 				assert path.fileName.toString() == expectedFileName
@@ -77,7 +79,7 @@ class FilesystemImagePersistenceStrategyTest extends Specification {
 		given:
 			strategy.writeToFile(_ as MultipartFile, _ as Path) >> { throw new IOException() }
 		when:
-			strategy.save(multipartFile, image)
+			strategy.save(multipartFile, imageInfoDto)
 		then:
 			ImagePersistenceException ex = thrown()
 		and:
diff --git a/src/test/groovy/ru/mystamps/web/service/ImageServiceImplTest.groovy b/src/test/groovy/ru/mystamps/web/service/ImageServiceImplTest.groovy
@@ -26,6 +26,7 @@ import ru.mystamps.web.dao.ImageDao
 import ru.mystamps.web.dao.JdbcImageDao
 import ru.mystamps.web.entity.Image
 import ru.mystamps.web.service.dto.ImageDto
+import ru.mystamps.web.service.dto.ImageInfoDto
 import ru.mystamps.web.service.exception.ImagePersistenceException
 
 class ImageServiceImplTest extends Specification {
@@ -124,17 +125,18 @@ class ImageServiceImplTest extends Specification {
 	
 	def "save() should call strategy"() {
 		given:
-			Image expectedImage = TestObjects.createImage()
+			Image image = TestObjects.createImage()
 		when:
 			String url = service.save(multipartFile)
 		then:
-			imageDao.save(_ as Image) >> expectedImage
+			imageDao.save(_ as Image) >> image
 		and:
 			1 * imagePersistenceStrategy.save({ MultipartFile passedFile ->
 				assert passedFile == multipartFile
 				return true
-			}, { Image passedImage ->
-				assert passedImage == expectedImage
+			}, { ImageInfoDto passedImage ->
+				assert passedImage?.id == image.id
+				assert passedImage?.type == image.type.toString()
 				return true
 			})
 	}
diff --git a/src/test/java/ru/mystamps/web/service/TestObjects.java b/src/test/java/ru/mystamps/web/service/TestObjects.java
@@ -25,6 +25,7 @@
 import ru.mystamps.web.dao.dto.UsersActivationFullDto;
 import ru.mystamps.web.entity.Image;
 import ru.mystamps.web.service.dto.DbImageDto;
+import ru.mystamps.web.service.dto.ImageInfoDto;
 import ru.mystamps.web.service.dto.LinkEntityDto;
 import ru.mystamps.web.service.dto.SeriesInfoDto;
 import ru.mystamps.web.service.dto.SitemapInfoDto;
@@ -107,6 +108,10 @@ public static Image createImage() {
 		return image;
 	}
 	
+	public static ImageInfoDto createImageInfoDto() {
+		return new ImageInfoDto(1, "PNG");
+	}
+	
 	public static DbImageDto createDbImageDto() {
 		return new DbImageDto("PNG", "test".getBytes());
 	}

Original file line number	Diff line number	Diff line change
`@@ -21,8 +21,9 @@`
`21`	`21`
`22`	`22`	`import ru.mystamps.web.entity.Image;`
`23`	`23`	`import ru.mystamps.web.service.dto.ImageDto;`
	`24`	`+import ru.mystamps.web.service.dto.ImageInfoDto;`
`24`	`25`
`25`	`26`	`public interface ImagePersistenceStrategy {`
`26`		`- void save(MultipartFile file, Image image);`
	`27`	`+ void save(MultipartFile file, ImageInfoDto image);`
`27`	`28`	`ImageDto get(Image image);`
`28`	`29`	`}`