diff --git a/.github/actions/secret-scanner/gitleaks-custom-rules-template.toml b/.github/actions/secret-scanner/gitleaks-custom-rules-template.toml
index 2d5f39288c..7eb8cbec9f 100644
--- a/.github/actions/secret-scanner/gitleaks-custom-rules-template.toml
+++ b/.github/actions/secret-scanner/gitleaks-custom-rules-template.toml
@@ -15,20 +15,20 @@ description = "Identify banned IDs"
regex = '''${GITLEAKS_REGEX_BANNED_IDS}'''
tags = ["banned-ids"]
-[allowlist]
-description = "Global allowlist"
-paths = [
- ".idea/.*",
- "(.*/)?target/.*",
- ".gitreview"
-]
-regexes = [
- '''(?i).*query\.local-justice.*''',
- '''(?i).*referencedata\.query\.local-justice-areas.*''',
- '''(?i).*referencedata\.local-authority-address.*''',
- '''(?i).*referencedata\.local-justice-area-address.*''',
- '''(?i).*referencedata\.query\.local.*''',
- '''(?i).*vnd\.referencedata\.query\.local.*''',
- '''(?i).*referencedata\.local.*'''
-]
+[allowlist]
+description = "Global allowlist"
+paths = [
+ ".idea/.*",
+ "(.*/)?target/.*",
+ ".gitreview"
+]
+regexes = [
+ '''(?i).*query\.local-justice.*''',
+ '''(?i).*referencedata\.query\.local-justice-areas.*''',
+ '''(?i).*referencedata\.local-authority-address.*''',
+ '''(?i).*referencedata\.local-justice-area-address.*''',
+ '''(?i).*referencedata\.query\.local.*''',
+ '''(?i).*vnd\.referencedata\.query\.local.*''',
+ '''(?i).*referencedata\.local.*'''
+]
diff --git a/azure-pipelines.yaml b/azure-pipelines.yaml
index 1275dd64ee..1b5070f628 100644
--- a/azure-pipelines.yaml
+++ b/azure-pipelines.yaml
@@ -21,7 +21,7 @@ resources:
type: github
name: hmcts/cpp-azure-devops-templates
endpoint: 'hmcts'
- ref: 'main'
+ ref: main
pool:
name: "MDV-ADO-AGENT-AKS-01"
diff --git a/buildWithSonar.sh b/buildWithSonar.sh
index 0d7e4fb11d..0b2d81e3d0 100755
--- a/buildWithSonar.sh
+++ b/buildWithSonar.sh
@@ -14,5 +14,8 @@ set -e
. functions.sh
+
+
+####
buildWithSonar
diff --git a/hearing-command/hearing-command-api/pom.xml b/hearing-command/hearing-command-api/pom.xml
index fa56ea5923..7697613c60 100644
--- a/hearing-command/hearing-command-api/pom.xml
+++ b/hearing-command/hearing-command-api/pom.xml
@@ -3,7 +3,7 @@
uk.gov.moj.cpp.hearing
hearing-command
- 17.0.143-SNAPSHOT
+ 17.0.151-RBSD-2609-SNAPSHOT
hearing-command-api
war
diff --git a/hearing-command/hearing-command-api/src/main/java/uk/gov/moj/cpp/hearing/command/api/HearingCommandApi.java b/hearing-command/hearing-command-api/src/main/java/uk/gov/moj/cpp/hearing/command/api/HearingCommandApi.java
index f9365c699b..390d787e1a 100644
--- a/hearing-command/hearing-command-api/src/main/java/uk/gov/moj/cpp/hearing/command/api/HearingCommandApi.java
+++ b/hearing-command/hearing-command-api/src/main/java/uk/gov/moj/cpp/hearing/command/api/HearingCommandApi.java
@@ -260,11 +260,6 @@ public void publishHearingListsForCrownCourtsWithIds(final JsonEnvelope envelope
sendEnvelopeWithName(envelope, "hearing.command.publish-hearing-lists-for-crown-courts-with-ids");
}
- @Handles("hearing.compute-outstanding-fines")
- public void computeOutstandingFines(final JsonEnvelope envelope) {
- sendEnvelopeWithName(envelope, "hearing.command.compute-outstanding-fines");
- }
-
@Handles("hearing.book-provisional-hearing-slots")
public void bookProvisionalHearingSlots(final JsonEnvelope envelope) {
sendEnvelopeWithName(envelope, "hearing.command.book-provisional-hearing-slots");
diff --git a/hearing-command/hearing-command-api/src/main/java/uk/gov/moj/cpp/hearing/command/api/HearingEventCommandApi.java b/hearing-command/hearing-command-api/src/main/java/uk/gov/moj/cpp/hearing/command/api/HearingEventCommandApi.java
index d5f3aa746d..fd2017a587 100644
--- a/hearing-command/hearing-command-api/src/main/java/uk/gov/moj/cpp/hearing/command/api/HearingEventCommandApi.java
+++ b/hearing-command/hearing-command-api/src/main/java/uk/gov/moj/cpp/hearing/command/api/HearingEventCommandApi.java
@@ -1,7 +1,7 @@
package uk.gov.moj.cpp.hearing.command.api;
-import static javax.json.Json.createArrayBuilder;
-import static javax.json.Json.createObjectBuilder;
+import static uk.gov.justice.services.messaging.JsonObjects.createArrayBuilder;
+import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder;
import static uk.gov.justice.services.core.annotation.Component.COMMAND_API;
import uk.gov.justice.services.common.converter.ZonedDateTimes;
diff --git a/hearing-command/hearing-command-api/src/main/java/uk/gov/moj/cpp/hearing/command/api/service/HearingQueryService.java b/hearing-command/hearing-command-api/src/main/java/uk/gov/moj/cpp/hearing/command/api/service/HearingQueryService.java
index 39dcc25be8..cb89005f4d 100644
--- a/hearing-command/hearing-command-api/src/main/java/uk/gov/moj/cpp/hearing/command/api/service/HearingQueryService.java
+++ b/hearing-command/hearing-command-api/src/main/java/uk/gov/moj/cpp/hearing/command/api/service/HearingQueryService.java
@@ -1,6 +1,6 @@
package uk.gov.moj.cpp.hearing.command.api.service;
-import static javax.json.Json.createObjectBuilder;
+import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder;
import static uk.gov.justice.services.core.annotation.Component.COMMAND_API;
import static uk.gov.justice.services.messaging.JsonEnvelope.envelopeFrom;
import static uk.gov.justice.services.messaging.JsonObjects.getUUID;
diff --git a/hearing-command/hearing-command-api/src/main/java/uk/gov/moj/cpp/hearing/command/api/service/ReferenceDataService.java b/hearing-command/hearing-command-api/src/main/java/uk/gov/moj/cpp/hearing/command/api/service/ReferenceDataService.java
index fd59323184..e04a7a21e5 100644
--- a/hearing-command/hearing-command-api/src/main/java/uk/gov/moj/cpp/hearing/command/api/service/ReferenceDataService.java
+++ b/hearing-command/hearing-command-api/src/main/java/uk/gov/moj/cpp/hearing/command/api/service/ReferenceDataService.java
@@ -1,7 +1,7 @@
package uk.gov.moj.cpp.hearing.command.api.service;
import static java.util.stream.Collectors.toList;
-import static javax.json.Json.createObjectBuilder;
+import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder;
import static uk.gov.justice.services.core.annotation.Component.COMMAND_API;
import static uk.gov.justice.services.messaging.Envelope.metadataFrom;
import static uk.gov.justice.services.messaging.JsonEnvelope.envelopeFrom;
diff --git a/hearing-command/hearing-command-api/src/main/resources/uk/gov/moj/cpp/hearing/command/api/accesscontrol/hearing-command-api.drl b/hearing-command/hearing-command-api/src/main/resources/uk/gov/moj/cpp/hearing/command/api/accesscontrol/hearing-command-api.drl
index fb6ea37dd1..dcb73ce527 100644
--- a/hearing-command/hearing-command-api/src/main/resources/uk/gov/moj/cpp/hearing/command/api/accesscontrol/hearing-command-api.drl
+++ b/hearing-command/hearing-command-api/src/main/resources/uk/gov/moj/cpp/hearing/command/api/accesscontrol/hearing-command-api.drl
@@ -449,15 +449,6 @@ rule "Command - API - Action - hearing.publish-hearing-lists-for-crown-courts-wi
$outcome.setSuccess(true);
end
-rule "Command - API - Action - hearing.compute-outstanding-fines"
- when
- $outcome: Outcome();
- $action: Action(name == "hearing.compute-outstanding-fines");
- eval(userAndGroupProvider.isMemberOfAnyOfTheSuppliedGroups($action,"Court Clerks", "Legal Advisers", "Court Associate", "NCES", "Court Administrators"));
- then
- $outcome.setSuccess(true);
-end
-
rule "Command - API - Action - hearing.record-session-time"
when
$outcome: Outcome();
diff --git a/hearing-command/hearing-command-api/src/raml/hearing-command-api.raml b/hearing-command/hearing-command-api/src/raml/hearing-command-api.raml
index ec9602dbcb..fcfc23fee4 100644
--- a/hearing-command/hearing-command-api/src/raml/hearing-command-api.raml
+++ b/hearing-command/hearing-command-api/src/raml/hearing-command-api.raml
@@ -551,22 +551,6 @@ baseUri: http://localhost:8080/hearing-command-api/command/api/rest/hearing
202:
description: Request accepted
-/outstanding-fines:
- post:
- description: |
- ...
- (mapping):
- requestType: application/vnd.hearing.compute-outstanding-fines+json
- name: hearing.compute-outstanding-fines
- ...
- body:
- application/vnd.hearing.compute-outstanding-fines+json:
- example: !include json/hearing.compute-outstanding-fines.json
- schema: !include json/schema/hearing.compute-outstanding-fines.json
- responses:
- 202:
- description: OK
-
/record-session-time:
post:
description: |
diff --git a/hearing-command/hearing-command-api/src/raml/json/schema/hearing.set-trial-type.json b/hearing-command/hearing-command-api/src/raml/json/schema/hearing.set-trial-type.json
index 1b0cd3c7c9..a0d48ee2d0 100644
--- a/hearing-command/hearing-command-api/src/raml/json/schema/hearing.set-trial-type.json
+++ b/hearing-command/hearing-command-api/src/raml/json/schema/hearing.set-trial-type.json
@@ -11,8 +11,10 @@
},
"vacatedTrialReasonId": {
"$ref": "http://justice.gov.uk/domain/core/common/definitions.json#/definitions/uuid"
+ },
+ "crackedIneffectiveSubReasonId": {
+ "$ref": "http://justice.gov.uk/domain/core/common/definitions.json#/definitions/uuid"
}
-
},
"oneOf": [
{
diff --git a/hearing-command/hearing-command-api/src/test/java/uk/gov/moj/cpp/hearing/command/api/DefendantsWelshTranslationsCommandApiTest.java b/hearing-command/hearing-command-api/src/test/java/uk/gov/moj/cpp/hearing/command/api/DefendantsWelshTranslationsCommandApiTest.java
index a6ff23b704..7a500fc8bb 100644
--- a/hearing-command/hearing-command-api/src/test/java/uk/gov/moj/cpp/hearing/command/api/DefendantsWelshTranslationsCommandApiTest.java
+++ b/hearing-command/hearing-command-api/src/test/java/uk/gov/moj/cpp/hearing/command/api/DefendantsWelshTranslationsCommandApiTest.java
@@ -16,7 +16,7 @@
import javax.json.JsonObject;
-import static javax.json.Json.createObjectBuilder;
+import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.core.Is.is;
import static org.mockito.Mockito.verify;
diff --git a/hearing-command/hearing-command-api/src/test/java/uk/gov/moj/cpp/hearing/command/api/HearingCommandApiAccessControlTest.java b/hearing-command/hearing-command-api/src/test/java/uk/gov/moj/cpp/hearing/command/api/HearingCommandApiAccessControlTest.java
index 705af3367c..c50122df20 100644
--- a/hearing-command/hearing-command-api/src/test/java/uk/gov/moj/cpp/hearing/command/api/HearingCommandApiAccessControlTest.java
+++ b/hearing-command/hearing-command-api/src/test/java/uk/gov/moj/cpp/hearing/command/api/HearingCommandApiAccessControlTest.java
@@ -45,8 +45,6 @@ public class HearingCommandApiAccessControlTest extends BaseDroolsAccessControlT
private static final String ACTION_NAME_COURT_LIST_PUBLISH_STATUS = "hearing.publish-court-list";
private static final String ACTION_NAME_PUBLISH_HEARING_LISTS_FOR_CROWN_COURTS = "hearing.publish-hearing-lists-for-crown-courts";
private static final String ACTION_NAME_PUBLISH_HEARING_LISTS_FOR_CROWN_COURTS_WITH_IDS = "hearing.publish-hearing-lists-for-crown-courts-with-ids";
- private static final String ACTION_NAME_COMPUTE_OUTSTANDING_FINES = "hearing.compute-outstanding-fines";
-
private static final String ACTION_NAME_RECORD_SESSION_TIME = "hearing.record-session-time";
private static final String ACTION_NAME_BOOK_PROVISIONAL_HEARING_SLOTS = "hearing.book-provisional-hearing-slots";
private static final String ACTION_NAME_SET_TRIAL_TYPE = "hearing.set-trial-type";
@@ -590,25 +588,6 @@ public void shouldNotAllowUserInAuthorisedGroupToBookProvisionalHearingSlots() {
assertFailureOutcome(results);
}
-
- @Test
- public void shouldAllowAuthorisedUserToComputeOutstandingFines() {
- final Action action = createActionFor(ACTION_NAME_COMPUTE_OUTSTANDING_FINES);
- given(this.userAndGroupProvider.isMemberOfAnyOfTheSuppliedGroups(action, "Court Clerks", "Legal Advisers", "Court Associate", "NCES", "Court Administrators"))
- .willReturn(true);
-
- final ExecutionResults results = executeRulesWith(action);
- assertSuccessfulOutcome(results);
- }
-
- @Test
- public void shouldNotAllowUnauthorisedUserToComputeOutstandingFines() {
- final Action action = createActionFor(ACTION_NAME_COMPUTE_OUTSTANDING_FINES);
-
- final ExecutionResults results = executeRulesWith(action);
- assertFailureOutcome(results);
- }
-
@Test
public void shouldAllowAuthorisedUserToRecordSessionTime() {
final Action action = createActionFor(ACTION_NAME_RECORD_SESSION_TIME);
diff --git a/hearing-command/hearing-command-api/src/test/java/uk/gov/moj/cpp/hearing/command/api/HearingCommandApiTest.java b/hearing-command/hearing-command-api/src/test/java/uk/gov/moj/cpp/hearing/command/api/HearingCommandApiTest.java
index c778dc0022..27ba791509 100644
--- a/hearing-command/hearing-command-api/src/test/java/uk/gov/moj/cpp/hearing/command/api/HearingCommandApiTest.java
+++ b/hearing-command/hearing-command-api/src/test/java/uk/gov/moj/cpp/hearing/command/api/HearingCommandApiTest.java
@@ -6,7 +6,7 @@
import static java.util.function.Function.identity;
import static java.util.stream.Collectors.toList;
import static java.util.stream.Collectors.toMap;
-import static javax.json.Json.createObjectBuilder;
+import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.containsInAnyOrder;
import static org.hamcrest.core.Is.is;
@@ -236,15 +236,6 @@ public void shouldPassThroughAddCompanyRepresentativeRequestToCommandHandler() {
assertEnvelopeIsPassedThroughWithName(jsonRequestEnvelope.payloadAsJsonObject(), "hearing.command.add-company-representative");
}
- @Test
- public void shouldPassThroughComputeOutstandingFinesRequestToCommandHandler() {
- final JsonEnvelope jsonRequestEnvelope = buildDummyJsonRequestEnvelopeWithName("hearing.compute-outstanding-fines");
-
- hearingCommandApi.computeOutstandingFines(jsonRequestEnvelope);
-
- assertEnvelopeIsPassedThroughWithName(jsonRequestEnvelope.payloadAsJsonObject(), "hearing.command.compute-outstanding-fines");
- }
-
@Test
public void shouldPassThroughBookProvisionalHearingSlotsRequestToCommandHandler() {
final JsonEnvelope jsonRequestEnvelope = buildDummyJsonRequestEnvelopeWithName("hearing.book-provisional-hearing-slots");
diff --git a/hearing-command/hearing-command-api/src/test/java/uk/gov/moj/cpp/hearing/command/api/HearingEventCommandApiTest.java b/hearing-command/hearing-command-api/src/test/java/uk/gov/moj/cpp/hearing/command/api/HearingEventCommandApiTest.java
index 638cf20801..7f473edeac 100644
--- a/hearing-command/hearing-command-api/src/test/java/uk/gov/moj/cpp/hearing/command/api/HearingEventCommandApiTest.java
+++ b/hearing-command/hearing-command-api/src/test/java/uk/gov/moj/cpp/hearing/command/api/HearingEventCommandApiTest.java
@@ -6,8 +6,8 @@
import static java.lang.Boolean.TRUE;
import static java.lang.String.format;
import static java.util.UUID.randomUUID;
-import static javax.json.Json.createArrayBuilder;
-import static javax.json.Json.createObjectBuilder;
+import static uk.gov.justice.services.messaging.JsonObjects.createArrayBuilder;
+import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder;
import static org.hamcrest.CoreMatchers.allOf;
import static org.hamcrest.CoreMatchers.equalTo;
import static org.hamcrest.MatcherAssert.assertThat;
diff --git a/hearing-command/hearing-command-api/src/test/java/uk/gov/moj/cpp/hearing/command/api/NotificationCommandApiTest.java b/hearing-command/hearing-command-api/src/test/java/uk/gov/moj/cpp/hearing/command/api/NotificationCommandApiTest.java
index 276ca630f3..d779f9f2d4 100644
--- a/hearing-command/hearing-command-api/src/test/java/uk/gov/moj/cpp/hearing/command/api/NotificationCommandApiTest.java
+++ b/hearing-command/hearing-command-api/src/test/java/uk/gov/moj/cpp/hearing/command/api/NotificationCommandApiTest.java
@@ -2,8 +2,8 @@
import static com.jayway.jsonpath.matchers.JsonPathMatchers.withJsonPath;
import static java.util.UUID.randomUUID;
-import static javax.json.Json.createArrayBuilder;
-import static javax.json.Json.createObjectBuilder;
+import static uk.gov.justice.services.messaging.JsonObjects.createArrayBuilder;
+import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder;
import static org.hamcrest.CoreMatchers.allOf;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.core.Is.is;
diff --git a/hearing-command/hearing-command-api/src/test/java/uk/gov/moj/cpp/hearing/command/api/ReusableInfoCommandApiTest.java b/hearing-command/hearing-command-api/src/test/java/uk/gov/moj/cpp/hearing/command/api/ReusableInfoCommandApiTest.java
index 5ce7d475aa..a89809c7c4 100644
--- a/hearing-command/hearing-command-api/src/test/java/uk/gov/moj/cpp/hearing/command/api/ReusableInfoCommandApiTest.java
+++ b/hearing-command/hearing-command-api/src/test/java/uk/gov/moj/cpp/hearing/command/api/ReusableInfoCommandApiTest.java
@@ -1,6 +1,6 @@
package uk.gov.moj.cpp.hearing.command.api;
-import static javax.json.Json.createObjectBuilder;
+import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.core.Is.is;
import static org.mockito.Mockito.verify;
diff --git a/hearing-command/hearing-command-api/src/test/java/uk/gov/moj/cpp/hearing/command/api/YouthCourtDefendantsCommandApiTest.java b/hearing-command/hearing-command-api/src/test/java/uk/gov/moj/cpp/hearing/command/api/YouthCourtDefendantsCommandApiTest.java
index f7fb39776e..d72260dcbd 100644
--- a/hearing-command/hearing-command-api/src/test/java/uk/gov/moj/cpp/hearing/command/api/YouthCourtDefendantsCommandApiTest.java
+++ b/hearing-command/hearing-command-api/src/test/java/uk/gov/moj/cpp/hearing/command/api/YouthCourtDefendantsCommandApiTest.java
@@ -12,7 +12,7 @@
import javax.json.JsonObject;
-import static javax.json.Json.createObjectBuilder;
+import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.core.Is.is;
import static org.mockito.Mockito.verify;
diff --git a/hearing-command/hearing-command-api/src/test/java/uk/gov/moj/cpp/hearing/command/api/service/HearingQueryServiceTest.java b/hearing-command/hearing-command-api/src/test/java/uk/gov/moj/cpp/hearing/command/api/service/HearingQueryServiceTest.java
index 56de5e4a2a..427d528842 100644
--- a/hearing-command/hearing-command-api/src/test/java/uk/gov/moj/cpp/hearing/command/api/service/HearingQueryServiceTest.java
+++ b/hearing-command/hearing-command-api/src/test/java/uk/gov/moj/cpp/hearing/command/api/service/HearingQueryServiceTest.java
@@ -1,7 +1,7 @@
package uk.gov.moj.cpp.hearing.command.api.service;
import static java.util.UUID.randomUUID;
-import static javax.json.Json.createObjectBuilder;
+import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
diff --git a/hearing-command/hearing-command-api/src/test/java/uk/gov/moj/cpp/hearing/command/api/service/ReferenceDataServiceTest.java b/hearing-command/hearing-command-api/src/test/java/uk/gov/moj/cpp/hearing/command/api/service/ReferenceDataServiceTest.java
index e14f75e79f..49f31750fb 100644
--- a/hearing-command/hearing-command-api/src/test/java/uk/gov/moj/cpp/hearing/command/api/service/ReferenceDataServiceTest.java
+++ b/hearing-command/hearing-command-api/src/test/java/uk/gov/moj/cpp/hearing/command/api/service/ReferenceDataServiceTest.java
@@ -23,7 +23,7 @@
import java.util.List;
import java.util.UUID;
-import javax.json.Json;
+import uk.gov.justice.services.messaging.JsonObjects;
import javax.json.JsonObject;
import org.junit.jupiter.api.Test;
@@ -71,7 +71,7 @@ public void shouldReturnValidResultDefinition() {
@Test
public void shouldReturnEmptyResultDefinition() {
- final JsonObject jsonObjectPayload = Json.createObjectBuilder().add("resultDefinitions", Json.createArrayBuilder().add(Json.createObjectBuilder().build())).build();
+ final JsonObject jsonObjectPayload = JsonObjects.createObjectBuilder().add("resultDefinitions", JsonObjects.createArrayBuilder().add(JsonObjects.createObjectBuilder().build())).build();
final Metadata metadata = CommandAPITestBase.metadataFor(RESULT_QUERY, randomUUID().toString());
final Envelope envelope = Envelope.envelopeFrom(metadata, jsonObjectPayload);
diff --git a/hearing-command/hearing-command-handler/pom.xml b/hearing-command/hearing-command-handler/pom.xml
index 0ad48ed721..5c4ae0fedd 100644
--- a/hearing-command/hearing-command-handler/pom.xml
+++ b/hearing-command/hearing-command-handler/pom.xml
@@ -3,7 +3,7 @@
uk.gov.moj.cpp.hearing
hearing-command
- 17.0.143-SNAPSHOT
+ 17.0.151-RBSD-2609-SNAPSHOT
hearing-command-handler
war
diff --git a/hearing-command/hearing-command-handler/src/main/java/uk/gov/moj/cpp/hearing/command/handler/ComputeOutstandingFinesCommandHandler.java b/hearing-command/hearing-command-handler/src/main/java/uk/gov/moj/cpp/hearing/command/handler/ComputeOutstandingFinesCommandHandler.java
deleted file mode 100644
index 6beffc4293..0000000000
--- a/hearing-command/hearing-command-handler/src/main/java/uk/gov/moj/cpp/hearing/command/handler/ComputeOutstandingFinesCommandHandler.java
+++ /dev/null
@@ -1,53 +0,0 @@
-package uk.gov.moj.cpp.hearing.command.handler;
-
-import static uk.gov.justice.services.core.annotation.Component.COMMAND_HANDLER;
-import static uk.gov.justice.services.core.enveloper.Enveloper.toEnvelopeWithMetadataFrom;
-
-import uk.gov.justice.services.core.annotation.Handles;
-import uk.gov.justice.services.core.annotation.ServiceComponent;
-import uk.gov.justice.services.eventsourcing.source.core.EventStream;
-import uk.gov.justice.services.eventsourcing.source.core.exception.EventStreamException;
-import uk.gov.justice.services.messaging.JsonEnvelope;
-import uk.gov.moj.cpp.hearing.domain.OutstandingFinesQuery;
-import uk.gov.moj.cpp.hearing.domain.event.OutstandingFinesQueried;
-
-import java.util.UUID;
-import java.util.stream.Stream;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-@ServiceComponent(COMMAND_HANDLER)
-public class ComputeOutstandingFinesCommandHandler extends AbstractCommandHandler {
-
- private static final Logger LOGGER =
- LoggerFactory.getLogger(ComputeOutstandingFinesCommandHandler.class.getName());
-
- @Handles("hearing.command.compute-outstanding-fines")
- public void computeOutstandingFines(final JsonEnvelope envelope) throws EventStreamException {
-
- if (LOGGER.isDebugEnabled()) {
- LOGGER.debug("hearing.command.compute-outstanding-fines {}", envelope.toObfuscatedDebugString());
- }
-
- final OutstandingFinesQuery outstandingFinesQuery = convertToObject(envelope, OutstandingFinesQuery.class);
-
- final EventStream eventStream = eventSource.getStreamById(UUID.randomUUID());
-
- final Stream newEvents = Stream.of(outstandingFinesQuery)
- .map(this::createOutstandingFinesQueried)
- .map(toEnvelopeWithMetadataFrom(envelope));
-
- eventStream.append(newEvents);
-
- }
-
- private OutstandingFinesQueried createOutstandingFinesQueried(final OutstandingFinesQuery query) {
- return OutstandingFinesQueried.newBuilder()
- .withCourtCentreId(query.getCourtCentreId())
- .withCourtRoomIds(query.getCourtRoomIds())
- .withHearingDate(query.getHearingDate())
- .build();
- }
-
-}
\ No newline at end of file
diff --git a/hearing-command/hearing-command-handler/src/main/java/uk/gov/moj/cpp/hearing/command/handler/CustodyTimeLimitClockHandler.java b/hearing-command/hearing-command-handler/src/main/java/uk/gov/moj/cpp/hearing/command/handler/CustodyTimeLimitClockHandler.java
index a427c19e09..c18a549f66 100644
--- a/hearing-command/hearing-command-handler/src/main/java/uk/gov/moj/cpp/hearing/command/handler/CustodyTimeLimitClockHandler.java
+++ b/hearing-command/hearing-command-handler/src/main/java/uk/gov/moj/cpp/hearing/command/handler/CustodyTimeLimitClockHandler.java
@@ -1,7 +1,7 @@
package uk.gov.moj.cpp.hearing.command.handler;
import static java.util.stream.Collectors.toList;
-import static javax.json.Json.createObjectBuilder;
+import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder;
import static uk.gov.justice.services.core.annotation.Component.COMMAND_HANDLER;
import static uk.gov.justice.services.messaging.JsonEnvelope.envelopeFrom;
import static uk.gov.justice.services.messaging.JsonEnvelope.metadataFrom;
diff --git a/hearing-command/hearing-command-handler/src/main/java/uk/gov/moj/cpp/hearing/command/handler/PublishCourtListStatusHandler.java b/hearing-command/hearing-command-handler/src/main/java/uk/gov/moj/cpp/hearing/command/handler/PublishCourtListStatusHandler.java
index 3a5d6e8c46..0020480a5a 100644
--- a/hearing-command/hearing-command-handler/src/main/java/uk/gov/moj/cpp/hearing/command/handler/PublishCourtListStatusHandler.java
+++ b/hearing-command/hearing-command-handler/src/main/java/uk/gov/moj/cpp/hearing/command/handler/PublishCourtListStatusHandler.java
@@ -23,7 +23,7 @@
import java.util.stream.Stream;
import javax.inject.Inject;
-import javax.json.Json;
+import uk.gov.justice.services.messaging.JsonObjects;
import javax.json.JsonString;
import javax.json.JsonValue;
@@ -94,7 +94,7 @@ public void publishHearingListsForCrownCourts(final JsonEnvelope commandEnvelope
@Handles("hearing.command.publish-hearing-lists-for-crown-courts-with-ids")
public void publishHearingListsForCrownCourtsWithIds(final JsonEnvelope commandEnvelope) {
Optional.ofNullable(commandEnvelope.payloadAsJsonObject().getJsonArray("ids"))
- .orElse(Json.createArrayBuilder().build()).getValuesAs(JsonString.class)
+ .orElse(JsonObjects.createArrayBuilder().build()).getValuesAs(JsonString.class)
.stream().map(JsonString::getString).map(UUID::fromString)
.forEach(courtCentreId -> publishFinalCourtList(commandEnvelope.metadata(), courtCentreId));
}
@@ -121,7 +121,7 @@ private PublishCourtList generatePublishCourtListCommand(final UUID courtCentreI
}
public static JsonValue asJson(final PublishCourtList publishCourtList) {
- return Json.createObjectBuilder()
+ return JsonObjects.createObjectBuilder()
.add(PublishCourtListFields.COURT_CENTRE_ID.getInternalName(), publishCourtList.getCourtCentreId().toString())
.add(PublishCourtListFields.CREATED_TIME.getInternalName(), publishCourtList.getCreatedTime().toString())
.build();
diff --git a/hearing-command/hearing-command-handler/src/main/java/uk/gov/moj/cpp/hearing/command/handler/SetTrialTypeCommandHandler.java b/hearing-command/hearing-command-handler/src/main/java/uk/gov/moj/cpp/hearing/command/handler/SetTrialTypeCommandHandler.java
index bdfea98262..2e99d3894b 100644
--- a/hearing-command/hearing-command-handler/src/main/java/uk/gov/moj/cpp/hearing/command/handler/SetTrialTypeCommandHandler.java
+++ b/hearing-command/hearing-command-handler/src/main/java/uk/gov/moj/cpp/hearing/command/handler/SetTrialTypeCommandHandler.java
@@ -1,7 +1,7 @@
package uk.gov.moj.cpp.hearing.command.handler;
import static java.util.Objects.nonNull;
-import static javax.json.Json.createObjectBuilder;
+import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder;
import static uk.gov.justice.services.core.annotation.Component.COMMAND_HANDLER;
import static uk.gov.justice.services.messaging.JsonEnvelope.envelopeFrom;
import static uk.gov.justice.services.messaging.JsonEnvelope.metadataFrom;
@@ -63,8 +63,9 @@ public void handleTrialType(final JsonEnvelope envelope) throws EventStreamExcep
final String description = crackedIneffectiveReason.getString("description");
final String type = crackedIneffectiveReason.getString("type");
final Optional id = getUUID(crackedIneffectiveReason, "id");
+ final UUID crackedIneffectiveSubReasonId = trialType.getCrackedIneffectiveSubReasonId();
- aggregate(HearingAggregate.class, trialType.getHearingId(), envelope, a -> a.setTrialType(new HearingTrialType(trialType.getHearingId(), id.get(), code, type, description)));
+ aggregate(HearingAggregate.class, trialType.getHearingId(), envelope, a -> a.setTrialType(new HearingTrialType(trialType.getHearingId(), id.get(), code, type, description,crackedIneffectiveSubReasonId)));
}
if (nonNull(trialType.getIsEffectiveTrial()) && trialType.getIsEffectiveTrial()) {
diff --git a/hearing-command/hearing-command-handler/src/main/java/uk/gov/moj/cpp/hearing/command/handler/service/ReferenceDataService.java b/hearing-command/hearing-command-handler/src/main/java/uk/gov/moj/cpp/hearing/command/handler/service/ReferenceDataService.java
index e1620b4fc5..f78bb8511c 100644
--- a/hearing-command/hearing-command-handler/src/main/java/uk/gov/moj/cpp/hearing/command/handler/service/ReferenceDataService.java
+++ b/hearing-command/hearing-command-handler/src/main/java/uk/gov/moj/cpp/hearing/command/handler/service/ReferenceDataService.java
@@ -18,7 +18,7 @@
import java.util.stream.Collectors;
import static java.util.UUID.randomUUID;
-import static javax.json.Json.createObjectBuilder;
+import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder;
import static uk.gov.justice.services.core.annotation.Component.COMMAND_API;
import static uk.gov.justice.services.messaging.JsonEnvelope.envelopeFrom;
import static uk.gov.justice.services.messaging.JsonEnvelope.metadataBuilder;
diff --git a/hearing-command/hearing-command-handler/src/raml/hearing-command-handler.messaging.raml b/hearing-command/hearing-command-handler/src/raml/hearing-command-handler.messaging.raml
index f70d017609..32b6f257db 100644
--- a/hearing-command/hearing-command-handler/src/raml/hearing-command-handler.messaging.raml
+++ b/hearing-command/hearing-command-handler/src/raml/hearing-command-handler.messaging.raml
@@ -413,11 +413,6 @@ baseUri: message://command/handler/message/hearing
schema: !include json/schema/hearing.command.publish-hearing-lists-for-crown-courts-with-ids.json
example: !include json/hearing.command.publish-hearing-lists-for-crown-courts-with-ids.json
-# Compute Outstanding Fines
- application/vnd.hearing.command.compute-outstanding-fines+json:
- schema: !include json/schema/hearing.command.compute-outstanding-fines.json
- example: !include json/hearing.command.compute-outstanding-fines.json
-
application/vnd.hearing.command.record-session-time+json:
schema: !include json/schema/hearing.command.record-session-time.json
example: !include json/hearing.command.record-session-time.json
diff --git a/hearing-command/hearing-command-handler/src/raml/json/hearing.command.compute-outstanding-fines.json b/hearing-command/hearing-command-handler/src/raml/json/hearing.command.compute-outstanding-fines.json
deleted file mode 100644
index f9037056e5..0000000000
--- a/hearing-command/hearing-command-handler/src/raml/json/hearing.command.compute-outstanding-fines.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
- "courtCentreId": "05683290-f82a-456f-8017-12d9717b703a",
- "courtRoomIds": [
- "0d8b8e7c-e803-4ba5-96df-1917eccaaf9d",
- "db4ac13f-9791-4796-8a8e-7c01d84a3893"
- ],
- "hearingDate": "2019-12-17"
-}
\ No newline at end of file
diff --git a/hearing-command/hearing-command-handler/src/raml/json/schema/hearing.command.compute-outstanding-fines.json b/hearing-command/hearing-command-handler/src/raml/json/schema/hearing.command.compute-outstanding-fines.json
deleted file mode 100644
index a2ad68fa48..0000000000
--- a/hearing-command/hearing-command-handler/src/raml/json/schema/hearing.command.compute-outstanding-fines.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
- "$schema": "http://json-schema.org/draft-04/schema#",
- "id": "http://justice.gov.uk/hearing/courts/hearing.command.compute-outstanding-fines.json",
- "type": "object",
- "properties": {
- "courtCentreId": {
- "$ref": "http://justice.gov.uk/core/courts/courtsDefinitions.json#/definitions/uuid"
- },
- "courtRoomIds": {
- "type": "array",
- "minItems": 1,
- "items": {
- "$ref": "http://justice.gov.uk/core/courts/courtsDefinitions.json#/definitions/uuid"
- }
- },
- "hearingDate": {
- "$ref": "http://justice.gov.uk/core/courts/courtsDefinitions.json#/definitions/datePattern"
- }
- },
- "required": [
- "courtCentreId",
- "courtRoomIds",
- "hearingDate"
- ],
- "additionalProperties": false
-}
\ No newline at end of file
diff --git a/hearing-command/hearing-command-handler/src/raml/json/schema/hearing.command.set-trial-type.json b/hearing-command/hearing-command-handler/src/raml/json/schema/hearing.command.set-trial-type.json
index 6866dc4a5c..84184e11cd 100644
--- a/hearing-command/hearing-command-handler/src/raml/json/schema/hearing.command.set-trial-type.json
+++ b/hearing-command/hearing-command-handler/src/raml/json/schema/hearing.command.set-trial-type.json
@@ -14,6 +14,9 @@
},
"vacatedTrialReasonId": {
"$ref": "http://justice.gov.uk/domain/core/common/definitions.json#/definitions/uuid"
+ },
+ "crackedIneffectiveSubReasonId": {
+ "$ref": "http://justice.gov.uk/domain/core/common/definitions.json#/definitions/uuid"
}
},
"oneOf": [
diff --git a/hearing-command/hearing-command-handler/src/test/java/uk/gov/moj/cpp/hearing/command/handler/AddDefendantCommandHandlerTest.java b/hearing-command/hearing-command-handler/src/test/java/uk/gov/moj/cpp/hearing/command/handler/AddDefendantCommandHandlerTest.java
index 614451d173..fef2d5de88 100644
--- a/hearing-command/hearing-command-handler/src/test/java/uk/gov/moj/cpp/hearing/command/handler/AddDefendantCommandHandlerTest.java
+++ b/hearing-command/hearing-command-handler/src/test/java/uk/gov/moj/cpp/hearing/command/handler/AddDefendantCommandHandlerTest.java
@@ -42,7 +42,7 @@
import java.time.ZonedDateTime;
import java.util.UUID;
-import javax.json.Json;
+import uk.gov.justice.services.messaging.JsonObjects;
import javax.json.JsonObject;
import org.junit.jupiter.api.Test;
@@ -99,8 +99,8 @@ public void testCaseDefendantAddedIgnored() throws EventStreamException {
when(this.eventSource.getStreamById(arbitraryDefendant.getProsecutionCaseId())).thenReturn(this.caseEventStream);
when(this.aggregateService.get(this.caseEventStream, CaseAggregate.class)).thenReturn(caseAggregate);
- JsonObject payload = Json.createObjectBuilder()
- .add("defendants", Json.createArrayBuilder().add(objectToJsonObjectConverter.convert(arbitraryDefendant)).build())
+ JsonObject payload = JsonObjects.createObjectBuilder()
+ .add("defendants", JsonObjects.createArrayBuilder().add(objectToJsonObjectConverter.convert(arbitraryDefendant)).build())
.build();
final JsonEnvelope envelope = envelopeFrom(metadataWithRandomUUID("hearing.add-defendant"), payload);
@@ -130,8 +130,8 @@ public void testCaseDefendantAdded_When_Hearing_Date_Already_Passed() throws Eve
when(this.eventSource.getStreamById(arbitraryDefendant.getProsecutionCaseId())).thenReturn(this.caseEventStream);
when(this.aggregateService.get(this.caseEventStream, CaseAggregate.class)).thenReturn(caseAggregate);
- JsonObject payload = Json.createObjectBuilder()
- .add("defendants", Json.createArrayBuilder().add(objectToJsonObjectConverter.convert(arbitraryDefendant)).build())
+ JsonObject payload = JsonObjects.createObjectBuilder()
+ .add("defendants", JsonObjects.createArrayBuilder().add(objectToJsonObjectConverter.convert(arbitraryDefendant)).build())
.build();
final JsonEnvelope envelope = envelopeFrom(metadataWithRandomUUID("hearing.add-defendant"), payload);
when(this.eventSource.getStreamById(arbitraryHearingObject.getHearingId())).thenReturn(this.hearingEventStream);
@@ -167,8 +167,8 @@ public void testCaseDefendantShouldAdded() throws EventStreamException {
when(this.eventSource.getStreamById(arbitraryDefendant.getProsecutionCaseId())).thenReturn(this.caseEventStream);
when(this.aggregateService.get(this.caseEventStream, CaseAggregate.class)).thenReturn(caseAggregate);
- JsonObject payload = Json.createObjectBuilder()
- .add("defendants", Json.createArrayBuilder().add(objectToJsonObjectConverter.convert(arbitraryDefendant)).build())
+ JsonObject payload = JsonObjects.createObjectBuilder()
+ .add("defendants", JsonObjects.createArrayBuilder().add(objectToJsonObjectConverter.convert(arbitraryDefendant)).build())
.build();
final JsonEnvelope envelope = envelopeFrom(metadataWithRandomUUID("hearing.add-defendant"), payload);
when(this.eventSource.getStreamById(arbitraryHearingObject.getHearingId())).thenReturn(this.hearingEventStream);
@@ -204,8 +204,8 @@ public void testCaseDefendantShouldNotBeAddedWhenDuplicate() throws EventStreamE
when(this.eventSource.getStreamById(arbitraryDefendant.getProsecutionCaseId())).thenReturn(this.caseEventStream);
when(this.aggregateService.get(this.caseEventStream, CaseAggregate.class)).thenReturn(caseAggregate);
- JsonObject payload = Json.createObjectBuilder()
- .add("defendants", Json.createArrayBuilder().add(objectToJsonObjectConverter.convert(arbitraryDefendant)).build())
+ JsonObject payload = JsonObjects.createObjectBuilder()
+ .add("defendants", JsonObjects.createArrayBuilder().add(objectToJsonObjectConverter.convert(arbitraryDefendant)).build())
.build();
final JsonEnvelope envelope = envelopeFrom(metadataWithRandomUUID("hearing.add-defendant"), payload);
when(this.eventSource.getStreamById(arbitraryHearingObject.getHearingId())).thenReturn(this.hearingEventStream);
@@ -248,8 +248,8 @@ public void testCaseDefendantShouldAdded_When_Hearing_Date_In_Future() throws Ev
when(this.eventSource.getStreamById(arbitraryDefendant.getProsecutionCaseId())).thenReturn(this.caseEventStream);
when(this.aggregateService.get(this.caseEventStream, CaseAggregate.class)).thenReturn(caseAggregate);
- JsonObject payload = Json.createObjectBuilder()
- .add("defendants", Json.createArrayBuilder().add(objectToJsonObjectConverter.convert(arbitraryDefendant)).build())
+ JsonObject payload = JsonObjects.createObjectBuilder()
+ .add("defendants", JsonObjects.createArrayBuilder().add(objectToJsonObjectConverter.convert(arbitraryDefendant)).build())
.build();
final JsonEnvelope envelope = envelopeFrom(metadataWithRandomUUID("hearing.add-defendant"), payload);
when(this.eventSource.getStreamById(arbitraryHearingObject.getHearingId())).thenReturn(this.hearingEventStream);
@@ -284,9 +284,9 @@ public void shouldAddDefendantToAllHearingsWhenListHearingRequestsAreEmpty() thr
when(this.eventSource.getStreamById(arbitraryDefendant.getProsecutionCaseId())).thenReturn(this.caseEventStream);
when(this.aggregateService.get(this.caseEventStream, CaseAggregate.class)).thenReturn(caseAggregate);
- JsonObject payload = Json.createObjectBuilder()
- .add("defendants", Json.createArrayBuilder().add(objectToJsonObjectConverter.convert(arbitraryDefendant)).build())
- .add("listHearingRequests", Json.createArrayBuilder().build())
+ JsonObject payload = JsonObjects.createObjectBuilder()
+ .add("defendants", JsonObjects.createArrayBuilder().add(objectToJsonObjectConverter.convert(arbitraryDefendant)).build())
+ .add("listHearingRequests", JsonObjects.createArrayBuilder().build())
.build();
final JsonEnvelope envelope = envelopeFrom(metadataWithRandomUUID("hearing.add-defendant"), payload);
when(this.eventSource.getStreamById(arbitraryHearingObject.getHearingId())).thenReturn(this.hearingEventStream);
@@ -328,9 +328,9 @@ public void shouldNotAddDefendantToAnyHearingsWhenNoMatchToListHearingRequests()
.build();
- JsonObject payload = Json.createObjectBuilder()
- .add("defendants", Json.createArrayBuilder().add(objectToJsonObjectConverter.convert(arbitraryDefendant)).build())
- .add("listHearingRequests", Json.createArrayBuilder().add(objectToJsonObjectConverter.convert(listHearingRequest)).build())
+ JsonObject payload = JsonObjects.createObjectBuilder()
+ .add("defendants", JsonObjects.createArrayBuilder().add(objectToJsonObjectConverter.convert(arbitraryDefendant)).build())
+ .add("listHearingRequests", JsonObjects.createArrayBuilder().add(objectToJsonObjectConverter.convert(listHearingRequest)).build())
.build();
final JsonEnvelope envelope = envelopeFrom(metadataWithRandomUUID("hearing.add-defendant"), payload);
when(this.eventSource.getStreamById(arbitraryHearingObject.getHearingId())).thenReturn(this.hearingEventStream);
@@ -374,9 +374,9 @@ public void shouldAddDefendantToHearingWithMatchingHearingRequest() throws Event
.build();
- JsonObject payload = Json.createObjectBuilder()
- .add("defendants", Json.createArrayBuilder().add(objectToJsonObjectConverter.convert(arbitraryDefendant)).build())
- .add("listHearingRequests", Json.createArrayBuilder().add(objectToJsonObjectConverter.convert(listHearingRequest)).build())
+ JsonObject payload = JsonObjects.createObjectBuilder()
+ .add("defendants", JsonObjects.createArrayBuilder().add(objectToJsonObjectConverter.convert(arbitraryDefendant)).build())
+ .add("listHearingRequests", JsonObjects.createArrayBuilder().add(objectToJsonObjectConverter.convert(listHearingRequest)).build())
.build();
final JsonEnvelope envelope = envelopeFrom(metadataWithRandomUUID("hearing.add-defendant"), payload);
diff --git a/hearing-command/hearing-command-handler/src/test/java/uk/gov/moj/cpp/hearing/command/handler/AddMasterDefendantIdToDefendantCommandHandlerTest.java b/hearing-command/hearing-command-handler/src/test/java/uk/gov/moj/cpp/hearing/command/handler/AddMasterDefendantIdToDefendantCommandHandlerTest.java
index 3a067f9599..3458cdd04a 100644
--- a/hearing-command/hearing-command-handler/src/test/java/uk/gov/moj/cpp/hearing/command/handler/AddMasterDefendantIdToDefendantCommandHandlerTest.java
+++ b/hearing-command/hearing-command-handler/src/test/java/uk/gov/moj/cpp/hearing/command/handler/AddMasterDefendantIdToDefendantCommandHandlerTest.java
@@ -1,7 +1,7 @@
package uk.gov.moj.cpp.hearing.command.handler;
import static java.util.UUID.randomUUID;
-import static javax.json.Json.createObjectBuilder;
+import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.is;
import static org.mockito.Mockito.when;
diff --git a/hearing-command/hearing-command-handler/src/test/java/uk/gov/moj/cpp/hearing/command/handler/ApplicationDetailChangeCommandHandlerTest.java b/hearing-command/hearing-command-handler/src/test/java/uk/gov/moj/cpp/hearing/command/handler/ApplicationDetailChangeCommandHandlerTest.java
index 5a85c4fcc1..b95e266ca5 100644
--- a/hearing-command/hearing-command-handler/src/test/java/uk/gov/moj/cpp/hearing/command/handler/ApplicationDetailChangeCommandHandlerTest.java
+++ b/hearing-command/hearing-command-handler/src/test/java/uk/gov/moj/cpp/hearing/command/handler/ApplicationDetailChangeCommandHandlerTest.java
@@ -50,7 +50,7 @@
import java.util.UUID;
-import javax.json.Json;
+import uk.gov.justice.services.messaging.JsonObjects;
import javax.json.JsonObject;
import org.junit.jupiter.api.Test;
@@ -105,7 +105,7 @@ public void testUpdateExistingCourtApplicationShouldIgnored_When_Hearing_Not_Fou
when(this.eventSource.getStreamById(courtApplication.getId())).thenReturn(this.applicationEventStream);
when(this.aggregateService.get(this.applicationEventStream, ApplicationAggregate.class)).thenReturn(applicationAggregate);
- JsonObject payload = Json.createObjectBuilder()
+ JsonObject payload = JsonObjects.createObjectBuilder()
.add("courtApplication", objectToJsonObjectConverter.convert(courtApplication))
.build();
final JsonEnvelope envelope = envelopeFrom(metadataWithRandomUUID("hearing.update-court-application"), payload);
@@ -138,7 +138,7 @@ public void testUpdateExistingCourtApplicationShouldApply_When_Application_Alrea
when(this.aggregateService.get(this.applicationEventStream, ApplicationAggregate.class)).thenReturn(applicationAggregate);
- JsonObject payload = Json.createObjectBuilder()
+ JsonObject payload = JsonObjects.createObjectBuilder()
.add("courtApplication", objectToJsonObjectConverter.convert(courtApplication))
.build();
final JsonEnvelope envelope = envelopeFrom(metadataWithRandomUUID("hearing.update-court-application"), payload);
@@ -177,7 +177,7 @@ void testUpdateLaaReferenceForApplicationShouldIgnored_When_Hearing_Not_Found()
when(this.eventSource.getStreamById(applicationId)).thenReturn(this.applicationEventStream);
when(this.aggregateService.get(this.applicationEventStream, ApplicationAggregate.class)).thenReturn(applicationAggregate);
- JsonObject payload = Json.createObjectBuilder()
+ JsonObject payload = JsonObjects.createObjectBuilder()
.add("applicationId", applicationId.toString())
.add("subjectId", subjectId.toString() )
.add("offenceId", offenceId.toString() )
@@ -221,7 +221,7 @@ void testUpdateLaaRefernceForApplicationShouldApply_When_Application_Already_Add
when(this.aggregateService.get(this.applicationEventStream, ApplicationAggregate.class)).thenReturn(applicationAggregate);
- JsonObject payload = Json.createObjectBuilder()
+ JsonObject payload = JsonObjects.createObjectBuilder()
.add("applicationId", applicationId.toString())
.add("subjectId", subjectId.toString() )
.add("offenceId", offenceId.toString() )
@@ -267,7 +267,7 @@ void testUpdateLaaRefernceForApplicationShouldApply_When_Application_Already_Add
when(this.aggregateService.get(this.applicationEventStream, ApplicationAggregate.class)).thenReturn(applicationAggregate);
- JsonObject payload = Json.createObjectBuilder()
+ JsonObject payload = JsonObjects.createObjectBuilder()
.add("applicationId", applicationId.toString())
.add("subjectId", subjectId.toString() )
.add("laaReference", objectToJsonObjectConverter.convert(laaReference))
@@ -314,7 +314,7 @@ void testUpdateDefenceOrganisationForApplicationShouldIgnored_When_Hearing_Not_F
when(this.eventSource.getStreamById(applicationId)).thenReturn(this.applicationEventStream);
when(this.aggregateService.get(this.applicationEventStream, ApplicationAggregate.class)).thenReturn(applicationAggregate);
- JsonObject payload = Json.createObjectBuilder()
+ JsonObject payload = JsonObjects.createObjectBuilder()
.add("applicationId", applicationId.toString())
.add("subjectId", subjectId.toString() )
.add("associatedDefenceOrganisation", objectToJsonObjectConverter.convert(associatedDefenceOrganisation))
@@ -362,7 +362,7 @@ void testUpdateDefenceOrganisationForApplicationShouldApply_When_Application_Alr
when(this.aggregateService.get(this.applicationEventStream, ApplicationAggregate.class)).thenReturn(applicationAggregate);
- JsonObject payload = Json.createObjectBuilder()
+ JsonObject payload = JsonObjects.createObjectBuilder()
.add("applicationId", applicationId.toString())
.add("subjectId", subjectId.toString() )
.add("associatedDefenceOrganisation", objectToJsonObjectConverter.convert(associatedDefenceOrganisation))
@@ -415,7 +415,7 @@ void testUpdateDefenceOrganisationAsNullForApplicationShouldApply_When_Applicati
when(this.aggregateService.get(this.applicationEventStream, ApplicationAggregate.class)).thenReturn(applicationAggregate);
- JsonObject payload = Json.createObjectBuilder()
+ JsonObject payload = JsonObjects.createObjectBuilder()
.add("applicationId", applicationId.toString())
.add("subjectId", subjectId.toString() )
.build();
diff --git a/hearing-command/hearing-command-handler/src/test/java/uk/gov/moj/cpp/hearing/command/handler/CaseMarkersCommandHandlerTest.java b/hearing-command/hearing-command-handler/src/test/java/uk/gov/moj/cpp/hearing/command/handler/CaseMarkersCommandHandlerTest.java
index aacbbc1c72..b97417c4e6 100644
--- a/hearing-command/hearing-command-handler/src/test/java/uk/gov/moj/cpp/hearing/command/handler/CaseMarkersCommandHandlerTest.java
+++ b/hearing-command/hearing-command-handler/src/test/java/uk/gov/moj/cpp/hearing/command/handler/CaseMarkersCommandHandlerTest.java
@@ -26,7 +26,7 @@
import java.util.UUID;
import java.util.stream.Collectors;
-import javax.json.Json;
+import uk.gov.justice.services.messaging.JsonObjects;
import javax.json.JsonObject;
import org.hamcrest.Matchers;
@@ -80,11 +80,11 @@ public void updateCaseMarkers() throws EventStreamException {
aggregate.registerHearingId(fromString("34d07e81-9770-4d23-af6f-84f1d7571bd3"), fromString("581767a1-22af-408a-92f0-20837846cc6f"));
aggregate.registerHearingId(fromString("34d07e81-9770-4d23-af6f-84f1d7571bd3"), fromString("123767a1-22af-408a-92f0-20837846cc67"));
- final JsonObject payload = Json.createObjectBuilder()
+ final JsonObject payload = JsonObjects.createObjectBuilder()
.add("prosecutionCaseId", "34d07e81-9770-4d23-af6f-84f1d7571bd3")
.add("hearingId", "581767a1-22af-408a-92f0-20837846cc6f")
- .add("caseMarkers", Json.createArrayBuilder()
- .add(Json.createObjectBuilder()
+ .add("caseMarkers", JsonObjects.createArrayBuilder()
+ .add(JsonObjects.createObjectBuilder()
.add("id", "3789ab16-0bb7-4ef1-87ef-c936bf0364f1")
.add("markerTypeid", "3789ab16-0bb7-4ef1-87ef-c936bf0364f1")
.add("markerTypeCode", "WP")
@@ -112,13 +112,13 @@ public void updateCaseMarkers() throws EventStreamException {
@Test
public void updateCaseMarkersForAssociatedHearings() throws EventStreamException {
- final JsonObject payload = Json.createObjectBuilder()
+ final JsonObject payload = JsonObjects.createObjectBuilder()
.add("prosecutionCaseId", "34d07e81-9770-4d23-af6f-84f1d7571bd3")
- .add("hearingIds", Json.createArrayBuilder()
+ .add("hearingIds", JsonObjects.createArrayBuilder()
.add("581767a1-22af-408a-92f0-20837846cc6f")
.build())
- .add("caseMarkers", Json.createArrayBuilder()
- .add(Json.createObjectBuilder()
+ .add("caseMarkers", JsonObjects.createArrayBuilder()
+ .add(JsonObjects.createObjectBuilder()
.add("id", "3789ab16-0bb7-4ef1-87ef-c936bf0364f1")
.add("markerTypeid", "3789ab16-0bb7-4ef1-87ef-c936bf0364f1")
.add("markerTypeCode", "WP")
diff --git a/hearing-command/hearing-command-handler/src/test/java/uk/gov/moj/cpp/hearing/command/handler/ComputeOutstandingFinesCommandHandlerTest.java b/hearing-command/hearing-command-handler/src/test/java/uk/gov/moj/cpp/hearing/command/handler/ComputeOutstandingFinesCommandHandlerTest.java
deleted file mode 100644
index 8f4261e0d2..0000000000
--- a/hearing-command/hearing-command-handler/src/test/java/uk/gov/moj/cpp/hearing/command/handler/ComputeOutstandingFinesCommandHandlerTest.java
+++ /dev/null
@@ -1,111 +0,0 @@
-package uk.gov.moj.cpp.hearing.command.handler;
-
-import static java.util.UUID.fromString;
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.is;
-import static org.hamcrest.collection.IsIterableContainingInAnyOrder.containsInAnyOrder;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.Mockito.when;
-import static uk.gov.justice.services.test.utils.core.enveloper.EnveloperFactory.createEnveloperWithEvents;
-import static uk.gov.justice.services.test.utils.core.helper.EventStreamMockHelper.verifyAppendAndGetArgumentFrom;
-import static uk.gov.justice.services.test.utils.core.messaging.MetadataBuilderFactory.metadataWithRandomUUID;
-import static uk.gov.justice.services.test.utils.core.reflection.ReflectionUtil.setField;
-import static uk.gov.moj.cpp.hearing.test.ObjectConverters.asPojo;
-import static uk.gov.moj.cpp.hearing.test.matchers.BeanMatcher.isBean;
-
-import uk.gov.justice.services.common.converter.JsonObjectToObjectConverter;
-import uk.gov.justice.services.common.converter.ObjectToJsonObjectConverter;
-import uk.gov.justice.services.common.converter.jackson.ObjectMapperProducer;
-import uk.gov.justice.services.core.enveloper.Enveloper;
-import uk.gov.justice.services.eventsourcing.source.core.EventSource;
-import uk.gov.justice.services.eventsourcing.source.core.EventStream;
-import uk.gov.justice.services.eventsourcing.source.core.exception.EventStreamException;
-import uk.gov.justice.services.messaging.JsonEnvelope;
-import uk.gov.justice.services.messaging.MetadataBuilder;
-import uk.gov.justice.services.test.utils.framework.api.JsonObjectConvertersFactory;
-import uk.gov.moj.cpp.hearing.domain.event.OutstandingFinesQueried;
-
-import java.time.LocalDate;
-import java.util.stream.Collectors;
-
-import javax.json.Json;
-import javax.json.JsonObject;
-
-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.Mock;
-import org.mockito.Spy;
-import org.mockito.junit.jupiter.MockitoExtension;
-
-@ExtendWith(MockitoExtension.class)
-public class ComputeOutstandingFinesCommandHandlerTest {
-
- private static final String COURT_ROOM_ID1 = "2181fbc2-f4f9-495b-a648-9bb45e752302";
- private static final String COURT_ROOM_ID2 = "872f4cce-6be1-45c8-a520-604828c96cbd";
- private static final String COURT_ROOM_ID3 = "d16499b0-28ca-48e2-960a-c443123af9c3";
-
- @Spy
- private final Enveloper enveloper = createEnveloperWithEvents(OutstandingFinesQueried.class);
-
- @InjectMocks
- private ComputeOutstandingFinesCommandHandler computeOutstandingFinesCommandHandler;
-
-
- @Mock
- private EventStream eventStream;
-
- @Mock
- private EventSource eventSource;
-
- @Spy
- private JsonObjectToObjectConverter jsonObjectToObjectConverter = new JsonObjectConvertersFactory().jsonObjectToObjectConverter();
-
- @Spy
- private ObjectToJsonObjectConverter objectToJsonObjectConverter = new JsonObjectConvertersFactory().objectToJsonObjectConverter();
-
-
- @Test
- public void computeOutstandingFines() throws EventStreamException {
-
-
- final JsonObject payload = createCourtRoomsOutstandingFInesQuery();
-
- final MetadataBuilder metadataBuilder = metadataWithRandomUUID("hearing.command.compute-outstanding-fines")
- .withClientCorrelationId("0d5d72c0-7987-4677-8ce7-69fab7031f9b");
-
- final JsonEnvelope envelope = JsonEnvelope.envelopeFrom(metadataBuilder, payload);
-
- when(eventSource.getStreamById(any())).thenReturn(eventStream);
-
-
- computeOutstandingFinesCommandHandler.computeOutstandingFines(envelope);
-
- final JsonEnvelope actualEventProduced = verifyAppendAndGetArgumentFrom(eventStream).collect(Collectors.toList()).get(0);
- assertThat(actualEventProduced.metadata().name(), is("hearing.compute-outstanding-fines-requested"));
- assertThat(actualEventProduced.metadata().clientCorrelationId().get(), is("0d5d72c0-7987-4677-8ce7-69fab7031f9b"));
- assertThat(asPojo(actualEventProduced, OutstandingFinesQueried.class),
- isBean(OutstandingFinesQueried.class)
- .with(OutstandingFinesQueried::getCourtCentreId, is(fromString("88abd281-8c52-4171-aca1-740f734b43d7")))
- .with(OutstandingFinesQueried::getCourtRoomIds, containsInAnyOrder(
- fromString(COURT_ROOM_ID1),
- fromString(COURT_ROOM_ID2),
- fromString(COURT_ROOM_ID3)
- ))
- .with(OutstandingFinesQueried::getHearingDate, is(LocalDate.parse("2019-12-18")))
- );
- }
-
- private JsonObject createCourtRoomsOutstandingFInesQuery() {
- return Json.createObjectBuilder()
- .add("courtCentreId", "88abd281-8c52-4171-aca1-740f734b43d7")
- .add("courtRoomIds", Json.createArrayBuilder()
- .add(COURT_ROOM_ID1)
- .add(COURT_ROOM_ID2)
- .add(COURT_ROOM_ID3))
- .add("hearingDate", "2019-12-18")
- .build();
- }
-
-}
\ No newline at end of file
diff --git a/hearing-command/hearing-command-handler/src/test/java/uk/gov/moj/cpp/hearing/command/handler/CustodyTimeLimitClockHandlerTest.java b/hearing-command/hearing-command-handler/src/test/java/uk/gov/moj/cpp/hearing/command/handler/CustodyTimeLimitClockHandlerTest.java
index df3a43e781..7af5b7263d 100644
--- a/hearing-command/hearing-command-handler/src/test/java/uk/gov/moj/cpp/hearing/command/handler/CustodyTimeLimitClockHandlerTest.java
+++ b/hearing-command/hearing-command-handler/src/test/java/uk/gov/moj/cpp/hearing/command/handler/CustodyTimeLimitClockHandlerTest.java
@@ -3,8 +3,8 @@
import static com.jayway.jsonpath.matchers.JsonPathMatchers.withJsonPath;
import static java.util.UUID.randomUUID;
-import static javax.json.Json.createArrayBuilder;
-import static javax.json.Json.createObjectBuilder;
+import static uk.gov.justice.services.messaging.JsonObjects.createArrayBuilder;
+import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder;
import static org.codehaus.groovy.runtime.InvokerHelper.asList;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
diff --git a/hearing-command/hearing-command-handler/src/test/java/uk/gov/moj/cpp/hearing/command/handler/DefendantsWelshTranslationsCommandHandlerTest.java b/hearing-command/hearing-command-handler/src/test/java/uk/gov/moj/cpp/hearing/command/handler/DefendantsWelshTranslationsCommandHandlerTest.java
index 529c40a5ea..4ba957e056 100644
--- a/hearing-command/hearing-command-handler/src/test/java/uk/gov/moj/cpp/hearing/command/handler/DefendantsWelshTranslationsCommandHandlerTest.java
+++ b/hearing-command/hearing-command-handler/src/test/java/uk/gov/moj/cpp/hearing/command/handler/DefendantsWelshTranslationsCommandHandlerTest.java
@@ -1,7 +1,7 @@
package uk.gov.moj.cpp.hearing.command.handler;
import static java.util.UUID.randomUUID;
-import static javax.json.Json.createObjectBuilder;
+import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder;
import static org.hamcrest.CoreMatchers.is;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.eq;
@@ -33,7 +33,7 @@
import java.util.UUID;
import java.util.stream.Collectors;
-import javax.json.Json;
+import uk.gov.justice.services.messaging.JsonObjects;
import javax.json.JsonObjectBuilder;
import org.junit.jupiter.api.Test;
@@ -103,7 +103,7 @@ private JsonEnvelope createHearingCommandSaveDefendantsWelshTranslationsEnvelope
final DefendantsWithWelshTranslationsCommand defendantsWithWelshTranslationsCommand) {
final JsonObjectBuilder payloadBuilder = createObjectBuilder()
.add("hearingId", hearingId.toString())
- .add("defendantsWelshList", Json.createArrayBuilder().add(objectToJsonObjectConverter.convert(defendantsWithWelshTranslationsCommand)).build());
+ .add("defendantsWelshList", JsonObjects.createArrayBuilder().add(objectToJsonObjectConverter.convert(defendantsWithWelshTranslationsCommand)).build());
return JsonEnvelope.envelopeFrom(metadataWithRandomUUID("hearing.command.save-defendants-welsh-translations"), payloadBuilder.build());
}
diff --git a/hearing-command/hearing-command-handler/src/test/java/uk/gov/moj/cpp/hearing/command/handler/DeleteCourtApplicationHandlerTest.java b/hearing-command/hearing-command-handler/src/test/java/uk/gov/moj/cpp/hearing/command/handler/DeleteCourtApplicationHandlerTest.java
index 8fda64b1b4..8373edd1fe 100644
--- a/hearing-command/hearing-command-handler/src/test/java/uk/gov/moj/cpp/hearing/command/handler/DeleteCourtApplicationHandlerTest.java
+++ b/hearing-command/hearing-command-handler/src/test/java/uk/gov/moj/cpp/hearing/command/handler/DeleteCourtApplicationHandlerTest.java
@@ -21,7 +21,7 @@
import java.util.UUID;
import java.util.stream.Stream;
-import javax.json.Json;
+import uk.gov.justice.services.messaging.JsonObjects;
import javax.json.JsonObject;
import org.junit.jupiter.api.Test;
@@ -62,7 +62,7 @@ public void shouldHandleDeleteCourtApplication() throws EventStreamException {
when(eventSource.getStreamById(any())).thenReturn(eventStream);
when(aggregateService.get(eventStream, HearingAggregate.class)).thenReturn(hearingAggregate);
when(hearingAggregate.deleteCourtApplicationHearing(hearingId)).thenReturn(mock(Stream.class));
- final JsonObject payload = Json.createObjectBuilder()
+ final JsonObject payload = JsonObjects.createObjectBuilder()
.add("hearingId", hearingId.toString())
.build();
final JsonEnvelope commandEnvelope = createEnvelope("hearing.command.delete-court-application-hearing", payload);
diff --git a/hearing-command/hearing-command-handler/src/test/java/uk/gov/moj/cpp/hearing/command/handler/DeleteHearingCommandHandlerTest.java b/hearing-command/hearing-command-handler/src/test/java/uk/gov/moj/cpp/hearing/command/handler/DeleteHearingCommandHandlerTest.java
index fe890edd86..3c5ee9dc18 100644
--- a/hearing-command/hearing-command-handler/src/test/java/uk/gov/moj/cpp/hearing/command/handler/DeleteHearingCommandHandlerTest.java
+++ b/hearing-command/hearing-command-handler/src/test/java/uk/gov/moj/cpp/hearing/command/handler/DeleteHearingCommandHandlerTest.java
@@ -2,8 +2,8 @@
import static com.jayway.jsonpath.matchers.JsonPathMatchers.withJsonPath;
import static java.util.UUID.randomUUID;
-import static javax.json.Json.createArrayBuilder;
-import static javax.json.Json.createObjectBuilder;
+import static uk.gov.justice.services.messaging.JsonObjects.createArrayBuilder;
+import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.core.AllOf.allOf;
diff --git a/hearing-command/hearing-command-handler/src/test/java/uk/gov/moj/cpp/hearing/command/handler/DuplicateHearingCommandHandlerTest.java b/hearing-command/hearing-command-handler/src/test/java/uk/gov/moj/cpp/hearing/command/handler/DuplicateHearingCommandHandlerTest.java
index 30cca91cc1..311b0497dc 100644
--- a/hearing-command/hearing-command-handler/src/test/java/uk/gov/moj/cpp/hearing/command/handler/DuplicateHearingCommandHandlerTest.java
+++ b/hearing-command/hearing-command-handler/src/test/java/uk/gov/moj/cpp/hearing/command/handler/DuplicateHearingCommandHandlerTest.java
@@ -2,8 +2,8 @@
import static com.jayway.jsonpath.matchers.JsonPathMatchers.withJsonPath;
import static java.util.UUID.randomUUID;
-import static javax.json.Json.createArrayBuilder;
-import static javax.json.Json.createObjectBuilder;
+import static uk.gov.justice.services.messaging.JsonObjects.createArrayBuilder;
+import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.core.AllOf.allOf;
diff --git a/hearing-command/hearing-command-handler/src/test/java/uk/gov/moj/cpp/hearing/command/handler/EjectCaseOrApplicationCommandHandlerTest.java b/hearing-command/hearing-command-handler/src/test/java/uk/gov/moj/cpp/hearing/command/handler/EjectCaseOrApplicationCommandHandlerTest.java
index 066bd85fae..b12a2beb5c 100644
--- a/hearing-command/hearing-command-handler/src/test/java/uk/gov/moj/cpp/hearing/command/handler/EjectCaseOrApplicationCommandHandlerTest.java
+++ b/hearing-command/hearing-command-handler/src/test/java/uk/gov/moj/cpp/hearing/command/handler/EjectCaseOrApplicationCommandHandlerTest.java
@@ -35,7 +35,7 @@
import java.util.UUID;
import java.util.stream.Stream;
-import javax.json.Json;
+import uk.gov.justice.services.messaging.JsonObjects;
import javax.json.JsonObject;
import org.junit.jupiter.api.Test;
@@ -74,8 +74,8 @@ public class EjectCaseOrApplicationCommandHandlerTest {
public void shouldEjectCase() throws EventStreamException {
final UUID hearingId = randomUUID();
final UUID prosecutionCaseId = randomUUID();
- JsonObject payload = Json.createObjectBuilder()
- .add("hearingIds", Json.createArrayBuilder().add(hearingId.toString()))
+ JsonObject payload = JsonObjects.createObjectBuilder()
+ .add("hearingIds", JsonObjects.createArrayBuilder().add(hearingId.toString()))
.add("prosecutionCaseId", prosecutionCaseId.toString())
.build();
final JsonEnvelope envelope =
@@ -95,7 +95,7 @@ public void shouldEjectCase() throws EventStreamException {
@Test
public void shouldEjectCaseWhenHearingIdsNotPresent() throws EventStreamException {
final UUID prosecutionCaseId = randomUUID();
- JsonObject payload = Json.createObjectBuilder()
+ JsonObject payload = JsonObjects.createObjectBuilder()
.add("prosecutionCaseId", prosecutionCaseId.toString())
.build();
final JsonEnvelope envelope =
@@ -112,7 +112,7 @@ public void shouldEjectCaseWhenHearingIdsNotPresent() throws EventStreamExceptio
@Test
public void shouldEjectApplicationWhenHearingIdsNotPresent() throws EventStreamException {
final UUID applicationId = randomUUID();
- JsonObject payload = Json.createObjectBuilder()
+ JsonObject payload = JsonObjects.createObjectBuilder()
.add("applicationId", applicationId.toString())
.build();
final JsonEnvelope envelope =
@@ -129,7 +129,7 @@ public void shouldEjectApplicationWhenHearingIdsNotPresent() throws EventStreamE
@Test
public void shouldRaiseCourtApplicationEjectedWhenProsecutionCaseIdIsNullButHearingIdsIsNotNull() throws EventStreamException {
final UUID applicationId = randomUUID();
- JsonObject payload = Json.createObjectBuilder()
+ JsonObject payload = JsonObjects.createObjectBuilder()
.add("applicationId", applicationId.toString())
.build();
final JsonEnvelope envelope =
@@ -150,8 +150,8 @@ public void shouldRaiseCourtApplicationEjectedWhenProsecutionCaseIdIsNullButHear
public void shouldEjectCourtApplication() throws EventStreamException {
final UUID hearingId = randomUUID();
final UUID applicationId = randomUUID();
- JsonObject payload = Json.createObjectBuilder()
- .add("hearingIds", Json.createArrayBuilder().add(hearingId.toString()))
+ JsonObject payload = JsonObjects.createObjectBuilder()
+ .add("hearingIds", JsonObjects.createArrayBuilder().add(hearingId.toString()))
.add("applicationId", applicationId.toString())
.build();
final JsonEnvelope envelope =
diff --git a/hearing-command/hearing-command-handler/src/test/java/uk/gov/moj/cpp/hearing/command/handler/ExtendCustodyTimeLimitCommandHandlerTest.java b/hearing-command/hearing-command-handler/src/test/java/uk/gov/moj/cpp/hearing/command/handler/ExtendCustodyTimeLimitCommandHandlerTest.java
index 90e8df5752..650361f244 100644
--- a/hearing-command/hearing-command-handler/src/test/java/uk/gov/moj/cpp/hearing/command/handler/ExtendCustodyTimeLimitCommandHandlerTest.java
+++ b/hearing-command/hearing-command-handler/src/test/java/uk/gov/moj/cpp/hearing/command/handler/ExtendCustodyTimeLimitCommandHandlerTest.java
@@ -2,7 +2,7 @@
import static com.jayway.jsonpath.matchers.JsonPathMatchers.withJsonPath;
import static java.util.UUID.randomUUID;
-import static javax.json.Json.createObjectBuilder;
+import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.core.AllOf.allOf;
diff --git a/hearing-command/hearing-command-handler/src/test/java/uk/gov/moj/cpp/hearing/command/handler/HearingCommandHandlerRamlConfigTest.java b/hearing-command/hearing-command-handler/src/test/java/uk/gov/moj/cpp/hearing/command/handler/HearingCommandHandlerRamlConfigTest.java
index 18c0f5806c..10067f76ce 100644
--- a/hearing-command/hearing-command-handler/src/test/java/uk/gov/moj/cpp/hearing/command/handler/HearingCommandHandlerRamlConfigTest.java
+++ b/hearing-command/hearing-command-handler/src/test/java/uk/gov/moj/cpp/hearing/command/handler/HearingCommandHandlerRamlConfigTest.java
@@ -61,7 +61,6 @@ public void testActionNameAndHandleNameAreSame() throws Exception {
UpdateDefendantLegalAidStatusCommandHandler.class,
UpdateCaseDefendantsHandler.class,
PublishCourtListStatusHandler.class,
- ComputeOutstandingFinesCommandHandler.class,
SessionTimeCommandHandler.class,
BookProvisionalHearingSlotsCommandHandler.class,
ClearVacatedReasonCommandHandler.class,
diff --git a/hearing-command/hearing-command-handler/src/test/java/uk/gov/moj/cpp/hearing/command/handler/InitiateHearingCommandHandlerTest.java b/hearing-command/hearing-command-handler/src/test/java/uk/gov/moj/cpp/hearing/command/handler/InitiateHearingCommandHandlerTest.java
index 6264cb580e..47e89fbd7d 100644
--- a/hearing-command/hearing-command-handler/src/test/java/uk/gov/moj/cpp/hearing/command/handler/InitiateHearingCommandHandlerTest.java
+++ b/hearing-command/hearing-command-handler/src/test/java/uk/gov/moj/cpp/hearing/command/handler/InitiateHearingCommandHandlerTest.java
@@ -5,7 +5,7 @@
import static java.util.Collections.singletonList;
import static java.util.UUID.randomUUID;
import static java.util.stream.Collectors.toList;
-import static javax.json.Json.createObjectBuilder;
+import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder;
import static org.hamcrest.CoreMatchers.hasItem;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
diff --git a/hearing-command/hearing-command-handler/src/test/java/uk/gov/moj/cpp/hearing/command/handler/ProsecutionCaseCommandHandlerTest.java b/hearing-command/hearing-command-handler/src/test/java/uk/gov/moj/cpp/hearing/command/handler/ProsecutionCaseCommandHandlerTest.java
index d943f08058..65033419a1 100644
--- a/hearing-command/hearing-command-handler/src/test/java/uk/gov/moj/cpp/hearing/command/handler/ProsecutionCaseCommandHandlerTest.java
+++ b/hearing-command/hearing-command-handler/src/test/java/uk/gov/moj/cpp/hearing/command/handler/ProsecutionCaseCommandHandlerTest.java
@@ -1,8 +1,8 @@
package uk.gov.moj.cpp.hearing.command.handler;
import static java.util.UUID.randomUUID;
-import static javax.json.Json.createArrayBuilder;
-import static javax.json.Json.createObjectBuilder;
+import static uk.gov.justice.services.messaging.JsonObjects.createArrayBuilder;
+import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.is;
import static org.mockito.ArgumentMatchers.any;
diff --git a/hearing-command/hearing-command-handler/src/test/java/uk/gov/moj/cpp/hearing/command/handler/ProvisionalHearingSlotInfoHandlerTest.java b/hearing-command/hearing-command-handler/src/test/java/uk/gov/moj/cpp/hearing/command/handler/ProvisionalHearingSlotInfoHandlerTest.java
index a26fb31fd9..90b152c392 100644
--- a/hearing-command/hearing-command-handler/src/test/java/uk/gov/moj/cpp/hearing/command/handler/ProvisionalHearingSlotInfoHandlerTest.java
+++ b/hearing-command/hearing-command-handler/src/test/java/uk/gov/moj/cpp/hearing/command/handler/ProvisionalHearingSlotInfoHandlerTest.java
@@ -2,8 +2,8 @@
import static com.jayway.jsonpath.matchers.JsonPathMatchers.withJsonPath;
import static java.time.ZonedDateTime.parse;
-import static javax.json.Json.createArrayBuilder;
-import static javax.json.Json.createObjectBuilder;
+import static uk.gov.justice.services.messaging.JsonObjects.createArrayBuilder;
+import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.core.AllOf.allOf;
diff --git a/hearing-command/hearing-command-handler/src/test/java/uk/gov/moj/cpp/hearing/command/handler/PublishCourtListStatusHandlerTest.java b/hearing-command/hearing-command-handler/src/test/java/uk/gov/moj/cpp/hearing/command/handler/PublishCourtListStatusHandlerTest.java
index 7f117fbfca..e7dbf8a9f0 100644
--- a/hearing-command/hearing-command-handler/src/test/java/uk/gov/moj/cpp/hearing/command/handler/PublishCourtListStatusHandlerTest.java
+++ b/hearing-command/hearing-command-handler/src/test/java/uk/gov/moj/cpp/hearing/command/handler/PublishCourtListStatusHandlerTest.java
@@ -1,9 +1,9 @@
package uk.gov.moj.cpp.hearing.command.handler;
import static java.util.UUID.randomUUID;
-import static javax.json.Json.createArrayBuilder;
-import static javax.json.Json.createObjectBuilder;
-import static javax.json.Json.createReader;
+import static uk.gov.justice.services.messaging.JsonObjects.createArrayBuilder;
+import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder;
+import static uk.gov.justice.services.messaging.JsonObjects.createReader;
import static org.apache.commons.lang3.RandomStringUtils.randomAlphanumeric;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
@@ -39,7 +39,7 @@
import java.util.UUID;
import java.util.stream.Stream;
-import javax.json.Json;
+import uk.gov.justice.services.messaging.JsonObjects;
import javax.json.JsonObject;
import javax.json.JsonReader;
@@ -108,7 +108,7 @@ public void hearingCommandHandlerShouldTriggerExportFailedForPublishEvent() thro
.replace("ERROR_MESSAGE", errorMessage)
.replace("CREATED_TIME", createdTime.toString());
try {
- final JsonReader jsonReader = Json.createReader(new StringReader(jsonString));
+ final JsonReader jsonReader = JsonObjects.createReader(new StringReader(jsonString));
final JsonEnvelope commandEnvelope = createEnvelope("hearing.command.record-court-list-export-failed", jsonReader.readObject());
publishCourtListStatusHandler.recordCourtListExportFailed(commandEnvelope);
verify(courtListAggregate).recordCourtListExportFailed(any(UUID.class), any(String.class), any(ZonedDateTime.class), eq(errorMessage));
@@ -133,7 +133,7 @@ public void hearingCommandHandlerShouldTriggerExportSuccessfulForPublishEvent()
.replace("CREATED_TIME", createdTime);
try {
- final JsonReader jsonReader = Json.createReader(new StringReader(jsonString));
+ final JsonReader jsonReader = JsonObjects.createReader(new StringReader(jsonString));
final JsonEnvelope commandEnvelope = createEnvelope("hearing.command.record-court-list-export-successful", jsonReader.readObject());
publishCourtListStatusHandler.recordCourtListExportSuccessful(commandEnvelope);
verify(courtListAggregate).recordCourtListExportSuccessful(any(UUID.class), any(String.class), any(ZonedDateTime.class));
@@ -154,7 +154,7 @@ public void shouldCreatePublishHearingListRequestedEvent() throws Exception {
final String jsonString = givenPayload("/hearing.command.publish-court-list.json").toString()
.replace("COURT_CENTRE_ID", courtCentreId.toString());
- final JsonReader jsonReader = Json.createReader(new StringReader(jsonString));
+ final JsonReader jsonReader = JsonObjects.createReader(new StringReader(jsonString));
final JsonEnvelope commandEnvelope = createEnvelope("hearing.command.publish-court-list", jsonReader.readObject());
publishCourtListStatusHandler.publishCourtList(commandEnvelope);
verify(courtListAggregate).recordCourtListRequested(any(UUID.class), any(ZonedDateTime.class));
diff --git a/hearing-command/hearing-command-handler/src/test/java/uk/gov/moj/cpp/hearing/command/handler/RecordNextHearingDayUpdatedCommandHandlerTest.java b/hearing-command/hearing-command-handler/src/test/java/uk/gov/moj/cpp/hearing/command/handler/RecordNextHearingDayUpdatedCommandHandlerTest.java
index ced54304b6..dc8f8f8305 100644
--- a/hearing-command/hearing-command-handler/src/test/java/uk/gov/moj/cpp/hearing/command/handler/RecordNextHearingDayUpdatedCommandHandlerTest.java
+++ b/hearing-command/hearing-command-handler/src/test/java/uk/gov/moj/cpp/hearing/command/handler/RecordNextHearingDayUpdatedCommandHandlerTest.java
@@ -32,7 +32,7 @@
import java.time.ZonedDateTime;
import java.util.UUID;
-import javax.json.Json;
+import uk.gov.justice.services.messaging.JsonObjects;
import javax.json.JsonObject;
import org.hamcrest.Matchers;
@@ -76,7 +76,7 @@ public void shouldCreateNextHearingDayChangedEvent() throws EventStreamException
final UUID seedingHearingId = randomUUID();
final ZonedDateTime earliestNextHearingDate = ZonedDateTime.of(2022, 01, 01, 0, 0, 0, 0, ZoneId.of("UTC"));
- final JsonObject payload = Json.createObjectBuilder()
+ final JsonObject payload = JsonObjects.createObjectBuilder()
.add("hearingId", hearingId.toString())
.add("seedingHearingId", seedingHearingId.toString())
.add("hearingStartDate", "2021-06-20T00:00:00.000Z")
diff --git a/hearing-command/hearing-command-handler/src/test/java/uk/gov/moj/cpp/hearing/command/handler/RemoveCaseFromGroupCasesCommandHandlerTest.java b/hearing-command/hearing-command-handler/src/test/java/uk/gov/moj/cpp/hearing/command/handler/RemoveCaseFromGroupCasesCommandHandlerTest.java
index b5018f7af0..1cc4f3bdc2 100644
--- a/hearing-command/hearing-command-handler/src/test/java/uk/gov/moj/cpp/hearing/command/handler/RemoveCaseFromGroupCasesCommandHandlerTest.java
+++ b/hearing-command/hearing-command-handler/src/test/java/uk/gov/moj/cpp/hearing/command/handler/RemoveCaseFromGroupCasesCommandHandlerTest.java
@@ -42,7 +42,7 @@
import java.util.UUID;
import java.util.stream.Stream;
-import javax.json.Json;
+import uk.gov.justice.services.messaging.JsonObjects;
import javax.json.JsonObjectBuilder;
import org.junit.jupiter.api.BeforeEach;
@@ -222,7 +222,7 @@ public void shouldCreatePrivateEvent_WhenCaseRemovedWithMultipleHearings() throw
}
private JsonEnvelope getJsonEnvelopeForRemoveCommand(final UUID groupId, final UUID masterCaseId, final ProsecutionCase removedCase, final ProsecutionCase newGroupMaster) {
- JsonObjectBuilder builder = Json.createObjectBuilder()
+ JsonObjectBuilder builder = JsonObjects.createObjectBuilder()
.add("groupId", groupId.toString())
.add("masterCaseId", masterCaseId.toString())
.add("removedCase", objectToJsonObjectConverter.convert(removedCase));
diff --git a/hearing-command/hearing-command-handler/src/test/java/uk/gov/moj/cpp/hearing/command/handler/RemoveTargetsCommandHandlerTest.java b/hearing-command/hearing-command-handler/src/test/java/uk/gov/moj/cpp/hearing/command/handler/RemoveTargetsCommandHandlerTest.java
index 2b862247e9..687a195ea4 100644
--- a/hearing-command/hearing-command-handler/src/test/java/uk/gov/moj/cpp/hearing/command/handler/RemoveTargetsCommandHandlerTest.java
+++ b/hearing-command/hearing-command-handler/src/test/java/uk/gov/moj/cpp/hearing/command/handler/RemoveTargetsCommandHandlerTest.java
@@ -1,8 +1,8 @@
package uk.gov.moj.cpp.hearing.command.handler;
import static java.util.UUID.randomUUID;
-import static javax.json.Json.createArrayBuilder;
-import static javax.json.Json.createObjectBuilder;
+import static uk.gov.justice.services.messaging.JsonObjects.createArrayBuilder;
+import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.is;
import static org.mockito.Mockito.when;
diff --git a/hearing-command/hearing-command-handler/src/test/java/uk/gov/moj/cpp/hearing/command/handler/RequestApprovalCommandHandlerTest.java b/hearing-command/hearing-command-handler/src/test/java/uk/gov/moj/cpp/hearing/command/handler/RequestApprovalCommandHandlerTest.java
index 901bb44270..4bc9b9e58f 100644
--- a/hearing-command/hearing-command-handler/src/test/java/uk/gov/moj/cpp/hearing/command/handler/RequestApprovalCommandHandlerTest.java
+++ b/hearing-command/hearing-command-handler/src/test/java/uk/gov/moj/cpp/hearing/command/handler/RequestApprovalCommandHandlerTest.java
@@ -1,7 +1,7 @@
package uk.gov.moj.cpp.hearing.command.handler;
import static com.jayway.jsonpath.matchers.JsonPathMatchers.withJsonPath;
-import static javax.json.Json.createObjectBuilder;
+import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.core.AllOf.allOf;
diff --git a/hearing-command/hearing-command-handler/src/test/java/uk/gov/moj/cpp/hearing/command/handler/SetTrialTypeCommandHandlerTest.java b/hearing-command/hearing-command-handler/src/test/java/uk/gov/moj/cpp/hearing/command/handler/SetTrialTypeCommandHandlerTest.java
index 1ec751b2ae..a86e427ff9 100644
--- a/hearing-command/hearing-command-handler/src/test/java/uk/gov/moj/cpp/hearing/command/handler/SetTrialTypeCommandHandlerTest.java
+++ b/hearing-command/hearing-command-handler/src/test/java/uk/gov/moj/cpp/hearing/command/handler/SetTrialTypeCommandHandlerTest.java
@@ -1,7 +1,7 @@
package uk.gov.moj.cpp.hearing.command.handler;
import static java.util.UUID.randomUUID;
-import static javax.json.Json.createObjectBuilder;
+import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.mockito.ArgumentMatchers.any;
@@ -100,9 +100,9 @@ public void eventHearingSetTrialTypeShouldBeCreated() throws Exception {
CommandHelpers.InitiateHearingCommandHelper hearingObject = CommandHelpers.h(standardInitiateHearingTemplate());
final UUID hearingId = hearingObject.getHearingId();
+ final UUID crackedIneffectiveSubReasonId = randomUUID();
-
- HearingTrialType trialType = new HearingTrialType(hearingId, trialTypeId, "A", "Effective", "Some Description");
+ HearingTrialType trialType = new HearingTrialType(hearingId, trialTypeId, "A", "Effective", "Some Description",crackedIneffectiveSubReasonId);
final HearingAggregate hearingAggregate = new HearingAggregate() {{
apply(new HearingInitiated(hearingObject.getHearing()));
}};
@@ -123,6 +123,7 @@ public void eventHearingSetTrialTypeShouldBeCreated() throws Exception {
assertThat(asPojo(events.get(0), HearingTrialType.class), isBean(HearingTrialType.class)
.with(HearingTrialType::getHearingId, Matchers.is(hearingId))
.with(HearingTrialType::getTrialTypeId, Matchers.is(trialTypeId))
+ .with(HearingTrialType::getCrackedIneffectiveSubReasonId, Matchers.is(crackedIneffectiveSubReasonId))
);
}
diff --git a/hearing-command/hearing-command-handler/src/test/java/uk/gov/moj/cpp/hearing/command/handler/ShareResultsCommandHandlerTest.java b/hearing-command/hearing-command-handler/src/test/java/uk/gov/moj/cpp/hearing/command/handler/ShareResultsCommandHandlerTest.java
index b52088028a..b4dd2ac208 100644
--- a/hearing-command/hearing-command-handler/src/test/java/uk/gov/moj/cpp/hearing/command/handler/ShareResultsCommandHandlerTest.java
+++ b/hearing-command/hearing-command-handler/src/test/java/uk/gov/moj/cpp/hearing/command/handler/ShareResultsCommandHandlerTest.java
@@ -164,7 +164,7 @@ private static Defendant convert(final uk.gov.justice.core.courts.Defendant curr
final PersonDefendant curPd = currentDefendant.getPersonDefendant();
final Person cpd = curPd.getPersonDetails();
Person person = new Person(cpd.getAdditionalNationalityCode(), cpd.getAdditionalNationalityDescription(), cpd.getAdditionalNationalityId(), cpd.getAddress(), cpd.getContact(), cpd.getDateOfBirth(),
- cpd.getDisabilityStatus(), cpd.getDocumentationLanguageNeeds(), cpd.getEthnicity(), firstName, cpd.getGender(), cpd.getHearingLanguageNeeds(), cpd.getInterpreterLanguageNeeds(),
+ cpd.getDisabilityStatus(), cpd.getDocumentationLanguageNeeds(), cpd.getEthnicity(), firstName, cpd.getGender(), cpd.getHearingLanguageNeeds(), cpd.getInterpreterLanguageNeeds(), cpd.getIsAddressConfidential(),
cpd.getLastName(), cpd.getMiddleName(), cpd.getNationalInsuranceNumber(), cpd.getNationalityCode(), cpd.getNationalityDescription(), cpd.getNationalityId(),
cpd.getOccupation(), cpd.getOccupationCode(), cpd.getPersonMarkers(), cpd.getSpecificRequirements(), cpd.getTitle());
diff --git a/hearing-command/hearing-command-handler/src/test/java/uk/gov/moj/cpp/hearing/command/handler/ShareResultsCommandHandlerV2Test.java b/hearing-command/hearing-command-handler/src/test/java/uk/gov/moj/cpp/hearing/command/handler/ShareResultsCommandHandlerV2Test.java
index 16a515fffb..055e1d12e3 100644
--- a/hearing-command/hearing-command-handler/src/test/java/uk/gov/moj/cpp/hearing/command/handler/ShareResultsCommandHandlerV2Test.java
+++ b/hearing-command/hearing-command-handler/src/test/java/uk/gov/moj/cpp/hearing/command/handler/ShareResultsCommandHandlerV2Test.java
@@ -230,7 +230,7 @@ private static Defendant convert(final uk.gov.justice.core.courts.Defendant curr
final PersonDefendant curPd = currentDefendant.getPersonDefendant();
final Person cpd = curPd.getPersonDetails();
Person person = new Person(cpd.getAdditionalNationalityCode(), cpd.getAdditionalNationalityDescription(), cpd.getAdditionalNationalityId(), cpd.getAddress(), cpd.getContact(), cpd.getDateOfBirth(),
- cpd.getDisabilityStatus(), cpd.getDocumentationLanguageNeeds(), cpd.getEthnicity(), firstName, cpd.getGender(), cpd.getHearingLanguageNeeds(), cpd.getInterpreterLanguageNeeds(),
+ cpd.getDisabilityStatus(), cpd.getDocumentationLanguageNeeds(), cpd.getEthnicity(), firstName, cpd.getGender(), cpd.getHearingLanguageNeeds(), cpd.getInterpreterLanguageNeeds(), cpd.getIsAddressConfidential(),
cpd.getLastName(), cpd.getMiddleName(), cpd.getNationalInsuranceNumber(), cpd.getNationalityCode(), cpd.getNationalityDescription(), cpd.getNationalityId(),
cpd.getOccupation(), cpd.getOccupationCode(), cpd.getPersonMarkers(), cpd.getSpecificRequirements(), cpd.getTitle());
diff --git a/hearing-command/hearing-command-handler/src/test/java/uk/gov/moj/cpp/hearing/command/handler/UnallocateHearingCommandHandlerTest.java b/hearing-command/hearing-command-handler/src/test/java/uk/gov/moj/cpp/hearing/command/handler/UnallocateHearingCommandHandlerTest.java
index 58a4447d7e..758bc9387e 100644
--- a/hearing-command/hearing-command-handler/src/test/java/uk/gov/moj/cpp/hearing/command/handler/UnallocateHearingCommandHandlerTest.java
+++ b/hearing-command/hearing-command-handler/src/test/java/uk/gov/moj/cpp/hearing/command/handler/UnallocateHearingCommandHandlerTest.java
@@ -2,8 +2,8 @@
import static com.jayway.jsonpath.matchers.JsonPathMatchers.withJsonPath;
import static java.util.UUID.randomUUID;
-import static javax.json.Json.createArrayBuilder;
-import static javax.json.Json.createObjectBuilder;
+import static uk.gov.justice.services.messaging.JsonObjects.createArrayBuilder;
+import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.core.AllOf.allOf;
diff --git a/hearing-command/hearing-command-handler/src/test/java/uk/gov/moj/cpp/hearing/command/handler/UnlockHearingCommandHandlerTest.java b/hearing-command/hearing-command-handler/src/test/java/uk/gov/moj/cpp/hearing/command/handler/UnlockHearingCommandHandlerTest.java
index 5f9853c6ef..de14222524 100644
--- a/hearing-command/hearing-command-handler/src/test/java/uk/gov/moj/cpp/hearing/command/handler/UnlockHearingCommandHandlerTest.java
+++ b/hearing-command/hearing-command-handler/src/test/java/uk/gov/moj/cpp/hearing/command/handler/UnlockHearingCommandHandlerTest.java
@@ -1,6 +1,6 @@
package uk.gov.moj.cpp.hearing.command.handler;
-import static javax.json.Json.createObjectBuilder;
+import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.mockito.Mockito.when;
import static uk.gov.justice.services.test.utils.core.enveloper.EnveloperFactory.createEnveloperWithEvents;
diff --git a/hearing-command/hearing-command-handler/src/test/java/uk/gov/moj/cpp/hearing/command/handler/UpdateCaseDefendantsHandlerTest.java b/hearing-command/hearing-command-handler/src/test/java/uk/gov/moj/cpp/hearing/command/handler/UpdateCaseDefendantsHandlerTest.java
index 5da6744dba..678d26483d 100644
--- a/hearing-command/hearing-command-handler/src/test/java/uk/gov/moj/cpp/hearing/command/handler/UpdateCaseDefendantsHandlerTest.java
+++ b/hearing-command/hearing-command-handler/src/test/java/uk/gov/moj/cpp/hearing/command/handler/UpdateCaseDefendantsHandlerTest.java
@@ -43,7 +43,7 @@
import java.util.Arrays;
import java.util.UUID;
-import javax.json.Json;
+import uk.gov.justice.services.messaging.JsonObjects;
import javax.json.JsonObject;
import org.junit.jupiter.api.BeforeEach;
@@ -120,7 +120,7 @@ public void testCaseDefendantsUpdated() throws EventStreamException{
.withId(defendantId)
.withProceedingsConcluded(true).build()))
.build();
- final JsonObject commandPayload = Json.createObjectBuilder()
+ final JsonObject commandPayload = JsonObjects.createObjectBuilder()
.add("prosecutionCase",objectToJsonObjectConverter.convert(prosecutionCase))
.build();
final JsonEnvelope envelope = envelopeFrom(metadataWithRandomUUID("hearing.command.update-case-defendants"), commandPayload);
@@ -141,12 +141,12 @@ public void testCaseDefendantsForHearingUpdated() throws EventStreamException{
setupMockedEventStream(hearingId, this.hearingEventStream, hearingAggregate);
hearingAggregate.initiate(initiateHearingCommand.getHearing());
- final JsonObject commandPayload = Json.createObjectBuilder()
- .add("prosecutionCase",Json.createObjectBuilder()
+ final JsonObject commandPayload = JsonObjects.createObjectBuilder()
+ .add("prosecutionCase",JsonObjects.createObjectBuilder()
.add("caseStatus", "CLOSED")
.add("id", caseId.toString())
- .add("defendants", Json.createArrayBuilder()
- .add(Json.createObjectBuilder()
+ .add("defendants", JsonObjects.createArrayBuilder()
+ .add(JsonObjects.createObjectBuilder()
.add("id",defendantId.toString())
.add("proceedingsConcluded", true)
.build()).build())
@@ -178,7 +178,7 @@ public void testApplicationDefendantsUpdated() throws EventStreamException{
.withId(defendantId)
.build())
.build();
- final JsonObject commandPayload = Json.createObjectBuilder()
+ final JsonObject commandPayload = JsonObjects.createObjectBuilder()
.add("courtApplication",objectToJsonObjectConverter.convert(courtApplication))
.build();
final JsonEnvelope envelope = envelopeFrom(metadataWithRandomUUID("hearing.command.update-application-defendants"), commandPayload);
@@ -202,10 +202,10 @@ public void testApplicationDefendantsForHearingUpdated() throws EventStreamExcep
setupMockedEventStream(hearingId, this.hearingEventStream, hearingAggregate);
hearingAggregate.initiate(initiateHearingCommand.getHearing());
- final JsonObject commandPayload = Json.createObjectBuilder()
- .add("courtApplication", Json.createObjectBuilder()
+ final JsonObject commandPayload = JsonObjects.createObjectBuilder()
+ .add("courtApplication", JsonObjects.createObjectBuilder()
.add("id", applicationId.toString())
- .add("applicant", Json.createObjectBuilder()
+ .add("applicant", JsonObjects.createObjectBuilder()
.add("id", defendantId.toString())
.build()).build())
.add("hearingId", hearingId.toString())
diff --git a/hearing-command/hearing-command-handler/src/test/java/uk/gov/moj/cpp/hearing/command/handler/UpdateDefendantLegalAidStatusCommandHandlerTest.java b/hearing-command/hearing-command-handler/src/test/java/uk/gov/moj/cpp/hearing/command/handler/UpdateDefendantLegalAidStatusCommandHandlerTest.java
index 02526e0335..08564cdb9c 100644
--- a/hearing-command/hearing-command-handler/src/test/java/uk/gov/moj/cpp/hearing/command/handler/UpdateDefendantLegalAidStatusCommandHandlerTest.java
+++ b/hearing-command/hearing-command-handler/src/test/java/uk/gov/moj/cpp/hearing/command/handler/UpdateDefendantLegalAidStatusCommandHandlerTest.java
@@ -31,7 +31,7 @@
import java.util.UUID;
-import javax.json.Json;
+import uk.gov.justice.services.messaging.JsonObjects;
import javax.json.JsonObject;
import org.junit.jupiter.api.BeforeEach;
@@ -87,10 +87,10 @@ public void testUpdateDefendantLegalAidStatus () throws EventStreamException {
defendantAggregate.registerHearing(defendantId, hearingId);
- final JsonObject commandPayload = Json.createObjectBuilder()
+ final JsonObject commandPayload = JsonObjects.createObjectBuilder()
.add("defendantId", defendantId.toString())
.add("legalAidStatus", "Granted")
- .add("hearingIds", Json.createArrayBuilder().add(hearingId.toString()).build())
+ .add("hearingIds", JsonObjects.createArrayBuilder().add(hearingId.toString()).build())
.build();
@@ -114,10 +114,10 @@ public void testUpdateDefendantLegalAidStatusWhenHearingNotRegisteredAgainstDefe
- final JsonObject commandPayload = Json.createObjectBuilder()
+ final JsonObject commandPayload = JsonObjects.createObjectBuilder()
.add("defendantId", defendantId.toString())
.add("legalAidStatus", "Granted")
- .add("hearingIds", Json.createArrayBuilder().add(hearingId.toString()).build())
+ .add("hearingIds", JsonObjects.createArrayBuilder().add(hearingId.toString()).build())
.build();
@@ -137,7 +137,7 @@ public void testUpdateDefendantLegalAidStatusForHearing () throws EventStreamExc
hearingAggregate.initiate(initiateHearingCommand.getHearing());
- final JsonObject commandPayload = Json.createObjectBuilder()
+ final JsonObject commandPayload = JsonObjects.createObjectBuilder()
.add("hearingId", hearingId.toString())
.add("defendantId", defendantId.toString())
.add("legalAidStatus", "Granted")
diff --git a/hearing-command/hearing-command-handler/src/test/java/uk/gov/moj/cpp/hearing/command/handler/UpdateHearingAfterCaseRemovedFromGroupCasesCommandHandlerTest.java b/hearing-command/hearing-command-handler/src/test/java/uk/gov/moj/cpp/hearing/command/handler/UpdateHearingAfterCaseRemovedFromGroupCasesCommandHandlerTest.java
index c8c185f985..98f346ac39 100644
--- a/hearing-command/hearing-command-handler/src/test/java/uk/gov/moj/cpp/hearing/command/handler/UpdateHearingAfterCaseRemovedFromGroupCasesCommandHandlerTest.java
+++ b/hearing-command/hearing-command-handler/src/test/java/uk/gov/moj/cpp/hearing/command/handler/UpdateHearingAfterCaseRemovedFromGroupCasesCommandHandlerTest.java
@@ -36,7 +36,7 @@
import java.util.List;
import java.util.UUID;
-import javax.json.Json;
+import uk.gov.justice.services.messaging.JsonObjects;
import javax.json.JsonObjectBuilder;
import org.junit.jupiter.api.BeforeEach;
@@ -174,7 +174,7 @@ private void assertHearingAggregateValues(final UUID groupId, final List c
private JsonEnvelope getJsonEnvelopeForRemoveCommand(final UUID hearingId, final UUID groupId,
final ProsecutionCase removedCase, final ProsecutionCase newGroupMaster) {
- JsonObjectBuilder builder = Json.createObjectBuilder()
+ JsonObjectBuilder builder = JsonObjects.createObjectBuilder()
.add("hearingId", hearingId.toString())
.add("groupId", groupId.toString())
.add("removedCase", objectToJsonObjectConverter.convert(removedCase));
diff --git a/hearing-command/hearing-command-handler/src/test/java/uk/gov/moj/cpp/hearing/command/handler/UpdateOffenceResultsCommandHandlerTest.java b/hearing-command/hearing-command-handler/src/test/java/uk/gov/moj/cpp/hearing/command/handler/UpdateOffenceResultsCommandHandlerTest.java
index 9a046cd850..66b1d16cbb 100644
--- a/hearing-command/hearing-command-handler/src/test/java/uk/gov/moj/cpp/hearing/command/handler/UpdateOffenceResultsCommandHandlerTest.java
+++ b/hearing-command/hearing-command-handler/src/test/java/uk/gov/moj/cpp/hearing/command/handler/UpdateOffenceResultsCommandHandlerTest.java
@@ -7,8 +7,8 @@
import static java.util.UUID.randomUUID;
import static java.util.stream.Collectors.toList;
import static java.util.stream.Collectors.toMap;
-import static javax.json.Json.createArrayBuilder;
-import static javax.json.Json.createObjectBuilder;
+import static uk.gov.justice.services.messaging.JsonObjects.createArrayBuilder;
+import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder;
import static org.hamcrest.CoreMatchers.allOf;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.containsInAnyOrder;
diff --git a/hearing-command/hearing-command-handler/src/test/java/uk/gov/moj/cpp/hearing/command/handler/UpdatePleaCommandHandlerTest.java b/hearing-command/hearing-command-handler/src/test/java/uk/gov/moj/cpp/hearing/command/handler/UpdatePleaCommandHandlerTest.java
index 8f2959eaec..7b44fd3734 100644
--- a/hearing-command/hearing-command-handler/src/test/java/uk/gov/moj/cpp/hearing/command/handler/UpdatePleaCommandHandlerTest.java
+++ b/hearing-command/hearing-command-handler/src/test/java/uk/gov/moj/cpp/hearing/command/handler/UpdatePleaCommandHandlerTest.java
@@ -21,6 +21,7 @@
import static uk.gov.moj.cpp.hearing.test.CommandHelpers.h;
import static uk.gov.moj.cpp.hearing.test.ObjectConverters.asPojo;
import static uk.gov.moj.cpp.hearing.test.TestTemplates.InitiateHearingCommandTemplates.standardInitiateHearingTemplate;
+import static uk.gov.moj.cpp.hearing.test.TestTemplates.InitiateHearingCommandTemplates.standardInitiateHearingTemplateWithMultidayHearing;
import static uk.gov.moj.cpp.hearing.test.matchers.BeanMatcher.isBean;
import uk.gov.justice.core.courts.AllocationDecision;
@@ -504,7 +505,7 @@ public void testOffenceAggregateUpdatePleaToGuilty() throws Throwable {
public void enrichAssociatedHearingsWithIndicatedPleaInformation() throws Throwable {
final HearingAggregate hearingAggregate = new HearingAggregate() {{
- apply(new HearingInitiated(hearing.getHearing()));
+ apply(new HearingInitiated(h(standardInitiateHearingTemplateWithMultidayHearing()).getHearing()));
}};
final LocalDate pleaDate = PAST_LOCAL_DATE.next();
diff --git a/hearing-command/hearing-command-handler/src/test/java/uk/gov/moj/cpp/hearing/command/handler/UpdateResultLineSharedDatesCommandHandlerTest.java b/hearing-command/hearing-command-handler/src/test/java/uk/gov/moj/cpp/hearing/command/handler/UpdateResultLineSharedDatesCommandHandlerTest.java
index e4c62f6d21..1d7f6e9c67 100644
--- a/hearing-command/hearing-command-handler/src/test/java/uk/gov/moj/cpp/hearing/command/handler/UpdateResultLineSharedDatesCommandHandlerTest.java
+++ b/hearing-command/hearing-command-handler/src/test/java/uk/gov/moj/cpp/hearing/command/handler/UpdateResultLineSharedDatesCommandHandlerTest.java
@@ -26,7 +26,7 @@
import java.util.UUID;
import java.util.stream.Collectors;
-import javax.json.Json;
+import uk.gov.justice.services.messaging.JsonObjects;
import javax.json.JsonObject;
import com.fasterxml.jackson.annotation.JsonAutoDetect;
@@ -79,10 +79,10 @@ public void updateResultLineSharedDates() throws EventStreamException {
final UUID resultLineId1 = UUID.randomUUID();
final String sharedDate = "2020-02-05";
- final JsonObject payload = Json.createObjectBuilder()
+ final JsonObject payload = JsonObjects.createObjectBuilder()
.add("hearingId", hearingId.toString())
- .add("resultLinesToBeUpdated", Json.createArrayBuilder()
- .add(Json.createObjectBuilder()
+ .add("resultLinesToBeUpdated", JsonObjects.createArrayBuilder()
+ .add(JsonObjects.createObjectBuilder()
.add("resultLineId", resultLineId1.toString())
.add("sharedDate", sharedDate)
)).build();
diff --git a/hearing-command/hearing-command-handler/src/test/java/uk/gov/moj/cpp/hearing/command/handler/UpdateTargetCommandHandlerTest.java b/hearing-command/hearing-command-handler/src/test/java/uk/gov/moj/cpp/hearing/command/handler/UpdateTargetCommandHandlerTest.java
index a2e2ed37f9..1fc8cee318 100644
--- a/hearing-command/hearing-command-handler/src/test/java/uk/gov/moj/cpp/hearing/command/handler/UpdateTargetCommandHandlerTest.java
+++ b/hearing-command/hearing-command-handler/src/test/java/uk/gov/moj/cpp/hearing/command/handler/UpdateTargetCommandHandlerTest.java
@@ -23,7 +23,7 @@
import java.util.UUID;
import java.util.stream.Stream;
-import javax.json.Json;
+import uk.gov.justice.services.messaging.JsonObjects;
import javax.json.JsonObject;
import org.junit.jupiter.api.Test;
@@ -61,7 +61,7 @@ void shouldHandlePatchApplicationFinalisedOnTarget() throws EventStreamException
final UUID hearingId = UUID.randomUUID();
final UUID targetId = UUID.randomUUID();
final LocalDate hearingDay = LocalDate.now();
- final JsonObject payload = Json.createObjectBuilder()
+ final JsonObject payload = JsonObjects.createObjectBuilder()
.add("hearingId", hearingId.toString())
.add("targetId", targetId.toString())
.add("hearingDay", hearingDay.toString())
diff --git a/hearing-command/hearing-command-handler/src/test/java/uk/gov/moj/cpp/hearing/command/handler/ValidateResultAmendmentsCommandHandlerTest.java b/hearing-command/hearing-command-handler/src/test/java/uk/gov/moj/cpp/hearing/command/handler/ValidateResultAmendmentsCommandHandlerTest.java
index d2d2db5141..55c14b6293 100644
--- a/hearing-command/hearing-command-handler/src/test/java/uk/gov/moj/cpp/hearing/command/handler/ValidateResultAmendmentsCommandHandlerTest.java
+++ b/hearing-command/hearing-command-handler/src/test/java/uk/gov/moj/cpp/hearing/command/handler/ValidateResultAmendmentsCommandHandlerTest.java
@@ -2,7 +2,7 @@
import static com.jayway.jsonpath.matchers.JsonPathMatchers.withJsonPath;
import static java.time.ZonedDateTime.now;
-import static javax.json.Json.createObjectBuilder;
+import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.core.AllOf.allOf;
diff --git a/hearing-command/hearing-command-handler/src/test/java/uk/gov/moj/cpp/hearing/command/handler/service/ReferenceDataServiceTest.java b/hearing-command/hearing-command-handler/src/test/java/uk/gov/moj/cpp/hearing/command/handler/service/ReferenceDataServiceTest.java
index 3531bdaf54..8f8c191129 100644
--- a/hearing-command/hearing-command-handler/src/test/java/uk/gov/moj/cpp/hearing/command/handler/service/ReferenceDataServiceTest.java
+++ b/hearing-command/hearing-command-handler/src/test/java/uk/gov/moj/cpp/hearing/command/handler/service/ReferenceDataServiceTest.java
@@ -2,8 +2,8 @@
import static java.util.UUID.fromString;
import static java.util.UUID.randomUUID;
-import static javax.json.Json.createArrayBuilder;
-import static javax.json.Json.createObjectBuilder;
+import static uk.gov.justice.services.messaging.JsonObjects.createArrayBuilder;
+import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.is;
import static org.mockito.ArgumentMatchers.any;
@@ -23,7 +23,7 @@
import java.util.Set;
import java.util.UUID;
-import javax.json.Json;
+import uk.gov.justice.services.messaging.JsonObjects;
import javax.json.JsonObject;
import org.junit.jupiter.api.Test;
@@ -93,7 +93,7 @@ private JsonObject buildPleaStatusTypesPayload(){
private JsonEnvelope generateReferenceDataServiceResponse(final List expectedCourtCentreIds) {
return createEnvelope(".", createObjectBuilder()
- .add("organisationunits", Json.createArrayBuilder()
+ .add("organisationunits", JsonObjects.createArrayBuilder()
.add(buildOrgUnit(expectedCourtCentreIds.get(0)))
.add(buildOrgUnit(expectedCourtCentreIds.get(1)))
)
@@ -101,7 +101,7 @@ private JsonEnvelope generateReferenceDataServiceResponse(final List expec
}
private JsonObject buildOrgUnit(final UUID courtCentreId) {
- return Json.createObjectBuilder()
+ return JsonObjects.createObjectBuilder()
.add("id", courtCentreId.toString())
.build();
}
diff --git a/hearing-command/pom.xml b/hearing-command/pom.xml
index 41838d10f5..004c8789d1 100644
--- a/hearing-command/pom.xml
+++ b/hearing-command/pom.xml
@@ -3,7 +3,7 @@
uk.gov.moj.cpp.hearing
hearing-parent
- 17.0.143-SNAPSHOT
+ 17.0.151-RBSD-2609-SNAPSHOT
hearing-command
pom
diff --git a/hearing-common/pom.xml b/hearing-common/pom.xml
index f1de50f97b..67a0191879 100644
--- a/hearing-common/pom.xml
+++ b/hearing-common/pom.xml
@@ -3,7 +3,7 @@
hearing-parent
uk.gov.moj.cpp.hearing
- 17.0.143-SNAPSHOT
+ 17.0.151-RBSD-2609-SNAPSHOT
4.0.0
diff --git a/hearing-common/src/main/java/uk/gov/moj/cpp/hearing/common/ReferenceDataLoader.java b/hearing-common/src/main/java/uk/gov/moj/cpp/hearing/common/ReferenceDataLoader.java
index a1254e6a10..f709a23a75 100644
--- a/hearing-common/src/main/java/uk/gov/moj/cpp/hearing/common/ReferenceDataLoader.java
+++ b/hearing-common/src/main/java/uk/gov/moj/cpp/hearing/common/ReferenceDataLoader.java
@@ -4,7 +4,7 @@
import static java.util.Objects.isNull;
import static java.util.Optional.of;
import static java.util.UUID.randomUUID;
-import static javax.json.Json.createObjectBuilder;
+import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder;
import static org.apache.commons.collections.CollectionUtils.isEmpty;
import static uk.gov.justice.services.core.annotation.Component.EVENT_PROCESSOR;
import static uk.gov.justice.services.messaging.JsonEnvelope.envelopeFrom;
diff --git a/hearing-domain/hearing-domain-aggregate/pom.xml b/hearing-domain/hearing-domain-aggregate/pom.xml
index 3b82904e71..b026d0207d 100644
--- a/hearing-domain/hearing-domain-aggregate/pom.xml
+++ b/hearing-domain/hearing-domain-aggregate/pom.xml
@@ -3,7 +3,7 @@
uk.gov.moj.cpp.hearing
hearing-domain
- 17.0.143-SNAPSHOT
+ 17.0.151-RBSD-2609-SNAPSHOT
hearing-domain-aggregate
diff --git a/hearing-domain/hearing-domain-aggregate/src/main/java/uk/gov/moj/cpp/hearing/domain/aggregate/hearing/HearingTrialTypeDelegate.java b/hearing-domain/hearing-domain-aggregate/src/main/java/uk/gov/moj/cpp/hearing/domain/aggregate/hearing/HearingTrialTypeDelegate.java
index fdffcfee29..18a6f1d837 100644
--- a/hearing-domain/hearing-domain-aggregate/src/main/java/uk/gov/moj/cpp/hearing/domain/aggregate/hearing/HearingTrialTypeDelegate.java
+++ b/hearing-domain/hearing-domain-aggregate/src/main/java/uk/gov/moj/cpp/hearing/domain/aggregate/hearing/HearingTrialTypeDelegate.java
@@ -50,6 +50,7 @@ public void handleTrialTypeSetForHearing(final HearingTrialType hearingTrialType
.withCode(hearingTrialType.getCode())
.withDescription(hearingTrialType.getDescription())
.withType(hearingTrialType.getType())
+ .withCrackedIneffectiveSubReasonId(hearingTrialType.getCrackedIneffectiveSubReasonId())
.build());
this.momento.getHearing().setIsVacatedTrial(false);
this.momento.getHearing().setIsEffectiveTrial(null);
diff --git a/hearing-domain/hearing-domain-aggregate/src/main/java/uk/gov/moj/cpp/hearing/domain/aggregate/hearing/PleaDelegate.java b/hearing-domain/hearing-domain-aggregate/src/main/java/uk/gov/moj/cpp/hearing/domain/aggregate/hearing/PleaDelegate.java
index 859e6c5b32..83206d3f8d 100644
--- a/hearing-domain/hearing-domain-aggregate/src/main/java/uk/gov/moj/cpp/hearing/domain/aggregate/hearing/PleaDelegate.java
+++ b/hearing-domain/hearing-domain-aggregate/src/main/java/uk/gov/moj/cpp/hearing/domain/aggregate/hearing/PleaDelegate.java
@@ -1,7 +1,9 @@
package uk.gov.moj.cpp.hearing.domain.aggregate.hearing;
+import static java.util.Objects.isNull;
import static java.util.Objects.nonNull;
import static java.util.Optional.ofNullable;
+import static org.apache.commons.collections.CollectionUtils.isNotEmpty;
import static uk.gov.justice.core.courts.IndicatedPleaValue.INDICATED_GUILTY;
import static uk.gov.moj.cpp.hearing.domain.aggregate.util.PleaVerdictUtil.isGuiltyVerdict;
import static uk.gov.moj.cpp.hearing.domain.event.ConvictionDateAdded.convictionDateAdded;
@@ -9,6 +11,7 @@
import uk.gov.justice.core.courts.CourtApplication;
import uk.gov.justice.core.courts.CourtOrderOffence;
+import uk.gov.justice.core.courts.Hearing;
import uk.gov.justice.core.courts.IndicatedPlea;
import uk.gov.justice.core.courts.Offence;
import uk.gov.justice.core.courts.Plea;
@@ -132,28 +135,33 @@ public Stream