Organisation removed

src/main/java/scot/carricksoftware/grants/bootstrap/DataLoadPlaces.java

@@ -10,6 +10,7 @@ import org.apache.logging.log4j.Logger;
 import org.springframework.context.annotation.Profile;
 import org.springframework.stereotype.Component;
 import scot.carricksoftware.grants.domains.places.Country;
+import scot.carricksoftware.grants.domains.places.Organisation;
 import scot.carricksoftware.grants.domains.places.Place;
 import scot.carricksoftware.grants.domains.places.Region;
 import scot.carricksoftware.grants.services.places.countries.CountryService;
@@ -39,15 +40,19 @@ public class DataLoadPlaces {
         loadCountries();
         loadRegions();
         loadPlaces();
+        loadOrganisations();
     }
 
-
     final Country scotland = new Country();
     final Country england = new Country();
 
     final Region inverness = new Region();
     final Region midlothian = new Region();
 
+    final Organisation army = new Organisation();
+
+
+
     private void loadCountries() {
         scotland.setName("Scotland");
         countryService.save(scotland);
@@ -82,4 +87,9 @@ public class DataLoadPlaces {
     }
 
 
+    private void loadOrganisations() {
+        army.setName("The army");
+
+    }
+
 }

src/main/java/scot/carricksoftware/grants/controllers/places/organisations/OrganisationFormController.java

@@ -1,18 +0,0 @@
-/*
- * Copyright (c)  20 Feb 2025, Andrew Grant of Carrick Software .
- * All rights reserved.
- */
-
-package scot.carricksoftware.grants.controllers.places.organisations;
-
-import org.springframework.ui.Model;
-import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.ModelAttribute;
-import scot.carricksoftware.grants.commands.places.organisations.OrganisationCommand;
-
-@SuppressWarnings("unused")
-
-public interface OrganisationFormController {
-
-    String saveOrUpdate(@ModelAttribute OrganisationCommand organisationCommand, BindingResult bindingResult, Model model);
-}

src/main/java/scot/carricksoftware/grants/controllers/places/organisations/OrganisationFormControllerImpl.java

@@ -1,105 +0,0 @@
-/*
- * Copyright (c)  20 Feb 2025, Andrew Grant of Carrick Software .
- * All rights reserved.
- */
-
-package scot.carricksoftware.grants.controllers.places.organisations;
-
-import jakarta.validation.Valid;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
-import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.ModelAttribute;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import scot.carricksoftware.grants.commands.places.organisations.OrganisationCommand;
-import scot.carricksoftware.grants.commands.places.organisations.OrganisationCommandImpl;
-import scot.carricksoftware.grants.constants.AttributeConstants;
-import scot.carricksoftware.grants.constants.MappingConstants;
-import scot.carricksoftware.grants.constants.ViewConstants;
-import scot.carricksoftware.grants.converters.Capitalisation;
-import scot.carricksoftware.grants.converters.places.organisations.OrganisationCommandConverter;
-import scot.carricksoftware.grants.converters.places.organisations.OrganisationConverter;
-import scot.carricksoftware.grants.services.places.organisations.OrganisationService;
-import scot.carricksoftware.grants.validators.places.OrganisationCommandValidator;
-
-@SuppressWarnings("LoggingSimilarMessage")
-@Controller
-public class OrganisationFormControllerImpl implements OrganisationFormController {
-
-    private static final Logger logger = LogManager.getLogger(OrganisationFormControllerImpl.class);
-    private final OrganisationService organisationService;
-    @SuppressWarnings({"unused", "FieldCanBeLocal"})
-    private final OrganisationCommandConverter organisationCommandConverter;
-    private final OrganisationConverter organisationConverter;
-    private final Capitalisation capitalisation;
-    private final OrganisationCommandValidator organisationCommandValidator;
-
-
-    public OrganisationFormControllerImpl(OrganisationService organisationService,
-                                          OrganisationCommandConverter organisationCommandConverter,
-                                          OrganisationConverter organisationConverter,
-                                          Capitalisation capitalisation, OrganisationCommandValidator organisationCommandValidator) {
-        this.organisationService = organisationService;
-        this.organisationCommandConverter = organisationCommandConverter;
-
-
-        this.organisationConverter = organisationConverter;
-        this.capitalisation = capitalisation;
-        this.organisationCommandValidator = organisationCommandValidator;
-    }
-
-    @SuppressWarnings("SameReturnValue")
-    @GetMapping(MappingConstants.ORGANISATION_NEW)
-    public final String getNewOrganisation(final Model model) {
-        logger.debug("OrganisationFormControllerImpl::getNewOrganisation");
-        model.addAttribute(AttributeConstants.ORGANISATION_COMMAND, new OrganisationCommandImpl());
-        return ViewConstants.ORGANISATION_FORM;
-    }
-
-    @SuppressWarnings("SameReturnValue")
-    @GetMapping(MappingConstants.ORGANISATION_EDIT)
-    public final String organisationEdit(@Valid @PathVariable final String id, Model model) {
-        logger.debug("OrganisationFormControllerImpl::organisationEdit");
-        model.addAttribute(AttributeConstants.ORGANISATION_COMMAND, organisationService.findById(Long.valueOf(id)));
-        return ViewConstants.ORGANISATION_FORM;
-    }
-
-
-    @Override
-    @PostMapping(MappingConstants.ORGANISATION)
-    public String saveOrUpdate(@Valid @ModelAttribute OrganisationCommand organisationCommand, BindingResult bindingResult, Model model) {
-        logger.debug("OrganisationFormControllerImpl::saveOrUpdate");
-
-        organisationCommandValidator.validate(organisationCommand, bindingResult);
-
-
-        if (bindingResult.hasErrors()) {
-            bindingResult.getAllErrors().forEach(error -> logger.debug(error.getDefaultMessage()));
-            return ViewConstants.ORGANISATION_FORM;
-        }
-
-        cleanUp(organisationCommand);
-        OrganisationCommand savedCommand = organisationService.saveOrganisationCommand(organisationCommand);
-        model.addAttribute(AttributeConstants.ORGANISATION_COMMAND, savedCommand);
-        return MappingConstants.REDIRECT + MappingConstants.ORGANISATION_SHOW.replace("{id}", "" + savedCommand.getId());
-    }
-
-    private void cleanUp(OrganisationCommand organisationCommand) {
-        organisationCommand.setName(capitalisation.getCapitalisation(organisationCommand.getName()));
-    }
-
-    @SuppressWarnings("SameReturnValue")
-    @GetMapping(MappingConstants.ORGANISATION_SHOW)
-    public String showById(@PathVariable String id, Model model) {
-        logger.debug("OrganisationFormControllerImpl::saveOrUpdate");
-        OrganisationCommand savedCommand = organisationConverter.convert(organisationService.findById(Long.valueOf(id)));
-        model.addAttribute(AttributeConstants.ORGANISATION_COMMAND, savedCommand);
-        return ViewConstants.ORGANISATION_FORM;
-    }
-
-
-}

src/main/java/scot/carricksoftware/grants/controllers/places/organisations/OrganisationListController.java

@@ -1,29 +0,0 @@
-/*
- * Copyright (c) Andrew Grant of Carrick Software 11/03/2025, 22:25. All rights reserved.
- *
- */
-
-package scot.carricksoftware.grants.controllers.places.organisations;
-
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.PathVariable;
-
-@SuppressWarnings("unused")
-@Controller
-public interface OrganisationListController {
-
-    String getListPage(final Model model);
-
-    String getNextPage(final Model model);
-
-    String getPreviousPage(final Model model);
-
-    String getFirstPage(final Model model);
-
-    String getLastPage(final Model model);
-
-    String organisationDelete(@PathVariable String id);
-
-    int getPageNumber();
-}

src/main/java/scot/carricksoftware/grants/controllers/places/organisations/OrganisationListControllerImpl.java

@@ -1,107 +0,0 @@
-/*
- * Copyright (c) Andrew Grant of Carrick Software 11/03/2025, 22:25. All rights reserved.
- *
- */
-
-package scot.carricksoftware.grants.controllers.places.organisations;
-
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import scot.carricksoftware.grants.constants.ApplicationConstants;
-import scot.carricksoftware.grants.constants.AttributeConstants;
-import scot.carricksoftware.grants.constants.MappingConstants;
-import scot.carricksoftware.grants.constants.ViewConstants;
-import scot.carricksoftware.grants.controllers.ControllerHelper;
-import scot.carricksoftware.grants.services.places.organisations.OrganisationService;
-
-import static java.lang.Integer.max;
-
-@Controller
-public class OrganisationListControllerImpl implements OrganisationListController {
-
-    private static final Logger logger = LogManager.getLogger(OrganisationListControllerImpl.class);
-
-
-    private int currentPage = 0;
-    private final ControllerHelper controllerHelper;
-    private final OrganisationService organisationService;
-
-    public OrganisationListControllerImpl(ControllerHelper controllerHelper,
-                                          OrganisationService organisationService) {
-        this.controllerHelper = controllerHelper;
-        this.organisationService = organisationService;
-    }
-
-    @SuppressWarnings("SameReturnValue")
-    @GetMapping(MappingConstants.ORGANISATION_LIST)
-    @Override
-    public final String getListPage(final Model model) {
-        logger.debug("PersonListControllerImpl::getOrganisationPage");
-        currentPage = 0;
-        return sendAttributesAndReturn(model);
-    }
-
-    @SuppressWarnings("SameReturnValue")
-    private String sendAttributesAndReturn(Model model) {
-        model.addAttribute(AttributeConstants.ORGANISATIONS, organisationService.getPagedOrganisations(currentPage));
-        controllerHelper.addAttributes(model);
-        return ViewConstants.ORGANISATION_LIST;
-    }
-
-    @SuppressWarnings("SameReturnValue")
-    @GetMapping(MappingConstants.ORGANISATION_NEXT)
-    @Override
-    public final String getNextPage(final Model model) {
-        logger.debug("OrganisationListControllerImpl::getNextPage");
-        currentPage++;
-        return sendAttributesAndReturn(model);
-    }
-
-    @SuppressWarnings("SameReturnValue")
-    @GetMapping(MappingConstants.ORGANISATION_PREVIOUS)
-    @Override
-    public final String getPreviousPage(final Model model) {
-        logger.debug("OrganisationListControllerImpl::getPreviousPage");
-        currentPage = max(0, currentPage - 1);
-        return sendAttributesAndReturn(model);
-    }
-
-    @SuppressWarnings("SameReturnValue")
-    @GetMapping(MappingConstants.ORGANISATION_REWIND)
-    public final String getFirstPage(final Model model) {
-        logger.debug("OrganisationListControllerImpl::getFirstPage");
-        currentPage = 0;
-        return sendAttributesAndReturn(model);
-    }
-
-    @SuppressWarnings("SameReturnValue")
-    @GetMapping(MappingConstants.ORGANISATION_FF)
-    @Override
-    public final String getLastPage(final Model model) {
-        logger.debug("OrganisationListControllerImpl::getLastPage");
-        long organisationCount = organisationService.count();
-        currentPage = (int) (organisationCount / ApplicationConstants.DEFAULT_PAGE_SIZE);
-        return sendAttributesAndReturn(model);
-    }
-
-
-    @SuppressWarnings("SameReturnValue")
-    @GetMapping(MappingConstants.ORGANISATION_DELETE)
-    @Override
-    public final String organisationDelete(@PathVariable final String id) {
-        logger.debug("OrganisationListControllerImpl::organisationDelete");
-        organisationService.deleteById(Long.valueOf(id));
-        return MappingConstants.REDIRECT + MappingConstants.ORGANISATIONS;
-    }
-
-    @Override
-    public int getPageNumber() {
-        return currentPage;
-    }
-
-
-}

src/main/java/scot/carricksoftware/grants/repositories/places/OrganisationRepository.java

@@ -7,7 +7,6 @@ package scot.carricksoftware.grants.repositories.places;
 
 import org.springframework.data.repository.PagingAndSortingRepository;
 import org.springframework.stereotype.Repository;
-import scot.carricksoftware.grants.commands.places.organisations.OrganisationCommand;
 import scot.carricksoftware.grants.domains.places.Organisation;
 
 import java.util.Optional;
@@ -15,16 +14,13 @@ import java.util.Optional;
 @Repository
 public interface OrganisationRepository extends PagingAndSortingRepository<Organisation, Long> {
 
-    @SuppressWarnings("unused")
-    OrganisationCommand saveOrganisationCommand(OrganisationCommand organisationCommand);
-
-    Iterable<Organisation> findAll();
-
-    void deleteById(Long id);
+    Organisation save(Organisation organisation);
 
     long count();
 
-    Organisation save(Organisation organisation);
+    void deleteById(Long id);
 
     Optional<Organisation> findById(Long id);
+
+    Iterable<Organisation> findAll();
 }

src/main/java/scot/carricksoftware/grants/services/places/organisations/OrganisationService.java

@@ -1,32 +0,0 @@
-/*
- * Copyright (c) Andrew Grant of Carrick Software 11/03/2025, 20:23. All rights reserved.
- *
- */
-
-package scot.carricksoftware.grants.services.places.organisations;
-
-import scot.carricksoftware.grants.commands.places.organisations.OrganisationCommand;
-import scot.carricksoftware.grants.domains.places.Organisation;
-
-import java.util.List;
-
-public interface OrganisationService {
-
-
-    @SuppressWarnings("unused")
-    OrganisationCommand saveOrganisationCommand(OrganisationCommand organisationCommand);
-
-    void deleteById(Long id);
-
-    List<Organisation> getPagedOrganisations(int pageNumber);
-
-    long count();
-
-
-    @SuppressWarnings("unused")
-    List<Organisation> findAll();
-
-    Organisation findById(Long id);
-
-    Organisation save(Organisation organisation);
-}

src/main/java/scot/carricksoftware/grants/services/places/organisations/OrganisationServiceImpl.java

@@ -1,105 +0,0 @@
-/*
- * Copyright (c) Andrew Grant of Carrick Software 11/03/2025, 20:23. All rights reserved.
- *
- */
-
-package scot.carricksoftware.grants.services.places.organisations;
-
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
-import org.springframework.data.domain.Page;
-import org.springframework.data.domain.PageRequest;
-import org.springframework.data.domain.Pageable;
-import org.springframework.data.domain.Sort;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-import scot.carricksoftware.grants.commands.places.organisations.OrganisationCommand;
-import scot.carricksoftware.grants.constants.ApplicationConstants;
-import scot.carricksoftware.grants.converters.places.organisations.OrganisationCommandConverter;
-import scot.carricksoftware.grants.converters.places.organisations.OrganisationConverter;
-import scot.carricksoftware.grants.domains.places.Organisation;
-import scot.carricksoftware.grants.repositories.places.OrganisationRepository;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Optional;
-
-@Service
-public class OrganisationServiceImpl implements OrganisationService {
-    private static final Logger logger = LogManager.getLogger(OrganisationServiceImpl.class);
-
-    @SuppressWarnings({"unused"})
-    private final OrganisationRepository organisationRepository;
-    private final OrganisationConverter organisationConverter;
-    private final OrganisationCommandConverter organisationCommandConverter;
-
-    public OrganisationServiceImpl(
-            OrganisationRepository organisationRepository,
-            OrganisationConverter organisationConverter,
-            OrganisationCommandConverter organisationCommandConverter) {
-
-        this.organisationRepository = organisationRepository;
-        this.organisationConverter = organisationConverter;
-        this.organisationCommandConverter = organisationCommandConverter;
-    }
-
-
-    @Override
-    public void deleteById(Long id) {
-        logger.debug("OrganisationServiceImpl::deleteBy");
-        organisationRepository.deleteById(id);
-    }
-
-
-    @Override
-    public List<Organisation> getPagedOrganisations(int pageNumber) {
-        logger.debug("OrganisationServiceImpl::getPagedOrganisation");
-        Pageable paging = PageRequest.of(pageNumber, ApplicationConstants.DEFAULT_PAGE_SIZE, getSort());
-        Page<Organisation> pagedResult = organisationRepository.findAll(paging);
-        return pagedResult.getContent();
-    }
-
-    private Sort getSort() {
-        return Sort.by(Sort.Direction.ASC, "name");
-    }
-
-    @Override
-    public long count() {
-        logger.debug("OrganisationServiceImpl::count");
-        return organisationRepository.count();
-    }
-
-    @Transactional
-    @Override
-    public OrganisationCommand saveOrganisationCommand(OrganisationCommand organisationCommand) {
-        logger.debug("OrganisationServiceImpl::saveOrganisationCommand");
-        Organisation organisation = organisationCommandConverter.convert(organisationCommand);
-        Organisation savedOrganisation = organisationRepository.save(organisation);
-        assert organisation != null;
-        return organisationConverter.convert(savedOrganisation);
-
-    }
-
-    @Override
-    public List<Organisation> findAll() {
-        logger.debug("OrganisationServiceImpl::findAll");
-        List<Organisation> result = new ArrayList<>();
-        Iterable<Organisation> organisationIterable = organisationRepository.findAll();
-        organisationIterable.forEach(result::add);
-        return result;
-    }
-
-    @Override
-    public Organisation findById(Long id) {
-        logger.debug("OrganisationServiceImpl::findById");
-        Optional<Organisation> organisation = organisationRepository.findById(id);
-        return organisation.orElse(null);
-    }
-
-    @Override
-    public Organisation save(Organisation organisation) {
-        logger.debug("OrganisationServiceImpl::save");
-        return organisationRepository.save(organisation);
-    }
-
-}

src/main/java/scot/carricksoftware/grants/validators/places/OrganisationCommandValidator.java

@@ -1,31 +0,0 @@
-/*
- * Copyright (c) Andrew Grant of Carrick Software 19/03/2025, 09:51. All rights reserved.
- *
- */
-
-package scot.carricksoftware.grants.validators.places;
-
-import org.springframework.stereotype.Component;
-import org.springframework.validation.BindingResult;
-import scot.carricksoftware.grants.commands.places.organisations.OrganisationCommand;
-import scot.carricksoftware.grants.constants.ApplicationConstants;
-import scot.carricksoftware.grants.constants.ValidationConstants;
-
-@Component
-public class OrganisationCommandValidator {
-
-    public void validate(OrganisationCommand organisationCommand, BindingResult bindingResult) {
-        if (organisationCommand.getName().length() < ApplicationConstants.MINIMUM_NAME_LENGTH) {
-            bindingResult.rejectValue("name", ApplicationConstants.EMPTY_STRING,
-                    null,
-                    ValidationConstants.NAME_IS_TOO_SHORT);
-        } else {
-            if (organisationCommand.getName().length() > ApplicationConstants.MAXIMUM_NAME_LENGTH) {
-                bindingResult.rejectValue("name", ApplicationConstants.EMPTY_STRING,
-                        null,
-                        ValidationConstants.NAME_IS_TOO_LONG);
-            }
-        }
-    }
-}
-

src/test/java/scot/carricksoftware/grants/controllers/places/organisations/OrganisationFormControllerCleansingTest.java

@@ -1,92 +0,0 @@
-/*
- * Copyright (c)  19 Feb 2025, Andrew Grant of Carrick Software .
- * All rights reserved.
- */
-
-package scot.carricksoftware.grants.controllers.places.organisations;
-
-
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.ExtendWith;
-import org.mockito.Mock;
-import org.mockito.junit.jupiter.MockitoExtension;
-import org.springframework.ui.Model;
-import org.springframework.validation.BindingResult;
-import scot.carricksoftware.grants.commands.places.organisations.OrganisationCommand;
-import scot.carricksoftware.grants.converters.CapitalisationImpl;
-import scot.carricksoftware.grants.converters.places.organisations.OrganisationCommandConverterImpl;
-import scot.carricksoftware.grants.converters.places.organisations.OrganisationConverterImpl;
-import scot.carricksoftware.grants.services.places.organisations.OrganisationService;
-import scot.carricksoftware.grants.validators.places.OrganisationCommandValidator;
-
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-
-@ExtendWith(MockitoExtension.class)
-public class OrganisationFormControllerCleansingTest {
-
-    @SuppressWarnings("unused")
-    private OrganisationFormControllerImpl organisationController;
-
-    @Mock
-    private OrganisationService organisationServiceMock;
-
-    @Mock
-    private OrganisationCommandConverterImpl organisationCommandConverterMock;
-
-    @Mock
-    private OrganisationConverterImpl organisationConverterMock;
-
-    @Mock
-    private CapitalisationImpl capitalisationMock;
-
-    @Mock
-    OrganisationCommand organisationCommandMock;
-
-    @Mock
-    BindingResult bindingResultMock;
-
-    @Mock
-    OrganisationCommandValidator organisationCommandValidatorMock;
-
-    @Mock
-    Model modelMock;
-
-
-    @BeforeEach
-    public void setUp() {
-        organisationController = new OrganisationFormControllerImpl(organisationServiceMock,
-                organisationCommandConverterMock,
-                organisationConverterMock,
-                capitalisationMock,
-                organisationCommandValidatorMock);
-    }
-
-
-    @Test
-    public void saveOrUpdateCleansingTest() {
-        String name = "goat";
-        String uName = "Goat";
-        when(organisationServiceMock.saveOrganisationCommand(any())).thenReturn(organisationCommandMock);
-        when(organisationCommandMock.getName()).thenReturn(name);
-        when(capitalisationMock.getCapitalisation(name)).thenReturn(uName);
-        organisationController.saveOrUpdate(organisationCommandMock, bindingResultMock, modelMock);
-        verify(organisationCommandMock).setName(uName);
-    }
-
-    @Test
-    public void saveOrUpdateValidationTest() {
-        String name = "goat";
-        String uName = "Goat";
-        when(organisationServiceMock.saveOrganisationCommand(any())).thenReturn(organisationCommandMock);
-        when(organisationCommandMock.getName()).thenReturn(name);
-        when(capitalisationMock.getCapitalisation(name)).thenReturn(uName);
-        organisationController.saveOrUpdate(organisationCommandMock, bindingResultMock, modelMock);
-        verify(organisationCommandValidatorMock).validate(organisationCommandMock, bindingResultMock);
-    }
-
-
-}

src/test/java/scot/carricksoftware/grants/controllers/places/organisations/OrganisationFormControllerSaveOrUpdateTest.java

@@ -1,97 +0,0 @@
-/*
- * Copyright (c)  19 Feb 2025, Andrew Grant of Carrick Software .
- * All rights reserved.
- */
-
-package scot.carricksoftware.grants.controllers.places.organisations;
-
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.ExtendWith;
-import org.mockito.Mock;
-import org.mockito.junit.jupiter.MockitoExtension;
-import org.springframework.ui.Model;
-import org.springframework.validation.BindingResult;
-import scot.carricksoftware.grants.commands.places.organisations.OrganisationCommand;
-import scot.carricksoftware.grants.commands.places.organisations.OrganisationCommandImpl;
-import scot.carricksoftware.grants.converters.Capitalisation;
-import scot.carricksoftware.grants.converters.places.organisations.OrganisationCommandConverterImpl;
-import scot.carricksoftware.grants.converters.places.organisations.OrganisationConverterImpl;
-import scot.carricksoftware.grants.services.places.organisations.OrganisationService;
-import scot.carricksoftware.grants.validators.places.OrganisationCommandValidator;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-
-@ExtendWith(MockitoExtension.class)
-public class OrganisationFormControllerSaveOrUpdateTest {
-
-    @SuppressWarnings("unused")
-    private OrganisationFormControllerImpl organisationController;
-
-    @Mock
-    private OrganisationService organisationServiceMock;
-
-    @Mock
-    private OrganisationCommandConverterImpl organisationCommandConverterMock;
-
-    @Mock
-    private OrganisationConverterImpl organisationConverterMock;
-
-    @Mock
-    private Capitalisation capitalisationMock;
-
-    @Mock
-    Model modelMock;
-
-    @Mock
-    BindingResult bindingResultMock;
-
-    @Mock
-    OrganisationCommandValidator organisationCommandValidatorMock;
-
-    private OrganisationCommand organisationCommand;
-
-
-    @BeforeEach
-    public void setUp() {
-        organisationController = new OrganisationFormControllerImpl(organisationServiceMock,
-                organisationCommandConverterMock,
-                organisationConverterMock,
-                capitalisationMock,
-                organisationCommandValidatorMock);
-        organisationCommand = new OrganisationCommandImpl();
-    }
-
-    @Test
-    public void saveOrUpdateNoErrorsTest() {
-        Long id = 4L;
-        organisationCommand.setId(id);
-        when(organisationServiceMock.saveOrganisationCommand(any(OrganisationCommand.class))).thenReturn(organisationCommand);
-        assertEquals("redirect:/organisation/4/show", organisationController.saveOrUpdate(organisationCommand, bindingResultMock, modelMock));
-    }
-
-    @Test
-    public void saveOrUpdateErrorsTest() {
-        Long id = 4L;
-        organisationCommand.setId(id);
-        when(bindingResultMock.hasErrors()).thenReturn(true);
-        assertEquals("organisation/form", organisationController.saveOrUpdate(organisationCommand, bindingResultMock, modelMock));
-    }
-
-    @Test
-    public void CleaningTakesPlaceTest() {
-        OrganisationCommand organisationCommand = new OrganisationCommandImpl();
-        organisationCommand.setId(4L);
-        organisationCommand.setName("england");
-        when(bindingResultMock.hasErrors()).thenReturn(false);
-        when(organisationServiceMock.saveOrganisationCommand(any(OrganisationCommand.class))).thenReturn(organisationCommand);
-        organisationController.saveOrUpdate(organisationCommand, bindingResultMock, modelMock);
-        verify(capitalisationMock).getCapitalisation("england");
-    }
-
-
-}

src/test/java/scot/carricksoftware/grants/controllers/places/organisations/OrganisationFormControllerTest.java

@@ -1,99 +0,0 @@
-/*
- * Copyright (c)  19 Feb 2025, Andrew Grant of Carrick Software .
- * All rights reserved.
- */
-
-package scot.carricksoftware.grants.controllers.places.organisations;
-
-
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.ExtendWith;
-import org.mockito.ArgumentCaptor;
-import org.mockito.Mock;
-import org.mockito.junit.jupiter.MockitoExtension;
-import org.springframework.ui.Model;
-import scot.carricksoftware.grants.commands.places.organisations.OrganisationCommand;
-import scot.carricksoftware.grants.constants.AttributeConstants;
-import scot.carricksoftware.grants.converters.Capitalisation;
-import scot.carricksoftware.grants.converters.places.organisations.OrganisationCommandConverterImpl;
-import scot.carricksoftware.grants.converters.places.organisations.OrganisationConverterImpl;
-import scot.carricksoftware.grants.domains.places.Organisation;
-import scot.carricksoftware.grants.services.places.organisations.OrganisationService;
-import scot.carricksoftware.grants.validators.places.OrganisationCommandValidator;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-import static scot.carricksoftware.grants.GenerateRandomNumberValues.GetRandomLong;
-import static scot.carricksoftware.grants.GenerateRandomPlaceValues.GetRandomOrganisation;
-import static scot.carricksoftware.grants.GenerateRandomPlaceValues.GetRandomOrganisationCommand;
-
-
-@ExtendWith(MockitoExtension.class)
-public class OrganisationFormControllerTest {
-
-    @SuppressWarnings("unused")
-    private OrganisationFormControllerImpl organisationController;
-
-    @Mock
-    private OrganisationService organisationServiceMock;
-
-    @Mock
-    private OrganisationCommandConverterImpl organisationCommandConverterMock;
-
-    @Mock
-    private OrganisationConverterImpl organisationConverterMock;
-
-    @Mock
-    private Capitalisation capitalisationMock;
-
-    @Mock
-    private Model modelMock;
-
-    @Mock
-    OrganisationCommandValidator organisationCommandValidatorMock;
-
-
-    @BeforeEach
-    public void setUp() {
-        organisationController = new OrganisationFormControllerImpl(organisationServiceMock,
-                organisationCommandConverterMock,
-                organisationConverterMock,
-                capitalisationMock,
-                organisationCommandValidatorMock);
-    }
-
-    @Test
-    public void getNewOrganisationTest() {
-        ArgumentCaptor<Object> objectCaptor = ArgumentCaptor.forClass(Object.class);
-        ArgumentCaptor<String> stringCaptor = ArgumentCaptor.forClass(String.class);
-        assertEquals("organisation/form", organisationController.getNewOrganisation(modelMock));
-        verify(modelMock).addAttribute(stringCaptor.capture(), objectCaptor.capture());
-        assertEquals("organisationCommand", stringCaptor.getValue());
-        assertEquals("OrganisationCommandImpl", objectCaptor.getValue().getClass().getSimpleName());
-    }
-
-    @Test
-    public void organisationEditTestEditTest() {
-        Long id = GetRandomLong();
-        Organisation organisation = GetRandomOrganisation();
-        when(organisationServiceMock.findById(id)).thenReturn(organisation);
-
-        assertEquals("organisation/form", organisationController.organisationEdit(id + "", modelMock));
-        verify(modelMock).addAttribute(AttributeConstants.ORGANISATION_COMMAND, organisation);
-    }
-
-    @Test
-    public void showByIdTest() {
-        Long id = GetRandomLong();
-        Organisation organisation = GetRandomOrganisation();
-        OrganisationCommand organisationCommand = GetRandomOrganisationCommand();
-
-        when(organisationServiceMock.findById(id)).thenReturn(organisation);
-        when(organisationConverterMock.convert(organisation)).thenReturn(organisationCommand);
-        assertEquals("organisation/form", organisationController.showById(id + "", modelMock));
-        verify(modelMock).addAttribute(AttributeConstants.ORGANISATION_COMMAND, organisationCommand);
-    }
-
-}

src/test/java/scot/carricksoftware/grants/controllers/places/organisations/OrganisationListControllerTest.java

@@ -1,125 +0,0 @@
-/*
- * Copyright (c)  19 Feb 2025, Andrew Grant of Carrick Software .
- * All rights reserved.
- */
-
-package scot.carricksoftware.grants.controllers.places.organisations;
-
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.ExtendWith;
-import org.mockito.Mock;
-import org.mockito.junit.jupiter.MockitoExtension;
-import org.springframework.ui.Model;
-import scot.carricksoftware.grants.constants.ApplicationConstants;
-import scot.carricksoftware.grants.controllers.ControllerHelper;
-import scot.carricksoftware.grants.domains.places.Organisation;
-import scot.carricksoftware.grants.services.places.organisations.OrganisationService;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-import static scot.carricksoftware.grants.GenerateRandomNumberValues.GetRandomLong;
-import static scot.carricksoftware.grants.GenerateRandomPlaceValues.GetRandomOrganisation;
-
-
-@ExtendWith(MockitoExtension.class)
-public class OrganisationListControllerTest {
-
-    private OrganisationListControllerImpl controller;
-
-    @Mock
-    private ControllerHelper controllerHelperMock;
-
-    @Mock
-    private OrganisationService organisationServiceMock;
-
-    @Mock
-    private Model modelMock;
-
-    @Mock
-    List<Organisation> organisationListMock;
-
-    @BeforeEach
-    public void setUp() {
-        controller = new OrganisationListControllerImpl(controllerHelperMock, organisationServiceMock);
-    }
-
-    @Test
-    public void getListPageTest() {
-        when(organisationServiceMock.getPagedOrganisations(0)).thenReturn(organisationListMock);
-        assertEquals("organisation/list", controller.getListPage(modelMock));
-        verify(modelMock).addAttribute("organisations", organisationListMock);
-        verify(controllerHelperMock).addAttributes(modelMock);
-    }
-
-    @Test
-    public void getLastPageTest() {
-        int page = 25;
-        int count = page * ApplicationConstants.DEFAULT_PAGE_SIZE;
-        when(organisationServiceMock.count()).thenReturn((long) count);
-        controller.getLastPage(modelMock);
-        controller.getPreviousPage(modelMock);
-        assertEquals("organisation/list", controller.getLastPage(modelMock));
-        verify(organisationServiceMock, times(2)).getPagedOrganisations(page);
-    }
-
-    @Test
-    public void placeDeleteTest() {
-        Long id = GetRandomLong();
-        assertEquals("redirect:/organisations", controller.organisationDelete(Long.toString(id)));
-        verify(organisationServiceMock).deleteById(id);
-    }
-
-    @Test
-    public void getFirstPlaceTest() {
-        List<Organisation> organisationList = new ArrayList<>();
-        organisationList.add(GetRandomOrganisation());
-        when(organisationServiceMock.getPagedOrganisations(0)).thenReturn(organisationList);
-
-        assertEquals("organisation/list", controller.getFirstPage(modelMock));
-        assertEquals(0, controller.getPageNumber());
-        verify(modelMock).addAttribute("organisations", organisationList);
-    }
-
-    @Test
-    public void getNextPlaceTest() {
-        List<Organisation> organisationList = new ArrayList<>();
-        organisationList.add(GetRandomOrganisation());
-        when(organisationServiceMock.getPagedOrganisations(0)).thenReturn(organisationList);
-
-        controller.getFirstPage(modelMock);
-        assertEquals("organisation/list", controller.getNextPage(modelMock));
-        assertEquals(1, controller.getPageNumber());
-        verify(modelMock).addAttribute("organisations", organisationList);
-
-    }
-
-    @Test
-    public void getPreviousFromFirstTest() {
-        List<Organisation> organisationList = new ArrayList<>();
-        organisationList.add(GetRandomOrganisation());
-        when(organisationServiceMock.getPagedOrganisations(0)).thenReturn(organisationList);
-
-        controller.getFirstPage(modelMock);
-        assertEquals("organisation/list", controller.getPreviousPage(modelMock));
-        assertEquals(0, controller.getPageNumber());
-        verify(modelMock, times(2)).addAttribute("organisations", organisationList);
-    }
-
-    @Test
-    public void getPreviousFromLastTest() {
-        int page = 25;
-        int count = page * ApplicationConstants.DEFAULT_PAGE_SIZE;
-        when(organisationServiceMock.count()).thenReturn((long) count);
-        controller.getLastPage(modelMock);
-        assertEquals("organisation/list", controller.getPreviousPage(modelMock));
-        assertEquals(24, controller.getPageNumber());
-    }
-
-
-}

src/test/java/scot/carricksoftware/grants/services/places/organisations/OrganisationServiceFindTest.java

@@ -1,74 +0,0 @@
-/*
- * Copyright (c) Andrew Grant of Carrick Software 11/03/2025, 20:24. All rights reserved.
- *
- */
-
-package scot.carricksoftware.grants.services.places.organisations;
-
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.ExtendWith;
-import org.mockito.Mock;
-import org.mockito.junit.jupiter.MockitoExtension;
-import scot.carricksoftware.grants.converters.places.organisations.OrganisationCommandConverterImpl;
-import scot.carricksoftware.grants.converters.places.organisations.OrganisationConverterImpl;
-import scot.carricksoftware.grants.domains.places.Organisation;
-import scot.carricksoftware.grants.repositories.places.OrganisationRepository;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Optional;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNull;
-import static org.mockito.Mockito.when;
-import static scot.carricksoftware.grants.GenerateRandomNumberValues.GetRandomLong;
-import static scot.carricksoftware.grants.GenerateRandomPlaceValues.GetRandomOrganisation;
-
-@ExtendWith(MockitoExtension.class)
-public class OrganisationServiceFindTest {
-
-    OrganisationService organisationService;
-
-    @Mock
-    OrganisationRepository organisationRepositoryMock;
-
-    @Mock
-    OrganisationConverterImpl organisationConverterMock;
-
-    @Mock
-    OrganisationCommandConverterImpl organisationCommandConverterMock;
-
-    @BeforeEach
-    public void setUp() {
-        organisationService = new OrganisationServiceImpl(organisationRepositoryMock,
-                organisationConverterMock,
-                organisationCommandConverterMock);
-    }
-
-    @Test
-    public void testFindAll() {
-        List<Organisation> organisations = new ArrayList<>();
-        organisations.add(GetRandomOrganisation());
-        when(organisationRepositoryMock.findAll()).thenReturn(organisations);
-        assertEquals(organisations, organisationService.findAll());
-    }
-
-    @Test
-    public void testFindByFoundId() {
-        Long id = GetRandomLong();
-        Organisation organisation = GetRandomOrganisation();
-        Optional<Organisation> organisationOptional = Optional.of(organisation);
-        when(organisationRepositoryMock.findById(id)).thenReturn(organisationOptional);
-        assertEquals(organisation, organisationService.findById(id));
-    }
-
-    @Test
-    public void testFindByNotFoundId() {
-        Long id = GetRandomLong();
-        Optional<Organisation> empty = Optional.empty();
-        when(organisationRepositoryMock.findById(id)).thenReturn(empty);
-        assertNull(organisationService.findById(id));
-    }
-
-}

src/test/java/scot/carricksoftware/grants/services/places/organisations/OrganisationServiceSaveTest.java

@@ -1,77 +0,0 @@
-/*
- * Copyright (c) Andrew Grant of Carrick Software 11/03/2025, 20:24. All rights reserved.
- *
- */
-
-package scot.carricksoftware.grants.services.places.organisations;
-
-
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.ExtendWith;
-import org.mockito.Mock;
-import org.mockito.junit.jupiter.MockitoExtension;
-import org.springframework.data.domain.Pageable;
-import scot.carricksoftware.grants.commands.places.organisations.OrganisationCommand;
-import scot.carricksoftware.grants.commands.places.organisations.OrganisationCommandImpl;
-import scot.carricksoftware.grants.converters.places.organisations.OrganisationCommandConverterImpl;
-import scot.carricksoftware.grants.converters.places.organisations.OrganisationConverterImpl;
-import scot.carricksoftware.grants.domains.places.Organisation;
-import scot.carricksoftware.grants.repositories.places.OrganisationRepository;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.mockito.Mockito.when;
-import static scot.carricksoftware.grants.GenerateCertificateRandomValues.GetRandomString;
-import static scot.carricksoftware.grants.GenerateRandomPlaceValues.GetRandomOrganisation;
-
-
-@ExtendWith(MockitoExtension.class)
-public class OrganisationServiceSaveTest {
-
-    OrganisationService organisationService;
-
-    @Mock
-    OrganisationRepository organisationRepositoryMock;
-
-    @Mock
-    OrganisationConverterImpl organisationConverterImplMock;
-
-    @Mock
-    OrganisationCommandConverterImpl organisationCommandConverterImplMock;
-
-
-    @BeforeEach
-    public void setUp() {
-        organisationService = new OrganisationServiceImpl(organisationRepositoryMock,
-                organisationConverterImplMock,
-                organisationCommandConverterImplMock);
-    }
-
-    @SuppressWarnings("unused")
-    @Mock
-    Pageable pageableMock;
-
-
-    @Test
-    public void saveTest() {
-        Organisation organisation = new Organisation();
-        organisation.setName(GetRandomString());
-
-        when(organisationRepositoryMock.save(organisation)).thenReturn(organisation);
-
-        assertEquals(organisation, organisationService.save(organisation));
-    }
-
-    @Test
-    public void saveOrganisationCommandTest() {
-        Organisation organisation = GetRandomOrganisation();
-        OrganisationCommand organisationCommand = new OrganisationCommandImpl();
-        when(organisationCommandConverterImplMock.convert(organisationCommand)).thenReturn(organisation);
-        when(organisationRepositoryMock.save(organisation)).thenReturn(organisation);
-        when(organisationConverterImplMock.convert((organisation))).thenReturn(organisationCommand);
-
-        assertEquals(organisationCommand, organisationService.saveOrganisationCommand(organisationCommand));
-    }
-
-
-}

src/test/java/scot/carricksoftware/grants/services/places/organisations/OrganisationServiceTest.java

@@ -1,86 +0,0 @@
-/*
- * Copyright (c) Andrew Grant of Carrick Software 11/03/2025, 20:24. All rights reserved.
- *
- */
-
-package scot.carricksoftware.grants.services.places.organisations;
-
-
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.ExtendWith;
-import org.mockito.Mock;
-import org.mockito.junit.jupiter.MockitoExtension;
-import org.springframework.data.domain.Page;
-import org.springframework.data.domain.Pageable;
-import scot.carricksoftware.grants.converters.places.organisations.OrganisationCommandConverterImpl;
-import scot.carricksoftware.grants.converters.places.organisations.OrganisationConverterImpl;
-import scot.carricksoftware.grants.domains.places.Organisation;
-import scot.carricksoftware.grants.repositories.places.OrganisationRepository;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-import static scot.carricksoftware.grants.GenerateRandomNumberValues.GetRandomLong;
-import static scot.carricksoftware.grants.GenerateRandomPlaceValues.GetRandomOrganisation;
-
-
-@ExtendWith(MockitoExtension.class)
-public class OrganisationServiceTest {
-
-    OrganisationService organisationService;
-
-    @Mock
-    OrganisationRepository organisationRepositoryMock;
-
-    @Mock
-    OrganisationConverterImpl organisationConverterImplMock;
-
-    @Mock
-    OrganisationCommandConverterImpl organisationCommandConverterImplMock;
-
-
-    @BeforeEach
-    public void setUp() {
-        organisationService = new OrganisationServiceImpl(organisationRepositoryMock,
-                organisationConverterImplMock,
-                organisationCommandConverterImplMock);
-    }
-
-    @SuppressWarnings("unused")
-    @Mock
-    Pageable pageableMock;
-
-    @Mock
-    Page<Organisation> pageMock;
-
-    @Test
-    public void deleteByIdTest() {
-        Long id = GetRandomLong();
-        organisationService.deleteById(id);
-        verify(organisationRepositoryMock).deleteById(id);
-    }
-
-    @Test
-    public void CountTest() {
-        long result = GetRandomLong();
-        when(organisationRepositoryMock.count()).thenReturn(result);
-        assertEquals(result, organisationService.count());
-    }
-
-    @Test
-    public void getPagedCountriesTest() {
-        List<Organisation> result = new ArrayList<>();
-        Organisation organisation = GetRandomOrganisation();
-        result.add(organisation);
-        when(pageMock.getContent()).thenReturn(result);
-        when(organisationRepositoryMock.findAll(any(Pageable.class))).thenReturn(pageMock);
-        assertEquals(result, organisationService.getPagedOrganisations(0));
-    }
-
-
-}

src/test/java/scot/carricksoftware/grants/validators/places/OrganisationCommandValidatorImplTest.java

@@ -1,86 +0,0 @@
-/*
- * Copyright (c) Andrew Grant of Carrick Software 19/03/2025, 11:41. All rights reserved.
- *
- */
-
-package scot.carricksoftware.grants.validators.places;
-
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.ExtendWith;
-import org.mockito.ArgumentCaptor;
-import org.mockito.Mock;
-import org.mockito.junit.jupiter.MockitoExtension;
-import org.springframework.validation.BindingResult;
-import scot.carricksoftware.grants.commands.places.organisations.OrganisationCommand;
-import scot.carricksoftware.grants.commands.places.organisations.OrganisationCommandImpl;
-import scot.carricksoftware.grants.constants.ApplicationConstants;
-import scot.carricksoftware.grants.constants.ValidationConstants;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNull;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.verifyNoInteractions;
-
-@ExtendWith(MockitoExtension.class)
-class OrganisationCommandValidatorImplTest {
-
-    private OrganisationCommandValidator validator;
-
-    private OrganisationCommand organisationCommand;
-
-    @Mock
-    private BindingResult bindingResultMock;
-
-    @BeforeEach
-    void setUp() {
-        validator = new OrganisationCommandValidator();
-        organisationCommand = new OrganisationCommandImpl();
-    }
-
-    @Test
-    public void minimumSizeIsAllowedTest() {
-        String repeated = new String(new char[ApplicationConstants.MINIMUM_NAME_LENGTH]).replace("\0", "x");
-        organisationCommand.setName(repeated);
-        validator.validate(organisationCommand, bindingResultMock);
-        verifyNoInteractions(bindingResultMock);
-    }
-
-    @Test
-    public void maximumSizeIsAllowedTest() {
-        String repeated = new String(new char[ApplicationConstants.MAXIMUM_NAME_LENGTH]).replace("\0", "x");
-        organisationCommand.setName(repeated);
-        validator.validate(organisationCommand, bindingResultMock);
-        verifyNoInteractions(bindingResultMock);
-    }
-
-    @Test
-    public void greaterThanMaximumSizeIsRejectedTest() {
-        ArgumentCaptor<String> stringArgumentCaptor = ArgumentCaptor.forClass(String.class);
-        ArgumentCaptor<Object[]> objectArgumentCaptor = ArgumentCaptor.forClass(Object[].class);
-
-        String repeated = new String(new char[ApplicationConstants.MAXIMUM_NAME_LENGTH + 1]).replace("\0", "x");
-        organisationCommand.setName(repeated);
-        validator.validate(organisationCommand, bindingResultMock);
-        verify(bindingResultMock).rejectValue(stringArgumentCaptor.capture(), stringArgumentCaptor.capture(), objectArgumentCaptor.capture(), stringArgumentCaptor.capture());
-        assertEquals("name", stringArgumentCaptor.getAllValues().get(0));
-        assertEquals(ApplicationConstants.EMPTY_STRING, stringArgumentCaptor.getAllValues().get(1));
-        assertEquals(ValidationConstants.NAME_IS_TOO_LONG, stringArgumentCaptor.getAllValues().get(2));
-        assertNull(objectArgumentCaptor.getAllValues().get(0));
-    }
-
-    @Test
-    public void smallerThanMinimumSizeIsRejectedTest() {
-        ArgumentCaptor<String> stringArgumentCaptor = ArgumentCaptor.forClass(String.class);
-        ArgumentCaptor<Object[]> objectArgumentCaptor = ArgumentCaptor.forClass(Object[].class);
-
-        String repeated = new String(new char[ApplicationConstants.MINIMUM_NAME_LENGTH - 1]).replace("\0", "x");
-        organisationCommand.setName(repeated);
-        validator.validate(organisationCommand, bindingResultMock);
-        verify(bindingResultMock).rejectValue(stringArgumentCaptor.capture(), stringArgumentCaptor.capture(), objectArgumentCaptor.capture(), stringArgumentCaptor.capture());
-        assertEquals("name", stringArgumentCaptor.getAllValues().get(0));
-        assertEquals(ApplicationConstants.EMPTY_STRING, stringArgumentCaptor.getAllValues().get(1));
-        assertEquals(ValidationConstants.NAME_IS_TOO_SHORT, stringArgumentCaptor.getAllValues().get(2));
-        assertNull(objectArgumentCaptor.getAllValues().get(0));
-    }
-}