DatabaseImagePersistenceStrategy.get(): replace usage of ImageData.

Addressed to #120

No functional changes.

Author: php-coder

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

@@ -57,6 +57,11 @@ public JdbcImageDao getJdbcImageDao() {
 		return new JdbcImageDaoImpl(jdbcTemplate);
 	}
 
+	@Bean
+	public JdbcImageDataDao getJdbcImageDataDao() {
+		return new JdbcImageDataDaoImpl(jdbcTemplate);
+	}
+	
 	@Bean
 	public MichelCatalogDao getMichelCatalogDao() {
 		return new JdbcMichelCatalogDaoImpl(jdbcTemplate);

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

@@ -39,10 +39,16 @@ class DbStrategiesConfig implements StrategiesConfig {
 		@Autowired
 		private ImageDataDao imageDataDao;
 
+		@Autowired
+		private DaoConfig daoConfig;
+		
 		@Bean
 		@Override
 		public ImagePersistenceStrategy getImagePersistenceStrategy() {
-			return new DatabaseImagePersistenceStrategy(imageDataDao);
+			return new DatabaseImagePersistenceStrategy(
+				imageDataDao,
+				daoConfig.getJdbcImageDataDao()
+			);
 		}
 
 	}

src/main/java/ru/mystamps/web/dao/JdbcImageDataDao.java

@@ -0,0 +1,24 @@
+/*
+ * Copyright (C) 2009-2016 Slava Semushin <[email protected]>
+ *
+ * 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.dao;
+
+import ru.mystamps.web.service.dto.DbImageDto;
+
+public interface JdbcImageDataDao {
+	DbImageDto findByImageId(Integer imageId);
+}

src/main/java/ru/mystamps/web/dao/impl/JdbcImageDataDaoImpl.java

@@ -0,0 +1,52 @@
+/*
+ * Copyright (C) 2009-2016 Slava Semushin <[email protected]>
+ *
+ * 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.dao.impl;
+
+import java.util.Collections;
+
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.dao.EmptyResultDataAccessException;
+import org.springframework.jdbc.core.namedparam.NamedParameterJdbcTemplate;
+
+import lombok.RequiredArgsConstructor;
+
+import ru.mystamps.web.dao.JdbcImageDataDao;
+import ru.mystamps.web.service.dto.DbImageDto;
+
+@RequiredArgsConstructor
+public class JdbcImageDataDaoImpl implements JdbcImageDataDao {
+	
+	private final NamedParameterJdbcTemplate jdbcTemplate;
+	
+	@Value("${image_data.find_by_image_id}")
+	private String findByImageIdSql;
+	
+	@Override
+	public DbImageDto findByImageId(Integer imageId) {
+		try {
+			return jdbcTemplate.queryForObject(
+				findByImageIdSql,
+				Collections.singletonMap("image_id", imageId),
+				RowMappers::forDbImageDto
+			);
+		} catch (EmptyResultDataAccessException ex) {
+			return null;
+		}
+	}
+	
+}

src/main/java/ru/mystamps/web/dao/impl/RowMappers.java

@@ -28,6 +28,7 @@
 import ru.mystamps.web.dao.dto.UserDetails;
 import ru.mystamps.web.dao.dto.UsersActivationDto;
 import ru.mystamps.web.dao.dto.UsersActivationFullDto;
+import ru.mystamps.web.service.dto.DbImageDto;
 import ru.mystamps.web.service.dto.LinkEntityDto;
 import ru.mystamps.web.service.dto.SelectEntityDto;
 import ru.mystamps.web.service.dto.SeriesInfoDto;
@@ -223,4 +224,11 @@ public static UserDetails forUserDetails(ResultSet rs, int i) throws SQLExceptio
 		);
 	}
 
+	public static DbImageDto forDbImageDto(ResultSet rs, int i) throws SQLException {
+		return new DbImageDto(
+			rs.getString("type"),
+			rs.getBytes("data")
+		);
+	}
+	
 }

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

@@ -29,6 +29,7 @@
 import lombok.RequiredArgsConstructor;
 
 import ru.mystamps.web.dao.ImageDataDao;
+import ru.mystamps.web.dao.JdbcImageDataDao;
 import ru.mystamps.web.entity.Image;
 import ru.mystamps.web.entity.ImageData;
 import ru.mystamps.web.service.dto.DbImageDto;
@@ -41,6 +42,7 @@ public class DatabaseImagePersistenceStrategy implements ImagePersistenceStrateg
 		LoggerFactory.getLogger(DatabaseImagePersistenceStrategy.class);
 
 	private final ImageDataDao imageDataDao;
+	private final JdbcImageDataDao jdbcImageDataDao;
 
 	@PostConstruct
 	public void init() {
@@ -65,13 +67,13 @@ public void save(MultipartFile file, Image image) {
 
 	@Override
 	public ImageDto get(Image image) {
-		ImageData imageData = imageDataDao.findByImage(image);
-		if (imageData == null) {
+		DbImageDto imageDto = jdbcImageDataDao.findByImageId(image.getId());
+		if (imageDto == null) {
 			LOG.warn("Found image without content: #{}", image.getId());
 			return null;
 		}
 
-		return new DbImageDto(imageData);
+		return imageDto;
 	}
 
 }

src/main/java/ru/mystamps/web/service/dto/DbImageDto.java

@@ -18,23 +18,13 @@
 package ru.mystamps.web.service.dto;
 
 import lombok.EqualsAndHashCode;
+import lombok.Getter;
 import lombok.RequiredArgsConstructor;
 
-import ru.mystamps.web.entity.ImageData;
-
+@Getter
 @EqualsAndHashCode
 @RequiredArgsConstructor
 public class DbImageDto implements ImageDto {
-	private final ImageData imageData;
-	
-	@Override
-	public String getType() {
-		return imageData.getImage().getType().toString();
-	}
-	
-	@Override
-	public byte[] getData() {
-		return imageData.getContent();
-	}
-	
+	private final String type;
+	private final byte[] data;
 }

src/main/resources/sql/image_dao_queries.properties

@@ -13,3 +13,11 @@ series_image.find_by_series_id = \
 SELECT image_id \
   FROM series_images \
  WHERE series_id = :series_id
+
+image_data.find_by_image_id = \
+SELECT d.content AS data \
+     , i.type \
+  FROM images_data d \
+  JOIN images i \
+    ON i.id = d.image_id \
+ WHERE d.image_id = :image_id

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

@@ -22,19 +22,21 @@ import org.springframework.web.multipart.MultipartFile
 import spock.lang.Specification
 
 import ru.mystamps.web.dao.ImageDataDao
+import ru.mystamps.web.dao.JdbcImageDataDao
 import ru.mystamps.web.entity.Image
 import ru.mystamps.web.entity.ImageData
-import ru.mystamps.web.service.dto.DbImageDto
 import ru.mystamps.web.service.dto.ImageDto
 import ru.mystamps.web.service.exception.ImagePersistenceException
 
 class DatabaseImagePersistenceStrategyTest extends Specification {
 
 	private ImageDataDao imageDataDao = Mock()
+	private JdbcImageDataDao jdbcImageDataDao = Mock()
 	private MultipartFile multipartFile = Mock()
 	private Image image = TestObjects.createImage()
 
-	private ImagePersistenceStrategy strategy = new DatabaseImagePersistenceStrategy(imageDataDao)
+	private ImagePersistenceStrategy strategy =
+		new DatabaseImagePersistenceStrategy(imageDataDao, jdbcImageDataDao)
 
 	//
 	// Tests for save()
@@ -82,19 +84,22 @@ class DatabaseImagePersistenceStrategyTest extends Specification {
 
 	def "get() should pass image to image data dao"() {
 		given:
-			Image expectedImage = TestObjects.createImage()
+			Integer expectedImageId = image.getId()
+		and:
+			Image image = TestObjects.createImage()
+			image.setId(expectedImageId)
 		when:
-			strategy.get(expectedImage)
+			strategy.get(image)
 		then:
-			1 * imageDataDao.findByImage({ Image image ->
-				assert image == expectedImage
+			1 * jdbcImageDataDao.findByImageId({ Integer imageId ->
+				assert imageId == expectedImageId
 				return true
 			})
 	}
 
 	def "get() should return null when image data dao returned null"() {
 		given:
-			imageDataDao.findByImage(_ as Image) >> null
+			jdbcImageDataDao.findByImageId(_ as Integer) >> null
 		when:
 			ImageDto result = strategy.get(image)
 		then:
@@ -103,15 +108,13 @@ class DatabaseImagePersistenceStrategyTest extends Specification {
 
 	def "get() should return result from image data dao"() {
 		given:
-			ImageData expectedImageData = TestObjects.createImageData()
-		and:
-			ImageDto expectedImage = new DbImageDto(expectedImageData)
+			ImageDto expectedImageDto = TestObjects.createDbImageDto()
 		and:
-			imageDataDao.findByImage(_ as Image) >> expectedImageData
+			jdbcImageDataDao.findByImageId(_ as Integer) >> expectedImageDto
 		when:
 			ImageDto result = strategy.get(image)
 		then:
-			result == expectedImage
+			result == expectedImageDto
 	}
 
 }

src/test/java/ru/mystamps/web/service/TestObjects.java

@@ -24,7 +24,6 @@
 import ru.mystamps.web.dao.dto.UsersActivationDto;
 import ru.mystamps.web.dao.dto.UsersActivationFullDto;
 import ru.mystamps.web.entity.Image;
-import ru.mystamps.web.entity.ImageData;
 import ru.mystamps.web.service.dto.DbImageDto;
 import ru.mystamps.web.service.dto.LinkEntityDto;
 import ru.mystamps.web.service.dto.SeriesInfoDto;
@@ -108,15 +107,8 @@ public static Image createImage() {
 		return image;
 	}
 
-	public static ImageData createImageData() {
-		ImageData imageData = new ImageData();
-		imageData.setContent("test".getBytes());
-		imageData.setImage(createImage());
-		return imageData;
-	}
-	
 	public static DbImageDto createDbImageDto() {
-		return new DbImageDto(createImageData());
+		return new DbImageDto("PNG", "test".getBytes());
 	}
 
 	public static SitemapInfoDto createSitemapInfoDto() {