Merge pull request #39 from companieshouse/tferns-IDVA6-1361-fix-sonar

IDVA6-1361: Refactor and clean up code across multiple files

src/main/java/uk/gov/companieshouse/acsp/manage/users/controller/AcspMembershipsController.java

@@ -8,11 +8,9 @@
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Controller;
 import uk.gov.companieshouse.acsp.manage.users.exceptions.BadRequestRuntimeException;
-import uk.gov.companieshouse.acsp.manage.users.model.AcspDataDao;
 import uk.gov.companieshouse.acsp.manage.users.service.AcspDataService;
 import uk.gov.companieshouse.acsp.manage.users.service.AcspMembersService;
 import uk.gov.companieshouse.acsp.manage.users.utils.PaginationValidatorUtil;
-import uk.gov.companieshouse.acsp.manage.users.utils.PaginationValidatorUtil.PaginationParams;
 import uk.gov.companieshouse.acsp.manage.users.utils.StaticPropertyUtil;
 import uk.gov.companieshouse.api.acsp_manage_users.api.AcspMembershipsInterface;
 import uk.gov.companieshouse.api.acsp_manage_users.model.AcspMembership;
@@ -86,11 +84,11 @@ public ResponseEntity<AcspMembershipsList> getMembersForAcsp(
       throw new BadRequestRuntimeException(PLEASE_CHECK_THE_REQUEST_AND_TRY_AGAIN);
     }
 
-    final PaginationParams paginationParams =
+    final var paginationParams =
         PaginationValidatorUtil.validateAndGetParams(pageIndex, itemsPerPage);
 
     // This will probably be replaced by the ACSP Data Sync API once available.
-    final AcspDataDao acspDataDao = acspDataService.fetchAcspData(acspNumber);
+    final var acspDataDao = acspDataService.fetchAcspData(acspNumber);
 
     final var acspMembershipsList =
         acspMembersService.findAllByAcspNumberAndRole(

src/main/java/uk/gov/companieshouse/acsp/manage/users/service/AcspMembersService.java

@@ -9,17 +9,15 @@
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import uk.gov.companieshouse.acsp.manage.users.mapper.AcspMembershipListMapper;
-import org.springframework.transaction.annotation.Transactional;
-import uk.gov.companieshouse.acsp.manage.users.mapper.AcspMembershipListMapper;
 import uk.gov.companieshouse.acsp.manage.users.mapper.AcspMembershipMapper;
 import uk.gov.companieshouse.acsp.manage.users.mapper.AcspMembershipsListMapper;
 import uk.gov.companieshouse.acsp.manage.users.model.AcspDataDao;
 import uk.gov.companieshouse.acsp.manage.users.model.AcspMembersDao;
 import uk.gov.companieshouse.acsp.manage.users.repositories.AcspMembersRepository;
 import uk.gov.companieshouse.acsp.manage.users.utils.StaticPropertyUtil;
 import uk.gov.companieshouse.api.accounts.user.model.User;
-import uk.gov.companieshouse.api.acsp_manage_users.model.AcspMembershipsList;
 import uk.gov.companieshouse.api.acsp_manage_users.model.AcspMembership;
+import uk.gov.companieshouse.api.acsp_manage_users.model.AcspMembershipsList;
 import uk.gov.companieshouse.logging.Logger;
 import uk.gov.companieshouse.logging.LoggerFactory;
 

src/main/java/uk/gov/companieshouse/acsp/manage/users/utils/PaginationValidatorUtil.java

@@ -11,6 +11,10 @@ public class PaginationValidatorUtil {
   private static final int DEFAULT_PAGE_INDEX = 0;
   private static final int DEFAULT_ITEMS_PER_PAGE = 15;
 
+  private PaginationValidatorUtil() {
+    // private instructor to hide the implicit public one
+  }
+
   public static class PaginationParams {
     public final int pageIndex;
     public final int itemsPerPage;

src/test/java/uk/gov/companieshouse/acsp/manage/users/configuration/ApiClientConfigTest.java

@@ -6,7 +6,7 @@
 import uk.gov.companieshouse.api.InternalApiClient;
 
 @Tag("unit-test")
-public class ApiClientConfigTest {
+class ApiClientConfigTest {
 
     @Test
     void internalApiClientIsCorrectType(){