diff --git a/src/integrationTest/java/uk/gov/hmcts/darts/task/service/AdminGetAutomatedTaskServiceTest.java b/src/integrationTest/java/uk/gov/hmcts/darts/task/service/AdminGetAutomatedTaskServiceIntTest.java similarity index 98% rename from src/integrationTest/java/uk/gov/hmcts/darts/task/service/AdminGetAutomatedTaskServiceTest.java rename to src/integrationTest/java/uk/gov/hmcts/darts/task/service/AdminGetAutomatedTaskServiceIntTest.java index e973d33de01..8c1b46a31ad 100644 --- a/src/integrationTest/java/uk/gov/hmcts/darts/task/service/AdminGetAutomatedTaskServiceTest.java +++ b/src/integrationTest/java/uk/gov/hmcts/darts/task/service/AdminGetAutomatedTaskServiceIntTest.java @@ -10,7 +10,7 @@ import static org.assertj.core.api.Assertions.assertThat; -class AdminGetAutomatedTaskServiceTest extends IntegrationBase { +class AdminGetAutomatedTaskServiceIntTest extends IntegrationBase { @Autowired private AdminAutomatedTaskService adminAutomatedTaskService; diff --git a/src/integrationTest/java/uk/gov/hmcts/darts/task/service/AdminGetAutomatedTasksByIdTest.java b/src/integrationTest/java/uk/gov/hmcts/darts/task/service/AdminGetAutomatedTasksByIdIntTest.java similarity index 97% rename from src/integrationTest/java/uk/gov/hmcts/darts/task/service/AdminGetAutomatedTasksByIdTest.java rename to src/integrationTest/java/uk/gov/hmcts/darts/task/service/AdminGetAutomatedTasksByIdIntTest.java index 6fc94e29ca4..6b1bb0a8d55 100644 --- a/src/integrationTest/java/uk/gov/hmcts/darts/task/service/AdminGetAutomatedTasksByIdTest.java +++ b/src/integrationTest/java/uk/gov/hmcts/darts/task/service/AdminGetAutomatedTasksByIdIntTest.java @@ -19,7 +19,7 @@ import static uk.gov.hmcts.darts.common.enums.SecurityRoleEnum.SUPER_ADMIN; @AutoConfigureMockMvc -class AdminGetAutomatedTasksByIdTest extends IntegrationBase { +class AdminGetAutomatedTasksByIdIntTest extends IntegrationBase { private static final URI ENDPOINT = URI.create("/admin/automated-tasks/"); diff --git a/src/integrationTest/java/uk/gov/hmcts/darts/task/service/AdminGetAutomatedTasksTest.java b/src/integrationTest/java/uk/gov/hmcts/darts/task/service/AdminGetAutomatedTasksIntTest.java similarity index 96% rename from src/integrationTest/java/uk/gov/hmcts/darts/task/service/AdminGetAutomatedTasksTest.java rename to src/integrationTest/java/uk/gov/hmcts/darts/task/service/AdminGetAutomatedTasksIntTest.java index 28432b55a60..e2f8d451337 100644 --- a/src/integrationTest/java/uk/gov/hmcts/darts/task/service/AdminGetAutomatedTasksTest.java +++ b/src/integrationTest/java/uk/gov/hmcts/darts/task/service/AdminGetAutomatedTasksIntTest.java @@ -16,7 +16,7 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; @AutoConfigureMockMvc -class AdminGetAutomatedTasksTest extends IntegrationBase { +class AdminGetAutomatedTasksIntTest extends IntegrationBase { private static final URI ENDPOINT = URI.create("/admin/automated-tasks"); diff --git a/src/integrationTest/java/uk/gov/hmcts/darts/task/service/AdminPatchAutomatedTaskTest.java b/src/integrationTest/java/uk/gov/hmcts/darts/task/service/AdminPatchAutomatedTaskIntTest.java similarity index 98% rename from src/integrationTest/java/uk/gov/hmcts/darts/task/service/AdminPatchAutomatedTaskTest.java rename to src/integrationTest/java/uk/gov/hmcts/darts/task/service/AdminPatchAutomatedTaskIntTest.java index 31468443dd0..86e5f47b085 100644 --- a/src/integrationTest/java/uk/gov/hmcts/darts/task/service/AdminPatchAutomatedTaskTest.java +++ b/src/integrationTest/java/uk/gov/hmcts/darts/task/service/AdminPatchAutomatedTaskIntTest.java @@ -23,7 +23,7 @@ import static uk.gov.hmcts.darts.common.enums.SecurityRoleEnum.SUPER_ADMIN; @AutoConfigureMockMvc -class AdminPatchAutomatedTaskTest extends IntegrationBase { +class AdminPatchAutomatedTaskIntTest extends IntegrationBase { private static final URI ENDPOINT = URI.create("/admin/automated-tasks/"); diff --git a/src/integrationTest/java/uk/gov/hmcts/darts/task/service/AdminRunAutomatedTaskTest.java b/src/integrationTest/java/uk/gov/hmcts/darts/task/service/AdminRunAutomatedTaskIntTest.java similarity index 98% rename from src/integrationTest/java/uk/gov/hmcts/darts/task/service/AdminRunAutomatedTaskTest.java rename to src/integrationTest/java/uk/gov/hmcts/darts/task/service/AdminRunAutomatedTaskIntTest.java index 851779245e6..221fede1107 100644 --- a/src/integrationTest/java/uk/gov/hmcts/darts/task/service/AdminRunAutomatedTaskTest.java +++ b/src/integrationTest/java/uk/gov/hmcts/darts/task/service/AdminRunAutomatedTaskIntTest.java @@ -23,7 +23,7 @@ import static uk.gov.hmcts.darts.common.enums.SecurityRoleEnum.SUPER_ADMIN; @AutoConfigureMockMvc -class AdminRunAutomatedTaskTest extends IntegrationBase { +class AdminRunAutomatedTaskIntTest extends IntegrationBase { private static final URI ENDPOINT = URI.create("/admin/automated-tasks/1/run"); private static final URI ENDPOINT_WITH_NON_EXISTING_TASK_ID = URI.create("/admin/automated-tasks/-1/run"); diff --git a/src/integrationTest/java/uk/gov/hmcts/darts/task/service/AdminUpdateAutomatedTaskServiceTest.java b/src/integrationTest/java/uk/gov/hmcts/darts/task/service/AdminUpdateAutomatedTaskServiceIntTest.java similarity index 98% rename from src/integrationTest/java/uk/gov/hmcts/darts/task/service/AdminUpdateAutomatedTaskServiceTest.java rename to src/integrationTest/java/uk/gov/hmcts/darts/task/service/AdminUpdateAutomatedTaskServiceIntTest.java index aa045fede49..a867c39071b 100644 --- a/src/integrationTest/java/uk/gov/hmcts/darts/task/service/AdminUpdateAutomatedTaskServiceTest.java +++ b/src/integrationTest/java/uk/gov/hmcts/darts/task/service/AdminUpdateAutomatedTaskServiceIntTest.java @@ -17,7 +17,7 @@ import static org.assertj.core.api.Assertions.assertThat; -class AdminUpdateAutomatedTaskServiceTest extends IntegrationBase { +class AdminUpdateAutomatedTaskServiceIntTest extends IntegrationBase { @Autowired private AdminAutomatedTaskService adminAutomatedTaskService; diff --git a/src/integrationTest/java/uk/gov/hmcts/darts/task/service/AutomatedTaskServiceTest.java b/src/integrationTest/java/uk/gov/hmcts/darts/task/service/AutomatedTaskServiceIntTest.java similarity index 99% rename from src/integrationTest/java/uk/gov/hmcts/darts/task/service/AutomatedTaskServiceTest.java rename to src/integrationTest/java/uk/gov/hmcts/darts/task/service/AutomatedTaskServiceIntTest.java index d436919a112..b83588e5a74 100644 --- a/src/integrationTest/java/uk/gov/hmcts/darts/task/service/AutomatedTaskServiceTest.java +++ b/src/integrationTest/java/uk/gov/hmcts/darts/task/service/AutomatedTaskServiceIntTest.java @@ -97,7 +97,7 @@ import static uk.gov.hmcts.darts.test.common.AwaitabilityUtil.waitForMax10SecondsWithOneSecondPoll; @Slf4j -class AutomatedTaskServiceTest extends IntegrationBase { +class AutomatedTaskServiceIntTest extends IntegrationBase { @Autowired private AutomatedTaskService automatedTaskService; diff --git a/src/integrationTest/java/uk/gov/hmcts/darts/task/service/ExternalDataStoreDeleterTest.java b/src/integrationTest/java/uk/gov/hmcts/darts/task/service/ExternalDataStoreDeleterIntTest.java similarity index 99% rename from src/integrationTest/java/uk/gov/hmcts/darts/task/service/ExternalDataStoreDeleterTest.java rename to src/integrationTest/java/uk/gov/hmcts/darts/task/service/ExternalDataStoreDeleterIntTest.java index d91058272a3..ce486733d9c 100644 --- a/src/integrationTest/java/uk/gov/hmcts/darts/task/service/ExternalDataStoreDeleterTest.java +++ b/src/integrationTest/java/uk/gov/hmcts/darts/task/service/ExternalDataStoreDeleterIntTest.java @@ -52,7 +52,7 @@ import static uk.gov.hmcts.darts.common.enums.ObjectRecordStatusEnum.STORED; import static uk.gov.hmcts.darts.test.common.data.PersistableFactory.getMediaRequestTestData; -class ExternalDataStoreDeleterTest extends IntegrationBase { +class ExternalDataStoreDeleterIntTest extends IntegrationBase { @Autowired protected TransientObjectDirectoryStub transientObjectDirectoryStub; @Autowired diff --git a/src/integrationTest/java/uk/gov/hmcts/darts/task/service/GenerateCaseDocumentProcessorIntTest.java b/src/integrationTest/java/uk/gov/hmcts/darts/task/service/GenerateCaseDocumentProcessorIntTest.java index 411ea2780b0..49ccc22ddfd 100644 --- a/src/integrationTest/java/uk/gov/hmcts/darts/task/service/GenerateCaseDocumentProcessorIntTest.java +++ b/src/integrationTest/java/uk/gov/hmcts/darts/task/service/GenerateCaseDocumentProcessorIntTest.java @@ -29,22 +29,22 @@ class GenerateCaseDocumentProcessorIntTest extends IntegrationBase { private static final OffsetDateTime DT_2025 = OffsetDateTime.of(2025, 1, 1, 1, 0, 0, 0, UTC); @MockitoSpyBean - CaseRepository caseRepository; + private CaseRepository caseRepository; @MockitoSpyBean - CaseDocumentRepository caseDocumentRepository; + private CaseDocumentRepository caseDocumentRepository; @MockitoSpyBean - ExternalObjectDirectoryRepository eodRepository; + private ExternalObjectDirectoryRepository eodRepository; @Autowired - UserAccountRepository userAccountRepository; + private UserAccountRepository userAccountRepository; @Autowired - AnnotationRepository annotationRepository; + private AnnotationRepository annotationRepository; @Autowired - GenerateCaseDocumentSingleCaseProcessor processor; + private GenerateCaseDocumentSingleCaseProcessor processor; @Autowired - HearingRepository hearingRepository; + private HearingRepository hearingRepository; @Test - void testGenerateCaseDocument() { + void generateCaseDocument_ShouldGenerateCaseDocument() { // given givenBearerTokenExists("darts.global.user@hmcts.net"); diff --git a/src/integrationTest/java/uk/gov/hmcts/darts/task/service/InboundAudioDeleterProcessorTest.java b/src/integrationTest/java/uk/gov/hmcts/darts/task/service/InboundAudioDeleterProcessorIntTest.java similarity index 98% rename from src/integrationTest/java/uk/gov/hmcts/darts/task/service/InboundAudioDeleterProcessorTest.java rename to src/integrationTest/java/uk/gov/hmcts/darts/task/service/InboundAudioDeleterProcessorIntTest.java index 55efe9d8918..17e540c28bf 100644 --- a/src/integrationTest/java/uk/gov/hmcts/darts/task/service/InboundAudioDeleterProcessorTest.java +++ b/src/integrationTest/java/uk/gov/hmcts/darts/task/service/InboundAudioDeleterProcessorIntTest.java @@ -23,7 +23,7 @@ import static uk.gov.hmcts.darts.common.enums.ObjectRecordStatusEnum.STORED; import static uk.gov.hmcts.darts.test.common.data.PersistableFactory.getMediaTestData; -class InboundAudioDeleterProcessorTest extends IntegrationBase { +class InboundAudioDeleterProcessorIntTest extends IntegrationBase { private static final String USER_EMAIL_ADDRESS = "system_InboundAudioDeleter@hmcts.net"; public static final LocalDateTime HEARING_DATE = LocalDateTime.of(2023, 6, 10, 10, 0, 0); diff --git a/src/integrationTest/java/uk/gov/hmcts/darts/task/service/OutboundAudioDeleterProcessorTest.java b/src/integrationTest/java/uk/gov/hmcts/darts/task/service/OutboundAudioDeleterProcessorIntTest.java similarity index 99% rename from src/integrationTest/java/uk/gov/hmcts/darts/task/service/OutboundAudioDeleterProcessorTest.java rename to src/integrationTest/java/uk/gov/hmcts/darts/task/service/OutboundAudioDeleterProcessorIntTest.java index 20dd31da420..0a2044551ff 100644 --- a/src/integrationTest/java/uk/gov/hmcts/darts/task/service/OutboundAudioDeleterProcessorTest.java +++ b/src/integrationTest/java/uk/gov/hmcts/darts/task/service/OutboundAudioDeleterProcessorIntTest.java @@ -47,7 +47,7 @@ import static uk.gov.hmcts.darts.common.enums.ObjectRecordStatusEnum.STORED; import static uk.gov.hmcts.darts.test.common.data.PersistableFactory.getMediaRequestTestData; -class OutboundAudioDeleterProcessorTest extends IntegrationBase { +class OutboundAudioDeleterProcessorIntTest extends IntegrationBase { private static final String USER_EMAIL_ADDRESS = "system_OutboundAudioDeleter@hmcts.net"; private UserAccountEntity userAccount; diff --git a/src/main/java/uk/gov/hmcts/darts/casedocument/service/GenerateCaseDocumentSingleCaseProcessor.java b/src/main/java/uk/gov/hmcts/darts/casedocument/service/GenerateCaseDocumentSingleCaseProcessor.java index 44e8248f280..182c9d9e61c 100644 --- a/src/main/java/uk/gov/hmcts/darts/casedocument/service/GenerateCaseDocumentSingleCaseProcessor.java +++ b/src/main/java/uk/gov/hmcts/darts/casedocument/service/GenerateCaseDocumentSingleCaseProcessor.java @@ -4,4 +4,5 @@ public interface GenerateCaseDocumentSingleCaseProcessor { void processGenerateCaseDocument(Integer caseId); + } diff --git a/src/main/java/uk/gov/hmcts/darts/casedocument/service/impl/GenerateCaseDocumentSingleCaseProcessorImpl.java b/src/main/java/uk/gov/hmcts/darts/casedocument/service/impl/GenerateCaseDocumentSingleCaseProcessorImpl.java index 8e6af10754e..0b25895bc16 100644 --- a/src/main/java/uk/gov/hmcts/darts/casedocument/service/impl/GenerateCaseDocumentSingleCaseProcessorImpl.java +++ b/src/main/java/uk/gov/hmcts/darts/casedocument/service/impl/GenerateCaseDocumentSingleCaseProcessorImpl.java @@ -90,7 +90,7 @@ private void updateCourtCaseRetention(Integer caseId) { courtCaseEntity.setRetentionUpdated(true); courtCaseEntity.setRetentionRetries(0); caseRepository.save(courtCaseEntity); - log.debug("Updated retention for case id {} due to case document generation", caseId); + log.info("Updated retention for case id {} due to case document generation", caseId); } private CaseDocumentEntity createAndSaveCaseDocumentEntity(Integer caseId, String caseDocument, String externalLocation, UserAccountEntity user) { diff --git a/src/main/java/uk/gov/hmcts/darts/common/config/security/SecurityConfig.java b/src/main/java/uk/gov/hmcts/darts/common/config/security/SecurityConfig.java index 1c0d43ad45c..9b12996ba18 100644 --- a/src/main/java/uk/gov/hmcts/darts/common/config/security/SecurityConfig.java +++ b/src/main/java/uk/gov/hmcts/darts/common/config/security/SecurityConfig.java @@ -206,6 +206,7 @@ private void writeError(HttpServletResponse response, Exception exception) { Jwt getJwtFromRequest(HttpServletRequest request) { try { String authHeader = request.getHeader("Authorization"); + //TODO: Remove this log statement in production code, as it may expose sensitive information String token = authHeader.replace(TOKEN_BEARER_PREFIX, "").trim(); String issuer = JWTParser.parse(token).getJWTClaimsSet().getIssuer();