diff --git a/src/main/java/uk/gov/companieshouse/confirmationstatementapi/configuration/ConfirmationStatementServiceEligibilityConfig.java b/src/main/java/uk/gov/companieshouse/confirmationstatementapi/configuration/ConfirmationStatementServiceEligibilityConfig.java index 52c3413b..c8c7f852 100644 --- a/src/main/java/uk/gov/companieshouse/confirmationstatementapi/configuration/ConfirmationStatementServiceEligibilityConfig.java +++ b/src/main/java/uk/gov/companieshouse/confirmationstatementapi/configuration/ConfirmationStatementServiceEligibilityConfig.java @@ -1,9 +1,13 @@ package uk.gov.companieshouse.confirmationstatementapi.configuration; -import org.springframework.beans.factory.annotation.Qualifier; +import java.util.ArrayList; +import java.util.List; +import java.util.Set; + import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; + import uk.gov.companieshouse.api.model.company.CompanyProfileApi; import uk.gov.companieshouse.confirmationstatementapi.eligibility.EligibilityRule; import uk.gov.companieshouse.confirmationstatementapi.eligibility.impl.CompanyOfficerValidation; @@ -19,10 +23,6 @@ import uk.gov.companieshouse.confirmationstatementapi.service.PscService; import uk.gov.companieshouse.confirmationstatementapi.service.ShareholderService; -import java.util.ArrayList; -import java.util.List; -import java.util.Set; - @Configuration public class ConfirmationStatementServiceEligibilityConfig { @@ -51,7 +51,6 @@ public class ConfirmationStatementServiceEligibilityConfig { private boolean multipleOfficerJourneyFeatureFlag; @Bean - @Qualifier("confirmation-statement-eligibility-rules") List> confirmationStatementEligibilityRules(OfficerService officerService, PscService pscService, CorporateBodyService corporateBodyService, ShareholderService shareholderService) { var listOfRules = new ArrayList>(); @@ -83,5 +82,5 @@ List> confirmationStatementEligibilityRules(O listOfRules.add(companyTradedStatusValidation); return listOfRules; - } + } } diff --git a/src/main/java/uk/gov/companieshouse/confirmationstatementapi/configuration/InterceptorConfig.java b/src/main/java/uk/gov/companieshouse/confirmationstatementapi/configuration/InterceptorConfig.java index 29c752cd..3da0c0a2 100644 --- a/src/main/java/uk/gov/companieshouse/confirmationstatementapi/configuration/InterceptorConfig.java +++ b/src/main/java/uk/gov/companieshouse/confirmationstatementapi/configuration/InterceptorConfig.java @@ -40,34 +40,43 @@ public class InterceptorConfig implements WebMvcConfigurer { PRIVATE, COSTS }; - static final String[] NOT_COMPANY_AUTH_ENDPOINTS = (String[]) ArrayUtils.addAll( + static final String[] NOT_COMPANY_AUTH_ENDPOINTS = ArrayUtils.addAll( USER_AUTH_ENDPOINTS, INTERNAL_AUTH_ENDPOINTS ); - @Autowired - private CompanyNumberValidationInterceptor companyNumberValidationInterceptor; + private final CompanyNumberValidationInterceptor companyNumberValidationInterceptor; - @Autowired - private TransactionIdValidationInterceptor transactionIdValidationInterceptor; + private final TransactionIdValidationInterceptor transactionIdValidationInterceptor; - @Autowired - private TransactionInterceptor transactionInterceptor; + private final TransactionInterceptor transactionInterceptor; - @Autowired - private LoggingInterceptor loggingInterceptor; + private final LoggingInterceptor loggingInterceptor; - @Autowired - private FilingInterceptor filingInterceptor; + private final FilingInterceptor filingInterceptor; - @Autowired - private InternalUserInterceptor internalUserInterceptor; + private final InternalUserInterceptor internalUserInterceptor; - @Autowired - private SubmissionIdValidationInterceptor submissionIdValidationInterceptor; + private final SubmissionIdValidationInterceptor submissionIdValidationInterceptor; + + private final SubmissionInterceptor submissionInterceptor; @Autowired - private SubmissionInterceptor submissionInterceptor; + public InterceptorConfig(CompanyNumberValidationInterceptor companyNumberValidationInterceptor, + TransactionIdValidationInterceptor transactionIdValidationInterceptor, TransactionInterceptor transactionInterceptor, + LoggingInterceptor loggingInterceptor, FilingInterceptor filingInterceptor, + InternalUserInterceptor internalUserInterceptor, SubmissionIdValidationInterceptor submissionIdValidationInterceptor, + SubmissionInterceptor submissionInterceptor) { + super(); + this.companyNumberValidationInterceptor = companyNumberValidationInterceptor; + this.transactionIdValidationInterceptor = transactionIdValidationInterceptor; + this.transactionInterceptor = transactionInterceptor; + this.loggingInterceptor = loggingInterceptor; + this.filingInterceptor = filingInterceptor; + this.internalUserInterceptor = internalUserInterceptor; + this.submissionIdValidationInterceptor = submissionIdValidationInterceptor; + this.submissionInterceptor = submissionInterceptor; + } /** * Setup the interceptors to run against endpoints when the endpoints are called diff --git a/src/main/java/uk/gov/companieshouse/confirmationstatementapi/controller/EligibilityController.java b/src/main/java/uk/gov/companieshouse/confirmationstatementapi/controller/EligibilityController.java index 666932d0..bba4c173 100644 --- a/src/main/java/uk/gov/companieshouse/confirmationstatementapi/controller/EligibilityController.java +++ b/src/main/java/uk/gov/companieshouse/confirmationstatementapi/controller/EligibilityController.java @@ -1,5 +1,9 @@ package uk.gov.companieshouse.confirmationstatementapi.controller; +import static uk.gov.companieshouse.confirmationstatementapi.utils.Constants.ERIC_REQUEST_ID_KEY; + +import java.util.HashMap; + import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; @@ -7,6 +11,7 @@ import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestHeader; import org.springframework.web.bind.annotation.RestController; + import uk.gov.companieshouse.confirmationstatementapi.eligibility.EligibilityStatusCode; import uk.gov.companieshouse.confirmationstatementapi.exception.CompanyNotFoundException; import uk.gov.companieshouse.confirmationstatementapi.model.response.CompanyValidationResponse; @@ -14,18 +19,19 @@ import uk.gov.companieshouse.confirmationstatementapi.service.EligibilityService; import uk.gov.companieshouse.confirmationstatementapi.utils.ApiLogger; -import java.util.HashMap; - -import static uk.gov.companieshouse.confirmationstatementapi.utils.Constants.ERIC_REQUEST_ID_KEY; - @RestController public class EligibilityController { - @Autowired - private CompanyProfileService companyProfileService; + private final CompanyProfileService companyProfileService; + + private final EligibilityService eligibilityService; @Autowired - private EligibilityService eligibilityService; + public EligibilityController(CompanyProfileService companyProfileService, EligibilityService eligibilityService) { + super(); + this.companyProfileService = companyProfileService; + this.eligibilityService = eligibilityService; + } @GetMapping("/confirmation-statement/company/{company-number}/eligibility") public ResponseEntity getEligibility(@PathVariable("company-number") String companyNumber, diff --git a/src/main/java/uk/gov/companieshouse/confirmationstatementapi/controller/FilingController.java b/src/main/java/uk/gov/companieshouse/confirmationstatementapi/controller/FilingController.java index 31fd2c5a..8be7874d 100644 --- a/src/main/java/uk/gov/companieshouse/confirmationstatementapi/controller/FilingController.java +++ b/src/main/java/uk/gov/companieshouse/confirmationstatementapi/controller/FilingController.java @@ -1,5 +1,11 @@ package uk.gov.companieshouse.confirmationstatementapi.controller; +import static uk.gov.companieshouse.confirmationstatementapi.utils.Constants.CONFIRMATION_STATEMENT_ID_KEY; +import static uk.gov.companieshouse.confirmationstatementapi.utils.Constants.ERIC_REQUEST_ID_KEY; +import static uk.gov.companieshouse.confirmationstatementapi.utils.Constants.TRANSACTION_ID_KEY; + +import java.util.HashMap; + import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.GetMapping; @@ -8,24 +14,24 @@ import org.springframework.web.bind.annotation.RequestHeader; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; + import uk.gov.companieshouse.api.model.filinggenerator.FilingApi; import uk.gov.companieshouse.api.model.transaction.Transaction; import uk.gov.companieshouse.confirmationstatementapi.exception.SubmissionNotFoundException; import uk.gov.companieshouse.confirmationstatementapi.service.FilingService; import uk.gov.companieshouse.confirmationstatementapi.utils.ApiLogger; -import java.util.HashMap; - -import static uk.gov.companieshouse.confirmationstatementapi.utils.Constants.CONFIRMATION_STATEMENT_ID_KEY; -import static uk.gov.companieshouse.confirmationstatementapi.utils.Constants.ERIC_REQUEST_ID_KEY; -import static uk.gov.companieshouse.confirmationstatementapi.utils.Constants.TRANSACTION_ID_KEY; - @RestController @RequestMapping("/private/transactions/{transaction_id}/confirmation-statement/{confirmation_statement_id}/filings") public class FilingController { + private final FilingService filingService; + @Autowired - private FilingService filingService; + public FilingController(FilingService filingService) { + super(); + this.filingService = filingService; + } @GetMapping public ResponseEntity getFiling( diff --git a/src/main/java/uk/gov/companieshouse/confirmationstatementapi/controller/NextMadeUpToDateController.java b/src/main/java/uk/gov/companieshouse/confirmationstatementapi/controller/NextMadeUpToDateController.java index 6289d956..92c7a534 100644 --- a/src/main/java/uk/gov/companieshouse/confirmationstatementapi/controller/NextMadeUpToDateController.java +++ b/src/main/java/uk/gov/companieshouse/confirmationstatementapi/controller/NextMadeUpToDateController.java @@ -1,25 +1,31 @@ package uk.gov.companieshouse.confirmationstatementapi.controller; +import static uk.gov.companieshouse.confirmationstatementapi.utils.Constants.ERIC_REQUEST_ID_KEY; + +import java.util.HashMap; + import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestHeader; import org.springframework.web.bind.annotation.RestController; + import uk.gov.companieshouse.confirmationstatementapi.exception.CompanyNotFoundException; import uk.gov.companieshouse.confirmationstatementapi.model.json.NextMadeUpToDateJson; import uk.gov.companieshouse.confirmationstatementapi.service.ConfirmationStatementService; import uk.gov.companieshouse.confirmationstatementapi.utils.ApiLogger; -import java.util.HashMap; - -import static uk.gov.companieshouse.confirmationstatementapi.utils.Constants.ERIC_REQUEST_ID_KEY; - @RestController public class NextMadeUpToDateController { + private final ConfirmationStatementService confirmationStatementService; + @Autowired - private ConfirmationStatementService confirmationStatementService; + public NextMadeUpToDateController(ConfirmationStatementService confirmationStatementService) { + super(); + this.confirmationStatementService = confirmationStatementService; + } @GetMapping("/confirmation-statement/company/{company-number}/next-made-up-to-date") public ResponseEntity getNextMadeUpToDate( diff --git a/src/main/java/uk/gov/companieshouse/confirmationstatementapi/controller/PersonsOfSignificantControlController.java b/src/main/java/uk/gov/companieshouse/confirmationstatementapi/controller/PersonsOfSignificantControlController.java index eceaf7c3..fe0a253a 100644 --- a/src/main/java/uk/gov/companieshouse/confirmationstatementapi/controller/PersonsOfSignificantControlController.java +++ b/src/main/java/uk/gov/companieshouse/confirmationstatementapi/controller/PersonsOfSignificantControlController.java @@ -18,18 +18,25 @@ import java.util.List; import static uk.gov.companieshouse.confirmationstatementapi.utils.Constants.ERIC_REQUEST_ID_KEY; +import static uk.gov.companieshouse.confirmationstatementapi.utils.Constants.CONFIRMATION_STATEMENT_ID_KEY; import static uk.gov.companieshouse.confirmationstatementapi.utils.Constants.TRANSACTION_ID_KEY; @RestController class PersonsOfSignificantControlController { + private final PscService pscService; + @Autowired - private PscService pscService; + public PersonsOfSignificantControlController(PscService pscService) { + super(); + this.pscService = pscService; + } @GetMapping("/transactions/{transaction_id}/confirmation-statement/{confirmation_statement_id}/persons-of-significant-control") public ResponseEntity> getPersonsOfSignificantControl( @RequestAttribute("transaction") Transaction transaction, @PathVariable(TRANSACTION_ID_KEY) String transactionId, + @PathVariable(CONFIRMATION_STATEMENT_ID_KEY) String confirmationStatementId, @RequestHeader(value = ERIC_REQUEST_ID_KEY) String requestId) { var logMap = new HashMap(); diff --git a/src/main/java/uk/gov/companieshouse/confirmationstatementapi/controller/RegisterLocationsController.java b/src/main/java/uk/gov/companieshouse/confirmationstatementapi/controller/RegisterLocationsController.java index 7d77fe42..c3d164e6 100644 --- a/src/main/java/uk/gov/companieshouse/confirmationstatementapi/controller/RegisterLocationsController.java +++ b/src/main/java/uk/gov/companieshouse/confirmationstatementapi/controller/RegisterLocationsController.java @@ -18,6 +18,7 @@ import java.util.List; import static uk.gov.companieshouse.confirmationstatementapi.utils.Constants.ERIC_REQUEST_ID_KEY; +import static uk.gov.companieshouse.confirmationstatementapi.utils.Constants.CONFIRMATION_STATEMENT_ID_KEY; import static uk.gov.companieshouse.confirmationstatementapi.utils.Constants.TRANSACTION_ID_KEY; @RestController @@ -34,6 +35,7 @@ public RegisterLocationsController(RegisterLocationService regLocService) { public ResponseEntity> getRegisterLocations( @RequestAttribute("transaction") Transaction transaction, @PathVariable(TRANSACTION_ID_KEY) String transactionId, + @PathVariable(CONFIRMATION_STATEMENT_ID_KEY) String confirmationStatementId, @RequestHeader(value = ERIC_REQUEST_ID_KEY) String requestId) { var logMap = new HashMap(); diff --git a/src/main/java/uk/gov/companieshouse/confirmationstatementapi/controller/ShareholderController.java b/src/main/java/uk/gov/companieshouse/confirmationstatementapi/controller/ShareholderController.java index d616beff..fc391d9d 100644 --- a/src/main/java/uk/gov/companieshouse/confirmationstatementapi/controller/ShareholderController.java +++ b/src/main/java/uk/gov/companieshouse/confirmationstatementapi/controller/ShareholderController.java @@ -18,6 +18,7 @@ import java.util.HashMap; import java.util.List; +import static uk.gov.companieshouse.confirmationstatementapi.utils.Constants.CONFIRMATION_STATEMENT_ID_KEY; import static uk.gov.companieshouse.confirmationstatementapi.utils.Constants.ERIC_REQUEST_ID_KEY; import static uk.gov.companieshouse.confirmationstatementapi.utils.Constants.TRANSACTION_ID_KEY; @@ -35,6 +36,7 @@ public ShareholderController(ShareholderService shareholderService) { public ResponseEntity> getShareholders( @RequestAttribute("transaction") Transaction transaction, @PathVariable(TRANSACTION_ID_KEY) String transactionId, + @PathVariable(CONFIRMATION_STATEMENT_ID_KEY) String confirmationStatementId, @RequestHeader(value = ERIC_REQUEST_ID_KEY) String requestId) { var map = new HashMap(); diff --git a/src/main/java/uk/gov/companieshouse/confirmationstatementapi/controller/StatementOfCapitalController.java b/src/main/java/uk/gov/companieshouse/confirmationstatementapi/controller/StatementOfCapitalController.java index 328b3734..9af64afd 100644 --- a/src/main/java/uk/gov/companieshouse/confirmationstatementapi/controller/StatementOfCapitalController.java +++ b/src/main/java/uk/gov/companieshouse/confirmationstatementapi/controller/StatementOfCapitalController.java @@ -18,6 +18,7 @@ import java.util.HashMap; +import static uk.gov.companieshouse.confirmationstatementapi.utils.Constants.CONFIRMATION_STATEMENT_ID_KEY; import static uk.gov.companieshouse.confirmationstatementapi.utils.Constants.ERIC_REQUEST_ID_KEY; import static uk.gov.companieshouse.confirmationstatementapi.utils.Constants.TRANSACTION_ID_KEY; @@ -35,6 +36,7 @@ public StatementOfCapitalController(StatementOfCapitalService statementOfCapital public ResponseEntity getStatementOfCapital( @RequestAttribute("transaction") Transaction transaction, @PathVariable(TRANSACTION_ID_KEY) String transactionId, + @PathVariable(CONFIRMATION_STATEMENT_ID_KEY) String confirmationStatementId, @RequestHeader(value = ERIC_REQUEST_ID_KEY) String requestId) { var logMap = new HashMap(); diff --git a/src/main/java/uk/gov/companieshouse/confirmationstatementapi/interceptor/SubmissionInterceptor.java b/src/main/java/uk/gov/companieshouse/confirmationstatementapi/interceptor/SubmissionInterceptor.java index bb9802a8..b35c9fd6 100644 --- a/src/main/java/uk/gov/companieshouse/confirmationstatementapi/interceptor/SubmissionInterceptor.java +++ b/src/main/java/uk/gov/companieshouse/confirmationstatementapi/interceptor/SubmissionInterceptor.java @@ -34,6 +34,7 @@ public SubmissionInterceptor(ConfirmationStatementService confirmationStatementS @Override public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) { + @SuppressWarnings("unchecked") final Map pathVariables = (Map) request .getAttribute(HandlerMapping.URI_TEMPLATE_VARIABLES_ATTRIBUTE); final var submissionId = pathVariables.get(CONFIRMATION_STATEMENT_ID_KEY); diff --git a/src/main/java/uk/gov/companieshouse/confirmationstatementapi/interceptor/TransactionInterceptor.java b/src/main/java/uk/gov/companieshouse/confirmationstatementapi/interceptor/TransactionInterceptor.java index de4d0e83..e874bd5d 100644 --- a/src/main/java/uk/gov/companieshouse/confirmationstatementapi/interceptor/TransactionInterceptor.java +++ b/src/main/java/uk/gov/companieshouse/confirmationstatementapi/interceptor/TransactionInterceptor.java @@ -29,6 +29,7 @@ public TransactionInterceptor(TransactionService transactionService) { @Override public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) { + @SuppressWarnings("unchecked") final Map pathVariables = (Map) request .getAttribute(HandlerMapping.URI_TEMPLATE_VARIABLES_ATTRIBUTE); final var transactionId = pathVariables.get(TRANSACTION_ID_KEY); diff --git a/src/main/java/uk/gov/companieshouse/confirmationstatementapi/interceptor/validation/CompanyNumberValidationInterceptor.java b/src/main/java/uk/gov/companieshouse/confirmationstatementapi/interceptor/validation/CompanyNumberValidationInterceptor.java index 20d1ed77..4e7e2f1b 100644 --- a/src/main/java/uk/gov/companieshouse/confirmationstatementapi/interceptor/validation/CompanyNumberValidationInterceptor.java +++ b/src/main/java/uk/gov/companieshouse/confirmationstatementapi/interceptor/validation/CompanyNumberValidationInterceptor.java @@ -27,6 +27,7 @@ public class CompanyNumberValidationInterceptor implements HandlerInterceptor { @Override public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) { + @SuppressWarnings("unchecked") final Map pathVariables = (Map) request .getAttribute(HandlerMapping.URI_TEMPLATE_VARIABLES_ATTRIBUTE); String companyNumber = pathVariables.get(COMPANY_NUMBER); diff --git a/src/main/java/uk/gov/companieshouse/confirmationstatementapi/interceptor/validation/SubmissionIdValidationInterceptor.java b/src/main/java/uk/gov/companieshouse/confirmationstatementapi/interceptor/validation/SubmissionIdValidationInterceptor.java index 7a87ac2d..dea985fd 100644 --- a/src/main/java/uk/gov/companieshouse/confirmationstatementapi/interceptor/validation/SubmissionIdValidationInterceptor.java +++ b/src/main/java/uk/gov/companieshouse/confirmationstatementapi/interceptor/validation/SubmissionIdValidationInterceptor.java @@ -27,6 +27,7 @@ public class SubmissionIdValidationInterceptor implements HandlerInterceptor { @Override public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) { + @SuppressWarnings("unchecked") final Map pathVariables = (Map) request .getAttribute(HandlerMapping.URI_TEMPLATE_VARIABLES_ATTRIBUTE); final var submissionId = pathVariables.get(CONFIRMATION_STATEMENT_ID_KEY); diff --git a/src/main/java/uk/gov/companieshouse/confirmationstatementapi/interceptor/validation/TransactionIdValidationInterceptor.java b/src/main/java/uk/gov/companieshouse/confirmationstatementapi/interceptor/validation/TransactionIdValidationInterceptor.java index e00b276b..7d8d149a 100644 --- a/src/main/java/uk/gov/companieshouse/confirmationstatementapi/interceptor/validation/TransactionIdValidationInterceptor.java +++ b/src/main/java/uk/gov/companieshouse/confirmationstatementapi/interceptor/validation/TransactionIdValidationInterceptor.java @@ -23,6 +23,7 @@ public class TransactionIdValidationInterceptor implements HandlerInterceptor { @Override public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) { + @SuppressWarnings("unchecked") final Map pathVariables = (Map) request .getAttribute(HandlerMapping.URI_TEMPLATE_VARIABLES_ATTRIBUTE); final var transactionId = pathVariables.get(TRANSACTION_ID_KEY); diff --git a/src/main/java/uk/gov/companieshouse/confirmationstatementapi/model/mapping/PscsMapper.java b/src/main/java/uk/gov/companieshouse/confirmationstatementapi/model/mapping/PscsMapper.java index dc51bdde..cac5d696 100644 --- a/src/main/java/uk/gov/companieshouse/confirmationstatementapi/model/mapping/PscsMapper.java +++ b/src/main/java/uk/gov/companieshouse/confirmationstatementapi/model/mapping/PscsMapper.java @@ -1,19 +1,19 @@ package uk.gov.companieshouse.confirmationstatementapi.model.mapping; +import java.sql.Timestamp; +import java.time.format.DateTimeFormatter; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; + import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Component; + import uk.gov.companieshouse.api.model.common.DateOfBirth; import uk.gov.companieshouse.api.model.company.PersonOfSignificantControl; import uk.gov.companieshouse.api.model.psc.NameElementsApi; import uk.gov.companieshouse.confirmationstatementapi.model.json.PersonOfSignificantControlJson; -import java.sql.Timestamp; -import java.time.format.DateTimeFormatter; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; -import java.util.stream.Collectors; - @Component public class PscsMapper { @@ -25,7 +25,7 @@ public List mapToPscsApi(List { if (StringUtils.isNotBlank(name)) { - if (fullName.length() > 0) { + if (!fullName.isEmpty()) { fullName.append(" "); } fullName.append(name); diff --git a/src/main/java/uk/gov/companieshouse/confirmationstatementapi/service/EligibilityService.java b/src/main/java/uk/gov/companieshouse/confirmationstatementapi/service/EligibilityService.java index 4e511d30..ed017c36 100644 --- a/src/main/java/uk/gov/companieshouse/confirmationstatementapi/service/EligibilityService.java +++ b/src/main/java/uk/gov/companieshouse/confirmationstatementapi/service/EligibilityService.java @@ -1,8 +1,10 @@ package uk.gov.companieshouse.confirmationstatementapi.service; +import java.util.List; + import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.stereotype.Service; + import uk.gov.companieshouse.api.model.company.CompanyProfileApi; import uk.gov.companieshouse.confirmationstatementapi.eligibility.EligibilityRule; import uk.gov.companieshouse.confirmationstatementapi.eligibility.EligibilityStatusCode; @@ -11,16 +13,13 @@ import uk.gov.companieshouse.confirmationstatementapi.model.response.CompanyValidationResponse; import uk.gov.companieshouse.confirmationstatementapi.utils.ApiLogger; -import java.util.List; - @Service public class EligibilityService { private final List> eligibilityRules; @Autowired - public EligibilityService(@Qualifier("confirmation-statement-eligibility-rules") - List> eligibilityRules){ + public EligibilityService(List> eligibilityRules){ this.eligibilityRules = eligibilityRules; } diff --git a/src/main/java/uk/gov/companieshouse/confirmationstatementapi/service/StatementOfCapitalService.java b/src/main/java/uk/gov/companieshouse/confirmationstatementapi/service/StatementOfCapitalService.java index 65e9bcb6..b09b53a3 100644 --- a/src/main/java/uk/gov/companieshouse/confirmationstatementapi/service/StatementOfCapitalService.java +++ b/src/main/java/uk/gov/companieshouse/confirmationstatementapi/service/StatementOfCapitalService.java @@ -11,8 +11,13 @@ @Service public class StatementOfCapitalService { + private final OracleQueryClient oracleQueryClient; + @Autowired - private OracleQueryClient oracleQueryClient; + public StatementOfCapitalService(OracleQueryClient oracleQueryClient) { + super(); + this.oracleQueryClient = oracleQueryClient; + } public StatementOfCapitalJson getStatementOfCapital(String companyNumber) throws ServiceException, StatementOfCapitalNotFoundException { return oracleQueryClient.getStatementOfCapitalData(companyNumber); diff --git a/src/test/java/uk/gov/companieshouse/confirmationstatementapi/configuration/InterceptorConfigRouteMatchingTest.java b/src/test/java/uk/gov/companieshouse/confirmationstatementapi/configuration/InterceptorConfigRouteMatchingTest.java index 64e511d8..1b0ac49a 100644 --- a/src/test/java/uk/gov/companieshouse/confirmationstatementapi/configuration/InterceptorConfigRouteMatchingTest.java +++ b/src/test/java/uk/gov/companieshouse/confirmationstatementapi/configuration/InterceptorConfigRouteMatchingTest.java @@ -35,23 +35,23 @@ class InterceptorConfigRouteMatchingTest { @Test void interceptorsMatchIntendedRoutesTest() throws Exception { Map> testCases = new HashMap<>(); - Set COMPANY_NUMBER_INTERCEPTORS = Set.of("LoggingInterceptor", "CRUDAuthenticationInterceptor", "CompanyNumberValidationInterceptor"); - Set TRANSACTION_INTERCEPTORS = Set.of("LoggingInterceptor", "CRUDAuthenticationInterceptor", "TransactionInterceptor", "TransactionIdValidationInterceptor"); - Set CS_ID_INTERCEPTORS = Set.of("LoggingInterceptor", "CRUDAuthenticationInterceptor", "TransactionInterceptor", "TransactionIdValidationInterceptor", "SubmissionInterceptor", "SubmissionIdValidationInterceptor"); + Set companyNumberInterceptors = Set.of("LoggingInterceptor", "CRUDAuthenticationInterceptor", "CompanyNumberValidationInterceptor"); + Set transactionInterceptors = Set.of("LoggingInterceptor", "CRUDAuthenticationInterceptor", "TransactionInterceptor", "TransactionIdValidationInterceptor"); + Set csIdInterceptors = Set.of("LoggingInterceptor", "CRUDAuthenticationInterceptor", "TransactionInterceptor", "TransactionIdValidationInterceptor", "SubmissionInterceptor", "SubmissionIdValidationInterceptor"); // company number - testCases.put("/confirmation-statement/company/12345/eligibility", COMPANY_NUMBER_INTERCEPTORS); - testCases.put("/confirmation-statement/company/12345/next-made-up-to-date", COMPANY_NUMBER_INTERCEPTORS); + testCases.put("/confirmation-statement/company/12345/eligibility", companyNumberInterceptors); + testCases.put("/confirmation-statement/company/12345/next-made-up-to-date", companyNumberInterceptors); // txn id - testCases.put("/transactions/12345/confirmation-statement/", TRANSACTION_INTERCEPTORS); // note trailing slash required + testCases.put("/transactions/12345/confirmation-statement/", transactionInterceptors); // note trailing slash required // txn id + cs id - testCases.put("/transactions/12345/confirmation-statement/12345", CS_ID_INTERCEPTORS); - testCases.put("/transactions/12345/confirmation-statement/12345/validation-status", CS_ID_INTERCEPTORS); - testCases.put("/transactions/12345/confirmation-statement/12345/statement-of-capital", CS_ID_INTERCEPTORS); - testCases.put("/transactions/12345/confirmation-statement/12345/active-director-details", CS_ID_INTERCEPTORS); - testCases.put("/transactions/12345/confirmation-statement/12345/persons-of-significant-control", CS_ID_INTERCEPTORS); - testCases.put("/transactions/12345/confirmation-statement/12345/shareholders", CS_ID_INTERCEPTORS); - testCases.put("/transactions/12345/confirmation-statement/12345/register-locations", CS_ID_INTERCEPTORS); + testCases.put("/transactions/12345/confirmation-statement/12345", csIdInterceptors); + testCases.put("/transactions/12345/confirmation-statement/12345/validation-status", csIdInterceptors); + testCases.put("/transactions/12345/confirmation-statement/12345/statement-of-capital", csIdInterceptors); + testCases.put("/transactions/12345/confirmation-statement/12345/active-director-details", csIdInterceptors); + testCases.put("/transactions/12345/confirmation-statement/12345/persons-of-significant-control", csIdInterceptors); + testCases.put("/transactions/12345/confirmation-statement/12345/shareholders", csIdInterceptors); + testCases.put("/transactions/12345/confirmation-statement/12345/register-locations", csIdInterceptors); // internal endpoints testCases.put("/private/transactions/12345/confirmation-statement/12345/filings", Set.of("LoggingInterceptor", "InternalUserInterceptor", "TransactionInterceptor", "FilingInterceptor")); testCases.put("/transactions/12345/confirmation-statement/12345/costs", Set.of("LoggingInterceptor", "InternalUserInterceptor", "TransactionInterceptor", "TransactionIdValidationInterceptor", "SubmissionInterceptor", "SubmissionIdValidationInterceptor")); diff --git a/src/test/java/uk/gov/companieshouse/confirmationstatementapi/configuration/InterceptorConfigTest.java b/src/test/java/uk/gov/companieshouse/confirmationstatementapi/configuration/InterceptorConfigTest.java index f93e67ca..c316d6d3 100644 --- a/src/test/java/uk/gov/companieshouse/confirmationstatementapi/configuration/InterceptorConfigTest.java +++ b/src/test/java/uk/gov/companieshouse/confirmationstatementapi/configuration/InterceptorConfigTest.java @@ -60,7 +60,7 @@ class InterceptorConfigTest { private CRUDAuthenticationInterceptor crudAuthenticationInterceptor; @InjectMocks - private InterceptorConfig interceptorConfig = new InterceptorConfig(); + private InterceptorConfig interceptorConfig; @Test void addInterceptorsTest() { diff --git a/src/test/java/uk/gov/companieshouse/confirmationstatementapi/controller/EligibilityControllerTest.java b/src/test/java/uk/gov/companieshouse/confirmationstatementapi/controller/EligibilityControllerTest.java index 0dd40a4a..2ade8bfb 100644 --- a/src/test/java/uk/gov/companieshouse/confirmationstatementapi/controller/EligibilityControllerTest.java +++ b/src/test/java/uk/gov/companieshouse/confirmationstatementapi/controller/EligibilityControllerTest.java @@ -42,7 +42,7 @@ void testSuccessfulGetEligibility() throws ServiceException, CompanyNotFoundExce companyValidationResponse.setEligibilityStatusCode(EligibilityStatusCode.COMPANY_VALID_FOR_SERVICE); when(eligibilityService.checkCompanyEligibility(companyProfileApi)).thenReturn(companyValidationResponse); ResponseEntity response = eligibilityController.getEligibility(COMPANY_NUMBER, ERIC_REQUEST_ID); - assertEquals(200, response.getStatusCodeValue()); + assertEquals(200, response.getStatusCode().value()); } @Test @@ -54,28 +54,28 @@ void testNotEligibleGetEligibility() throws ServiceException, CompanyNotFoundExc companyValidationResponse.setEligibilityStatusCode(EligibilityStatusCode.INVALID_COMPANY_STATUS); when(eligibilityService.checkCompanyEligibility(companyProfileApi)).thenReturn(companyValidationResponse); ResponseEntity response = eligibilityController.getEligibility(COMPANY_NUMBER, ERIC_REQUEST_ID); - assertEquals(200, response.getStatusCodeValue()); + assertEquals(200, response.getStatusCode().value()); } @Test void testServiceExceptionGetEligibility() throws ServiceException, CompanyNotFoundException { when(companyProfileService.getCompanyProfile(COMPANY_NUMBER)).thenThrow(new ServiceException("", new Exception())); ResponseEntity response = eligibilityController.getEligibility(COMPANY_NUMBER, ERIC_REQUEST_ID); - assertEquals(500, response.getStatusCodeValue()); + assertEquals(500, response.getStatusCode().value()); } @Test void testUncheckedExceptionGetEligibility() throws ServiceException, CompanyNotFoundException { when(companyProfileService.getCompanyProfile(COMPANY_NUMBER)).thenThrow(new RuntimeException("runtime exception")); ResponseEntity response = eligibilityController.getEligibility(COMPANY_NUMBER, ERIC_REQUEST_ID); - assertEquals(500, response.getStatusCodeValue()); + assertEquals(500, response.getStatusCode().value()); } @Test void testCompanyNotFound() throws ServiceException, CompanyNotFoundException { when(companyProfileService.getCompanyProfile(COMPANY_NUMBER)).thenThrow(new CompanyNotFoundException()); ResponseEntity response = eligibilityController.getEligibility(COMPANY_NUMBER, ERIC_REQUEST_ID); - assertEquals(404, response.getStatusCodeValue()); + assertEquals(404, response.getStatusCode().value()); assertNotNull(response.getBody()); assertEquals(EligibilityStatusCode.COMPANY_NOT_FOUND, response.getBody().getEligibilityStatusCode()); } diff --git a/src/test/java/uk/gov/companieshouse/confirmationstatementapi/controller/OfficerControllerTest.java b/src/test/java/uk/gov/companieshouse/confirmationstatementapi/controller/OfficerControllerTest.java index 91ea9f03..ea5f3160 100644 --- a/src/test/java/uk/gov/companieshouse/confirmationstatementapi/controller/OfficerControllerTest.java +++ b/src/test/java/uk/gov/companieshouse/confirmationstatementapi/controller/OfficerControllerTest.java @@ -1,22 +1,22 @@ package uk.gov.companieshouse.confirmationstatementapi.controller; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.mockito.Mockito.when; + +import java.util.Arrays; + import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.InjectMocks; import org.mockito.Mock; import org.mockito.junit.jupiter.MockitoExtension; import org.springframework.http.HttpStatus; + +import uk.gov.companieshouse.api.model.company.ActiveOfficerDetailsJson; import uk.gov.companieshouse.api.model.transaction.Transaction; -import uk.gov.companieshouse.confirmationstatementapi.exception.ActiveOfficerNotFoundException; import uk.gov.companieshouse.confirmationstatementapi.exception.ServiceException; -import uk.gov.companieshouse.api.model.company.ActiveOfficerDetailsJson; import uk.gov.companieshouse.confirmationstatementapi.service.OfficerService; -import java.util.Arrays; - -import static org.junit.jupiter.api.Assertions.*; -import static org.mockito.Mockito.when; - @ExtendWith(MockitoExtension.class) class OfficerControllerTest { @@ -34,14 +34,14 @@ class OfficerControllerTest { private static final String CONFIRMATION_STATEMENT_ID = "abc123"; @Test - void testGetActiveOfficerDetails() throws ActiveOfficerNotFoundException, ServiceException { + void testGetActiveOfficerDetails() throws ServiceException { when(officerService.getActiveOfficerDetails(transaction.getCompanyNumber())).thenReturn(new ActiveOfficerDetailsJson()); var response = officerController.getActiveOfficersDetails(transaction, TRANSACTION_ID, CONFIRMATION_STATEMENT_ID, ERIC_REQUEST_ID); assertEquals(HttpStatus.OK, response.getStatusCode()); } @Test - void testGetActiveOfficerDetailsServiceException() throws ActiveOfficerNotFoundException, ServiceException { + void testGetActiveOfficerDetailsServiceException() throws ServiceException { when(officerService.getActiveOfficerDetails(transaction.getCompanyNumber())).thenThrow(ServiceException.class); var response = officerController.getActiveOfficersDetails(transaction, TRANSACTION_ID, CONFIRMATION_STATEMENT_ID, ERIC_REQUEST_ID); assertEquals(HttpStatus.INTERNAL_SERVER_ERROR, response.getStatusCode()); @@ -62,10 +62,4 @@ void testGetListActiveOfficersDetailsServiceException() throws ServiceException assertEquals(HttpStatus.INTERNAL_SERVER_ERROR, response.getStatusCode()); } - @Test - void testGetListActiveOfficersDetailsOfficerNotFoundException() throws ServiceException { - when(officerService.getListActiveOfficersDetails(transaction.getCompanyNumber())).thenThrow(ServiceException.class); - var response = officerController.getListActiveOfficersDetails(transaction, TRANSACTION_ID, CONFIRMATION_STATEMENT_ID, ERIC_REQUEST_ID); - assertEquals(HttpStatus.INTERNAL_SERVER_ERROR, response.getStatusCode()); - } } \ No newline at end of file diff --git a/src/test/java/uk/gov/companieshouse/confirmationstatementapi/controller/PersonOfSignificantControlJsonControllerTest.java b/src/test/java/uk/gov/companieshouse/confirmationstatementapi/controller/PersonOfSignificantControlJsonControllerTest.java index bf313c1c..db6d20f2 100644 --- a/src/test/java/uk/gov/companieshouse/confirmationstatementapi/controller/PersonOfSignificantControlJsonControllerTest.java +++ b/src/test/java/uk/gov/companieshouse/confirmationstatementapi/controller/PersonOfSignificantControlJsonControllerTest.java @@ -22,6 +22,7 @@ class PersonOfSignificantControlJsonControllerTest { private static final String TRANSACTION_ID = "GFEDCBA"; + private static final String CONFIRMATION_STATEMENT_ID = "ignored"; private static final String ERIC_REQUEST_ID = "XaBcDeF12345"; @Mock @@ -37,7 +38,7 @@ class PersonOfSignificantControlJsonControllerTest { void testGetPersonsOfSignificantControlOKResponse() throws ServiceException { var pscs = Arrays.asList(new PersonOfSignificantControlJson(), new PersonOfSignificantControlJson()); when(pscService.getPSCsFromOracle(transaction.getCompanyNumber())).thenReturn(pscs); - var response = personsOfSignificantControlController.getPersonsOfSignificantControl(transaction, TRANSACTION_ID, ERIC_REQUEST_ID); + var response = personsOfSignificantControlController.getPersonsOfSignificantControl(transaction, TRANSACTION_ID, CONFIRMATION_STATEMENT_ID, ERIC_REQUEST_ID); assertEquals(HttpStatus.OK, response.getStatusCode()); assertEquals(pscs, response.getBody()); @@ -48,7 +49,7 @@ void testGetPersonsOfSignificantControlUnsafeCompNumber() throws ServiceExceptio when(transaction.getCompanyNumber()).thenReturn("\n\r\t12345678"); var pscs = Arrays.asList(new PersonOfSignificantControlJson(), new PersonOfSignificantControlJson()); when(pscService.getPSCsFromOracle("___12345678")).thenReturn(pscs); - var response = personsOfSignificantControlController.getPersonsOfSignificantControl(transaction, TRANSACTION_ID, ERIC_REQUEST_ID); + var response = personsOfSignificantControlController.getPersonsOfSignificantControl(transaction, TRANSACTION_ID, CONFIRMATION_STATEMENT_ID, ERIC_REQUEST_ID); assertEquals(HttpStatus.OK, response.getStatusCode()); assertEquals(pscs, response.getBody()); @@ -57,7 +58,7 @@ void testGetPersonsOfSignificantControlUnsafeCompNumber() throws ServiceExceptio @Test void testGetPersonsOfSignificantControlServiceException() throws ServiceException { when(pscService.getPSCsFromOracle(transaction.getCompanyNumber())).thenThrow(new ServiceException("Message")); - var response = personsOfSignificantControlController.getPersonsOfSignificantControl(transaction, TRANSACTION_ID, ERIC_REQUEST_ID); + var response = personsOfSignificantControlController.getPersonsOfSignificantControl(transaction, TRANSACTION_ID, CONFIRMATION_STATEMENT_ID, ERIC_REQUEST_ID); assertEquals(HttpStatus.INTERNAL_SERVER_ERROR, response.getStatusCode()); } @@ -66,7 +67,7 @@ void testGetPersonsOfSignificantControlServiceException() throws ServiceExceptio void testGetPersonsOfSignificantControlUncheckedException() throws ServiceException { var runtimeException = new RuntimeException("Message"); when(pscService.getPSCsFromOracle(transaction.getCompanyNumber())).thenThrow(runtimeException); - var thrown = assertThrows(Exception.class, () -> personsOfSignificantControlController.getPersonsOfSignificantControl(transaction, TRANSACTION_ID, ERIC_REQUEST_ID)); + var thrown = assertThrows(Exception.class, () -> personsOfSignificantControlController.getPersonsOfSignificantControl(transaction, TRANSACTION_ID, CONFIRMATION_STATEMENT_ID, ERIC_REQUEST_ID)); assertEquals(runtimeException, thrown); } diff --git a/src/test/java/uk/gov/companieshouse/confirmationstatementapi/controller/RegisterLocationsControllerTest.java b/src/test/java/uk/gov/companieshouse/confirmationstatementapi/controller/RegisterLocationsControllerTest.java index 8a52e37e..86e2cf31 100644 --- a/src/test/java/uk/gov/companieshouse/confirmationstatementapi/controller/RegisterLocationsControllerTest.java +++ b/src/test/java/uk/gov/companieshouse/confirmationstatementapi/controller/RegisterLocationsControllerTest.java @@ -21,6 +21,7 @@ class RegisterLocationsControllerTest { private static final String TRANSACTION_ID = "GFEDCBA"; + private static final String CONFIRMATION_STATEMENT_ID = "ignored"; private static final String ERIC_REQUEST_ID = "XaBcDeF12345"; @Mock @@ -36,7 +37,7 @@ class RegisterLocationsControllerTest { void testGetRegisterLocationsOKResponse() throws ServiceException { var registerLocations = Arrays.asList(new RegisterLocationJson(), new RegisterLocationJson()); when(regLocService.getRegisterLocations(transaction.getCompanyNumber())).thenReturn(registerLocations); - var response = regLocController.getRegisterLocations(transaction, TRANSACTION_ID, ERIC_REQUEST_ID); + var response = regLocController.getRegisterLocations(transaction, TRANSACTION_ID, CONFIRMATION_STATEMENT_ID, ERIC_REQUEST_ID); assertEquals(HttpStatus.OK, response.getStatusCode()); assertEquals(registerLocations, response.getBody()); @@ -45,7 +46,7 @@ void testGetRegisterLocationsOKResponse() throws ServiceException { @Test void testGetRegisterLocationsServiceException() throws ServiceException { when(regLocService.getRegisterLocations(transaction.getCompanyNumber())).thenThrow(new ServiceException("Internal Server Error")); - var response = regLocController.getRegisterLocations(transaction, TRANSACTION_ID, ERIC_REQUEST_ID); + var response = regLocController.getRegisterLocations(transaction, TRANSACTION_ID, CONFIRMATION_STATEMENT_ID, ERIC_REQUEST_ID); assertEquals(HttpStatus.INTERNAL_SERVER_ERROR, response.getStatusCode()); } @@ -54,7 +55,7 @@ void testGetRegisterLocationsServiceException() throws ServiceException { void testGetRegisterLocationsUncheckedException() throws ServiceException { var runtimeException = new RuntimeException("Runtime Error"); when(regLocService.getRegisterLocations(transaction.getCompanyNumber())).thenThrow(runtimeException); - var thrown = assertThrows(Exception.class, () -> regLocController.getRegisterLocations(transaction, TRANSACTION_ID, ERIC_REQUEST_ID)); + var thrown = assertThrows(Exception.class, () -> regLocController.getRegisterLocations(transaction, TRANSACTION_ID, CONFIRMATION_STATEMENT_ID, ERIC_REQUEST_ID)); assertEquals(runtimeException, thrown); } diff --git a/src/test/java/uk/gov/companieshouse/confirmationstatementapi/controller/ShareholderJsonControllerTest.java b/src/test/java/uk/gov/companieshouse/confirmationstatementapi/controller/ShareholderJsonControllerTest.java index 4393e2a1..853fc06f 100644 --- a/src/test/java/uk/gov/companieshouse/confirmationstatementapi/controller/ShareholderJsonControllerTest.java +++ b/src/test/java/uk/gov/companieshouse/confirmationstatementapi/controller/ShareholderJsonControllerTest.java @@ -22,6 +22,7 @@ class ShareholderJsonControllerTest { private static final String ERIC_REQUEST_ID = "XaBcDeF12345"; + private static final String CONFIRMATION_STATEMENT_ID = "ignored"; private static final String TRANSACTION_ID = "GFEDCBA"; @Mock @@ -37,7 +38,7 @@ class ShareholderJsonControllerTest { void testGetShareholderOKResponse() throws ServiceException { var shareholder = Arrays.asList(new ShareholderJson(), new ShareholderJson()); when(shareholderService.getShareholders(transaction.getCompanyNumber())).thenReturn(shareholder); - var response = shareholderController.getShareholders(transaction, TRANSACTION_ID, ERIC_REQUEST_ID); + var response = shareholderController.getShareholders(transaction, TRANSACTION_ID, CONFIRMATION_STATEMENT_ID, ERIC_REQUEST_ID); assertEquals(HttpStatus.OK, response.getStatusCode()); assertEquals(shareholder, response.getBody()); @@ -46,7 +47,7 @@ void testGetShareholderOKResponse() throws ServiceException { @Test void testGetShareholderServiceException() throws ServiceException { when(shareholderService.getShareholders(transaction.getCompanyNumber())).thenThrow(new ServiceException("Internal Server Error")); - var response = shareholderController.getShareholders(transaction, TRANSACTION_ID, ERIC_REQUEST_ID); + var response = shareholderController.getShareholders(transaction, TRANSACTION_ID, CONFIRMATION_STATEMENT_ID, ERIC_REQUEST_ID); assertEquals(HttpStatus.INTERNAL_SERVER_ERROR, response.getStatusCode()); } @@ -55,7 +56,7 @@ void testGetShareholderServiceException() throws ServiceException { void testGetShareholderUncheckedException() throws ServiceException { var runtimeException = new RuntimeException("Runtime Error"); when(shareholderService.getShareholders(transaction.getCompanyNumber())).thenThrow(runtimeException); - var thrown = assertThrows(Exception.class, () -> shareholderController.getShareholders(transaction, TRANSACTION_ID, ERIC_REQUEST_ID)); + var thrown = assertThrows(Exception.class, () -> shareholderController.getShareholders(transaction, TRANSACTION_ID, CONFIRMATION_STATEMENT_ID, ERIC_REQUEST_ID)); assertEquals(runtimeException, thrown); } diff --git a/src/test/java/uk/gov/companieshouse/confirmationstatementapi/controller/StatementOfCapitalJsonControllerTest.java b/src/test/java/uk/gov/companieshouse/confirmationstatementapi/controller/StatementOfCapitalJsonControllerTest.java index d9091a81..601392a9 100644 --- a/src/test/java/uk/gov/companieshouse/confirmationstatementapi/controller/StatementOfCapitalJsonControllerTest.java +++ b/src/test/java/uk/gov/companieshouse/confirmationstatementapi/controller/StatementOfCapitalJsonControllerTest.java @@ -29,26 +29,27 @@ class StatementOfCapitalJsonControllerTest { private StatementOfCapitalController statementOfCapitalController; private static final String TRANSACTION_ID = "GFEDCBA"; + private static final String CONFIRMATION_STATEMENT_ID = "ignored"; private static final String ERIC_REQUEST_ID = "XaBcDeF12345"; @Test void getStatementOfCapital() throws ServiceException, StatementOfCapitalNotFoundException { when(statementOfCapitalService.getStatementOfCapital(transaction.getCompanyNumber())).thenReturn(new StatementOfCapitalJson()); - var response = statementOfCapitalController.getStatementOfCapital(transaction, TRANSACTION_ID, ERIC_REQUEST_ID); + var response = statementOfCapitalController.getStatementOfCapital(transaction, TRANSACTION_ID, CONFIRMATION_STATEMENT_ID, ERIC_REQUEST_ID); assertEquals(HttpStatus.OK, response.getStatusCode()); } @Test void getStatementOfCapitalServiceException() throws ServiceException, StatementOfCapitalNotFoundException { when(statementOfCapitalService.getStatementOfCapital(transaction.getCompanyNumber())).thenThrow(ServiceException.class); - var response = statementOfCapitalController.getStatementOfCapital(transaction, TRANSACTION_ID, ERIC_REQUEST_ID); + var response = statementOfCapitalController.getStatementOfCapital(transaction, TRANSACTION_ID, CONFIRMATION_STATEMENT_ID, ERIC_REQUEST_ID); assertEquals(HttpStatus.INTERNAL_SERVER_ERROR, response.getStatusCode()); } @Test void getStatementOfCapitalStatementOfCapitalNotFoundException() throws ServiceException, StatementOfCapitalNotFoundException { when(statementOfCapitalService.getStatementOfCapital(transaction.getCompanyNumber())).thenThrow(StatementOfCapitalNotFoundException.class); - var response = statementOfCapitalController.getStatementOfCapital(transaction, TRANSACTION_ID, ERIC_REQUEST_ID); + var response = statementOfCapitalController.getStatementOfCapital(transaction, TRANSACTION_ID, CONFIRMATION_STATEMENT_ID, ERIC_REQUEST_ID); assertEquals(HttpStatus.NOT_FOUND, response.getStatusCode()); } diff --git a/src/test/java/uk/gov/companieshouse/confirmationstatementapi/eligibility/impl/CompanyOfficerValidationTest.java b/src/test/java/uk/gov/companieshouse/confirmationstatementapi/eligibility/impl/CompanyOfficerValidationTest.java index cc4701a6..0d3f8742 100644 --- a/src/test/java/uk/gov/companieshouse/confirmationstatementapi/eligibility/impl/CompanyOfficerValidationTest.java +++ b/src/test/java/uk/gov/companieshouse/confirmationstatementapi/eligibility/impl/CompanyOfficerValidationTest.java @@ -42,9 +42,9 @@ class CompanyOfficerValidationTest { @BeforeEach void init() { OFFICER_LIST.clear(); - CompanyOfficerApi MOCK_OFFICER = new CompanyOfficerApi(); - MOCK_OFFICER.setOfficerRole(OfficerRoleApi.DIRECTOR); - OFFICER_LIST.add(MOCK_OFFICER); + CompanyOfficerApi mockOfficer = new CompanyOfficerApi(); + mockOfficer.setOfficerRole(OfficerRoleApi.DIRECTOR); + OFFICER_LIST.add(mockOfficer); companyProfileApi.setCompanyNumber(COMPANY_NUMBER); } @@ -63,9 +63,9 @@ void validateDoesNotThrowExceptionOnSingleOfficerCompanyWithDirectorWithMultiple void validateThrowsExceptionOnSingleOfficerCompanyWithSecretaryWithMultipleOfficerJourneyFlagOff() throws ServiceException { companyOfficerValidation = new CompanyOfficerValidation(officerService,false); OFFICER_LIST.clear(); - CompanyOfficerApi MOCK_OFFICER = new CompanyOfficerApi(); - MOCK_OFFICER.setOfficerRole(OfficerRoleApi.SECRETARY); - OFFICER_LIST.add(MOCK_OFFICER); + CompanyOfficerApi mockOfficer = new CompanyOfficerApi(); + mockOfficer.setOfficerRole(OfficerRoleApi.SECRETARY); + OFFICER_LIST.add(mockOfficer); mockOfficers.setItems(OFFICER_LIST); mockOfficers.setActiveCount((long) OFFICER_LIST.size()); @@ -192,9 +192,9 @@ void isOfficerDirectorReturnsTrueForCompanyWithTwoDirectorsOneRetired() { void isOfficerDirectorReturnsFalseForCompanyWithOneSecretary() { companyOfficerValidation = new CompanyOfficerValidation(officerService,false); OFFICER_LIST.clear(); - CompanyOfficerApi MOCK_OFFICER = new CompanyOfficerApi(); - MOCK_OFFICER.setOfficerRole(OfficerRoleApi.SECRETARY); - OFFICER_LIST.add(MOCK_OFFICER); + CompanyOfficerApi mockOfficer = new CompanyOfficerApi(); + mockOfficer.setOfficerRole(OfficerRoleApi.SECRETARY); + OFFICER_LIST.add(mockOfficer); mockOfficers.setItems(OFFICER_LIST); mockOfficers.setActiveCount((long) OFFICER_LIST.size()); diff --git a/src/test/java/uk/gov/companieshouse/confirmationstatementapi/eligibility/impl/CompanyPscCountValidationTest.java b/src/test/java/uk/gov/companieshouse/confirmationstatementapi/eligibility/impl/CompanyPscCountValidationTest.java index e3302721..4e979001 100644 --- a/src/test/java/uk/gov/companieshouse/confirmationstatementapi/eligibility/impl/CompanyPscCountValidationTest.java +++ b/src/test/java/uk/gov/companieshouse/confirmationstatementapi/eligibility/impl/CompanyPscCountValidationTest.java @@ -39,10 +39,10 @@ void setUp() { @ParameterizedTest @ValueSource(longs = {0l, 1l}) - void validateDoesNotThrow(long PSCs) throws ServiceException { + void validateDoesNotThrow(long pscs) throws ServiceException { when(pscService.getPSCsFromCHS(any())).thenReturn(pscsApi); companyPscCountValidation = new CompanyPscCountValidation(pscService, true, false); - pscsApi.setActiveCount(PSCs); + pscsApi.setActiveCount(pscs); assertDoesNotThrow(() -> companyPscCountValidation.validate(companyProfileApi)); } diff --git a/src/test/java/uk/gov/companieshouse/confirmationstatementapi/eligibility/impl/CompanyShareholderCountValidationTest.java b/src/test/java/uk/gov/companieshouse/confirmationstatementapi/eligibility/impl/CompanyShareholderCountValidationTest.java index 117c6a93..00f21d6a 100644 --- a/src/test/java/uk/gov/companieshouse/confirmationstatementapi/eligibility/impl/CompanyShareholderCountValidationTest.java +++ b/src/test/java/uk/gov/companieshouse/confirmationstatementapi/eligibility/impl/CompanyShareholderCountValidationTest.java @@ -24,8 +24,8 @@ class CompanyShareholderCountValidationTest { private static final String COMPANY_NUMBER = "12345678"; - private static String LTD_BY_GUARANTEE = "test-private-limited-guarant-nsc"; - private static String NOT_LTD_BY_GUARANTEE = "test-not-limited-guarant-nsc"; + private static final String LTD_BY_GUARANTEE = "test-private-limited-guarant-nsc"; + private static final String NOT_LTD_BY_GUARANTEE = "test-not-limited-guarant-nsc"; private CompanyProfileApi profile; private CompanyShareholderCountValidation validation; diff --git a/src/test/java/uk/gov/companieshouse/confirmationstatementapi/eligibility/impl/CompanyTypeCS01FilingNotRequiredValidationTest.java b/src/test/java/uk/gov/companieshouse/confirmationstatementapi/eligibility/impl/CompanyTypeCS01FilingNotRequiredValidationTest.java index b0a56a75..90b140cf 100644 --- a/src/test/java/uk/gov/companieshouse/confirmationstatementapi/eligibility/impl/CompanyTypeCS01FilingNotRequiredValidationTest.java +++ b/src/test/java/uk/gov/companieshouse/confirmationstatementapi/eligibility/impl/CompanyTypeCS01FilingNotRequiredValidationTest.java @@ -45,7 +45,7 @@ void validateThrowsOnANotRequiredType() { } @Test - void validateDoesNotThrowOnNullType() throws EligibilityException { + void validateDoesNotThrowOnNullType() { CompanyProfileApi companyProfileApi = new CompanyProfileApi(); companyProfileApi.setType(null); diff --git a/src/test/java/uk/gov/companieshouse/confirmationstatementapi/interceptor/FilingInterceptorTest.java b/src/test/java/uk/gov/companieshouse/confirmationstatementapi/interceptor/FilingInterceptorTest.java index 0f1d32f2..13bcebf2 100644 --- a/src/test/java/uk/gov/companieshouse/confirmationstatementapi/interceptor/FilingInterceptorTest.java +++ b/src/test/java/uk/gov/companieshouse/confirmationstatementapi/interceptor/FilingInterceptorTest.java @@ -1,5 +1,11 @@ package uk.gov.companieshouse.confirmationstatementapi.interceptor; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.mockito.Mockito.when; + +import java.util.Collections; + import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; @@ -7,16 +13,10 @@ import org.mockito.Mock; import org.mockito.junit.jupiter.MockitoExtension; import org.springframework.mock.web.MockHttpServletResponse; -import uk.gov.companieshouse.api.model.transaction.Transaction; -import uk.gov.companieshouse.api.model.transaction.TransactionStatus; import jakarta.servlet.http.HttpServletRequest; -import java.io.IOException; -import java.util.Collections; - -import static org.junit.jupiter.api.Assertions.assertFalse; -import static org.junit.jupiter.api.Assertions.assertTrue; -import static org.mockito.Mockito.when; +import uk.gov.companieshouse.api.model.transaction.Transaction; +import uk.gov.companieshouse.api.model.transaction.TransactionStatus; @ExtendWith(MockitoExtension.class) class FilingInterceptorTest { @@ -39,7 +39,7 @@ void init() { } @Test - void preHandleClosed() throws IOException { + void preHandleClosed() { MockHttpServletResponse mockHttpServletResponse = new MockHttpServletResponse(); Object mockHandler = new Object(); @@ -49,7 +49,7 @@ void preHandleClosed() throws IOException { } @Test - void preHandleOpen() throws IOException { + void preHandleOpen() { MockHttpServletResponse mockHttpServletResponse = new MockHttpServletResponse(); Object mockHandler = new Object(); @@ -60,7 +60,7 @@ void preHandleOpen() throws IOException { } @Test - void preHandleNoTransaction() throws IOException { + void preHandleNoTransaction() { MockHttpServletResponse mockHttpServletResponse = new MockHttpServletResponse(); Object mockHandler = new Object(); diff --git a/src/test/java/uk/gov/companieshouse/confirmationstatementapi/interceptor/validation/CompanyNumberValidationInterceptorTest.java b/src/test/java/uk/gov/companieshouse/confirmationstatementapi/interceptor/validation/CompanyNumberValidationInterceptorTest.java index acd567fe..3f50c808 100644 --- a/src/test/java/uk/gov/companieshouse/confirmationstatementapi/interceptor/validation/CompanyNumberValidationInterceptorTest.java +++ b/src/test/java/uk/gov/companieshouse/confirmationstatementapi/interceptor/validation/CompanyNumberValidationInterceptorTest.java @@ -62,6 +62,10 @@ void preHandleTrueForValidStrings(String company) { @ParameterizedTest @MethodSource("invalidStrings") void preHandleTrueForInvalidStrings(String company) { + preHandleForInvalidStrings(company); + } + + private void preHandleForInvalidStrings(String company) { MockHttpServletResponse mockHttpServletResponse = new MockHttpServletResponse(); Object mockHandler = new Object(); @@ -75,14 +79,7 @@ void preHandleTrueForInvalidStrings(String company) { @ParameterizedTest @MethodSource("blankStrings") void preHandleFalseForBlankString(String company) { - MockHttpServletResponse mockHttpServletResponse = new MockHttpServletResponse(); - Object mockHandler = new Object(); - - var pathParams = new HashMap(); - pathParams.put(COMPANY_NUMBER, company); - when(mockHttpServletRequest.getAttribute(HandlerMapping.URI_TEMPLATE_VARIABLES_ATTRIBUTE)).thenReturn(pathParams); - - assertFalse(companyNumberValidationInterceptor.preHandle(mockHttpServletRequest, mockHttpServletResponse, mockHandler)); + preHandleForInvalidStrings(company); } } diff --git a/src/test/java/uk/gov/companieshouse/confirmationstatementapi/interceptor/validation/SubmissionIdValidationInterceptorTest.java b/src/test/java/uk/gov/companieshouse/confirmationstatementapi/interceptor/validation/SubmissionIdValidationInterceptorTest.java index 451deecc..c4d042da 100644 --- a/src/test/java/uk/gov/companieshouse/confirmationstatementapi/interceptor/validation/SubmissionIdValidationInterceptorTest.java +++ b/src/test/java/uk/gov/companieshouse/confirmationstatementapi/interceptor/validation/SubmissionIdValidationInterceptorTest.java @@ -43,7 +43,7 @@ void setEnvironment() { } @Test - void preHandleTrueForStringWithSpecialChars() throws Exception { + void preHandleTrueForStringWithSpecialChars() { MockHttpServletResponse mockHttpServletResponse = new MockHttpServletResponse(); Object mockHandler = new Object(); @@ -56,7 +56,7 @@ void preHandleTrueForStringWithSpecialChars() throws Exception { } @Test - void preHandleTrueForFiftyLengthString() throws Exception { + void preHandleTrueForFiftyLengthString() { MockHttpServletResponse mockHttpServletResponse = new MockHttpServletResponse(); Object mockHandler = new Object(); diff --git a/src/test/java/uk/gov/companieshouse/confirmationstatementapi/interceptor/validation/TransactionIdValidationInterceptorTest.java b/src/test/java/uk/gov/companieshouse/confirmationstatementapi/interceptor/validation/TransactionIdValidationInterceptorTest.java index 7a1685d5..2b30c582 100644 --- a/src/test/java/uk/gov/companieshouse/confirmationstatementapi/interceptor/validation/TransactionIdValidationInterceptorTest.java +++ b/src/test/java/uk/gov/companieshouse/confirmationstatementapi/interceptor/validation/TransactionIdValidationInterceptorTest.java @@ -41,7 +41,7 @@ void setEnvironment() { } @Test - void preHandleTrueForStringWithSpecialChars() throws Exception { + void preHandleTrueForStringWithSpecialChars() { MockHttpServletResponse mockHttpServletResponse = new MockHttpServletResponse(); Object mockHandler = new Object(); @@ -54,7 +54,7 @@ void preHandleTrueForStringWithSpecialChars() throws Exception { } @Test - void preHandleTrueForFiftyLengthString() throws Exception { + void preHandleTrueForFiftyLengthString() { MockHttpServletResponse mockHttpServletResponse = new MockHttpServletResponse(); Object mockHandler = new Object(); diff --git a/src/test/java/uk/gov/companieshouse/confirmationstatementapi/service/ConfirmationStatementServiceTest.java b/src/test/java/uk/gov/companieshouse/confirmationstatementapi/service/ConfirmationStatementServiceTest.java index 88f51bde..936be252 100644 --- a/src/test/java/uk/gov/companieshouse/confirmationstatementapi/service/ConfirmationStatementServiceTest.java +++ b/src/test/java/uk/gov/companieshouse/confirmationstatementapi/service/ConfirmationStatementServiceTest.java @@ -8,13 +8,12 @@ import static org.junit.jupiter.api.Assertions.assertThrows; import static org.junit.jupiter.api.Assertions.assertTrue; import static org.mockito.ArgumentMatchers.any; -import static org.mockito.Mockito.when; -import static org.mockito.Mockito.verify; import static org.mockito.Mockito.lenient; import static org.mockito.Mockito.times; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; import static uk.gov.companieshouse.confirmationstatementapi.utils.Constants.LIMITED_PARTNERSHIP_TYPE; - import java.time.LocalDate; import java.time.format.DateTimeFormatter; import java.util.HashMap; @@ -127,7 +126,6 @@ void init() { @Test void createConfirmationStatement() throws ServiceException, CompanyNotFoundException { ReflectionTestUtils.setField(confirmationStatementService, "isValidationStatusEnabled", true); - transaction = new Transaction(); transaction.setId("abc"); transaction.setCompanyNumber(COMPANY_NUMBER); CompanyProfileApi companyProfileApi = getTestCompanyProfileApi(); @@ -160,7 +158,6 @@ void createConfirmationStatement() throws ServiceException, CompanyNotFoundExcep @Test void createPayableResourceConfirmationStatement() throws ServiceException, CompanyNotFoundException { // GIVEN - transaction = new Transaction(); transaction.setId("abc"); transaction.setCompanyNumber(COMPANY_NUMBER); CompanyProfileApi companyProfileApi = getTestCompanyProfileApi(); @@ -201,7 +198,6 @@ void createPayableResourceConfirmationStatement() throws ServiceException, Compa void doesNotCheckPaymentWhenFeatureFlaggedOff() throws ServiceException, CompanyNotFoundException { // GIVEN ReflectionTestUtils.setField(confirmationStatementService, "isPaymentCheckFeatureEnabled", false); - transaction = new Transaction(); transaction.setId("abc"); transaction.setCompanyNumber(COMPANY_NUMBER); CompanyProfileApi companyProfileApi = getTestCompanyProfileApi(); @@ -229,7 +225,6 @@ void doesNotCheckPaymentWhenFeatureFlaggedOff() throws ServiceException, Company @Test void createConfirmationStatementFailingStatusValidation() throws ServiceException, CompanyNotFoundException { // GIVEN - transaction = new Transaction(); transaction.setCompanyNumber(COMPANY_NUMBER); CompanyProfileApi companyProfileApi = new CompanyProfileApi(); companyProfileApi.setCompanyStatus("FailureValue"); @@ -254,7 +249,6 @@ void createConfirmationStatementFailingStatusValidation() throws ServiceExceptio @Test void createConfirmationStatementExistingStatementError() throws ServiceException, CompanyNotFoundException { // GIVEN - transaction = new Transaction(); transaction.setCompanyNumber(COMPANY_NUMBER); transaction.setId("abc"); Resource resource = new Resource(); @@ -281,7 +275,6 @@ void createConfirmationStatementExistingStatementError() throws ServiceException @Test void createConfirmationStatementCompanyNotFound() throws ServiceException, CompanyNotFoundException { // GIVEN - transaction = new Transaction(); transaction.setCompanyNumber(COMPANY_NUMBER); when(companyProfileService.getCompanyProfile(COMPANY_NUMBER)).thenThrow(new CompanyNotFoundException()); diff --git a/src/test/java/uk/gov/companieshouse/confirmationstatementapi/service/OfficerServiceTest.java b/src/test/java/uk/gov/companieshouse/confirmationstatementapi/service/OfficerServiceTest.java index e188d2f7..762c40c1 100644 --- a/src/test/java/uk/gov/companieshouse/confirmationstatementapi/service/OfficerServiceTest.java +++ b/src/test/java/uk/gov/companieshouse/confirmationstatementapi/service/OfficerServiceTest.java @@ -1,36 +1,37 @@ package uk.gov.companieshouse.confirmationstatementapi.service; -import com.google.api.client.http.HttpHeaders; -import com.google.api.client.http.HttpResponseException; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.mockito.Mockito.when; + +import java.io.IOException; +import java.util.Arrays; +import java.util.List; + import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.InjectMocks; import org.mockito.Mock; import org.mockito.junit.jupiter.MockitoExtension; + +import com.google.api.client.http.HttpHeaders; +import com.google.api.client.http.HttpResponseException; + import uk.gov.companieshouse.api.ApiClient; import uk.gov.companieshouse.api.error.ApiErrorResponseException; import uk.gov.companieshouse.api.handler.exception.URIValidationException; import uk.gov.companieshouse.api.handler.officers.OfficersResourceHandler; import uk.gov.companieshouse.api.handler.officers.request.OfficersList; import uk.gov.companieshouse.api.model.ApiResponse; +import uk.gov.companieshouse.api.model.company.ActiveOfficerDetailsJson; import uk.gov.companieshouse.api.model.officers.OfficersApi; import uk.gov.companieshouse.confirmationstatementapi.client.ApiClientService; import uk.gov.companieshouse.confirmationstatementapi.client.OracleQueryClient; -import uk.gov.companieshouse.confirmationstatementapi.exception.ActiveOfficerNotFoundException; import uk.gov.companieshouse.confirmationstatementapi.exception.ServiceException; -import uk.gov.companieshouse.api.model.company.ActiveOfficerDetailsJson; import uk.gov.companieshouse.confirmationstatementapi.repository.ConfirmationStatementSubmissionsRepository; -import java.io.IOException; -import java.util.Arrays; -import java.util.List; - -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertNotNull; -import static org.junit.jupiter.api.Assertions.assertNull; -import static org.junit.jupiter.api.Assertions.assertThrows; -import static org.mockito.Mockito.when; - @ExtendWith(MockitoExtension.class) class OfficerServiceTest { @@ -118,7 +119,7 @@ void getOfficersProfileApiError404Response() throws IOException, URIValidationEx } @Test - void getActiveDirectorDetailsTest() throws ServiceException, ActiveOfficerNotFoundException { + void getActiveDirectorDetailsTest() throws ServiceException { ActiveOfficerDetailsJson details = new ActiveOfficerDetailsJson(); details.setForeName1("John"); details.setSurname("Doe"); diff --git a/src/test/java/uk/gov/companieshouse/confirmationstatementapi/utils/ApiLoggerTest.java b/src/test/java/uk/gov/companieshouse/confirmationstatementapi/utils/ApiLoggerTest.java index 4692ff54..c06623f4 100644 --- a/src/test/java/uk/gov/companieshouse/confirmationstatementapi/utils/ApiLoggerTest.java +++ b/src/test/java/uk/gov/companieshouse/confirmationstatementapi/utils/ApiLoggerTest.java @@ -1,15 +1,14 @@ package uk.gov.companieshouse.confirmationstatementapi.utils; -import org.junit.jupiter.api.BeforeEach; -import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.extension.ExtendWith; -import org.mockito.InjectMocks; -import org.mockito.junit.jupiter.MockitoExtension; +import static org.junit.jupiter.api.Assertions.assertEquals; import java.util.HashMap; import java.util.Map; -import static org.junit.jupiter.api.Assertions.assertEquals; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; +import org.mockito.junit.jupiter.MockitoExtension; @ExtendWith(MockitoExtension.class) class ApiLoggerTest { @@ -19,9 +18,6 @@ class ApiLoggerTest { private static final String LOG_MAP_KEY = "COMPANY_NUMBER"; private static final String LOG_MAP_VALUE = "00006400"; - @InjectMocks - private static ApiLogger apiLogger; - private Map logMap; @BeforeEach @@ -32,7 +28,7 @@ void setup() { @Test void testDebugContextLoggingDoesNotModifyLogMap() { - apiLogger.debugContext(CONTEXT, TEST_MESSAGE, logMap); + ApiLogger.debugContext(CONTEXT, TEST_MESSAGE, logMap); assertEquals(1, logMap.size()); assertEquals(LOG_MAP_VALUE, logMap.get(LOG_MAP_KEY)); @@ -40,7 +36,7 @@ void testDebugContextLoggingDoesNotModifyLogMap() { @Test void testInfoLoggingDoesNotModifyLogMap() { - apiLogger.info(TEST_MESSAGE, logMap); + ApiLogger.info(TEST_MESSAGE, logMap); assertEquals(1, logMap.size()); assertEquals(LOG_MAP_VALUE, logMap.get(LOG_MAP_KEY)); @@ -48,7 +44,7 @@ void testInfoLoggingDoesNotModifyLogMap() { @Test void testInfoContextLoggingDoesNotModifyLogMap() { - apiLogger.infoContext(CONTEXT, TEST_MESSAGE, logMap); + ApiLogger.infoContext(CONTEXT, TEST_MESSAGE, logMap); assertEquals(1, logMap.size()); assertEquals(LOG_MAP_VALUE, logMap.get(LOG_MAP_KEY)); @@ -56,7 +52,7 @@ void testInfoContextLoggingDoesNotModifyLogMap() { @Test void testErrorContextLoggingDoesNotModifyLogMap() { - apiLogger.errorContext(CONTEXT, TEST_MESSAGE, new Exception("TEST"), logMap); + ApiLogger.errorContext(CONTEXT, TEST_MESSAGE, new Exception("TEST"), logMap); assertEquals(1, logMap.size()); assertEquals(LOG_MAP_VALUE, logMap.get(LOG_MAP_KEY));