DatabaseImagePersistenceStrategy.save(): replace usage of ImageData.

Addressed to #120

No functional changes.

Author: php-coder

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

@@ -23,7 +23,6 @@
 import org.springframework.context.annotation.Profile;
 import org.springframework.core.env.Environment;
 
-import ru.mystamps.web.dao.ImageDataDao;
 import ru.mystamps.web.service.DatabaseImagePersistenceStrategy;
 import ru.mystamps.web.service.FilesystemImagePersistenceStrategy;
 import ru.mystamps.web.service.ImagePersistenceStrategy;
@@ -36,17 +35,13 @@ public interface StrategiesConfig {
 	@Profile("test")
 	class DbStrategiesConfig implements StrategiesConfig {
 
-		@Autowired
-		private ImageDataDao imageDataDao;
-		
 		@Autowired
 		private DaoConfig daoConfig;
 
 		@Bean
 		@Override
 		public ImagePersistenceStrategy getImagePersistenceStrategy() {
 			return new DatabaseImagePersistenceStrategy(
-				imageDataDao,
 				daoConfig.getJdbcImageDataDao()
 			);
 		}

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

@@ -17,8 +17,10 @@
  */
 package ru.mystamps.web.dao;
 
+import ru.mystamps.web.dao.dto.AddImageDataDbDto;
 import ru.mystamps.web.service.dto.DbImageDto;
 
 public interface JdbcImageDataDao {
 	DbImageDto findByImageId(Integer imageId);
+	Integer add(AddImageDataDbDto imageData);
 }

src/main/java/ru/mystamps/web/dao/dto/AddImageDataDbDto.java

@@ -0,0 +1,28 @@
+/*
+ * 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.dto;
+
+import lombok.Getter;
+import lombok.Setter;
+
+@Getter
+@Setter
+public class AddImageDataDbDto {
+	private Integer imageId;
+	private byte[] content;
+}

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

@@ -18,14 +18,22 @@
 package ru.mystamps.web.dao.impl;
 
 import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.apache.commons.lang3.Validate;
 
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.dao.EmptyResultDataAccessException;
+import org.springframework.jdbc.core.namedparam.MapSqlParameterSource;
 import org.springframework.jdbc.core.namedparam.NamedParameterJdbcTemplate;
+import org.springframework.jdbc.support.GeneratedKeyHolder;
+import org.springframework.jdbc.support.KeyHolder;
 
 import lombok.RequiredArgsConstructor;
 
 import ru.mystamps.web.dao.JdbcImageDataDao;
+import ru.mystamps.web.dao.dto.AddImageDataDbDto;
 import ru.mystamps.web.service.dto.DbImageDto;
 
 @RequiredArgsConstructor
@@ -36,6 +44,9 @@ public class JdbcImageDataDaoImpl implements JdbcImageDataDao {
 	@Value("${image_data.find_by_image_id}")
 	private String findByImageIdSql;
 
+	@Value("${image_data.add}")
+	private String addImageDataSql;
+	
 	@Override
 	public DbImageDto findByImageId(Integer imageId) {
 		try {
@@ -49,4 +60,27 @@ public DbImageDto findByImageId(Integer imageId) {
 		}
 	}
 
+	@Override
+	public Integer add(AddImageDataDbDto imageData) {
+		Map<String, Object> params = new HashMap<>();
+		params.put("image_id", imageData.getImageId());
+		params.put("content", imageData.getContent());
+		
+		KeyHolder holder = new GeneratedKeyHolder();
+		
+		int affected = jdbcTemplate.update(
+			addImageDataSql,
+			new MapSqlParameterSource(params),
+			holder
+		);
+		
+		Validate.validState(
+			affected == 1,
+			"Unexpected number of affected rows after creation of image's data: %d",
+			affected
+		);
+		
+		return Integer.valueOf(holder.getKey().intValue());
+	}
+	
 }

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

@@ -28,10 +28,9 @@
 
 import lombok.RequiredArgsConstructor;
 
-import ru.mystamps.web.dao.ImageDataDao;
 import ru.mystamps.web.dao.JdbcImageDataDao;
+import ru.mystamps.web.dao.dto.AddImageDataDbDto;
 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;
@@ -41,7 +40,6 @@ public class DatabaseImagePersistenceStrategy implements ImagePersistenceStrateg
 	private static final Logger LOG =
 		LoggerFactory.getLogger(DatabaseImagePersistenceStrategy.class);
 
-	private final ImageDataDao imageDataDao;
 	private final JdbcImageDataDao jdbcImageDataDao;
 
 	@PostConstruct
@@ -52,12 +50,12 @@ public void init() {
 	@Override
 	public void save(MultipartFile file, Image image) {
 		try {
-			ImageData imageData = new ImageData();
-			imageData.setImage(image);
+			AddImageDataDbDto imageData = new AddImageDataDbDto();
+			imageData.setImageId(image.getId());
 			imageData.setContent(file.getBytes());
 
-			ImageData entity = imageDataDao.save(imageData);
-			LOG.info("Image's data entity saved to database ({})", entity);
+			Integer id = jdbcImageDataDao.add(imageData);
+			LOG.info("Image's data #{} for image #{} have been saved", id, image.getId());
 
 		} catch (IOException e) {
 			// throw RuntimeException for rolling back transaction

src/main/resources/sql/image_dao_queries.properties

@@ -21,3 +21,14 @@ SELECT d.content AS data \
   JOIN images i \
     ON i.id = d.image_id \
  WHERE d.image_id = :image_id
+
+image_data.add = \
+INSERT \
+  INTO images_data \
+     ( image_id \
+     , content \
+     ) \
+VALUES \
+     ( :image_id \
+     , :content \
+     )

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

@@ -21,22 +21,20 @@ 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.dao.dto.AddImageDataDbDto
 import ru.mystamps.web.entity.Image
-import ru.mystamps.web.entity.ImageData
 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, jdbcImageDataDao)
+		new DatabaseImagePersistenceStrategy(jdbcImageDataDao)
 
 	//
 	// Tests for save()
@@ -60,20 +58,20 @@ class DatabaseImagePersistenceStrategyTest extends Specification {
 		when:
 			strategy.save(multipartFile, image)
 		then:
-			1 * imageDataDao.save({ ImageData imageData ->
+			1 * jdbcImageDataDao.add({ AddImageDataDbDto imageData ->
 				assert imageData?.content == expected
 				return true
 			})
 	}
 
 	def "save() should pass image to image data dao"() {
 		given:
-			Image expectedImage = TestObjects.createImage()
+			Integer expectedImageId = image.getId()
 		when:
-			strategy.save(multipartFile, expectedImage)
+			strategy.save(multipartFile, image)
 		then:
-			1 * imageDataDao.save({ ImageData imageData ->
-				assert imageData?.image == expectedImage
+			1 * jdbcImageDataDao.add({ AddImageDataDbDto imageData ->
+				assert imageData?.imageId == expectedImageId
 				return true
 			})
 	}