Image: renamed field image to data.

Reported by PMD about field name that matches the declaring class name.

No functional changes.

Author: php-coder

src/env/dev/WEB-INF/classes/mysql-scheme.sql

@@ -21,7 +21,7 @@
 
     create table images (
         id integer not null auto_increment,
-        image longblob not null,
+        data longblob not null,
         type varchar(4) not null,
         primary key (id)
     ) ENGINE=InnoDB;

src/env/test/WEB-INF/classes/h2-scheme.sql

@@ -21,7 +21,7 @@
 
     create table images (
         id integer generated by default as identity,
-        image blob not null,
+        data blob not null,
         type varchar(4) not null,
         primary key (id)
     );

src/main/java/ru/mystamps/web/controller/ImageController.java

@@ -53,9 +53,9 @@ public void getImage(@PathVariable("id") final Integer id, final HttpServletResp
 
 		// TODO: set content disposition
 		response.setContentType("image/" + image.getType().toString().toLowerCase());
-		response.setContentLength(image.getImage().length);
+		response.setContentLength(image.getData().length);
 
-		response.getOutputStream().write(image.getImage());
+		response.getOutputStream().write(image.getData());
 	}
 
 }

src/main/java/ru/mystamps/web/entity/Image.java

@@ -49,7 +49,7 @@ public class Image {
 
 	@Lob
 	@Basic(optional = false, fetch = FetchType.LAZY)
-	private byte[] image;
+	private byte[] data;
 
 	public enum Type {
 		JPEG, PNG

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

@@ -60,7 +60,7 @@ String save(final MultipartFile file) {
 		image.setType(Image.Type.valueOf(extension.toUpperCase()));
 
 		try {
-			image.setImage(file.getBytes());
+			image.setData(file.getBytes());
 		} catch (final IOException e) {
 			// throw RuntimeException for rolling back transaction
 			throw Throwables.propagate(e);

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

@@ -131,7 +131,7 @@ public void saveShouldPassFileContentToDao() throws IOException {
 
 		verify(imageDao).save(imageCaptor.capture());
 
-		assertThat(imageCaptor.getValue().getImage()).isEqualTo(expected);
+		assertThat(imageCaptor.getValue().getData()).isEqualTo(expected);
 	}
 
 	@Test