From baa814412625a04f54b13241ce3dfad25f8481d1 Mon Sep 17 00:00:00 2001 From: Maria Martinez Date: Tue, 3 Dec 2024 14:16:53 -0800 Subject: [PATCH] SonaCloud fixes --- .../controller/client/ClientController.java | 32 +++++++++---------- .../service/client/ClientLegacyService.java | 18 +++++------ .../ClientDistrictServiceIntegrationTest.java | 2 +- .../client/ClientServiceIntegrationTest.java | 2 +- 4 files changed, 27 insertions(+), 27 deletions(-) diff --git a/backend/src/main/java/ca/bc/gov/app/controller/client/ClientController.java b/backend/src/main/java/ca/bc/gov/app/controller/client/ClientController.java index 1112a09bf9..7d52528488 100644 --- a/backend/src/main/java/ca/bc/gov/app/controller/client/ClientController.java +++ b/backend/src/main/java/ca/bc/gov/app/controller/client/ClientController.java @@ -117,23 +117,23 @@ public Flux fullSearch( return clientLegacyService .search(page, size, keyword) .doOnNext(pair -> { - Long count = pair.getSecond(); + Long count = pair.getSecond(); - serverResponse - .getHeaders() - .putIfAbsent( - ApplicationConstant.X_TOTAL_COUNT, - List.of(count.toString()) - ); + serverResponse + .getHeaders() + .putIfAbsent( + ApplicationConstant.X_TOTAL_COUNT, + List.of(count.toString()) + ); }) .map(Pair::getFirst) .doFinally(signalType -> - serverResponse - .getHeaders() - .putIfAbsent( - ApplicationConstant.X_TOTAL_COUNT, - List.of("0") - ) + serverResponse + .getHeaders() + .putIfAbsent( + ApplicationConstant.X_TOTAL_COUNT, + List.of("0") + ) ); } @@ -154,12 +154,12 @@ public Flux findByClientName(@PathVariable String name) { /** * Finds a client based on their registration number. * - * This endpoint retrieves client information by searching for a registration number. + *

This endpoint retrieves client information by searching for a registration number. * If no client is found, an error is returned. * * @param registrationNumber the registration number of the client to look up * @return a {@link Mono} emitting the {@link ClientLookUpDto} if found, or an error - * if no data exists + * if no data exists */ @GetMapping(value = "/incorporation/{registrationNumber}") public Mono findByRegistrationNumber( @@ -175,7 +175,7 @@ public Mono findByRegistrationNumber( /** * Searches for an individual client by user ID and last name. * - * This endpoint fetches an individual client using their user ID and last name. + *

This endpoint fetches an individual client using their user ID and last name. * The request is validated against existing records in the system. * * @param userId the unique identifier of the individual to search for diff --git a/backend/src/main/java/ca/bc/gov/app/service/client/ClientLegacyService.java b/backend/src/main/java/ca/bc/gov/app/service/client/ClientLegacyService.java index 19e9398d10..cb9de4a2cb 100644 --- a/backend/src/main/java/ca/bc/gov/app/service/client/ClientLegacyService.java +++ b/backend/src/main/java/ca/bc/gov/app/service/client/ClientLegacyService.java @@ -22,15 +22,15 @@ import reactor.core.publisher.Mono; /** - * This class is responsible for interacting with the legacy API to fetch client data. It uses the - * WebClient to send HTTP requests to the legacy API and converts the responses into Flux of - * ForestClientDto objects. It provides several methods to search for clients in the legacy system - * using different search criteria. - *

- * It is annotated with @Slf4j for logging, @Service to indicate that it's a Spring service bean, - * and @Observed for metrics. - *

- * Each method logs the search parameters and the results for debugging purposes. + * This class is responsible for interacting with the legacy API to fetch client data. + * It uses the WebClient to send HTTP requests to the legacy API and converts the responses + * into Flux of ForestClientDto objects. It provides several methods to search for clients + * in the legacy system using different search criteria. + * + *

It is annotated with @Slf4j for logging, @Service to indicate that it's a + * Spring service bean, and @Observed for metrics. + * + *

Each method logs the search parameters and the results for debugging purposes. */ @Slf4j @Service diff --git a/backend/src/test/java/ca/bc/gov/app/service/client/ClientDistrictServiceIntegrationTest.java b/backend/src/test/java/ca/bc/gov/app/service/client/ClientDistrictServiceIntegrationTest.java index a39f17f6e1..99c14a7c7c 100644 --- a/backend/src/test/java/ca/bc/gov/app/service/client/ClientDistrictServiceIntegrationTest.java +++ b/backend/src/test/java/ca/bc/gov/app/service/client/ClientDistrictServiceIntegrationTest.java @@ -10,7 +10,7 @@ @Slf4j @DisplayName("Integrated Test | FSA Client District Service") -public class ClientDistrictServiceIntegrationTest extends AbstractTestContainerIntegrationTest { +class ClientDistrictServiceIntegrationTest extends AbstractTestContainerIntegrationTest { @Autowired private ClientDistrictService service; diff --git a/backend/src/test/java/ca/bc/gov/app/service/client/ClientServiceIntegrationTest.java b/backend/src/test/java/ca/bc/gov/app/service/client/ClientServiceIntegrationTest.java index 0804376172..779d4f1b75 100644 --- a/backend/src/test/java/ca/bc/gov/app/service/client/ClientServiceIntegrationTest.java +++ b/backend/src/test/java/ca/bc/gov/app/service/client/ClientServiceIntegrationTest.java @@ -25,7 +25,7 @@ import reactor.test.StepVerifier; @DisplayName("Integrated Test | Client Service") -public class ClientServiceIntegrationTest extends AbstractTestContainerIntegrationTest { +class ClientServiceIntegrationTest extends AbstractTestContainerIntegrationTest { @Autowired private ClientService service;