Team/peg 2848 rebased 2609 v2

.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.*'''	
+]	
 

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"

buildWithSonar.sh

@@ -14,5 +14,8 @@ set -e
 
 . functions.sh
 
+
+
+####
 buildWithSonar
 

hearing-command/hearing-command-api/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>uk.gov.moj.cpp.hearing</groupId>
         <artifactId>hearing-command</artifactId>
-        <version>17.0.143-SNAPSHOT</version>
+        <version>17.0.151-RBSD-2609-SNAPSHOT</version>
     </parent>
     <artifactId>hearing-command-api</artifactId>
     <packaging>war</packaging>

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");

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;

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;

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;

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();

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: |

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": [
   {

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;

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);

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");

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;

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;

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;

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;

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;

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);
 

hearing-command/hearing-command-handler/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>uk.gov.moj.cpp.hearing</groupId>
         <artifactId>hearing-command</artifactId>
-        <version>17.0.143-SNAPSHOT</version>
+        <version>17.0.151-RBSD-2609-SNAPSHOT</version>
     </parent>
     <artifactId>hearing-command-handler</artifactId>
     <packaging>war</packaging>

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;

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();