2 月之前 · 8bc36090aa
--- a/src/main/java/scot/carricksoftware/grants/bootstrap/DataLoadImages.java
+++ b/src/main/java/scot/carricksoftware/grants/bootstrap/DataLoadImages.java
@@ -50,7 +50,7 @@ public class DataLoadImages {
 
				         ImageCommand imageCommand = new ImageCommandImpl();
			
 
				         imageCommand.setName("Dalkeith");
			
 
				         imageCommand.setImageData("Dalkeith".getBytes());
			
 
				-        imageCommand.setFilename("Midlothian");
			
 
				+        imageCommand.setFileName("Midlothian");
			
 
				 
			
 
				         imageService.saveImageCommand(imageCommand);
			
 
				     }
			
--- a/src/main/java/scot/carricksoftware/grants/commands/images/ImageCommand.java
+++ b/src/main/java/scot/carricksoftware/grants/commands/images/ImageCommand.java
@@ -22,7 +22,7 @@ public interface ImageCommand {
 
				     @SuppressWarnings("unused")
			
 
				     void setImageData(byte[] imageData);
			
 
				 
			
 
				-    String getFilename();
			
 
				+    String getFileName();
			
 
				 
			
 
				-    void setFilename(String filename);
			
 
				+    void setFileName(String filename);
			
 
				 }
			
--- a/src/main/java/scot/carricksoftware/grants/commands/images/ImageCommandImpl.java
+++ b/src/main/java/scot/carricksoftware/grants/commands/images/ImageCommandImpl.java
@@ -13,7 +13,7 @@ public class ImageCommandImpl implements ImageCommand{
 
				     Long Id;
			
 
				     private String name;
			
 
				     private byte[] imageData;
			
 
				-    private String filename;
			
 
				+    private String fileName;
			
 
				 
			
 
				     @Override
			
 
				     public Long getId() {
			
@@ -46,12 +46,12 @@ public class ImageCommandImpl implements ImageCommand{
 
				     }
			
 
				 
			
 
				     @Override
			
 
				-    public String getFilename() {
			
 
				-        return filename;
			
 
				+    public String getFileName() {
			
 
				+        return fileName;
			
 
				     }
			
 
				 
			
 
				     @Override
			
 
				-    public void setFilename(String filename) {
			
 
				-        this.filename = filename;
			
 
				+    public void setFileName(String filename) {
			
 
				+        this.fileName = filename;
			
 
				     }
			
 
				 }
			
--- a/src/main/java/scot/carricksoftware/grants/converters/images/image/ImageCommandConverterImpl.java
+++ b/src/main/java/scot/carricksoftware/grants/converters/images/image/ImageCommandConverterImpl.java
@@ -20,7 +20,7 @@ public class ImageCommandConverterImpl implements ImageCommandConverter {
 
				         target.setId(source.getId());
			
 
				         target.setName(source.getName());
			
 
				         target.setImageData(source.getImageData());
			
 
				-        target.setFileName(source.getFilename());
			
 
				+        target.setFileName(source.getFileName());
			
 
				         return target;
			
 
				     }
			
 
				 
			
--- a/src/main/java/scot/carricksoftware/grants/converters/images/image/ImageConverterImpl.java
+++ b/src/main/java/scot/carricksoftware/grants/converters/images/image/ImageConverterImpl.java
@@ -20,7 +20,7 @@ public class ImageConverterImpl implements ImageConverter {
 
				         target.setId(source.getId());
			
 
				         target.setName(source.getName());
			
 
				         target.setImageData(source.getImageData());
			
 
				-        target.setFilename(source.getFileName());
			
 
				+        target.setFileName(source.getFileName());
			
 
				         return target;
			
 
				     }
			
 
				 }
			
--- a/src/main/resources/templates/images/image/form.html
+++ b/src/main/resources/templates/images/image/form.html
@@ -18,7 +18,7 @@
 
				 
			
 
				 </head>
			
 
				 <body>
			
 
				-<!--/*@thymesVar id="personCommand" type="scot.carricksoftware.grants.commands.people.PersonCommand"*/-->
			
 
				+
			
 
				 <div th:insert="~{fragments/layout::banner}"></div>
			
 
				 
			
 
				 <div class="container border border-info rounded-3 text-center p-4">
			
@@ -51,6 +51,23 @@
 
				                     </div>
			
 
				                 </td>
			
 
				             </tr>
			
 
				+            <tr>
			
 
				+                <td style="text-align: right;">
			
 
				+                    <label for="fileName"><span style="color: rgb(255,0,0);">*</span>File Name :&nbsp;</label>
			
 
				+                </td>
			
 
				+                <td  style="text-align: left;">
			
 
				+                    <input class="form-control" id="fileName"
			
 
				+                           th:field="*{fileName}" type="text" readonly >
			
 
				+                    <div th:if="${#fields.hasErrors('name')}">
			
 
				+                        <ul class="text-danger">
			
 
				+                            <li th:each="err : ${#fields.errors('fileName')}" th:text="${err}"/>
			
 
				+                        </ul>
			
 
				+                    </div>
			
 
				+                </td>
			
 
				+            </tr>
			
 
				+
			
 
				+
			
 
				+
			
 
				             <tr><td>&nbsp;</td></tr>
			
 
				         </table>
			
 
				         <button type="submit" class="btn btn-primary">Commit</button>
			
--- a/src/test/java/scot/carricksoftware/grants/bootstrap/DataLoadImagesTest.java
+++ b/src/test/java/scot/carricksoftware/grants/bootstrap/DataLoadImagesTest.java
@@ -64,7 +64,7 @@ class DataLoadImagesTest {
 
				         verify(imageServiceMock).saveImageCommand(captor.capture());
			
 
				         assertEquals("Dalkeith", captor.getValue().getName());
			
 
				         assertEquals("Dalkeith", new String(captor.getValue().getImageData()));
			
 
				-        assertEquals("Midlothian", captor.getValue().getFilename());
			
 
				+        assertEquals("Midlothian", captor.getValue().getFileName());
			
 
				     }
			
 
				 
			
 
				     @Test
			
--- a/src/test/java/scot/carricksoftware/grants/commands/images/ImageCommandTest.java
+++ b/src/test/java/scot/carricksoftware/grants/commands/images/ImageCommandTest.java
@@ -59,14 +59,14 @@ class ImageCommandTest {
 
				 
			
 
				     @Test
			
 
				     public void getFilenameTest() {
			
 
				-        assertNull(imageCommand.getFilename());
			
 
				+        assertNull(imageCommand.getFileName());
			
 
				     }
			
 
				 
			
 
				     @Test
			
 
				     public void setFilenameTest() {
			
 
				         String filename = GetRandomString();
			
 
				-        imageCommand.setFilename(filename);
			
 
				-        assertEquals(filename, imageCommand.getFilename());
			
 
				+        imageCommand.setFileName(filename);
			
 
				+        assertEquals(filename, imageCommand.getFileName());
			
 
				     }
			
 
				 
			
 
				 
			
--- a/src/test/java/scot/carricksoftware/grants/converters/images/image/ImageCommandConverterTest.java
+++ b/src/test/java/scot/carricksoftware/grants/converters/images/image/ImageCommandConverterTest.java
@@ -37,7 +37,7 @@ class ImageCommandConverterTest {
 
				         source.setId(Id);
			
 
				         source.setName(name);
			
 
				         source.setImageData(imageData);
			
 
				-        source.setFilename(filename);
			
 
				+        source.setFileName(filename);
			
 
				 
			
 
				 
			
 
				         Image target = converter.convert(source);
			
--- a/src/test/java/scot/carricksoftware/grants/converters/images/image/ImageConverterTest.java
+++ b/src/test/java/scot/carricksoftware/grants/converters/images/image/ImageConverterTest.java
@@ -44,6 +44,6 @@ class ImageConverterTest {
 
				         assertEquals(Id, target.getId());
			
 
				         assertEquals(name, target.getName());
			
 
				         assertArrayEquals(imageData, target.getImageData());
			
 
				-        assertEquals(filename, target.getFilename());
			
 
				+        assertEquals(filename, target.getFileName());
			
 
				     }
			
 
				 }