diff --git a/config/owasp/suppressions.xml b/config/owasp/suppressions.xml
index 62dcb2b3df..b6ef9072ba 100644
--- a/config/owasp/suppressions.xml
+++ b/config/owasp/suppressions.xml
@@ -28,8 +28,13 @@
CVE-2020-5408
CVE-2016-1000027
CVE-2023-41080
+ CVE-2023-31419
+ CVE-2023-31418
+ CVE-2023-5072
+ CVE-2023-42795
+ CVE-2023-45648
CVE-2023-20860
-
+
\ No newline at end of file
diff --git a/src/main/java/uk/gov/hmcts/cmc/claimstore/services/DirectionsQuestionnaireService.java b/src/main/java/uk/gov/hmcts/cmc/claimstore/services/DirectionsQuestionnaireService.java
index 7ab83ea40b..2be1fd6814 100644
--- a/src/main/java/uk/gov/hmcts/cmc/claimstore/services/DirectionsQuestionnaireService.java
+++ b/src/main/java/uk/gov/hmcts/cmc/claimstore/services/DirectionsQuestionnaireService.java
@@ -2,7 +2,6 @@
import org.springframework.stereotype.Service;
import uk.gov.hmcts.cmc.ccd.domain.CaseEvent;
-import uk.gov.hmcts.cmc.claimstore.services.pilotcourt.PilotCourtService;
import uk.gov.hmcts.cmc.domain.models.Claim;
import uk.gov.hmcts.cmc.domain.models.claimantresponse.ClaimantResponse;
import uk.gov.hmcts.cmc.domain.models.claimantresponse.ResponseRejection;
@@ -18,8 +17,6 @@
import static uk.gov.hmcts.cmc.ccd.domain.CaseEvent.DIRECTIONS_QUESTIONNAIRE_DEADLINE;
import static uk.gov.hmcts.cmc.ccd.domain.CaseEvent.REFERRED_TO_MEDIATION;
import static uk.gov.hmcts.cmc.ccd.domain.CaseEvent.WAITING_TRANSFER;
-import static uk.gov.hmcts.cmc.claimstore.services.pilotcourt.Pilot.JDDO;
-import static uk.gov.hmcts.cmc.claimstore.services.pilotcourt.Pilot.LA;
import static uk.gov.hmcts.cmc.claimstore.utils.ClaimantResponseHelper.isOptedForMediation;
import static uk.gov.hmcts.cmc.claimstore.utils.TheirDetailsHelper.isDefendantBusiness;
import static uk.gov.hmcts.cmc.claimstore.utils.TheirDetailsHelper.isDefendantIndividual;
@@ -36,10 +33,8 @@
@Service
public class DirectionsQuestionnaireService {
- private final PilotCourtService pilotCourtService;
- public DirectionsQuestionnaireService(PilotCourtService pilotCourtService) {
- this.pilotCourtService = pilotCourtService;
+ public DirectionsQuestionnaireService() {
}
public CaseEvent prepareCaseEvent(ResponseRejection responseRejection, Claim claim) {
@@ -51,13 +46,11 @@ public CaseEvent prepareCaseEvent(ResponseRejection responseRejection, Claim cla
return DIRECTIONS_QUESTIONNAIRE_DEADLINE;
}
- String preferredCourt = getPreferredCourt(claim);
-
- if (isLegalAdvisorPilot(claim) && pilotCourtService.isPilotCourt(preferredCourt, LA, claim.getCreatedAt())) {
+ if (isLegalAdvisorPilot(claim)) {
return ASSIGNING_FOR_LEGAL_ADVISOR_DIRECTIONS;
}
- if (isJudgePilot(claim) && pilotCourtService.isPilotCourt(preferredCourt, JDDO, claim.getCreatedAt())) {
+ if (isJudgePilot(claim)) {
return ASSIGNING_FOR_JUDGE_DIRECTIONS;
}
@@ -66,13 +59,11 @@ public CaseEvent prepareCaseEvent(ResponseRejection responseRejection, Claim cla
public String getDirectionsCaseState(Claim claim) {
- String preferredCourt = getPreferredCourt(claim);
-
- if (isLegalAdvisorPilot(claim) && pilotCourtService.isPilotCourt(preferredCourt, LA, claim.getCreatedAt())) {
+ if (isLegalAdvisorPilot(claim)) {
return READY_FOR_LEGAL_ADVISOR_DIRECTIONS.getValue();
}
- if (isJudgePilot(claim) && pilotCourtService.isPilotCourt(preferredCourt, JDDO, claim.getCreatedAt())) {
+ if (isJudgePilot(claim)) {
return READY_FOR_JUDGE_DIRECTIONS.getValue();
}
@@ -134,4 +125,4 @@ private static String getClaimantHearingCourt(ClaimantResponse claimantResponse)
throw new IllegalStateException("No preferred court as claimant response is not rejection.");
}
}
-}
+}
\ No newline at end of file
diff --git a/src/main/java/uk/gov/hmcts/cmc/claimstore/services/ccd/callbacks/caseworker/PaperResponseFullDefenceCallbackHandler.java b/src/main/java/uk/gov/hmcts/cmc/claimstore/services/ccd/callbacks/caseworker/PaperResponseFullDefenceCallbackHandler.java
index 328007030a..9f2fd54a95 100644
--- a/src/main/java/uk/gov/hmcts/cmc/claimstore/services/ccd/callbacks/caseworker/PaperResponseFullDefenceCallbackHandler.java
+++ b/src/main/java/uk/gov/hmcts/cmc/claimstore/services/ccd/callbacks/caseworker/PaperResponseFullDefenceCallbackHandler.java
@@ -23,7 +23,6 @@
import uk.gov.hmcts.cmc.claimstore.services.ccd.callbacks.CallbackHandler;
import uk.gov.hmcts.cmc.claimstore.services.ccd.callbacks.CallbackParams;
import uk.gov.hmcts.cmc.claimstore.services.ccd.callbacks.CallbackType;
-import uk.gov.hmcts.cmc.claimstore.services.pilotcourt.PilotCourtService;
import uk.gov.hmcts.cmc.claimstore.utils.CaseDetailsConverter;
import uk.gov.hmcts.cmc.domain.models.Address;
import uk.gov.hmcts.cmc.domain.models.Claim;
@@ -50,8 +49,6 @@
import static uk.gov.hmcts.cmc.claimstore.services.ccd.Role.CASEWORKER;
import static uk.gov.hmcts.cmc.claimstore.services.ccd.callbacks.CallbackParams.Params.BEARER_TOKEN;
import static uk.gov.hmcts.cmc.claimstore.services.ccd.callbacks.caseworker.PaperResponseOCON9xFormCallbackHandler.OCON9X_SUBTYPE;
-import static uk.gov.hmcts.cmc.claimstore.services.pilotcourt.Pilot.JDDO;
-import static uk.gov.hmcts.cmc.claimstore.services.pilotcourt.Pilot.LA;
@Service
public class PaperResponseFullDefenceCallbackHandler extends CallbackHandler {
@@ -68,7 +65,6 @@ public class PaperResponseFullDefenceCallbackHandler extends CallbackHandler {
private final CaseEventService caseEventService;
private final LaunchDarklyClient launchDarklyClient;
private final DefenceResponseNotificationService defenceResponseNotificationService;
- private final PilotCourtService pilotCourtService;
public PaperResponseFullDefenceCallbackHandler(CaseDetailsConverter caseDetailsConverter, Clock clock,
EventProducer eventProducer, CaseMapper caseMapper,
@@ -77,8 +73,7 @@ public PaperResponseFullDefenceCallbackHandler(CaseDetailsConverter caseDetailsC
CaseEventService caseEventService,
LaunchDarklyClient launchDarklyClient,
DefenceResponseNotificationService
- defenceResponseNotificationService,
- PilotCourtService pilotCourtService) {
+ defenceResponseNotificationService) {
this.caseDetailsConverter = caseDetailsConverter;
this.clock = clock;
this.eventProducer = eventProducer;
@@ -88,7 +83,6 @@ public PaperResponseFullDefenceCallbackHandler(CaseDetailsConverter caseDetailsC
this.caseEventService = caseEventService;
this.launchDarklyClient = launchDarklyClient;
this.defenceResponseNotificationService = defenceResponseNotificationService;
- this.pilotCourtService = pilotCourtService;
}
protected Map callbacks() {
@@ -149,7 +143,7 @@ private CallbackResponse aboutToSubmit(CallbackParams callbackParams) {
caseDetailsConverter.calculateIntentionToProceedDeadline(LocalDateTime.now(clock));
if (!StringUtils.isBlank(ccdCase.getPreferredDQCourt())) {
- preferredDQPilotCourt = getpreferredDQPilotCourt(ccdCase.getPreferredDQCourt(), ccdCase.getSubmittedOn());
+ preferredDQPilotCourt = ccdCase.getPreferredDQCourt();
}
CCDCase updatedCcdCase = ccdCase.toBuilder()
@@ -368,12 +362,4 @@ public List getSupportedRoles() {
return ROLES;
}
- private String getpreferredDQPilotCourt(String courtName, LocalDateTime createdOn) {
- if (pilotCourtService.isPilotCourt(courtName, LA, createdOn)
- || pilotCourtService.isPilotCourt(courtName, JDDO, createdOn)) {
- return courtName;
- } else {
- return null;
- }
- }
-}
+}
\ No newline at end of file
diff --git a/src/test/java/uk/gov/hmcts/cmc/claimstore/services/DirectionsQuestionnaireServiceTest.java b/src/test/java/uk/gov/hmcts/cmc/claimstore/services/DirectionsQuestionnaireServiceTest.java
index 8743d1a14a..bcea0e174b 100644
--- a/src/test/java/uk/gov/hmcts/cmc/claimstore/services/DirectionsQuestionnaireServiceTest.java
+++ b/src/test/java/uk/gov/hmcts/cmc/claimstore/services/DirectionsQuestionnaireServiceTest.java
@@ -4,10 +4,8 @@
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
-import org.mockito.Mock;
import org.mockito.junit.MockitoJUnitRunner;
import uk.gov.hmcts.cmc.ccd.domain.CaseEvent;
-import uk.gov.hmcts.cmc.claimstore.services.pilotcourt.PilotCourtService;
import uk.gov.hmcts.cmc.domain.models.Claim;
import uk.gov.hmcts.cmc.domain.models.claimantresponse.ResponseAcceptation;
import uk.gov.hmcts.cmc.domain.models.claimantresponse.ResponseRejection;
@@ -23,9 +21,6 @@
import uk.gov.hmcts.cmc.domain.models.sampledata.SampleClaimData;
import static org.assertj.core.api.Assertions.assertThat;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.ArgumentMatchers.eq;
-import static org.mockito.Mockito.when;
import static uk.gov.hmcts.cmc.ccd.domain.CaseEvent.ASSIGNING_FOR_JUDGE_DIRECTIONS;
import static uk.gov.hmcts.cmc.ccd.domain.CaseEvent.ASSIGNING_FOR_LEGAL_ADVISOR_DIRECTIONS;
import static uk.gov.hmcts.cmc.ccd.domain.CaseEvent.DIRECTIONS_QUESTIONNAIRE_DEADLINE;
@@ -122,15 +117,11 @@ public class DirectionsQuestionnaireServiceTest {
)
.build();
- @Mock
- private PilotCourtService pilotCourtService;
-
private DirectionsQuestionnaireService directionsQuestionnaireService;
@Before
public void setUp() {
- when(pilotCourtService.isPilotCourt(eq(PILOT_COURT_NAME), any(), any())).thenReturn(true);
- directionsQuestionnaireService = new DirectionsQuestionnaireService(pilotCourtService);
+ directionsQuestionnaireService = new DirectionsQuestionnaireService();
}
@Test
@@ -547,4 +538,4 @@ public void shouldReturnNullIfDQNotPresent() {
assertThat(directionsQuestionnaireService.getPreferredIndieSolCourt(claim)).isEqualTo(null);
}
-}
+}
\ No newline at end of file