JdbcImageDao and JdbcImageDaoImpl renamed to ImageDao and JdbcImageDao.

Addressed to #120

No functional changes.

Author: php-coder

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

@@ -53,8 +53,8 @@ public GibbonsCatalogDao getGibbonsCatalogDao() {
 	}
 
 	@Bean
-	public JdbcImageDao getJdbcImageDao() {
-		return new JdbcImageDaoImpl(jdbcTemplate);
+	public ImageDao getImageDao() {
+		return new JdbcImageDao(jdbcTemplate);
 	}
 
 	@Bean

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

@@ -80,7 +80,7 @@ public CronService getCronService() {
 	public ImageService getImageService() {
 		return new ImageServiceImpl(
 			strategiesConfig.getImagePersistenceStrategy(),
-			daoConfig.getJdbcImageDao()
+			daoConfig.getImageDao()
 		);
 	}
 

src/main/java/ru/mystamps/web/dao/JdbcImageDao.java renamed to src/main/java/ru/mystamps/web/dao/ImageDao.java

@@ -21,7 +21,7 @@
 
 import ru.mystamps.web.dao.dto.ImageInfoDto;
 
-public interface JdbcImageDao {
+public interface ImageDao {
 	Integer add(String type);
 	void addToSeries(Integer seriesId, Integer imageId);
 	ImageInfoDto findById(Integer imageId);

src/main/java/ru/mystamps/web/dao/impl/JdbcImageDaoImpl.java renamed to src/main/java/ru/mystamps/web/dao/impl/JdbcImageDao.java

@@ -33,11 +33,11 @@
 
 import lombok.RequiredArgsConstructor;
 
-import ru.mystamps.web.dao.JdbcImageDao;
+import ru.mystamps.web.dao.ImageDao;
 import ru.mystamps.web.dao.dto.ImageInfoDto;
 
 @RequiredArgsConstructor
-public class JdbcImageDaoImpl implements JdbcImageDao {
+public class JdbcImageDao implements ImageDao {
 
 	private final NamedParameterJdbcTemplate jdbcTemplate;
 

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

@@ -32,7 +32,7 @@
 
 import lombok.RequiredArgsConstructor;
 
-import ru.mystamps.web.dao.JdbcImageDao;
+import ru.mystamps.web.dao.ImageDao;
 import ru.mystamps.web.dao.dto.ImageDto;
 import ru.mystamps.web.dao.dto.ImageInfoDto;
 import ru.mystamps.web.service.exception.ImagePersistenceException;
@@ -46,7 +46,7 @@ public class ImageServiceImpl implements ImageService {
 	private static final Logger LOG = LoggerFactory.getLogger(ImageServiceImpl.class);
 
 	private final ImagePersistenceStrategy imagePersistenceStrategy;
-	private final JdbcImageDao jdbcImageDao;
+	private final ImageDao imageDao;
 
 	@Override
 	@Transactional
@@ -66,7 +66,7 @@ public Integer save(MultipartFile file) {
 
 		String imageType = extension.toUpperCase(Locale.US);
 
-		Integer id = jdbcImageDao.add(imageType);
+		Integer id = imageDao.add(imageType);
 		if (id == null) {
 			throw new ImagePersistenceException("Can't save image");
 		}
@@ -85,7 +85,7 @@ public ImageDto get(Integer imageId) {
 		Validate.isTrue(imageId != null, "Image id must be non null");
 		Validate.isTrue(imageId > 0, "Image id must be greater than zero");
 
-		ImageInfoDto image = jdbcImageDao.findById(imageId);
+		ImageInfoDto image = imageDao.findById(imageId);
 		if (image == null) {
 			return null;
 		}
@@ -100,7 +100,7 @@ public void addToSeries(Integer seriesId, Integer imageId) {
 		Validate.isTrue(seriesId != null, "Series id must be non null");
 		Validate.isTrue(imageId != null, "Image id must be non null");
 
-		jdbcImageDao.addToSeries(seriesId, imageId);
+		imageDao.addToSeries(seriesId, imageId);
 
 		LOG.info("Series #{}: image #{} was added", seriesId, imageId);
 	}
@@ -110,7 +110,7 @@ public void addToSeries(Integer seriesId, Integer imageId) {
 	public List<Integer> findBySeriesId(Integer seriesId) {
 		Validate.isTrue(seriesId != null, "Series id must be non null");
 
-		return jdbcImageDao.findBySeriesId(seriesId);
+		return imageDao.findBySeriesId(seriesId);
 	}
 
 	private static String extractExtensionFromContentType(String contentType) {

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

@@ -22,26 +22,23 @@ import org.springframework.web.multipart.MultipartFile
 import spock.lang.Specification
 import spock.lang.Unroll
 
-import ru.mystamps.web.dao.JdbcImageDao
+import ru.mystamps.web.dao.ImageDao
 import ru.mystamps.web.dao.dto.ImageDto
 import ru.mystamps.web.dao.dto.ImageInfoDto
 import ru.mystamps.web.service.exception.ImagePersistenceException
 
 class ImageServiceImplTest extends Specification {
 
-	private JdbcImageDao jdbcImageDao = Mock()
+	private ImageDao imageDao = Mock()
 	private MultipartFile multipartFile = Mock()
 	private ImagePersistenceStrategy imagePersistenceStrategy = Mock()
 
-	private ImageService service = new ImageServiceImpl(
-		imagePersistenceStrategy,
-		jdbcImageDao
-	)
+	private ImageService service = new ImageServiceImpl(imagePersistenceStrategy, imageDao)
 
 	def setup() {
 		multipartFile.getSize() >> 1024L
 		multipartFile.getContentType() >> 'image/png'
-		jdbcImageDao.add(_ as String) >> 17
+		imageDao.add(_ as String) >> 17
 	}
 
 	//
@@ -86,7 +83,7 @@ class ImageServiceImplTest extends Specification {
 		when:
 			service.save(multipartFile)
 		then:
-			1 * jdbcImageDao.add(_ as String) >> 18
+			1 * imageDao.add(_ as String) >> 18
 	}
 
 	@Unroll
@@ -96,7 +93,7 @@ class ImageServiceImplTest extends Specification {
 		then:
 			multipartFile.getContentType() >> contentType
 		and:
-			1 * jdbcImageDao.add({ String type ->
+			1 * imageDao.add({ String type ->
 				assert type == expectedType
 				return true
 			}) >> 19
@@ -112,7 +109,7 @@ class ImageServiceImplTest extends Specification {
 		when:
 			service.save(multipartFile)
 		then:
-			jdbcImageDao.add(_ as String) >> null
+			imageDao.add(_ as String) >> null
 		and:
 			0 * imagePersistenceStrategy.save(_ as MultipartFile, _ as ImageInfoDto)
 		and:
@@ -125,7 +122,7 @@ class ImageServiceImplTest extends Specification {
 		when:
 			String url = service.save(multipartFile)
 		then:
-			jdbcImageDao.add(_ as String) >> image.id
+			imageDao.add(_ as String) >> image.id
 		and:
 			1 * imagePersistenceStrategy.save({ MultipartFile passedFile ->
 				assert passedFile == multipartFile
@@ -143,7 +140,7 @@ class ImageServiceImplTest extends Specification {
 		when:
 			Integer actualImageId = service.save(multipartFile)
 		then:
-			jdbcImageDao.add(_ as String) >> expectedImageId
+			imageDao.add(_ as String) >> expectedImageId
 		and:
 			actualImageId == expectedImageId
 	}
@@ -169,7 +166,7 @@ class ImageServiceImplTest extends Specification {
 		when:
 			service.get(7)
 		then:
-			1 * jdbcImageDao.findById({ Integer imageId ->
+			1 * imageDao.findById({ Integer imageId ->
 				assert imageId == 7
 				return true
 			})
@@ -179,7 +176,7 @@ class ImageServiceImplTest extends Specification {
 		when:
 			ImageDto image = service.get(9)
 		then:
-			jdbcImageDao.findById(_ as Integer) >> null
+			imageDao.findById(_ as Integer) >> null
 		and:
 			0 * imagePersistenceStrategy.get(_ as ImageInfoDto)
 		and:
@@ -190,7 +187,7 @@ class ImageServiceImplTest extends Specification {
 		given:
 			ImageInfoDto expectedImage = TestObjects.createImageInfoDto()
 		and:
-			jdbcImageDao.findById(_ as Integer) >> expectedImage
+			imageDao.findById(_ as Integer) >> expectedImage
 		and:
 			ImageDto expectedImageDto = TestObjects.createDbImageDto()
 		when:
@@ -207,7 +204,7 @@ class ImageServiceImplTest extends Specification {
 
 	def "get() should return null when strategy returned null"() {
 		given:
-			jdbcImageDao.findById(_ as Integer) >> TestObjects.createImageInfoDto()
+			imageDao.findById(_ as Integer) >> TestObjects.createImageInfoDto()
 		and:
 			imagePersistenceStrategy.get(_ as ImageInfoDto) >> null
 		when: