From cbf2a3d95aa0d52403929219f5b619297cd9b911 Mon Sep 17 00:00:00 2001 From: JamesCollettCGI Date: Thu, 15 Jan 2026 13:06:02 +0000 Subject: [PATCH 1/8] Empty commit From f8a5b7aa9723351d9f9d0decd39753a93b0b4552 Mon Sep 17 00:00:00 2001 From: JamesCollettCGI Date: Thu, 15 Jan 2026 15:12:11 +0000 Subject: [PATCH 2/8] Add logging to DefaultCaseDetailsRepository.java --- .../DefaultCaseDetailsRepository.java | 35 +++++++++--- .../ccd/domain/service/common/JcLogger.java | 57 +++++++++++++++++++ 2 files changed, 85 insertions(+), 7 deletions(-) create mode 100644 src/main/java/uk/gov/hmcts/ccd/domain/service/common/JcLogger.java diff --git a/src/main/java/uk/gov/hmcts/ccd/data/casedetails/DefaultCaseDetailsRepository.java b/src/main/java/uk/gov/hmcts/ccd/data/casedetails/DefaultCaseDetailsRepository.java index c4a436385d..29872d4244 100644 --- a/src/main/java/uk/gov/hmcts/ccd/data/casedetails/DefaultCaseDetailsRepository.java +++ b/src/main/java/uk/gov/hmcts/ccd/data/casedetails/DefaultCaseDetailsRepository.java @@ -13,6 +13,7 @@ import uk.gov.hmcts.ccd.data.casedetails.search.SearchQueryFactoryOperation; import uk.gov.hmcts.ccd.domain.model.migration.MigrationParameters; import uk.gov.hmcts.ccd.domain.model.definition.CaseDetails; +import uk.gov.hmcts.ccd.domain.service.common.JcLogger; import uk.gov.hmcts.ccd.endpoint.exceptions.CaseConcurrencyException; import uk.gov.hmcts.ccd.endpoint.exceptions.CasePersistenceException; import uk.gov.hmcts.ccd.endpoint.exceptions.ReferenceKeyUniqueConstraintException; @@ -44,6 +45,8 @@ public class DefaultCaseDetailsRepository implements CaseDetailsRepository { private static final Logger LOG = LoggerFactory.getLogger(DefaultCaseDetailsRepository.class); + private final JcLogger jclogger = new JcLogger("DefaultCaseDetailsRepository", true); + public static final String QUALIFIER = "default"; private static final String UNIQUE_REFERENCE_KEY_CONSTRAINT = "case_data_reference_key"; private final CaseDetailsMapper caseDetailsMapper; @@ -82,7 +85,7 @@ public CaseDetails set(final CaseDetails caseDetails) { another action happened at the same time. Please review the case and try again."""); } catch (PersistenceException e) { - if ((e instanceof ConstraintViolationException || e.getCause() instanceof ConstraintViolationException) + if ((e instanceof ConstraintViolationException || e.getCause() instanceof ConstraintViolationException) && isDuplicateReference(e)) { LOG.warn("ConstraintViolationException happen for UUID={}. ConstraintName: {}", caseDetails.getReference(), UNIQUE_REFERENCE_KEY_CONSTRAINT); @@ -157,15 +160,33 @@ public CaseDetails findUniqueCase(final String jurisdiction, return findByReference(jurisdiction, reference).orElse(null); } + /* + * QUESTION: How are metadata and dataSearchParams constructed in the scenario ? + */ @Override public List findByMetaDataAndFieldData(final MetaData metadata, final Map dataSearchParams) { - return getQuery(metadata, dataSearchParams, false) - .map(query -> { - paginate(query, metadata.getPage()); - return caseDetailsMapper.entityToModel((List) query.getResultList()); - }) - .orElse(Collections.emptyList()); + jclogger.jclog("findByMetaDataAndFieldData()", + "CALL STACK: " + jclogger.getCallStackAsString()); + jclogger.jclog("findByMetaDataAndFieldData()", + "MetaData: " + jclogger.printObjectToString(metadata)); + jclogger.jclog("findByMetaDataAndFieldData()", + "SearchParams: " + dataSearchParams.size()); + jclogger.jclog("findByMetaDataAndFieldData()", + "SearchParams: " + jclogger.printObjectToString(dataSearchParams)); + + Optional optionalQuery = getQuery(metadata, dataSearchParams, false); + if (optionalQuery.isPresent()) { + Query query = optionalQuery.get(); + paginate(query, metadata.getPage()); + List resultsList = (List) query.getResultList(); + + jclogger.jclog("findByMetaDataAndFieldData()", "ResultList.size: " + resultsList.size()); + + return caseDetailsMapper.entityToModel(resultsList); + } else { + return Collections.emptyList(); + } } @Override diff --git a/src/main/java/uk/gov/hmcts/ccd/domain/service/common/JcLogger.java b/src/main/java/uk/gov/hmcts/ccd/domain/service/common/JcLogger.java new file mode 100644 index 0000000000..270537549a --- /dev/null +++ b/src/main/java/uk/gov/hmcts/ccd/domain/service/common/JcLogger.java @@ -0,0 +1,57 @@ +package uk.gov.hmcts.ccd.domain.service.common; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import com.fasterxml.jackson.databind.ObjectMapper; +import uk.gov.hmcts.ccd.config.JacksonUtils; + +public class JcLogger { + + private static final Logger LOG = LoggerFactory.getLogger(JcLogger.class); + private static final ObjectMapper MAPPER = JacksonUtils.MAPPER; + + private final String className; + private final boolean logEnabled; + + public JcLogger(final String className, final boolean logEnabled) { + this.className = className; + this.logEnabled = logEnabled; + } + + /** + * Log message. + */ + public void jclog(final String method, final String message) { + if (logEnabled) { + LOG.info(" | JCDEBUG: Info: {}: {}: {}", method, className, message); + LOG.warn(" | JCDEBUG: Warn: {}: {}: {}", method, className, message); + LOG.error("| JCDEBUG: Error: {}: {}: {}", method, className, message); + LOG.debug("| JCDEBUG: Debug: {}: {}: {}", method, className, message); + } + } + + /** + * Get call stack as String (tab separated). + */ + public String getCallStackAsString() { + final StringBuilder sb = new StringBuilder(); + final StackTraceElement[] stackTrace = Thread.currentThread().getStackTrace(); + // Skip the first two elements to exclude getStackTrace() and getCallStackAsString() + for (int i = 2; i < stackTrace.length; i++) { + sb.append(stackTrace[i].toString()).append("\t"); + } + return sb.toString(); + } + + /** + * Print Object to String (in JSON format). + */ + public String printObjectToString(final Object object) { + try { + return MAPPER.writeValueAsString(object); + } catch (Exception e) { + return "ERROR_WRITING_OBJECT"; + } + } + +} From 03854c292ff7e0ec800253ff648d032535f6f2da Mon Sep 17 00:00:00 2001 From: JamesCollettCGI Date: Thu, 15 Jan 2026 19:13:44 +0000 Subject: [PATCH 3/8] Update logging --- .../data/casedetails/DefaultCaseDetailsRepository.java | 2 +- .../uk/gov/hmcts/ccd/domain/service/common/JcLogger.java | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/main/java/uk/gov/hmcts/ccd/data/casedetails/DefaultCaseDetailsRepository.java b/src/main/java/uk/gov/hmcts/ccd/data/casedetails/DefaultCaseDetailsRepository.java index 29872d4244..9fca2db95f 100644 --- a/src/main/java/uk/gov/hmcts/ccd/data/casedetails/DefaultCaseDetailsRepository.java +++ b/src/main/java/uk/gov/hmcts/ccd/data/casedetails/DefaultCaseDetailsRepository.java @@ -85,7 +85,7 @@ public CaseDetails set(final CaseDetails caseDetails) { another action happened at the same time. Please review the case and try again."""); } catch (PersistenceException e) { - if ((e instanceof ConstraintViolationException || e.getCause() instanceof ConstraintViolationException) + if ((e instanceof ConstraintViolationException || e.getCause() instanceof ConstraintViolationException) && isDuplicateReference(e)) { LOG.warn("ConstraintViolationException happen for UUID={}. ConstraintName: {}", caseDetails.getReference(), UNIQUE_REFERENCE_KEY_CONSTRAINT); diff --git a/src/main/java/uk/gov/hmcts/ccd/domain/service/common/JcLogger.java b/src/main/java/uk/gov/hmcts/ccd/domain/service/common/JcLogger.java index 270537549a..b3d81a897b 100644 --- a/src/main/java/uk/gov/hmcts/ccd/domain/service/common/JcLogger.java +++ b/src/main/java/uk/gov/hmcts/ccd/domain/service/common/JcLogger.java @@ -24,9 +24,9 @@ public JcLogger(final String className, final boolean logEnabled) { public void jclog(final String method, final String message) { if (logEnabled) { LOG.info(" | JCDEBUG: Info: {}: {}: {}", method, className, message); - LOG.warn(" | JCDEBUG: Warn: {}: {}: {}", method, className, message); - LOG.error("| JCDEBUG: Error: {}: {}: {}", method, className, message); - LOG.debug("| JCDEBUG: Debug: {}: {}: {}", method, className, message); + //LOG.warn(" | JCDEBUG: Warn: {}: {}: {}", method, className, message); + //LOG.error("| JCDEBUG: Error: {}: {}: {}", method, className, message); + //LOG.debug("| JCDEBUG: Debug: {}: {}: {}", method, className, message); } } @@ -50,7 +50,7 @@ public String printObjectToString(final Object object) { try { return MAPPER.writeValueAsString(object); } catch (Exception e) { - return "ERROR_WRITING_OBJECT"; + return "ERROR_WRITING_OBJECT: " + e.getMessage(); } } From d04c227f94b40da4c91f19928a07b08f551e5104 Mon Sep 17 00:00:00 2001 From: JamesCollettCGI Date: Fri, 16 Jan 2026 12:25:34 +0000 Subject: [PATCH 4/8] Update logging --- build.gradle | 10 ++++++---- .../gov/hmcts/ccd/domain/service/common/JcLogger.java | 2 ++ 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/build.gradle b/build.gradle index de2c02f1c8..594010a29b 100644 --- a/build.gradle +++ b/build.gradle @@ -184,7 +184,9 @@ dependencies { // start::CVE Vulnerability dependency overrides // MAIN PARENT DEPENDEDNCY - implementation group: 'com.auth0', name: 'java-jwt', version: '4.5.0' + implementation 'com.fasterxml.jackson.datatype:jackson-datatype-jdk8' + + implementation group: 'com.auth0', name: 'java-jwt', version: '4.5.0' implementation group: 'com.google.code.gson', name: 'gson', version: '2.13.2' // java-property-to-json implementation group: 'com.google.guava', name: 'guava', version: '33.5.0-jre' // java-property-to-json implementation group: 'com.jayway.jsonpath', name: 'json-path', version: '2.10.0' // spring-hateoas @@ -210,7 +212,7 @@ dependencies { testImplementation group: 'org.assertj', name: 'assertj-core', version: '3.27.6' // spring-cloud-starter-contract-stub-runner testImplementation group: 'org.mockito', name: 'mockito-core', version: mockito // spring-cloud-starter-contract-stub-runner testImplementation group: 'org.mockito', name: 'mockito-junit-jupiter', version: mockito // spring-boot-starter-test - + // end::CVE Vulnerability dependency overrides // Lombok @@ -270,7 +272,7 @@ dependencies { implementation group: 'org.jooq', name: 'jool-java-8', version: '0.9.15' implementation group: 'org.mapstruct', name: 'mapstruct', version: '1.6.3' implementation group: 'pl.jalokim.propertiestojson', name: 'java-properties-to-json', version: '5.3.0' - + annotationProcessor group: 'org.mapstruct', name: 'mapstruct-processor', version: '1.6.3' testAnnotationProcessor group: 'org.mapstruct', name: 'mapstruct-processor', version: '1.6.3' runtimeOnly group: 'org.postgresql', name: 'postgresql', version: '42.5.6' @@ -892,4 +894,4 @@ void loadEnvSecrets(String env) { project.file("./.${env}-remote-env").write(new String(os.toString().replace('\n', '').decodeBase64(), java.nio.charset.StandardCharsets.UTF_8)) } } -} \ No newline at end of file +} diff --git a/src/main/java/uk/gov/hmcts/ccd/domain/service/common/JcLogger.java b/src/main/java/uk/gov/hmcts/ccd/domain/service/common/JcLogger.java index b3d81a897b..d28442e373 100644 --- a/src/main/java/uk/gov/hmcts/ccd/domain/service/common/JcLogger.java +++ b/src/main/java/uk/gov/hmcts/ccd/domain/service/common/JcLogger.java @@ -4,6 +4,7 @@ import org.slf4j.LoggerFactory; import com.fasterxml.jackson.databind.ObjectMapper; import uk.gov.hmcts.ccd.config.JacksonUtils; +import com.fasterxml.jackson.datatype.jdk8.Jdk8Module; public class JcLogger { @@ -16,6 +17,7 @@ public class JcLogger { public JcLogger(final String className, final boolean logEnabled) { this.className = className; this.logEnabled = logEnabled; + MAPPER.registerModule(new Jdk8Module()); } /** From 7f18dcd6e7d892f47303bf622957fd0d7b39bcbc Mon Sep 17 00:00:00 2001 From: JamesCollettCGI Date: Fri, 16 Jan 2026 13:09:50 +0000 Subject: [PATCH 5/8] Add initial logging to endpoints CaseDetailsEndpoint and QueryEndpoint --- .../DefaultCaseDetailsRepository.java | 7 +++++-- .../ccd/endpoint/std/CaseDetailsEndpoint.java | 18 ++++++++++++++---- .../hmcts/ccd/endpoint/ui/QueryEndpoint.java | 13 +++++++++++-- 3 files changed, 30 insertions(+), 8 deletions(-) diff --git a/src/main/java/uk/gov/hmcts/ccd/data/casedetails/DefaultCaseDetailsRepository.java b/src/main/java/uk/gov/hmcts/ccd/data/casedetails/DefaultCaseDetailsRepository.java index 9fca2db95f..1e2ec0f2b4 100644 --- a/src/main/java/uk/gov/hmcts/ccd/data/casedetails/DefaultCaseDetailsRepository.java +++ b/src/main/java/uk/gov/hmcts/ccd/data/casedetails/DefaultCaseDetailsRepository.java @@ -85,7 +85,7 @@ public CaseDetails set(final CaseDetails caseDetails) { another action happened at the same time. Please review the case and try again."""); } catch (PersistenceException e) { - if ((e instanceof ConstraintViolationException || e.getCause() instanceof ConstraintViolationException) + if ((e instanceof ConstraintViolationException || e.getCause() instanceof ConstraintViolationException) && isDuplicateReference(e)) { LOG.warn("ConstraintViolationException happen for UUID={}. ConstraintName: {}", caseDetails.getReference(), UNIQUE_REFERENCE_KEY_CONSTRAINT); @@ -166,8 +166,11 @@ public CaseDetails findUniqueCase(final String jurisdiction, @Override public List findByMetaDataAndFieldData(final MetaData metadata, final Map dataSearchParams) { + final String callstack = jclogger.getCallStackAsString(); jclogger.jclog("findByMetaDataAndFieldData()", - "CALL STACK: " + jclogger.getCallStackAsString()); + "CALL STACK: " + callstack.hashCode()); + jclogger.jclog("findByMetaDataAndFieldData()", + "CALL STACK: " + callstack); jclogger.jclog("findByMetaDataAndFieldData()", "MetaData: " + jclogger.printObjectToString(metadata)); jclogger.jclog("findByMetaDataAndFieldData()", diff --git a/src/main/java/uk/gov/hmcts/ccd/endpoint/std/CaseDetailsEndpoint.java b/src/main/java/uk/gov/hmcts/ccd/endpoint/std/CaseDetailsEndpoint.java index 73e9bee7c9..6a061dc207 100644 --- a/src/main/java/uk/gov/hmcts/ccd/endpoint/std/CaseDetailsEndpoint.java +++ b/src/main/java/uk/gov/hmcts/ccd/endpoint/std/CaseDetailsEndpoint.java @@ -12,6 +12,7 @@ import uk.gov.hmcts.ccd.domain.model.definition.CaseDetails; import uk.gov.hmcts.ccd.domain.model.definition.Document; import uk.gov.hmcts.ccd.domain.model.std.CaseDataContent; +import uk.gov.hmcts.ccd.domain.service.common.JcLogger; import uk.gov.hmcts.ccd.domain.service.createcase.CreateCaseOperation; import uk.gov.hmcts.ccd.domain.service.createevent.CreateEventOperation; import uk.gov.hmcts.ccd.domain.service.getcase.CaseNotFoundException; @@ -75,6 +76,8 @@ @Tag(name = "Standard case API") public class CaseDetailsEndpoint { + private final JcLogger jclogger = new JcLogger("CaseDetailsEndpoint", true); + private final GetCaseOperation getCaseOperation; private final CreateCaseOperation createCaseOperation; private final CreateEventOperation createEventOperation; @@ -188,7 +191,7 @@ public StartEventResult startEventForCaseworker( @GetMapping(value = "/citizens/{uid}/jurisdictions/{jid}/case-types/{ctid}/cases/{cid}/event-triggers/{etid}/token") @Operation( - summary = "Start event creation as Citizen", + summary = "Start event creation as Citizen", description = "Start the event creation process for an existing case. Triggers `AboutToStart` callback." ) @ApiResponses(value = { @@ -215,7 +218,7 @@ public StartEventResult startEventForCitizen( @GetMapping(value = "/caseworkers/{uid}/jurisdictions/{jid}/case-types/{ctid}/event-triggers/{etid}/token") @Operation( - summary = "Start case creation as Case worker", + summary = "Start case creation as Case worker", description = "Start the case creation process for a new case. Triggers `AboutToStart` callback." ) @ApiResponses(value = { @@ -239,7 +242,7 @@ public StartEventResult startCaseForCaseworker( @GetMapping(value = "/citizens/{uid}/jurisdictions/{jid}/case-types/{ctid}/event-triggers/{etid}/token") @Operation( - summary = "Start case creation as Citizen", + summary = "Start case creation as Citizen", description = "Start the case creation process for a new case. Triggers `AboutToStart` callback." ) @ApiResponses(value = { @@ -431,7 +434,7 @@ public List searchCasesForCaseWorkers( @PathVariable("jid") final String jurisdictionId, @Parameter(name = "Case type ID", required = true) @PathVariable("ctid") final String caseTypeId, - @Parameter(name = "Query Parameters", + @Parameter(name = "Query Parameters", description = "Query Parameters, valid options: created_date, last_modified_date, " + "state, case_reference", required = false) @RequestParam(required = false) Map queryParameters) { @@ -451,14 +454,21 @@ public List searchCasesForCitizens(@PathVariable("uid") final Strin return searchCases(jurisdictionId, caseTypeId, queryParameters); } + /* + * QUESTION: How is 'sanitizedParams' constructed in method searchCases() ? + */ private List searchCases(final String jurisdictionId, final String caseTypeId, final Map queryParameters) { final MetaData metadata = createMetadata(jurisdictionId, caseTypeId, queryParameters); + jclogger.jclog("searchCases()", "sanitized: " + queryParameters.size()); + jclogger.jclog("searchCases()", "sanitized: " + jclogger.printObjectToString(queryParameters)); final Map sanitizedParams = fieldMapSanitizeOperation.execute(queryParameters); + jclogger.jclog("searchCases()", "sanitized: " + sanitizedParams.size()); + jclogger.jclog("searchCases()", "sanitized: " + jclogger.printObjectToString(sanitizedParams)); return searchOperation.execute(metadata, sanitizedParams); } diff --git a/src/main/java/uk/gov/hmcts/ccd/endpoint/ui/QueryEndpoint.java b/src/main/java/uk/gov/hmcts/ccd/endpoint/ui/QueryEndpoint.java index 4b966cc632..382a014ce5 100644 --- a/src/main/java/uk/gov/hmcts/ccd/endpoint/ui/QueryEndpoint.java +++ b/src/main/java/uk/gov/hmcts/ccd/endpoint/ui/QueryEndpoint.java @@ -40,6 +40,7 @@ import uk.gov.hmcts.ccd.domain.service.aggregated.GetEventTriggerOperation; import uk.gov.hmcts.ccd.domain.service.aggregated.GetUserProfileOperation; import uk.gov.hmcts.ccd.domain.service.aggregated.SearchQueryOperation; +import uk.gov.hmcts.ccd.domain.service.common.JcLogger; import uk.gov.hmcts.ccd.endpoint.exceptions.BadRequestException; import uk.gov.hmcts.ccd.endpoint.exceptions.ResourceNotFoundException; import uk.gov.hmcts.ccd.v2.V2; @@ -85,6 +86,7 @@ public class QueryEndpoint { private static final Logger LOG = LoggerFactory.getLogger(QueryEndpoint.class); public static final String CASE_TYPE_ID_PATTERN = "^[a-zA-Z0-9_.]+$"; + private final JcLogger jclogger = new JcLogger("QueryEndpoint", true); private final GetCaseViewOperation getCaseViewOperation; private final GetCaseHistoryViewOperation getCaseHistoryViewOperation; @@ -153,6 +155,9 @@ public List getJurisdictions(@RequestParam(value } } + /* + * QUESTION: How is 'sanitized' constructed in method searchNew() ? + */ @RequestMapping(value = "/caseworkers/{uid}/jurisdictions/{jid}/case-types/{ctid}/cases", method = RequestMethod.GET) @Operation(summary = "Get case data with UI layout") @@ -179,8 +184,12 @@ public SearchResultView searchNew(@PathVariable("jid") final String jurisdiction metadata.setPage(param(params, PAGE_PARAM)); metadata.setSortDirection(param(params, SORT_PARAM)); + jclogger.jclog("searchNew()", "sanitized: " + params.size()); + jclogger.jclog("searchNew()", "sanitized: " + jclogger.printObjectToString(params)); Map sanitized = fieldMapSanitizeOperation.execute(params); + jclogger.jclog("searchNew()", "sanitized: " + sanitized.size()); + jclogger.jclog("searchNew()", "sanitized: " + jclogger.printObjectToString(sanitized)); return searchQueryOperation.execute(view, metadata, sanitized); } @@ -207,11 +216,11 @@ public SearchInput[] findSearchInputDetails(@PathVariable("uid") final String ui method = RequestMethod.GET) @Operation(summary = "Get Workbasket Input details") @ApiResponse( - responseCode = "200", + responseCode = "200", description = "Workbasket Input data found for the given case type and jurisdiction" ) @ApiResponse( - responseCode = "404", + responseCode = "404", description = "No Workbasket Input found for the given case type and jurisdiction" ) public WorkbasketInput[] findWorkbasketInputDetails(@PathVariable("uid") final String uid, From 37f2867fe0ad404a56f798d76f721988551193b2 Mon Sep 17 00:00:00 2001 From: JamesCollettCGI Date: Fri, 16 Jan 2026 13:20:23 +0000 Subject: [PATCH 6/8] Update logging in endpoints CaseDetailsEndpoint and QueryEndpoint --- .../gov/hmcts/ccd/endpoint/std/CaseDetailsEndpoint.java | 8 ++++++-- .../java/uk/gov/hmcts/ccd/endpoint/ui/QueryEndpoint.java | 6 ++++-- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/src/main/java/uk/gov/hmcts/ccd/endpoint/std/CaseDetailsEndpoint.java b/src/main/java/uk/gov/hmcts/ccd/endpoint/std/CaseDetailsEndpoint.java index 6a061dc207..a74a4f7c4b 100644 --- a/src/main/java/uk/gov/hmcts/ccd/endpoint/std/CaseDetailsEndpoint.java +++ b/src/main/java/uk/gov/hmcts/ccd/endpoint/std/CaseDetailsEndpoint.java @@ -463,8 +463,12 @@ private List searchCases(final String jurisdictionId, final MetaData metadata = createMetadata(jurisdictionId, caseTypeId, queryParameters); - jclogger.jclog("searchCases()", "sanitized: " + queryParameters.size()); - jclogger.jclog("searchCases()", "sanitized: " + jclogger.printObjectToString(queryParameters)); + jclogger.jclog("searchCases()", "jurisdictionId: " + jurisdictionId); + jclogger.jclog("searchCases()", "caseTypeId: " + caseTypeId); + jclogger.jclog("searchCases()", + "queryParameters: " + queryParameters.size()); + jclogger.jclog("searchCases()", + "queryParameters: " + jclogger.printObjectToString(queryParameters)); final Map sanitizedParams = fieldMapSanitizeOperation.execute(queryParameters); jclogger.jclog("searchCases()", "sanitized: " + sanitizedParams.size()); diff --git a/src/main/java/uk/gov/hmcts/ccd/endpoint/ui/QueryEndpoint.java b/src/main/java/uk/gov/hmcts/ccd/endpoint/ui/QueryEndpoint.java index 382a014ce5..6c17c6342b 100644 --- a/src/main/java/uk/gov/hmcts/ccd/endpoint/ui/QueryEndpoint.java +++ b/src/main/java/uk/gov/hmcts/ccd/endpoint/ui/QueryEndpoint.java @@ -184,8 +184,10 @@ public SearchResultView searchNew(@PathVariable("jid") final String jurisdiction metadata.setPage(param(params, PAGE_PARAM)); metadata.setSortDirection(param(params, SORT_PARAM)); - jclogger.jclog("searchNew()", "sanitized: " + params.size()); - jclogger.jclog("searchNew()", "sanitized: " + jclogger.printObjectToString(params)); + jclogger.jclog("searchNew()", "jurisdictionId: " + jurisdictionId); + jclogger.jclog("searchNew()", "caseTypeId: " + caseTypeId); + jclogger.jclog("searchNew()", "params: " + params.size()); + jclogger.jclog("searchNew()", "params: " + jclogger.printObjectToString(params)); Map sanitized = fieldMapSanitizeOperation.execute(params); jclogger.jclog("searchNew()", "sanitized: " + sanitized.size()); From 736e92cac9b9b51cf9d82aebbd5ac8304a19c757 Mon Sep 17 00:00:00 2001 From: JamesCollettCGI Date: Fri, 16 Jan 2026 14:16:54 +0000 Subject: [PATCH 7/8] Temporary Sonar exclusions while debugging logging enabled --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 594010a29b..a37e581dbd 100644 --- a/build.gradle +++ b/build.gradle @@ -563,7 +563,7 @@ sonarqube { properties { property "sonar.exclusions", "build/generated-sources/**/*.java," + "**/AppInsightsConfiguration.java," + - "**/TestingSupportController.java" + "**/TestingSupportController.java,**/JcLogger.java,**/DefaultCaseDetailsRepository.java,**/CaseDetailsEndpoint.java,**/QueryEndpoint.java" property "sonar.projectName", "ccd-data-store-api" property "sonar.projectKey", "ccd-data-store-api" property "sonar.coverage.jacoco.xmlReportPaths", "${jacocoTestReport.reports.xml.outputLocation}" From 2306f2bfd9301e5bf8407f9de9c6c0294fd67d79 Mon Sep 17 00:00:00 2001 From: JamesCollettCGI Date: Fri, 16 Jan 2026 15:37:37 +0000 Subject: [PATCH 8/8] Temporary changes to functional test files --- .../features/F-026 - Get Cases V1 Internal/S-589.td.json | 2 +- .../features/F-048 - Get pagination metadata/S-593.td.json | 2 +- .../features/F-057 - Get Pagination Meta Citizen/S-594.td.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/aat/resources/features/F-026 - Get Cases V1 Internal/S-589.td.json b/src/aat/resources/features/F-026 - Get Cases V1 Internal/S-589.td.json index e2ce4d5440..c936630a8b 100644 --- a/src/aat/resources/features/F-026 - Get Cases V1 Internal/S-589.td.json +++ b/src/aat/resources/features/F-026 - Get Cases V1 Internal/S-589.td.json @@ -22,7 +22,7 @@ "uid": "[[DEFAULT_AUTO_VALUE]]", "jid": "BEFTA_JURISDICTION_3", "ctid": "BEFTA_CASETYPE_3_4", - "date": "1970-01-01" + "date": "1970-02-02" } }, diff --git a/src/aat/resources/features/F-048 - Get pagination metadata/S-593.td.json b/src/aat/resources/features/F-048 - Get pagination metadata/S-593.td.json index b9494ff0e0..6d676abd11 100644 --- a/src/aat/resources/features/F-048 - Get pagination metadata/S-593.td.json +++ b/src/aat/resources/features/F-048 - Get pagination metadata/S-593.td.json @@ -25,7 +25,7 @@ "uid": "[[DEFAULT_AUTO_VALUE]]", "jid": "BEFTA_JURISDICTION_3", "ctid": "BEFTA_CASETYPE_3_4", - "date":"1970-01-01" + "date":"1970-04-04" } }, diff --git a/src/aat/resources/features/F-057 - Get Pagination Meta Citizen/S-594.td.json b/src/aat/resources/features/F-057 - Get Pagination Meta Citizen/S-594.td.json index 1c1f96496f..459f3bd727 100644 --- a/src/aat/resources/features/F-057 - Get Pagination Meta Citizen/S-594.td.json +++ b/src/aat/resources/features/F-057 - Get Pagination Meta Citizen/S-594.td.json @@ -16,7 +16,7 @@ "uid": "[[DEFAULT_AUTO_VALUE]]", "jid": "BEFTA_JURISDICTION_3", "ctid": "BEFTA_CASETYPE_3_4", - "date": "1970-01-01" + "date": "1970-03-03" } },