DatabaseImagePersistenceStrategy: rename a member.

Addressed to #120

No functional changes.

Author: php-coder

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

@@ -40,7 +40,7 @@ public class DatabaseImagePersistenceStrategy implements ImagePersistenceStrateg
 	private static final Logger LOG =
 		LoggerFactory.getLogger(DatabaseImagePersistenceStrategy.class);
 
-	private final JdbcImageDataDao jdbcImageDataDao;
+	private final JdbcImageDataDao imageDataDao;
 
 	@PostConstruct
 	public void init() {
@@ -54,7 +54,7 @@ public void save(MultipartFile file, Image image) {
 			imageData.setImageId(image.getId());
 			imageData.setContent(file.getBytes());
 
-			Integer id = jdbcImageDataDao.add(imageData);
+			Integer id = imageDataDao.add(imageData);
 			LOG.info("Image's data #{} for image #{} have been saved", id, image.getId());
 
 		} catch (IOException e) {
@@ -65,7 +65,7 @@ public void save(MultipartFile file, Image image) {
 
 	@Override
 	public ImageDto get(Image image) {
-		DbImageDto imageDto = jdbcImageDataDao.findByImageId(image.getId());
+		DbImageDto imageDto = imageDataDao.findByImageId(image.getId());
 		if (imageDto == null) {
 			LOG.warn("Found image without content: #{}", image.getId());
 			return null;

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

@@ -29,12 +29,11 @@ import ru.mystamps.web.service.exception.ImagePersistenceException
 
 class DatabaseImagePersistenceStrategyTest extends Specification {
 
-	private JdbcImageDataDao jdbcImageDataDao = Mock()
+	private JdbcImageDataDao imageDataDao = Mock()
 	private MultipartFile multipartFile = Mock()
 	private Image image = TestObjects.createImage()
 
-	private ImagePersistenceStrategy strategy =
-		new DatabaseImagePersistenceStrategy(jdbcImageDataDao)
+	private ImagePersistenceStrategy strategy = new DatabaseImagePersistenceStrategy(imageDataDao)
 
 	//
 	// Tests for save()
@@ -58,7 +57,7 @@ class DatabaseImagePersistenceStrategyTest extends Specification {
 		when:
 			strategy.save(multipartFile, image)
 		then:
-			1 * jdbcImageDataDao.add({ AddImageDataDbDto imageData ->
+			1 * imageDataDao.add({ AddImageDataDbDto imageData ->
 				assert imageData?.content == expected
 				return true
 			})
@@ -70,7 +69,7 @@ class DatabaseImagePersistenceStrategyTest extends Specification {
 		when:
 			strategy.save(multipartFile, image)
 		then:
-			1 * jdbcImageDataDao.add({ AddImageDataDbDto imageData ->
+			1 * imageDataDao.add({ AddImageDataDbDto imageData ->
 				assert imageData?.imageId == expectedImageId
 				return true
 			})
@@ -89,15 +88,15 @@ class DatabaseImagePersistenceStrategyTest extends Specification {
 		when:
 			strategy.get(image)
 		then:
-			1 * jdbcImageDataDao.findByImageId({ Integer imageId ->
+			1 * imageDataDao.findByImageId({ Integer imageId ->
 				assert imageId == expectedImageId
 				return true
 			})
 	}
 
 	def "get() should return null when image data dao returned null"() {
 		given:
-			jdbcImageDataDao.findByImageId(_ as Integer) >> null
+			imageDataDao.findByImageId(_ as Integer) >> null
 		when:
 			ImageDto result = strategy.get(image)
 		then:
@@ -108,7 +107,7 @@ class DatabaseImagePersistenceStrategyTest extends Specification {
 		given:
 			ImageDto expectedImageDto = TestObjects.createDbImageDto()
 		and:
-			jdbcImageDataDao.findByImageId(_ as Integer) >> expectedImageDto
+			imageDataDao.findByImageId(_ as Integer) >> expectedImageDto
 		when:
 			ImageDto result = strategy.get(image)
 		then: