PersonImage Converter

src/main/java/scot/carricksoftware/grants/converters/images/personimage/PersonImageCommandConverterImpl.java

@@ -19,6 +19,12 @@ public class PersonImageCommandConverterImpl implements PersonImageCommandConver
         PersonImage target = new PersonImage();
         target.setId(source.getId());
         target.setPerson(source.getPerson());
+        target.setImage(source.getImage());
+        target.setLevel(source.getLevel());
+        target.setOrder(source.getOrder());
+        target.setCaption(source.getCaption());
+        target.setHeight(source.getHeight());
+        target.setWidth(source.getWidth());
         return target;
     }
 

src/main/java/scot/carricksoftware/grants/converters/images/personimage/PersonImageConverterImpl.java

@@ -19,6 +19,13 @@ public class PersonImageConverterImpl implements PersonImageConverter {
         PersonImageCommand target = new PersonImageCommandImpl();
         target.setId(source.getId());
         target.setPerson(source.getPerson());
+        target.setOrder(source.getOrder());
+        target.setCaption(source.getCaption());
+        target.setHeight(source.getHeight());
+        target.setWidth(source.getWidth());
+        target.setImage(source.getImage());
+        target.setLevel(source.getLevel());
+
         return target;
     }
 }

src/test/java/scot/carricksoftware/grants/bootstrap/DataLoadPlacesTest.java

@@ -26,11 +26,14 @@ public class DataLoadPlacesTest {
     private DataLoadPlaces dataLoadPlaces;
 
 
-    @Mock private CountryServiceImpl countryServiceMock;
-    @Mock private RegionServiceImpl regionServiceMock;
-    @Mock private PlaceServiceImpl placeServiceMock;
-    @Mock private OrganisationServiceImpl organisationServiceMock;
-
+    @Mock
+    private CountryServiceImpl countryServiceMock;
+    @Mock
+    private RegionServiceImpl regionServiceMock;
+    @Mock
+    private PlaceServiceImpl placeServiceMock;
+    @Mock
+    private OrganisationServiceImpl organisationServiceMock;
 
 
     @BeforeEach

src/test/java/scot/carricksoftware/grants/controllers/images/images/ImageFormControllerSaveOrUpdateTest.java

@@ -75,7 +75,7 @@ public class ImageFormControllerSaveOrUpdateTest {
         Long id = 4L;
         imageCommand.setId(id);
         when(imageServiceMock.saveImageCommand(any(ImageCommand.class))).thenReturn(imageCommand);
-        assertEquals("redirect:/image/4/show", imageController.saveOrUpdate(imageCommand, fileMock,bindingResultMock, modelMock));
+        assertEquals("redirect:/image/4/show", imageController.saveOrUpdate(imageCommand, fileMock, bindingResultMock, modelMock));
     }
 
     @Test

src/test/java/scot/carricksoftware/grants/controllers/images/images/ImageFormControllerTest.java

@@ -83,5 +83,4 @@ public class ImageFormControllerTest {
     }
 
 
-
 }

src/test/java/scot/carricksoftware/grants/controllers/images/images/ImageFormControllerValidationTest.java

@@ -73,7 +73,7 @@ public class ImageFormControllerValidationTest {
         ImageCommand imageCommand = new ImageCommandImpl();
         when(imageServiceMock.saveImageCommand(any())).thenReturn(imageCommand);
 
-        imageController.saveOrUpdate(imageCommand,fileMock,bindingResultMock,modelMock);
+        imageController.saveOrUpdate(imageCommand, fileMock, bindingResultMock, modelMock);
         verify(imageCommandValidatorImplMock).validate(imageCommand, bindingResultMock);
     }
 

src/test/java/scot/carricksoftware/grants/converters/images/ConvertToBase64Test.java

@@ -29,5 +29,5 @@ class ConvertToBase64Test {
         byte[] testBytes = testString.getBytes();
         assertEquals(wikipediaAnswer, converter.convert(testBytes));
     }
-    
+
 }

src/test/java/scot/carricksoftware/grants/converters/images/image/ImageCommandConverterTest.java

@@ -43,7 +43,7 @@ class ImageCommandConverterTest {
         assertNotNull(target);
         assertEquals(Id, target.getId());
         assertEquals(name, target.getName());
-        assertEquals(filename,target.getFileName());
-        assertEquals(imageData,target.getImageData());
+        assertEquals(filename, target.getFileName());
+        assertEquals(imageData, target.getImageData());
     }
 }

src/test/java/scot/carricksoftware/grants/validators/helpers/ValidateTypesFileTypeTest.java

@@ -33,11 +33,11 @@ class ValidateTypesFileTypeTest {
         message = "message";
     }
 
-   @Test
+    @Test
     void allowedTypeTest() {
         validateTypes.validateFileType("file.YES", field, new String[]{"YES"}, message, bindingResultMock);
         verifyNoInteractions(bindingResultMock);
-   }
+    }
 
     @Test
     void lowerCaseAllowedTypeTest() {
@@ -48,7 +48,7 @@ class ValidateTypesFileTypeTest {
     @Test
     void notAllowedTypeTest() {
         validateTypes.validateFileType("file.YES", field, new String[]{"NON"}, message, bindingResultMock);
-        verify(bindingResultMock).rejectValue(field,"", null, message);
+        verify(bindingResultMock).rejectValue(field, "", null, message);
     }
 
 }

src/test/java/scot/carricksoftware/grants/validators/images/ImageCommandValidatorTest.java

@@ -46,7 +46,7 @@ class ImageCommandValidatorTest {
         validator.validate(imageCommandMock, bindingResultMock);
 
         verify(validateTypesMock).validateFileType(fileName,
-                "fileName", new String[]{"JPG","GIF"},
+                "fileName", new String[]{"JPG", "GIF"},
                 "The file type is not supported.", bindingResultMock);
     }