ImagePersistenceStrategy.get(): replace usage of Image.

php-coder · php-coder · commit 7bb190783edc · 2016-04-16T20:32: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
@@ -30,7 +30,6 @@
 
 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.DbImageDto;
 import ru.mystamps.web.service.dto.ImageDto;
 import ru.mystamps.web.service.dto.ImageInfoDto;
@@ -65,7 +64,7 @@ public void save(MultipartFile file, ImageInfoDto image) {
 	}
 	
 	@Override
-	public ImageDto get(Image image) {
+	public ImageDto get(ImageInfoDto image) {
 		DbImageDto imageDto = imageDataDao.findByImageId(image.getId());
 		if (imageDto == null) {
 			LOG.warn("Found image without content: #{}", image.getId());
diff --git a/src/main/java/ru/mystamps/web/service/FilesystemImagePersistenceStrategy.java b/src/main/java/ru/mystamps/web/service/FilesystemImagePersistenceStrategy.java
@@ -29,7 +29,6 @@
 
 import org.springframework.web.multipart.MultipartFile;
 
-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;
@@ -76,13 +75,8 @@ public void save(MultipartFile file, ImageInfoDto image) {
 	}
 	
 	@Override
-	public ImageDto get(Image image) {
-		Path dest = createFile(
-			new ImageInfoDto(
-				image.getId(),
-				image.getType().toString()
-			)
-		);
+	public ImageDto get(ImageInfoDto image) {
+		Path dest = createFile(image);
 		if (!exists(dest)) {
 			LOG.warn("Found image without content: #{} ({} doesn't exist)", image.getId(), dest);
 			return null;
diff --git a/src/main/java/ru/mystamps/web/service/ImagePersistenceStrategy.java b/src/main/java/ru/mystamps/web/service/ImagePersistenceStrategy.java
@@ -19,11 +19,10 @@
 
 import org.springframework.web.multipart.MultipartFile;
 
-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, ImageInfoDto image);
-	ImageDto get(Image image);
+	ImageDto get(ImageInfoDto image);
 }
diff --git a/src/main/java/ru/mystamps/web/service/ImageServiceImpl.java b/src/main/java/ru/mystamps/web/service/ImageServiceImpl.java
@@ -95,7 +95,9 @@ public ImageDto get(Integer imageId) {
 			return null;
 		}
 		
-		return imagePersistenceStrategy.get(image);
+		return imagePersistenceStrategy.get(
+			new ImageInfoDto(image.getId(), image.getType().toString())
+		);
 	}
 	
 	@Override
diff --git a/src/main/java/ru/mystamps/web/service/dto/FsImageDto.java b/src/main/java/ru/mystamps/web/service/dto/FsImageDto.java
@@ -20,17 +20,15 @@
 import lombok.EqualsAndHashCode;
 import lombok.RequiredArgsConstructor;
 
-import ru.mystamps.web.entity.Image;
-
 @EqualsAndHashCode
 @RequiredArgsConstructor
 public class FsImageDto implements ImageDto {
-	private final Image image;
+	private final ImageInfoDto image;
 	private final byte[] data;
 	
 	@Override
 	public String getType() {
-		return image.getType().toString();
+		return image.getType();
 	}
 	
 	@Override
diff --git a/src/test/groovy/ru/mystamps/web/service/DatabaseImagePersistenceStrategyTest.groovy b/src/test/groovy/ru/mystamps/web/service/DatabaseImagePersistenceStrategyTest.groovy
@@ -23,7 +23,6 @@ import spock.lang.Specification
 
 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
@@ -32,7 +31,6 @@ 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)
@@ -83,12 +81,9 @@ class DatabaseImagePersistenceStrategyTest extends Specification {
 	
 	def "get() should pass image to image data dao"() {
 		given:
-			Integer expectedImageId = image.getId()
-		and:
-			Image image = TestObjects.createImage()
-			image.setId(expectedImageId)
+			Integer expectedImageId = imageInfoDto.id
 		when:
-			strategy.get(image)
+			strategy.get(imageInfoDto)
 		then:
 			1 * imageDataDao.findByImageId({ Integer imageId ->
 				assert imageId == expectedImageId
@@ -100,7 +95,7 @@ class DatabaseImagePersistenceStrategyTest extends Specification {
 		given:
 			imageDataDao.findByImageId(_ as Integer) >> null
 		when:
-			ImageDto result = strategy.get(image)
+			ImageDto result = strategy.get(imageInfoDto)
 		then:
 			result == null
 	}
@@ -111,7 +106,7 @@ class DatabaseImagePersistenceStrategyTest extends Specification {
 		and:
 			imageDataDao.findByImageId(_ as Integer) >> expectedImageDto
 		when:
-			ImageDto result = strategy.get(image)
+			ImageDto result = strategy.get(imageInfoDto)
 		then:
 			result == expectedImageDto
 	}
diff --git a/src/test/groovy/ru/mystamps/web/service/FilesystemImagePersistenceStrategyTest.groovy b/src/test/groovy/ru/mystamps/web/service/FilesystemImagePersistenceStrategyTest.groovy
@@ -32,7 +32,6 @@ class FilesystemImagePersistenceStrategyTest extends Specification {
 	private static final STORAGE_DIR = File.separator + 'tmp'
 	
 	private MultipartFile multipartFile = Mock()
-	private Image image = TestObjects.createImage()
 	private ImageInfoDto imageInfoDto = TestObjects.createImageInfoDto()
 	private Path mockFile = Mock(Path)
 	
@@ -96,7 +95,7 @@ class FilesystemImagePersistenceStrategyTest extends Specification {
 		and:
 			strategy.createFile(_ as Image) >> mockFile
 		when:
-			ImageDto result = strategy.get(image)
+			ImageDto result = strategy.get(imageInfoDto)
 		then:
 			result == null
 	}
@@ -109,7 +108,7 @@ class FilesystemImagePersistenceStrategyTest extends Specification {
 		and:
 			strategy.toByteArray(_ as Path) >> { throw new IOException() }
 		when:
-			strategy.get(image)
+			strategy.get(imageInfoDto)
 		then:
 			ImagePersistenceException ex = thrown()
 		and:
@@ -118,7 +117,7 @@ class FilesystemImagePersistenceStrategyTest extends Specification {
 	
 	def "get() should return result with correct type and content"() {
 		given:
-			String expectedType = image.type
+			String expectedType = imageInfoDto.type
 		and:
 			byte[] expectedData = 'any data'.bytes
 		and:
@@ -128,7 +127,7 @@ class FilesystemImagePersistenceStrategyTest extends Specification {
 		and:
 			strategy.toByteArray(_ as Path) >> expectedData
 		when:
-			ImageDto result = strategy.get(image)
+			ImageDto result = strategy.get(imageInfoDto)
 		then:
 			result.type == expectedType
 			result.data == expectedData
diff --git a/src/test/groovy/ru/mystamps/web/service/ImageServiceImplTest.groovy b/src/test/groovy/ru/mystamps/web/service/ImageServiceImplTest.groovy
@@ -200,8 +200,9 @@ class ImageServiceImplTest extends Specification {
 		when:
 			ImageDto actualImageDto = service.get(7)
 		then:
-			1 * imagePersistenceStrategy.get({ Image passedImage ->
-				assert passedImage == expectedImage
+			1 * imagePersistenceStrategy.get({ ImageInfoDto passedImage ->
+				assert passedImage?.id == expectedImage.id
+				assert passedImage?.type == expectedImage.type.toString()
 				return true
 			}) >> expectedImageDto
 		and:

Original file line number	Diff line number	Diff line change
`@@ -95,7 +95,9 @@ public ImageDto get(Integer imageId) {`
`95`	`95`	`return null;`
`96`	`96`	`}`
`97`	`97`
`98`		`- return imagePersistenceStrategy.get(image);`
	`98`	`+ return imagePersistenceStrategy.get(`
	`99`	`+ new ImageInfoDto(image.getId(), image.getType().toString())`
	`100`	`+ );`
`99`	`101`	`}`
`100`	`102`
`101`	`103`	`@Override`