ImageServiceImpl.save(): get rid of Image.

Addressed to #120

No functional changes.

Author: php-coder

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

@@ -25,7 +25,6 @@
 import org.springframework.mail.javamail.JavaMailSender;
 import org.springframework.scheduling.annotation.EnableAsync;
 
-import ru.mystamps.web.dao.ImageDao;
 // CheckStyle: ignore AvoidStarImportCheck for next 1 line
 import ru.mystamps.web.service.*; // NOPMD: UnusedImports
 import ru.mystamps.web.support.spring.security.SecurityConfig;
@@ -43,9 +42,6 @@ public class ServicesConfig {
 	@Autowired
 	private StrategiesConfig strategiesConfig;
 
-	@Autowired
-	private ImageDao imageDao;
-	
 	@Autowired
 	private JavaMailSender mailSender;
 
@@ -84,7 +80,6 @@ public CronService getCronService() {
 	public ImageService getImageService() {
 		return new ImageServiceImpl(
 			strategiesConfig.getImagePersistenceStrategy(),
-			imageDao,
 			daoConfig.getJdbcImageDao()
 		);
 	}

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

@@ -22,6 +22,7 @@
 import ru.mystamps.web.service.dto.ImageInfoDto;
 
 public interface JdbcImageDao {
+	Integer add(String type);
 	void addToSeries(Integer seriesId, Integer imageId);
 	ImageInfoDto findById(Integer imageId);
 	List<Integer> findBySeriesId(Integer seriesId);

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

@@ -22,9 +22,14 @@
 import java.util.List;
 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;
 
@@ -36,6 +41,9 @@ public class JdbcImageDaoImpl implements JdbcImageDao {
 
 	private final NamedParameterJdbcTemplate jdbcTemplate;
 
+	@Value("${image.add}")
+	private String addImageSql;
+	
 	@Value("${series_image.add}")
 	private String addImageToSeriesSql;
 
@@ -45,6 +53,27 @@ public class JdbcImageDaoImpl implements JdbcImageDao {
 	@Value("${series_image.find_by_series_id}")
 	private String findBySeriesIdSql;
 
+	@Override
+	public Integer add(String type) {
+		KeyHolder holder = new GeneratedKeyHolder();
+		
+		int affected = jdbcTemplate.update(
+			addImageSql,
+			new MapSqlParameterSource(
+				Collections.singletonMap("type", type)
+			),
+			holder
+		);
+		
+		Validate.validState(
+			affected == 1,
+			"Unexpected number of affected rows after adding image: %d",
+			affected
+		);
+		
+		return Integer.valueOf(holder.getKey().intValue());
+	}
+	
 	@Override
 	public void addToSeries(Integer seriesId, Integer imageId) {
 		Map<String, Object> params = new HashMap<>();

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

@@ -32,9 +32,7 @@
 
 import lombok.RequiredArgsConstructor;
 
-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;
@@ -48,7 +46,6 @@ public class ImageServiceImpl implements ImageService {
 	private static final Logger LOG = LoggerFactory.getLogger(ImageServiceImpl.class);
 
 	private final ImagePersistenceStrategy imagePersistenceStrategy;
-	private final ImageDao imageDao;
 	private final JdbcImageDao jdbcImageDao;
 
 	@Override
@@ -67,22 +64,19 @@ public Integer save(MultipartFile file) {
 				contentType, extension
 		);
 
-		Image image = new Image();
-		image.setType(Image.Type.valueOf(extension.toUpperCase(Locale.US)));
+		String imageType = extension.toUpperCase(Locale.US);
 
-		Image entity = imageDao.save(image);
-		if (entity == null) {
+		Integer id = jdbcImageDao.add(imageType);
+		if (id == null) {
 			throw new ImagePersistenceException("Can't save image");
 		}
 
-		LOG.info("Image entity was saved to database ({})", entity);
+		ImageInfoDto image = new ImageInfoDto(id, imageType);
+		LOG.info("Image was saved to database ({})", image);
 
-		imagePersistenceStrategy.save(
-			file,
-			new ImageInfoDto(entity.getId(), image.getType().toString())
-		);
+		imagePersistenceStrategy.save(file, image);
 
-		return entity.getId();
+		return image.getId();
 	}
 
 	@Override

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

@@ -19,9 +19,11 @@
 
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
+import lombok.ToString;
 
 @Getter
 @RequiredArgsConstructor
+@ToString
 public class ImageInfoDto {
 	private final Integer id;
 	private final String type;

src/main/resources/sql/image_dao_queries.properties

@@ -33,6 +33,13 @@ VALUES \
      , :content \
      )
 
+image.add = \
+INSERT \
+  INTO images \
+     ( type ) \
+VALUES \
+     ( :type )
+
 image.find_by_id = \
 SELECT id \
      , type \

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

@@ -22,30 +22,26 @@ import org.springframework.web.multipart.MultipartFile
 import spock.lang.Specification
 import spock.lang.Unroll
 
-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 {
 
-	private ImageDao imageDao = Mock()
 	private JdbcImageDao jdbcImageDao = Mock()
 	private MultipartFile multipartFile = Mock()
 	private ImagePersistenceStrategy imagePersistenceStrategy = Mock()
 
 	private ImageService service = new ImageServiceImpl(
 		imagePersistenceStrategy,
-		imageDao,
 		jdbcImageDao
 	)
 
 	def setup() {
 		multipartFile.getSize() >> 1024L
 		multipartFile.getContentType() >> 'image/png'
-		imageDao.save(_ as Image) >> new Image()
+		jdbcImageDao.add(_ as String) >> 17
 	}
 
 	//
@@ -90,33 +86,33 @@ class ImageServiceImplTest extends Specification {
 		when:
 			service.save(multipartFile)
 		then:
-			1 * imageDao.save(_ as Image) >> new Image()
+			1 * jdbcImageDao.add(_ as String) >> 18
 	}
 
 	@Unroll
-	def "save() should pass content type '#contentType' to image dao"(String contentType, Image.Type expectedType) {
+	def "save() should pass content type '#contentType' to image dao"(String contentType, String expectedType) {
 		when:
 			service.save(multipartFile)
 		then:
 			multipartFile.getContentType() >> contentType
 		and:
-			1 * imageDao.save({ Image image ->
-				assert image?.type == expectedType
+			1 * jdbcImageDao.add({ String type ->
+				assert type == expectedType
 				return true
-			}) >> new Image()
+			}) >> 19
 		where:
 			contentType                 || expectedType
-			'image/jpeg'                || Image.Type.JPEG
-			'image/jpeg; charset=UTF-8' || Image.Type.JPEG
-			'image/png'                 || Image.Type.PNG
-			'image/png; charset=UTF8'   || Image.Type.PNG
+			'image/jpeg'                || 'JPEG'
+			'image/jpeg; charset=UTF-8' || 'JPEG'
+			'image/png'                 || 'PNG'
+			'image/png; charset=UTF8'   || 'PNG'
 	}
 
 	def "save() should throw exception when image dao returned null"() {
 		when:
 			service.save(multipartFile)
 		then:
-			imageDao.save(_ as Image) >> null
+			jdbcImageDao.add(_ as String) >> null
 		and:
 			0 * imagePersistenceStrategy.save(_ as MultipartFile, _ as ImageInfoDto)
 		and:
@@ -125,11 +121,11 @@ class ImageServiceImplTest extends Specification {
 
 	def "save() should call strategy"() {
 		given:
-			Image image = TestObjects.createImage()
+			ImageInfoDto image = TestObjects.createImageInfoDto()
 		when:
 			String url = service.save(multipartFile)
 		then:
-			imageDao.save(_ as Image) >> image
+			jdbcImageDao.add(_ as String) >> image.id
 		and:
 			1 * imagePersistenceStrategy.save({ MultipartFile passedFile ->
 				assert passedFile == multipartFile
@@ -143,13 +139,13 @@ class ImageServiceImplTest extends Specification {
 
 	def "save() should return saved image"() {
 		given:
-			Image expectedImage = TestObjects.createImage()
+			Integer expectedImageId = 20
 		when:
 			Integer actualImageId = service.save(multipartFile)
 		then:
-			imageDao.save(_ as Image) >> expectedImage
+			jdbcImageDao.add(_ as String) >> expectedImageId
 		and:
-			actualImageId == expectedImage.getId()
+			actualImageId == expectedImageId
 	}
 
 	//

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

@@ -23,7 +23,6 @@
 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.entity.Image;
 import ru.mystamps.web.service.dto.DbImageDto;
 import ru.mystamps.web.service.dto.ImageInfoDto;
 import ru.mystamps.web.service.dto.LinkEntityDto;
@@ -101,13 +100,6 @@ public static UserDetails createUserDetails() {
 		);
 	}
 
-	public static Image createImage() {
-		Image image = new Image();
-		image.setId(1);
-		image.setType(Image.Type.PNG);
-		return image;
-	}
-	
 	public static ImageInfoDto createImageInfoDto() {
 		return new ImageInfoDto(1, "PNG");
 	}