implements Converter { diff --git a/sjp-event/sjp-event-listener/src/main/java/uk/gov/moj/cpp/sjp/event/listener/converter/SjpCaseCreatedToCase.java b/sjp-event/sjp-event-listener/src/main/java/uk/gov/moj/cpp/sjp/event/listener/converter/SjpCaseCreatedToCase.java index 74e192e488..2d88b370f1 100644 --- a/sjp-event/sjp-event-listener/src/main/java/uk/gov/moj/cpp/sjp/event/listener/converter/SjpCaseCreatedToCase.java +++ b/sjp-event/sjp-event-listener/src/main/java/uk/gov/moj/cpp/sjp/event/listener/converter/SjpCaseCreatedToCase.java @@ -11,7 +11,7 @@ import uk.gov.moj.cpp.sjp.persistence.entity.LegalEntityDetails; import uk.gov.moj.cpp.sjp.persistence.entity.PersonalDetails; -import javax.inject.Inject; +import jakarta.inject.Inject; /** * @deprecated Replaced by {@link CaseReceivedToCase} diff --git a/sjp-event/sjp-event-listener/src/main/java/uk/gov/moj/cpp/sjp/event/listener/handler/CaseSearchResultService.java b/sjp-event/sjp-event-listener/src/main/java/uk/gov/moj/cpp/sjp/event/listener/handler/CaseSearchResultService.java index 21e8247461..afd1599f68 100644 --- a/sjp-event/sjp-event-listener/src/main/java/uk/gov/moj/cpp/sjp/event/listener/handler/CaseSearchResultService.java +++ b/sjp-event/sjp-event-listener/src/main/java/uk/gov/moj/cpp/sjp/event/listener/handler/CaseSearchResultService.java @@ -7,8 +7,8 @@ import java.time.ZonedDateTime; import java.util.UUID; -import javax.inject.Inject; -import javax.transaction.Transactional; +import jakarta.inject.Inject; +import jakarta.transaction.Transactional; public class CaseSearchResultService { diff --git a/sjp-event/sjp-event-listener/src/main/java/uk/gov/moj/cpp/sjp/event/listener/service/CaseApplicationService.java b/sjp-event/sjp-event-listener/src/main/java/uk/gov/moj/cpp/sjp/event/listener/service/CaseApplicationService.java index 2488d9a305..d9924ea805 100644 --- a/sjp-event/sjp-event-listener/src/main/java/uk/gov/moj/cpp/sjp/event/listener/service/CaseApplicationService.java +++ b/sjp-event/sjp-event-listener/src/main/java/uk/gov/moj/cpp/sjp/event/listener/service/CaseApplicationService.java @@ -7,8 +7,8 @@ import java.util.UUID; -import javax.inject.Inject; -import javax.transaction.Transactional; +import jakarta.inject.Inject; +import jakarta.transaction.Transactional; public class CaseApplicationService { diff --git a/sjp-event/sjp-event-listener/src/main/java/uk/gov/moj/cpp/sjp/event/listener/service/CaseService.java b/sjp-event/sjp-event-listener/src/main/java/uk/gov/moj/cpp/sjp/event/listener/service/CaseService.java index b5135fa96e..6d6ea975ca 100644 --- a/sjp-event/sjp-event-listener/src/main/java/uk/gov/moj/cpp/sjp/event/listener/service/CaseService.java +++ b/sjp-event/sjp-event-listener/src/main/java/uk/gov/moj/cpp/sjp/event/listener/service/CaseService.java @@ -3,8 +3,8 @@ import uk.gov.moj.cpp.sjp.persistence.entity.CaseDetail; import uk.gov.moj.cpp.sjp.persistence.repository.CaseRepository; -import javax.inject.Inject; -import javax.transaction.Transactional; +import jakarta.inject.Inject; +import jakarta.transaction.Transactional; import java.util.UUID; public class CaseService { diff --git a/sjp-event/sjp-event-listener/src/main/resources/META-INF/beans.xml b/sjp-event/sjp-event-listener/src/main/resources/META-INF/beans.xml index cc3f8d2864..1d83bc8c5a 100644 --- a/sjp-event/sjp-event-listener/src/main/resources/META-INF/beans.xml +++ b/sjp-event/sjp-event-listener/src/main/resources/META-INF/beans.xml @@ -1,6 +1,6 @@ - - \ No newline at end of file + xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee https://jakarta.ee/xml/ns/jakartaee/beans_4_0.xsd" + bean-discovery-mode="all" version="4.0"> + diff --git a/sjp-event/sjp-event-listener/src/test/java/uk/gov/moj/cpp/sjp/event/listener/CaseApplicationListenerTest.java b/sjp-event/sjp-event-listener/src/test/java/uk/gov/moj/cpp/sjp/event/listener/CaseApplicationListenerTest.java index 6c7b7ebdac..58863f8e87 100644 --- a/sjp-event/sjp-event-listener/src/test/java/uk/gov/moj/cpp/sjp/event/listener/CaseApplicationListenerTest.java +++ b/sjp-event/sjp-event-listener/src/test/java/uk/gov/moj/cpp/sjp/event/listener/CaseApplicationListenerTest.java @@ -37,7 +37,7 @@ import java.time.LocalDate; import java.util.UUID; -import javax.json.JsonObject; +import jakarta.json.JsonObject; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/sjp-event/sjp-event-listener/src/test/java/uk/gov/moj/cpp/sjp/event/listener/CaseCreatedListenerTest.java b/sjp-event/sjp-event-listener/src/test/java/uk/gov/moj/cpp/sjp/event/listener/CaseCreatedListenerTest.java index 5da93ff949..812b7b5f16 100644 --- a/sjp-event/sjp-event-listener/src/test/java/uk/gov/moj/cpp/sjp/event/listener/CaseCreatedListenerTest.java +++ b/sjp-event/sjp-event-listener/src/test/java/uk/gov/moj/cpp/sjp/event/listener/CaseCreatedListenerTest.java @@ -19,7 +19,7 @@ import uk.gov.moj.cpp.sjp.persistence.entity.PersonalDetails; import uk.gov.moj.cpp.sjp.persistence.repository.CaseRepository; -import javax.json.JsonObject; +import jakarta.json.JsonObject; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; diff --git a/sjp-event/sjp-event-listener/src/test/java/uk/gov/moj/cpp/sjp/event/listener/CaseReceivedListenerTest.java b/sjp-event/sjp-event-listener/src/test/java/uk/gov/moj/cpp/sjp/event/listener/CaseReceivedListenerTest.java index b56e4fa753..f506765683 100644 --- a/sjp-event/sjp-event-listener/src/test/java/uk/gov/moj/cpp/sjp/event/listener/CaseReceivedListenerTest.java +++ b/sjp-event/sjp-event-listener/src/test/java/uk/gov/moj/cpp/sjp/event/listener/CaseReceivedListenerTest.java @@ -39,7 +39,7 @@ import java.util.List; import java.util.UUID; -import javax.json.JsonObject; +import jakarta.json.JsonObject; import org.apache.commons.lang3.RandomStringUtils; import org.junit.jupiter.api.BeforeEach; diff --git a/sjp-event/sjp-event-listener/src/test/java/uk/gov/moj/cpp/sjp/event/listener/CaseUpdatedListenerTest.java b/sjp-event/sjp-event-listener/src/test/java/uk/gov/moj/cpp/sjp/event/listener/CaseUpdatedListenerTest.java index 2fd9c47e85..f714656332 100644 --- a/sjp-event/sjp-event-listener/src/test/java/uk/gov/moj/cpp/sjp/event/listener/CaseUpdatedListenerTest.java +++ b/sjp-event/sjp-event-listener/src/test/java/uk/gov/moj/cpp/sjp/event/listener/CaseUpdatedListenerTest.java @@ -39,7 +39,7 @@ import java.time.ZonedDateTime; import java.util.UUID; -import javax.json.JsonObject; +import jakarta.json.JsonObject; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; diff --git a/sjp-event/sjp-event-listener/src/test/java/uk/gov/moj/cpp/sjp/event/listener/DefendantDetailsAcknowledgedListenerTest.java b/sjp-event/sjp-event-listener/src/test/java/uk/gov/moj/cpp/sjp/event/listener/DefendantDetailsAcknowledgedListenerTest.java index ed45557eac..a7ba23eb1c 100644 --- a/sjp-event/sjp-event-listener/src/test/java/uk/gov/moj/cpp/sjp/event/listener/DefendantDetailsAcknowledgedListenerTest.java +++ b/sjp-event/sjp-event-listener/src/test/java/uk/gov/moj/cpp/sjp/event/listener/DefendantDetailsAcknowledgedListenerTest.java @@ -18,7 +18,7 @@ import java.time.format.DateTimeFormatter; import java.util.UUID; -import javax.json.JsonObject; +import jakarta.json.JsonObject; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; diff --git a/sjp-event/sjp-event-listener/src/test/java/uk/gov/moj/cpp/sjp/event/listener/DefendantPendingChangesAcceptedListenerTest.java b/sjp-event/sjp-event-listener/src/test/java/uk/gov/moj/cpp/sjp/event/listener/DefendantPendingChangesAcceptedListenerTest.java index c8b0597c60..bfcddd25c8 100644 --- a/sjp-event/sjp-event-listener/src/test/java/uk/gov/moj/cpp/sjp/event/listener/DefendantPendingChangesAcceptedListenerTest.java +++ b/sjp-event/sjp-event-listener/src/test/java/uk/gov/moj/cpp/sjp/event/listener/DefendantPendingChangesAcceptedListenerTest.java @@ -22,7 +22,7 @@ import java.time.format.DateTimeFormatter; import java.util.UUID; -import javax.json.JsonObject; +import jakarta.json.JsonObject; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; diff --git a/sjp-event/sjp-event-listener/src/test/java/uk/gov/moj/cpp/sjp/event/listener/DefendantPendingChangesRejectedListenerTest.java b/sjp-event/sjp-event-listener/src/test/java/uk/gov/moj/cpp/sjp/event/listener/DefendantPendingChangesRejectedListenerTest.java index 2e5b47497d..b3a65e442b 100644 --- a/sjp-event/sjp-event-listener/src/test/java/uk/gov/moj/cpp/sjp/event/listener/DefendantPendingChangesRejectedListenerTest.java +++ b/sjp-event/sjp-event-listener/src/test/java/uk/gov/moj/cpp/sjp/event/listener/DefendantPendingChangesRejectedListenerTest.java @@ -21,7 +21,7 @@ import java.time.format.DateTimeFormatter; import java.util.UUID; -import javax.json.JsonObject; +import jakarta.json.JsonObject; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; diff --git a/sjp-event/sjp-event-listener/src/test/java/uk/gov/moj/cpp/sjp/event/listener/DefendantPersonalDetailsUpdatedTest.java b/sjp-event/sjp-event-listener/src/test/java/uk/gov/moj/cpp/sjp/event/listener/DefendantPersonalDetailsUpdatedTest.java index 448675e1eb..52ba9e6602 100644 --- a/sjp-event/sjp-event-listener/src/test/java/uk/gov/moj/cpp/sjp/event/listener/DefendantPersonalDetailsUpdatedTest.java +++ b/sjp-event/sjp-event-listener/src/test/java/uk/gov/moj/cpp/sjp/event/listener/DefendantPersonalDetailsUpdatedTest.java @@ -33,7 +33,7 @@ import java.time.ZonedDateTime; import java.util.UUID; -import javax.json.JsonObject; +import jakarta.json.JsonObject; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; diff --git a/sjp-event/sjp-event-listener/src/test/java/uk/gov/moj/cpp/sjp/event/listener/EmployerListenerTest.java b/sjp-event/sjp-event-listener/src/test/java/uk/gov/moj/cpp/sjp/event/listener/EmployerListenerTest.java index 3ced4183ee..b894a79af0 100644 --- a/sjp-event/sjp-event-listener/src/test/java/uk/gov/moj/cpp/sjp/event/listener/EmployerListenerTest.java +++ b/sjp-event/sjp-event-listener/src/test/java/uk/gov/moj/cpp/sjp/event/listener/EmployerListenerTest.java @@ -32,7 +32,7 @@ import java.time.ZonedDateTime; import java.util.UUID; -import javax.json.JsonObject; +import jakarta.json.JsonObject; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/sjp-event/sjp-event-listener/src/test/java/uk/gov/moj/cpp/sjp/event/listener/EnterpriseIdAssociatedListenerTest.java b/sjp-event/sjp-event-listener/src/test/java/uk/gov/moj/cpp/sjp/event/listener/EnterpriseIdAssociatedListenerTest.java index f7eeaaf18f..1bab39b4ff 100644 --- a/sjp-event/sjp-event-listener/src/test/java/uk/gov/moj/cpp/sjp/event/listener/EnterpriseIdAssociatedListenerTest.java +++ b/sjp-event/sjp-event-listener/src/test/java/uk/gov/moj/cpp/sjp/event/listener/EnterpriseIdAssociatedListenerTest.java @@ -16,7 +16,7 @@ import java.util.UUID; -import javax.json.JsonObjectBuilder; +import jakarta.json.JsonObjectBuilder; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; diff --git a/sjp-event/sjp-event-listener/src/test/java/uk/gov/moj/cpp/sjp/event/listener/FinancialImpositionExportListenerTest.java b/sjp-event/sjp-event-listener/src/test/java/uk/gov/moj/cpp/sjp/event/listener/FinancialImpositionExportListenerTest.java index 700bd482e6..5f18410060 100644 --- a/sjp-event/sjp-event-listener/src/test/java/uk/gov/moj/cpp/sjp/event/listener/FinancialImpositionExportListenerTest.java +++ b/sjp-event/sjp-event-listener/src/test/java/uk/gov/moj/cpp/sjp/event/listener/FinancialImpositionExportListenerTest.java @@ -14,7 +14,7 @@ import java.util.UUID; -import javax.json.JsonObject; +import jakarta.json.JsonObject; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/sjp-event/sjp-event-listener/src/test/java/uk/gov/moj/cpp/sjp/event/listener/FinancialMeansListenerTest.java b/sjp-event/sjp-event-listener/src/test/java/uk/gov/moj/cpp/sjp/event/listener/FinancialMeansListenerTest.java index 3a9a5df98c..8dce37cc08 100644 --- a/sjp-event/sjp-event-listener/src/test/java/uk/gov/moj/cpp/sjp/event/listener/FinancialMeansListenerTest.java +++ b/sjp-event/sjp-event-listener/src/test/java/uk/gov/moj/cpp/sjp/event/listener/FinancialMeansListenerTest.java @@ -33,7 +33,7 @@ import java.util.List; import java.util.UUID; -import javax.json.JsonObject; +import jakarta.json.JsonObject; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/sjp-event/sjp-event-listener/src/test/java/uk/gov/moj/cpp/sjp/event/listener/OffenceUpdatedListenerTest.java b/sjp-event/sjp-event-listener/src/test/java/uk/gov/moj/cpp/sjp/event/listener/OffenceUpdatedListenerTest.java index cbe2c1c2ad..4b87bcf8b0 100644 --- a/sjp-event/sjp-event-listener/src/test/java/uk/gov/moj/cpp/sjp/event/listener/OffenceUpdatedListenerTest.java +++ b/sjp-event/sjp-event-listener/src/test/java/uk/gov/moj/cpp/sjp/event/listener/OffenceUpdatedListenerTest.java @@ -43,7 +43,7 @@ import java.util.Optional; import java.util.UUID; -import javax.json.JsonObject; +import jakarta.json.JsonObject; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; diff --git a/sjp-event/sjp-event-listener/src/test/java/uk/gov/moj/cpp/sjp/event/listener/PleasSetListenerTest.java b/sjp-event/sjp-event-listener/src/test/java/uk/gov/moj/cpp/sjp/event/listener/PleasSetListenerTest.java index 63435d467a..4ed0660aa5 100644 --- a/sjp-event/sjp-event-listener/src/test/java/uk/gov/moj/cpp/sjp/event/listener/PleasSetListenerTest.java +++ b/sjp-event/sjp-event-listener/src/test/java/uk/gov/moj/cpp/sjp/event/listener/PleasSetListenerTest.java @@ -24,7 +24,7 @@ import java.io.StringReader; import java.util.UUID; -import javax.json.JsonObject; +import jakarta.json.JsonObject; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; diff --git a/sjp-event/sjp-event-listener/src/test/java/uk/gov/moj/cpp/sjp/event/listener/PressTransparencyReportListenerTest.java b/sjp-event/sjp-event-listener/src/test/java/uk/gov/moj/cpp/sjp/event/listener/PressTransparencyReportListenerTest.java index 2332d0d73a..aa1b879e02 100644 --- a/sjp-event/sjp-event-listener/src/test/java/uk/gov/moj/cpp/sjp/event/listener/PressTransparencyReportListenerTest.java +++ b/sjp-event/sjp-event-listener/src/test/java/uk/gov/moj/cpp/sjp/event/listener/PressTransparencyReportListenerTest.java @@ -22,7 +22,7 @@ import java.util.List; import java.util.UUID; -import javax.json.JsonArrayBuilder; +import jakarta.json.JsonArrayBuilder; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; diff --git a/sjp-event/sjp-event-listener/src/test/java/uk/gov/moj/cpp/sjp/event/listener/ReadyCaseListenerTest.java b/sjp-event/sjp-event-listener/src/test/java/uk/gov/moj/cpp/sjp/event/listener/ReadyCaseListenerTest.java index fc462957be..00140edf5a 100644 --- a/sjp-event/sjp-event-listener/src/test/java/uk/gov/moj/cpp/sjp/event/listener/ReadyCaseListenerTest.java +++ b/sjp-event/sjp-event-listener/src/test/java/uk/gov/moj/cpp/sjp/event/listener/ReadyCaseListenerTest.java @@ -31,7 +31,7 @@ import java.util.Optional; import java.util.UUID; -import javax.json.JsonObjectBuilder; +import jakarta.json.JsonObjectBuilder; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; diff --git a/sjp-event/sjp-event-listener/src/test/java/uk/gov/moj/cpp/sjp/event/listener/ResolveCaseEligibleForAOCPListenerTest.java b/sjp-event/sjp-event-listener/src/test/java/uk/gov/moj/cpp/sjp/event/listener/ResolveCaseEligibleForAOCPListenerTest.java index 0fb0c42e12..decd2e47b1 100644 --- a/sjp-event/sjp-event-listener/src/test/java/uk/gov/moj/cpp/sjp/event/listener/ResolveCaseEligibleForAOCPListenerTest.java +++ b/sjp-event/sjp-event-listener/src/test/java/uk/gov/moj/cpp/sjp/event/listener/ResolveCaseEligibleForAOCPListenerTest.java @@ -23,7 +23,7 @@ import java.util.UUID; -import javax.json.JsonObject; +import jakarta.json.JsonObject; import com.fasterxml.jackson.databind.ObjectMapper; import org.junit.jupiter.api.Test; diff --git a/sjp-event/sjp-event-listener/src/test/java/uk/gov/moj/cpp/sjp/event/listener/SocCheckListenerTest.java b/sjp-event/sjp-event-listener/src/test/java/uk/gov/moj/cpp/sjp/event/listener/SocCheckListenerTest.java index a8a500a754..d10a25f1f2 100644 --- a/sjp-event/sjp-event-listener/src/test/java/uk/gov/moj/cpp/sjp/event/listener/SocCheckListenerTest.java +++ b/sjp-event/sjp-event-listener/src/test/java/uk/gov/moj/cpp/sjp/event/listener/SocCheckListenerTest.java @@ -16,7 +16,7 @@ import java.time.ZonedDateTime; import java.util.UUID; -import javax.json.JsonObject; +import jakarta.json.JsonObject; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; diff --git a/sjp-event/sjp-event-listener/src/test/java/uk/gov/moj/cpp/sjp/event/listener/TransparencyReportListenerTest.java b/sjp-event/sjp-event-listener/src/test/java/uk/gov/moj/cpp/sjp/event/listener/TransparencyReportListenerTest.java index 31c5c3f51c..4412a85335 100644 --- a/sjp-event/sjp-event-listener/src/test/java/uk/gov/moj/cpp/sjp/event/listener/TransparencyReportListenerTest.java +++ b/sjp-event/sjp-event-listener/src/test/java/uk/gov/moj/cpp/sjp/event/listener/TransparencyReportListenerTest.java @@ -28,7 +28,7 @@ import java.util.List; import java.util.UUID; -import javax.json.JsonArrayBuilder; +import jakarta.json.JsonArrayBuilder; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; diff --git a/sjp-event/sjp-event-listener/src/test/java/uk/gov/moj/cpp/sjp/event/listener/converter/DecisionSavedToCaseDecisionTest.java b/sjp-event/sjp-event-listener/src/test/java/uk/gov/moj/cpp/sjp/event/listener/converter/DecisionSavedToCaseDecisionTest.java index 24586c314e..7efd591cf6 100644 --- a/sjp-event/sjp-event-listener/src/test/java/uk/gov/moj/cpp/sjp/event/listener/converter/DecisionSavedToCaseDecisionTest.java +++ b/sjp-event/sjp-event-listener/src/test/java/uk/gov/moj/cpp/sjp/event/listener/converter/DecisionSavedToCaseDecisionTest.java @@ -69,7 +69,7 @@ import java.util.UUID; import java.util.stream.Stream; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.hamcrest.Matcher; import org.junit.jupiter.api.Test; diff --git a/sjp-event/sjp-event-listener/src/test/java/uk/gov/moj/cpp/sjp/util/fakes/FakeAocpAcceptedEmailNotificationRepository.java b/sjp-event/sjp-event-listener/src/test/java/uk/gov/moj/cpp/sjp/util/fakes/FakeAocpAcceptedEmailNotificationRepository.java index 94bb4b5f63..e7d74fe644 100644 --- a/sjp-event/sjp-event-listener/src/test/java/uk/gov/moj/cpp/sjp/util/fakes/FakeAocpAcceptedEmailNotificationRepository.java +++ b/sjp-event/sjp-event-listener/src/test/java/uk/gov/moj/cpp/sjp/util/fakes/FakeAocpAcceptedEmailNotificationRepository.java @@ -4,106 +4,87 @@ import java.util.List; import java.util.Map; import java.util.UUID; -import javax.persistence.metamodel.SingularAttribute; +import jakarta.persistence.metamodel.SingularAttribute; import uk.gov.moj.cpp.sjp.persistence.entity.AocpAcceptedEmailStatus; import uk.gov.moj.cpp.sjp.persistence.repository.AocpAcceptedEmailNotificationStatusRepository; -public abstract class FakeAocpAcceptedEmailNotificationRepository implements AocpAcceptedEmailNotificationStatusRepository { +public abstract class FakeAocpAcceptedEmailNotificationRepository extends AocpAcceptedEmailNotificationStatusRepository { private Map inMemoryStorage = new HashMap<>(); - @Override public AocpAcceptedEmailStatus save(final AocpAcceptedEmailStatus notificationOfAocpAcceptedEmail) { return this.inMemoryStorage.put(notificationOfAocpAcceptedEmail.getCaseId(), clone(notificationOfAocpAcceptedEmail)); } - @Override public AocpAcceptedEmailStatus saveAndFlush(final AocpAcceptedEmailStatus notificationOfAocpAcceptedEmail) { throw new UnsupportedOperationException(); } - @Override public AocpAcceptedEmailStatus saveAndFlushAndRefresh(final AocpAcceptedEmailStatus notificationOfAocpAcceptedEmail) { throw new UnsupportedOperationException(); } - @Override public void remove(final AocpAcceptedEmailStatus notificationOfAocpAcceptedEmail) { throw new UnsupportedOperationException(); } - @Override public void removeAndFlush(final AocpAcceptedEmailStatus notificationOfAocpAcceptedEmail) { throw new UnsupportedOperationException(); } - @Override public void attachAndRemove(final AocpAcceptedEmailStatus notificationOfAocpAcceptedEmail) { throw new UnsupportedOperationException(); } - @Override public void refresh(final AocpAcceptedEmailStatus notificationOfAocpAcceptedEmail) { throw new UnsupportedOperationException(); } - @Override public void flush() { throw new UnsupportedOperationException(); } - @Override public AocpAcceptedEmailStatus findBy(final UUID uuid) { return this.inMemoryStorage.get(uuid); } - @Override public List findAll() { throw new UnsupportedOperationException(); } - @Override public List findAll(final int i, final int i1) { throw new UnsupportedOperationException(); } - @Override public List findBy(final AocpAcceptedEmailStatus notificationOfAocpAcceptedEmail, final SingularAttribute... singularAttributes) { throw new UnsupportedOperationException(); } - @Override public List findBy(final AocpAcceptedEmailStatus notificationOfAocpAcceptedEmail, final int i, final int i1, final SingularAttribute... singularAttributes) { throw new UnsupportedOperationException(); } - @Override public List findByLike(final AocpAcceptedEmailStatus notificationOfAocpAcceptedEmail, final SingularAttribute... singularAttributes) { throw new UnsupportedOperationException(); } - @Override public List findByLike(final AocpAcceptedEmailStatus notificationOfAocpAcceptedEmail, final int i, final int i1, final SingularAttribute... singularAttributes) { throw new UnsupportedOperationException(); } - @Override public Long count() { throw new UnsupportedOperationException(); } - @Override public Long count(final AocpAcceptedEmailStatus notificationOfAocpAcceptedEmail, final SingularAttribute... singularAttributes) { throw new UnsupportedOperationException(); } - @Override public Long countLike(final AocpAcceptedEmailStatus notificationOfAocpAcceptedEmail, final SingularAttribute... singularAttributes) { throw new UnsupportedOperationException(); } - @Override public UUID getPrimaryKey(final AocpAcceptedEmailStatus notificationOfAocpAcceptedEmail) { throw new UnsupportedOperationException(); } diff --git a/sjp-event/sjp-event-listener/src/test/java/uk/gov/moj/cpp/sjp/util/fakes/FakeEmailNotificationRepository.java b/sjp-event/sjp-event-listener/src/test/java/uk/gov/moj/cpp/sjp/util/fakes/FakeEmailNotificationRepository.java index 1c24c37bb2..8ed2913013 100644 --- a/sjp-event/sjp-event-listener/src/test/java/uk/gov/moj/cpp/sjp/util/fakes/FakeEmailNotificationRepository.java +++ b/sjp-event/sjp-event-listener/src/test/java/uk/gov/moj/cpp/sjp/util/fakes/FakeEmailNotificationRepository.java @@ -12,103 +12,84 @@ import java.util.Map; import java.util.UUID; -import javax.persistence.metamodel.SingularAttribute; +import jakarta.persistence.metamodel.SingularAttribute; -public abstract class FakeEmailNotificationRepository implements EmailNotificationRepository { +public abstract class FakeEmailNotificationRepository extends EmailNotificationRepository { private Map inMemoryStorage = new HashMap<>(); - @Override public EmailNotification save(final EmailNotification emailNotification) { return this.inMemoryStorage.put(emailNotification.getId(), clone(emailNotification)); } - @Override public EmailNotification saveAndFlush(final EmailNotification emailNotification) { throw new UnsupportedOperationException(); } - @Override public EmailNotification saveAndFlushAndRefresh(final EmailNotification emailNotification) { throw new UnsupportedOperationException(); } - @Override public void remove(final EmailNotification emailNotification) { throw new UnsupportedOperationException(); } - @Override public void removeAndFlush(final EmailNotification emailNotification) { throw new UnsupportedOperationException(); } - @Override public void attachAndRemove(final EmailNotification emailNotification) { throw new UnsupportedOperationException(); } - @Override public void refresh(final EmailNotification emailNotification) { throw new UnsupportedOperationException(); } - @Override public void flush() { throw new UnsupportedOperationException(); } - @Override public EmailNotification findBy(final UUID uuid) { return this.inMemoryStorage.get(uuid); } - @Override public List findAll() { throw new UnsupportedOperationException(); } - @Override public List findAll(final int i, final int i1) { throw new UnsupportedOperationException(); } - @Override public List findBy(final EmailNotification emailNotification, final SingularAttribute... singularAttributes) { throw new UnsupportedOperationException(); } - @Override public List findBy(final EmailNotification emailNotification, final int i, final int i1, final SingularAttribute... singularAttributes) { throw new UnsupportedOperationException(); } - @Override public List findByLike(final EmailNotification emailNotification, final SingularAttribute... singularAttributes) { throw new UnsupportedOperationException(); } - @Override public List findByLike(final EmailNotification emailNotification, final int i, final int i1, final SingularAttribute... singularAttributes) { throw new UnsupportedOperationException(); } - @Override public Long count() { throw new UnsupportedOperationException(); } - @Override public Long count(final EmailNotification emailNotification, final SingularAttribute... singularAttributes) { throw new UnsupportedOperationException(); } - @Override public Long countLike(final EmailNotification emailNotification, final SingularAttribute... singularAttributes) { throw new UnsupportedOperationException(); } - @Override public UUID getPrimaryKey(final EmailNotification emailNotification) { throw new UnsupportedOperationException(); } @@ -123,7 +104,6 @@ private EmailNotification clone(final EmailNotification entity) { ); } - @Override public EmailNotification findByReferenceIdAndNotificationType(final UUID referenceId, final EmailNotification.NotificationNotifyDocumentType notificationType) { Iterator it = this.inMemoryStorage.entrySet().iterator(); while (it.hasNext()) { diff --git a/sjp-event/sjp-event-listener/src/test/java/uk/gov/moj/cpp/sjp/util/fakes/FakeEndorsementRemovalNotificationRepository.java b/sjp-event/sjp-event-listener/src/test/java/uk/gov/moj/cpp/sjp/util/fakes/FakeEndorsementRemovalNotificationRepository.java index b16a962e0b..dab55bea0a 100644 --- a/sjp-event/sjp-event-listener/src/test/java/uk/gov/moj/cpp/sjp/util/fakes/FakeEndorsementRemovalNotificationRepository.java +++ b/sjp-event/sjp-event-listener/src/test/java/uk/gov/moj/cpp/sjp/util/fakes/FakeEndorsementRemovalNotificationRepository.java @@ -9,109 +9,89 @@ import java.util.Optional; import java.util.UUID; -import javax.persistence.metamodel.SingularAttribute; +import jakarta.persistence.metamodel.SingularAttribute; -public abstract class FakeEndorsementRemovalNotificationRepository implements EndorsementRemovalNotificationRepository { +public abstract class FakeEndorsementRemovalNotificationRepository extends EndorsementRemovalNotificationRepository { private Map inMemoryStorage = new HashMap<>(); - @Override public NotificationOfEndorsementStatus save(final NotificationOfEndorsementStatus notificationOfEndorsementStatus) { return this.inMemoryStorage.put(notificationOfEndorsementStatus.getApplicationDecisionId(), clone(notificationOfEndorsementStatus)); } - @Override public NotificationOfEndorsementStatus saveAndFlush(final NotificationOfEndorsementStatus notificationOfEndorsementStatus) { throw new UnsupportedOperationException(); } - @Override public NotificationOfEndorsementStatus saveAndFlushAndRefresh(final NotificationOfEndorsementStatus notificationOfEndorsementStatus) { throw new UnsupportedOperationException(); } - @Override public void remove(final NotificationOfEndorsementStatus notificationOfEndorsementStatus) { throw new UnsupportedOperationException(); } - @Override public void removeAndFlush(final NotificationOfEndorsementStatus notificationOfEndorsementStatus) { throw new UnsupportedOperationException(); } - @Override public void attachAndRemove(final NotificationOfEndorsementStatus notificationOfEndorsementStatus) { throw new UnsupportedOperationException(); } - @Override public void refresh(final NotificationOfEndorsementStatus notificationOfEndorsementStatus) { throw new UnsupportedOperationException(); } - @Override public void flush() { throw new UnsupportedOperationException(); } - @Override public NotificationOfEndorsementStatus findBy(final UUID uuid) { return this.inMemoryStorage.get(uuid); } - @Override public Optional findOptionalBy(final UUID uuid) { throw new UnsupportedOperationException(); } - @Override public List findAll() { throw new UnsupportedOperationException(); } - @Override public List findAll(final int i, final int i1) { throw new UnsupportedOperationException(); } - @Override public List findBy(final NotificationOfEndorsementStatus notificationOfEndorsementStatus, final SingularAttribute... singularAttributes) { throw new UnsupportedOperationException(); } - @Override public List findBy(final NotificationOfEndorsementStatus notificationOfEndorsementStatus, final int i, final int i1, final SingularAttribute... singularAttributes) { throw new UnsupportedOperationException(); } - @Override public List findByLike(final NotificationOfEndorsementStatus notificationOfEndorsementStatus, final SingularAttribute... singularAttributes) { throw new UnsupportedOperationException(); } - @Override public List findByLike(final NotificationOfEndorsementStatus notificationOfEndorsementStatus, final int i, final int i1, final SingularAttribute... singularAttributes) { throw new UnsupportedOperationException(); } - @Override public Long count() { throw new UnsupportedOperationException(); } - @Override public Long count(final NotificationOfEndorsementStatus notificationOfEndorsementStatus, final SingularAttribute... singularAttributes) { throw new UnsupportedOperationException(); } - @Override public Long countLike(final NotificationOfEndorsementStatus notificationOfEndorsementStatus, final SingularAttribute... singularAttributes) { throw new UnsupportedOperationException(); } - @Override public UUID getPrimaryKey(final NotificationOfEndorsementStatus notificationOfEndorsementStatus) { throw new UnsupportedOperationException(); } diff --git a/sjp-event/sjp-event-listener/src/test/java/uk/gov/moj/cpp/sjp/util/fakes/FakeEnforcementPendingApplicationNotificationRepository.java b/sjp-event/sjp-event-listener/src/test/java/uk/gov/moj/cpp/sjp/util/fakes/FakeEnforcementPendingApplicationNotificationRepository.java index dc0ca6fefc..d234ff1f0f 100644 --- a/sjp-event/sjp-event-listener/src/test/java/uk/gov/moj/cpp/sjp/util/fakes/FakeEnforcementPendingApplicationNotificationRepository.java +++ b/sjp-event/sjp-event-listener/src/test/java/uk/gov/moj/cpp/sjp/util/fakes/FakeEnforcementPendingApplicationNotificationRepository.java @@ -9,111 +9,91 @@ import java.util.Optional; import java.util.UUID; -import javax.persistence.metamodel.SingularAttribute; +import jakarta.persistence.metamodel.SingularAttribute; -public class FakeEnforcementPendingApplicationNotificationRepository implements EnforcementPendingApplicationNotificationStatusRepository { +public class FakeEnforcementPendingApplicationNotificationRepository extends EnforcementPendingApplicationNotificationStatusRepository { private Map inMemoryStorage = new HashMap<>(); - @Override public EnforcementNotification save(final EnforcementNotification notificationOfEndorsementStatus) { return this.inMemoryStorage.put(notificationOfEndorsementStatus.getApplicationId(), clone(notificationOfEndorsementStatus)); } - @Override public EnforcementNotification saveAndFlush(final EnforcementNotification notificationOfEndorsementStatus) { throw new UnsupportedOperationException(); } - @Override public EnforcementNotification saveAndFlushAndRefresh(final EnforcementNotification notificationOfEndorsementStatus) { throw new UnsupportedOperationException(); } - @Override public void remove(final EnforcementNotification notificationOfEndorsementStatus) { throw new UnsupportedOperationException(); } - @Override public void removeAndFlush(final EnforcementNotification notificationOfEndorsementStatus) { throw new UnsupportedOperationException(); } - @Override public void attachAndRemove(final EnforcementNotification notificationOfEndorsementStatus) { throw new UnsupportedOperationException(); } - @Override public void refresh(final EnforcementNotification notificationOfEndorsementStatus) { throw new UnsupportedOperationException(); } - @Override public void flush() { throw new UnsupportedOperationException(); } - @Override public EnforcementNotification findBy(final UUID uuid) { return this.inMemoryStorage.get(uuid); } - @Override public Optional findOptionalBy(final UUID uuid) { throw new UnsupportedOperationException(); } - @Override public List findAll() { throw new UnsupportedOperationException(); } - @Override public List findAll(final int i, final int i1) { throw new UnsupportedOperationException(); } - @Override public List findBy(final EnforcementNotification notificationOfEndorsementStatus, final SingularAttribute... singularAttributes) { throw new UnsupportedOperationException(); } - @Override public List findBy(final EnforcementNotification notificationOfEndorsementStatus, final int i, final int i1, final SingularAttribute... singularAttributes) { throw new UnsupportedOperationException(); } - @Override public List findByLike(final EnforcementNotification notificationOfEndorsementStatus, final SingularAttribute... singularAttributes) { throw new UnsupportedOperationException(); } - @Override public List findByLike(final EnforcementNotification notificationOfEndorsementStatus, final int i, final int i1, final SingularAttribute... singularAttributes) { throw new UnsupportedOperationException(); } - @Override public Long count() { throw new UnsupportedOperationException(); } - @Override public Long count(final EnforcementNotification notificationOfEndorsementStatus, final SingularAttribute... singularAttributes) { throw new UnsupportedOperationException(); } - @Override public Long countLike(final EnforcementNotification notificationOfEndorsementStatus, final SingularAttribute... singularAttributes) { throw new UnsupportedOperationException(); } - @Override public UUID getPrimaryKey(final EnforcementNotification notificationOfEndorsementStatus) { throw new UnsupportedOperationException(); } diff --git a/sjp-event/sjp-event-listener/src/test/java/uk/gov/moj/cpp/sjp/util/fakes/TestOffenceRepository.java b/sjp-event/sjp-event-listener/src/test/java/uk/gov/moj/cpp/sjp/util/fakes/TestOffenceRepository.java index 3e9ad78bfa..2e6674cbbb 100644 --- a/sjp-event/sjp-event-listener/src/test/java/uk/gov/moj/cpp/sjp/util/fakes/TestOffenceRepository.java +++ b/sjp-event/sjp-event-listener/src/test/java/uk/gov/moj/cpp/sjp/util/fakes/TestOffenceRepository.java @@ -12,9 +12,9 @@ import java.util.UUID; import java.util.stream.Collectors; -import javax.persistence.metamodel.SingularAttribute; +import jakarta.persistence.metamodel.SingularAttribute; -public class TestOffenceRepository implements OffenceRepository { +public class TestOffenceRepository extends OffenceRepository { private final List offences; @@ -22,114 +22,92 @@ public TestOffenceRepository() { this.offences = new ArrayList(); } - @Override public List findByDefendantDetail(final DefendantDetail defendantDetail) { throw new UnsupportedOperationException(); } - @Override public List findByIds(final List offenceIds) { return offences.stream() .filter(o -> offenceIds.contains(o.getId())) .collect(Collectors.toList()); } - @Override public OffenceDetail save(final OffenceDetail offenceDetail) { throw new UnsupportedOperationException(); } - @Override public OffenceDetail saveAndFlush(final OffenceDetail offenceDetail) { throw new UnsupportedOperationException(); } - @Override public OffenceDetail saveAndFlushAndRefresh(final OffenceDetail offenceDetail) { throw new UnsupportedOperationException(); } - @Override public void remove(final OffenceDetail offenceDetail) { throw new UnsupportedOperationException(); } - @Override public void removeAndFlush(final OffenceDetail offenceDetail) { throw new UnsupportedOperationException(); } - @Override public void attachAndRemove(final OffenceDetail offenceDetail) { throw new UnsupportedOperationException(); } - @Override public void refresh(final OffenceDetail offenceDetail) { throw new UnsupportedOperationException(); } - @Override public Optional findOptionalBy(final UUID uuid) { throw new UnsupportedOperationException(); } - @Override public void flush() { throw new UnsupportedOperationException(); } - @Override public OffenceDetail findBy(final UUID uuid) { throw new UnsupportedOperationException(); } - @Override public List findAll() { throw new UnsupportedOperationException(); } - @Override public List findAll(final int i, final int i1) { throw new UnsupportedOperationException(); } - @Override public List findBy(final OffenceDetail offenceDetail, final SingularAttribute... singularAttributes) { throw new UnsupportedOperationException(); } - @Override public List findBy(final OffenceDetail offenceDetail, final int i, final int i1, final SingularAttribute... singularAttributes) { throw new UnsupportedOperationException(); } - @Override public List findByLike(final OffenceDetail offenceDetail, final SingularAttribute... singularAttributes) { throw new UnsupportedOperationException(); } - @Override public List findByLike(final OffenceDetail offenceDetail, final int i, final int i1, final SingularAttribute... singularAttributes) { throw new UnsupportedOperationException(); } - @Override public Long count() { throw new UnsupportedOperationException(); } - @Override public Long count(final OffenceDetail offenceDetail, final SingularAttribute... singularAttributes) { throw new UnsupportedOperationException(); } - @Override public Long countLike(final OffenceDetail offenceDetail, final SingularAttribute... singularAttributes) { throw new UnsupportedOperationException(); } - @Override public UUID getPrimaryKey(final OffenceDetail offenceDetail) { throw new UnsupportedOperationException(); } diff --git a/sjp-event/sjp-event-processor/pom.xml b/sjp-event/sjp-event-processor/pom.xml index c2e06daadb..291ba5c690 100644 --- a/sjp-event/sjp-event-processor/pom.xml +++ b/sjp-event/sjp-event-processor/pom.xml @@ -3,7 +3,7 @@ sjp-event uk.gov.moj.cpp.sjp - 17.104.193-SNAPSHOT + 25.104.0-M1-SNAPSHOT 4.0.0 @@ -51,8 +51,8 @@ file-service-persistence