Skip to content

PEG-2848: Merge dev/PEG-2848-R14-merge2 into team/PEG-2848-R14 #165

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
vmuthuhm wants to merge 7 commits into
base: team/PEG-2848-R14
Choose a base branch
from
Open

PEG-2848: Merge dev/PEG-2848-R14-merge2 into team/PEG-2848-R14 #165

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
ee1edc9
New 17.104.170-PEG-2848-R14-SNAPSHOT
May 19, 2026
1180767
New 17.104.171-PEG-2848-R14-SNAPSHOT
May 19, 2026
f2c85b4
PEG-2973 cpp-context-hearing Framework D changes
Jan 23, 2026
2e8543f
PEG-2848: fix build issue
MohamedFarouk-HMCTS Feb 5, 2026
3f7171a
Rebase from release-engg-2609 & version bump to -RBSD-2609-SNAPSHOT (…
vmuthuhm Apr 17, 2026
0f43fe1
PEG-2848-R14: clean up post-merge difference in ReusableInformationMa…
May 21, 2026
4a9b79f
New 17.104.172-PEG-2848-R14-SNAPSHOT
May 22, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions buildWithSonar.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,8 @@ set -e

. functions.sh



####
buildWithSonar

2 changes: 1 addition & 1 deletion hearing-command/hearing-command-api/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<groupId>uk.gov.moj.cpp.hearing</groupId>
<artifactId>hearing-command</artifactId>
<version>17.104.169-PEG-2848-R14-SNAPSHOT</version>
<version>17.104.172-PEG-2848-R14-SNAPSHOT</version>
</parent>
<artifactId>hearing-command-api</artifactId>
<packaging>war</packaging>
Expand Down
2 changes: 1 addition & 1 deletion hearing-command/hearing-command-handler/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<groupId>uk.gov.moj.cpp.hearing</groupId>
<artifactId>hearing-command</artifactId>
<version>17.104.169-PEG-2848-R14-SNAPSHOT</version>
<version>17.104.172-PEG-2848-R14-SNAPSHOT</version>
</parent>
<artifactId>hearing-command-handler</artifactId>
<packaging>war</packaging>
Expand Down
2 changes: 1 addition & 1 deletion hearing-command/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<groupId>uk.gov.moj.cpp.hearing</groupId>
<artifactId>hearing-parent</artifactId>
<version>17.104.169-PEG-2848-R14-SNAPSHOT</version>
<version>17.104.172-PEG-2848-R14-SNAPSHOT</version>
</parent>
<artifactId>hearing-command</artifactId>
<packaging>pom</packaging>
Expand Down
2 changes: 1 addition & 1 deletion hearing-common/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<artifactId>hearing-parent</artifactId>
<groupId>uk.gov.moj.cpp.hearing</groupId>
<version>17.104.169-PEG-2848-R14-SNAPSHOT</version>
<version>17.104.172-PEG-2848-R14-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion hearing-domain/hearing-domain-aggregate/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<groupId>uk.gov.moj.cpp.hearing</groupId>
<artifactId>hearing-domain</artifactId>
<version>17.104.169-PEG-2848-R14-SNAPSHOT</version>
<version>17.104.172-PEG-2848-R14-SNAPSHOT</version>
</parent>
<artifactId>hearing-domain-aggregate</artifactId>
<dependencies>
Expand Down
2 changes: 1 addition & 1 deletion hearing-domain/hearing-domain-common/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<groupId>uk.gov.moj.cpp.hearing</groupId>
<artifactId>hearing-domain</artifactId>
<version>17.104.169-PEG-2848-R14-SNAPSHOT</version>
<version>17.104.172-PEG-2848-R14-SNAPSHOT</version>
</parent>
<artifactId>hearing-domain-common</artifactId>

Expand Down
2 changes: 1 addition & 1 deletion hearing-domain/hearing-domain-event/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<groupId>uk.gov.moj.cpp.hearing</groupId>
<artifactId>hearing-domain</artifactId>
<version>17.104.169-PEG-2848-R14-SNAPSHOT</version>
<version>17.104.172-PEG-2848-R14-SNAPSHOT</version>
</parent>
<artifactId>hearing-domain-event</artifactId>

Expand Down
2 changes: 1 addition & 1 deletion hearing-domain/hearing-domain-xhibit/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<groupId>uk.gov.moj.cpp.hearing</groupId>
<artifactId>hearing-domain</artifactId>
<version>17.104.169-PEG-2848-R14-SNAPSHOT</version>
<version>17.104.172-PEG-2848-R14-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion hearing-domain/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<groupId>uk.gov.moj.cpp.hearing</groupId>
<artifactId>hearing-parent</artifactId>
<version>17.104.169-PEG-2848-R14-SNAPSHOT</version>
<version>17.104.172-PEG-2848-R14-SNAPSHOT</version>
</parent>
<artifactId>hearing-domain</artifactId>
<packaging>pom</packaging>
Expand Down
2 changes: 1 addition & 1 deletion hearing-event-sources/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<artifactId>hearing-parent</artifactId>
<groupId>uk.gov.moj.cpp.hearing</groupId>
<version>17.104.169-PEG-2848-R14-SNAPSHOT</version>
<version>17.104.172-PEG-2848-R14-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Expand Down
2 changes: 1 addition & 1 deletion hearing-event/hearing-event-listener/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<groupId>uk.gov.moj.cpp.hearing</groupId>
<artifactId>hearing-event</artifactId>
<version>17.104.169-PEG-2848-R14-SNAPSHOT</version>
<version>17.104.172-PEG-2848-R14-SNAPSHOT</version>
</parent>
<artifactId>hearing-event-listener</artifactId>
<packaging>war</packaging>
Expand Down
2 changes: 1 addition & 1 deletion .../src/test/java/uk/gov/moj/cpp/hearing/event/listener/HearingDeletedEventListenerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package uk.gov.moj.cpp.hearing.event.listener;

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.BDDMockito.given;
import static org.mockito.Mockito.mock;
Expand Down
2 changes: 1 addition & 1 deletion hearing-event/hearing-event-processor/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<artifactId>hearing-event</artifactId>
<groupId>uk.gov.moj.cpp.hearing</groupId>
<version>17.104.169-PEG-2848-R14-SNAPSHOT</version>
<version>17.104.172-PEG-2848-R14-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<packaging>war</packaging>
Expand Down
54 changes: 53 additions & 1 deletion ...ing-event-processor/src/main/java/uk/gov/moj/cpp/hearing/pi/ProsecutionCaseRetriever.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1,53 @@
package uk.gov.moj.cpp.hearing.pi;import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder;import static uk.gov.justice.services.core.annotation.Component.EVENT_PROCESSOR;import static uk.gov.justice.services.messaging.JsonEnvelope.envelopeFrom;import static uk.gov.justice.services.messaging.JsonEnvelope.metadataBuilder;import uk.gov.justice.services.core.annotation.ServiceComponent;import uk.gov.justice.services.core.requester.Requester;import uk.gov.justice.services.messaging.JsonEnvelope;import uk.gov.moj.cpp.hearing.query.view.response.hearingresponse.ProsecutionCaseResponse;import java.util.Optional;import java.util.UUID;import javax.enterprise.context.ApplicationScoped;import javax.inject.Inject;import javax.json.JsonObject;import org.slf4j.Logger;import org.slf4j.LoggerFactory;@ApplicationScopedpublic class ProsecutionCaseRetriever { private static final Logger LOGGER = LoggerFactory.getLogger(ProsecutionCaseRetriever.class); private static final String HEARING_QUERY_PROSECUTIONCASE_BY_HEARINGID = "hearing.prosecution-case-by-hearingid"; @ServiceComponent(EVENT_PROCESSOR) @Inject private Requester requester; public Optional<ProsecutionCaseResponse> getProsecutionCaseForHearing(final UUID hearingId, final UUID hearingEventDefinitionId) { LOGGER.info(" getProsecutionCaseForHearing hearing id {} ", hearingId); final JsonObject query = createObjectBuilder() .add("hearingId", String.valueOf(hearingId)) .add("hearingEventDefinitionId", String.valueOf(hearingEventDefinitionId)) .build(); final JsonEnvelope jsonEnvelope = envelopeFrom( metadataBuilder() .withId(UUID.randomUUID()) .withName(HEARING_QUERY_PROSECUTIONCASE_BY_HEARINGID) .build(), query); if (!jsonEnvelope.payloadAsJsonObject().isEmpty()) { return Optional.of(requester.requestAsAdmin(jsonEnvelope, ProsecutionCaseResponse.class).payload()); } return Optional.empty(); }}
package uk.gov.moj.cpp.hearing.pi;

import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder;
import static uk.gov.justice.services.core.annotation.Component.EVENT_PROCESSOR;
import static uk.gov.justice.services.messaging.JsonEnvelope.envelopeFrom;
import static uk.gov.justice.services.messaging.JsonEnvelope.metadataBuilder;

import uk.gov.justice.services.core.annotation.ServiceComponent;
import uk.gov.justice.services.core.requester.Requester;
import uk.gov.justice.services.messaging.JsonEnvelope;
import uk.gov.moj.cpp.hearing.query.view.response.hearingresponse.ProsecutionCaseResponse;

import java.util.Optional;
import java.util.UUID;

import javax.enterprise.context.ApplicationScoped;
import javax.inject.Inject;
import javax.json.JsonObject;

import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

@ApplicationScoped
public class ProsecutionCaseRetriever {

private static final Logger LOGGER = LoggerFactory.getLogger(ProsecutionCaseRetriever.class);
private static final String HEARING_QUERY_PROSECUTIONCASE_BY_HEARINGID = "hearing.prosecution-case-by-hearingid";

@ServiceComponent(EVENT_PROCESSOR)
@Inject
private Requester requester;

public Optional<ProsecutionCaseResponse> getProsecutionCaseForHearing(final UUID hearingId, final UUID hearingEventDefinitionId) {

LOGGER.info(" getProsecutionCaseForHearing hearing id {} ", hearingId);
final JsonObject query = createObjectBuilder()
.add("hearingId", String.valueOf(hearingId))
.add("hearingEventDefinitionId", String.valueOf(hearingEventDefinitionId))
.build();

final JsonEnvelope jsonEnvelope = envelopeFrom(
metadataBuilder()
.withId(UUID.randomUUID())
.withName(HEARING_QUERY_PROSECUTIONCASE_BY_HEARINGID)
.build(),
query);

if (!jsonEnvelope.payloadAsJsonObject().isEmpty()) {
return Optional.of(requester.requestAsAdmin(jsonEnvelope, ProsecutionCaseResponse.class).payload());
}
return Optional.empty();
}
}
2 changes: 1 addition & 1 deletion hearing-event/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<groupId>uk.gov.moj.cpp.hearing</groupId>
<artifactId>hearing-parent</artifactId>
<version>17.104.169-PEG-2848-R14-SNAPSHOT</version>
<version>17.104.172-PEG-2848-R14-SNAPSHOT</version>
</parent>
<artifactId>hearing-event</artifactId>
<packaging>pom</packaging>
Expand Down
2 changes: 1 addition & 1 deletion hearing-healthchecks/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<artifactId>hearing-parent</artifactId>
<groupId>uk.gov.moj.cpp.hearing</groupId>
<version>17.104.169-PEG-2848-R14-SNAPSHOT</version>
<version>17.104.172-PEG-2848-R14-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion hearing-integration-test/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>uk.gov.moj.cpp.hearing</groupId>
<artifactId>hearing-parent</artifactId>
<version>17.104.169-PEG-2848-R14-SNAPSHOT</version>
<version>17.104.172-PEG-2848-R14-SNAPSHOT</version>
</parent>

<artifactId>hearing-integration-test</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion hearing-json/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<artifactId>hearing-parent</artifactId>
<groupId>uk.gov.moj.cpp.hearing</groupId>
<version>17.104.169-PEG-2848-R14-SNAPSHOT</version>
<version>17.104.172-PEG-2848-R14-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion hearing-query/hearing-query-api/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<groupId>uk.gov.moj.cpp.hearing</groupId>
<artifactId>hearing-query</artifactId>
<version>17.104.169-PEG-2848-R14-SNAPSHOT</version>
<version>17.104.172-PEG-2848-R14-SNAPSHOT</version>
</parent>
<artifactId>hearing-query-api</artifactId>
<packaging>war</packaging>
Expand Down
2 changes: 1 addition & 1 deletion hearing-query/hearing-query-view/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<groupId>uk.gov.moj.cpp.hearing</groupId>
<artifactId>hearing-query</artifactId>
<version>17.104.169-PEG-2848-R14-SNAPSHOT</version>
<version>17.104.172-PEG-2848-R14-SNAPSHOT</version>
</parent>
<artifactId>hearing-query-view</artifactId>
<packaging>jar</packaging>
Expand Down
2 changes: 1 addition & 1 deletion hearing-query/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<groupId>uk.gov.moj.cpp.hearing</groupId>
<artifactId>hearing-parent</artifactId>
<version>17.104.169-PEG-2848-R14-SNAPSHOT</version>
<version>17.104.172-PEG-2848-R14-SNAPSHOT</version>
</parent>
<artifactId>hearing-query</artifactId>
<packaging>pom</packaging>
Expand Down
2 changes: 1 addition & 1 deletion hearing-service/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<groupId>uk.gov.moj.cpp.hearing</groupId>
<artifactId>hearing-parent</artifactId>
<version>17.104.169-PEG-2848-R14-SNAPSHOT</version>
<version>17.104.172-PEG-2848-R14-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion hearing-viewstore/hearing-viewstore-liquibase/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<groupId>uk.gov.moj.cpp.hearing</groupId>
<artifactId>hearing-viewstore</artifactId>
<version>17.104.169-PEG-2848-R14-SNAPSHOT</version>
<version>17.104.172-PEG-2848-R14-SNAPSHOT</version>
</parent>
<artifactId>hearing-viewstore-liquibase</artifactId>

Expand Down
2 changes: 1 addition & 1 deletion hearing-viewstore/hearing-viewstore-persistence/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<groupId>uk.gov.moj.cpp.hearing</groupId>
<artifactId>hearing-viewstore</artifactId>
<version>17.104.169-PEG-2848-R14-SNAPSHOT</version>
<version>17.104.172-PEG-2848-R14-SNAPSHOT</version>
</parent>
<artifactId>hearing-viewstore-persistence</artifactId>
<properties>
Expand Down
2 changes: 1 addition & 1 deletion hearing-viewstore/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<groupId>uk.gov.moj.cpp.hearing</groupId>
<artifactId>hearing-parent</artifactId>
<version>17.104.169-PEG-2848-R14-SNAPSHOT</version>
<version>17.104.172-PEG-2848-R14-SNAPSHOT</version>
</parent>
<artifactId>hearing-viewstore</artifactId>
<packaging>pom</packaging>
Expand Down
2 changes: 1 addition & 1 deletion pojo-plugin/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<groupId>uk.gov.moj.cpp.hearing</groupId>
<artifactId>hearing-parent</artifactId>
<version>17.104.169-PEG-2848-R14-SNAPSHOT</version>
<version>17.104.172-PEG-2848-R14-SNAPSHOT</version>
</parent>
<artifactId>pojo-plugin</artifactId>

Expand Down
2 changes: 1 addition & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
</parent>
<groupId>uk.gov.moj.cpp.hearing</groupId>
<artifactId>hearing-parent</artifactId>
<version>17.104.169-PEG-2848-R14-SNAPSHOT</version>
<version>17.104.172-PEG-2848-R14-SNAPSHOT</version>
<packaging>pom</packaging>

<name>Hearing Context - Parent Module</name>
Expand Down
2 changes: 1 addition & 1 deletion test-utilities/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>uk.gov.moj.cpp.hearing</groupId>
<artifactId>hearing-parent</artifactId>
<version>17.104.169-PEG-2848-R14-SNAPSHOT</version>
<version>17.104.172-PEG-2848-R14-SNAPSHOT</version>
</parent>

<dependencies>
Expand Down