From 820c659ccfe9535b74e3a7218c64ecde42751923 Mon Sep 17 00:00:00 2001 From: allanmckenzie Date: Tue, 15 Sep 2026 14:58:26 +0100 Subject: [PATCH 1/2] PEG-3562 PEG-3295 sjp: Java 25 / WildFly 40 / Jakarta EE 11 upgrade on the released 25.104.2 stack Consolidates the two parallel Java 25 lines into a single change cut from release/26.20: - dev/java-25-wildfly-40-upgrade (13 commits, the line behind PR #150) - kept, as the newer and further-advanced migration - dev/sjp-25.104-upgrade (2 commits, 12 Aug, local only) - contributed nothing to keep: its unique content was the deprecated sjp-domain-transformation-anonymise module, 53 accidentally committed maven-output-sjp*.txt build logs, and an earlier iteration of the same DeltaSpike to JPA migration service-parent-pom and coredomain.version are on the released 25.104.2. The anonymise module stays deleted: stream-transformation-tool-anonymise is javax-only with no Jakarta release. --- azure-pipelines.yaml | 5 +- docker/Dockerfile_sjp-service | 2 +- pom.xml | 20 +- sjp-command/pom.xml | 2 +- sjp-command/sjp-command-api/pom.xml | 24 +- .../sjp/command/api/AddCaseDocumentApi.java | 2 +- ...inancialImpositionAccountNumberBdfApi.java | 2 +- ...ddFinancialImpositionCorrelationIdApi.java | 2 +- .../api/AocpResponseTimerExpiredApi.java | 2 +- .../api/CaseAssignmentRestrictionApi.java | 4 +- .../moj/cpp/sjp/command/api/CaseNoteApi.java | 6 +- .../cpp/sjp/command/api/CaseReopenedApi.java | 4 +- .../cpp/sjp/command/api/CreateCaseApi.java | 10 +- .../command/api/CreateCaseApplicationApi.java | 2 +- .../cpp/sjp/command/api/DatesToAvoidApi.java | 2 +- .../moj/cpp/sjp/command/api/DecisionApi.java | 6 +- .../sjp/command/api/DefendantDetailsApi.java | 6 +- .../command/api/DeleteCaseDocumentApi.java | 2 +- .../moj/cpp/sjp/command/api/EmployerApi.java | 6 +- .../sjp/command/api/FinancialMeansApi.java | 2 +- .../command/api/MarkAsLegalSocCheckedApi.java | 4 +- .../api/OffenceWithdrawalRequestApi.java | 4 +- .../cpp/sjp/command/api/PleadOnlineApi.java | 8 +- .../api/PressTransparencyReportApi.java | 2 +- .../sjp/command/api/RequestDeleteDocsApi.java | 2 +- .../cpp/sjp/command/api/ReserveCaseApi.java | 2 +- .../sjp/command/api/ResolveCaseStatusApi.java | 6 +- .../api/ResolveConvictionCourtApi.java | 2 +- .../sjp/command/api/ResubmitResultsApi.java | 2 +- .../moj/cpp/sjp/command/api/SessionApi.java | 6 +- .../api/SetDatesToAvoidRequiredApi.java | 6 +- .../moj/cpp/sjp/command/api/SetPleasApi.java | 4 +- .../cpp/sjp/command/api/TransparencyApi.java | 2 +- .../api/UpdateAllFinancialMeansApi.java | 2 +- .../api/UpdateCasesManagementStatusApi.java | 2 +- .../api/UpdateHearingRequirementsApi.java | 2 +- .../sjp/command/api/UpdateOffenceCodeApi.java | 2 +- .../command/api/UploadCaseDocumentApi.java | 2 +- .../command/api/service/AddressService.java | 4 +- .../sjp/command/api/service/CaseService.java | 4 +- .../api/service/ContactDetailsService.java | 4 +- .../api/service/ReferenceDataService.java | 4 +- .../api/validator/PleadOnlineValidator.java | 2 +- .../command/api/validator/SetPleasModel.java | 2 +- .../api/validator/UpdatePleaModel.java | 2 +- .../AdjournDecisionValidator.java | 2 +- .../ApplicationDecisionValidator.java | 2 +- .../CommonDecisionValidator.java | 2 +- .../DischargeDecisionValidator.java | 2 +- .../FinancialImpositionValidator.java | 2 +- .../FinancialPenaltyDecisionValidator.java | 6 +- .../SjpServiceFileInterceptor.java | 2 +- .../utils/NullSafeJsonObjectHelper.java | 2 +- .../src/main/resources/META-INF/beans.xml | 8 +- ...cialImpositionAccountNumberBdfApiTest.java | 2 +- ...nancialImpositionCorrelationIdApiTest.java | 2 +- .../api/AocpResponseTimeExpiredApiTest.java | 2 +- .../cpp/sjp/command/api/CaseNoteApiTest.java | 4 +- .../sjp/command/api/CreateCaseApiTest.java | 2 +- .../api/CreateCaseApplicationApiTest.java | 2 +- .../cpp/sjp/command/api/DecisionApiTest.java | 6 +- .../command/api/DefendantDetailsApiTest.java | 2 +- .../api/OffenceWithdrawalRequestApiTest.java | 4 +- .../sjp/command/api/PleadOnlineApiTest.java | 8 +- .../api/ResolveConvictingCourtApiTest.java | 2 +- .../api/ResolveConvictionCourtApiTest.java | 2 +- .../cpp/sjp/command/api/SessionApiTest.java | 2 +- .../sjp/command/api/UpdateEmployerTest.java | 4 +- .../api/service/AddressServiceTest.java | 4 +- .../command/api/service/CaseServiceTest.java | 2 +- .../api/service/ReferenceDataServiceTest.java | 2 +- .../validator/PleadOnlineValidatorTest.java | 6 +- .../DischargeDecisionValidatorTest.java | 2 +- .../FinancialImpositionValidatorTest.java | 4 +- ...FinancialPenaltyDecisionValidatorTest.java | 2 +- .../schema/CaseReopenedSchemaTest.java | 2 +- .../schema/UpdateDefendantSchemaTest.java | 2 +- .../utils/CommonObjectBuilderUtil.java | 4 +- .../utils/NullSafeJsonObjectHelperTest.java | 2 +- sjp-command/sjp-command-controller/pom.xml | 24 +- .../ApplicationDecisionController.java | 6 +- .../controller/AssignmentController.java | 10 +- .../command/controller/BaseController.java | 6 +- .../CaseAssignmentRestrictionController.java | 6 +- .../controller/CaseCreateController.java | 4 +- .../controller/CaseNoteController.java | 6 +- .../CreateApplicationController.java | 6 +- .../controller/DecisionController.java | 10 +- .../DefendantDetailsController.java | 4 +- .../controller/NoActionController.java | 2 +- .../controller/PleadAocpOnlineController.java | 4 +- .../controller/PleadOnlineController.java | 4 +- .../controller/RegionAwareController.java | 4 +- .../UpdateOffenceCodeController.java | 2 +- .../service/CaseApplicationService.java | 4 +- .../cpp/sjp/command/service/CaseService.java | 4 +- .../command/service/ReadyCasesService.java | 4 +- .../command/service/ReferenceDataService.java | 6 +- .../sjp/command/service/SessionService.java | 4 +- .../cpp/sjp/command/service/UserService.java | 4 +- .../src/main/resources/META-INF/beans.xml | 8 +- .../gov/moj/cpp/sjp/command/TestFixtures.java | 6 +- .../accesscontrol/AddCaseDocumentTest.java | 2 +- .../CaseAssignmentRestrictionTest.java | 2 +- .../command/accesscontrol/CreateCaseTest.java | 2 +- .../accesscontrol/DeleteCaseDocumentTest.java | 2 +- .../command/accesscontrol/EmployerTest.java | 2 +- .../MarkAsLegalSocCheckedTest.java | 2 +- .../accesscontrol/MarkCaseReopenedTest.java | 2 +- .../command/accesscontrol/SetPleasTest.java | 2 +- .../accesscontrol/UpdateCaseReopenedTest.java | 2 +- .../UpdateFinancialMeansTest.java | 2 +- .../UpdateHearingRequirementsTest.java | 2 +- .../ApplicationDecisionControllerTest.java | 6 +- .../controller/AssignmentControllerTest.java | 6 +- ...seAssignmentRestrictionControllerTest.java | 2 +- .../controller/CaseCreateControllerTest.java | 4 +- .../controller/CaseNoteControllerTest.java | 4 +- .../controller/DecisionControllerTest.java | 10 +- .../DefendantDetailsControllerTest.java | 4 +- .../PleadAocpOnlineControllerTest.java | 4 +- .../controller/PleadOnlineControllerTest.java | 4 +- .../service/ReadyCasesServiceTest.java | 4 +- .../sjp/command/service/UserServiceTest.java | 4 +- sjp-command/sjp-command-handler/pom.xml | 6 +- .../AcceptPendingDefendantChangesHandler.java | 4 +- ...cceptPendingDefendantChangesHandlerCC.java | 4 +- ...owledgeDefendantDetailsUpdatesHandler.java | 4 +- .../handler/AddCaseDocumentHandler.java | 4 +- .../handler/AddDatesToAvoidHandler.java | 4 +- .../AocpAcceptanceTimerExpiredHandler.java | 2 +- .../AocpAcceptedEmailNotificationHandler.java | 4 +- .../command/handler/AssignmentHandler.java | 6 +- .../handler/BasePersonInfoHandler.java | 2 +- .../handler/CaseAdjournmentHandler.java | 4 +- .../CaseAssignmentRestrictionHandler.java | 4 +- .../command/handler/CaseCommandHandler.java | 6 +- .../sjp/command/handler/CaseNoteHandler.java | 2 +- .../command/handler/CaseReceivedHandler.java | 4 +- .../command/handler/CaseReopenedHandler.java | 2 +- .../ChangeCaseManagementStatusHandler.java | 2 +- .../handler/CreateCaseApplicationHandler.java | 6 +- .../sjp/command/handler/DecisionHandler.java | 2 +- ...fendantAcceptedAOCPPleadOnlineHandler.java | 4 +- .../handler/DeleteCaseDocumentHandler.java | 2 +- ...EndorsementRemovalNotificationHandler.java | 2 +- ...PendingApplicationNotificationHandler.java | 4 +- .../handler/FinancialImpositionHandler.java | 2 +- .../handler/FinancialMeansHandler.java | 2 +- .../handler/MarkAsLegalSocCheckedHandler.java | 2 +- .../OffenceWithdrawalRequestHandler.java | 2 +- ...artialAocpCriteriaNotificationHandler.java | 4 +- .../command/handler/PleadOnlineHandler.java | 4 +- .../PressTransparencyReportHandler.java | 8 +- .../RejectPendingDefendantChangesHandler.java | 4 +- .../ResolveCaseAOCPEligibilityHandler.java | 2 +- .../handler/ResubmitResultsHandler.java | 2 +- .../sjp/command/handler/SessionHandler.java | 6 +- .../handler/SetPleasCommandHandler.java | 4 +- .../handler/TransparencyReportHandler.java | 6 +- .../handler/UpdateCaseApplicationHandler.java | 2 +- ...dateCaseListedInCriminalCourtsHandler.java | 4 +- .../UpdateCasesManagementStatusHandler.java | 4 +- .../UpdateDefendantDetailsFromCCHandler.java | 4 +- .../UpdateDefendantDetailsHandler.java | 4 +- ...fendantNationalInsuranceNumberHandler.java | 2 +- .../UpdateHearingRequirementsHandler.java | 2 +- .../handler/UpdateOffenceCodeHandler.java | 2 +- .../handler/UploadCaseDocumentHandler.java | 4 +- .../service/EnforcementAreaService.java | 4 +- .../handler/service/ReferenceDataService.java | 6 +- .../src/main/resources/META-INF/beans.xml | 8 +- ...tPendingDefendantChangesHandlerCCTest.java | 4 +- ...eptPendingDefendantChangesHandlerTest.java | 4 +- .../handler/AddDatesToAvoidHandlerTest.java | 2 +- ...AocpAcceptanceTimerExpiredHandlerTest.java | 2 +- .../CaseAssignmentRestrictionHandlerTest.java | 2 +- .../handler/CaseCommandHandlerTest.java | 2 +- .../command/handler/CaseNoteHandlerTest.java | 2 +- .../handler/CaseReceivedHandlerTest.java | 2 +- .../CreateCaseApplicationHandlerTest.java | 2 +- .../command/handler/DecisionHandlerTest.java | 4 +- .../command/handler/EmployerHandlerTest.java | 4 +- .../FinancialImpositionHandlerTest.java | 2 +- .../MarkAsLegalSocCheckedHandlerTest.java | 2 +- .../OffenceWithdrawalRequestHandlerTest.java | 2 +- .../PressTransparencyReportHandlerTest.java | 4 +- ...ectPendingDefendantChangesHandlerTest.java | 2 +- ...ResolveCaseAOCPEligibilityHandlerTest.java | 2 +- .../ResolveConvictingCourtHandlerTest.java | 2 +- .../ResolveConvictionCourtHandlerTest.java | 2 +- .../command/handler/SessionHandlerTest.java | 2 +- .../TransparencyReportHandlerTest.java | 4 +- ...teAllFinancialMeansCommandHandlerTest.java | 2 +- .../UpdateCaseApplicationHandlerTest.java | 2 +- ...dateDefendantDetailsFromCCHandlerTest.java | 4 +- .../UpdateDefendantDetailsHandlerTest.java | 4 +- ...antNationalInsuranceNumberHandlerTest.java | 2 +- .../UploadCaseDocumentHandlerTest.java | 2 +- .../AddCaseDocumentCommandBuilder.java | 2 +- .../builder/CaseReopenDetailsBuilder.java | 2 +- .../handler/converter/BaseConverterTest.java | 4 +- .../service/EnforcementAreaServiceTest.java | 2 +- .../service/ReferenceDataServiceTest.java | 4 +- sjp-domain/pom.xml | 2 +- sjp-domain/sjp-domain-aggregate/pom.xml | 8 +- .../sjp/domain/aggregate/CaseAggregate.java | 2 +- .../CaseManagementStatusAggregate.java | 2 +- .../PressTransparencyReportAggregate.java | 2 +- .../TransparencyReportAggregate.java | 2 +- .../handler/ResubmitResultsHandler.java | 2 +- .../src/main/resources/META-INF/beans.xml | 6 + .../CaseApplicationOffenceResultsTest.java | 4 +- sjp-domain/sjp-domain-common/pom.xml | 4 +- sjp-domain/sjp-domain-event-processor/pom.xml | 2 +- sjp-domain/sjp-domain-event/pom.xml | 4 +- .../src/main/resources/META-INF/beans.xml | 6 + ...ssignedEventBackwardCompatibilityTest.java | 2 +- ...questedEventBackwardCompatibilityTest.java | 2 +- .../CaseAssignmentCreatedTest.java | 2 +- .../CaseAssignmentDeletedTest.java | 2 +- .../CourtReferralActionedTest.java | 2 +- .../CourtReferralCreatedTest.java | 2 +- .../CourtReferralNotFoundTest.java | 2 +- sjp-domain/sjp-domain-prosecution/pom.xml | 2 +- sjp-domain/sjp-domain-transformation/pom.xml | 4 +- .../pom.xml | 35 -- .../run-transformation.sh | 30 -- .../anonymise/SjpEventTransformation.java | 8 - .../resources/events-anonymisation-rule.json | 297 ------------- .../anonymise/SjpEventTransformationTest.java | 400 ------------------ .../input.json | 25 -- .../input.json | 4 - .../input.json | 8 - .../input.json | 4 - .../sjp.events.case-document-added/input.json | 10 - .../input.json | 5 - .../input.json | 7 - .../sjp.events.case-received/input.json | 42 -- .../input.json | 19 - .../input.json | 6 - .../input.json | 6 - .../sjp.events.case-status-changed/input.json | 4 - .../input.json | 4 - .../sjp.events.decision-rejected/input.json | 36 -- .../sjp.events.decision-saved/input.json | 146 ------- .../input.json | 17 - .../input.json | 8 - .../input.json | 4 - .../input.json | 35 -- .../input.json | 10 - .../input.json | 79 ---- .../sjp.events.plea-update-denied/input.json | 8 - .../input.json | 7 - .../sjp.events.pleaded-guilty/input.json | 8 - .../sjp.events.pleaded-not-guilty/input.json | 8 - .../resources/sjp.events.pleas-set/input.json | 24 -- .../sjp.events.sjp-case-created/input.json | 33 -- .../src/test/resources/standalone-ds.xml | 278 ------------ .../pom.xml | 6 +- .../gov/moj/cpp/sjp/BaseEventTransformer.java | 4 +- .../cpp/sjp/CaseReceivedEventTransformer.java | 2 +- ...fendantAddressUpdatedEventTransformer.java | 2 +- ...FinancialMeansUpdatedEventTransformer.java | 2 +- .../OnlinePleaReceivedEventTransformer.java | 2 +- .../sjp/TopLevelAddressEventTransformer.java | 2 +- .../moj/cpp/EventTransformerTestHelper.java | 2 +- sjp-event-sources/pom.xml | 2 +- sjp-event/pom.xml | 16 +- sjp-event/sjp-event-indexer/pom.xml | 15 +- .../src/main/resources/META-INF/beans.xml | 8 +- .../jolt/CaseReceivedTransformationTest.java | 4 +- .../CaseStatusChangeTransformationTest.java | 4 +- ...ailsMovedFromPeopleTransformationTest.java | 2 +- ...ndantDetailsUpdatedTransformationTest.java | 2 +- ...dingChangesAcceptedTransformationTest.java | 4 +- .../SjpCaseCreatedTransformationTest.java | 2 +- .../helper/AddressVerificationHelper.java | 2 +- .../cpp/indexer/jolt/helper/JsonHelper.java | 4 +- sjp-event/sjp-event-listener/pom.xml | 16 +- ...AocpAcceptedEmailNotificationListener.java | 4 +- .../event/listener/AocpPleasSetListener.java | 4 +- .../listener/CCApplicationStatusListener.java | 2 +- .../listener/CaseAdjournmentListener.java | 2 +- .../listener/CaseApplicationListener.java | 4 +- .../CaseAssignmentRestrictionListener.java | 2 +- .../event/listener/CaseCreatedListener.java | 4 +- .../event/listener/CaseDecisionListener.java | 2 +- .../sjp/event/listener/CaseNoteListener.java | 2 +- .../event/listener/CaseReservedListener.java | 2 +- .../listener/CaseSearchResultListener.java | 6 +- .../event/listener/CaseUpdatedListener.java | 6 +- .../event/listener/CourtReferralListener.java | 2 +- .../listener/DatesToAvoidAddedListener.java | 6 +- .../listener/DatesToAvoidUpdatedListener.java | 6 +- .../DefendantAcceptedAocpListener.java | 2 +- .../DefendantDetailsAcknowledgedListener.java | 2 +- ...fendantDetailsMovedFromPeopleListener.java | 4 +- ...fendantPendingChangesAcceptedListener.java | 4 +- ...fendantPendingChangesRejectedListener.java | 4 +- ...fendantPersonalDetailsChangesListener.java | 4 +- .../listener/DefendantUpdatedListener.java | 4 +- .../listener/EmailNotificationListener.java | 4 +- .../sjp/event/listener/EmployerListener.java | 4 +- .../listener/EmploymentStatusListener.java | 6 +- ...ndorsementRemovalNotificationListener.java | 4 +- ...endingApplicationNotificationListener.java | 4 +- .../EnterpriseIdAssociatedListener.java | 4 +- .../FinancialImpositionExportListener.java | 6 +- .../listener/FinancialMeansListener.java | 2 +- .../HearingLanguageUpdatedListener.java | 4 +- .../listener/InterpreterUpdatedListener.java | 4 +- .../listener/OffenceUpdatedListener.java | 4 +- .../listener/OnlinePleaReceivedListener.java | 6 +- .../OutstandingFinesUpdatedListener.java | 4 +- .../sjp/event/listener/PleasSetListener.java | 4 +- .../PressTransparencyReportListener.java | 6 +- .../sjp/event/listener/ReadyCaseListener.java | 6 +- .../ResolveCaseEligibleForAOCPListener.java | 4 +- .../sjp/event/listener/SessionListener.java | 6 +- .../sjp/event/listener/SocCheckListener.java | 4 +- .../listener/TransparencyReportListener.java | 8 +- .../TrialRequestCancelledListener.java | 2 +- .../listener/TrialRequestedListener.java | 2 +- ...ateOffenceCodeRequestReceivedListener.java | 2 +- ...ionDecisionSavedToApplicationDecision.java | 2 +- .../converter/CaseReceivedToCase.java | 2 +- .../DecisionSavedToCaseDecision.java | 4 +- .../DefendantToDefendantDetails.java | 2 +- .../PersonToPersonalDetailsEntity.java | 2 +- .../converter/SjpCaseCreatedToCase.java | 2 +- .../handler/CaseSearchResultService.java | 4 +- .../service/CaseApplicationService.java | 4 +- .../event/listener/service/CaseService.java | 4 +- .../src/main/resources/META-INF/beans.xml | 8 +- .../listener/CaseApplicationListenerTest.java | 2 +- .../listener/CaseCreatedListenerTest.java | 2 +- .../listener/CaseReceivedListenerTest.java | 2 +- .../listener/CaseUpdatedListenerTest.java | 2 +- ...endantDetailsAcknowledgedListenerTest.java | 2 +- ...antPendingChangesAcceptedListenerTest.java | 2 +- ...antPendingChangesRejectedListenerTest.java | 2 +- .../DefendantPersonalDetailsUpdatedTest.java | 2 +- .../event/listener/EmployerListenerTest.java | 2 +- .../EnterpriseIdAssociatedListenerTest.java | 2 +- ...FinancialImpositionExportListenerTest.java | 2 +- .../listener/FinancialMeansListenerTest.java | 2 +- .../listener/OffenceUpdatedListenerTest.java | 2 +- .../event/listener/PleasSetListenerTest.java | 2 +- .../PressTransparencyReportListenerTest.java | 2 +- .../event/listener/ReadyCaseListenerTest.java | 2 +- ...esolveCaseEligibleForAOCPListenerTest.java | 2 +- .../event/listener/SocCheckListenerTest.java | 2 +- .../TransparencyReportListenerTest.java | 2 +- .../DecisionSavedToCaseDecisionTest.java | 2 +- ...cpAcceptedEmailNotificationRepository.java | 23 +- .../FakeEmailNotificationRepository.java | 24 +- ...orsementRemovalNotificationRepository.java | 24 +- ...dingApplicationNotificationRepository.java | 24 +- .../sjp/util/fakes/TestOffenceRepository.java | 26 +- sjp-event/sjp-event-processor/pom.xml | 26 +- ...esWithdrawalRequestCancelledProcessor.java | 2 +- ...lOffencesWithdrawalRequestedProcessor.java | 2 +- .../ApplicationDecisionProcessor.java | 2 +- .../ApplicationSetAsideProcessor.java | 2 +- .../event/processor/AssignmentProcessor.java | 6 +- .../processor/CaseAdjournmentProcessor.java | 4 +- .../CaseApplicationRecordedProcessor.java | 4 +- .../processor/CaseCompletedProcessor.java | 4 +- ...ledBecauseCaseAlreadyExistedProcessor.java | 4 +- .../processor/CaseDecisionProcessor.java | 10 +- .../processor/CaseDocumentProcessor.java | 4 +- .../CaseDocumentUpdatedProcessor.java | 6 +- .../CaseLegalSocCheckedProcessor.java | 8 +- .../event/processor/CaseListedProcessor.java | 4 +- .../processor/CaseNoteAddedProcessor.java | 4 +- .../processor/CaseReceivedProcessor.java | 6 +- .../processor/CaseReopenedProcessor.java | 4 +- .../processor/CaseReservedProcessor.java | 2 +- .../CaseUpdateRejectedProcessor.java | 4 +- .../ConvictionCourtResolvedProcessor.java | 4 +- .../CourtApplicationCreatedProcessor.java | 4 +- .../CourtApplicationUpdatedProcessor.java | 2 +- .../processor/CourtReferralProcessor.java | 6 +- .../processor/DatesToAvoidProcessor.java | 4 +- .../DefendantAcceptedAocpProcessor.java | 4 +- .../DefendantDetailsUpdateProcessor.java | 2 +- ...DetailsUpdateRequestAcceptedProcessor.java | 6 +- ...ntDetailsUpdatesAcknowledgedProcessor.java | 4 +- ...endantPendingChangesAcceptedProcessor.java | 2 +- ...endantPendingChangesRejectedProcessor.java | 2 +- .../DeleteCaseDocumentProcessor.java | 2 +- .../processor/DeleteDocsStartedProcessor.java | 4 +- .../event/processor/EmployerProcessor.java | 2 +- ...dorsementRemovalNotificationProcessor.java | 2 +- ...ndingApplicationNotificationProcessor.java | 2 +- .../FinancialImpositionExportProcessor.java | 2 +- .../processor/FinancialMeansProcessor.java | 6 +- .../HearingResultReceivedProcessor.java | 4 +- .../processor/HearingResultedProcessor.java | 4 +- .../NotificationNotifyProcessor.java | 2 +- .../OffenceWithdrawalRequestProcessor.java | 2 +- ...tialAocpCriteriaNotificationProcessor.java | 4 +- .../processor/PleaNotificationProcessor.java | 4 +- .../event/processor/PleaUpdatedProcessor.java | 4 +- .../event/processor/PleadOnlineProcessor.java | 6 +- .../event/processor/PleasSetProcessor.java | 2 +- ...sTransparencyReportRequestedProcessor.java | 12 +- ...secutionCasesReferredToCourtProcessor.java | 6 +- .../SJPDefendantUpdatedProcessor.java | 6 +- .../sjp/event/processor/SessionProcessor.java | 4 +- .../SjpProsecutionCaseCreatedProcessor.java | 10 +- .../StagingEnforcementEventProcessor.java | 4 +- .../processor/SysDocGeneratorProcessor.java | 6 +- .../TransparencyReportRequestedProcessor.java | 12 +- .../UpdateCasesManagementStatusProcessor.java | 6 +- .../processor/activiti/ActivitiService.java | 4 +- .../CaseAssignmentTimeoutProcess.java | 4 +- .../processor/activiti/CaseStateService.java | 2 +- .../activiti/SjpProcessManagerService.java | 6 +- .../activiti/TimerExpirationProcess.java | 4 +- .../delegates/AbstractCaseDelegate.java | 4 +- .../activiti/delegates/AddMaterialToCase.java | 6 +- .../delegates/AssignmentTimedOutDelegate.java | 4 +- .../delegates/CaseCompletedDelegate.java | 2 +- .../delegates/CaseStartedDelegate.java | 2 +- .../DatesToAvoidProcessedDelegate.java | 2 +- .../delegates/PleaCancelledDelegate.java | 4 +- .../delegates/PleaUpdatedDelegate.java | 4 +- .../delegates/ProvedInAbsenceDelegate.java | 2 +- .../activiti/delegates/ReadyCaseDelegate.java | 4 +- .../activiti/delegates/UploadFile.java | 6 +- .../WithdrawalRequestCancelledDelegate.java | 4 +- .../WithdrawalRequestedDelegate.java | 4 +- .../adjournment/CaseAdjournedDelegate.java | 2 +- .../CaseAdjournmentElapsedDelegate.java | 4 +- .../timers/SendExpirationCommandDelegate.java | 6 +- .../helper/JsonObjectConversionHelper.java | 4 +- .../results/converter/AddressConverter.java | 2 +- .../AssociatedPersonDetailsConverter.java | 2 +- .../results/converter/ConverterUtils.java | 2 +- .../converter/CourtCentreConverter.java | 6 +- .../converter/DefendantsConverter.java | 6 +- .../converter/HearingDaysConverter.java | 2 +- .../converter/LJADetailsConverter.java | 2 +- .../LegalEntityDefendantConverter.java | 2 +- .../results/converter/OffencesConverter.java | 6 +- .../converter/PersonDefendantConverter.java | 2 +- .../converter/PersonDetailsConverter.java | 2 +- .../ProsecutionCaseIdentifierConverter.java | 6 +- .../converter/ProsecutionCasesConverter.java | 4 +- ...ationDecisionToHearingResultConverter.java | 6 +- ...pCaseDecisionToHearingResultConverter.java | 4 +- .../converter/SjpToHearingConverter.java | 2 +- .../results/converter/VerdictConverter.java | 6 +- ...cisionSavedToJudicialResultsConverter.java | 2 +- .../judicialresult/JCachedReferenceData.java | 6 +- .../judicialresult/JudicialResultHelper.java | 4 +- .../JudicialResultPromptDurationHelper.java | 2 +- .../AdjournDecisionResultAggregator.java | 4 +- .../aggregator/DecisionResultAggregator.java | 2 +- .../DischargeDecisionResultAggregator.java | 4 +- .../DismissDecisionResultAggregator.java | 4 +- ...ialImpositionDecisionResultAggregator.java | 4 +- ...ancialPenaltyDecisionResultAggregator.java | 4 +- ...paratePenaltyDecisionResultAggregator.java | 4 +- .../OatsDecisionResultAggregator.java | 4 +- ...rCourtHearingDecisionResultAggregator.java | 4 +- ...ureSjpSessionDecisionResultAggregator.java | 4 +- ...edToOpenCourtDecisionResultAggregator.java | 4 +- .../SetAsideDecisionResultAggregator.java | 4 +- .../WithDrawDecisionResultAggregator.java | 4 +- .../service/ApplicationParameters.java | 2 +- .../service/AzureFunctionService.java | 2 +- .../processor/service/LocalJusticeArea.java | 2 +- .../processor/service/MaterialService.java | 4 +- .../service/ProsecutionCaseFileService.java | 6 +- .../service/ReferenceDataOffencesService.java | 4 +- .../service/ReferenceDataService.java | 8 +- .../event/processor/service/SjpService.java | 6 +- .../service/SystemIdMapperService.java | 4 +- .../processor/service/UsersGroupsService.java | 4 +- .../assignment/AssignmentConfiguration.java | 6 +- .../service/assignment/AssignmentService.java | 10 +- .../DivisionCodeHelper.java | 4 +- .../EnforcementAreaEmailHelper.java | 4 +- .../EnforcementAreaService.java | 4 +- .../EnforcementEmailAttachmentService.java | 4 +- .../EnforcementNotificationService.java | 2 +- .../FinancialImpositionHelper.java | 2 +- ...EndorsementRemovalNotificationService.java | 4 +- .../NotificationNotify.java | 4 +- .../referral/CourtDocumentTransformer.java | 6 +- .../CourtDocumentsDataSourcingService.java | 4 +- .../HearingRequestsDataSourcingService.java | 4 +- .../ProsecutionCasesDataSourcingService.java | 4 +- .../SjpReferralDataSourcingService.java | 4 +- .../helpers/ConvictingCourtHelper.java | 2 +- .../helpers/HearingRequestsViewHelper.java | 2 +- .../helpers/ProsecutionCasesViewHelper.java | 6 +- .../helpers/SjpReferralViewHelper.java | 2 +- ...ndorsementRemovalNotificationStrategy.java | 2 +- ...endingApplicationNotificationStrategy.java | 2 +- .../PressAndTransparencyReportStrategy.java | 6 +- .../SystemDocGenerator.java | 4 +- .../service/timers/TimerService.java | 2 +- .../event/processor/utils/MetadataHelper.java | 6 +- .../event/processor/utils/PayloadHelper.java | 6 +- .../src/main/resources/META-INF/beans.xml | 8 +- ...thdrawalRequestCancelledProcessorTest.java | 2 +- ...encesWithdrawalRequestedProcessorTest.java | 2 +- .../ApplicationSetAsideProcessorTest.java | 2 +- .../processor/AssignmentProcessorTest.java | 2 +- .../CaseApplicationRecordedProcessorTest.java | 2 +- .../CaseCompletedProcessorResultsTest.java | 2 +- .../processor/CaseCompletedProcessorTest.java | 4 +- .../processor/CaseDecisionProcessorTest.java | 2 +- .../CaseDocumentUpdatedProcessorTest.java | 4 +- .../CaseDocumentUploadedProcessorTest.java | 2 +- .../CaseLegalSocCheckedProcessorTest.java | 4 +- .../processor/CaseListedProcessorTest.java | 4 +- .../processor/CaseNoteAddedProcessorTest.java | 2 +- .../processor/CaseReceivedProcessorTest.java | 6 +- .../processor/CaseReopenedProcessorTest.java | 2 +- .../processor/CaseReservedProcessorTest.java | 2 +- .../ConvictingCourtResolvedProcessorTest.java | 4 +- .../ConvictionCourtResolvedProcessorTest.java | 4 +- .../CourtApplicationCreatedProcessorTest.java | 2 +- .../processor/CourtReferralProcessorTest.java | 2 +- .../processor/DatesToAvoidProcessorTest.java | 2 +- .../DefendantDetailsUpdateProcessorTest.java | 2 +- ...ilsUpdateRequestAcceptedProcessorTest.java | 2 +- ...tailsUpdatesAcknowledgedProcessorTest.java | 2 +- ...ntPendingChangesAcceptedProcessorTest.java | 2 +- ...ntPendingChangesRejectedProcessorTest.java | 2 +- .../DeleteCaseDocumentProcessorTest.java | 2 +- .../DeleteDocsStartedProcessorTest.java | 4 +- ...ementRemovalNotificationProcessorTest.java | 2 +- ...gApplicationNotificationProcessorTest.java | 2 +- ...inancialImpositionExportProcessorTest.java | 2 +- .../FinancialMeansProcessorTest.java | 2 +- .../HearingResultReceivedProcessorTest.java | 6 +- .../HearingResultedProcessorTest.java | 2 +- .../NotificationNotifyProcessorTest.java | 2 +- ...OffenceWithdrawalRequestProcessorTest.java | 2 +- .../processor/PleadOnlineProcessorTest.java | 8 +- .../processor/PleasSetProcessorTest.java | 4 +- ...nsparencyReportRequestedProcessorTest.java | 8 +- ...tionCasesReferredToCourtProcessorTest.java | 2 +- .../SJPDefendantUpdatedProcessorTest.java | 2 +- .../event/processor/SessionProcessorTest.java | 2 +- .../SysDocGeneratorProcessorTest.java | 2 +- ...nsparencyReportRequestedProcessorTest.java | 8 +- .../activiti/ActivitiJUnit5Extension.java | 76 ++++ .../CaseAssignmentTimeoutProcessTest.java | 18 +- .../activiti/CaseStateProcessTest.java | 16 +- .../processor/activiti/DelegatesVerifier.java | 8 +- .../timers/TimerExpirationProcessTest.java | 27 +- .../converter/AddressConverterTest.java | 2 +- .../converter/CourtCentreConverterTest.java | 2 +- .../converter/DefendantsConverterTest.java | 2 +- .../converter/HearingDaysConverterTest.java | 2 +- .../converter/LJADetailsConverterTest.java | 2 +- .../converter/OffencesConverterTest.java | 2 +- ...rosecutionCaseIdentifierConverterTest.java | 4 +- .../ProsecutionCasesConverterTest.java | 2 +- .../ResultingToResultsConverterHelper.java | 6 +- .../converter/VerdictConverterTest.java | 2 +- .../JudicialResultHelperTest.java | 4 +- .../WithDrawDecisionResultAggregatorTest.java | 2 +- .../service/AssignmentServiceTest.java | 2 +- .../service/LocalJusticeAreaTest.java | 2 +- .../service/MaterialServiceTest.java | 2 +- .../ProsecutionCaseFileServiceTest.java | 4 +- .../ReferenceDataOffencesServiceTest.java | 2 +- .../service/ReferenceDataServiceTest.java | 8 +- .../processor/service/SjpServiceTest.java | 2 +- .../service/UsersGroupsServiceTest.java | 2 +- .../DivisionCodeHelperTest.java | 2 +- .../EnforcementAreaEmailHelperTest.java | 2 +- .../EnforcementAreaServiceTest.java | 2 +- ...EnforcementEmailAttachmentServiceTest.java | 2 +- .../EnforcementNotificationServiceTest.java | 2 +- ...rsementRemovalNotificationServiceTest.java | 2 +- .../NotificationNotifyTest.java | 2 +- ...CourtDocumentsDataSourcingServiceTest.java | 4 +- ...earingRequestsDataSourcingServiceTest.java | 4 +- ...osecutionCasesDataSourcingServiceTest.java | 4 +- .../SjpReferralDataSourcingServiceTest.java | 4 +- .../HearingRequestsViewHelperTest.java | 2 +- .../ProsecutionCasesViewHelperTest.java | 2 +- .../helpers/SjpReferralViewHelperTest.java | 2 +- ...ngApplicationNotificationStrategyTest.java | 2 +- .../SystemDocGeneratorTest.java | 2 +- .../sjp/event/processor/utils/FileUtil.java | 4 +- .../sjp/event/processor/utils/JsonHelper.java | 2 +- .../processor/utils/MetadataHelperTest.java | 2 +- .../ApplicationDecisionSetAsideEnvelope.java | 2 +- ...DocumentAvailableEventEnvelopeBuilder.java | 2 +- .../GenerationFailedEventEnvelopeBuilder.java | 2 +- .../processor/utils/fake/FakeFileStorer.java | 2 +- ...-financial-imposition-acknowledgement.json | 12 +- ...-financial-imposition-acknowledgement.json | 28 +- sjp-healthchecks/pom.xml | 10 +- .../SjpIgnoredHealthcheckNamesProvider.java | 2 +- .../src/main/resources/META-INF/beans.xml | 8 +- sjp-integration-test/pom.xml | 25 +- .../moj/sjp/it/command/AddDatesToAvoid.java | 4 +- .../uk/gov/moj/sjp/it/command/CreateCase.java | 10 +- .../it/command/UpdateDefendantDetails.java | 6 +- .../it/commandclient/CreateCaseClient.java | 4 +- .../moj/sjp/it/helper/AssignmentHelper.java | 8 +- .../moj/sjp/it/helper/CaseAccountHelper.java | 2 +- .../sjp/it/helper/CaseApplicationHelper.java | 6 +- .../moj/sjp/it/helper/CaseDocumentHelper.java | 6 +- .../uk/gov/moj/sjp/it/helper/CaseHelper.java | 4 +- .../gov/moj/sjp/it/helper/CaseNoteHelper.java | 6 +- .../CaseProsecutingAuthorityHelper.java | 2 +- .../it/helper/CaseReopenedInLibraHelper.java | 4 +- .../sjp/it/helper/CaseSearchResultHelper.java | 2 +- .../sjp/it/helper/CasesMissingSjpnHelper.java | 4 +- .../gov/moj/sjp/it/helper/CitizenHelper.java | 6 +- .../gov/moj/sjp/it/helper/DecisionHelper.java | 4 +- .../it/helper/DeleteCaseDocumentHelper.java | 4 +- .../gov/moj/sjp/it/helper/EmployerHelper.java | 8 +- .../sjp/it/helper/FileServiceDBHelper.java | 2 +- .../sjp/it/helper/FinancialMeansHelper.java | 10 +- .../OffencesWithdrawalRequestHelper.java | 12 +- .../moj/sjp/it/helper/PleadOnlineHelper.java | 10 +- .../helper/PressTransparencyReportHelper.java | 4 +- .../moj/sjp/it/helper/ReadyCaseHelper.java | 4 +- .../sjp/it/helper/RegionsQueryApiClient.java | 4 +- .../moj/sjp/it/helper/ReserveCaseHelper.java | 4 +- .../gov/moj/sjp/it/helper/SessionHelper.java | 6 +- .../gov/moj/sjp/it/helper/SetPleasHelper.java | 8 +- .../it/helper/TransparencyReportHelper.java | 4 +- .../UpdateHearingRequirementsHelper.java | 6 +- .../uk/gov/moj/sjp/it/model/Defendant.java | 6 +- .../java/uk/gov/moj/sjp/it/model/Offence.java | 2 +- .../moj/sjp/it/pollingquery/CasePoller.java | 8 +- .../PendingDatesToAvoidPoller.java | 2 +- .../producer/ReferToCourtHearingProducer.java | 2 +- .../gov/moj/sjp/it/stub/AssignmentStub.java | 10 +- .../stub/DefendantOutstandingFinesStub.java | 2 +- .../uk/gov/moj/sjp/it/stub/IdMapperStub.java | 6 +- .../uk/gov/moj/sjp/it/stub/MaterialStub.java | 6 +- .../sjp/it/stub/NotificationNotifyStub.java | 8 +- .../sjp/it/stub/ProgressionServiceStub.java | 4 +- .../stub/ProsecutionCaseFileServiceStub.java | 4 +- .../sjp/it/stub/ReferenceDataServiceStub.java | 14 +- .../gov/moj/sjp/it/stub/SchedulingStub.java | 4 +- .../moj/sjp/it/stub/SysDocGeneratorStub.java | 2 +- .../it/stub/SystemDocumentGeneratorStub.java | 4 +- .../moj/sjp/it/stub/UnifiedSearchStub.java | 4 +- .../gov/moj/sjp/it/stub/UsersGroupsStub.java | 8 +- .../uk/gov/moj/sjp/it/test/AssignCaseIT.java | 4 +- .../it/test/CCApplicationStatusUpdateIT.java | 2 +- .../moj/sjp/it/test/CaseApplicationIT.java | 2 +- .../it/test/CaseAssignmentRestrictionIT.java | 6 +- .../moj/sjp/it/test/CaseCourtExtractIT.java | 8 +- .../test/CaseFinancialImpositionExportIT.java | 2 +- .../it/test/CaseListedInCriminalCourtsIT.java | 2 +- .../sjp/it/test/CaseManagementStatusIT.java | 2 +- .../uk/gov/moj/sjp/it/test/CaseNotesIT.java | 10 +- .../uk/gov/moj/sjp/it/test/CaseResultsIT.java | 4 +- .../moj/sjp/it/test/CaseUnassignmentIT.java | 2 +- .../moj/sjp/it/test/CaseUpdateRejectedIT.java | 6 +- .../gov/moj/sjp/it/test/CourtReferralIT.java | 4 +- .../uk/gov/moj/sjp/it/test/CreateCaseIT.java | 10 +- .../sjp/it/test/DefendantAcceptedAocpIT.java | 4 +- .../moj/sjp/it/test/DefendantDetailsIT.java | 12 +- .../it/test/DefendantOutstandingFinesIT.java | 4 +- .../it/test/DefendantPendingChangesIT.java | 6 +- .../sjp/it/test/DefendantPotentialCaseIT.java | 4 +- .../moj/sjp/it/test/DeleteCaseDocumentIT.java | 2 +- .../sjp/it/test/DeleteFinancialMeansIT.java | 6 +- .../uk/gov/moj/sjp/it/test/EmployerIT.java | 2 +- ...ementPendingApplicationNotificationIT.java | 6 +- .../sjp/it/test/FindCasesMissingSjpnIT.java | 4 +- .../it/test/GetCaseByUrnAndPostcodeIT.java | 2 +- .../moj/sjp/it/test/GetCaseDocumentIT.java | 6 +- .../it/test/MarkCaseAsLegalSocCheckedIT.java | 2 +- .../test/MultipleOffencesSaveDecisionIT.java | 4 +- ...MultipleOffencesWithdrawalRequestedIT.java | 2 +- ...ificationToDvlaToRemoveEndorsementsIT.java | 2 +- .../uk/gov/moj/sjp/it/test/PleadOnlineIT.java | 16 +- .../test/PressRestrictionsSaveDecisionIT.java | 2 +- .../it/test/PressTransparencyReportIT.java | 6 +- .../uk/gov/moj/sjp/it/test/ReadyCaseIT.java | 2 +- .../uk/gov/moj/sjp/it/test/ReserveCaseIT.java | 8 +- .../gov/moj/sjp/it/test/ResultOrdersIT.java | 2 +- .../uk/gov/moj/sjp/it/test/SearchCasesIT.java | 4 +- ...tionFailedBecauseCaseAlreadyExistedIT.java | 4 +- .../moj/sjp/it/test/SjpQueryApiRegionsIT.java | 2 +- .../moj/sjp/it/test/TransparencyReportIT.java | 6 +- .../sjp/it/test/UpdateAllFinancialMeanIT.java | 2 +- .../test/UpdateDefendantDetailsFromCCIT.java | 8 +- .../sjp/it/test/UpdateFinancialMeanIT.java | 4 +- .../test/ingestor/CaseReceivedIngestorIT.java | 2 +- .../it/test/ingestor/CaseStatusChangedIT.java | 2 +- .../DefendantDetailUpdatedIngestorIT.java | 2 +- ...ndantDetailsMovedFromPeopleIngestorIT.java | 4 +- .../it/test/ingestor/IndexerCatchupIT.java | 2 +- .../test/ingestor/PleaReceivedIngestorIT.java | 2 +- .../test/ingestor/helper/CasePredicate.java | 4 +- .../helper/ElasticSearchQueryHelper.java | 2 +- .../test/ingestor/helper/IngesterHelper.java | 4 +- .../gov/moj/sjp/it/util/ActivitiHelper.java | 14 +- .../util/CaseAssignmentRestrictionHelper.java | 8 +- .../java/uk/gov/moj/sjp/it/util/FileUtil.java | 2 +- .../gov/moj/sjp/it/util/HttpClientUtil.java | 14 +- .../uk/gov/moj/sjp/it/util/JsonHelper.java | 4 +- .../uk/gov/moj/sjp/it/util/QueueUtil.java | 12 +- .../sjp/it/util/RestPollerWithDefaults.java | 10 +- .../sjp/it/util/SysDocGeneratorHelper.java | 2 +- .../uk/gov/moj/sjp/it/util/TopicUtil.java | 47 +- .../it/util/commandclient/CommandClient.java | 2 +- .../util/commandclient/CommandExecutor.java | 18 +- .../it/util/commandclient/EventListener.java | 6 +- .../sjp/it/verifier/PersonInfoVerifier.java | 2 +- sjp-json/pom.xml | 2 +- sjp-query/pom.xml | 2 +- sjp-query/sjp-query-api/pom.xml | 26 +- ...esCaseIdDocumentsCourtExtractResource.java | 20 +- ...eIdDocumentsDocumentIdContentResource.java | 24 +- ...ansparencyReportContentFileIdResource.java | 8 +- ...ansparencyReportContentFileIdResource.java | 6 +- ...esCaseIdDocumentsCourtExtractResource.java | 12 +- ...eIdDocumentsDocumentIdContentResource.java | 12 +- ...ansparencyReportContentFileIdResource.java | 12 +- ...ansparencyReportContentFileIdResource.java | 12 +- .../justice/api/resource/ResourceUtility.java | 10 +- .../sjp/material/client/MaterialClient.java | 62 +++ .../api/CaseAssignmentRestrictionApi.java | 2 +- .../cpp/sjp/query/api/RegionsQueryApi.java | 2 +- .../cpp/sjp/query/api/SessionQueryApi.java | 2 +- .../moj/cpp/sjp/query/api/SjpDocumentApi.java | 4 +- .../moj/cpp/sjp/query/api/SjpQueryApi.java | 10 +- .../query/api/converter/CaseConverter.java | 12 +- .../api/decorator/DecisionDecorator.java | 6 +- .../decorator/DecisionSessionDecorator.java | 10 +- .../decorator/DocumentMetadataDecorator.java | 8 +- .../decorator/OffenceDecisionDecorator.java | 8 +- .../query/api/decorator/OffenceDecorator.java | 10 +- .../query/api/decorator/OffenceHelper.java | 4 +- .../cpp/sjp/query/api/helper/JsonHelper.java | 2 +- .../api/service/CourtExtractDataService.java | 4 +- .../api/service/DocumentMetadataService.java | 4 +- .../service/ReferenceOffencesDataService.java | 4 +- .../query/api/service/SjpVerdictService.java | 4 +- .../api/validator/SjpQueryApiValidator.java | 2 +- .../sjp/query/service/OffenceFineLevels.java | 2 +- .../query/service/ReferenceDataService.java | 4 +- .../sjp/query/service/ReferralReasons.java | 2 +- .../sjp/query/service/UsersGroupsService.java | 6 +- .../sjp/query/service/WithdrawalReasons.java | 2 +- .../src/main/resources/META-INF/beans.xml | 8 +- ...seIdDocumentsCourtExtractResourceTest.java | 4 +- ...ocumentsDocumentIdContentResourceTest.java | 20 +- ...arencyReportContentFileIdResourceTest.java | 6 +- .../material/client/MaterialClientTest.java | 91 ++++ .../SjpDroolsAccessControlTest.java | 2 +- .../api/AllFinancialMeansQueryApiTest.java | 2 +- .../api/CaseAssignmentRestrictionApiTest.java | 2 +- .../cpp/sjp/query/api/SjpDocumentApiTest.java | 2 +- .../query/api/SjpFindCaseQueryApiTest.java | 4 +- .../cpp/sjp/query/api/SjpQueryApiTest.java | 4 +- ...pQueryCaseWithDocumentMetadataApiTest.java | 2 +- .../DecisionSessionDecoratorTest.java | 2 +- .../DocumentMetadataDecoratorTest.java | 2 +- .../OffenceDecisionDecoratorTest.java | 4 +- .../api/decorator/OffenceDecoratorTest.java | 6 +- .../api/decorator/OffenceHelperTest.java | 6 +- .../OffenceImprisonableHelperTest.java | 2 +- .../OffenceNotInEffectHelperTest.java | 2 +- .../decorator/OffenceOutOfTimeHelperTest.java | 2 +- .../OffenceWelshSupportHelperTest.java | 2 +- .../moj/cpp/sjp/query/api/util/FileUtil.java | 4 +- .../query/converter/CaseConverterTest.java | 2 +- .../query/service/OffenceFineLevelsTest.java | 4 +- .../service/ReferenceDataServiceTest.java | 4 +- .../ReferenceOffencesDataServiceTest.java | 2 +- .../query/service/ReferralReasonsTest.java | 2 +- .../query/service/UsersGroupsServiceTest.java | 2 +- sjp-query/sjp-query-view/pom.xml | 19 +- .../sjp/query/view/AccountNoteQueryView.java | 6 +- .../sjp/query/view/AssignmentQueryView.java | 6 +- .../sjp/query/view/CaseApplicationView.java | 4 +- .../view/CaseAssignmentRestrictionView.java | 6 +- .../sjp/query/view/CaseNotesQueryView.java | 8 +- .../cpp/sjp/query/view/RegionsQueryView.java | 2 +- .../moj/cpp/sjp/query/view/ResultsView.java | 4 +- .../cpp/sjp/query/view/SessionQueryView.java | 2 +- .../query/view/SjpCaseCourtExtractView.java | 2 +- .../cpp/sjp/query/view/SjpDocumentView.java | 4 +- .../moj/cpp/sjp/query/view/SjpQueryView.java | 8 +- .../query/view/SjpReadyCasesQueryView.java | 8 +- .../AbstractOffenceDecisionResult.java | 6 +- .../DecisionSavedOffenceConverter.java | 4 +- .../view/converter/DismissDecisionResult.java | 4 +- .../converter/FixedListConverterUtil.java | 2 +- .../converter/PressRestrictionResult.java | 6 +- .../cpp/sjp/query/view/converter/Prompt.java | 4 +- ...ferencedDecisionSavedOffenceConverter.java | 12 +- .../sjp/query/view/converter/ResultCode.java | 4 +- .../converter/SetAsideDecisionResult.java | 4 +- .../converter/WithdrawDecisionResult.java | 4 +- .../prompts/EmployerPromptConverter.java | 4 +- .../prompts/FixedListPromptConverter.java | 4 +- .../HardcodedValuePromptConverter.java | 4 +- .../prompts/LsumDatePromptConverter.java | 4 +- .../prompts/MajorCreditorPromptConverter.java | 4 +- .../prompts/NoActionPromptConverter.java | 4 +- .../converter/prompts/PromptConverter.java | 4 +- .../results/CDResultCodeConverter.java | 4 +- .../results/NCOLLOResultCodeConverter.java | 4 +- .../results/ResultCodeConverter.java | 4 +- .../query/view/response/ApplicationView.java | 2 +- .../cpp/sjp/query/view/response/CaseView.java | 2 +- .../query/view/service/AssignmentService.java | 2 +- .../view/service/CachedReferenceData.java | 2 +- .../view/service/CaseApplicationService.java | 10 +- .../sjp/query/view/service/CaseService.java | 24 +- .../view/service/CourtExtractDataService.java | 8 +- .../view/service/DatesToAvoidService.java | 2 +- .../query/view/service/DefendantService.java | 2 +- .../query/view/service/EmployerService.java | 2 +- .../view/service/FinancialMeansService.java | 2 +- .../view/service/OffenceDataSupplier.java | 2 +- .../sjp/query/view/service/OffenceHelper.java | 10 +- .../PressTransparencyReportService.java | 4 +- .../view/service/ProgressionService.java | 4 +- .../service/ProsecutionCaseFileService.java | 6 +- .../view/service/ProsecutionCaseService.java | 6 +- .../service/ReferenceDataCachingService.java | 4 +- .../service/ReferenceDataOffencesService.java | 4 +- .../view/service/ReferenceDataService.java | 8 +- .../query/view/service/ResultsService.java | 10 +- .../service/TransparencyReportService.java | 4 +- .../view/service/UserAndGroupsService.java | 6 +- .../view/service/UserDetailsCacheService.java | 2 +- .../DefendantPotentialCaseServiceImpl.java | 6 +- .../rules/CourtCaseClosedRule.java | 2 +- .../rules/CourtCaseOpenRule.java | 2 +- .../search/DefendantCaseQuery.java | 4 +- .../search/UnifiedDefendantCaseSearcher.java | 6 +- .../cpp/sjp/query/view/util/JsonUtility.java | 4 +- .../src/main/resources/META-INF/beans.xml | 8 +- .../CaseAssignmentRestrictionViewTest.java | 4 +- .../view/CaseDocumentsRestrictionTests.java | 2 +- .../view/FindAssignmentCandidatesTest.java | 2 +- .../cpp/sjp/query/view/ResultsViewTest.java | 2 +- .../cpp/sjp/query/view/SjpQueryViewTest.java | 4 +- .../DecisionSavedOffenceConverterTest.java | 2 +- .../converter/DismissDecisionResultTest.java | 2 +- .../converter/PressRestrictionResultTest.java | 2 +- ...ncedDecisionSavedOffenceConverterTest.java | 8 +- .../converter/SetAsideDecisionResultTest.java | 2 +- .../converter/WithdrawDecisionResultTest.java | 2 +- .../results/ABDCResultCodeConverterTest.java | 4 +- .../ADJOURNSJPResultCodeConverterTest.java | 4 +- .../results/ADTResultCodeConverterTest.java | 4 +- .../results/AEOCResultCodeConverterTest.java | 4 +- .../results/CDResultCodeConverterTest.java | 4 +- .../results/COLLOResultCodeConverterTest.java | 4 +- .../results/DTResultCodeConverterTest.java | 4 +- .../results/FCOMPResultCodeConverterTest.java | 4 +- .../results/FCOSTResultCodeConverterTest.java | 4 +- .../results/FOResultCodeConverterTest.java | 4 +- .../results/FVSResultCodeConverterTest.java | 4 +- .../results/GPTACResultCodeConverterTest.java | 4 +- .../results/INSTLResultCodeConverterTest.java | 4 +- .../results/LSUMIResultCodeConverterTest.java | 4 +- .../results/LSUMResultCodeConverterTest.java | 4 +- .../NCOLLOResultCodeConverterTest.java | 4 +- .../NCOSTSResultCodeConverterTest.java | 4 +- .../results/NCRSResultCodeConverterTest.java | 4 +- .../results/NOVSResultCodeConverterTest.java | 4 +- .../results/NSPResultCodeConverterTest.java | 4 +- .../RINSTLResultCodeConverterTest.java | 4 +- .../RLSUMIResultCodeConverterTest.java | 4 +- .../results/RLSUMResultCodeConverterTest.java | 4 +- .../results/RSJPTResultCodeConverterTest.java | 4 +- .../results/ResultCodeConverterTest.java | 6 +- .../SUMRCCResultCodeConverterTest.java | 4 +- .../SUMRTOResultCodeConverterTest.java | 4 +- .../TFOOUTResultCodeConverterTest.java | 4 +- .../WDRNOTResultCodeConverterTest.java | 4 +- .../query/view/matcher/ResultMatchers.java | 2 +- .../CaseServiceFindCasesMissingSjpnTest.java | 18 +- .../query/view/service/CaseServiceTest.java | 8 +- .../service/CourtExtractDataServiceTest.java | 4 +- .../query/view/service/OffenceHelperTest.java | 6 +- .../PressTransparencyReportServiceTest.java | 2 +- .../view/service/ProgressionServiceTest.java | 4 +- .../service/ProsecutionCaseServiceTest.java | 2 +- .../ReferenceDataCachingServiceTest.java | 4 +- .../service/ReferenceDataServiceTest.java | 6 +- .../view/service/ResultsServiceTest.java | 4 +- .../TransparencyReportServiceTest.java | 2 +- .../service/UserAndGroupsServiceTest.java | 2 +- .../DefendantPotentialCaseServiceTest.java | 2 +- .../UnifiedDefendantCaseSearcherTest.java | 2 +- .../moj/cpp/sjp/query/view/util/FileUtil.java | 6 +- .../cpp/sjp/query/view/util/JsonHelper.java | 4 +- .../sjp/query/view/util/JsonUtilityTest.java | 4 +- .../util/builders/OffenceDecisionBuilder.java | 4 +- .../util/fakes/FakeReferenceDataService.java | 2 +- sjp-service/pom.xml | 2 +- .../src/main/resources/META-INF/beans.xml | 8 +- sjp-viewstore/pom.xml | 2 +- sjp-viewstore/sjp-viewstore-liquibase/pom.xml | 2 +- .../sjp-viewstore-persistence/pom.xml | 38 +- .../converter/JpaConverterJson.java | 8 +- .../sjp/persistence/entity/AccountNote.java | 8 +- .../cpp/sjp/persistence/entity/Address.java | 4 +- .../entity/AdjournOffenceDecision.java | 8 +- .../entity/AocpAcceptedEmailStatus.java | 12 +- .../persistence/entity/AocpOnlinePlea.java | 20 +- .../persistence/entity/CaseApplication.java | 22 +- .../entity/CaseApplicationDecision.java | 14 +- .../entity/CaseAssignmentRestriction.java | 8 +- .../entity/CaseCourtReferralStatus.java | 8 +- .../sjp/persistence/entity/CaseDecision.java | 22 +- .../sjp/persistence/entity/CaseDetail.java | 34 +- .../sjp/persistence/entity/CaseDocument.java | 10 +- .../cpp/sjp/persistence/entity/CaseNote.java | 12 +- .../persistence/entity/CasePublishStatus.java | 8 +- .../persistence/entity/CaseSearchResult.java | 26 +- .../sjp/persistence/entity/CaseSummary.java | 14 +- .../persistence/entity/ContactDetails.java | 6 +- .../persistence/entity/CostsAndSurcharge.java | 4 +- .../sjp/persistence/entity/CourtDetails.java | 4 +- .../persistence/entity/DefendantDetail.java | 27 +- .../entity/DefendantDetailUpdateRequest.java | 12 +- .../entity/DischargeOffenceDecision.java | 16 +- .../persistence/entity/DischargePeriod.java | 8 +- .../entity/DismissOffenceDecision.java | 4 +- .../persistence/entity/EmailNotification.java | 12 +- .../cpp/sjp/persistence/entity/Employer.java | 8 +- .../entity/EnforcementNotification.java | 12 +- .../entity/FinancialImposition.java | 14 +- .../persistence/entity/FinancialMeans.java | 12 +- .../FinancialPenaltyOffenceDecision.java | 10 +- .../sjp/persistence/entity/Installments.java | 8 +- .../persistence/entity/InterpreterDetail.java | 4 +- .../entity/LegalEntityDetails.java | 4 +- .../entity/LegalEntityFinancialMeans.java | 8 +- .../cpp/sjp/persistence/entity/LumpSum.java | 4 +- .../NoSeparatePenaltyOffenceDecision.java | 6 +- .../NotificationOfEndorsementStatus.java | 12 +- .../entity/OatsOffenceDecision.java | 4 +- .../persistence/entity/OffenceDecision.java | 24 +- .../sjp/persistence/entity/OffenceDetail.java | 20 +- .../persistence/entity/OffenceSummary.java | 8 +- .../sjp/persistence/entity/OnlinePlea.java | 20 +- .../persistence/entity/OnlinePleaDetail.java | 12 +- .../entity/OnlinePleaLegalEntityDetails.java | 10 +- .../entity/OnlinePleaPersonalDetails.java | 8 +- .../cpp/sjp/persistence/entity/Payment.java | 10 +- .../sjp/persistence/entity/PaymentTerms.java | 6 +- .../entity/PendingDatesToAvoid.java | 14 +- .../persistence/entity/PersonalDetails.java | 8 +- .../persistence/entity/PressRestriction.java | 4 +- .../PressTransparencyReportMetadata.java | 8 +- .../cpp/sjp/persistence/entity/ReadyCase.java | 14 +- .../entity/ReferForCourtHearingDecision.java | 6 +- .../ReferredForFutureSJPSessionDecision.java | 4 +- .../entity/ReferredToOpenCourtDecision.java | 6 +- .../sjp/persistence/entity/ReserveCase.java | 10 +- .../cpp/sjp/persistence/entity/Session.java | 25 +- .../entity/SetAsideOffenceDecision.java | 4 +- .../cpp/sjp/persistence/entity/SocCheck.java | 8 +- .../sjp/persistence/entity/StreamStatus.java | 8 +- .../entity/TransparencyReportMetadata.java | 8 +- .../entity/WithdrawOffenceDecision.java | 6 +- ...ptedEmailNotificationStatusRepository.java | 37 +- .../repository/AocpOnlinePleaRepository.java | 67 ++- .../repository/AssignmentRepository.java | 4 +- .../repository/CaseAccountNoteRepository.java | 39 +- .../CaseApplicationDecisionRepository.java | 32 +- .../repository/CaseApplicationRepository.java | 49 ++- .../CaseAssignmentRestrictionRepository.java | 66 ++- .../CaseCourtReferralStatusRepository.java | 33 +- .../repository/CaseDecisionRepository.java | 66 ++- .../repository/CaseDocumentRepository.java | 62 ++- .../repository/CaseNoteRepository.java | 53 ++- .../CasePublishStatusRepository.java | 42 +- .../repository/CaseRepository.java | 374 +++++++++------- .../CaseSearchResultRepository.java | 115 +++-- .../repository/CaseSummaryRepository.java | 33 +- ...efendantDetailUpdateRequestRepository.java | 34 +- .../repository/DefendantRepository.java | 72 +++- .../EmailNotificationRepository.java | 45 +- .../repository/EmployerRepository.java | 32 +- ...orsementRemovalNotificationRepository.java | 33 +- ...plicationNotificationStatusRepository.java | 33 +- .../repository/FinancialMeansRepository.java | 32 +- .../repository/OffenceRepository.java | 56 ++- .../OnlinePleaDetailRepository.java | 60 ++- .../repository/OnlinePleaRepository.java | 121 ++++-- .../PendingDatesToAvoidRepository.java | 54 ++- ...sTransparencyReportMetadataRepository.java | 51 ++- .../repository/ReadyCaseRepository.java | 50 ++- .../repository/ReserveCaseRepository.java | 53 ++- .../repository/SessionRepository.java | 42 +- .../repository/SocCheckRepository.java | 34 +- .../TransparencyReportMetadataRepository.java | 46 +- .../src/main/resources/META-INF/beans.xml | 8 +- .../main/resources/META-INF/persistence.xml | 6 +- .../entity/converter/TimestampConverter.java | 4 +- .../repository/AssignmentRepositoryTest.java | 30 +- .../CaseApplicationRepositoryTest.java | 52 ++- ...seAssignmentRestrictionRepositoryTest.java | 34 +- .../CaseDecisionRepositoryTest.java | 36 +- .../CaseDocumentRepositoryTest.java | 31 +- .../repository/CaseNoteRepositoryTest.java | 23 +- ...aseRepositoryProsecutingAuthorityTest.java | 27 +- .../repository/CaseRepositorySjpnTest.java | 51 +-- .../repository/CaseRepositoryTest.java | 145 +++---- .../CaseSearchResultRepositoryTest.java | 62 +-- ...dantDetailUpdateRequestRepositoryTest.java | 29 +- .../repository/DefendantRepositoryTest.java | 75 ++-- .../repository/OffenceRepositoryTest.java | 33 +- .../repository/OnlinePleaRepositoryTest.java | 53 +-- .../PendingDatesToAvoidRepositoryTest.java | 38 +- ...nsparencyReportMetadataRepositoryTest.java | 28 +- .../repository/ReadyCaseRepositoryTest.java | 27 +- .../repository/ReserveCaseRepositoryTest.java | 45 +- ...nsparencyReportMetadataRepositoryTest.java | 28 +- .../test/resources/META-INF/persistence.xml | 26 ++ 1031 files changed, 4505 insertions(+), 4785 deletions(-) delete mode 100644 sjp-domain/sjp-domain-transformation/sjp-domain-transformation-anonymise/pom.xml delete mode 100755 sjp-domain/sjp-domain-transformation/sjp-domain-transformation-anonymise/run-transformation.sh delete mode 100644 sjp-domain/sjp-domain-transformation/sjp-domain-transformation-anonymise/src/main/java/uk/gov/moj/cpp/sjp/domain/transformation/anonymise/SjpEventTransformation.java delete mode 100644 sjp-domain/sjp-domain-transformation/sjp-domain-transformation-anonymise/src/main/resources/events-anonymisation-rule.json delete mode 100644 sjp-domain/sjp-domain-transformation/sjp-domain-transformation-anonymise/src/test/java/uk/gov/moj/cpp/sjp/domain/transformation/anonymise/SjpEventTransformationTest.java delete mode 100644 sjp-domain/sjp-domain-transformation/sjp-domain-transformation-anonymise/src/test/resources/sjp.events.all-financial-means-updated/input.json delete mode 100644 sjp-domain/sjp-domain-transformation/sjp-domain-transformation-anonymise/src/test/resources/sjp.events.case-assignment-created/input.json delete mode 100644 sjp-domain/sjp-domain-transformation/sjp-domain-transformation-anonymise/src/test/resources/sjp.events.case-assignment-requested/input.json delete mode 100644 sjp-domain/sjp-domain-transformation/sjp-domain-transformation-anonymise/src/test/resources/sjp.events.case-creation-failed-because-case-already-existed/input.json delete mode 100644 sjp-domain/sjp-domain-transformation/sjp-domain-transformation-anonymise/src/test/resources/sjp.events.case-document-added/input.json delete mode 100644 sjp-domain/sjp-domain-transformation/sjp-domain-transformation-anonymise/src/test/resources/sjp.events.case-document-uploaded/input.json delete mode 100644 sjp-domain/sjp-domain-transformation/sjp-domain-transformation-anonymise/src/test/resources/sjp.events.case-marked-ready-for-decision/input.json delete mode 100644 sjp-domain/sjp-domain-transformation/sjp-domain-transformation-anonymise/src/test/resources/sjp.events.case-received/input.json delete mode 100644 sjp-domain/sjp-domain-transformation/sjp-domain-transformation-anonymise/src/test/resources/sjp.events.case-referred-for-court-hearing/input.json delete mode 100644 sjp-domain/sjp-domain-transformation/sjp-domain-transformation-anonymise/src/test/resources/sjp.events.case-reopened-in-libra-updated/input.json delete mode 100644 sjp-domain/sjp-domain-transformation/sjp-domain-transformation-anonymise/src/test/resources/sjp.events.case-reopened-in-libra/input.json delete mode 100644 sjp-domain/sjp-domain-transformation/sjp-domain-transformation-anonymise/src/test/resources/sjp.events.case-status-changed/input.json delete mode 100644 sjp-domain/sjp-domain-transformation/sjp-domain-transformation-anonymise/src/test/resources/sjp.events.case-update-rejected/input.json delete mode 100644 sjp-domain/sjp-domain-transformation/sjp-domain-transformation-anonymise/src/test/resources/sjp.events.decision-rejected/input.json delete mode 100644 sjp-domain/sjp-domain-transformation/sjp-domain-transformation-anonymise/src/test/resources/sjp.events.decision-saved/input.json delete mode 100644 sjp-domain/sjp-domain-transformation/sjp-domain-transformation-anonymise/src/test/resources/sjp.events.defendant-details-moved-from-people/input.json delete mode 100644 sjp-domain/sjp-domain-transformation/sjp-domain-transformation-anonymise/src/test/resources/sjp.events.delegated-powers-session-started/input.json delete mode 100644 sjp-domain/sjp-domain-transformation/sjp-domain-transformation-anonymise/src/test/resources/sjp.events.employment-status-updated/input.json delete mode 100644 sjp-domain/sjp-domain-transformation/sjp-domain-transformation-anonymise/src/test/resources/sjp.events.financial-means-updated/input.json delete mode 100644 sjp-domain/sjp-domain-transformation/sjp-domain-transformation-anonymise/src/test/resources/sjp.events.interpreter-for-defendant-updated/input.json delete mode 100644 sjp-domain/sjp-domain-transformation/sjp-domain-transformation-anonymise/src/test/resources/sjp.events.online-plea-received/input.json delete mode 100644 sjp-domain/sjp-domain-transformation/sjp-domain-transformation-anonymise/src/test/resources/sjp.events.plea-update-denied/input.json delete mode 100644 sjp-domain/sjp-domain-transformation/sjp-domain-transformation-anonymise/src/test/resources/sjp.events.pleaded-guilty-court-hearing-requested/input.json delete mode 100644 sjp-domain/sjp-domain-transformation/sjp-domain-transformation-anonymise/src/test/resources/sjp.events.pleaded-guilty/input.json delete mode 100644 sjp-domain/sjp-domain-transformation/sjp-domain-transformation-anonymise/src/test/resources/sjp.events.pleaded-not-guilty/input.json delete mode 100644 sjp-domain/sjp-domain-transformation/sjp-domain-transformation-anonymise/src/test/resources/sjp.events.pleas-set/input.json delete mode 100644 sjp-domain/sjp-domain-transformation/sjp-domain-transformation-anonymise/src/test/resources/sjp.events.sjp-case-created/input.json delete mode 100644 sjp-domain/sjp-domain-transformation/sjp-domain-transformation-anonymise/src/test/resources/standalone-ds.xml create mode 100644 sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/activiti/ActivitiJUnit5Extension.java create mode 100644 sjp-query/sjp-query-api/src/main/java/uk/gov/moj/cpp/sjp/material/client/MaterialClient.java create mode 100644 sjp-query/sjp-query-api/src/test/java/uk/gov/moj/cpp/sjp/material/client/MaterialClientTest.java create mode 100644 sjp-viewstore/sjp-viewstore-persistence/src/test/resources/META-INF/persistence.xml diff --git a/azure-pipelines.yaml b/azure-pipelines.yaml index bc86372cc1..2bd9d1a3d6 100644 --- a/azure-pipelines.yaml +++ b/azure-pipelines.yaml @@ -21,12 +21,12 @@ resources: type: github name: hmcts/cpp-azure-devops-templates endpoint: 'hmcts' - ref: 'main' + ref: 'wildfly40' pool: name: "MDV-ADO-AGENT-AKS-01" demands: - - identifier -equals centos8-j17 + - identifier -equals ubuntu-j25 variables: sonarqubeProject: "uk.gov.moj.cpp.sjp:sjp-parent" # update eg: uk.gov.moj.cpp.listing:listing-parent @@ -49,3 +49,4 @@ stages: sonarQubeType: 'sonarQubeAKS' serviceName: ${{ variables['service_Name'] }} itTestFolder: ${{ variables['itTest_Folder'] }} + aksDeployBranch: 'wildfly40' diff --git a/docker/Dockerfile_sjp-service b/docker/Dockerfile_sjp-service index 589fa5de57..f4b8b6ed37 100644 --- a/docker/Dockerfile_sjp-service +++ b/docker/Dockerfile_sjp-service @@ -7,7 +7,7 @@ ARG mavenArtifactBaseUrl ARG framework_libraries_version ARG framework_version ARG eventstore_version -ARG activiti_version=17.21.1 +ARG activiti_version=25.104.0 ARG wildfly_home=/opt/jboss/wildfly ARG wildfly_user=jboss diff --git a/pom.xml b/pom.xml index 00e81ea2a1..1dde2e4513 100644 --- a/pom.xml +++ b/pom.xml @@ -4,12 +4,12 @@ uk.gov.moj.cpp.common service-parent-pom - 17.104.3 + 25.104.2 uk.gov.moj.cpp.sjp sjp-parent - 17.104.193-SNAPSHOT + 25.104.0-M1-SNAPSHOT pom @@ -40,24 +40,24 @@ 6.0.0 4.1.4-ATCM - 17.0.57 + 17.0.85 17.0.1 - 17.104.137 + 17.104.140 17.104.52 17.0.11 0.1.49 17.104.48 - 17.0.280 + 17.0.286 17.0.66 4.1.4-ATCM true file://${project.build.directory}/site 2.3.0 - 17.104.4 + 25.104.2 ${coredomain.version} - 3.0.0 + 6.0.1 2.10 - 1.18.20 + 1.18.40 1.3.0 1.6.0-M1 17.0.96 @@ -65,7 +65,7 @@ 2.0.11 -Djava.locale.providers=CLDR 6.13 - 7.16.2 + 9.3.3 17.104.81 17.0.26 1.5.0 @@ -73,7 +73,7 @@ 2.0.0 1.0-m5.1 main - 1.4.196 + 2.3.232 diff --git a/sjp-command/pom.xml b/sjp-command/pom.xml index 5f93178b42..04e101dd23 100644 --- a/sjp-command/pom.xml +++ b/sjp-command/pom.xml @@ -3,7 +3,7 @@ sjp-parent uk.gov.moj.cpp.sjp - 17.104.193-SNAPSHOT + 25.104.0-M1-SNAPSHOT 4.0.0 diff --git a/sjp-command/sjp-command-api/pom.xml b/sjp-command/sjp-command-api/pom.xml index 95047ebc37..130d11df87 100644 --- a/sjp-command/sjp-command-api/pom.xml +++ b/sjp-command/sjp-command-api/pom.xml @@ -3,7 +3,7 @@ sjp-command uk.gov.moj.cpp.sjp - 17.104.193-SNAPSHOT + 25.104.0-M1-SNAPSHOT 4.0.0 @@ -29,8 +29,8 @@ - javax - javaee-api + jakarta.platform + jakarta.jakartaee-api provided @@ -98,10 +98,15 @@ messaging-client-generator-plugin - javax - javaee-api + jakarta.platform + jakarta.jakartaee-api ${javaee-api.version} + + jakarta.xml.bind + jakarta.xml.bind-api + ${jakarta.xml.bind-api.raml.version} + uk.gov.moj.cpp.sjp sjp-command-controller @@ -121,10 +126,15 @@ rest-client-generator-plugin - javax - javaee-api + jakarta.platform + jakarta.jakartaee-api ${javaee-api.version} + + jakarta.xml.bind + jakarta.xml.bind-api + ${jakarta.xml.bind-api.raml.version} + uk.gov.moj.cpp.sjp sjp-query-api diff --git a/sjp-command/sjp-command-api/src/main/java/uk/gov/moj/cpp/sjp/command/api/AddCaseDocumentApi.java b/sjp-command/sjp-command-api/src/main/java/uk/gov/moj/cpp/sjp/command/api/AddCaseDocumentApi.java index e6c157c5df..5c6706011d 100644 --- a/sjp-command/sjp-command-api/src/main/java/uk/gov/moj/cpp/sjp/command/api/AddCaseDocumentApi.java +++ b/sjp-command/sjp-command-api/src/main/java/uk/gov/moj/cpp/sjp/command/api/AddCaseDocumentApi.java @@ -8,7 +8,7 @@ import uk.gov.justice.services.core.sender.Sender; import uk.gov.justice.services.messaging.JsonEnvelope; -import javax.inject.Inject; +import jakarta.inject.Inject; @ServiceComponent(COMMAND_API) public class AddCaseDocumentApi { diff --git a/sjp-command/sjp-command-api/src/main/java/uk/gov/moj/cpp/sjp/command/api/AddFinancialImpositionAccountNumberBdfApi.java b/sjp-command/sjp-command-api/src/main/java/uk/gov/moj/cpp/sjp/command/api/AddFinancialImpositionAccountNumberBdfApi.java index 206d4e7e52..99124c6437 100644 --- a/sjp-command/sjp-command-api/src/main/java/uk/gov/moj/cpp/sjp/command/api/AddFinancialImpositionAccountNumberBdfApi.java +++ b/sjp-command/sjp-command-api/src/main/java/uk/gov/moj/cpp/sjp/command/api/AddFinancialImpositionAccountNumberBdfApi.java @@ -9,7 +9,7 @@ import uk.gov.justice.services.core.sender.Sender; import uk.gov.justice.services.messaging.JsonEnvelope; -import javax.inject.Inject; +import jakarta.inject.Inject; /** * This command is only used for ATCM-6980 BDF and can be deprecated once ran however the event diff --git a/sjp-command/sjp-command-api/src/main/java/uk/gov/moj/cpp/sjp/command/api/AddFinancialImpositionCorrelationIdApi.java b/sjp-command/sjp-command-api/src/main/java/uk/gov/moj/cpp/sjp/command/api/AddFinancialImpositionCorrelationIdApi.java index 393d22d071..907157542d 100644 --- a/sjp-command/sjp-command-api/src/main/java/uk/gov/moj/cpp/sjp/command/api/AddFinancialImpositionCorrelationIdApi.java +++ b/sjp-command/sjp-command-api/src/main/java/uk/gov/moj/cpp/sjp/command/api/AddFinancialImpositionCorrelationIdApi.java @@ -9,7 +9,7 @@ import uk.gov.justice.services.core.sender.Sender; import uk.gov.justice.services.messaging.JsonEnvelope; -import javax.inject.Inject; +import jakarta.inject.Inject; @ServiceComponent(COMMAND_API) public class AddFinancialImpositionCorrelationIdApi { diff --git a/sjp-command/sjp-command-api/src/main/java/uk/gov/moj/cpp/sjp/command/api/AocpResponseTimerExpiredApi.java b/sjp-command/sjp-command-api/src/main/java/uk/gov/moj/cpp/sjp/command/api/AocpResponseTimerExpiredApi.java index 640870b99d..6ea12e2eb1 100644 --- a/sjp-command/sjp-command-api/src/main/java/uk/gov/moj/cpp/sjp/command/api/AocpResponseTimerExpiredApi.java +++ b/sjp-command/sjp-command-api/src/main/java/uk/gov/moj/cpp/sjp/command/api/AocpResponseTimerExpiredApi.java @@ -10,7 +10,7 @@ import uk.gov.justice.services.messaging.JsonEnvelope; import uk.gov.moj.cpp.sjp.command.api.service.CaseService; -import javax.inject.Inject; +import jakarta.inject.Inject; @ServiceComponent(COMMAND_API) public class AocpResponseTimerExpiredApi { diff --git a/sjp-command/sjp-command-api/src/main/java/uk/gov/moj/cpp/sjp/command/api/CaseAssignmentRestrictionApi.java b/sjp-command/sjp-command-api/src/main/java/uk/gov/moj/cpp/sjp/command/api/CaseAssignmentRestrictionApi.java index 2f7093058e..181f55a254 100644 --- a/sjp-command/sjp-command-api/src/main/java/uk/gov/moj/cpp/sjp/command/api/CaseAssignmentRestrictionApi.java +++ b/sjp-command/sjp-command-api/src/main/java/uk/gov/moj/cpp/sjp/command/api/CaseAssignmentRestrictionApi.java @@ -10,8 +10,8 @@ import uk.gov.justice.services.core.sender.Sender; import uk.gov.justice.services.messaging.Envelope; -import javax.inject.Inject; -import javax.json.JsonObject; +import jakarta.inject.Inject; +import jakarta.json.JsonObject; @ServiceComponent(COMMAND_API) public class CaseAssignmentRestrictionApi { diff --git a/sjp-command/sjp-command-api/src/main/java/uk/gov/moj/cpp/sjp/command/api/CaseNoteApi.java b/sjp-command/sjp-command-api/src/main/java/uk/gov/moj/cpp/sjp/command/api/CaseNoteApi.java index 1ace463dcd..fa4c8a47f1 100644 --- a/sjp-command/sjp-command-api/src/main/java/uk/gov/moj/cpp/sjp/command/api/CaseNoteApi.java +++ b/sjp-command/sjp-command-api/src/main/java/uk/gov/moj/cpp/sjp/command/api/CaseNoteApi.java @@ -13,9 +13,9 @@ import uk.gov.justice.services.core.sender.Sender; import uk.gov.justice.services.messaging.JsonEnvelope; -import javax.inject.Inject; -import javax.json.JsonObject; -import javax.ws.rs.BadRequestException; +import jakarta.inject.Inject; +import jakarta.json.JsonObject; +import jakarta.ws.rs.BadRequestException; @ServiceComponent(COMMAND_API) public class CaseNoteApi { diff --git a/sjp-command/sjp-command-api/src/main/java/uk/gov/moj/cpp/sjp/command/api/CaseReopenedApi.java b/sjp-command/sjp-command-api/src/main/java/uk/gov/moj/cpp/sjp/command/api/CaseReopenedApi.java index ba975a43fe..88c4eac3a7 100644 --- a/sjp-command/sjp-command-api/src/main/java/uk/gov/moj/cpp/sjp/command/api/CaseReopenedApi.java +++ b/sjp-command/sjp-command-api/src/main/java/uk/gov/moj/cpp/sjp/command/api/CaseReopenedApi.java @@ -14,8 +14,8 @@ import java.time.LocalDate; import java.util.Optional; -import javax.inject.Inject; -import javax.json.JsonObject; +import jakarta.inject.Inject; +import jakarta.json.JsonObject; /** * Command api for marking a case as reopened. diff --git a/sjp-command/sjp-command-api/src/main/java/uk/gov/moj/cpp/sjp/command/api/CreateCaseApi.java b/sjp-command/sjp-command-api/src/main/java/uk/gov/moj/cpp/sjp/command/api/CreateCaseApi.java index e935c68fa3..119f97e577 100644 --- a/sjp-command/sjp-command-api/src/main/java/uk/gov/moj/cpp/sjp/command/api/CreateCaseApi.java +++ b/sjp-command/sjp-command-api/src/main/java/uk/gov/moj/cpp/sjp/command/api/CreateCaseApi.java @@ -19,11 +19,11 @@ import java.util.Optional; -import javax.inject.Inject; -import javax.json.JsonArray; -import javax.json.JsonArrayBuilder; -import javax.json.JsonObject; -import javax.json.JsonObjectBuilder; +import jakarta.inject.Inject; +import jakarta.json.JsonArray; +import jakarta.json.JsonArrayBuilder; +import jakarta.json.JsonObject; +import jakarta.json.JsonObjectBuilder; @ServiceComponent(COMMAND_API) public class CreateCaseApi { diff --git a/sjp-command/sjp-command-api/src/main/java/uk/gov/moj/cpp/sjp/command/api/CreateCaseApplicationApi.java b/sjp-command/sjp-command-api/src/main/java/uk/gov/moj/cpp/sjp/command/api/CreateCaseApplicationApi.java index 661a0c6b92..1193091c9c 100644 --- a/sjp-command/sjp-command-api/src/main/java/uk/gov/moj/cpp/sjp/command/api/CreateCaseApplicationApi.java +++ b/sjp-command/sjp-command-api/src/main/java/uk/gov/moj/cpp/sjp/command/api/CreateCaseApplicationApi.java @@ -5,7 +5,7 @@ import uk.gov.justice.services.core.sender.Sender; import uk.gov.justice.services.messaging.JsonEnvelope; -import javax.inject.Inject; +import jakarta.inject.Inject; import static uk.gov.justice.services.core.annotation.Component.COMMAND_API; import static uk.gov.justice.services.messaging.JsonEnvelope.envelopeFrom; diff --git a/sjp-command/sjp-command-api/src/main/java/uk/gov/moj/cpp/sjp/command/api/DatesToAvoidApi.java b/sjp-command/sjp-command-api/src/main/java/uk/gov/moj/cpp/sjp/command/api/DatesToAvoidApi.java index d7e62dc12f..0813a88082 100644 --- a/sjp-command/sjp-command-api/src/main/java/uk/gov/moj/cpp/sjp/command/api/DatesToAvoidApi.java +++ b/sjp-command/sjp-command-api/src/main/java/uk/gov/moj/cpp/sjp/command/api/DatesToAvoidApi.java @@ -8,7 +8,7 @@ import uk.gov.justice.services.core.sender.Sender; import uk.gov.justice.services.messaging.JsonEnvelope; -import javax.inject.Inject; +import jakarta.inject.Inject; @ServiceComponent(COMMAND_API) public class DatesToAvoidApi { diff --git a/sjp-command/sjp-command-api/src/main/java/uk/gov/moj/cpp/sjp/command/api/DecisionApi.java b/sjp-command/sjp-command-api/src/main/java/uk/gov/moj/cpp/sjp/command/api/DecisionApi.java index 9c3fa27506..38dfa9931a 100644 --- a/sjp-command/sjp-command-api/src/main/java/uk/gov/moj/cpp/sjp/command/api/DecisionApi.java +++ b/sjp-command/sjp-command-api/src/main/java/uk/gov/moj/cpp/sjp/command/api/DecisionApi.java @@ -30,9 +30,9 @@ import java.util.List; import java.util.Optional; -import javax.inject.Inject; -import javax.json.JsonObject; -import javax.json.JsonObjectBuilder; +import jakarta.inject.Inject; +import jakarta.json.JsonObject; +import jakarta.json.JsonObjectBuilder; @ServiceComponent(COMMAND_API) public class DecisionApi { diff --git a/sjp-command/sjp-command-api/src/main/java/uk/gov/moj/cpp/sjp/command/api/DefendantDetailsApi.java b/sjp-command/sjp-command-api/src/main/java/uk/gov/moj/cpp/sjp/command/api/DefendantDetailsApi.java index 08b9efa4a3..5fd0310951 100644 --- a/sjp-command/sjp-command-api/src/main/java/uk/gov/moj/cpp/sjp/command/api/DefendantDetailsApi.java +++ b/sjp-command/sjp-command-api/src/main/java/uk/gov/moj/cpp/sjp/command/api/DefendantDetailsApi.java @@ -11,9 +11,9 @@ import uk.gov.justice.services.core.sender.Sender; import uk.gov.justice.services.messaging.JsonEnvelope; -import javax.inject.Inject; -import javax.json.JsonObject; -import javax.json.JsonObjectBuilder; +import jakarta.inject.Inject; +import jakarta.json.JsonObject; +import jakarta.json.JsonObjectBuilder; @SuppressWarnings("squid:CallToDeprecatedMethod") @ServiceComponent(COMMAND_API) diff --git a/sjp-command/sjp-command-api/src/main/java/uk/gov/moj/cpp/sjp/command/api/DeleteCaseDocumentApi.java b/sjp-command/sjp-command-api/src/main/java/uk/gov/moj/cpp/sjp/command/api/DeleteCaseDocumentApi.java index a8c5f7e900..f3d3b23e13 100644 --- a/sjp-command/sjp-command-api/src/main/java/uk/gov/moj/cpp/sjp/command/api/DeleteCaseDocumentApi.java +++ b/sjp-command/sjp-command-api/src/main/java/uk/gov/moj/cpp/sjp/command/api/DeleteCaseDocumentApi.java @@ -10,7 +10,7 @@ import uk.gov.justice.services.core.sender.Sender; import uk.gov.justice.services.messaging.JsonEnvelope; -import javax.inject.Inject; +import jakarta.inject.Inject; @ServiceComponent(COMMAND_API) public class DeleteCaseDocumentApi { diff --git a/sjp-command/sjp-command-api/src/main/java/uk/gov/moj/cpp/sjp/command/api/EmployerApi.java b/sjp-command/sjp-command-api/src/main/java/uk/gov/moj/cpp/sjp/command/api/EmployerApi.java index 0c551c1d2e..01f467c363 100644 --- a/sjp-command/sjp-command-api/src/main/java/uk/gov/moj/cpp/sjp/command/api/EmployerApi.java +++ b/sjp-command/sjp-command-api/src/main/java/uk/gov/moj/cpp/sjp/command/api/EmployerApi.java @@ -11,9 +11,9 @@ import uk.gov.justice.services.core.sender.Sender; import uk.gov.justice.services.messaging.JsonEnvelope; -import javax.inject.Inject; -import javax.json.JsonObject; -import javax.json.JsonObjectBuilder; +import jakarta.inject.Inject; +import jakarta.json.JsonObject; +import jakarta.json.JsonObjectBuilder; @ServiceComponent(COMMAND_API) public class EmployerApi { diff --git a/sjp-command/sjp-command-api/src/main/java/uk/gov/moj/cpp/sjp/command/api/FinancialMeansApi.java b/sjp-command/sjp-command-api/src/main/java/uk/gov/moj/cpp/sjp/command/api/FinancialMeansApi.java index 89448d2a2a..db0b99f6b8 100644 --- a/sjp-command/sjp-command-api/src/main/java/uk/gov/moj/cpp/sjp/command/api/FinancialMeansApi.java +++ b/sjp-command/sjp-command-api/src/main/java/uk/gov/moj/cpp/sjp/command/api/FinancialMeansApi.java @@ -8,7 +8,7 @@ import uk.gov.justice.services.core.sender.Sender; import uk.gov.justice.services.messaging.JsonEnvelope; -import javax.inject.Inject; +import jakarta.inject.Inject; @ServiceComponent(COMMAND_API) public class FinancialMeansApi { diff --git a/sjp-command/sjp-command-api/src/main/java/uk/gov/moj/cpp/sjp/command/api/MarkAsLegalSocCheckedApi.java b/sjp-command/sjp-command-api/src/main/java/uk/gov/moj/cpp/sjp/command/api/MarkAsLegalSocCheckedApi.java index 416eab54c3..486cde12db 100644 --- a/sjp-command/sjp-command-api/src/main/java/uk/gov/moj/cpp/sjp/command/api/MarkAsLegalSocCheckedApi.java +++ b/sjp-command/sjp-command-api/src/main/java/uk/gov/moj/cpp/sjp/command/api/MarkAsLegalSocCheckedApi.java @@ -7,8 +7,8 @@ import uk.gov.justice.services.messaging.Envelope; import uk.gov.justice.services.messaging.JsonEnvelope; -import javax.inject.Inject; -import javax.json.JsonObject; +import jakarta.inject.Inject; +import jakarta.json.JsonObject; import static uk.gov.justice.services.core.annotation.Component.COMMAND_API; import static uk.gov.justice.services.messaging.Envelope.metadataFrom; diff --git a/sjp-command/sjp-command-api/src/main/java/uk/gov/moj/cpp/sjp/command/api/OffenceWithdrawalRequestApi.java b/sjp-command/sjp-command-api/src/main/java/uk/gov/moj/cpp/sjp/command/api/OffenceWithdrawalRequestApi.java index af63990861..0951a69208 100644 --- a/sjp-command/sjp-command-api/src/main/java/uk/gov/moj/cpp/sjp/command/api/OffenceWithdrawalRequestApi.java +++ b/sjp-command/sjp-command-api/src/main/java/uk/gov/moj/cpp/sjp/command/api/OffenceWithdrawalRequestApi.java @@ -8,8 +8,8 @@ import uk.gov.justice.services.core.sender.Sender; import uk.gov.justice.services.messaging.JsonEnvelope; -import javax.inject.Inject; -import javax.json.JsonObject; +import jakarta.inject.Inject; +import jakarta.json.JsonObject; @ServiceComponent(COMMAND_API) public class OffenceWithdrawalRequestApi { diff --git a/sjp-command/sjp-command-api/src/main/java/uk/gov/moj/cpp/sjp/command/api/PleadOnlineApi.java b/sjp-command/sjp-command-api/src/main/java/uk/gov/moj/cpp/sjp/command/api/PleadOnlineApi.java index b6301868f2..d81202766d 100644 --- a/sjp-command/sjp-command-api/src/main/java/uk/gov/moj/cpp/sjp/command/api/PleadOnlineApi.java +++ b/sjp-command/sjp-command-api/src/main/java/uk/gov/moj/cpp/sjp/command/api/PleadOnlineApi.java @@ -27,10 +27,10 @@ import java.util.Map; import java.util.Objects; -import javax.inject.Inject; -import javax.json.JsonObject; -import javax.json.JsonObjectBuilder; -import javax.json.JsonReader; +import jakarta.inject.Inject; +import jakarta.json.JsonObject; +import jakarta.json.JsonObjectBuilder; +import jakarta.json.JsonReader; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.JsonNode; diff --git a/sjp-command/sjp-command-api/src/main/java/uk/gov/moj/cpp/sjp/command/api/PressTransparencyReportApi.java b/sjp-command/sjp-command-api/src/main/java/uk/gov/moj/cpp/sjp/command/api/PressTransparencyReportApi.java index 0d56c5b893..ca8ccc4dc0 100644 --- a/sjp-command/sjp-command-api/src/main/java/uk/gov/moj/cpp/sjp/command/api/PressTransparencyReportApi.java +++ b/sjp-command/sjp-command-api/src/main/java/uk/gov/moj/cpp/sjp/command/api/PressTransparencyReportApi.java @@ -9,7 +9,7 @@ import uk.gov.justice.services.core.sender.Sender; import uk.gov.justice.services.messaging.JsonEnvelope; -import javax.inject.Inject; +import jakarta.inject.Inject; @ServiceComponent(COMMAND_API) public class PressTransparencyReportApi { diff --git a/sjp-command/sjp-command-api/src/main/java/uk/gov/moj/cpp/sjp/command/api/RequestDeleteDocsApi.java b/sjp-command/sjp-command-api/src/main/java/uk/gov/moj/cpp/sjp/command/api/RequestDeleteDocsApi.java index deb5870a6a..55f2da02a7 100644 --- a/sjp-command/sjp-command-api/src/main/java/uk/gov/moj/cpp/sjp/command/api/RequestDeleteDocsApi.java +++ b/sjp-command/sjp-command-api/src/main/java/uk/gov/moj/cpp/sjp/command/api/RequestDeleteDocsApi.java @@ -8,7 +8,7 @@ import uk.gov.justice.services.core.sender.Sender; import uk.gov.justice.services.messaging.JsonEnvelope; -import javax.inject.Inject; +import jakarta.inject.Inject; @ServiceComponent(COMMAND_API) public class RequestDeleteDocsApi { diff --git a/sjp-command/sjp-command-api/src/main/java/uk/gov/moj/cpp/sjp/command/api/ReserveCaseApi.java b/sjp-command/sjp-command-api/src/main/java/uk/gov/moj/cpp/sjp/command/api/ReserveCaseApi.java index c1724321ee..eb0be63bb5 100644 --- a/sjp-command/sjp-command-api/src/main/java/uk/gov/moj/cpp/sjp/command/api/ReserveCaseApi.java +++ b/sjp-command/sjp-command-api/src/main/java/uk/gov/moj/cpp/sjp/command/api/ReserveCaseApi.java @@ -5,7 +5,7 @@ import static uk.gov.justice.services.messaging.JsonEnvelope.metadataFrom; -import javax.inject.Inject; +import jakarta.inject.Inject; import uk.gov.justice.services.core.annotation.Handles; import uk.gov.justice.services.core.annotation.ServiceComponent; import uk.gov.justice.services.core.enveloper.Enveloper; diff --git a/sjp-command/sjp-command-api/src/main/java/uk/gov/moj/cpp/sjp/command/api/ResolveCaseStatusApi.java b/sjp-command/sjp-command-api/src/main/java/uk/gov/moj/cpp/sjp/command/api/ResolveCaseStatusApi.java index a1704c9dd4..74ca969ef2 100644 --- a/sjp-command/sjp-command-api/src/main/java/uk/gov/moj/cpp/sjp/command/api/ResolveCaseStatusApi.java +++ b/sjp-command/sjp-command-api/src/main/java/uk/gov/moj/cpp/sjp/command/api/ResolveCaseStatusApi.java @@ -9,9 +9,9 @@ import uk.gov.justice.services.core.sender.Sender; import uk.gov.justice.services.messaging.JsonEnvelope; -import javax.inject.Inject; -import javax.json.JsonObject; -import javax.json.JsonObjectBuilder; +import jakarta.inject.Inject; +import jakarta.json.JsonObject; +import jakarta.json.JsonObjectBuilder; @ServiceComponent(COMMAND_API) public class ResolveCaseStatusApi { diff --git a/sjp-command/sjp-command-api/src/main/java/uk/gov/moj/cpp/sjp/command/api/ResolveConvictionCourtApi.java b/sjp-command/sjp-command-api/src/main/java/uk/gov/moj/cpp/sjp/command/api/ResolveConvictionCourtApi.java index 000a131ea3..061854efd9 100644 --- a/sjp-command/sjp-command-api/src/main/java/uk/gov/moj/cpp/sjp/command/api/ResolveConvictionCourtApi.java +++ b/sjp-command/sjp-command-api/src/main/java/uk/gov/moj/cpp/sjp/command/api/ResolveConvictionCourtApi.java @@ -8,7 +8,7 @@ import uk.gov.justice.services.core.sender.Sender; import uk.gov.justice.services.messaging.JsonEnvelope; -import javax.inject.Inject; +import jakarta.inject.Inject; @ServiceComponent(COMMAND_API) public class ResolveConvictionCourtApi { diff --git a/sjp-command/sjp-command-api/src/main/java/uk/gov/moj/cpp/sjp/command/api/ResubmitResultsApi.java b/sjp-command/sjp-command-api/src/main/java/uk/gov/moj/cpp/sjp/command/api/ResubmitResultsApi.java index 85ec681c3b..690447f5c6 100644 --- a/sjp-command/sjp-command-api/src/main/java/uk/gov/moj/cpp/sjp/command/api/ResubmitResultsApi.java +++ b/sjp-command/sjp-command-api/src/main/java/uk/gov/moj/cpp/sjp/command/api/ResubmitResultsApi.java @@ -8,7 +8,7 @@ import uk.gov.justice.services.core.sender.Sender; import uk.gov.justice.services.messaging.JsonEnvelope; -import javax.inject.Inject; +import jakarta.inject.Inject; @ServiceComponent(COMMAND_API) public class ResubmitResultsApi { diff --git a/sjp-command/sjp-command-api/src/main/java/uk/gov/moj/cpp/sjp/command/api/SessionApi.java b/sjp-command/sjp-command-api/src/main/java/uk/gov/moj/cpp/sjp/command/api/SessionApi.java index 80d5fa0549..b7ce7ba577 100644 --- a/sjp-command/sjp-command-api/src/main/java/uk/gov/moj/cpp/sjp/command/api/SessionApi.java +++ b/sjp-command/sjp-command-api/src/main/java/uk/gov/moj/cpp/sjp/command/api/SessionApi.java @@ -16,9 +16,9 @@ import uk.gov.moj.cpp.sjp.command.utils.UUIDHelper; import uk.gov.moj.cpp.sjp.domain.SessionCourt; -import javax.inject.Inject; -import javax.json.JsonObject; -import javax.json.JsonObjectBuilder; +import jakarta.inject.Inject; +import jakarta.json.JsonObject; +import jakarta.json.JsonObjectBuilder; @ServiceComponent(COMMAND_API) public class SessionApi { diff --git a/sjp-command/sjp-command-api/src/main/java/uk/gov/moj/cpp/sjp/command/api/SetDatesToAvoidRequiredApi.java b/sjp-command/sjp-command-api/src/main/java/uk/gov/moj/cpp/sjp/command/api/SetDatesToAvoidRequiredApi.java index fb0fc28239..7e7dae47b9 100644 --- a/sjp-command/sjp-command-api/src/main/java/uk/gov/moj/cpp/sjp/command/api/SetDatesToAvoidRequiredApi.java +++ b/sjp-command/sjp-command-api/src/main/java/uk/gov/moj/cpp/sjp/command/api/SetDatesToAvoidRequiredApi.java @@ -9,9 +9,9 @@ import uk.gov.justice.services.core.sender.Sender; import uk.gov.justice.services.messaging.JsonEnvelope; -import javax.inject.Inject; -import javax.json.JsonObject; -import javax.json.JsonObjectBuilder; +import jakarta.inject.Inject; +import jakarta.json.JsonObject; +import jakarta.json.JsonObjectBuilder; @ServiceComponent(COMMAND_API) public class SetDatesToAvoidRequiredApi { diff --git a/sjp-command/sjp-command-api/src/main/java/uk/gov/moj/cpp/sjp/command/api/SetPleasApi.java b/sjp-command/sjp-command-api/src/main/java/uk/gov/moj/cpp/sjp/command/api/SetPleasApi.java index 9ed3f8cc43..df9d18ae97 100644 --- a/sjp-command/sjp-command-api/src/main/java/uk/gov/moj/cpp/sjp/command/api/SetPleasApi.java +++ b/sjp-command/sjp-command-api/src/main/java/uk/gov/moj/cpp/sjp/command/api/SetPleasApi.java @@ -15,8 +15,8 @@ import java.util.List; import java.util.Map; -import javax.inject.Inject; -import javax.json.JsonObject; +import jakarta.inject.Inject; +import jakarta.json.JsonObject; @ServiceComponent(COMMAND_API) public class SetPleasApi { diff --git a/sjp-command/sjp-command-api/src/main/java/uk/gov/moj/cpp/sjp/command/api/TransparencyApi.java b/sjp-command/sjp-command-api/src/main/java/uk/gov/moj/cpp/sjp/command/api/TransparencyApi.java index 8f00b4ba50..0173c6276a 100644 --- a/sjp-command/sjp-command-api/src/main/java/uk/gov/moj/cpp/sjp/command/api/TransparencyApi.java +++ b/sjp-command/sjp-command-api/src/main/java/uk/gov/moj/cpp/sjp/command/api/TransparencyApi.java @@ -10,7 +10,7 @@ import uk.gov.justice.services.core.sender.Sender; import uk.gov.justice.services.messaging.JsonEnvelope; -import javax.inject.Inject; +import jakarta.inject.Inject; @ServiceComponent(COMMAND_API) public class TransparencyApi { diff --git a/sjp-command/sjp-command-api/src/main/java/uk/gov/moj/cpp/sjp/command/api/UpdateAllFinancialMeansApi.java b/sjp-command/sjp-command-api/src/main/java/uk/gov/moj/cpp/sjp/command/api/UpdateAllFinancialMeansApi.java index b8417e6f87..cfa34fce43 100644 --- a/sjp-command/sjp-command-api/src/main/java/uk/gov/moj/cpp/sjp/command/api/UpdateAllFinancialMeansApi.java +++ b/sjp-command/sjp-command-api/src/main/java/uk/gov/moj/cpp/sjp/command/api/UpdateAllFinancialMeansApi.java @@ -8,7 +8,7 @@ import uk.gov.justice.services.core.sender.Sender; import uk.gov.justice.services.messaging.JsonEnvelope; -import javax.inject.Inject; +import jakarta.inject.Inject; @ServiceComponent(COMMAND_API) public class UpdateAllFinancialMeansApi { diff --git a/sjp-command/sjp-command-api/src/main/java/uk/gov/moj/cpp/sjp/command/api/UpdateCasesManagementStatusApi.java b/sjp-command/sjp-command-api/src/main/java/uk/gov/moj/cpp/sjp/command/api/UpdateCasesManagementStatusApi.java index 78a833843e..450a239923 100644 --- a/sjp-command/sjp-command-api/src/main/java/uk/gov/moj/cpp/sjp/command/api/UpdateCasesManagementStatusApi.java +++ b/sjp-command/sjp-command-api/src/main/java/uk/gov/moj/cpp/sjp/command/api/UpdateCasesManagementStatusApi.java @@ -8,7 +8,7 @@ import uk.gov.justice.services.core.sender.Sender; import uk.gov.justice.services.messaging.JsonEnvelope; -import javax.inject.Inject; +import jakarta.inject.Inject; @ServiceComponent(COMMAND_API) public class UpdateCasesManagementStatusApi { diff --git a/sjp-command/sjp-command-api/src/main/java/uk/gov/moj/cpp/sjp/command/api/UpdateHearingRequirementsApi.java b/sjp-command/sjp-command-api/src/main/java/uk/gov/moj/cpp/sjp/command/api/UpdateHearingRequirementsApi.java index b045f1bb2a..19b1e0c253 100644 --- a/sjp-command/sjp-command-api/src/main/java/uk/gov/moj/cpp/sjp/command/api/UpdateHearingRequirementsApi.java +++ b/sjp-command/sjp-command-api/src/main/java/uk/gov/moj/cpp/sjp/command/api/UpdateHearingRequirementsApi.java @@ -8,7 +8,7 @@ import uk.gov.justice.services.core.sender.Sender; import uk.gov.justice.services.messaging.JsonEnvelope; -import javax.inject.Inject; +import jakarta.inject.Inject; @ServiceComponent(COMMAND_API) public class UpdateHearingRequirementsApi { diff --git a/sjp-command/sjp-command-api/src/main/java/uk/gov/moj/cpp/sjp/command/api/UpdateOffenceCodeApi.java b/sjp-command/sjp-command-api/src/main/java/uk/gov/moj/cpp/sjp/command/api/UpdateOffenceCodeApi.java index d58ae6f94e..d81aa1e40b 100644 --- a/sjp-command/sjp-command-api/src/main/java/uk/gov/moj/cpp/sjp/command/api/UpdateOffenceCodeApi.java +++ b/sjp-command/sjp-command-api/src/main/java/uk/gov/moj/cpp/sjp/command/api/UpdateOffenceCodeApi.java @@ -8,7 +8,7 @@ import uk.gov.justice.services.core.sender.Sender; import uk.gov.justice.services.messaging.JsonEnvelope; -import javax.inject.Inject; +import jakarta.inject.Inject; @ServiceComponent(COMMAND_API) public class UpdateOffenceCodeApi { diff --git a/sjp-command/sjp-command-api/src/main/java/uk/gov/moj/cpp/sjp/command/api/UploadCaseDocumentApi.java b/sjp-command/sjp-command-api/src/main/java/uk/gov/moj/cpp/sjp/command/api/UploadCaseDocumentApi.java index bb830e5d96..cce4aef95d 100644 --- a/sjp-command/sjp-command-api/src/main/java/uk/gov/moj/cpp/sjp/command/api/UploadCaseDocumentApi.java +++ b/sjp-command/sjp-command-api/src/main/java/uk/gov/moj/cpp/sjp/command/api/UploadCaseDocumentApi.java @@ -8,7 +8,7 @@ import uk.gov.justice.services.core.sender.Sender; import uk.gov.justice.services.messaging.JsonEnvelope; -import javax.inject.Inject; +import jakarta.inject.Inject; @ServiceComponent(COMMAND_API) public class UploadCaseDocumentApi { diff --git a/sjp-command/sjp-command-api/src/main/java/uk/gov/moj/cpp/sjp/command/api/service/AddressService.java b/sjp-command/sjp-command-api/src/main/java/uk/gov/moj/cpp/sjp/command/api/service/AddressService.java index 123d40c7cd..cbc34941d2 100644 --- a/sjp-command/sjp-command-api/src/main/java/uk/gov/moj/cpp/sjp/command/api/service/AddressService.java +++ b/sjp-command/sjp-command-api/src/main/java/uk/gov/moj/cpp/sjp/command/api/service/AddressService.java @@ -5,8 +5,8 @@ import static org.apache.commons.lang3.StringUtils.SPACE; import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilderWithFilter; -import javax.json.JsonObject; -import javax.json.JsonObjectBuilder; +import jakarta.json.JsonObject; +import jakarta.json.JsonObjectBuilder; public class AddressService { diff --git a/sjp-command/sjp-command-api/src/main/java/uk/gov/moj/cpp/sjp/command/api/service/CaseService.java b/sjp-command/sjp-command-api/src/main/java/uk/gov/moj/cpp/sjp/command/api/service/CaseService.java index def6ce5343..4543fa5f27 100644 --- a/sjp-command/sjp-command-api/src/main/java/uk/gov/moj/cpp/sjp/command/api/service/CaseService.java +++ b/sjp-command/sjp-command-api/src/main/java/uk/gov/moj/cpp/sjp/command/api/service/CaseService.java @@ -8,8 +8,8 @@ import uk.gov.justice.services.core.requester.Requester; import uk.gov.justice.services.messaging.JsonEnvelope; -import javax.inject.Inject; -import javax.json.JsonObject; +import jakarta.inject.Inject; +import jakarta.json.JsonObject; public class CaseService { diff --git a/sjp-command/sjp-command-api/src/main/java/uk/gov/moj/cpp/sjp/command/api/service/ContactDetailsService.java b/sjp-command/sjp-command-api/src/main/java/uk/gov/moj/cpp/sjp/command/api/service/ContactDetailsService.java index 8bd4ca0306..486f44da3d 100644 --- a/sjp-command/sjp-command-api/src/main/java/uk/gov/moj/cpp/sjp/command/api/service/ContactDetailsService.java +++ b/sjp-command/sjp-command-api/src/main/java/uk/gov/moj/cpp/sjp/command/api/service/ContactDetailsService.java @@ -4,8 +4,8 @@ import static org.apache.commons.lang3.StringUtils.isWhitespace; import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilderWithFilter; -import javax.json.JsonObject; -import javax.json.JsonObjectBuilder; +import jakarta.json.JsonObject; +import jakarta.json.JsonObjectBuilder; public class ContactDetailsService { diff --git a/sjp-command/sjp-command-api/src/main/java/uk/gov/moj/cpp/sjp/command/api/service/ReferenceDataService.java b/sjp-command/sjp-command-api/src/main/java/uk/gov/moj/cpp/sjp/command/api/service/ReferenceDataService.java index 0adb77e7e0..75cae73725 100644 --- a/sjp-command/sjp-command-api/src/main/java/uk/gov/moj/cpp/sjp/command/api/service/ReferenceDataService.java +++ b/sjp-command/sjp-command-api/src/main/java/uk/gov/moj/cpp/sjp/command/api/service/ReferenceDataService.java @@ -14,8 +14,8 @@ import java.util.Optional; -import javax.inject.Inject; -import javax.json.JsonObject; +import jakarta.inject.Inject; +import jakarta.json.JsonObject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/sjp-command/sjp-command-api/src/main/java/uk/gov/moj/cpp/sjp/command/api/validator/PleadOnlineValidator.java b/sjp-command/sjp-command-api/src/main/java/uk/gov/moj/cpp/sjp/command/api/validator/PleadOnlineValidator.java index 0ee495b17c..31049ebe15 100644 --- a/sjp-command/sjp-command-api/src/main/java/uk/gov/moj/cpp/sjp/command/api/validator/PleadOnlineValidator.java +++ b/sjp-command/sjp-command-api/src/main/java/uk/gov/moj/cpp/sjp/command/api/validator/PleadOnlineValidator.java @@ -25,7 +25,7 @@ import java.util.Set; import java.util.stream.Stream; -import javax.json.JsonObject; +import jakarta.json.JsonObject; public class PleadOnlineValidator { diff --git a/sjp-command/sjp-command-api/src/main/java/uk/gov/moj/cpp/sjp/command/api/validator/SetPleasModel.java b/sjp-command/sjp-command-api/src/main/java/uk/gov/moj/cpp/sjp/command/api/validator/SetPleasModel.java index 9f68f503f0..7b7fd6fe74 100644 --- a/sjp-command/sjp-command-api/src/main/java/uk/gov/moj/cpp/sjp/command/api/validator/SetPleasModel.java +++ b/sjp-command/sjp-command-api/src/main/java/uk/gov/moj/cpp/sjp/command/api/validator/SetPleasModel.java @@ -11,7 +11,7 @@ import java.util.Optional; import java.util.stream.Collectors; -import javax.json.JsonObject; +import jakarta.json.JsonObject; import org.apache.commons.lang3.EnumUtils; diff --git a/sjp-command/sjp-command-api/src/main/java/uk/gov/moj/cpp/sjp/command/api/validator/UpdatePleaModel.java b/sjp-command/sjp-command-api/src/main/java/uk/gov/moj/cpp/sjp/command/api/validator/UpdatePleaModel.java index d4663696a8..2d7f6be196 100644 --- a/sjp-command/sjp-command-api/src/main/java/uk/gov/moj/cpp/sjp/command/api/validator/UpdatePleaModel.java +++ b/sjp-command/sjp-command-api/src/main/java/uk/gov/moj/cpp/sjp/command/api/validator/UpdatePleaModel.java @@ -2,7 +2,7 @@ import uk.gov.justice.services.messaging.JsonObjects; -import javax.json.JsonObject; +import jakarta.json.JsonObject; import org.apache.commons.lang3.EnumUtils; diff --git a/sjp-command/sjp-command-api/src/main/java/uk/gov/moj/cpp/sjp/command/api/validator/decisionvalidator/AdjournDecisionValidator.java b/sjp-command/sjp-command-api/src/main/java/uk/gov/moj/cpp/sjp/command/api/validator/decisionvalidator/AdjournDecisionValidator.java index d6bb4a8b7b..d053071db1 100644 --- a/sjp-command/sjp-command-api/src/main/java/uk/gov/moj/cpp/sjp/command/api/validator/decisionvalidator/AdjournDecisionValidator.java +++ b/sjp-command/sjp-command-api/src/main/java/uk/gov/moj/cpp/sjp/command/api/validator/decisionvalidator/AdjournDecisionValidator.java @@ -7,7 +7,7 @@ import java.time.LocalDate; -import javax.json.JsonObject; +import jakarta.json.JsonObject; public class AdjournDecisionValidator { diff --git a/sjp-command/sjp-command-api/src/main/java/uk/gov/moj/cpp/sjp/command/api/validator/decisionvalidator/ApplicationDecisionValidator.java b/sjp-command/sjp-command-api/src/main/java/uk/gov/moj/cpp/sjp/command/api/validator/decisionvalidator/ApplicationDecisionValidator.java index a60303ff6a..6c40d23c7a 100644 --- a/sjp-command/sjp-command-api/src/main/java/uk/gov/moj/cpp/sjp/command/api/validator/decisionvalidator/ApplicationDecisionValidator.java +++ b/sjp-command/sjp-command-api/src/main/java/uk/gov/moj/cpp/sjp/command/api/validator/decisionvalidator/ApplicationDecisionValidator.java @@ -4,7 +4,7 @@ import uk.gov.justice.services.adapter.rest.exception.BadRequestException; -import javax.json.JsonObject; +import jakarta.json.JsonObject; public class ApplicationDecisionValidator { diff --git a/sjp-command/sjp-command-api/src/main/java/uk/gov/moj/cpp/sjp/command/api/validator/decisionvalidator/CommonDecisionValidator.java b/sjp-command/sjp-command-api/src/main/java/uk/gov/moj/cpp/sjp/command/api/validator/decisionvalidator/CommonDecisionValidator.java index 6e5e8c2f4e..3426332e0e 100644 --- a/sjp-command/sjp-command-api/src/main/java/uk/gov/moj/cpp/sjp/command/api/validator/decisionvalidator/CommonDecisionValidator.java +++ b/sjp-command/sjp-command-api/src/main/java/uk/gov/moj/cpp/sjp/command/api/validator/decisionvalidator/CommonDecisionValidator.java @@ -8,7 +8,7 @@ import java.math.BigDecimal; import java.util.Optional; -import javax.json.JsonObject; +import jakarta.json.JsonObject; public class CommonDecisionValidator { private CommonDecisionValidator() { diff --git a/sjp-command/sjp-command-api/src/main/java/uk/gov/moj/cpp/sjp/command/api/validator/decisionvalidator/DischargeDecisionValidator.java b/sjp-command/sjp-command-api/src/main/java/uk/gov/moj/cpp/sjp/command/api/validator/decisionvalidator/DischargeDecisionValidator.java index 95b3648d27..5c777d75ce 100644 --- a/sjp-command/sjp-command-api/src/main/java/uk/gov/moj/cpp/sjp/command/api/validator/decisionvalidator/DischargeDecisionValidator.java +++ b/sjp-command/sjp-command-api/src/main/java/uk/gov/moj/cpp/sjp/command/api/validator/decisionvalidator/DischargeDecisionValidator.java @@ -3,7 +3,7 @@ import uk.gov.justice.services.adapter.rest.exception.BadRequestException; import uk.gov.moj.cpp.sjp.domain.decision.discharge.DischargeType; -import javax.json.JsonObject; +import jakarta.json.JsonObject; import static uk.gov.moj.cpp.sjp.command.utils.NullSafeJsonObjectHelper.notNull; import static uk.gov.moj.cpp.sjp.domain.decision.discharge.DischargeType.CONDITIONAL; diff --git a/sjp-command/sjp-command-api/src/main/java/uk/gov/moj/cpp/sjp/command/api/validator/decisionvalidator/FinancialImpositionValidator.java b/sjp-command/sjp-command-api/src/main/java/uk/gov/moj/cpp/sjp/command/api/validator/decisionvalidator/FinancialImpositionValidator.java index f61df2af08..0444b011d2 100644 --- a/sjp-command/sjp-command-api/src/main/java/uk/gov/moj/cpp/sjp/command/api/validator/decisionvalidator/FinancialImpositionValidator.java +++ b/sjp-command/sjp-command-api/src/main/java/uk/gov/moj/cpp/sjp/command/api/validator/decisionvalidator/FinancialImpositionValidator.java @@ -18,7 +18,7 @@ import java.util.List; import java.util.Optional; -import javax.json.JsonObject; +import jakarta.json.JsonObject; public class FinancialImpositionValidator { private static final String PAYMENT = "payment"; diff --git a/sjp-command/sjp-command-api/src/main/java/uk/gov/moj/cpp/sjp/command/api/validator/decisionvalidator/FinancialPenaltyDecisionValidator.java b/sjp-command/sjp-command-api/src/main/java/uk/gov/moj/cpp/sjp/command/api/validator/decisionvalidator/FinancialPenaltyDecisionValidator.java index b5671a7c39..cb6dcbd682 100644 --- a/sjp-command/sjp-command-api/src/main/java/uk/gov/moj/cpp/sjp/command/api/validator/decisionvalidator/FinancialPenaltyDecisionValidator.java +++ b/sjp-command/sjp-command-api/src/main/java/uk/gov/moj/cpp/sjp/command/api/validator/decisionvalidator/FinancialPenaltyDecisionValidator.java @@ -2,7 +2,7 @@ import static java.math.BigDecimal.ZERO; import static java.util.Optional.ofNullable; -import static javax.json.JsonValue.ValueType.NUMBER; +import static jakarta.json.JsonValue.ValueType.NUMBER; import static uk.gov.moj.cpp.sjp.command.api.validator.decisionvalidator.CommonDecisionValidator.getFinancialPenaltyValue; import uk.gov.justice.services.adapter.rest.exception.BadRequestException; @@ -10,8 +10,8 @@ import java.math.BigDecimal; import java.util.Optional; -import javax.json.JsonNumber; -import javax.json.JsonObject; +import jakarta.json.JsonNumber; +import jakarta.json.JsonObject; public class FinancialPenaltyDecisionValidator { diff --git a/sjp-command/sjp-command-api/src/main/java/uk/gov/moj/cpp/sjp/command/interceptor/SjpServiceFileInterceptor.java b/sjp-command/sjp-command-api/src/main/java/uk/gov/moj/cpp/sjp/command/interceptor/SjpServiceFileInterceptor.java index 59b8d681cc..d2a14e069d 100644 --- a/sjp-command/sjp-command-api/src/main/java/uk/gov/moj/cpp/sjp/command/interceptor/SjpServiceFileInterceptor.java +++ b/sjp-command/sjp-command-api/src/main/java/uk/gov/moj/cpp/sjp/command/interceptor/SjpServiceFileInterceptor.java @@ -14,7 +14,7 @@ import java.util.Optional; import java.util.UUID; -import javax.inject.Inject; +import jakarta.inject.Inject; public class SjpServiceFileInterceptor implements Interceptor { diff --git a/sjp-command/sjp-command-api/src/main/java/uk/gov/moj/cpp/sjp/command/utils/NullSafeJsonObjectHelper.java b/sjp-command/sjp-command-api/src/main/java/uk/gov/moj/cpp/sjp/command/utils/NullSafeJsonObjectHelper.java index fbe15fbdbb..b778265cd2 100644 --- a/sjp-command/sjp-command-api/src/main/java/uk/gov/moj/cpp/sjp/command/utils/NullSafeJsonObjectHelper.java +++ b/sjp-command/sjp-command-api/src/main/java/uk/gov/moj/cpp/sjp/command/utils/NullSafeJsonObjectHelper.java @@ -2,7 +2,7 @@ import org.apache.commons.lang3.Validate; -import javax.json.JsonObject; +import jakarta.json.JsonObject; import java.util.Objects; public class NullSafeJsonObjectHelper { diff --git a/sjp-command/sjp-command-api/src/main/resources/META-INF/beans.xml b/sjp-command/sjp-command-api/src/main/resources/META-INF/beans.xml index cc3f8d2864..1d83bc8c5a 100644 --- a/sjp-command/sjp-command-api/src/main/resources/META-INF/beans.xml +++ b/sjp-command/sjp-command-api/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-command/sjp-command-api/src/test/java/uk/gov/moj/cpp/sjp/command/api/AddFinancialImpositionAccountNumberBdfApiTest.java b/sjp-command/sjp-command-api/src/test/java/uk/gov/moj/cpp/sjp/command/api/AddFinancialImpositionAccountNumberBdfApiTest.java index e97691597d..80f1190582 100644 --- a/sjp-command/sjp-command-api/src/test/java/uk/gov/moj/cpp/sjp/command/api/AddFinancialImpositionAccountNumberBdfApiTest.java +++ b/sjp-command/sjp-command-api/src/test/java/uk/gov/moj/cpp/sjp/command/api/AddFinancialImpositionAccountNumberBdfApiTest.java @@ -26,7 +26,7 @@ import java.util.Map; -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-command/sjp-command-api/src/test/java/uk/gov/moj/cpp/sjp/command/api/AddFinancialImpositionCorrelationIdApiTest.java b/sjp-command/sjp-command-api/src/test/java/uk/gov/moj/cpp/sjp/command/api/AddFinancialImpositionCorrelationIdApiTest.java index f84cb78573..c386cc04b6 100644 --- a/sjp-command/sjp-command-api/src/test/java/uk/gov/moj/cpp/sjp/command/api/AddFinancialImpositionCorrelationIdApiTest.java +++ b/sjp-command/sjp-command-api/src/test/java/uk/gov/moj/cpp/sjp/command/api/AddFinancialImpositionCorrelationIdApiTest.java @@ -26,7 +26,7 @@ import java.util.Map; -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-command/sjp-command-api/src/test/java/uk/gov/moj/cpp/sjp/command/api/AocpResponseTimeExpiredApiTest.java b/sjp-command/sjp-command-api/src/test/java/uk/gov/moj/cpp/sjp/command/api/AocpResponseTimeExpiredApiTest.java index 3f053e4afd..f590fe7e83 100644 --- a/sjp-command/sjp-command-api/src/test/java/uk/gov/moj/cpp/sjp/command/api/AocpResponseTimeExpiredApiTest.java +++ b/sjp-command/sjp-command-api/src/test/java/uk/gov/moj/cpp/sjp/command/api/AocpResponseTimeExpiredApiTest.java @@ -15,7 +15,7 @@ import uk.gov.justice.services.messaging.Envelope; import uk.gov.justice.services.messaging.JsonEnvelope; -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-command/sjp-command-api/src/test/java/uk/gov/moj/cpp/sjp/command/api/CaseNoteApiTest.java b/sjp-command/sjp-command-api/src/test/java/uk/gov/moj/cpp/sjp/command/api/CaseNoteApiTest.java index c858f0932b..5e2dd5dc4b 100644 --- a/sjp-command/sjp-command-api/src/test/java/uk/gov/moj/cpp/sjp/command/api/CaseNoteApiTest.java +++ b/sjp-command/sjp-command-api/src/test/java/uk/gov/moj/cpp/sjp/command/api/CaseNoteApiTest.java @@ -39,8 +39,8 @@ import java.util.Map; import java.util.UUID; -import javax.json.JsonObjectBuilder; -import javax.ws.rs.BadRequestException; +import jakarta.json.JsonObjectBuilder; +import jakarta.ws.rs.BadRequestException; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; diff --git a/sjp-command/sjp-command-api/src/test/java/uk/gov/moj/cpp/sjp/command/api/CreateCaseApiTest.java b/sjp-command/sjp-command-api/src/test/java/uk/gov/moj/cpp/sjp/command/api/CreateCaseApiTest.java index 993a29d2e3..faf693cc0e 100644 --- a/sjp-command/sjp-command-api/src/test/java/uk/gov/moj/cpp/sjp/command/api/CreateCaseApiTest.java +++ b/sjp-command/sjp-command-api/src/test/java/uk/gov/moj/cpp/sjp/command/api/CreateCaseApiTest.java @@ -28,7 +28,7 @@ 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-command/sjp-command-api/src/test/java/uk/gov/moj/cpp/sjp/command/api/CreateCaseApplicationApiTest.java b/sjp-command/sjp-command-api/src/test/java/uk/gov/moj/cpp/sjp/command/api/CreateCaseApplicationApiTest.java index 282f19bbed..884b818d39 100644 --- a/sjp-command/sjp-command-api/src/test/java/uk/gov/moj/cpp/sjp/command/api/CreateCaseApplicationApiTest.java +++ b/sjp-command/sjp-command-api/src/test/java/uk/gov/moj/cpp/sjp/command/api/CreateCaseApplicationApiTest.java @@ -24,7 +24,7 @@ import java.util.Map; -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-command/sjp-command-api/src/test/java/uk/gov/moj/cpp/sjp/command/api/DecisionApiTest.java b/sjp-command/sjp-command-api/src/test/java/uk/gov/moj/cpp/sjp/command/api/DecisionApiTest.java index 60543bc4ad..62dc971b85 100644 --- a/sjp-command/sjp-command-api/src/test/java/uk/gov/moj/cpp/sjp/command/api/DecisionApiTest.java +++ b/sjp-command/sjp-command-api/src/test/java/uk/gov/moj/cpp/sjp/command/api/DecisionApiTest.java @@ -54,9 +54,9 @@ import java.time.ZonedDateTime; import java.util.UUID; -import javax.json.JsonArray; -import javax.json.JsonObject; -import javax.json.JsonObjectBuilder; +import jakarta.json.JsonArray; +import jakarta.json.JsonObject; +import jakarta.json.JsonObjectBuilder; import org.apache.commons.lang3.StringUtils; import org.junit.jupiter.api.Test; diff --git a/sjp-command/sjp-command-api/src/test/java/uk/gov/moj/cpp/sjp/command/api/DefendantDetailsApiTest.java b/sjp-command/sjp-command-api/src/test/java/uk/gov/moj/cpp/sjp/command/api/DefendantDetailsApiTest.java index 92cc2dac67..7cedbe7a94 100644 --- a/sjp-command/sjp-command-api/src/test/java/uk/gov/moj/cpp/sjp/command/api/DefendantDetailsApiTest.java +++ b/sjp-command/sjp-command-api/src/test/java/uk/gov/moj/cpp/sjp/command/api/DefendantDetailsApiTest.java @@ -26,7 +26,7 @@ import java.util.Map; 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-command/sjp-command-api/src/test/java/uk/gov/moj/cpp/sjp/command/api/OffenceWithdrawalRequestApiTest.java b/sjp-command/sjp-command-api/src/test/java/uk/gov/moj/cpp/sjp/command/api/OffenceWithdrawalRequestApiTest.java index 857f147bfa..c920a0c159 100644 --- a/sjp-command/sjp-command-api/src/test/java/uk/gov/moj/cpp/sjp/command/api/OffenceWithdrawalRequestApiTest.java +++ b/sjp-command/sjp-command-api/src/test/java/uk/gov/moj/cpp/sjp/command/api/OffenceWithdrawalRequestApiTest.java @@ -26,8 +26,8 @@ import java.util.Map; -import javax.json.JsonArray; -import javax.json.JsonObject; +import jakarta.json.JsonArray; +import jakarta.json.JsonObject; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; diff --git a/sjp-command/sjp-command-api/src/test/java/uk/gov/moj/cpp/sjp/command/api/PleadOnlineApiTest.java b/sjp-command/sjp-command-api/src/test/java/uk/gov/moj/cpp/sjp/command/api/PleadOnlineApiTest.java index 61b0305f5e..3efee47b68 100644 --- a/sjp-command/sjp-command-api/src/test/java/uk/gov/moj/cpp/sjp/command/api/PleadOnlineApiTest.java +++ b/sjp-command/sjp-command-api/src/test/java/uk/gov/moj/cpp/sjp/command/api/PleadOnlineApiTest.java @@ -43,10 +43,10 @@ import java.util.Optional; import java.util.UUID; -import javax.json.JsonArray; -import javax.json.JsonObject; -import javax.json.JsonObjectBuilder; -import javax.json.JsonValue; +import jakarta.json.JsonArray; +import jakarta.json.JsonObject; +import jakarta.json.JsonObjectBuilder; +import jakarta.json.JsonValue; import org.hamcrest.CoreMatchers; import org.junit.jupiter.api.Test; diff --git a/sjp-command/sjp-command-api/src/test/java/uk/gov/moj/cpp/sjp/command/api/ResolveConvictingCourtApiTest.java b/sjp-command/sjp-command-api/src/test/java/uk/gov/moj/cpp/sjp/command/api/ResolveConvictingCourtApiTest.java index 4a0672ddfb..aabd54d9ca 100644 --- a/sjp-command/sjp-command-api/src/test/java/uk/gov/moj/cpp/sjp/command/api/ResolveConvictingCourtApiTest.java +++ b/sjp-command/sjp-command-api/src/test/java/uk/gov/moj/cpp/sjp/command/api/ResolveConvictingCourtApiTest.java @@ -21,7 +21,7 @@ import java.time.ZonedDateTime; -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-command/sjp-command-api/src/test/java/uk/gov/moj/cpp/sjp/command/api/ResolveConvictionCourtApiTest.java b/sjp-command/sjp-command-api/src/test/java/uk/gov/moj/cpp/sjp/command/api/ResolveConvictionCourtApiTest.java index 8fd66ed87b..0a0f72a36d 100644 --- a/sjp-command/sjp-command-api/src/test/java/uk/gov/moj/cpp/sjp/command/api/ResolveConvictionCourtApiTest.java +++ b/sjp-command/sjp-command-api/src/test/java/uk/gov/moj/cpp/sjp/command/api/ResolveConvictionCourtApiTest.java @@ -21,7 +21,7 @@ import java.time.ZonedDateTime; -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-command/sjp-command-api/src/test/java/uk/gov/moj/cpp/sjp/command/api/SessionApiTest.java b/sjp-command/sjp-command-api/src/test/java/uk/gov/moj/cpp/sjp/command/api/SessionApiTest.java index 9a4d112311..87763019fa 100644 --- a/sjp-command/sjp-command-api/src/test/java/uk/gov/moj/cpp/sjp/command/api/SessionApiTest.java +++ b/sjp-command/sjp-command-api/src/test/java/uk/gov/moj/cpp/sjp/command/api/SessionApiTest.java @@ -45,7 +45,7 @@ import java.util.Optional; import java.util.UUID; -import javax.json.JsonObject; +import jakarta.json.JsonObject; import org.hamcrest.CoreMatchers; import org.junit.jupiter.api.Test; diff --git a/sjp-command/sjp-command-api/src/test/java/uk/gov/moj/cpp/sjp/command/api/UpdateEmployerTest.java b/sjp-command/sjp-command-api/src/test/java/uk/gov/moj/cpp/sjp/command/api/UpdateEmployerTest.java index 923561636c..4468be8312 100644 --- a/sjp-command/sjp-command-api/src/test/java/uk/gov/moj/cpp/sjp/command/api/UpdateEmployerTest.java +++ b/sjp-command/sjp-command-api/src/test/java/uk/gov/moj/cpp/sjp/command/api/UpdateEmployerTest.java @@ -18,8 +18,8 @@ import java.util.Objects; import java.util.UUID; -import javax.json.JsonObject; -import javax.json.JsonObjectBuilder; +import jakarta.json.JsonObject; +import jakarta.json.JsonObjectBuilder; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; diff --git a/sjp-command/sjp-command-api/src/test/java/uk/gov/moj/cpp/sjp/command/api/service/AddressServiceTest.java b/sjp-command/sjp-command-api/src/test/java/uk/gov/moj/cpp/sjp/command/api/service/AddressServiceTest.java index ee2979a3ec..1ae6a92040 100644 --- a/sjp-command/sjp-command-api/src/test/java/uk/gov/moj/cpp/sjp/command/api/service/AddressServiceTest.java +++ b/sjp-command/sjp-command-api/src/test/java/uk/gov/moj/cpp/sjp/command/api/service/AddressServiceTest.java @@ -14,8 +14,8 @@ import java.util.List; import java.util.stream.Stream; -import javax.json.JsonObject; -import javax.json.JsonObjectBuilder; +import jakarta.json.JsonObject; +import jakarta.json.JsonObjectBuilder; import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; diff --git a/sjp-command/sjp-command-api/src/test/java/uk/gov/moj/cpp/sjp/command/api/service/CaseServiceTest.java b/sjp-command/sjp-command-api/src/test/java/uk/gov/moj/cpp/sjp/command/api/service/CaseServiceTest.java index 1fefaacd63..9b7b1bb81e 100644 --- a/sjp-command/sjp-command-api/src/test/java/uk/gov/moj/cpp/sjp/command/api/service/CaseServiceTest.java +++ b/sjp-command/sjp-command-api/src/test/java/uk/gov/moj/cpp/sjp/command/api/service/CaseServiceTest.java @@ -13,7 +13,7 @@ import java.util.UUID; -import javax.json.JsonObject; +import jakarta.json.JsonObject; import org.hamcrest.MatcherAssert; import org.junit.jupiter.api.Test; diff --git a/sjp-command/sjp-command-api/src/test/java/uk/gov/moj/cpp/sjp/command/api/service/ReferenceDataServiceTest.java b/sjp-command/sjp-command-api/src/test/java/uk/gov/moj/cpp/sjp/command/api/service/ReferenceDataServiceTest.java index f61b42d0d9..d0a99f22e2 100644 --- a/sjp-command/sjp-command-api/src/test/java/uk/gov/moj/cpp/sjp/command/api/service/ReferenceDataServiceTest.java +++ b/sjp-command/sjp-command-api/src/test/java/uk/gov/moj/cpp/sjp/command/api/service/ReferenceDataServiceTest.java @@ -26,7 +26,7 @@ import java.util.Optional; -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-command/sjp-command-api/src/test/java/uk/gov/moj/cpp/sjp/command/api/validator/PleadOnlineValidatorTest.java b/sjp-command/sjp-command-api/src/test/java/uk/gov/moj/cpp/sjp/command/api/validator/PleadOnlineValidatorTest.java index 9bdecbbc0a..0e7b901b32 100644 --- a/sjp-command/sjp-command-api/src/test/java/uk/gov/moj/cpp/sjp/command/api/validator/PleadOnlineValidatorTest.java +++ b/sjp-command/sjp-command-api/src/test/java/uk/gov/moj/cpp/sjp/command/api/validator/PleadOnlineValidatorTest.java @@ -35,9 +35,9 @@ import java.util.UUID; import java.util.stream.Stream; -import javax.json.JsonArray; -import javax.json.JsonObject; -import javax.json.JsonObjectBuilder; +import jakarta.json.JsonArray; +import jakarta.json.JsonObject; +import jakarta.json.JsonObjectBuilder; import org.hamcrest.Matcher; import org.junit.jupiter.api.Test; diff --git a/sjp-command/sjp-command-api/src/test/java/uk/gov/moj/cpp/sjp/command/api/validator/decisionvalidator/DischargeDecisionValidatorTest.java b/sjp-command/sjp-command-api/src/test/java/uk/gov/moj/cpp/sjp/command/api/validator/decisionvalidator/DischargeDecisionValidatorTest.java index 184d3acca0..1053df38d6 100644 --- a/sjp-command/sjp-command-api/src/test/java/uk/gov/moj/cpp/sjp/command/api/validator/decisionvalidator/DischargeDecisionValidatorTest.java +++ b/sjp-command/sjp-command-api/src/test/java/uk/gov/moj/cpp/sjp/command/api/validator/decisionvalidator/DischargeDecisionValidatorTest.java @@ -9,7 +9,7 @@ import uk.gov.justice.services.adapter.rest.exception.BadRequestException; import uk.gov.moj.cpp.sjp.domain.decision.discharge.DischargeType; -import javax.json.JsonObject; +import jakarta.json.JsonObject; import org.junit.jupiter.api.Test; diff --git a/sjp-command/sjp-command-api/src/test/java/uk/gov/moj/cpp/sjp/command/api/validator/decisionvalidator/FinancialImpositionValidatorTest.java b/sjp-command/sjp-command-api/src/test/java/uk/gov/moj/cpp/sjp/command/api/validator/decisionvalidator/FinancialImpositionValidatorTest.java index 0c9188c0ed..9a70b4ec9a 100644 --- a/sjp-command/sjp-command-api/src/test/java/uk/gov/moj/cpp/sjp/command/api/validator/decisionvalidator/FinancialImpositionValidatorTest.java +++ b/sjp-command/sjp-command-api/src/test/java/uk/gov/moj/cpp/sjp/command/api/validator/decisionvalidator/FinancialImpositionValidatorTest.java @@ -18,8 +18,8 @@ import java.time.LocalDate; -import javax.json.JsonArrayBuilder; -import javax.json.JsonObject; +import jakarta.json.JsonArrayBuilder; +import jakarta.json.JsonObject; import org.junit.jupiter.api.Test; diff --git a/sjp-command/sjp-command-api/src/test/java/uk/gov/moj/cpp/sjp/command/api/validator/decisionvalidator/FinancialPenaltyDecisionValidatorTest.java b/sjp-command/sjp-command-api/src/test/java/uk/gov/moj/cpp/sjp/command/api/validator/decisionvalidator/FinancialPenaltyDecisionValidatorTest.java index 32567dd88e..84fbdce291 100644 --- a/sjp-command/sjp-command-api/src/test/java/uk/gov/moj/cpp/sjp/command/api/validator/decisionvalidator/FinancialPenaltyDecisionValidatorTest.java +++ b/sjp-command/sjp-command-api/src/test/java/uk/gov/moj/cpp/sjp/command/api/validator/decisionvalidator/FinancialPenaltyDecisionValidatorTest.java @@ -16,7 +16,7 @@ import java.util.Optional; import java.util.UUID; -import javax.json.JsonObject; +import jakarta.json.JsonObject; import org.junit.jupiter.api.Test; diff --git a/sjp-command/sjp-command-api/src/test/java/uk/gov/moj/cpp/sjp/command/schema/CaseReopenedSchemaTest.java b/sjp-command/sjp-command-api/src/test/java/uk/gov/moj/cpp/sjp/command/schema/CaseReopenedSchemaTest.java index e3e1b5387a..3f8f706afe 100644 --- a/sjp-command/sjp-command-api/src/test/java/uk/gov/moj/cpp/sjp/command/schema/CaseReopenedSchemaTest.java +++ b/sjp-command/sjp-command-api/src/test/java/uk/gov/moj/cpp/sjp/command/schema/CaseReopenedSchemaTest.java @@ -15,7 +15,7 @@ import java.util.stream.Stream; -import javax.json.JsonValue; +import jakarta.json.JsonValue; import org.hamcrest.CoreMatchers; import org.junit.jupiter.api.BeforeAll; diff --git a/sjp-command/sjp-command-api/src/test/java/uk/gov/moj/cpp/sjp/command/schema/UpdateDefendantSchemaTest.java b/sjp-command/sjp-command-api/src/test/java/uk/gov/moj/cpp/sjp/command/schema/UpdateDefendantSchemaTest.java index 2818951f09..d89516f009 100644 --- a/sjp-command/sjp-command-api/src/test/java/uk/gov/moj/cpp/sjp/command/schema/UpdateDefendantSchemaTest.java +++ b/sjp-command/sjp-command-api/src/test/java/uk/gov/moj/cpp/sjp/command/schema/UpdateDefendantSchemaTest.java @@ -10,7 +10,7 @@ import uk.gov.justice.services.messaging.JsonEnvelope; -import javax.json.JsonObject; +import jakarta.json.JsonObject; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; diff --git a/sjp-command/sjp-command-api/src/test/java/uk/gov/moj/cpp/sjp/command/utils/CommonObjectBuilderUtil.java b/sjp-command/sjp-command-api/src/test/java/uk/gov/moj/cpp/sjp/command/utils/CommonObjectBuilderUtil.java index cc2676e263..2a846bb948 100644 --- a/sjp-command/sjp-command-api/src/test/java/uk/gov/moj/cpp/sjp/command/utils/CommonObjectBuilderUtil.java +++ b/sjp-command/sjp-command-api/src/test/java/uk/gov/moj/cpp/sjp/command/utils/CommonObjectBuilderUtil.java @@ -21,8 +21,8 @@ import java.time.LocalDate; import java.util.UUID; -import javax.json.JsonArrayBuilder; -import javax.json.JsonObject; +import jakarta.json.JsonArrayBuilder; +import jakarta.json.JsonObject; public class CommonObjectBuilderUtil { diff --git a/sjp-command/sjp-command-api/src/test/java/uk/gov/moj/cpp/sjp/command/utils/NullSafeJsonObjectHelperTest.java b/sjp-command/sjp-command-api/src/test/java/uk/gov/moj/cpp/sjp/command/utils/NullSafeJsonObjectHelperTest.java index 8afc116d85..849f2d3107 100644 --- a/sjp-command/sjp-command-api/src/test/java/uk/gov/moj/cpp/sjp/command/utils/NullSafeJsonObjectHelperTest.java +++ b/sjp-command/sjp-command-api/src/test/java/uk/gov/moj/cpp/sjp/command/utils/NullSafeJsonObjectHelperTest.java @@ -5,7 +5,7 @@ import static org.junit.jupiter.api.Assertions.assertThrows; import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; -import javax.json.JsonObject; +import jakarta.json.JsonObject; import org.junit.jupiter.api.Test; diff --git a/sjp-command/sjp-command-controller/pom.xml b/sjp-command/sjp-command-controller/pom.xml index 7f6d156788..2697aa34c8 100644 --- a/sjp-command/sjp-command-controller/pom.xml +++ b/sjp-command/sjp-command-controller/pom.xml @@ -3,7 +3,7 @@ sjp-command uk.gov.moj.cpp.sjp - 17.104.193-SNAPSHOT + 25.104.0-M1-SNAPSHOT 4.0.0 @@ -21,10 +21,15 @@ messaging-client-generator-plugin - javax - javaee-api + jakarta.platform + jakarta.jakartaee-api ${javaee-api.version} + + jakarta.xml.bind + jakarta.xml.bind-api + ${jakarta.xml.bind-api.raml.version} + uk.gov.moj.cpp.sjp sjp-command-handler @@ -44,10 +49,15 @@ rest-client-generator-plugin - javax - javaee-api + jakarta.platform + jakarta.jakartaee-api ${javaee-api.version} + + jakarta.xml.bind + jakarta.xml.bind-api + ${jakarta.xml.bind-api.raml.version} + uk.gov.moj.cpp.usersgroups usersgroups-query-api @@ -160,8 +170,8 @@ command-controller - javax - javaee-api + jakarta.platform + jakarta.jakartaee-api provided diff --git a/sjp-command/sjp-command-controller/src/main/java/uk/gov/moj/cpp/sjp/command/controller/ApplicationDecisionController.java b/sjp-command/sjp-command-controller/src/main/java/uk/gov/moj/cpp/sjp/command/controller/ApplicationDecisionController.java index a563cf0af2..7a1504f3c6 100644 --- a/sjp-command/sjp-command-controller/src/main/java/uk/gov/moj/cpp/sjp/command/controller/ApplicationDecisionController.java +++ b/sjp-command/sjp-command-controller/src/main/java/uk/gov/moj/cpp/sjp/command/controller/ApplicationDecisionController.java @@ -11,9 +11,9 @@ import uk.gov.justice.services.messaging.JsonEnvelope; import uk.gov.moj.cpp.sjp.command.service.UserService; -import javax.inject.Inject; -import javax.json.JsonObject; -import javax.json.JsonObjectBuilder; +import jakarta.inject.Inject; +import jakarta.json.JsonObject; +import jakarta.json.JsonObjectBuilder; @ServiceComponent(COMMAND_CONTROLLER) public class ApplicationDecisionController { diff --git a/sjp-command/sjp-command-controller/src/main/java/uk/gov/moj/cpp/sjp/command/controller/AssignmentController.java b/sjp-command/sjp-command-controller/src/main/java/uk/gov/moj/cpp/sjp/command/controller/AssignmentController.java index eb0f8023b4..ef2821c051 100644 --- a/sjp-command/sjp-command-controller/src/main/java/uk/gov/moj/cpp/sjp/command/controller/AssignmentController.java +++ b/sjp-command/sjp-command-controller/src/main/java/uk/gov/moj/cpp/sjp/command/controller/AssignmentController.java @@ -14,11 +14,11 @@ import java.util.UUID; -import javax.inject.Inject; -import javax.json.JsonArray; -import javax.json.JsonArrayBuilder; -import javax.json.JsonObject; -import javax.json.JsonObjectBuilder; +import jakarta.inject.Inject; +import jakarta.json.JsonArray; +import jakarta.json.JsonArrayBuilder; +import jakarta.json.JsonObject; +import jakarta.json.JsonObjectBuilder; @ServiceComponent(COMMAND_CONTROLLER) public class AssignmentController { diff --git a/sjp-command/sjp-command-controller/src/main/java/uk/gov/moj/cpp/sjp/command/controller/BaseController.java b/sjp-command/sjp-command-controller/src/main/java/uk/gov/moj/cpp/sjp/command/controller/BaseController.java index 7aa3dc4190..1264980a54 100644 --- a/sjp-command/sjp-command-controller/src/main/java/uk/gov/moj/cpp/sjp/command/controller/BaseController.java +++ b/sjp-command/sjp-command-controller/src/main/java/uk/gov/moj/cpp/sjp/command/controller/BaseController.java @@ -4,9 +4,9 @@ import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilderWithFilter; -import javax.json.JsonObject; -import javax.json.JsonObjectBuilder; -import javax.json.JsonValue; +import jakarta.json.JsonObject; +import jakarta.json.JsonObjectBuilder; +import jakarta.json.JsonValue; public abstract class BaseController { diff --git a/sjp-command/sjp-command-controller/src/main/java/uk/gov/moj/cpp/sjp/command/controller/CaseAssignmentRestrictionController.java b/sjp-command/sjp-command-controller/src/main/java/uk/gov/moj/cpp/sjp/command/controller/CaseAssignmentRestrictionController.java index abd48335b9..908aa1044f 100644 --- a/sjp-command/sjp-command-controller/src/main/java/uk/gov/moj/cpp/sjp/command/controller/CaseAssignmentRestrictionController.java +++ b/sjp-command/sjp-command-controller/src/main/java/uk/gov/moj/cpp/sjp/command/controller/CaseAssignmentRestrictionController.java @@ -13,9 +13,9 @@ import java.util.List; -import javax.inject.Inject; -import javax.json.JsonArrayBuilder; -import javax.json.JsonObjectBuilder; +import jakarta.inject.Inject; +import jakarta.json.JsonArrayBuilder; +import jakarta.json.JsonObjectBuilder; @ServiceComponent(COMMAND_CONTROLLER) public class CaseAssignmentRestrictionController { diff --git a/sjp-command/sjp-command-controller/src/main/java/uk/gov/moj/cpp/sjp/command/controller/CaseCreateController.java b/sjp-command/sjp-command-controller/src/main/java/uk/gov/moj/cpp/sjp/command/controller/CaseCreateController.java index e71258afc4..e3fad9d956 100644 --- a/sjp-command/sjp-command-controller/src/main/java/uk/gov/moj/cpp/sjp/command/controller/CaseCreateController.java +++ b/sjp-command/sjp-command-controller/src/main/java/uk/gov/moj/cpp/sjp/command/controller/CaseCreateController.java @@ -8,8 +8,8 @@ import uk.gov.justice.services.core.sender.Sender; import uk.gov.justice.services.messaging.JsonEnvelope; -import javax.inject.Inject; -import javax.json.JsonObject; +import jakarta.inject.Inject; +import jakarta.json.JsonObject; @ServiceComponent(COMMAND_CONTROLLER) public class CaseCreateController extends RegionAwareController { diff --git a/sjp-command/sjp-command-controller/src/main/java/uk/gov/moj/cpp/sjp/command/controller/CaseNoteController.java b/sjp-command/sjp-command-controller/src/main/java/uk/gov/moj/cpp/sjp/command/controller/CaseNoteController.java index 7d419495a6..d48760dde0 100644 --- a/sjp-command/sjp-command-controller/src/main/java/uk/gov/moj/cpp/sjp/command/controller/CaseNoteController.java +++ b/sjp-command/sjp-command-controller/src/main/java/uk/gov/moj/cpp/sjp/command/controller/CaseNoteController.java @@ -14,9 +14,9 @@ import uk.gov.justice.services.messaging.JsonEnvelope; import uk.gov.moj.cpp.sjp.command.service.UserService; -import javax.inject.Inject; -import javax.json.JsonObject; -import javax.json.JsonObjectBuilder; +import jakarta.inject.Inject; +import jakarta.json.JsonObject; +import jakarta.json.JsonObjectBuilder; @ServiceComponent(COMMAND_CONTROLLER) public class CaseNoteController { diff --git a/sjp-command/sjp-command-controller/src/main/java/uk/gov/moj/cpp/sjp/command/controller/CreateApplicationController.java b/sjp-command/sjp-command-controller/src/main/java/uk/gov/moj/cpp/sjp/command/controller/CreateApplicationController.java index 7a180d5638..862ae86de0 100644 --- a/sjp-command/sjp-command-controller/src/main/java/uk/gov/moj/cpp/sjp/command/controller/CreateApplicationController.java +++ b/sjp-command/sjp-command-controller/src/main/java/uk/gov/moj/cpp/sjp/command/controller/CreateApplicationController.java @@ -6,9 +6,9 @@ import uk.gov.justice.services.messaging.JsonEnvelope; import uk.gov.moj.cpp.sjp.command.service.CaseApplicationService; -import javax.inject.Inject; -import javax.json.JsonObject; -import javax.json.JsonObjectBuilder; +import jakarta.inject.Inject; +import jakarta.json.JsonObject; +import jakarta.json.JsonObjectBuilder; import static uk.gov.justice.services.core.annotation.Component.COMMAND_CONTROLLER; import static uk.gov.justice.services.messaging.JsonEnvelope.envelopeFrom; diff --git a/sjp-command/sjp-command-controller/src/main/java/uk/gov/moj/cpp/sjp/command/controller/DecisionController.java b/sjp-command/sjp-command-controller/src/main/java/uk/gov/moj/cpp/sjp/command/controller/DecisionController.java index d47ccdadb8..119fb36d1d 100644 --- a/sjp-command/sjp-command-controller/src/main/java/uk/gov/moj/cpp/sjp/command/controller/DecisionController.java +++ b/sjp-command/sjp-command-controller/src/main/java/uk/gov/moj/cpp/sjp/command/controller/DecisionController.java @@ -20,11 +20,11 @@ import java.util.Optional; -import javax.inject.Inject; -import javax.json.JsonArray; -import javax.json.JsonArrayBuilder; -import javax.json.JsonObject; -import javax.json.JsonObjectBuilder; +import jakarta.inject.Inject; +import jakarta.json.JsonArray; +import jakarta.json.JsonArrayBuilder; +import jakarta.json.JsonObject; +import jakarta.json.JsonObjectBuilder; @ServiceComponent(COMMAND_CONTROLLER) public class DecisionController { diff --git a/sjp-command/sjp-command-controller/src/main/java/uk/gov/moj/cpp/sjp/command/controller/DefendantDetailsController.java b/sjp-command/sjp-command-controller/src/main/java/uk/gov/moj/cpp/sjp/command/controller/DefendantDetailsController.java index fe7a59579f..a7b3dc8939 100644 --- a/sjp-command/sjp-command-controller/src/main/java/uk/gov/moj/cpp/sjp/command/controller/DefendantDetailsController.java +++ b/sjp-command/sjp-command-controller/src/main/java/uk/gov/moj/cpp/sjp/command/controller/DefendantDetailsController.java @@ -8,8 +8,8 @@ import uk.gov.justice.services.core.sender.Sender; import uk.gov.justice.services.messaging.JsonEnvelope; -import javax.inject.Inject; -import javax.json.JsonObject; +import jakarta.inject.Inject; +import jakarta.json.JsonObject; @ServiceComponent(COMMAND_CONTROLLER) public class DefendantDetailsController extends RegionAwareController { diff --git a/sjp-command/sjp-command-controller/src/main/java/uk/gov/moj/cpp/sjp/command/controller/NoActionController.java b/sjp-command/sjp-command-controller/src/main/java/uk/gov/moj/cpp/sjp/command/controller/NoActionController.java index 9731c88991..f225b3cb8f 100644 --- a/sjp-command/sjp-command-controller/src/main/java/uk/gov/moj/cpp/sjp/command/controller/NoActionController.java +++ b/sjp-command/sjp-command-controller/src/main/java/uk/gov/moj/cpp/sjp/command/controller/NoActionController.java @@ -10,7 +10,7 @@ import java.lang.annotation.Repeatable; -import javax.inject.Inject; +import jakarta.inject.Inject; /** * Controller what directly forwards the payload from the API to the Handler TODO: refactor once diff --git a/sjp-command/sjp-command-controller/src/main/java/uk/gov/moj/cpp/sjp/command/controller/PleadAocpOnlineController.java b/sjp-command/sjp-command-controller/src/main/java/uk/gov/moj/cpp/sjp/command/controller/PleadAocpOnlineController.java index 0d1caffcc9..0c61b980af 100644 --- a/sjp-command/sjp-command-controller/src/main/java/uk/gov/moj/cpp/sjp/command/controller/PleadAocpOnlineController.java +++ b/sjp-command/sjp-command-controller/src/main/java/uk/gov/moj/cpp/sjp/command/controller/PleadAocpOnlineController.java @@ -8,8 +8,8 @@ import uk.gov.justice.services.core.sender.Sender; import uk.gov.justice.services.messaging.JsonEnvelope; -import javax.inject.Inject; -import javax.json.JsonObject; +import jakarta.inject.Inject; +import jakarta.json.JsonObject; @ServiceComponent(COMMAND_CONTROLLER) public class PleadAocpOnlineController extends RegionAwareController { diff --git a/sjp-command/sjp-command-controller/src/main/java/uk/gov/moj/cpp/sjp/command/controller/PleadOnlineController.java b/sjp-command/sjp-command-controller/src/main/java/uk/gov/moj/cpp/sjp/command/controller/PleadOnlineController.java index 520a34787c..3de305a150 100644 --- a/sjp-command/sjp-command-controller/src/main/java/uk/gov/moj/cpp/sjp/command/controller/PleadOnlineController.java +++ b/sjp-command/sjp-command-controller/src/main/java/uk/gov/moj/cpp/sjp/command/controller/PleadOnlineController.java @@ -8,8 +8,8 @@ import uk.gov.justice.services.core.sender.Sender; import uk.gov.justice.services.messaging.JsonEnvelope; -import javax.inject.Inject; -import javax.json.JsonObject; +import jakarta.inject.Inject; +import jakarta.json.JsonObject; @ServiceComponent(COMMAND_CONTROLLER) public class PleadOnlineController extends RegionAwareController { diff --git a/sjp-command/sjp-command-controller/src/main/java/uk/gov/moj/cpp/sjp/command/controller/RegionAwareController.java b/sjp-command/sjp-command-controller/src/main/java/uk/gov/moj/cpp/sjp/command/controller/RegionAwareController.java index cb3542ce8e..72427c3359 100644 --- a/sjp-command/sjp-command-controller/src/main/java/uk/gov/moj/cpp/sjp/command/controller/RegionAwareController.java +++ b/sjp-command/sjp-command-controller/src/main/java/uk/gov/moj/cpp/sjp/command/controller/RegionAwareController.java @@ -9,8 +9,8 @@ import java.util.Objects; import java.util.Optional; -import javax.inject.Inject; -import javax.json.JsonObject; +import jakarta.inject.Inject; +import jakarta.json.JsonObject; public abstract class RegionAwareController extends BaseController { diff --git a/sjp-command/sjp-command-controller/src/main/java/uk/gov/moj/cpp/sjp/command/controller/UpdateOffenceCodeController.java b/sjp-command/sjp-command-controller/src/main/java/uk/gov/moj/cpp/sjp/command/controller/UpdateOffenceCodeController.java index 267a8ad396..36740b5609 100644 --- a/sjp-command/sjp-command-controller/src/main/java/uk/gov/moj/cpp/sjp/command/controller/UpdateOffenceCodeController.java +++ b/sjp-command/sjp-command-controller/src/main/java/uk/gov/moj/cpp/sjp/command/controller/UpdateOffenceCodeController.java @@ -9,7 +9,7 @@ import uk.gov.justice.services.core.sender.Sender; import uk.gov.justice.services.messaging.JsonEnvelope; -import javax.inject.Inject; +import jakarta.inject.Inject; @ServiceComponent(COMMAND_CONTROLLER) public class UpdateOffenceCodeController { diff --git a/sjp-command/sjp-command-controller/src/main/java/uk/gov/moj/cpp/sjp/command/service/CaseApplicationService.java b/sjp-command/sjp-command-controller/src/main/java/uk/gov/moj/cpp/sjp/command/service/CaseApplicationService.java index 83f3423ac3..f8ceae23a6 100644 --- a/sjp-command/sjp-command-controller/src/main/java/uk/gov/moj/cpp/sjp/command/service/CaseApplicationService.java +++ b/sjp-command/sjp-command-controller/src/main/java/uk/gov/moj/cpp/sjp/command/service/CaseApplicationService.java @@ -8,8 +8,8 @@ import uk.gov.justice.services.core.requester.Requester; import uk.gov.justice.services.messaging.JsonEnvelope; -import javax.inject.Inject; -import javax.json.JsonObject; +import jakarta.inject.Inject; +import jakarta.json.JsonObject; public class CaseApplicationService { diff --git a/sjp-command/sjp-command-controller/src/main/java/uk/gov/moj/cpp/sjp/command/service/CaseService.java b/sjp-command/sjp-command-controller/src/main/java/uk/gov/moj/cpp/sjp/command/service/CaseService.java index 555cb8be72..08c183da05 100644 --- a/sjp-command/sjp-command-controller/src/main/java/uk/gov/moj/cpp/sjp/command/service/CaseService.java +++ b/sjp-command/sjp-command-controller/src/main/java/uk/gov/moj/cpp/sjp/command/service/CaseService.java @@ -10,8 +10,8 @@ import uk.gov.justice.services.core.requester.Requester; import uk.gov.justice.services.messaging.JsonEnvelope; -import javax.inject.Inject; -import javax.json.JsonObject; +import jakarta.inject.Inject; +import jakarta.json.JsonObject; public class CaseService { diff --git a/sjp-command/sjp-command-controller/src/main/java/uk/gov/moj/cpp/sjp/command/service/ReadyCasesService.java b/sjp-command/sjp-command-controller/src/main/java/uk/gov/moj/cpp/sjp/command/service/ReadyCasesService.java index 77bf6e9832..24e6a4de14 100644 --- a/sjp-command/sjp-command-controller/src/main/java/uk/gov/moj/cpp/sjp/command/service/ReadyCasesService.java +++ b/sjp-command/sjp-command-controller/src/main/java/uk/gov/moj/cpp/sjp/command/service/ReadyCasesService.java @@ -10,8 +10,8 @@ import java.util.UUID; -import javax.inject.Inject; -import javax.json.JsonObject; +import jakarta.inject.Inject; +import jakarta.json.JsonObject; public class ReadyCasesService { diff --git a/sjp-command/sjp-command-controller/src/main/java/uk/gov/moj/cpp/sjp/command/service/ReferenceDataService.java b/sjp-command/sjp-command-controller/src/main/java/uk/gov/moj/cpp/sjp/command/service/ReferenceDataService.java index 2d436439b0..0ef9a877ea 100644 --- a/sjp-command/sjp-command-controller/src/main/java/uk/gov/moj/cpp/sjp/command/service/ReferenceDataService.java +++ b/sjp-command/sjp-command-controller/src/main/java/uk/gov/moj/cpp/sjp/command/service/ReferenceDataService.java @@ -14,9 +14,9 @@ import java.util.Optional; -import javax.inject.Inject; -import javax.json.JsonObject; -import javax.json.JsonValue; +import jakarta.inject.Inject; +import jakarta.json.JsonObject; +import jakarta.json.JsonValue; public class ReferenceDataService { diff --git a/sjp-command/sjp-command-controller/src/main/java/uk/gov/moj/cpp/sjp/command/service/SessionService.java b/sjp-command/sjp-command-controller/src/main/java/uk/gov/moj/cpp/sjp/command/service/SessionService.java index 29ae5d3d25..c2dd40a668 100644 --- a/sjp-command/sjp-command-controller/src/main/java/uk/gov/moj/cpp/sjp/command/service/SessionService.java +++ b/sjp-command/sjp-command-controller/src/main/java/uk/gov/moj/cpp/sjp/command/service/SessionService.java @@ -10,8 +10,8 @@ import uk.gov.justice.services.messaging.Envelope; import uk.gov.justice.services.messaging.JsonEnvelope; -import javax.inject.Inject; -import javax.json.JsonObject; +import jakarta.inject.Inject; +import jakarta.json.JsonObject; public class SessionService { diff --git a/sjp-command/sjp-command-controller/src/main/java/uk/gov/moj/cpp/sjp/command/service/UserService.java b/sjp-command/sjp-command-controller/src/main/java/uk/gov/moj/cpp/sjp/command/service/UserService.java index b538945dc7..5f563ae83d 100644 --- a/sjp-command/sjp-command-controller/src/main/java/uk/gov/moj/cpp/sjp/command/service/UserService.java +++ b/sjp-command/sjp-command-controller/src/main/java/uk/gov/moj/cpp/sjp/command/service/UserService.java @@ -11,8 +11,8 @@ import java.util.UUID; -import javax.inject.Inject; -import javax.json.JsonObject; +import jakarta.inject.Inject; +import jakarta.json.JsonObject; public class UserService { diff --git a/sjp-command/sjp-command-controller/src/main/resources/META-INF/beans.xml b/sjp-command/sjp-command-controller/src/main/resources/META-INF/beans.xml index cc3f8d2864..1d83bc8c5a 100644 --- a/sjp-command/sjp-command-controller/src/main/resources/META-INF/beans.xml +++ b/sjp-command/sjp-command-controller/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-command/sjp-command-controller/src/test/java/uk/gov/moj/cpp/sjp/command/TestFixtures.java b/sjp-command/sjp-command-controller/src/test/java/uk/gov/moj/cpp/sjp/command/TestFixtures.java index 8c806c5a82..b88fe2c361 100644 --- a/sjp-command/sjp-command-controller/src/test/java/uk/gov/moj/cpp/sjp/command/TestFixtures.java +++ b/sjp-command/sjp-command-controller/src/test/java/uk/gov/moj/cpp/sjp/command/TestFixtures.java @@ -4,9 +4,9 @@ import static uk.gov.justice.services.messaging.JsonObjects.createArrayBuilder; import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; -import javax.json.JsonArray; -import javax.json.JsonObject; -import javax.json.JsonObjectBuilder; +import jakarta.json.JsonArray; +import jakarta.json.JsonObject; +import jakarta.json.JsonObjectBuilder; public class TestFixtures { diff --git a/sjp-command/sjp-command-controller/src/test/java/uk/gov/moj/cpp/sjp/command/accesscontrol/AddCaseDocumentTest.java b/sjp-command/sjp-command-controller/src/test/java/uk/gov/moj/cpp/sjp/command/accesscontrol/AddCaseDocumentTest.java index 3412f8390b..0281a7f58c 100644 --- a/sjp-command/sjp-command-controller/src/test/java/uk/gov/moj/cpp/sjp/command/accesscontrol/AddCaseDocumentTest.java +++ b/sjp-command/sjp-command-controller/src/test/java/uk/gov/moj/cpp/sjp/command/accesscontrol/AddCaseDocumentTest.java @@ -12,7 +12,7 @@ import java.util.HashMap; import java.util.Map; -import javax.json.JsonObject; +import jakarta.json.JsonObject; import org.junit.jupiter.api.Test; diff --git a/sjp-command/sjp-command-controller/src/test/java/uk/gov/moj/cpp/sjp/command/accesscontrol/CaseAssignmentRestrictionTest.java b/sjp-command/sjp-command-controller/src/test/java/uk/gov/moj/cpp/sjp/command/accesscontrol/CaseAssignmentRestrictionTest.java index 7a968c9e7b..99e019390e 100644 --- a/sjp-command/sjp-command-controller/src/test/java/uk/gov/moj/cpp/sjp/command/accesscontrol/CaseAssignmentRestrictionTest.java +++ b/sjp-command/sjp-command-controller/src/test/java/uk/gov/moj/cpp/sjp/command/accesscontrol/CaseAssignmentRestrictionTest.java @@ -12,7 +12,7 @@ import java.util.HashMap; import java.util.Map; -import javax.json.JsonObject; +import jakarta.json.JsonObject; import org.junit.jupiter.api.Test; diff --git a/sjp-command/sjp-command-controller/src/test/java/uk/gov/moj/cpp/sjp/command/accesscontrol/CreateCaseTest.java b/sjp-command/sjp-command-controller/src/test/java/uk/gov/moj/cpp/sjp/command/accesscontrol/CreateCaseTest.java index a0e1954e9a..4a5bb51aaa 100644 --- a/sjp-command/sjp-command-controller/src/test/java/uk/gov/moj/cpp/sjp/command/accesscontrol/CreateCaseTest.java +++ b/sjp-command/sjp-command-controller/src/test/java/uk/gov/moj/cpp/sjp/command/accesscontrol/CreateCaseTest.java @@ -12,7 +12,7 @@ import java.util.HashMap; import java.util.Map; -import javax.json.JsonObject; +import jakarta.json.JsonObject; import org.junit.jupiter.api.Test; diff --git a/sjp-command/sjp-command-controller/src/test/java/uk/gov/moj/cpp/sjp/command/accesscontrol/DeleteCaseDocumentTest.java b/sjp-command/sjp-command-controller/src/test/java/uk/gov/moj/cpp/sjp/command/accesscontrol/DeleteCaseDocumentTest.java index 744783c74f..50351cd28a 100644 --- a/sjp-command/sjp-command-controller/src/test/java/uk/gov/moj/cpp/sjp/command/accesscontrol/DeleteCaseDocumentTest.java +++ b/sjp-command/sjp-command-controller/src/test/java/uk/gov/moj/cpp/sjp/command/accesscontrol/DeleteCaseDocumentTest.java @@ -12,7 +12,7 @@ import java.util.HashMap; import java.util.Map; -import javax.json.JsonObject; +import jakarta.json.JsonObject; import org.junit.jupiter.api.Test; diff --git a/sjp-command/sjp-command-controller/src/test/java/uk/gov/moj/cpp/sjp/command/accesscontrol/EmployerTest.java b/sjp-command/sjp-command-controller/src/test/java/uk/gov/moj/cpp/sjp/command/accesscontrol/EmployerTest.java index 03f5a030dd..2e17db14b0 100644 --- a/sjp-command/sjp-command-controller/src/test/java/uk/gov/moj/cpp/sjp/command/accesscontrol/EmployerTest.java +++ b/sjp-command/sjp-command-controller/src/test/java/uk/gov/moj/cpp/sjp/command/accesscontrol/EmployerTest.java @@ -12,7 +12,7 @@ import java.util.HashMap; import java.util.Map; -import javax.json.JsonObject; +import jakarta.json.JsonObject; import org.junit.jupiter.api.Test; diff --git a/sjp-command/sjp-command-controller/src/test/java/uk/gov/moj/cpp/sjp/command/accesscontrol/MarkAsLegalSocCheckedTest.java b/sjp-command/sjp-command-controller/src/test/java/uk/gov/moj/cpp/sjp/command/accesscontrol/MarkAsLegalSocCheckedTest.java index 49da9da866..d552302221 100644 --- a/sjp-command/sjp-command-controller/src/test/java/uk/gov/moj/cpp/sjp/command/accesscontrol/MarkAsLegalSocCheckedTest.java +++ b/sjp-command/sjp-command-controller/src/test/java/uk/gov/moj/cpp/sjp/command/accesscontrol/MarkAsLegalSocCheckedTest.java @@ -12,7 +12,7 @@ import java.util.HashMap; import java.util.Map; -import javax.json.JsonObject; +import jakarta.json.JsonObject; import org.junit.jupiter.api.Test; diff --git a/sjp-command/sjp-command-controller/src/test/java/uk/gov/moj/cpp/sjp/command/accesscontrol/MarkCaseReopenedTest.java b/sjp-command/sjp-command-controller/src/test/java/uk/gov/moj/cpp/sjp/command/accesscontrol/MarkCaseReopenedTest.java index aaa917c9c1..43062e4028 100644 --- a/sjp-command/sjp-command-controller/src/test/java/uk/gov/moj/cpp/sjp/command/accesscontrol/MarkCaseReopenedTest.java +++ b/sjp-command/sjp-command-controller/src/test/java/uk/gov/moj/cpp/sjp/command/accesscontrol/MarkCaseReopenedTest.java @@ -12,7 +12,7 @@ import java.util.HashMap; import java.util.Map; -import javax.json.JsonObject; +import jakarta.json.JsonObject; import org.junit.jupiter.api.Test; diff --git a/sjp-command/sjp-command-controller/src/test/java/uk/gov/moj/cpp/sjp/command/accesscontrol/SetPleasTest.java b/sjp-command/sjp-command-controller/src/test/java/uk/gov/moj/cpp/sjp/command/accesscontrol/SetPleasTest.java index ab4ad1889f..c3d71d1f40 100644 --- a/sjp-command/sjp-command-controller/src/test/java/uk/gov/moj/cpp/sjp/command/accesscontrol/SetPleasTest.java +++ b/sjp-command/sjp-command-controller/src/test/java/uk/gov/moj/cpp/sjp/command/accesscontrol/SetPleasTest.java @@ -12,7 +12,7 @@ import java.util.Map; -import javax.json.JsonObject; +import jakarta.json.JsonObject; import org.junit.jupiter.api.Test; import org.mockito.Mock; diff --git a/sjp-command/sjp-command-controller/src/test/java/uk/gov/moj/cpp/sjp/command/accesscontrol/UpdateCaseReopenedTest.java b/sjp-command/sjp-command-controller/src/test/java/uk/gov/moj/cpp/sjp/command/accesscontrol/UpdateCaseReopenedTest.java index a950b000f5..9352e2744b 100644 --- a/sjp-command/sjp-command-controller/src/test/java/uk/gov/moj/cpp/sjp/command/accesscontrol/UpdateCaseReopenedTest.java +++ b/sjp-command/sjp-command-controller/src/test/java/uk/gov/moj/cpp/sjp/command/accesscontrol/UpdateCaseReopenedTest.java @@ -12,7 +12,7 @@ import java.util.HashMap; import java.util.Map; -import javax.json.JsonObject; +import jakarta.json.JsonObject; import org.junit.jupiter.api.Test; diff --git a/sjp-command/sjp-command-controller/src/test/java/uk/gov/moj/cpp/sjp/command/accesscontrol/UpdateFinancialMeansTest.java b/sjp-command/sjp-command-controller/src/test/java/uk/gov/moj/cpp/sjp/command/accesscontrol/UpdateFinancialMeansTest.java index e8c1455629..70095f7ad6 100644 --- a/sjp-command/sjp-command-controller/src/test/java/uk/gov/moj/cpp/sjp/command/accesscontrol/UpdateFinancialMeansTest.java +++ b/sjp-command/sjp-command-controller/src/test/java/uk/gov/moj/cpp/sjp/command/accesscontrol/UpdateFinancialMeansTest.java @@ -12,7 +12,7 @@ import java.util.HashMap; import java.util.Map; -import javax.json.JsonObject; +import jakarta.json.JsonObject; import org.junit.jupiter.api.Test; diff --git a/sjp-command/sjp-command-controller/src/test/java/uk/gov/moj/cpp/sjp/command/accesscontrol/UpdateHearingRequirementsTest.java b/sjp-command/sjp-command-controller/src/test/java/uk/gov/moj/cpp/sjp/command/accesscontrol/UpdateHearingRequirementsTest.java index 5780048c0f..5293b3cbc7 100644 --- a/sjp-command/sjp-command-controller/src/test/java/uk/gov/moj/cpp/sjp/command/accesscontrol/UpdateHearingRequirementsTest.java +++ b/sjp-command/sjp-command-controller/src/test/java/uk/gov/moj/cpp/sjp/command/accesscontrol/UpdateHearingRequirementsTest.java @@ -12,7 +12,7 @@ import java.util.HashMap; import java.util.Map; -import javax.json.JsonObject; +import jakarta.json.JsonObject; import org.junit.jupiter.api.Test; diff --git a/sjp-command/sjp-command-controller/src/test/java/uk/gov/moj/cpp/sjp/command/controller/ApplicationDecisionControllerTest.java b/sjp-command/sjp-command-controller/src/test/java/uk/gov/moj/cpp/sjp/command/controller/ApplicationDecisionControllerTest.java index 82d72ac04b..7373c7a6c4 100644 --- a/sjp-command/sjp-command-controller/src/test/java/uk/gov/moj/cpp/sjp/command/controller/ApplicationDecisionControllerTest.java +++ b/sjp-command/sjp-command-controller/src/test/java/uk/gov/moj/cpp/sjp/command/controller/ApplicationDecisionControllerTest.java @@ -27,9 +27,9 @@ import java.util.UUID; -import javax.json.JsonObject; -import javax.json.JsonObjectBuilder; -import javax.json.JsonValue; +import jakarta.json.JsonObject; +import jakarta.json.JsonObjectBuilder; +import jakarta.json.JsonValue; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; diff --git a/sjp-command/sjp-command-controller/src/test/java/uk/gov/moj/cpp/sjp/command/controller/AssignmentControllerTest.java b/sjp-command/sjp-command-controller/src/test/java/uk/gov/moj/cpp/sjp/command/controller/AssignmentControllerTest.java index c69cb483a8..87f3a218f0 100644 --- a/sjp-command/sjp-command-controller/src/test/java/uk/gov/moj/cpp/sjp/command/controller/AssignmentControllerTest.java +++ b/sjp-command/sjp-command-controller/src/test/java/uk/gov/moj/cpp/sjp/command/controller/AssignmentControllerTest.java @@ -25,9 +25,9 @@ import java.util.UUID; -import javax.json.JsonObject; -import javax.json.JsonObjectBuilder; -import javax.json.JsonValue; +import jakarta.json.JsonObject; +import jakarta.json.JsonObjectBuilder; +import jakarta.json.JsonValue; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; diff --git a/sjp-command/sjp-command-controller/src/test/java/uk/gov/moj/cpp/sjp/command/controller/CaseAssignmentRestrictionControllerTest.java b/sjp-command/sjp-command-controller/src/test/java/uk/gov/moj/cpp/sjp/command/controller/CaseAssignmentRestrictionControllerTest.java index 050c7e83e5..2778d10022 100644 --- a/sjp-command/sjp-command-controller/src/test/java/uk/gov/moj/cpp/sjp/command/controller/CaseAssignmentRestrictionControllerTest.java +++ b/sjp-command/sjp-command-controller/src/test/java/uk/gov/moj/cpp/sjp/command/controller/CaseAssignmentRestrictionControllerTest.java @@ -21,7 +21,7 @@ import java.time.LocalDate; -import javax.json.JsonValue; +import jakarta.json.JsonValue; import com.jayway.jsonpath.ReadContext; import org.hamcrest.Matcher; diff --git a/sjp-command/sjp-command-controller/src/test/java/uk/gov/moj/cpp/sjp/command/controller/CaseCreateControllerTest.java b/sjp-command/sjp-command-controller/src/test/java/uk/gov/moj/cpp/sjp/command/controller/CaseCreateControllerTest.java index 2df98980d9..031209f047 100644 --- a/sjp-command/sjp-command-controller/src/test/java/uk/gov/moj/cpp/sjp/command/controller/CaseCreateControllerTest.java +++ b/sjp-command/sjp-command-controller/src/test/java/uk/gov/moj/cpp/sjp/command/controller/CaseCreateControllerTest.java @@ -27,8 +27,8 @@ import uk.gov.justice.services.test.utils.core.matchers.JsonEnvelopePayloadMatcher; import uk.gov.moj.cpp.sjp.command.service.ReferenceDataService; -import javax.json.JsonObject; -import javax.json.JsonValue; +import jakarta.json.JsonObject; +import jakarta.json.JsonValue; import com.jayway.jsonpath.ReadContext; import org.hamcrest.Matcher; diff --git a/sjp-command/sjp-command-controller/src/test/java/uk/gov/moj/cpp/sjp/command/controller/CaseNoteControllerTest.java b/sjp-command/sjp-command-controller/src/test/java/uk/gov/moj/cpp/sjp/command/controller/CaseNoteControllerTest.java index b96b2a026a..7d5379202e 100644 --- a/sjp-command/sjp-command-controller/src/test/java/uk/gov/moj/cpp/sjp/command/controller/CaseNoteControllerTest.java +++ b/sjp-command/sjp-command-controller/src/test/java/uk/gov/moj/cpp/sjp/command/controller/CaseNoteControllerTest.java @@ -35,8 +35,8 @@ import java.util.UUID; -import javax.json.JsonObject; -import javax.json.JsonObjectBuilder; +import jakarta.json.JsonObject; +import jakarta.json.JsonObjectBuilder; import com.jayway.jsonpath.ReadContext; import org.hamcrest.Matcher; diff --git a/sjp-command/sjp-command-controller/src/test/java/uk/gov/moj/cpp/sjp/command/controller/DecisionControllerTest.java b/sjp-command/sjp-command-controller/src/test/java/uk/gov/moj/cpp/sjp/command/controller/DecisionControllerTest.java index 83c0d0b128..26cc332cef 100644 --- a/sjp-command/sjp-command-controller/src/test/java/uk/gov/moj/cpp/sjp/command/controller/DecisionControllerTest.java +++ b/sjp-command/sjp-command-controller/src/test/java/uk/gov/moj/cpp/sjp/command/controller/DecisionControllerTest.java @@ -36,11 +36,11 @@ import java.time.ZonedDateTime; import java.util.UUID; -import javax.json.JsonArray; -import javax.json.JsonArrayBuilder; -import javax.json.JsonObject; -import javax.json.JsonObjectBuilder; -import javax.json.JsonValue; +import jakarta.json.JsonArray; +import jakarta.json.JsonArrayBuilder; +import jakarta.json.JsonObject; +import jakarta.json.JsonObjectBuilder; +import jakarta.json.JsonValue; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; diff --git a/sjp-command/sjp-command-controller/src/test/java/uk/gov/moj/cpp/sjp/command/controller/DefendantDetailsControllerTest.java b/sjp-command/sjp-command-controller/src/test/java/uk/gov/moj/cpp/sjp/command/controller/DefendantDetailsControllerTest.java index 0c15ef1eff..2f1f23be7c 100644 --- a/sjp-command/sjp-command-controller/src/test/java/uk/gov/moj/cpp/sjp/command/controller/DefendantDetailsControllerTest.java +++ b/sjp-command/sjp-command-controller/src/test/java/uk/gov/moj/cpp/sjp/command/controller/DefendantDetailsControllerTest.java @@ -26,8 +26,8 @@ import uk.gov.justice.services.test.utils.core.matchers.JsonEnvelopePayloadMatcher; import uk.gov.moj.cpp.sjp.command.service.ReferenceDataService; -import javax.json.JsonObject; -import javax.json.JsonValue; +import jakarta.json.JsonObject; +import jakarta.json.JsonValue; import com.jayway.jsonpath.ReadContext; import org.hamcrest.Matcher; diff --git a/sjp-command/sjp-command-controller/src/test/java/uk/gov/moj/cpp/sjp/command/controller/PleadAocpOnlineControllerTest.java b/sjp-command/sjp-command-controller/src/test/java/uk/gov/moj/cpp/sjp/command/controller/PleadAocpOnlineControllerTest.java index f0315e64e9..a2e2251043 100644 --- a/sjp-command/sjp-command-controller/src/test/java/uk/gov/moj/cpp/sjp/command/controller/PleadAocpOnlineControllerTest.java +++ b/sjp-command/sjp-command-controller/src/test/java/uk/gov/moj/cpp/sjp/command/controller/PleadAocpOnlineControllerTest.java @@ -27,8 +27,8 @@ import uk.gov.justice.services.test.utils.core.matchers.JsonEnvelopePayloadMatcher; import uk.gov.moj.cpp.sjp.command.service.ReferenceDataService; -import javax.json.JsonObject; -import javax.json.JsonValue; +import jakarta.json.JsonObject; +import jakarta.json.JsonValue; import com.jayway.jsonpath.ReadContext; import org.hamcrest.Matcher; diff --git a/sjp-command/sjp-command-controller/src/test/java/uk/gov/moj/cpp/sjp/command/controller/PleadOnlineControllerTest.java b/sjp-command/sjp-command-controller/src/test/java/uk/gov/moj/cpp/sjp/command/controller/PleadOnlineControllerTest.java index 0048675dcf..8a2b9be7b5 100644 --- a/sjp-command/sjp-command-controller/src/test/java/uk/gov/moj/cpp/sjp/command/controller/PleadOnlineControllerTest.java +++ b/sjp-command/sjp-command-controller/src/test/java/uk/gov/moj/cpp/sjp/command/controller/PleadOnlineControllerTest.java @@ -27,8 +27,8 @@ import uk.gov.justice.services.test.utils.core.matchers.JsonEnvelopePayloadMatcher; import uk.gov.moj.cpp.sjp.command.service.ReferenceDataService; -import javax.json.JsonObject; -import javax.json.JsonValue; +import jakarta.json.JsonObject; +import jakarta.json.JsonValue; import com.jayway.jsonpath.ReadContext; import org.hamcrest.Matcher; diff --git a/sjp-command/sjp-command-controller/src/test/java/uk/gov/moj/cpp/sjp/command/service/ReadyCasesServiceTest.java b/sjp-command/sjp-command-controller/src/test/java/uk/gov/moj/cpp/sjp/command/service/ReadyCasesServiceTest.java index 8ee1a4bb46..0a0509e633 100644 --- a/sjp-command/sjp-command-controller/src/test/java/uk/gov/moj/cpp/sjp/command/service/ReadyCasesServiceTest.java +++ b/sjp-command/sjp-command-controller/src/test/java/uk/gov/moj/cpp/sjp/command/service/ReadyCasesServiceTest.java @@ -2,7 +2,7 @@ import static com.jayway.jsonpath.matchers.JsonPathMatchers.withJsonPath; import static java.util.UUID.randomUUID; -import static javax.json.JsonValue.NULL; +import static jakarta.json.JsonValue.NULL; import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.MatcherAssert.assertThat; import static org.mockito.Mockito.when; @@ -24,7 +24,7 @@ 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-command/sjp-command-controller/src/test/java/uk/gov/moj/cpp/sjp/command/service/UserServiceTest.java b/sjp-command/sjp-command-controller/src/test/java/uk/gov/moj/cpp/sjp/command/service/UserServiceTest.java index 1f2fe7fed0..70e8d521ad 100644 --- a/sjp-command/sjp-command-controller/src/test/java/uk/gov/moj/cpp/sjp/command/service/UserServiceTest.java +++ b/sjp-command/sjp-command-controller/src/test/java/uk/gov/moj/cpp/sjp/command/service/UserServiceTest.java @@ -2,7 +2,7 @@ import static com.jayway.jsonpath.matchers.JsonPathMatchers.withJsonPath; import static java.util.UUID.randomUUID; -import static javax.json.JsonValue.NULL; +import static jakarta.json.JsonValue.NULL; import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.MatcherAssert.assertThat; import static org.mockito.Mockito.when; @@ -23,7 +23,7 @@ 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-command/sjp-command-handler/pom.xml b/sjp-command/sjp-command-handler/pom.xml index c02e06c549..6c1cf15e91 100644 --- a/sjp-command/sjp-command-handler/pom.xml +++ b/sjp-command/sjp-command-handler/pom.xml @@ -3,7 +3,7 @@ sjp-command uk.gov.moj.cpp.sjp - 17.104.193-SNAPSHOT + 25.104.0-M1-SNAPSHOT 4.0.0 @@ -31,8 +31,8 @@ ${project.version} - javax - javaee-api + jakarta.platform + jakarta.jakartaee-api provided diff --git a/sjp-command/sjp-command-handler/src/main/java/uk/gov/moj/cpp/sjp/command/handler/AcceptPendingDefendantChangesHandler.java b/sjp-command/sjp-command-handler/src/main/java/uk/gov/moj/cpp/sjp/command/handler/AcceptPendingDefendantChangesHandler.java index b54d094d11..63429bdaa4 100644 --- a/sjp-command/sjp-command-handler/src/main/java/uk/gov/moj/cpp/sjp/command/handler/AcceptPendingDefendantChangesHandler.java +++ b/sjp-command/sjp-command-handler/src/main/java/uk/gov/moj/cpp/sjp/command/handler/AcceptPendingDefendantChangesHandler.java @@ -20,8 +20,8 @@ import java.util.UUID; import java.util.stream.Stream; -import javax.inject.Inject; -import javax.json.JsonObject; +import jakarta.inject.Inject; +import jakarta.json.JsonObject; @SuppressWarnings("squid:CallToDeprecatedMethod") @ServiceComponent(Component.COMMAND_HANDLER) diff --git a/sjp-command/sjp-command-handler/src/main/java/uk/gov/moj/cpp/sjp/command/handler/AcceptPendingDefendantChangesHandlerCC.java b/sjp-command/sjp-command-handler/src/main/java/uk/gov/moj/cpp/sjp/command/handler/AcceptPendingDefendantChangesHandlerCC.java index 866070725e..7897e44748 100644 --- a/sjp-command/sjp-command-handler/src/main/java/uk/gov/moj/cpp/sjp/command/handler/AcceptPendingDefendantChangesHandlerCC.java +++ b/sjp-command/sjp-command-handler/src/main/java/uk/gov/moj/cpp/sjp/command/handler/AcceptPendingDefendantChangesHandlerCC.java @@ -20,8 +20,8 @@ import java.util.UUID; import java.util.stream.Stream; -import javax.inject.Inject; -import javax.json.JsonObject; +import jakarta.inject.Inject; +import jakarta.json.JsonObject; @SuppressWarnings("squid:CallToDeprecatedMethod") @ServiceComponent(Component.COMMAND_HANDLER) diff --git a/sjp-command/sjp-command-handler/src/main/java/uk/gov/moj/cpp/sjp/command/handler/AcknowledgeDefendantDetailsUpdatesHandler.java b/sjp-command/sjp-command-handler/src/main/java/uk/gov/moj/cpp/sjp/command/handler/AcknowledgeDefendantDetailsUpdatesHandler.java index 92f07b5096..a5a379dc37 100644 --- a/sjp-command/sjp-command-handler/src/main/java/uk/gov/moj/cpp/sjp/command/handler/AcknowledgeDefendantDetailsUpdatesHandler.java +++ b/sjp-command/sjp-command-handler/src/main/java/uk/gov/moj/cpp/sjp/command/handler/AcknowledgeDefendantDetailsUpdatesHandler.java @@ -17,8 +17,8 @@ import java.util.UUID; import java.util.stream.Stream; -import javax.inject.Inject; -import javax.json.JsonObject; +import jakarta.inject.Inject; +import jakarta.json.JsonObject; @ServiceComponent(Component.COMMAND_HANDLER) public class AcknowledgeDefendantDetailsUpdatesHandler { diff --git a/sjp-command/sjp-command-handler/src/main/java/uk/gov/moj/cpp/sjp/command/handler/AddCaseDocumentHandler.java b/sjp-command/sjp-command-handler/src/main/java/uk/gov/moj/cpp/sjp/command/handler/AddCaseDocumentHandler.java index a0a89de4a5..ed1ca9d1f5 100644 --- a/sjp-command/sjp-command-handler/src/main/java/uk/gov/moj/cpp/sjp/command/handler/AddCaseDocumentHandler.java +++ b/sjp-command/sjp-command-handler/src/main/java/uk/gov/moj/cpp/sjp/command/handler/AddCaseDocumentHandler.java @@ -10,8 +10,8 @@ import java.util.UUID; -import javax.inject.Inject; -import javax.json.JsonObject; +import jakarta.inject.Inject; +import jakarta.json.JsonObject; @SuppressWarnings("WeakerAccess") @ServiceComponent(Component.COMMAND_HANDLER) diff --git a/sjp-command/sjp-command-handler/src/main/java/uk/gov/moj/cpp/sjp/command/handler/AddDatesToAvoidHandler.java b/sjp-command/sjp-command-handler/src/main/java/uk/gov/moj/cpp/sjp/command/handler/AddDatesToAvoidHandler.java index a5be230319..6584f29d3c 100644 --- a/sjp-command/sjp-command-handler/src/main/java/uk/gov/moj/cpp/sjp/command/handler/AddDatesToAvoidHandler.java +++ b/sjp-command/sjp-command-handler/src/main/java/uk/gov/moj/cpp/sjp/command/handler/AddDatesToAvoidHandler.java @@ -9,8 +9,8 @@ import uk.gov.moj.cpp.accesscontrol.sjp.providers.ProsecutingAuthorityProvider; import uk.gov.moj.cpp.sjp.domain.aggregate.CaseAggregate; -import javax.inject.Inject; -import javax.json.JsonObject; +import jakarta.inject.Inject; +import jakarta.json.JsonObject; @ServiceComponent(Component.COMMAND_HANDLER) public class AddDatesToAvoidHandler extends CaseCommandHandler { diff --git a/sjp-command/sjp-command-handler/src/main/java/uk/gov/moj/cpp/sjp/command/handler/AocpAcceptanceTimerExpiredHandler.java b/sjp-command/sjp-command-handler/src/main/java/uk/gov/moj/cpp/sjp/command/handler/AocpAcceptanceTimerExpiredHandler.java index 2c79813fe0..8460a78cb8 100644 --- a/sjp-command/sjp-command-handler/src/main/java/uk/gov/moj/cpp/sjp/command/handler/AocpAcceptanceTimerExpiredHandler.java +++ b/sjp-command/sjp-command-handler/src/main/java/uk/gov/moj/cpp/sjp/command/handler/AocpAcceptanceTimerExpiredHandler.java @@ -11,7 +11,7 @@ import uk.gov.moj.cpp.sjp.domain.aggregate.Session; import uk.gov.moj.cpp.sjp.domain.decision.AocpDecision; -import javax.inject.Inject; +import jakarta.inject.Inject; @ServiceComponent(Component.COMMAND_HANDLER) public class AocpAcceptanceTimerExpiredHandler extends CaseCommandHandler { diff --git a/sjp-command/sjp-command-handler/src/main/java/uk/gov/moj/cpp/sjp/command/handler/AocpAcceptedEmailNotificationHandler.java b/sjp-command/sjp-command-handler/src/main/java/uk/gov/moj/cpp/sjp/command/handler/AocpAcceptedEmailNotificationHandler.java index a06f26eb36..4ce4041a34 100644 --- a/sjp-command/sjp-command-handler/src/main/java/uk/gov/moj/cpp/sjp/command/handler/AocpAcceptedEmailNotificationHandler.java +++ b/sjp-command/sjp-command-handler/src/main/java/uk/gov/moj/cpp/sjp/command/handler/AocpAcceptedEmailNotificationHandler.java @@ -18,8 +18,8 @@ import java.util.UUID; import java.util.stream.Stream; -import javax.inject.Inject; -import javax.json.JsonObject; +import jakarta.inject.Inject; +import jakarta.json.JsonObject; @ServiceComponent(Component.COMMAND_HANDLER) public class AocpAcceptedEmailNotificationHandler { diff --git a/sjp-command/sjp-command-handler/src/main/java/uk/gov/moj/cpp/sjp/command/handler/AssignmentHandler.java b/sjp-command/sjp-command-handler/src/main/java/uk/gov/moj/cpp/sjp/command/handler/AssignmentHandler.java index 6d985758ea..5b6caa8e26 100644 --- a/sjp-command/sjp-command-handler/src/main/java/uk/gov/moj/cpp/sjp/command/handler/AssignmentHandler.java +++ b/sjp-command/sjp-command-handler/src/main/java/uk/gov/moj/cpp/sjp/command/handler/AssignmentHandler.java @@ -26,9 +26,9 @@ import java.util.UUID; import java.util.stream.Stream; -import javax.inject.Inject; -import javax.json.JsonObject; -import javax.json.JsonString; +import jakarta.inject.Inject; +import jakarta.json.JsonObject; +import jakarta.json.JsonString; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/sjp-command/sjp-command-handler/src/main/java/uk/gov/moj/cpp/sjp/command/handler/BasePersonInfoHandler.java b/sjp-command/sjp-command-handler/src/main/java/uk/gov/moj/cpp/sjp/command/handler/BasePersonInfoHandler.java index b01a2e03f4..0857e05eca 100644 --- a/sjp-command/sjp-command-handler/src/main/java/uk/gov/moj/cpp/sjp/command/handler/BasePersonInfoHandler.java +++ b/sjp-command/sjp-command-handler/src/main/java/uk/gov/moj/cpp/sjp/command/handler/BasePersonInfoHandler.java @@ -8,7 +8,7 @@ import java.util.UUID; -import javax.json.JsonObject; +import jakarta.json.JsonObject; public class BasePersonInfoHandler { diff --git a/sjp-command/sjp-command-handler/src/main/java/uk/gov/moj/cpp/sjp/command/handler/CaseAdjournmentHandler.java b/sjp-command/sjp-command-handler/src/main/java/uk/gov/moj/cpp/sjp/command/handler/CaseAdjournmentHandler.java index 4032ade9e4..853eca8d2b 100644 --- a/sjp-command/sjp-command-handler/src/main/java/uk/gov/moj/cpp/sjp/command/handler/CaseAdjournmentHandler.java +++ b/sjp-command/sjp-command-handler/src/main/java/uk/gov/moj/cpp/sjp/command/handler/CaseAdjournmentHandler.java @@ -13,8 +13,8 @@ import java.time.LocalDate; import java.util.UUID; -import javax.inject.Inject; -import javax.json.JsonObject; +import jakarta.inject.Inject; +import jakarta.json.JsonObject; @ServiceComponent(Component.COMMAND_HANDLER) public class CaseAdjournmentHandler extends CaseCommandHandler { diff --git a/sjp-command/sjp-command-handler/src/main/java/uk/gov/moj/cpp/sjp/command/handler/CaseAssignmentRestrictionHandler.java b/sjp-command/sjp-command-handler/src/main/java/uk/gov/moj/cpp/sjp/command/handler/CaseAssignmentRestrictionHandler.java index ff5bb6ff1b..0027144a90 100644 --- a/sjp-command/sjp-command-handler/src/main/java/uk/gov/moj/cpp/sjp/command/handler/CaseAssignmentRestrictionHandler.java +++ b/sjp-command/sjp-command-handler/src/main/java/uk/gov/moj/cpp/sjp/command/handler/CaseAssignmentRestrictionHandler.java @@ -21,8 +21,8 @@ import java.util.function.Function; import java.util.stream.Stream; -import javax.inject.Inject; -import javax.json.JsonValue; +import jakarta.inject.Inject; +import jakarta.json.JsonValue; @ServiceComponent(Component.COMMAND_HANDLER) diff --git a/sjp-command/sjp-command-handler/src/main/java/uk/gov/moj/cpp/sjp/command/handler/CaseCommandHandler.java b/sjp-command/sjp-command-handler/src/main/java/uk/gov/moj/cpp/sjp/command/handler/CaseCommandHandler.java index 6ca339f801..764fcc036e 100644 --- a/sjp-command/sjp-command-handler/src/main/java/uk/gov/moj/cpp/sjp/command/handler/CaseCommandHandler.java +++ b/sjp-command/sjp-command-handler/src/main/java/uk/gov/moj/cpp/sjp/command/handler/CaseCommandHandler.java @@ -22,9 +22,9 @@ import java.util.function.Function; import java.util.stream.Stream; -import javax.inject.Inject; -import javax.json.JsonObject; -import javax.json.JsonValue; +import jakarta.inject.Inject; +import jakarta.json.JsonObject; +import jakarta.json.JsonValue; public class CaseCommandHandler { diff --git a/sjp-command/sjp-command-handler/src/main/java/uk/gov/moj/cpp/sjp/command/handler/CaseNoteHandler.java b/sjp-command/sjp-command-handler/src/main/java/uk/gov/moj/cpp/sjp/command/handler/CaseNoteHandler.java index 0a74f86e3f..c2a097358b 100644 --- a/sjp-command/sjp-command-handler/src/main/java/uk/gov/moj/cpp/sjp/command/handler/CaseNoteHandler.java +++ b/sjp-command/sjp-command-handler/src/main/java/uk/gov/moj/cpp/sjp/command/handler/CaseNoteHandler.java @@ -10,7 +10,7 @@ import uk.gov.justice.services.eventsourcing.source.core.exception.EventStreamException; import uk.gov.justice.services.messaging.Envelope; -import javax.inject.Inject; +import jakarta.inject.Inject; @ServiceComponent(COMMAND_HANDLER) public class CaseNoteHandler extends CaseCommandHandler { diff --git a/sjp-command/sjp-command-handler/src/main/java/uk/gov/moj/cpp/sjp/command/handler/CaseReceivedHandler.java b/sjp-command/sjp-command-handler/src/main/java/uk/gov/moj/cpp/sjp/command/handler/CaseReceivedHandler.java index fcdcf32261..5f90af0fa5 100644 --- a/sjp-command/sjp-command-handler/src/main/java/uk/gov/moj/cpp/sjp/command/handler/CaseReceivedHandler.java +++ b/sjp-command/sjp-command-handler/src/main/java/uk/gov/moj/cpp/sjp/command/handler/CaseReceivedHandler.java @@ -10,8 +10,8 @@ import java.util.UUID; -import javax.inject.Inject; -import javax.json.JsonObject; +import jakarta.inject.Inject; +import jakarta.json.JsonObject; @ServiceComponent(Component.COMMAND_HANDLER) public class CaseReceivedHandler extends CaseCommandHandler { diff --git a/sjp-command/sjp-command-handler/src/main/java/uk/gov/moj/cpp/sjp/command/handler/CaseReopenedHandler.java b/sjp-command/sjp-command-handler/src/main/java/uk/gov/moj/cpp/sjp/command/handler/CaseReopenedHandler.java index 0d7770db64..b398daeb13 100644 --- a/sjp-command/sjp-command-handler/src/main/java/uk/gov/moj/cpp/sjp/command/handler/CaseReopenedHandler.java +++ b/sjp-command/sjp-command-handler/src/main/java/uk/gov/moj/cpp/sjp/command/handler/CaseReopenedHandler.java @@ -12,7 +12,7 @@ import java.util.UUID; import java.util.stream.Stream; -import javax.json.JsonObject; +import jakarta.json.JsonObject; @ServiceComponent(Component.COMMAND_HANDLER) public class CaseReopenedHandler extends CaseCommandHandler { diff --git a/sjp-command/sjp-command-handler/src/main/java/uk/gov/moj/cpp/sjp/command/handler/ChangeCaseManagementStatusHandler.java b/sjp-command/sjp-command-handler/src/main/java/uk/gov/moj/cpp/sjp/command/handler/ChangeCaseManagementStatusHandler.java index 8568331706..3d9acabb1a 100644 --- a/sjp-command/sjp-command-handler/src/main/java/uk/gov/moj/cpp/sjp/command/handler/ChangeCaseManagementStatusHandler.java +++ b/sjp-command/sjp-command-handler/src/main/java/uk/gov/moj/cpp/sjp/command/handler/ChangeCaseManagementStatusHandler.java @@ -7,7 +7,7 @@ import uk.gov.justice.services.messaging.JsonEnvelope; import uk.gov.moj.cpp.sjp.domain.common.CaseManagementStatus; -import javax.json.JsonObject; +import jakarta.json.JsonObject; @ServiceComponent(Component.COMMAND_HANDLER) public class ChangeCaseManagementStatusHandler extends CaseCommandHandler { diff --git a/sjp-command/sjp-command-handler/src/main/java/uk/gov/moj/cpp/sjp/command/handler/CreateCaseApplicationHandler.java b/sjp-command/sjp-command-handler/src/main/java/uk/gov/moj/cpp/sjp/command/handler/CreateCaseApplicationHandler.java index 6a8b9d934c..c61ff99682 100644 --- a/sjp-command/sjp-command-handler/src/main/java/uk/gov/moj/cpp/sjp/command/handler/CreateCaseApplicationHandler.java +++ b/sjp-command/sjp-command-handler/src/main/java/uk/gov/moj/cpp/sjp/command/handler/CreateCaseApplicationHandler.java @@ -22,9 +22,9 @@ import uk.gov.justice.services.messaging.JsonEnvelope; import uk.gov.moj.cpp.sjp.command.handler.service.ReferenceDataService; -import javax.inject.Inject; -import javax.json.JsonObject; -import javax.json.JsonValue; +import jakarta.inject.Inject; +import jakarta.json.JsonObject; +import jakarta.json.JsonValue; import java.util.ArrayList; import java.util.Collection; import java.util.Collections; diff --git a/sjp-command/sjp-command-handler/src/main/java/uk/gov/moj/cpp/sjp/command/handler/DecisionHandler.java b/sjp-command/sjp-command-handler/src/main/java/uk/gov/moj/cpp/sjp/command/handler/DecisionHandler.java index df384ce2ff..800c29e7aa 100644 --- a/sjp-command/sjp-command-handler/src/main/java/uk/gov/moj/cpp/sjp/command/handler/DecisionHandler.java +++ b/sjp-command/sjp-command-handler/src/main/java/uk/gov/moj/cpp/sjp/command/handler/DecisionHandler.java @@ -24,7 +24,7 @@ import java.util.Optional; import java.util.UUID; -import javax.inject.Inject; +import jakarta.inject.Inject; @ServiceComponent(COMMAND_HANDLER) public class DecisionHandler extends CaseCommandHandler { diff --git a/sjp-command/sjp-command-handler/src/main/java/uk/gov/moj/cpp/sjp/command/handler/DefendantAcceptedAOCPPleadOnlineHandler.java b/sjp-command/sjp-command-handler/src/main/java/uk/gov/moj/cpp/sjp/command/handler/DefendantAcceptedAOCPPleadOnlineHandler.java index 603bbb7d65..c3955f5c18 100644 --- a/sjp-command/sjp-command-handler/src/main/java/uk/gov/moj/cpp/sjp/command/handler/DefendantAcceptedAOCPPleadOnlineHandler.java +++ b/sjp-command/sjp-command-handler/src/main/java/uk/gov/moj/cpp/sjp/command/handler/DefendantAcceptedAOCPPleadOnlineHandler.java @@ -8,8 +8,8 @@ import uk.gov.justice.services.messaging.JsonEnvelope; import uk.gov.moj.cpp.sjp.domain.onlineplea.PleadAocpOnline; -import javax.inject.Inject; -import javax.json.JsonObject; +import jakarta.inject.Inject; +import jakarta.json.JsonObject; @ServiceComponent(Component.COMMAND_HANDLER) public class DefendantAcceptedAOCPPleadOnlineHandler extends CaseCommandHandler { diff --git a/sjp-command/sjp-command-handler/src/main/java/uk/gov/moj/cpp/sjp/command/handler/DeleteCaseDocumentHandler.java b/sjp-command/sjp-command-handler/src/main/java/uk/gov/moj/cpp/sjp/command/handler/DeleteCaseDocumentHandler.java index d77c78c658..d2060b241b 100644 --- a/sjp-command/sjp-command-handler/src/main/java/uk/gov/moj/cpp/sjp/command/handler/DeleteCaseDocumentHandler.java +++ b/sjp-command/sjp-command-handler/src/main/java/uk/gov/moj/cpp/sjp/command/handler/DeleteCaseDocumentHandler.java @@ -6,7 +6,7 @@ import uk.gov.justice.services.eventsourcing.source.core.exception.EventStreamException; import uk.gov.justice.services.messaging.JsonEnvelope; -import javax.json.JsonObject; +import jakarta.json.JsonObject; import java.util.UUID; @SuppressWarnings("WeakerAccess") diff --git a/sjp-command/sjp-command-handler/src/main/java/uk/gov/moj/cpp/sjp/command/handler/EndorsementRemovalNotificationHandler.java b/sjp-command/sjp-command-handler/src/main/java/uk/gov/moj/cpp/sjp/command/handler/EndorsementRemovalNotificationHandler.java index 3288c436dd..f63c1963b5 100644 --- a/sjp-command/sjp-command-handler/src/main/java/uk/gov/moj/cpp/sjp/command/handler/EndorsementRemovalNotificationHandler.java +++ b/sjp-command/sjp-command-handler/src/main/java/uk/gov/moj/cpp/sjp/command/handler/EndorsementRemovalNotificationHandler.java @@ -15,7 +15,7 @@ import java.util.UUID; import java.util.stream.Stream; -import javax.inject.Inject; +import jakarta.inject.Inject; @ServiceComponent(Component.COMMAND_HANDLER) public class EndorsementRemovalNotificationHandler { diff --git a/sjp-command/sjp-command-handler/src/main/java/uk/gov/moj/cpp/sjp/command/handler/EnforcementPendingApplicationNotificationHandler.java b/sjp-command/sjp-command-handler/src/main/java/uk/gov/moj/cpp/sjp/command/handler/EnforcementPendingApplicationNotificationHandler.java index 76138b5c57..64e8fee73d 100644 --- a/sjp-command/sjp-command-handler/src/main/java/uk/gov/moj/cpp/sjp/command/handler/EnforcementPendingApplicationNotificationHandler.java +++ b/sjp-command/sjp-command-handler/src/main/java/uk/gov/moj/cpp/sjp/command/handler/EnforcementPendingApplicationNotificationHandler.java @@ -20,8 +20,8 @@ import java.util.UUID; import java.util.stream.Stream; -import javax.inject.Inject; -import javax.json.JsonObject; +import jakarta.inject.Inject; +import jakarta.json.JsonObject; @ServiceComponent(Component.COMMAND_HANDLER) public class EnforcementPendingApplicationNotificationHandler extends CaseCommandHandler { diff --git a/sjp-command/sjp-command-handler/src/main/java/uk/gov/moj/cpp/sjp/command/handler/FinancialImpositionHandler.java b/sjp-command/sjp-command-handler/src/main/java/uk/gov/moj/cpp/sjp/command/handler/FinancialImpositionHandler.java index bd8a77a2ef..7e154870d6 100644 --- a/sjp-command/sjp-command-handler/src/main/java/uk/gov/moj/cpp/sjp/command/handler/FinancialImpositionHandler.java +++ b/sjp-command/sjp-command-handler/src/main/java/uk/gov/moj/cpp/sjp/command/handler/FinancialImpositionHandler.java @@ -10,7 +10,7 @@ import java.util.UUID; -import javax.json.JsonObject; +import jakarta.json.JsonObject; @ServiceComponent(Component.COMMAND_HANDLER) public class FinancialImpositionHandler extends CaseCommandHandler { diff --git a/sjp-command/sjp-command-handler/src/main/java/uk/gov/moj/cpp/sjp/command/handler/FinancialMeansHandler.java b/sjp-command/sjp-command-handler/src/main/java/uk/gov/moj/cpp/sjp/command/handler/FinancialMeansHandler.java index d90bbc9231..6472c3fe8c 100644 --- a/sjp-command/sjp-command-handler/src/main/java/uk/gov/moj/cpp/sjp/command/handler/FinancialMeansHandler.java +++ b/sjp-command/sjp-command-handler/src/main/java/uk/gov/moj/cpp/sjp/command/handler/FinancialMeansHandler.java @@ -9,7 +9,7 @@ import java.util.UUID; -import javax.json.JsonObject; +import jakarta.json.JsonObject; @ServiceComponent(Component.COMMAND_HANDLER) public class FinancialMeansHandler extends CaseCommandHandler { diff --git a/sjp-command/sjp-command-handler/src/main/java/uk/gov/moj/cpp/sjp/command/handler/MarkAsLegalSocCheckedHandler.java b/sjp-command/sjp-command-handler/src/main/java/uk/gov/moj/cpp/sjp/command/handler/MarkAsLegalSocCheckedHandler.java index 0754fb7149..42735a456b 100644 --- a/sjp-command/sjp-command-handler/src/main/java/uk/gov/moj/cpp/sjp/command/handler/MarkAsLegalSocCheckedHandler.java +++ b/sjp-command/sjp-command-handler/src/main/java/uk/gov/moj/cpp/sjp/command/handler/MarkAsLegalSocCheckedHandler.java @@ -9,7 +9,7 @@ import java.time.ZonedDateTime; import java.util.UUID; -import javax.json.JsonObject; +import jakarta.json.JsonObject; @ServiceComponent(Component.COMMAND_HANDLER) public class MarkAsLegalSocCheckedHandler extends CaseCommandHandler { diff --git a/sjp-command/sjp-command-handler/src/main/java/uk/gov/moj/cpp/sjp/command/handler/OffenceWithdrawalRequestHandler.java b/sjp-command/sjp-command-handler/src/main/java/uk/gov/moj/cpp/sjp/command/handler/OffenceWithdrawalRequestHandler.java index 0874e4d250..123464e13b 100644 --- a/sjp-command/sjp-command-handler/src/main/java/uk/gov/moj/cpp/sjp/command/handler/OffenceWithdrawalRequestHandler.java +++ b/sjp-command/sjp-command-handler/src/main/java/uk/gov/moj/cpp/sjp/command/handler/OffenceWithdrawalRequestHandler.java @@ -19,7 +19,7 @@ import java.util.UUID; import java.util.stream.Collectors; -import javax.inject.Inject; +import jakarta.inject.Inject; @ServiceComponent(COMMAND_HANDLER) public class OffenceWithdrawalRequestHandler extends CaseCommandHandler { diff --git a/sjp-command/sjp-command-handler/src/main/java/uk/gov/moj/cpp/sjp/command/handler/PartialAocpCriteriaNotificationHandler.java b/sjp-command/sjp-command-handler/src/main/java/uk/gov/moj/cpp/sjp/command/handler/PartialAocpCriteriaNotificationHandler.java index a217ff8710..84a2be00bc 100644 --- a/sjp-command/sjp-command-handler/src/main/java/uk/gov/moj/cpp/sjp/command/handler/PartialAocpCriteriaNotificationHandler.java +++ b/sjp-command/sjp-command-handler/src/main/java/uk/gov/moj/cpp/sjp/command/handler/PartialAocpCriteriaNotificationHandler.java @@ -15,8 +15,8 @@ import java.util.UUID; import java.util.stream.Stream; -import javax.inject.Inject; -import javax.json.JsonObject; +import jakarta.inject.Inject; +import jakarta.json.JsonObject; @ServiceComponent(Component.COMMAND_HANDLER) public class PartialAocpCriteriaNotificationHandler { diff --git a/sjp-command/sjp-command-handler/src/main/java/uk/gov/moj/cpp/sjp/command/handler/PleadOnlineHandler.java b/sjp-command/sjp-command-handler/src/main/java/uk/gov/moj/cpp/sjp/command/handler/PleadOnlineHandler.java index a7930b3928..a68d64efcb 100644 --- a/sjp-command/sjp-command-handler/src/main/java/uk/gov/moj/cpp/sjp/command/handler/PleadOnlineHandler.java +++ b/sjp-command/sjp-command-handler/src/main/java/uk/gov/moj/cpp/sjp/command/handler/PleadOnlineHandler.java @@ -11,8 +11,8 @@ import java.util.UUID; -import javax.inject.Inject; -import javax.json.JsonObject; +import jakarta.inject.Inject; +import jakarta.json.JsonObject; @ServiceComponent(Component.COMMAND_HANDLER) public class PleadOnlineHandler extends CaseCommandHandler { diff --git a/sjp-command/sjp-command-handler/src/main/java/uk/gov/moj/cpp/sjp/command/handler/PressTransparencyReportHandler.java b/sjp-command/sjp-command-handler/src/main/java/uk/gov/moj/cpp/sjp/command/handler/PressTransparencyReportHandler.java index 46b6d7af95..f6e8130a15 100644 --- a/sjp-command/sjp-command-handler/src/main/java/uk/gov/moj/cpp/sjp/command/handler/PressTransparencyReportHandler.java +++ b/sjp-command/sjp-command-handler/src/main/java/uk/gov/moj/cpp/sjp/command/handler/PressTransparencyReportHandler.java @@ -24,10 +24,10 @@ import java.util.function.Function; import java.util.stream.Stream; -import javax.inject.Inject; -import javax.json.JsonArray; -import javax.json.JsonObject; -import javax.json.JsonString; +import jakarta.inject.Inject; +import jakarta.json.JsonArray; +import jakarta.json.JsonObject; +import jakarta.json.JsonString; @ServiceComponent(Component.COMMAND_HANDLER) public class PressTransparencyReportHandler { diff --git a/sjp-command/sjp-command-handler/src/main/java/uk/gov/moj/cpp/sjp/command/handler/RejectPendingDefendantChangesHandler.java b/sjp-command/sjp-command-handler/src/main/java/uk/gov/moj/cpp/sjp/command/handler/RejectPendingDefendantChangesHandler.java index 2b0b5942f4..71c5f34826 100644 --- a/sjp-command/sjp-command-handler/src/main/java/uk/gov/moj/cpp/sjp/command/handler/RejectPendingDefendantChangesHandler.java +++ b/sjp-command/sjp-command-handler/src/main/java/uk/gov/moj/cpp/sjp/command/handler/RejectPendingDefendantChangesHandler.java @@ -15,8 +15,8 @@ import java.util.UUID; import java.util.stream.Stream; -import javax.inject.Inject; -import javax.json.JsonObject; +import jakarta.inject.Inject; +import jakarta.json.JsonObject; @SuppressWarnings("squid:CallToDeprecatedMethod") @ServiceComponent(Component.COMMAND_HANDLER) diff --git a/sjp-command/sjp-command-handler/src/main/java/uk/gov/moj/cpp/sjp/command/handler/ResolveCaseAOCPEligibilityHandler.java b/sjp-command/sjp-command-handler/src/main/java/uk/gov/moj/cpp/sjp/command/handler/ResolveCaseAOCPEligibilityHandler.java index e0031d3632..33ad601fb6 100644 --- a/sjp-command/sjp-command-handler/src/main/java/uk/gov/moj/cpp/sjp/command/handler/ResolveCaseAOCPEligibilityHandler.java +++ b/sjp-command/sjp-command-handler/src/main/java/uk/gov/moj/cpp/sjp/command/handler/ResolveCaseAOCPEligibilityHandler.java @@ -10,7 +10,7 @@ import static java.util.Optional.of; import static java.util.UUID.fromString; -import javax.json.JsonObject; +import jakarta.json.JsonObject; import java.math.BigDecimal; import java.util.Optional; diff --git a/sjp-command/sjp-command-handler/src/main/java/uk/gov/moj/cpp/sjp/command/handler/ResubmitResultsHandler.java b/sjp-command/sjp-command-handler/src/main/java/uk/gov/moj/cpp/sjp/command/handler/ResubmitResultsHandler.java index 374b151b73..679325b3b8 100644 --- a/sjp-command/sjp-command-handler/src/main/java/uk/gov/moj/cpp/sjp/command/handler/ResubmitResultsHandler.java +++ b/sjp-command/sjp-command-handler/src/main/java/uk/gov/moj/cpp/sjp/command/handler/ResubmitResultsHandler.java @@ -11,7 +11,7 @@ import java.util.UUID; -import javax.inject.Inject; +import jakarta.inject.Inject; @ServiceComponent(COMMAND_HANDLER) public class ResubmitResultsHandler extends CaseCommandHandler { diff --git a/sjp-command/sjp-command-handler/src/main/java/uk/gov/moj/cpp/sjp/command/handler/SessionHandler.java b/sjp-command/sjp-command-handler/src/main/java/uk/gov/moj/cpp/sjp/command/handler/SessionHandler.java index 86f977a0af..fbc408d87a 100644 --- a/sjp-command/sjp-command-handler/src/main/java/uk/gov/moj/cpp/sjp/command/handler/SessionHandler.java +++ b/sjp-command/sjp-command-handler/src/main/java/uk/gov/moj/cpp/sjp/command/handler/SessionHandler.java @@ -9,7 +9,7 @@ import java.util.List; import java.util.stream.Collectors; -import javax.json.JsonString; +import jakarta.json.JsonString; import uk.gov.justice.core.courts.DelegatedPowers; import uk.gov.justice.services.common.converter.JsonObjectToObjectConverter; import uk.gov.justice.services.common.util.Clock; @@ -31,8 +31,8 @@ import java.util.function.Function; import java.util.stream.Stream; -import javax.inject.Inject; -import javax.json.JsonObject; +import jakarta.inject.Inject; +import jakarta.json.JsonObject; @ServiceComponent(Component.COMMAND_HANDLER) public class SessionHandler { diff --git a/sjp-command/sjp-command-handler/src/main/java/uk/gov/moj/cpp/sjp/command/handler/SetPleasCommandHandler.java b/sjp-command/sjp-command-handler/src/main/java/uk/gov/moj/cpp/sjp/command/handler/SetPleasCommandHandler.java index c194c4c574..d05c6966f4 100644 --- a/sjp-command/sjp-command-handler/src/main/java/uk/gov/moj/cpp/sjp/command/handler/SetPleasCommandHandler.java +++ b/sjp-command/sjp-command-handler/src/main/java/uk/gov/moj/cpp/sjp/command/handler/SetPleasCommandHandler.java @@ -8,8 +8,8 @@ import uk.gov.justice.services.messaging.JsonEnvelope; import uk.gov.moj.cpp.sjp.domain.plea.SetPleas; -import javax.inject.Inject; -import javax.json.JsonObject; +import jakarta.inject.Inject; +import jakarta.json.JsonObject; import java.util.UUID; @ServiceComponent(Component.COMMAND_HANDLER) diff --git a/sjp-command/sjp-command-handler/src/main/java/uk/gov/moj/cpp/sjp/command/handler/TransparencyReportHandler.java b/sjp-command/sjp-command-handler/src/main/java/uk/gov/moj/cpp/sjp/command/handler/TransparencyReportHandler.java index ea0e0c416a..565ae4cdbd 100644 --- a/sjp-command/sjp-command-handler/src/main/java/uk/gov/moj/cpp/sjp/command/handler/TransparencyReportHandler.java +++ b/sjp-command/sjp-command-handler/src/main/java/uk/gov/moj/cpp/sjp/command/handler/TransparencyReportHandler.java @@ -23,9 +23,9 @@ import java.util.function.Function; import java.util.stream.Stream; -import javax.inject.Inject; -import javax.json.JsonObject; -import javax.json.JsonString; +import jakarta.inject.Inject; +import jakarta.json.JsonObject; +import jakarta.json.JsonString; @ServiceComponent(Component.COMMAND_HANDLER) public class TransparencyReportHandler { diff --git a/sjp-command/sjp-command-handler/src/main/java/uk/gov/moj/cpp/sjp/command/handler/UpdateCaseApplicationHandler.java b/sjp-command/sjp-command-handler/src/main/java/uk/gov/moj/cpp/sjp/command/handler/UpdateCaseApplicationHandler.java index 6823d4ab8b..67fd7c4f10 100644 --- a/sjp-command/sjp-command-handler/src/main/java/uk/gov/moj/cpp/sjp/command/handler/UpdateCaseApplicationHandler.java +++ b/sjp-command/sjp-command-handler/src/main/java/uk/gov/moj/cpp/sjp/command/handler/UpdateCaseApplicationHandler.java @@ -8,7 +8,7 @@ import uk.gov.justice.services.eventsourcing.source.core.exception.EventStreamException; import uk.gov.justice.services.messaging.JsonEnvelope; -import javax.json.JsonObject; +import jakarta.json.JsonObject; import java.util.UUID; import static java.util.UUID.fromString; diff --git a/sjp-command/sjp-command-handler/src/main/java/uk/gov/moj/cpp/sjp/command/handler/UpdateCaseListedInCriminalCourtsHandler.java b/sjp-command/sjp-command-handler/src/main/java/uk/gov/moj/cpp/sjp/command/handler/UpdateCaseListedInCriminalCourtsHandler.java index 084e56dfe2..8914866a39 100644 --- a/sjp-command/sjp-command-handler/src/main/java/uk/gov/moj/cpp/sjp/command/handler/UpdateCaseListedInCriminalCourtsHandler.java +++ b/sjp-command/sjp-command-handler/src/main/java/uk/gov/moj/cpp/sjp/command/handler/UpdateCaseListedInCriminalCourtsHandler.java @@ -17,8 +17,8 @@ import java.util.UUID; import java.util.stream.Collectors; -import javax.json.JsonObject; -import javax.json.JsonString; +import jakarta.json.JsonObject; +import jakarta.json.JsonString; @ServiceComponent(Component.COMMAND_HANDLER) public class UpdateCaseListedInCriminalCourtsHandler extends CaseCommandHandler { diff --git a/sjp-command/sjp-command-handler/src/main/java/uk/gov/moj/cpp/sjp/command/handler/UpdateCasesManagementStatusHandler.java b/sjp-command/sjp-command-handler/src/main/java/uk/gov/moj/cpp/sjp/command/handler/UpdateCasesManagementStatusHandler.java index e69aa6f779..8f9ead7099 100644 --- a/sjp-command/sjp-command-handler/src/main/java/uk/gov/moj/cpp/sjp/command/handler/UpdateCasesManagementStatusHandler.java +++ b/sjp-command/sjp-command-handler/src/main/java/uk/gov/moj/cpp/sjp/command/handler/UpdateCasesManagementStatusHandler.java @@ -16,8 +16,8 @@ import java.util.function.Function; import java.util.stream.Stream; -import javax.inject.Inject; -import javax.json.JsonObject; +import jakarta.inject.Inject; +import jakarta.json.JsonObject; @ServiceComponent(Component.COMMAND_HANDLER) public class UpdateCasesManagementStatusHandler { diff --git a/sjp-command/sjp-command-handler/src/main/java/uk/gov/moj/cpp/sjp/command/handler/UpdateDefendantDetailsFromCCHandler.java b/sjp-command/sjp-command-handler/src/main/java/uk/gov/moj/cpp/sjp/command/handler/UpdateDefendantDetailsFromCCHandler.java index a3841b3ecf..e609ca204b 100644 --- a/sjp-command/sjp-command-handler/src/main/java/uk/gov/moj/cpp/sjp/command/handler/UpdateDefendantDetailsFromCCHandler.java +++ b/sjp-command/sjp-command-handler/src/main/java/uk/gov/moj/cpp/sjp/command/handler/UpdateDefendantDetailsFromCCHandler.java @@ -24,8 +24,8 @@ import java.util.UUID; import java.util.stream.Stream; -import javax.inject.Inject; -import javax.json.JsonObject; +import jakarta.inject.Inject; +import jakarta.json.JsonObject; /** * Handler for updating defendant details from Criminal Courts (CC). diff --git a/sjp-command/sjp-command-handler/src/main/java/uk/gov/moj/cpp/sjp/command/handler/UpdateDefendantDetailsHandler.java b/sjp-command/sjp-command-handler/src/main/java/uk/gov/moj/cpp/sjp/command/handler/UpdateDefendantDetailsHandler.java index 1b3093515c..d69f9e759b 100644 --- a/sjp-command/sjp-command-handler/src/main/java/uk/gov/moj/cpp/sjp/command/handler/UpdateDefendantDetailsHandler.java +++ b/sjp-command/sjp-command-handler/src/main/java/uk/gov/moj/cpp/sjp/command/handler/UpdateDefendantDetailsHandler.java @@ -23,8 +23,8 @@ import java.util.UUID; import java.util.stream.Stream; -import javax.inject.Inject; -import javax.json.JsonObject; +import jakarta.inject.Inject; +import jakarta.json.JsonObject; @ServiceComponent(Component.COMMAND_HANDLER) public class UpdateDefendantDetailsHandler extends BasePersonInfoHandler { diff --git a/sjp-command/sjp-command-handler/src/main/java/uk/gov/moj/cpp/sjp/command/handler/UpdateDefendantNationalInsuranceNumberHandler.java b/sjp-command/sjp-command-handler/src/main/java/uk/gov/moj/cpp/sjp/command/handler/UpdateDefendantNationalInsuranceNumberHandler.java index 02c839d94c..ac4f2a4353 100644 --- a/sjp-command/sjp-command-handler/src/main/java/uk/gov/moj/cpp/sjp/command/handler/UpdateDefendantNationalInsuranceNumberHandler.java +++ b/sjp-command/sjp-command-handler/src/main/java/uk/gov/moj/cpp/sjp/command/handler/UpdateDefendantNationalInsuranceNumberHandler.java @@ -8,7 +8,7 @@ import java.util.UUID; -import javax.json.JsonObject; +import jakarta.json.JsonObject; @ServiceComponent(Component.COMMAND_HANDLER) public class UpdateDefendantNationalInsuranceNumberHandler extends CaseCommandHandler { diff --git a/sjp-command/sjp-command-handler/src/main/java/uk/gov/moj/cpp/sjp/command/handler/UpdateHearingRequirementsHandler.java b/sjp-command/sjp-command-handler/src/main/java/uk/gov/moj/cpp/sjp/command/handler/UpdateHearingRequirementsHandler.java index 7fffe152ac..361a0b19b3 100644 --- a/sjp-command/sjp-command-handler/src/main/java/uk/gov/moj/cpp/sjp/command/handler/UpdateHearingRequirementsHandler.java +++ b/sjp-command/sjp-command-handler/src/main/java/uk/gov/moj/cpp/sjp/command/handler/UpdateHearingRequirementsHandler.java @@ -9,7 +9,7 @@ import java.util.UUID; -import javax.json.JsonObject; +import jakarta.json.JsonObject; @ServiceComponent(Component.COMMAND_HANDLER) public class UpdateHearingRequirementsHandler extends CaseCommandHandler { diff --git a/sjp-command/sjp-command-handler/src/main/java/uk/gov/moj/cpp/sjp/command/handler/UpdateOffenceCodeHandler.java b/sjp-command/sjp-command-handler/src/main/java/uk/gov/moj/cpp/sjp/command/handler/UpdateOffenceCodeHandler.java index 02d5d97d0a..6e04aa517a 100644 --- a/sjp-command/sjp-command-handler/src/main/java/uk/gov/moj/cpp/sjp/command/handler/UpdateOffenceCodeHandler.java +++ b/sjp-command/sjp-command-handler/src/main/java/uk/gov/moj/cpp/sjp/command/handler/UpdateOffenceCodeHandler.java @@ -9,7 +9,7 @@ import java.util.UUID; -import javax.json.JsonObject; +import jakarta.json.JsonObject; @ServiceComponent(COMMAND_HANDLER) public class UpdateOffenceCodeHandler extends CaseCommandHandler { diff --git a/sjp-command/sjp-command-handler/src/main/java/uk/gov/moj/cpp/sjp/command/handler/UploadCaseDocumentHandler.java b/sjp-command/sjp-command-handler/src/main/java/uk/gov/moj/cpp/sjp/command/handler/UploadCaseDocumentHandler.java index 79f668b68c..6dce853ba8 100644 --- a/sjp-command/sjp-command-handler/src/main/java/uk/gov/moj/cpp/sjp/command/handler/UploadCaseDocumentHandler.java +++ b/sjp-command/sjp-command-handler/src/main/java/uk/gov/moj/cpp/sjp/command/handler/UploadCaseDocumentHandler.java @@ -12,8 +12,8 @@ import java.util.UUID; -import javax.inject.Inject; -import javax.json.JsonObject; +import jakarta.inject.Inject; +import jakarta.json.JsonObject; @SuppressWarnings("WeakerAccess") @ServiceComponent(Component.COMMAND_HANDLER) diff --git a/sjp-command/sjp-command-handler/src/main/java/uk/gov/moj/cpp/sjp/command/handler/service/EnforcementAreaService.java b/sjp-command/sjp-command-handler/src/main/java/uk/gov/moj/cpp/sjp/command/handler/service/EnforcementAreaService.java index 83c4956436..44cde744dd 100644 --- a/sjp-command/sjp-command-handler/src/main/java/uk/gov/moj/cpp/sjp/command/handler/service/EnforcementAreaService.java +++ b/sjp-command/sjp-command-handler/src/main/java/uk/gov/moj/cpp/sjp/command/handler/service/EnforcementAreaService.java @@ -4,8 +4,8 @@ import uk.gov.justice.services.messaging.JsonEnvelope; -import javax.inject.Inject; -import javax.json.JsonObject; +import jakarta.inject.Inject; +import jakarta.json.JsonObject; public class EnforcementAreaService { diff --git a/sjp-command/sjp-command-handler/src/main/java/uk/gov/moj/cpp/sjp/command/handler/service/ReferenceDataService.java b/sjp-command/sjp-command-handler/src/main/java/uk/gov/moj/cpp/sjp/command/handler/service/ReferenceDataService.java index 7d48e8b458..0661af6a40 100644 --- a/sjp-command/sjp-command-handler/src/main/java/uk/gov/moj/cpp/sjp/command/handler/service/ReferenceDataService.java +++ b/sjp-command/sjp-command-handler/src/main/java/uk/gov/moj/cpp/sjp/command/handler/service/ReferenceDataService.java @@ -13,9 +13,9 @@ import java.util.Optional; import java.util.UUID; -import javax.inject.Inject; -import javax.json.JsonObject; -import javax.json.JsonValue; +import jakarta.inject.Inject; +import jakarta.json.JsonObject; +import jakarta.json.JsonValue; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/sjp-command/sjp-command-handler/src/main/resources/META-INF/beans.xml b/sjp-command/sjp-command-handler/src/main/resources/META-INF/beans.xml index cc3f8d2864..1d83bc8c5a 100644 --- a/sjp-command/sjp-command-handler/src/main/resources/META-INF/beans.xml +++ b/sjp-command/sjp-command-handler/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-command/sjp-command-handler/src/test/java/uk/gov/moj/cpp/sjp/command/handler/AcceptPendingDefendantChangesHandlerCCTest.java b/sjp-command/sjp-command-handler/src/test/java/uk/gov/moj/cpp/sjp/command/handler/AcceptPendingDefendantChangesHandlerCCTest.java index 70f521235f..87763817b3 100644 --- a/sjp-command/sjp-command-handler/src/test/java/uk/gov/moj/cpp/sjp/command/handler/AcceptPendingDefendantChangesHandlerCCTest.java +++ b/sjp-command/sjp-command-handler/src/test/java/uk/gov/moj/cpp/sjp/command/handler/AcceptPendingDefendantChangesHandlerCCTest.java @@ -37,8 +37,8 @@ import java.util.UUID; -import javax.json.JsonObject; -import javax.json.JsonObjectBuilder; +import jakarta.json.JsonObject; +import jakarta.json.JsonObjectBuilder; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; diff --git a/sjp-command/sjp-command-handler/src/test/java/uk/gov/moj/cpp/sjp/command/handler/AcceptPendingDefendantChangesHandlerTest.java b/sjp-command/sjp-command-handler/src/test/java/uk/gov/moj/cpp/sjp/command/handler/AcceptPendingDefendantChangesHandlerTest.java index a04ca89016..6611e87261 100644 --- a/sjp-command/sjp-command-handler/src/test/java/uk/gov/moj/cpp/sjp/command/handler/AcceptPendingDefendantChangesHandlerTest.java +++ b/sjp-command/sjp-command-handler/src/test/java/uk/gov/moj/cpp/sjp/command/handler/AcceptPendingDefendantChangesHandlerTest.java @@ -36,8 +36,8 @@ import java.time.LocalDate; import java.util.UUID; -import javax.json.JsonObject; -import javax.json.JsonObjectBuilder; +import jakarta.json.JsonObject; +import jakarta.json.JsonObjectBuilder; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; diff --git a/sjp-command/sjp-command-handler/src/test/java/uk/gov/moj/cpp/sjp/command/handler/AddDatesToAvoidHandlerTest.java b/sjp-command/sjp-command-handler/src/test/java/uk/gov/moj/cpp/sjp/command/handler/AddDatesToAvoidHandlerTest.java index 88f0bf75da..1c6acd4ea2 100644 --- a/sjp-command/sjp-command-handler/src/test/java/uk/gov/moj/cpp/sjp/command/handler/AddDatesToAvoidHandlerTest.java +++ b/sjp-command/sjp-command-handler/src/test/java/uk/gov/moj/cpp/sjp/command/handler/AddDatesToAvoidHandlerTest.java @@ -30,7 +30,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-command/sjp-command-handler/src/test/java/uk/gov/moj/cpp/sjp/command/handler/AocpAcceptanceTimerExpiredHandlerTest.java b/sjp-command/sjp-command-handler/src/test/java/uk/gov/moj/cpp/sjp/command/handler/AocpAcceptanceTimerExpiredHandlerTest.java index 880596d832..a9d947e76d 100644 --- a/sjp-command/sjp-command-handler/src/test/java/uk/gov/moj/cpp/sjp/command/handler/AocpAcceptanceTimerExpiredHandlerTest.java +++ b/sjp-command/sjp-command-handler/src/test/java/uk/gov/moj/cpp/sjp/command/handler/AocpAcceptanceTimerExpiredHandlerTest.java @@ -25,7 +25,7 @@ import java.util.UUID; import java.util.stream.Stream; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; diff --git a/sjp-command/sjp-command-handler/src/test/java/uk/gov/moj/cpp/sjp/command/handler/CaseAssignmentRestrictionHandlerTest.java b/sjp-command/sjp-command-handler/src/test/java/uk/gov/moj/cpp/sjp/command/handler/CaseAssignmentRestrictionHandlerTest.java index c2eaf03ffb..7df64832cb 100644 --- a/sjp-command/sjp-command-handler/src/test/java/uk/gov/moj/cpp/sjp/command/handler/CaseAssignmentRestrictionHandlerTest.java +++ b/sjp-command/sjp-command-handler/src/test/java/uk/gov/moj/cpp/sjp/command/handler/CaseAssignmentRestrictionHandlerTest.java @@ -40,7 +40,7 @@ import java.util.stream.Stream; -import javax.json.JsonValue; +import jakarta.json.JsonValue; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; diff --git a/sjp-command/sjp-command-handler/src/test/java/uk/gov/moj/cpp/sjp/command/handler/CaseCommandHandlerTest.java b/sjp-command/sjp-command-handler/src/test/java/uk/gov/moj/cpp/sjp/command/handler/CaseCommandHandlerTest.java index c7fb9a1356..90f20dfdb2 100644 --- a/sjp-command/sjp-command-handler/src/test/java/uk/gov/moj/cpp/sjp/command/handler/CaseCommandHandlerTest.java +++ b/sjp-command/sjp-command-handler/src/test/java/uk/gov/moj/cpp/sjp/command/handler/CaseCommandHandlerTest.java @@ -22,7 +22,7 @@ import java.util.function.Function; import java.util.stream.Stream; -import javax.json.JsonObject; +import jakarta.json.JsonObject; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; diff --git a/sjp-command/sjp-command-handler/src/test/java/uk/gov/moj/cpp/sjp/command/handler/CaseNoteHandlerTest.java b/sjp-command/sjp-command-handler/src/test/java/uk/gov/moj/cpp/sjp/command/handler/CaseNoteHandlerTest.java index e58dbdf1ba..5884297617 100644 --- a/sjp-command/sjp-command-handler/src/test/java/uk/gov/moj/cpp/sjp/command/handler/CaseNoteHandlerTest.java +++ b/sjp-command/sjp-command-handler/src/test/java/uk/gov/moj/cpp/sjp/command/handler/CaseNoteHandlerTest.java @@ -4,7 +4,7 @@ import static com.jayway.jsonpath.matchers.JsonPathMatchers.withJsonPath; import static java.time.ZonedDateTime.now; import static java.util.UUID.randomUUID; -import static javax.json.JsonValue.NULL; +import static jakarta.json.JsonValue.NULL; import static org.hamcrest.CoreMatchers.allOf; import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.CoreMatchers.is; diff --git a/sjp-command/sjp-command-handler/src/test/java/uk/gov/moj/cpp/sjp/command/handler/CaseReceivedHandlerTest.java b/sjp-command/sjp-command-handler/src/test/java/uk/gov/moj/cpp/sjp/command/handler/CaseReceivedHandlerTest.java index f8d85da169..1ee5373a84 100644 --- a/sjp-command/sjp-command-handler/src/test/java/uk/gov/moj/cpp/sjp/command/handler/CaseReceivedHandlerTest.java +++ b/sjp-command/sjp-command-handler/src/test/java/uk/gov/moj/cpp/sjp/command/handler/CaseReceivedHandlerTest.java @@ -25,7 +25,7 @@ import java.util.function.Function; import java.util.stream.Stream; -import javax.json.JsonObject; +import jakarta.json.JsonObject; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/sjp-command/sjp-command-handler/src/test/java/uk/gov/moj/cpp/sjp/command/handler/CreateCaseApplicationHandlerTest.java b/sjp-command/sjp-command-handler/src/test/java/uk/gov/moj/cpp/sjp/command/handler/CreateCaseApplicationHandlerTest.java index f2620c0edf..545d767107 100644 --- a/sjp-command/sjp-command-handler/src/test/java/uk/gov/moj/cpp/sjp/command/handler/CreateCaseApplicationHandlerTest.java +++ b/sjp-command/sjp-command-handler/src/test/java/uk/gov/moj/cpp/sjp/command/handler/CreateCaseApplicationHandlerTest.java @@ -80,7 +80,7 @@ import java.util.UUID; import java.util.stream.Stream; -import javax.json.JsonObject; +import jakarta.json.JsonObject; import org.hamcrest.CoreMatchers; import org.hamcrest.Matchers; diff --git a/sjp-command/sjp-command-handler/src/test/java/uk/gov/moj/cpp/sjp/command/handler/DecisionHandlerTest.java b/sjp-command/sjp-command-handler/src/test/java/uk/gov/moj/cpp/sjp/command/handler/DecisionHandlerTest.java index c959f742e5..88e6f00873 100644 --- a/sjp-command/sjp-command-handler/src/test/java/uk/gov/moj/cpp/sjp/command/handler/DecisionHandlerTest.java +++ b/sjp-command/sjp-command-handler/src/test/java/uk/gov/moj/cpp/sjp/command/handler/DecisionHandlerTest.java @@ -5,7 +5,7 @@ import static java.nio.charset.Charset.defaultCharset; import static java.util.UUID.fromString; import static java.util.UUID.randomUUID; -import static javax.json.JsonValue.NULL; +import static jakarta.json.JsonValue.NULL; import static org.hamcrest.CoreMatchers.allOf; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.CoreMatchers.equalTo; @@ -70,7 +70,7 @@ import java.util.UUID; import java.util.stream.Stream; -import javax.json.JsonObject; +import jakarta.json.JsonObject; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.io.Resources; diff --git a/sjp-command/sjp-command-handler/src/test/java/uk/gov/moj/cpp/sjp/command/handler/EmployerHandlerTest.java b/sjp-command/sjp-command-handler/src/test/java/uk/gov/moj/cpp/sjp/command/handler/EmployerHandlerTest.java index 3bc9f2131e..c33fd8fc96 100644 --- a/sjp-command/sjp-command-handler/src/test/java/uk/gov/moj/cpp/sjp/command/handler/EmployerHandlerTest.java +++ b/sjp-command/sjp-command-handler/src/test/java/uk/gov/moj/cpp/sjp/command/handler/EmployerHandlerTest.java @@ -41,8 +41,8 @@ import java.util.stream.Collectors; import java.util.stream.Stream; -import javax.json.JsonObject; -import javax.json.JsonValue; +import jakarta.json.JsonObject; +import jakarta.json.JsonValue; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; diff --git a/sjp-command/sjp-command-handler/src/test/java/uk/gov/moj/cpp/sjp/command/handler/FinancialImpositionHandlerTest.java b/sjp-command/sjp-command-handler/src/test/java/uk/gov/moj/cpp/sjp/command/handler/FinancialImpositionHandlerTest.java index ce8c26b7c9..6ab9304692 100644 --- a/sjp-command/sjp-command-handler/src/test/java/uk/gov/moj/cpp/sjp/command/handler/FinancialImpositionHandlerTest.java +++ b/sjp-command/sjp-command-handler/src/test/java/uk/gov/moj/cpp/sjp/command/handler/FinancialImpositionHandlerTest.java @@ -32,7 +32,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-command/sjp-command-handler/src/test/java/uk/gov/moj/cpp/sjp/command/handler/MarkAsLegalSocCheckedHandlerTest.java b/sjp-command/sjp-command-handler/src/test/java/uk/gov/moj/cpp/sjp/command/handler/MarkAsLegalSocCheckedHandlerTest.java index 59024d36ed..620d442e22 100644 --- a/sjp-command/sjp-command-handler/src/test/java/uk/gov/moj/cpp/sjp/command/handler/MarkAsLegalSocCheckedHandlerTest.java +++ b/sjp-command/sjp-command-handler/src/test/java/uk/gov/moj/cpp/sjp/command/handler/MarkAsLegalSocCheckedHandlerTest.java @@ -33,7 +33,7 @@ import java.util.UUID; import java.util.stream.Stream; -import javax.json.JsonObjectBuilder; +import jakarta.json.JsonObjectBuilder; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/sjp-command/sjp-command-handler/src/test/java/uk/gov/moj/cpp/sjp/command/handler/OffenceWithdrawalRequestHandlerTest.java b/sjp-command/sjp-command-handler/src/test/java/uk/gov/moj/cpp/sjp/command/handler/OffenceWithdrawalRequestHandlerTest.java index 8d75cf2897..1426da2e59 100644 --- a/sjp-command/sjp-command-handler/src/test/java/uk/gov/moj/cpp/sjp/command/handler/OffenceWithdrawalRequestHandlerTest.java +++ b/sjp-command/sjp-command-handler/src/test/java/uk/gov/moj/cpp/sjp/command/handler/OffenceWithdrawalRequestHandlerTest.java @@ -5,7 +5,7 @@ import static java.time.ZonedDateTime.now; import static java.time.ZonedDateTime.of; import static java.util.UUID.randomUUID; -import static javax.json.JsonValue.NULL; +import static jakarta.json.JsonValue.NULL; import static org.hamcrest.CoreMatchers.allOf; import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.CoreMatchers.is; diff --git a/sjp-command/sjp-command-handler/src/test/java/uk/gov/moj/cpp/sjp/command/handler/PressTransparencyReportHandlerTest.java b/sjp-command/sjp-command-handler/src/test/java/uk/gov/moj/cpp/sjp/command/handler/PressTransparencyReportHandlerTest.java index e1cf973ec6..07bdba792a 100644 --- a/sjp-command/sjp-command-handler/src/test/java/uk/gov/moj/cpp/sjp/command/handler/PressTransparencyReportHandlerTest.java +++ b/sjp-command/sjp-command-handler/src/test/java/uk/gov/moj/cpp/sjp/command/handler/PressTransparencyReportHandlerTest.java @@ -50,8 +50,8 @@ import java.util.UUID; import java.util.stream.Stream; -import javax.json.JsonArrayBuilder; -import javax.json.JsonObject; +import jakarta.json.JsonArrayBuilder; +import jakarta.json.JsonObject; import com.fasterxml.jackson.databind.ObjectMapper; import org.junit.jupiter.api.BeforeEach; diff --git a/sjp-command/sjp-command-handler/src/test/java/uk/gov/moj/cpp/sjp/command/handler/RejectPendingDefendantChangesHandlerTest.java b/sjp-command/sjp-command-handler/src/test/java/uk/gov/moj/cpp/sjp/command/handler/RejectPendingDefendantChangesHandlerTest.java index c81bc0736a..1d75b1a63c 100644 --- a/sjp-command/sjp-command-handler/src/test/java/uk/gov/moj/cpp/sjp/command/handler/RejectPendingDefendantChangesHandlerTest.java +++ b/sjp-command/sjp-command-handler/src/test/java/uk/gov/moj/cpp/sjp/command/handler/RejectPendingDefendantChangesHandlerTest.java @@ -29,7 +29,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-command/sjp-command-handler/src/test/java/uk/gov/moj/cpp/sjp/command/handler/ResolveCaseAOCPEligibilityHandlerTest.java b/sjp-command/sjp-command-handler/src/test/java/uk/gov/moj/cpp/sjp/command/handler/ResolveCaseAOCPEligibilityHandlerTest.java index 91ffcbccb3..f30d98d582 100644 --- a/sjp-command/sjp-command-handler/src/test/java/uk/gov/moj/cpp/sjp/command/handler/ResolveCaseAOCPEligibilityHandlerTest.java +++ b/sjp-command/sjp-command-handler/src/test/java/uk/gov/moj/cpp/sjp/command/handler/ResolveCaseAOCPEligibilityHandlerTest.java @@ -35,7 +35,7 @@ import java.util.UUID; import java.util.stream.Stream; -import javax.json.JsonValue; +import jakarta.json.JsonValue; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; diff --git a/sjp-command/sjp-command-handler/src/test/java/uk/gov/moj/cpp/sjp/command/handler/ResolveConvictingCourtHandlerTest.java b/sjp-command/sjp-command-handler/src/test/java/uk/gov/moj/cpp/sjp/command/handler/ResolveConvictingCourtHandlerTest.java index 60d14ed52e..fe039c303e 100644 --- a/sjp-command/sjp-command-handler/src/test/java/uk/gov/moj/cpp/sjp/command/handler/ResolveConvictingCourtHandlerTest.java +++ b/sjp-command/sjp-command-handler/src/test/java/uk/gov/moj/cpp/sjp/command/handler/ResolveConvictingCourtHandlerTest.java @@ -4,7 +4,7 @@ import static java.time.ZoneOffset.UTC; import static java.time.ZonedDateTime.now; import static java.util.UUID.randomUUID; -import static javax.json.JsonValue.NULL; +import static jakarta.json.JsonValue.NULL; import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.MatcherAssert.assertThat; diff --git a/sjp-command/sjp-command-handler/src/test/java/uk/gov/moj/cpp/sjp/command/handler/ResolveConvictionCourtHandlerTest.java b/sjp-command/sjp-command-handler/src/test/java/uk/gov/moj/cpp/sjp/command/handler/ResolveConvictionCourtHandlerTest.java index 820ba399a2..a2b89cfc10 100644 --- a/sjp-command/sjp-command-handler/src/test/java/uk/gov/moj/cpp/sjp/command/handler/ResolveConvictionCourtHandlerTest.java +++ b/sjp-command/sjp-command-handler/src/test/java/uk/gov/moj/cpp/sjp/command/handler/ResolveConvictionCourtHandlerTest.java @@ -4,7 +4,7 @@ import static java.time.ZoneOffset.UTC; import static java.time.ZonedDateTime.now; import static java.util.UUID.randomUUID; -import static javax.json.JsonValue.NULL; +import static jakarta.json.JsonValue.NULL; import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.MatcherAssert.assertThat; diff --git a/sjp-command/sjp-command-handler/src/test/java/uk/gov/moj/cpp/sjp/command/handler/SessionHandlerTest.java b/sjp-command/sjp-command-handler/src/test/java/uk/gov/moj/cpp/sjp/command/handler/SessionHandlerTest.java index 235f2a3be6..7c0a8f68a9 100644 --- a/sjp-command/sjp-command-handler/src/test/java/uk/gov/moj/cpp/sjp/command/handler/SessionHandlerTest.java +++ b/sjp-command/sjp-command-handler/src/test/java/uk/gov/moj/cpp/sjp/command/handler/SessionHandlerTest.java @@ -55,7 +55,7 @@ import java.util.UUID; import java.util.stream.Stream; -import javax.json.JsonObject; +import jakarta.json.JsonObject; import com.fasterxml.jackson.databind.ObjectMapper; import org.junit.jupiter.api.BeforeEach; diff --git a/sjp-command/sjp-command-handler/src/test/java/uk/gov/moj/cpp/sjp/command/handler/TransparencyReportHandlerTest.java b/sjp-command/sjp-command-handler/src/test/java/uk/gov/moj/cpp/sjp/command/handler/TransparencyReportHandlerTest.java index 35a838d609..792c135ca3 100644 --- a/sjp-command/sjp-command-handler/src/test/java/uk/gov/moj/cpp/sjp/command/handler/TransparencyReportHandlerTest.java +++ b/sjp-command/sjp-command-handler/src/test/java/uk/gov/moj/cpp/sjp/command/handler/TransparencyReportHandlerTest.java @@ -49,8 +49,8 @@ import java.util.UUID; import java.util.stream.Stream; -import javax.json.JsonArrayBuilder; -import javax.json.JsonObject; +import jakarta.json.JsonArrayBuilder; +import jakarta.json.JsonObject; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; diff --git a/sjp-command/sjp-command-handler/src/test/java/uk/gov/moj/cpp/sjp/command/handler/UpdateAllFinancialMeansCommandHandlerTest.java b/sjp-command/sjp-command-handler/src/test/java/uk/gov/moj/cpp/sjp/command/handler/UpdateAllFinancialMeansCommandHandlerTest.java index 64377e1054..9fecb31967 100644 --- a/sjp-command/sjp-command-handler/src/test/java/uk/gov/moj/cpp/sjp/command/handler/UpdateAllFinancialMeansCommandHandlerTest.java +++ b/sjp-command/sjp-command-handler/src/test/java/uk/gov/moj/cpp/sjp/command/handler/UpdateAllFinancialMeansCommandHandlerTest.java @@ -2,7 +2,7 @@ import static com.jayway.jsonpath.matchers.JsonPathMatchers.withJsonPath; import static java.util.UUID.randomUUID; -import static javax.json.JsonValue.NULL; +import static jakarta.json.JsonValue.NULL; import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.CoreMatchers.nullValue; import static org.hamcrest.Matchers.allOf; diff --git a/sjp-command/sjp-command-handler/src/test/java/uk/gov/moj/cpp/sjp/command/handler/UpdateCaseApplicationHandlerTest.java b/sjp-command/sjp-command-handler/src/test/java/uk/gov/moj/cpp/sjp/command/handler/UpdateCaseApplicationHandlerTest.java index 790d1067c6..5213346918 100644 --- a/sjp-command/sjp-command-handler/src/test/java/uk/gov/moj/cpp/sjp/command/handler/UpdateCaseApplicationHandlerTest.java +++ b/sjp-command/sjp-command-handler/src/test/java/uk/gov/moj/cpp/sjp/command/handler/UpdateCaseApplicationHandlerTest.java @@ -40,7 +40,7 @@ import java.util.UUID; import java.util.stream.Stream; -import javax.json.JsonObjectBuilder; +import jakarta.json.JsonObjectBuilder; import org.hamcrest.Matchers; import org.hamcrest.core.AllOf; diff --git a/sjp-command/sjp-command-handler/src/test/java/uk/gov/moj/cpp/sjp/command/handler/UpdateDefendantDetailsFromCCHandlerTest.java b/sjp-command/sjp-command-handler/src/test/java/uk/gov/moj/cpp/sjp/command/handler/UpdateDefendantDetailsFromCCHandlerTest.java index e13ac612a4..79ffd2b124 100644 --- a/sjp-command/sjp-command-handler/src/test/java/uk/gov/moj/cpp/sjp/command/handler/UpdateDefendantDetailsFromCCHandlerTest.java +++ b/sjp-command/sjp-command-handler/src/test/java/uk/gov/moj/cpp/sjp/command/handler/UpdateDefendantDetailsFromCCHandlerTest.java @@ -39,8 +39,8 @@ import java.util.UUID; -import javax.json.JsonObject; -import javax.json.JsonObjectBuilder; +import jakarta.json.JsonObject; +import jakarta.json.JsonObjectBuilder; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; diff --git a/sjp-command/sjp-command-handler/src/test/java/uk/gov/moj/cpp/sjp/command/handler/UpdateDefendantDetailsHandlerTest.java b/sjp-command/sjp-command-handler/src/test/java/uk/gov/moj/cpp/sjp/command/handler/UpdateDefendantDetailsHandlerTest.java index f75d16ec88..6f3e64ae0f 100644 --- a/sjp-command/sjp-command-handler/src/test/java/uk/gov/moj/cpp/sjp/command/handler/UpdateDefendantDetailsHandlerTest.java +++ b/sjp-command/sjp-command-handler/src/test/java/uk/gov/moj/cpp/sjp/command/handler/UpdateDefendantDetailsHandlerTest.java @@ -39,8 +39,8 @@ import java.time.LocalDate; import java.util.UUID; -import javax.json.JsonObject; -import javax.json.JsonObjectBuilder; +import jakarta.json.JsonObject; +import jakarta.json.JsonObjectBuilder; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; diff --git a/sjp-command/sjp-command-handler/src/test/java/uk/gov/moj/cpp/sjp/command/handler/UpdateDefendantNationalInsuranceNumberHandlerTest.java b/sjp-command/sjp-command-handler/src/test/java/uk/gov/moj/cpp/sjp/command/handler/UpdateDefendantNationalInsuranceNumberHandlerTest.java index ec183a53a2..708dc42858 100644 --- a/sjp-command/sjp-command-handler/src/test/java/uk/gov/moj/cpp/sjp/command/handler/UpdateDefendantNationalInsuranceNumberHandlerTest.java +++ b/sjp-command/sjp-command-handler/src/test/java/uk/gov/moj/cpp/sjp/command/handler/UpdateDefendantNationalInsuranceNumberHandlerTest.java @@ -29,7 +29,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-command/sjp-command-handler/src/test/java/uk/gov/moj/cpp/sjp/command/handler/UploadCaseDocumentHandlerTest.java b/sjp-command/sjp-command-handler/src/test/java/uk/gov/moj/cpp/sjp/command/handler/UploadCaseDocumentHandlerTest.java index 27764e1eec..dfc5d20d56 100644 --- a/sjp-command/sjp-command-handler/src/test/java/uk/gov/moj/cpp/sjp/command/handler/UploadCaseDocumentHandlerTest.java +++ b/sjp-command/sjp-command-handler/src/test/java/uk/gov/moj/cpp/sjp/command/handler/UploadCaseDocumentHandlerTest.java @@ -33,7 +33,7 @@ import java.util.UUID; import java.util.stream.Stream; -import javax.json.JsonObjectBuilder; +import jakarta.json.JsonObjectBuilder; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/sjp-command/sjp-command-handler/src/test/java/uk/gov/moj/cpp/sjp/command/handler/builder/AddCaseDocumentCommandBuilder.java b/sjp-command/sjp-command-handler/src/test/java/uk/gov/moj/cpp/sjp/command/handler/builder/AddCaseDocumentCommandBuilder.java index 84a718a290..2ff6e8cfbc 100644 --- a/sjp-command/sjp-command-handler/src/test/java/uk/gov/moj/cpp/sjp/command/handler/builder/AddCaseDocumentCommandBuilder.java +++ b/sjp-command/sjp-command-handler/src/test/java/uk/gov/moj/cpp/sjp/command/handler/builder/AddCaseDocumentCommandBuilder.java @@ -13,7 +13,7 @@ import java.util.UUID; -import javax.json.JsonObjectBuilder; +import jakarta.json.JsonObjectBuilder; public class AddCaseDocumentCommandBuilder { diff --git a/sjp-command/sjp-command-handler/src/test/java/uk/gov/moj/cpp/sjp/command/handler/builder/CaseReopenDetailsBuilder.java b/sjp-command/sjp-command-handler/src/test/java/uk/gov/moj/cpp/sjp/command/handler/builder/CaseReopenDetailsBuilder.java index 68bb239cbe..a2a8573259 100644 --- a/sjp-command/sjp-command-handler/src/test/java/uk/gov/moj/cpp/sjp/command/handler/builder/CaseReopenDetailsBuilder.java +++ b/sjp-command/sjp-command-handler/src/test/java/uk/gov/moj/cpp/sjp/command/handler/builder/CaseReopenDetailsBuilder.java @@ -15,7 +15,7 @@ import uk.gov.justice.services.messaging.JsonEnvelope; import uk.gov.moj.cpp.sjp.domain.CaseReopenDetails; -import javax.json.JsonObject; +import jakarta.json.JsonObject; public class CaseReopenDetailsBuilder { diff --git a/sjp-command/sjp-command-handler/src/test/java/uk/gov/moj/cpp/sjp/command/handler/converter/BaseConverterTest.java b/sjp-command/sjp-command-handler/src/test/java/uk/gov/moj/cpp/sjp/command/handler/converter/BaseConverterTest.java index ee9499b172..26e9e2bb0f 100644 --- a/sjp-command/sjp-command-handler/src/test/java/uk/gov/moj/cpp/sjp/command/handler/converter/BaseConverterTest.java +++ b/sjp-command/sjp-command-handler/src/test/java/uk/gov/moj/cpp/sjp/command/handler/converter/BaseConverterTest.java @@ -8,8 +8,8 @@ import java.io.IOException; import java.io.InputStream; -import javax.json.JsonObject; -import javax.json.JsonReader; +import jakarta.json.JsonObject; +import jakarta.json.JsonReader; import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Mock; diff --git a/sjp-command/sjp-command-handler/src/test/java/uk/gov/moj/cpp/sjp/command/handler/service/EnforcementAreaServiceTest.java b/sjp-command/sjp-command-handler/src/test/java/uk/gov/moj/cpp/sjp/command/handler/service/EnforcementAreaServiceTest.java index 5b674e8f3c..5ef6ace0d5 100644 --- a/sjp-command/sjp-command-handler/src/test/java/uk/gov/moj/cpp/sjp/command/handler/service/EnforcementAreaServiceTest.java +++ b/sjp-command/sjp-command-handler/src/test/java/uk/gov/moj/cpp/sjp/command/handler/service/EnforcementAreaServiceTest.java @@ -11,7 +11,7 @@ import java.util.Optional; -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-command/sjp-command-handler/src/test/java/uk/gov/moj/cpp/sjp/command/handler/service/ReferenceDataServiceTest.java b/sjp-command/sjp-command-handler/src/test/java/uk/gov/moj/cpp/sjp/command/handler/service/ReferenceDataServiceTest.java index b28a1062f7..2a64cdc04d 100644 --- a/sjp-command/sjp-command-handler/src/test/java/uk/gov/moj/cpp/sjp/command/handler/service/ReferenceDataServiceTest.java +++ b/sjp-command/sjp-command-handler/src/test/java/uk/gov/moj/cpp/sjp/command/handler/service/ReferenceDataServiceTest.java @@ -24,8 +24,8 @@ import java.util.Optional; import java.util.UUID; -import javax.json.JsonObject; -import javax.json.JsonValue; +import jakarta.json.JsonObject; +import jakarta.json.JsonValue; import com.fasterxml.jackson.databind.ObjectMapper; import org.junit.jupiter.api.Test; diff --git a/sjp-domain/pom.xml b/sjp-domain/pom.xml index 3976cf0f11..61cd88ae9d 100644 --- a/sjp-domain/pom.xml +++ b/sjp-domain/pom.xml @@ -5,7 +5,7 @@ uk.gov.moj.cpp.sjp sjp-parent - 17.104.193-SNAPSHOT + 25.104.0-M1-SNAPSHOT sjp-domain diff --git a/sjp-domain/sjp-domain-aggregate/pom.xml b/sjp-domain/sjp-domain-aggregate/pom.xml index 6013957d3d..7f9d1d4c64 100644 --- a/sjp-domain/sjp-domain-aggregate/pom.xml +++ b/sjp-domain/sjp-domain-aggregate/pom.xml @@ -5,7 +5,7 @@ uk.gov.moj.cpp.sjp sjp-domain - 17.104.193-SNAPSHOT + 25.104.0-M1-SNAPSHOT sjp-domain-aggregate @@ -79,9 +79,9 @@ messaging-core - javax.el - javax.el-api - ${javax.el-api.version} + jakarta.el + jakarta.el-api + ${jakarta.el-api.version} org.junit.jupiter diff --git a/sjp-domain/sjp-domain-aggregate/src/main/java/uk/gov/moj/cpp/sjp/domain/aggregate/CaseAggregate.java b/sjp-domain/sjp-domain-aggregate/src/main/java/uk/gov/moj/cpp/sjp/domain/aggregate/CaseAggregate.java index fe938520dc..bd161896c0 100644 --- a/sjp-domain/sjp-domain-aggregate/src/main/java/uk/gov/moj/cpp/sjp/domain/aggregate/CaseAggregate.java +++ b/sjp-domain/sjp-domain-aggregate/src/main/java/uk/gov/moj/cpp/sjp/domain/aggregate/CaseAggregate.java @@ -76,7 +76,7 @@ import uk.gov.moj.cpp.sjp.event.CaseStatusChanged; import uk.gov.moj.cpp.sjp.event.CaseListedInCriminalCourtsUpdated; -import javax.json.JsonObject; +import jakarta.json.JsonObject; import java.math.BigDecimal; import java.time.LocalDate; import java.time.ZonedDateTime; diff --git a/sjp-domain/sjp-domain-aggregate/src/main/java/uk/gov/moj/cpp/sjp/domain/aggregate/CaseManagementStatusAggregate.java b/sjp-domain/sjp-domain-aggregate/src/main/java/uk/gov/moj/cpp/sjp/domain/aggregate/CaseManagementStatusAggregate.java index 48736d85d6..b0aa26c4f4 100644 --- a/sjp-domain/sjp-domain-aggregate/src/main/java/uk/gov/moj/cpp/sjp/domain/aggregate/CaseManagementStatusAggregate.java +++ b/sjp-domain/sjp-domain-aggregate/src/main/java/uk/gov/moj/cpp/sjp/domain/aggregate/CaseManagementStatusAggregate.java @@ -17,7 +17,7 @@ import java.util.stream.Collectors; import java.util.stream.Stream; -import javax.json.JsonObject; +import jakarta.json.JsonObject; public class CaseManagementStatusAggregate implements Aggregate { diff --git a/sjp-domain/sjp-domain-aggregate/src/main/java/uk/gov/moj/cpp/sjp/domain/aggregate/PressTransparencyReportAggregate.java b/sjp-domain/sjp-domain-aggregate/src/main/java/uk/gov/moj/cpp/sjp/domain/aggregate/PressTransparencyReportAggregate.java index 5d65e79264..53a0419663 100644 --- a/sjp-domain/sjp-domain-aggregate/src/main/java/uk/gov/moj/cpp/sjp/domain/aggregate/PressTransparencyReportAggregate.java +++ b/sjp-domain/sjp-domain-aggregate/src/main/java/uk/gov/moj/cpp/sjp/domain/aggregate/PressTransparencyReportAggregate.java @@ -24,7 +24,7 @@ import java.util.UUID; import java.util.stream.Stream; -import javax.json.JsonObject; +import jakarta.json.JsonObject; public class PressTransparencyReportAggregate implements Aggregate { diff --git a/sjp-domain/sjp-domain-aggregate/src/main/java/uk/gov/moj/cpp/sjp/domain/aggregate/TransparencyReportAggregate.java b/sjp-domain/sjp-domain-aggregate/src/main/java/uk/gov/moj/cpp/sjp/domain/aggregate/TransparencyReportAggregate.java index ad20b1efc4..76584ec4ae 100644 --- a/sjp-domain/sjp-domain-aggregate/src/main/java/uk/gov/moj/cpp/sjp/domain/aggregate/TransparencyReportAggregate.java +++ b/sjp-domain/sjp-domain-aggregate/src/main/java/uk/gov/moj/cpp/sjp/domain/aggregate/TransparencyReportAggregate.java @@ -23,7 +23,7 @@ import java.util.UUID; import java.util.stream.Stream; -import javax.json.JsonObject; +import jakarta.json.JsonObject; public class TransparencyReportAggregate implements Aggregate { diff --git a/sjp-domain/sjp-domain-aggregate/src/main/java/uk/gov/moj/cpp/sjp/domain/aggregate/handler/ResubmitResultsHandler.java b/sjp-domain/sjp-domain-aggregate/src/main/java/uk/gov/moj/cpp/sjp/domain/aggregate/handler/ResubmitResultsHandler.java index 0cac9a93fe..b1be8bb107 100644 --- a/sjp-domain/sjp-domain-aggregate/src/main/java/uk/gov/moj/cpp/sjp/domain/aggregate/handler/ResubmitResultsHandler.java +++ b/sjp-domain/sjp-domain-aggregate/src/main/java/uk/gov/moj/cpp/sjp/domain/aggregate/handler/ResubmitResultsHandler.java @@ -18,7 +18,7 @@ import java.time.ZonedDateTime; import java.util.stream.Stream; -import javax.json.JsonObject; +import jakarta.json.JsonObject; @SuppressWarnings({"squid:S1698", "squid:S2259"}) public class ResubmitResultsHandler { diff --git a/sjp-domain/sjp-domain-aggregate/src/main/resources/META-INF/beans.xml b/sjp-domain/sjp-domain-aggregate/src/main/resources/META-INF/beans.xml index e69de29bb2..1d83bc8c5a 100644 --- a/sjp-domain/sjp-domain-aggregate/src/main/resources/META-INF/beans.xml +++ b/sjp-domain/sjp-domain-aggregate/src/main/resources/META-INF/beans.xml @@ -0,0 +1,6 @@ + + + diff --git a/sjp-domain/sjp-domain-aggregate/src/test/java/uk/gov/moj/cpp/sjp/domain/aggregate/CaseApplicationOffenceResultsTest.java b/sjp-domain/sjp-domain-aggregate/src/test/java/uk/gov/moj/cpp/sjp/domain/aggregate/CaseApplicationOffenceResultsTest.java index 6e18e113a0..e31c5ff669 100644 --- a/sjp-domain/sjp-domain-aggregate/src/test/java/uk/gov/moj/cpp/sjp/domain/aggregate/CaseApplicationOffenceResultsTest.java +++ b/sjp-domain/sjp-domain-aggregate/src/test/java/uk/gov/moj/cpp/sjp/domain/aggregate/CaseApplicationOffenceResultsTest.java @@ -23,8 +23,8 @@ import java.util.List; import java.util.stream.Stream; -import javax.json.JsonObject; -import javax.json.JsonReader; +import jakarta.json.JsonObject; +import jakarta.json.JsonReader; import com.google.common.io.Resources; import org.junit.jupiter.api.BeforeEach; diff --git a/sjp-domain/sjp-domain-common/pom.xml b/sjp-domain/sjp-domain-common/pom.xml index 674d817ef3..e18c3ac92f 100644 --- a/sjp-domain/sjp-domain-common/pom.xml +++ b/sjp-domain/sjp-domain-common/pom.xml @@ -5,7 +5,7 @@ uk.gov.moj.cpp.sjp sjp-domain - 17.104.193-SNAPSHOT + 25.104.0-M1-SNAPSHOT @@ -66,7 +66,7 @@ org.glassfish - javax.json + jakarta.json uk.gov.moj.cpp.core.domain diff --git a/sjp-domain/sjp-domain-event-processor/pom.xml b/sjp-domain/sjp-domain-event-processor/pom.xml index 21c74983d2..84eecb57a2 100644 --- a/sjp-domain/sjp-domain-event-processor/pom.xml +++ b/sjp-domain/sjp-domain-event-processor/pom.xml @@ -3,7 +3,7 @@ sjp-domain uk.gov.moj.cpp.sjp - 17.104.193-SNAPSHOT + 25.104.0-M1-SNAPSHOT 4.0.0 diff --git a/sjp-domain/sjp-domain-event/pom.xml b/sjp-domain/sjp-domain-event/pom.xml index c5c9ac393d..71e2f58871 100644 --- a/sjp-domain/sjp-domain-event/pom.xml +++ b/sjp-domain/sjp-domain-event/pom.xml @@ -5,7 +5,7 @@ uk.gov.moj.cpp.sjp sjp-domain - 17.104.193-SNAPSHOT + 25.104.0-M1-SNAPSHOT sjp-domain-event @@ -31,7 +31,7 @@ org.glassfish - javax.json + jakarta.json uk.gov.moj.cpp.sjp diff --git a/sjp-domain/sjp-domain-event/src/main/resources/META-INF/beans.xml b/sjp-domain/sjp-domain-event/src/main/resources/META-INF/beans.xml index e69de29bb2..1d83bc8c5a 100644 --- a/sjp-domain/sjp-domain-event/src/main/resources/META-INF/beans.xml +++ b/sjp-domain/sjp-domain-event/src/main/resources/META-INF/beans.xml @@ -0,0 +1,6 @@ + + + diff --git a/sjp-domain/sjp-domain-event/src/test/java/uk/gov/moj/cpp/sjp/event/CaseAssignedEventBackwardCompatibilityTest.java b/sjp-domain/sjp-domain-event/src/test/java/uk/gov/moj/cpp/sjp/event/CaseAssignedEventBackwardCompatibilityTest.java index b52de100c5..40a542aa2f 100644 --- a/sjp-domain/sjp-domain-event/src/test/java/uk/gov/moj/cpp/sjp/event/CaseAssignedEventBackwardCompatibilityTest.java +++ b/sjp-domain/sjp-domain-event/src/test/java/uk/gov/moj/cpp/sjp/event/CaseAssignedEventBackwardCompatibilityTest.java @@ -15,7 +15,7 @@ import java.util.UUID; -import javax.json.JsonObject; +import jakarta.json.JsonObject; import com.fasterxml.jackson.databind.MapperFeature; import com.fasterxml.jackson.databind.ObjectMapper; diff --git a/sjp-domain/sjp-domain-event/src/test/java/uk/gov/moj/cpp/sjp/event/CaseAssignmentRequestedEventBackwardCompatibilityTest.java b/sjp-domain/sjp-domain-event/src/test/java/uk/gov/moj/cpp/sjp/event/CaseAssignmentRequestedEventBackwardCompatibilityTest.java index eafdc75811..4958237698 100644 --- a/sjp-domain/sjp-domain-event/src/test/java/uk/gov/moj/cpp/sjp/event/CaseAssignmentRequestedEventBackwardCompatibilityTest.java +++ b/sjp-domain/sjp-domain-event/src/test/java/uk/gov/moj/cpp/sjp/event/CaseAssignmentRequestedEventBackwardCompatibilityTest.java @@ -16,7 +16,7 @@ import java.util.UUID; -import javax.json.JsonObject; +import jakarta.json.JsonObject; import com.fasterxml.jackson.databind.MapperFeature; import com.fasterxml.jackson.databind.ObjectMapper; diff --git a/sjp-domain/sjp-domain-event/src/test/java/uk/gov/moj/cpp/sjp/event/decommissioned/CaseAssignmentCreatedTest.java b/sjp-domain/sjp-domain-event/src/test/java/uk/gov/moj/cpp/sjp/event/decommissioned/CaseAssignmentCreatedTest.java index 6aa9ff22b4..943a8567fc 100644 --- a/sjp-domain/sjp-domain-event/src/test/java/uk/gov/moj/cpp/sjp/event/decommissioned/CaseAssignmentCreatedTest.java +++ b/sjp-domain/sjp-domain-event/src/test/java/uk/gov/moj/cpp/sjp/event/decommissioned/CaseAssignmentCreatedTest.java @@ -11,7 +11,7 @@ import java.util.UUID; -import javax.json.JsonObject; +import jakarta.json.JsonObject; import org.junit.jupiter.api.Test; diff --git a/sjp-domain/sjp-domain-event/src/test/java/uk/gov/moj/cpp/sjp/event/decommissioned/CaseAssignmentDeletedTest.java b/sjp-domain/sjp-domain-event/src/test/java/uk/gov/moj/cpp/sjp/event/decommissioned/CaseAssignmentDeletedTest.java index e7826ea9b5..76a28be63e 100644 --- a/sjp-domain/sjp-domain-event/src/test/java/uk/gov/moj/cpp/sjp/event/decommissioned/CaseAssignmentDeletedTest.java +++ b/sjp-domain/sjp-domain-event/src/test/java/uk/gov/moj/cpp/sjp/event/decommissioned/CaseAssignmentDeletedTest.java @@ -11,7 +11,7 @@ import java.util.UUID; -import javax.json.JsonObject; +import jakarta.json.JsonObject; import org.junit.jupiter.api.Test; diff --git a/sjp-domain/sjp-domain-event/src/test/java/uk/gov/moj/cpp/sjp/event/decommissioned/CourtReferralActionedTest.java b/sjp-domain/sjp-domain-event/src/test/java/uk/gov/moj/cpp/sjp/event/decommissioned/CourtReferralActionedTest.java index 1a70e2a6ac..accf516786 100644 --- a/sjp-domain/sjp-domain-event/src/test/java/uk/gov/moj/cpp/sjp/event/decommissioned/CourtReferralActionedTest.java +++ b/sjp-domain/sjp-domain-event/src/test/java/uk/gov/moj/cpp/sjp/event/decommissioned/CourtReferralActionedTest.java @@ -13,7 +13,7 @@ import java.time.format.DateTimeFormatter; import java.util.UUID; -import javax.json.JsonObject; +import jakarta.json.JsonObject; import org.junit.jupiter.api.Test; diff --git a/sjp-domain/sjp-domain-event/src/test/java/uk/gov/moj/cpp/sjp/event/decommissioned/CourtReferralCreatedTest.java b/sjp-domain/sjp-domain-event/src/test/java/uk/gov/moj/cpp/sjp/event/decommissioned/CourtReferralCreatedTest.java index 83228045d3..7ce9185499 100644 --- a/sjp-domain/sjp-domain-event/src/test/java/uk/gov/moj/cpp/sjp/event/decommissioned/CourtReferralCreatedTest.java +++ b/sjp-domain/sjp-domain-event/src/test/java/uk/gov/moj/cpp/sjp/event/decommissioned/CourtReferralCreatedTest.java @@ -13,7 +13,7 @@ import java.time.format.DateTimeFormatter; import java.util.UUID; -import javax.json.JsonObject; +import jakarta.json.JsonObject; import org.junit.jupiter.api.Test; diff --git a/sjp-domain/sjp-domain-event/src/test/java/uk/gov/moj/cpp/sjp/event/decommissioned/CourtReferralNotFoundTest.java b/sjp-domain/sjp-domain-event/src/test/java/uk/gov/moj/cpp/sjp/event/decommissioned/CourtReferralNotFoundTest.java index f2a74a7f1e..c24ea8de78 100644 --- a/sjp-domain/sjp-domain-event/src/test/java/uk/gov/moj/cpp/sjp/event/decommissioned/CourtReferralNotFoundTest.java +++ b/sjp-domain/sjp-domain-event/src/test/java/uk/gov/moj/cpp/sjp/event/decommissioned/CourtReferralNotFoundTest.java @@ -11,7 +11,7 @@ import java.util.UUID; -import javax.json.JsonObject; +import jakarta.json.JsonObject; import org.junit.jupiter.api.Test; diff --git a/sjp-domain/sjp-domain-prosecution/pom.xml b/sjp-domain/sjp-domain-prosecution/pom.xml index f7ffd3f04c..3a6face641 100644 --- a/sjp-domain/sjp-domain-prosecution/pom.xml +++ b/sjp-domain/sjp-domain-prosecution/pom.xml @@ -4,7 +4,7 @@ sjp-domain uk.gov.moj.cpp.sjp - 17.104.193-SNAPSHOT + 25.104.0-M1-SNAPSHOT sjp-domain-prosecution diff --git a/sjp-domain/sjp-domain-transformation/pom.xml b/sjp-domain/sjp-domain-transformation/pom.xml index 2a7fc27b62..dd22a56f87 100644 --- a/sjp-domain/sjp-domain-transformation/pom.xml +++ b/sjp-domain/sjp-domain-transformation/pom.xml @@ -3,7 +3,7 @@ sjp-domain uk.gov.moj.cpp.sjp - 17.104.193-SNAPSHOT + 25.104.0-M1-SNAPSHOT 4.0.0 @@ -12,9 +12,7 @@ pom - sjp-domain-transformation-anonymise sjp-domain-transformation-postcode - diff --git a/sjp-domain/sjp-domain-transformation/sjp-domain-transformation-anonymise/pom.xml b/sjp-domain/sjp-domain-transformation/sjp-domain-transformation-anonymise/pom.xml deleted file mode 100644 index 4f6ed8b713..0000000000 --- a/sjp-domain/sjp-domain-transformation/sjp-domain-transformation-anonymise/pom.xml +++ /dev/null @@ -1,35 +0,0 @@ - - - - sjp-domain-transformation - uk.gov.moj.cpp.sjp - 17.104.193-SNAPSHOT - - 4.0.0 - - sjp-domain-transformation-anonymise - - - - uk.gov.justice - stream-transformation-tool-anonymise - 6.1.2 - - - org.junit.jupiter - junit-jupiter-api - test - - - uk.gov.justice.services - test-utils-core - test - - - ch.qos.logback - logback-classic - - - - - diff --git a/sjp-domain/sjp-domain-transformation/sjp-domain-transformation-anonymise/run-transformation.sh b/sjp-domain/sjp-domain-transformation/sjp-domain-transformation-anonymise/run-transformation.sh deleted file mode 100755 index cb6f48a110..0000000000 --- a/sjp-domain/sjp-domain-transformation/sjp-domain-transformation-anonymise/run-transformation.sh +++ /dev/null @@ -1,30 +0,0 @@ -#!/usr/bin/env bash - -TRANSFORMATION_JAR=$(echo target/sjp-domain-transformation-anonymise*.jar) - -# for framework 5 services, use 5.3.1 -# for framework 6 services, use 6.0.1 -EVENT_TOOL_VERSION=6.4.5 -EVENT_TOOL_JAR=target/dependency/event-tool-${EVENT_TOOL_VERSION}-swarm.jar - -PROCESS_FILE=target/processFile -STANDALONE_XML=src/test/resources/standalone-ds.xml - -echo TRANSFORMATION_JAR=${TRANSFORMATION_JAR} - -[[ ! -f ${TRANSFORMATION_JAR} ]] && echo "File not found: "${TRANSFORMATION_JAR} && exit - -# Download Event Tool JAR -mvn dependency:copy -Dartifact=uk.gov.justice:event-tool:${EVENT_TOOL_VERSION}:jar:swarm - -touch ${PROCESS_FILE} - -java -jar -Dorg.wildfly.swarm.mainProcessFile=${PROCESS_FILE} \ - -DstreamCountReportingInterval=3 \ - -DprocessAllStreams=true \ - -Devent.transformation.jar=${TRANSFORMATION_JAR} ${EVENT_TOOL_JAR} \ - -Dorg.slf4j.simpleLogger.defaultLogLevel=debug \ - -c ${STANDALONE_XML} -Dswarm.http.port=18080 \ - -Dswarm.https.port=18443 \ - -Dswarm.deployment.timeout=3600 | - tee target/transformation.log diff --git a/sjp-domain/sjp-domain-transformation/sjp-domain-transformation-anonymise/src/main/java/uk/gov/moj/cpp/sjp/domain/transformation/anonymise/SjpEventTransformation.java b/sjp-domain/sjp-domain-transformation/sjp-domain-transformation-anonymise/src/main/java/uk/gov/moj/cpp/sjp/domain/transformation/anonymise/SjpEventTransformation.java deleted file mode 100644 index 60709ff58e..0000000000 --- a/sjp-domain/sjp-domain-transformation/sjp-domain-transformation-anonymise/src/main/java/uk/gov/moj/cpp/sjp/domain/transformation/anonymise/SjpEventTransformation.java +++ /dev/null @@ -1,8 +0,0 @@ -package uk.gov.moj.cpp.sjp.domain.transformation.anonymise; - -import uk.gov.justice.tools.eventsourcing.anonymization.EventAnonymiserTransformation; -import uk.gov.justice.tools.eventsourcing.transformation.api.annotation.Transformation; - -@Transformation -public class SjpEventTransformation extends EventAnonymiserTransformation { -} diff --git a/sjp-domain/sjp-domain-transformation/sjp-domain-transformation-anonymise/src/main/resources/events-anonymisation-rule.json b/sjp-domain/sjp-domain-transformation/sjp-domain-transformation-anonymise/src/main/resources/events-anonymisation-rule.json deleted file mode 100644 index c23bc2f940..0000000000 --- a/sjp-domain/sjp-domain-transformation/sjp-domain-transformation-anonymise/src/main/resources/events-anonymisation-rule.json +++ /dev/null @@ -1,297 +0,0 @@ -{ - "events": [ - { - "eventName": "sjp.events.case-assigned", - "fieldsToBeIgnored": [ - "$.caseAssignmentType" - ] - }, - { - "eventName": "sjp.events.case-assignment-rejected", - "fieldsToBeIgnored": [ - "$.reason" - ] - }, - { - "eventName": "sjp.events.case-assignment-requested", - "fieldsToBeIgnored": [ - "$.session.type", - "$.session.courtHouseCode" - ] - }, - { - "eventName": "sjp.events.sjp-case-created", - "fieldsToBeIgnored": [ - "$.urn", - "$.prosecutingAuthority", - "$.initiationCode", - "$.ptiUrn", - "$.summonsCode" - ] - }, - { - "eventName": "sjp.events.case-document-added", - "fieldsToBeIgnored": [ - "$.caseDocument.documentType" - ] - }, - { - "eventName": "sjp.events.case-document-uploaded", - "fieldsToBeIgnored": [ - "$.documentType" - ] - }, - { - "eventName": "sjp.events.case-listed-in-criminal-courts", - "fieldsToBeIgnored": [ - "$.hearingCourtName" - ] - }, - { - "eventName": "sjp.events.case-marked-ready-for-decision", - "fieldsToBeIgnored": [ - "$.reason", - "$.markedAt", - "$.sessionType", - "$.priority" - ] - }, - { - "eventName": "sjp.events.case-note-added", - "fieldsToBeIgnored": [ - "$.note.type" - ] - }, - { - "eventName": "sjp.events.case-received", - "fieldsToBeIgnored": [ - "$.urn", - "$.enterpriseId", - "$.prosecutingAuthority", - "$.defendant.offences[*].libraOffenceCode", - "$.defendant.gender", - "$.defendant.title", - "$.defendant.hearingLanguage" - ] - }, - { - "eventName": "sjp.events.case-referred-for-court-hearing", - "fieldsToBeIgnored": [ - "$.urn", - "$.referredOffences[*].verdict" - ] - }, - { - "eventName": "sjp.events.case-unassignment-rejected", - "fieldsToBeIgnored": [ - "$.reason" - ] - }, - { - "eventName": "sjp.events.defendant-name-updated", - "fieldsToBeIgnored": [ - "$.oldPersonalName.title", - "$.newPersonalName.title" - ] - }, - { - "eventName": "sjp.events.defendant-details-moved-from-people", - "fieldsToBeIgnored": [ - "$.title", - "$.gender" - ] - }, - { - "eventName": "sjp.events.defendant-details-updated", - "fieldsToBeIgnored": [ - "$.title", - "$.gender" - ] - }, - { - "eventName": "sjp.events.delegated-powers-session-started", - "fieldsToBeIgnored": [ - "$.courtHouseCode", - "$.courtHouseName", - "$.localJusticeAreaNationalCourtCode" - ] - }, - { - "eventName": "sjp.events.financial-means-updated", - "fieldsToBeIgnored": [ - "$.income.frequency", - "$.employmentStatus", - "$.outgoings[*].description" - ] - }, - { - "eventName": "sjp.events.magistrate-session-started", - "fieldsToBeIgnored": [ - "$.courtHouseCode", - "$.courtHouseName", - "$.localJusticeAreaNationalCourtCode" - ] - }, - { - "eventName": "sjp.events.online-plea-received", - "fieldsToBeIgnored": [ - "$.urn", - "$.interpreterLanguage", - "$.outgoings[*].description", - "$.financialMeans.employmentStatus", - "$.financialMeans.income.frequency" - ] - }, - { - "eventName": "sjp.events.plea-updated", - "fieldsToBeIgnored": [ - "$.plea", - "$.pleaMethod" - ] - }, - { - "eventName": "sjp.events.transparency-report-generated", - "fieldsToBeIgnored": [ - "$.englishReportMetadata.fileName", - "$.welshReportMetadata.fileName", - "$.pleaMethod" - ] - }, - { - "eventName": "sjp.events.case-status-changed", - "fieldsToBeIgnored": [ - "$.caseStatus" - ] - }, - { - "eventName": "sjp.events.decision-saved", - "fieldsToBeIgnored": [ - "$.offenceDecisions[*].type", - "$.offenceDecisions[*].offenceDecisionInformation.verdict", - "$.offenceDecisions[*].offenceDecisionInformation[*].verdict", - "$.offenceDecisions[*].defendantCourtOptions.interpreter.language", - "$.offenceDecisions[*].dischargeType", - "$.offenceDecisions[*].dischargedFor.unit", - "$.offenceDecisions[*].noCompensationReason", - "$.offenceDecisions[*].magistratesCourt", - "$.offenceDecisions[*].penaltyPointsReason", - "$.offenceDecisions[*].disqualificationType", - "$.offenceDecisions[*].disqualificationPeriod.unit", - "$.financialImposition.payment.paymentType", - "$.financialImposition.payment.reasonWhyNotAttachedOrDeducted", - "$.financialImposition.payment.reasonForDeductingFromBenefits", - "$.financialImposition.payment.fineTransferredTo.nationalCourtCode", - "$.financialImposition.payment.fineTransferredTo.nationalCourtName", - "$.financialImposition.payment.paymentTerms.installments.period" - ] - }, - { - "eventName": "sjp.events.all-financial-means-updated", - "fieldsToBeIgnored": [ - "$.income.frequency", - "$.employmentStatus" - ] - }, - { - "eventName": "sjp.events.employment-status-updated", - "fieldsToBeIgnored": [ - "$.employmentStatus" - ] - }, - { - "eventName": "sjp.events.interpreter-for-defendant-updated", - "fieldsToBeIgnored": [ - "$.interpreter.language" - ] - }, - { - "eventName": "sjp.events.pleaded-guilty", - "fieldsToBeIgnored": [ - "$.method" - ] - }, - { - "eventName": "sjp.events.pleaded-guilty-court-hearing-requested", - "fieldsToBeIgnored": [ - "$.method" - ] - }, - { - "eventName": "sjp.events.pleaded-not-guilty", - "fieldsToBeIgnored": [ - "$.method" - ] - }, - { - "eventName": "sjp.events.pleas-set", - "fieldsToBeIgnored": [ - "$.defendantCourtOptions.interpreter.language", - "$.pleas[*].pleaType" - ] - }, - { - "eventName": "sjp.events.case-assignment-created", - "fieldsToBeIgnored": [ - "$.caseAssignmentType" - ] - }, - { - "eventName": "sjp.events.case-creation-failed-because-case-already-existed", - "fieldsToBeIgnored": [ - "$.urn" - ] - }, - { - "eventName": "sjp.events.case-reopened-in-libra", - "fieldsToBeIgnored": [ - "$.libraCaseNumber", - "$.reason" - ] - }, - { - "eventName": "sjp.events.case-reopened-in-libra-updated", - "fieldsToBeIgnored": [ - "$.libraCaseNumber", - "$.reason" - ] - }, - { - "eventName": "sjp.events.case-update-rejected", - "fieldsToBeIgnored": [ - "$.reason" - ] - }, - { - "eventName": "sjp.events.decision-rejected", - "fieldsToBeIgnored": [ - "$.decision.offenceDecisions[*].type", - "$.decision.offenceDecisions[*].offenceDecisionInformation.verdict" - ] - }, - { - "eventName": "sjp.events.plea-update-denied", - "fieldsToBeIgnored": [ - "$.denialReason" - ] - }, - { - "eventName": "sjp.events.case-management-status-changed", - "fieldsToBeIgnored": [ - "$.caseManagementStatus" - ] - }, - { - "eventName": "sjp.events.update-cases-management-status", - "fieldsToBeIgnored": [ - "$.caseByManagementStatusList[*].caseManagementStatus", - "$.cases[*].caseManagementStatus" - ] - }, - { - "eventName": "sjp.events.transparency-report-metadata-added", - "fieldsToBeIgnored": [ - "$.language" - ] - } - ] -} diff --git a/sjp-domain/sjp-domain-transformation/sjp-domain-transformation-anonymise/src/test/java/uk/gov/moj/cpp/sjp/domain/transformation/anonymise/SjpEventTransformationTest.java b/sjp-domain/sjp-domain-transformation/sjp-domain-transformation-anonymise/src/test/java/uk/gov/moj/cpp/sjp/domain/transformation/anonymise/SjpEventTransformationTest.java deleted file mode 100644 index b956c166f1..0000000000 --- a/sjp-domain/sjp-domain-transformation/sjp-domain-transformation-anonymise/src/test/java/uk/gov/moj/cpp/sjp/domain/transformation/anonymise/SjpEventTransformationTest.java +++ /dev/null @@ -1,400 +0,0 @@ -package uk.gov.moj.cpp.sjp.domain.transformation.anonymise; - -import static com.jayway.jsonpath.matchers.JsonPathMatchers.isJson; -import static com.jayway.jsonpath.matchers.JsonPathMatchers.withJsonPath; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.hamcrest.Matchers.allOf; -import static org.hamcrest.Matchers.is; -import static uk.gov.justice.services.messaging.JsonObjects.createReader; - -import uk.gov.justice.services.messaging.JsonEnvelope; -import uk.gov.justice.services.test.utils.core.enveloper.EnvelopeFactory; -import uk.gov.justice.tools.eventsourcing.anonymization.util.FileUtil; - -import java.io.StringReader; -import java.util.stream.Stream; - -import javax.json.JsonObject; -import javax.json.JsonReader; - -import io.restassured.path.json.JsonPath; -import org.junit.jupiter.api.Test; - -public class SjpEventTransformationTest { - - private AnonymiseUtil anonymiseUtil; - private JsonPath inputJsonPath; - private JsonObject anonymisedJsonObject; - - private static JsonObject jsonFromString(String jsonObjectStr) { - JsonReader jsonReader = createReader(new StringReader(jsonObjectStr)); - JsonObject object = jsonReader.readObject(); - jsonReader.close(); - return object; - } - - public void initialize(final String eventName) { - anonymiseUtil = new AnonymiseUtil().apply(eventName); - inputJsonPath = anonymiseUtil.getInputJsonPath(); - anonymisedJsonObject = anonymiseUtil.getAnonymisedJsonObject(); - } - - @Test - public void sjp_events_case_received() { - initialize("sjp.events.case-received"); - - assertThat(anonymisedJsonObject.toString(), - isJson(allOf( - withJsonPath("$.urn", is(inputJsonPath.getString("urn"))), - withJsonPath("$.enterpriseId", is(inputJsonPath.getString("enterpriseId"))), - withJsonPath("$.prosecutingAuthority", is(inputJsonPath.getString("prosecutingAuthority"))), - withJsonPath("$.defendant.offences[*].libraOffenceCode", is(inputJsonPath.getList("defendant.offences.libraOffenceCode"))), - withJsonPath("$.defendant.gender", is(inputJsonPath.getString("defendant.gender"))), - withJsonPath("$.defendant.title", is(inputJsonPath.getString("defendant.title"))), - withJsonPath("$.defendant.hearingLanguage", is(inputJsonPath.getString("defendant.hearingLanguage"))) - ) - )); - } - - @Test - public void sjp_events_defendant_details_moved_from_people() { - initialize("sjp.events.defendant-details-moved-from-people"); - - assertThat(anonymisedJsonObject.toString(), - isJson(allOf( - withJsonPath("$.gender", is(inputJsonPath.getString("gender"))), - withJsonPath("$.title", is(inputJsonPath.getString("title"))) - ) - )); - } - - @Test - public void sjp_events_financial_means_updated() { - initialize("sjp.events.financial-means-updated"); - - assertThat(anonymisedJsonObject.toString(), - isJson(allOf( - withJsonPath("$.income.frequency", is(inputJsonPath.getString("income.frequency"))), - withJsonPath("$.employmentStatus", is(inputJsonPath.getString("employmentStatus"))), - withJsonPath("$.outgoings[*].description", is(inputJsonPath.getList("outgoings.description"))) - ) - )); - } - - @Test - public void sjp_events_sjp_case_created() { - initialize("sjp.events.sjp-case-created"); - - assertThat(anonymisedJsonObject.toString(), - isJson(allOf( - withJsonPath("$.urn", is(inputJsonPath.getString("urn"))), - withJsonPath("$.prosecutingAuthority", is(inputJsonPath.getString("prosecutingAuthority"))), - withJsonPath("$.initiationCode", is(inputJsonPath.getString("initiationCode"))), - withJsonPath("$.ptiUrn", is(inputJsonPath.getString("ptiUrn"))), - withJsonPath("$.summonsCode", is(inputJsonPath.getString("summonsCode"))) - ) - )); - } - - @Test - public void sjp_events_online_plea_received() { - initialize("sjp.events.online-plea-received"); - - assertThat(anonymisedJsonObject.toString(), - isJson(allOf( - withJsonPath("$.urn", is(inputJsonPath.getString("urn"))), - withJsonPath("$.interpreterLanguage", is(inputJsonPath.getString("interpreterLanguage"))), - withJsonPath("$.outgoings[*].description", is(inputJsonPath.getList("outgoings.description"))), - withJsonPath("$.financialMeans.employmentStatus", is(inputJsonPath.getString("financialMeans.employmentStatus"))), - withJsonPath("$.financialMeans.income.frequency", is(inputJsonPath.getString("financialMeans.income.frequency"))) - ) - )); - } - - @Test - public void sjp_events_case_marked_ready_for_decision() { - initialize("sjp.events.case-marked-ready-for-decision"); - - assertThat(anonymisedJsonObject.toString(), - isJson(allOf( - withJsonPath("$.reason", is(inputJsonPath.getString("reason"))), - withJsonPath("$.markedAt", is(inputJsonPath.getString("markedAt"))), - withJsonPath("$.sessionType", is(inputJsonPath.getString("sessionType"))), - withJsonPath("$.priority", is(inputJsonPath.getString("priority"))) - ) - )); - } - - @Test - public void sjp_events_decision_saved() { - initialize("sjp.events.decision-saved"); - - assertThat(anonymisedJsonObject.toString(), - isJson(allOf( - withJsonPath("$.offenceDecisions[*].type", is(inputJsonPath.getList("offenceDecisions.type"))), - withJsonPath("$.offenceDecisions[*].dischargedFor.unit", is(inputJsonPath.getList("offenceDecisions.dischargedFor.unit"))), - withJsonPath("$.financialImposition.payment.paymentType", is(inputJsonPath.getString("financialImposition.payment.paymentType"))), - withJsonPath("$.financialImposition.payment.reasonWhyNotAttachedOrDeducted", is(inputJsonPath.getString("financialImposition.payment.reasonWhyNotAttachedOrDeducted"))), - withJsonPath("$.financialImposition.payment.reasonForDeductingFromBenefits", is(inputJsonPath.getString("financialImposition.payment.reasonForDeductingFromBenefits"))), - withJsonPath("$.financialImposition.payment.fineTransferredTo.nationalCourtCode", is(inputJsonPath.getString("financialImposition.payment.fineTransferredTo.nationalCourtCode"))), - withJsonPath("$.financialImposition.payment.fineTransferredTo.nationalCourtName", is(inputJsonPath.getString("financialImposition.payment.fineTransferredTo.nationalCourtName"))), - withJsonPath("$.financialImposition.payment.paymentTerms.installments.period", is(inputJsonPath.getString("financialImposition.payment.paymentTerms.installments.period"))) - ) - )); - } - - @Test - public void sjp_events_case_status_changed() { - initialize("sjp.events.case-status-changed"); - - assertThat(anonymisedJsonObject.toString(), - isJson(allOf( - withJsonPath("$.caseStatus", is(inputJsonPath.getString("caseStatus"))) - ) - )); - } - - @Test - public void sjp_events_all_financial_means_updated() { - initialize("sjp.events.all-financial-means-updated"); - - assertThat(anonymisedJsonObject.toString(), - isJson(allOf( - withJsonPath("$.income.frequency", is(inputJsonPath.getString("income.frequency"))), - withJsonPath("$.employmentStatus", is(inputJsonPath.getString("employmentStatus"))) - ) - )); - } - - @Test - public void sjp_events_case_assignment_requested() { - initialize("sjp.events.case-assignment-requested"); - - assertThat(anonymisedJsonObject.toString(), - isJson(allOf( - withJsonPath("$.session.type", is(inputJsonPath.getString("session.type"))) - ) - )); - } - - @Test - public void sjp_events_case_document_uploaded() { - initialize("sjp.events.case-document-uploaded"); - - assertThat(anonymisedJsonObject.toString(), - isJson(allOf( - withJsonPath("$.documentType", is(inputJsonPath.getString("documentType"))) - ) - )); - } - - @Test - public void sjp_events_case_referred_for_court_hearing() { - initialize("sjp.events.case-referred-for-court-hearing"); - - assertThat(anonymisedJsonObject.toString(), - isJson(allOf( - withJsonPath("$.urn", is(inputJsonPath.getString("urn"))), - withJsonPath("$.referredOffences[*].verdict", is(inputJsonPath.getList("referredOffences.verdict"))) - ) - )); - } - - @Test - public void sjp_events_employment_status_updated() { - initialize("sjp.events.employment-status-updated"); - - assertThat(anonymisedJsonObject.toString(), - isJson(allOf( - withJsonPath("$.employmentStatus", is(inputJsonPath.getString("employmentStatus"))) - ) - )); - } - - @Test - public void sjp_events_interpreter_for_defendant_updated() { - initialize("sjp.events.interpreter-for-defendant-updated"); - - assertThat(anonymisedJsonObject.toString(), - isJson(allOf( - withJsonPath("$.interpreter.language", is(inputJsonPath.getString("interpreter.language"))) - ) - )); - } - - @Test - public void sjp_events_magistrate_session_started() { - initialize("sjp.events.delegated-powers-session-started"); - - assertThat(anonymisedJsonObject.toString(), - isJson(allOf( - withJsonPath("$.courtHouseCode", is(inputJsonPath.getString("courtHouseCode"))), - withJsonPath("$.courtHouseName", is(inputJsonPath.getString("courtHouseName"))), - withJsonPath("$.localJusticeAreaNationalCourtCode", is(inputJsonPath.getString("localJusticeAreaNationalCourtCode"))) - ) - )); - } - - @Test - public void sjp_events_pleaded_guilty() { - initialize("sjp.events.pleaded-guilty"); - - assertThat(anonymisedJsonObject.toString(), - isJson(allOf( - withJsonPath("$.method", is(inputJsonPath.getString("method"))) - ) - )); - } - - @Test - public void sjp_events_pleaded_guilty_court_hearing_requested() { - initialize("sjp.events.pleaded-guilty-court-hearing-requested"); - - assertThat(anonymisedJsonObject.toString(), - isJson(allOf( - withJsonPath("$.method", is(inputJsonPath.getString("method"))) - ) - )); - } - - @Test - public void sjp_events_pleaded_not_guilty() { - initialize("sjp.events.pleaded-not-guilty"); - - assertThat(anonymisedJsonObject.toString(), - isJson(allOf( - withJsonPath("$.method", is(inputJsonPath.getString("method"))) - ) - )); - } - - @Test - public void sjp_events_pleas_set() { - initialize("sjp.events.pleas-set"); - - assertThat(anonymisedJsonObject.toString(), - isJson(allOf( - withJsonPath("$.defendantCourtOptions.interpreter.language", is(inputJsonPath.getString("defendantCourtOptions.interpreter.language"))), - withJsonPath("$.pleas[*].pleaType", is(inputJsonPath.getList("pleas.pleaType"))) - ) - )); - } - - @Test - public void sjp_events_case_assignment_created() { - initialize("sjp.events.case-assignment-created"); - - assertThat(anonymisedJsonObject.toString(), - isJson(allOf( - withJsonPath("$.caseAssignmentType", is(inputJsonPath.getString("caseAssignmentType"))) - ) - )); - } - - @Test - public void sjp_events_case_creation_failed_because_case_already_existed() { - initialize("sjp.events.case-creation-failed-because-case-already-existed"); - - assertThat(anonymisedJsonObject.toString(), - isJson(allOf( - withJsonPath("$.urn", is(inputJsonPath.getString("urn"))) - ) - )); - } - - @Test - public void sjp_events_case_reopened_in_libra() { - initialize("sjp.events.case-reopened-in-libra"); - - assertThat(anonymisedJsonObject.toString(), - isJson(allOf( - withJsonPath("$.libraCaseNumber", is(inputJsonPath.getString("libraCaseNumber"))), - withJsonPath("$.reason", is(inputJsonPath.getString("reason"))) - ) - )); - } - - @Test - public void sjp_events_case_reopened_in_libra_updated() { - initialize("sjp.events.case-reopened-in-libra-updated"); - - assertThat(anonymisedJsonObject.toString(), - isJson(allOf( - withJsonPath("$.libraCaseNumber", is(inputJsonPath.getString("libraCaseNumber"))), - withJsonPath("$.reason", is(inputJsonPath.getString("reason"))) - ) - )); - } - - @Test - public void sjp_events_case_update_rejected() { - initialize("sjp.events.case-update-rejected"); - - assertThat(anonymisedJsonObject.toString(), - isJson(allOf( - withJsonPath("$.reason", is(inputJsonPath.getString("reason"))) - ) - )); - } - - @Test - public void sjp_events_plea_update_denied() { - initialize("sjp.events.plea-update-denied"); - - assertThat(anonymisedJsonObject.toString(), - isJson(allOf( - withJsonPath("$.denialReason", is(inputJsonPath.getString("denialReason"))) - ) - )); - } - - @Test - public void sjp_events_decision_rejected() { - initialize("sjp.events.decision-rejected"); - - assertThat(anonymisedJsonObject.toString(), - isJson(allOf( - withJsonPath("$.decision.offenceDecisions[*].type", is(inputJsonPath.getList("decision.offenceDecisions.type"))), - withJsonPath("$.decision.offenceDecisions[*].offenceDecisionInformation.verdict", is(inputJsonPath.getList("decision.offenceDecisions.offenceDecisionInformation.verdict"))) - ) - )); - } - - @Test - public void sjp_events_case_document_added() { - initialize("sjp.events.case-document-added"); - - assertThat(anonymisedJsonObject.toString(), - isJson(allOf( - withJsonPath("$.caseDocument.documentType", is(inputJsonPath.getString("caseDocument.documentType"))) - ) - )); - } - - private static class AnonymiseUtil { - private JsonPath inputJsonPath; - private JsonObject inputJsonObject; - private JsonObject anonymisedJsonObject; - - public JsonPath getInputJsonPath() { - return inputJsonPath; - } - - public JsonObject getAnonymisedJsonObject() { - return anonymisedJsonObject; - } - - public AnonymiseUtil apply(String eventName) { - String fileContentsAsString = FileUtil.getFileContentsAsString(eventName + "/input.json"); - inputJsonPath = JsonPath.from(fileContentsAsString); - - inputJsonObject = jsonFromString(fileContentsAsString); - final JsonEnvelope jsonEnvelope = EnvelopeFactory.createEnvelope(eventName, inputJsonObject); - SjpEventTransformation st = new SjpEventTransformation(); - Stream apply = st.apply(jsonEnvelope); - JsonEnvelope envelope = apply.findFirst().get(); - anonymisedJsonObject = envelope.payloadAsJsonObject(); - return this; - } - } -} diff --git a/sjp-domain/sjp-domain-transformation/sjp-domain-transformation-anonymise/src/test/resources/sjp.events.all-financial-means-updated/input.json b/sjp-domain/sjp-domain-transformation/sjp-domain-transformation-anonymise/src/test/resources/sjp.events.all-financial-means-updated/input.json deleted file mode 100644 index 78702254db..0000000000 --- a/sjp-domain/sjp-domain-transformation/sjp-domain-transformation-anonymise/src/test/resources/sjp.events.all-financial-means-updated/input.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "defendantId": "d8e98a60-ab09-48eb-8623-8438771b7fad", - "income": { - "frequency": "MONTHLY", - "amount": 20000 - }, - "benefits": { - "claimed": true, - "type": "benefit claimed" - }, - "employmentStatus": "EMPLOYED", - "employer": { - "defendantId": "d8e98a60-ab09-48eb-8623-8438771b7fad", - "name": "MOJ", - "employeeReference": "12345", - "phone": "02040700000", - "address": { - "address1": "101 Boleyn", - "address2": "Oxford street", - "address3": "Oxford", - "address4": "London", - "postcode": "E79QG" - } - } -} \ No newline at end of file diff --git a/sjp-domain/sjp-domain-transformation/sjp-domain-transformation-anonymise/src/test/resources/sjp.events.case-assignment-created/input.json b/sjp-domain/sjp-domain-transformation/sjp-domain-transformation-anonymise/src/test/resources/sjp.events.case-assignment-created/input.json deleted file mode 100644 index 5da643e85f..0000000000 --- a/sjp-domain/sjp-domain-transformation/sjp-domain-transformation-anonymise/src/test/resources/sjp.events.case-assignment-created/input.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "caseId": "d8e98a60-ab09-48eb-8623-8438771b7fad", - "caseAssignmentType": "MAGISTRATE_DECISION" -} \ No newline at end of file diff --git a/sjp-domain/sjp-domain-transformation/sjp-domain-transformation-anonymise/src/test/resources/sjp.events.case-assignment-requested/input.json b/sjp-domain/sjp-domain-transformation/sjp-domain-transformation-anonymise/src/test/resources/sjp.events.case-assignment-requested/input.json deleted file mode 100644 index 5f74fcfba7..0000000000 --- a/sjp-domain/sjp-domain-transformation/sjp-domain-transformation-anonymise/src/test/resources/sjp.events.case-assignment-requested/input.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "session": { - "id": "bce0e828-4cd8-4895-9d3e-f833c6596883", - "userId": "a085e359-6069-4694-8820-7810e7dfe762", - "type": "DELEGATED_POWERS", - "courtHouseCode": "B23HS00" - } -} \ No newline at end of file diff --git a/sjp-domain/sjp-domain-transformation/sjp-domain-transformation-anonymise/src/test/resources/sjp.events.case-creation-failed-because-case-already-existed/input.json b/sjp-domain/sjp-domain-transformation/sjp-domain-transformation-anonymise/src/test/resources/sjp.events.case-creation-failed-because-case-already-existed/input.json deleted file mode 100644 index 5c39423a33..0000000000 --- a/sjp-domain/sjp-domain-transformation/sjp-domain-transformation-anonymise/src/test/resources/sjp.events.case-creation-failed-because-case-already-existed/input.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "caseId": "d8e98a60-ab09-48eb-8623-8438771b7fad", - "urn": "TVL6662926140" -} \ No newline at end of file diff --git a/sjp-domain/sjp-domain-transformation/sjp-domain-transformation-anonymise/src/test/resources/sjp.events.case-document-added/input.json b/sjp-domain/sjp-domain-transformation/sjp-domain-transformation-anonymise/src/test/resources/sjp.events.case-document-added/input.json deleted file mode 100644 index b11e2c9729..0000000000 --- a/sjp-domain/sjp-domain-transformation/sjp-domain-transformation-anonymise/src/test/resources/sjp.events.case-document-added/input.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "caseId": "d8f6f161-1050-41e3-b45a-c7ec5709fccd", - "caseDocument": { - "id": "da9ed34b-8783-4fbf-b119-6fd605324cc6", - "materialId": "da9ed34b-8783-4fbf-b119-6fd605324cc6", - "documentType": "PLEA", - "addedAt": "2019-05-31T10:05:03.544Z" - }, - "indexWithinDocumentType": 1 -} \ No newline at end of file diff --git a/sjp-domain/sjp-domain-transformation/sjp-domain-transformation-anonymise/src/test/resources/sjp.events.case-document-uploaded/input.json b/sjp-domain/sjp-domain-transformation/sjp-domain-transformation-anonymise/src/test/resources/sjp.events.case-document-uploaded/input.json deleted file mode 100644 index 78295af2cf..0000000000 --- a/sjp-domain/sjp-domain-transformation/sjp-domain-transformation-anonymise/src/test/resources/sjp.events.case-document-uploaded/input.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "caseId": "e1bfc563-afdf-4c0b-9576-7edd1c43ea84", - "documentReference": "48d6cc32-aea7-42da-ad21-4958e402dcd0", - "documentType": "RESULT_ORDER" -} \ No newline at end of file diff --git a/sjp-domain/sjp-domain-transformation/sjp-domain-transformation-anonymise/src/test/resources/sjp.events.case-marked-ready-for-decision/input.json b/sjp-domain/sjp-domain-transformation/sjp-domain-transformation-anonymise/src/test/resources/sjp.events.case-marked-ready-for-decision/input.json deleted file mode 100644 index 2e4283082f..0000000000 --- a/sjp-domain/sjp-domain-transformation/sjp-domain-transformation-anonymise/src/test/resources/sjp.events.case-marked-ready-for-decision/input.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "caseId": "f72121d9-e8e6-49b4-ad8b-b9c423a288d2", - "reason": "PIA", - "markedAt": "2020-01-07T16:02:46.757Z", - "sessionType": "MAGISTRATE", - "priority": "LOW" -} \ No newline at end of file diff --git a/sjp-domain/sjp-domain-transformation/sjp-domain-transformation-anonymise/src/test/resources/sjp.events.case-received/input.json b/sjp-domain/sjp-domain-transformation/sjp-domain-transformation-anonymise/src/test/resources/sjp.events.case-received/input.json deleted file mode 100644 index b3c9d4b901..0000000000 --- a/sjp-domain/sjp-domain-transformation/sjp-domain-transformation-anonymise/src/test/resources/sjp.events.case-received/input.json +++ /dev/null @@ -1,42 +0,0 @@ -{ - "caseId": "812c9a80-899f-4e95-a357-a9d5c0b76014", - "urn": "TFL36768OKXHK", - "enterpriseId": "HXWRC5W69V8L", - "prosecutingAuthority": "TFL", - "costs": 10, - "postingDate": "2018-11-14", - "defendant": { - "id": "aad0ada0-d83f-4fd3-82ea-94a05dcdb578", - "title": "Mr", - "firstName": "Corden", - "lastName": "NeoNeo", - "dateOfBirth": "1995-12-18", - "gender": "Female", - "nationalInsuranceNumber": "NS421919D", - "address": { - "address1": "Flat 1, Armageddon House", - "address2": "13 Old Road", - "address3": "Giggleswick", - "address4": "Merton", - "postcode": "NN16 1AB" - }, - "numPreviousConvictions": 2, - "offences": [ - { - "id": "22ecca97-17bb-4722-9ca1-79396f5d61c6", - "offenceSequenceNo": 1, - "libraOffenceCode": "TR11053", - "chargeDate": "2018-11-11", - "libraOffenceDateCode": 1, - "offenceDate": "2018-10-28", - "offenceWording": "On 02/07/2015 At threadneedle street EC2 Being a passenger on a Public service Vehicle operated on behalf of London Bus Services Limited being used for the carriage of passengers at separate fares where the vehicle was being operated by a Driver without a Conductor did not as directed by the Driver an Inspector or a Notice displayed on the vehicle pay the fare for the journey in accordance with the direction ", - "prosecutionFacts": "An incident took place at GREEN PARK station whereby you were spoken to by a member of London Underground staff regarding your train journey and the associated fare.The facts of this incidents are now being considered and I must advise you that legal proceedings may be initiated against you regarding this matter in accordance with the LU prosecution policy", - "witnessStatement": "What happened in January was that I decided to take the tube home on Friday eventing from GP.Behind the gates was a Fare inspector and she asked me to show my oyster card. I pulled out my card and showed it only to realize that I was actually not holding my own oyster but my wife's student oyster. We do have several oyster cards at home for when friends visit etc and I must have picked her card as opposed to mine. We are both using our cards regularly to get to work/uni and I did not notice that I was using her card in error.", - "compensation": 16 - } - ], - "hearingLanguage": "E", - "region": "London" - }, - "createdOn": "2018-12-12T17:46:13.010Z" -} diff --git a/sjp-domain/sjp-domain-transformation/sjp-domain-transformation-anonymise/src/test/resources/sjp.events.case-referred-for-court-hearing/input.json b/sjp-domain/sjp-domain-transformation/sjp-domain-transformation-anonymise/src/test/resources/sjp.events.case-referred-for-court-hearing/input.json deleted file mode 100644 index dcef72a3a6..0000000000 --- a/sjp-domain/sjp-domain-transformation/sjp-domain-transformation-anonymise/src/test/resources/sjp.events.case-referred-for-court-hearing/input.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "caseId": "c3baa19b-6660-4b78-bfad-7aa92694302b", - "referredOffences": [ - { - "offenceId": "6b11003d-5db3-4864-bc54-3d1ba3cb6fba", - "verdict": "NO_VERDICT" - }, - { - "offenceId": "bc2158d5-7b40-45e0-8974-bb25bbb375f7", - "verdict": "NO_VERDICT" - } - ], - "estimatedHearingDuration": 20, - "referralReasonId": "d10c5cc4-ec2a-41ac-bd6e-a3659c5cfeb1", - "referredAt": "2020-01-08T15:10:21.032Z", - "decisionId": "f8573955-48fa-4742-b8d8-0353a4ee0b89", - "listingNotes": "My notes", - "urn": "TFL36757727LX" -} \ No newline at end of file diff --git a/sjp-domain/sjp-domain-transformation/sjp-domain-transformation-anonymise/src/test/resources/sjp.events.case-reopened-in-libra-updated/input.json b/sjp-domain/sjp-domain-transformation/sjp-domain-transformation-anonymise/src/test/resources/sjp.events.case-reopened-in-libra-updated/input.json deleted file mode 100644 index 9345427acf..0000000000 --- a/sjp-domain/sjp-domain-transformation/sjp-domain-transformation-anonymise/src/test/resources/sjp.events.case-reopened-in-libra-updated/input.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "caseId": "d8e98a60-ab09-48eb-8623-8438771b7fad", - "reopenedDate": "2017-01-01", - "libraCaseNumber": "LIBRA12345", - "reason": "Mandatory reason" -} \ No newline at end of file diff --git a/sjp-domain/sjp-domain-transformation/sjp-domain-transformation-anonymise/src/test/resources/sjp.events.case-reopened-in-libra/input.json b/sjp-domain/sjp-domain-transformation/sjp-domain-transformation-anonymise/src/test/resources/sjp.events.case-reopened-in-libra/input.json deleted file mode 100644 index 9345427acf..0000000000 --- a/sjp-domain/sjp-domain-transformation/sjp-domain-transformation-anonymise/src/test/resources/sjp.events.case-reopened-in-libra/input.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "caseId": "d8e98a60-ab09-48eb-8623-8438771b7fad", - "reopenedDate": "2017-01-01", - "libraCaseNumber": "LIBRA12345", - "reason": "Mandatory reason" -} \ No newline at end of file diff --git a/sjp-domain/sjp-domain-transformation/sjp-domain-transformation-anonymise/src/test/resources/sjp.events.case-status-changed/input.json b/sjp-domain/sjp-domain-transformation/sjp-domain-transformation-anonymise/src/test/resources/sjp.events.case-status-changed/input.json deleted file mode 100644 index f913aa539f..0000000000 --- a/sjp-domain/sjp-domain-transformation/sjp-domain-transformation-anonymise/src/test/resources/sjp.events.case-status-changed/input.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "caseId": "f72121d9-e8e6-49b4-ad8b-b9c423a288d2", - "caseStatus": "NO_PLEA_RECEIVED_READY_FOR_DECISION" -} \ No newline at end of file diff --git a/sjp-domain/sjp-domain-transformation/sjp-domain-transformation-anonymise/src/test/resources/sjp.events.case-update-rejected/input.json b/sjp-domain/sjp-domain-transformation/sjp-domain-transformation-anonymise/src/test/resources/sjp.events.case-update-rejected/input.json deleted file mode 100644 index d28c877be3..0000000000 --- a/sjp-domain/sjp-domain-transformation/sjp-domain-transformation-anonymise/src/test/resources/sjp.events.case-update-rejected/input.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "caseId": "d8e98a60-ab09-48eb-8623-8438771b7fad", - "reason": "WITHDRAWAL_PENDING" -} \ No newline at end of file diff --git a/sjp-domain/sjp-domain-transformation/sjp-domain-transformation-anonymise/src/test/resources/sjp.events.decision-rejected/input.json b/sjp-domain/sjp-domain-transformation/sjp-domain-transformation-anonymise/src/test/resources/sjp.events.decision-rejected/input.json deleted file mode 100644 index 073775a8ad..0000000000 --- a/sjp-domain/sjp-domain-transformation/sjp-domain-transformation-anonymise/src/test/resources/sjp.events.decision-rejected/input.json +++ /dev/null @@ -1,36 +0,0 @@ -{ - "decision": { - "decisionId": "7dfcf915-adb2-4ce0-9a81-bf45072f7bac", - "sessionId": "ab73f106-ec06-48a3-8cf4-f329891ba548", - "caseId": "c4ec3a35-76bf-4649-b43a-761e71c3765e", - "note": "Wrongly convicted", - "savedAt": "2019-05-01T13:47:06.517Z", - "savedBy": { - "firstName": "Erica", - "lastName": "Wilson", - "userId": "4c8770db-02e6-4f4b-829e-2af9ea97d12f" - }, - "offenceDecisions": [ - { - "type": "WITHDRAW", - "offenceDecisionInformation": { - "offenceId": "042c541a-55b5-4f66-98f0-46b9e560f1b5", - "verdict": "NO_VERDICT" - }, - "withdrawalReasonId": "f89302ea-9ad4-44e7-8e5d-5c4ef1171ca6" - }, - { - "type": "WITHDRAW", - "offenceDecisionInformation": { - "offenceId": "b6c0eb95-e27d-42b8-8f42-e8765860a46c", - "verdict": "NO_VERDICT" - }, - "withdrawalReasonId": "f89302ea-9ad4-44e7-8e5d-5c4ef1171ca6" - } - ] - }, - "rejectionReasons": [ - "Offence b6c0eb95-e27d-42b8-8f42-e8765860a46c already has a final decision", - "Offence 042c541a-55b5-4f66-98f0-46b9e560f1b5 already has a final decision" - ] -} diff --git a/sjp-domain/sjp-domain-transformation/sjp-domain-transformation-anonymise/src/test/resources/sjp.events.decision-saved/input.json b/sjp-domain/sjp-domain-transformation/sjp-domain-transformation-anonymise/src/test/resources/sjp.events.decision-saved/input.json deleted file mode 100644 index e74a1b8a0c..0000000000 --- a/sjp-domain/sjp-domain-transformation/sjp-domain-transformation-anonymise/src/test/resources/sjp.events.decision-saved/input.json +++ /dev/null @@ -1,146 +0,0 @@ -{ - "decisionId": "079e4889-e938-4056-8d6f-cc43511218ff", - "sessionId": "d7e68305-98b0-4b1a-ba3d-041009eea126", - "caseId": "2b484dc8-9477-47c4-ab4c-d24007d74846", - "savedAt": "2020-01-07T16:33:50.376Z", - "offenceDecisions": [ - { - "type": "ADJOURN", - "id": "62b99f2e-2b13-4a5d-a09d-97d276af5aa7", - "offenceDecisionInformation": [ - { - "offenceId": "a2c78db0-2756-4570-921a-cde92b3885fe", - "verdict": "NO_VERDICT" - } - ], - "reason": "not enough arguments", - "adjournTo": "2020-01-29" - }, - { - "type": "WITHDRAW", - "id": "5d822529-4496-4b8a-a770-720f0d8531a5", - "offenceDecisionInformation": { - "offenceId": "ca7b10ae-f9a0-4b49-9e8f-0c4b5b55b4f7", - "verdict": "NO_VERDICT" - }, - "withdrawalReasonId": "030d4335-f9fe-39e0-ad7e-d01a0791ff87" - }, - { - "type": "DISMISS", - "id": "45e286ab-7535-4b95-a1a0-5b52f8ea6932", - "offenceDecisionInformation": { - "offenceId": "19f8c2d8-f796-467c-9f7a-938d811e1f2f", - "verdict": "FOUND_NOT_GUILTY" - } - }, - { - "type": "REFERRED_FOR_FUTURE_SJP_SESSION", - "id": "45e286ab-7535-4b95-a1a0-5b52f8ea6932", - "offenceDecisionInformation": [ - { - "offenceId": "6b11003d-5db3-4864-bc54-3d1ba3cb6fba", - "verdict": "NO_VERDICT" - }, - { - "offenceId": "bc2158d5-7b40-45e0-8974-bb25bbb375f7", - "verdict": "NO_VERDICT" - } - ] - }, - { - "type": "DISCHARGE", - "id": "716681dd-7dbf-44e5-bb38-d586108e6bf6", - "offenceDecisionInformation": { - "offenceId": "8c15b323-2dcc-4fba-a99e-3360bdda3d05", - "verdict": "PROVED_SJP" - }, - "dischargeType": "ABSOLUTE", - "compensation": 0, - "noCompensationReason": "Limited means of the defendant", - "guiltyPleaTakenIntoAccount": false - }, - { - "type": "FINANCIAL_PENALTY", - "id": "29c46e7d-b1be-4b9d-885b-72d3773776cf", - "offenceDecisionInformation": { - "offenceId": "b6e17d9f-2e77-4f58-bbc4-36c819929510", - "verdict": "PROVED_SJP" - }, - "fine": 220, - "compensation": 0, - "noCompensationReason": "There is no loss or damage", - "guiltyPleaTakenIntoAccount": false - }, - { - "type": "REFER_FOR_COURT_HEARING", - "id": "063b2ede-20e1-401c-8cdd-d8df2a2c6a63", - "offenceDecisionInformation": [ - { - "offenceId": "6b11003d-5db3-4864-bc54-3d1ba3cb6fba", - "verdict": "NO_VERDICT" - }, - { - "offenceId": "bc2158d5-7b40-45e0-8974-bb25bbb375f7", - "verdict": "NO_VERDICT" - } - ], - "referralReasonId": "d10c5cc4-ec2a-41ac-bd6e-a3659c5cfeb1", - "estimatedHearingDuration": 20, - "defendantCourtOptions": { - "interpreter": { - "needed": false - }, - "welshHearing": false - } - }, - { - "type": "REFERRED_TO_OPEN_COURT", - "id": "063b2ede-20e1-401c-8cdd-d8df2a2c6a63", - "offenceDecisionInformation": [ - { - "offenceId": "6b11003d-5db3-4864-bc54-3d1ba3cb6fba", - "verdict": "NO_VERDICT" - }, - { - "offenceId": "bc2158d5-7b40-45e0-8974-bb25bbb375f7", - "verdict": "NO_VERDICT" - } - ], - "referredToCourt": "", - "referredToRoom": 20, - "referredToDateTime": "2020-01-07T16:33:50.376Z", - "reason": "Random reason", - "magistratesCourt": "A magistrates court" - } - ], - "financialImposition": { - "costsAndSurcharge": { - "costs": 0, - "reasonForNoCosts": "sdfsdf", - "victimSurcharge": 32, - "collectionOrderMade": true - }, - "payment": { - "totalSum": 252, - "paymentType": "PAY_TO_COURT", - "reasonWhyNotAttachedOrDeducted": "No information from defendant", - "reasonForDeductingFromBenefits": "COMPENSATION_ORDERED", - "paymentTerms": { - "reserveTerms": false, - "lumpSum": { - "amount": 252, - "withinDays": 14 - }, - "installments": { - "amount": 252, - "period": "MONTHLY", - "startDate": "2020-01-07" - } - }, - "fineTransferredTo": { - "nationalCourtCode": "1753", - "nationalCourtName": "South Cumbria Magistrates' Court" - } - } - } -} \ No newline at end of file diff --git a/sjp-domain/sjp-domain-transformation/sjp-domain-transformation-anonymise/src/test/resources/sjp.events.defendant-details-moved-from-people/input.json b/sjp-domain/sjp-domain-transformation/sjp-domain-transformation-anonymise/src/test/resources/sjp.events.defendant-details-moved-from-people/input.json deleted file mode 100644 index 0d71968419..0000000000 --- a/sjp-domain/sjp-domain-transformation/sjp-domain-transformation-anonymise/src/test/resources/sjp.events.defendant-details-moved-from-people/input.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "caseId": "062e2d75-fd24-4725-9fee-4f9e8020383e", - "personId": "ba85e3ef-d180-4fa3-a1bf-fb8d9fd2a662", - "title": "Mr", - "firstName": "John", - "lastName": "Major", - "dateOfBirth": "1998-08-23", - "gender": "Male", - "contactNumber": {}, - "address": { - "address1": "", - "address2": "TJlbXPYOVJfUGCJZBzBiP", - "address3": "RXhHkb", - "address4": "", - "postcode": "AA1A 1AA" - } -} \ No newline at end of file diff --git a/sjp-domain/sjp-domain-transformation/sjp-domain-transformation-anonymise/src/test/resources/sjp.events.delegated-powers-session-started/input.json b/sjp-domain/sjp-domain-transformation/sjp-domain-transformation-anonymise/src/test/resources/sjp.events.delegated-powers-session-started/input.json deleted file mode 100644 index f995406515..0000000000 --- a/sjp-domain/sjp-domain-transformation/sjp-domain-transformation-anonymise/src/test/resources/sjp.events.delegated-powers-session-started/input.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "sessionId": "93b81f22-a530-4c55-80ca-6489f0ea1371", - "userId": "a085e359-6069-4694-8820-7810e7dfe762", - "courtHouseCode": "B23HS00", - "courtHouseName": "Leamington Spa Magistrates' Court", - "localJusticeAreaNationalCourtCode": "2905", - "startedAt": "2020-01-08T15:06:21.400Z" -} \ No newline at end of file diff --git a/sjp-domain/sjp-domain-transformation/sjp-domain-transformation-anonymise/src/test/resources/sjp.events.employment-status-updated/input.json b/sjp-domain/sjp-domain-transformation/sjp-domain-transformation-anonymise/src/test/resources/sjp.events.employment-status-updated/input.json deleted file mode 100644 index bfb2cb71ce..0000000000 --- a/sjp-domain/sjp-domain-transformation/sjp-domain-transformation-anonymise/src/test/resources/sjp.events.employment-status-updated/input.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "defendantId": "4d025b95-4a83-4236-92fb-19692e8af956", - "employmentStatus": "EMPLOYED" -} \ No newline at end of file diff --git a/sjp-domain/sjp-domain-transformation/sjp-domain-transformation-anonymise/src/test/resources/sjp.events.financial-means-updated/input.json b/sjp-domain/sjp-domain-transformation/sjp-domain-transformation-anonymise/src/test/resources/sjp.events.financial-means-updated/input.json deleted file mode 100644 index 47e541f0d7..0000000000 --- a/sjp-domain/sjp-domain-transformation/sjp-domain-transformation-anonymise/src/test/resources/sjp.events.financial-means-updated/input.json +++ /dev/null @@ -1,35 +0,0 @@ -{ - "defendantId": "07584fcb-b6df-41e2-8e86-87911f1b61fe", - "income": { - "frequency": "MONTHLY", - "amount": 4000 - }, - "benefits": { - "claimed": false - }, - "employmentStatus": "SELF_EMPLOYED", - "outgoings": [ - { - "description": "Accommodation", - "amount": 1200 - }, - { - "description": "Council Tax", - "amount": 200 - }, - { - "description": "Household Bills", - "amount": 130 - }, - { - "description": "Travel Expenses", - "amount": 100 - }, - { - "description": "Child Maintenance", - "amount": 0 - } - ], - "updatedByOnlinePlea": true, - "updatedDate": "2019-11-22T11:47:43.705Z" -} \ No newline at end of file diff --git a/sjp-domain/sjp-domain-transformation/sjp-domain-transformation-anonymise/src/test/resources/sjp.events.interpreter-for-defendant-updated/input.json b/sjp-domain/sjp-domain-transformation/sjp-domain-transformation-anonymise/src/test/resources/sjp.events.interpreter-for-defendant-updated/input.json deleted file mode 100644 index b0eaea7910..0000000000 --- a/sjp-domain/sjp-domain-transformation/sjp-domain-transformation-anonymise/src/test/resources/sjp.events.interpreter-for-defendant-updated/input.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "caseId": "a157bce5-12d8-409c-983f-3852fcdd463f", - "defendantId": "4d025b95-4a83-4236-92fb-19692e8af956", - "interpreter": { - "language": "French", - "needed": true - }, - "updatedByOnlinePlea": true, - "updatedDate": "2020-01-08T15:03:15.672Z" -} \ No newline at end of file diff --git a/sjp-domain/sjp-domain-transformation/sjp-domain-transformation-anonymise/src/test/resources/sjp.events.online-plea-received/input.json b/sjp-domain/sjp-domain-transformation/sjp-domain-transformation-anonymise/src/test/resources/sjp.events.online-plea-received/input.json deleted file mode 100644 index 2abe70d8f8..0000000000 --- a/sjp-domain/sjp-domain-transformation/sjp-domain-transformation-anonymise/src/test/resources/sjp.events.online-plea-received/input.json +++ /dev/null @@ -1,79 +0,0 @@ -{ - "urn": "TVL6662926140", - "caseId": "9afc48be-3b06-4168-8650-41531b23153a", - "defendantId": "e928e0a7-ee54-4371-aed9-b3db794607ae", - "unavailability": "I'm on holiday November 17 to 19", - "interpreterLanguage": "French", - "speakWelsh": true, - "witnessDetails": "My mate Dave", - "witnessDispute": "They are lying", - "outstandingFines": true, - "personalDetails": { - "firstName": "John", - "lastName": "Protractor-6662926140", - "address": { - "address1": "Flat 55", - "address2": "1 Oxford Road", - "address3": "Croydon", - "address4": "Surrey", - "address5": "Greater London", - "postcode": "SW99 1AA" - }, - "contactDetails": { - "home": "0208000888", - "mobile": "07890123123", - "email": "protractor@test.com" - }, - "dateOfBirth": "1977-10-17", - "nationalInsuranceNumber": "AB123456A" - }, - "financialMeans": { - "income": { - "frequency": "MONTHLY", - "amount": 200.25 - }, - "benefits": { - "claimed": true, - "type": "jobseekers allowance", - "deductPenaltyPreference": false - }, - "employmentStatus": "EMPLOYED" - }, - "employer": { - "name": "Pret a manger", - "employeeReference": "12345", - "phone": "020 7998 0007", - "address": { - "address1": "18 Tottenham Court Road", - "address2": "London", - "address3": "England", - "address4": "UK", - "address5": "Greater London", - "postcode": "W1T 1JY" - } - }, - "outgoings": [ - { - "description": "Accommodation" - }, - { - "description": "Council Tax", - "amount": 120.5 - }, - { - "description": "Household bills", - "amount": 50.8 - }, - { - "description": "Travel expenses", - "amount": 100.1 - }, - { - "description": "Child maintenance" - }, - { - "description": "Other expenses required for live", - "amount": 163.6 - } - ] -} \ No newline at end of file diff --git a/sjp-domain/sjp-domain-transformation/sjp-domain-transformation-anonymise/src/test/resources/sjp.events.plea-update-denied/input.json b/sjp-domain/sjp-domain-transformation/sjp-domain-transformation-anonymise/src/test/resources/sjp.events.plea-update-denied/input.json deleted file mode 100644 index 8cf51c5958..0000000000 --- a/sjp-domain/sjp-domain-transformation/sjp-domain-transformation-anonymise/src/test/resources/sjp.events.plea-update-denied/input.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "caseId": "d8e98a60-ab09-48eb-8623-8438771b7fad", - "offenceId": "d8e98a60-ab09-48eb-8623-8438771b7fad", - "plea": "It wasn't me", - "interpreterRequired": false, - "interpreterLanguage": "French", - "denialReason": "Mandatory reason" -} \ No newline at end of file diff --git a/sjp-domain/sjp-domain-transformation/sjp-domain-transformation-anonymise/src/test/resources/sjp.events.pleaded-guilty-court-hearing-requested/input.json b/sjp-domain/sjp-domain-transformation/sjp-domain-transformation-anonymise/src/test/resources/sjp.events.pleaded-guilty-court-hearing-requested/input.json deleted file mode 100644 index d35227c466..0000000000 --- a/sjp-domain/sjp-domain-transformation/sjp-domain-transformation-anonymise/src/test/resources/sjp.events.pleaded-guilty-court-hearing-requested/input.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "caseId": "ad80cc58-00cd-4be4-99b2-725d1d031e6b", - "defendantId": "74fd7baa-0e47-4c8c-9bb3-7c29cb3eebf7", - "offenceId": "65f55d87-f49a-4ed0-8626-c7f9bade72ac", - "method": "POSTAL", - "pleadDate": "2020-01-08T15:04:27.864Z" -} \ No newline at end of file diff --git a/sjp-domain/sjp-domain-transformation/sjp-domain-transformation-anonymise/src/test/resources/sjp.events.pleaded-guilty/input.json b/sjp-domain/sjp-domain-transformation/sjp-domain-transformation-anonymise/src/test/resources/sjp.events.pleaded-guilty/input.json deleted file mode 100644 index 45cbfcffd3..0000000000 --- a/sjp-domain/sjp-domain-transformation/sjp-domain-transformation-anonymise/src/test/resources/sjp.events.pleaded-guilty/input.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "caseId": "a157bce5-12d8-409c-983f-3852fcdd463f", - "defendantId": "4d025b95-4a83-4236-92fb-19692e8af956", - "offenceId": "35c80d48-6a73-499d-952b-4dedb6bb5b09", - "method": "ONLINE", - "mitigation": "I was drunk at the time", - "pleadDate": "2020-01-08T15:03:15.672Z" -} \ No newline at end of file diff --git a/sjp-domain/sjp-domain-transformation/sjp-domain-transformation-anonymise/src/test/resources/sjp.events.pleaded-not-guilty/input.json b/sjp-domain/sjp-domain-transformation/sjp-domain-transformation-anonymise/src/test/resources/sjp.events.pleaded-not-guilty/input.json deleted file mode 100644 index 45cbfcffd3..0000000000 --- a/sjp-domain/sjp-domain-transformation/sjp-domain-transformation-anonymise/src/test/resources/sjp.events.pleaded-not-guilty/input.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "caseId": "a157bce5-12d8-409c-983f-3852fcdd463f", - "defendantId": "4d025b95-4a83-4236-92fb-19692e8af956", - "offenceId": "35c80d48-6a73-499d-952b-4dedb6bb5b09", - "method": "ONLINE", - "mitigation": "I was drunk at the time", - "pleadDate": "2020-01-08T15:03:15.672Z" -} \ No newline at end of file diff --git a/sjp-domain/sjp-domain-transformation/sjp-domain-transformation-anonymise/src/test/resources/sjp.events.pleas-set/input.json b/sjp-domain/sjp-domain-transformation/sjp-domain-transformation-anonymise/src/test/resources/sjp.events.pleas-set/input.json deleted file mode 100644 index 10a243a096..0000000000 --- a/sjp-domain/sjp-domain-transformation/sjp-domain-transformation-anonymise/src/test/resources/sjp.events.pleas-set/input.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "caseId": "9afc48be-3b06-4168-8650-41531b23153a", - "defendantCourtOptions": { - "interpreter": { - "language": "French", - "needed": true - }, - "welshHearing": true - }, - "pleas": [ - { - "defendantId": "e928e0a7-ee54-4371-aed9-b3db794607ae", - "offenceId": "219d77a9-c910-462e-8c38-905fb74e6a51", - "pleaType": "GUILTY", - "mitigation": "I was drunk at the time" - }, - { - "defendantId": "e928e0a7-ee54-4371-aed9-b3db794607ae", - "offenceId": "6744c435-915e-44ff-b467-7286fb7c4c15", - "pleaType": "NOT_GUILTY", - "notGuiltyBecause": "I wasn't there" - } - ] -} \ No newline at end of file diff --git a/sjp-domain/sjp-domain-transformation/sjp-domain-transformation-anonymise/src/test/resources/sjp.events.sjp-case-created/input.json b/sjp-domain/sjp-domain-transformation/sjp-domain-transformation-anonymise/src/test/resources/sjp.events.sjp-case-created/input.json deleted file mode 100644 index 05ebd61b3e..0000000000 --- a/sjp-domain/sjp-domain-transformation/sjp-domain-transformation-anonymise/src/test/resources/sjp.events.sjp-case-created/input.json +++ /dev/null @@ -1,33 +0,0 @@ -{ - "id": "b295197d-0a13-49b2-b252-884fd32601b0", - "urn": "TFL36768OKXHK", - "ptiUrn": "AqfLWIg", - "initiationCode": "W", - "summonsCode": "E", - "prosecutingAuthority": "TVL", - "libraOriginatingOrg": "fdoGVSp", - "libraHearingLocation": "UILUfou", - "dateOfHearing": "2017-05-11", - "timeOfHearing": "XVGjwPkU", - "personId": "cdfe7af1-9bf4-4cf4-81cc-119d823335ae", - "defendantId": "cd23dbea-501d-43dc-ba54-68bfdfdf9853", - "costs": 0.0, - "numPreviousConvictions": 0, - "postingDate": "2017-04-13", - "offences": [ - { - "id": "17170f60-b9b6-42b1-8a51-6f8bbdd2492f", - "prosecutorCaseId": "VUyyxQhDPn", - "offenceSequenceNo": 1, - "libraOffenceCode": "iYtJyMV", - "chargeDate": "2017-04-12", - "libraOffenceDateCode": 1, - "offenceDate": "2017-02-01", - "offenceWording": "TqMblach a a ajdjdjd jJgsHTdjTNLTFLMRgWTwlJ", - "prosecutionFacts": "dmd dd mdmv", - "witnessStatement": "zkjsnfsdfksdnjf ksd fsndkfnsdnfdsfmdsmv", - "compensation": 0.0 - } - ], - "createdOn": "2017-04-12T11:17:39.655Z" -} \ No newline at end of file diff --git a/sjp-domain/sjp-domain-transformation/sjp-domain-transformation-anonymise/src/test/resources/standalone-ds.xml b/sjp-domain/sjp-domain-transformation/sjp-domain-transformation-anonymise/src/test/resources/standalone-ds.xml deleted file mode 100644 index 69f2804bdf..0000000000 --- a/sjp-domain/sjp-domain-transformation/sjp-domain-transformation-anonymise/src/test/resources/standalone-ds.xml +++ /dev/null @@ -1,278 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - postgres - localhost - master - 5432 - sjpeventstore - - sjp - - - public - 0 - - 1 - 10 - 10 - true - - - 100 - - TRANSACTION_READ_COMMITTED - - true - - - sjp - sjp - - - - - - - - - - - org.postgresql.Driver - org.postgresql.xa.PGXADataSource - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/sjp-domain/sjp-domain-transformation/sjp-domain-transformation-postcode/pom.xml b/sjp-domain/sjp-domain-transformation/sjp-domain-transformation-postcode/pom.xml index 902e5d8cb7..5e1401daf8 100644 --- a/sjp-domain/sjp-domain-transformation/sjp-domain-transformation-postcode/pom.xml +++ b/sjp-domain/sjp-domain-transformation/sjp-domain-transformation-postcode/pom.xml @@ -3,7 +3,7 @@ sjp-domain-transformation uk.gov.moj.cpp.sjp - 17.104.193-SNAPSHOT + 25.104.0-M1-SNAPSHOT 4.0.0 @@ -25,8 +25,8 @@ provided - javax - javaee-api + jakarta.platform + jakarta.jakartaee-api provided diff --git a/sjp-domain/sjp-domain-transformation/sjp-domain-transformation-postcode/src/main/java/uk/gov/moj/cpp/sjp/BaseEventTransformer.java b/sjp-domain/sjp-domain-transformation/sjp-domain-transformation-postcode/src/main/java/uk/gov/moj/cpp/sjp/BaseEventTransformer.java index 896db04d08..3216f7afdf 100644 --- a/sjp-domain/sjp-domain-transformation/sjp-domain-transformation-postcode/src/main/java/uk/gov/moj/cpp/sjp/BaseEventTransformer.java +++ b/sjp-domain/sjp-domain-transformation/sjp-domain-transformation-postcode/src/main/java/uk/gov/moj/cpp/sjp/BaseEventTransformer.java @@ -8,8 +8,8 @@ import uk.gov.justice.services.messaging.JsonObjects; import uk.gov.justice.tools.eventsourcing.transformation.api.EventTransformation; -import javax.json.JsonObject; -import javax.json.JsonObjectBuilder; +import jakarta.json.JsonObject; +import jakarta.json.JsonObjectBuilder; public abstract class BaseEventTransformer implements EventTransformation { diff --git a/sjp-domain/sjp-domain-transformation/sjp-domain-transformation-postcode/src/main/java/uk/gov/moj/cpp/sjp/CaseReceivedEventTransformer.java b/sjp-domain/sjp-domain-transformation/sjp-domain-transformation-postcode/src/main/java/uk/gov/moj/cpp/sjp/CaseReceivedEventTransformer.java index 5465479eed..fff7e9a785 100644 --- a/sjp-domain/sjp-domain-transformation/sjp-domain-transformation-postcode/src/main/java/uk/gov/moj/cpp/sjp/CaseReceivedEventTransformer.java +++ b/sjp-domain/sjp-domain-transformation/sjp-domain-transformation-postcode/src/main/java/uk/gov/moj/cpp/sjp/CaseReceivedEventTransformer.java @@ -11,7 +11,7 @@ import java.util.stream.Stream; -import javax.json.JsonObject; +import jakarta.json.JsonObject; @Transformation public class CaseReceivedEventTransformer extends BaseEventTransformer { diff --git a/sjp-domain/sjp-domain-transformation/sjp-domain-transformation-postcode/src/main/java/uk/gov/moj/cpp/sjp/DefendantAddressUpdatedEventTransformer.java b/sjp-domain/sjp-domain-transformation/sjp-domain-transformation-postcode/src/main/java/uk/gov/moj/cpp/sjp/DefendantAddressUpdatedEventTransformer.java index c71e86ce56..3768afd0c1 100644 --- a/sjp-domain/sjp-domain-transformation/sjp-domain-transformation-postcode/src/main/java/uk/gov/moj/cpp/sjp/DefendantAddressUpdatedEventTransformer.java +++ b/sjp-domain/sjp-domain-transformation/sjp-domain-transformation-postcode/src/main/java/uk/gov/moj/cpp/sjp/DefendantAddressUpdatedEventTransformer.java @@ -11,7 +11,7 @@ import java.util.stream.Stream; -import javax.json.JsonObject; +import jakarta.json.JsonObject; @Transformation public class DefendantAddressUpdatedEventTransformer extends BaseEventTransformer { diff --git a/sjp-domain/sjp-domain-transformation/sjp-domain-transformation-postcode/src/main/java/uk/gov/moj/cpp/sjp/FinancialMeansUpdatedEventTransformer.java b/sjp-domain/sjp-domain-transformation/sjp-domain-transformation-postcode/src/main/java/uk/gov/moj/cpp/sjp/FinancialMeansUpdatedEventTransformer.java index 426856d895..bed9da7bcd 100644 --- a/sjp-domain/sjp-domain-transformation/sjp-domain-transformation-postcode/src/main/java/uk/gov/moj/cpp/sjp/FinancialMeansUpdatedEventTransformer.java +++ b/sjp-domain/sjp-domain-transformation/sjp-domain-transformation-postcode/src/main/java/uk/gov/moj/cpp/sjp/FinancialMeansUpdatedEventTransformer.java @@ -4,7 +4,7 @@ import uk.gov.justice.tools.eventsourcing.transformation.api.Action; import uk.gov.justice.tools.eventsourcing.transformation.api.annotation.Transformation; -import javax.json.JsonObject; +import jakarta.json.JsonObject; import java.util.stream.Stream; import static java.util.stream.Stream.of; diff --git a/sjp-domain/sjp-domain-transformation/sjp-domain-transformation-postcode/src/main/java/uk/gov/moj/cpp/sjp/OnlinePleaReceivedEventTransformer.java b/sjp-domain/sjp-domain-transformation/sjp-domain-transformation-postcode/src/main/java/uk/gov/moj/cpp/sjp/OnlinePleaReceivedEventTransformer.java index c127788fef..5f75e7e687 100644 --- a/sjp-domain/sjp-domain-transformation/sjp-domain-transformation-postcode/src/main/java/uk/gov/moj/cpp/sjp/OnlinePleaReceivedEventTransformer.java +++ b/sjp-domain/sjp-domain-transformation/sjp-domain-transformation-postcode/src/main/java/uk/gov/moj/cpp/sjp/OnlinePleaReceivedEventTransformer.java @@ -11,7 +11,7 @@ import java.util.stream.Stream; -import javax.json.JsonObject; +import jakarta.json.JsonObject; @Transformation public class OnlinePleaReceivedEventTransformer extends BaseEventTransformer { diff --git a/sjp-domain/sjp-domain-transformation/sjp-domain-transformation-postcode/src/main/java/uk/gov/moj/cpp/sjp/TopLevelAddressEventTransformer.java b/sjp-domain/sjp-domain-transformation/sjp-domain-transformation-postcode/src/main/java/uk/gov/moj/cpp/sjp/TopLevelAddressEventTransformer.java index d71620ed99..38ca81d406 100644 --- a/sjp-domain/sjp-domain-transformation/sjp-domain-transformation-postcode/src/main/java/uk/gov/moj/cpp/sjp/TopLevelAddressEventTransformer.java +++ b/sjp-domain/sjp-domain-transformation/sjp-domain-transformation-postcode/src/main/java/uk/gov/moj/cpp/sjp/TopLevelAddressEventTransformer.java @@ -10,7 +10,7 @@ import java.util.stream.Stream; -import javax.json.JsonObject; +import jakarta.json.JsonObject; public abstract class TopLevelAddressEventTransformer extends BaseEventTransformer { diff --git a/sjp-domain/sjp-domain-transformation/sjp-domain-transformation-postcode/src/test/java/uk/gov/moj/cpp/EventTransformerTestHelper.java b/sjp-domain/sjp-domain-transformation/sjp-domain-transformation-postcode/src/test/java/uk/gov/moj/cpp/EventTransformerTestHelper.java index 7a985659fc..dbd48c092c 100644 --- a/sjp-domain/sjp-domain-transformation/sjp-domain-transformation-postcode/src/test/java/uk/gov/moj/cpp/EventTransformerTestHelper.java +++ b/sjp-domain/sjp-domain-transformation/sjp-domain-transformation-postcode/src/test/java/uk/gov/moj/cpp/EventTransformerTestHelper.java @@ -16,7 +16,7 @@ import java.util.Map; import java.util.stream.Stream; -import javax.json.JsonObject; +import jakarta.json.JsonObject; public class EventTransformerTestHelper { diff --git a/sjp-event-sources/pom.xml b/sjp-event-sources/pom.xml index efb054b5a3..3ddd0986e4 100644 --- a/sjp-event-sources/pom.xml +++ b/sjp-event-sources/pom.xml @@ -3,7 +3,7 @@ sjp-parent uk.gov.moj.cpp.sjp - 17.104.193-SNAPSHOT + 25.104.0-M1-SNAPSHOT ../pom.xml 4.0.0 diff --git a/sjp-event/pom.xml b/sjp-event/pom.xml index c4f4d2063e..7b047bf5b6 100644 --- a/sjp-event/pom.xml +++ b/sjp-event/pom.xml @@ -3,7 +3,7 @@ sjp-parent uk.gov.moj.cpp.sjp - 17.104.193-SNAPSHOT + 25.104.0-M1-SNAPSHOT 4.0.0 @@ -30,6 +30,11 @@ uk.gov.justice.framework-generators messaging-adapter-generator-plugin + + jakarta.xml.bind + jakarta.xml.bind-api + ${jakarta.xml.bind-api.raml.version} + uk.gov.moj.cpp.sjp sjp-event-sources @@ -43,10 +48,15 @@ messaging-client-generator-plugin - javax - javaee-api + jakarta.platform + jakarta.jakartaee-api ${javaee-api.version} + + jakarta.xml.bind + jakarta.xml.bind-api + ${jakarta.xml.bind-api.raml.version} + uk.gov.moj.cpp.sjp sjp-event-sources diff --git a/sjp-event/sjp-event-indexer/pom.xml b/sjp-event/sjp-event-indexer/pom.xml index 7a86dceeb3..9b586bb5d7 100644 --- a/sjp-event/sjp-event-indexer/pom.xml +++ b/sjp-event/sjp-event-indexer/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 @@ -20,8 +20,8 @@ event-indexer - javax - javaee-api + jakarta.platform + jakarta.jakartaee-api provided @@ -102,6 +102,11 @@ + + jakarta.xml.bind + jakarta.xml.bind-api + ${jakarta.xml.bind-api.raml.version} + unifiedsearch-client-generator uk.gov.justice.framework-generators @@ -113,8 +118,8 @@ ${cpp.framework.version} - javax - javaee-api + jakarta.platform + jakarta.jakartaee-api ${javaee-api.version} runtime diff --git a/sjp-event/sjp-event-indexer/src/main/resources/META-INF/beans.xml b/sjp-event/sjp-event-indexer/src/main/resources/META-INF/beans.xml index cc3f8d2864..1d83bc8c5a 100644 --- a/sjp-event/sjp-event-indexer/src/main/resources/META-INF/beans.xml +++ b/sjp-event/sjp-event-indexer/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-indexer/src/test/java/uk/gov/moj/cpp/indexer/jolt/CaseReceivedTransformationTest.java b/sjp-event/sjp-event-indexer/src/test/java/uk/gov/moj/cpp/indexer/jolt/CaseReceivedTransformationTest.java index da6a447628..b5bac953b2 100644 --- a/sjp-event/sjp-event-indexer/src/test/java/uk/gov/moj/cpp/indexer/jolt/CaseReceivedTransformationTest.java +++ b/sjp-event/sjp-event-indexer/src/test/java/uk/gov/moj/cpp/indexer/jolt/CaseReceivedTransformationTest.java @@ -21,8 +21,8 @@ import java.io.IOException; -import javax.json.JsonObject; -import javax.json.JsonString; +import jakarta.json.JsonObject; +import jakarta.json.JsonString; import com.jayway.jsonpath.DocumentContext; import org.junit.jupiter.api.BeforeEach; diff --git a/sjp-event/sjp-event-indexer/src/test/java/uk/gov/moj/cpp/indexer/jolt/CaseStatusChangeTransformationTest.java b/sjp-event/sjp-event-indexer/src/test/java/uk/gov/moj/cpp/indexer/jolt/CaseStatusChangeTransformationTest.java index eceb8ff4ec..2551ff1140 100644 --- a/sjp-event/sjp-event-indexer/src/test/java/uk/gov/moj/cpp/indexer/jolt/CaseStatusChangeTransformationTest.java +++ b/sjp-event/sjp-event-indexer/src/test/java/uk/gov/moj/cpp/indexer/jolt/CaseStatusChangeTransformationTest.java @@ -12,8 +12,8 @@ import java.io.IOException; -import javax.json.JsonObject; -import javax.json.JsonString; +import jakarta.json.JsonObject; +import jakarta.json.JsonString; import com.jayway.jsonpath.DocumentContext; import org.junit.jupiter.api.BeforeEach; diff --git a/sjp-event/sjp-event-indexer/src/test/java/uk/gov/moj/cpp/indexer/jolt/DefendantDetailsMovedFromPeopleTransformationTest.java b/sjp-event/sjp-event-indexer/src/test/java/uk/gov/moj/cpp/indexer/jolt/DefendantDetailsMovedFromPeopleTransformationTest.java index 23aca68713..593268c5bb 100644 --- a/sjp-event/sjp-event-indexer/src/test/java/uk/gov/moj/cpp/indexer/jolt/DefendantDetailsMovedFromPeopleTransformationTest.java +++ b/sjp-event/sjp-event-indexer/src/test/java/uk/gov/moj/cpp/indexer/jolt/DefendantDetailsMovedFromPeopleTransformationTest.java @@ -20,7 +20,7 @@ import java.io.IOException; -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-indexer/src/test/java/uk/gov/moj/cpp/indexer/jolt/DefendantDetailsUpdatedTransformationTest.java b/sjp-event/sjp-event-indexer/src/test/java/uk/gov/moj/cpp/indexer/jolt/DefendantDetailsUpdatedTransformationTest.java index a6c0ec355b..205115ba42 100644 --- a/sjp-event/sjp-event-indexer/src/test/java/uk/gov/moj/cpp/indexer/jolt/DefendantDetailsUpdatedTransformationTest.java +++ b/sjp-event/sjp-event-indexer/src/test/java/uk/gov/moj/cpp/indexer/jolt/DefendantDetailsUpdatedTransformationTest.java @@ -21,7 +21,7 @@ import java.io.IOException; -import javax.json.JsonObject; +import jakarta.json.JsonObject; import com.jayway.jsonpath.DocumentContext; import org.junit.jupiter.api.BeforeEach; diff --git a/sjp-event/sjp-event-indexer/src/test/java/uk/gov/moj/cpp/indexer/jolt/DefendantPendingChangesAcceptedTransformationTest.java b/sjp-event/sjp-event-indexer/src/test/java/uk/gov/moj/cpp/indexer/jolt/DefendantPendingChangesAcceptedTransformationTest.java index b010373011..d34e527acf 100644 --- a/sjp-event/sjp-event-indexer/src/test/java/uk/gov/moj/cpp/indexer/jolt/DefendantPendingChangesAcceptedTransformationTest.java +++ b/sjp-event/sjp-event-indexer/src/test/java/uk/gov/moj/cpp/indexer/jolt/DefendantPendingChangesAcceptedTransformationTest.java @@ -12,8 +12,8 @@ import java.io.IOException; -import javax.json.JsonObject; -import javax.json.JsonString; +import jakarta.json.JsonObject; +import jakarta.json.JsonString; import com.jayway.jsonpath.DocumentContext; import org.junit.jupiter.api.BeforeEach; diff --git a/sjp-event/sjp-event-indexer/src/test/java/uk/gov/moj/cpp/indexer/jolt/SjpCaseCreatedTransformationTest.java b/sjp-event/sjp-event-indexer/src/test/java/uk/gov/moj/cpp/indexer/jolt/SjpCaseCreatedTransformationTest.java index 6e9b990d75..4971c851f5 100644 --- a/sjp-event/sjp-event-indexer/src/test/java/uk/gov/moj/cpp/indexer/jolt/SjpCaseCreatedTransformationTest.java +++ b/sjp-event/sjp-event-indexer/src/test/java/uk/gov/moj/cpp/indexer/jolt/SjpCaseCreatedTransformationTest.java @@ -11,7 +11,7 @@ import java.io.IOException; -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-indexer/src/test/java/uk/gov/moj/cpp/indexer/jolt/helper/AddressVerificationHelper.java b/sjp-event/sjp-event-indexer/src/test/java/uk/gov/moj/cpp/indexer/jolt/helper/AddressVerificationHelper.java index 8a4ea059b1..a36d72ea13 100644 --- a/sjp-event/sjp-event-indexer/src/test/java/uk/gov/moj/cpp/indexer/jolt/helper/AddressVerificationHelper.java +++ b/sjp-event/sjp-event-indexer/src/test/java/uk/gov/moj/cpp/indexer/jolt/helper/AddressVerificationHelper.java @@ -3,7 +3,7 @@ import static org.hamcrest.core.Is.is; import static org.hamcrest.MatcherAssert.assertThat; -import javax.json.JsonObject; +import jakarta.json.JsonObject; public class AddressVerificationHelper { public static final String SPACE = " "; diff --git a/sjp-event/sjp-event-indexer/src/test/java/uk/gov/moj/cpp/indexer/jolt/helper/JsonHelper.java b/sjp-event/sjp-event-indexer/src/test/java/uk/gov/moj/cpp/indexer/jolt/helper/JsonHelper.java index 800f6231f4..973f579b64 100644 --- a/sjp-event/sjp-event-indexer/src/test/java/uk/gov/moj/cpp/indexer/jolt/helper/JsonHelper.java +++ b/sjp-event/sjp-event-indexer/src/test/java/uk/gov/moj/cpp/indexer/jolt/helper/JsonHelper.java @@ -10,8 +10,8 @@ import java.io.InputStream; import java.io.UncheckedIOException; -import javax.json.JsonObject; -import javax.json.JsonReader; +import jakarta.json.JsonObject; +import jakarta.json.JsonReader; public class JsonHelper { public static JsonObject readJson(final String filePath) { diff --git a/sjp-event/sjp-event-listener/pom.xml b/sjp-event/sjp-event-listener/pom.xml index 5c5690778a..f89c836786 100644 --- a/sjp-event/sjp-event-listener/pom.xml +++ b/sjp-event/sjp-event-listener/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 @@ -35,8 +35,8 @@ file-service-persistence - javax - javaee-api + jakarta.platform + jakarta.jakartaee-api provided @@ -105,7 +105,14 @@ org.apache.maven.plugins maven-failsafe-plugin - + org.apache.maven.plugins maven-dependency-plugin @@ -117,6 +124,7 @@ unpack + true mireportdata-sjp-event-listener diff --git a/sjp-event/sjp-event-listener/src/main/java/uk/gov/moj/cpp/sjp/event/listener/AocpAcceptedEmailNotificationListener.java b/sjp-event/sjp-event-listener/src/main/java/uk/gov/moj/cpp/sjp/event/listener/AocpAcceptedEmailNotificationListener.java index d9e635bfa2..55ea3c94cd 100644 --- a/sjp-event/sjp-event-listener/src/main/java/uk/gov/moj/cpp/sjp/event/listener/AocpAcceptedEmailNotificationListener.java +++ b/sjp-event/sjp-event-listener/src/main/java/uk/gov/moj/cpp/sjp/event/listener/AocpAcceptedEmailNotificationListener.java @@ -5,8 +5,8 @@ import java.time.ZonedDateTime; -import javax.inject.Inject; -import javax.transaction.Transactional; +import jakarta.inject.Inject; +import jakarta.transaction.Transactional; import uk.gov.justice.services.common.converter.JsonObjectToObjectConverter; import uk.gov.justice.services.core.annotation.Handles; import uk.gov.justice.services.core.annotation.ServiceComponent; diff --git a/sjp-event/sjp-event-listener/src/main/java/uk/gov/moj/cpp/sjp/event/listener/AocpPleasSetListener.java b/sjp-event/sjp-event-listener/src/main/java/uk/gov/moj/cpp/sjp/event/listener/AocpPleasSetListener.java index 33cf43fdd1..231aba00ea 100644 --- a/sjp-event/sjp-event-listener/src/main/java/uk/gov/moj/cpp/sjp/event/listener/AocpPleasSetListener.java +++ b/sjp-event/sjp-event-listener/src/main/java/uk/gov/moj/cpp/sjp/event/listener/AocpPleasSetListener.java @@ -14,8 +14,8 @@ import java.util.Optional; -import javax.inject.Inject; -import javax.transaction.Transactional; +import jakarta.inject.Inject; +import jakarta.transaction.Transactional; @ServiceComponent(EVENT_LISTENER) public class AocpPleasSetListener { diff --git a/sjp-event/sjp-event-listener/src/main/java/uk/gov/moj/cpp/sjp/event/listener/CCApplicationStatusListener.java b/sjp-event/sjp-event-listener/src/main/java/uk/gov/moj/cpp/sjp/event/listener/CCApplicationStatusListener.java index 2efa16b03b..fa770df3a0 100644 --- a/sjp-event/sjp-event-listener/src/main/java/uk/gov/moj/cpp/sjp/event/listener/CCApplicationStatusListener.java +++ b/sjp-event/sjp-event-listener/src/main/java/uk/gov/moj/cpp/sjp/event/listener/CCApplicationStatusListener.java @@ -9,7 +9,7 @@ import uk.gov.moj.cpp.sjp.persistence.entity.ApplicationStatus; import uk.gov.moj.cpp.sjp.persistence.entity.CaseDetail; -import javax.inject.Inject; +import jakarta.inject.Inject; import java.util.UUID; diff --git a/sjp-event/sjp-event-listener/src/main/java/uk/gov/moj/cpp/sjp/event/listener/CaseAdjournmentListener.java b/sjp-event/sjp-event-listener/src/main/java/uk/gov/moj/cpp/sjp/event/listener/CaseAdjournmentListener.java index c9ceb3bd00..d0236ad8ca 100644 --- a/sjp-event/sjp-event-listener/src/main/java/uk/gov/moj/cpp/sjp/event/listener/CaseAdjournmentListener.java +++ b/sjp-event/sjp-event-listener/src/main/java/uk/gov/moj/cpp/sjp/event/listener/CaseAdjournmentListener.java @@ -9,7 +9,7 @@ import uk.gov.moj.cpp.sjp.event.CaseAdjournmentToLaterSjpHearingElapsed; import uk.gov.moj.cpp.sjp.persistence.repository.CaseRepository; -import javax.inject.Inject; +import jakarta.inject.Inject; @ServiceComponent(EVENT_LISTENER) public class CaseAdjournmentListener { diff --git a/sjp-event/sjp-event-listener/src/main/java/uk/gov/moj/cpp/sjp/event/listener/CaseApplicationListener.java b/sjp-event/sjp-event-listener/src/main/java/uk/gov/moj/cpp/sjp/event/listener/CaseApplicationListener.java index ef537d8fc7..10bb959209 100644 --- a/sjp-event/sjp-event-listener/src/main/java/uk/gov/moj/cpp/sjp/event/listener/CaseApplicationListener.java +++ b/sjp-event/sjp-event-listener/src/main/java/uk/gov/moj/cpp/sjp/event/listener/CaseApplicationListener.java @@ -24,8 +24,8 @@ import java.time.LocalDate; -import javax.inject.Inject; -import javax.json.JsonObject; +import jakarta.inject.Inject; +import jakarta.json.JsonObject; @ServiceComponent(EVENT_LISTENER) diff --git a/sjp-event/sjp-event-listener/src/main/java/uk/gov/moj/cpp/sjp/event/listener/CaseAssignmentRestrictionListener.java b/sjp-event/sjp-event-listener/src/main/java/uk/gov/moj/cpp/sjp/event/listener/CaseAssignmentRestrictionListener.java index c08fb6ff15..ed5dfa90f5 100644 --- a/sjp-event/sjp-event-listener/src/main/java/uk/gov/moj/cpp/sjp/event/listener/CaseAssignmentRestrictionListener.java +++ b/sjp-event/sjp-event-listener/src/main/java/uk/gov/moj/cpp/sjp/event/listener/CaseAssignmentRestrictionListener.java @@ -12,7 +12,7 @@ import java.time.LocalDate; import java.time.ZonedDateTime; -import javax.inject.Inject; +import jakarta.inject.Inject; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; diff --git a/sjp-event/sjp-event-listener/src/main/java/uk/gov/moj/cpp/sjp/event/listener/CaseCreatedListener.java b/sjp-event/sjp-event-listener/src/main/java/uk/gov/moj/cpp/sjp/event/listener/CaseCreatedListener.java index 5bc0f2cda5..7cde2be344 100644 --- a/sjp-event/sjp-event-listener/src/main/java/uk/gov/moj/cpp/sjp/event/listener/CaseCreatedListener.java +++ b/sjp-event/sjp-event-listener/src/main/java/uk/gov/moj/cpp/sjp/event/listener/CaseCreatedListener.java @@ -15,8 +15,8 @@ import uk.gov.moj.cpp.sjp.persistence.entity.DefendantDetail; 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; @ServiceComponent(EVENT_LISTENER) public class CaseCreatedListener { diff --git a/sjp-event/sjp-event-listener/src/main/java/uk/gov/moj/cpp/sjp/event/listener/CaseDecisionListener.java b/sjp-event/sjp-event-listener/src/main/java/uk/gov/moj/cpp/sjp/event/listener/CaseDecisionListener.java index ef04f617f7..faffd507f6 100644 --- a/sjp-event/sjp-event-listener/src/main/java/uk/gov/moj/cpp/sjp/event/listener/CaseDecisionListener.java +++ b/sjp-event/sjp-event-listener/src/main/java/uk/gov/moj/cpp/sjp/event/listener/CaseDecisionListener.java @@ -35,7 +35,7 @@ import java.util.Optional; import java.util.UUID; -import javax.inject.Inject; +import jakarta.inject.Inject; @ServiceComponent(EVENT_LISTENER) public class CaseDecisionListener { diff --git a/sjp-event/sjp-event-listener/src/main/java/uk/gov/moj/cpp/sjp/event/listener/CaseNoteListener.java b/sjp-event/sjp-event-listener/src/main/java/uk/gov/moj/cpp/sjp/event/listener/CaseNoteListener.java index 9b6a9bc8ae..d258f82c6d 100644 --- a/sjp-event/sjp-event-listener/src/main/java/uk/gov/moj/cpp/sjp/event/listener/CaseNoteListener.java +++ b/sjp-event/sjp-event-listener/src/main/java/uk/gov/moj/cpp/sjp/event/listener/CaseNoteListener.java @@ -10,7 +10,7 @@ import uk.gov.moj.cpp.sjp.persistence.entity.CaseNote; import uk.gov.moj.cpp.sjp.persistence.repository.CaseNoteRepository; -import javax.inject.Inject; +import jakarta.inject.Inject; @ServiceComponent(EVENT_LISTENER) public class CaseNoteListener { diff --git a/sjp-event/sjp-event-listener/src/main/java/uk/gov/moj/cpp/sjp/event/listener/CaseReservedListener.java b/sjp-event/sjp-event-listener/src/main/java/uk/gov/moj/cpp/sjp/event/listener/CaseReservedListener.java index c5e3cb3e52..f0a6a954f1 100644 --- a/sjp-event/sjp-event-listener/src/main/java/uk/gov/moj/cpp/sjp/event/listener/CaseReservedListener.java +++ b/sjp-event/sjp-event-listener/src/main/java/uk/gov/moj/cpp/sjp/event/listener/CaseReservedListener.java @@ -4,7 +4,7 @@ import java.util.List; -import javax.inject.Inject; +import jakarta.inject.Inject; import uk.gov.justice.services.core.annotation.Handles; import uk.gov.justice.services.core.annotation.ServiceComponent; import uk.gov.justice.services.messaging.Envelope; diff --git a/sjp-event/sjp-event-listener/src/main/java/uk/gov/moj/cpp/sjp/event/listener/CaseSearchResultListener.java b/sjp-event/sjp-event-listener/src/main/java/uk/gov/moj/cpp/sjp/event/listener/CaseSearchResultListener.java index 3481248772..6bf9e6718b 100644 --- a/sjp-event/sjp-event-listener/src/main/java/uk/gov/moj/cpp/sjp/event/listener/CaseSearchResultListener.java +++ b/sjp-event/sjp-event-listener/src/main/java/uk/gov/moj/cpp/sjp/event/listener/CaseSearchResultListener.java @@ -16,9 +16,9 @@ import java.util.Optional; import java.util.UUID; -import javax.inject.Inject; -import javax.json.JsonObject; -import javax.transaction.Transactional; +import jakarta.inject.Inject; +import jakarta.json.JsonObject; +import jakarta.transaction.Transactional; @ServiceComponent(EVENT_LISTENER) public class CaseSearchResultListener { diff --git a/sjp-event/sjp-event-listener/src/main/java/uk/gov/moj/cpp/sjp/event/listener/CaseUpdatedListener.java b/sjp-event/sjp-event-listener/src/main/java/uk/gov/moj/cpp/sjp/event/listener/CaseUpdatedListener.java index 49ac77edf4..6e4e3818ef 100644 --- a/sjp-event/sjp-event-listener/src/main/java/uk/gov/moj/cpp/sjp/event/listener/CaseUpdatedListener.java +++ b/sjp-event/sjp-event-listener/src/main/java/uk/gov/moj/cpp/sjp/event/listener/CaseUpdatedListener.java @@ -39,9 +39,9 @@ import java.util.UUID; import java.util.stream.Collectors; -import javax.inject.Inject; -import javax.json.JsonObject; -import javax.transaction.Transactional; +import jakarta.inject.Inject; +import jakarta.json.JsonObject; +import jakarta.transaction.Transactional; @ServiceComponent(EVENT_LISTENER) public class CaseUpdatedListener { diff --git a/sjp-event/sjp-event-listener/src/main/java/uk/gov/moj/cpp/sjp/event/listener/CourtReferralListener.java b/sjp-event/sjp-event-listener/src/main/java/uk/gov/moj/cpp/sjp/event/listener/CourtReferralListener.java index b86b6436ee..a829091abd 100644 --- a/sjp-event/sjp-event-listener/src/main/java/uk/gov/moj/cpp/sjp/event/listener/CourtReferralListener.java +++ b/sjp-event/sjp-event-listener/src/main/java/uk/gov/moj/cpp/sjp/event/listener/CourtReferralListener.java @@ -18,7 +18,7 @@ import java.util.UUID; -import javax.inject.Inject; +import jakarta.inject.Inject; @ServiceComponent(EVENT_LISTENER) public class CourtReferralListener { diff --git a/sjp-event/sjp-event-listener/src/main/java/uk/gov/moj/cpp/sjp/event/listener/DatesToAvoidAddedListener.java b/sjp-event/sjp-event-listener/src/main/java/uk/gov/moj/cpp/sjp/event/listener/DatesToAvoidAddedListener.java index 9ab936a8b7..4cffc2947d 100644 --- a/sjp-event/sjp-event-listener/src/main/java/uk/gov/moj/cpp/sjp/event/listener/DatesToAvoidAddedListener.java +++ b/sjp-event/sjp-event-listener/src/main/java/uk/gov/moj/cpp/sjp/event/listener/DatesToAvoidAddedListener.java @@ -10,9 +10,9 @@ import java.util.UUID; -import javax.inject.Inject; -import javax.json.JsonObject; -import javax.transaction.Transactional; +import jakarta.inject.Inject; +import jakarta.json.JsonObject; +import jakarta.transaction.Transactional; @ServiceComponent(EVENT_LISTENER) public class DatesToAvoidAddedListener { diff --git a/sjp-event/sjp-event-listener/src/main/java/uk/gov/moj/cpp/sjp/event/listener/DatesToAvoidUpdatedListener.java b/sjp-event/sjp-event-listener/src/main/java/uk/gov/moj/cpp/sjp/event/listener/DatesToAvoidUpdatedListener.java index 9b75c85d57..c78055fe85 100644 --- a/sjp-event/sjp-event-listener/src/main/java/uk/gov/moj/cpp/sjp/event/listener/DatesToAvoidUpdatedListener.java +++ b/sjp-event/sjp-event-listener/src/main/java/uk/gov/moj/cpp/sjp/event/listener/DatesToAvoidUpdatedListener.java @@ -9,9 +9,9 @@ import java.util.UUID; -import javax.inject.Inject; -import javax.json.JsonObject; -import javax.transaction.Transactional; +import jakarta.inject.Inject; +import jakarta.json.JsonObject; +import jakarta.transaction.Transactional; @ServiceComponent(EVENT_LISTENER) public class DatesToAvoidUpdatedListener { diff --git a/sjp-event/sjp-event-listener/src/main/java/uk/gov/moj/cpp/sjp/event/listener/DefendantAcceptedAocpListener.java b/sjp-event/sjp-event-listener/src/main/java/uk/gov/moj/cpp/sjp/event/listener/DefendantAcceptedAocpListener.java index 86b9124993..764229e0ae 100644 --- a/sjp-event/sjp-event-listener/src/main/java/uk/gov/moj/cpp/sjp/event/listener/DefendantAcceptedAocpListener.java +++ b/sjp-event/sjp-event-listener/src/main/java/uk/gov/moj/cpp/sjp/event/listener/DefendantAcceptedAocpListener.java @@ -23,7 +23,7 @@ import java.util.UUID; -import javax.inject.Inject; +import jakarta.inject.Inject; @ServiceComponent(EVENT_LISTENER) public class DefendantAcceptedAocpListener { diff --git a/sjp-event/sjp-event-listener/src/main/java/uk/gov/moj/cpp/sjp/event/listener/DefendantDetailsAcknowledgedListener.java b/sjp-event/sjp-event-listener/src/main/java/uk/gov/moj/cpp/sjp/event/listener/DefendantDetailsAcknowledgedListener.java index e7109cc91b..b06e4a6271 100644 --- a/sjp-event/sjp-event-listener/src/main/java/uk/gov/moj/cpp/sjp/event/listener/DefendantDetailsAcknowledgedListener.java +++ b/sjp-event/sjp-event-listener/src/main/java/uk/gov/moj/cpp/sjp/event/listener/DefendantDetailsAcknowledgedListener.java @@ -10,7 +10,7 @@ import uk.gov.moj.cpp.sjp.persistence.entity.CaseDetail; import uk.gov.moj.cpp.sjp.persistence.repository.CaseRepository; -import javax.inject.Inject; +import jakarta.inject.Inject; @ServiceComponent(EVENT_LISTENER) public class DefendantDetailsAcknowledgedListener { diff --git a/sjp-event/sjp-event-listener/src/main/java/uk/gov/moj/cpp/sjp/event/listener/DefendantDetailsMovedFromPeopleListener.java b/sjp-event/sjp-event-listener/src/main/java/uk/gov/moj/cpp/sjp/event/listener/DefendantDetailsMovedFromPeopleListener.java index 2e12486f2c..7c34f24eab 100644 --- a/sjp-event/sjp-event-listener/src/main/java/uk/gov/moj/cpp/sjp/event/listener/DefendantDetailsMovedFromPeopleListener.java +++ b/sjp-event/sjp-event-listener/src/main/java/uk/gov/moj/cpp/sjp/event/listener/DefendantDetailsMovedFromPeopleListener.java @@ -15,8 +15,8 @@ import uk.gov.moj.cpp.sjp.persistence.entity.PersonalDetails; 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; @ServiceComponent(EVENT_LISTENER) public class DefendantDetailsMovedFromPeopleListener { diff --git a/sjp-event/sjp-event-listener/src/main/java/uk/gov/moj/cpp/sjp/event/listener/DefendantPendingChangesAcceptedListener.java b/sjp-event/sjp-event-listener/src/main/java/uk/gov/moj/cpp/sjp/event/listener/DefendantPendingChangesAcceptedListener.java index 7bab952367..04c0795317 100644 --- a/sjp-event/sjp-event-listener/src/main/java/uk/gov/moj/cpp/sjp/event/listener/DefendantPendingChangesAcceptedListener.java +++ b/sjp-event/sjp-event-listener/src/main/java/uk/gov/moj/cpp/sjp/event/listener/DefendantPendingChangesAcceptedListener.java @@ -11,8 +11,8 @@ import uk.gov.moj.cpp.sjp.persistence.entity.DefendantDetailUpdateRequest; import uk.gov.moj.cpp.sjp.persistence.repository.DefendantDetailUpdateRequestRepository; -import javax.inject.Inject; -import javax.transaction.Transactional; +import jakarta.inject.Inject; +import jakarta.transaction.Transactional; @ServiceComponent(EVENT_LISTENER) public class DefendantPendingChangesAcceptedListener { diff --git a/sjp-event/sjp-event-listener/src/main/java/uk/gov/moj/cpp/sjp/event/listener/DefendantPendingChangesRejectedListener.java b/sjp-event/sjp-event-listener/src/main/java/uk/gov/moj/cpp/sjp/event/listener/DefendantPendingChangesRejectedListener.java index 8d99838048..4e3f1f2796 100644 --- a/sjp-event/sjp-event-listener/src/main/java/uk/gov/moj/cpp/sjp/event/listener/DefendantPendingChangesRejectedListener.java +++ b/sjp-event/sjp-event-listener/src/main/java/uk/gov/moj/cpp/sjp/event/listener/DefendantPendingChangesRejectedListener.java @@ -11,8 +11,8 @@ import uk.gov.moj.cpp.sjp.persistence.entity.DefendantDetailUpdateRequest; import uk.gov.moj.cpp.sjp.persistence.repository.DefendantDetailUpdateRequestRepository; -import javax.inject.Inject; -import javax.transaction.Transactional; +import jakarta.inject.Inject; +import jakarta.transaction.Transactional; @ServiceComponent(EVENT_LISTENER) public class DefendantPendingChangesRejectedListener { diff --git a/sjp-event/sjp-event-listener/src/main/java/uk/gov/moj/cpp/sjp/event/listener/DefendantPersonalDetailsChangesListener.java b/sjp-event/sjp-event-listener/src/main/java/uk/gov/moj/cpp/sjp/event/listener/DefendantPersonalDetailsChangesListener.java index eeeb998b9d..72743e5056 100644 --- a/sjp-event/sjp-event-listener/src/main/java/uk/gov/moj/cpp/sjp/event/listener/DefendantPersonalDetailsChangesListener.java +++ b/sjp-event/sjp-event-listener/src/main/java/uk/gov/moj/cpp/sjp/event/listener/DefendantPersonalDetailsChangesListener.java @@ -28,8 +28,8 @@ import java.util.UUID; import java.util.function.BiConsumer; -import javax.inject.Inject; -import javax.transaction.Transactional; +import jakarta.inject.Inject; +import jakarta.transaction.Transactional; @SuppressWarnings("squid:S1133") @ServiceComponent(EVENT_LISTENER) diff --git a/sjp-event/sjp-event-listener/src/main/java/uk/gov/moj/cpp/sjp/event/listener/DefendantUpdatedListener.java b/sjp-event/sjp-event-listener/src/main/java/uk/gov/moj/cpp/sjp/event/listener/DefendantUpdatedListener.java index 9c173977aa..c3302873fc 100644 --- a/sjp-event/sjp-event-listener/src/main/java/uk/gov/moj/cpp/sjp/event/listener/DefendantUpdatedListener.java +++ b/sjp-event/sjp-event-listener/src/main/java/uk/gov/moj/cpp/sjp/event/listener/DefendantUpdatedListener.java @@ -22,8 +22,8 @@ import java.time.LocalDate; -import javax.inject.Inject; -import javax.transaction.Transactional; +import jakarta.inject.Inject; +import jakarta.transaction.Transactional; @ServiceComponent(EVENT_LISTENER) public class DefendantUpdatedListener { diff --git a/sjp-event/sjp-event-listener/src/main/java/uk/gov/moj/cpp/sjp/event/listener/EmailNotificationListener.java b/sjp-event/sjp-event-listener/src/main/java/uk/gov/moj/cpp/sjp/event/listener/EmailNotificationListener.java index 216aa754a4..9124c50a44 100644 --- a/sjp-event/sjp-event-listener/src/main/java/uk/gov/moj/cpp/sjp/event/listener/EmailNotificationListener.java +++ b/sjp-event/sjp-event-listener/src/main/java/uk/gov/moj/cpp/sjp/event/listener/EmailNotificationListener.java @@ -17,8 +17,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; @ServiceComponent(EVENT_LISTENER) public class EmailNotificationListener { diff --git a/sjp-event/sjp-event-listener/src/main/java/uk/gov/moj/cpp/sjp/event/listener/EmployerListener.java b/sjp-event/sjp-event-listener/src/main/java/uk/gov/moj/cpp/sjp/event/listener/EmployerListener.java index 46deee7552..8d525dc168 100644 --- a/sjp-event/sjp-event-listener/src/main/java/uk/gov/moj/cpp/sjp/event/listener/EmployerListener.java +++ b/sjp-event/sjp-event-listener/src/main/java/uk/gov/moj/cpp/sjp/event/listener/EmployerListener.java @@ -16,8 +16,8 @@ import java.util.Optional; import java.util.UUID; -import javax.inject.Inject; -import javax.transaction.Transactional; +import jakarta.inject.Inject; +import jakarta.transaction.Transactional; @ServiceComponent(EVENT_LISTENER) public class EmployerListener { diff --git a/sjp-event/sjp-event-listener/src/main/java/uk/gov/moj/cpp/sjp/event/listener/EmploymentStatusListener.java b/sjp-event/sjp-event-listener/src/main/java/uk/gov/moj/cpp/sjp/event/listener/EmploymentStatusListener.java index 551fd0bc81..a544501fed 100644 --- a/sjp-event/sjp-event-listener/src/main/java/uk/gov/moj/cpp/sjp/event/listener/EmploymentStatusListener.java +++ b/sjp-event/sjp-event-listener/src/main/java/uk/gov/moj/cpp/sjp/event/listener/EmploymentStatusListener.java @@ -11,9 +11,9 @@ import java.util.UUID; -import javax.inject.Inject; -import javax.json.JsonObject; -import javax.transaction.Transactional; +import jakarta.inject.Inject; +import jakarta.json.JsonObject; +import jakarta.transaction.Transactional; @ServiceComponent(EVENT_LISTENER) public class EmploymentStatusListener { diff --git a/sjp-event/sjp-event-listener/src/main/java/uk/gov/moj/cpp/sjp/event/listener/EndorsementRemovalNotificationListener.java b/sjp-event/sjp-event-listener/src/main/java/uk/gov/moj/cpp/sjp/event/listener/EndorsementRemovalNotificationListener.java index fd778f21f4..24fddc292b 100644 --- a/sjp-event/sjp-event-listener/src/main/java/uk/gov/moj/cpp/sjp/event/listener/EndorsementRemovalNotificationListener.java +++ b/sjp-event/sjp-event-listener/src/main/java/uk/gov/moj/cpp/sjp/event/listener/EndorsementRemovalNotificationListener.java @@ -19,8 +19,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; @ServiceComponent(EVENT_LISTENER) public class EndorsementRemovalNotificationListener { diff --git a/sjp-event/sjp-event-listener/src/main/java/uk/gov/moj/cpp/sjp/event/listener/EnforcementPendingApplicationNotificationListener.java b/sjp-event/sjp-event-listener/src/main/java/uk/gov/moj/cpp/sjp/event/listener/EnforcementPendingApplicationNotificationListener.java index d7146539a5..31144fe20e 100644 --- a/sjp-event/sjp-event-listener/src/main/java/uk/gov/moj/cpp/sjp/event/listener/EnforcementPendingApplicationNotificationListener.java +++ b/sjp-event/sjp-event-listener/src/main/java/uk/gov/moj/cpp/sjp/event/listener/EnforcementPendingApplicationNotificationListener.java @@ -19,8 +19,8 @@ import java.time.ZonedDateTime; -import javax.inject.Inject; -import javax.transaction.Transactional; +import jakarta.inject.Inject; +import jakarta.transaction.Transactional; @ServiceComponent(EVENT_LISTENER) public class EnforcementPendingApplicationNotificationListener { diff --git a/sjp-event/sjp-event-listener/src/main/java/uk/gov/moj/cpp/sjp/event/listener/EnterpriseIdAssociatedListener.java b/sjp-event/sjp-event-listener/src/main/java/uk/gov/moj/cpp/sjp/event/listener/EnterpriseIdAssociatedListener.java index 622484fc39..fb156565ba 100644 --- a/sjp-event/sjp-event-listener/src/main/java/uk/gov/moj/cpp/sjp/event/listener/EnterpriseIdAssociatedListener.java +++ b/sjp-event/sjp-event-listener/src/main/java/uk/gov/moj/cpp/sjp/event/listener/EnterpriseIdAssociatedListener.java @@ -10,8 +10,8 @@ import java.util.UUID; -import javax.inject.Inject; -import javax.json.JsonObject; +import jakarta.inject.Inject; +import jakarta.json.JsonObject; @ServiceComponent(EVENT_LISTENER) public class EnterpriseIdAssociatedListener { diff --git a/sjp-event/sjp-event-listener/src/main/java/uk/gov/moj/cpp/sjp/event/listener/FinancialImpositionExportListener.java b/sjp-event/sjp-event-listener/src/main/java/uk/gov/moj/cpp/sjp/event/listener/FinancialImpositionExportListener.java index a36c338360..cc17f11800 100644 --- a/sjp-event/sjp-event-listener/src/main/java/uk/gov/moj/cpp/sjp/event/listener/FinancialImpositionExportListener.java +++ b/sjp-event/sjp-event-listener/src/main/java/uk/gov/moj/cpp/sjp/event/listener/FinancialImpositionExportListener.java @@ -13,9 +13,9 @@ import uk.gov.moj.cpp.sjp.persistence.entity.DefendantDetail; import uk.gov.moj.cpp.sjp.persistence.repository.DefendantRepository; -import javax.inject.Inject; -import javax.json.JsonObject; -import javax.transaction.Transactional; +import jakarta.inject.Inject; +import jakarta.json.JsonObject; +import jakarta.transaction.Transactional; @SuppressWarnings({"squid:S4114"}) // suppress sonar duplicate method issue due to requirement of BDF. @ServiceComponent(EVENT_LISTENER) public class FinancialImpositionExportListener { diff --git a/sjp-event/sjp-event-listener/src/main/java/uk/gov/moj/cpp/sjp/event/listener/FinancialMeansListener.java b/sjp-event/sjp-event-listener/src/main/java/uk/gov/moj/cpp/sjp/event/listener/FinancialMeansListener.java index ee56346f29..90f9967d88 100644 --- a/sjp-event/sjp-event-listener/src/main/java/uk/gov/moj/cpp/sjp/event/listener/FinancialMeansListener.java +++ b/sjp-event/sjp-event-listener/src/main/java/uk/gov/moj/cpp/sjp/event/listener/FinancialMeansListener.java @@ -21,7 +21,7 @@ import java.util.UUID; -import javax.inject.Inject; +import jakarta.inject.Inject; @ServiceComponent(EVENT_LISTENER) public class FinancialMeansListener { diff --git a/sjp-event/sjp-event-listener/src/main/java/uk/gov/moj/cpp/sjp/event/listener/HearingLanguageUpdatedListener.java b/sjp-event/sjp-event-listener/src/main/java/uk/gov/moj/cpp/sjp/event/listener/HearingLanguageUpdatedListener.java index 0ba728268c..c1cbb6db8a 100644 --- a/sjp-event/sjp-event-listener/src/main/java/uk/gov/moj/cpp/sjp/event/listener/HearingLanguageUpdatedListener.java +++ b/sjp-event/sjp-event-listener/src/main/java/uk/gov/moj/cpp/sjp/event/listener/HearingLanguageUpdatedListener.java @@ -14,8 +14,8 @@ import java.util.UUID; -import javax.inject.Inject; -import javax.transaction.Transactional; +import jakarta.inject.Inject; +import jakarta.transaction.Transactional; @ServiceComponent(EVENT_LISTENER) public class HearingLanguageUpdatedListener { diff --git a/sjp-event/sjp-event-listener/src/main/java/uk/gov/moj/cpp/sjp/event/listener/InterpreterUpdatedListener.java b/sjp-event/sjp-event-listener/src/main/java/uk/gov/moj/cpp/sjp/event/listener/InterpreterUpdatedListener.java index cbe23a8259..0baa2ea54b 100644 --- a/sjp-event/sjp-event-listener/src/main/java/uk/gov/moj/cpp/sjp/event/listener/InterpreterUpdatedListener.java +++ b/sjp-event/sjp-event-listener/src/main/java/uk/gov/moj/cpp/sjp/event/listener/InterpreterUpdatedListener.java @@ -17,8 +17,8 @@ import java.util.Optional; import java.util.UUID; -import javax.inject.Inject; -import javax.transaction.Transactional; +import jakarta.inject.Inject; +import jakarta.transaction.Transactional; @ServiceComponent(EVENT_LISTENER) public class InterpreterUpdatedListener { diff --git a/sjp-event/sjp-event-listener/src/main/java/uk/gov/moj/cpp/sjp/event/listener/OffenceUpdatedListener.java b/sjp-event/sjp-event-listener/src/main/java/uk/gov/moj/cpp/sjp/event/listener/OffenceUpdatedListener.java index f84e713dc2..e55fac089b 100644 --- a/sjp-event/sjp-event-listener/src/main/java/uk/gov/moj/cpp/sjp/event/listener/OffenceUpdatedListener.java +++ b/sjp-event/sjp-event-listener/src/main/java/uk/gov/moj/cpp/sjp/event/listener/OffenceUpdatedListener.java @@ -21,8 +21,8 @@ import uk.gov.moj.cpp.sjp.persistence.repository.OnlinePleaDetailRepository; import uk.gov.moj.cpp.sjp.persistence.repository.OnlinePleaRepository; -import javax.inject.Inject; -import javax.transaction.Transactional; +import jakarta.inject.Inject; +import jakarta.transaction.Transactional; import java.time.ZonedDateTime; import static uk.gov.justice.services.core.annotation.Component.EVENT_LISTENER; diff --git a/sjp-event/sjp-event-listener/src/main/java/uk/gov/moj/cpp/sjp/event/listener/OnlinePleaReceivedListener.java b/sjp-event/sjp-event-listener/src/main/java/uk/gov/moj/cpp/sjp/event/listener/OnlinePleaReceivedListener.java index 107ab33468..479bf44018 100644 --- a/sjp-event/sjp-event-listener/src/main/java/uk/gov/moj/cpp/sjp/event/listener/OnlinePleaReceivedListener.java +++ b/sjp-event/sjp-event-listener/src/main/java/uk/gov/moj/cpp/sjp/event/listener/OnlinePleaReceivedListener.java @@ -25,9 +25,9 @@ import java.time.ZonedDateTime; import java.util.UUID; -import javax.inject.Inject; -import javax.json.JsonObject; -import javax.transaction.Transactional; +import jakarta.inject.Inject; +import jakarta.json.JsonObject; +import jakarta.transaction.Transactional; @ServiceComponent(EVENT_LISTENER) public class OnlinePleaReceivedListener { diff --git a/sjp-event/sjp-event-listener/src/main/java/uk/gov/moj/cpp/sjp/event/listener/OutstandingFinesUpdatedListener.java b/sjp-event/sjp-event-listener/src/main/java/uk/gov/moj/cpp/sjp/event/listener/OutstandingFinesUpdatedListener.java index 5320d65428..8d8ca647fe 100644 --- a/sjp-event/sjp-event-listener/src/main/java/uk/gov/moj/cpp/sjp/event/listener/OutstandingFinesUpdatedListener.java +++ b/sjp-event/sjp-event-listener/src/main/java/uk/gov/moj/cpp/sjp/event/listener/OutstandingFinesUpdatedListener.java @@ -10,8 +10,8 @@ import uk.gov.moj.cpp.sjp.persistence.entity.OnlinePlea; import uk.gov.moj.cpp.sjp.persistence.repository.OnlinePleaRepository; -import javax.inject.Inject; -import javax.transaction.Transactional; +import jakarta.inject.Inject; +import jakarta.transaction.Transactional; @ServiceComponent(EVENT_LISTENER) public class OutstandingFinesUpdatedListener { diff --git a/sjp-event/sjp-event-listener/src/main/java/uk/gov/moj/cpp/sjp/event/listener/PleasSetListener.java b/sjp-event/sjp-event-listener/src/main/java/uk/gov/moj/cpp/sjp/event/listener/PleasSetListener.java index efaa73716c..bcdda88918 100644 --- a/sjp-event/sjp-event-listener/src/main/java/uk/gov/moj/cpp/sjp/event/listener/PleasSetListener.java +++ b/sjp-event/sjp-event-listener/src/main/java/uk/gov/moj/cpp/sjp/event/listener/PleasSetListener.java @@ -14,8 +14,8 @@ import java.util.Optional; -import javax.inject.Inject; -import javax.transaction.Transactional; +import jakarta.inject.Inject; +import jakarta.transaction.Transactional; @ServiceComponent(EVENT_LISTENER) public class PleasSetListener { diff --git a/sjp-event/sjp-event-listener/src/main/java/uk/gov/moj/cpp/sjp/event/listener/PressTransparencyReportListener.java b/sjp-event/sjp-event-listener/src/main/java/uk/gov/moj/cpp/sjp/event/listener/PressTransparencyReportListener.java index ebff9bd027..6f7cfa8020 100644 --- a/sjp-event/sjp-event-listener/src/main/java/uk/gov/moj/cpp/sjp/event/listener/PressTransparencyReportListener.java +++ b/sjp-event/sjp-event-listener/src/main/java/uk/gov/moj/cpp/sjp/event/listener/PressTransparencyReportListener.java @@ -16,9 +16,9 @@ import java.time.LocalDateTime; import java.util.UUID; -import javax.inject.Inject; -import javax.json.JsonObject; -import javax.transaction.Transactional; +import jakarta.inject.Inject; +import jakarta.json.JsonObject; +import jakarta.transaction.Transactional; @ServiceComponent(EVENT_LISTENER) public class PressTransparencyReportListener { diff --git a/sjp-event/sjp-event-listener/src/main/java/uk/gov/moj/cpp/sjp/event/listener/ReadyCaseListener.java b/sjp-event/sjp-event-listener/src/main/java/uk/gov/moj/cpp/sjp/event/listener/ReadyCaseListener.java index a41ca05a5e..02701fa80f 100644 --- a/sjp-event/sjp-event-listener/src/main/java/uk/gov/moj/cpp/sjp/event/listener/ReadyCaseListener.java +++ b/sjp-event/sjp-event-listener/src/main/java/uk/gov/moj/cpp/sjp/event/listener/ReadyCaseListener.java @@ -25,9 +25,9 @@ import java.util.Optional; import java.util.UUID; -import javax.inject.Inject; -import javax.json.JsonObject; -import javax.transaction.Transactional; +import jakarta.inject.Inject; +import jakarta.json.JsonObject; +import jakarta.transaction.Transactional; @ServiceComponent(EVENT_LISTENER) public class ReadyCaseListener { diff --git a/sjp-event/sjp-event-listener/src/main/java/uk/gov/moj/cpp/sjp/event/listener/ResolveCaseEligibleForAOCPListener.java b/sjp-event/sjp-event-listener/src/main/java/uk/gov/moj/cpp/sjp/event/listener/ResolveCaseEligibleForAOCPListener.java index 070144f322..da4dc4f637 100644 --- a/sjp-event/sjp-event-listener/src/main/java/uk/gov/moj/cpp/sjp/event/listener/ResolveCaseEligibleForAOCPListener.java +++ b/sjp-event/sjp-event-listener/src/main/java/uk/gov/moj/cpp/sjp/event/listener/ResolveCaseEligibleForAOCPListener.java @@ -14,8 +14,8 @@ import java.util.Optional; -import javax.inject.Inject; -import javax.json.JsonObject; +import jakarta.inject.Inject; +import jakarta.json.JsonObject; @ServiceComponent(EVENT_LISTENER) public class ResolveCaseEligibleForAOCPListener { diff --git a/sjp-event/sjp-event-listener/src/main/java/uk/gov/moj/cpp/sjp/event/listener/SessionListener.java b/sjp-event/sjp-event-listener/src/main/java/uk/gov/moj/cpp/sjp/event/listener/SessionListener.java index b0c9205ee1..73e722d886 100644 --- a/sjp-event/sjp-event-listener/src/main/java/uk/gov/moj/cpp/sjp/event/listener/SessionListener.java +++ b/sjp-event/sjp-event-listener/src/main/java/uk/gov/moj/cpp/sjp/event/listener/SessionListener.java @@ -19,9 +19,9 @@ import java.time.ZonedDateTime; import java.util.UUID; -import javax.inject.Inject; -import javax.json.JsonObject; -import javax.transaction.Transactional; +import jakarta.inject.Inject; +import jakarta.json.JsonObject; +import jakarta.transaction.Transactional; @ServiceComponent(EVENT_LISTENER) public class SessionListener { diff --git a/sjp-event/sjp-event-listener/src/main/java/uk/gov/moj/cpp/sjp/event/listener/SocCheckListener.java b/sjp-event/sjp-event-listener/src/main/java/uk/gov/moj/cpp/sjp/event/listener/SocCheckListener.java index 7be39ad32e..f3ab66a507 100644 --- a/sjp-event/sjp-event-listener/src/main/java/uk/gov/moj/cpp/sjp/event/listener/SocCheckListener.java +++ b/sjp-event/sjp-event-listener/src/main/java/uk/gov/moj/cpp/sjp/event/listener/SocCheckListener.java @@ -12,8 +12,8 @@ import java.time.ZonedDateTime; import java.util.UUID; -import javax.inject.Inject; -import javax.json.JsonObject; +import jakarta.inject.Inject; +import jakarta.json.JsonObject; @ServiceComponent(EVENT_LISTENER) public class SocCheckListener { diff --git a/sjp-event/sjp-event-listener/src/main/java/uk/gov/moj/cpp/sjp/event/listener/TransparencyReportListener.java b/sjp-event/sjp-event-listener/src/main/java/uk/gov/moj/cpp/sjp/event/listener/TransparencyReportListener.java index 8f256201ed..5064c82400 100644 --- a/sjp-event/sjp-event-listener/src/main/java/uk/gov/moj/cpp/sjp/event/listener/TransparencyReportListener.java +++ b/sjp-event/sjp-event-listener/src/main/java/uk/gov/moj/cpp/sjp/event/listener/TransparencyReportListener.java @@ -22,10 +22,10 @@ import java.util.List; import java.util.UUID; -import javax.inject.Inject; -import javax.json.JsonObject; -import javax.json.JsonString; -import javax.transaction.Transactional; +import jakarta.inject.Inject; +import jakarta.json.JsonObject; +import jakarta.json.JsonString; +import jakarta.transaction.Transactional; import org.apache.commons.collections.CollectionUtils; diff --git a/sjp-event/sjp-event-listener/src/main/java/uk/gov/moj/cpp/sjp/event/listener/TrialRequestCancelledListener.java b/sjp-event/sjp-event-listener/src/main/java/uk/gov/moj/cpp/sjp/event/listener/TrialRequestCancelledListener.java index a83432904e..2b0f71cd63 100644 --- a/sjp-event/sjp-event-listener/src/main/java/uk/gov/moj/cpp/sjp/event/listener/TrialRequestCancelledListener.java +++ b/sjp-event/sjp-event-listener/src/main/java/uk/gov/moj/cpp/sjp/event/listener/TrialRequestCancelledListener.java @@ -9,7 +9,7 @@ import java.util.UUID; -import javax.inject.Inject; +import jakarta.inject.Inject; @ServiceComponent(EVENT_LISTENER) public class TrialRequestCancelledListener { diff --git a/sjp-event/sjp-event-listener/src/main/java/uk/gov/moj/cpp/sjp/event/listener/TrialRequestedListener.java b/sjp-event/sjp-event-listener/src/main/java/uk/gov/moj/cpp/sjp/event/listener/TrialRequestedListener.java index d975072520..33aa35e53f 100644 --- a/sjp-event/sjp-event-listener/src/main/java/uk/gov/moj/cpp/sjp/event/listener/TrialRequestedListener.java +++ b/sjp-event/sjp-event-listener/src/main/java/uk/gov/moj/cpp/sjp/event/listener/TrialRequestedListener.java @@ -12,7 +12,7 @@ import uk.gov.moj.cpp.sjp.persistence.repository.OnlinePleaRepository; import uk.gov.moj.cpp.sjp.persistence.repository.PendingDatesToAvoidRepository; -import javax.inject.Inject; +import jakarta.inject.Inject; @ServiceComponent(EVENT_LISTENER) public class TrialRequestedListener { diff --git a/sjp-event/sjp-event-listener/src/main/java/uk/gov/moj/cpp/sjp/event/listener/UpdateOffenceCodeRequestReceivedListener.java b/sjp-event/sjp-event-listener/src/main/java/uk/gov/moj/cpp/sjp/event/listener/UpdateOffenceCodeRequestReceivedListener.java index 87bb2c4cea..6af92940e5 100644 --- a/sjp-event/sjp-event-listener/src/main/java/uk/gov/moj/cpp/sjp/event/listener/UpdateOffenceCodeRequestReceivedListener.java +++ b/sjp-event/sjp-event-listener/src/main/java/uk/gov/moj/cpp/sjp/event/listener/UpdateOffenceCodeRequestReceivedListener.java @@ -9,7 +9,7 @@ import uk.gov.moj.cpp.sjp.persistence.entity.CaseDetail; import uk.gov.moj.cpp.sjp.persistence.repository.CaseRepository; -import javax.inject.Inject; +import jakarta.inject.Inject; @ServiceComponent(EVENT_LISTENER) public class UpdateOffenceCodeRequestReceivedListener { diff --git a/sjp-event/sjp-event-listener/src/main/java/uk/gov/moj/cpp/sjp/event/listener/converter/ApplicationDecisionSavedToApplicationDecision.java b/sjp-event/sjp-event-listener/src/main/java/uk/gov/moj/cpp/sjp/event/listener/converter/ApplicationDecisionSavedToApplicationDecision.java index 490a0aaf65..b8239cbb44 100644 --- a/sjp-event/sjp-event-listener/src/main/java/uk/gov/moj/cpp/sjp/event/listener/converter/ApplicationDecisionSavedToApplicationDecision.java +++ b/sjp-event/sjp-event-listener/src/main/java/uk/gov/moj/cpp/sjp/event/listener/converter/ApplicationDecisionSavedToApplicationDecision.java @@ -8,7 +8,7 @@ import uk.gov.moj.cpp.sjp.persistence.repository.CaseApplicationRepository; import uk.gov.moj.cpp.sjp.persistence.repository.SessionRepository; -import javax.inject.Inject; +import jakarta.inject.Inject; public class ApplicationDecisionSavedToApplicationDecision implements Converter { diff --git a/sjp-event/sjp-event-listener/src/main/java/uk/gov/moj/cpp/sjp/event/listener/converter/CaseReceivedToCase.java b/sjp-event/sjp-event-listener/src/main/java/uk/gov/moj/cpp/sjp/event/listener/converter/CaseReceivedToCase.java index c7673a9b5d..102b8fab67 100644 --- a/sjp-event/sjp-event-listener/src/main/java/uk/gov/moj/cpp/sjp/event/listener/converter/CaseReceivedToCase.java +++ b/sjp-event/sjp-event-listener/src/main/java/uk/gov/moj/cpp/sjp/event/listener/converter/CaseReceivedToCase.java @@ -4,7 +4,7 @@ import uk.gov.moj.cpp.sjp.event.CaseReceived; import uk.gov.moj.cpp.sjp.persistence.entity.CaseDetail; -import javax.inject.Inject; +import jakarta.inject.Inject; public class CaseReceivedToCase implements Converter { diff --git a/sjp-event/sjp-event-listener/src/main/java/uk/gov/moj/cpp/sjp/event/listener/converter/DecisionSavedToCaseDecision.java b/sjp-event/sjp-event-listener/src/main/java/uk/gov/moj/cpp/sjp/event/listener/converter/DecisionSavedToCaseDecision.java index c092bebea1..9136bfeae9 100644 --- a/sjp-event/sjp-event-listener/src/main/java/uk/gov/moj/cpp/sjp/event/listener/converter/DecisionSavedToCaseDecision.java +++ b/sjp-event/sjp-event-listener/src/main/java/uk/gov/moj/cpp/sjp/event/listener/converter/DecisionSavedToCaseDecision.java @@ -24,8 +24,8 @@ import java.util.Set; import java.util.UUID; -import javax.inject.Inject; -import javax.persistence.EntityManager; +import jakarta.inject.Inject; +import jakarta.persistence.EntityManager; public class DecisionSavedToCaseDecision implements Converter { diff --git a/sjp-event/sjp-event-listener/src/main/java/uk/gov/moj/cpp/sjp/event/listener/converter/DefendantToDefendantDetails.java b/sjp-event/sjp-event-listener/src/main/java/uk/gov/moj/cpp/sjp/event/listener/converter/DefendantToDefendantDetails.java index 48fb5ea71d..14ae806dbb 100644 --- a/sjp-event/sjp-event-listener/src/main/java/uk/gov/moj/cpp/sjp/event/listener/converter/DefendantToDefendantDetails.java +++ b/sjp-event/sjp-event-listener/src/main/java/uk/gov/moj/cpp/sjp/event/listener/converter/DefendantToDefendantDetails.java @@ -10,7 +10,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; public class DefendantToDefendantDetails implements Converter { diff --git a/sjp-event/sjp-event-listener/src/main/java/uk/gov/moj/cpp/sjp/event/listener/converter/PersonToPersonalDetailsEntity.java b/sjp-event/sjp-event-listener/src/main/java/uk/gov/moj/cpp/sjp/event/listener/converter/PersonToPersonalDetailsEntity.java index eeb97955b6..88321b969f 100644 --- a/sjp-event/sjp-event-listener/src/main/java/uk/gov/moj/cpp/sjp/event/listener/converter/PersonToPersonalDetailsEntity.java +++ b/sjp-event/sjp-event-listener/src/main/java/uk/gov/moj/cpp/sjp/event/listener/converter/PersonToPersonalDetailsEntity.java @@ -4,7 +4,7 @@ import uk.gov.moj.cpp.sjp.domain.Person; import uk.gov.moj.cpp.sjp.persistence.entity.PersonalDetails; -import javax.inject.Inject; +import jakarta.inject.Inject; public class PersonToPersonalDetailsEntity

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 - javax - javaee-api + jakarta.platform + jakarta.jakartaee-api provided @@ -127,7 +127,7 @@ org.glassfish - javax.json + jakarta.json test @@ -143,10 +143,15 @@ messaging-client-generator-plugin - javax - javaee-api + jakarta.platform + jakarta.jakartaee-api ${javaee-api.version} + + jakarta.xml.bind + jakarta.xml.bind-api + ${jakarta.xml.bind-api.raml.version} + uk.gov.moj.cpp.sjp sjp-command-handler @@ -166,10 +171,15 @@ rest-client-generator-plugin - javax - javaee-api + jakarta.platform + jakarta.jakartaee-api ${javaee-api.version} + + jakarta.xml.bind + jakarta.xml.bind-api + ${jakarta.xml.bind-api.raml.version} + uk.gov.moj.cpp.notification.notify notificationnotify-command-api diff --git a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/AllOffencesWithdrawalRequestCancelledProcessor.java b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/AllOffencesWithdrawalRequestCancelledProcessor.java index 198f3faed0..ac0a747a59 100644 --- a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/AllOffencesWithdrawalRequestCancelledProcessor.java +++ b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/AllOffencesWithdrawalRequestCancelledProcessor.java @@ -14,7 +14,7 @@ import java.util.UUID; -import javax.inject.Inject; +import jakarta.inject.Inject; @SuppressWarnings("WeakerAccess") @ServiceComponent(Component.EVENT_PROCESSOR) diff --git a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/AllOffencesWithdrawalRequestedProcessor.java b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/AllOffencesWithdrawalRequestedProcessor.java index a4d5b90a5e..daecfe2a40 100644 --- a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/AllOffencesWithdrawalRequestedProcessor.java +++ b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/AllOffencesWithdrawalRequestedProcessor.java @@ -14,7 +14,7 @@ import java.util.UUID; -import javax.inject.Inject; +import jakarta.inject.Inject; @SuppressWarnings("WeakerAccess") @ServiceComponent(Component.EVENT_PROCESSOR) diff --git a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/ApplicationDecisionProcessor.java b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/ApplicationDecisionProcessor.java index 2fd6323a60..3257f352b8 100644 --- a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/ApplicationDecisionProcessor.java +++ b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/ApplicationDecisionProcessor.java @@ -13,7 +13,7 @@ import uk.gov.moj.cpp.sjp.event.ApplicationOffenceResultsSaved; import uk.gov.moj.cpp.sjp.event.processor.results.converter.SjpToHearingConverter; -import javax.inject.Inject; +import jakarta.inject.Inject; import static java.util.Objects.nonNull; import static uk.gov.justice.services.core.annotation.Component.EVENT_PROCESSOR; diff --git a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/ApplicationSetAsideProcessor.java b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/ApplicationSetAsideProcessor.java index 2faa6fc579..1790efb562 100644 --- a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/ApplicationSetAsideProcessor.java +++ b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/ApplicationSetAsideProcessor.java @@ -12,7 +12,7 @@ import uk.gov.justice.services.messaging.JsonEnvelope; import uk.gov.moj.cpp.sjp.event.decision.ApplicationDecisionSetAside; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/AssignmentProcessor.java b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/AssignmentProcessor.java index 5817bc73ec..683808a532 100644 --- a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/AssignmentProcessor.java +++ b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/AssignmentProcessor.java @@ -26,9 +26,9 @@ import java.util.List; import java.util.UUID; -import javax.inject.Inject; -import javax.json.JsonArrayBuilder; -import javax.json.JsonObject; +import jakarta.inject.Inject; +import jakarta.json.JsonArrayBuilder; +import jakarta.json.JsonObject; @ServiceComponent(EVENT_PROCESSOR) public class AssignmentProcessor { diff --git a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/CaseAdjournmentProcessor.java b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/CaseAdjournmentProcessor.java index 05313ab4ed..38282c3d43 100644 --- a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/CaseAdjournmentProcessor.java +++ b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/CaseAdjournmentProcessor.java @@ -12,8 +12,8 @@ import java.time.LocalDate; import java.util.UUID; -import javax.inject.Inject; -import javax.json.JsonObject; +import jakarta.inject.Inject; +import jakarta.json.JsonObject; @ServiceComponent(EVENT_PROCESSOR) public class CaseAdjournmentProcessor { diff --git a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/CaseApplicationRecordedProcessor.java b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/CaseApplicationRecordedProcessor.java index d786a600bf..1f6da2e314 100644 --- a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/CaseApplicationRecordedProcessor.java +++ b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/CaseApplicationRecordedProcessor.java @@ -16,8 +16,8 @@ import uk.gov.moj.cpp.sjp.event.CaseApplicationRecorded; import uk.gov.moj.cpp.sjp.event.processor.service.enforcementnotification.EnforcementNotificationService; -import javax.inject.Inject; -import javax.json.JsonObject; +import jakarta.inject.Inject; +import jakarta.json.JsonObject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/CaseCompletedProcessor.java b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/CaseCompletedProcessor.java index 14b3a76520..4cacc95897 100644 --- a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/CaseCompletedProcessor.java +++ b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/CaseCompletedProcessor.java @@ -15,8 +15,8 @@ import java.util.UUID; -import javax.inject.Inject; -import javax.json.JsonObject; +import jakarta.inject.Inject; +import jakarta.json.JsonObject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/CaseCreationFailedBecauseCaseAlreadyExistedProcessor.java b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/CaseCreationFailedBecauseCaseAlreadyExistedProcessor.java index 74a19d82a0..6aee4fca76 100644 --- a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/CaseCreationFailedBecauseCaseAlreadyExistedProcessor.java +++ b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/CaseCreationFailedBecauseCaseAlreadyExistedProcessor.java @@ -8,8 +8,8 @@ import uk.gov.justice.services.core.sender.Sender; import uk.gov.justice.services.messaging.JsonEnvelope; -import javax.inject.Inject; -import javax.json.JsonObject; +import jakarta.inject.Inject; +import jakarta.json.JsonObject; @ServiceComponent(EVENT_PROCESSOR) public class CaseCreationFailedBecauseCaseAlreadyExistedProcessor { diff --git a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/CaseDecisionProcessor.java b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/CaseDecisionProcessor.java index cf7dd3dbaa..5ea3ce5662 100644 --- a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/CaseDecisionProcessor.java +++ b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/CaseDecisionProcessor.java @@ -47,11 +47,11 @@ import java.util.UUID; import java.util.stream.Collectors; -import javax.inject.Inject; -import javax.json.JsonArrayBuilder; -import javax.json.JsonObject; -import javax.json.JsonObjectBuilder; -import javax.json.JsonValue; +import jakarta.inject.Inject; +import jakarta.json.JsonArrayBuilder; +import jakarta.json.JsonObject; +import jakarta.json.JsonObjectBuilder; +import jakarta.json.JsonValue; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/CaseDocumentProcessor.java b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/CaseDocumentProcessor.java index 2f9df8917d..14e771c6f1 100644 --- a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/CaseDocumentProcessor.java +++ b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/CaseDocumentProcessor.java @@ -21,8 +21,8 @@ import java.util.Optional; import java.util.UUID; -import javax.inject.Inject; -import javax.json.JsonObject; +import jakarta.inject.Inject; +import jakarta.json.JsonObject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/CaseDocumentUpdatedProcessor.java b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/CaseDocumentUpdatedProcessor.java index de81dce659..d1a219876d 100644 --- a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/CaseDocumentUpdatedProcessor.java +++ b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/CaseDocumentUpdatedProcessor.java @@ -10,9 +10,9 @@ import uk.gov.justice.services.messaging.JsonEnvelope; import uk.gov.moj.cpp.sjp.event.CaseDocumentAdded; -import javax.inject.Inject; -import javax.json.JsonObject; -import javax.json.JsonObjectBuilder; +import jakarta.inject.Inject; +import jakarta.json.JsonObject; +import jakarta.json.JsonObjectBuilder; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/CaseLegalSocCheckedProcessor.java b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/CaseLegalSocCheckedProcessor.java index a99fea2f1a..7376e4907f 100644 --- a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/CaseLegalSocCheckedProcessor.java +++ b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/CaseLegalSocCheckedProcessor.java @@ -2,7 +2,7 @@ import static java.lang.String.format; import static java.util.UUID.randomUUID; -import static javax.json.JsonValue.NULL; +import static jakarta.json.JsonValue.NULL; import static uk.gov.justice.services.core.annotation.Component.EVENT_PROCESSOR; import static uk.gov.justice.services.messaging.Envelope.envelopeFrom; import static uk.gov.justice.services.messaging.JsonEnvelope.metadataFrom; @@ -23,9 +23,9 @@ import java.time.ZonedDateTime; import java.util.UUID; -import javax.inject.Inject; -import javax.json.JsonObject; -import javax.json.JsonObjectBuilder; +import jakarta.inject.Inject; +import jakarta.json.JsonObject; +import jakarta.json.JsonObjectBuilder; @ServiceComponent(EVENT_PROCESSOR) public class CaseLegalSocCheckedProcessor { diff --git a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/CaseListedProcessor.java b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/CaseListedProcessor.java index 141ddb48e3..eb713353f6 100644 --- a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/CaseListedProcessor.java +++ b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/CaseListedProcessor.java @@ -14,8 +14,8 @@ import uk.gov.moj.cpp.sjp.event.CaseListedInCriminalCourtsV2; import uk.gov.moj.cpp.sjp.event.processor.results.converter.SjpToHearingConverter; -import javax.inject.Inject; -import javax.json.JsonObject; +import jakarta.inject.Inject; +import jakarta.json.JsonObject; import static uk.gov.justice.hearing.courts.HearingResulted.hearingResulted; import static uk.gov.justice.services.core.enveloper.Enveloper.envelop; diff --git a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/CaseNoteAddedProcessor.java b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/CaseNoteAddedProcessor.java index 935a1ac823..5c9e1778ba 100644 --- a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/CaseNoteAddedProcessor.java +++ b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/CaseNoteAddedProcessor.java @@ -15,8 +15,8 @@ import java.util.UUID; -import javax.inject.Inject; -import javax.json.JsonObject; +import jakarta.inject.Inject; +import jakarta.json.JsonObject; @ServiceComponent(EVENT_PROCESSOR) public class CaseNoteAddedProcessor { diff --git a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/CaseReceivedProcessor.java b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/CaseReceivedProcessor.java index 1defd0ef31..ee42c766f2 100644 --- a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/CaseReceivedProcessor.java +++ b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/CaseReceivedProcessor.java @@ -37,9 +37,9 @@ import java.util.Optional; import java.util.UUID; -import javax.inject.Inject; -import javax.json.JsonObject; -import javax.json.JsonObjectBuilder; +import jakarta.inject.Inject; +import jakarta.json.JsonObject; +import jakarta.json.JsonObjectBuilder; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/CaseReopenedProcessor.java b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/CaseReopenedProcessor.java index 8c8e49d4ee..6cd727efae 100644 --- a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/CaseReopenedProcessor.java +++ b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/CaseReopenedProcessor.java @@ -10,8 +10,8 @@ import uk.gov.justice.services.core.sender.Sender; import uk.gov.justice.services.messaging.JsonEnvelope; -import javax.inject.Inject; -import javax.json.JsonObject; +import jakarta.inject.Inject; +import jakarta.json.JsonObject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/CaseReservedProcessor.java b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/CaseReservedProcessor.java index 3ab251388e..7ce8e4d231 100644 --- a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/CaseReservedProcessor.java +++ b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/CaseReservedProcessor.java @@ -5,7 +5,7 @@ import java.time.ZonedDateTime; import java.util.UUID; -import javax.inject.Inject; +import jakarta.inject.Inject; import uk.gov.justice.services.core.annotation.Component; import uk.gov.justice.services.core.annotation.Handles; import uk.gov.justice.services.core.annotation.ServiceComponent; diff --git a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/CaseUpdateRejectedProcessor.java b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/CaseUpdateRejectedProcessor.java index 1a2071cd90..c3781f6731 100644 --- a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/CaseUpdateRejectedProcessor.java +++ b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/CaseUpdateRejectedProcessor.java @@ -12,8 +12,8 @@ import uk.gov.justice.services.messaging.JsonEnvelope; import uk.gov.moj.cpp.sjp.event.CaseUpdateRejected; -import javax.inject.Inject; -import javax.json.JsonObject; +import jakarta.inject.Inject; +import jakarta.json.JsonObject; @SuppressWarnings("WeakerAccess") @ServiceComponent(Component.EVENT_PROCESSOR) diff --git a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/ConvictionCourtResolvedProcessor.java b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/ConvictionCourtResolvedProcessor.java index de26e1346c..d089ef140d 100644 --- a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/ConvictionCourtResolvedProcessor.java +++ b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/ConvictionCourtResolvedProcessor.java @@ -9,8 +9,8 @@ import uk.gov.justice.services.messaging.JsonEnvelope; import uk.gov.moj.cpp.sjp.event.decision.ConvictionCourtResolved; -import javax.inject.Inject; -import javax.json.JsonObject; +import jakarta.inject.Inject; +import jakarta.json.JsonObject; @ServiceComponent(Component.EVENT_PROCESSOR) public class ConvictionCourtResolvedProcessor { diff --git a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/CourtApplicationCreatedProcessor.java b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/CourtApplicationCreatedProcessor.java index caf5eaac6c..5d51c14bc0 100644 --- a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/CourtApplicationCreatedProcessor.java +++ b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/CourtApplicationCreatedProcessor.java @@ -17,8 +17,8 @@ import uk.gov.justice.services.core.sender.Sender; import uk.gov.justice.services.messaging.JsonEnvelope; -import javax.inject.Inject; -import javax.json.JsonObject; +import jakarta.inject.Inject; +import jakarta.json.JsonObject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/CourtApplicationUpdatedProcessor.java b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/CourtApplicationUpdatedProcessor.java index 121ff16d7f..f692d4ec1c 100644 --- a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/CourtApplicationUpdatedProcessor.java +++ b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/CourtApplicationUpdatedProcessor.java @@ -9,7 +9,7 @@ import uk.gov.justice.services.core.sender.Sender; import uk.gov.justice.services.messaging.JsonEnvelope; -import javax.inject.Inject; +import jakarta.inject.Inject; /** * Subject's address updated while creating application diff --git a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/CourtReferralProcessor.java b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/CourtReferralProcessor.java index c54e78ff5d..7faadd052d 100644 --- a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/CourtReferralProcessor.java +++ b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/CourtReferralProcessor.java @@ -2,7 +2,7 @@ import static java.lang.String.format; import static java.util.Collections.emptyList; -import static javax.json.JsonValue.NULL; +import static jakarta.json.JsonValue.NULL; import static uk.gov.justice.services.core.annotation.Component.EVENT_PROCESSOR; import static uk.gov.justice.services.messaging.Envelope.metadataFrom; import static uk.gov.justice.services.messaging.JsonEnvelope.envelopeFrom; @@ -40,8 +40,8 @@ import java.util.Optional; import java.util.UUID; -import javax.inject.Inject; -import javax.json.JsonObject; +import jakarta.inject.Inject; +import jakarta.json.JsonObject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/DatesToAvoidProcessor.java b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/DatesToAvoidProcessor.java index 0339168357..89b7b5d4c5 100644 --- a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/DatesToAvoidProcessor.java +++ b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/DatesToAvoidProcessor.java @@ -17,8 +17,8 @@ import java.time.LocalDate; import java.util.UUID; -import javax.inject.Inject; -import javax.json.JsonObject; +import jakarta.inject.Inject; +import jakarta.json.JsonObject; @ServiceComponent(EVENT_PROCESSOR) public class DatesToAvoidProcessor { diff --git a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/DefendantAcceptedAocpProcessor.java b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/DefendantAcceptedAocpProcessor.java index a026882a64..ad4f92581f 100644 --- a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/DefendantAcceptedAocpProcessor.java +++ b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/DefendantAcceptedAocpProcessor.java @@ -25,8 +25,8 @@ import java.time.LocalDate; import java.time.ZonedDateTime; -import javax.inject.Inject; -import javax.json.JsonObject; +import jakarta.inject.Inject; +import jakarta.json.JsonObject; @ServiceComponent(EVENT_PROCESSOR) public class DefendantAcceptedAocpProcessor { diff --git a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/DefendantDetailsUpdateProcessor.java b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/DefendantDetailsUpdateProcessor.java index 676703dd46..a78ebf870a 100644 --- a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/DefendantDetailsUpdateProcessor.java +++ b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/DefendantDetailsUpdateProcessor.java @@ -8,7 +8,7 @@ import uk.gov.justice.services.core.sender.Sender; import uk.gov.justice.services.messaging.JsonEnvelope; -import javax.inject.Inject; +import jakarta.inject.Inject; @ServiceComponent(EVENT_PROCESSOR) public class DefendantDetailsUpdateProcessor { diff --git a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/DefendantDetailsUpdateRequestAcceptedProcessor.java b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/DefendantDetailsUpdateRequestAcceptedProcessor.java index 87f353e0d5..532c4c2637 100644 --- a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/DefendantDetailsUpdateRequestAcceptedProcessor.java +++ b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/DefendantDetailsUpdateRequestAcceptedProcessor.java @@ -10,9 +10,9 @@ import uk.gov.justice.services.core.sender.Sender; import uk.gov.justice.services.messaging.JsonEnvelope; -import javax.inject.Inject; -import javax.json.JsonObject; -import javax.json.JsonObjectBuilder; +import jakarta.inject.Inject; +import jakarta.json.JsonObject; +import jakarta.json.JsonObjectBuilder; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/DefendantDetailsUpdatesAcknowledgedProcessor.java b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/DefendantDetailsUpdatesAcknowledgedProcessor.java index 07004d98ef..5126647e73 100644 --- a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/DefendantDetailsUpdatesAcknowledgedProcessor.java +++ b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/DefendantDetailsUpdatesAcknowledgedProcessor.java @@ -10,8 +10,8 @@ import uk.gov.justice.services.messaging.JsonEnvelope; import uk.gov.moj.cpp.sjp.event.DefendantDetailsUpdatesAcknowledged; -import javax.inject.Inject; -import javax.json.JsonObject; +import jakarta.inject.Inject; +import jakarta.json.JsonObject; @ServiceComponent(EVENT_PROCESSOR) public class DefendantDetailsUpdatesAcknowledgedProcessor { diff --git a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/DefendantPendingChangesAcceptedProcessor.java b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/DefendantPendingChangesAcceptedProcessor.java index 0d2dfc9f57..ceab5e9800 100644 --- a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/DefendantPendingChangesAcceptedProcessor.java +++ b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/DefendantPendingChangesAcceptedProcessor.java @@ -8,7 +8,7 @@ import uk.gov.justice.services.core.sender.Sender; import uk.gov.justice.services.messaging.JsonEnvelope; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/DefendantPendingChangesRejectedProcessor.java b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/DefendantPendingChangesRejectedProcessor.java index 1feb92151d..3683d285f2 100644 --- a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/DefendantPendingChangesRejectedProcessor.java +++ b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/DefendantPendingChangesRejectedProcessor.java @@ -8,7 +8,7 @@ import uk.gov.justice.services.core.sender.Sender; import uk.gov.justice.services.messaging.JsonEnvelope; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/DeleteCaseDocumentProcessor.java b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/DeleteCaseDocumentProcessor.java index 6d6c2b07fd..d8a15f3a96 100644 --- a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/DeleteCaseDocumentProcessor.java +++ b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/DeleteCaseDocumentProcessor.java @@ -11,7 +11,7 @@ import uk.gov.justice.services.core.sender.Sender; import uk.gov.justice.services.messaging.JsonEnvelope; -import javax.inject.Inject; +import jakarta.inject.Inject; @ServiceComponent(EVENT_PROCESSOR) public class DeleteCaseDocumentProcessor { diff --git a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/DeleteDocsStartedProcessor.java b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/DeleteDocsStartedProcessor.java index 5a1cec5d78..d47fcacc8e 100644 --- a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/DeleteDocsStartedProcessor.java +++ b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/DeleteDocsStartedProcessor.java @@ -13,8 +13,8 @@ import uk.gov.justice.services.messaging.JsonEnvelope; import uk.gov.moj.cpp.sjp.event.FinancialMeansDeleteDocsStarted; -import javax.inject.Inject; -import javax.json.JsonObject; +import jakarta.inject.Inject; +import jakarta.json.JsonObject; @ServiceComponent(EVENT_PROCESSOR) public class DeleteDocsStartedProcessor { diff --git a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/EmployerProcessor.java b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/EmployerProcessor.java index 69549174a4..5fa5489082 100644 --- a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/EmployerProcessor.java +++ b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/EmployerProcessor.java @@ -8,7 +8,7 @@ import uk.gov.justice.services.core.sender.Sender; import uk.gov.justice.services.messaging.JsonEnvelope; -import javax.inject.Inject; +import jakarta.inject.Inject; @ServiceComponent(EVENT_PROCESSOR) public class EmployerProcessor { diff --git a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/EndorsementRemovalNotificationProcessor.java b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/EndorsementRemovalNotificationProcessor.java index c5d3d8e63c..c9992b5654 100644 --- a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/EndorsementRemovalNotificationProcessor.java +++ b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/EndorsementRemovalNotificationProcessor.java @@ -26,7 +26,7 @@ import java.util.Optional; import java.util.UUID; -import javax.inject.Inject; +import jakarta.inject.Inject; @ServiceComponent(EVENT_PROCESSOR) public class EndorsementRemovalNotificationProcessor { diff --git a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/EnforcementPendingApplicationNotificationProcessor.java b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/EnforcementPendingApplicationNotificationProcessor.java index 3f51aadabb..37cb984083 100644 --- a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/EnforcementPendingApplicationNotificationProcessor.java +++ b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/EnforcementPendingApplicationNotificationProcessor.java @@ -31,7 +31,7 @@ import java.time.ZonedDateTime; import java.util.UUID; -import javax.inject.Inject; +import jakarta.inject.Inject; @ServiceComponent(EVENT_PROCESSOR) public class EnforcementPendingApplicationNotificationProcessor { diff --git a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/FinancialImpositionExportProcessor.java b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/FinancialImpositionExportProcessor.java index 284687c3c5..2067ad7796 100644 --- a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/FinancialImpositionExportProcessor.java +++ b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/FinancialImpositionExportProcessor.java @@ -13,7 +13,7 @@ import uk.gov.moj.cpp.sjp.event.FinancialImpositionAccountNumberAdded; import uk.gov.moj.cpp.sjp.event.processor.service.enforcementnotification.EnforcementNotificationService; -import javax.inject.Inject; +import jakarta.inject.Inject; @ServiceComponent(EVENT_PROCESSOR) public class FinancialImpositionExportProcessor { diff --git a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/FinancialMeansProcessor.java b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/FinancialMeansProcessor.java index 40646b282d..e8bc6b0af7 100644 --- a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/FinancialMeansProcessor.java +++ b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/FinancialMeansProcessor.java @@ -9,9 +9,9 @@ import uk.gov.justice.services.core.sender.Sender; import uk.gov.justice.services.messaging.JsonEnvelope; -import javax.inject.Inject; -import javax.json.JsonArray; -import javax.json.JsonObject; +import jakarta.inject.Inject; +import jakarta.json.JsonArray; +import jakarta.json.JsonObject; @ServiceComponent(EVENT_PROCESSOR) public class FinancialMeansProcessor { diff --git a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/HearingResultReceivedProcessor.java b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/HearingResultReceivedProcessor.java index 7c6f428096..c4e58da1af 100644 --- a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/HearingResultReceivedProcessor.java +++ b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/HearingResultReceivedProcessor.java @@ -22,8 +22,8 @@ import java.util.Objects; import java.util.Optional; -import javax.inject.Inject; -import javax.json.JsonObject; +import jakarta.inject.Inject; +import jakarta.json.JsonObject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/HearingResultedProcessor.java b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/HearingResultedProcessor.java index 7d2d5f1445..99d3a4597c 100644 --- a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/HearingResultedProcessor.java +++ b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/HearingResultedProcessor.java @@ -22,8 +22,8 @@ import java.util.Objects; import java.util.Optional; -import javax.inject.Inject; -import javax.json.JsonObject; +import jakarta.inject.Inject; +import jakarta.json.JsonObject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/NotificationNotifyProcessor.java b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/NotificationNotifyProcessor.java index 4195c0fd18..c921af04da 100644 --- a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/NotificationNotifyProcessor.java +++ b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/NotificationNotifyProcessor.java @@ -28,7 +28,7 @@ import java.util.Optional; import java.util.UUID; -import javax.inject.Inject; +import jakarta.inject.Inject; /** * Process responses from Notification.Notify public events for sent and failed emails diff --git a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/OffenceWithdrawalRequestProcessor.java b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/OffenceWithdrawalRequestProcessor.java index 145dde7455..e22953a537 100644 --- a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/OffenceWithdrawalRequestProcessor.java +++ b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/OffenceWithdrawalRequestProcessor.java @@ -8,7 +8,7 @@ import uk.gov.justice.services.core.sender.Sender; import uk.gov.justice.services.messaging.JsonEnvelope; -import javax.inject.Inject; +import jakarta.inject.Inject; @ServiceComponent(EVENT_PROCESSOR) public class OffenceWithdrawalRequestProcessor { diff --git a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/PartialAocpCriteriaNotificationProcessor.java b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/PartialAocpCriteriaNotificationProcessor.java index 11d794469c..77a94787bb 100644 --- a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/PartialAocpCriteriaNotificationProcessor.java +++ b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/PartialAocpCriteriaNotificationProcessor.java @@ -23,8 +23,8 @@ import java.util.Optional; import java.util.UUID; -import javax.inject.Inject; -import javax.json.JsonObject; +import jakarta.inject.Inject; +import jakarta.json.JsonObject; @ServiceComponent(EVENT_PROCESSOR) public class PartialAocpCriteriaNotificationProcessor { diff --git a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/PleaNotificationProcessor.java b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/PleaNotificationProcessor.java index 2c1b4a2441..4c72ad4648 100644 --- a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/PleaNotificationProcessor.java +++ b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/PleaNotificationProcessor.java @@ -16,8 +16,8 @@ import uk.gov.moj.cpp.sjp.event.processor.service.Country; import uk.gov.moj.cpp.sjp.event.processor.service.ReferenceDataService; -import javax.inject.Inject; -import javax.json.JsonObject; +import jakarta.inject.Inject; +import jakarta.json.JsonObject; @SuppressWarnings("squid:CallToDeprecatedMethod") @ServiceComponent(EVENT_PROCESSOR) diff --git a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/PleaUpdatedProcessor.java b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/PleaUpdatedProcessor.java index e9b2b6d5fe..8d01f44b4c 100644 --- a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/PleaUpdatedProcessor.java +++ b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/PleaUpdatedProcessor.java @@ -33,8 +33,8 @@ import java.util.Optional; import java.util.UUID; -import javax.inject.Inject; -import javax.json.JsonObject; +import jakarta.inject.Inject; +import jakarta.json.JsonObject; @ServiceComponent(EVENT_PROCESSOR) public class PleaUpdatedProcessor { diff --git a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/PleadOnlineProcessor.java b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/PleadOnlineProcessor.java index 527a180742..c7e714946f 100644 --- a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/PleadOnlineProcessor.java +++ b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/PleadOnlineProcessor.java @@ -35,9 +35,9 @@ import java.util.Set; import java.util.stream.Stream; -import javax.inject.Inject; -import javax.json.JsonObject; -import javax.json.JsonObjectBuilder; +import jakarta.inject.Inject; +import jakarta.json.JsonObject; +import jakarta.json.JsonObjectBuilder; import org.apache.commons.lang3.StringUtils; diff --git a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/PleasSetProcessor.java b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/PleasSetProcessor.java index 10f3d716f2..7f0d7b4c81 100644 --- a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/PleasSetProcessor.java +++ b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/PleasSetProcessor.java @@ -9,7 +9,7 @@ import uk.gov.justice.services.messaging.JsonEnvelope; import uk.gov.moj.cpp.sjp.event.PleasSet; -import javax.inject.Inject; +import jakarta.inject.Inject; @ServiceComponent(EVENT_PROCESSOR) public class PleasSetProcessor { diff --git a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/PressTransparencyReportRequestedProcessor.java b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/PressTransparencyReportRequestedProcessor.java index 175cb2d0b6..5e3ee0f538 100644 --- a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/PressTransparencyReportRequestedProcessor.java +++ b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/PressTransparencyReportRequestedProcessor.java @@ -49,12 +49,12 @@ import java.util.Optional; import java.util.UUID; -import javax.inject.Inject; -import javax.json.JsonArray; -import javax.json.JsonArrayBuilder; -import javax.json.JsonObject; -import javax.json.JsonObjectBuilder; -import javax.transaction.Transactional; +import jakarta.inject.Inject; +import jakarta.json.JsonArray; +import jakarta.json.JsonArrayBuilder; +import jakarta.json.JsonObject; +import jakarta.json.JsonObjectBuilder; +import jakarta.transaction.Transactional; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/ProsecutionCasesReferredToCourtProcessor.java b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/ProsecutionCasesReferredToCourtProcessor.java index de17e04a88..fb9302caab 100644 --- a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/ProsecutionCasesReferredToCourtProcessor.java +++ b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/ProsecutionCasesReferredToCourtProcessor.java @@ -10,9 +10,9 @@ import uk.gov.justice.services.core.sender.Sender; import uk.gov.justice.services.messaging.JsonEnvelope; -import javax.inject.Inject; -import javax.json.JsonObject; -import javax.json.JsonObjectBuilder; +import jakarta.inject.Inject; +import jakarta.json.JsonObject; +import jakarta.json.JsonObjectBuilder; @ServiceComponent(EVENT_PROCESSOR) public class ProsecutionCasesReferredToCourtProcessor { diff --git a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/SJPDefendantUpdatedProcessor.java b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/SJPDefendantUpdatedProcessor.java index 598f1026aa..9f076c8698 100644 --- a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/SJPDefendantUpdatedProcessor.java +++ b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/SJPDefendantUpdatedProcessor.java @@ -10,9 +10,9 @@ import uk.gov.justice.services.core.sender.Sender; import uk.gov.justice.services.messaging.JsonEnvelope; -import javax.inject.Inject; -import javax.json.JsonObject; -import javax.json.JsonObjectBuilder; +import jakarta.inject.Inject; +import jakarta.json.JsonObject; +import jakarta.json.JsonObjectBuilder; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/SessionProcessor.java b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/SessionProcessor.java index 68332a420d..e9f1e5a1b8 100644 --- a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/SessionProcessor.java +++ b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/SessionProcessor.java @@ -22,8 +22,8 @@ import java.util.UUID; -import javax.inject.Inject; -import javax.json.JsonObject; +import jakarta.inject.Inject; +import jakarta.json.JsonObject; @ServiceComponent(EVENT_PROCESSOR) public class SessionProcessor { diff --git a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/SjpProsecutionCaseCreatedProcessor.java b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/SjpProsecutionCaseCreatedProcessor.java index d845a5c21e..556f2563df 100644 --- a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/SjpProsecutionCaseCreatedProcessor.java +++ b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/SjpProsecutionCaseCreatedProcessor.java @@ -1,6 +1,6 @@ package uk.gov.moj.cpp.sjp.event.processor; -import static javax.json.JsonValue.NULL; +import static jakarta.json.JsonValue.NULL; import static org.slf4j.LoggerFactory.getLogger; import static uk.gov.justice.services.core.annotation.Component.EVENT_PROCESSOR; import static uk.gov.justice.services.messaging.Envelope.metadataFrom; @@ -23,10 +23,10 @@ import java.time.LocalDate; import java.util.UUID; -import javax.inject.Inject; -import javax.json.JsonArray; -import javax.json.JsonArrayBuilder; -import javax.json.JsonObject; +import jakarta.inject.Inject; +import jakarta.json.JsonArray; +import jakarta.json.JsonArrayBuilder; +import jakarta.json.JsonObject; import org.slf4j.Logger; diff --git a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/StagingEnforcementEventProcessor.java b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/StagingEnforcementEventProcessor.java index eaf9a68e96..dac1d6e8dc 100644 --- a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/StagingEnforcementEventProcessor.java +++ b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/StagingEnforcementEventProcessor.java @@ -13,8 +13,8 @@ import java.util.Optional; import java.util.UUID; -import javax.inject.Inject; -import javax.json.JsonObject; +import jakarta.inject.Inject; +import jakarta.json.JsonObject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/SysDocGeneratorProcessor.java b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/SysDocGeneratorProcessor.java index 2eac86858c..62989d0931 100644 --- a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/SysDocGeneratorProcessor.java +++ b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/SysDocGeneratorProcessor.java @@ -8,9 +8,9 @@ import uk.gov.justice.services.messaging.JsonEnvelope; import uk.gov.moj.cpp.sjp.event.processor.service.systemdocgenerator.SystemDocGeneratorResponseStrategy; -import javax.enterprise.inject.Instance; -import javax.inject.Inject; -import javax.json.JsonObject; +import jakarta.enterprise.inject.Instance; +import jakarta.inject.Inject; +import jakarta.json.JsonObject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/TransparencyReportRequestedProcessor.java b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/TransparencyReportRequestedProcessor.java index d78984bdea..de7f8f8571 100644 --- a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/TransparencyReportRequestedProcessor.java +++ b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/TransparencyReportRequestedProcessor.java @@ -48,12 +48,12 @@ import java.util.Optional; import java.util.UUID; -import javax.inject.Inject; -import javax.json.JsonArray; -import javax.json.JsonArrayBuilder; -import javax.json.JsonObject; -import javax.json.JsonObjectBuilder; -import javax.transaction.Transactional; +import jakarta.inject.Inject; +import jakarta.json.JsonArray; +import jakarta.json.JsonArrayBuilder; +import jakarta.json.JsonObject; +import jakarta.json.JsonObjectBuilder; +import jakarta.transaction.Transactional; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/UpdateCasesManagementStatusProcessor.java b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/UpdateCasesManagementStatusProcessor.java index 0bb79c2624..4ed1edce63 100644 --- a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/UpdateCasesManagementStatusProcessor.java +++ b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/UpdateCasesManagementStatusProcessor.java @@ -11,9 +11,9 @@ import uk.gov.justice.services.messaging.JsonEnvelope; import uk.gov.moj.cpp.sjp.event.casemanagement.UpdateCasesManagementStatus; -import javax.inject.Inject; -import javax.json.JsonObject; -import javax.transaction.Transactional; +import jakarta.inject.Inject; +import jakarta.json.JsonObject; +import jakarta.transaction.Transactional; @ServiceComponent(EVENT_PROCESSOR) public class UpdateCasesManagementStatusProcessor { diff --git a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/activiti/ActivitiService.java b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/activiti/ActivitiService.java index 77f3ec987a..be4052a1df 100644 --- a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/activiti/ActivitiService.java +++ b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/activiti/ActivitiService.java @@ -4,8 +4,8 @@ import java.util.Map; import java.util.Optional; -import javax.ejb.Startup; -import javax.inject.Inject; +import jakarta.ejb.Startup; +import jakarta.inject.Inject; import org.activiti.engine.RuntimeService; import org.activiti.engine.runtime.Execution; diff --git a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/activiti/CaseAssignmentTimeoutProcess.java b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/activiti/CaseAssignmentTimeoutProcess.java index 73fb6066a6..4db3421c98 100644 --- a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/activiti/CaseAssignmentTimeoutProcess.java +++ b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/activiti/CaseAssignmentTimeoutProcess.java @@ -7,8 +7,8 @@ import java.util.Map; import java.util.UUID; -import javax.inject.Inject; -import javax.inject.Named; +import jakarta.inject.Inject; +import jakarta.inject.Named; import org.activiti.engine.RuntimeService; import org.activiti.engine.runtime.ProcessInstance; diff --git a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/activiti/CaseStateService.java b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/activiti/CaseStateService.java index 4ccd4a133c..57b4a056ae 100644 --- a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/activiti/CaseStateService.java +++ b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/activiti/CaseStateService.java @@ -18,7 +18,7 @@ import java.util.Optional; import java.util.UUID; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/activiti/SjpProcessManagerService.java b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/activiti/SjpProcessManagerService.java index c9f7cb6619..65f8c7d7a1 100644 --- a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/activiti/SjpProcessManagerService.java +++ b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/activiti/SjpProcessManagerService.java @@ -8,9 +8,9 @@ import java.util.Map; import java.util.UUID; -import javax.ejb.Startup; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; +import jakarta.ejb.Startup; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; import org.activiti.engine.RuntimeService; import org.activiti.engine.runtime.Execution; diff --git a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/activiti/TimerExpirationProcess.java b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/activiti/TimerExpirationProcess.java index 0307492829..3f92103348 100644 --- a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/activiti/TimerExpirationProcess.java +++ b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/activiti/TimerExpirationProcess.java @@ -14,8 +14,8 @@ import java.util.Map; import java.util.UUID; -import javax.inject.Inject; -import javax.inject.Named; +import jakarta.inject.Inject; +import jakarta.inject.Named; import org.activiti.engine.RuntimeService; import org.slf4j.Logger; diff --git a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/activiti/delegates/AbstractCaseDelegate.java b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/activiti/delegates/AbstractCaseDelegate.java index ab90d79055..e2f2be092d 100644 --- a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/activiti/delegates/AbstractCaseDelegate.java +++ b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/activiti/delegates/AbstractCaseDelegate.java @@ -14,8 +14,8 @@ import java.util.UUID; -import javax.inject.Inject; -import javax.json.JsonObject; +import jakarta.inject.Inject; +import jakarta.json.JsonObject; import org.activiti.engine.delegate.DelegateExecution; import org.activiti.engine.delegate.JavaDelegate; diff --git a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/activiti/delegates/AddMaterialToCase.java b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/activiti/delegates/AddMaterialToCase.java index 72d393658f..2365f3cfe1 100644 --- a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/activiti/delegates/AddMaterialToCase.java +++ b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/activiti/delegates/AddMaterialToCase.java @@ -12,9 +12,9 @@ import uk.gov.moj.cpp.sjp.event.processor.CaseDocumentProcessor; import uk.gov.moj.cpp.sjp.event.processor.utils.MetadataHelper; -import javax.inject.Inject; -import javax.inject.Named; -import javax.json.JsonObject; +import jakarta.inject.Inject; +import jakarta.inject.Named; +import jakarta.json.JsonObject; import org.activiti.engine.delegate.DelegateExecution; import org.activiti.engine.delegate.JavaDelegate; diff --git a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/activiti/delegates/AssignmentTimedOutDelegate.java b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/activiti/delegates/AssignmentTimedOutDelegate.java index 9009a4f060..d22ced0738 100644 --- a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/activiti/delegates/AssignmentTimedOutDelegate.java +++ b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/activiti/delegates/AssignmentTimedOutDelegate.java @@ -8,8 +8,8 @@ import java.util.UUID; -import javax.inject.Inject; -import javax.inject.Named; +import jakarta.inject.Inject; +import jakarta.inject.Named; import org.activiti.engine.delegate.DelegateExecution; import org.activiti.engine.delegate.JavaDelegate; diff --git a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/activiti/delegates/CaseCompletedDelegate.java b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/activiti/delegates/CaseCompletedDelegate.java index d3122d5b7f..a213d37ebe 100644 --- a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/activiti/delegates/CaseCompletedDelegate.java +++ b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/activiti/delegates/CaseCompletedDelegate.java @@ -4,7 +4,7 @@ import java.util.UUID; -import javax.inject.Named; +import jakarta.inject.Named; import org.activiti.engine.delegate.DelegateExecution; import org.slf4j.Logger; diff --git a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/activiti/delegates/CaseStartedDelegate.java b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/activiti/delegates/CaseStartedDelegate.java index 6805024d65..4ca8d1a454 100644 --- a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/activiti/delegates/CaseStartedDelegate.java +++ b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/activiti/delegates/CaseStartedDelegate.java @@ -4,7 +4,7 @@ import java.util.UUID; -import javax.inject.Named; +import jakarta.inject.Named; import org.activiti.engine.delegate.DelegateExecution; import org.slf4j.Logger; diff --git a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/activiti/delegates/DatesToAvoidProcessedDelegate.java b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/activiti/delegates/DatesToAvoidProcessedDelegate.java index 4cefd07ef9..10f220a301 100644 --- a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/activiti/delegates/DatesToAvoidProcessedDelegate.java +++ b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/activiti/delegates/DatesToAvoidProcessedDelegate.java @@ -13,7 +13,7 @@ import java.util.UUID; -import javax.inject.Named; +import jakarta.inject.Named; import org.activiti.engine.delegate.DelegateExecution; diff --git a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/activiti/delegates/PleaCancelledDelegate.java b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/activiti/delegates/PleaCancelledDelegate.java index 120c744f0e..8345b2525c 100644 --- a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/activiti/delegates/PleaCancelledDelegate.java +++ b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/activiti/delegates/PleaCancelledDelegate.java @@ -15,8 +15,8 @@ import java.util.UUID; -import javax.inject.Named; -import javax.json.JsonObject; +import jakarta.inject.Named; +import jakarta.json.JsonObject; import org.activiti.engine.delegate.DelegateExecution; import org.slf4j.Logger; diff --git a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/activiti/delegates/PleaUpdatedDelegate.java b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/activiti/delegates/PleaUpdatedDelegate.java index d6e1f7d6e9..02d20e4987 100644 --- a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/activiti/delegates/PleaUpdatedDelegate.java +++ b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/activiti/delegates/PleaUpdatedDelegate.java @@ -17,8 +17,8 @@ import java.util.UUID; -import javax.inject.Named; -import javax.json.JsonObject; +import jakarta.inject.Named; +import jakarta.json.JsonObject; import org.activiti.engine.delegate.DelegateExecution; import org.slf4j.Logger; diff --git a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/activiti/delegates/ProvedInAbsenceDelegate.java b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/activiti/delegates/ProvedInAbsenceDelegate.java index a6c6c63759..98b0ac8e6d 100644 --- a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/activiti/delegates/ProvedInAbsenceDelegate.java +++ b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/activiti/delegates/ProvedInAbsenceDelegate.java @@ -2,7 +2,7 @@ import static uk.gov.moj.cpp.sjp.event.processor.activiti.CaseStateService.PROVED_IN_ABSENCE_VARIABLE; -import javax.inject.Named; +import jakarta.inject.Named; import org.activiti.engine.delegate.DelegateExecution; import org.activiti.engine.delegate.JavaDelegate; diff --git a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/activiti/delegates/ReadyCaseDelegate.java b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/activiti/delegates/ReadyCaseDelegate.java index 22ec355451..288d49341a 100644 --- a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/activiti/delegates/ReadyCaseDelegate.java +++ b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/activiti/delegates/ReadyCaseDelegate.java @@ -22,8 +22,8 @@ import java.util.Optional; import java.util.UUID; -import javax.inject.Inject; -import javax.inject.Named; +import jakarta.inject.Inject; +import jakarta.inject.Named; import org.activiti.engine.delegate.DelegateExecution; import org.apache.commons.lang3.EnumUtils; diff --git a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/activiti/delegates/UploadFile.java b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/activiti/delegates/UploadFile.java index 275b755d82..734f7fe185 100644 --- a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/activiti/delegates/UploadFile.java +++ b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/activiti/delegates/UploadFile.java @@ -14,9 +14,9 @@ import java.util.UUID; -import javax.inject.Inject; -import javax.inject.Named; -import javax.json.JsonObject; +import jakarta.inject.Inject; +import jakarta.inject.Named; +import jakarta.json.JsonObject; import org.activiti.engine.delegate.DelegateExecution; import org.activiti.engine.delegate.JavaDelegate; diff --git a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/activiti/delegates/WithdrawalRequestCancelledDelegate.java b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/activiti/delegates/WithdrawalRequestCancelledDelegate.java index 4b020f269a..a2e9a22405 100644 --- a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/activiti/delegates/WithdrawalRequestCancelledDelegate.java +++ b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/activiti/delegates/WithdrawalRequestCancelledDelegate.java @@ -11,8 +11,8 @@ import java.util.UUID; -import javax.inject.Named; -import javax.json.JsonObject; +import jakarta.inject.Named; +import jakarta.json.JsonObject; import org.activiti.engine.delegate.DelegateExecution; import org.slf4j.Logger; diff --git a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/activiti/delegates/WithdrawalRequestedDelegate.java b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/activiti/delegates/WithdrawalRequestedDelegate.java index d9625fed44..95063b35f7 100644 --- a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/activiti/delegates/WithdrawalRequestedDelegate.java +++ b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/activiti/delegates/WithdrawalRequestedDelegate.java @@ -11,8 +11,8 @@ import java.util.UUID; -import javax.inject.Named; -import javax.json.JsonObject; +import jakarta.inject.Named; +import jakarta.json.JsonObject; import org.activiti.engine.delegate.DelegateExecution; import org.slf4j.Logger; diff --git a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/activiti/delegates/adjournment/CaseAdjournedDelegate.java b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/activiti/delegates/adjournment/CaseAdjournedDelegate.java index be9c970604..ac5efe5754 100644 --- a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/activiti/delegates/adjournment/CaseAdjournedDelegate.java +++ b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/activiti/delegates/adjournment/CaseAdjournedDelegate.java @@ -7,7 +7,7 @@ import java.util.UUID; -import javax.inject.Named; +import jakarta.inject.Named; import org.activiti.engine.delegate.DelegateExecution; diff --git a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/activiti/delegates/adjournment/CaseAdjournmentElapsedDelegate.java b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/activiti/delegates/adjournment/CaseAdjournmentElapsedDelegate.java index e422e20512..f117999dfd 100644 --- a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/activiti/delegates/adjournment/CaseAdjournmentElapsedDelegate.java +++ b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/activiti/delegates/adjournment/CaseAdjournmentElapsedDelegate.java @@ -8,8 +8,8 @@ import java.util.UUID; -import javax.inject.Named; -import javax.json.JsonObject; +import jakarta.inject.Named; +import jakarta.json.JsonObject; import org.activiti.engine.delegate.DelegateExecution; import org.slf4j.Logger; diff --git a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/activiti/delegates/timers/SendExpirationCommandDelegate.java b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/activiti/delegates/timers/SendExpirationCommandDelegate.java index 9493cf915a..5031eb8f48 100644 --- a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/activiti/delegates/timers/SendExpirationCommandDelegate.java +++ b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/activiti/delegates/timers/SendExpirationCommandDelegate.java @@ -14,9 +14,9 @@ import java.util.UUID; -import javax.inject.Inject; -import javax.inject.Named; -import javax.json.JsonObject; +import jakarta.inject.Inject; +import jakarta.inject.Named; +import jakarta.json.JsonObject; import org.activiti.engine.delegate.DelegateExecution; import org.activiti.engine.delegate.JavaDelegate; diff --git a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/helper/JsonObjectConversionHelper.java b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/helper/JsonObjectConversionHelper.java index aa2ca5d651..771a77f5ad 100644 --- a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/helper/JsonObjectConversionHelper.java +++ b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/helper/JsonObjectConversionHelper.java @@ -9,8 +9,8 @@ import java.io.InputStream; import java.io.UncheckedIOException; -import javax.json.JsonObject; -import javax.json.JsonReader; +import jakarta.json.JsonObject; +import jakarta.json.JsonReader; import com.fasterxml.jackson.databind.ObjectMapper; diff --git a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/results/converter/AddressConverter.java b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/results/converter/AddressConverter.java index f3f754ade6..2862c336bb 100644 --- a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/results/converter/AddressConverter.java +++ b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/results/converter/AddressConverter.java @@ -4,7 +4,7 @@ import java.util.Optional; -import javax.json.JsonObject; +import jakarta.json.JsonObject; public class AddressConverter { private static final String ADDRESS1_KEY = "address1"; diff --git a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/results/converter/AssociatedPersonDetailsConverter.java b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/results/converter/AssociatedPersonDetailsConverter.java index 2255a4f7de..a2125932f0 100644 --- a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/results/converter/AssociatedPersonDetailsConverter.java +++ b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/results/converter/AssociatedPersonDetailsConverter.java @@ -7,7 +7,7 @@ import java.util.ArrayList; import java.util.List; -import javax.inject.Inject; +import jakarta.inject.Inject; public class AssociatedPersonDetailsConverter { diff --git a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/results/converter/ConverterUtils.java b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/results/converter/ConverterUtils.java index 9c7c9d71bd..e0d1b32ec6 100644 --- a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/results/converter/ConverterUtils.java +++ b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/results/converter/ConverterUtils.java @@ -4,7 +4,7 @@ import java.util.UUID; -import javax.json.JsonObject; +import jakarta.json.JsonObject; public class ConverterUtils { diff --git a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/results/converter/CourtCentreConverter.java b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/results/converter/CourtCentreConverter.java index eb3dd72141..bb7f6a85b9 100644 --- a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/results/converter/CourtCentreConverter.java +++ b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/results/converter/CourtCentreConverter.java @@ -2,7 +2,7 @@ import static java.util.Objects.isNull; import static java.util.Optional.of; -import static javax.json.JsonValue.NULL; +import static jakarta.json.JsonValue.NULL; import static uk.gov.justice.services.messaging.JsonEnvelope.envelopeFrom; import static uk.gov.justice.services.messaging.JsonEnvelope.metadataFrom; import static uk.gov.moj.cpp.sjp.event.processor.results.converter.ConverterUtils.extractUUID; @@ -16,8 +16,8 @@ import java.util.Optional; import java.util.UUID; -import javax.inject.Inject; -import javax.json.JsonObject; +import jakarta.inject.Inject; +import jakarta.json.JsonObject; public class CourtCentreConverter { diff --git a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/results/converter/DefendantsConverter.java b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/results/converter/DefendantsConverter.java index 5f002566ae..0b1cc9de55 100644 --- a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/results/converter/DefendantsConverter.java +++ b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/results/converter/DefendantsConverter.java @@ -1,6 +1,6 @@ package uk.gov.moj.cpp.sjp.event.processor.results.converter; -import static javax.json.JsonValue.NULL; +import static jakarta.json.JsonValue.NULL; import static uk.gov.justice.services.messaging.JsonEnvelope.envelopeFrom; import static uk.gov.justice.services.messaging.JsonEnvelope.metadataFrom; import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; @@ -20,8 +20,8 @@ import java.util.List; import java.util.Optional; -import javax.inject.Inject; -import javax.json.JsonObject; +import jakarta.inject.Inject; +import jakarta.json.JsonObject; public class DefendantsConverter { diff --git a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/results/converter/HearingDaysConverter.java b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/results/converter/HearingDaysConverter.java index d6bb48c19e..523396561b 100644 --- a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/results/converter/HearingDaysConverter.java +++ b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/results/converter/HearingDaysConverter.java @@ -7,7 +7,7 @@ import java.util.ArrayList; import java.util.List; -import javax.json.JsonObject; +import jakarta.json.JsonObject; public class HearingDaysConverter { diff --git a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/results/converter/LJADetailsConverter.java b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/results/converter/LJADetailsConverter.java index 980904bd84..69cca2e883 100644 --- a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/results/converter/LJADetailsConverter.java +++ b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/results/converter/LJADetailsConverter.java @@ -6,7 +6,7 @@ import java.util.Optional; -import javax.json.JsonObject; +import jakarta.json.JsonObject; public class LJADetailsConverter { private static final String LJA_CODE = "localJusticeAreaNationalCourtCode"; diff --git a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/results/converter/LegalEntityDefendantConverter.java b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/results/converter/LegalEntityDefendantConverter.java index 277dad536a..3509827b14 100644 --- a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/results/converter/LegalEntityDefendantConverter.java +++ b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/results/converter/LegalEntityDefendantConverter.java @@ -7,7 +7,7 @@ import uk.gov.justice.core.courts.Organisation; import uk.gov.justice.json.schemas.domains.sjp.LegalEntityDetails; -import javax.inject.Inject; +import jakarta.inject.Inject; public class LegalEntityDefendantConverter { diff --git a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/results/converter/OffencesConverter.java b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/results/converter/OffencesConverter.java index 9b2f452d53..e64654a269 100644 --- a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/results/converter/OffencesConverter.java +++ b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/results/converter/OffencesConverter.java @@ -4,7 +4,7 @@ import static java.util.Optional.ofNullable; import static java.util.UUID.fromString; import static java.util.UUID.randomUUID; -import static javax.json.JsonValue.NULL; +import static jakarta.json.JsonValue.NULL; import static uk.gov.justice.services.messaging.Envelope.metadataBuilder; import static uk.gov.justice.services.messaging.JsonEnvelope.envelopeFrom; @@ -26,8 +26,8 @@ import java.util.List; import java.util.Optional; -import javax.inject.Inject; -import javax.json.JsonObject; +import jakarta.inject.Inject; +import jakarta.json.JsonObject; import com.google.common.annotations.VisibleForTesting; diff --git a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/results/converter/PersonDefendantConverter.java b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/results/converter/PersonDefendantConverter.java index 81e2d9465c..d80f95dd0e 100644 --- a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/results/converter/PersonDefendantConverter.java +++ b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/results/converter/PersonDefendantConverter.java @@ -10,7 +10,7 @@ import uk.gov.justice.services.messaging.Metadata; import uk.gov.moj.cpp.sjp.event.processor.results.converter.judicialresult.JCachedReferenceData; -import javax.inject.Inject; +import jakarta.inject.Inject; public class PersonDefendantConverter { diff --git a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/results/converter/PersonDetailsConverter.java b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/results/converter/PersonDetailsConverter.java index 0b986b63e0..2f60efd6e8 100644 --- a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/results/converter/PersonDetailsConverter.java +++ b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/results/converter/PersonDetailsConverter.java @@ -8,7 +8,7 @@ import java.time.LocalDate; -import javax.inject.Inject; +import jakarta.inject.Inject; public class PersonDetailsConverter { diff --git a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/results/converter/ProsecutionCaseIdentifierConverter.java b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/results/converter/ProsecutionCaseIdentifierConverter.java index 83fd1284f0..5cfebc1125 100644 --- a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/results/converter/ProsecutionCaseIdentifierConverter.java +++ b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/results/converter/ProsecutionCaseIdentifierConverter.java @@ -1,7 +1,7 @@ package uk.gov.moj.cpp.sjp.event.processor.results.converter; import static java.util.UUID.fromString; -import static javax.json.JsonValue.NULL; +import static jakarta.json.JsonValue.NULL; import static uk.gov.justice.services.messaging.Envelope.metadataBuilder; import static uk.gov.justice.services.messaging.JsonEnvelope.envelopeFrom; @@ -11,8 +11,8 @@ import java.util.UUID; -import javax.inject.Inject; -import javax.json.JsonObject; +import jakarta.inject.Inject; +import jakarta.json.JsonObject; public class ProsecutionCaseIdentifierConverter { diff --git a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/results/converter/ProsecutionCasesConverter.java b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/results/converter/ProsecutionCasesConverter.java index beb91341ae..2643720e43 100644 --- a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/results/converter/ProsecutionCasesConverter.java +++ b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/results/converter/ProsecutionCasesConverter.java @@ -10,8 +10,8 @@ import java.util.ArrayList; import java.util.List; -import javax.inject.Inject; -import javax.json.JsonObject; +import jakarta.inject.Inject; +import jakarta.json.JsonObject; public class ProsecutionCasesConverter { diff --git a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/results/converter/SjpApplicationDecisionToHearingResultConverter.java b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/results/converter/SjpApplicationDecisionToHearingResultConverter.java index 0394fbf972..760fce1ce6 100644 --- a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/results/converter/SjpApplicationDecisionToHearingResultConverter.java +++ b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/results/converter/SjpApplicationDecisionToHearingResultConverter.java @@ -2,7 +2,7 @@ import static java.util.Optional.ofNullable; import static java.util.UUID.fromString; -import static javax.json.JsonValue.NULL; +import static jakarta.json.JsonValue.NULL; import static uk.gov.justice.core.courts.CourtApplicationParty.courtApplicationParty; import static uk.gov.justice.core.courts.HearingLanguage.ENGLISH; import static uk.gov.justice.core.courts.JurisdictionType.MAGISTRATES; @@ -47,8 +47,8 @@ import java.util.Optional; import java.util.UUID; -import javax.inject.Inject; -import javax.json.JsonObject; +import jakarta.inject.Inject; +import jakarta.json.JsonObject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/results/converter/SjpCaseDecisionToHearingResultConverter.java b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/results/converter/SjpCaseDecisionToHearingResultConverter.java index f14e7fe272..6654a0ec45 100644 --- a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/results/converter/SjpCaseDecisionToHearingResultConverter.java +++ b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/results/converter/SjpCaseDecisionToHearingResultConverter.java @@ -4,7 +4,7 @@ import static java.util.Optional.ofNullable; import static java.util.UUID.fromString; import static java.util.stream.Collectors.toList; -import static javax.json.JsonValue.NULL; +import static jakarta.json.JsonValue.NULL; import static uk.gov.justice.core.courts.HearingLanguage.ENGLISH; import static uk.gov.justice.core.courts.JurisdictionType.MAGISTRATES; import static uk.gov.justice.json.schemas.domains.sjp.results.PublicHearingResulted.publicHearingResulted; @@ -28,7 +28,7 @@ import java.util.List; import java.util.UUID; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/results/converter/SjpToHearingConverter.java b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/results/converter/SjpToHearingConverter.java index 1f7900392c..82c8e87476 100644 --- a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/results/converter/SjpToHearingConverter.java +++ b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/results/converter/SjpToHearingConverter.java @@ -10,7 +10,7 @@ import uk.gov.moj.cpp.sjp.event.CaseListedInCriminalCourtsV2; import uk.gov.moj.cpp.sjp.event.decision.DecisionSaved; -import javax.inject.Inject; +import jakarta.inject.Inject; public class SjpToHearingConverter { diff --git a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/results/converter/VerdictConverter.java b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/results/converter/VerdictConverter.java index 75e51c019b..eff81b8fdb 100644 --- a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/results/converter/VerdictConverter.java +++ b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/results/converter/VerdictConverter.java @@ -1,6 +1,6 @@ package uk.gov.moj.cpp.sjp.event.processor.results.converter; -import static javax.json.JsonValue.NULL; +import static jakarta.json.JsonValue.NULL; import static uk.gov.justice.core.courts.Verdict.verdict; import static uk.gov.justice.services.messaging.Envelope.metadataBuilder; import static uk.gov.justice.services.messaging.JsonEnvelope.envelopeFrom; @@ -16,8 +16,8 @@ import java.util.Optional; import java.util.UUID; -import javax.inject.Inject; -import javax.json.JsonObject; +import jakarta.inject.Inject; +import jakarta.json.JsonObject; import com.google.common.collect.ImmutableMap; import org.slf4j.Logger; diff --git a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/results/converter/judicialresult/DecisionSavedToJudicialResultsConverter.java b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/results/converter/judicialresult/DecisionSavedToJudicialResultsConverter.java index cf0a69ffc1..a916595535 100644 --- a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/results/converter/judicialresult/DecisionSavedToJudicialResultsConverter.java +++ b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/results/converter/judicialresult/DecisionSavedToJudicialResultsConverter.java @@ -26,7 +26,7 @@ import java.util.List; import java.util.UUID; -import javax.inject.Inject; +import jakarta.inject.Inject; public class DecisionSavedToJudicialResultsConverter { diff --git a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/results/converter/judicialresult/JCachedReferenceData.java b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/results/converter/judicialresult/JCachedReferenceData.java index a855fc4b5d..a32802f87f 100644 --- a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/results/converter/judicialresult/JCachedReferenceData.java +++ b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/results/converter/judicialresult/JCachedReferenceData.java @@ -14,9 +14,9 @@ import java.util.Optional; import java.util.UUID; -import javax.inject.Inject; -import javax.json.JsonObject; -import javax.ws.rs.NotFoundException; +import jakarta.inject.Inject; +import jakarta.json.JsonObject; +import jakarta.ws.rs.NotFoundException; import org.apache.commons.collections.MapUtils; import org.apache.commons.collections.map.HashedMap; diff --git a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/results/converter/judicialresult/JudicialResultHelper.java b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/results/converter/judicialresult/JudicialResultHelper.java index f72d98a4c5..f98af6fdcb 100644 --- a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/results/converter/judicialresult/JudicialResultHelper.java +++ b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/results/converter/judicialresult/JudicialResultHelper.java @@ -19,8 +19,8 @@ import java.util.UUID; import java.util.stream.Collectors; -import javax.json.JsonObject; -import javax.json.JsonString; +import jakarta.json.JsonObject; +import jakarta.json.JsonString; import com.google.common.collect.ImmutableMap; diff --git a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/results/converter/judicialresult/JudicialResultPromptDurationHelper.java b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/results/converter/judicialresult/JudicialResultPromptDurationHelper.java index 5055705875..770b62d231 100644 --- a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/results/converter/judicialresult/JudicialResultPromptDurationHelper.java +++ b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/results/converter/judicialresult/JudicialResultPromptDurationHelper.java @@ -20,7 +20,7 @@ import java.util.Optional; import java.util.function.BiFunction; -import javax.json.JsonObject; +import jakarta.json.JsonObject; import org.apache.commons.lang3.BooleanUtils; import org.apache.commons.lang3.tuple.Pair; diff --git a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/results/converter/judicialresult/aggregator/AdjournDecisionResultAggregator.java b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/results/converter/judicialresult/aggregator/AdjournDecisionResultAggregator.java index c48e9522ae..920ad99d28 100644 --- a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/results/converter/judicialresult/aggregator/AdjournDecisionResultAggregator.java +++ b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/results/converter/judicialresult/aggregator/AdjournDecisionResultAggregator.java @@ -21,8 +21,8 @@ import java.util.Optional; import java.util.UUID; -import javax.inject.Inject; -import javax.json.JsonObject; +import jakarta.inject.Inject; +import jakarta.json.JsonObject; public class AdjournDecisionResultAggregator extends DecisionResultAggregator { diff --git a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/results/converter/judicialresult/aggregator/DecisionResultAggregator.java b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/results/converter/judicialresult/aggregator/DecisionResultAggregator.java index 97db86b594..6b0e2ae719 100644 --- a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/results/converter/judicialresult/aggregator/DecisionResultAggregator.java +++ b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/results/converter/judicialresult/aggregator/DecisionResultAggregator.java @@ -63,7 +63,7 @@ import java.util.Optional; import java.util.UUID; -import javax.json.JsonObject; +import jakarta.json.JsonObject; import com.google.common.collect.ImmutableMap; diff --git a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/results/converter/judicialresult/aggregator/DischargeDecisionResultAggregator.java b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/results/converter/judicialresult/aggregator/DischargeDecisionResultAggregator.java index 202e113939..ec5ad9efaa 100644 --- a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/results/converter/judicialresult/aggregator/DischargeDecisionResultAggregator.java +++ b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/results/converter/judicialresult/aggregator/DischargeDecisionResultAggregator.java @@ -26,8 +26,8 @@ import java.util.Optional; import java.util.UUID; -import javax.inject.Inject; -import javax.json.JsonObject; +import jakarta.inject.Inject; +import jakarta.json.JsonObject; public class DischargeDecisionResultAggregator extends DecisionResultAggregator { diff --git a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/results/converter/judicialresult/aggregator/DismissDecisionResultAggregator.java b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/results/converter/judicialresult/aggregator/DismissDecisionResultAggregator.java index 22b7286f51..1238fd83f7 100644 --- a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/results/converter/judicialresult/aggregator/DismissDecisionResultAggregator.java +++ b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/results/converter/judicialresult/aggregator/DismissDecisionResultAggregator.java @@ -17,8 +17,8 @@ import java.util.List; import java.util.UUID; -import javax.inject.Inject; -import javax.json.JsonObject; +import jakarta.inject.Inject; +import jakarta.json.JsonObject; public class DismissDecisionResultAggregator extends DecisionResultAggregator { diff --git a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/results/converter/judicialresult/aggregator/FinancialImpositionDecisionResultAggregator.java b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/results/converter/judicialresult/aggregator/FinancialImpositionDecisionResultAggregator.java index fe7e299fbc..132dd0147a 100644 --- a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/results/converter/judicialresult/aggregator/FinancialImpositionDecisionResultAggregator.java +++ b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/results/converter/judicialresult/aggregator/FinancialImpositionDecisionResultAggregator.java @@ -92,8 +92,8 @@ import java.util.UUID; import java.util.stream.Collectors; -import javax.inject.Inject; -import javax.json.JsonObject; +import jakarta.inject.Inject; +import jakarta.json.JsonObject; import com.google.common.collect.ImmutableMap; diff --git a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/results/converter/judicialresult/aggregator/FinancialPenaltyDecisionResultAggregator.java b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/results/converter/judicialresult/aggregator/FinancialPenaltyDecisionResultAggregator.java index c81255fdbb..f1058b3b20 100644 --- a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/results/converter/judicialresult/aggregator/FinancialPenaltyDecisionResultAggregator.java +++ b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/results/converter/judicialresult/aggregator/FinancialPenaltyDecisionResultAggregator.java @@ -24,8 +24,8 @@ import java.util.Optional; import java.util.UUID; -import javax.inject.Inject; -import javax.json.JsonObject; +import jakarta.inject.Inject; +import jakarta.json.JsonObject; public class FinancialPenaltyDecisionResultAggregator extends DecisionResultAggregator { diff --git a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/results/converter/judicialresult/aggregator/NoSeparatePenaltyDecisionResultAggregator.java b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/results/converter/judicialresult/aggregator/NoSeparatePenaltyDecisionResultAggregator.java index c76bf2de0e..b42ae06749 100644 --- a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/results/converter/judicialresult/aggregator/NoSeparatePenaltyDecisionResultAggregator.java +++ b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/results/converter/judicialresult/aggregator/NoSeparatePenaltyDecisionResultAggregator.java @@ -20,8 +20,8 @@ import java.util.List; import java.util.UUID; -import javax.inject.Inject; -import javax.json.JsonObject; +import jakarta.inject.Inject; +import jakarta.json.JsonObject; public class NoSeparatePenaltyDecisionResultAggregator extends DecisionResultAggregator { diff --git a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/results/converter/judicialresult/aggregator/OatsDecisionResultAggregator.java b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/results/converter/judicialresult/aggregator/OatsDecisionResultAggregator.java index 952c9f65cf..d770b2ab25 100644 --- a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/results/converter/judicialresult/aggregator/OatsDecisionResultAggregator.java +++ b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/results/converter/judicialresult/aggregator/OatsDecisionResultAggregator.java @@ -17,8 +17,8 @@ import java.util.List; import java.util.UUID; -import javax.inject.Inject; -import javax.json.JsonObject; +import jakarta.inject.Inject; +import jakarta.json.JsonObject; public class OatsDecisionResultAggregator extends DecisionResultAggregator { diff --git a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/results/converter/judicialresult/aggregator/ReferForCourtHearingDecisionResultAggregator.java b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/results/converter/judicialresult/aggregator/ReferForCourtHearingDecisionResultAggregator.java index ebd7186c7c..d552248f2d 100644 --- a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/results/converter/judicialresult/aggregator/ReferForCourtHearingDecisionResultAggregator.java +++ b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/results/converter/judicialresult/aggregator/ReferForCourtHearingDecisionResultAggregator.java @@ -43,8 +43,8 @@ import java.util.Optional; import java.util.UUID; -import javax.inject.Inject; -import javax.json.JsonObject; +import jakarta.inject.Inject; +import jakarta.json.JsonObject; @SuppressWarnings("squid:S1188") public class ReferForCourtHearingDecisionResultAggregator extends DecisionResultAggregator { diff --git a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/results/converter/judicialresult/aggregator/ReferredForFutureSjpSessionDecisionResultAggregator.java b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/results/converter/judicialresult/aggregator/ReferredForFutureSjpSessionDecisionResultAggregator.java index 91e1aa446a..c4e8fda499 100644 --- a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/results/converter/judicialresult/aggregator/ReferredForFutureSjpSessionDecisionResultAggregator.java +++ b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/results/converter/judicialresult/aggregator/ReferredForFutureSjpSessionDecisionResultAggregator.java @@ -16,8 +16,8 @@ import java.util.List; import java.util.UUID; -import javax.inject.Inject; -import javax.json.JsonObject; +import jakarta.inject.Inject; +import jakarta.json.JsonObject; public class ReferredForFutureSjpSessionDecisionResultAggregator extends DecisionResultAggregator { diff --git a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/results/converter/judicialresult/aggregator/ReferredToOpenCourtDecisionResultAggregator.java b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/results/converter/judicialresult/aggregator/ReferredToOpenCourtDecisionResultAggregator.java index 80baba9b7e..dbd618a452 100644 --- a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/results/converter/judicialresult/aggregator/ReferredToOpenCourtDecisionResultAggregator.java +++ b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/results/converter/judicialresult/aggregator/ReferredToOpenCourtDecisionResultAggregator.java @@ -21,8 +21,8 @@ import java.util.List; import java.util.UUID; -import javax.inject.Inject; -import javax.json.JsonObject; +import jakarta.inject.Inject; +import jakarta.json.JsonObject; public class ReferredToOpenCourtDecisionResultAggregator extends DecisionResultAggregator { diff --git a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/results/converter/judicialresult/aggregator/SetAsideDecisionResultAggregator.java b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/results/converter/judicialresult/aggregator/SetAsideDecisionResultAggregator.java index 5190d16ef1..220aa86cd0 100644 --- a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/results/converter/judicialresult/aggregator/SetAsideDecisionResultAggregator.java +++ b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/results/converter/judicialresult/aggregator/SetAsideDecisionResultAggregator.java @@ -15,8 +15,8 @@ import java.util.List; import java.util.UUID; -import javax.inject.Inject; -import javax.json.JsonObject; +import jakarta.inject.Inject; +import jakarta.json.JsonObject; public class SetAsideDecisionResultAggregator extends DecisionResultAggregator { diff --git a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/results/converter/judicialresult/aggregator/WithDrawDecisionResultAggregator.java b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/results/converter/judicialresult/aggregator/WithDrawDecisionResultAggregator.java index bd1312199a..a918cf3f51 100644 --- a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/results/converter/judicialresult/aggregator/WithDrawDecisionResultAggregator.java +++ b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/results/converter/judicialresult/aggregator/WithDrawDecisionResultAggregator.java @@ -19,8 +19,8 @@ import java.util.List; import java.util.UUID; -import javax.inject.Inject; -import javax.json.JsonObject; +import jakarta.inject.Inject; +import jakarta.json.JsonObject; public class WithDrawDecisionResultAggregator extends DecisionResultAggregator { diff --git a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/service/ApplicationParameters.java b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/service/ApplicationParameters.java index 73ddfaf296..e3293bdf5d 100644 --- a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/service/ApplicationParameters.java +++ b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/service/ApplicationParameters.java @@ -2,7 +2,7 @@ import uk.gov.justice.services.common.configuration.Value; -import javax.inject.Inject; +import jakarta.inject.Inject; public class ApplicationParameters { diff --git a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/service/AzureFunctionService.java b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/service/AzureFunctionService.java index 4bf1ee7ba5..44a684ffa9 100644 --- a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/service/AzureFunctionService.java +++ b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/service/AzureFunctionService.java @@ -4,7 +4,7 @@ import java.io.IOException; -import javax.inject.Inject; +import jakarta.inject.Inject; public class AzureFunctionService { diff --git a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/service/LocalJusticeArea.java b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/service/LocalJusticeArea.java index 86b97e74b1..8105b76785 100644 --- a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/service/LocalJusticeArea.java +++ b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/service/LocalJusticeArea.java @@ -1,6 +1,6 @@ package uk.gov.moj.cpp.sjp.event.processor.service; -import javax.json.JsonObject; +import jakarta.json.JsonObject; import org.apache.commons.lang3.builder.EqualsBuilder; import org.apache.commons.lang3.builder.HashCodeBuilder; diff --git a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/service/MaterialService.java b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/service/MaterialService.java index 10b6becbe3..e5f674fb0d 100644 --- a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/service/MaterialService.java +++ b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/service/MaterialService.java @@ -10,8 +10,8 @@ import java.util.UUID; -import javax.inject.Inject; -import javax.json.JsonObject; +import jakarta.inject.Inject; +import jakarta.json.JsonObject; public class MaterialService { diff --git a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/service/ProsecutionCaseFileService.java b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/service/ProsecutionCaseFileService.java index 7aed80b582..12d55a4713 100644 --- a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/service/ProsecutionCaseFileService.java +++ b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/service/ProsecutionCaseFileService.java @@ -13,9 +13,9 @@ import java.util.Optional; import java.util.UUID; -import javax.inject.Inject; -import javax.json.JsonObject; -import javax.json.JsonValue; +import jakarta.inject.Inject; +import jakarta.json.JsonObject; +import jakarta.json.JsonValue; public class ProsecutionCaseFileService { diff --git a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/service/ReferenceDataOffencesService.java b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/service/ReferenceDataOffencesService.java index 2e636752d4..51954e12bd 100644 --- a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/service/ReferenceDataOffencesService.java +++ b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/service/ReferenceDataOffencesService.java @@ -17,8 +17,8 @@ import java.util.Set; import java.util.UUID; -import javax.inject.Inject; -import javax.json.JsonObject; +import jakarta.inject.Inject; +import jakarta.json.JsonObject; public class ReferenceDataOffencesService { diff --git a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/service/ReferenceDataService.java b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/service/ReferenceDataService.java index 5cb27f0d83..48b00b01ca 100644 --- a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/service/ReferenceDataService.java +++ b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/service/ReferenceDataService.java @@ -38,10 +38,10 @@ import java.util.UUID; import java.util.stream.Stream; -import javax.inject.Inject; -import javax.json.JsonArray; -import javax.json.JsonObject; -import javax.json.JsonValue; +import jakarta.inject.Inject; +import jakarta.json.JsonArray; +import jakarta.json.JsonObject; +import jakarta.json.JsonValue; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/service/SjpService.java b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/service/SjpService.java index 7cb835080f..7f04bb0239 100644 --- a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/service/SjpService.java +++ b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/service/SjpService.java @@ -30,9 +30,9 @@ import java.util.Optional; import java.util.UUID; -import javax.inject.Inject; -import javax.json.JsonObject; -import javax.json.JsonValue; +import jakarta.inject.Inject; +import jakarta.json.JsonObject; +import jakarta.json.JsonValue; @SuppressWarnings("squid:CallToDeprecatedMethod") public class SjpService { diff --git a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/service/SystemIdMapperService.java b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/service/SystemIdMapperService.java index 9f321e2487..b0f7c5dd81 100644 --- a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/service/SystemIdMapperService.java +++ b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/service/SystemIdMapperService.java @@ -13,8 +13,8 @@ import java.util.Optional; import java.util.UUID; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; @ApplicationScoped public class SystemIdMapperService { diff --git a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/service/UsersGroupsService.java b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/service/UsersGroupsService.java index f42a86fa33..0a60937138 100644 --- a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/service/UsersGroupsService.java +++ b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/service/UsersGroupsService.java @@ -10,8 +10,8 @@ import java.util.UUID; -import javax.inject.Inject; -import javax.json.JsonObject; +import jakarta.inject.Inject; +import jakarta.json.JsonObject; public class UsersGroupsService { diff --git a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/service/assignment/AssignmentConfiguration.java b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/service/assignment/AssignmentConfiguration.java index e03c5bf095..9125cc7bc1 100644 --- a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/service/assignment/AssignmentConfiguration.java +++ b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/service/assignment/AssignmentConfiguration.java @@ -2,9 +2,9 @@ import uk.gov.justice.services.common.configuration.Value; -import javax.annotation.PostConstruct; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; +import jakarta.annotation.PostConstruct; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; @ApplicationScoped public class AssignmentConfiguration { diff --git a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/service/assignment/AssignmentService.java b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/service/assignment/AssignmentService.java index 3887dcc5e5..0cc567e970 100644 --- a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/service/assignment/AssignmentService.java +++ b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/service/assignment/AssignmentService.java @@ -24,11 +24,11 @@ import java.util.List; import java.util.UUID; -import javax.inject.Inject; -import javax.json.JsonArray; -import javax.json.JsonObject; -import javax.json.JsonObjectBuilder; -import javax.json.JsonString; +import jakarta.inject.Inject; +import jakarta.json.JsonArray; +import jakarta.json.JsonObject; +import jakarta.json.JsonObjectBuilder; +import jakarta.json.JsonString; public class AssignmentService { diff --git a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/service/enforcementnotification/DivisionCodeHelper.java b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/service/enforcementnotification/DivisionCodeHelper.java index 5fd8ee6c47..73ab3f5320 100644 --- a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/service/enforcementnotification/DivisionCodeHelper.java +++ b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/service/enforcementnotification/DivisionCodeHelper.java @@ -5,8 +5,8 @@ import uk.gov.justice.services.messaging.JsonEnvelope; import uk.gov.moj.cpp.sjp.event.processor.service.ReferenceDataService; -import javax.inject.Inject; -import javax.json.JsonObject; +import jakarta.inject.Inject; +import jakarta.json.JsonObject; public class DivisionCodeHelper { diff --git a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/service/enforcementnotification/EnforcementAreaEmailHelper.java b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/service/enforcementnotification/EnforcementAreaEmailHelper.java index 9bae5a2393..156c07b8f6 100644 --- a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/service/enforcementnotification/EnforcementAreaEmailHelper.java +++ b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/service/enforcementnotification/EnforcementAreaEmailHelper.java @@ -5,8 +5,8 @@ import uk.gov.justice.services.messaging.JsonEnvelope; import uk.gov.moj.cpp.sjp.event.processor.service.ReferenceDataService; -import javax.inject.Inject; -import javax.json.JsonObject; +import jakarta.inject.Inject; +import jakarta.json.JsonObject; public class EnforcementAreaEmailHelper { diff --git a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/service/enforcementnotification/EnforcementAreaService.java b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/service/enforcementnotification/EnforcementAreaService.java index 93ea40ae6c..91e5fd7d3f 100644 --- a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/service/enforcementnotification/EnforcementAreaService.java +++ b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/service/enforcementnotification/EnforcementAreaService.java @@ -5,8 +5,8 @@ import uk.gov.justice.services.messaging.JsonEnvelope; import uk.gov.moj.cpp.sjp.event.processor.service.ReferenceDataService; -import javax.inject.Inject; -import javax.json.JsonObject; +import jakarta.inject.Inject; +import jakarta.json.JsonObject; public class EnforcementAreaService { diff --git a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/service/enforcementnotification/EnforcementEmailAttachmentService.java b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/service/enforcementnotification/EnforcementEmailAttachmentService.java index ad73e881d2..89c7cdd1f4 100644 --- a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/service/enforcementnotification/EnforcementEmailAttachmentService.java +++ b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/service/enforcementnotification/EnforcementEmailAttachmentService.java @@ -27,8 +27,8 @@ import java.io.ByteArrayInputStream; import java.util.UUID; -import javax.inject.Inject; -import javax.json.JsonObject; +import jakarta.inject.Inject; +import jakarta.json.JsonObject; @SuppressWarnings({"squid:S3655"}) // Suppress Optional.get without .isPresent(). public class EnforcementEmailAttachmentService { diff --git a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/service/enforcementnotification/EnforcementNotificationService.java b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/service/enforcementnotification/EnforcementNotificationService.java index cd6ede5c88..50a81b75b6 100644 --- a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/service/enforcementnotification/EnforcementNotificationService.java +++ b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/service/enforcementnotification/EnforcementNotificationService.java @@ -16,7 +16,7 @@ import java.util.UUID; -import javax.inject.Inject; +import jakarta.inject.Inject; public class EnforcementNotificationService { diff --git a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/service/enforcementnotification/FinancialImpositionHelper.java b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/service/enforcementnotification/FinancialImpositionHelper.java index 723fabe5db..ae73095387 100644 --- a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/service/enforcementnotification/FinancialImpositionHelper.java +++ b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/service/enforcementnotification/FinancialImpositionHelper.java @@ -2,7 +2,7 @@ import uk.gov.justice.json.schemas.domains.sjp.queries.CaseDetails; -import javax.inject.Inject; +import jakarta.inject.Inject; public class FinancialImpositionHelper { diff --git a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/service/notification/EndorsementRemovalNotificationService.java b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/service/notification/EndorsementRemovalNotificationService.java index edb45a0b4f..f2fde66969 100644 --- a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/service/notification/EndorsementRemovalNotificationService.java +++ b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/service/notification/EndorsementRemovalNotificationService.java @@ -25,8 +25,8 @@ import java.util.UUID; import java.util.stream.Collectors; -import javax.inject.Inject; -import javax.json.JsonObject; +import jakarta.inject.Inject; +import jakarta.json.JsonObject; @SuppressWarnings({"squid:S3655"}) // Suppress Optional.get without .isPresent(). public class EndorsementRemovalNotificationService { diff --git a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/service/notificationnotify/NotificationNotify.java b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/service/notificationnotify/NotificationNotify.java index 315b4ed2d4..72a0bf6fd8 100644 --- a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/service/notificationnotify/NotificationNotify.java +++ b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/service/notificationnotify/NotificationNotify.java @@ -9,8 +9,8 @@ import uk.gov.justice.services.core.sender.Sender; import uk.gov.justice.services.messaging.JsonEnvelope; -import javax.inject.Inject; -import javax.json.JsonObjectBuilder; +import jakarta.inject.Inject; +import jakarta.json.JsonObjectBuilder; public class NotificationNotify { private static final String COMMAND_NAME = "notificationnotify.send-email-notification"; diff --git a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/service/referral/CourtDocumentTransformer.java b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/service/referral/CourtDocumentTransformer.java index 76c374a64f..b44894ada0 100644 --- a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/service/referral/CourtDocumentTransformer.java +++ b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/service/referral/CourtDocumentTransformer.java @@ -20,9 +20,9 @@ import java.util.stream.Collectors; import java.util.stream.IntStream; -import javax.inject.Inject; -import javax.json.JsonArray; -import javax.json.JsonObject; +import jakarta.inject.Inject; +import jakarta.json.JsonArray; +import jakarta.json.JsonObject; @SuppressWarnings("squid:S1168") public class CourtDocumentTransformer { diff --git a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/service/referral/CourtDocumentsDataSourcingService.java b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/service/referral/CourtDocumentsDataSourcingService.java index ba333130a5..96fe23f128 100644 --- a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/service/referral/CourtDocumentsDataSourcingService.java +++ b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/service/referral/CourtDocumentsDataSourcingService.java @@ -27,8 +27,8 @@ import java.util.UUID; import java.util.stream.Collectors; -import javax.inject.Inject; -import javax.json.JsonObject; +import jakarta.inject.Inject; +import jakarta.json.JsonObject; public class CourtDocumentsDataSourcingService { diff --git a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/service/referral/HearingRequestsDataSourcingService.java b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/service/referral/HearingRequestsDataSourcingService.java index 361766af2d..a65a6f2034 100644 --- a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/service/referral/HearingRequestsDataSourcingService.java +++ b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/service/referral/HearingRequestsDataSourcingService.java @@ -14,8 +14,8 @@ import java.util.UUID; import java.util.stream.Collectors; -import javax.inject.Inject; -import javax.json.JsonObject; +import jakarta.inject.Inject; +import jakarta.json.JsonObject; @SuppressWarnings("squid:S107") public class HearingRequestsDataSourcingService { diff --git a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/service/referral/ProsecutionCasesDataSourcingService.java b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/service/referral/ProsecutionCasesDataSourcingService.java index c288315eaa..f61e48fdab 100644 --- a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/service/referral/ProsecutionCasesDataSourcingService.java +++ b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/service/referral/ProsecutionCasesDataSourcingService.java @@ -31,8 +31,8 @@ import java.util.UUID; import java.util.stream.Collectors; -import javax.inject.Inject; -import javax.json.JsonObject; +import jakarta.inject.Inject; +import jakarta.json.JsonObject; @SuppressWarnings("squid:S107") public class ProsecutionCasesDataSourcingService { diff --git a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/service/referral/SjpReferralDataSourcingService.java b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/service/referral/SjpReferralDataSourcingService.java index 843ef6ba2d..55e1f8891a 100644 --- a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/service/referral/SjpReferralDataSourcingService.java +++ b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/service/referral/SjpReferralDataSourcingService.java @@ -11,8 +11,8 @@ import java.time.ZonedDateTime; import java.util.UUID; -import javax.inject.Inject; -import javax.json.JsonObject; +import jakarta.inject.Inject; +import jakarta.json.JsonObject; public class SjpReferralDataSourcingService { diff --git a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/service/referral/helpers/ConvictingCourtHelper.java b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/service/referral/helpers/ConvictingCourtHelper.java index 1cad132ce6..c872da8f4b 100644 --- a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/service/referral/helpers/ConvictingCourtHelper.java +++ b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/service/referral/helpers/ConvictingCourtHelper.java @@ -9,7 +9,7 @@ import java.util.Optional; -import javax.inject.Inject; +import jakarta.inject.Inject; public class ConvictingCourtHelper { diff --git a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/service/referral/helpers/HearingRequestsViewHelper.java b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/service/referral/helpers/HearingRequestsViewHelper.java index 2f973fbda3..9339a07557 100644 --- a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/service/referral/helpers/HearingRequestsViewHelper.java +++ b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/service/referral/helpers/HearingRequestsViewHelper.java @@ -10,7 +10,7 @@ import uk.gov.moj.cpp.sjp.event.processor.model.referral.HearingTypeView; import uk.gov.moj.cpp.sjp.event.processor.model.referral.ReferralReasonView; -import javax.json.JsonObject; +import jakarta.json.JsonObject; import java.util.List; import java.util.Optional; import java.util.UUID; diff --git a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/service/referral/helpers/ProsecutionCasesViewHelper.java b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/service/referral/helpers/ProsecutionCasesViewHelper.java index 951acd335f..2a2800f998 100644 --- a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/service/referral/helpers/ProsecutionCasesViewHelper.java +++ b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/service/referral/helpers/ProsecutionCasesViewHelper.java @@ -59,9 +59,9 @@ import java.util.UUID; import java.util.stream.Collectors; -import javax.inject.Inject; -import javax.json.JsonArray; -import javax.json.JsonObject; +import jakarta.inject.Inject; +import jakarta.json.JsonArray; +import jakarta.json.JsonObject; import org.apache.commons.lang3.StringUtils; diff --git a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/service/referral/helpers/SjpReferralViewHelper.java b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/service/referral/helpers/SjpReferralViewHelper.java index 6c514a2b62..330f977ede 100644 --- a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/service/referral/helpers/SjpReferralViewHelper.java +++ b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/service/referral/helpers/SjpReferralViewHelper.java @@ -12,7 +12,7 @@ import java.util.List; import java.util.Optional; -import javax.json.JsonObject; +import jakarta.json.JsonObject; public class SjpReferralViewHelper { diff --git a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/service/systemdocgenerator/EndorsementRemovalNotificationStrategy.java b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/service/systemdocgenerator/EndorsementRemovalNotificationStrategy.java index 76ee310932..60d7983e4b 100644 --- a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/service/systemdocgenerator/EndorsementRemovalNotificationStrategy.java +++ b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/service/systemdocgenerator/EndorsementRemovalNotificationStrategy.java @@ -10,7 +10,7 @@ import uk.gov.justice.services.core.sender.Sender; import uk.gov.justice.services.messaging.JsonEnvelope; -import javax.inject.Inject; +import jakarta.inject.Inject; public class EndorsementRemovalNotificationStrategy implements SystemDocGeneratorResponseStrategy { diff --git a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/service/systemdocgenerator/EnforcementPendingApplicationNotificationStrategy.java b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/service/systemdocgenerator/EnforcementPendingApplicationNotificationStrategy.java index 738d9b7ef6..12813ad556 100644 --- a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/service/systemdocgenerator/EnforcementPendingApplicationNotificationStrategy.java +++ b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/service/systemdocgenerator/EnforcementPendingApplicationNotificationStrategy.java @@ -12,7 +12,7 @@ import java.time.ZonedDateTime; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/service/systemdocgenerator/PressAndTransparencyReportStrategy.java b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/service/systemdocgenerator/PressAndTransparencyReportStrategy.java index ebeb8b8fcf..2697a02982 100644 --- a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/service/systemdocgenerator/PressAndTransparencyReportStrategy.java +++ b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/service/systemdocgenerator/PressAndTransparencyReportStrategy.java @@ -21,9 +21,9 @@ import java.util.Set; import java.util.stream.Stream; -import javax.inject.Inject; -import javax.json.JsonObject; -import javax.json.JsonObjectBuilder; +import jakarta.inject.Inject; +import jakarta.json.JsonObject; +import jakarta.json.JsonObjectBuilder; import com.google.common.collect.Sets; import org.slf4j.Logger; diff --git a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/service/systemdocgenerator/SystemDocGenerator.java b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/service/systemdocgenerator/SystemDocGenerator.java index b29b518c04..ce74c5eae2 100644 --- a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/service/systemdocgenerator/SystemDocGenerator.java +++ b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/service/systemdocgenerator/SystemDocGenerator.java @@ -9,8 +9,8 @@ import uk.gov.justice.services.messaging.Envelope; import uk.gov.justice.services.messaging.JsonEnvelope; -import javax.inject.Inject; -import javax.json.JsonObject; +import jakarta.inject.Inject; +import jakarta.json.JsonObject; public class SystemDocGenerator { diff --git a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/service/timers/TimerService.java b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/service/timers/TimerService.java index 3e12af42e5..73ae311843 100644 --- a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/service/timers/TimerService.java +++ b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/service/timers/TimerService.java @@ -7,7 +7,7 @@ import java.time.LocalDate; import java.util.UUID; -import javax.inject.Inject; +import jakarta.inject.Inject; public class TimerService { diff --git a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/utils/MetadataHelper.java b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/utils/MetadataHelper.java index 8ab43e3c4d..5c0f82a9ee 100644 --- a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/utils/MetadataHelper.java +++ b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/utils/MetadataHelper.java @@ -15,9 +15,9 @@ import java.util.Optional; import java.util.function.Function; -import javax.json.JsonObject; -import javax.json.JsonObjectBuilder; -import javax.json.JsonReader; +import jakarta.json.JsonObject; +import jakarta.json.JsonObjectBuilder; +import jakarta.json.JsonReader; public class MetadataHelper { diff --git a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/utils/PayloadHelper.java b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/utils/PayloadHelper.java index 3855b33246..9e8221d784 100644 --- a/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/utils/PayloadHelper.java +++ b/sjp-event/sjp-event-processor/src/main/java/uk/gov/moj/cpp/sjp/event/processor/utils/PayloadHelper.java @@ -16,9 +16,9 @@ import java.time.format.DateTimeFormatter; import java.util.Locale; -import javax.inject.Inject; -import javax.json.JsonArray; -import javax.json.JsonObject; +import jakarta.inject.Inject; +import jakarta.json.JsonArray; +import jakarta.json.JsonObject; import com.google.common.collect.HashBasedTable; import com.google.common.collect.Table; diff --git a/sjp-event/sjp-event-processor/src/main/resources/META-INF/beans.xml b/sjp-event/sjp-event-processor/src/main/resources/META-INF/beans.xml index cc3f8d2864..1d83bc8c5a 100644 --- a/sjp-event/sjp-event-processor/src/main/resources/META-INF/beans.xml +++ b/sjp-event/sjp-event-processor/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-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/AllOffencesWithdrawalRequestCancelledProcessorTest.java b/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/AllOffencesWithdrawalRequestCancelledProcessorTest.java index 05ee74c1e9..182bd68acf 100644 --- a/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/AllOffencesWithdrawalRequestCancelledProcessorTest.java +++ b/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/AllOffencesWithdrawalRequestCancelledProcessorTest.java @@ -25,7 +25,7 @@ import java.util.UUID; -import javax.json.JsonValue; +import jakarta.json.JsonValue; import com.fasterxml.jackson.databind.ObjectMapper; import org.junit.jupiter.api.Test; diff --git a/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/AllOffencesWithdrawalRequestedProcessorTest.java b/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/AllOffencesWithdrawalRequestedProcessorTest.java index ab80d2dcab..8fd0339250 100644 --- a/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/AllOffencesWithdrawalRequestedProcessorTest.java +++ b/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/AllOffencesWithdrawalRequestedProcessorTest.java @@ -19,7 +19,7 @@ import java.util.UUID; -import javax.json.JsonValue; +import jakarta.json.JsonValue; import com.fasterxml.jackson.databind.ObjectMapper; import org.junit.jupiter.api.Test; diff --git a/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/ApplicationSetAsideProcessorTest.java b/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/ApplicationSetAsideProcessorTest.java index e0d8fee62e..0df76650e9 100644 --- a/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/ApplicationSetAsideProcessorTest.java +++ b/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/ApplicationSetAsideProcessorTest.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-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/AssignmentProcessorTest.java b/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/AssignmentProcessorTest.java index a6615bdf64..2eff7d49be 100644 --- a/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/AssignmentProcessorTest.java +++ b/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/AssignmentProcessorTest.java @@ -43,7 +43,7 @@ import java.util.List; import java.util.UUID; -import javax.json.JsonArray; +import jakarta.json.JsonArray; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; diff --git a/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/CaseApplicationRecordedProcessorTest.java b/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/CaseApplicationRecordedProcessorTest.java index 77a3d2f2bb..0cdfcd8acd 100644 --- a/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/CaseApplicationRecordedProcessorTest.java +++ b/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/CaseApplicationRecordedProcessorTest.java @@ -28,7 +28,7 @@ import java.util.UUID; import java.util.function.Consumer; -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-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/CaseCompletedProcessorResultsTest.java b/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/CaseCompletedProcessorResultsTest.java index a91409654d..f031f1fc15 100644 --- a/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/CaseCompletedProcessorResultsTest.java +++ b/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/CaseCompletedProcessorResultsTest.java @@ -27,7 +27,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-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/CaseCompletedProcessorTest.java b/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/CaseCompletedProcessorTest.java index 995359b88c..49dd1318a9 100644 --- a/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/CaseCompletedProcessorTest.java +++ b/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/CaseCompletedProcessorTest.java @@ -39,8 +39,8 @@ import java.util.List; import java.util.UUID; -import javax.json.JsonObject; -import javax.json.JsonValue; +import jakarta.json.JsonObject; +import jakarta.json.JsonValue; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/CaseDecisionProcessorTest.java b/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/CaseDecisionProcessorTest.java index 72ba032fa3..b7a289e3b6 100644 --- a/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/CaseDecisionProcessorTest.java +++ b/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/CaseDecisionProcessorTest.java @@ -33,7 +33,7 @@ import java.util.UUID; import java.util.function.Function; -import javax.json.JsonValue; +import jakarta.json.JsonValue; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; diff --git a/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/CaseDocumentUpdatedProcessorTest.java b/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/CaseDocumentUpdatedProcessorTest.java index e24bcc0f3e..7fb9b470ac 100644 --- a/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/CaseDocumentUpdatedProcessorTest.java +++ b/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/CaseDocumentUpdatedProcessorTest.java @@ -23,8 +23,8 @@ import java.util.Optional; import java.util.UUID; -import javax.json.JsonObject; -import javax.json.JsonObjectBuilder; +import jakarta.json.JsonObject; +import jakarta.json.JsonObjectBuilder; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; diff --git a/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/CaseDocumentUploadedProcessorTest.java b/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/CaseDocumentUploadedProcessorTest.java index 44e52e9496..d104ae266b 100644 --- a/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/CaseDocumentUploadedProcessorTest.java +++ b/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/CaseDocumentUploadedProcessorTest.java @@ -36,7 +36,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-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/CaseLegalSocCheckedProcessorTest.java b/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/CaseLegalSocCheckedProcessorTest.java index 48883929cd..8d205b71e0 100644 --- a/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/CaseLegalSocCheckedProcessorTest.java +++ b/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/CaseLegalSocCheckedProcessorTest.java @@ -31,8 +31,8 @@ import java.time.ZonedDateTime; import java.util.UUID; -import javax.json.JsonObject; -import javax.json.JsonValue; +import jakarta.json.JsonObject; +import jakarta.json.JsonValue; import org.hamcrest.CoreMatchers; import org.junit.jupiter.api.Test; diff --git a/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/CaseListedProcessorTest.java b/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/CaseListedProcessorTest.java index f3daaa2aee..b33878bc18 100644 --- a/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/CaseListedProcessorTest.java +++ b/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/CaseListedProcessorTest.java @@ -29,8 +29,8 @@ import java.util.UUID; import java.util.function.Function; -import javax.json.JsonArray; -import javax.json.JsonValue; +import jakarta.json.JsonArray; +import jakarta.json.JsonValue; import com.fasterxml.jackson.databind.ObjectMapper; import org.junit.jupiter.api.Test; diff --git a/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/CaseNoteAddedProcessorTest.java b/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/CaseNoteAddedProcessorTest.java index fbdbd68acd..33e2b61e1b 100644 --- a/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/CaseNoteAddedProcessorTest.java +++ b/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/CaseNoteAddedProcessorTest.java @@ -23,7 +23,7 @@ import java.time.ZonedDateTime; import java.util.UUID; -import javax.json.JsonValue; +import jakarta.json.JsonValue; import org.hamcrest.CoreMatchers; import org.junit.jupiter.api.Test; diff --git a/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/CaseReceivedProcessorTest.java b/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/CaseReceivedProcessorTest.java index 9be770dfb5..ad29c1338c 100644 --- a/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/CaseReceivedProcessorTest.java +++ b/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/CaseReceivedProcessorTest.java @@ -44,9 +44,9 @@ import java.time.LocalDate; import java.util.UUID; -import javax.json.JsonObject; -import javax.json.JsonObjectBuilder; -import javax.json.JsonValue; +import jakarta.json.JsonObject; +import jakarta.json.JsonObjectBuilder; +import jakarta.json.JsonValue; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; diff --git a/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/CaseReopenedProcessorTest.java b/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/CaseReopenedProcessorTest.java index 7b724f8276..fdd18f84d4 100644 --- a/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/CaseReopenedProcessorTest.java +++ b/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/CaseReopenedProcessorTest.java @@ -20,7 +20,7 @@ import java.util.UUID; import java.util.function.Consumer; -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-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/CaseReservedProcessorTest.java b/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/CaseReservedProcessorTest.java index ae869fa37c..fdbd1b690d 100644 --- a/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/CaseReservedProcessorTest.java +++ b/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/CaseReservedProcessorTest.java @@ -26,7 +26,7 @@ import java.time.ZonedDateTime; import java.util.UUID; -import javax.json.JsonValue; +import jakarta.json.JsonValue; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; diff --git a/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/ConvictingCourtResolvedProcessorTest.java b/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/ConvictingCourtResolvedProcessorTest.java index 9ab5a95bf1..523a80fb4d 100644 --- a/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/ConvictingCourtResolvedProcessorTest.java +++ b/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/ConvictingCourtResolvedProcessorTest.java @@ -18,8 +18,8 @@ import java.util.UUID; -import javax.json.JsonObject; -import javax.json.JsonValue; +import jakarta.json.JsonObject; +import jakarta.json.JsonValue; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; diff --git a/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/ConvictionCourtResolvedProcessorTest.java b/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/ConvictionCourtResolvedProcessorTest.java index 66972f4db1..9a91ed68ca 100644 --- a/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/ConvictionCourtResolvedProcessorTest.java +++ b/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/ConvictionCourtResolvedProcessorTest.java @@ -18,8 +18,8 @@ import java.util.UUID; -import javax.json.JsonObject; -import javax.json.JsonValue; +import jakarta.json.JsonObject; +import jakarta.json.JsonValue; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; diff --git a/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/CourtApplicationCreatedProcessorTest.java b/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/CourtApplicationCreatedProcessorTest.java index 1e25c98fdf..520ca47cdf 100644 --- a/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/CourtApplicationCreatedProcessorTest.java +++ b/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/CourtApplicationCreatedProcessorTest.java @@ -17,7 +17,7 @@ import uk.gov.justice.services.core.sender.Sender; import uk.gov.justice.services.messaging.JsonEnvelope; -import javax.json.JsonObject; +import jakarta.json.JsonObject; import java.util.Arrays; import java.util.UUID; diff --git a/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/CourtReferralProcessorTest.java b/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/CourtReferralProcessorTest.java index ed12160cfd..c71a19c309 100644 --- a/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/CourtReferralProcessorTest.java +++ b/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/CourtReferralProcessorTest.java @@ -73,7 +73,7 @@ import java.util.Optional; 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-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/DatesToAvoidProcessorTest.java b/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/DatesToAvoidProcessorTest.java index 7164905a80..9595df41fa 100644 --- a/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/DatesToAvoidProcessorTest.java +++ b/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/DatesToAvoidProcessorTest.java @@ -24,7 +24,7 @@ import java.util.UUID; -import javax.json.JsonValue; +import jakarta.json.JsonValue; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; diff --git a/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/DefendantDetailsUpdateProcessorTest.java b/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/DefendantDetailsUpdateProcessorTest.java index 071695f3f2..06e42b6b04 100644 --- a/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/DefendantDetailsUpdateProcessorTest.java +++ b/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/DefendantDetailsUpdateProcessorTest.java @@ -12,7 +12,7 @@ import uk.gov.justice.services.messaging.JsonEnvelope; import uk.gov.justice.services.test.utils.core.enveloper.EnveloperFactory; -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-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/DefendantDetailsUpdateRequestAcceptedProcessorTest.java b/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/DefendantDetailsUpdateRequestAcceptedProcessorTest.java index 57d97100e4..c678963666 100644 --- a/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/DefendantDetailsUpdateRequestAcceptedProcessorTest.java +++ b/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/DefendantDetailsUpdateRequestAcceptedProcessorTest.java @@ -11,7 +11,7 @@ import uk.gov.justice.services.core.sender.Sender; import uk.gov.justice.services.messaging.JsonEnvelope; -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-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/DefendantDetailsUpdatesAcknowledgedProcessorTest.java b/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/DefendantDetailsUpdatesAcknowledgedProcessorTest.java index 48ea41e3c3..6766541cd4 100644 --- a/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/DefendantDetailsUpdatesAcknowledgedProcessorTest.java +++ b/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/DefendantDetailsUpdatesAcknowledgedProcessorTest.java @@ -19,7 +19,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-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/DefendantPendingChangesAcceptedProcessorTest.java b/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/DefendantPendingChangesAcceptedProcessorTest.java index d71ad8e174..f8eccbd518 100644 --- a/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/DefendantPendingChangesAcceptedProcessorTest.java +++ b/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/DefendantPendingChangesAcceptedProcessorTest.java @@ -13,7 +13,7 @@ import uk.gov.justice.services.messaging.JsonEnvelope; import uk.gov.justice.services.test.utils.core.enveloper.EnveloperFactory; -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-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/DefendantPendingChangesRejectedProcessorTest.java b/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/DefendantPendingChangesRejectedProcessorTest.java index 059646b4b6..1c8cfb0dd5 100644 --- a/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/DefendantPendingChangesRejectedProcessorTest.java +++ b/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/DefendantPendingChangesRejectedProcessorTest.java @@ -13,7 +13,7 @@ import uk.gov.justice.services.messaging.JsonEnvelope; import uk.gov.justice.services.test.utils.core.enveloper.EnveloperFactory; -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-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/DeleteCaseDocumentProcessorTest.java b/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/DeleteCaseDocumentProcessorTest.java index ebf168792b..064e3ed55f 100644 --- a/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/DeleteCaseDocumentProcessorTest.java +++ b/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/DeleteCaseDocumentProcessorTest.java @@ -18,7 +18,7 @@ import java.util.List; 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-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/DeleteDocsStartedProcessorTest.java b/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/DeleteDocsStartedProcessorTest.java index c0e8d08e67..f6d6c7a638 100644 --- a/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/DeleteDocsStartedProcessorTest.java +++ b/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/DeleteDocsStartedProcessorTest.java @@ -20,8 +20,8 @@ import java.util.UUID; -import javax.json.JsonObject; -import javax.json.JsonValue; +import jakarta.json.JsonObject; +import jakarta.json.JsonValue; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/EndorsementRemovalNotificationProcessorTest.java b/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/EndorsementRemovalNotificationProcessorTest.java index 9202392641..9edb5079cf 100644 --- a/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/EndorsementRemovalNotificationProcessorTest.java +++ b/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/EndorsementRemovalNotificationProcessorTest.java @@ -43,7 +43,7 @@ import java.util.Optional; import java.util.UUID; -import javax.json.JsonValue; +import jakarta.json.JsonValue; import org.apache.commons.lang3.reflect.FieldUtils; import org.junit.jupiter.api.BeforeEach; diff --git a/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/EnforcementPendingApplicationNotificationProcessorTest.java b/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/EnforcementPendingApplicationNotificationProcessorTest.java index 4589ed74c9..e21dbb4c94 100644 --- a/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/EnforcementPendingApplicationNotificationProcessorTest.java +++ b/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/EnforcementPendingApplicationNotificationProcessorTest.java @@ -43,7 +43,7 @@ import java.util.List; import java.util.UUID; -import javax.json.JsonValue; +import jakarta.json.JsonValue; import org.apache.commons.lang3.reflect.FieldUtils; import org.junit.jupiter.api.BeforeEach; diff --git a/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/FinancialImpositionExportProcessorTest.java b/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/FinancialImpositionExportProcessorTest.java index d325de5e86..bd476aaea1 100644 --- a/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/FinancialImpositionExportProcessorTest.java +++ b/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/FinancialImpositionExportProcessorTest.java @@ -15,7 +15,7 @@ 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-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/FinancialMeansProcessorTest.java b/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/FinancialMeansProcessorTest.java index 817bc0ff52..833c4f8a77 100644 --- a/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/FinancialMeansProcessorTest.java +++ b/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/FinancialMeansProcessorTest.java @@ -26,7 +26,7 @@ import java.util.List; 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-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/HearingResultReceivedProcessorTest.java b/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/HearingResultReceivedProcessorTest.java index 25ef1ff491..be074e3cc7 100644 --- a/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/HearingResultReceivedProcessorTest.java +++ b/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/HearingResultReceivedProcessorTest.java @@ -24,9 +24,9 @@ import uk.gov.justice.services.messaging.JsonEnvelope; import uk.gov.moj.cpp.sjp.event.CaseReceived; -import javax.json.JsonArrayBuilder; -import javax.json.JsonObjectBuilder; -import javax.json.JsonValue; +import jakarta.json.JsonArrayBuilder; +import jakarta.json.JsonObjectBuilder; +import jakarta.json.JsonValue; import java.io.IOException; import java.util.Arrays; import java.util.UUID; diff --git a/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/HearingResultedProcessorTest.java b/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/HearingResultedProcessorTest.java index ee08a14b8d..facc70b9b0 100644 --- a/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/HearingResultedProcessorTest.java +++ b/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/HearingResultedProcessorTest.java @@ -33,7 +33,7 @@ import java.util.Arrays; import java.util.UUID; -import javax.json.JsonValue; +import jakarta.json.JsonValue; import com.fasterxml.jackson.databind.ObjectMapper; import org.junit.jupiter.api.BeforeEach; diff --git a/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/NotificationNotifyProcessorTest.java b/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/NotificationNotifyProcessorTest.java index 8162b108e9..e99f5ba9bc 100644 --- a/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/NotificationNotifyProcessorTest.java +++ b/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/NotificationNotifyProcessorTest.java @@ -28,7 +28,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-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/OffenceWithdrawalRequestProcessorTest.java b/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/OffenceWithdrawalRequestProcessorTest.java index 5af27f01bc..69a7af6b9e 100644 --- a/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/OffenceWithdrawalRequestProcessorTest.java +++ b/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/OffenceWithdrawalRequestProcessorTest.java @@ -20,7 +20,7 @@ import uk.gov.justice.services.messaging.JsonEnvelope; import uk.gov.justice.services.test.utils.core.enveloper.EnveloperFactory; -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-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/PleadOnlineProcessorTest.java b/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/PleadOnlineProcessorTest.java index 320165a8d5..b2d3fec0c4 100644 --- a/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/PleadOnlineProcessorTest.java +++ b/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/PleadOnlineProcessorTest.java @@ -26,10 +26,10 @@ import java.util.Optional; import java.util.UUID; -import javax.json.JsonArray; -import javax.json.JsonObject; -import javax.json.JsonObjectBuilder; -import javax.json.JsonValue; +import jakarta.json.JsonArray; +import jakarta.json.JsonObject; +import jakarta.json.JsonObjectBuilder; +import jakarta.json.JsonValue; import org.hamcrest.CoreMatchers; import org.junit.jupiter.api.Test; diff --git a/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/PleasSetProcessorTest.java b/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/PleasSetProcessorTest.java index 19ec8ea83f..81b5b27973 100644 --- a/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/PleasSetProcessorTest.java +++ b/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/PleasSetProcessorTest.java @@ -23,8 +23,8 @@ import java.io.StringReader; import java.util.UUID; -import javax.json.JsonObject; -import javax.json.JsonValue; +import jakarta.json.JsonObject; +import jakarta.json.JsonValue; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; diff --git a/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/PressTransparencyReportRequestedProcessorTest.java b/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/PressTransparencyReportRequestedProcessorTest.java index a82128ed24..1587ac3f55 100644 --- a/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/PressTransparencyReportRequestedProcessorTest.java +++ b/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/PressTransparencyReportRequestedProcessorTest.java @@ -63,10 +63,10 @@ import java.util.UUID; import java.util.function.Function; -import javax.json.JsonArray; -import javax.json.JsonArrayBuilder; -import javax.json.JsonObject; -import javax.json.JsonObjectBuilder; +import jakarta.json.JsonArray; +import jakarta.json.JsonArrayBuilder; +import jakarta.json.JsonObject; +import jakarta.json.JsonObjectBuilder; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/ProsecutionCasesReferredToCourtProcessorTest.java b/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/ProsecutionCasesReferredToCourtProcessorTest.java index f25c4b17e4..6a0113dda6 100644 --- a/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/ProsecutionCasesReferredToCourtProcessorTest.java +++ b/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/ProsecutionCasesReferredToCourtProcessorTest.java @@ -27,7 +27,7 @@ import java.util.UUID; -import javax.json.JsonArray; +import jakarta.json.JsonArray; import com.google.common.collect.ImmutableMap; import org.junit.jupiter.api.Test; diff --git a/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/SJPDefendantUpdatedProcessorTest.java b/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/SJPDefendantUpdatedProcessorTest.java index 9196baddbb..096c11396b 100644 --- a/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/SJPDefendantUpdatedProcessorTest.java +++ b/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/SJPDefendantUpdatedProcessorTest.java @@ -14,7 +14,7 @@ import uk.gov.justice.services.core.sender.Sender; import uk.gov.justice.services.messaging.JsonEnvelope; -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-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/SessionProcessorTest.java b/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/SessionProcessorTest.java index a33e87e052..4cd4363341 100644 --- a/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/SessionProcessorTest.java +++ b/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/SessionProcessorTest.java @@ -34,7 +34,7 @@ import java.util.List; 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-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/SysDocGeneratorProcessorTest.java b/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/SysDocGeneratorProcessorTest.java index 0a710ff75b..5b36cb6e79 100644 --- a/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/SysDocGeneratorProcessorTest.java +++ b/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/SysDocGeneratorProcessorTest.java @@ -10,7 +10,7 @@ import java.util.Arrays; -import javax.enterprise.inject.Instance; +import jakarta.enterprise.inject.Instance; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; diff --git a/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/TransparencyReportRequestedProcessorTest.java b/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/TransparencyReportRequestedProcessorTest.java index e34e2faab9..01a4459a75 100644 --- a/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/TransparencyReportRequestedProcessorTest.java +++ b/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/TransparencyReportRequestedProcessorTest.java @@ -44,10 +44,10 @@ import java.util.Objects; import java.util.UUID; -import javax.json.JsonArray; -import javax.json.JsonArrayBuilder; -import javax.json.JsonObject; -import javax.json.JsonObjectBuilder; +import jakarta.json.JsonArray; +import jakarta.json.JsonArrayBuilder; +import jakarta.json.JsonObject; +import jakarta.json.JsonObjectBuilder; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; diff --git a/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/activiti/ActivitiJUnit5Extension.java b/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/activiti/ActivitiJUnit5Extension.java new file mode 100644 index 0000000000..273eb5c906 --- /dev/null +++ b/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/activiti/ActivitiJUnit5Extension.java @@ -0,0 +1,76 @@ +package uk.gov.moj.cpp.sjp.event.processor.activiti; + +import java.io.InputStream; +import java.lang.reflect.Method; + +import org.activiti.engine.ProcessEngine; +import org.activiti.engine.ProcessEngineConfiguration; +import org.activiti.engine.RepositoryService; +import org.activiti.engine.RuntimeService; +import org.activiti.engine.impl.cfg.StandaloneProcessEngineConfiguration; +import org.activiti.engine.impl.test.JobTestHelper; +import org.activiti.engine.test.Deployment; +import org.junit.jupiter.api.extension.AfterEachCallback; +import org.junit.jupiter.api.extension.BeforeEachCallback; +import org.junit.jupiter.api.extension.ExtensionContext; + +/** + * JUnit 5 replacement for the Activiti JUnit 4 {@code ActivitiRule}: builds a {@link ProcessEngine} + * from {@code /activiti.cfg.xml} before each test and deploys the BPMN resources named in the test + * method's {@link Deployment} annotation, tearing both down afterwards. + */ +public class ActivitiJUnit5Extension implements BeforeEachCallback, AfterEachCallback { + + private ProcessEngine processEngine; + private String deploymentId; + + @Override + public void beforeEach(final ExtensionContext context) { + final InputStream cfgStream = ActivitiJUnit5Extension.class.getResourceAsStream("/activiti.cfg.xml"); + processEngine = ProcessEngineConfiguration + .createProcessEngineConfigurationFromInputStream(cfgStream, "processEngineConfiguration") + .buildProcessEngine(); + + final Method testMethod = context.getRequiredTestMethod(); + final Deployment deployment = testMethod.getAnnotation(Deployment.class); + if (deployment != null) { + final RepositoryService repositoryService = processEngine.getRepositoryService(); + final org.activiti.engine.repository.DeploymentBuilder builder = repositoryService.createDeployment(); + for (final String resource : deployment.resources()) { + builder.addClasspathResource(resource); + } + deploymentId = builder.deploy().getId(); + } + } + + @Override + public void afterEach(final ExtensionContext context) { + if (deploymentId != null) { + processEngine.getRepositoryService().deleteDeployment(deploymentId, true); + deploymentId = null; + } + if (processEngine != null) { + processEngine.close(); + processEngine = null; + } + } + + public ProcessEngine getProcessEngine() { + return processEngine; + } + + public RuntimeService getRuntimeService() { + return processEngine.getRuntimeService(); + } + + public StandaloneProcessEngineConfiguration getProcessEngineConfiguration() { + return (StandaloneProcessEngineConfiguration) processEngine.getProcessEngineConfiguration(); + } + + public void waitForJobExecutorToProcessAllJobs(final long maxMillisToWait, final long intervalMillis) { + JobTestHelper.waitForJobExecutorToProcessAllJobs( + processEngine.getProcessEngineConfiguration(), + processEngine.getManagementService(), + maxMillisToWait, intervalMillis); + } +} diff --git a/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/activiti/CaseAssignmentTimeoutProcessTest.java b/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/activiti/CaseAssignmentTimeoutProcessTest.java index a06d5daff4..510150de00 100644 --- a/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/activiti/CaseAssignmentTimeoutProcessTest.java +++ b/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/activiti/CaseAssignmentTimeoutProcessTest.java @@ -8,21 +8,19 @@ import java.util.UUID; import org.activiti.engine.runtime.ProcessInstance; -import org.activiti.engine.test.ActivitiRule; import org.activiti.engine.test.Deployment; -import org.junit.Before; -import org.junit.Ignore; -import org.junit.Rule; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.RegisterExtension; -//TODO FIXME!!! junit5 not yet supported by activiti engine //https://github.com/Activiti/Activiti/issues/3267 public class CaseAssignmentTimeoutProcessTest { private static final String TIMEOUT_PROCESS_PATH = "processes/caseAssignmentTimeout.bpmn20.xml"; private static final int MAX_MILLIS_TO_WAIT = 10000; - @Rule - public ActivitiRule rule = new ActivitiRule(); + @RegisterExtension + ActivitiJUnit5Extension rule = new ActivitiJUnit5Extension(); private CaseAssignmentTimeoutProcess caseAssignmentTimeoutProcess; @@ -30,7 +28,7 @@ public class CaseAssignmentTimeoutProcessTest { private DelegatesVerifier delegatesVerifier; - @Before + @BeforeEach public void init() { caseId = randomUUID(); @@ -74,7 +72,7 @@ public void shouldFailGracefullyCancellingNonExistentAssignmentTimer() { } @Test - @Ignore("DD-17905:Commented as part of 21.25.01 as it is failing on Jenkins at random, but works locally") + @Disabled("DD-17905:Commented as part of 21.25.01 as it is failing on Jenkins at random, but works locally") @Deployment(resources = TIMEOUT_PROCESS_PATH) public void shouldNotThrowAnExceptionForDuplicateTimers() { diff --git a/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/activiti/CaseStateProcessTest.java b/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/activiti/CaseStateProcessTest.java index b6f5fe562d..b6799c878d 100644 --- a/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/activiti/CaseStateProcessTest.java +++ b/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/activiti/CaseStateProcessTest.java @@ -9,7 +9,7 @@ import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.is; import static org.hamcrest.core.AllOf.allOf; -import static org.junit.Assert.assertThat; +import static org.hamcrest.MatcherAssert.assertThat; import static uk.gov.justice.services.test.utils.core.messaging.MetadataBuilderFactory.metadataWithRandomUUIDAndName; import static uk.gov.moj.cpp.sjp.event.processor.activiti.CaseStateService.CASE_ADJOURNED_DATE; import static uk.gov.moj.cpp.sjp.event.processor.activiti.CaseStateService.CASE_ADJOURNED_SIGNAL_NAME; @@ -60,19 +60,17 @@ import java.util.stream.Stream; import com.google.common.collect.ImmutableMap; -import org.activiti.engine.test.ActivitiRule; import org.activiti.engine.test.Deployment; -import org.junit.Before; -import org.junit.Rule; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.RegisterExtension; -//TODO FIXME!!! junit5 not yet supported by activiti engine //https://github.com/Activiti/Activiti/issues/3267 public class CaseStateProcessTest { private static final String PROCESS_PATH = "processes/case-state.bpmn20.xml"; - @Rule - public ActivitiRule rule = new ActivitiRule(); + @RegisterExtension + ActivitiJUnit5Extension rule = new ActivitiJUnit5Extension(); private DelegatesVerifier delegatesVerifier; @@ -80,7 +78,7 @@ public class CaseStateProcessTest { private Metadata metadata; private CaseStateService caseStateService; - @Before + @BeforeEach public void init() { caseId = randomUUID(); metadata = metadataWithRandomUUIDAndName().build(); diff --git a/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/activiti/DelegatesVerifier.java b/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/activiti/DelegatesVerifier.java index d9d6e18ae9..37efba2b90 100644 --- a/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/activiti/DelegatesVerifier.java +++ b/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/activiti/DelegatesVerifier.java @@ -5,7 +5,6 @@ import static java.lang.String.format; import static java.util.Arrays.stream; import static java.util.stream.Collectors.toList; -import static org.activiti.engine.impl.test.JobTestHelper.waitForJobExecutorToProcessAllJobs; import static org.apache.commons.lang3.ArrayUtils.contains; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.greaterThan; @@ -18,7 +17,6 @@ import org.activiti.engine.impl.cfg.StandaloneProcessEngineConfiguration; import org.activiti.engine.runtime.Execution; import org.activiti.engine.runtime.ProcessInstance; -import org.activiti.engine.test.ActivitiRule; import org.apache.commons.lang3.StringUtils; import org.hamcrest.Matcher; import org.slf4j.Logger; @@ -51,9 +49,9 @@ public String toString() { } } - private final ActivitiRule rule; + private final ActivitiJUnit5Extension rule; - public DelegatesVerifier(final ActivitiRule rule) { + public DelegatesVerifier(final ActivitiJUnit5Extension rule) { this.rule = rule; stream(DelegatesVerifier.Delegate.values()).map(this::getDelegateExecution).forEach(MockedDelegate::resetExecutions); @@ -130,7 +128,7 @@ public void assertProcessFinished(final String processInstanceId, final boolean public void tryProcessPendingJobs() { try { - waitForJobExecutorToProcessAllJobs(rule, 10000, 10); + rule.waitForJobExecutorToProcessAllJobs(10000, 10); } catch (final ActivitiException e) { LOGGER.warn("Exception thrown while waiting for jobs to be processed", e); } diff --git a/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/activiti/delegates/timers/TimerExpirationProcessTest.java b/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/activiti/delegates/timers/TimerExpirationProcessTest.java index 3d6dd80cd8..be8fa04ca9 100644 --- a/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/activiti/delegates/timers/TimerExpirationProcessTest.java +++ b/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/activiti/delegates/timers/TimerExpirationProcessTest.java @@ -2,8 +2,8 @@ import static java.time.ZoneOffset.UTC; import static java.util.UUID.randomUUID; +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.equalTo; -import static org.junit.Assert.assertThat; import static org.mockito.Mockito.verify; import static uk.gov.justice.services.test.utils.core.messaging.MetadataBuilderFactory.metadataWithRandomUUIDAndName; import static uk.gov.moj.cpp.sjp.event.processor.EventProcessorConstants.CASE_ID; @@ -11,6 +11,7 @@ import uk.gov.justice.services.core.sender.Sender; import uk.gov.justice.services.messaging.JsonEnvelope; import uk.gov.justice.services.messaging.Metadata; +import uk.gov.moj.cpp.sjp.event.processor.activiti.ActivitiJUnit5Extension; import uk.gov.moj.cpp.sjp.event.processor.activiti.TimerExpirationProcess; import java.time.LocalDate; @@ -18,26 +19,24 @@ import org.activiti.engine.runtime.Job; import org.activiti.engine.runtime.ProcessInstance; -import org.activiti.engine.test.ActivitiRule; import org.activiti.engine.test.Deployment; -import org.junit.Before; -import org.junit.Rule; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; +import org.junit.jupiter.api.extension.RegisterExtension; import org.mockito.ArgumentCaptor; import org.mockito.Captor; import org.mockito.Mock; import org.mockito.Mockito; -import org.mockito.junit.MockitoJUnitRunner; +import org.mockito.junit.jupiter.MockitoExtension; -//TODO FIXME!!! junit5 not yet supported by activiti engine //https://github.com/Activiti/Activiti/issues/3267 -@RunWith(MockitoJUnitRunner.class) +@ExtendWith(MockitoExtension.class) public class TimerExpirationProcessTest { private static final String TIMEOUT_PROCESS_PATH = "processes/timerTimeout.bpmn20.xml"; - @Rule - public ActivitiRule rule = new ActivitiRule(); + @RegisterExtension + ActivitiJUnit5Extension rule = new ActivitiJUnit5Extension(); @Mock private Sender sender; @@ -51,7 +50,7 @@ public class TimerExpirationProcessTest { private Metadata metadata; - @Before + @BeforeEach public void init() { Mockito.reset(MockSender.sender); caseId = randomUUID(); @@ -72,14 +71,14 @@ public void shouldTriggerTimeoutTaskAfterTimeout() { .processInstanceBusinessKey(caseId.toString()) .singleResult(); - final Job job = rule.getManagementService() + final Job job = rule.getProcessEngine().getManagementService() .createJobQuery() .processInstanceId(processInstance.getProcessInstanceId()) .singleResult(); assertThat(job.getDuedate().toInstant(), equalTo(defendantResponseExpiryDate.atStartOfDay(UTC).toInstant())); - rule.getManagementService().executeJob(job.getId()); + rule.getProcessEngine().getManagementService().executeJob(job.getId()); verify(MockSender.sender).sendAsAdmin(argumentCaptor.capture()); diff --git a/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/results/converter/AddressConverterTest.java b/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/results/converter/AddressConverterTest.java index 372bc62ce3..0bbd0aff94 100644 --- a/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/results/converter/AddressConverterTest.java +++ b/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/results/converter/AddressConverterTest.java @@ -29,7 +29,7 @@ import java.util.Optional; -import javax.json.JsonObject; +import jakarta.json.JsonObject; import org.junit.jupiter.api.Test; import org.mockito.InjectMocks; diff --git a/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/results/converter/CourtCentreConverterTest.java b/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/results/converter/CourtCentreConverterTest.java index 78904636dc..844af4112e 100644 --- a/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/results/converter/CourtCentreConverterTest.java +++ b/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/results/converter/CourtCentreConverterTest.java @@ -27,7 +27,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-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/results/converter/DefendantsConverterTest.java b/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/results/converter/DefendantsConverterTest.java index c0a12f5c19..d4820f90f0 100644 --- a/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/results/converter/DefendantsConverterTest.java +++ b/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/results/converter/DefendantsConverterTest.java @@ -26,7 +26,7 @@ import java.util.List; import java.util.Optional; -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-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/results/converter/HearingDaysConverterTest.java b/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/results/converter/HearingDaysConverterTest.java index c77489f485..309db469e2 100644 --- a/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/results/converter/HearingDaysConverterTest.java +++ b/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/results/converter/HearingDaysConverterTest.java @@ -12,7 +12,7 @@ import java.time.ZonedDateTime; import java.util.List; -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-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/results/converter/LJADetailsConverterTest.java b/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/results/converter/LJADetailsConverterTest.java index 7dabfcc48d..e53ae6fa0f 100644 --- a/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/results/converter/LJADetailsConverterTest.java +++ b/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/results/converter/LJADetailsConverterTest.java @@ -14,7 +14,7 @@ import java.util.Optional; -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-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/results/converter/OffencesConverterTest.java b/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/results/converter/OffencesConverterTest.java index a1c0d6f049..46648916f3 100644 --- a/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/results/converter/OffencesConverterTest.java +++ b/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/results/converter/OffencesConverterTest.java @@ -21,7 +21,7 @@ import java.util.HashMap; 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-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/results/converter/ProsecutionCaseIdentifierConverterTest.java b/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/results/converter/ProsecutionCaseIdentifierConverterTest.java index 5570e7526b..d75449094a 100644 --- a/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/results/converter/ProsecutionCaseIdentifierConverterTest.java +++ b/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/results/converter/ProsecutionCaseIdentifierConverterTest.java @@ -16,8 +16,8 @@ import uk.gov.justice.core.courts.ProsecutionCaseIdentifier; import uk.gov.moj.cpp.sjp.event.processor.service.ReferenceDataService; -import javax.json.JsonArray; -import javax.json.JsonObject; +import jakarta.json.JsonArray; +import jakarta.json.JsonObject; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; diff --git a/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/results/converter/ProsecutionCasesConverterTest.java b/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/results/converter/ProsecutionCasesConverterTest.java index fe6ca98517..7c22671feb 100644 --- a/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/results/converter/ProsecutionCasesConverterTest.java +++ b/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/results/converter/ProsecutionCasesConverterTest.java @@ -18,7 +18,7 @@ import java.util.Arrays; import java.util.List; -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-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/results/converter/ResultingToResultsConverterHelper.java b/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/results/converter/ResultingToResultsConverterHelper.java index df0879eaba..664f0f010e 100644 --- a/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/results/converter/ResultingToResultsConverterHelper.java +++ b/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/results/converter/ResultingToResultsConverterHelper.java @@ -45,9 +45,9 @@ import java.util.Optional; import java.util.UUID; -import javax.json.JsonArrayBuilder; -import javax.json.JsonObject; -import javax.json.JsonValue; +import jakarta.json.JsonArrayBuilder; +import jakarta.json.JsonObject; +import jakarta.json.JsonValue; public class ResultingToResultsConverterHelper { diff --git a/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/results/converter/VerdictConverterTest.java b/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/results/converter/VerdictConverterTest.java index 84fa107a42..cbb97d212e 100644 --- a/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/results/converter/VerdictConverterTest.java +++ b/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/results/converter/VerdictConverterTest.java @@ -22,7 +22,7 @@ import java.util.Optional; import java.util.UUID; -import javax.json.JsonObject; +import jakarta.json.JsonObject; import com.google.common.collect.Lists; import org.junit.jupiter.api.Test; diff --git a/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/results/converter/judicialresult/JudicialResultHelperTest.java b/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/results/converter/judicialresult/JudicialResultHelperTest.java index 2b484c286a..81fc0616fe 100644 --- a/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/results/converter/judicialresult/JudicialResultHelperTest.java +++ b/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/results/converter/judicialresult/JudicialResultHelperTest.java @@ -13,8 +13,8 @@ import java.util.HashMap; import java.util.UUID; -import javax.json.Json; -import javax.json.JsonObject; +import jakarta.json.Json; +import jakarta.json.JsonObject; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/results/converter/judicialresult/aggregator/WithDrawDecisionResultAggregatorTest.java b/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/results/converter/judicialresult/aggregator/WithDrawDecisionResultAggregatorTest.java index 62be5ae75b..c9b51aa887 100644 --- a/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/results/converter/judicialresult/aggregator/WithDrawDecisionResultAggregatorTest.java +++ b/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/results/converter/judicialresult/aggregator/WithDrawDecisionResultAggregatorTest.java @@ -20,7 +20,7 @@ import java.util.UUID; -import javax.json.JsonObject; +import jakarta.json.JsonObject; import org.hamcrest.Matchers; import org.junit.jupiter.api.BeforeEach; diff --git a/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/service/AssignmentServiceTest.java b/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/service/AssignmentServiceTest.java index 39286a258c..df776fc5e5 100644 --- a/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/service/AssignmentServiceTest.java +++ b/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/service/AssignmentServiceTest.java @@ -35,7 +35,7 @@ import java.util.Map; import java.util.UUID; -import javax.json.JsonArray; +import jakarta.json.JsonArray; import com.google.common.collect.ImmutableMap; import org.hamcrest.CustomTypeSafeMatcher; diff --git a/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/service/LocalJusticeAreaTest.java b/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/service/LocalJusticeAreaTest.java index 0ef1a02fae..7357966a2f 100644 --- a/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/service/LocalJusticeAreaTest.java +++ b/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/service/LocalJusticeAreaTest.java @@ -5,7 +5,7 @@ import static org.junit.jupiter.api.Assertions.assertThrows; import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; -import javax.json.JsonObject; +import jakarta.json.JsonObject; import org.junit.jupiter.api.Test; diff --git a/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/service/MaterialServiceTest.java b/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/service/MaterialServiceTest.java index 6fe8f496b2..c70021ef55 100644 --- a/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/service/MaterialServiceTest.java +++ b/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/service/MaterialServiceTest.java @@ -22,7 +22,7 @@ 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-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/service/ProsecutionCaseFileServiceTest.java b/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/service/ProsecutionCaseFileServiceTest.java index 754fce5a50..5444ad80cc 100644 --- a/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/service/ProsecutionCaseFileServiceTest.java +++ b/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/service/ProsecutionCaseFileServiceTest.java @@ -24,8 +24,8 @@ import java.util.Optional; import java.util.UUID; -import javax.json.JsonObject; -import javax.json.JsonValue; +import jakarta.json.JsonObject; +import jakarta.json.JsonValue; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; diff --git a/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/service/ReferenceDataOffencesServiceTest.java b/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/service/ReferenceDataOffencesServiceTest.java index 21715e3bb0..c72923082d 100644 --- a/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/service/ReferenceDataOffencesServiceTest.java +++ b/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/service/ReferenceDataOffencesServiceTest.java @@ -28,7 +28,7 @@ import java.util.Set; import java.util.UUID; -import javax.json.JsonObject; +import jakarta.json.JsonObject; import com.google.common.collect.ImmutableMap; import com.google.common.collect.Sets; diff --git a/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/service/ReferenceDataServiceTest.java b/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/service/ReferenceDataServiceTest.java index 238bdf7f78..c259c34b0b 100644 --- a/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/service/ReferenceDataServiceTest.java +++ b/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/service/ReferenceDataServiceTest.java @@ -37,10 +37,10 @@ import java.util.Optional; import java.util.UUID; -import javax.json.JsonArray; -import javax.json.JsonObject; -import javax.json.JsonObjectBuilder; -import javax.json.JsonValue; +import jakarta.json.JsonArray; +import jakarta.json.JsonObject; +import jakarta.json.JsonObjectBuilder; +import jakarta.json.JsonValue; import org.hamcrest.Matcher; import org.junit.jupiter.api.Test; diff --git a/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/service/SjpServiceTest.java b/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/service/SjpServiceTest.java index 1c7b933022..164f200ea4 100644 --- a/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/service/SjpServiceTest.java +++ b/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/service/SjpServiceTest.java @@ -30,7 +30,7 @@ import java.util.List; 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-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/service/UsersGroupsServiceTest.java b/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/service/UsersGroupsServiceTest.java index a9ecdccf4f..99b61d2d68 100644 --- a/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/service/UsersGroupsServiceTest.java +++ b/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/service/UsersGroupsServiceTest.java @@ -22,7 +22,7 @@ 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-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/service/enforcementnotification/DivisionCodeHelperTest.java b/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/service/enforcementnotification/DivisionCodeHelperTest.java index 3e0b477ebb..06dac9b7a2 100644 --- a/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/service/enforcementnotification/DivisionCodeHelperTest.java +++ b/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/service/enforcementnotification/DivisionCodeHelperTest.java @@ -12,7 +12,7 @@ import uk.gov.justice.services.adapter.rest.exception.BadRequestException; import uk.gov.justice.services.messaging.JsonEnvelope; -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-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/service/enforcementnotification/EnforcementAreaEmailHelperTest.java b/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/service/enforcementnotification/EnforcementAreaEmailHelperTest.java index f431a32b60..4ec38c4854 100644 --- a/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/service/enforcementnotification/EnforcementAreaEmailHelperTest.java +++ b/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/service/enforcementnotification/EnforcementAreaEmailHelperTest.java @@ -11,7 +11,7 @@ import uk.gov.justice.json.schemas.domains.sjp.queries.Session; import uk.gov.justice.services.messaging.JsonEnvelope; -import javax.json.JsonObject; +import jakarta.json.JsonObject; import org.junit.Rule; import org.junit.jupiter.api.Test; diff --git a/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/service/enforcementnotification/EnforcementAreaServiceTest.java b/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/service/enforcementnotification/EnforcementAreaServiceTest.java index ce96b71345..00ad61da9d 100644 --- a/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/service/enforcementnotification/EnforcementAreaServiceTest.java +++ b/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/service/enforcementnotification/EnforcementAreaServiceTest.java @@ -12,7 +12,7 @@ import java.util.Optional; -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-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/service/enforcementnotification/EnforcementEmailAttachmentServiceTest.java b/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/service/enforcementnotification/EnforcementEmailAttachmentServiceTest.java index e3cca20281..d1dd93832e 100644 --- a/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/service/enforcementnotification/EnforcementEmailAttachmentServiceTest.java +++ b/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/service/enforcementnotification/EnforcementEmailAttachmentServiceTest.java @@ -41,7 +41,7 @@ import java.time.ZonedDateTime; import java.util.UUID; -import javax.json.JsonObject; +import jakarta.json.JsonObject; import com.fasterxml.jackson.databind.ObjectMapper; import org.apache.commons.lang3.tuple.Pair; diff --git a/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/service/enforcementnotification/EnforcementNotificationServiceTest.java b/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/service/enforcementnotification/EnforcementNotificationServiceTest.java index bbfa1f2825..9b79f08fea 100644 --- a/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/service/enforcementnotification/EnforcementNotificationServiceTest.java +++ b/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/service/enforcementnotification/EnforcementNotificationServiceTest.java @@ -39,7 +39,7 @@ import java.util.UUID; import java.util.stream.Stream; -import javax.json.JsonObject; +import jakarta.json.JsonObject; import org.junit.Assert; import org.junit.jupiter.api.Test; diff --git a/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/service/notification/EndorsementRemovalNotificationServiceTest.java b/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/service/notification/EndorsementRemovalNotificationServiceTest.java index 6bb1a9d6aa..1ae9317b7c 100644 --- a/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/service/notification/EndorsementRemovalNotificationServiceTest.java +++ b/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/service/notification/EndorsementRemovalNotificationServiceTest.java @@ -59,7 +59,7 @@ import java.util.Optional; import java.util.UUID; -import javax.json.JsonObject; +import jakarta.json.JsonObject; import com.fasterxml.jackson.databind.ObjectMapper; import org.apache.commons.lang3.tuple.Pair; diff --git a/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/service/notificationnotify/NotificationNotifyTest.java b/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/service/notificationnotify/NotificationNotifyTest.java index 53b5caba16..9d94ff13f9 100644 --- a/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/service/notificationnotify/NotificationNotifyTest.java +++ b/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/service/notificationnotify/NotificationNotifyTest.java @@ -12,7 +12,7 @@ import uk.gov.justice.services.core.sender.Sender; import uk.gov.justice.services.messaging.JsonEnvelope; -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-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/service/referral/CourtDocumentsDataSourcingServiceTest.java b/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/service/referral/CourtDocumentsDataSourcingServiceTest.java index 573826d5db..3d7e03d10e 100644 --- a/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/service/referral/CourtDocumentsDataSourcingServiceTest.java +++ b/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/service/referral/CourtDocumentsDataSourcingServiceTest.java @@ -2,7 +2,7 @@ import static java.util.Collections.singletonList; import static java.util.UUID.randomUUID; -import static javax.json.JsonValue.NULL; +import static jakarta.json.JsonValue.NULL; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.containsInAnyOrder; import static org.hamcrest.Matchers.hasSize; @@ -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-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/service/referral/HearingRequestsDataSourcingServiceTest.java b/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/service/referral/HearingRequestsDataSourcingServiceTest.java index dcffa3db5b..b81ceb0c7a 100644 --- a/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/service/referral/HearingRequestsDataSourcingServiceTest.java +++ b/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/service/referral/HearingRequestsDataSourcingServiceTest.java @@ -3,7 +3,7 @@ import static java.time.ZonedDateTime.now; import static java.util.Collections.singletonList; import static java.util.UUID.randomUUID; -import static javax.json.JsonValue.NULL; +import static jakarta.json.JsonValue.NULL; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; @@ -31,7 +31,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-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/service/referral/ProsecutionCasesDataSourcingServiceTest.java b/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/service/referral/ProsecutionCasesDataSourcingServiceTest.java index 9172131ab6..81d3e3d6f5 100644 --- a/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/service/referral/ProsecutionCasesDataSourcingServiceTest.java +++ b/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/service/referral/ProsecutionCasesDataSourcingServiceTest.java @@ -40,8 +40,8 @@ import java.util.UUID; import java.util.stream.Collectors; -import javax.json.JsonObject; -import javax.json.JsonValue; +import jakarta.json.JsonObject; +import jakarta.json.JsonValue; import com.google.common.collect.ImmutableMap; import com.google.common.collect.Sets; diff --git a/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/service/referral/SjpReferralDataSourcingServiceTest.java b/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/service/referral/SjpReferralDataSourcingServiceTest.java index f9ca113718..b820fc7e06 100644 --- a/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/service/referral/SjpReferralDataSourcingServiceTest.java +++ b/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/service/referral/SjpReferralDataSourcingServiceTest.java @@ -2,7 +2,7 @@ import static java.time.ZonedDateTime.now; import static java.util.UUID.randomUUID; -import static javax.json.JsonValue.NULL; +import static jakarta.json.JsonValue.NULL; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import static uk.gov.justice.services.messaging.JsonEnvelope.envelopeFrom; @@ -24,7 +24,7 @@ import java.util.List; 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-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/service/referral/helpers/HearingRequestsViewHelperTest.java b/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/service/referral/helpers/HearingRequestsViewHelperTest.java index b0558d9f7f..9e26cf94d8 100644 --- a/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/service/referral/helpers/HearingRequestsViewHelperTest.java +++ b/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/service/referral/helpers/HearingRequestsViewHelperTest.java @@ -24,7 +24,7 @@ import java.util.List; import java.util.UUID; -import javax.json.JsonObject; +import jakarta.json.JsonObject; import org.junit.jupiter.api.Test; diff --git a/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/service/referral/helpers/ProsecutionCasesViewHelperTest.java b/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/service/referral/helpers/ProsecutionCasesViewHelperTest.java index cf43f5e466..22420cf702 100644 --- a/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/service/referral/helpers/ProsecutionCasesViewHelperTest.java +++ b/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/service/referral/helpers/ProsecutionCasesViewHelperTest.java @@ -70,7 +70,7 @@ import java.util.UUID; import java.util.stream.Collectors; -import javax.json.JsonObject; +import jakarta.json.JsonObject; import com.google.common.collect.ImmutableMap; import org.apache.commons.lang3.StringUtils; diff --git a/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/service/referral/helpers/SjpReferralViewHelperTest.java b/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/service/referral/helpers/SjpReferralViewHelperTest.java index d483d8b835..76f7bc1afe 100644 --- a/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/service/referral/helpers/SjpReferralViewHelperTest.java +++ b/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/service/referral/helpers/SjpReferralViewHelperTest.java @@ -17,7 +17,7 @@ import java.time.LocalDate; import java.time.ZonedDateTime; -import javax.json.JsonObject; +import jakarta.json.JsonObject; import org.junit.jupiter.api.Test; diff --git a/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/service/systemdocgenerator/EnforcementPendingApplicationNotificationStrategyTest.java b/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/service/systemdocgenerator/EnforcementPendingApplicationNotificationStrategyTest.java index f9e0a20f21..edf667dfa5 100644 --- a/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/service/systemdocgenerator/EnforcementPendingApplicationNotificationStrategyTest.java +++ b/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/service/systemdocgenerator/EnforcementPendingApplicationNotificationStrategyTest.java @@ -18,7 +18,7 @@ import java.util.UUID; -import javax.json.JsonValue; +import jakarta.json.JsonValue; import org.hamcrest.core.Is; import org.junit.jupiter.api.Test; diff --git a/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/service/systemdocgenerator/SystemDocGeneratorTest.java b/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/service/systemdocgenerator/SystemDocGeneratorTest.java index 9b2aa70835..f0784be9f9 100644 --- a/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/service/systemdocgenerator/SystemDocGeneratorTest.java +++ b/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/service/systemdocgenerator/SystemDocGeneratorTest.java @@ -14,7 +14,7 @@ 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-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/utils/FileUtil.java b/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/utils/FileUtil.java index 6734849140..709ca36f8d 100644 --- a/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/utils/FileUtil.java +++ b/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/utils/FileUtil.java @@ -7,8 +7,8 @@ import java.nio.charset.Charset; import java.util.Map; -import javax.json.JsonObject; -import javax.json.JsonReader; +import jakarta.json.JsonObject; +import jakarta.json.JsonReader; import com.google.common.io.Resources; import org.apache.commons.lang3.text.StrSubstitutor; diff --git a/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/utils/JsonHelper.java b/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/utils/JsonHelper.java index 081c67e03f..5517c81bc9 100644 --- a/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/utils/JsonHelper.java +++ b/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/utils/JsonHelper.java @@ -5,7 +5,7 @@ import java.io.IOException; import java.io.UncheckedIOException; -import javax.json.JsonObject; +import jakarta.json.JsonObject; import com.fasterxml.jackson.databind.ObjectMapper; diff --git a/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/utils/MetadataHelperTest.java b/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/utils/MetadataHelperTest.java index ef6eee200d..36b2e10d07 100644 --- a/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/utils/MetadataHelperTest.java +++ b/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/utils/MetadataHelperTest.java @@ -14,7 +14,7 @@ import java.util.Optional; -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-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/utils/builders/ApplicationDecisionSetAsideEnvelope.java b/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/utils/builders/ApplicationDecisionSetAsideEnvelope.java index b19d844233..404d9b350f 100644 --- a/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/utils/builders/ApplicationDecisionSetAsideEnvelope.java +++ b/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/utils/builders/ApplicationDecisionSetAsideEnvelope.java @@ -5,7 +5,7 @@ import uk.gov.moj.cpp.sjp.event.decision.ApplicationDecisionSetAside; import uk.gov.moj.cpp.sjp.event.processor.utils.JsonHelper; -import javax.json.JsonObject; +import jakarta.json.JsonObject; public class ApplicationDecisionSetAsideEnvelope { diff --git a/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/utils/builders/DocumentAvailableEventEnvelopeBuilder.java b/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/utils/builders/DocumentAvailableEventEnvelopeBuilder.java index 16a1a5bdb6..706a0d0983 100644 --- a/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/utils/builders/DocumentAvailableEventEnvelopeBuilder.java +++ b/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/utils/builders/DocumentAvailableEventEnvelopeBuilder.java @@ -10,7 +10,7 @@ import java.time.ZonedDateTime; import java.util.UUID; -import javax.json.JsonObjectBuilder; +import jakarta.json.JsonObjectBuilder; public class DocumentAvailableEventEnvelopeBuilder { diff --git a/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/utils/builders/GenerationFailedEventEnvelopeBuilder.java b/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/utils/builders/GenerationFailedEventEnvelopeBuilder.java index 223be0985a..df5d648bf7 100644 --- a/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/utils/builders/GenerationFailedEventEnvelopeBuilder.java +++ b/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/utils/builders/GenerationFailedEventEnvelopeBuilder.java @@ -10,7 +10,7 @@ import java.time.ZonedDateTime; import java.time.format.DateTimeFormatter; -import javax.json.JsonObjectBuilder; +import jakarta.json.JsonObjectBuilder; public class GenerationFailedEventEnvelopeBuilder { diff --git a/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/utils/fake/FakeFileStorer.java b/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/utils/fake/FakeFileStorer.java index d39ca927c3..5febf7a0f9 100644 --- a/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/utils/fake/FakeFileStorer.java +++ b/sjp-event/sjp-event-processor/src/test/java/uk/gov/moj/cpp/sjp/event/processor/utils/fake/FakeFileStorer.java @@ -10,7 +10,7 @@ import java.util.Map; import java.util.UUID; -import javax.json.JsonObject; +import jakarta.json.JsonObject; import org.apache.commons.lang3.tuple.ImmutablePair; import org.apache.commons.lang3.tuple.Pair; diff --git a/sjp-event/sjp-event-processor/src/yaml/json/public.stagingenforcement.enforce-financial-imposition-acknowledgement.json b/sjp-event/sjp-event-processor/src/yaml/json/public.stagingenforcement.enforce-financial-imposition-acknowledgement.json index ff9bc7113f..87ea1f2052 100644 --- a/sjp-event/sjp-event-processor/src/yaml/json/public.stagingenforcement.enforce-financial-imposition-acknowledgement.json +++ b/sjp-event/sjp-event-processor/src/yaml/json/public.stagingenforcement.enforce-financial-imposition-acknowledgement.json @@ -2,7 +2,17 @@ "originator": "ATCM", "requestId": "C22dA7cB-CBEE-D7ee-6BBc-ACF2cB50cBDF", "acknowledgement": { - "accountNumber": "123456780" + "accountNumber": "987654321", + "minorCreditors": [ + { + "minorCreditorId": "b2c3d4e5-6789-01bc-def0-234567890abc", + "minorCreditorAccountNumber": "MC12345678" + }, + { + "minorCreditorId": "c3d4e5f6-7890-12cd-ef01-34567890abcd", + "minorCreditorAccountNumber": "MC87654321" + } + ] }, "exportStatus": "ENFORCEMENT_REQUEST_SELECTED", "updated": "2018-06-01T09:00:00Z" diff --git a/sjp-event/sjp-event-processor/src/yaml/json/schema/public.stagingenforcement.enforce-financial-imposition-acknowledgement.json b/sjp-event/sjp-event-processor/src/yaml/json/schema/public.stagingenforcement.enforce-financial-imposition-acknowledgement.json index 8b50ccdfeb..44193d0324 100644 --- a/sjp-event/sjp-event-processor/src/yaml/json/schema/public.stagingenforcement.enforce-financial-imposition-acknowledgement.json +++ b/sjp-event/sjp-event-processor/src/yaml/json/schema/public.stagingenforcement.enforce-financial-imposition-acknowledgement.json @@ -41,7 +41,7 @@ "definitions": { "uuid": { "type": "string", - "pattern": "[a-fA-F0-9]{8}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{12}$" + "pattern": "^[a-fA-F0-9]{8}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{12}$" }, "acknowledgement": { "type": "object", @@ -52,6 +52,13 @@ "type": "string", "minLength": 9, "maxLength": 9 + }, + "minorCreditors": { + "description": "Minor creditors with GoB-generated account numbers (optional)", + "type": "array", + "items": { + "$ref": "#/definitions/minorCreditorAcknowledgement" + } } }, "additionalProperties": false, @@ -76,6 +83,25 @@ ] } ] + }, + "minorCreditorAcknowledgement": { + "type": "object", + "properties": { + "minorCreditorId": { + "description": "UUID of the minor creditor (Compensate) in Common Platform", + "type": "string", + "maxLength": 36 + }, + "minorCreditorAccountNumber": { + "description": "GoB-generated account number for the minor creditor", + "type": "string" + } + }, + "additionalProperties": false, + "required": [ + "minorCreditorId", + "minorCreditorAccountNumber" + ] } } } diff --git a/sjp-healthchecks/pom.xml b/sjp-healthchecks/pom.xml index 6f0808b7a1..c4d4c74f80 100644 --- a/sjp-healthchecks/pom.xml +++ b/sjp-healthchecks/pom.xml @@ -3,7 +3,7 @@ sjp-parent uk.gov.moj.cpp.sjp - 17.104.193-SNAPSHOT + 25.104.0-M1-SNAPSHOT 4.0.0 @@ -11,8 +11,8 @@ - javax - javaee-api + jakarta.platform + jakarta.jakartaee-api provided @@ -28,10 +28,6 @@ uk.gov.moj.cpp.unifiedsearch unifiedsearch-client - - org.elasticsearch.client - elasticsearch-rest-high-level-client - diff --git a/sjp-healthchecks/src/main/java/uk/gov/moj/cpp/sjp/healthchecks/SjpIgnoredHealthcheckNamesProvider.java b/sjp-healthchecks/src/main/java/uk/gov/moj/cpp/sjp/healthchecks/SjpIgnoredHealthcheckNamesProvider.java index d511c179ba..fe9adcc914 100644 --- a/sjp-healthchecks/src/main/java/uk/gov/moj/cpp/sjp/healthchecks/SjpIgnoredHealthcheckNamesProvider.java +++ b/sjp-healthchecks/src/main/java/uk/gov/moj/cpp/sjp/healthchecks/SjpIgnoredHealthcheckNamesProvider.java @@ -7,7 +7,7 @@ import java.util.List; -import javax.enterprise.inject.Specializes; +import jakarta.enterprise.inject.Specializes; @Specializes public class SjpIgnoredHealthcheckNamesProvider extends DefaultIgnoredHealthcheckNamesProvider { diff --git a/sjp-healthchecks/src/main/resources/META-INF/beans.xml b/sjp-healthchecks/src/main/resources/META-INF/beans.xml index cc3f8d2864..1d83bc8c5a 100644 --- a/sjp-healthchecks/src/main/resources/META-INF/beans.xml +++ b/sjp-healthchecks/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-integration-test/pom.xml b/sjp-integration-test/pom.xml index 0fe2e56338..b15399470d 100644 --- a/sjp-integration-test/pom.xml +++ b/sjp-integration-test/pom.xml @@ -4,7 +4,7 @@ uk.gov.moj.cpp.sjp sjp-parent - 17.104.193-SNAPSHOT + 25.104.0-M1-SNAPSHOT 4.0.0 @@ -19,7 +19,7 @@ org.glassfish - javax.json + jakarta.json test @@ -94,8 +94,8 @@ test - javax - javaee-api + jakarta.platform + jakarta.jakartaee-api provided @@ -104,10 +104,10 @@ uk.gov.justice.services - persistence-deltaspike + persistence-jdbc - org.hibernate + org.hibernate.orm hibernate-core provided @@ -266,6 +266,19 @@ + + org.apache.maven.plugins + maven-compiler-plugin + + + + org.projectlombok + lombok + ${lombok.version} + + + + maven-surefire-plugin diff --git a/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/command/AddDatesToAvoid.java b/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/command/AddDatesToAvoid.java index 7163c1af0d..46c3c50558 100644 --- a/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/command/AddDatesToAvoid.java +++ b/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/command/AddDatesToAvoid.java @@ -6,8 +6,8 @@ import java.util.UUID; -import javax.json.JsonObject; -import javax.ws.rs.core.Response; +import jakarta.json.JsonObject; +import jakarta.ws.rs.core.Response; public class AddDatesToAvoid { diff --git a/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/command/CreateCase.java b/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/command/CreateCase.java index 26cb925000..e943f14b7e 100644 --- a/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/command/CreateCase.java +++ b/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/command/CreateCase.java @@ -5,7 +5,7 @@ import static java.util.Objects.requireNonNull; import static java.util.Optional.ofNullable; import static java.util.UUID.randomUUID; -import static javax.ws.rs.core.Response.Status.ACCEPTED; +import static jakarta.ws.rs.core.Response.Status.ACCEPTED; import static uk.gov.justice.services.messaging.JsonObjects.createArrayBuilder; import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static uk.gov.moj.sjp.it.Constants.DEFAULT_OFFENCE_CODE; @@ -28,10 +28,10 @@ import java.util.concurrent.atomic.AtomicInteger; import java.util.stream.Collectors; -import javax.json.JsonArrayBuilder; -import javax.json.JsonObject; -import javax.json.JsonObjectBuilder; -import javax.ws.rs.core.Response; +import jakarta.json.JsonArrayBuilder; +import jakarta.json.JsonObject; +import jakarta.json.JsonObjectBuilder; +import jakarta.ws.rs.core.Response; import org.apache.commons.lang3.RandomStringUtils; diff --git a/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/command/UpdateDefendantDetails.java b/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/command/UpdateDefendantDetails.java index 7f26208e89..1036f4a220 100644 --- a/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/command/UpdateDefendantDetails.java +++ b/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/command/UpdateDefendantDetails.java @@ -13,9 +13,9 @@ import java.time.LocalDate; import java.util.UUID; -import javax.json.JsonObject; -import javax.json.JsonObjectBuilder; -import javax.ws.rs.core.Response; +import jakarta.json.JsonObject; +import jakarta.json.JsonObjectBuilder; +import jakarta.ws.rs.core.Response; public class UpdateDefendantDetails { diff --git a/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/commandclient/CreateCaseClient.java b/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/commandclient/CreateCaseClient.java index 554c908a85..f256e3f479 100644 --- a/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/commandclient/CreateCaseClient.java +++ b/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/commandclient/CreateCaseClient.java @@ -15,8 +15,8 @@ import java.util.UUID; import java.util.function.Consumer; -import javax.validation.Valid; -import javax.validation.constraints.NotNull; +import jakarta.validation.Valid; +import jakarta.validation.constraints.NotNull; import lombok.Builder; import org.apache.commons.lang3.RandomStringUtils; diff --git a/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/helper/AssignmentHelper.java b/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/helper/AssignmentHelper.java index ab1bdcffbd..b84945a631 100644 --- a/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/helper/AssignmentHelper.java +++ b/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/helper/AssignmentHelper.java @@ -2,8 +2,8 @@ import static com.jayway.jsonpath.matchers.JsonPathMatchers.withJsonPath; import static java.util.concurrent.TimeUnit.SECONDS; -import static javax.ws.rs.core.Response.Status.ACCEPTED; -import static javax.ws.rs.core.Response.Status.OK; +import static jakarta.ws.rs.core.Response.Status.ACCEPTED; +import static jakarta.ws.rs.core.Response.Status.OK; import static org.awaitility.Awaitility.await; import static org.hamcrest.CoreMatchers.is; import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; @@ -20,8 +20,8 @@ import java.util.UUID; import java.util.stream.Stream; -import javax.json.JsonObject; -import javax.ws.rs.core.Response; +import jakarta.json.JsonObject; +import jakarta.ws.rs.core.Response; import io.restassured.path.json.JsonPath; diff --git a/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/helper/CaseAccountHelper.java b/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/helper/CaseAccountHelper.java index b470e670b7..538763e370 100644 --- a/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/helper/CaseAccountHelper.java +++ b/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/helper/CaseAccountHelper.java @@ -9,7 +9,7 @@ import java.util.UUID; -import javax.json.JsonObject; +import jakarta.json.JsonObject; import com.jayway.jsonpath.ReadContext; import org.hamcrest.Matcher; diff --git a/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/helper/CaseApplicationHelper.java b/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/helper/CaseApplicationHelper.java index 0c1767c1a4..27ed158a8b 100644 --- a/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/helper/CaseApplicationHelper.java +++ b/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/helper/CaseApplicationHelper.java @@ -2,7 +2,7 @@ import static java.lang.String.format; import static java.util.Optional.ofNullable; -import static javax.ws.rs.core.Response.Status.ACCEPTED; +import static jakarta.ws.rs.core.Response.Status.ACCEPTED; import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static uk.gov.moj.sjp.it.util.FileUtil.getFileContentAsJson; import static uk.gov.moj.sjp.it.util.HttpClientUtil.makePostCall; @@ -10,8 +10,8 @@ import java.time.LocalDate; import java.util.UUID; -import javax.json.JsonObject; -import javax.json.JsonObjectBuilder; +import jakarta.json.JsonObject; +import jakarta.json.JsonObjectBuilder; import com.google.common.collect.ImmutableMap; diff --git a/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/helper/CaseDocumentHelper.java b/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/helper/CaseDocumentHelper.java index 6e73ed2c59..18333acc1f 100644 --- a/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/helper/CaseDocumentHelper.java +++ b/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/helper/CaseDocumentHelper.java @@ -8,7 +8,7 @@ import static java.lang.String.format; import static java.util.UUID.fromString; import static java.util.UUID.randomUUID; -import static javax.ws.rs.core.Response.Status.OK; +import static jakarta.ws.rs.core.Response.Status.OK; import static org.hamcrest.CoreMatchers.allOf; import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.CoreMatchers.hasItem; @@ -46,8 +46,8 @@ import java.time.temporal.ChronoUnit; import java.util.UUID; -import javax.json.JsonObject; -import javax.ws.rs.core.Response; +import jakarta.json.JsonObject; +import jakarta.ws.rs.core.Response; import com.jayway.jsonpath.Filter; import io.restassured.path.json.JsonPath; diff --git a/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/helper/CaseHelper.java b/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/helper/CaseHelper.java index b8e3dd213b..1d51b3428e 100644 --- a/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/helper/CaseHelper.java +++ b/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/helper/CaseHelper.java @@ -3,7 +3,7 @@ import static com.jayway.jsonpath.matchers.JsonPathMatchers.isJson; import static com.jayway.jsonpath.matchers.JsonPathMatchers.withJsonPath; import static java.lang.String.format; -import static javax.ws.rs.core.Response.Status.ACCEPTED; +import static jakarta.ws.rs.core.Response.Status.ACCEPTED; import static org.hamcrest.CoreMatchers.hasItem; import static org.hamcrest.CoreMatchers.not; import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; @@ -18,7 +18,7 @@ import java.util.UUID; -import javax.json.JsonObject; +import jakarta.json.JsonObject; import com.jayway.jsonpath.ReadContext; import org.hamcrest.Matcher; diff --git a/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/helper/CaseNoteHelper.java b/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/helper/CaseNoteHelper.java index ca957706a0..48a0ddceeb 100644 --- a/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/helper/CaseNoteHelper.java +++ b/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/helper/CaseNoteHelper.java @@ -16,9 +16,9 @@ import java.util.UUID; -import javax.json.JsonObject; -import javax.json.JsonObjectBuilder; -import javax.ws.rs.core.Response; +import jakarta.json.JsonObject; +import jakarta.json.JsonObjectBuilder; +import jakarta.ws.rs.core.Response; import com.jayway.jsonpath.ReadContext; import org.hamcrest.Matcher; diff --git a/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/helper/CaseProsecutingAuthorityHelper.java b/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/helper/CaseProsecutingAuthorityHelper.java index 3cd686a45c..d26c9b7ef7 100644 --- a/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/helper/CaseProsecutingAuthorityHelper.java +++ b/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/helper/CaseProsecutingAuthorityHelper.java @@ -4,7 +4,7 @@ import java.util.UUID; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.Response; import io.restassured.path.json.JsonPath; diff --git a/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/helper/CaseReopenedInLibraHelper.java b/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/helper/CaseReopenedInLibraHelper.java index 1fe0366b0f..5f4c551c80 100644 --- a/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/helper/CaseReopenedInLibraHelper.java +++ b/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/helper/CaseReopenedInLibraHelper.java @@ -23,8 +23,8 @@ import java.time.LocalDate; import java.util.UUID; -import javax.jms.JMSException; -import javax.jms.MessageConsumer; +import jakarta.jms.JMSException; +import jakarta.jms.MessageConsumer; import io.restassured.path.json.JsonPath; import org.slf4j.Logger; diff --git a/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/helper/CaseSearchResultHelper.java b/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/helper/CaseSearchResultHelper.java index 1f2617c7a4..69355082cb 100644 --- a/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/helper/CaseSearchResultHelper.java +++ b/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/helper/CaseSearchResultHelper.java @@ -3,7 +3,7 @@ import static com.jayway.jsonpath.matchers.JsonPathMatchers.isJson; import static com.jayway.jsonpath.matchers.JsonPathMatchers.withJsonPath; import static java.util.UUID.randomUUID; -import static javax.ws.rs.core.Response.Status.OK; +import static jakarta.ws.rs.core.Response.Status.OK; import static org.hamcrest.CoreMatchers.allOf; import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.CoreMatchers.hasItem; diff --git a/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/helper/CasesMissingSjpnHelper.java b/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/helper/CasesMissingSjpnHelper.java index f7198681f3..ebb4150eb4 100644 --- a/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/helper/CasesMissingSjpnHelper.java +++ b/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/helper/CasesMissingSjpnHelper.java @@ -8,8 +8,8 @@ import java.util.UUID; -import javax.json.JsonObject; -import javax.ws.rs.core.Response; +import jakarta.json.JsonObject; +import jakarta.ws.rs.core.Response; public class CasesMissingSjpnHelper { diff --git a/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/helper/CitizenHelper.java b/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/helper/CitizenHelper.java index e75c970ee9..39d1226abf 100644 --- a/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/helper/CitizenHelper.java +++ b/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/helper/CitizenHelper.java @@ -2,8 +2,8 @@ import static com.jayway.jsonpath.matchers.JsonPathMatchers.withJsonPath; import static com.jayway.jsonpath.matchers.JsonPathMatchers.withoutJsonPath; -import static javax.ws.rs.core.Response.Status.NOT_FOUND; -import static javax.ws.rs.core.Response.Status.OK; +import static jakarta.ws.rs.core.Response.Status.NOT_FOUND; +import static jakarta.ws.rs.core.Response.Status.OK; import static org.hamcrest.Matchers.allOf; import static org.hamcrest.Matchers.equalTo; import static uk.gov.justice.services.test.utils.core.matchers.ResponsePayloadMatcher.payload; @@ -13,7 +13,7 @@ import java.util.UUID; -import javax.json.JsonObject; +import jakarta.json.JsonObject; public class CitizenHelper { diff --git a/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/helper/DecisionHelper.java b/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/helper/DecisionHelper.java index 9c0caa2bb4..6214ff03d1 100644 --- a/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/helper/DecisionHelper.java +++ b/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/helper/DecisionHelper.java @@ -6,7 +6,7 @@ import static java.util.Arrays.asList; import static java.util.UUID.randomUUID; import static java.util.stream.Collectors.toList; -import static javax.ws.rs.core.Response.Status.ACCEPTED; +import static jakarta.ws.rs.core.Response.Status.ACCEPTED; import static org.hamcrest.CoreMatchers.not; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.allOf; @@ -93,7 +93,7 @@ import java.util.Optional; import java.util.UUID; -import javax.json.JsonObject; +import jakarta.json.JsonObject; import com.jayway.jsonpath.ReadContext; import com.jayway.jsonpath.matchers.JsonPathMatchers; diff --git a/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/helper/DeleteCaseDocumentHelper.java b/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/helper/DeleteCaseDocumentHelper.java index 04536da4b3..05cf11924c 100644 --- a/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/helper/DeleteCaseDocumentHelper.java +++ b/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/helper/DeleteCaseDocumentHelper.java @@ -12,8 +12,8 @@ import java.util.UUID; -import javax.jms.MessageConsumer; -import javax.ws.rs.core.Response; +import jakarta.jms.MessageConsumer; +import jakarta.ws.rs.core.Response; import io.restassured.path.json.JsonPath; import org.slf4j.Logger; diff --git a/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/helper/EmployerHelper.java b/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/helper/EmployerHelper.java index 19bc7710d1..6f0bda24f2 100644 --- a/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/helper/EmployerHelper.java +++ b/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/helper/EmployerHelper.java @@ -24,10 +24,10 @@ import java.util.UUID; -import javax.jms.JMSException; -import javax.jms.MessageConsumer; -import javax.json.JsonObject; -import javax.ws.rs.core.Response; +import jakarta.jms.JMSException; +import jakarta.jms.MessageConsumer; +import jakarta.json.JsonObject; +import jakarta.ws.rs.core.Response; import com.jayway.jsonpath.ReadContext; import org.hamcrest.Matcher; diff --git a/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/helper/FileServiceDBHelper.java b/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/helper/FileServiceDBHelper.java index 164cf4a34b..657bbd2b38 100644 --- a/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/helper/FileServiceDBHelper.java +++ b/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/helper/FileServiceDBHelper.java @@ -15,7 +15,7 @@ import java.time.format.DateTimeFormatter; import java.util.UUID; -import javax.json.JsonObject; +import jakarta.json.JsonObject; public class FileServiceDBHelper { diff --git a/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/helper/FinancialMeansHelper.java b/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/helper/FinancialMeansHelper.java index 5bb21bd824..ce088e8d0e 100644 --- a/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/helper/FinancialMeansHelper.java +++ b/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/helper/FinancialMeansHelper.java @@ -4,7 +4,7 @@ import static org.awaitility.Awaitility.await; import static java.lang.String.format; import static java.util.UUID.randomUUID; -import static javax.ws.rs.core.Response.Status.OK; +import static jakarta.ws.rs.core.Response.Status.OK; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.MatcherAssert.assertThat; import static org.junit.jupiter.api.Assertions.fail; @@ -24,10 +24,10 @@ import java.util.Optional; import java.util.UUID; -import javax.jms.JMSException; -import javax.jms.MessageConsumer; -import javax.json.JsonObject; -import javax.ws.rs.core.Response; +import jakarta.jms.JMSException; +import jakarta.jms.MessageConsumer; +import jakarta.json.JsonObject; +import jakarta.ws.rs.core.Response; import com.jayway.jsonpath.JsonPath; import com.jayway.jsonpath.ReadContext; diff --git a/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/helper/OffencesWithdrawalRequestHelper.java b/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/helper/OffencesWithdrawalRequestHelper.java index d27fac4fc2..04b187f0c6 100644 --- a/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/helper/OffencesWithdrawalRequestHelper.java +++ b/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/helper/OffencesWithdrawalRequestHelper.java @@ -5,7 +5,7 @@ import static com.jayway.jsonpath.matchers.JsonPathMatchers.withoutJsonPath; import static java.util.UUID.randomUUID; import static java.util.stream.Collectors.toList; -import static javax.ws.rs.core.Response.Status.OK; +import static jakarta.ws.rs.core.Response.Status.OK; import static org.hamcrest.CoreMatchers.allOf; import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.CoreMatchers.hasItem; @@ -35,11 +35,11 @@ import java.util.Map; import java.util.UUID; -import javax.jms.JMSException; -import javax.jms.MessageConsumer; -import javax.json.JsonArrayBuilder; -import javax.json.JsonObject; -import javax.ws.rs.core.Response; +import jakarta.jms.JMSException; +import jakarta.jms.MessageConsumer; +import jakarta.json.JsonArrayBuilder; +import jakarta.json.JsonObject; +import jakarta.ws.rs.core.Response; import org.hamcrest.Matcher; diff --git a/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/helper/PleadOnlineHelper.java b/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/helper/PleadOnlineHelper.java index a3e2a13325..f64543024e 100644 --- a/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/helper/PleadOnlineHelper.java +++ b/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/helper/PleadOnlineHelper.java @@ -3,7 +3,7 @@ import static com.jayway.jsonpath.matchers.JsonPathMatchers.withJsonPath; import static java.lang.String.format; import static java.util.concurrent.TimeUnit.SECONDS; -import static javax.ws.rs.core.Response.Status.OK; +import static jakarta.ws.rs.core.Response.Status.OK; import static org.awaitility.Awaitility.await; import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.MatcherAssert.assertThat; @@ -33,10 +33,10 @@ import java.util.UUID; import java.util.concurrent.TimeUnit; -import javax.jms.JMSException; -import javax.jms.MessageConsumer; -import javax.json.JsonObject; -import javax.ws.rs.core.Response; +import jakarta.jms.JMSException; +import jakarta.jms.MessageConsumer; +import jakarta.json.JsonObject; +import jakarta.ws.rs.core.Response; import com.fasterxml.jackson.databind.ObjectMapper; import io.restassured.path.json.JsonPath; diff --git a/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/helper/PressTransparencyReportHelper.java b/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/helper/PressTransparencyReportHelper.java index c9e148c65b..f388986844 100644 --- a/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/helper/PressTransparencyReportHelper.java +++ b/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/helper/PressTransparencyReportHelper.java @@ -10,8 +10,8 @@ import java.io.UncheckedIOException; import java.util.Objects; -import javax.json.JsonObject; -import javax.ws.rs.core.Response; +import jakarta.json.JsonObject; +import jakarta.ws.rs.core.Response; import org.apache.commons.io.IOUtils; diff --git a/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/helper/ReadyCaseHelper.java b/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/helper/ReadyCaseHelper.java index 38c049c7e1..01341f028a 100644 --- a/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/helper/ReadyCaseHelper.java +++ b/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/helper/ReadyCaseHelper.java @@ -23,8 +23,8 @@ import java.util.Optional; import java.util.UUID; -import javax.jms.JMSException; -import javax.jms.MessageConsumer; +import jakarta.jms.JMSException; +import jakarta.jms.MessageConsumer; public class ReadyCaseHelper implements AutoCloseable { diff --git a/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/helper/RegionsQueryApiClient.java b/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/helper/RegionsQueryApiClient.java index f454b662b3..943836ff73 100644 --- a/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/helper/RegionsQueryApiClient.java +++ b/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/helper/RegionsQueryApiClient.java @@ -6,8 +6,8 @@ import uk.gov.moj.sjp.it.util.HttpClientUtil; import uk.gov.moj.sjp.it.util.JsonHelper; -import javax.json.JsonObject; -import javax.ws.rs.core.Response; +import jakarta.json.JsonObject; +import jakarta.ws.rs.core.Response; public class RegionsQueryApiClient { diff --git a/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/helper/ReserveCaseHelper.java b/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/helper/ReserveCaseHelper.java index 07cb42b8ea..78ed76b368 100644 --- a/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/helper/ReserveCaseHelper.java +++ b/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/helper/ReserveCaseHelper.java @@ -10,8 +10,8 @@ import uk.gov.justice.services.messaging.JsonEnvelope; import uk.gov.moj.sjp.it.util.TopicUtil; -import javax.jms.JMSException; -import javax.jms.MessageConsumer; +import jakarta.jms.JMSException; +import jakarta.jms.MessageConsumer; public class ReserveCaseHelper implements AutoCloseable { diff --git a/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/helper/SessionHelper.java b/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/helper/SessionHelper.java index 60b310f7af..aa5420cecd 100644 --- a/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/helper/SessionHelper.java +++ b/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/helper/SessionHelper.java @@ -1,8 +1,8 @@ package uk.gov.moj.sjp.it.helper; import static com.jayway.jsonpath.matchers.JsonPathMatchers.withJsonPath; -import static javax.ws.rs.core.Response.Status.ACCEPTED; -import static javax.ws.rs.core.Response.Status.OK; +import static jakarta.ws.rs.core.Response.Status.ACCEPTED; +import static jakarta.ws.rs.core.Response.Status.OK; import static org.hamcrest.Matchers.allOf; import static org.hamcrest.Matchers.notNullValue; import static uk.gov.justice.services.messaging.JsonObjects.createArrayBuilder; @@ -27,7 +27,7 @@ import java.util.Optional; import java.util.UUID; -import javax.json.JsonObject; +import jakarta.json.JsonObject; import org.hamcrest.Matcher; diff --git a/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/helper/SetPleasHelper.java b/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/helper/SetPleasHelper.java index 89b6c3867a..7256ffe204 100644 --- a/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/helper/SetPleasHelper.java +++ b/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/helper/SetPleasHelper.java @@ -23,10 +23,10 @@ import java.util.Objects; import java.util.UUID; -import javax.json.JsonArrayBuilder; -import javax.json.JsonObject; -import javax.json.JsonObjectBuilder; -import javax.ws.rs.core.Response; +import jakarta.json.JsonArrayBuilder; +import jakarta.json.JsonObject; +import jakarta.json.JsonObjectBuilder; +import jakarta.ws.rs.core.Response; import com.google.common.collect.Lists; import com.jayway.jsonpath.ReadContext; diff --git a/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/helper/TransparencyReportHelper.java b/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/helper/TransparencyReportHelper.java index ca771c5f49..be2e3cb4b4 100644 --- a/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/helper/TransparencyReportHelper.java +++ b/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/helper/TransparencyReportHelper.java @@ -9,8 +9,8 @@ import java.io.InputStream; import java.io.UncheckedIOException; -import javax.json.JsonObject; -import javax.ws.rs.core.Response; +import jakarta.json.JsonObject; +import jakarta.ws.rs.core.Response; import org.apache.commons.io.IOUtils; diff --git a/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/helper/UpdateHearingRequirementsHelper.java b/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/helper/UpdateHearingRequirementsHelper.java index d625f3e483..d568ca203c 100644 --- a/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/helper/UpdateHearingRequirementsHelper.java +++ b/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/helper/UpdateHearingRequirementsHelper.java @@ -8,9 +8,9 @@ import java.util.UUID; -import javax.jms.MessageConsumer; -import javax.json.JsonObject; -import javax.json.JsonObjectBuilder; +import jakarta.jms.MessageConsumer; +import jakarta.json.JsonObject; +import jakarta.json.JsonObjectBuilder; public class UpdateHearingRequirementsHelper implements AutoCloseable { diff --git a/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/model/Defendant.java b/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/model/Defendant.java index d5c4a9d85e..d717c8cf98 100644 --- a/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/model/Defendant.java +++ b/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/model/Defendant.java @@ -1,8 +1,8 @@ package uk.gov.moj.sjp.it.model; -import javax.validation.Valid; -import javax.validation.constraints.NotNull; -import javax.validation.constraints.Size; +import jakarta.validation.Valid; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Size; import lombok.Builder; diff --git a/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/model/Offence.java b/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/model/Offence.java index 9668fc70bb..4994e85d6a 100644 --- a/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/model/Offence.java +++ b/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/model/Offence.java @@ -6,7 +6,7 @@ import java.time.LocalDate; import java.util.UUID; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotNull; import lombok.Builder; diff --git a/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/pollingquery/CasePoller.java b/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/pollingquery/CasePoller.java index 8a74511f00..9db17c8c87 100644 --- a/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/pollingquery/CasePoller.java +++ b/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/pollingquery/CasePoller.java @@ -1,9 +1,9 @@ package uk.gov.moj.sjp.it.pollingquery; import static com.jayway.jsonpath.matchers.JsonPathMatchers.withJsonPath; -import static javax.ws.rs.core.Response.Status.FORBIDDEN; -import static javax.ws.rs.core.Response.Status.INTERNAL_SERVER_ERROR; -import static javax.ws.rs.core.Response.Status.OK; +import static jakarta.ws.rs.core.Response.Status.FORBIDDEN; +import static jakarta.ws.rs.core.Response.Status.INTERNAL_SERVER_ERROR; +import static jakarta.ws.rs.core.Response.Status.OK; import static org.hamcrest.CoreMatchers.any; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.Matchers.allOf; @@ -24,7 +24,7 @@ import java.util.UUID; -import javax.json.JsonObject; +import jakarta.json.JsonObject; import com.jayway.jsonpath.ReadContext; import io.restassured.path.json.JsonPath; diff --git a/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/pollingquery/PendingDatesToAvoidPoller.java b/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/pollingquery/PendingDatesToAvoidPoller.java index f462c53286..ea38789fb2 100644 --- a/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/pollingquery/PendingDatesToAvoidPoller.java +++ b/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/pollingquery/PendingDatesToAvoidPoller.java @@ -1,6 +1,6 @@ package uk.gov.moj.sjp.it.pollingquery; -import static javax.ws.rs.core.Response.Status.OK; +import static jakarta.ws.rs.core.Response.Status.OK; import static uk.gov.justice.services.test.utils.core.http.RequestParamsBuilder.requestParams; import static uk.gov.justice.services.test.utils.core.matchers.ResponsePayloadMatcher.payload; import static uk.gov.justice.services.test.utils.core.matchers.ResponseStatusMatcher.status; diff --git a/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/producer/ReferToCourtHearingProducer.java b/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/producer/ReferToCourtHearingProducer.java index d8ba586df1..a69bffe967 100644 --- a/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/producer/ReferToCourtHearingProducer.java +++ b/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/producer/ReferToCourtHearingProducer.java @@ -7,7 +7,7 @@ import java.util.UUID; -import javax.json.JsonObject; +import jakarta.json.JsonObject; import com.google.common.collect.ImmutableMap; diff --git a/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/stub/AssignmentStub.java b/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/stub/AssignmentStub.java index f39cbe09fd..afeacd9646 100644 --- a/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/stub/AssignmentStub.java +++ b/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/stub/AssignmentStub.java @@ -6,8 +6,8 @@ import static com.github.tomakehurst.wiremock.client.WireMock.get; import static com.github.tomakehurst.wiremock.client.WireMock.stubFor; import static com.github.tomakehurst.wiremock.client.WireMock.urlPathEqualTo; -import static javax.ws.rs.core.HttpHeaders.CONTENT_TYPE; -import static javax.ws.rs.core.MediaType.APPLICATION_JSON; +import static jakarta.ws.rs.core.HttpHeaders.CONTENT_TYPE; +import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON; import static org.apache.http.HttpStatus.SC_OK; import static uk.gov.justice.services.messaging.JsonObjects.createArrayBuilder; import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; @@ -15,9 +15,9 @@ import java.util.Optional; import java.util.UUID; -import javax.json.JsonArrayBuilder; -import javax.json.JsonObject; -import javax.json.JsonObjectBuilder; +import jakarta.json.JsonArrayBuilder; +import jakarta.json.JsonObject; +import jakarta.json.JsonObjectBuilder; public class AssignmentStub { diff --git a/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/stub/DefendantOutstandingFinesStub.java b/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/stub/DefendantOutstandingFinesStub.java index f3786138c3..ee90541188 100644 --- a/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/stub/DefendantOutstandingFinesStub.java +++ b/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/stub/DefendantOutstandingFinesStub.java @@ -5,7 +5,7 @@ import static com.github.tomakehurst.wiremock.client.WireMock.stubFor; import static com.github.tomakehurst.wiremock.client.WireMock.urlPathEqualTo; import static java.util.UUID.randomUUID; -import static javax.ws.rs.core.HttpHeaders.CONTENT_TYPE; +import static jakarta.ws.rs.core.HttpHeaders.CONTENT_TYPE; import static org.apache.http.HttpStatus.SC_OK; import uk.gov.justice.services.common.http.HeaderConstants; diff --git a/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/stub/IdMapperStub.java b/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/stub/IdMapperStub.java index 70630f4f73..9484fac43e 100644 --- a/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/stub/IdMapperStub.java +++ b/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/stub/IdMapperStub.java @@ -6,14 +6,14 @@ import static com.github.tomakehurst.wiremock.client.WireMock.post; import static com.github.tomakehurst.wiremock.client.WireMock.stubFor; import static com.github.tomakehurst.wiremock.client.WireMock.urlPathMatching; -import static javax.ws.rs.core.Response.Status.OK; +import static jakarta.ws.rs.core.Response.Status.OK; import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import java.time.ZonedDateTime; import java.util.UUID; -import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.Response; import com.github.tomakehurst.wiremock.client.WireMock; diff --git a/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/stub/MaterialStub.java b/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/stub/MaterialStub.java index ad69bbcf78..16b2db827a 100644 --- a/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/stub/MaterialStub.java +++ b/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/stub/MaterialStub.java @@ -13,8 +13,8 @@ import static java.lang.String.format; import static java.util.Optional.empty; import static java.util.UUID.randomUUID; -import static javax.ws.rs.core.HttpHeaders.CONTENT_TYPE; -import static javax.ws.rs.core.MediaType.APPLICATION_JSON; +import static jakarta.ws.rs.core.HttpHeaders.CONTENT_TYPE; +import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON; import static org.apache.http.HttpStatus.SC_ACCEPTED; import static org.apache.http.HttpStatus.SC_OK; import static org.awaitility.Awaitility.await; @@ -35,7 +35,7 @@ import java.util.UUID; import java.util.concurrent.TimeUnit; -import javax.json.JsonObject; +import jakarta.json.JsonObject; import com.github.tomakehurst.wiremock.verification.LoggedRequest; diff --git a/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/stub/NotificationNotifyStub.java b/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/stub/NotificationNotifyStub.java index 1f352f8289..458fb8501c 100644 --- a/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/stub/NotificationNotifyStub.java +++ b/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/stub/NotificationNotifyStub.java @@ -8,9 +8,9 @@ import static com.github.tomakehurst.wiremock.client.WireMock.stubFor; import static com.github.tomakehurst.wiremock.client.WireMock.urlPathMatching; import static java.util.UUID.randomUUID; -import static javax.ws.rs.core.HttpHeaders.CONTENT_TYPE; -import static javax.ws.rs.core.MediaType.APPLICATION_JSON; -import static javax.ws.rs.core.Response.Status.ACCEPTED; +import static jakarta.ws.rs.core.HttpHeaders.CONTENT_TYPE; +import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON; +import static jakarta.ws.rs.core.Response.Status.ACCEPTED; import static org.awaitility.Awaitility.waitAtMost; import static org.hamcrest.Matchers.hasSize; import static uk.gov.justice.services.integrationtest.utils.jms.JmsMessageProducerClientProvider.newPublicJmsMessageProducerClientProvider; @@ -31,7 +31,7 @@ import java.util.function.Predicate; import java.util.stream.Collectors; -import javax.json.JsonObject; +import jakarta.json.JsonObject; import com.github.tomakehurst.wiremock.verification.LoggedRequest; import org.json.JSONObject; diff --git a/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/stub/ProgressionServiceStub.java b/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/stub/ProgressionServiceStub.java index 776b675323..95c8124ffb 100644 --- a/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/stub/ProgressionServiceStub.java +++ b/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/stub/ProgressionServiceStub.java @@ -9,7 +9,7 @@ import static com.github.tomakehurst.wiremock.client.WireMock.urlPathEqualTo; import static com.github.tomakehurst.wiremock.client.WireMock.urlPathMatching; import static java.util.concurrent.TimeUnit.SECONDS; -import static javax.ws.rs.core.HttpHeaders.CONTENT_TYPE; +import static jakarta.ws.rs.core.HttpHeaders.CONTENT_TYPE; import static org.apache.http.HttpStatus.SC_ACCEPTED; import static org.awaitility.Awaitility.await; import static uk.gov.moj.sjp.it.util.JsonHelper.lenientCompare; @@ -23,7 +23,7 @@ import java.time.Duration; import java.util.List; -import javax.json.JsonObject; +import jakarta.json.JsonObject; import com.github.tomakehurst.wiremock.client.WireMock; import com.github.tomakehurst.wiremock.verification.LoggedRequest; diff --git a/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/stub/ProsecutionCaseFileServiceStub.java b/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/stub/ProsecutionCaseFileServiceStub.java index 0ab0d2de41..45a07a4db0 100644 --- a/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/stub/ProsecutionCaseFileServiceStub.java +++ b/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/stub/ProsecutionCaseFileServiceStub.java @@ -7,8 +7,8 @@ import static com.github.tomakehurst.wiremock.client.WireMock.urlPathEqualTo; import static java.lang.String.format; import static java.util.UUID.randomUUID; -import static javax.ws.rs.core.HttpHeaders.CONTENT_TYPE; -import static javax.ws.rs.core.MediaType.APPLICATION_JSON; +import static jakarta.ws.rs.core.HttpHeaders.CONTENT_TYPE; +import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON; import static org.apache.http.HttpHeaders.ACCEPT; import static org.apache.http.HttpStatus.SC_OK; import static uk.gov.justice.services.common.http.HeaderConstants.ID; diff --git a/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/stub/ReferenceDataServiceStub.java b/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/stub/ReferenceDataServiceStub.java index ba7e7762c2..c29b925053 100644 --- a/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/stub/ReferenceDataServiceStub.java +++ b/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/stub/ReferenceDataServiceStub.java @@ -9,9 +9,9 @@ import static com.github.tomakehurst.wiremock.client.WireMock.urlPathMatching; import static java.lang.String.format; import static java.util.UUID.randomUUID; -import static javax.ws.rs.core.HttpHeaders.CONTENT_TYPE; -import static javax.ws.rs.core.MediaType.APPLICATION_JSON; -import static javax.ws.rs.core.Response.Status.OK; +import static jakarta.ws.rs.core.HttpHeaders.CONTENT_TYPE; +import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON; +import static jakarta.ws.rs.core.Response.Status.OK; import static org.apache.http.HttpHeaders.ACCEPT; import static org.apache.http.HttpStatus.SC_OK; import static uk.gov.justice.services.common.http.HeaderConstants.ID; @@ -36,10 +36,10 @@ import java.util.Map; import java.util.UUID; -import javax.json.JsonArray; -import javax.json.JsonArrayBuilder; -import javax.json.JsonObject; -import javax.json.JsonObjectBuilder; +import jakarta.json.JsonArray; +import jakarta.json.JsonArrayBuilder; +import jakarta.json.JsonObject; +import jakarta.json.JsonObjectBuilder; import com.github.tomakehurst.wiremock.matching.StringValuePattern; import com.google.common.collect.ImmutableMap; diff --git a/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/stub/SchedulingStub.java b/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/stub/SchedulingStub.java index 6745385859..0fa696c227 100644 --- a/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/stub/SchedulingStub.java +++ b/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/stub/SchedulingStub.java @@ -5,8 +5,8 @@ import static com.github.tomakehurst.wiremock.client.WireMock.stubFor; import static com.github.tomakehurst.wiremock.client.WireMock.urlPathEqualTo; import static java.util.UUID.randomUUID; -import static javax.ws.rs.core.HttpHeaders.CONTENT_TYPE; -import static javax.ws.rs.core.MediaType.APPLICATION_JSON; +import static jakarta.ws.rs.core.HttpHeaders.CONTENT_TYPE; +import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON; import static org.apache.http.HttpStatus.SC_ACCEPTED; import uk.gov.justice.services.common.http.HeaderConstants; diff --git a/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/stub/SysDocGeneratorStub.java b/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/stub/SysDocGeneratorStub.java index 69f9ec178c..fa5efe314d 100644 --- a/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/stub/SysDocGeneratorStub.java +++ b/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/stub/SysDocGeneratorStub.java @@ -11,7 +11,7 @@ import static java.util.UUID.randomUUID; import static java.util.concurrent.TimeUnit.SECONDS; import static java.util.stream.Collectors.toList; -import static javax.ws.rs.core.HttpHeaders.CONTENT_TYPE; +import static jakarta.ws.rs.core.HttpHeaders.CONTENT_TYPE; import static org.apache.http.HttpStatus.SC_ACCEPTED; import static org.awaitility.Awaitility.await; import static uk.gov.moj.sjp.it.util.RestPollerWithDefaults.POLL_INTERVAL; diff --git a/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/stub/SystemDocumentGeneratorStub.java b/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/stub/SystemDocumentGeneratorStub.java index f1ef469a87..39d3e2a28f 100644 --- a/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/stub/SystemDocumentGeneratorStub.java +++ b/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/stub/SystemDocumentGeneratorStub.java @@ -9,8 +9,8 @@ import static java.util.Collections.emptyList; import static java.util.concurrent.TimeUnit.SECONDS; import static java.util.stream.Collectors.toList; -import static javax.ws.rs.core.HttpHeaders.CONTENT_TYPE; -import static javax.ws.rs.core.MediaType.APPLICATION_OCTET_STREAM; +import static jakarta.ws.rs.core.HttpHeaders.CONTENT_TYPE; +import static jakarta.ws.rs.core.MediaType.APPLICATION_OCTET_STREAM; import static org.apache.http.HttpStatus.SC_OK; import static org.awaitility.Awaitility.await; import static uk.gov.moj.sjp.it.util.RestPollerWithDefaults.POLL_INTERVAL; diff --git a/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/stub/UnifiedSearchStub.java b/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/stub/UnifiedSearchStub.java index 0964a428fc..4f05b15005 100644 --- a/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/stub/UnifiedSearchStub.java +++ b/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/stub/UnifiedSearchStub.java @@ -6,8 +6,8 @@ import static com.github.tomakehurst.wiremock.client.WireMock.stubFor; import static com.github.tomakehurst.wiremock.client.WireMock.urlPathMatching; import static java.util.UUID.randomUUID; -import static javax.ws.rs.core.MediaType.APPLICATION_JSON; -import static javax.ws.rs.core.Response.Status.OK; +import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON; +import static jakarta.ws.rs.core.Response.Status.OK; import java.time.LocalDate; import java.util.Arrays; diff --git a/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/stub/UsersGroupsStub.java b/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/stub/UsersGroupsStub.java index 5a1b3de78a..e21cc8ec7a 100644 --- a/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/stub/UsersGroupsStub.java +++ b/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/stub/UsersGroupsStub.java @@ -8,8 +8,8 @@ import static com.github.tomakehurst.wiremock.client.WireMock.urlPathMatching; import static java.lang.String.format; import static java.util.Objects.nonNull; -import static javax.ws.rs.core.HttpHeaders.CONTENT_TYPE; -import static javax.ws.rs.core.MediaType.APPLICATION_JSON; +import static jakarta.ws.rs.core.HttpHeaders.CONTENT_TYPE; +import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON; import static org.apache.http.HttpStatus.SC_OK; import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static uk.gov.moj.sjp.it.util.FileUtil.getPayload; @@ -19,8 +19,8 @@ import java.util.UUID; -import javax.json.JsonObject; -import javax.json.JsonObjectBuilder; +import jakarta.json.JsonObject; +import jakarta.json.JsonObjectBuilder; public class UsersGroupsStub { diff --git a/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/test/AssignCaseIT.java b/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/test/AssignCaseIT.java index 43d5863ced..aa699e9cd6 100644 --- a/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/test/AssignCaseIT.java +++ b/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/test/AssignCaseIT.java @@ -1,8 +1,8 @@ package uk.gov.moj.sjp.it.test; import static java.util.UUID.randomUUID; -import static javax.ws.rs.core.Response.Status.ACCEPTED; -import static javax.ws.rs.core.Response.Status.FORBIDDEN; +import static jakarta.ws.rs.core.Response.Status.ACCEPTED; +import static jakarta.ws.rs.core.Response.Status.FORBIDDEN; import static uk.gov.moj.sjp.it.command.CreateCase.CreateCasePayloadBuilder.defaultCaseBuilder; import static uk.gov.moj.sjp.it.helper.AssignmentHelper.assignCaseToUser; import static uk.gov.moj.sjp.it.helper.AssignmentHelper.pollUntilCaseAssignedToUser; diff --git a/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/test/CCApplicationStatusUpdateIT.java b/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/test/CCApplicationStatusUpdateIT.java index d54c890802..525af525b4 100644 --- a/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/test/CCApplicationStatusUpdateIT.java +++ b/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/test/CCApplicationStatusUpdateIT.java @@ -45,7 +45,7 @@ import java.time.LocalDate; import java.util.UUID; -import javax.json.JsonObject; +import jakarta.json.JsonObject; import com.google.common.collect.ImmutableMap; import com.google.common.collect.Sets; diff --git a/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/test/CaseApplicationIT.java b/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/test/CaseApplicationIT.java index 6b55e23e5c..886f78f62d 100644 --- a/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/test/CaseApplicationIT.java +++ b/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/test/CaseApplicationIT.java @@ -6,7 +6,7 @@ import static java.util.Arrays.asList; import static java.util.UUID.fromString; import static java.util.UUID.randomUUID; -import static javax.ws.rs.core.Response.Status.ACCEPTED; +import static jakarta.ws.rs.core.Response.Status.ACCEPTED; import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.is; diff --git a/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/test/CaseAssignmentRestrictionIT.java b/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/test/CaseAssignmentRestrictionIT.java index 572bf620e6..55824b0b92 100644 --- a/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/test/CaseAssignmentRestrictionIT.java +++ b/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/test/CaseAssignmentRestrictionIT.java @@ -22,9 +22,9 @@ import java.util.List; import java.util.Random; -import javax.json.JsonArrayBuilder; -import javax.json.JsonObjectBuilder; -import javax.ws.rs.core.Response; +import jakarta.json.JsonArrayBuilder; +import jakarta.json.JsonObjectBuilder; +import jakarta.ws.rs.core.Response; import org.hamcrest.Matcher; import org.junit.jupiter.api.BeforeEach; diff --git a/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/test/CaseCourtExtractIT.java b/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/test/CaseCourtExtractIT.java index ad9b1e2b1b..ab2374d63f 100644 --- a/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/test/CaseCourtExtractIT.java +++ b/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/test/CaseCourtExtractIT.java @@ -10,8 +10,8 @@ import static java.util.Objects.nonNull; import static java.util.UUID.fromString; import static java.util.UUID.randomUUID; -import static javax.ws.rs.core.HttpHeaders.CONTENT_DISPOSITION; -import static javax.ws.rs.core.HttpHeaders.CONTENT_TYPE; +import static jakarta.ws.rs.core.HttpHeaders.CONTENT_DISPOSITION; +import static jakarta.ws.rs.core.HttpHeaders.CONTENT_TYPE; import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.CoreMatchers.hasItem; import static org.hamcrest.MatcherAssert.assertThat; @@ -94,8 +94,8 @@ import java.time.format.DateTimeFormatter; import java.util.UUID; -import javax.json.JsonObject; -import javax.ws.rs.core.Response; +import jakarta.json.JsonObject; +import jakarta.ws.rs.core.Response; import com.google.common.collect.ImmutableMap; import com.google.common.collect.Sets; diff --git a/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/test/CaseFinancialImpositionExportIT.java b/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/test/CaseFinancialImpositionExportIT.java index 7650c76d52..1300d66308 100644 --- a/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/test/CaseFinancialImpositionExportIT.java +++ b/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/test/CaseFinancialImpositionExportIT.java @@ -64,7 +64,7 @@ import java.util.Optional; import java.util.UUID; -import javax.json.JsonObject; +import jakarta.json.JsonObject; import com.google.common.collect.Sets; import org.junit.jupiter.api.BeforeEach; diff --git a/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/test/CaseListedInCriminalCourtsIT.java b/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/test/CaseListedInCriminalCourtsIT.java index 2ef14397b1..5f10794e29 100644 --- a/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/test/CaseListedInCriminalCourtsIT.java +++ b/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/test/CaseListedInCriminalCourtsIT.java @@ -71,7 +71,7 @@ import java.util.Optional; import java.util.UUID; -import javax.json.JsonObject; +import jakarta.json.JsonObject; import com.google.common.collect.ImmutableMap; import com.google.common.collect.Sets; diff --git a/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/test/CaseManagementStatusIT.java b/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/test/CaseManagementStatusIT.java index 1b74d769dd..579acf271c 100644 --- a/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/test/CaseManagementStatusIT.java +++ b/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/test/CaseManagementStatusIT.java @@ -3,7 +3,7 @@ import static java.time.LocalDate.now; import static java.util.UUID.randomUUID; -import static javax.ws.rs.core.Response.Status.ACCEPTED; +import static jakarta.ws.rs.core.Response.Status.ACCEPTED; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.is; import static org.junit.jupiter.api.Assertions.assertTrue; diff --git a/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/test/CaseNotesIT.java b/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/test/CaseNotesIT.java index 8a4e09d2c4..bda6f2670b 100644 --- a/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/test/CaseNotesIT.java +++ b/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/test/CaseNotesIT.java @@ -4,10 +4,10 @@ import static com.jayway.jsonpath.matchers.JsonPathMatchers.withJsonPath; import static com.jayway.jsonpath.matchers.JsonPathMatchers.withoutJsonPath; import static java.util.UUID.randomUUID; -import static javax.ws.rs.core.Response.Status.ACCEPTED; -import static javax.ws.rs.core.Response.Status.BAD_REQUEST; -import static javax.ws.rs.core.Response.Status.FORBIDDEN; -import static javax.ws.rs.core.Response.Status.OK; +import static jakarta.ws.rs.core.Response.Status.ACCEPTED; +import static jakarta.ws.rs.core.Response.Status.BAD_REQUEST; +import static jakarta.ws.rs.core.Response.Status.FORBIDDEN; +import static jakarta.ws.rs.core.Response.Status.OK; import static org.hamcrest.Matchers.allOf; import static org.hamcrest.Matchers.hasItem; import static org.hamcrest.Matchers.is; @@ -35,7 +35,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-integration-test/src/test/java/uk/gov/moj/sjp/it/test/CaseResultsIT.java b/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/test/CaseResultsIT.java index 9c88c2e4de..acb6e5f213 100644 --- a/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/test/CaseResultsIT.java +++ b/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/test/CaseResultsIT.java @@ -46,8 +46,8 @@ import java.util.Optional; import java.util.UUID; -import javax.json.JsonArray; -import javax.json.JsonObject; +import jakarta.json.JsonArray; +import jakarta.json.JsonObject; import com.google.common.collect.Sets; import org.junit.jupiter.api.BeforeEach; diff --git a/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/test/CaseUnassignmentIT.java b/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/test/CaseUnassignmentIT.java index c30271410e..27d7d02fc0 100644 --- a/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/test/CaseUnassignmentIT.java +++ b/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/test/CaseUnassignmentIT.java @@ -32,7 +32,7 @@ import java.util.Optional; import java.util.UUID; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.Response; import com.google.common.collect.Sets; import org.junit.jupiter.api.BeforeEach; diff --git a/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/test/CaseUpdateRejectedIT.java b/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/test/CaseUpdateRejectedIT.java index 2ec21b21e7..0389738d6a 100644 --- a/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/test/CaseUpdateRejectedIT.java +++ b/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/test/CaseUpdateRejectedIT.java @@ -4,7 +4,7 @@ import static java.util.UUID.randomUUID; import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.MatcherAssert.assertThat; -import static org.jgroups.util.Util.assertTrue; +import static org.junit.jupiter.api.Assertions.assertTrue; import static org.junit.jupiter.api.Assertions.fail; import static uk.gov.moj.sjp.it.command.CreateCase.CreateCasePayloadBuilder.withDefaults; import static uk.gov.moj.sjp.it.command.CreateCase.createCaseForPayloadBuilder; @@ -37,8 +37,8 @@ import java.util.Optional; import java.util.UUID; -import javax.jms.JMSException; -import javax.json.JsonObject; +import jakarta.jms.JMSException; +import jakarta.json.JsonObject; import com.google.common.collect.Sets; import org.junit.jupiter.api.BeforeEach; diff --git a/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/test/CourtReferralIT.java b/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/test/CourtReferralIT.java index 1e35bf92da..a0cff9a45f 100644 --- a/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/test/CourtReferralIT.java +++ b/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/test/CourtReferralIT.java @@ -106,8 +106,8 @@ import java.util.Optional; import java.util.UUID; -import javax.json.JsonObject; -import javax.ws.rs.core.Response; +import jakarta.json.JsonObject; +import jakarta.ws.rs.core.Response; import com.google.common.collect.ImmutableMap; import com.google.common.collect.Sets; diff --git a/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/test/CreateCaseIT.java b/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/test/CreateCaseIT.java index 4506642ee1..4cb41708de 100644 --- a/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/test/CreateCaseIT.java +++ b/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/test/CreateCaseIT.java @@ -7,7 +7,7 @@ import static java.util.UUID.randomUUID; import static java.util.concurrent.TimeUnit.SECONDS; import static java.util.stream.Collectors.toList; -import static javax.ws.rs.core.Response.Status.BAD_REQUEST; +import static jakarta.ws.rs.core.Response.Status.BAD_REQUEST; import static org.awaitility.Awaitility.await; import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.CoreMatchers.notNullValue; @@ -53,10 +53,10 @@ import java.util.Optional; import java.util.UUID; -import javax.json.JsonArray; -import javax.json.JsonObject; -import javax.json.JsonValue; -import javax.ws.rs.core.Response; +import jakarta.json.JsonArray; +import jakarta.json.JsonObject; +import jakarta.json.JsonValue; +import jakarta.ws.rs.core.Response; import com.jayway.jsonpath.matchers.JsonPathMatchers; import io.restassured.path.json.JsonPath; diff --git a/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/test/DefendantAcceptedAocpIT.java b/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/test/DefendantAcceptedAocpIT.java index f9d8d703c5..905b7a3a46 100644 --- a/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/test/DefendantAcceptedAocpIT.java +++ b/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/test/DefendantAcceptedAocpIT.java @@ -63,8 +63,8 @@ import java.util.concurrent.Callable; import java.util.concurrent.TimeUnit; -import javax.json.JsonObject; -import javax.ws.rs.core.Response; +import jakarta.json.JsonObject; +import jakarta.ws.rs.core.Response; import com.google.common.collect.Sets; import io.restassured.path.json.JsonPath; diff --git a/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/test/DefendantDetailsIT.java b/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/test/DefendantDetailsIT.java index 4e3dd5fd0b..0e058b042c 100644 --- a/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/test/DefendantDetailsIT.java +++ b/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/test/DefendantDetailsIT.java @@ -3,8 +3,8 @@ import static com.jayway.jsonpath.matchers.JsonPathMatchers.withJsonPath; import static com.jayway.jsonpath.matchers.JsonPathMatchers.withoutJsonPath; import static java.util.UUID.randomUUID; -import static javax.ws.rs.core.Response.Status.BAD_REQUEST; -import static javax.ws.rs.core.Response.Status.OK; +import static jakarta.ws.rs.core.Response.Status.BAD_REQUEST; +import static jakarta.ws.rs.core.Response.Status.OK; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.allOf; import static org.hamcrest.Matchers.containsString; @@ -46,10 +46,10 @@ import java.util.Optional; import java.util.UUID; -import javax.json.Json; -import javax.json.JsonObject; -import javax.json.JsonValue; -import javax.ws.rs.core.Response; +import jakarta.json.Json; +import jakarta.json.JsonObject; +import jakarta.json.JsonValue; +import jakarta.ws.rs.core.Response; import com.google.common.collect.ImmutableList; import com.jayway.jsonpath.ReadContext; diff --git a/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/test/DefendantOutstandingFinesIT.java b/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/test/DefendantOutstandingFinesIT.java index 7b7f18d345..9fe31cf3b4 100644 --- a/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/test/DefendantOutstandingFinesIT.java +++ b/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/test/DefendantOutstandingFinesIT.java @@ -15,13 +15,13 @@ import uk.gov.moj.sjp.it.pollingquery.CasePoller; import uk.gov.moj.sjp.it.stub.DefendantOutstandingFinesStub; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.Response; import java.util.UUID; import static com.jayway.jsonpath.matchers.JsonPathMatchers.withJsonPath; import static java.util.UUID.randomUUID; -import static javax.ws.rs.core.Response.Status.OK; +import static jakarta.ws.rs.core.Response.Status.OK; import static org.hamcrest.Matchers.allOf; import static org.hamcrest.Matchers.equalTo; import static org.junit.jupiter.api.Assertions.assertTrue; diff --git a/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/test/DefendantPendingChangesIT.java b/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/test/DefendantPendingChangesIT.java index 4bad520629..4e7afd7e0e 100644 --- a/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/test/DefendantPendingChangesIT.java +++ b/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/test/DefendantPendingChangesIT.java @@ -25,15 +25,15 @@ import java.util.UUID; import org.hamcrest.CoreMatchers; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; public class DefendantPendingChangesIT extends BaseIntegrationTest { private final UUID caseIdOne = randomUUID(); private final UUID tvlUserUid = randomUUID(); private CreateCase.CreateCasePayloadBuilder createCasePayloadBuilder; - @Before + @BeforeEach public void setUp() { createCasePayloadBuilder = withDefaults(); diff --git a/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/test/DefendantPotentialCaseIT.java b/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/test/DefendantPotentialCaseIT.java index dcc7f8fe9b..7d00469055 100644 --- a/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/test/DefendantPotentialCaseIT.java +++ b/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/test/DefendantPotentialCaseIT.java @@ -27,8 +27,8 @@ import java.util.Optional; import java.util.UUID; -import javax.json.JsonArray; -import javax.json.JsonObject; +import jakarta.json.JsonArray; +import jakarta.json.JsonObject; import com.jayway.jsonpath.matchers.JsonPathMatchers; import org.hamcrest.Matcher; diff --git a/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/test/DeleteCaseDocumentIT.java b/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/test/DeleteCaseDocumentIT.java index e4bbc63823..2b464fa1bc 100644 --- a/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/test/DeleteCaseDocumentIT.java +++ b/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/test/DeleteCaseDocumentIT.java @@ -3,7 +3,7 @@ import static com.jayway.jsonpath.matchers.JsonPathMatchers.withJsonPath; import static java.time.LocalDate.now; import static java.util.UUID.randomUUID; -import static javax.ws.rs.core.Response.Status.ACCEPTED; +import static jakarta.ws.rs.core.Response.Status.ACCEPTED; import static org.hamcrest.CoreMatchers.is; import static uk.gov.justice.json.schemas.domains.sjp.User.user; import static uk.gov.moj.cpp.sjp.domain.SessionType.MAGISTRATE; diff --git a/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/test/DeleteFinancialMeansIT.java b/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/test/DeleteFinancialMeansIT.java index ce546c19bc..46367a27d4 100644 --- a/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/test/DeleteFinancialMeansIT.java +++ b/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/test/DeleteFinancialMeansIT.java @@ -38,9 +38,9 @@ import java.util.Set; import java.util.UUID; -import javax.json.JsonObject; -import javax.json.JsonReader; -import javax.ws.rs.core.Response; +import jakarta.json.JsonObject; +import jakarta.json.JsonReader; +import jakarta.ws.rs.core.Response; import org.hamcrest.Matcher; import org.json.JSONObject; diff --git a/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/test/EmployerIT.java b/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/test/EmployerIT.java index 6948684987..52cae69148 100644 --- a/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/test/EmployerIT.java +++ b/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/test/EmployerIT.java @@ -23,7 +23,7 @@ import java.util.UUID; -import javax.json.JsonObject; +import jakarta.json.JsonObject; import org.hamcrest.Matcher; import org.junit.jupiter.api.AfterEach; diff --git a/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/test/EnforcementPendingApplicationNotificationIT.java b/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/test/EnforcementPendingApplicationNotificationIT.java index 23b78f12ab..d0db71228c 100644 --- a/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/test/EnforcementPendingApplicationNotificationIT.java +++ b/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/test/EnforcementPendingApplicationNotificationIT.java @@ -75,9 +75,9 @@ import java.util.concurrent.Callable; import java.util.concurrent.TimeUnit; -import javax.json.JsonObject; -import javax.json.JsonObjectBuilder; -import javax.ws.rs.core.Response; +import jakarta.json.JsonObject; +import jakarta.json.JsonObjectBuilder; +import jakarta.ws.rs.core.Response; import com.google.common.collect.Sets; import org.awaitility.Awaitility; diff --git a/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/test/FindCasesMissingSjpnIT.java b/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/test/FindCasesMissingSjpnIT.java index 6ca5340e5c..8feb640a16 100644 --- a/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/test/FindCasesMissingSjpnIT.java +++ b/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/test/FindCasesMissingSjpnIT.java @@ -21,8 +21,8 @@ import java.util.UUID; import java.util.stream.Stream; -import javax.json.JsonObject; -import javax.json.JsonString; +import jakarta.json.JsonObject; +import jakarta.json.JsonString; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; diff --git a/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/test/GetCaseByUrnAndPostcodeIT.java b/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/test/GetCaseByUrnAndPostcodeIT.java index a4fa8389b5..d32ecef15c 100644 --- a/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/test/GetCaseByUrnAndPostcodeIT.java +++ b/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/test/GetCaseByUrnAndPostcodeIT.java @@ -14,7 +14,7 @@ import java.util.UUID; -import javax.json.JsonObject; +import jakarta.json.JsonObject; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; diff --git a/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/test/GetCaseDocumentIT.java b/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/test/GetCaseDocumentIT.java index ce4f16cd53..6f9a93d88c 100644 --- a/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/test/GetCaseDocumentIT.java +++ b/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/test/GetCaseDocumentIT.java @@ -3,7 +3,7 @@ import static com.jayway.jsonpath.matchers.JsonPathMatchers.isJson; import static com.jayway.jsonpath.matchers.JsonPathMatchers.withJsonPath; import static java.util.UUID.randomUUID; -import static javax.ws.rs.core.HttpHeaders.CONTENT_TYPE; +import static jakarta.ws.rs.core.HttpHeaders.CONTENT_TYPE; import static org.apache.commons.lang3.RandomStringUtils.randomAlphanumeric; import static org.apache.http.HttpStatus.SC_FORBIDDEN; import static org.apache.http.HttpStatus.SC_NOT_FOUND; @@ -35,8 +35,8 @@ import java.time.ZonedDateTime; import java.util.UUID; -import javax.json.JsonObject; -import javax.ws.rs.core.Response; +import jakarta.json.JsonObject; +import jakarta.ws.rs.core.Response; import org.hamcrest.Matcher; import org.hamcrest.Matchers; diff --git a/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/test/MarkCaseAsLegalSocCheckedIT.java b/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/test/MarkCaseAsLegalSocCheckedIT.java index 0354ed9166..4eedd44f1c 100644 --- a/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/test/MarkCaseAsLegalSocCheckedIT.java +++ b/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/test/MarkCaseAsLegalSocCheckedIT.java @@ -4,7 +4,7 @@ import static java.time.LocalDate.now; import static java.util.Arrays.asList; import static java.util.UUID.randomUUID; -import static javax.ws.rs.core.Response.Status.ACCEPTED; +import static jakarta.ws.rs.core.Response.Status.ACCEPTED; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.is; import static org.hamcrest.Matchers.notNullValue; diff --git a/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/test/MultipleOffencesSaveDecisionIT.java b/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/test/MultipleOffencesSaveDecisionIT.java index 291a0780a3..ad1cf5e1c8 100644 --- a/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/test/MultipleOffencesSaveDecisionIT.java +++ b/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/test/MultipleOffencesSaveDecisionIT.java @@ -122,8 +122,8 @@ import java.util.List; import java.util.UUID; -import javax.json.JsonObject; -import javax.ws.rs.core.Response; +import jakarta.json.JsonObject; +import jakarta.ws.rs.core.Response; import com.google.common.collect.Sets; import org.junit.jupiter.api.BeforeEach; diff --git a/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/test/MultipleOffencesWithdrawalRequestedIT.java b/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/test/MultipleOffencesWithdrawalRequestedIT.java index 392985c24c..87241a2f34 100644 --- a/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/test/MultipleOffencesWithdrawalRequestedIT.java +++ b/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/test/MultipleOffencesWithdrawalRequestedIT.java @@ -75,7 +75,7 @@ import java.util.UUID; import java.util.stream.Collectors; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.Response; import com.google.common.collect.ImmutableMap; import com.google.common.collect.Sets; diff --git a/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/test/NotificationToDvlaToRemoveEndorsementsIT.java b/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/test/NotificationToDvlaToRemoveEndorsementsIT.java index f83e1d320e..4a1167e9f8 100644 --- a/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/test/NotificationToDvlaToRemoveEndorsementsIT.java +++ b/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/test/NotificationToDvlaToRemoveEndorsementsIT.java @@ -79,7 +79,7 @@ import java.util.concurrent.Callable; import java.util.concurrent.TimeUnit; -import javax.json.JsonObject; +import jakarta.json.JsonObject; import com.google.common.collect.Sets; import org.awaitility.Awaitility; diff --git a/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/test/PleadOnlineIT.java b/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/test/PleadOnlineIT.java index cbecb3e6f1..570f2de8fb 100644 --- a/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/test/PleadOnlineIT.java +++ b/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/test/PleadOnlineIT.java @@ -10,7 +10,7 @@ import static java.util.UUID.fromString; import static java.util.UUID.randomUUID; import static java.util.stream.Collectors.toList; -import static javax.ws.rs.core.Response.Status.OK; +import static jakarta.ws.rs.core.Response.Status.OK; import static org.apache.commons.lang3.RandomStringUtils.randomAlphanumeric; import static org.apache.commons.lang3.RandomUtils.nextInt; import static org.hamcrest.CoreMatchers.allOf; @@ -21,7 +21,7 @@ import static org.hamcrest.Matchers.is; import static org.hamcrest.Matchers.not; import static org.hamcrest.collection.IsEmptyCollection.empty; -import static org.junit.Assume.assumeThat; +import static org.junit.jupiter.api.Assumptions.assumeTrue; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertTrue; import static org.junit.jupiter.api.Assertions.fail; @@ -113,8 +113,8 @@ import java.util.Set; import java.util.UUID; -import javax.json.JsonObject; -import javax.ws.rs.core.Response; +import jakarta.json.JsonObject; +import jakarta.ws.rs.core.Response; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.collect.Sets; @@ -1262,7 +1262,7 @@ private void pleadOnlineAndConfirmSuccess(final PleaType pleaType, final PleadOn private void pleadOnlineAndConfirmSuccessWithPublicEvent(final PleaType pleaType, final PleadOnlineHelper pleadOnlineHelper, final CaseSearchResultHelper caseSearchResultHelper, final Collection userIds, final boolean expectToHaveFinances) { - assumeThat(userIds, not(empty())); + assumeTrue(!userIds.isEmpty()); //checks person-info before plead-online personInfoVerifier.verifyPersonInfo(); //runs plea-online @@ -1303,7 +1303,7 @@ private void pleadOnlineAndConfirmSuccessWithPublicEvent(final PleaType pleaType private void pleadOnlineAndConfirmSuccess(final PleaType pleaType, final PleadOnlineHelper pleadOnlineHelper, final CaseSearchResultHelper caseSearchResultHelper, final Collection userIds, final boolean expectToHaveFinances) { - assumeThat(userIds, not(empty())); + assumeTrue(!userIds.isEmpty()); //checks person-info before plead-online personInfoVerifier.verifyPersonInfo(); //runs plea-online @@ -1344,7 +1344,7 @@ private void pleadOnlineAndConfirmSuccess(final PleaType pleaType, final PleadOn private void pleadOnlineAndConfirmSuccessLegalEntityWithPublicEvent(final PleaType pleaType, final PleadOnlineHelper pleadOnlineHelper, final CaseSearchResultHelper caseSearchResultHelper, final Collection userIds, final boolean expectToHaveFinances) { - assumeThat(userIds, not(empty())); + assumeTrue(!userIds.isEmpty()); //checks person-info before plead-online personInfoVerifier.verifyPersonInfo(); //runs plea-online @@ -1380,7 +1380,7 @@ private void pleadOnlineAndConfirmSuccessLegalEntityWithPublicEvent(final PleaTy private void pleadOnlineAndConfirmSuccessLegalEntity(final PleaType pleaType, final PleadOnlineHelper pleadOnlineHelper, final CaseSearchResultHelper caseSearchResultHelper, final Collection userIds, final boolean expectToHaveFinances) { - assumeThat(userIds, not(empty())); + assumeTrue(!userIds.isEmpty()); //checks person-info before plead-online personInfoVerifier.verifyPersonInfo(); //runs plea-online diff --git a/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/test/PressRestrictionsSaveDecisionIT.java b/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/test/PressRestrictionsSaveDecisionIT.java index 32e646b629..fc43a583e7 100644 --- a/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/test/PressRestrictionsSaveDecisionIT.java +++ b/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/test/PressRestrictionsSaveDecisionIT.java @@ -92,7 +92,7 @@ import java.util.Optional; import java.util.UUID; -import javax.json.JsonObject; +import jakarta.json.JsonObject; import org.hamcrest.Matcher; import org.junit.jupiter.api.BeforeEach; diff --git a/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/test/PressTransparencyReportIT.java b/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/test/PressTransparencyReportIT.java index 59b2a2b408..9fc6b11e72 100644 --- a/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/test/PressTransparencyReportIT.java +++ b/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/test/PressTransparencyReportIT.java @@ -45,9 +45,9 @@ import java.util.Set; import java.util.UUID; -import javax.json.JsonArray; -import javax.json.JsonObject; -import javax.json.JsonString; +import jakarta.json.JsonArray; +import jakarta.json.JsonObject; +import jakarta.json.JsonString; import org.json.JSONObject; import org.junit.jupiter.api.AfterAll; diff --git a/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/test/ReadyCaseIT.java b/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/test/ReadyCaseIT.java index f335c71fb4..eb14e2df61 100644 --- a/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/test/ReadyCaseIT.java +++ b/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/test/ReadyCaseIT.java @@ -46,7 +46,7 @@ import java.util.List; import java.util.UUID; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.Response; import org.apache.commons.lang3.tuple.Triple; import org.junit.jupiter.api.Test; diff --git a/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/test/ReserveCaseIT.java b/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/test/ReserveCaseIT.java index 064ca07b4a..0658fa0ddc 100644 --- a/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/test/ReserveCaseIT.java +++ b/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/test/ReserveCaseIT.java @@ -5,8 +5,8 @@ import static java.time.Month.JULY; import static java.util.Collections.singletonList; import static java.util.UUID.randomUUID; -import static javax.ws.rs.core.Response.Status.ACCEPTED; -import static javax.ws.rs.core.Response.Status.OK; +import static jakarta.ws.rs.core.Response.Status.ACCEPTED; +import static jakarta.ws.rs.core.Response.Status.OK; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.allOf; import static org.hamcrest.Matchers.is; @@ -69,8 +69,8 @@ import java.util.List; import java.util.UUID; -import javax.json.JsonObject; -import javax.ws.rs.core.Response; +import jakarta.json.JsonObject; +import jakarta.ws.rs.core.Response; import com.google.common.collect.Sets; import org.hamcrest.CoreMatchers; diff --git a/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/test/ResultOrdersIT.java b/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/test/ResultOrdersIT.java index 6eca603c77..ad76d0c558 100644 --- a/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/test/ResultOrdersIT.java +++ b/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/test/ResultOrdersIT.java @@ -2,7 +2,7 @@ import static com.jayway.jsonpath.matchers.JsonPathMatchers.withJsonPath; import static java.lang.String.format; -import static javax.ws.rs.core.Response.Status.OK; +import static jakarta.ws.rs.core.Response.Status.OK; import static org.hamcrest.CoreMatchers.allOf; import static org.hamcrest.CoreMatchers.is; import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; diff --git a/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/test/SearchCasesIT.java b/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/test/SearchCasesIT.java index a20b5425f3..794fc5ddfb 100644 --- a/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/test/SearchCasesIT.java +++ b/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/test/SearchCasesIT.java @@ -3,8 +3,8 @@ import static com.jayway.jsonpath.matchers.JsonPathMatchers.isJson; import static com.jayway.jsonpath.matchers.JsonPathMatchers.withJsonPath; import static java.util.UUID.randomUUID; -import static javax.ws.rs.core.Response.Status.FORBIDDEN; -import static javax.ws.rs.core.Response.Status.OK; +import static jakarta.ws.rs.core.Response.Status.FORBIDDEN; +import static jakarta.ws.rs.core.Response.Status.OK; import static org.hamcrest.Matchers.anyOf; import static org.hamcrest.Matchers.hasItem; import static org.hamcrest.Matchers.is; diff --git a/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/test/SjpCaseCreationFailedBecauseCaseAlreadyExistedIT.java b/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/test/SjpCaseCreationFailedBecauseCaseAlreadyExistedIT.java index 2871234a64..b32fbcf851 100644 --- a/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/test/SjpCaseCreationFailedBecauseCaseAlreadyExistedIT.java +++ b/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/test/SjpCaseCreationFailedBecauseCaseAlreadyExistedIT.java @@ -11,13 +11,13 @@ import io.restassured.path.json.JsonPath; -import javax.jms.JMSException; +import jakarta.jms.JMSException; import org.junit.jupiter.api.AfterEach; import uk.gov.moj.sjp.it.command.CreateCase; import uk.gov.moj.sjp.it.model.ProsecutingAuthority; import uk.gov.moj.sjp.it.util.TopicUtil; -import javax.jms.MessageConsumer; +import jakarta.jms.MessageConsumer; import org.hamcrest.Matchers; import org.junit.jupiter.api.BeforeEach; diff --git a/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/test/SjpQueryApiRegionsIT.java b/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/test/SjpQueryApiRegionsIT.java index 1824ec1e32..d80d795a25 100644 --- a/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/test/SjpQueryApiRegionsIT.java +++ b/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/test/SjpQueryApiRegionsIT.java @@ -10,7 +10,7 @@ import uk.gov.moj.sjp.it.helper.RegionsQueryApiClient; -import javax.json.JsonObject; +import jakarta.json.JsonObject; import org.junit.jupiter.api.Test; diff --git a/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/test/TransparencyReportIT.java b/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/test/TransparencyReportIT.java index 22900113b1..5e87672a48 100644 --- a/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/test/TransparencyReportIT.java +++ b/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/test/TransparencyReportIT.java @@ -45,9 +45,9 @@ import java.util.Set; import java.util.UUID; -import javax.json.JsonArray; -import javax.json.JsonObject; -import javax.json.JsonString; +import jakarta.json.JsonArray; +import jakarta.json.JsonObject; +import jakarta.json.JsonString; import org.json.JSONObject; import org.junit.jupiter.api.AfterAll; diff --git a/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/test/UpdateAllFinancialMeanIT.java b/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/test/UpdateAllFinancialMeanIT.java index 0e2ae75d24..cc2dff4e52 100644 --- a/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/test/UpdateAllFinancialMeanIT.java +++ b/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/test/UpdateAllFinancialMeanIT.java @@ -31,7 +31,7 @@ import java.math.BigDecimal; import java.util.UUID; -import javax.json.JsonObject; +import jakarta.json.JsonObject; import org.hamcrest.Matcher; import org.junit.jupiter.api.AfterEach; diff --git a/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/test/UpdateDefendantDetailsFromCCIT.java b/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/test/UpdateDefendantDetailsFromCCIT.java index e74d11e31b..68cd72afad 100644 --- a/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/test/UpdateDefendantDetailsFromCCIT.java +++ b/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/test/UpdateDefendantDetailsFromCCIT.java @@ -24,10 +24,10 @@ import java.util.Optional; import java.util.UUID; -import javax.json.JsonObject; +import jakarta.json.JsonObject; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; public class UpdateDefendantDetailsFromCCIT extends BaseIntegrationTest { @@ -36,7 +36,7 @@ public class UpdateDefendantDetailsFromCCIT extends BaseIntegrationTest { private final UUID userId = randomUUID(); private CreateCase.CreateCasePayloadBuilder createCasePayloadBuilder; - @Before + @BeforeEach public void setUp() { createCasePayloadBuilder = withDefaults(); stubEnforcementAreaByPostcode(createCasePayloadBuilder.getDefendantBuilder().getAddressBuilder().getPostcode(), diff --git a/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/test/UpdateFinancialMeanIT.java b/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/test/UpdateFinancialMeanIT.java index 6e5411fdfb..cb6bbfa3ba 100644 --- a/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/test/UpdateFinancialMeanIT.java +++ b/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/test/UpdateFinancialMeanIT.java @@ -25,8 +25,8 @@ import java.math.BigDecimal; import java.util.UUID; -import javax.json.JsonObject; -import javax.ws.rs.core.Response; +import jakarta.json.JsonObject; +import jakarta.ws.rs.core.Response; import org.hamcrest.Matcher; import org.junit.jupiter.api.AfterEach; diff --git a/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/test/ingestor/CaseReceivedIngestorIT.java b/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/test/ingestor/CaseReceivedIngestorIT.java index ac4aeff9a0..6f9d6f79ec 100644 --- a/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/test/ingestor/CaseReceivedIngestorIT.java +++ b/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/test/ingestor/CaseReceivedIngestorIT.java @@ -21,7 +21,7 @@ import java.time.LocalDate; import java.util.UUID; -import javax.json.JsonObject; +import jakarta.json.JsonObject; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; diff --git a/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/test/ingestor/CaseStatusChangedIT.java b/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/test/ingestor/CaseStatusChangedIT.java index 198b489b50..cfd79bbf7e 100644 --- a/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/test/ingestor/CaseStatusChangedIT.java +++ b/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/test/ingestor/CaseStatusChangedIT.java @@ -24,7 +24,7 @@ import java.util.UUID; -import javax.json.JsonObject; +import jakarta.json.JsonObject; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; diff --git a/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/test/ingestor/DefendantDetailUpdatedIngestorIT.java b/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/test/ingestor/DefendantDetailUpdatedIngestorIT.java index 1d8d6ab9e2..e2b4972004 100644 --- a/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/test/ingestor/DefendantDetailUpdatedIngestorIT.java +++ b/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/test/ingestor/DefendantDetailUpdatedIngestorIT.java @@ -26,7 +26,7 @@ import java.time.LocalDate; import java.util.UUID; -import javax.json.JsonObject; +import jakarta.json.JsonObject; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; diff --git a/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/test/ingestor/DefendantDetailsMovedFromPeopleIngestorIT.java b/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/test/ingestor/DefendantDetailsMovedFromPeopleIngestorIT.java index 47b0576f5a..2a3628243c 100644 --- a/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/test/ingestor/DefendantDetailsMovedFromPeopleIngestorIT.java +++ b/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/test/ingestor/DefendantDetailsMovedFromPeopleIngestorIT.java @@ -31,8 +31,8 @@ import java.time.LocalDate; import java.util.UUID; -import javax.json.JsonArray; -import javax.json.JsonObject; +import jakarta.json.JsonArray; +import jakarta.json.JsonObject; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/test/ingestor/IndexerCatchupIT.java b/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/test/ingestor/IndexerCatchupIT.java index 8bbdd1bd08..ae4271ba3b 100644 --- a/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/test/ingestor/IndexerCatchupIT.java +++ b/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/test/ingestor/IndexerCatchupIT.java @@ -24,7 +24,7 @@ import java.io.IOException; 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-integration-test/src/test/java/uk/gov/moj/sjp/it/test/ingestor/PleaReceivedIngestorIT.java b/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/test/ingestor/PleaReceivedIngestorIT.java index ed004cc0b7..6198668065 100644 --- a/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/test/ingestor/PleaReceivedIngestorIT.java +++ b/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/test/ingestor/PleaReceivedIngestorIT.java @@ -27,7 +27,7 @@ import java.time.LocalDate; import java.util.UUID; -import javax.json.JsonObject; +import jakarta.json.JsonObject; import org.json.JSONObject; import org.junit.jupiter.api.AfterEach; diff --git a/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/test/ingestor/helper/CasePredicate.java b/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/test/ingestor/helper/CasePredicate.java index 723e4b2cf0..afd73cdd3b 100644 --- a/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/test/ingestor/helper/CasePredicate.java +++ b/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/test/ingestor/helper/CasePredicate.java @@ -7,8 +7,8 @@ import java.util.function.Predicate; -import javax.json.JsonObject; -import javax.json.JsonString; +import jakarta.json.JsonObject; +import jakarta.json.JsonString; public class CasePredicate { private CasePredicate() { diff --git a/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/test/ingestor/helper/ElasticSearchQueryHelper.java b/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/test/ingestor/helper/ElasticSearchQueryHelper.java index ee569460b9..2053afb752 100644 --- a/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/test/ingestor/helper/ElasticSearchQueryHelper.java +++ b/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/test/ingestor/helper/ElasticSearchQueryHelper.java @@ -15,7 +15,7 @@ import java.util.Optional; import java.util.function.Predicate; -import javax.json.JsonObject; +import jakarta.json.JsonObject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/test/ingestor/helper/IngesterHelper.java b/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/test/ingestor/helper/IngesterHelper.java index 930233951c..5499492670 100644 --- a/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/test/ingestor/helper/IngesterHelper.java +++ b/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/test/ingestor/helper/IngesterHelper.java @@ -11,8 +11,8 @@ import java.io.StringReader; import java.util.Random; -import javax.json.JsonObject; -import javax.json.JsonReader; +import jakarta.json.JsonObject; +import jakarta.json.JsonReader; public class IngesterHelper { diff --git a/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/util/ActivitiHelper.java b/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/util/ActivitiHelper.java index 17fe501c40..3f23d94721 100644 --- a/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/util/ActivitiHelper.java +++ b/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/util/ActivitiHelper.java @@ -2,7 +2,7 @@ import static java.util.Optional.empty; import static java.util.concurrent.TimeUnit.SECONDS; -import static javax.ws.rs.core.MediaType.APPLICATION_JSON; +import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON; import static org.awaitility.Awaitility.await; import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.Matchers.not; @@ -22,12 +22,12 @@ import java.util.UUID; import java.util.stream.IntStream; -import javax.json.JsonObject; -import javax.ws.rs.client.Entity; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.MultivaluedHashMap; -import javax.ws.rs.core.MultivaluedMap; -import javax.ws.rs.core.Response; +import jakarta.json.JsonObject; +import jakarta.ws.rs.client.Entity; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MultivaluedHashMap; +import jakarta.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.core.Response; import io.restassured.path.json.JsonPath; diff --git a/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/util/CaseAssignmentRestrictionHelper.java b/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/util/CaseAssignmentRestrictionHelper.java index 19a8f606f6..d73100f2a3 100644 --- a/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/util/CaseAssignmentRestrictionHelper.java +++ b/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/util/CaseAssignmentRestrictionHelper.java @@ -30,10 +30,10 @@ import java.util.List; import java.util.Set; -import javax.json.JsonArrayBuilder; -import javax.json.JsonObject; -import javax.json.JsonObjectBuilder; -import javax.ws.rs.core.Response; +import jakarta.json.JsonArrayBuilder; +import jakarta.json.JsonObject; +import jakarta.json.JsonObjectBuilder; +import jakarta.ws.rs.core.Response; import org.hamcrest.Matcher; diff --git a/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/util/FileUtil.java b/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/util/FileUtil.java index 8b1019fe94..962f709367 100644 --- a/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/util/FileUtil.java +++ b/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/util/FileUtil.java @@ -9,7 +9,7 @@ import java.io.InputStream; import java.util.Map; -import javax.json.JsonObject; +import jakarta.json.JsonObject; import org.apache.commons.io.IOUtils; import org.apache.commons.lang3.text.StrSubstitutor; diff --git a/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/util/HttpClientUtil.java b/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/util/HttpClientUtil.java index 72463dfbd6..77cb746f91 100644 --- a/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/util/HttpClientUtil.java +++ b/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/util/HttpClientUtil.java @@ -15,13 +15,13 @@ import java.io.File; import java.util.UUID; -import javax.ws.rs.client.Entity; -import javax.ws.rs.core.GenericEntity; -import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.MultivaluedHashMap; -import javax.ws.rs.core.MultivaluedMap; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.client.Entity; +import jakarta.ws.rs.core.GenericEntity; +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MultivaluedHashMap; +import jakarta.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.core.Response; import org.jboss.resteasy.plugins.providers.multipart.MultipartFormDataOutput; import org.slf4j.Logger; diff --git a/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/util/JsonHelper.java b/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/util/JsonHelper.java index 05c9611d34..8f8447b55f 100644 --- a/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/util/JsonHelper.java +++ b/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/util/JsonHelper.java @@ -14,8 +14,8 @@ import java.io.UncheckedIOException; import java.util.List; -import javax.json.JsonObject; -import javax.json.JsonReader; +import jakarta.json.JsonObject; +import jakarta.json.JsonReader; import org.apache.commons.collections.CollectionUtils; import org.json.JSONObject; diff --git a/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/util/QueueUtil.java b/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/util/QueueUtil.java index a6a8c0a2bb..bf6e79d13c 100644 --- a/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/util/QueueUtil.java +++ b/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/util/QueueUtil.java @@ -1,15 +1,15 @@ package uk.gov.moj.sjp.it.util; -import static javax.jms.Session.AUTO_ACKNOWLEDGE; +import static jakarta.jms.Session.AUTO_ACKNOWLEDGE; import static uk.gov.justice.services.test.utils.core.messaging.QueueUriProvider.queueUri; import uk.gov.justice.services.messaging.JsonEnvelope; -import javax.jms.Connection; -import javax.jms.JMSException; -import javax.jms.MessageProducer; -import javax.jms.Session; -import javax.jms.TextMessage; +import jakarta.jms.Connection; +import jakarta.jms.JMSException; +import jakarta.jms.MessageProducer; +import jakarta.jms.Session; +import jakarta.jms.TextMessage; import org.apache.activemq.artemis.jms.client.ActiveMQConnectionFactory; diff --git a/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/util/RestPollerWithDefaults.java b/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/util/RestPollerWithDefaults.java index 2db5a6fa57..e05e0cedc9 100644 --- a/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/util/RestPollerWithDefaults.java +++ b/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/util/RestPollerWithDefaults.java @@ -3,10 +3,10 @@ import static java.util.concurrent.TimeUnit.MILLISECONDS; import static java.util.concurrent.TimeUnit.SECONDS; -import static javax.ws.rs.core.Response.Status.FORBIDDEN; -import static javax.ws.rs.core.Response.Status.INTERNAL_SERVER_ERROR; -import static javax.ws.rs.core.Response.Status.NOT_FOUND; -import static javax.ws.rs.core.Response.Status.OK; +import static jakarta.ws.rs.core.Response.Status.FORBIDDEN; +import static jakarta.ws.rs.core.Response.Status.INTERNAL_SERVER_ERROR; +import static jakarta.ws.rs.core.Response.Status.NOT_FOUND; +import static jakarta.ws.rs.core.Response.Status.OK; import static org.hamcrest.Matchers.allOf; import static org.hamcrest.Matchers.anyOf; import static org.junit.jupiter.api.Assertions.fail; @@ -20,7 +20,7 @@ import uk.gov.justice.services.test.utils.core.http.ResponseData; import uk.gov.justice.services.test.utils.core.http.RestPoller; -import javax.json.JsonObject; +import jakarta.json.JsonObject; import com.jayway.jsonpath.ReadContext; import org.hamcrest.Matcher; diff --git a/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/util/SysDocGeneratorHelper.java b/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/util/SysDocGeneratorHelper.java index 506f00a05e..ad3334544a 100644 --- a/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/util/SysDocGeneratorHelper.java +++ b/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/util/SysDocGeneratorHelper.java @@ -10,7 +10,7 @@ import java.time.format.DateTimeFormatter; import java.util.UUID; -import javax.json.JsonObject; +import jakarta.json.JsonObject; public class SysDocGeneratorHelper { diff --git a/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/util/TopicUtil.java b/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/util/TopicUtil.java index c64eb80200..2ce6368fc1 100644 --- a/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/util/TopicUtil.java +++ b/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/util/TopicUtil.java @@ -16,13 +16,13 @@ import java.util.Optional; import java.util.function.Function; -import javax.jms.Connection; -import javax.jms.JMSException; -import javax.jms.MessageConsumer; -import javax.jms.Session; -import javax.jms.TextMessage; -import javax.jms.Topic; -import javax.json.JsonObject; +import jakarta.jms.Connection; +import jakarta.jms.JMSException; +import jakarta.jms.MessageConsumer; +import jakarta.jms.Session; +import jakarta.jms.TextMessage; +import jakarta.jms.Topic; +import jakarta.json.JsonObject; import io.restassured.path.json.JsonPath; import org.apache.activemq.artemis.jms.client.ActiveMQConnectionFactory; @@ -42,6 +42,8 @@ public class TopicUtil implements AutoCloseable { private static final long RETRIEVE_TIMEOUT = 20000; private static final long MESSAGE_RETRIEVE_TRIAL_TIMEOUT = 10000; + private final String topicName; + private Connection connection; private Session session; @@ -53,9 +55,19 @@ public class TopicUtil implements AutoCloseable { public static final TopicUtil publicEvents = new TopicUtil(PUBLIC_ACTIVE_MQ_TOPIC); private TopicUtil(final String topicName) { + this.topicName = topicName; + connect(); + } + + private synchronized void connect() { try { LOGGER.info("Artemis URI: {}", QUEUE_URI); - ActiveMQConnectionFactory factory = new ActiveMQConnectionFactory(QUEUE_URI); + final ActiveMQConnectionFactory factory = new ActiveMQConnectionFactory(QUEUE_URI); + // Artemis 2.54 closes idle client connections, which would silently kill this shared + // static consumer connection part-way through a multi-test run and make events appear + // "not present". Disable the idle timeout so the connection stays alive end-to-end. + factory.setConnectionTTL(-1); + factory.setClientFailureCheckPeriod(-1); connection = factory.createConnection(); connection.start(); session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE); @@ -67,10 +79,17 @@ private TopicUtil(final String topicName) { } public MessageConsumer createConsumer(final String eventSelector) { + final String selector = String.format(EVENT_SELECTOR_TEMPLATE, eventSelector); try { - return session.createConsumer(topic, String.format(EVENT_SELECTOR_TEMPLATE, eventSelector)); + return session.createConsumer(topic, selector); } catch (JMSException e) { - throw new RuntimeException(e); + LOGGER.warn("Consumer creation failed; reconnecting to Artemis and retrying once", e); + connect(); + try { + return session.createConsumer(topic, selector); + } catch (JMSException retry) { + throw new RuntimeException(retry); + } } } @@ -84,7 +103,13 @@ public MessageConsumer createConsumerForMultipleSelectors(final String... eventS try { return session.createConsumer(topic, eventSelectorsExpression); } catch (JMSException e) { - throw new RuntimeException(e); + LOGGER.warn("Consumer creation failed; reconnecting to Artemis and retrying once", e); + connect(); + try { + return session.createConsumer(topic, eventSelectorsExpression); + } catch (JMSException retry) { + throw new RuntimeException(retry); + } } } diff --git a/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/util/commandclient/CommandClient.java b/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/util/commandclient/CommandClient.java index e15596e9fb..818e002627 100644 --- a/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/util/commandclient/CommandClient.java +++ b/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/util/commandclient/CommandClient.java @@ -5,7 +5,7 @@ import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import javax.ws.rs.HttpMethod; +import jakarta.ws.rs.HttpMethod; @Target(ElementType.TYPE) @Retention(RetentionPolicy.RUNTIME) diff --git a/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/util/commandclient/CommandExecutor.java b/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/util/commandclient/CommandExecutor.java index fc25e42928..46bb610cdb 100644 --- a/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/util/commandclient/CommandExecutor.java +++ b/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/util/commandclient/CommandExecutor.java @@ -27,15 +27,15 @@ import java.util.function.Function; import java.util.stream.Collectors; -import javax.jms.ConnectionFactory; -import javax.jms.JMSContext; -import javax.validation.ConstraintViolation; -import javax.validation.Validation; -import javax.validation.ValidatorFactory; -import javax.ws.rs.HttpMethod; -import javax.ws.rs.core.MultivaluedHashMap; -import javax.ws.rs.core.MultivaluedMap; -import javax.ws.rs.core.Response; +import jakarta.jms.ConnectionFactory; +import jakarta.jms.JMSContext; +import jakarta.validation.ConstraintViolation; +import jakarta.validation.Validation; +import jakarta.validation.ValidatorFactory; +import jakarta.ws.rs.HttpMethod; +import jakarta.ws.rs.core.MultivaluedHashMap; +import jakarta.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.core.Response; import com.damnhandy.uri.template.UriTemplate; import com.fasterxml.jackson.annotation.JsonAutoDetect; diff --git a/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/util/commandclient/EventListener.java b/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/util/commandclient/EventListener.java index 3a7519b4c4..edc7e59d71 100644 --- a/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/util/commandclient/EventListener.java +++ b/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/util/commandclient/EventListener.java @@ -13,9 +13,9 @@ import java.util.concurrent.Executors; import java.util.function.Consumer; -import javax.jms.JMSConsumer; -import javax.jms.JMSContext; -import javax.jms.JMSException; +import jakarta.jms.JMSConsumer; +import jakarta.jms.JMSContext; +import jakarta.jms.JMSException; import lombok.Getter; import lombok.Setter; diff --git a/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/verifier/PersonInfoVerifier.java b/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/verifier/PersonInfoVerifier.java index 6419edfc7c..ebbd11a00b 100644 --- a/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/verifier/PersonInfoVerifier.java +++ b/sjp-integration-test/src/test/java/uk/gov/moj/sjp/it/verifier/PersonInfoVerifier.java @@ -1,7 +1,7 @@ package uk.gov.moj.sjp.it.verifier; import static com.jayway.jsonpath.matchers.JsonPathMatchers.withJsonPath; -import static javax.ws.rs.core.Response.Status.OK; +import static jakarta.ws.rs.core.Response.Status.OK; import static org.hamcrest.CoreMatchers.allOf; import static org.hamcrest.CoreMatchers.equalTo; import static uk.gov.justice.services.test.utils.core.matchers.ResponsePayloadMatcher.payload; diff --git a/sjp-json/pom.xml b/sjp-json/pom.xml index b23fcb07e9..417bc42145 100644 --- a/sjp-json/pom.xml +++ b/sjp-json/pom.xml @@ -2,7 +2,7 @@ sjp-parent uk.gov.moj.cpp.sjp - 17.104.193-SNAPSHOT + 25.104.0-M1-SNAPSHOT 4.0.0 diff --git a/sjp-query/pom.xml b/sjp-query/pom.xml index 1ebd70c6ec..f0fdf950fd 100644 --- a/sjp-query/pom.xml +++ b/sjp-query/pom.xml @@ -3,7 +3,7 @@ sjp-parent uk.gov.moj.cpp.sjp - 17.104.193-SNAPSHOT + 25.104.0-M1-SNAPSHOT 4.0.0 diff --git a/sjp-query/sjp-query-api/pom.xml b/sjp-query/sjp-query-api/pom.xml index be2cdc2a25..c5832ce6cd 100644 --- a/sjp-query/sjp-query-api/pom.xml +++ b/sjp-query/sjp-query-api/pom.xml @@ -3,7 +3,7 @@ sjp-query uk.gov.moj.cpp.sjp - 17.104.193-SNAPSHOT + 25.104.0-M1-SNAPSHOT 4.0.0 @@ -21,10 +21,15 @@ rest-client-generator-plugin - javax - javaee-api + jakarta.platform + jakarta.jakartaee-api ${javaee-api.version} + + jakarta.xml.bind + jakarta.xml.bind-api + ${jakarta.xml.bind-api.raml.version} + uk.gov.moj.cpp.sjp sjp-query-view @@ -90,19 +95,8 @@ ${project.version} - uk.gov.moj.cpp.material - material-client - ${material.version} - - - uk.gov.justice.services - test-utils-core - - - - - javax - javaee-api + jakarta.platform + jakarta.jakartaee-api provided diff --git a/sjp-query/sjp-query-api/src/main/java/uk/gov/justice/api/resource/DefaultQueryApiCasesCaseIdDocumentsCourtExtractResource.java b/sjp-query/sjp-query-api/src/main/java/uk/gov/justice/api/resource/DefaultQueryApiCasesCaseIdDocumentsCourtExtractResource.java index a74401a4c4..706bd6d320 100644 --- a/sjp-query/sjp-query-api/src/main/java/uk/gov/justice/api/resource/DefaultQueryApiCasesCaseIdDocumentsCourtExtractResource.java +++ b/sjp-query/sjp-query-api/src/main/java/uk/gov/justice/api/resource/DefaultQueryApiCasesCaseIdDocumentsCourtExtractResource.java @@ -1,11 +1,11 @@ package uk.gov.justice.api.resource; import static java.util.UUID.randomUUID; -import static javax.ws.rs.core.HttpHeaders.CONTENT_TYPE; -import static javax.ws.rs.core.Response.Status.INTERNAL_SERVER_ERROR; -import static javax.ws.rs.core.Response.Status.NOT_FOUND; -import static javax.ws.rs.core.Response.Status.OK; -import static javax.ws.rs.core.Response.status; +import static jakarta.ws.rs.core.HttpHeaders.CONTENT_TYPE; +import static jakarta.ws.rs.core.Response.Status.INTERNAL_SERVER_ERROR; +import static jakarta.ws.rs.core.Response.Status.NOT_FOUND; +import static jakarta.ws.rs.core.Response.Status.OK; +import static jakarta.ws.rs.core.Response.status; import static org.slf4j.LoggerFactory.getLogger; import static uk.gov.justice.services.core.annotation.Component.QUERY_API; import static uk.gov.justice.services.core.interceptor.InterceptorContext.interceptorContextWithInput; @@ -24,11 +24,11 @@ import java.util.Optional; import java.util.UUID; -import javax.ejb.Stateless; -import javax.inject.Inject; -import javax.json.JsonObject; -import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.Response; +import jakarta.ejb.Stateless; +import jakarta.inject.Inject; +import jakarta.json.JsonObject; +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.Response; import org.slf4j.Logger; diff --git a/sjp-query/sjp-query-api/src/main/java/uk/gov/justice/api/resource/DefaultQueryApiCasesCaseIdDocumentsDocumentIdContentResource.java b/sjp-query/sjp-query-api/src/main/java/uk/gov/justice/api/resource/DefaultQueryApiCasesCaseIdDocumentsDocumentIdContentResource.java index 2fec7bb1bc..7585c21e9c 100644 --- a/sjp-query/sjp-query-api/src/main/java/uk/gov/justice/api/resource/DefaultQueryApiCasesCaseIdDocumentsDocumentIdContentResource.java +++ b/sjp-query/sjp-query-api/src/main/java/uk/gov/justice/api/resource/DefaultQueryApiCasesCaseIdDocumentsDocumentIdContentResource.java @@ -2,11 +2,11 @@ package uk.gov.justice.api.resource; import static java.util.UUID.randomUUID; -import static javax.ws.rs.core.HttpHeaders.CONTENT_TYPE; -import static javax.ws.rs.core.Response.Status.NOT_FOUND; -import static javax.ws.rs.core.Response.Status.OK; -import static javax.ws.rs.core.Response.Status.fromStatusCode; -import static javax.ws.rs.core.Response.status; +import static jakarta.ws.rs.core.HttpHeaders.CONTENT_TYPE; +import static jakarta.ws.rs.core.Response.Status.NOT_FOUND; +import static jakarta.ws.rs.core.Response.Status.OK; +import static jakarta.ws.rs.core.Response.Status.fromStatusCode; +import static jakarta.ws.rs.core.Response.status; import static uk.gov.justice.services.core.interceptor.InterceptorContext.interceptorContextWithInput; import static uk.gov.justice.services.messaging.JsonEnvelope.envelopeFrom; import static uk.gov.justice.services.messaging.JsonEnvelope.metadataBuilder; @@ -16,17 +16,17 @@ import uk.gov.justice.services.core.annotation.Component; import uk.gov.justice.services.core.interceptor.InterceptorChainProcessor; import uk.gov.justice.services.messaging.JsonEnvelope; -import uk.gov.moj.cpp.material.client.MaterialClient; +import uk.gov.moj.cpp.sjp.material.client.MaterialClient; import uk.gov.moj.cpp.systemusers.ServiceContextSystemUserProvider; import java.util.UUID; -import javax.ejb.Stateless; -import javax.inject.Inject; -import javax.json.JsonObject; -import javax.json.JsonValue; -import javax.ws.rs.WebApplicationException; -import javax.ws.rs.core.Response; +import jakarta.ejb.Stateless; +import jakarta.inject.Inject; +import jakarta.json.JsonObject; +import jakarta.json.JsonValue; +import jakarta.ws.rs.WebApplicationException; +import jakarta.ws.rs.core.Response; /** * http endpoint adapter which overrides default framework adapter. It handles transfer of files diff --git a/sjp-query/sjp-query-api/src/main/java/uk/gov/justice/api/resource/DefaultQueryApiPressTransparencyReportContentFileIdResource.java b/sjp-query/sjp-query-api/src/main/java/uk/gov/justice/api/resource/DefaultQueryApiPressTransparencyReportContentFileIdResource.java index 7f329bbe05..bc3e72d991 100644 --- a/sjp-query/sjp-query-api/src/main/java/uk/gov/justice/api/resource/DefaultQueryApiPressTransparencyReportContentFileIdResource.java +++ b/sjp-query/sjp-query-api/src/main/java/uk/gov/justice/api/resource/DefaultQueryApiPressTransparencyReportContentFileIdResource.java @@ -14,10 +14,10 @@ import java.util.UUID; -import javax.inject.Inject; -import javax.ws.rs.core.Context; -import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.Response; +import jakarta.inject.Inject; +import jakarta.ws.rs.core.Context; +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.Response; @Adapter(Component.QUERY_API) public class DefaultQueryApiPressTransparencyReportContentFileIdResource implements QueryApiPressTransparencyReportContentFileIdResource { diff --git a/sjp-query/sjp-query-api/src/main/java/uk/gov/justice/api/resource/DefaultQueryApiTransparencyReportContentFileIdResource.java b/sjp-query/sjp-query-api/src/main/java/uk/gov/justice/api/resource/DefaultQueryApiTransparencyReportContentFileIdResource.java index 8ea7be9a6e..6891a8e801 100644 --- a/sjp-query/sjp-query-api/src/main/java/uk/gov/justice/api/resource/DefaultQueryApiTransparencyReportContentFileIdResource.java +++ b/sjp-query/sjp-query-api/src/main/java/uk/gov/justice/api/resource/DefaultQueryApiTransparencyReportContentFileIdResource.java @@ -14,9 +14,9 @@ import java.util.UUID; -import javax.ejb.Stateless; -import javax.inject.Inject; -import javax.ws.rs.core.Response; +import jakarta.ejb.Stateless; +import jakarta.inject.Inject; +import jakarta.ws.rs.core.Response; @SuppressWarnings({"squid:S00112"}) @Stateless diff --git a/sjp-query/sjp-query-api/src/main/java/uk/gov/justice/api/resource/QueryApiCasesCaseIdDocumentsCourtExtractResource.java b/sjp-query/sjp-query-api/src/main/java/uk/gov/justice/api/resource/QueryApiCasesCaseIdDocumentsCourtExtractResource.java index ff9f372e87..a8224023fa 100644 --- a/sjp-query/sjp-query-api/src/main/java/uk/gov/justice/api/resource/QueryApiCasesCaseIdDocumentsCourtExtractResource.java +++ b/sjp-query/sjp-query-api/src/main/java/uk/gov/justice/api/resource/QueryApiCasesCaseIdDocumentsCourtExtractResource.java @@ -4,12 +4,12 @@ import java.util.UUID; -import javax.ws.rs.GET; -import javax.ws.rs.HeaderParam; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.HeaderParam; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.Response; @Path("cases/{caseId}/documents/court-extract") public interface QueryApiCasesCaseIdDocumentsCourtExtractResource { diff --git a/sjp-query/sjp-query-api/src/main/java/uk/gov/justice/api/resource/QueryApiCasesCaseIdDocumentsDocumentIdContentResource.java b/sjp-query/sjp-query-api/src/main/java/uk/gov/justice/api/resource/QueryApiCasesCaseIdDocumentsDocumentIdContentResource.java index 63cdc6888e..923196d536 100644 --- a/sjp-query/sjp-query-api/src/main/java/uk/gov/justice/api/resource/QueryApiCasesCaseIdDocumentsDocumentIdContentResource.java +++ b/sjp-query/sjp-query-api/src/main/java/uk/gov/justice/api/resource/QueryApiCasesCaseIdDocumentsDocumentIdContentResource.java @@ -5,12 +5,12 @@ import java.util.UUID; -import javax.ws.rs.GET; -import javax.ws.rs.HeaderParam; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.HeaderParam; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.Response; @Path("cases/{caseId}/documents/{documentId}/content") public interface QueryApiCasesCaseIdDocumentsDocumentIdContentResource { diff --git a/sjp-query/sjp-query-api/src/main/java/uk/gov/justice/api/resource/QueryApiPressTransparencyReportContentFileIdResource.java b/sjp-query/sjp-query-api/src/main/java/uk/gov/justice/api/resource/QueryApiPressTransparencyReportContentFileIdResource.java index 052a56aa73..c5332341b9 100644 --- a/sjp-query/sjp-query-api/src/main/java/uk/gov/justice/api/resource/QueryApiPressTransparencyReportContentFileIdResource.java +++ b/sjp-query/sjp-query-api/src/main/java/uk/gov/justice/api/resource/QueryApiPressTransparencyReportContentFileIdResource.java @@ -4,12 +4,12 @@ import java.util.UUID; -import javax.ws.rs.GET; -import javax.ws.rs.HeaderParam; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.HeaderParam; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.Response; @Path("press-transparency-report/content/{fileId}") public interface QueryApiPressTransparencyReportContentFileIdResource { diff --git a/sjp-query/sjp-query-api/src/main/java/uk/gov/justice/api/resource/QueryApiTransparencyReportContentFileIdResource.java b/sjp-query/sjp-query-api/src/main/java/uk/gov/justice/api/resource/QueryApiTransparencyReportContentFileIdResource.java index d00c2cfbde..c6aed8d97d 100644 --- a/sjp-query/sjp-query-api/src/main/java/uk/gov/justice/api/resource/QueryApiTransparencyReportContentFileIdResource.java +++ b/sjp-query/sjp-query-api/src/main/java/uk/gov/justice/api/resource/QueryApiTransparencyReportContentFileIdResource.java @@ -4,12 +4,12 @@ import java.util.UUID; -import javax.ws.rs.GET; -import javax.ws.rs.HeaderParam; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.HeaderParam; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.Response; @Path("transparency-report/content/{fileId}") diff --git a/sjp-query/sjp-query-api/src/main/java/uk/gov/justice/api/resource/ResourceUtility.java b/sjp-query/sjp-query-api/src/main/java/uk/gov/justice/api/resource/ResourceUtility.java index c696777171..a70e7e3c2c 100644 --- a/sjp-query/sjp-query-api/src/main/java/uk/gov/justice/api/resource/ResourceUtility.java +++ b/sjp-query/sjp-query-api/src/main/java/uk/gov/justice/api/resource/ResourceUtility.java @@ -1,9 +1,9 @@ package uk.gov.justice.api.resource; -import static javax.ws.rs.core.HttpHeaders.CONTENT_DISPOSITION; -import static javax.ws.rs.core.HttpHeaders.CONTENT_TYPE; -import static javax.ws.rs.core.Response.Status.OK; -import static javax.ws.rs.core.Response.status; +import static jakarta.ws.rs.core.HttpHeaders.CONTENT_DISPOSITION; +import static jakarta.ws.rs.core.HttpHeaders.CONTENT_TYPE; +import static jakarta.ws.rs.core.Response.Status.OK; +import static jakarta.ws.rs.core.Response.status; import static uk.gov.justice.api.resource.DefaultQueryApiTransparencyReportContentFileIdResource.PDF_CONTENT_TYPE; import uk.gov.justice.services.fileservice.api.FileRetriever; @@ -15,7 +15,7 @@ import java.util.Optional; import java.util.UUID; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.Response; public class ResourceUtility { diff --git a/sjp-query/sjp-query-api/src/main/java/uk/gov/moj/cpp/sjp/material/client/MaterialClient.java b/sjp-query/sjp-query-api/src/main/java/uk/gov/moj/cpp/sjp/material/client/MaterialClient.java new file mode 100644 index 0000000000..d275b5c314 --- /dev/null +++ b/sjp-query/sjp-query-api/src/main/java/uk/gov/moj/cpp/sjp/material/client/MaterialClient.java @@ -0,0 +1,62 @@ +package uk.gov.moj.cpp.sjp.material.client; + +import static jakarta.ws.rs.client.ClientBuilder.newClient; +import static uk.gov.justice.services.common.http.HeaderConstants.USER_ID; + +import java.util.UUID; + +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; +import jakarta.ws.rs.client.Client; +import jakarta.ws.rs.client.Invocation; +import jakarta.ws.rs.core.Response; + +import org.slf4j.Logger; + +/** + * SJP-owned copy of material's HTTP adapter (decouples sjp from the material-client JAR - PEG-3447). + * Trimmed to the single method sjp uses; runtime behaviour is unchanged - sjp still calls material + * over HTTP exactly as before. + */ +@ApplicationScoped +public class MaterialClient { + + public static final String REQUEST_PARAM_ADD_INLINE_CONTENT_DISPOSITION_HEADER = "addInlineContentDispositionHeader"; + + @Inject + Logger logger; + + private static final String BASE_URI = "http://localhost:8080/material-query-api/query/api/rest/material"; + private static final String MATERIAL_REQUEST_PATH = "/material/"; + private static final String GET_MATERIAL_AS_PDF = "application/vnd.material.query.material+json"; + private static final String REQUEST_PARAM_STREAM = "stream"; + private static final String REQUEST_PARAM_REQUEST_PDF = "requestPdf"; + + public Response getMaterialWithHeader(final UUID materialId, final UUID userId) { + return getMaterial(materialId.toString(), userId.toString(), true, false, true); + } + + private Response getMaterial(final String materialId, final String userId, final boolean asStream, final boolean asPdf, final boolean addInlineContentDispositionHeader) { + + final Invocation.Builder builder = getClient() + .target(BASE_URI) + .path(MATERIAL_REQUEST_PATH + materialId) + .queryParam(REQUEST_PARAM_STREAM, asStream) + .queryParam(REQUEST_PARAM_REQUEST_PDF, asPdf) + .queryParam(REQUEST_PARAM_ADD_INLINE_CONTENT_DISPOSITION_HEADER, addInlineContentDispositionHeader) + .request() + .header(USER_ID, userId) + .accept(GET_MATERIAL_AS_PDF); + + logger.info("Invoking call to material context"); + return builder.get(); + } + + /** + * Returns the JAX-RS client. Extracted so the client can be mocked in unit tests, since the + * static {@code newClient()} call is otherwise hard to stub. + */ + Client getClient() { + return newClient(); + } +} diff --git a/sjp-query/sjp-query-api/src/main/java/uk/gov/moj/cpp/sjp/query/api/CaseAssignmentRestrictionApi.java b/sjp-query/sjp-query-api/src/main/java/uk/gov/moj/cpp/sjp/query/api/CaseAssignmentRestrictionApi.java index c378f95e96..586f924e45 100644 --- a/sjp-query/sjp-query-api/src/main/java/uk/gov/moj/cpp/sjp/query/api/CaseAssignmentRestrictionApi.java +++ b/sjp-query/sjp-query-api/src/main/java/uk/gov/moj/cpp/sjp/query/api/CaseAssignmentRestrictionApi.java @@ -6,7 +6,7 @@ import uk.gov.justice.services.core.requester.Requester; import uk.gov.justice.services.messaging.JsonEnvelope; -import javax.inject.Inject; +import jakarta.inject.Inject; @ServiceComponent(Component.QUERY_API) public class CaseAssignmentRestrictionApi { diff --git a/sjp-query/sjp-query-api/src/main/java/uk/gov/moj/cpp/sjp/query/api/RegionsQueryApi.java b/sjp-query/sjp-query-api/src/main/java/uk/gov/moj/cpp/sjp/query/api/RegionsQueryApi.java index d11002f961..48844633c8 100644 --- a/sjp-query/sjp-query-api/src/main/java/uk/gov/moj/cpp/sjp/query/api/RegionsQueryApi.java +++ b/sjp-query/sjp-query-api/src/main/java/uk/gov/moj/cpp/sjp/query/api/RegionsQueryApi.java @@ -6,7 +6,7 @@ import uk.gov.justice.services.core.requester.Requester; import uk.gov.justice.services.messaging.JsonEnvelope; -import javax.inject.Inject; +import jakarta.inject.Inject; @ServiceComponent(Component.QUERY_API) public class RegionsQueryApi { diff --git a/sjp-query/sjp-query-api/src/main/java/uk/gov/moj/cpp/sjp/query/api/SessionQueryApi.java b/sjp-query/sjp-query-api/src/main/java/uk/gov/moj/cpp/sjp/query/api/SessionQueryApi.java index ace5e34567..7ee1e8c5ba 100644 --- a/sjp-query/sjp-query-api/src/main/java/uk/gov/moj/cpp/sjp/query/api/SessionQueryApi.java +++ b/sjp-query/sjp-query-api/src/main/java/uk/gov/moj/cpp/sjp/query/api/SessionQueryApi.java @@ -6,7 +6,7 @@ import uk.gov.justice.services.core.requester.Requester; import uk.gov.justice.services.messaging.JsonEnvelope; -import javax.inject.Inject; +import jakarta.inject.Inject; @ServiceComponent(Component.QUERY_API) public class SessionQueryApi { diff --git a/sjp-query/sjp-query-api/src/main/java/uk/gov/moj/cpp/sjp/query/api/SjpDocumentApi.java b/sjp-query/sjp-query-api/src/main/java/uk/gov/moj/cpp/sjp/query/api/SjpDocumentApi.java index 1aed894b99..f3bf2e50e2 100644 --- a/sjp-query/sjp-query-api/src/main/java/uk/gov/moj/cpp/sjp/query/api/SjpDocumentApi.java +++ b/sjp-query/sjp-query-api/src/main/java/uk/gov/moj/cpp/sjp/query/api/SjpDocumentApi.java @@ -13,8 +13,8 @@ import java.util.UUID; -import javax.inject.Inject; -import javax.json.JsonObject; +import jakarta.inject.Inject; +import jakarta.json.JsonObject; @ServiceComponent(Component.QUERY_API) public class SjpDocumentApi { diff --git a/sjp-query/sjp-query-api/src/main/java/uk/gov/moj/cpp/sjp/query/api/SjpQueryApi.java b/sjp-query/sjp-query-api/src/main/java/uk/gov/moj/cpp/sjp/query/api/SjpQueryApi.java index 28090f5230..12f5914cae 100644 --- a/sjp-query/sjp-query-api/src/main/java/uk/gov/moj/cpp/sjp/query/api/SjpQueryApi.java +++ b/sjp-query/sjp-query-api/src/main/java/uk/gov/moj/cpp/sjp/query/api/SjpQueryApi.java @@ -30,11 +30,11 @@ import java.util.Map; import java.util.Objects; -import javax.inject.Inject; -import javax.json.JsonObject; -import javax.json.JsonObjectBuilder; -import javax.json.JsonValue; -import javax.ws.rs.NotFoundException; +import jakarta.inject.Inject; +import jakarta.json.JsonObject; +import jakarta.json.JsonObjectBuilder; +import jakarta.json.JsonValue; +import jakarta.ws.rs.NotFoundException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/sjp-query/sjp-query-api/src/main/java/uk/gov/moj/cpp/sjp/query/api/converter/CaseConverter.java b/sjp-query/sjp-query-api/src/main/java/uk/gov/moj/cpp/sjp/query/api/converter/CaseConverter.java index c06cf57adc..3a42f52772 100644 --- a/sjp-query/sjp-query-api/src/main/java/uk/gov/moj/cpp/sjp/query/api/converter/CaseConverter.java +++ b/sjp-query/sjp-query-api/src/main/java/uk/gov/moj/cpp/sjp/query/api/converter/CaseConverter.java @@ -11,12 +11,12 @@ import java.util.Optional; -import javax.inject.Inject; -import javax.json.JsonArray; -import javax.json.JsonArrayBuilder; -import javax.json.JsonNumber; -import javax.json.JsonObject; -import javax.json.JsonObjectBuilder; +import jakarta.inject.Inject; +import jakarta.json.JsonArray; +import jakarta.json.JsonArrayBuilder; +import jakarta.json.JsonNumber; +import jakarta.json.JsonObject; +import jakarta.json.JsonObjectBuilder; import org.slf4j.Logger; diff --git a/sjp-query/sjp-query-api/src/main/java/uk/gov/moj/cpp/sjp/query/api/decorator/DecisionDecorator.java b/sjp-query/sjp-query-api/src/main/java/uk/gov/moj/cpp/sjp/query/api/decorator/DecisionDecorator.java index 7886376f3f..bdd799a5af 100644 --- a/sjp-query/sjp-query-api/src/main/java/uk/gov/moj/cpp/sjp/query/api/decorator/DecisionDecorator.java +++ b/sjp-query/sjp-query-api/src/main/java/uk/gov/moj/cpp/sjp/query/api/decorator/DecisionDecorator.java @@ -3,9 +3,9 @@ import uk.gov.justice.services.messaging.JsonEnvelope; import uk.gov.moj.cpp.sjp.query.service.WithdrawalReasons; -import javax.inject.Inject; -import javax.json.JsonArray; -import javax.json.JsonObject; +import jakarta.inject.Inject; +import jakarta.json.JsonArray; +import jakarta.json.JsonObject; public class DecisionDecorator { diff --git a/sjp-query/sjp-query-api/src/main/java/uk/gov/moj/cpp/sjp/query/api/decorator/DecisionSessionDecorator.java b/sjp-query/sjp-query-api/src/main/java/uk/gov/moj/cpp/sjp/query/api/decorator/DecisionSessionDecorator.java index f4a30c10bd..d35b88fdec 100644 --- a/sjp-query/sjp-query-api/src/main/java/uk/gov/moj/cpp/sjp/query/api/decorator/DecisionSessionDecorator.java +++ b/sjp-query/sjp-query-api/src/main/java/uk/gov/moj/cpp/sjp/query/api/decorator/DecisionSessionDecorator.java @@ -9,11 +9,11 @@ import java.util.UUID; -import javax.inject.Inject; -import javax.json.JsonArray; -import javax.json.JsonArrayBuilder; -import javax.json.JsonObject; -import javax.json.JsonObjectBuilder; +import jakarta.inject.Inject; +import jakarta.json.JsonArray; +import jakarta.json.JsonArrayBuilder; +import jakarta.json.JsonObject; +import jakarta.json.JsonObjectBuilder; public class DecisionSessionDecorator { diff --git a/sjp-query/sjp-query-api/src/main/java/uk/gov/moj/cpp/sjp/query/api/decorator/DocumentMetadataDecorator.java b/sjp-query/sjp-query-api/src/main/java/uk/gov/moj/cpp/sjp/query/api/decorator/DocumentMetadataDecorator.java index 2c36dadbf4..f8ead265d8 100644 --- a/sjp-query/sjp-query-api/src/main/java/uk/gov/moj/cpp/sjp/query/api/decorator/DocumentMetadataDecorator.java +++ b/sjp-query/sjp-query-api/src/main/java/uk/gov/moj/cpp/sjp/query/api/decorator/DocumentMetadataDecorator.java @@ -13,10 +13,10 @@ import java.util.Optional; import java.util.UUID; -import javax.inject.Inject; -import javax.json.JsonArrayBuilder; -import javax.json.JsonObject; -import javax.json.JsonObjectBuilder; +import jakarta.inject.Inject; +import jakarta.json.JsonArrayBuilder; +import jakarta.json.JsonObject; +import jakarta.json.JsonObjectBuilder; import org.slf4j.Logger; diff --git a/sjp-query/sjp-query-api/src/main/java/uk/gov/moj/cpp/sjp/query/api/decorator/OffenceDecisionDecorator.java b/sjp-query/sjp-query-api/src/main/java/uk/gov/moj/cpp/sjp/query/api/decorator/OffenceDecisionDecorator.java index b5b3ed6682..bf59048a6f 100644 --- a/sjp-query/sjp-query-api/src/main/java/uk/gov/moj/cpp/sjp/query/api/decorator/OffenceDecisionDecorator.java +++ b/sjp-query/sjp-query-api/src/main/java/uk/gov/moj/cpp/sjp/query/api/decorator/OffenceDecisionDecorator.java @@ -12,10 +12,10 @@ import java.util.UUID; -import javax.inject.Inject; -import javax.json.JsonArray; -import javax.json.JsonArrayBuilder; -import javax.json.JsonObject; +import jakarta.inject.Inject; +import jakarta.json.JsonArray; +import jakarta.json.JsonArrayBuilder; +import jakarta.json.JsonObject; import org.apache.commons.collections.CollectionUtils; diff --git a/sjp-query/sjp-query-api/src/main/java/uk/gov/moj/cpp/sjp/query/api/decorator/OffenceDecorator.java b/sjp-query/sjp-query-api/src/main/java/uk/gov/moj/cpp/sjp/query/api/decorator/OffenceDecorator.java index 0db66cd4b1..8f67dfbf31 100644 --- a/sjp-query/sjp-query-api/src/main/java/uk/gov/moj/cpp/sjp/query/api/decorator/OffenceDecorator.java +++ b/sjp-query/sjp-query-api/src/main/java/uk/gov/moj/cpp/sjp/query/api/decorator/OffenceDecorator.java @@ -10,11 +10,11 @@ import java.util.Optional; -import javax.inject.Inject; -import javax.json.JsonArray; -import javax.json.JsonArrayBuilder; -import javax.json.JsonObject; -import javax.json.JsonObjectBuilder; +import jakarta.inject.Inject; +import jakarta.json.JsonArray; +import jakarta.json.JsonArrayBuilder; +import jakarta.json.JsonObject; +import jakarta.json.JsonObjectBuilder; public class OffenceDecorator { diff --git a/sjp-query/sjp-query-api/src/main/java/uk/gov/moj/cpp/sjp/query/api/decorator/OffenceHelper.java b/sjp-query/sjp-query-api/src/main/java/uk/gov/moj/cpp/sjp/query/api/decorator/OffenceHelper.java index 91f17a5983..00e2a3b6e2 100644 --- a/sjp-query/sjp-query-api/src/main/java/uk/gov/moj/cpp/sjp/query/api/decorator/OffenceHelper.java +++ b/sjp-query/sjp-query-api/src/main/java/uk/gov/moj/cpp/sjp/query/api/decorator/OffenceHelper.java @@ -17,8 +17,8 @@ import java.util.UUID; import java.util.stream.Collectors; -import javax.json.JsonArray; -import javax.json.JsonObject; +import jakarta.json.JsonArray; +import jakarta.json.JsonObject; import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.tuple.Pair; diff --git a/sjp-query/sjp-query-api/src/main/java/uk/gov/moj/cpp/sjp/query/api/helper/JsonHelper.java b/sjp-query/sjp-query-api/src/main/java/uk/gov/moj/cpp/sjp/query/api/helper/JsonHelper.java index 4747dc904e..6aa7ce24f6 100644 --- a/sjp-query/sjp-query-api/src/main/java/uk/gov/moj/cpp/sjp/query/api/helper/JsonHelper.java +++ b/sjp-query/sjp-query-api/src/main/java/uk/gov/moj/cpp/sjp/query/api/helper/JsonHelper.java @@ -4,7 +4,7 @@ import java.util.Optional; -import javax.json.JsonObject; +import jakarta.json.JsonObject; public class JsonHelper { private JsonHelper() { diff --git a/sjp-query/sjp-query-api/src/main/java/uk/gov/moj/cpp/sjp/query/api/service/CourtExtractDataService.java b/sjp-query/sjp-query-api/src/main/java/uk/gov/moj/cpp/sjp/query/api/service/CourtExtractDataService.java index 8a4c196b36..718be4217a 100644 --- a/sjp-query/sjp-query-api/src/main/java/uk/gov/moj/cpp/sjp/query/api/service/CourtExtractDataService.java +++ b/sjp-query/sjp-query-api/src/main/java/uk/gov/moj/cpp/sjp/query/api/service/CourtExtractDataService.java @@ -13,8 +13,8 @@ import java.util.Optional; import java.util.UUID; -import javax.inject.Inject; -import javax.json.JsonObject; +import jakarta.inject.Inject; +import jakarta.json.JsonObject; public class CourtExtractDataService { diff --git a/sjp-query/sjp-query-api/src/main/java/uk/gov/moj/cpp/sjp/query/api/service/DocumentMetadataService.java b/sjp-query/sjp-query-api/src/main/java/uk/gov/moj/cpp/sjp/query/api/service/DocumentMetadataService.java index a977acc5c5..fd6e368f2e 100644 --- a/sjp-query/sjp-query-api/src/main/java/uk/gov/moj/cpp/sjp/query/api/service/DocumentMetadataService.java +++ b/sjp-query/sjp-query-api/src/main/java/uk/gov/moj/cpp/sjp/query/api/service/DocumentMetadataService.java @@ -12,8 +12,8 @@ import java.util.Optional; import java.util.UUID; -import javax.inject.Inject; -import javax.json.JsonObject; +import jakarta.inject.Inject; +import jakarta.json.JsonObject; public class DocumentMetadataService { diff --git a/sjp-query/sjp-query-api/src/main/java/uk/gov/moj/cpp/sjp/query/api/service/ReferenceOffencesDataService.java b/sjp-query/sjp-query-api/src/main/java/uk/gov/moj/cpp/sjp/query/api/service/ReferenceOffencesDataService.java index 8db3eebeab..f0a940f79f 100644 --- a/sjp-query/sjp-query-api/src/main/java/uk/gov/moj/cpp/sjp/query/api/service/ReferenceOffencesDataService.java +++ b/sjp-query/sjp-query-api/src/main/java/uk/gov/moj/cpp/sjp/query/api/service/ReferenceOffencesDataService.java @@ -8,8 +8,8 @@ import uk.gov.justice.services.core.requester.Requester; import uk.gov.justice.services.messaging.JsonEnvelope; -import javax.inject.Inject; -import javax.json.JsonObject; +import jakarta.inject.Inject; +import jakarta.json.JsonObject; public class ReferenceOffencesDataService { diff --git a/sjp-query/sjp-query-api/src/main/java/uk/gov/moj/cpp/sjp/query/api/service/SjpVerdictService.java b/sjp-query/sjp-query-api/src/main/java/uk/gov/moj/cpp/sjp/query/api/service/SjpVerdictService.java index c412051772..eccc769e27 100644 --- a/sjp-query/sjp-query-api/src/main/java/uk/gov/moj/cpp/sjp/query/api/service/SjpVerdictService.java +++ b/sjp-query/sjp-query-api/src/main/java/uk/gov/moj/cpp/sjp/query/api/service/SjpVerdictService.java @@ -9,8 +9,8 @@ import uk.gov.moj.cpp.sjp.domain.verdict.VerdictService; import uk.gov.moj.cpp.sjp.domain.verdict.VerdictType; -import javax.json.JsonArrayBuilder; -import javax.json.JsonObject; +import jakarta.json.JsonArrayBuilder; +import jakarta.json.JsonObject; public class SjpVerdictService { diff --git a/sjp-query/sjp-query-api/src/main/java/uk/gov/moj/cpp/sjp/query/api/validator/SjpQueryApiValidator.java b/sjp-query/sjp-query-api/src/main/java/uk/gov/moj/cpp/sjp/query/api/validator/SjpQueryApiValidator.java index f18881e515..99aed803e1 100644 --- a/sjp-query/sjp-query-api/src/main/java/uk/gov/moj/cpp/sjp/query/api/validator/SjpQueryApiValidator.java +++ b/sjp-query/sjp-query-api/src/main/java/uk/gov/moj/cpp/sjp/query/api/validator/SjpQueryApiValidator.java @@ -1,6 +1,6 @@ package uk.gov.moj.cpp.sjp.query.api.validator; -import javax.json.JsonObject; +import jakarta.json.JsonObject; import java.util.List; import java.util.Map; import java.util.Optional; diff --git a/sjp-query/sjp-query-api/src/main/java/uk/gov/moj/cpp/sjp/query/service/OffenceFineLevels.java b/sjp-query/sjp-query-api/src/main/java/uk/gov/moj/cpp/sjp/query/service/OffenceFineLevels.java index 339bae8a61..1841ffc43a 100644 --- a/sjp-query/sjp-query-api/src/main/java/uk/gov/moj/cpp/sjp/query/service/OffenceFineLevels.java +++ b/sjp-query/sjp-query-api/src/main/java/uk/gov/moj/cpp/sjp/query/service/OffenceFineLevels.java @@ -11,7 +11,7 @@ import java.util.Map; import java.util.Optional; -import javax.json.JsonObject; +import jakarta.json.JsonObject; import org.apache.commons.collections.MapUtils; diff --git a/sjp-query/sjp-query-api/src/main/java/uk/gov/moj/cpp/sjp/query/service/ReferenceDataService.java b/sjp-query/sjp-query-api/src/main/java/uk/gov/moj/cpp/sjp/query/service/ReferenceDataService.java index 27081d3333..6323458fe0 100644 --- a/sjp-query/sjp-query-api/src/main/java/uk/gov/moj/cpp/sjp/query/service/ReferenceDataService.java +++ b/sjp-query/sjp-query-api/src/main/java/uk/gov/moj/cpp/sjp/query/service/ReferenceDataService.java @@ -11,8 +11,8 @@ import java.util.List; -import javax.inject.Inject; -import javax.json.JsonObject; +import jakarta.inject.Inject; +import jakarta.json.JsonObject; public class ReferenceDataService { diff --git a/sjp-query/sjp-query-api/src/main/java/uk/gov/moj/cpp/sjp/query/service/ReferralReasons.java b/sjp-query/sjp-query-api/src/main/java/uk/gov/moj/cpp/sjp/query/service/ReferralReasons.java index b8001150a9..696ad41b74 100644 --- a/sjp-query/sjp-query-api/src/main/java/uk/gov/moj/cpp/sjp/query/service/ReferralReasons.java +++ b/sjp-query/sjp-query-api/src/main/java/uk/gov/moj/cpp/sjp/query/service/ReferralReasons.java @@ -11,7 +11,7 @@ import java.util.Optional; import java.util.UUID; -import javax.json.JsonObject; +import jakarta.json.JsonObject; import org.apache.commons.collections.MapUtils; diff --git a/sjp-query/sjp-query-api/src/main/java/uk/gov/moj/cpp/sjp/query/service/UsersGroupsService.java b/sjp-query/sjp-query-api/src/main/java/uk/gov/moj/cpp/sjp/query/service/UsersGroupsService.java index c74edf2d03..4f920c0c79 100644 --- a/sjp-query/sjp-query-api/src/main/java/uk/gov/moj/cpp/sjp/query/service/UsersGroupsService.java +++ b/sjp-query/sjp-query-api/src/main/java/uk/gov/moj/cpp/sjp/query/service/UsersGroupsService.java @@ -11,9 +11,9 @@ import java.util.UUID; -import javax.inject.Inject; -import javax.json.JsonObject; -import javax.json.JsonValue; +import jakarta.inject.Inject; +import jakarta.json.JsonObject; +import jakarta.json.JsonValue; public class UsersGroupsService { diff --git a/sjp-query/sjp-query-api/src/main/java/uk/gov/moj/cpp/sjp/query/service/WithdrawalReasons.java b/sjp-query/sjp-query-api/src/main/java/uk/gov/moj/cpp/sjp/query/service/WithdrawalReasons.java index be880087b6..b49bee96f7 100644 --- a/sjp-query/sjp-query-api/src/main/java/uk/gov/moj/cpp/sjp/query/service/WithdrawalReasons.java +++ b/sjp-query/sjp-query-api/src/main/java/uk/gov/moj/cpp/sjp/query/service/WithdrawalReasons.java @@ -11,7 +11,7 @@ import java.util.Optional; import java.util.UUID; -import javax.json.JsonObject; +import jakarta.json.JsonObject; import org.apache.commons.collections.MapUtils; diff --git a/sjp-query/sjp-query-api/src/main/resources/META-INF/beans.xml b/sjp-query/sjp-query-api/src/main/resources/META-INF/beans.xml index cc3f8d2864..1d83bc8c5a 100644 --- a/sjp-query/sjp-query-api/src/main/resources/META-INF/beans.xml +++ b/sjp-query/sjp-query-api/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-query/sjp-query-api/src/test/java/uk/gov/justice/api/resource/DefaultQueryApiCasesCaseIdDocumentsCourtExtractResourceTest.java b/sjp-query/sjp-query-api/src/test/java/uk/gov/justice/api/resource/DefaultQueryApiCasesCaseIdDocumentsCourtExtractResourceTest.java index 3247cc1e6c..a148813f45 100644 --- a/sjp-query/sjp-query-api/src/test/java/uk/gov/justice/api/resource/DefaultQueryApiCasesCaseIdDocumentsCourtExtractResourceTest.java +++ b/sjp-query/sjp-query-api/src/test/java/uk/gov/justice/api/resource/DefaultQueryApiCasesCaseIdDocumentsCourtExtractResourceTest.java @@ -31,8 +31,8 @@ import java.util.Optional; import java.util.UUID; -import javax.json.JsonObject; -import javax.ws.rs.core.Response; +import jakarta.json.JsonObject; +import jakarta.ws.rs.core.Response; import org.hamcrest.MatcherAssert; import org.junit.jupiter.api.BeforeEach; diff --git a/sjp-query/sjp-query-api/src/test/java/uk/gov/justice/api/resource/DefaultQueryApiCasesCaseIdDocumentsDocumentIdContentResourceTest.java b/sjp-query/sjp-query-api/src/test/java/uk/gov/justice/api/resource/DefaultQueryApiCasesCaseIdDocumentsDocumentIdContentResourceTest.java index 1433e0d53f..83b41a80e8 100644 --- a/sjp-query/sjp-query-api/src/test/java/uk/gov/justice/api/resource/DefaultQueryApiCasesCaseIdDocumentsDocumentIdContentResourceTest.java +++ b/sjp-query/sjp-query-api/src/test/java/uk/gov/justice/api/resource/DefaultQueryApiCasesCaseIdDocumentsDocumentIdContentResourceTest.java @@ -2,8 +2,8 @@ import static com.jayway.jsonpath.matchers.JsonPathMatchers.withJsonPath; import static java.util.UUID.randomUUID; -import static javax.servlet.http.HttpServletResponse.SC_NOT_FOUND; -import static javax.ws.rs.core.HttpHeaders.CONTENT_TYPE; +import static jakarta.servlet.http.HttpServletResponse.SC_NOT_FOUND; +import static jakarta.ws.rs.core.HttpHeaders.CONTENT_TYPE; import static org.apache.http.HttpStatus.SC_OK; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.allOf; @@ -27,17 +27,17 @@ import uk.gov.justice.services.core.interceptor.InterceptorChainProcessor; import uk.gov.justice.services.core.interceptor.InterceptorContext; import uk.gov.justice.services.messaging.JsonEnvelope; -import uk.gov.moj.cpp.material.client.MaterialClient; +import uk.gov.moj.cpp.sjp.material.client.MaterialClient; import uk.gov.moj.cpp.systemusers.ServiceContextSystemUserProvider; import java.util.Optional; import java.util.UUID; -import javax.json.JsonObject; -import javax.json.JsonValue; -import javax.ws.rs.core.MultivaluedHashMap; -import javax.ws.rs.core.MultivaluedMap; -import javax.ws.rs.core.Response; +import jakarta.json.JsonObject; +import jakarta.json.JsonValue; +import jakarta.ws.rs.core.MultivaluedHashMap; +import jakarta.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.core.Response; import com.google.common.collect.ImmutableMap; import org.junit.jupiter.api.Test; @@ -116,7 +116,7 @@ public void shouldRunNotFoundStatusWhenDocumentNotFound() { verifyInterceptorChainExecution(); - verify(materialClient, never()).getMaterial(argThat(any(UUID.class)), argThat(any(UUID.class))); + verify(materialClient, never()).getMaterialWithHeader(argThat(any(UUID.class)), argThat(any(UUID.class))); } @Test @@ -150,7 +150,7 @@ public void shouldRethrowAnyInterceptorException() { } verifyInterceptorChainExecution(); - verify(materialClient, never()).getMaterial(argThat(any(UUID.class)), argThat(any(UUID.class))); + verify(materialClient, never()).getMaterialWithHeader(argThat(any(UUID.class)), argThat(any(UUID.class))); } @Test diff --git a/sjp-query/sjp-query-api/src/test/java/uk/gov/justice/api/resource/DefaultQueryApiTransparencyReportContentFileIdResourceTest.java b/sjp-query/sjp-query-api/src/test/java/uk/gov/justice/api/resource/DefaultQueryApiTransparencyReportContentFileIdResourceTest.java index 6021a72745..fe363211ec 100644 --- a/sjp-query/sjp-query-api/src/test/java/uk/gov/justice/api/resource/DefaultQueryApiTransparencyReportContentFileIdResourceTest.java +++ b/sjp-query/sjp-query-api/src/test/java/uk/gov/justice/api/resource/DefaultQueryApiTransparencyReportContentFileIdResourceTest.java @@ -2,8 +2,8 @@ import static com.jayway.jsonpath.matchers.JsonPathMatchers.withJsonPath; import static java.util.UUID.randomUUID; -import static javax.ws.rs.core.HttpHeaders.CONTENT_DISPOSITION; -import static javax.ws.rs.core.HttpHeaders.CONTENT_TYPE; +import static jakarta.ws.rs.core.HttpHeaders.CONTENT_DISPOSITION; +import static jakarta.ws.rs.core.HttpHeaders.CONTENT_TYPE; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.allOf; import static org.hamcrest.Matchers.equalTo; @@ -30,7 +30,7 @@ import java.util.Optional; import java.util.UUID; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.Response; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/sjp-query/sjp-query-api/src/test/java/uk/gov/moj/cpp/sjp/material/client/MaterialClientTest.java b/sjp-query/sjp-query-api/src/test/java/uk/gov/moj/cpp/sjp/material/client/MaterialClientTest.java new file mode 100644 index 0000000000..66ca939208 --- /dev/null +++ b/sjp-query/sjp-query-api/src/test/java/uk/gov/moj/cpp/sjp/material/client/MaterialClientTest.java @@ -0,0 +1,91 @@ +package uk.gov.moj.cpp.sjp.material.client; + +import static java.util.UUID.fromString; +import static java.util.UUID.randomUUID; +import static org.hamcrest.CoreMatchers.is; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyString; +import static org.mockito.ArgumentMatchers.eq; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.mockStatic; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; +import static uk.gov.justice.services.common.http.HeaderConstants.USER_ID; +import static uk.gov.moj.cpp.sjp.material.client.MaterialClient.REQUEST_PARAM_ADD_INLINE_CONTENT_DISPOSITION_HEADER; + +import jakarta.ws.rs.client.Client; +import jakarta.ws.rs.client.ClientBuilder; +import jakarta.ws.rs.client.Invocation; +import jakarta.ws.rs.client.WebTarget; + +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; +import org.mockito.Mock; +import org.mockito.MockedStatic; +import org.mockito.junit.jupiter.MockitoExtension; +import org.slf4j.Logger; + +@ExtendWith(MockitoExtension.class) +public class MaterialClientTest { + + private static final String BASE_URI = "http://localhost:8080/material-query-api/query/api/rest/material"; + private static final String MATERIAL_REQUEST_PATH = "/material/"; + private static final String GET_MATERIAL_AS_PDF = "application/vnd.material.query.material+json"; + private static final String REQUEST_PARAM_STREAM = "stream"; + private static final String REQUEST_PARAM_REQUEST_PDF = "requestPdf"; + private static final String MATERIAL_ID_VALUE = randomUUID().toString(); + private static final String USER_ID_VALUE = randomUUID().toString(); + private static final String LOG_MATERIAL_CALL = "Invoking call to material context"; + + @Mock + private Logger logger; + + private final Client client = mock(Client.class); + private final WebTarget webTarget = mock(WebTarget.class); + private final Invocation.Builder builder = mock(Invocation.Builder.class); + + private final MaterialClient materialClient = new MaterialClient() { + @Override + Client getClient() { + return client; + } + }; + + @BeforeEach + public void init() { + materialClient.logger = logger; + when(client.target(anyString())).thenReturn(webTarget); + when(webTarget.path(anyString())).thenReturn(webTarget); + when(webTarget.queryParam(anyString(), any())).thenReturn(webTarget); + when(webTarget.request()).thenReturn(builder); + when(builder.header(anyString(), anyString())).thenReturn(builder); + when(builder.accept(anyString())).thenReturn(builder); + } + + @Test + public void shouldGetMaterialWithHeader() { + materialClient.getMaterialWithHeader(fromString(MATERIAL_ID_VALUE), fromString(USER_ID_VALUE)); + + verify(client).target(BASE_URI); + verify(webTarget).path(MATERIAL_REQUEST_PATH + MATERIAL_ID_VALUE); + verify(webTarget).queryParam(REQUEST_PARAM_STREAM, true); + verify(webTarget).queryParam(REQUEST_PARAM_REQUEST_PDF, false); + verify(webTarget).queryParam(REQUEST_PARAM_ADD_INLINE_CONTENT_DISPOSITION_HEADER, true); + verify(webTarget).request(); + verify(builder).header(eq(USER_ID), anyString()); + verify(builder).accept(GET_MATERIAL_AS_PDF); + verify(builder).get(); + verify(logger).info(LOG_MATERIAL_CALL); + } + + @Test + public void shouldReturnTheJaxRsClientFromGetClient() { + try (final MockedStatic clientBuilder = mockStatic(ClientBuilder.class)) { + clientBuilder.when(ClientBuilder::newClient).thenReturn(client); + + assertThat(new MaterialClient().getClient(), is(client)); + } + } +} diff --git a/sjp-query/sjp-query-api/src/test/java/uk/gov/moj/cpp/sjp/query/accesscontrol/SjpDroolsAccessControlTest.java b/sjp-query/sjp-query-api/src/test/java/uk/gov/moj/cpp/sjp/query/accesscontrol/SjpDroolsAccessControlTest.java index 3003c28342..7dbf154206 100644 --- a/sjp-query/sjp-query-api/src/test/java/uk/gov/moj/cpp/sjp/query/accesscontrol/SjpDroolsAccessControlTest.java +++ b/sjp-query/sjp-query-api/src/test/java/uk/gov/moj/cpp/sjp/query/accesscontrol/SjpDroolsAccessControlTest.java @@ -53,7 +53,7 @@ public SjpDroolsAccessControlTest(final String kSessionName, final String action } @BeforeEach - public void setup() { + public void setup() throws Exception { super.setup(); action = createActionFor(actionName); } diff --git a/sjp-query/sjp-query-api/src/test/java/uk/gov/moj/cpp/sjp/query/api/AllFinancialMeansQueryApiTest.java b/sjp-query/sjp-query-api/src/test/java/uk/gov/moj/cpp/sjp/query/api/AllFinancialMeansQueryApiTest.java index 7937145be5..a0de450a6d 100644 --- a/sjp-query/sjp-query-api/src/test/java/uk/gov/moj/cpp/sjp/query/api/AllFinancialMeansQueryApiTest.java +++ b/sjp-query/sjp-query-api/src/test/java/uk/gov/moj/cpp/sjp/query/api/AllFinancialMeansQueryApiTest.java @@ -25,7 +25,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-query/sjp-query-api/src/test/java/uk/gov/moj/cpp/sjp/query/api/CaseAssignmentRestrictionApiTest.java b/sjp-query/sjp-query-api/src/test/java/uk/gov/moj/cpp/sjp/query/api/CaseAssignmentRestrictionApiTest.java index 8a35757fec..7d67b2cecb 100644 --- a/sjp-query/sjp-query-api/src/test/java/uk/gov/moj/cpp/sjp/query/api/CaseAssignmentRestrictionApiTest.java +++ b/sjp-query/sjp-query-api/src/test/java/uk/gov/moj/cpp/sjp/query/api/CaseAssignmentRestrictionApiTest.java @@ -18,7 +18,7 @@ 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-query/sjp-query-api/src/test/java/uk/gov/moj/cpp/sjp/query/api/SjpDocumentApiTest.java b/sjp-query/sjp-query-api/src/test/java/uk/gov/moj/cpp/sjp/query/api/SjpDocumentApiTest.java index 9180324ffd..5359899d7b 100644 --- a/sjp-query/sjp-query-api/src/test/java/uk/gov/moj/cpp/sjp/query/api/SjpDocumentApiTest.java +++ b/sjp-query/sjp-query-api/src/test/java/uk/gov/moj/cpp/sjp/query/api/SjpDocumentApiTest.java @@ -35,7 +35,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-query/sjp-query-api/src/test/java/uk/gov/moj/cpp/sjp/query/api/SjpFindCaseQueryApiTest.java b/sjp-query/sjp-query-api/src/test/java/uk/gov/moj/cpp/sjp/query/api/SjpFindCaseQueryApiTest.java index 2a83a39499..06b337b2f4 100644 --- a/sjp-query/sjp-query-api/src/test/java/uk/gov/moj/cpp/sjp/query/api/SjpFindCaseQueryApiTest.java +++ b/sjp-query/sjp-query-api/src/test/java/uk/gov/moj/cpp/sjp/query/api/SjpFindCaseQueryApiTest.java @@ -30,8 +30,8 @@ import java.time.LocalDate; import java.util.UUID; -import javax.json.JsonObject; -import javax.json.JsonValue; +import jakarta.json.JsonObject; +import jakarta.json.JsonValue; import org.hamcrest.CoreMatchers; import org.junit.jupiter.api.Test; diff --git a/sjp-query/sjp-query-api/src/test/java/uk/gov/moj/cpp/sjp/query/api/SjpQueryApiTest.java b/sjp-query/sjp-query-api/src/test/java/uk/gov/moj/cpp/sjp/query/api/SjpQueryApiTest.java index dc66510f8a..af9b6f68ab 100644 --- a/sjp-query/sjp-query-api/src/test/java/uk/gov/moj/cpp/sjp/query/api/SjpQueryApiTest.java +++ b/sjp-query/sjp-query-api/src/test/java/uk/gov/moj/cpp/sjp/query/api/SjpQueryApiTest.java @@ -28,8 +28,8 @@ import java.util.Collections; -import javax.json.JsonObject; -import javax.json.JsonValue; +import jakarta.json.JsonObject; +import jakarta.json.JsonValue; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; diff --git a/sjp-query/sjp-query-api/src/test/java/uk/gov/moj/cpp/sjp/query/api/SjpQueryCaseWithDocumentMetadataApiTest.java b/sjp-query/sjp-query-api/src/test/java/uk/gov/moj/cpp/sjp/query/api/SjpQueryCaseWithDocumentMetadataApiTest.java index d6b201a270..6c97d55adc 100644 --- a/sjp-query/sjp-query-api/src/test/java/uk/gov/moj/cpp/sjp/query/api/SjpQueryCaseWithDocumentMetadataApiTest.java +++ b/sjp-query/sjp-query-api/src/test/java/uk/gov/moj/cpp/sjp/query/api/SjpQueryCaseWithDocumentMetadataApiTest.java @@ -25,7 +25,7 @@ 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-query/sjp-query-api/src/test/java/uk/gov/moj/cpp/sjp/query/api/decorator/DecisionSessionDecoratorTest.java b/sjp-query/sjp-query-api/src/test/java/uk/gov/moj/cpp/sjp/query/api/decorator/DecisionSessionDecoratorTest.java index e011218d10..5ef97f5ab5 100644 --- a/sjp-query/sjp-query-api/src/test/java/uk/gov/moj/cpp/sjp/query/api/decorator/DecisionSessionDecoratorTest.java +++ b/sjp-query/sjp-query-api/src/test/java/uk/gov/moj/cpp/sjp/query/api/decorator/DecisionSessionDecoratorTest.java @@ -13,7 +13,7 @@ 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-query/sjp-query-api/src/test/java/uk/gov/moj/cpp/sjp/query/api/decorator/DocumentMetadataDecoratorTest.java b/sjp-query/sjp-query-api/src/test/java/uk/gov/moj/cpp/sjp/query/api/decorator/DocumentMetadataDecoratorTest.java index 27b377527c..63b4627e99 100644 --- a/sjp-query/sjp-query-api/src/test/java/uk/gov/moj/cpp/sjp/query/api/decorator/DocumentMetadataDecoratorTest.java +++ b/sjp-query/sjp-query-api/src/test/java/uk/gov/moj/cpp/sjp/query/api/decorator/DocumentMetadataDecoratorTest.java @@ -21,7 +21,7 @@ import java.util.Optional; 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-query/sjp-query-api/src/test/java/uk/gov/moj/cpp/sjp/query/api/decorator/OffenceDecisionDecoratorTest.java b/sjp-query/sjp-query-api/src/test/java/uk/gov/moj/cpp/sjp/query/api/decorator/OffenceDecisionDecoratorTest.java index 6fd41470b6..b3eadc9465 100644 --- a/sjp-query/sjp-query-api/src/test/java/uk/gov/moj/cpp/sjp/query/api/decorator/OffenceDecisionDecoratorTest.java +++ b/sjp-query/sjp-query-api/src/test/java/uk/gov/moj/cpp/sjp/query/api/decorator/OffenceDecisionDecoratorTest.java @@ -21,8 +21,8 @@ import java.time.ZonedDateTime; import java.util.UUID; -import javax.json.JsonArrayBuilder; -import javax.json.JsonObject; +import jakarta.json.JsonArrayBuilder; +import jakarta.json.JsonObject; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; diff --git a/sjp-query/sjp-query-api/src/test/java/uk/gov/moj/cpp/sjp/query/api/decorator/OffenceDecoratorTest.java b/sjp-query/sjp-query-api/src/test/java/uk/gov/moj/cpp/sjp/query/api/decorator/OffenceDecoratorTest.java index f60cd953e5..733f9ae60a 100644 --- a/sjp-query/sjp-query-api/src/test/java/uk/gov/moj/cpp/sjp/query/api/decorator/OffenceDecoratorTest.java +++ b/sjp-query/sjp-query-api/src/test/java/uk/gov/moj/cpp/sjp/query/api/decorator/OffenceDecoratorTest.java @@ -22,9 +22,9 @@ import java.time.LocalDate; import java.util.UUID; -import javax.json.JsonArray; -import javax.json.JsonArrayBuilder; -import javax.json.JsonObject; +import jakarta.json.JsonArray; +import jakarta.json.JsonArrayBuilder; +import jakarta.json.JsonObject; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; diff --git a/sjp-query/sjp-query-api/src/test/java/uk/gov/moj/cpp/sjp/query/api/decorator/OffenceHelperTest.java b/sjp-query/sjp-query-api/src/test/java/uk/gov/moj/cpp/sjp/query/api/decorator/OffenceHelperTest.java index 2910bf2467..34b3bd2241 100644 --- a/sjp-query/sjp-query-api/src/test/java/uk/gov/moj/cpp/sjp/query/api/decorator/OffenceHelperTest.java +++ b/sjp-query/sjp-query-api/src/test/java/uk/gov/moj/cpp/sjp/query/api/decorator/OffenceHelperTest.java @@ -19,9 +19,9 @@ import java.util.Optional; import java.util.UUID; -import javax.json.JsonArray; -import javax.json.JsonObject; -import javax.json.JsonObjectBuilder; +import jakarta.json.JsonArray; +import jakarta.json.JsonObject; +import jakarta.json.JsonObjectBuilder; import org.apache.commons.lang3.StringUtils; import org.hamcrest.Matchers; diff --git a/sjp-query/sjp-query-api/src/test/java/uk/gov/moj/cpp/sjp/query/api/decorator/OffenceImprisonableHelperTest.java b/sjp-query/sjp-query-api/src/test/java/uk/gov/moj/cpp/sjp/query/api/decorator/OffenceImprisonableHelperTest.java index ae89d9d8ca..acb1782715 100644 --- a/sjp-query/sjp-query-api/src/test/java/uk/gov/moj/cpp/sjp/query/api/decorator/OffenceImprisonableHelperTest.java +++ b/sjp-query/sjp-query-api/src/test/java/uk/gov/moj/cpp/sjp/query/api/decorator/OffenceImprisonableHelperTest.java @@ -6,7 +6,7 @@ import java.util.stream.Stream; -import javax.json.JsonObjectBuilder; +import jakarta.json.JsonObjectBuilder; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; diff --git a/sjp-query/sjp-query-api/src/test/java/uk/gov/moj/cpp/sjp/query/api/decorator/OffenceNotInEffectHelperTest.java b/sjp-query/sjp-query-api/src/test/java/uk/gov/moj/cpp/sjp/query/api/decorator/OffenceNotInEffectHelperTest.java index 8f76555387..cb4b16fd4d 100644 --- a/sjp-query/sjp-query-api/src/test/java/uk/gov/moj/cpp/sjp/query/api/decorator/OffenceNotInEffectHelperTest.java +++ b/sjp-query/sjp-query-api/src/test/java/uk/gov/moj/cpp/sjp/query/api/decorator/OffenceNotInEffectHelperTest.java @@ -8,7 +8,7 @@ import java.time.LocalDate; import java.util.stream.Stream; -import javax.json.JsonObjectBuilder; +import jakarta.json.JsonObjectBuilder; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; diff --git a/sjp-query/sjp-query-api/src/test/java/uk/gov/moj/cpp/sjp/query/api/decorator/OffenceOutOfTimeHelperTest.java b/sjp-query/sjp-query-api/src/test/java/uk/gov/moj/cpp/sjp/query/api/decorator/OffenceOutOfTimeHelperTest.java index 9c5d623d11..34e575cc91 100644 --- a/sjp-query/sjp-query-api/src/test/java/uk/gov/moj/cpp/sjp/query/api/decorator/OffenceOutOfTimeHelperTest.java +++ b/sjp-query/sjp-query-api/src/test/java/uk/gov/moj/cpp/sjp/query/api/decorator/OffenceOutOfTimeHelperTest.java @@ -8,7 +8,7 @@ import java.time.LocalDate; import java.util.stream.Stream; -import javax.json.JsonObjectBuilder; +import jakarta.json.JsonObjectBuilder; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; diff --git a/sjp-query/sjp-query-api/src/test/java/uk/gov/moj/cpp/sjp/query/api/decorator/OffenceWelshSupportHelperTest.java b/sjp-query/sjp-query-api/src/test/java/uk/gov/moj/cpp/sjp/query/api/decorator/OffenceWelshSupportHelperTest.java index 0c658599f4..a83615cd99 100644 --- a/sjp-query/sjp-query-api/src/test/java/uk/gov/moj/cpp/sjp/query/api/decorator/OffenceWelshSupportHelperTest.java +++ b/sjp-query/sjp-query-api/src/test/java/uk/gov/moj/cpp/sjp/query/api/decorator/OffenceWelshSupportHelperTest.java @@ -4,7 +4,7 @@ import static org.hamcrest.Matchers.is; import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; -import javax.json.JsonObject; +import jakarta.json.JsonObject; import org.junit.jupiter.api.Test; diff --git a/sjp-query/sjp-query-api/src/test/java/uk/gov/moj/cpp/sjp/query/api/util/FileUtil.java b/sjp-query/sjp-query-api/src/test/java/uk/gov/moj/cpp/sjp/query/api/util/FileUtil.java index 41fdf67d8b..56afb4f33e 100644 --- a/sjp-query/sjp-query-api/src/test/java/uk/gov/moj/cpp/sjp/query/api/util/FileUtil.java +++ b/sjp-query/sjp-query-api/src/test/java/uk/gov/moj/cpp/sjp/query/api/util/FileUtil.java @@ -8,8 +8,8 @@ import java.nio.charset.Charset; import java.util.Map; -import javax.json.JsonObject; -import javax.json.JsonReader; +import jakarta.json.JsonObject; +import jakarta.json.JsonReader; import com.google.common.io.Resources; import org.apache.commons.lang3.text.StrSubstitutor; diff --git a/sjp-query/sjp-query-api/src/test/java/uk/gov/moj/cpp/sjp/query/converter/CaseConverterTest.java b/sjp-query/sjp-query-api/src/test/java/uk/gov/moj/cpp/sjp/query/converter/CaseConverterTest.java index af28538572..41da0e5ad7 100644 --- a/sjp-query/sjp-query-api/src/test/java/uk/gov/moj/cpp/sjp/query/converter/CaseConverterTest.java +++ b/sjp-query/sjp-query-api/src/test/java/uk/gov/moj/cpp/sjp/query/converter/CaseConverterTest.java @@ -16,7 +16,7 @@ import java.time.LocalDate; 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-query/sjp-query-api/src/test/java/uk/gov/moj/cpp/sjp/query/service/OffenceFineLevelsTest.java b/sjp-query/sjp-query-api/src/test/java/uk/gov/moj/cpp/sjp/query/service/OffenceFineLevelsTest.java index 90aede0ac6..ffcb85d41c 100644 --- a/sjp-query/sjp-query-api/src/test/java/uk/gov/moj/cpp/sjp/query/service/OffenceFineLevelsTest.java +++ b/sjp-query/sjp-query-api/src/test/java/uk/gov/moj/cpp/sjp/query/service/OffenceFineLevelsTest.java @@ -14,8 +14,8 @@ import java.math.BigDecimal; import java.util.Optional; -import javax.json.JsonArray; -import javax.json.JsonObject; +import jakarta.json.JsonArray; +import jakarta.json.JsonObject; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/sjp-query/sjp-query-api/src/test/java/uk/gov/moj/cpp/sjp/query/service/ReferenceDataServiceTest.java b/sjp-query/sjp-query-api/src/test/java/uk/gov/moj/cpp/sjp/query/service/ReferenceDataServiceTest.java index c8c230d03f..230dda71db 100644 --- a/sjp-query/sjp-query-api/src/test/java/uk/gov/moj/cpp/sjp/query/service/ReferenceDataServiceTest.java +++ b/sjp-query/sjp-query-api/src/test/java/uk/gov/moj/cpp/sjp/query/service/ReferenceDataServiceTest.java @@ -29,8 +29,8 @@ import java.util.List; -import javax.json.JsonObject; -import javax.json.JsonValue; +import jakarta.json.JsonObject; +import jakarta.json.JsonValue; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; diff --git a/sjp-query/sjp-query-api/src/test/java/uk/gov/moj/cpp/sjp/query/service/ReferenceOffencesDataServiceTest.java b/sjp-query/sjp-query-api/src/test/java/uk/gov/moj/cpp/sjp/query/service/ReferenceOffencesDataServiceTest.java index 02b743f1a6..5628d17f48 100644 --- a/sjp-query/sjp-query-api/src/test/java/uk/gov/moj/cpp/sjp/query/service/ReferenceOffencesDataServiceTest.java +++ b/sjp-query/sjp-query-api/src/test/java/uk/gov/moj/cpp/sjp/query/service/ReferenceOffencesDataServiceTest.java @@ -17,7 +17,7 @@ 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-query/sjp-query-api/src/test/java/uk/gov/moj/cpp/sjp/query/service/ReferralReasonsTest.java b/sjp-query/sjp-query-api/src/test/java/uk/gov/moj/cpp/sjp/query/service/ReferralReasonsTest.java index 52c165655b..ff77cc5081 100644 --- a/sjp-query/sjp-query-api/src/test/java/uk/gov/moj/cpp/sjp/query/service/ReferralReasonsTest.java +++ b/sjp-query/sjp-query-api/src/test/java/uk/gov/moj/cpp/sjp/query/service/ReferralReasonsTest.java @@ -15,7 +15,7 @@ import java.util.Optional; 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-query/sjp-query-api/src/test/java/uk/gov/moj/cpp/sjp/query/service/UsersGroupsServiceTest.java b/sjp-query/sjp-query-api/src/test/java/uk/gov/moj/cpp/sjp/query/service/UsersGroupsServiceTest.java index 15fe8061ac..39c98ad4bd 100644 --- a/sjp-query/sjp-query-api/src/test/java/uk/gov/moj/cpp/sjp/query/service/UsersGroupsServiceTest.java +++ b/sjp-query/sjp-query-api/src/test/java/uk/gov/moj/cpp/sjp/query/service/UsersGroupsServiceTest.java @@ -22,7 +22,7 @@ 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-query/sjp-query-view/pom.xml b/sjp-query/sjp-query-view/pom.xml index bed7acda31..3708db668a 100644 --- a/sjp-query/sjp-query-view/pom.xml +++ b/sjp-query/sjp-query-view/pom.xml @@ -3,7 +3,7 @@ sjp-query uk.gov.moj.cpp.sjp - 17.104.193-SNAPSHOT + 25.104.0-M1-SNAPSHOT 4.0.0 @@ -21,10 +21,15 @@ rest-client-generator-plugin - javax - javaee-api + jakarta.platform + jakarta.jakartaee-api ${javaee-api.version} + + jakarta.xml.bind + jakarta.xml.bind-api + ${jakarta.xml.bind-api.raml.version} + uk.gov.moj.cpp.usersgroups usersgroups-query-api @@ -107,8 +112,8 @@ - javax - javaee-api + jakarta.platform + jakarta.jakartaee-api provided @@ -135,8 +140,8 @@ - javax - javaee-api + jakarta.platform + jakarta.jakartaee-api provided diff --git a/sjp-query/sjp-query-view/src/main/java/uk/gov/moj/cpp/sjp/query/view/AccountNoteQueryView.java b/sjp-query/sjp-query-view/src/main/java/uk/gov/moj/cpp/sjp/query/view/AccountNoteQueryView.java index 88c560693f..5b915a87fb 100644 --- a/sjp-query/sjp-query-view/src/main/java/uk/gov/moj/cpp/sjp/query/view/AccountNoteQueryView.java +++ b/sjp-query/sjp-query-view/src/main/java/uk/gov/moj/cpp/sjp/query/view/AccountNoteQueryView.java @@ -15,9 +15,9 @@ import java.util.List; -import javax.inject.Inject; -import javax.json.JsonObject; -import javax.json.JsonObjectBuilder; +import jakarta.inject.Inject; +import jakarta.json.JsonObject; +import jakarta.json.JsonObjectBuilder; @ServiceComponent(Component.QUERY_VIEW) public class AccountNoteQueryView { diff --git a/sjp-query/sjp-query-view/src/main/java/uk/gov/moj/cpp/sjp/query/view/AssignmentQueryView.java b/sjp-query/sjp-query-view/src/main/java/uk/gov/moj/cpp/sjp/query/view/AssignmentQueryView.java index 24300bf8b0..f31f78ecaf 100644 --- a/sjp-query/sjp-query-view/src/main/java/uk/gov/moj/cpp/sjp/query/view/AssignmentQueryView.java +++ b/sjp-query/sjp-query-view/src/main/java/uk/gov/moj/cpp/sjp/query/view/AssignmentQueryView.java @@ -25,9 +25,9 @@ import java.util.UUID; import java.util.stream.Collectors; -import javax.inject.Inject; -import javax.json.JsonArrayBuilder; -import javax.json.JsonObject; +import jakarta.inject.Inject; +import jakarta.json.JsonArrayBuilder; +import jakarta.json.JsonObject; @ServiceComponent(Component.QUERY_VIEW) public class AssignmentQueryView { diff --git a/sjp-query/sjp-query-view/src/main/java/uk/gov/moj/cpp/sjp/query/view/CaseApplicationView.java b/sjp-query/sjp-query-view/src/main/java/uk/gov/moj/cpp/sjp/query/view/CaseApplicationView.java index 9dedbe5943..0bbe32b0f4 100644 --- a/sjp-query/sjp-query-view/src/main/java/uk/gov/moj/cpp/sjp/query/view/CaseApplicationView.java +++ b/sjp-query/sjp-query-view/src/main/java/uk/gov/moj/cpp/sjp/query/view/CaseApplicationView.java @@ -11,8 +11,8 @@ import java.util.UUID; -import javax.inject.Inject; -import javax.json.JsonObject; +import jakarta.inject.Inject; +import jakarta.json.JsonObject; @SuppressWarnings("WeakerAccess") @ServiceComponent(Component.QUERY_VIEW) diff --git a/sjp-query/sjp-query-view/src/main/java/uk/gov/moj/cpp/sjp/query/view/CaseAssignmentRestrictionView.java b/sjp-query/sjp-query-view/src/main/java/uk/gov/moj/cpp/sjp/query/view/CaseAssignmentRestrictionView.java index e67b71c8d3..9d4fc36717 100644 --- a/sjp-query/sjp-query-view/src/main/java/uk/gov/moj/cpp/sjp/query/view/CaseAssignmentRestrictionView.java +++ b/sjp-query/sjp-query-view/src/main/java/uk/gov/moj/cpp/sjp/query/view/CaseAssignmentRestrictionView.java @@ -18,9 +18,9 @@ import java.util.List; import java.util.Optional; -import javax.inject.Inject; -import javax.json.JsonArrayBuilder; -import javax.json.JsonObject; +import jakarta.inject.Inject; +import jakarta.json.JsonArrayBuilder; +import jakarta.json.JsonObject; import com.fasterxml.jackson.databind.ObjectMapper; import org.slf4j.Logger; diff --git a/sjp-query/sjp-query-view/src/main/java/uk/gov/moj/cpp/sjp/query/view/CaseNotesQueryView.java b/sjp-query/sjp-query-view/src/main/java/uk/gov/moj/cpp/sjp/query/view/CaseNotesQueryView.java index f0c21d7fda..ef06dd4cfc 100644 --- a/sjp-query/sjp-query-view/src/main/java/uk/gov/moj/cpp/sjp/query/view/CaseNotesQueryView.java +++ b/sjp-query/sjp-query-view/src/main/java/uk/gov/moj/cpp/sjp/query/view/CaseNotesQueryView.java @@ -19,10 +19,10 @@ import java.util.UUID; -import javax.inject.Inject; -import javax.json.JsonArray; -import javax.json.JsonObjectBuilder; -import javax.json.JsonValue; +import jakarta.inject.Inject; +import jakarta.json.JsonArray; +import jakarta.json.JsonObjectBuilder; +import jakarta.json.JsonValue; @ServiceComponent(Component.QUERY_VIEW) public class CaseNotesQueryView { diff --git a/sjp-query/sjp-query-view/src/main/java/uk/gov/moj/cpp/sjp/query/view/RegionsQueryView.java b/sjp-query/sjp-query-view/src/main/java/uk/gov/moj/cpp/sjp/query/view/RegionsQueryView.java index 2e9babc217..8b20d22cfd 100644 --- a/sjp-query/sjp-query-view/src/main/java/uk/gov/moj/cpp/sjp/query/view/RegionsQueryView.java +++ b/sjp-query/sjp-query-view/src/main/java/uk/gov/moj/cpp/sjp/query/view/RegionsQueryView.java @@ -16,7 +16,7 @@ import java.util.List; -import javax.inject.Inject; +import jakarta.inject.Inject; @ServiceComponent(Component.QUERY_VIEW) public class RegionsQueryView { diff --git a/sjp-query/sjp-query-view/src/main/java/uk/gov/moj/cpp/sjp/query/view/ResultsView.java b/sjp-query/sjp-query-view/src/main/java/uk/gov/moj/cpp/sjp/query/view/ResultsView.java index e187cf61f1..400189b9c7 100644 --- a/sjp-query/sjp-query-view/src/main/java/uk/gov/moj/cpp/sjp/query/view/ResultsView.java +++ b/sjp-query/sjp-query-view/src/main/java/uk/gov/moj/cpp/sjp/query/view/ResultsView.java @@ -7,8 +7,8 @@ import uk.gov.justice.services.messaging.JsonEnvelope; import uk.gov.moj.cpp.sjp.query.view.service.ResultsService; -import javax.inject.Inject; -import javax.json.JsonObject; +import jakarta.inject.Inject; +import jakarta.json.JsonObject; @SuppressWarnings("WeakerAccess") @ServiceComponent(Component.QUERY_VIEW) diff --git a/sjp-query/sjp-query-view/src/main/java/uk/gov/moj/cpp/sjp/query/view/SessionQueryView.java b/sjp-query/sjp-query-view/src/main/java/uk/gov/moj/cpp/sjp/query/view/SessionQueryView.java index e1e3d334e8..3a4fbde4f7 100644 --- a/sjp-query/sjp-query-view/src/main/java/uk/gov/moj/cpp/sjp/query/view/SessionQueryView.java +++ b/sjp-query/sjp-query-view/src/main/java/uk/gov/moj/cpp/sjp/query/view/SessionQueryView.java @@ -16,7 +16,7 @@ import java.util.Optional; import java.util.UUID; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/sjp-query/sjp-query-view/src/main/java/uk/gov/moj/cpp/sjp/query/view/SjpCaseCourtExtractView.java b/sjp-query/sjp-query-view/src/main/java/uk/gov/moj/cpp/sjp/query/view/SjpCaseCourtExtractView.java index fe3a045160..65898acd6a 100644 --- a/sjp-query/sjp-query-view/src/main/java/uk/gov/moj/cpp/sjp/query/view/SjpCaseCourtExtractView.java +++ b/sjp-query/sjp-query-view/src/main/java/uk/gov/moj/cpp/sjp/query/view/SjpCaseCourtExtractView.java @@ -13,7 +13,7 @@ import java.util.UUID; -import javax.inject.Inject; +import jakarta.inject.Inject; @ServiceComponent(Component.QUERY_VIEW) public class SjpCaseCourtExtractView { diff --git a/sjp-query/sjp-query-view/src/main/java/uk/gov/moj/cpp/sjp/query/view/SjpDocumentView.java b/sjp-query/sjp-query-view/src/main/java/uk/gov/moj/cpp/sjp/query/view/SjpDocumentView.java index 7f65629865..f66a056002 100644 --- a/sjp-query/sjp-query-view/src/main/java/uk/gov/moj/cpp/sjp/query/view/SjpDocumentView.java +++ b/sjp-query/sjp-query-view/src/main/java/uk/gov/moj/cpp/sjp/query/view/SjpDocumentView.java @@ -12,8 +12,8 @@ import java.util.Optional; import java.util.UUID; -import javax.inject.Inject; -import javax.json.JsonObject; +import jakarta.inject.Inject; +import jakarta.json.JsonObject; @ServiceComponent(Component.QUERY_VIEW) public class SjpDocumentView { diff --git a/sjp-query/sjp-query-view/src/main/java/uk/gov/moj/cpp/sjp/query/view/SjpQueryView.java b/sjp-query/sjp-query-view/src/main/java/uk/gov/moj/cpp/sjp/query/view/SjpQueryView.java index 6212ee6e1b..36bb9259c6 100644 --- a/sjp-query/sjp-query-view/src/main/java/uk/gov/moj/cpp/sjp/query/view/SjpQueryView.java +++ b/sjp-query/sjp-query-view/src/main/java/uk/gov/moj/cpp/sjp/query/view/SjpQueryView.java @@ -74,10 +74,10 @@ import java.util.Set; import java.util.UUID; -import javax.inject.Inject; -import javax.json.JsonArrayBuilder; -import javax.json.JsonObject; -import javax.persistence.NoResultException; +import jakarta.inject.Inject; +import jakarta.json.JsonArrayBuilder; +import jakarta.json.JsonObject; +import jakarta.persistence.NoResultException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/sjp-query/sjp-query-view/src/main/java/uk/gov/moj/cpp/sjp/query/view/SjpReadyCasesQueryView.java b/sjp-query/sjp-query-view/src/main/java/uk/gov/moj/cpp/sjp/query/view/SjpReadyCasesQueryView.java index b8c9451e2c..7b63e0be9c 100644 --- a/sjp-query/sjp-query-view/src/main/java/uk/gov/moj/cpp/sjp/query/view/SjpReadyCasesQueryView.java +++ b/sjp-query/sjp-query-view/src/main/java/uk/gov/moj/cpp/sjp/query/view/SjpReadyCasesQueryView.java @@ -15,10 +15,10 @@ import java.util.Optional; import java.util.UUID; -import javax.inject.Inject; -import javax.json.JsonArray; -import javax.json.JsonObject; -import javax.json.JsonObjectBuilder; +import jakarta.inject.Inject; +import jakarta.json.JsonArray; +import jakarta.json.JsonObject; +import jakarta.json.JsonObjectBuilder; @SuppressWarnings("WeakerAccess") @ServiceComponent(Component.QUERY_VIEW) diff --git a/sjp-query/sjp-query-view/src/main/java/uk/gov/moj/cpp/sjp/query/view/converter/AbstractOffenceDecisionResult.java b/sjp-query/sjp-query-view/src/main/java/uk/gov/moj/cpp/sjp/query/view/converter/AbstractOffenceDecisionResult.java index 4edee75dd1..4bea678542 100644 --- a/sjp-query/sjp-query-view/src/main/java/uk/gov/moj/cpp/sjp/query/view/converter/AbstractOffenceDecisionResult.java +++ b/sjp-query/sjp-query-view/src/main/java/uk/gov/moj/cpp/sjp/query/view/converter/AbstractOffenceDecisionResult.java @@ -5,9 +5,9 @@ import uk.gov.moj.cpp.sjp.query.view.service.CachedReferenceData; -import javax.json.JsonArrayBuilder; -import javax.json.JsonObject; -import javax.json.JsonObjectBuilder; +import jakarta.json.JsonArrayBuilder; +import jakarta.json.JsonObject; +import jakarta.json.JsonObjectBuilder; public abstract class AbstractOffenceDecisionResult { diff --git a/sjp-query/sjp-query-view/src/main/java/uk/gov/moj/cpp/sjp/query/view/converter/DecisionSavedOffenceConverter.java b/sjp-query/sjp-query-view/src/main/java/uk/gov/moj/cpp/sjp/query/view/converter/DecisionSavedOffenceConverter.java index ece4c80208..a2e9286e19 100644 --- a/sjp-query/sjp-query-view/src/main/java/uk/gov/moj/cpp/sjp/query/view/converter/DecisionSavedOffenceConverter.java +++ b/sjp-query/sjp-query-view/src/main/java/uk/gov/moj/cpp/sjp/query/view/converter/DecisionSavedOffenceConverter.java @@ -63,8 +63,8 @@ import uk.gov.moj.cpp.sjp.query.view.response.FinancialImpositionView; import uk.gov.moj.cpp.sjp.query.view.response.OffenceDecisionView; -import javax.json.JsonObject; -import javax.json.JsonObjectBuilder; +import jakarta.json.JsonObject; +import jakarta.json.JsonObjectBuilder; public class DecisionSavedOffenceConverter { diff --git a/sjp-query/sjp-query-view/src/main/java/uk/gov/moj/cpp/sjp/query/view/converter/DismissDecisionResult.java b/sjp-query/sjp-query-view/src/main/java/uk/gov/moj/cpp/sjp/query/view/converter/DismissDecisionResult.java index 233f81ecd6..d626175b5a 100644 --- a/sjp-query/sjp-query-view/src/main/java/uk/gov/moj/cpp/sjp/query/view/converter/DismissDecisionResult.java +++ b/sjp-query/sjp-query-view/src/main/java/uk/gov/moj/cpp/sjp/query/view/converter/DismissDecisionResult.java @@ -4,8 +4,8 @@ import uk.gov.moj.cpp.sjp.query.view.service.CachedReferenceData; -import javax.json.JsonObject; -import javax.json.JsonObjectBuilder; +import jakarta.json.JsonObject; +import jakarta.json.JsonObjectBuilder; public class DismissDecisionResult extends AbstractOffenceDecisionResult { diff --git a/sjp-query/sjp-query-view/src/main/java/uk/gov/moj/cpp/sjp/query/view/converter/FixedListConverterUtil.java b/sjp-query/sjp-query-view/src/main/java/uk/gov/moj/cpp/sjp/query/view/converter/FixedListConverterUtil.java index 23c697b7e0..f953328d46 100644 --- a/sjp-query/sjp-query-view/src/main/java/uk/gov/moj/cpp/sjp/query/view/converter/FixedListConverterUtil.java +++ b/sjp-query/sjp-query-view/src/main/java/uk/gov/moj/cpp/sjp/query/view/converter/FixedListConverterUtil.java @@ -5,7 +5,7 @@ import java.util.Map; import java.util.Optional; -import javax.json.JsonObject; +import jakarta.json.JsonObject; public class FixedListConverterUtil { diff --git a/sjp-query/sjp-query-view/src/main/java/uk/gov/moj/cpp/sjp/query/view/converter/PressRestrictionResult.java b/sjp-query/sjp-query-view/src/main/java/uk/gov/moj/cpp/sjp/query/view/converter/PressRestrictionResult.java index 0b6e58c0d2..47fcc5088a 100644 --- a/sjp-query/sjp-query-view/src/main/java/uk/gov/moj/cpp/sjp/query/view/converter/PressRestrictionResult.java +++ b/sjp-query/sjp-query-view/src/main/java/uk/gov/moj/cpp/sjp/query/view/converter/PressRestrictionResult.java @@ -7,9 +7,9 @@ import uk.gov.moj.cpp.sjp.query.view.service.CachedReferenceData; -import javax.json.JsonArrayBuilder; -import javax.json.JsonObject; -import javax.json.JsonObjectBuilder; +import jakarta.json.JsonArrayBuilder; +import jakarta.json.JsonObject; +import jakarta.json.JsonObjectBuilder; public class PressRestrictionResult { diff --git a/sjp-query/sjp-query-view/src/main/java/uk/gov/moj/cpp/sjp/query/view/converter/Prompt.java b/sjp-query/sjp-query-view/src/main/java/uk/gov/moj/cpp/sjp/query/view/converter/Prompt.java index f10339febb..ffe64386b0 100644 --- a/sjp-query/sjp-query-view/src/main/java/uk/gov/moj/cpp/sjp/query/view/converter/Prompt.java +++ b/sjp-query/sjp-query-view/src/main/java/uk/gov/moj/cpp/sjp/query/view/converter/Prompt.java @@ -15,8 +15,8 @@ import java.util.UUID; import java.util.function.Supplier; -import javax.json.JsonArrayBuilder; -import javax.json.JsonObject; +import jakarta.json.JsonArrayBuilder; +import jakarta.json.JsonObject; public enum Prompt { diff --git a/sjp-query/sjp-query-view/src/main/java/uk/gov/moj/cpp/sjp/query/view/converter/ReferencedDecisionSavedOffenceConverter.java b/sjp-query/sjp-query-view/src/main/java/uk/gov/moj/cpp/sjp/query/view/converter/ReferencedDecisionSavedOffenceConverter.java index 5d3af7b237..537029ed93 100644 --- a/sjp-query/sjp-query-view/src/main/java/uk/gov/moj/cpp/sjp/query/view/converter/ReferencedDecisionSavedOffenceConverter.java +++ b/sjp-query/sjp-query-view/src/main/java/uk/gov/moj/cpp/sjp/query/view/converter/ReferencedDecisionSavedOffenceConverter.java @@ -26,12 +26,12 @@ import java.util.Map; import java.util.Optional; -import javax.inject.Inject; -import javax.json.JsonArray; -import javax.json.JsonArrayBuilder; -import javax.json.JsonNumber; -import javax.json.JsonObject; -import javax.json.JsonObjectBuilder; +import jakarta.inject.Inject; +import jakarta.json.JsonArray; +import jakarta.json.JsonArrayBuilder; +import jakarta.json.JsonNumber; +import jakarta.json.JsonObject; +import jakarta.json.JsonObjectBuilder; import com.google.common.annotations.VisibleForTesting; import com.google.common.collect.ImmutableMap; diff --git a/sjp-query/sjp-query-view/src/main/java/uk/gov/moj/cpp/sjp/query/view/converter/ResultCode.java b/sjp-query/sjp-query-view/src/main/java/uk/gov/moj/cpp/sjp/query/view/converter/ResultCode.java index 57b7b5f394..9086539a0e 100644 --- a/sjp-query/sjp-query-view/src/main/java/uk/gov/moj/cpp/sjp/query/view/converter/ResultCode.java +++ b/sjp-query/sjp-query-view/src/main/java/uk/gov/moj/cpp/sjp/query/view/converter/ResultCode.java @@ -50,8 +50,8 @@ import java.util.UUID; import java.util.function.Supplier; -import javax.json.JsonArrayBuilder; -import javax.json.JsonObject; +import jakarta.json.JsonArrayBuilder; +import jakarta.json.JsonObject; import org.slf4j.Logger; diff --git a/sjp-query/sjp-query-view/src/main/java/uk/gov/moj/cpp/sjp/query/view/converter/SetAsideDecisionResult.java b/sjp-query/sjp-query-view/src/main/java/uk/gov/moj/cpp/sjp/query/view/converter/SetAsideDecisionResult.java index a7068c5567..7e5557d549 100644 --- a/sjp-query/sjp-query-view/src/main/java/uk/gov/moj/cpp/sjp/query/view/converter/SetAsideDecisionResult.java +++ b/sjp-query/sjp-query-view/src/main/java/uk/gov/moj/cpp/sjp/query/view/converter/SetAsideDecisionResult.java @@ -4,8 +4,8 @@ import uk.gov.moj.cpp.sjp.query.view.service.CachedReferenceData; -import javax.json.JsonObject; -import javax.json.JsonObjectBuilder; +import jakarta.json.JsonObject; +import jakarta.json.JsonObjectBuilder; public class SetAsideDecisionResult extends AbstractOffenceDecisionResult { diff --git a/sjp-query/sjp-query-view/src/main/java/uk/gov/moj/cpp/sjp/query/view/converter/WithdrawDecisionResult.java b/sjp-query/sjp-query-view/src/main/java/uk/gov/moj/cpp/sjp/query/view/converter/WithdrawDecisionResult.java index 0751fa0725..8b3e2f2d58 100644 --- a/sjp-query/sjp-query-view/src/main/java/uk/gov/moj/cpp/sjp/query/view/converter/WithdrawDecisionResult.java +++ b/sjp-query/sjp-query-view/src/main/java/uk/gov/moj/cpp/sjp/query/view/converter/WithdrawDecisionResult.java @@ -8,8 +8,8 @@ import java.util.UUID; -import javax.json.JsonObject; -import javax.json.JsonObjectBuilder; +import jakarta.json.JsonObject; +import jakarta.json.JsonObjectBuilder; public class WithdrawDecisionResult extends AbstractOffenceDecisionResult { diff --git a/sjp-query/sjp-query-view/src/main/java/uk/gov/moj/cpp/sjp/query/view/converter/prompts/EmployerPromptConverter.java b/sjp-query/sjp-query-view/src/main/java/uk/gov/moj/cpp/sjp/query/view/converter/prompts/EmployerPromptConverter.java index cc4c5b9956..e7b4847a4b 100644 --- a/sjp-query/sjp-query-view/src/main/java/uk/gov/moj/cpp/sjp/query/view/converter/prompts/EmployerPromptConverter.java +++ b/sjp-query/sjp-query-view/src/main/java/uk/gov/moj/cpp/sjp/query/view/converter/prompts/EmployerPromptConverter.java @@ -12,8 +12,8 @@ import java.util.Optional; import java.util.UUID; -import javax.json.JsonArrayBuilder; -import javax.json.JsonObject; +import jakarta.json.JsonArrayBuilder; +import jakarta.json.JsonObject; public class EmployerPromptConverter extends PromptConverter { diff --git a/sjp-query/sjp-query-view/src/main/java/uk/gov/moj/cpp/sjp/query/view/converter/prompts/FixedListPromptConverter.java b/sjp-query/sjp-query-view/src/main/java/uk/gov/moj/cpp/sjp/query/view/converter/prompts/FixedListPromptConverter.java index adf1aee0a2..21be73ae89 100644 --- a/sjp-query/sjp-query-view/src/main/java/uk/gov/moj/cpp/sjp/query/view/converter/prompts/FixedListPromptConverter.java +++ b/sjp-query/sjp-query-view/src/main/java/uk/gov/moj/cpp/sjp/query/view/converter/prompts/FixedListPromptConverter.java @@ -9,8 +9,8 @@ import java.util.Optional; -import javax.json.JsonArrayBuilder; -import javax.json.JsonObject; +import jakarta.json.JsonArrayBuilder; +import jakarta.json.JsonObject; public class FixedListPromptConverter extends PromptConverter { diff --git a/sjp-query/sjp-query-view/src/main/java/uk/gov/moj/cpp/sjp/query/view/converter/prompts/HardcodedValuePromptConverter.java b/sjp-query/sjp-query-view/src/main/java/uk/gov/moj/cpp/sjp/query/view/converter/prompts/HardcodedValuePromptConverter.java index 709c690593..637f24f3ec 100644 --- a/sjp-query/sjp-query-view/src/main/java/uk/gov/moj/cpp/sjp/query/view/converter/prompts/HardcodedValuePromptConverter.java +++ b/sjp-query/sjp-query-view/src/main/java/uk/gov/moj/cpp/sjp/query/view/converter/prompts/HardcodedValuePromptConverter.java @@ -4,8 +4,8 @@ import uk.gov.moj.cpp.sjp.query.view.converter.Prompt; import uk.gov.moj.cpp.sjp.query.view.service.OffenceDataSupplier; -import javax.json.JsonArrayBuilder; -import javax.json.JsonObject; +import jakarta.json.JsonArrayBuilder; +import jakarta.json.JsonObject; public class HardcodedValuePromptConverter extends PromptConverter { diff --git a/sjp-query/sjp-query-view/src/main/java/uk/gov/moj/cpp/sjp/query/view/converter/prompts/LsumDatePromptConverter.java b/sjp-query/sjp-query-view/src/main/java/uk/gov/moj/cpp/sjp/query/view/converter/prompts/LsumDatePromptConverter.java index 0457a6908c..7cdd6e4b0c 100644 --- a/sjp-query/sjp-query-view/src/main/java/uk/gov/moj/cpp/sjp/query/view/converter/prompts/LsumDatePromptConverter.java +++ b/sjp-query/sjp-query-view/src/main/java/uk/gov/moj/cpp/sjp/query/view/converter/prompts/LsumDatePromptConverter.java @@ -13,8 +13,8 @@ import java.time.LocalDate; import java.util.Optional; -import javax.json.JsonArrayBuilder; -import javax.json.JsonObject; +import jakarta.json.JsonArrayBuilder; +import jakarta.json.JsonObject; public class LsumDatePromptConverter extends PromptConverter { diff --git a/sjp-query/sjp-query-view/src/main/java/uk/gov/moj/cpp/sjp/query/view/converter/prompts/MajorCreditorPromptConverter.java b/sjp-query/sjp-query-view/src/main/java/uk/gov/moj/cpp/sjp/query/view/converter/prompts/MajorCreditorPromptConverter.java index 46e3c39e1e..3c605c9e25 100644 --- a/sjp-query/sjp-query-view/src/main/java/uk/gov/moj/cpp/sjp/query/view/converter/prompts/MajorCreditorPromptConverter.java +++ b/sjp-query/sjp-query-view/src/main/java/uk/gov/moj/cpp/sjp/query/view/converter/prompts/MajorCreditorPromptConverter.java @@ -11,8 +11,8 @@ import java.util.Optional; -import javax.json.JsonArrayBuilder; -import javax.json.JsonObject; +import jakarta.json.JsonArrayBuilder; +import jakarta.json.JsonObject; public class MajorCreditorPromptConverter extends PromptConverter{ diff --git a/sjp-query/sjp-query-view/src/main/java/uk/gov/moj/cpp/sjp/query/view/converter/prompts/NoActionPromptConverter.java b/sjp-query/sjp-query-view/src/main/java/uk/gov/moj/cpp/sjp/query/view/converter/prompts/NoActionPromptConverter.java index 85c6de647d..22c598a5b9 100644 --- a/sjp-query/sjp-query-view/src/main/java/uk/gov/moj/cpp/sjp/query/view/converter/prompts/NoActionPromptConverter.java +++ b/sjp-query/sjp-query-view/src/main/java/uk/gov/moj/cpp/sjp/query/view/converter/prompts/NoActionPromptConverter.java @@ -3,8 +3,8 @@ import uk.gov.moj.cpp.sjp.query.view.converter.Prompt; import uk.gov.moj.cpp.sjp.query.view.service.OffenceDataSupplier; -import javax.json.JsonArrayBuilder; -import javax.json.JsonObject; +import jakarta.json.JsonArrayBuilder; +import jakarta.json.JsonObject; public class NoActionPromptConverter extends PromptConverter { diff --git a/sjp-query/sjp-query-view/src/main/java/uk/gov/moj/cpp/sjp/query/view/converter/prompts/PromptConverter.java b/sjp-query/sjp-query-view/src/main/java/uk/gov/moj/cpp/sjp/query/view/converter/prompts/PromptConverter.java index 11d54f3547..52a68186b7 100644 --- a/sjp-query/sjp-query-view/src/main/java/uk/gov/moj/cpp/sjp/query/view/converter/prompts/PromptConverter.java +++ b/sjp-query/sjp-query-view/src/main/java/uk/gov/moj/cpp/sjp/query/view/converter/prompts/PromptConverter.java @@ -10,8 +10,8 @@ import java.util.Optional; import java.util.UUID; -import javax.json.JsonArrayBuilder; -import javax.json.JsonObject; +import jakarta.json.JsonArrayBuilder; +import jakarta.json.JsonObject; public class PromptConverter { diff --git a/sjp-query/sjp-query-view/src/main/java/uk/gov/moj/cpp/sjp/query/view/converter/results/CDResultCodeConverter.java b/sjp-query/sjp-query-view/src/main/java/uk/gov/moj/cpp/sjp/query/view/converter/results/CDResultCodeConverter.java index 9457443ef0..d7913c9595 100644 --- a/sjp-query/sjp-query-view/src/main/java/uk/gov/moj/cpp/sjp/query/view/converter/results/CDResultCodeConverter.java +++ b/sjp-query/sjp-query-view/src/main/java/uk/gov/moj/cpp/sjp/query/view/converter/results/CDResultCodeConverter.java @@ -28,8 +28,8 @@ import java.util.Map; import java.util.Optional; -import javax.json.JsonArrayBuilder; -import javax.json.JsonObject; +import jakarta.json.JsonArrayBuilder; +import jakarta.json.JsonObject; import org.apache.commons.collections.MapUtils; diff --git a/sjp-query/sjp-query-view/src/main/java/uk/gov/moj/cpp/sjp/query/view/converter/results/NCOLLOResultCodeConverter.java b/sjp-query/sjp-query-view/src/main/java/uk/gov/moj/cpp/sjp/query/view/converter/results/NCOLLOResultCodeConverter.java index e3d08cb89b..6cc43353a3 100644 --- a/sjp-query/sjp-query-view/src/main/java/uk/gov/moj/cpp/sjp/query/view/converter/results/NCOLLOResultCodeConverter.java +++ b/sjp-query/sjp-query-view/src/main/java/uk/gov/moj/cpp/sjp/query/view/converter/results/NCOLLOResultCodeConverter.java @@ -9,8 +9,8 @@ import java.util.Arrays; import java.util.List; -import javax.json.JsonArrayBuilder; -import javax.json.JsonObject; +import jakarta.json.JsonArrayBuilder; +import jakarta.json.JsonObject; public class NCOLLOResultCodeConverter extends ResultCodeConverter { diff --git a/sjp-query/sjp-query-view/src/main/java/uk/gov/moj/cpp/sjp/query/view/converter/results/ResultCodeConverter.java b/sjp-query/sjp-query-view/src/main/java/uk/gov/moj/cpp/sjp/query/view/converter/results/ResultCodeConverter.java index 41cd7b4a07..046c02fa8e 100644 --- a/sjp-query/sjp-query-view/src/main/java/uk/gov/moj/cpp/sjp/query/view/converter/results/ResultCodeConverter.java +++ b/sjp-query/sjp-query-view/src/main/java/uk/gov/moj/cpp/sjp/query/view/converter/results/ResultCodeConverter.java @@ -10,8 +10,8 @@ import java.util.List; -import javax.json.JsonArrayBuilder; -import javax.json.JsonObject; +import jakarta.json.JsonArrayBuilder; +import jakarta.json.JsonObject; public abstract class ResultCodeConverter { diff --git a/sjp-query/sjp-query-view/src/main/java/uk/gov/moj/cpp/sjp/query/view/response/ApplicationView.java b/sjp-query/sjp-query-view/src/main/java/uk/gov/moj/cpp/sjp/query/view/response/ApplicationView.java index bcae49c935..e6a4b81601 100644 --- a/sjp-query/sjp-query-view/src/main/java/uk/gov/moj/cpp/sjp/query/view/response/ApplicationView.java +++ b/sjp-query/sjp-query-view/src/main/java/uk/gov/moj/cpp/sjp/query/view/response/ApplicationView.java @@ -10,7 +10,7 @@ import java.util.List; import java.util.UUID; -import javax.json.JsonObject; +import jakarta.json.JsonObject; public class ApplicationView { diff --git a/sjp-query/sjp-query-view/src/main/java/uk/gov/moj/cpp/sjp/query/view/response/CaseView.java b/sjp-query/sjp-query-view/src/main/java/uk/gov/moj/cpp/sjp/query/view/response/CaseView.java index 96f6cc83fa..018d61537e 100644 --- a/sjp-query/sjp-query-view/src/main/java/uk/gov/moj/cpp/sjp/query/view/response/CaseView.java +++ b/sjp-query/sjp-query-view/src/main/java/uk/gov/moj/cpp/sjp/query/view/response/CaseView.java @@ -25,7 +25,7 @@ import java.util.Objects; import java.util.Set; -import javax.json.JsonObject; +import jakarta.json.JsonObject; public class CaseView { diff --git a/sjp-query/sjp-query-view/src/main/java/uk/gov/moj/cpp/sjp/query/view/service/AssignmentService.java b/sjp-query/sjp-query-view/src/main/java/uk/gov/moj/cpp/sjp/query/view/service/AssignmentService.java index a1a99269cf..f7e730b01e 100644 --- a/sjp-query/sjp-query-view/src/main/java/uk/gov/moj/cpp/sjp/query/view/service/AssignmentService.java +++ b/sjp-query/sjp-query-view/src/main/java/uk/gov/moj/cpp/sjp/query/view/service/AssignmentService.java @@ -10,7 +10,7 @@ import java.util.Set; import java.util.UUID; -import javax.inject.Inject; +import jakarta.inject.Inject; public class AssignmentService { diff --git a/sjp-query/sjp-query-view/src/main/java/uk/gov/moj/cpp/sjp/query/view/service/CachedReferenceData.java b/sjp-query/sjp-query-view/src/main/java/uk/gov/moj/cpp/sjp/query/view/service/CachedReferenceData.java index a39d39a587..2f422c89a3 100644 --- a/sjp-query/sjp-query-view/src/main/java/uk/gov/moj/cpp/sjp/query/view/service/CachedReferenceData.java +++ b/sjp-query/sjp-query-view/src/main/java/uk/gov/moj/cpp/sjp/query/view/service/CachedReferenceData.java @@ -12,7 +12,7 @@ import java.util.Map; import java.util.UUID; -import javax.json.JsonObject; +import jakarta.json.JsonObject; import org.apache.commons.collections.MapUtils; diff --git a/sjp-query/sjp-query-view/src/main/java/uk/gov/moj/cpp/sjp/query/view/service/CaseApplicationService.java b/sjp-query/sjp-query-view/src/main/java/uk/gov/moj/cpp/sjp/query/view/service/CaseApplicationService.java index 2bed908f42..9bda36a6b3 100644 --- a/sjp-query/sjp-query-view/src/main/java/uk/gov/moj/cpp/sjp/query/view/service/CaseApplicationService.java +++ b/sjp-query/sjp-query-view/src/main/java/uk/gov/moj/cpp/sjp/query/view/service/CaseApplicationService.java @@ -52,11 +52,11 @@ import java.util.UUID; import java.util.stream.Collectors; -import javax.inject.Inject; -import javax.json.JsonArrayBuilder; -import javax.json.JsonObject; -import javax.json.JsonObjectBuilder; -import javax.json.JsonValue; +import jakarta.inject.Inject; +import jakarta.json.JsonArrayBuilder; +import jakarta.json.JsonObject; +import jakarta.json.JsonObjectBuilder; +import jakarta.json.JsonValue; public class CaseApplicationService { diff --git a/sjp-query/sjp-query-view/src/main/java/uk/gov/moj/cpp/sjp/query/view/service/CaseService.java b/sjp-query/sjp-query-view/src/main/java/uk/gov/moj/cpp/sjp/query/view/service/CaseService.java index 1fbd8b6490..724ea81595 100644 --- a/sjp-query/sjp-query-view/src/main/java/uk/gov/moj/cpp/sjp/query/view/service/CaseService.java +++ b/sjp-query/sjp-query-view/src/main/java/uk/gov/moj/cpp/sjp/query/view/service/CaseService.java @@ -66,21 +66,25 @@ import java.util.function.Predicate; import java.util.stream.Collectors; -import javax.inject.Inject; -import javax.json.JsonArray; -import javax.json.JsonArrayBuilder; -import javax.json.JsonObject; -import javax.json.JsonObjectBuilder; -import javax.persistence.NoResultException; -import javax.persistence.NonUniqueResultException; +import jakarta.inject.Inject; +import jakarta.json.JsonArray; +import jakarta.json.JsonArrayBuilder; +import jakarta.json.JsonObject; +import jakarta.json.JsonObjectBuilder; +import jakarta.persistence.NoResultException; +import jakarta.persistence.NonUniqueResultException; import com.google.common.collect.Sets; import org.apache.commons.lang3.StringUtils; -import org.apache.deltaspike.data.api.QueryResult; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.persistence.TypedQuery; +import jakarta.transaction.Transactional; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @SuppressWarnings("WeakerAccess") +@ApplicationScoped +@Transactional public class CaseService { private static final Logger LOGGER = LoggerFactory.getLogger(CaseService.class); @@ -194,7 +198,7 @@ public CasesMissingSjpnView findCasesMissingSjpn(final JsonEnvelope envelope, if (limit.isPresent() && limit.get() < 1) { casesDetails = Collections.emptyList(); } else { - QueryResult caseDetailsResult; + TypedQuery caseDetailsResult; if (postedBefore.isPresent()) { caseDetailsResult = caseRepository.findCasesMissingSjpn(prosecutingAuthorityFilterValue, postedBefore.get(), @@ -205,7 +209,7 @@ public CasesMissingSjpnView findCasesMissingSjpn(final JsonEnvelope envelope, } if (limit.isPresent()) { - casesDetails = caseDetailsResult.maxResults(limit.get()).getResultList(); + casesDetails = caseDetailsResult.setMaxResults(limit.get()).getResultList(); } else { casesDetails = caseDetailsResult.getResultList(); } diff --git a/sjp-query/sjp-query-view/src/main/java/uk/gov/moj/cpp/sjp/query/view/service/CourtExtractDataService.java b/sjp-query/sjp-query-view/src/main/java/uk/gov/moj/cpp/sjp/query/view/service/CourtExtractDataService.java index cb8965cd17..a8526df7cb 100644 --- a/sjp-query/sjp-query-view/src/main/java/uk/gov/moj/cpp/sjp/query/view/service/CourtExtractDataService.java +++ b/sjp-query/sjp-query-view/src/main/java/uk/gov/moj/cpp/sjp/query/view/service/CourtExtractDataService.java @@ -27,9 +27,13 @@ import java.util.UUID; import java.util.stream.Stream; -import javax.inject.Inject; -import javax.json.JsonObject; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; +import jakarta.json.JsonObject; +import jakarta.transaction.Transactional; +@ApplicationScoped +@Transactional public class CourtExtractDataService { @Inject diff --git a/sjp-query/sjp-query-view/src/main/java/uk/gov/moj/cpp/sjp/query/view/service/DatesToAvoidService.java b/sjp-query/sjp-query-view/src/main/java/uk/gov/moj/cpp/sjp/query/view/service/DatesToAvoidService.java index 5d01d518c7..5aef465dca 100644 --- a/sjp-query/sjp-query-view/src/main/java/uk/gov/moj/cpp/sjp/query/view/service/DatesToAvoidService.java +++ b/sjp-query/sjp-query-view/src/main/java/uk/gov/moj/cpp/sjp/query/view/service/DatesToAvoidService.java @@ -15,7 +15,7 @@ import java.util.List; import java.util.stream.Collectors; -import javax.inject.Inject; +import jakarta.inject.Inject; public class DatesToAvoidService { diff --git a/sjp-query/sjp-query-view/src/main/java/uk/gov/moj/cpp/sjp/query/view/service/DefendantService.java b/sjp-query/sjp-query-view/src/main/java/uk/gov/moj/cpp/sjp/query/view/service/DefendantService.java index 939e48b35a..2b06a00691 100644 --- a/sjp-query/sjp-query-view/src/main/java/uk/gov/moj/cpp/sjp/query/view/service/DefendantService.java +++ b/sjp-query/sjp-query-view/src/main/java/uk/gov/moj/cpp/sjp/query/view/service/DefendantService.java @@ -23,7 +23,7 @@ import java.util.UUID; import java.util.stream.Collectors; -import javax.inject.Inject; +import jakarta.inject.Inject; public class DefendantService { diff --git a/sjp-query/sjp-query-view/src/main/java/uk/gov/moj/cpp/sjp/query/view/service/EmployerService.java b/sjp-query/sjp-query-view/src/main/java/uk/gov/moj/cpp/sjp/query/view/service/EmployerService.java index ca739802df..39f6414f11 100644 --- a/sjp-query/sjp-query-view/src/main/java/uk/gov/moj/cpp/sjp/query/view/service/EmployerService.java +++ b/sjp-query/sjp-query-view/src/main/java/uk/gov/moj/cpp/sjp/query/view/service/EmployerService.java @@ -7,7 +7,7 @@ import java.util.Optional; import java.util.UUID; -import javax.inject.Inject; +import jakarta.inject.Inject; public class EmployerService { diff --git a/sjp-query/sjp-query-view/src/main/java/uk/gov/moj/cpp/sjp/query/view/service/FinancialMeansService.java b/sjp-query/sjp-query-view/src/main/java/uk/gov/moj/cpp/sjp/query/view/service/FinancialMeansService.java index 252aa2c296..50bcd4ca6a 100644 --- a/sjp-query/sjp-query-view/src/main/java/uk/gov/moj/cpp/sjp/query/view/service/FinancialMeansService.java +++ b/sjp-query/sjp-query-view/src/main/java/uk/gov/moj/cpp/sjp/query/view/service/FinancialMeansService.java @@ -11,7 +11,7 @@ import java.util.Optional; import java.util.UUID; -import javax.inject.Inject; +import jakarta.inject.Inject; public class FinancialMeansService { diff --git a/sjp-query/sjp-query-view/src/main/java/uk/gov/moj/cpp/sjp/query/view/service/OffenceDataSupplier.java b/sjp-query/sjp-query-view/src/main/java/uk/gov/moj/cpp/sjp/query/view/service/OffenceDataSupplier.java index f273003069..bfc7a80776 100644 --- a/sjp-query/sjp-query-view/src/main/java/uk/gov/moj/cpp/sjp/query/view/service/OffenceDataSupplier.java +++ b/sjp-query/sjp-query-view/src/main/java/uk/gov/moj/cpp/sjp/query/view/service/OffenceDataSupplier.java @@ -8,7 +8,7 @@ import java.util.Optional; -import javax.json.JsonObject; +import jakarta.json.JsonObject; public class OffenceDataSupplier { private final JsonEnvelope sourceEnvelope; diff --git a/sjp-query/sjp-query-view/src/main/java/uk/gov/moj/cpp/sjp/query/view/service/OffenceHelper.java b/sjp-query/sjp-query-view/src/main/java/uk/gov/moj/cpp/sjp/query/view/service/OffenceHelper.java index 77a5f44324..f62344e3ae 100644 --- a/sjp-query/sjp-query-view/src/main/java/uk/gov/moj/cpp/sjp/query/view/service/OffenceHelper.java +++ b/sjp-query/sjp-query-view/src/main/java/uk/gov/moj/cpp/sjp/query/view/service/OffenceHelper.java @@ -16,11 +16,11 @@ import java.util.Optional; -import javax.inject.Inject; -import javax.json.JsonArray; -import javax.json.JsonArrayBuilder; -import javax.json.JsonObject; -import javax.json.JsonObjectBuilder; +import jakarta.inject.Inject; +import jakarta.json.JsonArray; +import jakarta.json.JsonArrayBuilder; +import jakarta.json.JsonObject; +import jakarta.json.JsonObjectBuilder; import org.slf4j.Logger; diff --git a/sjp-query/sjp-query-view/src/main/java/uk/gov/moj/cpp/sjp/query/view/service/PressTransparencyReportService.java b/sjp-query/sjp-query-view/src/main/java/uk/gov/moj/cpp/sjp/query/view/service/PressTransparencyReportService.java index b3bdc26f73..907a0671bc 100644 --- a/sjp-query/sjp-query-view/src/main/java/uk/gov/moj/cpp/sjp/query/view/service/PressTransparencyReportService.java +++ b/sjp-query/sjp-query-view/src/main/java/uk/gov/moj/cpp/sjp/query/view/service/PressTransparencyReportService.java @@ -10,8 +10,8 @@ import java.util.List; -import javax.inject.Inject; -import javax.persistence.NoResultException; +import jakarta.inject.Inject; +import jakarta.persistence.NoResultException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/sjp-query/sjp-query-view/src/main/java/uk/gov/moj/cpp/sjp/query/view/service/ProgressionService.java b/sjp-query/sjp-query-view/src/main/java/uk/gov/moj/cpp/sjp/query/view/service/ProgressionService.java index 9e38401416..ceb45be9c4 100644 --- a/sjp-query/sjp-query-view/src/main/java/uk/gov/moj/cpp/sjp/query/view/service/ProgressionService.java +++ b/sjp-query/sjp-query-view/src/main/java/uk/gov/moj/cpp/sjp/query/view/service/ProgressionService.java @@ -22,8 +22,8 @@ import java.util.UUID; import java.util.stream.Collectors; -import javax.inject.Inject; -import javax.json.JsonObject; +import jakarta.inject.Inject; +import jakarta.json.JsonObject; @SuppressWarnings("squid:CallToDeprecatedMethod") public class ProgressionService { diff --git a/sjp-query/sjp-query-view/src/main/java/uk/gov/moj/cpp/sjp/query/view/service/ProsecutionCaseFileService.java b/sjp-query/sjp-query-view/src/main/java/uk/gov/moj/cpp/sjp/query/view/service/ProsecutionCaseFileService.java index 65ca633c15..3d5c444cdf 100644 --- a/sjp-query/sjp-query-view/src/main/java/uk/gov/moj/cpp/sjp/query/view/service/ProsecutionCaseFileService.java +++ b/sjp-query/sjp-query-view/src/main/java/uk/gov/moj/cpp/sjp/query/view/service/ProsecutionCaseFileService.java @@ -15,9 +15,9 @@ import java.util.Optional; import java.util.UUID; -import javax.inject.Inject; -import javax.json.JsonObject; -import javax.json.JsonValue; +import jakarta.inject.Inject; +import jakarta.json.JsonObject; +import jakarta.json.JsonValue; public class ProsecutionCaseFileService { diff --git a/sjp-query/sjp-query-view/src/main/java/uk/gov/moj/cpp/sjp/query/view/service/ProsecutionCaseService.java b/sjp-query/sjp-query-view/src/main/java/uk/gov/moj/cpp/sjp/query/view/service/ProsecutionCaseService.java index 93e2a80a99..3d33b30c22 100644 --- a/sjp-query/sjp-query-view/src/main/java/uk/gov/moj/cpp/sjp/query/view/service/ProsecutionCaseService.java +++ b/sjp-query/sjp-query-view/src/main/java/uk/gov/moj/cpp/sjp/query/view/service/ProsecutionCaseService.java @@ -58,9 +58,9 @@ import java.util.Set; import java.util.UUID; -import javax.inject.Inject; -import javax.json.JsonArray; -import javax.json.JsonObject; +import jakarta.inject.Inject; +import jakarta.json.JsonArray; +import jakarta.json.JsonObject; import org.apache.commons.lang3.StringUtils; diff --git a/sjp-query/sjp-query-view/src/main/java/uk/gov/moj/cpp/sjp/query/view/service/ReferenceDataCachingService.java b/sjp-query/sjp-query-view/src/main/java/uk/gov/moj/cpp/sjp/query/view/service/ReferenceDataCachingService.java index 7f7c0b6681..62280b78ad 100644 --- a/sjp-query/sjp-query-view/src/main/java/uk/gov/moj/cpp/sjp/query/view/service/ReferenceDataCachingService.java +++ b/sjp-query/sjp-query-view/src/main/java/uk/gov/moj/cpp/sjp/query/view/service/ReferenceDataCachingService.java @@ -8,8 +8,8 @@ import java.util.concurrent.ExecutionException; import java.util.concurrent.TimeUnit; -import javax.inject.Inject; -import javax.json.JsonObject; +import jakarta.inject.Inject; +import jakarta.json.JsonObject; import com.google.common.cache.CacheBuilder; import com.google.common.cache.CacheLoader; diff --git a/sjp-query/sjp-query-view/src/main/java/uk/gov/moj/cpp/sjp/query/view/service/ReferenceDataOffencesService.java b/sjp-query/sjp-query-view/src/main/java/uk/gov/moj/cpp/sjp/query/view/service/ReferenceDataOffencesService.java index a98f3cc1df..4d3de5565f 100644 --- a/sjp-query/sjp-query-view/src/main/java/uk/gov/moj/cpp/sjp/query/view/service/ReferenceDataOffencesService.java +++ b/sjp-query/sjp-query-view/src/main/java/uk/gov/moj/cpp/sjp/query/view/service/ReferenceDataOffencesService.java @@ -15,8 +15,8 @@ import java.util.Map; import java.util.Set; -import javax.inject.Inject; -import javax.json.JsonObject; +import jakarta.inject.Inject; +import jakarta.json.JsonObject; public class ReferenceDataOffencesService { diff --git a/sjp-query/sjp-query-view/src/main/java/uk/gov/moj/cpp/sjp/query/view/service/ReferenceDataService.java b/sjp-query/sjp-query-view/src/main/java/uk/gov/moj/cpp/sjp/query/view/service/ReferenceDataService.java index bb80fe3726..763c064187 100644 --- a/sjp-query/sjp-query-view/src/main/java/uk/gov/moj/cpp/sjp/query/view/service/ReferenceDataService.java +++ b/sjp-query/sjp-query-view/src/main/java/uk/gov/moj/cpp/sjp/query/view/service/ReferenceDataService.java @@ -23,10 +23,10 @@ import java.util.UUID; import java.util.stream.Collectors; -import javax.inject.Inject; -import javax.json.JsonArray; -import javax.json.JsonObject; -import javax.json.JsonValue; +import jakarta.inject.Inject; +import jakarta.json.JsonArray; +import jakarta.json.JsonObject; +import jakarta.json.JsonValue; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/sjp-query/sjp-query-view/src/main/java/uk/gov/moj/cpp/sjp/query/view/service/ResultsService.java b/sjp-query/sjp-query-view/src/main/java/uk/gov/moj/cpp/sjp/query/view/service/ResultsService.java index 5024aeca5d..73b5fb9819 100644 --- a/sjp-query/sjp-query-view/src/main/java/uk/gov/moj/cpp/sjp/query/view/service/ResultsService.java +++ b/sjp-query/sjp-query-view/src/main/java/uk/gov/moj/cpp/sjp/query/view/service/ResultsService.java @@ -39,11 +39,11 @@ import java.util.UUID; import java.util.stream.Collectors; -import javax.inject.Inject; -import javax.json.JsonArray; -import javax.json.JsonArrayBuilder; -import javax.json.JsonObject; -import javax.json.JsonObjectBuilder; +import jakarta.inject.Inject; +import jakarta.json.JsonArray; +import jakarta.json.JsonArrayBuilder; +import jakarta.json.JsonObject; +import jakarta.json.JsonObjectBuilder; public class ResultsService { diff --git a/sjp-query/sjp-query-view/src/main/java/uk/gov/moj/cpp/sjp/query/view/service/TransparencyReportService.java b/sjp-query/sjp-query-view/src/main/java/uk/gov/moj/cpp/sjp/query/view/service/TransparencyReportService.java index 1b2875f2eb..9f6050e7e2 100644 --- a/sjp-query/sjp-query-view/src/main/java/uk/gov/moj/cpp/sjp/query/view/service/TransparencyReportService.java +++ b/sjp-query/sjp-query-view/src/main/java/uk/gov/moj/cpp/sjp/query/view/service/TransparencyReportService.java @@ -11,8 +11,8 @@ import java.util.List; -import javax.inject.Inject; -import javax.persistence.NoResultException; +import jakarta.inject.Inject; +import jakarta.persistence.NoResultException; import org.slf4j.Logger; diff --git a/sjp-query/sjp-query-view/src/main/java/uk/gov/moj/cpp/sjp/query/view/service/UserAndGroupsService.java b/sjp-query/sjp-query-view/src/main/java/uk/gov/moj/cpp/sjp/query/view/service/UserAndGroupsService.java index 0b530c6384..f5db69708a 100644 --- a/sjp-query/sjp-query-view/src/main/java/uk/gov/moj/cpp/sjp/query/view/service/UserAndGroupsService.java +++ b/sjp-query/sjp-query-view/src/main/java/uk/gov/moj/cpp/sjp/query/view/service/UserAndGroupsService.java @@ -23,9 +23,9 @@ import java.util.Optional; import java.util.UUID; -import javax.inject.Inject; -import javax.json.JsonArray; -import javax.json.JsonObject; +import jakarta.inject.Inject; +import jakarta.json.JsonArray; +import jakarta.json.JsonObject; import org.slf4j.Logger; diff --git a/sjp-query/sjp-query-view/src/main/java/uk/gov/moj/cpp/sjp/query/view/service/UserDetailsCacheService.java b/sjp-query/sjp-query-view/src/main/java/uk/gov/moj/cpp/sjp/query/view/service/UserDetailsCacheService.java index 2dc3c7815c..4654009a79 100644 --- a/sjp-query/sjp-query-view/src/main/java/uk/gov/moj/cpp/sjp/query/view/service/UserDetailsCacheService.java +++ b/sjp-query/sjp-query-view/src/main/java/uk/gov/moj/cpp/sjp/query/view/service/UserDetailsCacheService.java @@ -6,7 +6,7 @@ import java.util.concurrent.ExecutionException; import java.util.concurrent.TimeUnit; -import javax.inject.Inject; +import jakarta.inject.Inject; import com.google.common.cache.CacheBuilder; import com.google.common.cache.CacheLoader; diff --git a/sjp-query/sjp-query-view/src/main/java/uk/gov/moj/cpp/sjp/query/view/service/defendantcase/DefendantPotentialCaseServiceImpl.java b/sjp-query/sjp-query-view/src/main/java/uk/gov/moj/cpp/sjp/query/view/service/defendantcase/DefendantPotentialCaseServiceImpl.java index b627d99f5e..7a5c1751e0 100644 --- a/sjp-query/sjp-query-view/src/main/java/uk/gov/moj/cpp/sjp/query/view/service/defendantcase/DefendantPotentialCaseServiceImpl.java +++ b/sjp-query/sjp-query-view/src/main/java/uk/gov/moj/cpp/sjp/query/view/service/defendantcase/DefendantPotentialCaseServiceImpl.java @@ -37,9 +37,9 @@ import java.util.UUID; import java.util.stream.Collectors; -import javax.inject.Inject; -import javax.json.JsonObject; -import javax.persistence.PersistenceException; +import jakarta.inject.Inject; +import jakarta.json.JsonObject; +import jakarta.persistence.PersistenceException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/sjp-query/sjp-query-view/src/main/java/uk/gov/moj/cpp/sjp/query/view/service/defendantcase/rules/CourtCaseClosedRule.java b/sjp-query/sjp-query-view/src/main/java/uk/gov/moj/cpp/sjp/query/view/service/defendantcase/rules/CourtCaseClosedRule.java index 790e0cb16f..2dd6c017f5 100644 --- a/sjp-query/sjp-query-view/src/main/java/uk/gov/moj/cpp/sjp/query/view/service/defendantcase/rules/CourtCaseClosedRule.java +++ b/sjp-query/sjp-query-view/src/main/java/uk/gov/moj/cpp/sjp/query/view/service/defendantcase/rules/CourtCaseClosedRule.java @@ -11,7 +11,7 @@ import java.util.Optional; import java.util.UUID; -import javax.json.JsonObject; +import jakarta.json.JsonObject; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; diff --git a/sjp-query/sjp-query-view/src/main/java/uk/gov/moj/cpp/sjp/query/view/service/defendantcase/rules/CourtCaseOpenRule.java b/sjp-query/sjp-query-view/src/main/java/uk/gov/moj/cpp/sjp/query/view/service/defendantcase/rules/CourtCaseOpenRule.java index 907ee2236e..3632fb70bd 100644 --- a/sjp-query/sjp-query-view/src/main/java/uk/gov/moj/cpp/sjp/query/view/service/defendantcase/rules/CourtCaseOpenRule.java +++ b/sjp-query/sjp-query-view/src/main/java/uk/gov/moj/cpp/sjp/query/view/service/defendantcase/rules/CourtCaseOpenRule.java @@ -10,7 +10,7 @@ import java.util.Optional; import java.util.UUID; -import javax.json.JsonObject; +import jakarta.json.JsonObject; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; diff --git a/sjp-query/sjp-query-view/src/main/java/uk/gov/moj/cpp/sjp/query/view/service/defendantcase/search/DefendantCaseQuery.java b/sjp-query/sjp-query-view/src/main/java/uk/gov/moj/cpp/sjp/query/view/service/defendantcase/search/DefendantCaseQuery.java index b6453c8985..c3f25d2ad6 100644 --- a/sjp-query/sjp-query-view/src/main/java/uk/gov/moj/cpp/sjp/query/view/service/defendantcase/search/DefendantCaseQuery.java +++ b/sjp-query/sjp-query-view/src/main/java/uk/gov/moj/cpp/sjp/query/view/service/defendantcase/search/DefendantCaseQuery.java @@ -10,8 +10,8 @@ import java.time.LocalDate; import java.time.format.DateTimeFormatter; -import javax.json.JsonObject; -import javax.json.JsonObjectBuilder; +import jakarta.json.JsonObject; +import jakarta.json.JsonObjectBuilder; public class DefendantCaseQuery { diff --git a/sjp-query/sjp-query-view/src/main/java/uk/gov/moj/cpp/sjp/query/view/service/defendantcase/search/UnifiedDefendantCaseSearcher.java b/sjp-query/sjp-query-view/src/main/java/uk/gov/moj/cpp/sjp/query/view/service/defendantcase/search/UnifiedDefendantCaseSearcher.java index 337186d3be..56cde99d82 100644 --- a/sjp-query/sjp-query-view/src/main/java/uk/gov/moj/cpp/sjp/query/view/service/defendantcase/search/UnifiedDefendantCaseSearcher.java +++ b/sjp-query/sjp-query-view/src/main/java/uk/gov/moj/cpp/sjp/query/view/service/defendantcase/search/UnifiedDefendantCaseSearcher.java @@ -19,9 +19,9 @@ import java.util.ArrayList; import java.util.List; -import javax.inject.Inject; -import javax.json.JsonObject; -import javax.json.JsonObjectBuilder; +import jakarta.inject.Inject; +import jakarta.json.JsonObject; +import jakarta.json.JsonObjectBuilder; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/sjp-query/sjp-query-view/src/main/java/uk/gov/moj/cpp/sjp/query/view/util/JsonUtility.java b/sjp-query/sjp-query-view/src/main/java/uk/gov/moj/cpp/sjp/query/view/util/JsonUtility.java index dd0bf9a674..4d65c997a2 100644 --- a/sjp-query/sjp-query-view/src/main/java/uk/gov/moj/cpp/sjp/query/view/util/JsonUtility.java +++ b/sjp-query/sjp-query-view/src/main/java/uk/gov/moj/cpp/sjp/query/view/util/JsonUtility.java @@ -6,8 +6,8 @@ import java.util.Objects; import java.util.Optional; -import javax.json.JsonObject; -import javax.json.JsonValue; +import jakarta.json.JsonObject; +import jakarta.json.JsonValue; import org.apache.commons.lang3.EnumUtils; diff --git a/sjp-query/sjp-query-view/src/main/resources/META-INF/beans.xml b/sjp-query/sjp-query-view/src/main/resources/META-INF/beans.xml index cc3f8d2864..1d83bc8c5a 100644 --- a/sjp-query/sjp-query-view/src/main/resources/META-INF/beans.xml +++ b/sjp-query/sjp-query-view/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-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/CaseAssignmentRestrictionViewTest.java b/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/CaseAssignmentRestrictionViewTest.java index dc14d12fcf..5cb6ba5851 100644 --- a/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/CaseAssignmentRestrictionViewTest.java +++ b/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/CaseAssignmentRestrictionViewTest.java @@ -21,8 +21,8 @@ import java.time.ZonedDateTime; import java.util.List; -import javax.json.JsonObject; -import javax.json.JsonString; +import jakarta.json.JsonObject; +import jakarta.json.JsonString; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; diff --git a/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/CaseDocumentsRestrictionTests.java b/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/CaseDocumentsRestrictionTests.java index 9aa7c826da..58edf07663 100644 --- a/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/CaseDocumentsRestrictionTests.java +++ b/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/CaseDocumentsRestrictionTests.java @@ -32,7 +32,7 @@ import java.util.Collections; 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-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/FindAssignmentCandidatesTest.java b/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/FindAssignmentCandidatesTest.java index 1c5ecaf4f3..9d708d3be2 100644 --- a/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/FindAssignmentCandidatesTest.java +++ b/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/FindAssignmentCandidatesTest.java @@ -35,7 +35,7 @@ import java.util.Set; 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-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/ResultsViewTest.java b/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/ResultsViewTest.java index 9667cd4507..91b6165dd9 100644 --- a/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/ResultsViewTest.java +++ b/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/ResultsViewTest.java @@ -22,7 +22,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-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/SjpQueryViewTest.java b/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/SjpQueryViewTest.java index 4fee964fb6..743d7f4c85 100644 --- a/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/SjpQueryViewTest.java +++ b/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/SjpQueryViewTest.java @@ -109,8 +109,8 @@ import java.util.function.Function; import java.util.stream.Stream; -import javax.json.JsonObject; -import javax.persistence.NoResultException; +import jakarta.json.JsonObject; +import jakarta.persistence.NoResultException; import org.hamcrest.CoreMatchers; import org.hamcrest.Matchers; diff --git a/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/converter/DecisionSavedOffenceConverterTest.java b/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/converter/DecisionSavedOffenceConverterTest.java index 2a68c3c7be..9a3cb49edf 100644 --- a/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/converter/DecisionSavedOffenceConverterTest.java +++ b/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/converter/DecisionSavedOffenceConverterTest.java @@ -25,7 +25,7 @@ import java.math.BigDecimal; 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-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/converter/DismissDecisionResultTest.java b/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/converter/DismissDecisionResultTest.java index 721f5f191c..076dee2512 100644 --- a/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/converter/DismissDecisionResultTest.java +++ b/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/converter/DismissDecisionResultTest.java @@ -10,7 +10,7 @@ import uk.gov.moj.cpp.sjp.query.view.util.builders.OffenceDecisionBuilder; import uk.gov.moj.cpp.sjp.query.view.util.fakes.FakeCachedReferenceData; -import javax.json.JsonObject; +import jakarta.json.JsonObject; import org.junit.jupiter.api.Test; diff --git a/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/converter/PressRestrictionResultTest.java b/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/converter/PressRestrictionResultTest.java index 4003e11e7a..d6459530b9 100644 --- a/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/converter/PressRestrictionResultTest.java +++ b/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/converter/PressRestrictionResultTest.java @@ -10,7 +10,7 @@ import uk.gov.moj.cpp.sjp.query.view.service.CachedReferenceData; -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-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/converter/ReferencedDecisionSavedOffenceConverterTest.java b/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/converter/ReferencedDecisionSavedOffenceConverterTest.java index 9963141a7f..e7bbf62457 100644 --- a/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/converter/ReferencedDecisionSavedOffenceConverterTest.java +++ b/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/converter/ReferencedDecisionSavedOffenceConverterTest.java @@ -27,10 +27,10 @@ import java.util.UUID; import java.util.stream.Collectors; -import javax.json.JsonArray; -import javax.json.JsonArrayBuilder; -import javax.json.JsonObject; -import javax.json.JsonObjectBuilder; +import jakarta.json.JsonArray; +import jakarta.json.JsonArrayBuilder; +import jakarta.json.JsonObject; +import jakarta.json.JsonObjectBuilder; import com.google.common.collect.ImmutableMap; import org.json.JSONException; diff --git a/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/converter/SetAsideDecisionResultTest.java b/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/converter/SetAsideDecisionResultTest.java index 727495e1b1..fccaf30754 100644 --- a/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/converter/SetAsideDecisionResultTest.java +++ b/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/converter/SetAsideDecisionResultTest.java @@ -10,7 +10,7 @@ import uk.gov.moj.cpp.sjp.query.view.util.builders.OffenceDecisionBuilder; import uk.gov.moj.cpp.sjp.query.view.util.fakes.FakeCachedReferenceData; -import javax.json.JsonObject; +import jakarta.json.JsonObject; import org.junit.jupiter.api.Test; diff --git a/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/converter/WithdrawDecisionResultTest.java b/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/converter/WithdrawDecisionResultTest.java index 0a343f83af..79f0ae93ff 100644 --- a/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/converter/WithdrawDecisionResultTest.java +++ b/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/converter/WithdrawDecisionResultTest.java @@ -13,7 +13,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-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/converter/results/ABDCResultCodeConverterTest.java b/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/converter/results/ABDCResultCodeConverterTest.java index 84d6960c6d..d4cada7210 100644 --- a/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/converter/results/ABDCResultCodeConverterTest.java +++ b/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/converter/results/ABDCResultCodeConverterTest.java @@ -3,8 +3,8 @@ import static uk.gov.justice.services.messaging.JsonObjects.createArrayBuilder; import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; -import javax.json.JsonArray; -import javax.json.JsonObject; +import jakarta.json.JsonArray; +import jakarta.json.JsonObject; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; diff --git a/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/converter/results/ADJOURNSJPResultCodeConverterTest.java b/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/converter/results/ADJOURNSJPResultCodeConverterTest.java index b69f8a664f..8b5a73f5b4 100644 --- a/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/converter/results/ADJOURNSJPResultCodeConverterTest.java +++ b/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/converter/results/ADJOURNSJPResultCodeConverterTest.java @@ -3,8 +3,8 @@ import static uk.gov.justice.services.messaging.JsonObjects.createArrayBuilder; import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; -import javax.json.JsonArray; -import javax.json.JsonObject; +import jakarta.json.JsonArray; +import jakarta.json.JsonObject; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; diff --git a/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/converter/results/ADTResultCodeConverterTest.java b/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/converter/results/ADTResultCodeConverterTest.java index 62d963dbc5..3e836fd5dc 100644 --- a/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/converter/results/ADTResultCodeConverterTest.java +++ b/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/converter/results/ADTResultCodeConverterTest.java @@ -3,8 +3,8 @@ import static uk.gov.justice.services.messaging.JsonObjects.createArrayBuilder; import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; -import javax.json.JsonArray; -import javax.json.JsonObject; +import jakarta.json.JsonArray; +import jakarta.json.JsonObject; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; diff --git a/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/converter/results/AEOCResultCodeConverterTest.java b/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/converter/results/AEOCResultCodeConverterTest.java index f01e6682b3..42d6e8f461 100644 --- a/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/converter/results/AEOCResultCodeConverterTest.java +++ b/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/converter/results/AEOCResultCodeConverterTest.java @@ -3,8 +3,8 @@ import static uk.gov.justice.services.messaging.JsonObjects.createArrayBuilder; import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; -import javax.json.JsonArray; -import javax.json.JsonObject; +import jakarta.json.JsonArray; +import jakarta.json.JsonObject; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; diff --git a/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/converter/results/CDResultCodeConverterTest.java b/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/converter/results/CDResultCodeConverterTest.java index ffd37e67be..73b8d9a56f 100644 --- a/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/converter/results/CDResultCodeConverterTest.java +++ b/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/converter/results/CDResultCodeConverterTest.java @@ -6,8 +6,8 @@ import java.util.stream.Stream; -import javax.json.JsonArray; -import javax.json.JsonObject; +import jakarta.json.JsonArray; +import jakarta.json.JsonObject; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.params.ParameterizedTest; diff --git a/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/converter/results/COLLOResultCodeConverterTest.java b/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/converter/results/COLLOResultCodeConverterTest.java index 6d1d4cf6ac..42c29bf3c8 100644 --- a/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/converter/results/COLLOResultCodeConverterTest.java +++ b/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/converter/results/COLLOResultCodeConverterTest.java @@ -6,8 +6,8 @@ import java.util.stream.Stream; -import javax.json.JsonArray; -import javax.json.JsonObject; +import jakarta.json.JsonArray; +import jakarta.json.JsonObject; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.params.ParameterizedTest; diff --git a/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/converter/results/DTResultCodeConverterTest.java b/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/converter/results/DTResultCodeConverterTest.java index 2a22255cf9..9ef1dcd011 100644 --- a/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/converter/results/DTResultCodeConverterTest.java +++ b/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/converter/results/DTResultCodeConverterTest.java @@ -3,8 +3,8 @@ import static uk.gov.justice.services.messaging.JsonObjects.createArrayBuilder; import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; -import javax.json.JsonArray; -import javax.json.JsonObject; +import jakarta.json.JsonArray; +import jakarta.json.JsonObject; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; diff --git a/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/converter/results/FCOMPResultCodeConverterTest.java b/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/converter/results/FCOMPResultCodeConverterTest.java index a40a041e5a..f710044b4d 100644 --- a/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/converter/results/FCOMPResultCodeConverterTest.java +++ b/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/converter/results/FCOMPResultCodeConverterTest.java @@ -7,8 +7,8 @@ import java.util.Optional; -import javax.json.JsonArray; -import javax.json.JsonObject; +import jakarta.json.JsonArray; +import jakarta.json.JsonObject; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; diff --git a/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/converter/results/FCOSTResultCodeConverterTest.java b/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/converter/results/FCOSTResultCodeConverterTest.java index 814e364e7c..00227e528b 100644 --- a/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/converter/results/FCOSTResultCodeConverterTest.java +++ b/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/converter/results/FCOSTResultCodeConverterTest.java @@ -7,8 +7,8 @@ import java.util.Optional; -import javax.json.JsonArray; -import javax.json.JsonObject; +import jakarta.json.JsonArray; +import jakarta.json.JsonObject; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; diff --git a/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/converter/results/FOResultCodeConverterTest.java b/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/converter/results/FOResultCodeConverterTest.java index 6ce202f9d0..f3763285c0 100644 --- a/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/converter/results/FOResultCodeConverterTest.java +++ b/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/converter/results/FOResultCodeConverterTest.java @@ -3,8 +3,8 @@ import static uk.gov.justice.services.messaging.JsonObjects.createArrayBuilder; import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; -import javax.json.JsonArray; -import javax.json.JsonObject; +import jakarta.json.JsonArray; +import jakarta.json.JsonObject; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; diff --git a/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/converter/results/FVSResultCodeConverterTest.java b/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/converter/results/FVSResultCodeConverterTest.java index 4ebe75322f..1977e9eb0b 100644 --- a/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/converter/results/FVSResultCodeConverterTest.java +++ b/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/converter/results/FVSResultCodeConverterTest.java @@ -3,8 +3,8 @@ import static uk.gov.justice.services.messaging.JsonObjects.createArrayBuilder; import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; -import javax.json.JsonArray; -import javax.json.JsonObject; +import jakarta.json.JsonArray; +import jakarta.json.JsonObject; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; diff --git a/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/converter/results/GPTACResultCodeConverterTest.java b/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/converter/results/GPTACResultCodeConverterTest.java index 48b5b695e6..a05fefd1f0 100644 --- a/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/converter/results/GPTACResultCodeConverterTest.java +++ b/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/converter/results/GPTACResultCodeConverterTest.java @@ -3,8 +3,8 @@ import static uk.gov.justice.services.messaging.JsonObjects.createArrayBuilder; import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; -import javax.json.JsonArray; -import javax.json.JsonObject; +import jakarta.json.JsonArray; +import jakarta.json.JsonObject; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; diff --git a/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/converter/results/INSTLResultCodeConverterTest.java b/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/converter/results/INSTLResultCodeConverterTest.java index 68a5a67d86..56dad3676d 100644 --- a/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/converter/results/INSTLResultCodeConverterTest.java +++ b/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/converter/results/INSTLResultCodeConverterTest.java @@ -6,8 +6,8 @@ import java.util.stream.Stream; -import javax.json.JsonArray; -import javax.json.JsonObject; +import jakarta.json.JsonArray; +import jakarta.json.JsonObject; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.params.ParameterizedTest; diff --git a/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/converter/results/LSUMIResultCodeConverterTest.java b/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/converter/results/LSUMIResultCodeConverterTest.java index fb7d7073b6..13976d46d8 100644 --- a/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/converter/results/LSUMIResultCodeConverterTest.java +++ b/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/converter/results/LSUMIResultCodeConverterTest.java @@ -6,8 +6,8 @@ import java.util.stream.Stream; -import javax.json.JsonArray; -import javax.json.JsonObject; +import jakarta.json.JsonArray; +import jakarta.json.JsonObject; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.params.ParameterizedTest; diff --git a/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/converter/results/LSUMResultCodeConverterTest.java b/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/converter/results/LSUMResultCodeConverterTest.java index c371b67d5c..934ef939f8 100644 --- a/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/converter/results/LSUMResultCodeConverterTest.java +++ b/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/converter/results/LSUMResultCodeConverterTest.java @@ -9,8 +9,8 @@ import java.time.LocalDate; import java.util.stream.Stream; -import javax.json.JsonArray; -import javax.json.JsonObject; +import jakarta.json.JsonArray; +import jakarta.json.JsonObject; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.params.ParameterizedTest; diff --git a/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/converter/results/NCOLLOResultCodeConverterTest.java b/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/converter/results/NCOLLOResultCodeConverterTest.java index 55d7ba064f..603e35f3a0 100644 --- a/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/converter/results/NCOLLOResultCodeConverterTest.java +++ b/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/converter/results/NCOLLOResultCodeConverterTest.java @@ -3,8 +3,8 @@ import static uk.gov.justice.services.messaging.JsonObjects.createArrayBuilder; import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; -import javax.json.JsonArray; -import javax.json.JsonObject; +import jakarta.json.JsonArray; +import jakarta.json.JsonObject; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; diff --git a/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/converter/results/NCOSTSResultCodeConverterTest.java b/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/converter/results/NCOSTSResultCodeConverterTest.java index 52e7d8cad8..8e8104f47a 100644 --- a/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/converter/results/NCOSTSResultCodeConverterTest.java +++ b/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/converter/results/NCOSTSResultCodeConverterTest.java @@ -3,8 +3,8 @@ import static uk.gov.justice.services.messaging.JsonObjects.createArrayBuilder; import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; -import javax.json.JsonArray; -import javax.json.JsonObject; +import jakarta.json.JsonArray; +import jakarta.json.JsonObject; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; diff --git a/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/converter/results/NCRSResultCodeConverterTest.java b/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/converter/results/NCRSResultCodeConverterTest.java index 5bd5298993..d7312ce282 100644 --- a/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/converter/results/NCRSResultCodeConverterTest.java +++ b/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/converter/results/NCRSResultCodeConverterTest.java @@ -3,8 +3,8 @@ import static uk.gov.justice.services.messaging.JsonObjects.createArrayBuilder; import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; -import javax.json.JsonArray; -import javax.json.JsonObject; +import jakarta.json.JsonArray; +import jakarta.json.JsonObject; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; diff --git a/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/converter/results/NOVSResultCodeConverterTest.java b/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/converter/results/NOVSResultCodeConverterTest.java index 32490a8dae..65f518a8c9 100644 --- a/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/converter/results/NOVSResultCodeConverterTest.java +++ b/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/converter/results/NOVSResultCodeConverterTest.java @@ -3,8 +3,8 @@ import static uk.gov.justice.services.messaging.JsonObjects.createArrayBuilder; import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; -import javax.json.JsonArray; -import javax.json.JsonObject; +import jakarta.json.JsonArray; +import jakarta.json.JsonObject; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; diff --git a/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/converter/results/NSPResultCodeConverterTest.java b/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/converter/results/NSPResultCodeConverterTest.java index 6c4b7332d5..1a1e4c97e4 100644 --- a/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/converter/results/NSPResultCodeConverterTest.java +++ b/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/converter/results/NSPResultCodeConverterTest.java @@ -3,8 +3,8 @@ import static uk.gov.justice.services.messaging.JsonObjects.createArrayBuilder; import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; -import javax.json.JsonArray; -import javax.json.JsonObject; +import jakarta.json.JsonArray; +import jakarta.json.JsonObject; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; diff --git a/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/converter/results/RINSTLResultCodeConverterTest.java b/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/converter/results/RINSTLResultCodeConverterTest.java index 07f8e52df0..5d57a52b13 100644 --- a/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/converter/results/RINSTLResultCodeConverterTest.java +++ b/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/converter/results/RINSTLResultCodeConverterTest.java @@ -6,8 +6,8 @@ import java.util.stream.Stream; -import javax.json.JsonArray; -import javax.json.JsonObject; +import jakarta.json.JsonArray; +import jakarta.json.JsonObject; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.params.ParameterizedTest; diff --git a/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/converter/results/RLSUMIResultCodeConverterTest.java b/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/converter/results/RLSUMIResultCodeConverterTest.java index 0ee32890ae..d049c1c32c 100644 --- a/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/converter/results/RLSUMIResultCodeConverterTest.java +++ b/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/converter/results/RLSUMIResultCodeConverterTest.java @@ -6,8 +6,8 @@ import java.util.stream.Stream; -import javax.json.JsonArray; -import javax.json.JsonObject; +import jakarta.json.JsonArray; +import jakarta.json.JsonObject; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.params.ParameterizedTest; diff --git a/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/converter/results/RLSUMResultCodeConverterTest.java b/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/converter/results/RLSUMResultCodeConverterTest.java index 244a687687..826a52d5dc 100644 --- a/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/converter/results/RLSUMResultCodeConverterTest.java +++ b/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/converter/results/RLSUMResultCodeConverterTest.java @@ -6,8 +6,8 @@ import java.util.stream.Stream; -import javax.json.JsonArray; -import javax.json.JsonObject; +import jakarta.json.JsonArray; +import jakarta.json.JsonObject; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.params.ParameterizedTest; diff --git a/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/converter/results/RSJPTResultCodeConverterTest.java b/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/converter/results/RSJPTResultCodeConverterTest.java index 5c810d0f1a..3bb7a1e97a 100644 --- a/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/converter/results/RSJPTResultCodeConverterTest.java +++ b/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/converter/results/RSJPTResultCodeConverterTest.java @@ -3,8 +3,8 @@ import static uk.gov.justice.services.messaging.JsonObjects.createArrayBuilder; import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; -import javax.json.JsonArray; -import javax.json.JsonObject; +import jakarta.json.JsonArray; +import jakarta.json.JsonObject; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; diff --git a/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/converter/results/ResultCodeConverterTest.java b/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/converter/results/ResultCodeConverterTest.java index 41aa60c878..636bce7633 100644 --- a/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/converter/results/ResultCodeConverterTest.java +++ b/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/converter/results/ResultCodeConverterTest.java @@ -23,9 +23,9 @@ import java.util.Optional; import java.util.UUID; -import javax.json.JsonArray; -import javax.json.JsonArrayBuilder; -import javax.json.JsonObject; +import jakarta.json.JsonArray; +import jakarta.json.JsonArrayBuilder; +import jakarta.json.JsonObject; import org.mockito.Mock; diff --git a/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/converter/results/SUMRCCResultCodeConverterTest.java b/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/converter/results/SUMRCCResultCodeConverterTest.java index 22e0f0325d..e94001e34a 100644 --- a/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/converter/results/SUMRCCResultCodeConverterTest.java +++ b/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/converter/results/SUMRCCResultCodeConverterTest.java @@ -6,8 +6,8 @@ import java.util.stream.Stream; -import javax.json.JsonArray; -import javax.json.JsonObject; +import jakarta.json.JsonArray; +import jakarta.json.JsonObject; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.params.ParameterizedTest; diff --git a/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/converter/results/SUMRTOResultCodeConverterTest.java b/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/converter/results/SUMRTOResultCodeConverterTest.java index 79ece28985..12ffe083d2 100644 --- a/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/converter/results/SUMRTOResultCodeConverterTest.java +++ b/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/converter/results/SUMRTOResultCodeConverterTest.java @@ -3,8 +3,8 @@ import static uk.gov.justice.services.messaging.JsonObjects.createArrayBuilder; import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; -import javax.json.JsonArray; -import javax.json.JsonObject; +import jakarta.json.JsonArray; +import jakarta.json.JsonObject; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; diff --git a/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/converter/results/TFOOUTResultCodeConverterTest.java b/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/converter/results/TFOOUTResultCodeConverterTest.java index 241e7b28a7..011c9f5990 100644 --- a/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/converter/results/TFOOUTResultCodeConverterTest.java +++ b/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/converter/results/TFOOUTResultCodeConverterTest.java @@ -3,8 +3,8 @@ import static uk.gov.justice.services.messaging.JsonObjects.createArrayBuilder; import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; -import javax.json.JsonArray; -import javax.json.JsonObject; +import jakarta.json.JsonArray; +import jakarta.json.JsonObject; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; diff --git a/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/converter/results/WDRNOTResultCodeConverterTest.java b/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/converter/results/WDRNOTResultCodeConverterTest.java index 8aafb5cb58..031f462b8a 100644 --- a/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/converter/results/WDRNOTResultCodeConverterTest.java +++ b/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/converter/results/WDRNOTResultCodeConverterTest.java @@ -3,8 +3,8 @@ import static uk.gov.justice.services.messaging.JsonObjects.createArrayBuilder; import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; -import javax.json.JsonArray; -import javax.json.JsonObject; +import jakarta.json.JsonArray; +import jakarta.json.JsonObject; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; diff --git a/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/matcher/ResultMatchers.java b/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/matcher/ResultMatchers.java index b056c26c90..2af3042207 100644 --- a/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/matcher/ResultMatchers.java +++ b/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/matcher/ResultMatchers.java @@ -10,7 +10,7 @@ import java.math.BigDecimal; -import javax.json.JsonValue; +import jakarta.json.JsonValue; import org.hamcrest.Matcher; diff --git a/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/service/CaseServiceFindCasesMissingSjpnTest.java b/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/service/CaseServiceFindCasesMissingSjpnTest.java index b5e7bb95b7..8274eb14fe 100644 --- a/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/service/CaseServiceFindCasesMissingSjpnTest.java +++ b/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/service/CaseServiceFindCasesMissingSjpnTest.java @@ -28,7 +28,7 @@ import java.util.List; import java.util.Optional; -import org.apache.deltaspike.data.api.QueryResult; +import jakarta.persistence.TypedQuery; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; @@ -46,7 +46,7 @@ public class CaseServiceFindCasesMissingSjpnTest { private static final List AGENT_FILTER_VALUE = Arrays.asList("TFL", "XYZ"); private List caseDetails; @Mock - private QueryResult queryResult; + private TypedQuery queryResult; @Mock private CaseRepository caseRepository; @Mock @@ -78,7 +78,7 @@ public void shouldFindAllCasesMissingSjpn() { final CasesMissingSjpnView casesMissingSjpnView = service.findCasesMissingSjpn(envelope, empty(), empty()); - verify(queryResult, never()).maxResults(anyInt()); + verify(queryResult, never()).setMaxResults(anyInt()); assertThat(casesMissingSjpnView.ids, equalTo(extractCaseIds(caseDetails))); assertThat(casesMissingSjpnView.count, equalTo(COUNT)); @@ -93,7 +93,7 @@ public void shouldFindCasesMissingSjpnLimitedByPostingDate() { final CasesMissingSjpnView casesMissingSjpnView = service.findCasesMissingSjpn(envelope, empty(), Optional.of(NOW)); - verify(queryResult, never()).maxResults(anyInt()); + verify(queryResult, never()).setMaxResults(anyInt()); assertThat(casesMissingSjpnView.ids, equalTo(extractCaseIds(caseDetails))); assertThat(casesMissingSjpnView.count, equalTo(COUNT)); @@ -109,7 +109,7 @@ public void shouldReturnEmptyListWhenLimitIsZero() { verify(caseRepository, never()).findCasesMissingSjpn(any(String.class), any(List.class)); verify(caseRepository, never()).findCasesMissingSjpn(any(String.class), any(LocalDate.class), any(List.class)); - verify(queryResult, never()).maxResults(anyInt()); + verify(queryResult, never()).setMaxResults(anyInt()); assertThat(casesMissingSjpnView.ids, hasSize(0)); assertThat(casesMissingSjpnView.count, equalTo(COUNT)); @@ -120,14 +120,14 @@ public void shouldFindCasesMissingSjpnWhenLimitIsPositive() { final int limit = 2; when(queryResult.getResultList()).thenReturn(caseDetails); - when(queryResult.maxResults(anyInt())).thenReturn(queryResult); + when(queryResult.setMaxResults(anyInt())).thenReturn(queryResult); when(caseRepository.findCasesMissingSjpn(eq(TVL_FILTER_VALUE), anyList())).thenReturn(queryResult); when(caseRepository.countCasesMissingSjpn(eq(TVL_FILTER_VALUE), anyList())).thenReturn(COUNT); final CasesMissingSjpnView casesMissingSjpnView = service.findCasesMissingSjpn(envelope, Optional.of(limit), empty()); verify(caseRepository).findCasesMissingSjpn(TVL_FILTER_VALUE, AGENT_FILTER_VALUE); - verify(queryResult).maxResults(limit); + verify(queryResult).setMaxResults(limit); assertThat(casesMissingSjpnView.ids, equalTo(extractCaseIds(caseDetails))); assertThat(casesMissingSjpnView.count, equalTo(COUNT)); @@ -138,14 +138,14 @@ public void shouldFindCasesMissingSjpnWithCountAndPostingDateLimits() { final int limit = 2; when(queryResult.getResultList()).thenReturn(caseDetails); - when(queryResult.maxResults(anyInt())).thenReturn(queryResult); + when(queryResult.setMaxResults(anyInt())).thenReturn(queryResult); when(caseRepository.findCasesMissingSjpn(TVL_FILTER_VALUE, NOW, AGENT_FILTER_VALUE)).thenReturn(queryResult); when(caseRepository.countCasesMissingSjpn(TVL_FILTER_VALUE, NOW, AGENT_FILTER_VALUE)).thenReturn(COUNT); final CasesMissingSjpnView casesMissingSjpnView = service.findCasesMissingSjpn(envelope, Optional.of(limit), Optional.of(NOW)); verify(caseRepository).findCasesMissingSjpn(TVL_FILTER_VALUE, NOW, AGENT_FILTER_VALUE); - verify(queryResult).maxResults(limit); + verify(queryResult).setMaxResults(limit); assertThat(casesMissingSjpnView.ids, equalTo(extractCaseIds(caseDetails))); assertThat(casesMissingSjpnView.count, equalTo(COUNT)); diff --git a/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/service/CaseServiceTest.java b/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/service/CaseServiceTest.java index f4abb4b694..b9ea47ba07 100644 --- a/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/service/CaseServiceTest.java +++ b/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/service/CaseServiceTest.java @@ -84,10 +84,10 @@ import java.util.UUID; import java.util.stream.Collectors; -import javax.json.JsonArray; -import javax.json.JsonObject; -import javax.persistence.NoResultException; -import javax.persistence.NonUniqueResultException; +import jakarta.json.JsonArray; +import jakarta.json.JsonObject; +import jakarta.persistence.NoResultException; +import jakarta.persistence.NonUniqueResultException; import org.apache.commons.lang3.tuple.Pair; import org.junit.jupiter.api.Test; diff --git a/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/service/CourtExtractDataServiceTest.java b/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/service/CourtExtractDataServiceTest.java index 353b1fd311..225dd1ed72 100644 --- a/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/service/CourtExtractDataServiceTest.java +++ b/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/service/CourtExtractDataServiceTest.java @@ -71,8 +71,8 @@ import java.util.Optional; import java.util.UUID; -import javax.json.JsonArray; -import javax.json.JsonObject; +import jakarta.json.JsonArray; +import jakarta.json.JsonObject; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; diff --git a/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/service/OffenceHelperTest.java b/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/service/OffenceHelperTest.java index a709525e19..61a4e58f12 100644 --- a/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/service/OffenceHelperTest.java +++ b/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/service/OffenceHelperTest.java @@ -52,9 +52,9 @@ import java.util.Optional; import java.util.UUID; -import javax.json.JsonArray; -import javax.json.JsonObject; -import javax.json.JsonObjectBuilder; +import jakarta.json.JsonArray; +import jakarta.json.JsonObject; +import jakarta.json.JsonObjectBuilder; import org.hamcrest.Matchers; import org.junit.jupiter.api.BeforeEach; diff --git a/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/service/PressTransparencyReportServiceTest.java b/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/service/PressTransparencyReportServiceTest.java index 65f5bed33f..455e6ca7bf 100644 --- a/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/service/PressTransparencyReportServiceTest.java +++ b/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/service/PressTransparencyReportServiceTest.java @@ -18,7 +18,7 @@ import java.time.LocalDateTime; import java.time.LocalTime; -import javax.persistence.NoResultException; +import jakarta.persistence.NoResultException; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; diff --git a/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/service/ProgressionServiceTest.java b/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/service/ProgressionServiceTest.java index fba2ec727c..4178258394 100644 --- a/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/service/ProgressionServiceTest.java +++ b/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/service/ProgressionServiceTest.java @@ -19,8 +19,8 @@ import java.util.List; import java.util.UUID; -import javax.json.JsonArray; -import javax.json.JsonObject; +import jakarta.json.JsonArray; +import jakarta.json.JsonObject; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/service/ProsecutionCaseServiceTest.java b/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/service/ProsecutionCaseServiceTest.java index 67ddb6391b..4502978b9e 100644 --- a/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/service/ProsecutionCaseServiceTest.java +++ b/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/service/ProsecutionCaseServiceTest.java @@ -32,7 +32,7 @@ import java.util.Map; 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-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/service/ReferenceDataCachingServiceTest.java b/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/service/ReferenceDataCachingServiceTest.java index 45c3172103..d0ef130787 100644 --- a/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/service/ReferenceDataCachingServiceTest.java +++ b/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/service/ReferenceDataCachingServiceTest.java @@ -10,8 +10,8 @@ import java.util.Objects; import java.util.Optional; -import javax.json.JsonArray; -import javax.json.JsonObject; +import jakarta.json.JsonArray; +import jakarta.json.JsonObject; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; diff --git a/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/service/ReferenceDataServiceTest.java b/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/service/ReferenceDataServiceTest.java index 652708675f..6ef3c35660 100644 --- a/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/service/ReferenceDataServiceTest.java +++ b/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/service/ReferenceDataServiceTest.java @@ -28,9 +28,9 @@ import java.util.List; import java.util.Optional; -import javax.json.JsonArray; -import javax.json.JsonObject; -import javax.json.JsonValue; +import jakarta.json.JsonArray; +import jakarta.json.JsonObject; +import jakarta.json.JsonValue; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; diff --git a/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/service/ResultsServiceTest.java b/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/service/ResultsServiceTest.java index 9daa63cc0d..5bb06d4198 100644 --- a/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/service/ResultsServiceTest.java +++ b/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/service/ResultsServiceTest.java @@ -46,8 +46,8 @@ import java.util.Optional; import java.util.UUID; -import javax.json.JsonArray; -import javax.json.JsonObject; +import jakarta.json.JsonArray; +import jakarta.json.JsonObject; import com.google.common.collect.ImmutableMap; import org.junit.jupiter.api.BeforeEach; diff --git a/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/service/TransparencyReportServiceTest.java b/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/service/TransparencyReportServiceTest.java index 580fc15fea..deee94439c 100644 --- a/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/service/TransparencyReportServiceTest.java +++ b/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/service/TransparencyReportServiceTest.java @@ -20,7 +20,7 @@ import java.util.List; import java.util.UUID; -import javax.persistence.NoResultException; +import jakarta.persistence.NoResultException; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; diff --git a/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/service/UserAndGroupsServiceTest.java b/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/service/UserAndGroupsServiceTest.java index e00715a6eb..112be3ea48 100644 --- a/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/service/UserAndGroupsServiceTest.java +++ b/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/service/UserAndGroupsServiceTest.java @@ -27,7 +27,7 @@ import java.util.UUID; import java.util.stream.Stream; -import javax.json.JsonObject; +import jakarta.json.JsonObject; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/service/defendantcase/DefendantPotentialCaseServiceTest.java b/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/service/defendantcase/DefendantPotentialCaseServiceTest.java index 7dc8d965ef..5d6933138f 100644 --- a/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/service/defendantcase/DefendantPotentialCaseServiceTest.java +++ b/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/service/defendantcase/DefendantPotentialCaseServiceTest.java @@ -71,7 +71,7 @@ import java.util.UUID; import java.util.stream.Collectors; -import javax.json.JsonObject; +import jakarta.json.JsonObject; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule; diff --git a/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/service/defendantcase/search/UnifiedDefendantCaseSearcherTest.java b/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/service/defendantcase/search/UnifiedDefendantCaseSearcherTest.java index 6a6cc43340..af0a003efa 100644 --- a/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/service/defendantcase/search/UnifiedDefendantCaseSearcherTest.java +++ b/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/service/defendantcase/search/UnifiedDefendantCaseSearcherTest.java @@ -17,7 +17,7 @@ import uk.gov.moj.cpp.sjp.persistence.entity.DefendantDetail; import uk.gov.moj.cpp.sjp.persistence.entity.PersonalDetails; -import javax.json.JsonObject; +import jakarta.json.JsonObject; import java.time.LocalDate; import java.time.ZonedDateTime; import java.util.UUID; diff --git a/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/util/FileUtil.java b/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/util/FileUtil.java index 96da715f82..5ddb62649e 100644 --- a/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/util/FileUtil.java +++ b/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/util/FileUtil.java @@ -8,9 +8,9 @@ import java.util.HashMap; import java.util.Map; -import javax.json.JsonArray; -import javax.json.JsonObject; -import javax.json.JsonReader; +import jakarta.json.JsonArray; +import jakarta.json.JsonObject; +import jakarta.json.JsonReader; import com.google.common.io.Resources; import org.apache.commons.lang3.text.StrSubstitutor; diff --git a/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/util/JsonHelper.java b/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/util/JsonHelper.java index 96ee9d5b09..aad6764024 100644 --- a/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/util/JsonHelper.java +++ b/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/util/JsonHelper.java @@ -11,8 +11,8 @@ import java.io.StringReader; import java.net.URISyntaxException; -import javax.json.JsonObject; -import javax.json.JsonReader; +import jakarta.json.JsonObject; +import jakarta.json.JsonReader; import com.fasterxml.jackson.databind.ObjectMapper; diff --git a/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/util/JsonUtilityTest.java b/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/util/JsonUtilityTest.java index ad46b1a3ac..66e548cedb 100644 --- a/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/util/JsonUtilityTest.java +++ b/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/util/JsonUtilityTest.java @@ -3,8 +3,8 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; -import javax.json.JsonObject; -import javax.json.JsonValue; +import jakarta.json.JsonObject; +import jakarta.json.JsonValue; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; diff --git a/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/util/builders/OffenceDecisionBuilder.java b/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/util/builders/OffenceDecisionBuilder.java index d0afbbdcd5..fb7908c16c 100644 --- a/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/util/builders/OffenceDecisionBuilder.java +++ b/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/util/builders/OffenceDecisionBuilder.java @@ -10,8 +10,8 @@ import java.util.UUID; -import javax.json.JsonObject; -import javax.json.JsonObjectBuilder; +import jakarta.json.JsonObject; +import jakarta.json.JsonObjectBuilder; public class OffenceDecisionBuilder { diff --git a/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/util/fakes/FakeReferenceDataService.java b/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/util/fakes/FakeReferenceDataService.java index 205b9fdab6..69a782e433 100644 --- a/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/util/fakes/FakeReferenceDataService.java +++ b/sjp-query/sjp-query-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/util/fakes/FakeReferenceDataService.java @@ -15,7 +15,7 @@ import java.util.Optional; import java.util.UUID; -import javax.json.JsonObject; +import jakarta.json.JsonObject; public class FakeReferenceDataService extends ReferenceDataService { diff --git a/sjp-service/pom.xml b/sjp-service/pom.xml index e9ee025ac2..e6dddbf157 100644 --- a/sjp-service/pom.xml +++ b/sjp-service/pom.xml @@ -5,7 +5,7 @@ uk.gov.moj.cpp.sjp sjp-parent - 17.104.193-SNAPSHOT + 25.104.0-M1-SNAPSHOT sjp-service war diff --git a/sjp-service/src/main/resources/META-INF/beans.xml b/sjp-service/src/main/resources/META-INF/beans.xml index dfa019fcc7..1d83bc8c5a 100644 --- a/sjp-service/src/main/resources/META-INF/beans.xml +++ b/sjp-service/src/main/resources/META-INF/beans.xml @@ -1,6 +1,6 @@ - + diff --git a/sjp-viewstore/pom.xml b/sjp-viewstore/pom.xml index a5668a5d5d..b31182be00 100644 --- a/sjp-viewstore/pom.xml +++ b/sjp-viewstore/pom.xml @@ -3,7 +3,7 @@ sjp-parent uk.gov.moj.cpp.sjp - 17.104.193-SNAPSHOT + 25.104.0-M1-SNAPSHOT 4.0.0 sjp-viewstore diff --git a/sjp-viewstore/sjp-viewstore-liquibase/pom.xml b/sjp-viewstore/sjp-viewstore-liquibase/pom.xml index 410d049bd1..f75b9a54d9 100644 --- a/sjp-viewstore/sjp-viewstore-liquibase/pom.xml +++ b/sjp-viewstore/sjp-viewstore-liquibase/pom.xml @@ -5,7 +5,7 @@ uk.gov.moj.cpp.sjp sjp-viewstore - 17.104.193-SNAPSHOT + 25.104.0-M1-SNAPSHOT sjp-viewstore-liquibase diff --git a/sjp-viewstore/sjp-viewstore-persistence/pom.xml b/sjp-viewstore/sjp-viewstore-persistence/pom.xml index 8f5ce50617..e3943cf49e 100644 --- a/sjp-viewstore/sjp-viewstore-persistence/pom.xml +++ b/sjp-viewstore/sjp-viewstore-persistence/pom.xml @@ -3,7 +3,7 @@ sjp-viewstore uk.gov.moj.cpp.sjp - 17.104.193-SNAPSHOT + 25.104.0-M1-SNAPSHOT 4.0.0 @@ -11,13 +11,13 @@ - javax - javaee-api + jakarta.platform + jakarta.jakartaee-api provided uk.gov.justice.services - persistence-deltaspike + persistence-jdbc uk.gov.justice.utils @@ -28,15 +28,10 @@ jaxb-api - org.hibernate + org.hibernate.orm hibernate-core provided - - org.hibernate - hibernate-entitymanager - provided - org.mockito @@ -70,28 +65,13 @@ test - org.apache.tomee - openejb-core - test - - - org.apache.tomee - openejb-server - test - - - org.apache.deltaspike.modules - deltaspike-test-control-module-api - test - - - org.apache.deltaspike.modules - deltaspike-test-control-module-impl + uk.gov.justice.utils + test-utils-core test - org.apache.deltaspike.cdictrl - deltaspike-cdictrl-openejb + uk.gov.justice.utils + test-utils-hibernate test diff --git a/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/converter/JpaConverterJson.java b/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/converter/JpaConverterJson.java index ed295cea7c..673d7ff77e 100644 --- a/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/converter/JpaConverterJson.java +++ b/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/converter/JpaConverterJson.java @@ -4,10 +4,10 @@ import java.io.StringReader; -import javax.json.JsonObject; -import javax.json.JsonReader; -import javax.persistence.AttributeConverter; -import javax.persistence.Converter; +import jakarta.json.JsonObject; +import jakarta.json.JsonReader; +import jakarta.persistence.AttributeConverter; +import jakarta.persistence.Converter; @Converter(autoApply = true) public class JpaConverterJson implements AttributeConverter { diff --git a/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/entity/AccountNote.java b/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/entity/AccountNote.java index 51c6410c02..5ff27d9722 100644 --- a/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/entity/AccountNote.java +++ b/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/entity/AccountNote.java @@ -3,10 +3,10 @@ import java.util.UUID; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; @Entity @Table(name = "account_note") diff --git a/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/entity/Address.java b/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/entity/Address.java index d49848a07b..34671c0a32 100644 --- a/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/entity/Address.java +++ b/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/entity/Address.java @@ -3,8 +3,8 @@ import java.io.Serializable; import java.util.Objects; -import javax.persistence.Column; -import javax.persistence.Embeddable; +import jakarta.persistence.Column; +import jakarta.persistence.Embeddable; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; diff --git a/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/entity/AdjournOffenceDecision.java b/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/entity/AdjournOffenceDecision.java index e3ecf3b305..7b7c53f16c 100644 --- a/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/entity/AdjournOffenceDecision.java +++ b/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/entity/AdjournOffenceDecision.java @@ -7,10 +7,10 @@ import java.time.LocalDate; import java.util.UUID; -import javax.persistence.Column; -import javax.persistence.Convert; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; +import jakarta.persistence.Column; +import jakarta.persistence.Convert; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; @Entity @DiscriminatorValue("ADJOURN") diff --git a/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/entity/AocpAcceptedEmailStatus.java b/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/entity/AocpAcceptedEmailStatus.java index 257a55452a..61f548b61c 100644 --- a/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/entity/AocpAcceptedEmailStatus.java +++ b/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/entity/AocpAcceptedEmailStatus.java @@ -3,12 +3,12 @@ import java.io.Serializable; import java.time.ZonedDateTime; import java.util.UUID; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.EnumType; -import javax.persistence.Enumerated; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.EnumType; +import jakarta.persistence.Enumerated; +import jakarta.persistence.Id; +import jakarta.persistence.Table; @Entity @Table(name = "accepted_email_notification") diff --git a/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/entity/AocpOnlinePlea.java b/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/entity/AocpOnlinePlea.java index 33bf870d25..69ed633a8d 100644 --- a/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/entity/AocpOnlinePlea.java +++ b/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/entity/AocpOnlinePlea.java @@ -27,16 +27,16 @@ import java.util.UUID; import java.util.stream.Stream; -import javax.persistence.AttributeOverride; -import javax.persistence.AttributeOverrides; -import javax.persistence.Column; -import javax.persistence.Embeddable; -import javax.persistence.Embedded; -import javax.persistence.Entity; -import javax.persistence.EnumType; -import javax.persistence.Enumerated; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.AttributeOverride; +import jakarta.persistence.AttributeOverrides; +import jakarta.persistence.Column; +import jakarta.persistence.Embeddable; +import jakarta.persistence.Embedded; +import jakarta.persistence.Entity; +import jakarta.persistence.EnumType; +import jakarta.persistence.Enumerated; +import jakarta.persistence.Id; +import jakarta.persistence.Table; @Entity @Table(name = "aocp_online_plea") diff --git a/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/entity/CaseApplication.java b/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/entity/CaseApplication.java index 5101ccd9d3..98cca6a43a 100644 --- a/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/entity/CaseApplication.java +++ b/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/entity/CaseApplication.java @@ -7,17 +7,17 @@ import java.time.LocalDate; import java.util.UUID; -import javax.json.JsonObject; -import javax.persistence.Column; -import javax.persistence.Convert; -import javax.persistence.Entity; -import javax.persistence.EnumType; -import javax.persistence.Enumerated; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.OneToOne; -import javax.persistence.Table; +import jakarta.json.JsonObject; +import jakarta.persistence.Column; +import jakarta.persistence.Convert; +import jakarta.persistence.Entity; +import jakarta.persistence.EnumType; +import jakarta.persistence.Enumerated; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToOne; +import jakarta.persistence.Table; @Entity @Table(name = "case_application") diff --git a/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/entity/CaseApplicationDecision.java b/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/entity/CaseApplicationDecision.java index c2f99309ab..488f3bdf4d 100644 --- a/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/entity/CaseApplicationDecision.java +++ b/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/entity/CaseApplicationDecision.java @@ -4,13 +4,13 @@ import java.time.ZonedDateTime; import java.util.UUID; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.OneToOne; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToOne; +import jakarta.persistence.Table; @Entity @Table(name = "application_decision") diff --git a/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/entity/CaseAssignmentRestriction.java b/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/entity/CaseAssignmentRestriction.java index 44b733852d..4e887fd692 100644 --- a/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/entity/CaseAssignmentRestriction.java +++ b/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/entity/CaseAssignmentRestriction.java @@ -4,10 +4,10 @@ import java.time.LocalDate; import java.time.ZonedDateTime; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; @Entity diff --git a/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/entity/CaseCourtReferralStatus.java b/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/entity/CaseCourtReferralStatus.java index 09490d0be3..1b8bfbd324 100644 --- a/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/entity/CaseCourtReferralStatus.java +++ b/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/entity/CaseCourtReferralStatus.java @@ -4,10 +4,10 @@ import java.util.Objects; import java.util.UUID; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; import org.apache.commons.lang3.builder.EqualsBuilder; @Entity diff --git a/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/entity/CaseDecision.java b/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/entity/CaseDecision.java index 6dac63de7e..6b14ea7bb8 100644 --- a/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/entity/CaseDecision.java +++ b/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/entity/CaseDecision.java @@ -8,16 +8,16 @@ import java.util.List; import java.util.UUID; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; -import javax.persistence.OneToOne; -import javax.persistence.Table; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; +import jakarta.persistence.OneToOne; +import jakarta.persistence.Table; @Entity @Table(name = "case_decision") @@ -86,7 +86,7 @@ public List getOffenceDecisions() { } public void setOffenceDecisions(List offenceDecisions) { - this.offenceDecisions = copyOf(offenceDecisions); + this.offenceDecisions = new ArrayList<>(offenceDecisions); } public FinancialImposition getFinancialImposition() { diff --git a/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/entity/CaseDetail.java b/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/entity/CaseDetail.java index 6ce213f782..e544419a66 100644 --- a/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/entity/CaseDetail.java +++ b/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/entity/CaseDetail.java @@ -7,22 +7,22 @@ import uk.gov.moj.cpp.sjp.domain.common.CaseStatus; import uk.gov.moj.cpp.sjp.persistence.entity.view.CaseCountByAgeView; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.ColumnResult; -import javax.persistence.ConstructorResult; -import javax.persistence.Convert; -import javax.persistence.Entity; -import javax.persistence.EnumType; -import javax.persistence.Enumerated; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.OneToMany; -import javax.persistence.OneToOne; -import javax.persistence.SqlResultSetMapping; -import javax.persistence.SqlResultSetMappings; -import javax.persistence.Table; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.ColumnResult; +import jakarta.persistence.ConstructorResult; +import jakarta.persistence.Convert; +import jakarta.persistence.Entity; +import jakarta.persistence.EnumType; +import jakarta.persistence.Enumerated; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.OneToMany; +import jakarta.persistence.OneToOne; +import jakarta.persistence.SqlResultSetMapping; +import jakarta.persistence.SqlResultSetMappings; +import jakarta.persistence.Table; import java.io.Serializable; import java.math.BigDecimal; import java.time.LocalDate; @@ -253,7 +253,7 @@ public List getCaseDecisions() { } public void setCaseDecisions(List caseDecisions) { - this.caseDecisions = copyOf(caseDecisions); + this.caseDecisions = new ArrayList<>(caseDecisions); } public ZonedDateTime getDateTimeCreated() { diff --git a/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/entity/CaseDocument.java b/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/entity/CaseDocument.java index 065d410b5c..e777130e12 100644 --- a/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/entity/CaseDocument.java +++ b/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/entity/CaseDocument.java @@ -4,11 +4,11 @@ import java.time.ZonedDateTime; import java.util.UUID; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; -import javax.persistence.UniqueConstraint; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; +import jakarta.persistence.UniqueConstraint; @Entity @Table(name = "case_document", uniqueConstraints = @UniqueConstraint(columnNames = "id")) diff --git a/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/entity/CaseNote.java b/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/entity/CaseNote.java index d0d6d83186..5f89c282d3 100644 --- a/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/entity/CaseNote.java +++ b/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/entity/CaseNote.java @@ -7,12 +7,12 @@ import java.util.Optional; import java.util.UUID; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.EnumType; -import javax.persistence.Enumerated; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.EnumType; +import jakarta.persistence.Enumerated; +import jakarta.persistence.Id; +import jakarta.persistence.Table; import com.fasterxml.jackson.annotation.JsonIgnore; diff --git a/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/entity/CasePublishStatus.java b/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/entity/CasePublishStatus.java index 9f764b0707..c68a2b445f 100644 --- a/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/entity/CasePublishStatus.java +++ b/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/entity/CasePublishStatus.java @@ -6,10 +6,10 @@ import java.time.LocalDate; import java.util.UUID; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; @Entity @Table(name = "case_publish_status") diff --git a/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/entity/CaseSearchResult.java b/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/entity/CaseSearchResult.java index b463475346..4cb0a87780 100644 --- a/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/entity/CaseSearchResult.java +++ b/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/entity/CaseSearchResult.java @@ -1,6 +1,6 @@ package uk.gov.moj.cpp.sjp.persistence.entity; -import static javax.persistence.ConstraintMode.NO_CONSTRAINT; +import static jakarta.persistence.ConstraintMode.NO_CONSTRAINT; import java.io.Serializable; import java.time.LocalDate; @@ -10,18 +10,18 @@ import java.util.Set; import java.util.UUID; -import javax.persistence.Access; -import javax.persistence.AccessType; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.ForeignKey; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; -import javax.persistence.Table; +import jakarta.persistence.Access; +import jakarta.persistence.AccessType; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.ForeignKey; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; @Entity @Table(name = "case_search_result") diff --git a/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/entity/CaseSummary.java b/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/entity/CaseSummary.java index ed5b75ece5..9851e80832 100644 --- a/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/entity/CaseSummary.java +++ b/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/entity/CaseSummary.java @@ -9,13 +9,13 @@ import java.time.LocalDate; import java.util.UUID; -import javax.persistence.Column; -import javax.persistence.Convert; -import javax.persistence.Entity; -import javax.persistence.EnumType; -import javax.persistence.Enumerated; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Convert; +import jakarta.persistence.Entity; +import jakarta.persistence.EnumType; +import jakarta.persistence.Enumerated; +import jakarta.persistence.Id; +import jakarta.persistence.Table; @Entity @Table(name = "case_details") diff --git a/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/entity/ContactDetails.java b/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/entity/ContactDetails.java index 8b993e83c3..bebbc98992 100644 --- a/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/entity/ContactDetails.java +++ b/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/entity/ContactDetails.java @@ -3,9 +3,9 @@ import java.io.Serializable; import java.util.Objects; -import javax.persistence.Column; -import javax.persistence.Embeddable; -import javax.persistence.Transient; +import jakarta.persistence.Column; +import jakarta.persistence.Embeddable; +import jakarta.persistence.Transient; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; diff --git a/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/entity/CostsAndSurcharge.java b/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/entity/CostsAndSurcharge.java index 0a28b6fe4e..7737d6c813 100644 --- a/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/entity/CostsAndSurcharge.java +++ b/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/entity/CostsAndSurcharge.java @@ -3,8 +3,8 @@ import java.io.Serializable; import java.math.BigDecimal; -import javax.persistence.Column; -import javax.persistence.Embeddable; +import jakarta.persistence.Column; +import jakarta.persistence.Embeddable; @Embeddable public class CostsAndSurcharge implements Serializable { diff --git a/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/entity/CourtDetails.java b/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/entity/CourtDetails.java index 85dfbab9bd..2a66e9bd51 100644 --- a/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/entity/CourtDetails.java +++ b/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/entity/CourtDetails.java @@ -2,8 +2,8 @@ import java.io.Serializable; -import javax.persistence.Column; -import javax.persistence.Embeddable; +import jakarta.persistence.Column; +import jakarta.persistence.Embeddable; @Embeddable public class CourtDetails implements Serializable { diff --git a/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/entity/DefendantDetail.java b/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/entity/DefendantDetail.java index 309bfba405..ba4cb2d878 100644 --- a/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/entity/DefendantDetail.java +++ b/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/entity/DefendantDetail.java @@ -1,6 +1,5 @@ package uk.gov.moj.cpp.sjp.persistence.entity; -import static java.util.Collections.emptySet; import java.io.Serializable; import java.time.ZonedDateTime; @@ -12,18 +11,18 @@ import java.util.TreeSet; import java.util.UUID; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Embedded; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.OneToMany; -import javax.persistence.OneToOne; -import javax.persistence.OrderBy; -import javax.persistence.Table; -import javax.persistence.UniqueConstraint; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Embedded; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.OneToMany; +import jakarta.persistence.OneToOne; +import jakarta.persistence.OrderBy; +import jakarta.persistence.Table; +import jakarta.persistence.UniqueConstraint; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; @@ -199,7 +198,7 @@ public List getOffences() { } public void setOffences(final List offences) { - this.offences = offences == null ? emptySet() : new TreeSet<>(offences); + this.offences = offences == null ? new TreeSet<>() : new TreeSet<>(offences); this.offences.forEach(offence -> offence.setDefendantDetail(this)); } diff --git a/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/entity/DefendantDetailUpdateRequest.java b/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/entity/DefendantDetailUpdateRequest.java index 36d291451e..1254bf284b 100644 --- a/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/entity/DefendantDetailUpdateRequest.java +++ b/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/entity/DefendantDetailUpdateRequest.java @@ -6,12 +6,12 @@ import java.util.Objects; import java.util.UUID; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.EnumType; -import javax.persistence.Enumerated; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.EnumType; +import jakarta.persistence.Enumerated; +import jakarta.persistence.Id; +import jakarta.persistence.Table; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; diff --git a/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/entity/DischargeOffenceDecision.java b/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/entity/DischargeOffenceDecision.java index 4e38fffe6c..e8f10acdb3 100644 --- a/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/entity/DischargeOffenceDecision.java +++ b/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/entity/DischargeOffenceDecision.java @@ -7,14 +7,14 @@ import uk.gov.moj.cpp.sjp.domain.decision.endorsement.PenaltyPointsReason; import uk.gov.moj.cpp.sjp.domain.verdict.VerdictType; -import javax.persistence.AttributeOverride; -import javax.persistence.AttributeOverrides; -import javax.persistence.Column; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Embedded; -import javax.persistence.Entity; -import javax.persistence.EnumType; -import javax.persistence.Enumerated; +import jakarta.persistence.AttributeOverride; +import jakarta.persistence.AttributeOverrides; +import jakarta.persistence.Column; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Embedded; +import jakarta.persistence.Entity; +import jakarta.persistence.EnumType; +import jakarta.persistence.Enumerated; import java.math.BigDecimal; import java.time.LocalDate; diff --git a/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/entity/DischargePeriod.java b/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/entity/DischargePeriod.java index edbc91a756..5685e397d7 100644 --- a/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/entity/DischargePeriod.java +++ b/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/entity/DischargePeriod.java @@ -2,10 +2,10 @@ import uk.gov.moj.cpp.sjp.domain.decision.discharge.PeriodUnit; -import javax.persistence.Column; -import javax.persistence.Embeddable; -import javax.persistence.EnumType; -import javax.persistence.Enumerated; +import jakarta.persistence.Column; +import jakarta.persistence.Embeddable; +import jakarta.persistence.EnumType; +import jakarta.persistence.Enumerated; @Embeddable public class DischargePeriod { diff --git a/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/entity/DismissOffenceDecision.java b/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/entity/DismissOffenceDecision.java index b63ca9b279..044db9e0b8 100644 --- a/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/entity/DismissOffenceDecision.java +++ b/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/entity/DismissOffenceDecision.java @@ -5,8 +5,8 @@ import java.util.UUID; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; @Entity @DiscriminatorValue("DISMISS") diff --git a/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/entity/EmailNotification.java b/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/entity/EmailNotification.java index 6dfbcdeb5c..5b1d8a69b0 100644 --- a/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/entity/EmailNotification.java +++ b/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/entity/EmailNotification.java @@ -3,12 +3,12 @@ import java.time.ZonedDateTime; import java.util.UUID; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.EnumType; -import javax.persistence.Enumerated; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.EnumType; +import jakarta.persistence.Enumerated; +import jakarta.persistence.Id; +import jakarta.persistence.Table; @Entity @Table(name = "email_notification") diff --git a/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/entity/Employer.java b/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/entity/Employer.java index ad18639df9..48df1b062d 100644 --- a/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/entity/Employer.java +++ b/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/entity/Employer.java @@ -2,10 +2,10 @@ import java.util.UUID; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; @Entity @Table(name = "employer") diff --git a/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/entity/EnforcementNotification.java b/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/entity/EnforcementNotification.java index 05997edbca..b8940a9f54 100644 --- a/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/entity/EnforcementNotification.java +++ b/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/entity/EnforcementNotification.java @@ -4,12 +4,12 @@ import java.time.ZonedDateTime; import java.util.UUID; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.EnumType; -import javax.persistence.Enumerated; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.EnumType; +import jakarta.persistence.Enumerated; +import jakarta.persistence.Id; +import jakarta.persistence.Table; @Entity @Table(name = "enforcement_notification") diff --git a/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/entity/FinancialImposition.java b/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/entity/FinancialImposition.java index c0ccfdb316..b977a40525 100644 --- a/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/entity/FinancialImposition.java +++ b/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/entity/FinancialImposition.java @@ -3,13 +3,13 @@ import java.io.Serializable; import java.util.UUID; -import javax.persistence.Embedded; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.MapsId; -import javax.persistence.OneToOne; -import javax.persistence.Table; +import jakarta.persistence.Embedded; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.MapsId; +import jakarta.persistence.OneToOne; +import jakarta.persistence.Table; @Entity @Table(name = "financial_imposition") diff --git a/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/entity/FinancialMeans.java b/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/entity/FinancialMeans.java index 863180a824..02913e8b6d 100644 --- a/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/entity/FinancialMeans.java +++ b/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/entity/FinancialMeans.java @@ -5,12 +5,12 @@ import java.math.BigDecimal; import java.util.UUID; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.EnumType; -import javax.persistence.Enumerated; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.EnumType; +import jakarta.persistence.Enumerated; +import jakarta.persistence.Id; +import jakarta.persistence.Table; @Entity @Table(name = "financial_means") diff --git a/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/entity/FinancialPenaltyOffenceDecision.java b/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/entity/FinancialPenaltyOffenceDecision.java index 531cc09e1b..2f452410d3 100644 --- a/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/entity/FinancialPenaltyOffenceDecision.java +++ b/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/entity/FinancialPenaltyOffenceDecision.java @@ -6,11 +6,11 @@ import uk.gov.moj.cpp.sjp.domain.decision.endorsement.PenaltyPointsReason; import uk.gov.moj.cpp.sjp.domain.verdict.VerdictType; -import javax.persistence.Column; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; -import javax.persistence.EnumType; -import javax.persistence.Enumerated; +import jakarta.persistence.Column; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; +import jakarta.persistence.EnumType; +import jakarta.persistence.Enumerated; import java.math.BigDecimal; import java.time.LocalDate; diff --git a/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/entity/Installments.java b/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/entity/Installments.java index 343bf46102..e79c877852 100644 --- a/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/entity/Installments.java +++ b/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/entity/Installments.java @@ -6,10 +6,10 @@ import java.math.BigDecimal; import java.time.LocalDate; -import javax.persistence.Column; -import javax.persistence.Embeddable; -import javax.persistence.EnumType; -import javax.persistence.Enumerated; +import jakarta.persistence.Column; +import jakarta.persistence.Embeddable; +import jakarta.persistence.EnumType; +import jakarta.persistence.Enumerated; @Embeddable public class Installments implements Serializable { diff --git a/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/entity/InterpreterDetail.java b/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/entity/InterpreterDetail.java index a01359bf6f..415960601f 100644 --- a/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/entity/InterpreterDetail.java +++ b/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/entity/InterpreterDetail.java @@ -4,8 +4,8 @@ import java.io.Serializable; -import javax.persistence.Column; -import javax.persistence.Embeddable; +import jakarta.persistence.Column; +import jakarta.persistence.Embeddable; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; diff --git a/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/entity/LegalEntityDetails.java b/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/entity/LegalEntityDetails.java index f497c21b62..e94e29bc19 100644 --- a/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/entity/LegalEntityDetails.java +++ b/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/entity/LegalEntityDetails.java @@ -4,8 +4,8 @@ import java.io.Serializable; -import javax.persistence.Column; -import javax.persistence.Embeddable; +import jakarta.persistence.Column; +import jakarta.persistence.Embeddable; @Embeddable public class LegalEntityDetails implements Serializable { diff --git a/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/entity/LegalEntityFinancialMeans.java b/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/entity/LegalEntityFinancialMeans.java index faa56dac51..b098dc657d 100644 --- a/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/entity/LegalEntityFinancialMeans.java +++ b/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/entity/LegalEntityFinancialMeans.java @@ -2,19 +2,17 @@ import java.math.BigDecimal; -import javax.persistence.Column; -import javax.persistence.Embeddable; +import jakarta.persistence.Column; +import jakarta.persistence.Embeddable; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; -import org.checkerframework.checker.index.qual.Positive; @Embeddable public class LegalEntityFinancialMeans { @Column(name = "trading_more_than_twelve_months") private Boolean tradingMoreThan12Months; - @Positive @Column(name = "number_of_employees") private Integer numberOfEmployees; @@ -24,7 +22,7 @@ public class LegalEntityFinancialMeans { @Column(name = "net_turnover_whole_pounds") private BigDecimal netTurnover; - public LegalEntityFinancialMeans(final Boolean tradingMoreThan12Months, @Positive final Integer numberOfEmployees, final BigDecimal grossTurnover, final BigDecimal netTurnover) { + public LegalEntityFinancialMeans(final Boolean tradingMoreThan12Months, final Integer numberOfEmployees, final BigDecimal grossTurnover, final BigDecimal netTurnover) { this.tradingMoreThan12Months = tradingMoreThan12Months; this.numberOfEmployees = numberOfEmployees; this.grossTurnover = grossTurnover; diff --git a/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/entity/LumpSum.java b/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/entity/LumpSum.java index 91be6a7c1f..ea7112b0c3 100644 --- a/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/entity/LumpSum.java +++ b/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/entity/LumpSum.java @@ -4,8 +4,8 @@ import java.math.BigDecimal; import java.time.LocalDate; -import javax.persistence.Column; -import javax.persistence.Embeddable; +import jakarta.persistence.Column; +import jakarta.persistence.Embeddable; @Embeddable public class LumpSum implements Serializable { diff --git a/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/entity/NoSeparatePenaltyOffenceDecision.java b/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/entity/NoSeparatePenaltyOffenceDecision.java index e723ebd812..7a0868dbcb 100644 --- a/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/entity/NoSeparatePenaltyOffenceDecision.java +++ b/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/entity/NoSeparatePenaltyOffenceDecision.java @@ -6,9 +6,9 @@ import java.time.LocalDate; import java.util.UUID; -import javax.persistence.Column; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; +import jakarta.persistence.Column; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; @Entity @DiscriminatorValue(DecisionType.DecisionName.NO_SEPARATE_PENALTY) diff --git a/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/entity/NotificationOfEndorsementStatus.java b/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/entity/NotificationOfEndorsementStatus.java index 26c7098c90..ea291562fa 100644 --- a/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/entity/NotificationOfEndorsementStatus.java +++ b/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/entity/NotificationOfEndorsementStatus.java @@ -4,12 +4,12 @@ import java.time.ZonedDateTime; import java.util.UUID; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.EnumType; -import javax.persistence.Enumerated; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.EnumType; +import jakarta.persistence.Enumerated; +import jakarta.persistence.Id; +import jakarta.persistence.Table; @Entity @Table(name = "notification_of_endorsement_status") diff --git a/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/entity/OatsOffenceDecision.java b/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/entity/OatsOffenceDecision.java index a387ccc839..ae1c4f5cf2 100644 --- a/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/entity/OatsOffenceDecision.java +++ b/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/entity/OatsOffenceDecision.java @@ -5,8 +5,8 @@ import java.util.UUID; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; @Entity @DiscriminatorValue("OATS") diff --git a/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/entity/OffenceDecision.java b/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/entity/OffenceDecision.java index db220293f4..80f857ba03 100644 --- a/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/entity/OffenceDecision.java +++ b/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/entity/OffenceDecision.java @@ -9,18 +9,18 @@ import java.time.ZonedDateTime; import java.util.UUID; -import javax.persistence.Column; -import javax.persistence.Convert; -import javax.persistence.DiscriminatorColumn; -import javax.persistence.Embedded; -import javax.persistence.Entity; -import javax.persistence.EnumType; -import javax.persistence.Enumerated; -import javax.persistence.Id; -import javax.persistence.IdClass; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Convert; +import jakarta.persistence.DiscriminatorColumn; +import jakarta.persistence.Embedded; +import jakarta.persistence.Entity; +import jakarta.persistence.EnumType; +import jakarta.persistence.Enumerated; +import jakarta.persistence.Id; +import jakarta.persistence.IdClass; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; +import jakarta.persistence.Table; @Entity @Table(name = "offence_decision") diff --git a/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/entity/OffenceDetail.java b/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/entity/OffenceDetail.java index 626aba6b66..ccc67547a9 100644 --- a/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/entity/OffenceDetail.java +++ b/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/entity/OffenceDetail.java @@ -15,16 +15,16 @@ import java.util.Optional; import java.util.UUID; -import javax.persistence.Column; -import javax.persistence.Convert; -import javax.persistence.Embedded; -import javax.persistence.Entity; -import javax.persistence.EnumType; -import javax.persistence.Enumerated; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Convert; +import jakarta.persistence.Embedded; +import jakarta.persistence.Entity; +import jakarta.persistence.EnumType; +import jakarta.persistence.Enumerated; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; @Entity @Table(name = "offence") diff --git a/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/entity/OffenceSummary.java b/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/entity/OffenceSummary.java index 830a76e72d..f0025683f5 100644 --- a/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/entity/OffenceSummary.java +++ b/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/entity/OffenceSummary.java @@ -5,10 +5,10 @@ import java.util.Objects; import java.util.UUID; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; @Entity @Table(name = "offence") diff --git a/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/entity/OnlinePlea.java b/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/entity/OnlinePlea.java index 64c4aed4be..0c4ea7401f 100644 --- a/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/entity/OnlinePlea.java +++ b/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/entity/OnlinePlea.java @@ -27,16 +27,16 @@ import java.util.UUID; import java.util.stream.Stream; -import javax.persistence.AttributeOverride; -import javax.persistence.AttributeOverrides; -import javax.persistence.Column; -import javax.persistence.Embeddable; -import javax.persistence.Embedded; -import javax.persistence.Entity; -import javax.persistence.EnumType; -import javax.persistence.Enumerated; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.AttributeOverride; +import jakarta.persistence.AttributeOverrides; +import jakarta.persistence.Column; +import jakarta.persistence.Embeddable; +import jakarta.persistence.Embedded; +import jakarta.persistence.Entity; +import jakarta.persistence.EnumType; +import jakarta.persistence.Enumerated; +import jakarta.persistence.Id; +import jakarta.persistence.Table; @Entity @Table(name = "online_plea") diff --git a/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/entity/OnlinePleaDetail.java b/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/entity/OnlinePleaDetail.java index c5554f73e6..de791754c2 100644 --- a/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/entity/OnlinePleaDetail.java +++ b/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/entity/OnlinePleaDetail.java @@ -6,12 +6,12 @@ import java.util.UUID; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.EnumType; -import javax.persistence.Enumerated; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.EnumType; +import jakarta.persistence.Enumerated; +import jakarta.persistence.Id; +import jakarta.persistence.Table; @Entity @Table(name = "online_plea_detail") diff --git a/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/entity/OnlinePleaLegalEntityDetails.java b/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/entity/OnlinePleaLegalEntityDetails.java index 2ef61447d4..b77d4af159 100644 --- a/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/entity/OnlinePleaLegalEntityDetails.java +++ b/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/entity/OnlinePleaLegalEntityDetails.java @@ -1,10 +1,10 @@ package uk.gov.moj.cpp.sjp.persistence.entity; -import javax.persistence.AttributeOverride; -import javax.persistence.AttributeOverrides; -import javax.persistence.Column; -import javax.persistence.Embeddable; -import javax.persistence.Embedded; +import jakarta.persistence.AttributeOverride; +import jakarta.persistence.AttributeOverrides; +import jakarta.persistence.Column; +import jakarta.persistence.Embeddable; +import jakarta.persistence.Embedded; @Embeddable public class OnlinePleaLegalEntityDetails { diff --git a/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/entity/OnlinePleaPersonalDetails.java b/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/entity/OnlinePleaPersonalDetails.java index 4bd1ea380a..45269da8e8 100644 --- a/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/entity/OnlinePleaPersonalDetails.java +++ b/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/entity/OnlinePleaPersonalDetails.java @@ -6,10 +6,10 @@ import java.time.LocalDate; -import javax.persistence.AttributeOverride; -import javax.persistence.AttributeOverrides; -import javax.persistence.Column; -import javax.persistence.Embeddable; +import jakarta.persistence.AttributeOverride; +import jakarta.persistence.AttributeOverrides; +import jakarta.persistence.Column; +import jakarta.persistence.Embeddable; @Embeddable public class OnlinePleaPersonalDetails { diff --git a/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/entity/Payment.java b/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/entity/Payment.java index 17f87d4885..a1f00d574f 100644 --- a/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/entity/Payment.java +++ b/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/entity/Payment.java @@ -6,11 +6,11 @@ import java.io.Serializable; import java.math.BigDecimal; -import javax.persistence.Column; -import javax.persistence.Embeddable; -import javax.persistence.Embedded; -import javax.persistence.EnumType; -import javax.persistence.Enumerated; +import jakarta.persistence.Column; +import jakarta.persistence.Embeddable; +import jakarta.persistence.Embedded; +import jakarta.persistence.EnumType; +import jakarta.persistence.Enumerated; @Embeddable public class Payment implements Serializable { diff --git a/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/entity/PaymentTerms.java b/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/entity/PaymentTerms.java index 634b727e59..075aa7e753 100644 --- a/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/entity/PaymentTerms.java +++ b/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/entity/PaymentTerms.java @@ -2,9 +2,9 @@ import java.io.Serializable; -import javax.persistence.Column; -import javax.persistence.Embeddable; -import javax.persistence.Embedded; +import jakarta.persistence.Column; +import jakarta.persistence.Embeddable; +import jakarta.persistence.Embedded; @Embeddable public class PaymentTerms implements Serializable { diff --git a/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/entity/PendingDatesToAvoid.java b/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/entity/PendingDatesToAvoid.java index 38028181d5..dd3f55d1aa 100644 --- a/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/entity/PendingDatesToAvoid.java +++ b/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/entity/PendingDatesToAvoid.java @@ -3,13 +3,13 @@ import java.time.ZonedDateTime; import java.util.UUID; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.OneToOne; -import javax.persistence.PrimaryKeyJoinColumn; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.OneToOne; +import jakarta.persistence.PrimaryKeyJoinColumn; +import jakarta.persistence.Table; @Entity @Table(name = "pending_dates_to_avoid") diff --git a/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/entity/PersonalDetails.java b/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/entity/PersonalDetails.java index f711b1d648..85b4f88f2d 100644 --- a/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/entity/PersonalDetails.java +++ b/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/entity/PersonalDetails.java @@ -7,10 +7,10 @@ import java.time.ZonedDateTime; import java.util.Objects; -import javax.persistence.Column; -import javax.persistence.Embeddable; -import javax.persistence.EnumType; -import javax.persistence.Enumerated; +import jakarta.persistence.Column; +import jakarta.persistence.Embeddable; +import jakarta.persistence.EnumType; +import jakarta.persistence.Enumerated; @Embeddable public class PersonalDetails implements Serializable { diff --git a/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/entity/PressRestriction.java b/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/entity/PressRestriction.java index 22a238edad..4a68361f19 100644 --- a/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/entity/PressRestriction.java +++ b/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/entity/PressRestriction.java @@ -3,8 +3,8 @@ import java.io.Serializable; import java.util.Objects; -import javax.persistence.Column; -import javax.persistence.Embeddable; +import jakarta.persistence.Column; +import jakarta.persistence.Embeddable; @Embeddable public class PressRestriction implements Serializable { diff --git a/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/entity/PressTransparencyReportMetadata.java b/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/entity/PressTransparencyReportMetadata.java index c49bbaf583..a1cd9a1ed5 100644 --- a/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/entity/PressTransparencyReportMetadata.java +++ b/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/entity/PressTransparencyReportMetadata.java @@ -5,10 +5,10 @@ import java.time.LocalDateTime; import java.util.UUID; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; @Entity @Table(name = "press_transparency_report_metadata") diff --git a/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/entity/ReadyCase.java b/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/entity/ReadyCase.java index 4b64afb060..f711b36b18 100644 --- a/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/entity/ReadyCase.java +++ b/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/entity/ReadyCase.java @@ -9,13 +9,13 @@ import java.util.Optional; import java.util.UUID; -import javax.persistence.Column; -import javax.persistence.Convert; -import javax.persistence.Entity; -import javax.persistence.EnumType; -import javax.persistence.Enumerated; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Convert; +import jakarta.persistence.Entity; +import jakarta.persistence.EnumType; +import jakarta.persistence.Enumerated; +import jakarta.persistence.Id; +import jakarta.persistence.Table; @SuppressWarnings("squid:S107") @Entity diff --git a/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/entity/ReferForCourtHearingDecision.java b/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/entity/ReferForCourtHearingDecision.java index 07a8d6bf2f..aa4a84358f 100644 --- a/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/entity/ReferForCourtHearingDecision.java +++ b/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/entity/ReferForCourtHearingDecision.java @@ -6,9 +6,9 @@ import java.time.LocalDate; import java.util.UUID; -import javax.persistence.Column; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; +import jakarta.persistence.Column; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; @Entity @DiscriminatorValue(DecisionType.DecisionName.REFER_FOR_COURT_HEARING) diff --git a/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/entity/ReferredForFutureSJPSessionDecision.java b/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/entity/ReferredForFutureSJPSessionDecision.java index 32a3e67071..af9e7f307c 100644 --- a/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/entity/ReferredForFutureSJPSessionDecision.java +++ b/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/entity/ReferredForFutureSJPSessionDecision.java @@ -5,8 +5,8 @@ import java.util.UUID; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; @Entity @DiscriminatorValue("REFERRED_FOR_FUTURE_SJP_SESSION") diff --git a/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/entity/ReferredToOpenCourtDecision.java b/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/entity/ReferredToOpenCourtDecision.java index 87c825c28e..65e63bbb01 100644 --- a/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/entity/ReferredToOpenCourtDecision.java +++ b/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/entity/ReferredToOpenCourtDecision.java @@ -6,9 +6,9 @@ import java.time.ZonedDateTime; import java.util.UUID; -import javax.persistence.Column; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; +import jakarta.persistence.Column; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; @Entity @DiscriminatorValue("REFERRED_TO_OPEN_COURT") diff --git a/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/entity/ReserveCase.java b/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/entity/ReserveCase.java index 8189a71e47..f3510f914d 100644 --- a/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/entity/ReserveCase.java +++ b/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/entity/ReserveCase.java @@ -4,11 +4,11 @@ import java.time.ZonedDateTime; import java.util.Objects; import java.util.UUID; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; -import javax.persistence.UniqueConstraint; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; +import jakarta.persistence.UniqueConstraint; @Entity @Table(name = "reserve_case", uniqueConstraints = @UniqueConstraint(columnNames = "id")) diff --git a/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/entity/Session.java b/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/entity/Session.java index a4580d75da..9bd896d49b 100644 --- a/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/entity/Session.java +++ b/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/entity/Session.java @@ -6,9 +6,10 @@ import java.util.ArrayList; import java.util.List; -import javax.persistence.CollectionTable; -import javax.persistence.ElementCollection; -import javax.persistence.JoinColumn; +import jakarta.persistence.CollectionTable; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.FetchType; +import jakarta.persistence.JoinColumn; import uk.gov.moj.cpp.sjp.domain.SessionType; import java.io.Serializable; @@ -17,12 +18,12 @@ import java.util.Optional; import java.util.UUID; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.EnumType; -import javax.persistence.Enumerated; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.EnumType; +import jakarta.persistence.Enumerated; +import jakarta.persistence.Id; +import jakarta.persistence.Table; @Entity @Table(name = "session") @@ -62,7 +63,11 @@ public class Session implements Serializable { @Enumerated(EnumType.STRING) private SessionType type; - @ElementCollection + // EAGER: the Session entity is returned directly by the query handlers (sjp.query.session, + // latest-aocp-session, convicting-court-session) and serialised to JSON by the framework's + // ObjectToJsonValueConverter AFTER the handler returns (outside any session), so prosecutors + // must already be loaded. It is always part of the serialised session view. + @ElementCollection(fetch = FetchType.EAGER) @CollectionTable( name = "session_prosecutors", joinColumns = @JoinColumn(name = "session_id") diff --git a/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/entity/SetAsideOffenceDecision.java b/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/entity/SetAsideOffenceDecision.java index de424d5afa..0380abf2ed 100644 --- a/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/entity/SetAsideOffenceDecision.java +++ b/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/entity/SetAsideOffenceDecision.java @@ -5,8 +5,8 @@ import java.util.UUID; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; @Entity @DiscriminatorValue(DecisionType.DecisionName.SET_ASIDE) diff --git a/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/entity/SocCheck.java b/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/entity/SocCheck.java index f0bf156eab..707028ca81 100644 --- a/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/entity/SocCheck.java +++ b/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/entity/SocCheck.java @@ -3,10 +3,10 @@ import java.time.ZonedDateTime; import java.util.UUID; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; @Entity @Table(name = "soc_check") diff --git a/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/entity/StreamStatus.java b/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/entity/StreamStatus.java index f1e1839afc..dfc4c29ae1 100644 --- a/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/entity/StreamStatus.java +++ b/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/entity/StreamStatus.java @@ -2,10 +2,10 @@ import java.util.UUID; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; @Entity @Table(name = "stream_status") diff --git a/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/entity/TransparencyReportMetadata.java b/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/entity/TransparencyReportMetadata.java index 249a8f8d83..a3d7150043 100644 --- a/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/entity/TransparencyReportMetadata.java +++ b/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/entity/TransparencyReportMetadata.java @@ -5,10 +5,10 @@ import java.time.LocalDateTime; import java.util.UUID; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; @Entity @Table(name = "transparency_report_metadata") diff --git a/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/entity/WithdrawOffenceDecision.java b/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/entity/WithdrawOffenceDecision.java index 9533c370f6..24204e07b9 100644 --- a/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/entity/WithdrawOffenceDecision.java +++ b/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/entity/WithdrawOffenceDecision.java @@ -5,9 +5,9 @@ import java.util.UUID; -import javax.persistence.Column; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; +import jakarta.persistence.Column; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; @Entity @DiscriminatorValue(DecisionType.DecisionName.WITHDRAW) diff --git a/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/repository/AocpAcceptedEmailNotificationStatusRepository.java b/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/repository/AocpAcceptedEmailNotificationStatusRepository.java index 00ab471cfd..3f1b418818 100644 --- a/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/repository/AocpAcceptedEmailNotificationStatusRepository.java +++ b/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/repository/AocpAcceptedEmailNotificationStatusRepository.java @@ -1,10 +1,37 @@ package uk.gov.moj.cpp.sjp.persistence.repository; -import java.util.UUID; -import org.apache.deltaspike.data.api.EntityRepository; -import org.apache.deltaspike.data.api.Repository; import uk.gov.moj.cpp.sjp.persistence.entity.AocpAcceptedEmailStatus; -@Repository -public interface AocpAcceptedEmailNotificationStatusRepository extends EntityRepository { +import java.util.List; +import java.util.UUID; + +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.persistence.EntityManager; +import jakarta.persistence.PersistenceContext; + +@ApplicationScoped +public class AocpAcceptedEmailNotificationStatusRepository { + + @PersistenceContext(unitName = "sjp-persistence-unit") + private EntityManager entityManager; + + public AocpAcceptedEmailStatus findBy(final UUID id) { + return entityManager.find(AocpAcceptedEmailStatus.class, id); + } + + public AocpAcceptedEmailStatus save(final AocpAcceptedEmailStatus entity) { + return entityManager.merge(entity); + } + + public void remove(final AocpAcceptedEmailStatus entity) { + entityManager.remove(entityManager.contains(entity) ? entity : entityManager.merge(entity)); + } + + public Long count() { + return entityManager.createQuery("SELECT COUNT(e) FROM AocpAcceptedEmailStatus e", Long.class).getSingleResult(); + } + + public List findAll() { + return entityManager.createQuery("SELECT e FROM AocpAcceptedEmailStatus e", AocpAcceptedEmailStatus.class).getResultList(); + } } diff --git a/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/repository/AocpOnlinePleaRepository.java b/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/repository/AocpOnlinePleaRepository.java index dbc0b249cf..e0c45f88de 100644 --- a/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/repository/AocpOnlinePleaRepository.java +++ b/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/repository/AocpOnlinePleaRepository.java @@ -26,23 +26,18 @@ import java.util.UUID; import java.util.function.Function; -import javax.inject.Inject; -import javax.persistence.EntityManager; -import javax.persistence.Query; -import javax.persistence.criteria.CriteriaBuilder; -import javax.persistence.criteria.CriteriaUpdate; -import javax.persistence.criteria.Path; -import javax.persistence.criteria.Root; - -import org.apache.deltaspike.data.api.EntityRepository; -import org.apache.deltaspike.data.api.QueryParam; -import org.apache.deltaspike.data.api.Repository; -import org.apache.deltaspike.data.api.SingleResultType; - -@Repository -public abstract class AocpOnlinePleaRepository implements EntityRepository { - - @Inject +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.persistence.EntityManager; +import jakarta.persistence.PersistenceContext; +import jakarta.persistence.Query; +import jakarta.persistence.criteria.CriteriaBuilder; +import jakarta.persistence.criteria.CriteriaUpdate; +import jakarta.persistence.criteria.Path; +import jakarta.persistence.criteria.Root; + +public abstract class AocpOnlinePleaRepository { + + @PersistenceContext(unitName = "sjp-persistence-unit") private EntityManager entityManager; private static final String PERSONAL_DETAILS = "personalDetails"; @@ -78,10 +73,35 @@ private void updateOnlinePlea(AocpOnlinePlea aocpOnlinePlea) { /** * Hide employment, employer and outgoings. */ - @org.apache.deltaspike.data.api.Query( - value = "SELECT new AocpOnlinePlea(op.caseId, op.defendantId, op.personalDetails, op.submittedOn, op.aocpAccepted) FROM AocpOnlinePlea op WHERE op.caseId = :caseId", - singleResult = SingleResultType.OPTIONAL) - public abstract AocpOnlinePlea findAocpPleaByCaseId(@QueryParam("caseId") final UUID caseId); + public AocpOnlinePlea findAocpPleaByCaseId(final UUID caseId) { + return entityManager.createQuery( + "SELECT new AocpOnlinePlea(op.caseId, op.defendantId, op.personalDetails, op.submittedOn, op.aocpAccepted) FROM AocpOnlinePlea op WHERE op.caseId = :caseId", + AocpOnlinePlea.class) + .setParameter("caseId", caseId) + .getResultStream() + .findFirst() + .orElse(null); + } + + public AocpOnlinePlea findBy(final UUID id) { + return entityManager.find(AocpOnlinePlea.class, id); + } + + public AocpOnlinePlea save(final AocpOnlinePlea aocpOnlinePlea) { + return entityManager.merge(aocpOnlinePlea); + } + + public void remove(final AocpOnlinePlea aocpOnlinePlea) { + entityManager.remove(entityManager.contains(aocpOnlinePlea) ? aocpOnlinePlea : entityManager.merge(aocpOnlinePlea)); + } + + public Long count() { + return entityManager.createQuery("SELECT COUNT(op) FROM AocpOnlinePlea op", Long.class).getSingleResult(); + } + + public List findAll() { + return entityManager.createQuery("SELECT op FROM AocpOnlinePlea op", AocpOnlinePlea.class).getResultList(); + } abstract List getFieldsToUpdate(); @@ -125,9 +145,10 @@ public Object convertValue(AocpOnlinePlea aocpOnlinePlea) { } } - public abstract static class PersonDetailsOnlinePleaRepository extends AocpOnlinePleaRepository { + @ApplicationScoped + public static class PersonDetailsOnlinePleaRepository extends AocpOnlinePleaRepository { @Override - final List getFieldsToUpdate() { + List getFieldsToUpdate() { return asList( PERSON_FIRST_NAME, PERSON_LAST_NAME, diff --git a/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/repository/AssignmentRepository.java b/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/repository/AssignmentRepository.java index fb4866234a..2da7a2f5e1 100644 --- a/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/repository/AssignmentRepository.java +++ b/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/repository/AssignmentRepository.java @@ -10,8 +10,8 @@ import java.util.Set; import java.util.UUID; -import javax.inject.Inject; -import javax.persistence.EntityManager; +import jakarta.inject.Inject; +import jakarta.persistence.EntityManager; public class AssignmentRepository { diff --git a/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/repository/CaseAccountNoteRepository.java b/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/repository/CaseAccountNoteRepository.java index c5d0853518..13b5594884 100644 --- a/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/repository/CaseAccountNoteRepository.java +++ b/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/repository/CaseAccountNoteRepository.java @@ -5,12 +5,39 @@ import java.util.List; import java.util.UUID; -import org.apache.deltaspike.data.api.EntityRepository; -import org.apache.deltaspike.data.api.Repository; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.persistence.EntityManager; +import jakarta.persistence.PersistenceContext; -@Repository -public interface CaseAccountNoteRepository extends EntityRepository { +@ApplicationScoped +public class CaseAccountNoteRepository { - List findByCaseUrn(final String caseUrn); + @PersistenceContext(unitName = "sjp-persistence-unit") + private EntityManager entityManager; -} \ No newline at end of file + public List findByCaseUrn(final String caseUrn) { + return entityManager.createQuery("SELECT e FROM AccountNote e WHERE e.caseUrn = :caseUrn", AccountNote.class) + .setParameter("caseUrn", caseUrn) + .getResultList(); + } + + public AccountNote findBy(final UUID id) { + return entityManager.find(AccountNote.class, id); + } + + public AccountNote save(final AccountNote entity) { + return entityManager.merge(entity); + } + + public void remove(final AccountNote entity) { + entityManager.remove(entityManager.contains(entity) ? entity : entityManager.merge(entity)); + } + + public Long count() { + return entityManager.createQuery("SELECT COUNT(e) FROM AccountNote e", Long.class).getSingleResult(); + } + + public List findAll() { + return entityManager.createQuery("SELECT e FROM AccountNote e", AccountNote.class).getResultList(); + } +} diff --git a/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/repository/CaseApplicationDecisionRepository.java b/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/repository/CaseApplicationDecisionRepository.java index 7a9d490f10..41f9f684c1 100644 --- a/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/repository/CaseApplicationDecisionRepository.java +++ b/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/repository/CaseApplicationDecisionRepository.java @@ -2,12 +2,36 @@ import uk.gov.moj.cpp.sjp.persistence.entity.CaseApplicationDecision; +import java.util.List; import java.util.UUID; -import org.apache.deltaspike.data.api.EntityRepository; -import org.apache.deltaspike.data.api.Repository; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.persistence.EntityManager; +import jakarta.persistence.PersistenceContext; -@Repository -public interface CaseApplicationDecisionRepository extends EntityRepository { +@ApplicationScoped +public class CaseApplicationDecisionRepository { + @PersistenceContext(unitName = "sjp-persistence-unit") + private EntityManager entityManager; + + public CaseApplicationDecision findBy(final UUID id) { + return entityManager.find(CaseApplicationDecision.class, id); + } + + public CaseApplicationDecision save(final CaseApplicationDecision entity) { + return entityManager.merge(entity); + } + + public void remove(final CaseApplicationDecision entity) { + entityManager.remove(entityManager.contains(entity) ? entity : entityManager.merge(entity)); + } + + public Long count() { + return entityManager.createQuery("SELECT COUNT(e) FROM CaseApplicationDecision e", Long.class).getSingleResult(); + } + + public List findAll() { + return entityManager.createQuery("SELECT e FROM CaseApplicationDecision e", CaseApplicationDecision.class).getResultList(); + } } diff --git a/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/repository/CaseApplicationRepository.java b/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/repository/CaseApplicationRepository.java index 7bd2676a92..33201e75bb 100644 --- a/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/repository/CaseApplicationRepository.java +++ b/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/repository/CaseApplicationRepository.java @@ -1,23 +1,50 @@ package uk.gov.moj.cpp.sjp.persistence.repository; -import org.apache.deltaspike.data.api.EntityRepository; -import org.apache.deltaspike.data.api.Query; -import org.apache.deltaspike.data.api.QueryParam; -import org.apache.deltaspike.data.api.Repository; import uk.gov.moj.cpp.sjp.persistence.entity.CaseApplication; import uk.gov.moj.cpp.sjp.persistence.entity.CaseDetail; +import java.util.List; import java.util.UUID; -@Repository -public interface CaseApplicationRepository extends EntityRepository { +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.persistence.EntityManager; +import jakarta.persistence.PersistenceContext; - @Query("SELECT ca.caseDetail FROM CaseApplication ca WHERE ca.applicationDecision.decisionId=:applicationDecisionId") - CaseDetail findByApplicationDecisionId(@QueryParam("applicationDecisionId") UUID applicationDecisionId); +@ApplicationScoped +public class CaseApplicationRepository { - @Query("SELECT ca.caseDetail FROM CaseApplication ca WHERE ca.id=:applicationId") - CaseDetail findByApplicationId(@QueryParam("applicationId") UUID applicationId); + @PersistenceContext(unitName = "sjp-persistence-unit") + private EntityManager entityManager; -} + public CaseDetail findByApplicationDecisionId(final UUID applicationDecisionId) { + return entityManager.createQuery("SELECT ca.caseDetail FROM CaseApplication ca WHERE ca.applicationDecision.decisionId=:applicationDecisionId", CaseDetail.class) + .setParameter("applicationDecisionId", applicationDecisionId) + .getSingleResult(); + } + + public CaseDetail findByApplicationId(final UUID applicationId) { + return entityManager.createQuery("SELECT ca.caseDetail FROM CaseApplication ca WHERE ca.id=:applicationId", CaseDetail.class) + .setParameter("applicationId", applicationId) + .getSingleResult(); + } + + public CaseApplication findBy(final UUID id) { + return entityManager.find(CaseApplication.class, id); + } + public CaseApplication save(final CaseApplication entity) { + return entityManager.merge(entity); + } + public void remove(final CaseApplication entity) { + entityManager.remove(entityManager.contains(entity) ? entity : entityManager.merge(entity)); + } + + public Long count() { + return entityManager.createQuery("SELECT COUNT(e) FROM CaseApplication e", Long.class).getSingleResult(); + } + + public List findAll() { + return entityManager.createQuery("SELECT e FROM CaseApplication e", CaseApplication.class).getResultList(); + } +} diff --git a/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/repository/CaseAssignmentRestrictionRepository.java b/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/repository/CaseAssignmentRestrictionRepository.java index 180a663fce..3a2f895fb4 100644 --- a/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/repository/CaseAssignmentRestrictionRepository.java +++ b/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/repository/CaseAssignmentRestrictionRepository.java @@ -6,18 +6,15 @@ import java.time.ZonedDateTime; import java.util.List; -import javax.inject.Inject; -import javax.persistence.EntityManager; -import javax.persistence.Query; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.persistence.EntityManager; +import jakarta.persistence.PersistenceContext; +import jakarta.persistence.Query; -import org.apache.deltaspike.data.api.EntityRepository; -import org.apache.deltaspike.data.api.QueryParam; -import org.apache.deltaspike.data.api.Repository; +@ApplicationScoped +public class CaseAssignmentRestrictionRepository { -@Repository -public abstract class CaseAssignmentRestrictionRepository implements EntityRepository { - - @Inject + @PersistenceContext(unitName = "sjp-persistence-unit") private EntityManager entityManager; private static final String INSERT_STATEMENT = @@ -27,18 +24,31 @@ public abstract class CaseAssignmentRestrictionRepository implements EntityRepos "DO UPDATE " + "SET include_only = cast(:include_only as jsonb), exclude = cast(:exclude as jsonb), date_time_created = :date_time_created, valid_from = :valid_from, valid_to = :valid_to "; - @org.apache.deltaspike.data.api.Query(value = "SELECT * " + + private static final String FIND_BY_PROSECUTING_AUTHORITY = "SELECT * " + " FROM case_assignment_restriction " + " WHERE prosecuting_authority =:prosecuting_authority " + - " AND (valid_from IS NULL or valid_from <= :now) and (valid_to IS NULL OR valid_to >= :now)", isNative = true) - public abstract List findByProsecutingAuthority(@QueryParam("prosecuting_authority") final String prosecutingAuthority, @QueryParam("now") final LocalDate now); + " AND (valid_from IS NULL or valid_from <= :now) and (valid_to IS NULL OR valid_to >= :now)"; - @org.apache.deltaspike.data.api.Query(value = "SELECT prosecuting_authority " + + private static final String FIND_PROSECUTING_AUTHORITIES_BY_LJA = "SELECT prosecuting_authority " + " FROM case_assignment_restriction " + " WHERE (include_only = '[]' OR jsonb_exists(include_only, :lja)) " + " AND NOT jsonb_exists(exclude, :lja)" + - " AND (valid_from IS NULL or valid_from <= :now) and (valid_to IS NULL OR valid_to >= :now)", isNative = true) - public abstract List findProsecutingAuthoritiesByLja(@QueryParam("lja") final String lja, @QueryParam("now") final LocalDate now); + " AND (valid_from IS NULL or valid_from <= :now) and (valid_to IS NULL OR valid_to >= :now)"; + + public List findByProsecutingAuthority(final String prosecutingAuthority, final LocalDate now) { + return entityManager.createNativeQuery(FIND_BY_PROSECUTING_AUTHORITY, CaseAssignmentRestriction.class) + .setParameter("prosecuting_authority", prosecutingAuthority) + .setParameter("now", now) + .getResultList(); + } + + @SuppressWarnings("unchecked") + public List findProsecutingAuthoritiesByLja(final String lja, final LocalDate now) { + return entityManager.createNativeQuery(FIND_PROSECUTING_AUTHORITIES_BY_LJA) + .setParameter("lja", lja) + .setParameter("now", now) + .getResultList(); + } public void saveCaseAssignmentRestriction(final String prosecutingAuthority, final String includeOnly, final String exclude, final ZonedDateTime dateTimeCreated, final LocalDate validFrom, final LocalDate validTo) { @@ -51,14 +61,34 @@ public void saveCaseAssignmentRestriction(final String prosecutingAuthority, fin if (validFrom != null) { insertStatement.setParameter("valid_from", validFrom); } else { - insertStatement.setParameter("valid_from", LocalDate.of(1900,1,1)); + insertStatement.setParameter("valid_from", LocalDate.of(1900, 1, 1)); } if (validTo != null) { insertStatement.setParameter("valid_to", validTo); } else { - insertStatement.setParameter("valid_to", LocalDate.of(9999,1,1)); + insertStatement.setParameter("valid_to", LocalDate.of(9999, 1, 1)); } insertStatement.executeUpdate(); } + + public CaseAssignmentRestriction findBy(final String id) { + return entityManager.find(CaseAssignmentRestriction.class, id); + } + + public CaseAssignmentRestriction save(final CaseAssignmentRestriction entity) { + return entityManager.merge(entity); + } + + public void remove(final CaseAssignmentRestriction entity) { + entityManager.remove(entityManager.contains(entity) ? entity : entityManager.merge(entity)); + } + + public Long count() { + return entityManager.createQuery("SELECT COUNT(e) FROM CaseAssignmentRestriction e", Long.class).getSingleResult(); + } + + public List findAll() { + return entityManager.createQuery("SELECT e FROM CaseAssignmentRestriction e", CaseAssignmentRestriction.class).getResultList(); + } } diff --git a/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/repository/CaseCourtReferralStatusRepository.java b/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/repository/CaseCourtReferralStatusRepository.java index 4687048836..7c1d84d37c 100644 --- a/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/repository/CaseCourtReferralStatusRepository.java +++ b/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/repository/CaseCourtReferralStatusRepository.java @@ -2,11 +2,36 @@ import uk.gov.moj.cpp.sjp.persistence.entity.CaseCourtReferralStatus; +import java.util.List; import java.util.UUID; -import org.apache.deltaspike.data.api.EntityRepository; -import org.apache.deltaspike.data.api.Repository; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.persistence.EntityManager; +import jakarta.persistence.PersistenceContext; -@Repository -public interface CaseCourtReferralStatusRepository extends EntityRepository { +@ApplicationScoped +public class CaseCourtReferralStatusRepository { + + @PersistenceContext(unitName = "sjp-persistence-unit") + private EntityManager entityManager; + + public CaseCourtReferralStatus findBy(final UUID id) { + return entityManager.find(CaseCourtReferralStatus.class, id); + } + + public CaseCourtReferralStatus save(final CaseCourtReferralStatus entity) { + return entityManager.merge(entity); + } + + public void remove(final CaseCourtReferralStatus entity) { + entityManager.remove(entityManager.contains(entity) ? entity : entityManager.merge(entity)); + } + + public Long count() { + return entityManager.createQuery("SELECT COUNT(e) FROM CaseCourtReferralStatus e", Long.class).getSingleResult(); + } + + public List findAll() { + return entityManager.createQuery("SELECT e FROM CaseCourtReferralStatus e", CaseCourtReferralStatus.class).getResultList(); + } } diff --git a/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/repository/CaseDecisionRepository.java b/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/repository/CaseDecisionRepository.java index 524b2ccabd..b6656c8255 100644 --- a/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/repository/CaseDecisionRepository.java +++ b/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/repository/CaseDecisionRepository.java @@ -5,20 +5,54 @@ import java.util.List; import java.util.UUID; -import org.apache.deltaspike.data.api.EntityRepository; -import org.apache.deltaspike.data.api.Query; -import org.apache.deltaspike.data.api.QueryParam; -import org.apache.deltaspike.data.api.Repository; - -@Repository -public interface CaseDecisionRepository extends EntityRepository { - - @Query(value = "SELECT casedecision FROM CaseDecision as casedecision INNER JOIN casedecision.offenceDecisions as offencedecision " + - "WHERE offencedecision.offenceId = :offenceId and offencedecision.caseDecisionId = casedecision.id and offencedecision.verdictType IN ('FOUND_GUILTY', 'PROVED_SJP')") - List findCaseDecisionsForConvictingCourtSessions(@QueryParam("offenceId") final UUID offenceId); - - @Query(value = "SELECT casedecision_a FROM CaseDecision as casedecision_a " + - "WHERE casedecision_a.caseId = :caseId and casedecision_a.savedAt=(SELECT MAX(casedecision_b.savedAt) FROM CaseDecision as casedecision_b " + - "WHERE casedecision_b.caseId = casedecision_a.caseId )") - CaseDecision findCaseDecisionById(@QueryParam("caseId") final UUID caseId); +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.persistence.EntityManager; +import jakarta.persistence.PersistenceContext; + +@ApplicationScoped +public class CaseDecisionRepository { + + @PersistenceContext(unitName = "sjp-persistence-unit") + private EntityManager entityManager; + + public List findCaseDecisionsForConvictingCourtSessions(final UUID offenceId) { + return entityManager.createQuery("SELECT casedecision FROM CaseDecision as casedecision INNER JOIN casedecision.offenceDecisions as offencedecision " + + "WHERE offencedecision.offenceId = :offenceId and offencedecision.caseDecisionId = casedecision.id and offencedecision.verdictType IN ('FOUND_GUILTY', 'PROVED_SJP')", CaseDecision.class) + .setParameter("offenceId", offenceId) + .getResultList(); + } + + public CaseDecision findCaseDecisionById(final UUID caseId) { + return entityManager.createQuery("SELECT casedecision_a FROM CaseDecision as casedecision_a " + + "WHERE casedecision_a.caseId = :caseId and casedecision_a.savedAt=(SELECT MAX(casedecision_b.savedAt) FROM CaseDecision as casedecision_b " + + "WHERE casedecision_b.caseId = casedecision_a.caseId )", CaseDecision.class) + .setParameter("caseId", caseId) + .getSingleResult(); + } + + public CaseDecision findBy(final UUID id) { + return entityManager.find(CaseDecision.class, id); + } + + public CaseDecision save(final CaseDecision entity) { + // Mirror the DeltaSpike EntityRepository.save contract: persist a genuinely-new entity + // (leaving the passed instance managed, and its associations unresolved) else merge. + if (entity.getId() != null && entityManager.find(CaseDecision.class, entity.getId()) != null) { + return entityManager.merge(entity); + } + entityManager.persist(entity); + return entity; + } + + public void remove(final CaseDecision entity) { + entityManager.remove(entityManager.contains(entity) ? entity : entityManager.merge(entity)); + } + + public Long count() { + return entityManager.createQuery("SELECT COUNT(e) FROM CaseDecision e", Long.class).getSingleResult(); + } + + public List findAll() { + return entityManager.createQuery("SELECT e FROM CaseDecision e", CaseDecision.class).getResultList(); + } } diff --git a/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/repository/CaseDocumentRepository.java b/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/repository/CaseDocumentRepository.java index f9bfac4d09..dd076e1bd8 100644 --- a/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/repository/CaseDocumentRepository.java +++ b/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/repository/CaseDocumentRepository.java @@ -6,20 +6,50 @@ import java.util.List; import java.util.UUID; -import org.apache.deltaspike.data.api.EntityRepository; -import org.apache.deltaspike.data.api.Query; -import org.apache.deltaspike.data.api.QueryParam; -import org.apache.deltaspike.data.api.Repository; - -@Repository -public interface CaseDocumentRepository extends EntityRepository { - - @Query(value = "SELECT cd FROM CaseDocument cd WHERE cd.documentType = :documentType AND cd.addedAt >= :fromDate AND cd.addedAt < :toDate ORDER BY cd.addedAt DESC") - List findCaseDocumentsOrderedByAddedByDescending( - @QueryParam("fromDate") final ZonedDateTime fromDate, - @QueryParam("toDate") final ZonedDateTime toDate, - @QueryParam("documentType") final String documentType); - - @Query(value = "FROM CaseDocument cd WHERE cd.materialId = :materialId") - CaseDocument findByMaterialId(@QueryParam("materialId") UUID materialId); +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.persistence.EntityManager; +import jakarta.persistence.PersistenceContext; + +@ApplicationScoped +public class CaseDocumentRepository { + + @PersistenceContext(unitName = "sjp-persistence-unit") + private EntityManager entityManager; + + public List findCaseDocumentsOrderedByAddedByDescending( + final ZonedDateTime fromDate, + final ZonedDateTime toDate, + final String documentType) { + return entityManager.createQuery("SELECT cd FROM CaseDocument cd WHERE cd.documentType = :documentType AND cd.addedAt >= :fromDate AND cd.addedAt < :toDate ORDER BY cd.addedAt DESC", CaseDocument.class) + .setParameter("fromDate", fromDate) + .setParameter("toDate", toDate) + .setParameter("documentType", documentType) + .getResultList(); + } + + public CaseDocument findByMaterialId(final UUID materialId) { + return entityManager.createQuery("SELECT cd FROM CaseDocument cd WHERE cd.materialId = :materialId", CaseDocument.class) + .setParameter("materialId", materialId) + .getSingleResult(); + } + + public CaseDocument findBy(final UUID id) { + return entityManager.find(CaseDocument.class, id); + } + + public CaseDocument save(final CaseDocument entity) { + return entityManager.merge(entity); + } + + public void remove(final CaseDocument entity) { + entityManager.remove(entityManager.contains(entity) ? entity : entityManager.merge(entity)); + } + + public Long count() { + return entityManager.createQuery("SELECT COUNT(e) FROM CaseDocument e", Long.class).getSingleResult(); + } + + public List findAll() { + return entityManager.createQuery("SELECT e FROM CaseDocument e", CaseDocument.class).getResultList(); + } } diff --git a/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/repository/CaseNoteRepository.java b/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/repository/CaseNoteRepository.java index 4bed5c1cc5..1d03b04652 100644 --- a/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/repository/CaseNoteRepository.java +++ b/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/repository/CaseNoteRepository.java @@ -6,13 +6,52 @@ import java.util.List; import java.util.UUID; -import org.apache.deltaspike.data.api.EntityRepository; -import org.apache.deltaspike.data.api.Repository; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.persistence.EntityManager; +import jakarta.persistence.PersistenceContext; -@Repository -public interface CaseNoteRepository extends EntityRepository { +@ApplicationScoped +public class CaseNoteRepository { - List findByCaseIdOrderByAddedAtDesc(final UUID caseId); + @PersistenceContext(unitName = "sjp-persistence-unit") + private EntityManager entityManager; - List findByCaseIdAndNoteTypeOrderByAddedAtDesc(final UUID caseId, final NoteType noteType); -} \ No newline at end of file + public List findByCaseIdOrderByAddedAtDesc(final UUID caseId) { + return entityManager.createQuery("SELECT e FROM CaseNote e WHERE e.caseId = :caseId ORDER BY e.addedAt DESC", CaseNote.class) + .setParameter("caseId", caseId) + .getResultList(); + } + + public List findByCaseIdAndNoteTypeOrderByAddedAtDesc(final UUID caseId, final NoteType noteType) { + return entityManager.createQuery("SELECT e FROM CaseNote e WHERE e.caseId = :caseId AND e.noteType = :noteType ORDER BY e.addedAt DESC", CaseNote.class) + .setParameter("caseId", caseId) + .setParameter("noteType", noteType) + .getResultList(); + } + + public CaseNote findBy(final UUID id) { + return entityManager.find(CaseNote.class, id); + } + + public CaseNote save(final CaseNote entity) { + // Mirror the DeltaSpike EntityRepository.save contract: persist a genuinely-new entity + // (leaving the passed instance managed) else merge. + if (entity.getNoteId() != null && entityManager.find(CaseNote.class, entity.getNoteId()) != null) { + return entityManager.merge(entity); + } + entityManager.persist(entity); + return entity; + } + + public void remove(final CaseNote entity) { + entityManager.remove(entityManager.contains(entity) ? entity : entityManager.merge(entity)); + } + + public Long count() { + return entityManager.createQuery("SELECT COUNT(e) FROM CaseNote e", Long.class).getSingleResult(); + } + + public List findAll() { + return entityManager.createQuery("SELECT e FROM CaseNote e", CaseNote.class).getResultList(); + } +} diff --git a/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/repository/CasePublishStatusRepository.java b/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/repository/CasePublishStatusRepository.java index 340bae366d..13227ab341 100644 --- a/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/repository/CasePublishStatusRepository.java +++ b/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/repository/CasePublishStatusRepository.java @@ -5,15 +5,41 @@ import java.util.List; import java.util.UUID; -import org.apache.deltaspike.data.api.EntityRepository; -import org.apache.deltaspike.data.api.Query; -import org.apache.deltaspike.data.api.QueryParam; -import org.apache.deltaspike.data.api.Repository; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.persistence.EntityManager; +import jakarta.persistence.PersistenceContext; -@Repository -public interface CasePublishStatusRepository extends EntityRepository { +@ApplicationScoped +public class CasePublishStatusRepository { - @Query(value = "SELECT cps FROM CasePublishStatus cps WHERE cps.caseId in :caseIds ORDER BY cps.firstPublished DESC") - List findByCaseIds(@QueryParam("caseIds") final List caseIds); + @PersistenceContext(unitName = "sjp-persistence-unit") + private EntityManager entityManager; + public List findByCaseIds(final List caseIds) { + return entityManager.createQuery( + "SELECT cps FROM CasePublishStatus cps WHERE cps.caseId in :caseIds ORDER BY cps.firstPublished DESC", + CasePublishStatus.class) + .setParameter("caseIds", caseIds) + .getResultList(); + } + + public CasePublishStatus findBy(final UUID id) { + return entityManager.find(CasePublishStatus.class, id); + } + + public CasePublishStatus save(final CasePublishStatus entity) { + return entityManager.merge(entity); + } + + public void remove(final CasePublishStatus entity) { + entityManager.remove(entityManager.contains(entity) ? entity : entityManager.merge(entity)); + } + + public Long count() { + return entityManager.createQuery("SELECT COUNT(e) FROM CasePublishStatus e", Long.class).getSingleResult(); + } + + public List findAll() { + return entityManager.createQuery("SELECT e FROM CasePublishStatus e", CasePublishStatus.class).getResultList(); + } } diff --git a/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/repository/CaseRepository.java b/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/repository/CaseRepository.java index c422dcbf23..9175cfb00a 100644 --- a/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/repository/CaseRepository.java +++ b/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/repository/CaseRepository.java @@ -11,29 +11,24 @@ import java.util.List; import java.util.UUID; -import javax.inject.Inject; -import javax.persistence.EntityManager; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.persistence.EntityManager; +import jakarta.persistence.NoResultException; +import jakarta.persistence.PersistenceContext; +import jakarta.persistence.TypedQuery; import org.apache.commons.lang3.StringUtils; -import org.apache.deltaspike.data.api.AbstractEntityRepository; -import org.apache.deltaspike.data.api.Query; -import org.apache.deltaspike.data.api.QueryParam; -import org.apache.deltaspike.data.api.QueryResult; -import org.apache.deltaspike.data.api.Repository; -import org.apache.deltaspike.data.api.SingleResultType; -import org.apache.deltaspike.data.api.criteria.CriteriaSupport; /** * Repository for {@link CaseDetail} */ @SuppressWarnings({"ALL", "PMD.BeanMembersShouldSerialize"}) -@Repository -public abstract class CaseRepository extends AbstractEntityRepository implements CriteriaSupport { +@ApplicationScoped +public class CaseRepository { - @Inject + @PersistenceContext(unitName = "sjp-persistence-unit") private EntityManager entityManager; - private static final String SELECT_CASES_FOR_SOC_CHECK = " with adjourn_temp as (select distinct cd.id from case_decision cd inner join offence_decision od on cd.id = od.case_decision_id where od.decision_type = 'ADJOURN')" + " select distinct cast(cd.id as varchar) as id , cd.urn as urn, cdn.saved_at as lastUpdatedDate, cd.prosecuting_authority as prosecutingAuthority, sess.magistrate as magistrate, " + @@ -77,7 +72,6 @@ private String getOrderingString(final String sortField, final String sortOrder) return sb.toString(); } - public void completeCase(final UUID caseId) { final CaseDetail caseDetail = findBy(caseId); @@ -87,145 +81,225 @@ public void completeCase(final UUID caseId) { } } - @Query(value = "FROM CaseDetail cd WHERE UPPER(cd.urn) = UPPER(:urn)") - public abstract CaseDetail findByUrn(@QueryParam("urn") String urn); - - @Query(value = "SELECT cd FROM CaseDetail cd " + - "INNER JOIN cd.defendant dd " + - "WHERE (UPPER(cd.urn) = UPPER(:urn) OR UPPER(REGEXP_REPLACE(cd.urn, '^[a-zA-Z]+', '')) = UPPER(:urn)) " + - "AND UPPER(REPLACE(dd.address.postcode,' ','')) = UPPER(REPLACE(:postcode, ' ',''))", singleResult = SingleResultType.OPTIONAL) - public abstract CaseDetail findByUrnPostcode(@QueryParam("urn") String urn, - @QueryParam("postcode") String postcode); - - @Query(value = "select cd from CaseDetail cd INNER JOIN cd.defendant dd WHERE dd.id = :defendantId") - public abstract List findByDefendantId(@QueryParam("defendantId") final UUID defendantId); - - @Query(value = "SELECT cd FROM CaseDetail cd LEFT OUTER JOIN cd.caseDocuments cdocs ON cdocs.documentType = 'SJPN' " + - "WHERE cdocs IS NULL AND cd.completed IS NOT true AND ( cd.prosecutingAuthority LIKE :prosecutingAuthorityFilter OR cd.prosecutingAuthority IN (:agentProsecutorAuthorityAccess))") - public abstract QueryResult findCasesMissingSjpn(@QueryParam("prosecutingAuthorityFilter") String prosecutingAuthorityFilter, - @QueryParam("agentProsecutorAuthorityAccess") List agentProsecutorAuthorityAccess); - - @Query(value = "SELECT cd FROM CaseDetail cd LEFT OUTER JOIN cd.caseDocuments cdocs ON cdocs.documentType = 'SJPN' " + - "WHERE cdocs IS NULL AND cd.postingDate < :postedBefore AND cd.completed IS NOT true AND ( cd.prosecutingAuthority LIKE :prosecutingAuthorityFilter " + - "OR cd.prosecutingAuthority IN (:agentProsecutorAuthorityAccess))") - public abstract QueryResult findCasesMissingSjpn(@QueryParam("prosecutingAuthorityFilter") String prosecutingAuthorityFilter, @QueryParam("postedBefore") final LocalDate postedBefore, - @QueryParam("agentProsecutorAuthorityAccess") List agentProsecutorAuthorityAccess); - - @Query(value = "SELECT COUNT(cd) FROM CaseDetail cd LEFT OUTER JOIN cd.caseDocuments cdocs ON cdocs.documentType = 'SJPN' " + - "WHERE cdocs IS NULL AND cd.completed IS NOT true AND ( cd.prosecutingAuthority LIKE :prosecutingAuthorityFilter OR cd.prosecutingAuthority IN (:agentProsecutorAuthorityAccess) )") - public abstract int countCasesMissingSjpn(@QueryParam("prosecutingAuthorityFilter") String prosecutingAuthorityFilter, - @QueryParam("agentProsecutorAuthorityAccess") List agentProsecutorAuthorityAccess); - - @Query(value = "SELECT COUNT(cd) FROM CaseDetail cd LEFT OUTER JOIN cd.caseDocuments cdocs ON cdocs.documentType = 'SJPN' " + - "WHERE cdocs IS NULL AND cd.postingDate < :postedBefore AND cd.completed IS NOT true AND ( cd.prosecutingAuthority LIKE :prosecutingAuthorityFilter OR cd.prosecutingAuthority IN (:agentProsecutorAuthorityAccess))") - public abstract int countCasesMissingSjpn(@QueryParam("prosecutingAuthorityFilter") String prosecutingAuthorityFilter, @QueryParam("postedBefore") final LocalDate postedBefore, - @QueryParam("agentProsecutorAuthorityAccess") List agentProsecutorAuthorityAccess); - - @Query(value = "SELECT cd.caseDocuments FROM CaseDetail cd where cd.id = :caseId") - public abstract List findCaseDocuments(@QueryParam("caseId") final UUID caseId); - - @Query(value = "SELECT cd.defendant FROM CaseDetail cd where cd.id = :caseId") - public abstract DefendantDetail findCaseDefendant(@QueryParam("caseId") final UUID caseId); - - @Query(value = "select cd from CaseDetail cd JOIN cd.caseDocuments cdocs " + - "WHERE cdocs.materialId = :materialId") - public abstract CaseDetail findByMaterialId(@QueryParam("materialId") final UUID materialId); - - @Query(value = "SELECT cd.prosecutingAuthority FROM CaseDetail cd WHERE cd.id = :caseId", singleResult = SingleResultType.OPTIONAL) - public abstract String getProsecutingAuthority(@QueryParam("caseId") final UUID caseId); - - @Query(value = "SELECT new uk.gov.moj.cpp.sjp.persistence.entity.PendingCaseToPublishPerOffence" + - "(d.personalDetails.title, d.personalDetails.firstName, d.personalDetails.lastName, d.legalEntityDetails.legalEntityName, d.personalDetails.dateOfBirth," + - "cd.id, cd.urn," + - "d.address.address1, d.address.address2," + - "d.address.address3, d.address.address4, d.address.address5," + - "d.address.postcode, o.code, o.startDate, o.wording, " + - "o.pressRestriction.requested, o.pressRestriction.name, o.completed, cd.prosecutingAuthority, o.wordingWelsh) " + - "FROM CaseDetail cd " + - "LEFT OUTER JOIN cd.defendant d " + - "LEFT OUTER JOIN d.offences o " + - "WHERE cd.id IN (SELECT rc.id FROM ReadyCase rc) " + - "AND cd.id IN (SELECT cps.caseId FROM CasePublishStatus cps WHERE cps.numberOfPublishes < 5)" + - "ORDER BY cd.postingDate") - public abstract List findPublicTransparencyReportPendingCases(); - - @Query(value = "SELECT new uk.gov.moj.cpp.sjp.persistence.entity.PendingCaseToPublishPerOffence" + - "(d.personalDetails.title, d.personalDetails.firstName, d.personalDetails.lastName, d.legalEntityDetails.legalEntityName, d.personalDetails.dateOfBirth," + - "cd.id, cd.urn," + - "d.address.address1, d.address.address2," + - "d.address.address3, d.address.address4, d.address.address5," + - "d.address.postcode, o.code, o.startDate, o.wording, " + - "o.pressRestriction.requested, o.pressRestriction.name, o.completed, cd.prosecutingAuthority, o.wordingWelsh) " + - "FROM CaseDetail cd " + - "LEFT OUTER JOIN cd.defendant d " + - "LEFT OUTER JOIN d.offences o " + - "WHERE cd.id IN (SELECT rc.id FROM ReadyCase rc WHERE rc.markedAt BETWEEN :fromDate AND :toDate) " + - "ORDER BY cd.postingDate") - public abstract List findPublicTransparencyDeltaReportPendingCases(@QueryParam("fromDate") final LocalDate fromDate, @QueryParam("toDate") final LocalDate toDate); - - @Query(value = "SELECT new uk.gov.moj.cpp.sjp.persistence.entity.PendingCaseToPublishPerOffence" + - "(d.personalDetails.title, d.personalDetails.firstName, d.personalDetails.lastName, d.legalEntityDetails.legalEntityName, d.personalDetails.dateOfBirth," + - "cd.id, cd.urn," + - "d.address.address1, d.address.address2," + - "d.address.address3, d.address.address4, d.address.address5," + - "d.address.postcode, o.code, o.startDate, o.wording," + - "o.pressRestriction.requested, o.pressRestriction.name, o.completed, cd.prosecutingAuthority, o.wordingWelsh) " + - "FROM CaseDetail cd " + - "LEFT OUTER JOIN cd.defendant d " + - "LEFT OUTER JOIN d.offences o " + - "WHERE cd.id IN (SELECT rc.id FROM ReadyCase rc) " + - "AND cd.id IN (SELECT cps.caseId FROM CasePublishStatus cps WHERE cps.numberOfPublishes < 5)" + - "ORDER BY cd.postingDate") - public abstract List findPressTransparencyReportPendingCases(); - - @Query(value = "SELECT new uk.gov.moj.cpp.sjp.persistence.entity.PendingCaseToPublishPerOffence" + - "(d.personalDetails.title, d.personalDetails.firstName, d.personalDetails.lastName, d.legalEntityDetails.legalEntityName, d.personalDetails.dateOfBirth," + - "cd.id, cd.urn," + - "d.address.address1, d.address.address2," + - "d.address.address3, d.address.address4, d.address.address5," + - "d.address.postcode, o.code, o.startDate, o.wording," + - "o.pressRestriction.requested, o.pressRestriction.name, o.completed, cd.prosecutingAuthority, o.wordingWelsh) " + - "FROM CaseDetail cd " + - "LEFT OUTER JOIN cd.defendant d " + - "LEFT OUTER JOIN d.offences o " + - "WHERE cd.id IN (SELECT rc.id FROM ReadyCase rc WHERE rc.markedAt BETWEEN :fromDate AND :toDate) " + - "ORDER BY cd.postingDate") - public abstract List findPressTransparencyDeltaReportPendingCases(@QueryParam("fromDate") final LocalDate fromDate, @QueryParam("toDate") final LocalDate toDate); - - @Query(value = "SELECT DISTINCT new uk.gov.moj.cpp.sjp.persistence.entity.CaseNotGuiltyPlea" + - "(e.id, e.urn, o.pleaDate, d.personalDetails.firstName, d.personalDetails.lastName, d.legalEntityDetails.legalEntityName, e.prosecutingAuthority, e.caseManagementStatus) " + - "FROM CaseDetail e " + - "JOIN e.defendant d " + - "JOIN d.offences o " + - "WHERE e.completed = false " + - "AND o.plea = 'NOT_GUILTY' " + - "AND e.caseStatus != 'REFER_FOR_COURT_HEARING' " + - "AND e.prosecutingAuthority = :prosecutingAuthority " + - "ORDER BY o.pleaDate DESC ") - public abstract List findCasesNotGuiltyPleaByProsecutingAuthority(@QueryParam("prosecutingAuthority") String prosecutingAuthority); - - @Query(value = "SELECT DISTINCT new uk.gov.moj.cpp.sjp.persistence.entity.CaseNotGuiltyPlea" + - "(e.id, e.urn, o.pleaDate, d.personalDetails.firstName, d.personalDetails.lastName, d.legalEntityDetails.legalEntityName, e.prosecutingAuthority, e.caseManagementStatus) " + - "FROM CaseDetail e " + - "JOIN e.defendant d " + - "JOIN d.offences o " + - "WHERE e.completed = false " + - "AND o.plea = 'NOT_GUILTY' " + - "AND e.caseStatus != 'REFER_FOR_COURT_HEARING' " + - "ORDER BY o.pleaDate DESC ") - public abstract List findCasesNotGuiltyPlea(); - - @Query(value = "SELECT DISTINCT new uk.gov.moj.cpp.sjp.persistence.entity.CaseWithoutDefendantPostcode" + - "(e.id, e.urn, e.postingDate, d.personalDetails.firstName, d.personalDetails.lastName, e.prosecutingAuthority,d.legalEntityDetails.legalEntityName) " + - "FROM CaseDetail e " + - "JOIN e.defendant d " + - "WHERE e.completed = false " + - "AND d.address.postcode IS NULL " + - "ORDER BY e.postingDate DESC ") - public abstract List findCasesWithoutDefendantPostcode(); + public CaseDetail findByUrn(final String urn) { + return entityManager.createQuery("SELECT cd FROM CaseDetail cd WHERE UPPER(cd.urn) = UPPER(:urn)", CaseDetail.class) + .setParameter("urn", urn) + .getSingleResult(); + } + + public CaseDetail findByUrnPostcode(final String urn, final String postcode) { + final TypedQuery query = entityManager.createQuery("SELECT cd FROM CaseDetail cd " + + "INNER JOIN cd.defendant dd " + + "WHERE (UPPER(cd.urn) = UPPER(:urn) OR UPPER(FUNCTION('REGEXP_REPLACE', cd.urn, '^[a-zA-Z]+', '')) = UPPER(:urn)) " + + "AND UPPER(FUNCTION('REPLACE', dd.address.postcode, ' ', '')) = UPPER(FUNCTION('REPLACE', :postcode, ' ', ''))", CaseDetail.class) + .setParameter("urn", urn) + .setParameter("postcode", postcode); + try { + return query.getSingleResult(); + } catch (final NoResultException e) { + return null; + } + } + + public List findByDefendantId(final UUID defendantId) { + return entityManager.createQuery("select cd from CaseDetail cd INNER JOIN cd.defendant dd WHERE dd.id = :defendantId", CaseDetail.class) + .setParameter("defendantId", defendantId) + .getResultList(); + } + + public TypedQuery findCasesMissingSjpn(final String prosecutingAuthorityFilter, + final List agentProsecutorAuthorityAccess) { + return entityManager.createQuery("SELECT cd FROM CaseDetail cd LEFT OUTER JOIN cd.caseDocuments cdocs ON cdocs.documentType = 'SJPN' " + + "WHERE cdocs IS NULL AND cd.completed IS NOT true AND ( cd.prosecutingAuthority LIKE :prosecutingAuthorityFilter OR cd.prosecutingAuthority IN (:agentProsecutorAuthorityAccess))", CaseDetail.class) + .setParameter("prosecutingAuthorityFilter", prosecutingAuthorityFilter) + .setParameter("agentProsecutorAuthorityAccess", agentProsecutorAuthorityAccess); + } + + public TypedQuery findCasesMissingSjpn(final String prosecutingAuthorityFilter, final LocalDate postedBefore, + final List agentProsecutorAuthorityAccess) { + return entityManager.createQuery("SELECT cd FROM CaseDetail cd LEFT OUTER JOIN cd.caseDocuments cdocs ON cdocs.documentType = 'SJPN' " + + "WHERE cdocs IS NULL AND cd.postingDate < :postedBefore AND cd.completed IS NOT true AND ( cd.prosecutingAuthority LIKE :prosecutingAuthorityFilter " + + "OR cd.prosecutingAuthority IN (:agentProsecutorAuthorityAccess))", CaseDetail.class) + .setParameter("prosecutingAuthorityFilter", prosecutingAuthorityFilter) + .setParameter("postedBefore", postedBefore) + .setParameter("agentProsecutorAuthorityAccess", agentProsecutorAuthorityAccess); + } + + public int countCasesMissingSjpn(final String prosecutingAuthorityFilter, + final List agentProsecutorAuthorityAccess) { + return entityManager.createQuery("SELECT COUNT(cd) FROM CaseDetail cd LEFT OUTER JOIN cd.caseDocuments cdocs ON cdocs.documentType = 'SJPN' " + + "WHERE cdocs IS NULL AND cd.completed IS NOT true AND ( cd.prosecutingAuthority LIKE :prosecutingAuthorityFilter OR cd.prosecutingAuthority IN (:agentProsecutorAuthorityAccess) )", Long.class) + .setParameter("prosecutingAuthorityFilter", prosecutingAuthorityFilter) + .setParameter("agentProsecutorAuthorityAccess", agentProsecutorAuthorityAccess) + .getSingleResult().intValue(); + } + + public int countCasesMissingSjpn(final String prosecutingAuthorityFilter, final LocalDate postedBefore, + final List agentProsecutorAuthorityAccess) { + return entityManager.createQuery("SELECT COUNT(cd) FROM CaseDetail cd LEFT OUTER JOIN cd.caseDocuments cdocs ON cdocs.documentType = 'SJPN' " + + "WHERE cdocs IS NULL AND cd.postingDate < :postedBefore AND cd.completed IS NOT true AND ( cd.prosecutingAuthority LIKE :prosecutingAuthorityFilter OR cd.prosecutingAuthority IN (:agentProsecutorAuthorityAccess))", Long.class) + .setParameter("prosecutingAuthorityFilter", prosecutingAuthorityFilter) + .setParameter("postedBefore", postedBefore) + .setParameter("agentProsecutorAuthorityAccess", agentProsecutorAuthorityAccess) + .getSingleResult().intValue(); + } + + public List findCaseDocuments(final UUID caseId) { + return entityManager.createQuery("SELECT cd.caseDocuments FROM CaseDetail cd where cd.id = :caseId", CaseDocument.class) + .setParameter("caseId", caseId) + .getResultList(); + } + + public DefendantDetail findCaseDefendant(final UUID caseId) { + return entityManager.createQuery("SELECT cd.defendant FROM CaseDetail cd where cd.id = :caseId", DefendantDetail.class) + .setParameter("caseId", caseId) + .getSingleResult(); + } + + public CaseDetail findByMaterialId(final UUID materialId) { + return entityManager.createQuery("select cd from CaseDetail cd JOIN cd.caseDocuments cdocs WHERE cdocs.materialId = :materialId", CaseDetail.class) + .setParameter("materialId", materialId) + .getSingleResult(); + } + + public String getProsecutingAuthority(final UUID caseId) { + return entityManager.createQuery("SELECT cd.prosecutingAuthority FROM CaseDetail cd WHERE cd.id = :caseId", String.class) + .setParameter("caseId", caseId) + .getResultList().stream().findFirst().orElse(null); + } + + public List findPublicTransparencyReportPendingCases() { + return entityManager.createQuery("SELECT new uk.gov.moj.cpp.sjp.persistence.entity.PendingCaseToPublishPerOffence" + + "(d.personalDetails.title, d.personalDetails.firstName, d.personalDetails.lastName, d.legalEntityDetails.legalEntityName, d.personalDetails.dateOfBirth," + + "cd.id, cd.urn," + + "d.address.address1, d.address.address2," + + "d.address.address3, d.address.address4, d.address.address5," + + "d.address.postcode, o.code, o.startDate, o.wording, " + + "o.pressRestriction.requested, o.pressRestriction.name, o.completed, cd.prosecutingAuthority, o.wordingWelsh) " + + "FROM CaseDetail cd " + + "LEFT OUTER JOIN cd.defendant d " + + "LEFT OUTER JOIN d.offences o " + + "WHERE cd.id IN (SELECT rc.id FROM ReadyCase rc) " + + "AND cd.id IN (SELECT cps.caseId FROM CasePublishStatus cps WHERE cps.numberOfPublishes < 5)" + + "ORDER BY cd.postingDate", PendingCaseToPublishPerOffence.class) + .getResultList(); + } + + public List findPublicTransparencyDeltaReportPendingCases(final LocalDate fromDate, final LocalDate toDate) { + return entityManager.createQuery("SELECT new uk.gov.moj.cpp.sjp.persistence.entity.PendingCaseToPublishPerOffence" + + "(d.personalDetails.title, d.personalDetails.firstName, d.personalDetails.lastName, d.legalEntityDetails.legalEntityName, d.personalDetails.dateOfBirth," + + "cd.id, cd.urn," + + "d.address.address1, d.address.address2," + + "d.address.address3, d.address.address4, d.address.address5," + + "d.address.postcode, o.code, o.startDate, o.wording, " + + "o.pressRestriction.requested, o.pressRestriction.name, o.completed, cd.prosecutingAuthority, o.wordingWelsh) " + + "FROM CaseDetail cd " + + "LEFT OUTER JOIN cd.defendant d " + + "LEFT OUTER JOIN d.offences o " + + "WHERE cd.id IN (SELECT rc.id FROM ReadyCase rc WHERE rc.markedAt BETWEEN :fromDate AND :toDate) " + + "ORDER BY cd.postingDate", PendingCaseToPublishPerOffence.class) + .setParameter("fromDate", fromDate) + .setParameter("toDate", toDate) + .getResultList(); + } + + public List findPressTransparencyReportPendingCases() { + return entityManager.createQuery("SELECT new uk.gov.moj.cpp.sjp.persistence.entity.PendingCaseToPublishPerOffence" + + "(d.personalDetails.title, d.personalDetails.firstName, d.personalDetails.lastName, d.legalEntityDetails.legalEntityName, d.personalDetails.dateOfBirth," + + "cd.id, cd.urn," + + "d.address.address1, d.address.address2," + + "d.address.address3, d.address.address4, d.address.address5," + + "d.address.postcode, o.code, o.startDate, o.wording," + + "o.pressRestriction.requested, o.pressRestriction.name, o.completed, cd.prosecutingAuthority, o.wordingWelsh) " + + "FROM CaseDetail cd " + + "LEFT OUTER JOIN cd.defendant d " + + "LEFT OUTER JOIN d.offences o " + + "WHERE cd.id IN (SELECT rc.id FROM ReadyCase rc) " + + "AND cd.id IN (SELECT cps.caseId FROM CasePublishStatus cps WHERE cps.numberOfPublishes < 5)" + + "ORDER BY cd.postingDate", PendingCaseToPublishPerOffence.class) + .getResultList(); + } + + public List findPressTransparencyDeltaReportPendingCases(final LocalDate fromDate, final LocalDate toDate) { + return entityManager.createQuery("SELECT new uk.gov.moj.cpp.sjp.persistence.entity.PendingCaseToPublishPerOffence" + + "(d.personalDetails.title, d.personalDetails.firstName, d.personalDetails.lastName, d.legalEntityDetails.legalEntityName, d.personalDetails.dateOfBirth," + + "cd.id, cd.urn," + + "d.address.address1, d.address.address2," + + "d.address.address3, d.address.address4, d.address.address5," + + "d.address.postcode, o.code, o.startDate, o.wording," + + "o.pressRestriction.requested, o.pressRestriction.name, o.completed, cd.prosecutingAuthority, o.wordingWelsh) " + + "FROM CaseDetail cd " + + "LEFT OUTER JOIN cd.defendant d " + + "LEFT OUTER JOIN d.offences o " + + "WHERE cd.id IN (SELECT rc.id FROM ReadyCase rc WHERE rc.markedAt BETWEEN :fromDate AND :toDate) " + + "ORDER BY cd.postingDate", PendingCaseToPublishPerOffence.class) + .setParameter("fromDate", fromDate) + .setParameter("toDate", toDate) + .getResultList(); + } + + public List findCasesNotGuiltyPleaByProsecutingAuthority(final String prosecutingAuthority) { + return entityManager.createQuery("SELECT DISTINCT new uk.gov.moj.cpp.sjp.persistence.entity.CaseNotGuiltyPlea" + + "(e.id, e.urn, o.pleaDate, d.personalDetails.firstName, d.personalDetails.lastName, d.legalEntityDetails.legalEntityName, e.prosecutingAuthority, e.caseManagementStatus) " + + "FROM CaseDetail e " + + "JOIN e.defendant d " + + "JOIN d.offences o " + + "WHERE e.completed = false " + + "AND o.plea = 'NOT_GUILTY' " + + "AND e.caseStatus != 'REFER_FOR_COURT_HEARING' " + + "AND e.prosecutingAuthority = :prosecutingAuthority " + + "ORDER BY o.pleaDate DESC ", CaseNotGuiltyPlea.class) + .setParameter("prosecutingAuthority", prosecutingAuthority) + .getResultList(); + } + + public List findCasesNotGuiltyPlea() { + return entityManager.createQuery("SELECT DISTINCT new uk.gov.moj.cpp.sjp.persistence.entity.CaseNotGuiltyPlea" + + "(e.id, e.urn, o.pleaDate, d.personalDetails.firstName, d.personalDetails.lastName, d.legalEntityDetails.legalEntityName, e.prosecutingAuthority, e.caseManagementStatus) " + + "FROM CaseDetail e " + + "JOIN e.defendant d " + + "JOIN d.offences o " + + "WHERE e.completed = false " + + "AND o.plea = 'NOT_GUILTY' " + + "AND e.caseStatus != 'REFER_FOR_COURT_HEARING' " + + "ORDER BY o.pleaDate DESC ", CaseNotGuiltyPlea.class) + .getResultList(); + } + + public List findCasesWithoutDefendantPostcode() { + return entityManager.createQuery("SELECT DISTINCT new uk.gov.moj.cpp.sjp.persistence.entity.CaseWithoutDefendantPostcode" + + "(e.id, e.urn, e.postingDate, d.personalDetails.firstName, d.personalDetails.lastName, e.prosecutingAuthority,d.legalEntityDetails.legalEntityName) " + + "FROM CaseDetail e " + + "JOIN e.defendant d " + + "WHERE e.completed = false " + + "AND d.address.postcode IS NULL " + + "ORDER BY e.postingDate DESC ", CaseWithoutDefendantPostcode.class) + .getResultList(); + } public void updateDatesToAvoid(final UUID caseId, final String datesToAvoid) { findBy(caseId).setDatesToAvoid(datesToAvoid); } + public CaseDetail findBy(final UUID id) { + return entityManager.find(CaseDetail.class, id); + } + + public CaseDetail save(final CaseDetail caseDetail) { + // Mirror the DeltaSpike EntityRepository.save contract: persist a genuinely-new entity + // (leaving the passed instance managed so later mutations are tracked), else merge. + if (caseDetail.getId() != null && entityManager.find(CaseDetail.class, caseDetail.getId()) != null) { + return entityManager.merge(caseDetail); + } + entityManager.persist(caseDetail); + return caseDetail; + } + + public void remove(final CaseDetail caseDetail) { + entityManager.remove(entityManager.contains(caseDetail) ? caseDetail : entityManager.merge(caseDetail)); + } + + public Long count() { + return entityManager.createQuery("SELECT COUNT(cd) FROM CaseDetail cd", Long.class).getSingleResult(); + } } diff --git a/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/repository/CaseSearchResultRepository.java b/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/repository/CaseSearchResultRepository.java index 6041f65f37..52d692184f 100644 --- a/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/repository/CaseSearchResultRepository.java +++ b/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/repository/CaseSearchResultRepository.java @@ -5,34 +5,89 @@ import java.util.List; import java.util.UUID; -import org.apache.deltaspike.data.api.EntityRepository; -import org.apache.deltaspike.data.api.Query; -import org.apache.deltaspike.data.api.QueryParam; -import org.apache.deltaspike.data.api.Repository; - -@Repository -public interface CaseSearchResultRepository extends EntityRepository { - - @Query("from CaseSearchResult as r inner join fetch r.caseSummary as c where upper(r.lastName) = upper(:lastName) and r.dateAdded = " + - "(select max(z.dateAdded) from CaseSearchResult as z where z.caseId=r.caseId and upper(z.lastName) = upper(:lastName)) " + - "and (r.caseSummary.prosecutingAuthority like :prosecutingAuthority OR r.caseSummary.prosecutingAuthority IN (:agentProsecutorAuthorityAccess)) " + - "order by r.firstName ASC, c.postingDate DESC") - List findByLastName(@QueryParam("prosecutingAuthority") String prosecutingAuthority, @QueryParam("lastName") String lastName, - @QueryParam("agentProsecutorAuthorityAccess") List agentProsecutorAuthorityAccess); - - @Query("from CaseSearchResult as r inner join fetch r.caseSummary as c where upper(r.caseSummary.urn) = upper(:urn) and r.dateAdded = " + - "(select max(z.dateAdded) from CaseSearchResult as z where z.caseId=r.caseId) " + - "and (r.caseSummary.prosecutingAuthority like :prosecutingAuthority OR r.caseSummary.prosecutingAuthority IN (:agentProsecutorAuthorityAccess)) " + - "order by r.firstName ASC, c.postingDate DESC") - List findByUrn(@QueryParam("prosecutingAuthority") String prosecutingAuthority, @QueryParam("urn") String urn, - @QueryParam("agentProsecutorAuthorityAccess") List agentProsecutorAuthorityAccess); - - List findByCaseId(UUID caseId); - - @Query("from CaseSearchResult as r inner join fetch r.caseSummary as c where upper(r.legalEntityName) = upper(:legalEntityName) and r.dateAdded = " + - "(select max(z.dateAdded) from CaseSearchResult as z where z.caseId=r.caseId and upper(z.legalEntityName) = upper(:legalEntityName)) " + - "and (r.caseSummary.prosecutingAuthority like :prosecutingAuthority OR r.caseSummary.prosecutingAuthority IN (:agentProsecutorAuthorityAccess)) " + - "order by r.legalEntityName ASC, c.postingDate DESC") - List findByLegalEntityName(@QueryParam("prosecutingAuthority") String prosecutingAuthority, @QueryParam("legalEntityName") String legalEntityName, - @QueryParam("agentProsecutorAuthorityAccess") List agentProsecutorAuthorityAccess); +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.persistence.EntityManager; +import jakarta.persistence.PersistenceContext; + +@ApplicationScoped +public class CaseSearchResultRepository { + + @PersistenceContext(unitName = "sjp-persistence-unit") + private EntityManager entityManager; + + public List findByLastName(final String prosecutingAuthority, final String lastName, + final List agentProsecutorAuthorityAccess) { + return entityManager.createQuery( + "select r from CaseSearchResult as r inner join fetch r.caseSummary where upper(r.lastName) = upper(:lastName) and r.dateAdded = " + + "(select max(z.dateAdded) from CaseSearchResult as z where z.caseId=r.caseId and upper(z.lastName) = upper(:lastName)) " + + "and (r.caseSummary.prosecutingAuthority like :prosecutingAuthority OR r.caseSummary.prosecutingAuthority IN (:agentProsecutorAuthorityAccess)) " + + "order by r.firstName ASC, r.caseSummary.postingDate DESC", + CaseSearchResult.class) + .setParameter("prosecutingAuthority", prosecutingAuthority) + .setParameter("lastName", lastName) + .setParameter("agentProsecutorAuthorityAccess", agentProsecutorAuthorityAccess) + .getResultList(); + } + + public List findByUrn(final String prosecutingAuthority, final String urn, + final List agentProsecutorAuthorityAccess) { + return entityManager.createQuery( + "select r from CaseSearchResult as r inner join fetch r.caseSummary where upper(r.caseSummary.urn) = upper(:urn) and r.dateAdded = " + + "(select max(z.dateAdded) from CaseSearchResult as z where z.caseId=r.caseId) " + + "and (r.caseSummary.prosecutingAuthority like :prosecutingAuthority OR r.caseSummary.prosecutingAuthority IN (:agentProsecutorAuthorityAccess)) " + + "order by r.firstName ASC, r.caseSummary.postingDate DESC", + CaseSearchResult.class) + .setParameter("prosecutingAuthority", prosecutingAuthority) + .setParameter("urn", urn) + .setParameter("agentProsecutorAuthorityAccess", agentProsecutorAuthorityAccess) + .getResultList(); + } + + public List findByCaseId(final UUID caseId) { + return entityManager.createQuery( + "SELECT e FROM CaseSearchResult e WHERE e.caseId = :caseId", + CaseSearchResult.class) + .setParameter("caseId", caseId) + .getResultList(); + } + + public List findByLegalEntityName(final String prosecutingAuthority, final String legalEntityName, + final List agentProsecutorAuthorityAccess) { + return entityManager.createQuery( + "select r from CaseSearchResult as r inner join fetch r.caseSummary where upper(r.legalEntityName) = upper(:legalEntityName) and r.dateAdded = " + + "(select max(z.dateAdded) from CaseSearchResult as z where z.caseId=r.caseId and upper(z.legalEntityName) = upper(:legalEntityName)) " + + "and (r.caseSummary.prosecutingAuthority like :prosecutingAuthority OR r.caseSummary.prosecutingAuthority IN (:agentProsecutorAuthorityAccess)) " + + "order by r.legalEntityName ASC, r.caseSummary.postingDate DESC", + CaseSearchResult.class) + .setParameter("prosecutingAuthority", prosecutingAuthority) + .setParameter("legalEntityName", legalEntityName) + .setParameter("agentProsecutorAuthorityAccess", agentProsecutorAuthorityAccess) + .getResultList(); + } + + public CaseSearchResult findBy(final UUID id) { + return entityManager.find(CaseSearchResult.class, id); + } + + public CaseSearchResult save(final CaseSearchResult entity) { + return entityManager.merge(entity); + } + + public CaseSearchResult saveAndFlush(final CaseSearchResult entity) { + final CaseSearchResult merged = entityManager.merge(entity); + entityManager.flush(); + return merged; + } + + public void remove(final CaseSearchResult entity) { + entityManager.remove(entityManager.contains(entity) ? entity : entityManager.merge(entity)); + } + + public Long count() { + return entityManager.createQuery("SELECT COUNT(e) FROM CaseSearchResult e", Long.class).getSingleResult(); + } + + public List findAll() { + return entityManager.createQuery("SELECT e FROM CaseSearchResult e", CaseSearchResult.class).getResultList(); + } } diff --git a/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/repository/CaseSummaryRepository.java b/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/repository/CaseSummaryRepository.java index f7447af6a6..b27af5a439 100644 --- a/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/repository/CaseSummaryRepository.java +++ b/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/repository/CaseSummaryRepository.java @@ -2,11 +2,36 @@ import uk.gov.moj.cpp.sjp.persistence.entity.CaseSummary; +import java.util.List; import java.util.UUID; -import org.apache.deltaspike.data.api.EntityRepository; -import org.apache.deltaspike.data.api.Repository; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.persistence.EntityManager; +import jakarta.persistence.PersistenceContext; -@Repository -public interface CaseSummaryRepository extends EntityRepository { +@ApplicationScoped +public class CaseSummaryRepository { + + @PersistenceContext(unitName = "sjp-persistence-unit") + private EntityManager entityManager; + + public CaseSummary findBy(final UUID id) { + return entityManager.find(CaseSummary.class, id); + } + + public CaseSummary save(final CaseSummary entity) { + return entityManager.merge(entity); + } + + public void remove(final CaseSummary entity) { + entityManager.remove(entityManager.contains(entity) ? entity : entityManager.merge(entity)); + } + + public Long count() { + return entityManager.createQuery("SELECT COUNT(e) FROM CaseSummary e", Long.class).getSingleResult(); + } + + public List findAll() { + return entityManager.createQuery("SELECT e FROM CaseSummary e", CaseSummary.class).getResultList(); + } } diff --git a/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/repository/DefendantDetailUpdateRequestRepository.java b/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/repository/DefendantDetailUpdateRequestRepository.java index e0a91785d8..6a04853410 100644 --- a/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/repository/DefendantDetailUpdateRequestRepository.java +++ b/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/repository/DefendantDetailUpdateRequestRepository.java @@ -2,12 +2,36 @@ import uk.gov.moj.cpp.sjp.persistence.entity.DefendantDetailUpdateRequest; +import java.util.List; import java.util.UUID; -import org.apache.deltaspike.data.api.EntityRepository; -import org.apache.deltaspike.data.api.Repository; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.persistence.EntityManager; +import jakarta.persistence.PersistenceContext; -@Repository -public interface DefendantDetailUpdateRequestRepository extends EntityRepository { +@ApplicationScoped +public class DefendantDetailUpdateRequestRepository { -} \ No newline at end of file + @PersistenceContext(unitName = "sjp-persistence-unit") + private EntityManager entityManager; + + public DefendantDetailUpdateRequest findBy(final UUID id) { + return entityManager.find(DefendantDetailUpdateRequest.class, id); + } + + public DefendantDetailUpdateRequest save(final DefendantDetailUpdateRequest entity) { + return entityManager.merge(entity); + } + + public void remove(final DefendantDetailUpdateRequest entity) { + entityManager.remove(entityManager.contains(entity) ? entity : entityManager.merge(entity)); + } + + public Long count() { + return entityManager.createQuery("SELECT COUNT(e) FROM DefendantDetailUpdateRequest e", Long.class).getSingleResult(); + } + + public List findAll() { + return entityManager.createQuery("SELECT e FROM DefendantDetailUpdateRequest e", DefendantDetailUpdateRequest.class).getResultList(); + } +} diff --git a/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/repository/DefendantRepository.java b/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/repository/DefendantRepository.java index 04dc246a73..59404c5915 100644 --- a/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/repository/DefendantRepository.java +++ b/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/repository/DefendantRepository.java @@ -9,20 +9,15 @@ import java.util.List; import java.util.UUID; -import javax.inject.Inject; -import javax.persistence.EntityManager; - -import org.apache.deltaspike.data.api.EntityRepository; -import org.apache.deltaspike.data.api.Query; -import org.apache.deltaspike.data.api.QueryParam; -import org.apache.deltaspike.data.api.Repository; -import org.apache.deltaspike.data.api.SingleResultType; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.persistence.EntityManager; +import jakarta.persistence.PersistenceContext; /** * Repository for {@link DefendantDetail} */ -@Repository -public abstract class DefendantRepository implements EntityRepository { +@ApplicationScoped +public class DefendantRepository { private static final String UPDATED_DEFENDANT_DETAILS = "SELECT new uk.gov.moj.cpp.sjp.persistence.entity.view.UpdatedDefendantDetails(" + "dd.personalDetails.firstName, " + @@ -43,7 +38,8 @@ public abstract class DefendantRepository implements EntityRepository dd.updatesAcknowledgedAt)) " + "OR ((dd.personalDetails.dateOfBirthUpdatedAt BETWEEN :fromDate and :toDate) AND (dd.personalDetails.dateOfBirthUpdatedAt IS NOT NULL AND dd.updatesAcknowledgedAt IS NULL OR dd.personalDetails.dateOfBirthUpdatedAt > dd.updatesAcknowledgedAt)) " + "OR ((dd.nameUpdatedAt BETWEEN :fromDate and :toDate) AND (dd.nameUpdatedAt IS NOT NULL AND dd.updatesAcknowledgedAt IS NULL OR dd.nameUpdatedAt > dd.updatesAcknowledgedAt)))"; - @Inject + + @PersistenceContext(unitName = "sjp-persistence-unit") private EntityManager entityManager; public List findUpdatedByCaseProsecutingAuthority( @@ -56,7 +52,7 @@ public List findUpdatedByCaseProsecutingAuthority( agentProsecutorAuthorityAccess = Collections.singletonList("DUMMY_VALUE"); } - final javax.persistence.Query query = entityManager.createQuery(UPDATED_DEFENDANT_DETAILS); + final jakarta.persistence.Query query = entityManager.createQuery(UPDATED_DEFENDANT_DETAILS); query.setParameter("prosecutingAuthority", prosecutingAuthority); query.setParameter("agentProsecutorAuthorityAccess", agentProsecutorAuthorityAccess); @@ -66,16 +62,50 @@ public List findUpdatedByCaseProsecutingAuthority( return query.getResultList(); } - @Query("SELECT d.caseDetail.id FROM DefendantDetail d WHERE d.id=:id") - public abstract UUID findCaseIdByDefendantId(@QueryParam("id") final UUID id); + public UUID findCaseIdByDefendantId(final UUID id) { + return entityManager.createQuery("SELECT d.caseDetail.id FROM DefendantDetail d WHERE d.id=:id", UUID.class) + .setParameter("id", id) + .getSingleResult(); + } + + public UUID findCaseIdByCorrelationId(final UUID correlationId) { + return entityManager.createQuery("SELECT d.caseDetail.id FROM DefendantDetail d WHERE d.correlationId=:correlationId", UUID.class) + .setParameter("correlationId", correlationId) + .getSingleResult(); + } + + public UUID findOptionalCaseIdByDefendantId(final UUID id) { + return entityManager.createQuery("SELECT d.caseDetail.id FROM DefendantDetail d WHERE d.id=:id", UUID.class) + .setParameter("id", id) + .getResultStream() + .findFirst() + .orElse(null); + } + + public List findByReadyCases() { + return entityManager.createQuery( + "SELECT dd FROM DefendantDetail dd, ReadyCase rc where dd.caseDetail.id = rc.caseId", + DefendantDetail.class) + .getResultList(); + } + + public DefendantDetail findBy(final UUID id) { + return entityManager.find(DefendantDetail.class, id); + } + + public DefendantDetail save(final DefendantDetail entity) { + return entityManager.merge(entity); + } - @Query("SELECT d.caseDetail.id FROM DefendantDetail d WHERE d.correlationId=:correlationId") - public abstract UUID findCaseIdByCorrelationId(@QueryParam("correlationId") final UUID correlationId); + public void remove(final DefendantDetail entity) { + entityManager.remove(entityManager.contains(entity) ? entity : entityManager.merge(entity)); + } - @Query(value = "SELECT d.caseDetail.id FROM DefendantDetail d WHERE d.id=:id", - singleResult = SingleResultType.OPTIONAL) - public abstract UUID findOptionalCaseIdByDefendantId(@QueryParam("id") final UUID id); + public Long count() { + return entityManager.createQuery("SELECT COUNT(e) FROM DefendantDetail e", Long.class).getSingleResult(); + } - @Query(value = "SELECT dd FROM DefendantDetail dd, ReadyCase rc where dd.caseDetail.id = rc.caseId") - public abstract List findByReadyCases(); + public List findAll() { + return entityManager.createQuery("SELECT e FROM DefendantDetail e", DefendantDetail.class).getResultList(); + } } diff --git a/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/repository/EmailNotificationRepository.java b/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/repository/EmailNotificationRepository.java index 6376469d3f..f891b1958e 100644 --- a/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/repository/EmailNotificationRepository.java +++ b/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/repository/EmailNotificationRepository.java @@ -2,16 +2,45 @@ import uk.gov.moj.cpp.sjp.persistence.entity.EmailNotification; +import java.util.List; import java.util.UUID; -import org.apache.deltaspike.data.api.EntityRepository; -import org.apache.deltaspike.data.api.Query; -import org.apache.deltaspike.data.api.QueryParam; -import org.apache.deltaspike.data.api.Repository; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.persistence.EntityManager; +import jakarta.persistence.PersistenceContext; -@Repository -public interface EmailNotificationRepository extends EntityRepository { +@ApplicationScoped +public class EmailNotificationRepository { - @Query(value = "FROM EmailNotification e WHERE e.referenceId = :referenceId AND e.notificationType = :notificationType") - EmailNotification findByReferenceIdAndNotificationType(@QueryParam("referenceId") UUID referenceId, @QueryParam("notificationType") EmailNotification.NotificationNotifyDocumentType notificationType); + @PersistenceContext(unitName = "sjp-persistence-unit") + private EntityManager entityManager; + + public EmailNotification findByReferenceIdAndNotificationType(final UUID referenceId, final EmailNotification.NotificationNotifyDocumentType notificationType) { + return entityManager.createQuery( + "SELECT e FROM EmailNotification e WHERE e.referenceId = :referenceId AND e.notificationType = :notificationType", + EmailNotification.class) + .setParameter("referenceId", referenceId) + .setParameter("notificationType", notificationType) + .getSingleResult(); + } + + public EmailNotification findBy(final UUID id) { + return entityManager.find(EmailNotification.class, id); + } + + public EmailNotification save(final EmailNotification entity) { + return entityManager.merge(entity); + } + + public void remove(final EmailNotification entity) { + entityManager.remove(entityManager.contains(entity) ? entity : entityManager.merge(entity)); + } + + public Long count() { + return entityManager.createQuery("SELECT COUNT(e) FROM EmailNotification e", Long.class).getSingleResult(); + } + + public List findAll() { + return entityManager.createQuery("SELECT e FROM EmailNotification e", EmailNotification.class).getResultList(); + } } diff --git a/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/repository/EmployerRepository.java b/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/repository/EmployerRepository.java index 915eb11eeb..f713d0d926 100644 --- a/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/repository/EmployerRepository.java +++ b/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/repository/EmployerRepository.java @@ -2,12 +2,36 @@ import uk.gov.moj.cpp.sjp.persistence.entity.Employer; +import java.util.List; import java.util.UUID; -import org.apache.deltaspike.data.api.EntityRepository; -import org.apache.deltaspike.data.api.Repository; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.persistence.EntityManager; +import jakarta.persistence.PersistenceContext; -@Repository -public interface EmployerRepository extends EntityRepository { +@ApplicationScoped +public class EmployerRepository { + @PersistenceContext(unitName = "sjp-persistence-unit") + private EntityManager entityManager; + + public Employer findBy(final UUID id) { + return entityManager.find(Employer.class, id); + } + + public Employer save(final Employer entity) { + return entityManager.merge(entity); + } + + public void remove(final Employer entity) { + entityManager.remove(entityManager.contains(entity) ? entity : entityManager.merge(entity)); + } + + public Long count() { + return entityManager.createQuery("SELECT COUNT(e) FROM Employer e", Long.class).getSingleResult(); + } + + public List findAll() { + return entityManager.createQuery("SELECT e FROM Employer e", Employer.class).getResultList(); + } } diff --git a/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/repository/EndorsementRemovalNotificationRepository.java b/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/repository/EndorsementRemovalNotificationRepository.java index 6d42ed15f3..021f96d974 100644 --- a/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/repository/EndorsementRemovalNotificationRepository.java +++ b/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/repository/EndorsementRemovalNotificationRepository.java @@ -2,11 +2,36 @@ import uk.gov.moj.cpp.sjp.persistence.entity.NotificationOfEndorsementStatus; +import java.util.List; import java.util.UUID; -import org.apache.deltaspike.data.api.EntityRepository; -import org.apache.deltaspike.data.api.Repository; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.persistence.EntityManager; +import jakarta.persistence.PersistenceContext; -@Repository -public interface EndorsementRemovalNotificationRepository extends EntityRepository { +@ApplicationScoped +public class EndorsementRemovalNotificationRepository { + + @PersistenceContext(unitName = "sjp-persistence-unit") + private EntityManager entityManager; + + public NotificationOfEndorsementStatus findBy(final UUID id) { + return entityManager.find(NotificationOfEndorsementStatus.class, id); + } + + public NotificationOfEndorsementStatus save(final NotificationOfEndorsementStatus entity) { + return entityManager.merge(entity); + } + + public void remove(final NotificationOfEndorsementStatus entity) { + entityManager.remove(entityManager.contains(entity) ? entity : entityManager.merge(entity)); + } + + public Long count() { + return entityManager.createQuery("SELECT COUNT(e) FROM NotificationOfEndorsementStatus e", Long.class).getSingleResult(); + } + + public List findAll() { + return entityManager.createQuery("SELECT e FROM NotificationOfEndorsementStatus e", NotificationOfEndorsementStatus.class).getResultList(); + } } diff --git a/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/repository/EnforcementPendingApplicationNotificationStatusRepository.java b/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/repository/EnforcementPendingApplicationNotificationStatusRepository.java index 830ef7622d..30e8b2d7d1 100644 --- a/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/repository/EnforcementPendingApplicationNotificationStatusRepository.java +++ b/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/repository/EnforcementPendingApplicationNotificationStatusRepository.java @@ -2,11 +2,36 @@ import uk.gov.moj.cpp.sjp.persistence.entity.EnforcementNotification; +import java.util.List; import java.util.UUID; -import org.apache.deltaspike.data.api.EntityRepository; -import org.apache.deltaspike.data.api.Repository; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.persistence.EntityManager; +import jakarta.persistence.PersistenceContext; -@Repository -public interface EnforcementPendingApplicationNotificationStatusRepository extends EntityRepository { +@ApplicationScoped +public class EnforcementPendingApplicationNotificationStatusRepository { + + @PersistenceContext(unitName = "sjp-persistence-unit") + private EntityManager entityManager; + + public EnforcementNotification findBy(final UUID id) { + return entityManager.find(EnforcementNotification.class, id); + } + + public EnforcementNotification save(final EnforcementNotification entity) { + return entityManager.merge(entity); + } + + public void remove(final EnforcementNotification entity) { + entityManager.remove(entityManager.contains(entity) ? entity : entityManager.merge(entity)); + } + + public Long count() { + return entityManager.createQuery("SELECT COUNT(e) FROM EnforcementNotification e", Long.class).getSingleResult(); + } + + public List findAll() { + return entityManager.createQuery("SELECT e FROM EnforcementNotification e", EnforcementNotification.class).getResultList(); + } } diff --git a/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/repository/FinancialMeansRepository.java b/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/repository/FinancialMeansRepository.java index 4107acbcaa..b2b865ea0c 100644 --- a/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/repository/FinancialMeansRepository.java +++ b/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/repository/FinancialMeansRepository.java @@ -2,12 +2,36 @@ import uk.gov.moj.cpp.sjp.persistence.entity.FinancialMeans; +import java.util.List; import java.util.UUID; -import org.apache.deltaspike.data.api.EntityRepository; -import org.apache.deltaspike.data.api.Repository; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.persistence.EntityManager; +import jakarta.persistence.PersistenceContext; -@Repository -public interface FinancialMeansRepository extends EntityRepository { +@ApplicationScoped +public class FinancialMeansRepository { + @PersistenceContext(unitName = "sjp-persistence-unit") + private EntityManager entityManager; + + public FinancialMeans findBy(final UUID id) { + return entityManager.find(FinancialMeans.class, id); + } + + public FinancialMeans save(final FinancialMeans entity) { + return entityManager.merge(entity); + } + + public void remove(final FinancialMeans entity) { + entityManager.remove(entityManager.contains(entity) ? entity : entityManager.merge(entity)); + } + + public Long count() { + return entityManager.createQuery("SELECT COUNT(e) FROM FinancialMeans e", Long.class).getSingleResult(); + } + + public List findAll() { + return entityManager.createQuery("SELECT e FROM FinancialMeans e", FinancialMeans.class).getResultList(); + } } diff --git a/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/repository/OffenceRepository.java b/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/repository/OffenceRepository.java index 53acdbb8f6..fbba1b633b 100644 --- a/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/repository/OffenceRepository.java +++ b/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/repository/OffenceRepository.java @@ -7,20 +7,52 @@ import java.util.List; import java.util.UUID; -import org.apache.deltaspike.data.api.EntityRepository; -import org.apache.deltaspike.data.api.Query; -import org.apache.deltaspike.data.api.QueryParam; -import org.apache.deltaspike.data.api.Repository; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.persistence.EntityManager; +import jakarta.persistence.PersistenceContext; /** * Repository for {@link OffenceDetail} */ -@Repository -public interface OffenceRepository extends EntityRepository { - - List findByDefendantDetail(DefendantDetail defendantDetail); - - @Query("FROM OffenceDetail od WHERE od.id IN :offenceIds") - List findByIds(@QueryParam("offenceIds") List offenceIds); - +@ApplicationScoped +public class OffenceRepository { + + @PersistenceContext(unitName = "sjp-persistence-unit") + private EntityManager entityManager; + + public List findByDefendantDetail(DefendantDetail defendantDetail) { + return entityManager.createQuery( + "SELECT o FROM OffenceDetail o WHERE o.defendantDetail = :defendantDetail", + OffenceDetail.class) + .setParameter("defendantDetail", defendantDetail) + .getResultList(); + } + + public List findByIds(List offenceIds) { + return entityManager.createQuery( + "SELECT od FROM OffenceDetail od WHERE od.id IN (:offenceIds)", + OffenceDetail.class) + .setParameter("offenceIds", offenceIds) + .getResultList(); + } + + public OffenceDetail findBy(final UUID id) { + return entityManager.find(OffenceDetail.class, id); + } + + public OffenceDetail save(final OffenceDetail entity) { + return entityManager.merge(entity); + } + + public void remove(final OffenceDetail entity) { + entityManager.remove(entityManager.contains(entity) ? entity : entityManager.merge(entity)); + } + + public Long count() { + return entityManager.createQuery("SELECT COUNT(e) FROM OffenceDetail e", Long.class).getSingleResult(); + } + + public List findAll() { + return entityManager.createQuery("SELECT e FROM OffenceDetail e", OffenceDetail.class).getResultList(); + } } diff --git a/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/repository/OnlinePleaDetailRepository.java b/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/repository/OnlinePleaDetailRepository.java index d2a0d411a9..6813b1ebfd 100644 --- a/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/repository/OnlinePleaDetailRepository.java +++ b/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/repository/OnlinePleaDetailRepository.java @@ -5,15 +5,61 @@ import java.util.List; import java.util.UUID; -import org.apache.deltaspike.data.api.EntityRepository; -import org.apache.deltaspike.data.api.Repository; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.persistence.EntityManager; +import jakarta.persistence.PersistenceContext; -@Repository -public abstract class OnlinePleaDetailRepository implements EntityRepository { +@ApplicationScoped +public class OnlinePleaDetailRepository { - public abstract List findByCaseIdAndDefendantId(final UUID caseId, final UUID defendantId); + @PersistenceContext(unitName = "sjp-persistence-unit") + private EntityManager entityManager; - public abstract List findByCaseIdAndDefendantIdAndAocpPleaIsNull(final UUID caseId, final UUID defendantId); + public List findByCaseIdAndDefendantId(final UUID caseId, final UUID defendantId) { + return entityManager.createQuery( + "SELECT e FROM OnlinePleaDetail e WHERE e.caseId = :caseId AND e.defendantId = :defendantId", + OnlinePleaDetail.class) + .setParameter("caseId", caseId) + .setParameter("defendantId", defendantId) + .getResultList(); + } - public abstract List findByCaseIdAndDefendantIdAndAocpPlea(final UUID caseId, final UUID defendantId, final Boolean aocpPlea); + public List findByCaseIdAndDefendantIdAndAocpPleaIsNull(final UUID caseId, final UUID defendantId) { + return entityManager.createQuery( + "SELECT e FROM OnlinePleaDetail e WHERE e.caseId = :caseId AND e.defendantId = :defendantId AND e.aocpPlea IS NULL", + OnlinePleaDetail.class) + .setParameter("caseId", caseId) + .setParameter("defendantId", defendantId) + .getResultList(); + } + + public List findByCaseIdAndDefendantIdAndAocpPlea(final UUID caseId, final UUID defendantId, final Boolean aocpPlea) { + return entityManager.createQuery( + "SELECT e FROM OnlinePleaDetail e WHERE e.caseId = :caseId AND e.defendantId = :defendantId AND e.aocpPlea = :aocpPlea", + OnlinePleaDetail.class) + .setParameter("caseId", caseId) + .setParameter("defendantId", defendantId) + .setParameter("aocpPlea", aocpPlea) + .getResultList(); + } + + public OnlinePleaDetail findBy(final UUID id) { + return entityManager.find(OnlinePleaDetail.class, id); + } + + public OnlinePleaDetail save(final OnlinePleaDetail entity) { + return entityManager.merge(entity); + } + + public void remove(final OnlinePleaDetail entity) { + entityManager.remove(entityManager.contains(entity) ? entity : entityManager.merge(entity)); + } + + public Long count() { + return entityManager.createQuery("SELECT COUNT(e) FROM OnlinePleaDetail e", Long.class).getSingleResult(); + } + + public List findAll() { + return entityManager.createQuery("SELECT e FROM OnlinePleaDetail e", OnlinePleaDetail.class).getResultList(); + } } diff --git a/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/repository/OnlinePleaRepository.java b/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/repository/OnlinePleaRepository.java index 3851d69fe2..37aaf72b98 100644 --- a/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/repository/OnlinePleaRepository.java +++ b/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/repository/OnlinePleaRepository.java @@ -74,23 +74,18 @@ import java.util.UUID; import java.util.function.Function; -import javax.inject.Inject; -import javax.persistence.EntityManager; -import javax.persistence.Query; -import javax.persistence.criteria.CriteriaBuilder; -import javax.persistence.criteria.CriteriaUpdate; -import javax.persistence.criteria.Path; -import javax.persistence.criteria.Root; - -import org.apache.deltaspike.data.api.EntityRepository; -import org.apache.deltaspike.data.api.QueryParam; -import org.apache.deltaspike.data.api.Repository; -import org.apache.deltaspike.data.api.SingleResultType; - -@Repository -public abstract class OnlinePleaRepository implements EntityRepository { - - @Inject +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.persistence.EntityManager; +import jakarta.persistence.PersistenceContext; +import jakarta.persistence.Query; +import jakarta.persistence.criteria.CriteriaBuilder; +import jakarta.persistence.criteria.CriteriaUpdate; +import jakarta.persistence.criteria.Path; +import jakarta.persistence.criteria.Root; + +public abstract class OnlinePleaRepository { + + @PersistenceContext(unitName = "sjp-persistence-unit") private EntityManager entityManager; private static final String INSERT_STATEMENT = @@ -122,13 +117,38 @@ private void updateOnlinePlea(OnlinePlea onlinePlea) { /** * Hide employment, employer and outgoings. */ - @org.apache.deltaspike.data.api.Query( - value = "SELECT new OnlinePlea(op.caseId, op.pleaDetails, op.defendantId, op.personalDetails, op.submittedOn, op.legalEntityDetails) FROM OnlinePlea op WHERE op.caseId = :caseId", - singleResult = SingleResultType.OPTIONAL) - public abstract OnlinePlea findOnlinePleaWithoutFinances(@QueryParam("caseId") final UUID caseId); + public OnlinePlea findOnlinePleaWithoutFinances(final UUID caseId) { + return entityManager.createQuery( + "SELECT new OnlinePlea(op.caseId, op.pleaDetails, op.defendantId, op.personalDetails, op.submittedOn, op.legalEntityDetails) FROM OnlinePlea op WHERE op.caseId = :caseId", + OnlinePlea.class) + .setParameter("caseId", caseId) + .getResultStream() + .findFirst() + .orElse(null); + } abstract List getFieldsToUpdate(); + public OnlinePlea findBy(final UUID id) { + return entityManager.find(OnlinePlea.class, id); + } + + public OnlinePlea save(final OnlinePlea entity) { + return entityManager.merge(entity); + } + + public void remove(final OnlinePlea entity) { + entityManager.remove(entityManager.contains(entity) ? entity : entityManager.merge(entity)); + } + + public Long count() { + return entityManager.createQuery("SELECT COUNT(e) FROM OnlinePlea e", Long.class).getSingleResult(); + } + + public List findAll() { + return entityManager.createQuery("SELECT e FROM OnlinePlea e", OnlinePlea.class).getResultList(); + } + enum FIELDS { CASE_ID(OnlinePlea::getCaseId, "caseId"), @@ -260,9 +280,10 @@ private static class Constants { } } - public abstract static class FinancialMeansOnlinePleaRepository extends OnlinePleaRepository { + @ApplicationScoped + public static class FinancialMeansOnlinePleaRepository extends OnlinePleaRepository { @Override - final List getFieldsToUpdate() { + List getFieldsToUpdate() { return asList( EMPLOYMENT_INCOME_PAYMENT_AMOUNT, EMPLOYMENT_INCOME_FREQUENCY, @@ -282,9 +303,10 @@ final List getFieldsToUpdate() { } } - public abstract static class EmployerOnlinePleaRepository extends OnlinePleaRepository { + @ApplicationScoped + public static class EmployerOnlinePleaRepository extends OnlinePleaRepository { @Override - final List getFieldsToUpdate() { + List getFieldsToUpdate() { return asList( EMPLOYER_REFERENCE, EMPLOYER_NAME, @@ -299,9 +321,10 @@ final List getFieldsToUpdate() { } } - public abstract static class TrialOnlinePleaRepository extends OnlinePleaRepository { + @ApplicationScoped + public static class TrialOnlinePleaRepository extends OnlinePleaRepository { @Override - final List getFieldsToUpdate() { + List getFieldsToUpdate() { return asList( CASE_ID, WITNESS_DISPUTE, @@ -311,23 +334,26 @@ final List getFieldsToUpdate() { } } - public abstract static class InterpreterLanguageOnlinePleaRepository extends OnlinePleaRepository { + @ApplicationScoped + public static class InterpreterLanguageOnlinePleaRepository extends OnlinePleaRepository { @Override - final List getFieldsToUpdate() { + List getFieldsToUpdate() { return singletonList(INTERPRETER_LANGUAGE); } } - public abstract static class HearingLanguageOnlinePleaRepository extends OnlinePleaRepository { + @ApplicationScoped + public static class HearingLanguageOnlinePleaRepository extends OnlinePleaRepository { @Override - final List getFieldsToUpdate() { + List getFieldsToUpdate() { return singletonList(HEARING_LANGUAGE); } } - public abstract static class PersonDetailsOnlinePleaRepository extends OnlinePleaRepository { + @ApplicationScoped + public static class PersonDetailsOnlinePleaRepository extends OnlinePleaRepository { @Override - final List getFieldsToUpdate() { + List getFieldsToUpdate() { return asList( PERSON_FIRST_NAME, PERSON_LAST_NAME, @@ -349,27 +375,30 @@ final List getFieldsToUpdate() { } } - public abstract static class PleaDetailsRepository extends OnlinePleaRepository { + @ApplicationScoped + public static class PleaDetailsRepository extends OnlinePleaRepository { @Override - final List getFieldsToUpdate() { + List getFieldsToUpdate() { return asList( COME_TO_COURT ); } } - public abstract static class OutstandingFinesOnlinePleaRepository extends OnlinePleaRepository { + @ApplicationScoped + public static class OutstandingFinesOnlinePleaRepository extends OnlinePleaRepository { @Override - final List getFieldsToUpdate() { + List getFieldsToUpdate() { return asList( OUTSTANDING_FINES ); } } - public abstract static class LegalEntityDetailsOnlinePleaRepository extends OnlinePleaRepository { + @ApplicationScoped + public static class LegalEntityDetailsOnlinePleaRepository extends OnlinePleaRepository { @Override - final List getFieldsToUpdate() { + List getFieldsToUpdate() { return asList( LEGALENTITY_NAME, LEGALENTITY_HOME, @@ -391,9 +420,15 @@ final List getFieldsToUpdate() { } } - @org.apache.deltaspike.data.api.Query( - value = "SELECT op FROM OnlinePlea op WHERE op.caseId = :caseId AND op.defendantId = :defendantId", - singleResult = SingleResultType.OPTIONAL) - public abstract OnlinePlea findOnlinePleaByDefendantIdAndCaseId(@QueryParam("caseId") final UUID caseId, @QueryParam("defendantId") final UUID defendantId); + public OnlinePlea findOnlinePleaByDefendantIdAndCaseId(final UUID caseId, final UUID defendantId) { + return entityManager.createQuery( + "SELECT op FROM OnlinePlea op WHERE op.caseId = :caseId AND op.defendantId = :defendantId", + OnlinePlea.class) + .setParameter("caseId", caseId) + .setParameter("defendantId", defendantId) + .getResultStream() + .findFirst() + .orElse(null); + } } diff --git a/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/repository/PendingDatesToAvoidRepository.java b/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/repository/PendingDatesToAvoidRepository.java index 47e0aa7e07..9bb13110b1 100644 --- a/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/repository/PendingDatesToAvoidRepository.java +++ b/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/repository/PendingDatesToAvoidRepository.java @@ -6,25 +6,53 @@ import java.util.Optional; import java.util.UUID; -import org.apache.deltaspike.data.api.EntityRepository; -import org.apache.deltaspike.data.api.Query; -import org.apache.deltaspike.data.api.QueryParam; -import org.apache.deltaspike.data.api.Repository; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.persistence.EntityManager; +import jakarta.persistence.PersistenceContext; /** * Repository for {@link PendingDatesToAvoid} */ -@Repository -public abstract class PendingDatesToAvoidRepository implements EntityRepository { +@ApplicationScoped +public class PendingDatesToAvoidRepository { - @Query(value = "SELECT pda FROM PendingDatesToAvoid as pda INNER JOIN pda.caseDetail as cd " + - "WHERE cd.datesToAvoid IS NULL AND cd.assigneeId IS NULL AND cd.completed = false " + - "AND (cd.prosecutingAuthority like :prosecutingAuthority OR cd.prosecutingAuthority IN (:agentProsecutorAuthorityAccess) ) " + - "ORDER BY pda.pleaDate ASC") - public abstract List findCasesPendingDatesToAvoid(@QueryParam("prosecutingAuthority") String prosecutingAuthority, - @QueryParam("agentProsecutorAuthorityAccess") List agentProsecutorAuthorityAccess); + @PersistenceContext(unitName = "sjp-persistence-unit") + private EntityManager entityManager; + + public List findCasesPendingDatesToAvoid(String prosecutingAuthority, + List agentProsecutorAuthorityAccess) { + return entityManager.createQuery( + "SELECT pda FROM PendingDatesToAvoid as pda INNER JOIN pda.caseDetail as cd " + + "WHERE cd.datesToAvoid IS NULL AND cd.assigneeId IS NULL AND cd.completed = false " + + "AND (cd.prosecutingAuthority like :prosecutingAuthority OR cd.prosecutingAuthority IN (:agentProsecutorAuthorityAccess) ) " + + "ORDER BY pda.pleaDate ASC", + PendingDatesToAvoid.class) + .setParameter("prosecutingAuthority", prosecutingAuthority) + .setParameter("agentProsecutorAuthorityAccess", agentProsecutorAuthorityAccess) + .getResultList(); + } public void removeByCaseId(final UUID caseId) { Optional.ofNullable(this.findBy(caseId)).ifPresent(this::remove); } -} \ No newline at end of file + + public PendingDatesToAvoid findBy(final UUID id) { + return entityManager.find(PendingDatesToAvoid.class, id); + } + + public PendingDatesToAvoid save(final PendingDatesToAvoid entity) { + return entityManager.merge(entity); + } + + public void remove(final PendingDatesToAvoid entity) { + entityManager.remove(entityManager.contains(entity) ? entity : entityManager.merge(entity)); + } + + public Long count() { + return entityManager.createQuery("SELECT COUNT(e) FROM PendingDatesToAvoid e", Long.class).getSingleResult(); + } + + public List findAll() { + return entityManager.createQuery("SELECT e FROM PendingDatesToAvoid e", PendingDatesToAvoid.class).getResultList(); + } +} diff --git a/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/repository/PressTransparencyReportMetadataRepository.java b/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/repository/PressTransparencyReportMetadataRepository.java index b53cb5ba1d..5e0f799cba 100644 --- a/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/repository/PressTransparencyReportMetadataRepository.java +++ b/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/repository/PressTransparencyReportMetadataRepository.java @@ -6,16 +6,43 @@ import java.util.List; import java.util.UUID; -import org.apache.deltaspike.data.api.EntityRepository; -import org.apache.deltaspike.data.api.Query; -import org.apache.deltaspike.data.api.QueryParam; -import org.apache.deltaspike.data.api.Repository; - -@Repository -public interface PressTransparencyReportMetadataRepository extends EntityRepository { - - @Query(value = "SELECT ptrmd FROM PressTransparencyReportMetadata ptrmd " + - "WHERE ptrmd.fileServiceId is not null and ptrmd.generatedAt > :fromDate " + - "ORDER BY ptrmd.generatedAt DESC") - List findLatestPressTransparencyReportMetadata(@QueryParam("fromDate") LocalDateTime fromDate); +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.persistence.EntityManager; +import jakarta.persistence.PersistenceContext; + +@ApplicationScoped +public class PressTransparencyReportMetadataRepository { + + @PersistenceContext(unitName = "sjp-persistence-unit") + private EntityManager entityManager; + + public List findLatestPressTransparencyReportMetadata(LocalDateTime fromDate) { + return entityManager.createQuery( + "SELECT ptrmd FROM PressTransparencyReportMetadata ptrmd " + + "WHERE ptrmd.fileServiceId is not null and ptrmd.generatedAt > :fromDate " + + "ORDER BY ptrmd.generatedAt DESC", + PressTransparencyReportMetadata.class) + .setParameter("fromDate", fromDate) + .getResultList(); + } + + public PressTransparencyReportMetadata findBy(final UUID id) { + return entityManager.find(PressTransparencyReportMetadata.class, id); + } + + public PressTransparencyReportMetadata save(final PressTransparencyReportMetadata entity) { + return entityManager.merge(entity); + } + + public void remove(final PressTransparencyReportMetadata entity) { + entityManager.remove(entityManager.contains(entity) ? entity : entityManager.merge(entity)); + } + + public Long count() { + return entityManager.createQuery("SELECT COUNT(e) FROM PressTransparencyReportMetadata e", Long.class).getSingleResult(); + } + + public List findAll() { + return entityManager.createQuery("SELECT e FROM PressTransparencyReportMetadata e", PressTransparencyReportMetadata.class).getResultList(); + } } diff --git a/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/repository/ReadyCaseRepository.java b/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/repository/ReadyCaseRepository.java index a5962598a3..722487f2cf 100644 --- a/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/repository/ReadyCaseRepository.java +++ b/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/repository/ReadyCaseRepository.java @@ -5,13 +5,49 @@ import java.util.List; import java.util.UUID; -import org.apache.deltaspike.data.api.EntityRepository; -import org.apache.deltaspike.data.api.Repository; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.persistence.EntityManager; +import jakarta.persistence.PersistenceContext; -@Repository -public interface ReadyCaseRepository extends EntityRepository { +@ApplicationScoped +public class ReadyCaseRepository { - List findByAssigneeId(final UUID assigneeId); + @PersistenceContext(unitName = "sjp-persistence-unit") + private EntityManager entityManager; - ReadyCase findByCaseId(final UUID caseId); -} \ No newline at end of file + public List findByAssigneeId(final UUID assigneeId) { + return entityManager.createQuery( + "SELECT e FROM ReadyCase e WHERE e.assigneeId = :assigneeId", + ReadyCase.class) + .setParameter("assigneeId", assigneeId) + .getResultList(); + } + + public ReadyCase findByCaseId(final UUID caseId) { + return entityManager.createQuery( + "SELECT e FROM ReadyCase e WHERE e.caseId = :caseId", + ReadyCase.class) + .setParameter("caseId", caseId) + .getSingleResult(); + } + + public ReadyCase findBy(final UUID id) { + return entityManager.find(ReadyCase.class, id); + } + + public ReadyCase save(final ReadyCase entity) { + return entityManager.merge(entity); + } + + public void remove(final ReadyCase entity) { + entityManager.remove(entityManager.contains(entity) ? entity : entityManager.merge(entity)); + } + + public Long count() { + return entityManager.createQuery("SELECT COUNT(e) FROM ReadyCase e", Long.class).getSingleResult(); + } + + public List findAll() { + return entityManager.createQuery("SELECT e FROM ReadyCase e", ReadyCase.class).getResultList(); + } +} diff --git a/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/repository/ReserveCaseRepository.java b/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/repository/ReserveCaseRepository.java index e7bc45ab8b..73a50ec1d6 100644 --- a/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/repository/ReserveCaseRepository.java +++ b/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/repository/ReserveCaseRepository.java @@ -5,17 +5,50 @@ import java.util.List; import java.util.UUID; -import org.apache.deltaspike.data.api.EntityRepository; -import org.apache.deltaspike.data.api.Query; -import org.apache.deltaspike.data.api.QueryParam; -import org.apache.deltaspike.data.api.Repository; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.persistence.EntityManager; +import jakarta.persistence.PersistenceContext; -@Repository -public interface ReserveCaseRepository extends EntityRepository { +@ApplicationScoped +public class ReserveCaseRepository { - List findByCaseId(final UUID caseId); + @PersistenceContext(unitName = "sjp-persistence-unit") + private EntityManager entityManager; - @Query(value = "SELECT COUNT(rc) FROM ReserveCase rc where rc.reservedBy=:reservedBy") - int countReservedBy(@QueryParam("reservedBy") UUID reservedBy); + public List findByCaseId(final UUID caseId) { + return entityManager.createQuery( + "SELECT e FROM ReserveCase e WHERE e.caseId = :caseId", + ReserveCase.class) + .setParameter("caseId", caseId) + .getResultList(); + } -} \ No newline at end of file + public int countReservedBy(UUID reservedBy) { + return entityManager.createQuery( + "SELECT COUNT(rc) FROM ReserveCase rc where rc.reservedBy=:reservedBy", + Long.class) + .setParameter("reservedBy", reservedBy) + .getSingleResult() + .intValue(); + } + + public ReserveCase findBy(final UUID id) { + return entityManager.find(ReserveCase.class, id); + } + + public ReserveCase save(final ReserveCase entity) { + return entityManager.merge(entity); + } + + public void remove(final ReserveCase entity) { + entityManager.remove(entityManager.contains(entity) ? entity : entityManager.merge(entity)); + } + + public Long count() { + return entityManager.createQuery("SELECT COUNT(e) FROM ReserveCase e", Long.class).getSingleResult(); + } + + public List findAll() { + return entityManager.createQuery("SELECT e FROM ReserveCase e", ReserveCase.class).getResultList(); + } +} diff --git a/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/repository/SessionRepository.java b/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/repository/SessionRepository.java index 393b17ab65..1f3b6698b4 100644 --- a/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/repository/SessionRepository.java +++ b/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/repository/SessionRepository.java @@ -5,15 +5,41 @@ import java.util.List; import java.util.UUID; -import org.apache.deltaspike.data.api.EntityRepository; -import org.apache.deltaspike.data.api.Query; -import org.apache.deltaspike.data.api.Repository; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.persistence.EntityManager; +import jakarta.persistence.PersistenceContext; -@Repository -public interface SessionRepository extends EntityRepository { +@ApplicationScoped +public class SessionRepository { - @Query(value = "select session1 from Session session1 where session1.type='AOCP' and session1.endedAt is null and session1.startedAt =" + - "(select max(session2.startedAt) from Session session2 where session2.type='AOCP' and session2.endedAt is null)") - List findLatestAocpSession(); + @PersistenceContext(unitName = "sjp-persistence-unit") + private EntityManager entityManager; + public List findLatestAocpSession() { + return entityManager.createQuery( + "select session1 from Session session1 where session1.type='AOCP' and session1.endedAt is null and session1.startedAt =" + + "(select max(session2.startedAt) from Session session2 where session2.type='AOCP' and session2.endedAt is null)", + Session.class) + .getResultList(); + } + + public Session findBy(final UUID id) { + return entityManager.find(Session.class, id); + } + + public Session save(final Session entity) { + return entityManager.merge(entity); + } + + public void remove(final Session entity) { + entityManager.remove(entityManager.contains(entity) ? entity : entityManager.merge(entity)); + } + + public Long count() { + return entityManager.createQuery("SELECT COUNT(e) FROM Session e", Long.class).getSingleResult(); + } + + public List findAll() { + return entityManager.createQuery("SELECT e FROM Session e", Session.class).getResultList(); + } } diff --git a/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/repository/SocCheckRepository.java b/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/repository/SocCheckRepository.java index c708483527..91da708444 100644 --- a/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/repository/SocCheckRepository.java +++ b/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/repository/SocCheckRepository.java @@ -2,12 +2,36 @@ import uk.gov.moj.cpp.sjp.persistence.entity.SocCheck; +import java.util.List; import java.util.UUID; -import org.apache.deltaspike.data.api.EntityRepository; -import org.apache.deltaspike.data.api.Repository; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.persistence.EntityManager; +import jakarta.persistence.PersistenceContext; -@Repository -public interface SocCheckRepository extends EntityRepository { +@ApplicationScoped +public class SocCheckRepository { -} \ No newline at end of file + @PersistenceContext(unitName = "sjp-persistence-unit") + private EntityManager entityManager; + + public SocCheck findBy(final UUID id) { + return entityManager.find(SocCheck.class, id); + } + + public SocCheck save(final SocCheck entity) { + return entityManager.merge(entity); + } + + public void remove(final SocCheck entity) { + entityManager.remove(entityManager.contains(entity) ? entity : entityManager.merge(entity)); + } + + public Long count() { + return entityManager.createQuery("SELECT COUNT(e) FROM SocCheck e", Long.class).getSingleResult(); + } + + public List findAll() { + return entityManager.createQuery("SELECT e FROM SocCheck e", SocCheck.class).getResultList(); + } +} diff --git a/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/repository/TransparencyReportMetadataRepository.java b/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/repository/TransparencyReportMetadataRepository.java index 14e8bdf95b..4eafa31b66 100644 --- a/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/repository/TransparencyReportMetadataRepository.java +++ b/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/repository/TransparencyReportMetadataRepository.java @@ -6,17 +6,43 @@ import java.util.List; import java.util.UUID; -import org.apache.deltaspike.data.api.EntityRepository; -import org.apache.deltaspike.data.api.Query; -import org.apache.deltaspike.data.api.QueryParam; -import org.apache.deltaspike.data.api.Repository; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.persistence.EntityManager; +import jakarta.persistence.PersistenceContext; -@Repository -public interface TransparencyReportMetadataRepository extends EntityRepository { +@ApplicationScoped +public class TransparencyReportMetadataRepository { - @Query(value = "SELECT trmd FROM TransparencyReportMetadata trmd " + - "WHERE trmd.fileServiceId is not null and trmd.generatedAt > :fromDate " + - "ORDER BY trmd.generatedAt DESC") - List findLatestTransparencyReportMetadata(@QueryParam("fromDate") LocalDateTime fromDate); + @PersistenceContext(unitName = "sjp-persistence-unit") + private EntityManager entityManager; + public List findLatestTransparencyReportMetadata(LocalDateTime fromDate) { + return entityManager.createQuery( + "SELECT trmd FROM TransparencyReportMetadata trmd " + + "WHERE trmd.fileServiceId is not null and trmd.generatedAt > :fromDate " + + "ORDER BY trmd.generatedAt DESC", + TransparencyReportMetadata.class) + .setParameter("fromDate", fromDate) + .getResultList(); + } + + public TransparencyReportMetadata findBy(final UUID id) { + return entityManager.find(TransparencyReportMetadata.class, id); + } + + public TransparencyReportMetadata save(final TransparencyReportMetadata entity) { + return entityManager.merge(entity); + } + + public void remove(final TransparencyReportMetadata entity) { + entityManager.remove(entityManager.contains(entity) ? entity : entityManager.merge(entity)); + } + + public Long count() { + return entityManager.createQuery("SELECT COUNT(e) FROM TransparencyReportMetadata e", Long.class).getSingleResult(); + } + + public List findAll() { + return entityManager.createQuery("SELECT e FROM TransparencyReportMetadata e", TransparencyReportMetadata.class).getResultList(); + } } diff --git a/sjp-viewstore/sjp-viewstore-persistence/src/main/resources/META-INF/beans.xml b/sjp-viewstore/sjp-viewstore-persistence/src/main/resources/META-INF/beans.xml index cc3f8d2864..1d83bc8c5a 100644 --- a/sjp-viewstore/sjp-viewstore-persistence/src/main/resources/META-INF/beans.xml +++ b/sjp-viewstore/sjp-viewstore-persistence/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-viewstore/sjp-viewstore-persistence/src/main/resources/META-INF/persistence.xml b/sjp-viewstore/sjp-viewstore-persistence/src/main/resources/META-INF/persistence.xml index 4b71140e48..1836ef2afb 100644 --- a/sjp-viewstore/sjp-viewstore-persistence/src/main/resources/META-INF/persistence.xml +++ b/sjp-viewstore/sjp-viewstore-persistence/src/main/resources/META-INF/persistence.xml @@ -1,8 +1,8 @@ - + xsi:schemaLocation="https://jakarta.ee/xml/ns/persistence + https://jakarta.ee/xml/ns/persistence/persistence_3_0.xsd" version="3.0"> org.hibernate.jpa.HibernatePersistenceProvider diff --git a/sjp-viewstore/sjp-viewstore-persistence/src/test/java/uk/gov/moj/cpp/sjp/persistence/entity/converter/TimestampConverter.java b/sjp-viewstore/sjp-viewstore-persistence/src/test/java/uk/gov/moj/cpp/sjp/persistence/entity/converter/TimestampConverter.java index d8fad336c2..2463c5cd3b 100644 --- a/sjp-viewstore/sjp-viewstore-persistence/src/test/java/uk/gov/moj/cpp/sjp/persistence/entity/converter/TimestampConverter.java +++ b/sjp-viewstore/sjp-viewstore-persistence/src/test/java/uk/gov/moj/cpp/sjp/persistence/entity/converter/TimestampConverter.java @@ -4,8 +4,8 @@ import java.time.ZoneOffset; import java.time.ZonedDateTime; -import javax.persistence.AttributeConverter; -import javax.persistence.Converter; +import jakarta.persistence.AttributeConverter; +import jakarta.persistence.Converter; @Converter(autoApply = true) public class TimestampConverter implements AttributeConverter { diff --git a/sjp-viewstore/sjp-viewstore-persistence/src/test/java/uk/gov/moj/cpp/sjp/persistence/repository/AssignmentRepositoryTest.java b/sjp-viewstore/sjp-viewstore-persistence/src/test/java/uk/gov/moj/cpp/sjp/persistence/repository/AssignmentRepositoryTest.java index 9c9581be47..13333f9fb1 100644 --- a/sjp-viewstore/sjp-viewstore-persistence/src/test/java/uk/gov/moj/cpp/sjp/persistence/repository/AssignmentRepositoryTest.java +++ b/sjp-viewstore/sjp-viewstore-persistence/src/test/java/uk/gov/moj/cpp/sjp/persistence/repository/AssignmentRepositoryTest.java @@ -2,12 +2,11 @@ import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.tuple.Pair; -import org.apache.deltaspike.testcontrol.api.junit.CdiTestRunner; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.RegisterExtension; -import uk.gov.justice.services.test.utils.persistence.BaseTransactionalJunit4Test; -import uk.gov.justice.services.test.utils.persistence.BaseTransactionalJunit4Test; +import uk.gov.justice.services.test.utils.persistence.HibernateTestEntityManagerProvider; import uk.gov.moj.cpp.sjp.domain.AssignmentCandidate; import uk.gov.moj.cpp.sjp.domain.CaseReadinessReason; import uk.gov.moj.cpp.sjp.domain.SessionType; @@ -25,8 +24,7 @@ import uk.gov.moj.cpp.sjp.persistence.entity.ReserveCase; import uk.gov.moj.cpp.sjp.persistence.entity.StreamStatus; -import javax.inject.Inject; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import java.time.LocalDate; import java.time.ZonedDateTime; @@ -65,21 +63,27 @@ import static uk.gov.moj.cpp.sjp.domain.plea.PleaType.GUILTY_REQUEST_HEARING; import static uk.gov.moj.cpp.sjp.domain.plea.PleaType.NOT_GUILTY; -@RunWith(CdiTestRunner.class) -public class AssignmentRepositoryTest extends BaseTransactionalJunit4Test { +class AssignmentRepositoryTest { + + private static final String PERSISTENCE_UNIT = "sjp-test-persistence-unit"; + + @RegisterExtension + static HibernateTestEntityManagerProvider provider = new HibernateTestEntityManagerProvider(PERSISTENCE_UNIT); private static final ZonedDateTime TODAY_MIDNIGHT = ZonedDateTime.now(UTC).truncatedTo(ChronoUnit.DAYS); private final int NO_LIMIT = Integer.MAX_VALUE; - @Inject + private AssignmentRepository assignmentRepository; - @Inject private EntityManager em; private UUID assigneeId; - @Override - public void setUpBefore() { + @BeforeEach + void setUp() { + assignmentRepository = new AssignmentRepository(); + provider.injectEntityManagerInto(assignmentRepository, "em"); + em = provider.getEntityManager(); assigneeId = UUID.randomUUID(); } diff --git a/sjp-viewstore/sjp-viewstore-persistence/src/test/java/uk/gov/moj/cpp/sjp/persistence/repository/CaseApplicationRepositoryTest.java b/sjp-viewstore/sjp-viewstore-persistence/src/test/java/uk/gov/moj/cpp/sjp/persistence/repository/CaseApplicationRepositoryTest.java index 255fbf1dac..8fc94a84fc 100644 --- a/sjp-viewstore/sjp-viewstore-persistence/src/test/java/uk/gov/moj/cpp/sjp/persistence/repository/CaseApplicationRepositoryTest.java +++ b/sjp-viewstore/sjp-viewstore-persistence/src/test/java/uk/gov/moj/cpp/sjp/persistence/repository/CaseApplicationRepositoryTest.java @@ -1,31 +1,36 @@ package uk.gov.moj.cpp.sjp.persistence.repository; -import org.apache.deltaspike.testcontrol.api.junit.CdiTestRunner; -import org.junit.Assert; -import org.junit.Ignore; -import org.junit.Test; -import org.junit.runner.RunWith; +import static java.util.UUID.randomUUID; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static uk.gov.moj.cpp.sjp.persistence.entity.ApplicationType.STAT_DEC; + import uk.gov.justice.services.common.util.Clock; +import uk.gov.justice.services.common.util.UtcClock; import uk.gov.justice.services.test.utils.core.random.RandomGenerator; -import uk.gov.justice.services.test.utils.persistence.BaseTransactionalJunit4Test; +import uk.gov.justice.services.test.utils.persistence.HibernateTestEntityManagerProvider; import uk.gov.moj.cpp.sjp.persistence.builder.CaseDetailBuilder; import uk.gov.moj.cpp.sjp.persistence.builder.DefendantDetailBuilder; import uk.gov.moj.cpp.sjp.persistence.entity.CaseApplication; import uk.gov.moj.cpp.sjp.persistence.entity.CaseDetail; import uk.gov.moj.cpp.sjp.persistence.entity.CaseDocument; -import javax.inject.Inject; import java.math.BigDecimal; import java.time.LocalDate; import java.util.UUID; -import static java.util.UUID.randomUUID; -import static uk.gov.moj.cpp.sjp.persistence.entity.ApplicationType.STAT_DEC; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.RegisterExtension; -@Ignore -@RunWith(CdiTestRunner.class) -public class CaseApplicationRepositoryTest extends BaseTransactionalJunit4Test { +@Disabled +class CaseApplicationRepositoryTest { + + private static final String PERSISTENCE_UNIT = "sjp-test-persistence-unit"; + + @RegisterExtension + static HibernateTestEntityManagerProvider provider = new HibernateTestEntityManagerProvider(PERSISTENCE_UNIT); private static final UUID APPLICATION_ID = UUID.randomUUID(); private static final UUID CASE_ID = UUID.randomUUID(); @@ -45,15 +50,20 @@ public class CaseApplicationRepositoryTest extends BaseTransactionalJunit4Test { private static final String URN = "TFL12345678A"; private static CaseDetail caseDetail; - @Inject - private Clock clock; + private final Clock clock = new UtcClock(); - @Inject private CaseApplicationRepository caseApplicationRepository; - @Inject private CaseRepository caseRepository; + @BeforeEach + void setUp() { + caseApplicationRepository = new CaseApplicationRepository(); + provider.injectEntityManagerInto(caseApplicationRepository); + caseRepository = new CaseRepository(); + provider.injectEntityManagerInto(caseRepository); + } + @Test public void testFindByApplicationId() { caseDetail = createCase(CASE_ID, URN, DEFENDANT_ID, POSTCODE, VALID_MATERIAL_ID_1, VALID_MATERIAL_ID_2); @@ -61,11 +71,11 @@ public void testFindByApplicationId() { caseApplicationRepository.save(getCaseApplication()); caseApplicationRepository.findBy(APPLICATION_ID); final CaseApplication actual = caseApplicationRepository.findBy(APPLICATION_ID); - Assert.assertEquals(APPLICATION_ID, actual.getApplicationId()); - Assert.assertEquals(APPLICATION_TYPE_ID, actual.getTypeId()); - Assert.assertEquals(APPLICATION_REFERENCE, actual.getApplicationReference()); - Assert.assertEquals(APPLICATION_REASON, actual.getOutOfTimeReason()); - Assert.assertEquals(STAT_DEC, actual.getApplicationType()); + assertEquals(APPLICATION_ID, actual.getApplicationId()); + assertEquals(APPLICATION_TYPE_ID, actual.getTypeId()); + assertEquals(APPLICATION_REFERENCE, actual.getApplicationReference()); + assertEquals(APPLICATION_REASON, actual.getOutOfTimeReason()); + assertEquals(STAT_DEC, actual.getApplicationType()); } private CaseApplication getCaseApplication() { diff --git a/sjp-viewstore/sjp-viewstore-persistence/src/test/java/uk/gov/moj/cpp/sjp/persistence/repository/CaseAssignmentRestrictionRepositoryTest.java b/sjp-viewstore/sjp-viewstore-persistence/src/test/java/uk/gov/moj/cpp/sjp/persistence/repository/CaseAssignmentRestrictionRepositoryTest.java index d7c85aa2b4..feb83abf22 100644 --- a/sjp-viewstore/sjp-viewstore-persistence/src/test/java/uk/gov/moj/cpp/sjp/persistence/repository/CaseAssignmentRestrictionRepositoryTest.java +++ b/sjp-viewstore/sjp-viewstore-persistence/src/test/java/uk/gov/moj/cpp/sjp/persistence/repository/CaseAssignmentRestrictionRepositoryTest.java @@ -7,34 +7,36 @@ import static org.junit.jupiter.api.Assertions.assertNull; import uk.gov.justice.services.common.util.Clock; -import uk.gov.justice.services.test.utils.persistence.BaseTransactionalJunit4Test; +import uk.gov.justice.services.common.util.UtcClock; +import uk.gov.justice.services.test.utils.persistence.HibernateTestEntityManagerProvider; import uk.gov.moj.cpp.sjp.persistence.entity.CaseAssignmentRestriction; -import javax.inject.Inject; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.RegisterExtension; -import org.apache.deltaspike.testcontrol.api.junit.CdiTestRunner; -import org.junit.Before; -import org.junit.Ignore; -import org.junit.Test; -import org.junit.runner.RunWith; - -@RunWith(CdiTestRunner.class) -@Ignore +@Disabled // This test is ignored since h2 does not support jsonb type -public class CaseAssignmentRestrictionRepositoryTest extends BaseTransactionalJunit4Test { +class CaseAssignmentRestrictionRepositoryTest { + + private static final String PERSISTENCE_UNIT = "sjp-test-persistence-unit"; + + @RegisterExtension + static HibernateTestEntityManagerProvider provider = new HibernateTestEntityManagerProvider(PERSISTENCE_UNIT); private static final String PROSECUTING_AUTHORITY_TVL = "TVL"; private static final String PROSECUTING_AUTHORITY_TFL = "TFL"; private static final String PROSECUTING_AUTHORITY_DVLA = "DVLA"; - @Inject - private Clock dateTimeCreated; + private final Clock dateTimeCreated = new UtcClock(); - @Inject private CaseAssignmentRestrictionRepository repository; - @Before - public void set() { + @BeforeEach + void set() { + repository = new CaseAssignmentRestrictionRepository(); + provider.injectEntityManagerInto(repository); repository.saveCaseAssignmentRestriction(PROSECUTING_AUTHORITY_TVL, "[]", "[]", dateTimeCreated.now(), dateTimeCreated.now().toLocalDate(), dateTimeCreated.now().toLocalDate()); repository.saveCaseAssignmentRestriction(PROSECUTING_AUTHORITY_TFL, "[\"1234\"]", "[]", dateTimeCreated.now(), null, dateTimeCreated.now().toLocalDate()); repository.saveCaseAssignmentRestriction(PROSECUTING_AUTHORITY_DVLA, "[]", "[\"9876\"]", dateTimeCreated.now(), dateTimeCreated.now().toLocalDate(), null); diff --git a/sjp-viewstore/sjp-viewstore-persistence/src/test/java/uk/gov/moj/cpp/sjp/persistence/repository/CaseDecisionRepositoryTest.java b/sjp-viewstore/sjp-viewstore-persistence/src/test/java/uk/gov/moj/cpp/sjp/persistence/repository/CaseDecisionRepositoryTest.java index 90f74ed29e..01b574aa76 100644 --- a/sjp-viewstore/sjp-viewstore-persistence/src/test/java/uk/gov/moj/cpp/sjp/persistence/repository/CaseDecisionRepositoryTest.java +++ b/sjp-viewstore/sjp-viewstore-persistence/src/test/java/uk/gov/moj/cpp/sjp/persistence/repository/CaseDecisionRepositoryTest.java @@ -2,12 +2,12 @@ import static java.util.Arrays.*; import static java.util.UUID.randomUUID; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import static uk.gov.moj.cpp.sjp.domain.decision.discharge.DischargeType.CONDITIONAL; import static uk.gov.moj.cpp.sjp.domain.decision.discharge.PeriodUnit.*; import static uk.gov.moj.cpp.sjp.domain.plea.PleaType.*; -import uk.gov.justice.services.test.utils.persistence.BaseTransactionalJunit4Test; +import uk.gov.justice.services.test.utils.persistence.HibernateTestEntityManagerProvider; import uk.gov.moj.cpp.sjp.domain.decision.imposition.InstallmentPeriod; import uk.gov.moj.cpp.sjp.domain.decision.imposition.PaymentType; import uk.gov.moj.cpp.sjp.persistence.entity.CaseDecision; @@ -27,29 +27,29 @@ import java.time.ZonedDateTime; import java.util.UUID; -import javax.inject.Inject; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; -import org.apache.deltaspike.testcontrol.api.junit.CdiTestRunner; -import org.junit.After; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.RegisterExtension; -@RunWith(CdiTestRunner.class) -public class CaseDecisionRepositoryTest extends BaseTransactionalJunit4Test { +class CaseDecisionRepositoryTest { - @Inject - private EntityManager entityManager; + private static final String PERSISTENCE_UNIT = "sjp-test-persistence-unit"; - @Inject - private CaseDecisionRepository caseDecisionRepository; + @RegisterExtension + static HibernateTestEntityManagerProvider provider = new HibernateTestEntityManagerProvider(PERSISTENCE_UNIT); + private EntityManager entityManager; - @Override - public void setUpBefore() { } + private CaseDecisionRepository caseDecisionRepository; - @After - public void tearDownAfterTemporary() { } + @BeforeEach + void setUp() { + caseDecisionRepository = new CaseDecisionRepository(); + provider.injectEntityManagerInto(caseDecisionRepository); + entityManager = provider.getEntityManager(); + } @Test public void shouldSaveDischargeOffenceDecision() { diff --git a/sjp-viewstore/sjp-viewstore-persistence/src/test/java/uk/gov/moj/cpp/sjp/persistence/repository/CaseDocumentRepositoryTest.java b/sjp-viewstore/sjp-viewstore-persistence/src/test/java/uk/gov/moj/cpp/sjp/persistence/repository/CaseDocumentRepositoryTest.java index cf6e702860..29c5182f16 100644 --- a/sjp-viewstore/sjp-viewstore-persistence/src/test/java/uk/gov/moj/cpp/sjp/persistence/repository/CaseDocumentRepositoryTest.java +++ b/sjp-viewstore/sjp-viewstore-persistence/src/test/java/uk/gov/moj/cpp/sjp/persistence/repository/CaseDocumentRepositoryTest.java @@ -1,9 +1,9 @@ package uk.gov.moj.cpp.sjp.persistence.repository; -import static junit.framework.TestCase.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import uk.gov.justice.services.common.converter.ZonedDateTimes; -import uk.gov.justice.services.test.utils.persistence.BaseTransactionalJunit4Test; +import uk.gov.justice.services.test.utils.persistence.HibernateTestEntityManagerProvider; import uk.gov.moj.cpp.sjp.persistence.entity.CaseDetail; import uk.gov.moj.cpp.sjp.persistence.entity.CaseDocument; @@ -15,21 +15,20 @@ import java.util.List; import java.util.UUID; -import javax.inject.Inject; - import org.apache.commons.lang3.RandomStringUtils; -import org.apache.deltaspike.testcontrol.api.junit.CdiTestRunner; -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.RegisterExtension; + +class CaseDocumentRepositoryTest { + + private static final String PERSISTENCE_UNIT = "sjp-test-persistence-unit"; -@RunWith(CdiTestRunner.class) -public class CaseDocumentRepositoryTest extends BaseTransactionalJunit4Test { + @RegisterExtension + static HibernateTestEntityManagerProvider provider = new HibernateTestEntityManagerProvider(PERSISTENCE_UNIT); - @Inject private CaseDocumentRepository caseDocumentRepository; - @Inject private CaseRepository caseRepository; private ZonedDateTime addedAt_2017_01_01 = ZonedDateTimes.fromString("2017-01-01T00:00:00.000Z"); @@ -38,8 +37,12 @@ public class CaseDocumentRepositoryTest extends BaseTransactionalJunit4Test { private static final Integer DOCUMENT_NUMBER = 1; - @Before - public void givenCaseDocuments() { + @BeforeEach + void givenCaseDocuments() { + caseDocumentRepository = new CaseDocumentRepository(); + provider.injectEntityManagerInto(caseDocumentRepository); + caseRepository = new CaseRepository(); + provider.injectEntityManagerInto(caseRepository); addCaseDocument(addedAt_2017_01_01); addCaseDocument(addedAt_2017_01_05); addCaseDocument(addedAt_2017_01_10); diff --git a/sjp-viewstore/sjp-viewstore-persistence/src/test/java/uk/gov/moj/cpp/sjp/persistence/repository/CaseNoteRepositoryTest.java b/sjp-viewstore/sjp-viewstore-persistence/src/test/java/uk/gov/moj/cpp/sjp/persistence/repository/CaseNoteRepositoryTest.java index 4f36b13cb1..832a8d0c37 100644 --- a/sjp-viewstore/sjp-viewstore-persistence/src/test/java/uk/gov/moj/cpp/sjp/persistence/repository/CaseNoteRepositoryTest.java +++ b/sjp-viewstore/sjp-viewstore-persistence/src/test/java/uk/gov/moj/cpp/sjp/persistence/repository/CaseNoteRepositoryTest.java @@ -7,25 +7,32 @@ import static org.hamcrest.Matchers.contains; import uk.gov.justice.json.schemas.domains.sjp.NoteType; -import uk.gov.justice.services.test.utils.persistence.BaseTransactionalJunit4Test; +import uk.gov.justice.services.test.utils.persistence.HibernateTestEntityManagerProvider; import uk.gov.moj.cpp.sjp.persistence.entity.CaseNote; import java.time.ZonedDateTime; import java.util.List; import java.util.UUID; -import javax.inject.Inject; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.RegisterExtension; -import org.apache.deltaspike.testcontrol.api.junit.CdiTestRunner; -import org.junit.Test; -import org.junit.runner.RunWith; +class CaseNoteRepositoryTest { -@RunWith(CdiTestRunner.class) -public class CaseNoteRepositoryTest extends BaseTransactionalJunit4Test { + private static final String PERSISTENCE_UNIT = "sjp-test-persistence-unit"; + + @RegisterExtension + static HibernateTestEntityManagerProvider provider = new HibernateTestEntityManagerProvider(PERSISTENCE_UNIT); - @Inject private CaseNoteRepository caseNoteRepository; + @BeforeEach + void setUp() { + caseNoteRepository = new CaseNoteRepository(); + provider.injectEntityManagerInto(caseNoteRepository); + } + @Test public void shouldFindOrderdCaseNotesStartingWithMostRecent() { final UUID case1Id = randomUUID(); diff --git a/sjp-viewstore/sjp-viewstore-persistence/src/test/java/uk/gov/moj/cpp/sjp/persistence/repository/CaseRepositoryProsecutingAuthorityTest.java b/sjp-viewstore/sjp-viewstore-persistence/src/test/java/uk/gov/moj/cpp/sjp/persistence/repository/CaseRepositoryProsecutingAuthorityTest.java index 6541933d5d..c67606562b 100644 --- a/sjp-viewstore/sjp-viewstore-persistence/src/test/java/uk/gov/moj/cpp/sjp/persistence/repository/CaseRepositoryProsecutingAuthorityTest.java +++ b/sjp-viewstore/sjp-viewstore-persistence/src/test/java/uk/gov/moj/cpp/sjp/persistence/repository/CaseRepositoryProsecutingAuthorityTest.java @@ -6,26 +6,29 @@ import static org.hamcrest.Matchers.nullValue; import static uk.gov.moj.cpp.sjp.persistence.builder.CaseDetailBuilder.aCase; -import uk.gov.justice.services.test.utils.persistence.BaseTransactionalJunit4Test; +import uk.gov.justice.services.test.utils.persistence.HibernateTestEntityManagerProvider; import uk.gov.moj.cpp.sjp.persistence.entity.CaseDetail; -import javax.inject.Inject; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.RegisterExtension; -import org.apache.deltaspike.testcontrol.api.junit.CdiTestRunner; -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; +class CaseRepositoryProsecutingAuthorityTest { -@RunWith(CdiTestRunner.class) -public class CaseRepositoryProsecutingAuthorityTest extends BaseTransactionalJunit4Test { + private static final String PERSISTENCE_UNIT = "sjp-test-persistence-unit"; + + @RegisterExtension + static HibernateTestEntityManagerProvider provider = new HibernateTestEntityManagerProvider(PERSISTENCE_UNIT); - @Inject private CaseRepository caseRepository; private CaseDetail tflCase, tvlCase; - @Before - public void init() { + @BeforeEach + void createRepositoryAndSeedCases() { + caseRepository = new CaseRepository(); + provider.injectEntityManagerInto(caseRepository); + tflCase = aCase().withCaseId(randomUUID()).withProsecutingAuthority("TFL").build(); tvlCase = aCase().withCaseId(randomUUID()).withProsecutingAuthority("TVL").build(); caseRepository.save(tflCase); @@ -33,7 +36,7 @@ public void init() { } @Test - public void shouldGetCaseProsecutingAuthority() { + void shouldGetCaseProsecutingAuthority() { assertThat(caseRepository.getProsecutingAuthority(tflCase.getId()), is("TFL")); assertThat(caseRepository.getProsecutingAuthority(tvlCase.getId()), is("TVL")); assertThat(caseRepository.getProsecutingAuthority(randomUUID()), nullValue()); diff --git a/sjp-viewstore/sjp-viewstore-persistence/src/test/java/uk/gov/moj/cpp/sjp/persistence/repository/CaseRepositorySjpnTest.java b/sjp-viewstore/sjp-viewstore-persistence/src/test/java/uk/gov/moj/cpp/sjp/persistence/repository/CaseRepositorySjpnTest.java index f427c6e6d9..5277cb7b94 100644 --- a/sjp-viewstore/sjp-viewstore-persistence/src/test/java/uk/gov/moj/cpp/sjp/persistence/repository/CaseRepositorySjpnTest.java +++ b/sjp-viewstore/sjp-viewstore-persistence/src/test/java/uk/gov/moj/cpp/sjp/persistence/repository/CaseRepositorySjpnTest.java @@ -10,7 +10,8 @@ import static org.hamcrest.Matchers.isIn; import uk.gov.justice.services.common.util.Clock; -import uk.gov.justice.services.test.utils.persistence.BaseTransactionalJunit4Test; +import uk.gov.justice.services.common.util.UtcClock; +import uk.gov.justice.services.test.utils.persistence.HibernateTestEntityManagerProvider; import uk.gov.moj.cpp.sjp.persistence.entity.CaseDetail; import uk.gov.moj.cpp.sjp.persistence.entity.CaseDetailMissingSjpn; import uk.gov.moj.cpp.sjp.persistence.entity.CaseDocument; @@ -22,30 +23,32 @@ import java.util.stream.Collectors; import java.util.stream.Stream; -import javax.inject.Inject; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.RegisterExtension; -import org.apache.deltaspike.testcontrol.api.junit.CdiTestRunner; -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; - -@RunWith(CdiTestRunner.class) -public class CaseRepositorySjpnTest extends BaseTransactionalJunit4Test { +class CaseRepositorySjpnTest { private static final String TFL_PROSECUTOR_FILTER_VALUE = "TFL"; private static final String COURT_ADMIN_FILTER_VALUE = "%"; private static final int NUMBER_OF_PROSECUTING_AUTHORITIES = 2; - @Inject + private static final String PERSISTENCE_UNIT = "sjp-test-persistence-unit"; + + @RegisterExtension + static HibernateTestEntityManagerProvider provider = new HibernateTestEntityManagerProvider(PERSISTENCE_UNIT); + private CaseRepository caseRepository; - @Inject - private Clock clock; + private final Clock clock = new UtcClock(); private SjpCases tflCases, tvlCases, allCases = new SjpCases(); - @Before - public void addCasesAndDocuments() { + @BeforeEach + void createRepositoryAndSeedCases() { + + caseRepository = new CaseRepository(); + provider.injectEntityManagerInto(caseRepository); tflCases = createCasesAndDocuments("TFL"); tvlCases = createCasesAndDocuments("TVL"); @@ -63,7 +66,7 @@ public void addCasesAndDocuments() { } @Test - public void findCasesMissingSjpnForTflProsecutors() { + void findCasesMissingSjpnForTflProsecutors() { final List actualCases = caseRepository.findCasesMissingSjpn(TFL_PROSECUTOR_FILTER_VALUE, Collections.emptyList()).getResultList(); final List actualCaseIds = extractCaseIds(actualCases); @@ -71,7 +74,7 @@ public void findCasesMissingSjpnForTflProsecutors() { } @Test - public void findCasesMissingSjpnForCourtAdmin() { + void findCasesMissingSjpnForCourtAdmin() { final List actualCases = caseRepository.findCasesMissingSjpn(COURT_ADMIN_FILTER_VALUE, Collections.emptyList()).getResultList(); final List actualCaseIds = extractCaseIds(actualCases); @@ -79,10 +82,10 @@ public void findCasesMissingSjpnForCourtAdmin() { } @Test - public void findCasesMissingSjpnWithLimitForTflProsecutors() { + void findCasesMissingSjpnWithLimitForTflProsecutors() { int limit = 3; - final List actualCases = caseRepository.findCasesMissingSjpn(TFL_PROSECUTOR_FILTER_VALUE, Collections.emptyList()).maxResults(limit).getResultList(); + final List actualCases = caseRepository.findCasesMissingSjpn(TFL_PROSECUTOR_FILTER_VALUE, Collections.emptyList()).setMaxResults(limit).getResultList(); final List actualCaseIds = extractCaseIds(actualCases); assertThat(actualCaseIds, hasSize(limit)); @@ -92,10 +95,10 @@ public void findCasesMissingSjpnWithLimitForTflProsecutors() { } @Test - public void findCasesMissingSjpnWithLimitForCourtAdmin() { + void findCasesMissingSjpnWithLimitForCourtAdmin() { int limit = 3; - final List actualCases = caseRepository.findCasesMissingSjpn(COURT_ADMIN_FILTER_VALUE, Collections.emptyList()).maxResults(limit).getResultList(); + final List actualCases = caseRepository.findCasesMissingSjpn(COURT_ADMIN_FILTER_VALUE, Collections.emptyList()).setMaxResults(limit).getResultList(); final List actualCaseIds = extractCaseIds(actualCases); assertThat(actualCaseIds, hasSize(limit)); @@ -105,21 +108,21 @@ public void findCasesMissingSjpnWithLimitForCourtAdmin() { } @Test - public void countCasesMissingSjpnForTflProsecutors() { + void countCasesMissingSjpnForTflProsecutors() { final int actualCaseCount = caseRepository.countCasesMissingSjpn(TFL_PROSECUTOR_FILTER_VALUE, Collections.emptyList()); assertThat(actualCaseCount, equalTo(tflCases.uncompletedSjpCasesWithoutSjpn.size())); } @Test - public void countCasesMissingSjpnForCourAdmin() { + void countCasesMissingSjpnForCourAdmin() { final int actualCaseCount = caseRepository.countCasesMissingSjpn(COURT_ADMIN_FILTER_VALUE, Collections.emptyList()); assertThat(actualCaseCount, equalTo(allCases.uncompletedSjpCasesWithoutSjpn.size())); } @Test - public void countCasesMissingSjpnWithPostingDateOlderThanSpecifiedForTflProsecutors() { + void countCasesMissingSjpnWithPostingDateOlderThanSpecifiedForTflProsecutors() { int sjpCasesMissingSjpnCount = tflCases.uncompletedSjpCasesWithoutSjpn.size(); for (int i = 0; i < sjpCasesMissingSjpnCount; i++) { final LocalDate postingDate = LocalDate.now().minusDays(i); @@ -129,7 +132,7 @@ public void countCasesMissingSjpnWithPostingDateOlderThanSpecifiedForTflProsecut } @Test - public void countCasesMissingSjpnWithPostingDateOlderThanSpecifiedForCourtAdmin() { + void countCasesMissingSjpnWithPostingDateOlderThanSpecifiedForCourtAdmin() { int sjpCasesMissingSjpnCount = allCases.uncompletedSjpCasesWithoutSjpn.size(); for (int i = 0; i < sjpCasesMissingSjpnCount / NUMBER_OF_PROSECUTING_AUTHORITIES; i++) { final LocalDate postingDate = LocalDate.now().minusDays(i); diff --git a/sjp-viewstore/sjp-viewstore-persistence/src/test/java/uk/gov/moj/cpp/sjp/persistence/repository/CaseRepositoryTest.java b/sjp-viewstore/sjp-viewstore-persistence/src/test/java/uk/gov/moj/cpp/sjp/persistence/repository/CaseRepositoryTest.java index 772d0f3102..28a3eee330 100644 --- a/sjp-viewstore/sjp-viewstore-persistence/src/test/java/uk/gov/moj/cpp/sjp/persistence/repository/CaseRepositoryTest.java +++ b/sjp-viewstore/sjp-viewstore-persistence/src/test/java/uk/gov/moj/cpp/sjp/persistence/repository/CaseRepositoryTest.java @@ -9,18 +9,20 @@ import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.hasSize; import static org.hamcrest.Matchers.nullValue; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.junit.jupiter.api.Assertions.assertTrue; import static org.mockito.ArgumentMatchers.any; import static uk.gov.moj.cpp.sjp.domain.SessionType.DELEGATED_POWERS; import static uk.gov.moj.cpp.sjp.domain.SessionType.MAGISTRATE; import uk.gov.justice.services.common.util.Clock; +import uk.gov.justice.services.common.util.UtcClock; import uk.gov.justice.services.test.utils.core.random.RandomGenerator; -import uk.gov.justice.services.test.utils.persistence.BaseTransactionalJunit4Test; +import uk.gov.justice.services.test.utils.persistence.HibernateTestEntityManagerProvider; import uk.gov.moj.cpp.sjp.domain.CaseReadinessReason; import uk.gov.moj.cpp.sjp.persistence.builder.CaseDetailBuilder; import uk.gov.moj.cpp.sjp.persistence.builder.DefendantDetailBuilder; @@ -41,17 +43,14 @@ import java.util.Map; import java.util.UUID; -import javax.inject.Inject; -import javax.persistence.EntityManager; -import javax.persistence.NonUniqueResultException; +import jakarta.persistence.EntityManager; +import jakarta.persistence.NonUniqueResultException; -import org.apache.deltaspike.testcontrol.api.junit.CdiTestRunner; -import org.junit.After; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.RegisterExtension; -@RunWith(CdiTestRunner.class) -public class CaseRepositoryTest extends BaseTransactionalJunit4Test { +class CaseRepositoryTest { private static final Map CASES = new HashMap<>(); @@ -81,17 +80,19 @@ public class CaseRepositoryTest extends BaseTransactionalJunit4Test { private static final String OFFENCE_CODE = "PS0001"; private static final List READY_CASES = new ArrayList<>(); private static LocalDate postingDate = LocalDate.of(2015, 12, 31); - @Inject + + private static final String PERSISTENCE_UNIT = "sjp-test-persistence-unit"; + + @RegisterExtension + static HibernateTestEntityManagerProvider provider = new HibernateTestEntityManagerProvider(PERSISTENCE_UNIT); + private EntityManager entityManager; - @Inject private CaseRepository caseRepository; - @Inject private ReadyCaseRepository readyCaseRepository; - @Inject - private Clock clock; + private final Clock clock = new UtcClock(); private ZonedDateTime caseCreatedOn; @@ -101,8 +102,16 @@ private static String randomUrn() { return PROSECUTING_AUTHORITY + RandomGenerator.integer(100000000, 999999999).next(); } - @Override - public void setUpBefore() { + @BeforeEach + void createRepositoriesAndSeedCases() { + caseRepository = new CaseRepository(); + provider.injectEntityManagerInto(caseRepository); + + readyCaseRepository = new ReadyCaseRepository(); + provider.injectEntityManagerInto(readyCaseRepository); + + entityManager = provider.getEntityManager(); + caseCreatedOn = clock.now(); // given 4 cases exist in database case1 = getCase(VALID_CASE_ID_1, VALID_URN_1, VALID_DEFENDANT_ID_1); @@ -129,49 +138,43 @@ public void setUpBefore() { READY_CASES.forEach(readyCaseRepository::save); - //clear L1 cache to force JPA to execute query against database + //flush pending inserts then clear L1 cache to force JPA to execute query against database + entityManager.flush(); entityManager.clear(); } - @After - public void tearDownAfterTemporary() { - // cleaning up database after each test to avoid data collision - CASES.values().forEach(caseRepository::attachAndRemove); - READY_CASES.forEach(readyCaseRepository::attachAndRemove); - } - @Test - public void shouldFindPressTransparencyReportPendingCases() { + void shouldFindPressTransparencyReportPendingCases() { final List caseDetails = caseRepository.findPressTransparencyReportPendingCases(); assertNotNull(caseDetails); } @Test - public void shouldFindPressTransparencyDeltaReportPendingCases() { + void shouldFindPressTransparencyDeltaReportPendingCases() { final List caseDetails = caseRepository.findPressTransparencyDeltaReportPendingCases(any(), any()); assertNotNull(caseDetails); } @Test - public void shouldFindPublicTransparencyReportPendingCases() { + void shouldFindPublicTransparencyReportPendingCases() { final List caseDetails = caseRepository.findPublicTransparencyReportPendingCases(); assertNotNull(caseDetails); } @Test - public void shouldFindPublicTransparencyDeltaReportPendingCases() { + void shouldFindPublicTransparencyDeltaReportPendingCases() { final List caseDetails = caseRepository.findPublicTransparencyDeltaReportPendingCases(any(), any()); assertNotNull(caseDetails); } @Test - public void shouldFindCase() { + void shouldFindCase() { final CaseDetail actualCase = caseRepository.findBy(VALID_CASE_ID_1); assertNotNull(actualCase); } @Test - public void shouldFindCaseWithMultipleDocuments() { + void shouldFindCaseWithMultipleDocuments() { final CaseDetail actualCase = caseRepository.findBy(VALID_CASE_ID_2); assertNotNull(actualCase); assertThat(actualCase.getCaseDocuments(), hasSize(case2.getCaseDocuments().size())); @@ -180,62 +183,62 @@ public void shouldFindCaseWithMultipleDocuments() { } @Test - public void shouldFindCaseMatchingUrn() { + void shouldFindCaseMatchingUrn() { final CaseDetail actualCase = caseRepository.findByUrn(VALID_URN_1); assertNotNull(actualCase); - assertEquals("ID should match ID of case 1", VALID_CASE_ID_1, actualCase.getId()); + assertEquals(VALID_CASE_ID_1, actualCase.getId(), "ID should match ID of case 1"); assertThat(caseCreatedOn, is(actualCase.getDateTimeCreated())); } @Test - public void shouldFindCaseMatchingUrnIgnoringCase() { + void shouldFindCaseMatchingUrnIgnoringCase() { final CaseDetail actualCase = caseRepository.findByUrn(VALID_URN_1.toLowerCase()); assertNotNull(actualCase); - assertEquals("ID should match ID of case 1", VALID_CASE_ID_1, actualCase.getId()); + assertEquals(VALID_CASE_ID_1, actualCase.getId(), "ID should match ID of case 1"); } @Test - public void shouldFindCaseByPersonId() { + void shouldFindCaseByPersonId() { final List caseDetails = caseRepository.findByDefendantId(VALID_DEFENDANT_ID_1); assertNotNull(caseDetails); assertThat("Should have 1 entry", caseDetails, hasSize(1)); - assertEquals("ID should match ID of case 1", VALID_CASE_ID_1, caseDetails.get(0).getId()); + assertEquals(VALID_CASE_ID_1, caseDetails.get(0).getId(), "ID should match ID of case 1"); } @Test - public void shouldFindCaseWithEnterpriseIdByCaseId() { + void shouldFindCaseWithEnterpriseIdByCaseId() { final CaseDetail caseDetail = caseRepository.findBy(VALID_CASE_ID_1); assertThat(caseDetail.getEnterpriseId(), equalTo(ENTERPRISE_ID)); } @Test - public void shouldFindCaseDocuments() { + void shouldFindCaseDocuments() { final List caseDocuments = caseRepository.findCaseDocuments(VALID_CASE_ID_2); assertNotNull(caseDocuments); assertThat(caseDocuments.stream().map(CaseDocument::getMaterialId).collect(toList()), containsInAnyOrder(VALID_MATERIAL_ID_1, VALID_MATERIAL_ID_2)); } @Test - public void shouldFindCaseDefendants_Success() { + void shouldFindCaseDefendants_Success() { final DefendantDetail defendant = caseRepository.findCaseDefendant(VALID_CASE_ID_3); assertNotNull(defendant); assertEquals(VALID_CASE_ID_3, defendant.getCaseDetail().getId()); } @Test - public void shouldCompleteCaseSuccessfully() { - assertFalse("CaseAggregate should not be completed", - CASES.get(VALID_CASE_ID_1).isCompleted()); + void shouldCompleteCaseSuccessfully() { + assertFalse(CASES.get(VALID_CASE_ID_1).isCompleted(), + "CaseAggregate should not be completed"); caseRepository.completeCase(VALID_CASE_ID_1); final CaseDetail actualCase = caseRepository.findBy(VALID_CASE_ID_1); - assertTrue("CaseAggregate should be completed", actualCase.isCompleted()); + assertTrue(actualCase.isCompleted(), "CaseAggregate should be completed"); assertNull(actualCase.getAdjournedTo()); } @Test - public void shouldUpdateLibraCaseReopenedDetails() { + void shouldUpdateLibraCaseReopenedDetails() { final LocalDate reopenedDate = now(); final String reason = "REASON"; final CaseDetail actualCase = caseRepository.findByUrn(VALID_URN_1); @@ -250,7 +253,7 @@ public void shouldUpdateLibraCaseReopenedDetails() { } @Test - public void shouldFindCaseByMaterialIdWhenMaterialIsDocument() { + void shouldFindCaseByMaterialIdWhenMaterialIsDocument() { final CaseDetail actualCase = caseRepository.findByUrn(VALID_URN_2); @@ -260,7 +263,7 @@ public void shouldFindCaseByMaterialIdWhenMaterialIsDocument() { } @Test - public void shouldPersistCurrencyAndOtherSupportingInformation() { + void shouldPersistCurrencyAndOtherSupportingInformation() { final CaseDetail caseDetail = caseRepository.findBy(VALID_CASE_ID_1); assertThat(caseDetail.getDefendant().getNumPreviousConvictions(), is(NUM_PREVIOUS_CONVICTIONS)); @@ -277,44 +280,44 @@ public void shouldPersistCurrencyAndOtherSupportingInformation() { } @Test - public void shouldNotFindNonExistingCase() { + void shouldNotFindNonExistingCase() { final CaseDetail caseDetail = caseRepository.findBy(UUID.randomUUID()); assertThat(caseDetail, nullValue()); } @Test - public void shouldFindCaseMatchingUrnWithPrefixAndPostcode() { + void shouldFindCaseMatchingUrnWithPrefixAndPostcode() { final CaseDetail actualCase = caseRepository.findByUrnPostcode(VALID_URN_1, POSTCODE_1); assertNotNull(actualCase); - assertEquals("ID should match ID of case 1", VALID_CASE_ID_1, actualCase.getId()); - assertEquals("URN should match URN of case 1", VALID_URN_1, actualCase.getUrn()); + assertEquals(VALID_CASE_ID_1, actualCase.getId(), "ID should match ID of case 1"); + assertEquals(VALID_URN_1, actualCase.getUrn(), "URN should match URN of case 1"); } @Test - public void shouldFindCaseMatchingUrnWithPrefixAndPostcodeWithExtraSpaces() { + void shouldFindCaseMatchingUrnWithPrefixAndPostcodeWithExtraSpaces() { final CaseDetail actualCase = caseRepository.findByUrnPostcode(VALID_URN_1, String.format(" %s ", POSTCODE_1)); assertNotNull(actualCase); - assertEquals("ID should match ID of case 1", VALID_CASE_ID_1, actualCase.getId()); - assertEquals("URN should match URN of case 1", VALID_URN_1, actualCase.getUrn()); + assertEquals(VALID_CASE_ID_1, actualCase.getId(), "ID should match ID of case 1"); + assertEquals(VALID_URN_1, actualCase.getUrn(), "URN should match URN of case 1"); } @Test - public void shouldFindCaseMatchingUrnWithoutPrefixAndPostcode() { + void shouldFindCaseMatchingUrnWithoutPrefixAndPostcode() { final CaseDetail actualCase = caseRepository.findByUrnPostcode(VALID_URN_1.replace(PROSECUTING_AUTHORITY, ""), POSTCODE_1); assertNotNull(actualCase); - assertEquals("ID should match ID of case 1", VALID_CASE_ID_1, actualCase.getId()); - assertEquals("URN should match URN of case 1", VALID_URN_1, actualCase.getUrn()); + assertEquals(VALID_CASE_ID_1, actualCase.getId(), "ID should match ID of case 1"); + assertEquals(VALID_URN_1, actualCase.getUrn(), "URN should match URN of case 1"); } @Test - public void shouldFindCaseWhenUrnWithoutPrefixSameButPostcodeDifferent() { + void shouldFindCaseWhenUrnWithoutPrefixSameButPostcodeDifferent() { //given final String urn1 = "TFL12345678A"; @@ -338,8 +341,8 @@ public void shouldFindCaseWhenUrnWithoutPrefixSameButPostcodeDifferent() { assertEquals(urn1, actualCase.getUrn()); } - @Test(expected = NonUniqueResultException.class) - public void shouldThrowExceptionWhenTwoCasesHaveSameUrnWithoutPrefixAndPostcode() { + @Test + void shouldThrowExceptionWhenTwoCasesHaveSameUrnWithoutPrefixAndPostcode() { //given final String urn1 = "TFL12345678A"; @@ -356,14 +359,12 @@ public void shouldThrowExceptionWhenTwoCasesHaveSameUrnWithoutPrefixAndPostcode( CASES.put(caseDetail1.getId(), caseDetail1); CASES.put(caseDetail2.getId(), caseDetail2); - //when - final CaseDetail actualCase = caseRepository.findByUrnPostcode("12345678A", postcode1); - - //then throws exception + //when / then throws exception + assertThrows(NonUniqueResultException.class, () -> caseRepository.findByUrnPostcode("12345678A", postcode1)); } @Test - public void shouldFindCasesForSOCCheck() { + void shouldFindCasesForSOCCheck() { final String loggedInUserId = "2781b565-4514-4805-8744-a3e827f0f611"; final String ljaCode = "2577"; final String courtHouseCode = "B01LY00"; @@ -376,7 +377,7 @@ public void shouldFindCasesForSOCCheck() { } @Test - public void shouldFindCasesWithoutDefendantPostCode() { + void shouldFindCasesWithoutDefendantPostCode() { //given final CaseDetail caseDetail1 = getCase(randomUUID(), VALID_URN_1, POSTCODE_1); final CaseDetail caseDetail2 = getCase(randomUUID(), VALID_URN_2, POSTCODE_2); @@ -395,7 +396,7 @@ public void shouldFindCasesWithoutDefendantPostCode() { } @Test - public void shouldFindCasesWithoutDefendantPostCodeWhenDefendantIsCompany() { + void shouldFindCasesWithoutDefendantPostCodeWhenDefendantIsCompany() { //given final CaseDetail caseDetail1 = getCase(randomUUID(), VALID_URN_1, POSTCODE_1); final CaseDetail caseDetail2 = getCase(randomUUID(), VALID_URN_2, POSTCODE_2); diff --git a/sjp-viewstore/sjp-viewstore-persistence/src/test/java/uk/gov/moj/cpp/sjp/persistence/repository/CaseSearchResultRepositoryTest.java b/sjp-viewstore/sjp-viewstore-persistence/src/test/java/uk/gov/moj/cpp/sjp/persistence/repository/CaseSearchResultRepositoryTest.java index 32df84d216..adcab3a537 100644 --- a/sjp-viewstore/sjp-viewstore-persistence/src/test/java/uk/gov/moj/cpp/sjp/persistence/repository/CaseSearchResultRepositoryTest.java +++ b/sjp-viewstore/sjp-viewstore-persistence/src/test/java/uk/gov/moj/cpp/sjp/persistence/repository/CaseSearchResultRepositoryTest.java @@ -2,13 +2,13 @@ import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.CoreMatchers.notNullValue; +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.hasSize; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertThat; +import static org.junit.jupiter.api.Assertions.assertEquals; import uk.gov.justice.services.common.converter.LocalDates; -import uk.gov.justice.services.test.utils.persistence.BaseTransactionalJunit4Test; +import uk.gov.justice.services.test.utils.persistence.HibernateTestEntityManagerProvider; import uk.gov.moj.cpp.sjp.persistence.entity.CaseSearchResult; import uk.gov.moj.cpp.sjp.persistence.entity.CaseSummary; @@ -22,14 +22,11 @@ import java.util.UUID; import java.util.concurrent.atomic.AtomicLong; -import javax.inject.Inject; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.RegisterExtension; -import org.apache.deltaspike.testcontrol.api.junit.CdiTestRunner; -import org.junit.Test; -import org.junit.runner.RunWith; - -@RunWith(CdiTestRunner.class) -public class CaseSearchResultRepositoryTest extends BaseTransactionalJunit4Test { +class CaseSearchResultRepositoryTest { private static final boolean IS_CURRENT = false; private static final boolean IS_OLD = true; @@ -42,13 +39,26 @@ public class CaseSearchResultRepositoryTest extends BaseTransactionalJunit4Test private static final String PROSECUTING_AUTHORITY_2 = "PROC2"; private static final String PROSECUTING_AUTHORITY_WILDCARD = "%"; private static final String LEGAL_ENTITY_NAME = "legalEntityName"; - @Inject + + private static final String PERSISTENCE_UNIT = "sjp-test-persistence-unit"; + + @RegisterExtension + static HibernateTestEntityManagerProvider provider = new HibernateTestEntityManagerProvider(PERSISTENCE_UNIT); + private CaseSearchResultRepository caseSearchResultRepository; - @Inject private CaseSummaryRepository caseSummaryRepository; + @BeforeEach + void createRepositoriesWithInjectedEntityManager() { + caseSearchResultRepository = new CaseSearchResultRepository(); + provider.injectEntityManagerInto(caseSearchResultRepository); + + caseSummaryRepository = new CaseSummaryRepository(); + provider.injectEntityManagerInto(caseSummaryRepository); + } + @Test - public void shouldFindByLastName() { + void shouldFindByLastName() { createCaseSearchResult(false); @@ -60,7 +70,7 @@ public void shouldFindByLastName() { } @Test - public void shouldFindByLastNameForAgent() { + void shouldFindByLastNameForAgent() { createCaseSearchResult(PROSECUTING_AUTHORITY_2); @@ -71,7 +81,7 @@ public void shouldFindByLastNameForAgent() { } @Test - public void shouldNotFindByLastNameForOtherProsecutingAuthority() { + void shouldNotFindByLastNameForOtherProsecutingAuthority() { createCaseSearchResult(PROSECUTING_AUTHORITY_2); @@ -81,7 +91,7 @@ public void shouldNotFindByLastNameForOtherProsecutingAuthority() { } @Test - public void shouldFindByLastNameWithOrdering() { + void shouldFindByLastNameWithOrdering() { final CaseSearchResult caseSearchResultA = createCaseSearchResultWithFirstname("firstNameA", PROSECUTING_AUTHORITY_1); final CaseSearchResult caseSearchResultB = createCaseSearchResultWithFirstname("firstNameB", PROSECUTING_AUTHORITY_1); @@ -97,7 +107,7 @@ public void shouldFindByLastNameWithOrdering() { } @Test - public void shouldFindByLastNameEvenThoughItWasChanged() { + void shouldFindByLastNameEvenThoughItWasChanged() { // given final CaseSearchResult caseSearchResult = createCaseSearchResult(false); // when @@ -154,7 +164,7 @@ private void ensure(final CaseSearchResult caseSearchResult, final String lastNa } @Test - public void shouldFindByUrn() { + void shouldFindByUrn() { final CaseSearchResult caseSearchResult = createCaseSearchResult(false); @@ -166,7 +176,7 @@ public void shouldFindByUrn() { } @Test - public void shouldFindByUrnForAgent() { + void shouldFindByUrnForAgent() { createCaseSearchResult(PROSECUTING_AUTHORITY_2); @@ -178,7 +188,7 @@ public void shouldFindByUrnForAgent() { } @Test - public void shouldNotFindByUrnForOtherProsecutingAuthority() { + void shouldNotFindByUrnForOtherProsecutingAuthority() { createCaseSearchResult(PROSECUTING_AUTHORITY_2); @@ -189,7 +199,7 @@ public void shouldNotFindByUrnForOtherProsecutingAuthority() { } @Test - public void shouldFindByUrnOnlyLatest() { + void shouldFindByUrnOnlyLatest() { // given final CaseSearchResult caseSearchResult = createCaseSearchResult(false); simulateDefendantLastNameChanged(LAST_NAME_UPDATED, caseSearchResult.getCaseId()); @@ -207,7 +217,7 @@ public void shouldFindByUrnOnlyLatest() { } @Test - public void shouldFindByCaseId() { + void shouldFindByCaseId() { final CaseSearchResult caseSearchResult = createCaseSearchResult(false); final UUID caseId = caseSearchResult.getCaseId(); @@ -222,7 +232,7 @@ public void shouldFindByCaseId() { } @Test - public void shouldCreateWithoutCaseSummary() { + void shouldCreateWithoutCaseSummary() { final CaseSearchResult caseSearchResult = new CaseSearchResult(UUID.randomUUID(), UUID.randomUUID(), "firstName", "lastName", LocalDates.from("2001-02-03"), null, null); caseSearchResultRepository.save(caseSearchResult); @@ -310,7 +320,7 @@ private CaseSearchResult createCaseSearchResultWithLegalEntity( } @Test - public void shouldFindByLegalEntityName() { + void shouldFindByLegalEntityName() { createCaseSearchResult(true); // check it is case insensitive final List results = caseSearchResultRepository.findByLegalEntityName(PROSECUTING_AUTHORITY_WILDCARD, LEGAL_ENTITY_NAME.toLowerCase(), new ArrayList<>()); @@ -320,7 +330,7 @@ public void shouldFindByLegalEntityName() { } @Test - public void shouldFindByLegalEntityNameForAgent() { + void shouldFindByLegalEntityNameForAgent() { createCaseSearchResult(true); // check it is case insensitive final List results = caseSearchResultRepository.findByLegalEntityName(PROSECUTING_AUTHORITY_2, LEGAL_ENTITY_NAME.toLowerCase(), Arrays.asList(PROSECUTING_AUTHORITY_1)); @@ -328,4 +338,4 @@ public void shouldFindByLegalEntityNameForAgent() { assertEquals(LEGAL_ENTITY_NAME, results.get(0).getLegalEntityName()); assertEquals(URN, results.get(0).getCaseSummary().getUrn()); } -} \ No newline at end of file +} diff --git a/sjp-viewstore/sjp-viewstore-persistence/src/test/java/uk/gov/moj/cpp/sjp/persistence/repository/DefendantDetailUpdateRequestRepositoryTest.java b/sjp-viewstore/sjp-viewstore-persistence/src/test/java/uk/gov/moj/cpp/sjp/persistence/repository/DefendantDetailUpdateRequestRepositoryTest.java index f0618738d3..bef39d8ee5 100644 --- a/sjp-viewstore/sjp-viewstore-persistence/src/test/java/uk/gov/moj/cpp/sjp/persistence/repository/DefendantDetailUpdateRequestRepositoryTest.java +++ b/sjp-viewstore/sjp-viewstore-persistence/src/test/java/uk/gov/moj/cpp/sjp/persistence/repository/DefendantDetailUpdateRequestRepositoryTest.java @@ -3,28 +3,33 @@ import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.equalTo; -import uk.gov.justice.services.test.utils.persistence.BaseTransactionalTest; +import uk.gov.justice.services.test.utils.persistence.HibernateTestEntityManagerProvider; import uk.gov.moj.cpp.sjp.persistence.entity.DefendantDetailUpdateRequest; import java.time.ZonedDateTime; -import java.util.Optional; import java.util.UUID; -import javax.inject.Inject; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.RegisterExtension; -import junit.framework.TestCase; -import org.apache.deltaspike.testcontrol.api.junit.CdiTestRunner; -import org.junit.Test; -import org.junit.runner.RunWith; +class DefendantDetailUpdateRequestRepositoryTest { -@RunWith(CdiTestRunner.class) -public class DefendantDetailUpdateRequestRepositoryTest extends BaseTransactionalTest { + private static final String PERSISTENCE_UNIT = "sjp-test-persistence-unit"; + + @RegisterExtension + static HibernateTestEntityManagerProvider provider = new HibernateTestEntityManagerProvider(PERSISTENCE_UNIT); - @Inject private DefendantDetailUpdateRequestRepository defendantRepository; + @BeforeEach + void createRepositoryWithInjectedEntityManager() { + defendantRepository = new DefendantDetailUpdateRequestRepository(); + provider.injectEntityManagerInto(defendantRepository); + } + @Test - public void shouldFindByCaseId() { + void shouldFindByCaseId() { final UUID caseId = UUID.randomUUID(); DefendantDetailUpdateRequest defendantDetailUpdateRequest = createDefendantDetailUpdateRequest(caseId, UUID.randomUUID(), "firstName", "lastName", "middleName"); defendantRepository.save(defendantDetailUpdateRequest); @@ -45,4 +50,4 @@ private static DefendantDetailUpdateRequest createDefendantDetailUpdateRequest(f return defendantDetailUpdateRequest; } -} \ No newline at end of file +} diff --git a/sjp-viewstore/sjp-viewstore-persistence/src/test/java/uk/gov/moj/cpp/sjp/persistence/repository/DefendantRepositoryTest.java b/sjp-viewstore/sjp-viewstore-persistence/src/test/java/uk/gov/moj/cpp/sjp/persistence/repository/DefendantRepositoryTest.java index 3298af8102..7b892fefde 100644 --- a/sjp-viewstore/sjp-viewstore-persistence/src/test/java/uk/gov/moj/cpp/sjp/persistence/repository/DefendantRepositoryTest.java +++ b/sjp-viewstore/sjp-viewstore-persistence/src/test/java/uk/gov/moj/cpp/sjp/persistence/repository/DefendantRepositoryTest.java @@ -1,10 +1,14 @@ package uk.gov.moj.cpp.sjp.persistence.repository; -import org.apache.deltaspike.testcontrol.api.junit.CdiTestRunner; -import org.junit.Test; -import org.junit.runner.RunWith; +import static java.time.ZoneOffset.UTC; +import static java.time.ZonedDateTime.now; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.contains; +import static org.hamcrest.Matchers.equalTo; +import static org.hamcrest.Matchers.is; +import static org.hamcrest.Matchers.iterableWithSize; -import uk.gov.justice.services.test.utils.persistence.BaseTransactionalJunit4Test; +import uk.gov.justice.services.test.utils.persistence.HibernateTestEntityManagerProvider; import uk.gov.moj.cpp.sjp.domain.CaseReadinessReason; import uk.gov.moj.cpp.sjp.domain.SessionType; import uk.gov.moj.cpp.sjp.persistence.builder.CaseDetailBuilder; @@ -15,36 +19,43 @@ import uk.gov.moj.cpp.sjp.persistence.entity.ReadyCase; import uk.gov.moj.cpp.sjp.persistence.entity.view.UpdatedDefendantDetails; -import javax.inject.Inject; - import java.time.LocalDate; import java.time.ZonedDateTime; import java.util.Collections; import java.util.List; import java.util.UUID; -import static java.time.ZoneOffset.UTC; -import static java.time.ZonedDateTime.now; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.hamcrest.Matchers.contains; -import static org.hamcrest.Matchers.equalTo; -import static org.hamcrest.Matchers.is; -import static org.hamcrest.Matchers.iterableWithSize; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.RegisterExtension; + +class DefendantRepositoryTest { -@RunWith(CdiTestRunner.class) -public class DefendantRepositoryTest extends BaseTransactionalJunit4Test { + private static final String PERSISTENCE_UNIT = "sjp-test-persistence-unit"; + + @RegisterExtension + static HibernateTestEntityManagerProvider provider = new HibernateTestEntityManagerProvider(PERSISTENCE_UNIT); - @Inject private CaseRepository caseRepository; - @Inject private DefendantRepository defendantRepository; - @Inject private ReadyCaseRepository readyCaseRepository; + @BeforeEach + void createRepositoriesWithInjectedEntityManager() { + caseRepository = new CaseRepository(); + provider.injectEntityManagerInto(caseRepository); + + defendantRepository = new DefendantRepository(); + provider.injectEntityManagerInto(defendantRepository); + + readyCaseRepository = new ReadyCaseRepository(); + provider.injectEntityManagerInto(readyCaseRepository); + } + @Test - public void shouldFindDefendantWithDoBUpdatedAndUpdatesNotAcknowledgedYet() { + void shouldFindDefendantWithDoBUpdatedAndUpdatesNotAcknowledgedYet() { final PersonalDetails personalDetails = new PersonalDetails(); personalDetails.markDateOfBirthUpdated(now(UTC)); @@ -57,7 +68,7 @@ public void shouldFindDefendantWithDoBUpdatedAndUpdatesNotAcknowledgedYet() { } @Test - public void shouldFindDefendantWithDoBUpdatedAndUpdatesAcknowledgedBefore() { + void shouldFindDefendantWithDoBUpdatedAndUpdatesAcknowledgedBefore() { final PersonalDetails personalDetails = new PersonalDetails(); personalDetails.markDateOfBirthUpdated(now(UTC)); @@ -70,7 +81,7 @@ public void shouldFindDefendantWithDoBUpdatedAndUpdatesAcknowledgedBefore() { } @Test - public void shouldIgnoreDefendantWithDoBUpdateWhenAcknowledged() { + void shouldIgnoreDefendantWithDoBUpdateWhenAcknowledged() { final PersonalDetails personalDetails = new PersonalDetails(); personalDetails.markDateOfBirthUpdated(now(UTC).minusDays(2)); @@ -82,7 +93,7 @@ public void shouldIgnoreDefendantWithDoBUpdateWhenAcknowledged() { } @Test - public void shouldFindDefendantWithAddressUpdatedAndUpdatesNotAcknowledgedYet() { + void shouldFindDefendantWithAddressUpdatedAndUpdatesNotAcknowledgedYet() { final PersonalDetails personalDetails = new PersonalDetails(); final UpdatedDefendantDetails defendant = createCaseDetail(personalDetails, "TVL", null,now(UTC),null); @@ -94,7 +105,7 @@ public void shouldFindDefendantWithAddressUpdatedAndUpdatesNotAcknowledgedYet() } @Test - public void shouldIgnoreDefendantWhenUpdateHappenedMoreThan10DaysAgo() { + void shouldIgnoreDefendantWhenUpdateHappenedMoreThan10DaysAgo() { final PersonalDetails personalDetails = new PersonalDetails(); createCaseDetail(personalDetails, "TVL", null, now(UTC).minusDays(15), null); @@ -105,7 +116,7 @@ public void shouldIgnoreDefendantWhenUpdateHappenedMoreThan10DaysAgo() { } @Test - public void shouldFindDefendantWithAddressUpdatedAndUpdatesAcknowledgedBefore() { + void shouldFindDefendantWithAddressUpdatedAndUpdatesAcknowledgedBefore() { final PersonalDetails personalDetails = new PersonalDetails(); final UpdatedDefendantDetails defendant = createCaseDetail(personalDetails, "TVL", now(UTC).minusDays(2), now(UTC), null); @@ -117,7 +128,7 @@ public void shouldFindDefendantWithAddressUpdatedAndUpdatesAcknowledgedBefore() } @Test - public void shouldIgnoreDefendantWithAddressUpdateWhenAcknowledged() { + void shouldIgnoreDefendantWithAddressUpdateWhenAcknowledged() { final PersonalDetails personalDetails = new PersonalDetails(); createCaseDetail(personalDetails, "TVL", now(UTC), now(UTC).minusDays(2), null); @@ -128,7 +139,7 @@ public void shouldIgnoreDefendantWithAddressUpdateWhenAcknowledged() { } @Test - public void shouldFindDefendantWithNameUpdatedAndUpdatesNotAcknowledgedYet() { + void shouldFindDefendantWithNameUpdatedAndUpdatesNotAcknowledgedYet() { final PersonalDetails personalDetails = new PersonalDetails(); final UpdatedDefendantDetails defendant = createCaseDetail(personalDetails, "TVL", null, null, now(UTC)); @@ -140,7 +151,7 @@ public void shouldFindDefendantWithNameUpdatedAndUpdatesNotAcknowledgedYet() { } @Test - public void shouldFindDefendantWithNameUpdatedAndUpdatesAcknowledgedBefore() { + void shouldFindDefendantWithNameUpdatedAndUpdatesAcknowledgedBefore() { final PersonalDetails personalDetails = new PersonalDetails(); final UpdatedDefendantDetails defendant = createCaseDetail(personalDetails, "TVL", now(UTC).minusDays(2), null, now(UTC)); @@ -152,7 +163,7 @@ public void shouldFindDefendantWithNameUpdatedAndUpdatesAcknowledgedBefore() { } @Test - public void shouldIgnoreDefendantWithNameUpdateWhenAcknowledged() { + void shouldIgnoreDefendantWithNameUpdateWhenAcknowledged() { final PersonalDetails personalDetails = new PersonalDetails(); createCaseDetail(personalDetails, "TVL", now(UTC), null, now(UTC).minusDays(2)); @@ -163,7 +174,7 @@ public void shouldIgnoreDefendantWithNameUpdateWhenAcknowledged() { } @Test - public void shouldIgnoreDefendantWithNoDetailChanges() { + void shouldIgnoreDefendantWithNoDetailChanges() { createCaseDetail(new PersonalDetails(), "TVL", null, null, null); final List defendantDetails = defendantRepository.findUpdatedByCaseProsecutingAuthority("TVL", now().minusDays(10), now(), Collections.emptyList()); @@ -172,7 +183,7 @@ public void shouldIgnoreDefendantWithNoDetailChanges() { } @Test - public void shouldIgnoreDefendantForOtherAuthorityGroup() { + void shouldIgnoreDefendantForOtherAuthorityGroup() { createCaseDetail(null, "TVL", null, null, null); final List defendantDetails = defendantRepository.findUpdatedByCaseProsecutingAuthority("TFL", now().minusDays(10), now(), Collections.emptyList()); @@ -181,7 +192,7 @@ public void shouldIgnoreDefendantForOtherAuthorityGroup() { } @Test - public void shouldfindCaseIdByDefendantId() { + void shouldfindCaseIdByDefendantId() { final UpdatedDefendantDetails caseDetail = createCaseDetail(new PersonalDetails(), "TVL", null, null, null); final UUID actualCaseId = defendantRepository.findCaseIdByDefendantId(caseDetail.getDefendantId()); @@ -191,7 +202,7 @@ public void shouldfindCaseIdByDefendantId() { @Test - public void shouldFindDefendantsByReadyCases() { + void shouldFindDefendantsByReadyCases() { final UpdatedDefendantDetails caseDetail = createCaseDetail(new PersonalDetails(), "TVL", null, null, null); final List byReadyCases = defendantRepository.findByReadyCases(); diff --git a/sjp-viewstore/sjp-viewstore-persistence/src/test/java/uk/gov/moj/cpp/sjp/persistence/repository/OffenceRepositoryTest.java b/sjp-viewstore/sjp-viewstore-persistence/src/test/java/uk/gov/moj/cpp/sjp/persistence/repository/OffenceRepositoryTest.java index 544a10d6ab..b02af2355f 100644 --- a/sjp-viewstore/sjp-viewstore-persistence/src/test/java/uk/gov/moj/cpp/sjp/persistence/repository/OffenceRepositoryTest.java +++ b/sjp-viewstore/sjp-viewstore-persistence/src/test/java/uk/gov/moj/cpp/sjp/persistence/repository/OffenceRepositoryTest.java @@ -2,14 +2,14 @@ import static java.util.Arrays.asList; import static java.util.stream.Collectors.toList; +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.allOf; import static org.hamcrest.Matchers.contains; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.hasProperty; import static org.hamcrest.Matchers.hasSize; -import static org.junit.Assert.assertThat; -import uk.gov.justice.services.test.utils.persistence.BaseTransactionalJunit4Test; +import uk.gov.justice.services.test.utils.persistence.HibernateTestEntityManagerProvider; import uk.gov.moj.cpp.sjp.persistence.entity.Address; import uk.gov.moj.cpp.sjp.persistence.entity.CaseDetail; import uk.gov.moj.cpp.sjp.persistence.entity.ContactDetails; @@ -22,29 +22,38 @@ import java.util.List; import java.util.UUID; -import javax.inject.Inject; - import org.apache.commons.lang3.StringUtils; -import org.apache.deltaspike.testcontrol.api.junit.CdiTestRunner; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.RegisterExtension; /** * DB integration tests for {@link OffenceRepository} class */ -@RunWith(CdiTestRunner.class) -public class OffenceRepositoryTest extends BaseTransactionalJunit4Test { +class OffenceRepositoryTest { private static final int NUM_PREVIOUS_CONVICTIONS = 1; - @Inject + private static final String PERSISTENCE_UNIT = "sjp-test-persistence-unit"; + + @RegisterExtension + static HibernateTestEntityManagerProvider provider = new HibernateTestEntityManagerProvider(PERSISTENCE_UNIT); + private OffenceRepository offenceRepository; - @Inject private CaseRepository caseRepository; + @BeforeEach + void createRepositoriesWithInjectedEntityManager() { + offenceRepository = new OffenceRepository(); + provider.injectEntityManagerInto(offenceRepository); + + caseRepository = new CaseRepository(); + provider.injectEntityManagerInto(caseRepository); + } + @Test - public void shouldFindOffencesByIds() { + void shouldFindOffencesByIds() { final UUID offenceId1 = UUID.randomUUID(); final UUID offenceId2 = UUID.randomUUID(); final UUID offenceId3 = UUID.randomUUID(); diff --git a/sjp-viewstore/sjp-viewstore-persistence/src/test/java/uk/gov/moj/cpp/sjp/persistence/repository/OnlinePleaRepositoryTest.java b/sjp-viewstore/sjp-viewstore-persistence/src/test/java/uk/gov/moj/cpp/sjp/persistence/repository/OnlinePleaRepositoryTest.java index 35a21ec200..c7fc5586fe 100644 --- a/sjp-viewstore/sjp-viewstore-persistence/src/test/java/uk/gov/moj/cpp/sjp/persistence/repository/OnlinePleaRepositoryTest.java +++ b/sjp-viewstore/sjp-viewstore-persistence/src/test/java/uk/gov/moj/cpp/sjp/persistence/repository/OnlinePleaRepositoryTest.java @@ -6,12 +6,13 @@ import static org.hamcrest.Matchers.closeTo; import static org.hamcrest.Matchers.notNullValue; import static org.hamcrest.Matchers.nullValue; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertTrue; import uk.gov.justice.services.common.util.Clock; -import uk.gov.justice.services.test.utils.persistence.BaseTransactionalJunit4Test; +import uk.gov.justice.services.common.util.UtcClock; +import uk.gov.justice.services.test.utils.persistence.HibernateTestEntityManagerProvider; import uk.gov.moj.cpp.sjp.persistence.entity.Address; import uk.gov.moj.cpp.sjp.persistence.entity.CaseDetail; import uk.gov.moj.cpp.sjp.persistence.entity.LegalEntityFinancialMeans; @@ -24,35 +25,39 @@ import java.util.List; import java.util.UUID; -import javax.inject.Inject; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.RegisterExtension; -import org.apache.deltaspike.testcontrol.api.junit.CdiTestRunner; -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; - - -@RunWith(CdiTestRunner.class) -public class OnlinePleaRepositoryTest extends BaseTransactionalJunit4Test { +class OnlinePleaRepositoryTest { public static final String HOME = "123131231"; public static final String MOBILE = "12313131"; public static final String EMAIL = "test@test.com"; - @Inject + + private static final String PERSISTENCE_UNIT = "sjp-test-persistence-unit"; + + @RegisterExtension + static HibernateTestEntityManagerProvider provider = new HibernateTestEntityManagerProvider(PERSISTENCE_UNIT); + private OnlinePleaRepository.FinancialMeansOnlinePleaRepository onlinePleaRepository; - @Inject private CaseRepository caseRepository; - @Inject - private Clock clock; + private final Clock clock = new UtcClock(); private UUID caseId; private UUID caseId2; - @Before - public void set() { + @BeforeEach + void setUp() { + onlinePleaRepository = new OnlinePleaRepository.FinancialMeansOnlinePleaRepository(); + provider.injectEntityManagerInto(onlinePleaRepository); + + caseRepository = new CaseRepository(); + provider.injectEntityManagerInto(caseRepository); + caseId = UUID.randomUUID(); final CaseDetail caseDetail = getCaseWithDefendant(caseId); caseRepository.save(caseDetail); @@ -69,7 +74,7 @@ public void set() { } @Test - public void shouldFindOnlinePleaGivenCaseIdAndDefendantId() { + void shouldFindOnlinePleaGivenCaseIdAndDefendantId() { final OnlinePlea onlinePlea = onlinePleaRepository.findBy(caseId); final UUID defendantId = onlinePlea.getDefendantId(); @@ -81,7 +86,7 @@ public void shouldFindOnlinePleaGivenCaseIdAndDefendantId() { } @Test - public void shouldDeleteOutgoingDataOnSettingItToNullInOnlinePleaData() { + void shouldDeleteOutgoingDataOnSettingItToNullInOnlinePleaData() { final OnlinePlea onlinePlea = onlinePleaRepository.findBy(caseId); assertThat("Outgoing financial means data should present", onlinePlea.getOutgoings() != null); onlinePlea.setOutgoings(null); @@ -91,7 +96,7 @@ public void shouldDeleteOutgoingDataOnSettingItToNullInOnlinePleaData() { } @Test - public void shouldRetrieveLegalEntityDetails() { + void shouldRetrieveLegalEntityDetails() { final OnlinePlea onlinePlea = onlinePleaRepository.findBy(caseId2); assertNotNull(onlinePlea.getLegalEntityDetails()); assertEquals("companyLegal", onlinePlea.getLegalEntityDetails().getLegalEntityName()); @@ -106,7 +111,7 @@ public void shouldRetrieveLegalEntityDetails() { } @Test - public void shouldFindOnlinePleaWithoutFinances() { + void shouldFindOnlinePleaWithoutFinances() { // WHEN final OnlinePlea actualFullOnlinePlea = onlinePleaRepository.findBy(caseId); final OnlinePlea actualOnlinePleaWithoutFinances = onlinePleaRepository.findOnlinePleaWithoutFinances(caseId); @@ -193,4 +198,4 @@ private OnlinePlea buildOnlinePleaWithLegalEntity(final CaseDetail caseDetail1, return onlinePlea; } -} \ No newline at end of file +} diff --git a/sjp-viewstore/sjp-viewstore-persistence/src/test/java/uk/gov/moj/cpp/sjp/persistence/repository/PendingDatesToAvoidRepositoryTest.java b/sjp-viewstore/sjp-viewstore-persistence/src/test/java/uk/gov/moj/cpp/sjp/persistence/repository/PendingDatesToAvoidRepositoryTest.java index 493a3efab3..cc3d0c10a1 100644 --- a/sjp-viewstore/sjp-viewstore-persistence/src/test/java/uk/gov/moj/cpp/sjp/persistence/repository/PendingDatesToAvoidRepositoryTest.java +++ b/sjp-viewstore/sjp-viewstore-persistence/src/test/java/uk/gov/moj/cpp/sjp/persistence/repository/PendingDatesToAvoidRepositoryTest.java @@ -4,7 +4,7 @@ import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.hasSize; -import uk.gov.justice.services.test.utils.persistence.BaseTransactionalJunit4Test; +import uk.gov.justice.services.test.utils.persistence.HibernateTestEntityManagerProvider; import uk.gov.moj.cpp.sjp.persistence.builder.DatesToAvoidTestData; import uk.gov.moj.cpp.sjp.persistence.entity.CaseDetail; import uk.gov.moj.cpp.sjp.persistence.entity.PendingDatesToAvoid; @@ -15,27 +15,31 @@ import java.util.List; import java.util.UUID; -import javax.inject.Inject; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.RegisterExtension; -import org.apache.deltaspike.testcontrol.api.junit.CdiTestRunner; -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; +class PendingDatesToAvoidRepositoryTest { + private static final String PERSISTENCE_UNIT = "sjp-test-persistence-unit"; -@RunWith(CdiTestRunner.class) -public class PendingDatesToAvoidRepositoryTest extends BaseTransactionalJunit4Test { + @RegisterExtension + static HibernateTestEntityManagerProvider provider = new HibernateTestEntityManagerProvider(PERSISTENCE_UNIT); - @Inject private PendingDatesToAvoidRepository pendingDatesToAvoidRepository; - @Inject private CaseRepository caseRepository; private List testData; - @Before - public void set() { + @BeforeEach + void setUp() { + pendingDatesToAvoidRepository = new PendingDatesToAvoidRepository(); + provider.injectEntityManagerInto(pendingDatesToAvoidRepository); + + caseRepository = new CaseRepository(); + provider.injectEntityManagerInto(caseRepository); + testData = Arrays.asList( //TFL combinations new DatesToAvoidTestData("TFL", null, false, false, @@ -82,7 +86,7 @@ private void setupAndSaveDatesToAvoidData(DatesToAvoidTestData testData) { } @Test - public void shouldFindCasesPendingDatesToAvoidForTfl() { + void shouldFindCasesPendingDatesToAvoidForTfl() { // WHEN List results = pendingDatesToAvoidRepository.findCasesPendingDatesToAvoid("TFL", Collections.emptyList()); @@ -94,7 +98,7 @@ public void shouldFindCasesPendingDatesToAvoidForTfl() { } @Test - public void shouldFindCasesPendingDatesToAvoidForTflAndTvl() { + void shouldFindCasesPendingDatesToAvoidForTflAndTvl() { // WHEN List results = pendingDatesToAvoidRepository.findCasesPendingDatesToAvoid("TFL", Arrays.asList("TVL", "XYZ")); @@ -109,7 +113,7 @@ public void shouldFindCasesPendingDatesToAvoidForTflAndTvl() { } @Test - public void shouldFindCasesPendingDatesToAvoidForTvl() { + void shouldFindCasesPendingDatesToAvoidForTvl() { // WHEN List results = pendingDatesToAvoidRepository.findCasesPendingDatesToAvoid("TVL", Collections.emptyList()); @@ -121,7 +125,7 @@ public void shouldFindCasesPendingDatesToAvoidForTvl() { } @Test - public void shouldRemovePendingDatesToAvoid() { + void shouldRemovePendingDatesToAvoid() { List results = pendingDatesToAvoidRepository.findCasesPendingDatesToAvoid("TFL", Collections.emptyList()); assertThat(results, hasSize(3)); @@ -132,4 +136,4 @@ public void shouldRemovePendingDatesToAvoid() { assertThat(results.get(0).getCaseId(), equalTo(testData.get(4).getCaseId())); assertThat(results.get(1).getCaseId(), equalTo(testData.get(5).getCaseId())); } -} \ No newline at end of file +} diff --git a/sjp-viewstore/sjp-viewstore-persistence/src/test/java/uk/gov/moj/cpp/sjp/persistence/repository/PressTransparencyReportMetadataRepositoryTest.java b/sjp-viewstore/sjp-viewstore-persistence/src/test/java/uk/gov/moj/cpp/sjp/persistence/repository/PressTransparencyReportMetadataRepositoryTest.java index 721057847a..2be08bb245 100644 --- a/sjp-viewstore/sjp-viewstore-persistence/src/test/java/uk/gov/moj/cpp/sjp/persistence/repository/PressTransparencyReportMetadataRepositoryTest.java +++ b/sjp-viewstore/sjp-viewstore-persistence/src/test/java/uk/gov/moj/cpp/sjp/persistence/repository/PressTransparencyReportMetadataRepositoryTest.java @@ -1,34 +1,41 @@ package uk.gov.moj.cpp.sjp.persistence.repository; +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.is; -import static org.junit.Assert.assertThat; import static uk.gov.moj.cpp.sjp.domain.DocumentFormat.PDF; import static uk.gov.moj.cpp.sjp.domain.DocumentRequestType.DELTA; -import uk.gov.justice.services.test.utils.persistence.BaseTransactionalJunit4Test; +import uk.gov.justice.services.test.utils.persistence.HibernateTestEntityManagerProvider; import uk.gov.moj.cpp.sjp.persistence.entity.PressTransparencyReportMetadata; import java.time.LocalDateTime; import java.util.UUID; -import javax.inject.Inject; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.RegisterExtension; -import org.apache.deltaspike.testcontrol.api.junit.CdiTestRunner; -import org.junit.Test; -import org.junit.runner.RunWith; +class PressTransparencyReportMetadataRepositoryTest { -@RunWith(CdiTestRunner.class) -public class PressTransparencyReportMetadataRepositoryTest extends BaseTransactionalJunit4Test { + private static final String PERSISTENCE_UNIT = "sjp-test-persistence-unit"; + + @RegisterExtension + static HibernateTestEntityManagerProvider provider = new HibernateTestEntityManagerProvider(PERSISTENCE_UNIT); - @Inject private PressTransparencyReportMetadataRepository pressTransparencyReportMetadataRepository; private static final LocalDateTime earlierGeneratedAt = LocalDateTime.of(2018, 11, 26, 0, 0, 0); private static final LocalDateTime latestGeneratedAt = LocalDateTime.of(2018, 11, 27, 0, 0, 0); private static final LocalDateTime from = LocalDateTime.of(2018, 11, 25, 0, 0, 0); + @BeforeEach + void setUp() { + pressTransparencyReportMetadataRepository = new PressTransparencyReportMetadataRepository(); + provider.injectEntityManagerInto(pressTransparencyReportMetadataRepository); + } + @Test - public void shouldReturnTheLatestPressReportMetadata() { + void shouldReturnTheLatestPressReportMetadata() { // given final UUID earlierReportId = UUID.randomUUID(); final UUID earlierReportServiceId = UUID.randomUUID(); @@ -72,4 +79,3 @@ private PressTransparencyReportMetadata populatePressTransparencyMetadata(final } } - diff --git a/sjp-viewstore/sjp-viewstore-persistence/src/test/java/uk/gov/moj/cpp/sjp/persistence/repository/ReadyCaseRepositoryTest.java b/sjp-viewstore/sjp-viewstore-persistence/src/test/java/uk/gov/moj/cpp/sjp/persistence/repository/ReadyCaseRepositoryTest.java index 75c069ced7..025ee506cb 100644 --- a/sjp-viewstore/sjp-viewstore-persistence/src/test/java/uk/gov/moj/cpp/sjp/persistence/repository/ReadyCaseRepositoryTest.java +++ b/sjp-viewstore/sjp-viewstore-persistence/src/test/java/uk/gov/moj/cpp/sjp/persistence/repository/ReadyCaseRepositoryTest.java @@ -11,25 +11,32 @@ import static uk.gov.moj.cpp.sjp.domain.SessionType.DELEGATED_POWERS; import static uk.gov.moj.cpp.sjp.domain.SessionType.MAGISTRATE; -import uk.gov.justice.services.test.utils.persistence.BaseTransactionalJunit4Test; +import uk.gov.justice.services.test.utils.persistence.HibernateTestEntityManagerProvider; import uk.gov.moj.cpp.sjp.persistence.entity.ReadyCase; import java.util.UUID; -import javax.inject.Inject; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.RegisterExtension; -import org.apache.deltaspike.testcontrol.api.junit.CdiTestRunner; -import org.junit.Test; -import org.junit.runner.RunWith; +class ReadyCaseRepositoryTest { -@RunWith(CdiTestRunner.class) -public class ReadyCaseRepositoryTest extends BaseTransactionalJunit4Test { + private static final String PERSISTENCE_UNIT = "sjp-test-persistence-unit"; + + @RegisterExtension + static HibernateTestEntityManagerProvider provider = new HibernateTestEntityManagerProvider(PERSISTENCE_UNIT); - @Inject private ReadyCaseRepository readyCaseRepository; + @BeforeEach + void setUp() { + readyCaseRepository = new ReadyCaseRepository(); + provider.injectEntityManagerInto(readyCaseRepository); + } + @Test - public void shouldGetReadyCasesByAssigneeId() { + void shouldGetReadyCasesByAssigneeId() { final UUID assigneeId1 = UUID.randomUUID(); final UUID assigneeId2 = UUID.randomUUID(); final UUID assigneeId3 = UUID.randomUUID(); @@ -50,7 +57,7 @@ public void shouldGetReadyCasesByAssigneeId() { } @Test - public void shouldSaveAndLoadAllFields() { + void shouldSaveAndLoadAllFields() { final UUID assigneeId = UUID.randomUUID(); final UUID caseId = UUID.randomUUID(); diff --git a/sjp-viewstore/sjp-viewstore-persistence/src/test/java/uk/gov/moj/cpp/sjp/persistence/repository/ReserveCaseRepositoryTest.java b/sjp-viewstore/sjp-viewstore-persistence/src/test/java/uk/gov/moj/cpp/sjp/persistence/repository/ReserveCaseRepositoryTest.java index 2f62d8dfb1..67f551435c 100644 --- a/sjp-viewstore/sjp-viewstore-persistence/src/test/java/uk/gov/moj/cpp/sjp/persistence/repository/ReserveCaseRepositoryTest.java +++ b/sjp-viewstore/sjp-viewstore-persistence/src/test/java/uk/gov/moj/cpp/sjp/persistence/repository/ReserveCaseRepositoryTest.java @@ -4,31 +4,42 @@ import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.equalTo; - -import java.util.ArrayList; -import java.util.UUID; -import javax.inject.Inject; -import org.apache.deltaspike.testcontrol.api.junit.CdiTestRunner; -import org.junit.Test; -import org.junit.runner.RunWith; -import uk.gov.justice.services.test.utils.persistence.BaseTransactionalJunit4Test; +import uk.gov.justice.services.test.utils.persistence.HibernateTestEntityManagerProvider; import uk.gov.moj.cpp.sjp.persistence.builder.CaseDetailBuilder; import uk.gov.moj.cpp.sjp.persistence.entity.CaseDetail; import uk.gov.moj.cpp.sjp.persistence.entity.DefendantDetail; import uk.gov.moj.cpp.sjp.persistence.entity.PersonalDetails; import uk.gov.moj.cpp.sjp.persistence.entity.ReserveCase; -@RunWith(CdiTestRunner.class) -public class ReserveCaseRepositoryTest extends BaseTransactionalJunit4Test { +import java.util.ArrayList; +import java.util.UUID; + +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.RegisterExtension; + +class ReserveCaseRepositoryTest { + + private static final String PERSISTENCE_UNIT = "sjp-test-persistence-unit"; + + @RegisterExtension + static HibernateTestEntityManagerProvider provider = new HibernateTestEntityManagerProvider(PERSISTENCE_UNIT); - @Inject private ReserveCaseRepository reserveCaseRepository; - @Inject private CaseRepository caseRepository; + @BeforeEach + void setUp() { + reserveCaseRepository = new ReserveCaseRepository(); + provider.injectEntityManagerInto(reserveCaseRepository); + + caseRepository = new CaseRepository(); + provider.injectEntityManagerInto(caseRepository); + } + @Test - public void shouldSaveUnReservedCaseDetail(){ + void shouldSaveUnReservedCaseDetail() { final UUID caseId = UUID.randomUUID(); final CaseDetailBuilder caseDetailBuilder = getCaseDetail(caseId); @@ -41,7 +52,7 @@ public void shouldSaveUnReservedCaseDetail(){ } @Test - public void shouldSaveAndLoadWithCaseDetail(){ + void shouldSaveAndLoadWithCaseDetail() { final UUID reservedBy = UUID.randomUUID(); final UUID caseId = UUID.randomUUID(); @@ -60,7 +71,7 @@ public void shouldSaveAndLoadWithCaseDetail(){ } @Test - public void shouldDeleteAndLoadWithCaseDetail(){ + void shouldDeleteAndLoadWithCaseDetail() { final UUID reservedBy = UUID.randomUUID(); final UUID caseId = UUID.randomUUID(); @@ -85,8 +96,8 @@ public void shouldDeleteAndLoadWithCaseDetail(){ } - private CaseDetailBuilder getCaseDetail(final UUID caseId){ - final DefendantDetail defendantDetail = new DefendantDetail(UUID.randomUUID(), new PersonalDetails(), null,1,null,null,null); + private CaseDetailBuilder getCaseDetail(final UUID caseId) { + final DefendantDetail defendantDetail = new DefendantDetail(UUID.randomUUID(), new PersonalDetails(), null, 1, null, null, null); return CaseDetailBuilder.aCase().withCaseId(caseId).withDefendantDetail(defendantDetail); } diff --git a/sjp-viewstore/sjp-viewstore-persistence/src/test/java/uk/gov/moj/cpp/sjp/persistence/repository/TransparencyReportMetadataRepositoryTest.java b/sjp-viewstore/sjp-viewstore-persistence/src/test/java/uk/gov/moj/cpp/sjp/persistence/repository/TransparencyReportMetadataRepositoryTest.java index f9d2701d89..d2de600087 100644 --- a/sjp-viewstore/sjp-viewstore-persistence/src/test/java/uk/gov/moj/cpp/sjp/persistence/repository/TransparencyReportMetadataRepositoryTest.java +++ b/sjp-viewstore/sjp-viewstore-persistence/src/test/java/uk/gov/moj/cpp/sjp/persistence/repository/TransparencyReportMetadataRepositoryTest.java @@ -1,36 +1,43 @@ package uk.gov.moj.cpp.sjp.persistence.repository; +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.is; -import static org.junit.Assert.assertThat; import static uk.gov.moj.cpp.sjp.domain.DocumentFormat.PDF; import static uk.gov.moj.cpp.sjp.domain.DocumentLanguage.ENGLISH; import static uk.gov.moj.cpp.sjp.domain.DocumentRequestType.DELTA; import static uk.gov.moj.cpp.sjp.domain.DocumentRequestType.FULL; -import uk.gov.justice.services.test.utils.persistence.BaseTransactionalJunit4Test; +import uk.gov.justice.services.test.utils.persistence.HibernateTestEntityManagerProvider; import uk.gov.moj.cpp.sjp.persistence.entity.TransparencyReportMetadata; import java.time.LocalDateTime; import java.util.UUID; -import javax.inject.Inject; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.RegisterExtension; -import org.apache.deltaspike.testcontrol.api.junit.CdiTestRunner; -import org.junit.Test; -import org.junit.runner.RunWith; +class TransparencyReportMetadataRepositoryTest { -@RunWith(CdiTestRunner.class) -public class TransparencyReportMetadataRepositoryTest extends BaseTransactionalJunit4Test { + private static final String PERSISTENCE_UNIT = "sjp-test-persistence-unit"; + + @RegisterExtension + static HibernateTestEntityManagerProvider provider = new HibernateTestEntityManagerProvider(PERSISTENCE_UNIT); - @Inject private TransparencyReportMetadataRepository transparencyReportMetadataRepository; private static final LocalDateTime earlierGeneratedAt = LocalDateTime.of(2018, 11, 26, 0, 0, 0); private static final LocalDateTime latestGeneratedAt = LocalDateTime.of(2018, 11, 27, 0, 0, 0); private static final LocalDateTime from = LocalDateTime.of(2018, 11, 25, 0, 0, 0); + @BeforeEach + void setUp() { + transparencyReportMetadataRepository = new TransparencyReportMetadataRepository(); + provider.injectEntityManagerInto(transparencyReportMetadataRepository); + } + @Test - public void shouldReturnTheLatestReportMetadata() { + void shouldReturnTheLatestReportMetadata() { // given final UUID earlierReportId = UUID.randomUUID(); final UUID earlierReportWelshServiceId = UUID.randomUUID(); @@ -85,4 +92,3 @@ private TransparencyReportMetadata populateTransparencyMetadata(final UUID repor } - diff --git a/sjp-viewstore/sjp-viewstore-persistence/src/test/resources/META-INF/persistence.xml b/sjp-viewstore/sjp-viewstore-persistence/src/test/resources/META-INF/persistence.xml new file mode 100644 index 0000000000..26d8e9b09b --- /dev/null +++ b/sjp-viewstore/sjp-viewstore-persistence/src/test/resources/META-INF/persistence.xml @@ -0,0 +1,26 @@ + + + + + org.hibernate.jpa.HibernatePersistenceProvider + ../classes + uk.gov.moj.cpp.sjp.persistence.entity.converter.TimestampConverter + false + + + + + + + + + + + From 1798e92b93bd0df5c8c846deb04368d748cf4ae3 Mon Sep 17 00:00:00 2001 From: allanmckenzie Date: Tue, 15 Sep 2026 16:49:39 +0100 Subject: [PATCH 2/2] Use UtcClock in the viewstore persistence tests and name things properly The CI failure in DefendantRepositoryTest was a timestamp precision problem: the tests built entities from ZonedDateTime.now(), whose resolution on a Linux agent is nanoseconds, while the timestamp columns hold microseconds. The persisted value therefore lost precision the in-memory expected object kept, and equals() failed. It passed on macOS only because the clock there is coarser. UtcClock.now() is UTC and truncated to milliseconds, so the round trip is lossless on every platform. - UtcClock replaces ZonedDateTime.now / LocalDateTime.now across the persistence tests - DefendantRepositoryTest asserts field by field, inline at each call site, rather than equals() on the whole entity - the entity has no toString(), so an equals() mismatch reported only identity hashes and named neither the field nor the object - HibernateTestEntityManagerProvider fields are named after their type - AssignmentRepository and its test use entityManager rather than em, which also changes the CDI injection point name and the string the test injects by - @BeforeEach methods say what they do - static imports for randomUUID() and DAYS --- .../repository/AssignmentRepository.java | 4 +- .../repository/AssignmentRepositoryTest.java | 136 ++++++++-------- .../CaseApplicationRepositoryTest.java | 14 +- ...seAssignmentRestrictionRepositoryTest.java | 38 ++--- .../CaseDecisionRepositoryTest.java | 22 +-- .../CaseDocumentRepositoryTest.java | 15 +- .../repository/CaseNoteRepositoryTest.java | 16 +- ...aseRepositoryProsecutingAuthorityTest.java | 4 +- .../repository/CaseRepositorySjpnTest.java | 9 +- .../repository/CaseRepositoryTest.java | 8 +- .../CaseSearchResultRepositoryTest.java | 6 +- ...dantDetailUpdateRequestRepositoryTest.java | 13 +- .../repository/DefendantRepositoryTest.java | 146 +++++++++++++----- .../repository/OffenceRepositoryTest.java | 17 +- .../repository/OnlinePleaRepositoryTest.java | 13 +- .../PendingDatesToAvoidRepositoryTest.java | 36 +++-- ...nsparencyReportMetadataRepositoryTest.java | 15 +- .../repository/ReadyCaseRepositoryTest.java | 25 +-- .../repository/ReserveCaseRepositoryTest.java | 16 +- ...nsparencyReportMetadataRepositoryTest.java | 26 ++-- 20 files changed, 334 insertions(+), 245 deletions(-) diff --git a/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/repository/AssignmentRepository.java b/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/repository/AssignmentRepository.java index 2da7a2f5e1..baa08b2608 100644 --- a/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/repository/AssignmentRepository.java +++ b/sjp-viewstore/sjp-viewstore-persistence/src/main/java/uk/gov/moj/cpp/sjp/persistence/repository/AssignmentRepository.java @@ -16,7 +16,7 @@ public class AssignmentRepository { @Inject - private EntityManager em; + private EntityManager entityManager; private static final String ASSIGNMENTS_CANDIDATES_QUERY = "SELECT " + @@ -57,7 +57,7 @@ private List getAssignmentCandidates(final SessionType sess return Lists.newArrayList(); } - return em.createNativeQuery(ASSIGNMENTS_CANDIDATES_QUERY, CaseDetail.RESULT_SET_MAPPING_ASSIGNMENT_CANDIDATES) + return entityManager.createNativeQuery(ASSIGNMENTS_CANDIDATES_QUERY, CaseDetail.RESULT_SET_MAPPING_ASSIGNMENT_CANDIDATES) .setParameter("assigneeId", assigneeId) .setParameter("prosecutingAuthorities", prosecutingAuthorities) .setParameter("sessionType", sessionType.name()) diff --git a/sjp-viewstore/sjp-viewstore-persistence/src/test/java/uk/gov/moj/cpp/sjp/persistence/repository/AssignmentRepositoryTest.java b/sjp-viewstore/sjp-viewstore-persistence/src/test/java/uk/gov/moj/cpp/sjp/persistence/repository/AssignmentRepositoryTest.java index 13333f9fb1..2f8118139c 100644 --- a/sjp-viewstore/sjp-viewstore-persistence/src/test/java/uk/gov/moj/cpp/sjp/persistence/repository/AssignmentRepositoryTest.java +++ b/sjp-viewstore/sjp-viewstore-persistence/src/test/java/uk/gov/moj/cpp/sjp/persistence/repository/AssignmentRepositoryTest.java @@ -6,6 +6,7 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; +import uk.gov.justice.services.common.util.UtcClock; import uk.gov.justice.services.test.utils.persistence.HibernateTestEntityManagerProvider; import uk.gov.moj.cpp.sjp.domain.AssignmentCandidate; import uk.gov.moj.cpp.sjp.domain.CaseReadinessReason; @@ -28,7 +29,6 @@ import java.time.LocalDate; import java.time.ZonedDateTime; -import java.time.temporal.ChronoUnit; import java.util.List; import java.util.Optional; import java.util.Set; @@ -37,7 +37,7 @@ import java.util.stream.Stream; import static java.time.LocalDate.now; -import static java.time.ZoneOffset.UTC; +import static java.time.temporal.ChronoUnit.DAYS; import static java.util.Arrays.stream; import static java.util.Collections.emptyList; import static java.util.Collections.singletonList; @@ -68,29 +68,29 @@ class AssignmentRepositoryTest { private static final String PERSISTENCE_UNIT = "sjp-test-persistence-unit"; @RegisterExtension - static HibernateTestEntityManagerProvider provider = new HibernateTestEntityManagerProvider(PERSISTENCE_UNIT); + static HibernateTestEntityManagerProvider hibernateTestEntityManagerProvider = new HibernateTestEntityManagerProvider(PERSISTENCE_UNIT); - private static final ZonedDateTime TODAY_MIDNIGHT = ZonedDateTime.now(UTC).truncatedTo(ChronoUnit.DAYS); + private static final ZonedDateTime TODAY_MIDNIGHT = new UtcClock().now().truncatedTo(DAYS); private final int NO_LIMIT = Integer.MAX_VALUE; private AssignmentRepository assignmentRepository; - private EntityManager em; + private EntityManager entityManager; private UUID assigneeId; @BeforeEach - void setUp() { + void createRepositoryWithInjectedEntityManager() { assignmentRepository = new AssignmentRepository(); - provider.injectEntityManagerInto(assignmentRepository, "em"); - em = provider.getEntityManager(); - assigneeId = UUID.randomUUID(); + hibernateTestEntityManagerProvider.injectEntityManagerInto(assignmentRepository, "entityManager"); + entityManager = hibernateTestEntityManagerProvider.getEntityManager(); + assigneeId = randomUUID(); } @Test public void shouldLimitResultsForMagistrateSession() { - CaseSaver.prosecutingAuthority("TFL").postedDaysAgo(1).plea(GUILTY).save(em, PLEADED_GUILTY); - CaseSaver.prosecutingAuthority("TFL").postedDaysAgo(2).plea(GUILTY).save(em, PLEADED_GUILTY); + CaseSaver.prosecutingAuthority("TFL").postedDaysAgo(1).plea(GUILTY).save(entityManager, PLEADED_GUILTY); + CaseSaver.prosecutingAuthority("TFL").postedDaysAgo(2).plea(GUILTY).save(entityManager, PLEADED_GUILTY); assertThat(assignmentRepository.getAssignmentCandidatesForMagistrateSession(assigneeId, prosecutingAuthorities("TFL"), 3), hasSize(2)); assertThat(assignmentRepository.getAssignmentCandidatesForMagistrateSession(assigneeId, prosecutingAuthorities("TFL"), 2), hasSize(2)); @@ -100,8 +100,8 @@ public void shouldLimitResultsForMagistrateSession() { @Test public void shouldLimitResultsForDelegatePowersSession() { - CaseSaver.prosecutingAuthority("TFL").postedDaysAgo(1).notGuiltyWithDatesToAvoid().save(em, PLEADED_NOT_GUILTY); - CaseSaver.prosecutingAuthority("TFL").postedDaysAgo(2).notGuiltyWithDatesToAvoid().save(em, PLEADED_NOT_GUILTY); + CaseSaver.prosecutingAuthority("TFL").postedDaysAgo(1).notGuiltyWithDatesToAvoid().save(entityManager, PLEADED_NOT_GUILTY); + CaseSaver.prosecutingAuthority("TFL").postedDaysAgo(2).notGuiltyWithDatesToAvoid().save(entityManager, PLEADED_NOT_GUILTY); assertThat(assignmentRepository.getAssignmentCandidatesForDelegatedPowersSession(assigneeId, prosecutingAuthorities("TFL"), 3), hasSize(2)); assertThat(assignmentRepository.getAssignmentCandidatesForDelegatedPowersSession(assigneeId, prosecutingAuthorities("TFL"), 2), hasSize(2)); @@ -111,9 +111,9 @@ public void shouldLimitResultsForDelegatePowersSession() { @Test public void shouldExcludeProsecutorsForMagistrateSession() { - final CaseDetail tflCase = CaseSaver.prosecutingAuthority("TFL").postedDaysAgo(3).plea(GUILTY).save(em, PLEADED_GUILTY); - final CaseDetail tvlCase = CaseSaver.prosecutingAuthority("TVL").postedDaysAgo(2).plea(GUILTY).save(em, PLEADED_GUILTY); - final CaseDetail dvlaCase = CaseSaver.prosecutingAuthority("DVLA").postedDaysAgo(1).plea(GUILTY).save(em, PLEADED_GUILTY); + final CaseDetail tflCase = CaseSaver.prosecutingAuthority("TFL").postedDaysAgo(3).plea(GUILTY).save(entityManager, PLEADED_GUILTY); + final CaseDetail tvlCase = CaseSaver.prosecutingAuthority("TVL").postedDaysAgo(2).plea(GUILTY).save(entityManager, PLEADED_GUILTY); + final CaseDetail dvlaCase = CaseSaver.prosecutingAuthority("DVLA").postedDaysAgo(1).plea(GUILTY).save(entityManager, PLEADED_GUILTY); List magistrateSessionCandidates = assignmentRepository.getAssignmentCandidatesForMagistrateSession(assigneeId, prosecutingAuthorities("TVL", "DVLA"), NO_LIMIT); assertThat(getIds(magistrateSessionCandidates), contains(getIds(tvlCase, dvlaCase))); @@ -130,9 +130,9 @@ public void shouldExcludeProsecutorsForMagistrateSession() { @Test public void shouldIncludeProsecutorsForMagistrateSession() { - final CaseDetail tflCase = CaseSaver.prosecutingAuthority("TFL").postedDaysAgo(3).plea(GUILTY).save(em, PLEADED_GUILTY); - final CaseDetail tvlCase = CaseSaver.prosecutingAuthority("TVL").postedDaysAgo(2).plea(GUILTY).save(em, PLEADED_GUILTY); - final CaseDetail dvlaCase = CaseSaver.prosecutingAuthority("DVLA").postedDaysAgo(1).plea(GUILTY).save(em, PLEADED_GUILTY); + final CaseDetail tflCase = CaseSaver.prosecutingAuthority("TFL").postedDaysAgo(3).plea(GUILTY).save(entityManager, PLEADED_GUILTY); + final CaseDetail tvlCase = CaseSaver.prosecutingAuthority("TVL").postedDaysAgo(2).plea(GUILTY).save(entityManager, PLEADED_GUILTY); + final CaseDetail dvlaCase = CaseSaver.prosecutingAuthority("DVLA").postedDaysAgo(1).plea(GUILTY).save(entityManager, PLEADED_GUILTY); List magistrateSessionCandidates = assignmentRepository.getAssignmentCandidatesForMagistrateSession(assigneeId, prosecutingAuthorities("CPS"), NO_LIMIT); assertThat(getIds(magistrateSessionCandidates), hasSize(0)); @@ -149,9 +149,9 @@ public void shouldIncludeProsecutorsForMagistrateSession() { @Test public void shouldExcludeProsecutorsInDelegatedPowersSession() { - final CaseDetail tflCase = CaseSaver.prosecutingAuthority("TFL").postedDaysAgo(3).notGuiltyWithDatesToAvoid().save(em, PLEADED_NOT_GUILTY); - final CaseDetail tvlCase = CaseSaver.prosecutingAuthority("TVL").postedDaysAgo(2).pendingWithdrawal(true).save(em, WITHDRAWAL_REQUESTED); - final CaseDetail dvlaCase = CaseSaver.prosecutingAuthority("DVLA").postedDaysAgo(1).notGuiltyWithDatesToAvoid().save(em, PLEADED_NOT_GUILTY); + final CaseDetail tflCase = CaseSaver.prosecutingAuthority("TFL").postedDaysAgo(3).notGuiltyWithDatesToAvoid().save(entityManager, PLEADED_NOT_GUILTY); + final CaseDetail tvlCase = CaseSaver.prosecutingAuthority("TVL").postedDaysAgo(2).pendingWithdrawal(true).save(entityManager, WITHDRAWAL_REQUESTED); + final CaseDetail dvlaCase = CaseSaver.prosecutingAuthority("DVLA").postedDaysAgo(1).notGuiltyWithDatesToAvoid().save(entityManager, PLEADED_NOT_GUILTY); List delegatedPowersSessionCandidates; @@ -170,9 +170,9 @@ public void shouldExcludeProsecutorsInDelegatedPowersSession() { @Test public void shouldIncludeProsecutorsInDelegatedPowersSession() { - final CaseDetail tflCase = CaseSaver.prosecutingAuthority("TFL").postedDaysAgo(3).notGuiltyWithDatesToAvoid().save(em, PLEADED_NOT_GUILTY); - final CaseDetail tvlCase = CaseSaver.prosecutingAuthority("TVL").postedDaysAgo(2).notGuiltyWithDatesToAvoid().save(em, PLEADED_NOT_GUILTY); - final CaseDetail dvlaCase = CaseSaver.prosecutingAuthority("DVLA").postedDaysAgo(1).notGuiltyWithDatesToAvoid().save(em, PLEADED_NOT_GUILTY); + final CaseDetail tflCase = CaseSaver.prosecutingAuthority("TFL").postedDaysAgo(3).notGuiltyWithDatesToAvoid().save(entityManager, PLEADED_NOT_GUILTY); + final CaseDetail tvlCase = CaseSaver.prosecutingAuthority("TVL").postedDaysAgo(2).notGuiltyWithDatesToAvoid().save(entityManager, PLEADED_NOT_GUILTY); + final CaseDetail dvlaCase = CaseSaver.prosecutingAuthority("DVLA").postedDaysAgo(1).notGuiltyWithDatesToAvoid().save(entityManager, PLEADED_NOT_GUILTY); List delegatedPowersSessionCandidates = assignmentRepository.getAssignmentCandidatesForDelegatedPowersSession(assigneeId, prosecutingAuthorities("CPS"), NO_LIMIT); assertThat(getIds(delegatedPowersSessionCandidates), hasSize(0)); @@ -189,11 +189,11 @@ public void shouldIncludeProsecutorsInDelegatedPowersSession() { @Test public void shouldReturnCasesReadyForDecisionBasedOnSessionType() { - final CaseDetail guiltyPleaded = CaseSaver.prosecutingAuthority("TFL").postedDaysAgo(3).plea(GUILTY).save(em, PLEADED_GUILTY); - final CaseDetail pia = CaseSaver.prosecutingAuthority("TVL").postedDaysAgo(30).save(em, PIA); - final CaseDetail notGuiltyPleaded = CaseSaver.prosecutingAuthority("TFL").postedDaysAgo(3).notGuiltyWithDatesToAvoid().save(em, PLEADED_NOT_GUILTY); - final CaseDetail guiltyPleadedCourtHearingRequested = CaseSaver.prosecutingAuthority("TVL").postedDaysAgo(2).plea(GUILTY_REQUEST_HEARING).save(em, PLEADED_GUILTY_REQUEST_HEARING); - final CaseDetail withdrawalRequested = CaseSaver.prosecutingAuthority("DVLA").postedDaysAgo(1).pendingWithdrawal(true).save(em, WITHDRAWAL_REQUESTED); + final CaseDetail guiltyPleaded = CaseSaver.prosecutingAuthority("TFL").postedDaysAgo(3).plea(GUILTY).save(entityManager, PLEADED_GUILTY); + final CaseDetail pia = CaseSaver.prosecutingAuthority("TVL").postedDaysAgo(30).save(entityManager, PIA); + final CaseDetail notGuiltyPleaded = CaseSaver.prosecutingAuthority("TFL").postedDaysAgo(3).notGuiltyWithDatesToAvoid().save(entityManager, PLEADED_NOT_GUILTY); + final CaseDetail guiltyPleadedCourtHearingRequested = CaseSaver.prosecutingAuthority("TVL").postedDaysAgo(2).plea(GUILTY_REQUEST_HEARING).save(entityManager, PLEADED_GUILTY_REQUEST_HEARING); + final CaseDetail withdrawalRequested = CaseSaver.prosecutingAuthority("DVLA").postedDaysAgo(1).pendingWithdrawal(true).save(entityManager, WITHDRAWAL_REQUESTED); final List magistrateSessionCandidates = assignmentRepository.getAssignmentCandidatesForMagistrateSession(assigneeId, prosecutingAuthorities("TFL", "TVL", "DVLA"), NO_LIMIT); assertThat(getIds(magistrateSessionCandidates), contains(getIds(guiltyPleaded, pia))); @@ -208,10 +208,10 @@ public void shouldReturnCasesReadyForDecisionBasedOnSessionType() { @Test public void shouldPrioritizeCasesForMagistrateSession() { - final CaseDetail guiltyPleaded10DaysOld = CaseSaver.prosecutingAuthority("TFL").postedDaysAgo(10).plea(GUILTY).save(em, PLEADED_GUILTY); - final CaseDetail guiltyPleaded20DaysOld = CaseSaver.prosecutingAuthority("TFL").postedDaysAgo(20).plea(GUILTY).save(em, PLEADED_GUILTY); - final CaseDetail pia30DaysOld = CaseSaver.prosecutingAuthority("TFL").postedDaysAgo(30).save(em, PIA); - final CaseDetail pia40DaysOld = CaseSaver.prosecutingAuthority("TFL").postedDaysAgo(40).save(em, PIA); + final CaseDetail guiltyPleaded10DaysOld = CaseSaver.prosecutingAuthority("TFL").postedDaysAgo(10).plea(GUILTY).save(entityManager, PLEADED_GUILTY); + final CaseDetail guiltyPleaded20DaysOld = CaseSaver.prosecutingAuthority("TFL").postedDaysAgo(20).plea(GUILTY).save(entityManager, PLEADED_GUILTY); + final CaseDetail pia30DaysOld = CaseSaver.prosecutingAuthority("TFL").postedDaysAgo(30).save(entityManager, PIA); + final CaseDetail pia40DaysOld = CaseSaver.prosecutingAuthority("TFL").postedDaysAgo(40).save(entityManager, PIA); final List magistrateSessionCandidates = assignmentRepository.getAssignmentCandidatesForMagistrateSession(assigneeId, prosecutingAuthorities("TFL"), NO_LIMIT); assertThat(getIds(magistrateSessionCandidates), contains(getIds( @@ -224,14 +224,14 @@ public void shouldPrioritizeCasesForMagistrateSession() { @Test public void shouldPrioritizeCasesForDelegatedPowersSession() { - final CaseDetail pleadedNotGuilty10DaysOld = CaseSaver.prosecutingAuthority("TFL").postedDaysAgo(10).notGuiltyWithDatesToAvoid().save(em, PLEADED_NOT_GUILTY); - final CaseDetail pleadedNotGuilty20DaysOld = CaseSaver.prosecutingAuthority("TFL").postedDaysAgo(20).notGuiltyWithDatesToAvoid().save(em, PLEADED_NOT_GUILTY); + final CaseDetail pleadedNotGuilty10DaysOld = CaseSaver.prosecutingAuthority("TFL").postedDaysAgo(10).notGuiltyWithDatesToAvoid().save(entityManager, PLEADED_NOT_GUILTY); + final CaseDetail pleadedNotGuilty20DaysOld = CaseSaver.prosecutingAuthority("TFL").postedDaysAgo(20).notGuiltyWithDatesToAvoid().save(entityManager, PLEADED_NOT_GUILTY); - final CaseDetail courtHearingRequested15DaysOld = CaseSaver.prosecutingAuthority("TFL").postedDaysAgo(15).plea(GUILTY_REQUEST_HEARING).save(em, PLEADED_GUILTY_REQUEST_HEARING); - final CaseDetail courtHearingRequested25DaysOld = CaseSaver.prosecutingAuthority("TFL").postedDaysAgo(25).plea(GUILTY_REQUEST_HEARING).save(em, PLEADED_GUILTY_REQUEST_HEARING); + final CaseDetail courtHearingRequested15DaysOld = CaseSaver.prosecutingAuthority("TFL").postedDaysAgo(15).plea(GUILTY_REQUEST_HEARING).save(entityManager, PLEADED_GUILTY_REQUEST_HEARING); + final CaseDetail courtHearingRequested25DaysOld = CaseSaver.prosecutingAuthority("TFL").postedDaysAgo(25).plea(GUILTY_REQUEST_HEARING).save(entityManager, PLEADED_GUILTY_REQUEST_HEARING); - final CaseDetail pendingWithdrawal10DaysOld = CaseSaver.prosecutingAuthority("TFL").postedDaysAgo(10).pendingWithdrawal(true).save(em, WITHDRAWAL_REQUESTED); - final CaseDetail pendingWithdrawal20DaysOld = CaseSaver.prosecutingAuthority("TFL").postedDaysAgo(20).pendingWithdrawal(true).save(em, WITHDRAWAL_REQUESTED); + final CaseDetail pendingWithdrawal10DaysOld = CaseSaver.prosecutingAuthority("TFL").postedDaysAgo(10).pendingWithdrawal(true).save(entityManager, WITHDRAWAL_REQUESTED); + final CaseDetail pendingWithdrawal20DaysOld = CaseSaver.prosecutingAuthority("TFL").postedDaysAgo(20).pendingWithdrawal(true).save(entityManager, WITHDRAWAL_REQUESTED); final List delegatedPowersSessionCandidates = assignmentRepository.getAssignmentCandidatesForDelegatedPowersSession(assigneeId, prosecutingAuthorities("TFL"), NO_LIMIT); assertThat(getIds(delegatedPowersSessionCandidates), contains(getIds( @@ -246,9 +246,9 @@ public void shouldPrioritizeCasesForDelegatedPowersSession() { @Test public void shouldTopPrioritizeCasesAlreadyAssignedInMagistrateSession() { - final CaseDetail guiltyPleaded = CaseSaver.prosecutingAuthority("TFL").postedDaysAgo(3).plea(GUILTY).save(em, PLEADED_GUILTY); - final CaseDetail piaAfter40Days = CaseSaver.prosecutingAuthority("TFL").postedDaysAgo(40).save(em, PIA); - final CaseDetail assigned = CaseSaver.prosecutingAuthority("TFL").postedDaysAgo(30).assigneeId(assigneeId).save(em, PIA); + final CaseDetail guiltyPleaded = CaseSaver.prosecutingAuthority("TFL").postedDaysAgo(3).plea(GUILTY).save(entityManager, PLEADED_GUILTY); + final CaseDetail piaAfter40Days = CaseSaver.prosecutingAuthority("TFL").postedDaysAgo(40).save(entityManager, PIA); + final CaseDetail assigned = CaseSaver.prosecutingAuthority("TFL").postedDaysAgo(30).assigneeId(assigneeId).save(entityManager, PIA); final List magistrateSessionCandidates = assignmentRepository.getAssignmentCandidatesForMagistrateSession(assigneeId, prosecutingAuthorities("TFL"), NO_LIMIT); assertThat(getIds(magistrateSessionCandidates), contains(getIds( @@ -260,10 +260,10 @@ public void shouldTopPrioritizeCasesAlreadyAssignedInMagistrateSession() { @Test public void shouldTopPrioritizeCasesAlreadyAssignedInDelegatedPowersSession() { - final CaseDetail pleadedNotGuiltyAssigned = CaseSaver.prosecutingAuthority("TFL").postedDaysAgo(10).notGuiltyWithDatesToAvoid().assigneeId(assigneeId).save(em, PLEADED_NOT_GUILTY); - final CaseDetail pleadedNotGuilty = CaseSaver.prosecutingAuthority("TFL").postedDaysAgo(10).notGuiltyWithDatesToAvoid().save(em, PLEADED_NOT_GUILTY); - final CaseDetail courtHearingRequested = CaseSaver.prosecutingAuthority("TFL").postedDaysAgo(11).plea(GUILTY_REQUEST_HEARING).pendingWithdrawal(false).save(em, PLEADED_GUILTY_REQUEST_HEARING); - final CaseDetail pendingWithdrawal = CaseSaver.prosecutingAuthority("TFL").postedDaysAgo(11).pendingWithdrawal(true).save(em, WITHDRAWAL_REQUESTED); + final CaseDetail pleadedNotGuiltyAssigned = CaseSaver.prosecutingAuthority("TFL").postedDaysAgo(10).notGuiltyWithDatesToAvoid().assigneeId(assigneeId).save(entityManager, PLEADED_NOT_GUILTY); + final CaseDetail pleadedNotGuilty = CaseSaver.prosecutingAuthority("TFL").postedDaysAgo(10).notGuiltyWithDatesToAvoid().save(entityManager, PLEADED_NOT_GUILTY); + final CaseDetail courtHearingRequested = CaseSaver.prosecutingAuthority("TFL").postedDaysAgo(11).plea(GUILTY_REQUEST_HEARING).pendingWithdrawal(false).save(entityManager, PLEADED_GUILTY_REQUEST_HEARING); + final CaseDetail pendingWithdrawal = CaseSaver.prosecutingAuthority("TFL").postedDaysAgo(11).pendingWithdrawal(true).save(entityManager, WITHDRAWAL_REQUESTED); final List delegatedPowersSessionCandidates = assignmentRepository.getAssignmentCandidatesForDelegatedPowersSession(assigneeId, prosecutingAuthorities("TFL"), NO_LIMIT); @@ -277,11 +277,11 @@ public void shouldTopPrioritizeCasesAlreadyAssignedInDelegatedPowersSession() { @Test public void shouldIgnoreAlreadyCompletedCases() { - CaseSaver.prosecutingAuthority("TFL").plea(GUILTY).completed(true).save(em, CaseSaver.EXPECT_NOT_TO_BE_READY); - final CaseDetail pleadedGuilty = CaseSaver.prosecutingAuthority("TFL").plea(GUILTY).save(em, PLEADED_GUILTY); + CaseSaver.prosecutingAuthority("TFL").plea(GUILTY).completed(true).save(entityManager, CaseSaver.EXPECT_NOT_TO_BE_READY); + final CaseDetail pleadedGuilty = CaseSaver.prosecutingAuthority("TFL").plea(GUILTY).save(entityManager, PLEADED_GUILTY); - CaseSaver.prosecutingAuthority("TFL").plea(NOT_GUILTY).completed(true).save(em, CaseSaver.EXPECT_NOT_TO_BE_READY); - final CaseDetail pleadedNotGuilty = CaseSaver.prosecutingAuthority("TFL").notGuiltyWithDatesToAvoid().save(em, PLEADED_NOT_GUILTY); + CaseSaver.prosecutingAuthority("TFL").plea(NOT_GUILTY).completed(true).save(entityManager, CaseSaver.EXPECT_NOT_TO_BE_READY); + final CaseDetail pleadedNotGuilty = CaseSaver.prosecutingAuthority("TFL").notGuiltyWithDatesToAvoid().save(entityManager, PLEADED_NOT_GUILTY); final List magistrateSessionCandidates = assignmentRepository.getAssignmentCandidatesForMagistrateSession(assigneeId, prosecutingAuthorities("TFL"), NO_LIMIT); assertThat(getIds(magistrateSessionCandidates), contains(getIds(pleadedGuilty))); @@ -292,8 +292,8 @@ public void shouldIgnoreAlreadyCompletedCases() { @Test public void shouldReturnCaseVersion() { - CaseSaver.prosecutingAuthority("TFL").version(2).plea(GUILTY).completed(false).save(em, PLEADED_GUILTY); - CaseSaver.prosecutingAuthority("TFL").version(3).notGuiltyWithDatesToAvoid().save(em, PLEADED_NOT_GUILTY); + CaseSaver.prosecutingAuthority("TFL").version(2).plea(GUILTY).completed(false).save(entityManager, PLEADED_GUILTY); + CaseSaver.prosecutingAuthority("TFL").version(3).notGuiltyWithDatesToAvoid().save(entityManager, PLEADED_NOT_GUILTY); final List magistrateSessionCandidates = assignmentRepository.getAssignmentCandidatesForMagistrateSession(assigneeId, prosecutingAuthorities("TFL"), NO_LIMIT); assertThat(magistrateSessionCandidates, hasSize(1)); @@ -311,7 +311,7 @@ public void shouldReturnRightAssignmentWhenCaseDetailsDatesToAvoidIsNull() { .plea(NOT_GUILTY) .datesToAvoid(null) .pendingDatesToAvoid(TODAY_MIDNIGHT.minusDays(pastDaysFromNow)) - .save(em, pastDaysFromNow > 10 ? PLEADED_NOT_GUILTY : CaseSaver.EXPECT_NOT_TO_BE_READY); + .save(entityManager, pastDaysFromNow > 10 ? PLEADED_NOT_GUILTY : CaseSaver.EXPECT_NOT_TO_BE_READY); // dates to avoid is not set -> return only older than 10 days final AssignmentCandidate[] expectedAssignments = Stream.of(0, 1, 9, 10, 11, 20, 100) @@ -335,7 +335,7 @@ public void shouldReturnRightAssignmentWhenCaseDetailsDatesToAvoidIsNotNull() { .plea(NOT_GUILTY) .pendingDatesToAvoid(TODAY_MIDNIGHT.minusDays(notGuiltyPleaDaysAgo)) .datesToAvoid("dates-to-avoid" + notGuiltyPleaDaysAgo) - .save(em, PLEADED_NOT_GUILTY); + .save(entityManager, PLEADED_NOT_GUILTY); // dates to avoid is set -> return all of them final AssignmentCandidate[] expectedAssignments = Stream.of(9, 10, 11) @@ -353,15 +353,15 @@ public void shouldReturnRightAssignmentWhenCaseDetailsDatesToAvoidIsNotNull() { @Test public void shouldGetFirstReservedCase(){ - final CaseDetail pleadedNotGuiltyAssigned = CaseSaver.prosecutingAuthority("TFL").postedDaysAgo(10).notGuiltyWithDatesToAvoid().assigneeId(assigneeId).save(em, PLEADED_NOT_GUILTY); - final CaseDetail pleadedNotGuilty = CaseSaver.prosecutingAuthority("TFL").postedDaysAgo(10).notGuiltyWithDatesToAvoid().save(em, PLEADED_NOT_GUILTY); + final CaseDetail pleadedNotGuiltyAssigned = CaseSaver.prosecutingAuthority("TFL").postedDaysAgo(10).notGuiltyWithDatesToAvoid().assigneeId(assigneeId).save(entityManager, PLEADED_NOT_GUILTY); + final CaseDetail pleadedNotGuilty = CaseSaver.prosecutingAuthority("TFL").postedDaysAgo(10).notGuiltyWithDatesToAvoid().save(entityManager, PLEADED_NOT_GUILTY); List delegatedPowersSessionCandidates = assignmentRepository.getAssignmentCandidatesForDelegatedPowersSession(assigneeId, prosecutingAuthorities("TFL"), NO_LIMIT); assertThat(delegatedPowersSessionCandidates.get(0).getCaseId(), is(pleadedNotGuiltyAssigned.getId())); assertThat(delegatedPowersSessionCandidates.get(1).getCaseId(), is(pleadedNotGuilty.getId())); - reserveCase(em, pleadedNotGuilty.getId(), assigneeId, ZonedDateTime.now()); + reserveCase(entityManager,pleadedNotGuilty.getId(), assigneeId, new UtcClock().now()); delegatedPowersSessionCandidates = assignmentRepository.getAssignmentCandidatesForDelegatedPowersSession(assigneeId, prosecutingAuthorities("TFL"), NO_LIMIT); assertThat(delegatedPowersSessionCandidates.get(0).getCaseId(), is(pleadedNotGuilty.getId())); @@ -370,10 +370,10 @@ public void shouldGetFirstReservedCase(){ @Test public void shouldNotReturnReservedCaseForOtherUsers(){ - final CaseDetail pleadedNotGuiltyAssigned = CaseSaver.prosecutingAuthority("TFL").postedDaysAgo(10).notGuiltyWithDatesToAvoid().save(em, PLEADED_NOT_GUILTY); + final CaseDetail pleadedNotGuiltyAssigned = CaseSaver.prosecutingAuthority("TFL").postedDaysAgo(10).notGuiltyWithDatesToAvoid().save(entityManager, PLEADED_NOT_GUILTY); final UUID reserveUserId = randomUUID(); - reserveCase(em, pleadedNotGuiltyAssigned.getId(), reserveUserId, ZonedDateTime.now()); + reserveCase(entityManager,pleadedNotGuiltyAssigned.getId(), reserveUserId, new UtcClock().now()); List delegatedPowersSessionCandidates = assignmentRepository.getAssignmentCandidatesForDelegatedPowersSession(reserveUserId, prosecutingAuthorities("TFL"), NO_LIMIT); @@ -397,9 +397,9 @@ private static Set prosecutingAuthorities(final String... prosecutingAut return stream(prosecutingAuthorities).collect(toSet()); } - private void reserveCase(EntityManager em, final UUID caseId, final UUID userId, final ZonedDateTime reservedAt){ + private void reserveCase(EntityManager entityManager, final UUID caseId, final UUID userId, final ZonedDateTime reservedAt){ final ReserveCase reserveCase = new ReserveCase(caseId, "CASEURN", userId, reservedAt); - em.persist(reserveCase); + entityManager.persist(reserveCase); } private static class CaseSaver { @@ -471,7 +471,7 @@ CaseSaver pendingDatesToAvoid(ZonedDateTime datesToAvoidPleaDate) { return this; } - CaseDetail save(EntityManager em, CaseReadinessReason expectedCaseReadinessReason) { + CaseDetail save(EntityManager entityManager, CaseReadinessReason expectedCaseReadinessReason) { final UUID caseId = randomUUID(); final UUID defendantId = randomUUID(); final UUID offenceId = randomUUID(); @@ -495,15 +495,15 @@ CaseDetail save(EntityManager em, CaseReadinessReason expectedCaseReadinessReaso .build(); final StreamStatus caseStreamStatus = new StreamStatus(caseId, "sjp", "EVENT_LISTENER", version); - em.persist(caseDetail); - em.persist(caseStreamStatus); + entityManager.persist(caseDetail); + entityManager.persist(caseStreamStatus); //If the dates to avoid are provided, the case shouldn't be added to pending dates to avoid table final boolean datesToAvoidPresent = datesToAvoidPleaDate != null && StringUtils.isEmpty(datesToAvoid); if (datesToAvoidPresent) { - em.persist(buildPendingDatesToAvoid(caseDetail, datesToAvoidPleaDate)); + entityManager.persist(buildPendingDatesToAvoid(caseDetail, datesToAvoidPleaDate)); } else { - assertThat(em.find(PendingDatesToAvoid.class, caseDetail.getId()), nullValue()); + assertThat(entityManager.find(PendingDatesToAvoid.class, caseDetail.getId()), nullValue()); } CaseReadinessReason caseReadinessReason = EXPECT_NOT_TO_BE_READY; @@ -526,7 +526,7 @@ CaseDetail save(EntityManager em, CaseReadinessReason expectedCaseReadinessReaso assertThat(caseReadinessReason, equalTo(expectedCaseReadinessReason)); - em.persist(new ReadyCase(caseId, caseReadinessReason, assigneeId, getSessionType(pendingWithdrawal, plea), getPriority(pendingWithdrawal, plea), caseDetail.getProsecutingAuthority(), caseDetail.getPostingDate(), now())); + entityManager.persist(new ReadyCase(caseId, caseReadinessReason, assigneeId, getSessionType(pendingWithdrawal, plea), getPriority(pendingWithdrawal, plea), caseDetail.getProsecutingAuthority(), caseDetail.getPostingDate(), now())); } return caseDetail; diff --git a/sjp-viewstore/sjp-viewstore-persistence/src/test/java/uk/gov/moj/cpp/sjp/persistence/repository/CaseApplicationRepositoryTest.java b/sjp-viewstore/sjp-viewstore-persistence/src/test/java/uk/gov/moj/cpp/sjp/persistence/repository/CaseApplicationRepositoryTest.java index 8fc94a84fc..c8fca9aa12 100644 --- a/sjp-viewstore/sjp-viewstore-persistence/src/test/java/uk/gov/moj/cpp/sjp/persistence/repository/CaseApplicationRepositoryTest.java +++ b/sjp-viewstore/sjp-viewstore-persistence/src/test/java/uk/gov/moj/cpp/sjp/persistence/repository/CaseApplicationRepositoryTest.java @@ -30,11 +30,11 @@ class CaseApplicationRepositoryTest { private static final String PERSISTENCE_UNIT = "sjp-test-persistence-unit"; @RegisterExtension - static HibernateTestEntityManagerProvider provider = new HibernateTestEntityManagerProvider(PERSISTENCE_UNIT); + static HibernateTestEntityManagerProvider hibernateTestEntityManagerProvider = new HibernateTestEntityManagerProvider(PERSISTENCE_UNIT); - private static final UUID APPLICATION_ID = UUID.randomUUID(); - private static final UUID CASE_ID = UUID.randomUUID(); - private static final UUID APPLICATION_TYPE_ID = UUID.randomUUID(); + private static final UUID APPLICATION_ID = randomUUID(); + private static final UUID CASE_ID = randomUUID(); + private static final UUID APPLICATION_TYPE_ID = randomUUID(); private static final String APPLICATION_REFERENCE = "ref"; private static final String APPLICATION_REASON = "reason"; private static final LocalDate DATE_RECEIVED = LocalDate.now(); @@ -45,7 +45,7 @@ class CaseApplicationRepositoryTest { private static final UUID VALID_MATERIAL_ID_2 = randomUUID(); private static final String POSTCODE = "CR0 1AB"; private static final String OFFENCE_CODE = "PS0001"; - private static final UUID DEFENDANT_ID = UUID.randomUUID(); + private static final UUID DEFENDANT_ID = randomUUID(); private static LocalDate postingDate = LocalDate.of(2015, 12, 31); private static final String URN = "TFL12345678A"; private static CaseDetail caseDetail; @@ -59,9 +59,9 @@ class CaseApplicationRepositoryTest { @BeforeEach void setUp() { caseApplicationRepository = new CaseApplicationRepository(); - provider.injectEntityManagerInto(caseApplicationRepository); + hibernateTestEntityManagerProvider.injectEntityManagerInto(caseApplicationRepository); caseRepository = new CaseRepository(); - provider.injectEntityManagerInto(caseRepository); + hibernateTestEntityManagerProvider.injectEntityManagerInto(caseRepository); } @Test diff --git a/sjp-viewstore/sjp-viewstore-persistence/src/test/java/uk/gov/moj/cpp/sjp/persistence/repository/CaseAssignmentRestrictionRepositoryTest.java b/sjp-viewstore/sjp-viewstore-persistence/src/test/java/uk/gov/moj/cpp/sjp/persistence/repository/CaseAssignmentRestrictionRepositoryTest.java index feb83abf22..3e4a7e8c10 100644 --- a/sjp-viewstore/sjp-viewstore-persistence/src/test/java/uk/gov/moj/cpp/sjp/persistence/repository/CaseAssignmentRestrictionRepositoryTest.java +++ b/sjp-viewstore/sjp-viewstore-persistence/src/test/java/uk/gov/moj/cpp/sjp/persistence/repository/CaseAssignmentRestrictionRepositoryTest.java @@ -23,49 +23,49 @@ class CaseAssignmentRestrictionRepositoryTest { private static final String PERSISTENCE_UNIT = "sjp-test-persistence-unit"; @RegisterExtension - static HibernateTestEntityManagerProvider provider = new HibernateTestEntityManagerProvider(PERSISTENCE_UNIT); + static HibernateTestEntityManagerProvider hibernateTestEntityManagerProvider = new HibernateTestEntityManagerProvider(PERSISTENCE_UNIT); private static final String PROSECUTING_AUTHORITY_TVL = "TVL"; private static final String PROSECUTING_AUTHORITY_TFL = "TFL"; private static final String PROSECUTING_AUTHORITY_DVLA = "DVLA"; - private final Clock dateTimeCreated = new UtcClock(); + private final Clock clock = new UtcClock(); - private CaseAssignmentRestrictionRepository repository; + private CaseAssignmentRestrictionRepository caseAssignmentRestrictionRepository; @BeforeEach - void set() { - repository = new CaseAssignmentRestrictionRepository(); - provider.injectEntityManagerInto(repository); - repository.saveCaseAssignmentRestriction(PROSECUTING_AUTHORITY_TVL, "[]", "[]", dateTimeCreated.now(), dateTimeCreated.now().toLocalDate(), dateTimeCreated.now().toLocalDate()); - repository.saveCaseAssignmentRestriction(PROSECUTING_AUTHORITY_TFL, "[\"1234\"]", "[]", dateTimeCreated.now(), null, dateTimeCreated.now().toLocalDate()); - repository.saveCaseAssignmentRestriction(PROSECUTING_AUTHORITY_DVLA, "[]", "[\"9876\"]", dateTimeCreated.now(), dateTimeCreated.now().toLocalDate(), null); + void createRepositoryWithInjectedEntityManagerAndSaveRestrictions() { + caseAssignmentRestrictionRepository = new CaseAssignmentRestrictionRepository(); + hibernateTestEntityManagerProvider.injectEntityManagerInto(caseAssignmentRestrictionRepository); + caseAssignmentRestrictionRepository.saveCaseAssignmentRestriction(PROSECUTING_AUTHORITY_TVL, "[]", "[]", clock.now(), clock.now().toLocalDate(), clock.now().toLocalDate()); + caseAssignmentRestrictionRepository.saveCaseAssignmentRestriction(PROSECUTING_AUTHORITY_TFL, "[\"1234\"]", "[]", clock.now(), null, clock.now().toLocalDate()); + caseAssignmentRestrictionRepository.saveCaseAssignmentRestriction(PROSECUTING_AUTHORITY_DVLA, "[]", "[\"9876\"]", clock.now(), clock.now().toLocalDate(), null); } @Test public void shouldFindByProsecutingAuthority() { - CaseAssignmentRestriction caseAssignmentRestriction = repository.findBy(PROSECUTING_AUTHORITY_TVL); + CaseAssignmentRestriction caseAssignmentRestriction = caseAssignmentRestrictionRepository.findBy(PROSECUTING_AUTHORITY_TVL); assertThat(caseAssignmentRestriction.getProsecutingAuthority(), equalTo(PROSECUTING_AUTHORITY_TVL)); - assertThat(caseAssignmentRestriction.getDateTimeCreated(), equalTo(dateTimeCreated.now())); + assertThat(caseAssignmentRestriction.getDateTimeCreated(), equalTo(clock.now())); assertThat(caseAssignmentRestriction.getExclude(), equalTo(emptyList())); assertThat(caseAssignmentRestriction.getIncludeOnly(), equalTo(emptyList())); - assertThat(caseAssignmentRestriction.getValidFrom(), equalTo(dateTimeCreated.now().toLocalDate())); - assertThat(caseAssignmentRestriction.getValidTo(), equalTo(dateTimeCreated.now().toLocalDate())); + assertThat(caseAssignmentRestriction.getValidFrom(), equalTo(clock.now().toLocalDate())); + assertThat(caseAssignmentRestriction.getValidTo(), equalTo(clock.now().toLocalDate())); - caseAssignmentRestriction = repository.findBy(PROSECUTING_AUTHORITY_TFL); + caseAssignmentRestriction = caseAssignmentRestrictionRepository.findBy(PROSECUTING_AUTHORITY_TFL); assertThat(caseAssignmentRestriction.getProsecutingAuthority(), equalTo(PROSECUTING_AUTHORITY_TFL)); - assertThat(caseAssignmentRestriction.getDateTimeCreated(), equalTo(dateTimeCreated.now())); + assertThat(caseAssignmentRestriction.getDateTimeCreated(), equalTo(clock.now())); assertThat(caseAssignmentRestriction.getExclude(), equalTo(emptyList())); assertThat(caseAssignmentRestriction.getIncludeOnly(), equalTo(singletonList("1234"))); assertNull(caseAssignmentRestriction.getValidFrom()); - assertThat(caseAssignmentRestriction.getValidTo(), equalTo(dateTimeCreated.now().toLocalDate())); + assertThat(caseAssignmentRestriction.getValidTo(), equalTo(clock.now().toLocalDate())); - caseAssignmentRestriction = repository.findBy(PROSECUTING_AUTHORITY_DVLA); + caseAssignmentRestriction = caseAssignmentRestrictionRepository.findBy(PROSECUTING_AUTHORITY_DVLA); assertThat(caseAssignmentRestriction.getProsecutingAuthority(), equalTo(PROSECUTING_AUTHORITY_DVLA)); - assertThat(caseAssignmentRestriction.getDateTimeCreated(), equalTo(dateTimeCreated.now())); + assertThat(caseAssignmentRestriction.getDateTimeCreated(), equalTo(clock.now())); assertThat(caseAssignmentRestriction.getExclude(), equalTo(singletonList("9876"))); assertThat(caseAssignmentRestriction.getIncludeOnly(), equalTo(emptyList())); - assertThat(caseAssignmentRestriction.getValidFrom(), equalTo(dateTimeCreated.now().toLocalDate())); + assertThat(caseAssignmentRestriction.getValidFrom(), equalTo(clock.now().toLocalDate())); assertNull(caseAssignmentRestriction.getValidTo()); } } diff --git a/sjp-viewstore/sjp-viewstore-persistence/src/test/java/uk/gov/moj/cpp/sjp/persistence/repository/CaseDecisionRepositoryTest.java b/sjp-viewstore/sjp-viewstore-persistence/src/test/java/uk/gov/moj/cpp/sjp/persistence/repository/CaseDecisionRepositoryTest.java index 01b574aa76..ed6db19c0c 100644 --- a/sjp-viewstore/sjp-viewstore-persistence/src/test/java/uk/gov/moj/cpp/sjp/persistence/repository/CaseDecisionRepositoryTest.java +++ b/sjp-viewstore/sjp-viewstore-persistence/src/test/java/uk/gov/moj/cpp/sjp/persistence/repository/CaseDecisionRepositoryTest.java @@ -7,6 +7,7 @@ import static uk.gov.moj.cpp.sjp.domain.decision.discharge.PeriodUnit.*; import static uk.gov.moj.cpp.sjp.domain.plea.PleaType.*; +import uk.gov.justice.services.common.util.UtcClock; import uk.gov.justice.services.test.utils.persistence.HibernateTestEntityManagerProvider; import uk.gov.moj.cpp.sjp.domain.decision.imposition.InstallmentPeriod; import uk.gov.moj.cpp.sjp.domain.decision.imposition.PaymentType; @@ -24,7 +25,6 @@ import java.math.BigDecimal; import java.time.LocalDate; -import java.time.ZonedDateTime; import java.util.UUID; import jakarta.persistence.EntityManager; @@ -38,17 +38,19 @@ class CaseDecisionRepositoryTest { private static final String PERSISTENCE_UNIT = "sjp-test-persistence-unit"; @RegisterExtension - static HibernateTestEntityManagerProvider provider = new HibernateTestEntityManagerProvider(PERSISTENCE_UNIT); + static HibernateTestEntityManagerProvider hibernateTestEntityManagerProvider = new HibernateTestEntityManagerProvider(PERSISTENCE_UNIT); + + private final UtcClock clock = new UtcClock(); private EntityManager entityManager; private CaseDecisionRepository caseDecisionRepository; @BeforeEach - void setUp() { + void createRepositoryWithInjectedEntityManager() { caseDecisionRepository = new CaseDecisionRepository(); - provider.injectEntityManagerInto(caseDecisionRepository); - entityManager = provider.getEntityManager(); + hibernateTestEntityManagerProvider.injectEntityManagerInto(caseDecisionRepository); + entityManager = hibernateTestEntityManagerProvider.getEntityManager(); } @Test @@ -59,7 +61,7 @@ public void shouldSaveDischargeOffenceDecision() { UUID caseDecisionId = randomUUID(); caseDecision.setId(caseDecisionId); caseDecision.setCaseId(UUID.randomUUID()); - caseDecision.setSavedAt(ZonedDateTime.now()); + caseDecision.setSavedAt(clock.now()); caseDecision.setSession(entityManager.getReference(Session.class,randomUUID())); DischargeOffenceDecision dischargeOffenceDecision = new DischargeOffenceDecision(); @@ -67,7 +69,7 @@ public void shouldSaveDischargeOffenceDecision() { dischargeOffenceDecision.setDischargePeriod(new DischargePeriod(WEEK,10)); dischargeOffenceDecision.setGuiltyPleaTakenIntoAccount(true); dischargeOffenceDecision.setPleaAtDecisionTime(GUILTY); - dischargeOffenceDecision.setPleaDate(ZonedDateTime.now()); + dischargeOffenceDecision.setPleaDate(clock.now()); dischargeOffenceDecision.setDischargeType(CONDITIONAL); caseDecision.setOffenceDecisions(asList(dischargeOffenceDecision)); @@ -90,14 +92,14 @@ public void shouldSaveFinancialPenaltyOffenceDecision() { UUID caseDecisionId = randomUUID(); caseDecision.setId(caseDecisionId); caseDecision.setCaseId(UUID.randomUUID()); - caseDecision.setSavedAt(ZonedDateTime.now()); + caseDecision.setSavedAt(clock.now()); caseDecision.setSession(entityManager.getReference(Session.class,randomUUID())); FinancialPenaltyOffenceDecision financialPenaltyOffenceDecision = new FinancialPenaltyOffenceDecision(); financialPenaltyOffenceDecision.setCompensation(BigDecimal.valueOf(20.3)); financialPenaltyOffenceDecision.setGuiltyPleaTakenIntoAccount(true); financialPenaltyOffenceDecision.setPleaAtDecisionTime(GUILTY); - financialPenaltyOffenceDecision.setPleaDate(ZonedDateTime.now()); + financialPenaltyOffenceDecision.setPleaDate(clock.now()); financialPenaltyOffenceDecision.setFine(BigDecimal.valueOf(20.3)); caseDecision.setOffenceDecisions(asList(financialPenaltyOffenceDecision)); @@ -119,7 +121,7 @@ public void shouldSaveFinancialImposition() { UUID caseDecisionId = randomUUID(); caseDecision.setId(caseDecisionId); caseDecision.setCaseId(UUID.randomUUID()); - caseDecision.setSavedAt(ZonedDateTime.now()); + caseDecision.setSavedAt(clock.now()); caseDecision.setSession(entityManager.getReference(Session.class,randomUUID())); FinancialImposition financialImposition = new FinancialImposition(); diff --git a/sjp-viewstore/sjp-viewstore-persistence/src/test/java/uk/gov/moj/cpp/sjp/persistence/repository/CaseDocumentRepositoryTest.java b/sjp-viewstore/sjp-viewstore-persistence/src/test/java/uk/gov/moj/cpp/sjp/persistence/repository/CaseDocumentRepositoryTest.java index 29c5182f16..940a568a10 100644 --- a/sjp-viewstore/sjp-viewstore-persistence/src/test/java/uk/gov/moj/cpp/sjp/persistence/repository/CaseDocumentRepositoryTest.java +++ b/sjp-viewstore/sjp-viewstore-persistence/src/test/java/uk/gov/moj/cpp/sjp/persistence/repository/CaseDocumentRepositoryTest.java @@ -1,5 +1,6 @@ package uk.gov.moj.cpp.sjp.persistence.repository; +import static java.util.UUID.randomUUID; import static org.junit.jupiter.api.Assertions.assertEquals; import uk.gov.justice.services.common.converter.ZonedDateTimes; @@ -25,7 +26,7 @@ class CaseDocumentRepositoryTest { private static final String PERSISTENCE_UNIT = "sjp-test-persistence-unit"; @RegisterExtension - static HibernateTestEntityManagerProvider provider = new HibernateTestEntityManagerProvider(PERSISTENCE_UNIT); + static HibernateTestEntityManagerProvider hibernateTestEntityManagerProvider = new HibernateTestEntityManagerProvider(PERSISTENCE_UNIT); private CaseDocumentRepository caseDocumentRepository; @@ -40,9 +41,9 @@ class CaseDocumentRepositoryTest { @BeforeEach void givenCaseDocuments() { caseDocumentRepository = new CaseDocumentRepository(); - provider.injectEntityManagerInto(caseDocumentRepository); + hibernateTestEntityManagerProvider.injectEntityManagerInto(caseDocumentRepository); caseRepository = new CaseRepository(); - provider.injectEntityManagerInto(caseRepository); + hibernateTestEntityManagerProvider.injectEntityManagerInto(caseRepository); addCaseDocument(addedAt_2017_01_01); addCaseDocument(addedAt_2017_01_05); addCaseDocument(addedAt_2017_01_10); @@ -68,12 +69,12 @@ public void findCaseDocuments() { private void addCaseDocument(final ZonedDateTime addedAt) { - final DefendantDetail defendantDetail = new DefendantDetail(UUID.randomUUID(), new PersonalDetails(), null,1,null,null,null); - final CaseDetail caseDetail = new CaseDetail(UUID.randomUUID(), "TFL1234567", RandomStringUtils.randomAlphanumeric(12).toUpperCase(), "TFL", null, null, null, + final DefendantDetail defendantDetail = new DefendantDetail(randomUUID(), new PersonalDetails(), null,1,null,null,null); + final CaseDetail caseDetail = new CaseDetail(randomUUID(), "TFL1234567", RandomStringUtils.randomAlphanumeric(12).toUpperCase(), "TFL", null, null, null, defendantDetail, null, LocalDate.now(), null); caseDetail.setDefendant(defendantDetail); - final CaseDocument caseDocument = new CaseDocument(UUID.randomUUID(), - UUID.randomUUID(), CaseDocument.RESULT_ORDER_DOCUMENT_TYPE, + final CaseDocument caseDocument = new CaseDocument(randomUUID(), + randomUUID(), CaseDocument.RESULT_ORDER_DOCUMENT_TYPE, addedAt, caseDetail.getId(), DOCUMENT_NUMBER); caseRepository.save(caseDetail); diff --git a/sjp-viewstore/sjp-viewstore-persistence/src/test/java/uk/gov/moj/cpp/sjp/persistence/repository/CaseNoteRepositoryTest.java b/sjp-viewstore/sjp-viewstore-persistence/src/test/java/uk/gov/moj/cpp/sjp/persistence/repository/CaseNoteRepositoryTest.java index 832a8d0c37..06ac0c5de4 100644 --- a/sjp-viewstore/sjp-viewstore-persistence/src/test/java/uk/gov/moj/cpp/sjp/persistence/repository/CaseNoteRepositoryTest.java +++ b/sjp-viewstore/sjp-viewstore-persistence/src/test/java/uk/gov/moj/cpp/sjp/persistence/repository/CaseNoteRepositoryTest.java @@ -1,12 +1,12 @@ package uk.gov.moj.cpp.sjp.persistence.repository; -import static java.time.ZonedDateTime.now; import static java.util.UUID.randomUUID; import static org.apache.commons.lang3.RandomStringUtils.randomAlphanumeric; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.contains; import uk.gov.justice.json.schemas.domains.sjp.NoteType; +import uk.gov.justice.services.common.util.UtcClock; import uk.gov.justice.services.test.utils.persistence.HibernateTestEntityManagerProvider; import uk.gov.moj.cpp.sjp.persistence.entity.CaseNote; @@ -23,14 +23,16 @@ class CaseNoteRepositoryTest { private static final String PERSISTENCE_UNIT = "sjp-test-persistence-unit"; @RegisterExtension - static HibernateTestEntityManagerProvider provider = new HibernateTestEntityManagerProvider(PERSISTENCE_UNIT); + static HibernateTestEntityManagerProvider hibernateTestEntityManagerProvider = new HibernateTestEntityManagerProvider(PERSISTENCE_UNIT); + + private final UtcClock clock = new UtcClock(); private CaseNoteRepository caseNoteRepository; @BeforeEach - void setUp() { + void createRepositoryWithInjectedEntityManager() { caseNoteRepository = new CaseNoteRepository(); - provider.injectEntityManagerInto(caseNoteRepository); + hibernateTestEntityManagerProvider.injectEntityManagerInto(caseNoteRepository); } @Test @@ -38,9 +40,9 @@ public void shouldFindOrderdCaseNotesStartingWithMostRecent() { final UUID case1Id = randomUUID(); final UUID case2Id = randomUUID(); - final CaseNote firstCaseNot = createCaseNote(case1Id, now().minusHours(2)); - final CaseNote secondCaseNot = createCaseNote(case1Id, now().minusHours(1)); - final CaseNote thirdCaseNot = createCaseNote(case2Id, now().minusHours(1)); + final CaseNote firstCaseNot = createCaseNote(case1Id, clock.now().minusHours(2)); + final CaseNote secondCaseNot = createCaseNote(case1Id, clock.now().minusHours(1)); + final CaseNote thirdCaseNot = createCaseNote(case2Id, clock.now().minusHours(1)); caseNoteRepository.save(firstCaseNot); caseNoteRepository.save(secondCaseNot); diff --git a/sjp-viewstore/sjp-viewstore-persistence/src/test/java/uk/gov/moj/cpp/sjp/persistence/repository/CaseRepositoryProsecutingAuthorityTest.java b/sjp-viewstore/sjp-viewstore-persistence/src/test/java/uk/gov/moj/cpp/sjp/persistence/repository/CaseRepositoryProsecutingAuthorityTest.java index c67606562b..90ac18e9a6 100644 --- a/sjp-viewstore/sjp-viewstore-persistence/src/test/java/uk/gov/moj/cpp/sjp/persistence/repository/CaseRepositoryProsecutingAuthorityTest.java +++ b/sjp-viewstore/sjp-viewstore-persistence/src/test/java/uk/gov/moj/cpp/sjp/persistence/repository/CaseRepositoryProsecutingAuthorityTest.java @@ -18,7 +18,7 @@ class CaseRepositoryProsecutingAuthorityTest { private static final String PERSISTENCE_UNIT = "sjp-test-persistence-unit"; @RegisterExtension - static HibernateTestEntityManagerProvider provider = new HibernateTestEntityManagerProvider(PERSISTENCE_UNIT); + static HibernateTestEntityManagerProvider hibernateTestEntityManagerProvider = new HibernateTestEntityManagerProvider(PERSISTENCE_UNIT); private CaseRepository caseRepository; @@ -27,7 +27,7 @@ class CaseRepositoryProsecutingAuthorityTest { @BeforeEach void createRepositoryAndSeedCases() { caseRepository = new CaseRepository(); - provider.injectEntityManagerInto(caseRepository); + hibernateTestEntityManagerProvider.injectEntityManagerInto(caseRepository); tflCase = aCase().withCaseId(randomUUID()).withProsecutingAuthority("TFL").build(); tvlCase = aCase().withCaseId(randomUUID()).withProsecutingAuthority("TVL").build(); diff --git a/sjp-viewstore/sjp-viewstore-persistence/src/test/java/uk/gov/moj/cpp/sjp/persistence/repository/CaseRepositorySjpnTest.java b/sjp-viewstore/sjp-viewstore-persistence/src/test/java/uk/gov/moj/cpp/sjp/persistence/repository/CaseRepositorySjpnTest.java index 5277cb7b94..5745af672e 100644 --- a/sjp-viewstore/sjp-viewstore-persistence/src/test/java/uk/gov/moj/cpp/sjp/persistence/repository/CaseRepositorySjpnTest.java +++ b/sjp-viewstore/sjp-viewstore-persistence/src/test/java/uk/gov/moj/cpp/sjp/persistence/repository/CaseRepositorySjpnTest.java @@ -1,6 +1,7 @@ package uk.gov.moj.cpp.sjp.persistence.repository; import static java.time.LocalDate.now; +import static java.util.UUID.randomUUID; import static org.apache.commons.collections.ListUtils.union; import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.CoreMatchers.everyItem; @@ -36,7 +37,7 @@ class CaseRepositorySjpnTest { private static final String PERSISTENCE_UNIT = "sjp-test-persistence-unit"; @RegisterExtension - static HibernateTestEntityManagerProvider provider = new HibernateTestEntityManagerProvider(PERSISTENCE_UNIT); + static HibernateTestEntityManagerProvider hibernateTestEntityManagerProvider = new HibernateTestEntityManagerProvider(PERSISTENCE_UNIT); private CaseRepository caseRepository; @@ -48,7 +49,7 @@ class CaseRepositorySjpnTest { void createRepositoryAndSeedCases() { caseRepository = new CaseRepository(); - provider.injectEntityManagerInto(caseRepository); + hibernateTestEntityManagerProvider.injectEntityManagerInto(caseRepository); tflCases = createCasesAndDocuments("TFL"); tvlCases = createCasesAndDocuments("TVL"); @@ -172,7 +173,7 @@ private List createCases(final int count, final String prosecutingAu int i = cases.size(); for (CaseDetail caseDetail : cases) { - caseDetail.setId(UUID.randomUUID()); + caseDetail.setId(randomUUID()); caseDetail.setProsecutingAuthority(prosecutingAuthority); caseDetail.setPostingDate(now().minusDays(i--)); caseRepository.save(caseDetail); @@ -191,7 +192,7 @@ private void createOtherDocuments(final List cases) { private void createCaseDocuments(final List cases, final String documentType) { for (final CaseDetail caseDetail : cases) { - final CaseDocument sjpNotice = new CaseDocument(UUID.randomUUID(), UUID.randomUUID(), documentType, clock.now(), caseDetail.getId(), 1); + final CaseDocument sjpNotice = new CaseDocument(randomUUID(), randomUUID(), documentType, clock.now(), caseDetail.getId(), 1); caseDetail.addCaseDocuments(sjpNotice); caseRepository.save(caseDetail); } diff --git a/sjp-viewstore/sjp-viewstore-persistence/src/test/java/uk/gov/moj/cpp/sjp/persistence/repository/CaseRepositoryTest.java b/sjp-viewstore/sjp-viewstore-persistence/src/test/java/uk/gov/moj/cpp/sjp/persistence/repository/CaseRepositoryTest.java index 28a3eee330..eac7948fb3 100644 --- a/sjp-viewstore/sjp-viewstore-persistence/src/test/java/uk/gov/moj/cpp/sjp/persistence/repository/CaseRepositoryTest.java +++ b/sjp-viewstore/sjp-viewstore-persistence/src/test/java/uk/gov/moj/cpp/sjp/persistence/repository/CaseRepositoryTest.java @@ -84,7 +84,7 @@ class CaseRepositoryTest { private static final String PERSISTENCE_UNIT = "sjp-test-persistence-unit"; @RegisterExtension - static HibernateTestEntityManagerProvider provider = new HibernateTestEntityManagerProvider(PERSISTENCE_UNIT); + static HibernateTestEntityManagerProvider hibernateTestEntityManagerProvider = new HibernateTestEntityManagerProvider(PERSISTENCE_UNIT); private EntityManager entityManager; @@ -105,12 +105,12 @@ private static String randomUrn() { @BeforeEach void createRepositoriesAndSeedCases() { caseRepository = new CaseRepository(); - provider.injectEntityManagerInto(caseRepository); + hibernateTestEntityManagerProvider.injectEntityManagerInto(caseRepository); readyCaseRepository = new ReadyCaseRepository(); - provider.injectEntityManagerInto(readyCaseRepository); + hibernateTestEntityManagerProvider.injectEntityManagerInto(readyCaseRepository); - entityManager = provider.getEntityManager(); + entityManager = hibernateTestEntityManagerProvider.getEntityManager(); caseCreatedOn = clock.now(); // given 4 cases exist in database diff --git a/sjp-viewstore/sjp-viewstore-persistence/src/test/java/uk/gov/moj/cpp/sjp/persistence/repository/CaseSearchResultRepositoryTest.java b/sjp-viewstore/sjp-viewstore-persistence/src/test/java/uk/gov/moj/cpp/sjp/persistence/repository/CaseSearchResultRepositoryTest.java index adcab3a537..2f0b984726 100644 --- a/sjp-viewstore/sjp-viewstore-persistence/src/test/java/uk/gov/moj/cpp/sjp/persistence/repository/CaseSearchResultRepositoryTest.java +++ b/sjp-viewstore/sjp-viewstore-persistence/src/test/java/uk/gov/moj/cpp/sjp/persistence/repository/CaseSearchResultRepositoryTest.java @@ -43,7 +43,7 @@ class CaseSearchResultRepositoryTest { private static final String PERSISTENCE_UNIT = "sjp-test-persistence-unit"; @RegisterExtension - static HibernateTestEntityManagerProvider provider = new HibernateTestEntityManagerProvider(PERSISTENCE_UNIT); + static HibernateTestEntityManagerProvider hibernateTestEntityManagerProvider = new HibernateTestEntityManagerProvider(PERSISTENCE_UNIT); private CaseSearchResultRepository caseSearchResultRepository; private CaseSummaryRepository caseSummaryRepository; @@ -51,10 +51,10 @@ class CaseSearchResultRepositoryTest { @BeforeEach void createRepositoriesWithInjectedEntityManager() { caseSearchResultRepository = new CaseSearchResultRepository(); - provider.injectEntityManagerInto(caseSearchResultRepository); + hibernateTestEntityManagerProvider.injectEntityManagerInto(caseSearchResultRepository); caseSummaryRepository = new CaseSummaryRepository(); - provider.injectEntityManagerInto(caseSummaryRepository); + hibernateTestEntityManagerProvider.injectEntityManagerInto(caseSummaryRepository); } @Test diff --git a/sjp-viewstore/sjp-viewstore-persistence/src/test/java/uk/gov/moj/cpp/sjp/persistence/repository/DefendantDetailUpdateRequestRepositoryTest.java b/sjp-viewstore/sjp-viewstore-persistence/src/test/java/uk/gov/moj/cpp/sjp/persistence/repository/DefendantDetailUpdateRequestRepositoryTest.java index bef39d8ee5..2b1a53118f 100644 --- a/sjp-viewstore/sjp-viewstore-persistence/src/test/java/uk/gov/moj/cpp/sjp/persistence/repository/DefendantDetailUpdateRequestRepositoryTest.java +++ b/sjp-viewstore/sjp-viewstore-persistence/src/test/java/uk/gov/moj/cpp/sjp/persistence/repository/DefendantDetailUpdateRequestRepositoryTest.java @@ -1,12 +1,13 @@ package uk.gov.moj.cpp.sjp.persistence.repository; +import static java.util.UUID.randomUUID; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.equalTo; +import uk.gov.justice.services.common.util.UtcClock; import uk.gov.justice.services.test.utils.persistence.HibernateTestEntityManagerProvider; import uk.gov.moj.cpp.sjp.persistence.entity.DefendantDetailUpdateRequest; -import java.time.ZonedDateTime; import java.util.UUID; import org.junit.jupiter.api.BeforeEach; @@ -18,20 +19,20 @@ class DefendantDetailUpdateRequestRepositoryTest { private static final String PERSISTENCE_UNIT = "sjp-test-persistence-unit"; @RegisterExtension - static HibernateTestEntityManagerProvider provider = new HibernateTestEntityManagerProvider(PERSISTENCE_UNIT); + static HibernateTestEntityManagerProvider hibernateTestEntityManagerProvider = new HibernateTestEntityManagerProvider(PERSISTENCE_UNIT); private DefendantDetailUpdateRequestRepository defendantRepository; @BeforeEach void createRepositoryWithInjectedEntityManager() { defendantRepository = new DefendantDetailUpdateRequestRepository(); - provider.injectEntityManagerInto(defendantRepository); + hibernateTestEntityManagerProvider.injectEntityManagerInto(defendantRepository); } @Test void shouldFindByCaseId() { - final UUID caseId = UUID.randomUUID(); - DefendantDetailUpdateRequest defendantDetailUpdateRequest = createDefendantDetailUpdateRequest(caseId, UUID.randomUUID(), "firstName", "lastName", "middleName"); + final UUID caseId = randomUUID(); + DefendantDetailUpdateRequest defendantDetailUpdateRequest = createDefendantDetailUpdateRequest(caseId, randomUUID(), "firstName", "lastName", "middleName"); defendantRepository.save(defendantDetailUpdateRequest); final DefendantDetailUpdateRequest updateRequest = defendantRepository.findBy(caseId); @@ -46,7 +47,7 @@ private static DefendantDetailUpdateRequest createDefendantDetailUpdateRequest(f defendantDetailUpdateRequest.setFirstName(firstName); defendantDetailUpdateRequest.setLastName(lastName); defendantDetailUpdateRequest.setStatus(DefendantDetailUpdateRequest.Status.PENDING); - defendantDetailUpdateRequest.setUpdatedAt(ZonedDateTime.now()); + defendantDetailUpdateRequest.setUpdatedAt(new UtcClock().now()); return defendantDetailUpdateRequest; } diff --git a/sjp-viewstore/sjp-viewstore-persistence/src/test/java/uk/gov/moj/cpp/sjp/persistence/repository/DefendantRepositoryTest.java b/sjp-viewstore/sjp-viewstore-persistence/src/test/java/uk/gov/moj/cpp/sjp/persistence/repository/DefendantRepositoryTest.java index 7b892fefde..207c5647db 100644 --- a/sjp-viewstore/sjp-viewstore-persistence/src/test/java/uk/gov/moj/cpp/sjp/persistence/repository/DefendantRepositoryTest.java +++ b/sjp-viewstore/sjp-viewstore-persistence/src/test/java/uk/gov/moj/cpp/sjp/persistence/repository/DefendantRepositoryTest.java @@ -1,13 +1,11 @@ package uk.gov.moj.cpp.sjp.persistence.repository; -import static java.time.ZoneOffset.UTC; -import static java.time.ZonedDateTime.now; import static org.hamcrest.MatcherAssert.assertThat; -import static org.hamcrest.Matchers.contains; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.is; import static org.hamcrest.Matchers.iterableWithSize; +import uk.gov.justice.services.common.util.UtcClock; import uk.gov.justice.services.test.utils.persistence.HibernateTestEntityManagerProvider; import uk.gov.moj.cpp.sjp.domain.CaseReadinessReason; import uk.gov.moj.cpp.sjp.domain.SessionType; @@ -34,7 +32,9 @@ class DefendantRepositoryTest { private static final String PERSISTENCE_UNIT = "sjp-test-persistence-unit"; @RegisterExtension - static HibernateTestEntityManagerProvider provider = new HibernateTestEntityManagerProvider(PERSISTENCE_UNIT); + static HibernateTestEntityManagerProvider hibernateTestEntityManagerProvider = new HibernateTestEntityManagerProvider(PERSISTENCE_UNIT); + + private final UtcClock clock = new UtcClock(); private CaseRepository caseRepository; @@ -45,49 +45,73 @@ class DefendantRepositoryTest { @BeforeEach void createRepositoriesWithInjectedEntityManager() { caseRepository = new CaseRepository(); - provider.injectEntityManagerInto(caseRepository); + hibernateTestEntityManagerProvider.injectEntityManagerInto(caseRepository); defendantRepository = new DefendantRepository(); - provider.injectEntityManagerInto(defendantRepository); + hibernateTestEntityManagerProvider.injectEntityManagerInto(defendantRepository); readyCaseRepository = new ReadyCaseRepository(); - provider.injectEntityManagerInto(readyCaseRepository); + hibernateTestEntityManagerProvider.injectEntityManagerInto(readyCaseRepository); } @Test void shouldFindDefendantWithDoBUpdatedAndUpdatesNotAcknowledgedYet() { final PersonalDetails personalDetails = new PersonalDetails(); - personalDetails.markDateOfBirthUpdated(now(UTC)); + personalDetails.markDateOfBirthUpdated(clock.now()); final UpdatedDefendantDetails defendant = createCaseDetail(personalDetails, "TVL", null,null,null); - final List defendantDetails = defendantRepository.findUpdatedByCaseProsecutingAuthority("TVL", now().minusDays(10), now(), Collections.emptyList()); + final List defendantDetails = defendantRepository.findUpdatedByCaseProsecutingAuthority("TVL", clock.now().minusDays(10), clock.now(), Collections.emptyList()); assertThat(defendantDetails, iterableWithSize(1)); - assertThat(defendantDetails, contains(defendant)); + final UpdatedDefendantDetails found = defendantDetails.get(0); + assertThat(found.getDefendantId(), is(defendant.getDefendantId())); + assertThat(found.getFirstName(), is(defendant.getFirstName())); + assertThat(found.getLastName(), is(defendant.getLastName())); + assertThat(found.getDateOfBirth(), is(defendant.getDateOfBirth())); + assertThat(found.getCaseId(), is(defendant.getCaseId())); + assertThat(found.getCaseUrn(), is(defendant.getCaseUrn())); + assertThat(found.getRegion(), is(defendant.getRegion())); + assertThat(found.getLegalEntityName(), is(defendant.getLegalEntityName())); + assertThat(found.getProsecutingAuthority(), is(defendant.getProsecutingAuthority())); + assertThat(found.getAddressUpdatedAt(), is(defendant.getAddressUpdatedAt())); + assertThat(found.getDateOfBirthUpdatedAt(), is(defendant.getDateOfBirthUpdatedAt())); + assertThat(found.getNameUpdatedAt(), is(defendant.getNameUpdatedAt())); } @Test void shouldFindDefendantWithDoBUpdatedAndUpdatesAcknowledgedBefore() { final PersonalDetails personalDetails = new PersonalDetails(); - personalDetails.markDateOfBirthUpdated(now(UTC)); + personalDetails.markDateOfBirthUpdated(clock.now()); - final UpdatedDefendantDetails defendant = createCaseDetail(personalDetails, "TVL", now().minusDays(2),null,null); + final UpdatedDefendantDetails defendant = createCaseDetail(personalDetails, "TVL", clock.now().minusDays(2),null,null); - final List defendantDetails = defendantRepository.findUpdatedByCaseProsecutingAuthority("TVL", now().minusDays(10), now(), Collections.emptyList()); + final List defendantDetails = defendantRepository.findUpdatedByCaseProsecutingAuthority("TVL", clock.now().minusDays(10), clock.now(), Collections.emptyList()); assertThat(defendantDetails, iterableWithSize(1)); - assertThat(defendantDetails, contains(defendant)); + final UpdatedDefendantDetails found = defendantDetails.get(0); + assertThat(found.getDefendantId(), is(defendant.getDefendantId())); + assertThat(found.getFirstName(), is(defendant.getFirstName())); + assertThat(found.getLastName(), is(defendant.getLastName())); + assertThat(found.getDateOfBirth(), is(defendant.getDateOfBirth())); + assertThat(found.getCaseId(), is(defendant.getCaseId())); + assertThat(found.getCaseUrn(), is(defendant.getCaseUrn())); + assertThat(found.getRegion(), is(defendant.getRegion())); + assertThat(found.getLegalEntityName(), is(defendant.getLegalEntityName())); + assertThat(found.getProsecutingAuthority(), is(defendant.getProsecutingAuthority())); + assertThat(found.getAddressUpdatedAt(), is(defendant.getAddressUpdatedAt())); + assertThat(found.getDateOfBirthUpdatedAt(), is(defendant.getDateOfBirthUpdatedAt())); + assertThat(found.getNameUpdatedAt(), is(defendant.getNameUpdatedAt())); } @Test void shouldIgnoreDefendantWithDoBUpdateWhenAcknowledged() { final PersonalDetails personalDetails = new PersonalDetails(); - personalDetails.markDateOfBirthUpdated(now(UTC).minusDays(2)); + personalDetails.markDateOfBirthUpdated(clock.now().minusDays(2)); - createCaseDetail(personalDetails, "TVL", now(UTC),null,null); + createCaseDetail(personalDetails, "TVL", clock.now(),null,null); - final List defendantDetails = defendantRepository.findUpdatedByCaseProsecutingAuthority("TVL", now().minusDays(10), now(), Collections.emptyList()); + final List defendantDetails = defendantRepository.findUpdatedByCaseProsecutingAuthority("TVL", clock.now().minusDays(10), clock.now(), Collections.emptyList()); assertThat(defendantDetails, iterableWithSize(0)); } @@ -96,21 +120,33 @@ void shouldIgnoreDefendantWithDoBUpdateWhenAcknowledged() { void shouldFindDefendantWithAddressUpdatedAndUpdatesNotAcknowledgedYet() { final PersonalDetails personalDetails = new PersonalDetails(); - final UpdatedDefendantDetails defendant = createCaseDetail(personalDetails, "TVL", null,now(UTC),null); + final UpdatedDefendantDetails defendant = createCaseDetail(personalDetails, "TVL", null,clock.now(),null); - final List defendantDetails = defendantRepository.findUpdatedByCaseProsecutingAuthority("TVL", now().minusDays(10), now(), Collections.emptyList()); + final List defendantDetails = defendantRepository.findUpdatedByCaseProsecutingAuthority("TVL", clock.now().minusDays(10), clock.now(), Collections.emptyList()); assertThat(defendantDetails, iterableWithSize(1)); - assertThat(defendantDetails.get(0), is(defendant)); + final UpdatedDefendantDetails found = defendantDetails.get(0); + assertThat(found.getDefendantId(), is(defendant.getDefendantId())); + assertThat(found.getFirstName(), is(defendant.getFirstName())); + assertThat(found.getLastName(), is(defendant.getLastName())); + assertThat(found.getDateOfBirth(), is(defendant.getDateOfBirth())); + assertThat(found.getCaseId(), is(defendant.getCaseId())); + assertThat(found.getCaseUrn(), is(defendant.getCaseUrn())); + assertThat(found.getRegion(), is(defendant.getRegion())); + assertThat(found.getLegalEntityName(), is(defendant.getLegalEntityName())); + assertThat(found.getProsecutingAuthority(), is(defendant.getProsecutingAuthority())); + assertThat(found.getAddressUpdatedAt(), is(defendant.getAddressUpdatedAt())); + assertThat(found.getDateOfBirthUpdatedAt(), is(defendant.getDateOfBirthUpdatedAt())); + assertThat(found.getNameUpdatedAt(), is(defendant.getNameUpdatedAt())); } @Test void shouldIgnoreDefendantWhenUpdateHappenedMoreThan10DaysAgo() { final PersonalDetails personalDetails = new PersonalDetails(); - createCaseDetail(personalDetails, "TVL", null, now(UTC).minusDays(15), null); + createCaseDetail(personalDetails, "TVL", null, clock.now().minusDays(15), null); - final List defendantDetails = defendantRepository.findUpdatedByCaseProsecutingAuthority("TVL", now().minusDays(10), now(), Collections.emptyList()); + final List defendantDetails = defendantRepository.findUpdatedByCaseProsecutingAuthority("TVL", clock.now().minusDays(10), clock.now(), Collections.emptyList()); assertThat(defendantDetails, iterableWithSize(0)); } @@ -119,21 +155,33 @@ void shouldIgnoreDefendantWhenUpdateHappenedMoreThan10DaysAgo() { void shouldFindDefendantWithAddressUpdatedAndUpdatesAcknowledgedBefore() { final PersonalDetails personalDetails = new PersonalDetails(); - final UpdatedDefendantDetails defendant = createCaseDetail(personalDetails, "TVL", now(UTC).minusDays(2), now(UTC), null); + final UpdatedDefendantDetails defendant = createCaseDetail(personalDetails, "TVL", clock.now().minusDays(2), clock.now(), null); - final List defendantDetails = defendantRepository.findUpdatedByCaseProsecutingAuthority("TVL", now().minusDays(10), now(), Collections.emptyList()); + final List defendantDetails = defendantRepository.findUpdatedByCaseProsecutingAuthority("TVL", clock.now().minusDays(10), clock.now(), Collections.emptyList()); assertThat(defendantDetails, iterableWithSize(1)); - assertThat(defendantDetails.get(0), is(defendant)); + final UpdatedDefendantDetails found = defendantDetails.get(0); + assertThat(found.getDefendantId(), is(defendant.getDefendantId())); + assertThat(found.getFirstName(), is(defendant.getFirstName())); + assertThat(found.getLastName(), is(defendant.getLastName())); + assertThat(found.getDateOfBirth(), is(defendant.getDateOfBirth())); + assertThat(found.getCaseId(), is(defendant.getCaseId())); + assertThat(found.getCaseUrn(), is(defendant.getCaseUrn())); + assertThat(found.getRegion(), is(defendant.getRegion())); + assertThat(found.getLegalEntityName(), is(defendant.getLegalEntityName())); + assertThat(found.getProsecutingAuthority(), is(defendant.getProsecutingAuthority())); + assertThat(found.getAddressUpdatedAt(), is(defendant.getAddressUpdatedAt())); + assertThat(found.getDateOfBirthUpdatedAt(), is(defendant.getDateOfBirthUpdatedAt())); + assertThat(found.getNameUpdatedAt(), is(defendant.getNameUpdatedAt())); } @Test void shouldIgnoreDefendantWithAddressUpdateWhenAcknowledged() { final PersonalDetails personalDetails = new PersonalDetails(); - createCaseDetail(personalDetails, "TVL", now(UTC), now(UTC).minusDays(2), null); + createCaseDetail(personalDetails, "TVL", clock.now(), clock.now().minusDays(2), null); - final List defendantDetails = defendantRepository.findUpdatedByCaseProsecutingAuthority("TVL", now().minusDays(10), now(), Collections.emptyList()); + final List defendantDetails = defendantRepository.findUpdatedByCaseProsecutingAuthority("TVL", clock.now().minusDays(10), clock.now(), Collections.emptyList()); assertThat(defendantDetails, iterableWithSize(0)); } @@ -142,33 +190,57 @@ void shouldIgnoreDefendantWithAddressUpdateWhenAcknowledged() { void shouldFindDefendantWithNameUpdatedAndUpdatesNotAcknowledgedYet() { final PersonalDetails personalDetails = new PersonalDetails(); - final UpdatedDefendantDetails defendant = createCaseDetail(personalDetails, "TVL", null, null, now(UTC)); + final UpdatedDefendantDetails defendant = createCaseDetail(personalDetails, "TVL", null, null, clock.now()); - final List defendantDetails = defendantRepository.findUpdatedByCaseProsecutingAuthority("TVL", now().minusDays(10), now(), Collections.emptyList()); + final List defendantDetails = defendantRepository.findUpdatedByCaseProsecutingAuthority("TVL", clock.now().minusDays(10), clock.now(), Collections.emptyList()); assertThat(defendantDetails, iterableWithSize(1)); - assertThat(defendantDetails.get(0), is(defendant)); + final UpdatedDefendantDetails found = defendantDetails.get(0); + assertThat(found.getDefendantId(), is(defendant.getDefendantId())); + assertThat(found.getFirstName(), is(defendant.getFirstName())); + assertThat(found.getLastName(), is(defendant.getLastName())); + assertThat(found.getDateOfBirth(), is(defendant.getDateOfBirth())); + assertThat(found.getCaseId(), is(defendant.getCaseId())); + assertThat(found.getCaseUrn(), is(defendant.getCaseUrn())); + assertThat(found.getRegion(), is(defendant.getRegion())); + assertThat(found.getLegalEntityName(), is(defendant.getLegalEntityName())); + assertThat(found.getProsecutingAuthority(), is(defendant.getProsecutingAuthority())); + assertThat(found.getAddressUpdatedAt(), is(defendant.getAddressUpdatedAt())); + assertThat(found.getDateOfBirthUpdatedAt(), is(defendant.getDateOfBirthUpdatedAt())); + assertThat(found.getNameUpdatedAt(), is(defendant.getNameUpdatedAt())); } @Test void shouldFindDefendantWithNameUpdatedAndUpdatesAcknowledgedBefore() { final PersonalDetails personalDetails = new PersonalDetails(); - final UpdatedDefendantDetails defendant = createCaseDetail(personalDetails, "TVL", now(UTC).minusDays(2), null, now(UTC)); + final UpdatedDefendantDetails defendant = createCaseDetail(personalDetails, "TVL", clock.now().minusDays(2), null, clock.now()); - final List defendantDetails = defendantRepository.findUpdatedByCaseProsecutingAuthority("TVL", now().minusDays(10), now(), Collections.emptyList()); + final List defendantDetails = defendantRepository.findUpdatedByCaseProsecutingAuthority("TVL", clock.now().minusDays(10), clock.now(), Collections.emptyList()); assertThat(defendantDetails, iterableWithSize(1)); - assertThat(defendantDetails.get(0), is(defendant)); + final UpdatedDefendantDetails found = defendantDetails.get(0); + assertThat(found.getDefendantId(), is(defendant.getDefendantId())); + assertThat(found.getFirstName(), is(defendant.getFirstName())); + assertThat(found.getLastName(), is(defendant.getLastName())); + assertThat(found.getDateOfBirth(), is(defendant.getDateOfBirth())); + assertThat(found.getCaseId(), is(defendant.getCaseId())); + assertThat(found.getCaseUrn(), is(defendant.getCaseUrn())); + assertThat(found.getRegion(), is(defendant.getRegion())); + assertThat(found.getLegalEntityName(), is(defendant.getLegalEntityName())); + assertThat(found.getProsecutingAuthority(), is(defendant.getProsecutingAuthority())); + assertThat(found.getAddressUpdatedAt(), is(defendant.getAddressUpdatedAt())); + assertThat(found.getDateOfBirthUpdatedAt(), is(defendant.getDateOfBirthUpdatedAt())); + assertThat(found.getNameUpdatedAt(), is(defendant.getNameUpdatedAt())); } @Test void shouldIgnoreDefendantWithNameUpdateWhenAcknowledged() { final PersonalDetails personalDetails = new PersonalDetails(); - createCaseDetail(personalDetails, "TVL", now(UTC), null, now(UTC).minusDays(2)); + createCaseDetail(personalDetails, "TVL", clock.now(), null, clock.now().minusDays(2)); - final List defendantDetails = defendantRepository.findUpdatedByCaseProsecutingAuthority("TVL", now().minusDays(10), now(), Collections.emptyList()); + final List defendantDetails = defendantRepository.findUpdatedByCaseProsecutingAuthority("TVL", clock.now().minusDays(10), clock.now(), Collections.emptyList()); assertThat(defendantDetails, iterableWithSize(0)); } @@ -177,7 +249,7 @@ void shouldIgnoreDefendantWithNameUpdateWhenAcknowledged() { void shouldIgnoreDefendantWithNoDetailChanges() { createCaseDetail(new PersonalDetails(), "TVL", null, null, null); - final List defendantDetails = defendantRepository.findUpdatedByCaseProsecutingAuthority("TVL", now().minusDays(10), now(), Collections.emptyList()); + final List defendantDetails = defendantRepository.findUpdatedByCaseProsecutingAuthority("TVL", clock.now().minusDays(10), clock.now(), Collections.emptyList()); assertThat(defendantDetails, iterableWithSize(0)); } @@ -186,7 +258,7 @@ void shouldIgnoreDefendantWithNoDetailChanges() { void shouldIgnoreDefendantForOtherAuthorityGroup() { createCaseDetail(null, "TVL", null, null, null); - final List defendantDetails = defendantRepository.findUpdatedByCaseProsecutingAuthority("TFL", now().minusDays(10), now(), Collections.emptyList()); + final List defendantDetails = defendantRepository.findUpdatedByCaseProsecutingAuthority("TFL", clock.now().minusDays(10), clock.now(), Collections.emptyList()); assertThat(defendantDetails, iterableWithSize(0)); } diff --git a/sjp-viewstore/sjp-viewstore-persistence/src/test/java/uk/gov/moj/cpp/sjp/persistence/repository/OffenceRepositoryTest.java b/sjp-viewstore/sjp-viewstore-persistence/src/test/java/uk/gov/moj/cpp/sjp/persistence/repository/OffenceRepositoryTest.java index b02af2355f..0e691d6ca6 100644 --- a/sjp-viewstore/sjp-viewstore-persistence/src/test/java/uk/gov/moj/cpp/sjp/persistence/repository/OffenceRepositoryTest.java +++ b/sjp-viewstore/sjp-viewstore-persistence/src/test/java/uk/gov/moj/cpp/sjp/persistence/repository/OffenceRepositoryTest.java @@ -1,6 +1,7 @@ package uk.gov.moj.cpp.sjp.persistence.repository; import static java.util.Arrays.asList; +import static java.util.UUID.randomUUID; import static java.util.stream.Collectors.toList; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.allOf; @@ -37,7 +38,7 @@ class OffenceRepositoryTest { private static final String PERSISTENCE_UNIT = "sjp-test-persistence-unit"; @RegisterExtension - static HibernateTestEntityManagerProvider provider = new HibernateTestEntityManagerProvider(PERSISTENCE_UNIT); + static HibernateTestEntityManagerProvider hibernateTestEntityManagerProvider = new HibernateTestEntityManagerProvider(PERSISTENCE_UNIT); private OffenceRepository offenceRepository; @@ -46,17 +47,17 @@ class OffenceRepositoryTest { @BeforeEach void createRepositoriesWithInjectedEntityManager() { offenceRepository = new OffenceRepository(); - provider.injectEntityManagerInto(offenceRepository); + hibernateTestEntityManagerProvider.injectEntityManagerInto(offenceRepository); caseRepository = new CaseRepository(); - provider.injectEntityManagerInto(caseRepository); + hibernateTestEntityManagerProvider.injectEntityManagerInto(caseRepository); } @Test void shouldFindOffencesByIds() { - final UUID offenceId1 = UUID.randomUUID(); - final UUID offenceId2 = UUID.randomUUID(); - final UUID offenceId3 = UUID.randomUUID(); + final UUID offenceId1 = randomUUID(); + final UUID offenceId2 = randomUUID(); + final UUID offenceId3 = randomUUID(); final CaseDetail caseDetail = getCaseWithDefendantOffences(asList(offenceId1, offenceId2, offenceId3)); caseRepository.save(caseDetail); @@ -67,9 +68,9 @@ void shouldFindOffencesByIds() { } private CaseDetail getCaseWithDefendantOffences(final List offenceIds) { - final CaseDetail caseDetail = new CaseDetail(UUID.randomUUID()); + final CaseDetail caseDetail = new CaseDetail(randomUUID()); caseDetail.setDefendant(new DefendantDetail( - UUID.randomUUID(), + randomUUID(), new PersonalDetails(), offenceIds.stream().map(this::createOffenceDetails).collect(toList()), NUM_PREVIOUS_CONVICTIONS, diff --git a/sjp-viewstore/sjp-viewstore-persistence/src/test/java/uk/gov/moj/cpp/sjp/persistence/repository/OnlinePleaRepositoryTest.java b/sjp-viewstore/sjp-viewstore-persistence/src/test/java/uk/gov/moj/cpp/sjp/persistence/repository/OnlinePleaRepositoryTest.java index c7fc5586fe..4487be50c1 100644 --- a/sjp-viewstore/sjp-viewstore-persistence/src/test/java/uk/gov/moj/cpp/sjp/persistence/repository/OnlinePleaRepositoryTest.java +++ b/sjp-viewstore/sjp-viewstore-persistence/src/test/java/uk/gov/moj/cpp/sjp/persistence/repository/OnlinePleaRepositoryTest.java @@ -1,6 +1,7 @@ package uk.gov.moj.cpp.sjp.persistence.repository; import static java.util.Arrays.asList; +import static java.util.UUID.randomUUID; import static org.apache.commons.lang3.builder.EqualsBuilder.reflectionEquals; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.closeTo; @@ -38,7 +39,7 @@ class OnlinePleaRepositoryTest { private static final String PERSISTENCE_UNIT = "sjp-test-persistence-unit"; @RegisterExtension - static HibernateTestEntityManagerProvider provider = new HibernateTestEntityManagerProvider(PERSISTENCE_UNIT); + static HibernateTestEntityManagerProvider hibernateTestEntityManagerProvider = new HibernateTestEntityManagerProvider(PERSISTENCE_UNIT); private OnlinePleaRepository.FinancialMeansOnlinePleaRepository onlinePleaRepository; @@ -51,20 +52,20 @@ class OnlinePleaRepositoryTest { private UUID caseId2; @BeforeEach - void setUp() { + void createRepositoriesWithInjectedEntityManagerAndSaveOnlinePleas() { onlinePleaRepository = new OnlinePleaRepository.FinancialMeansOnlinePleaRepository(); - provider.injectEntityManagerInto(onlinePleaRepository); + hibernateTestEntityManagerProvider.injectEntityManagerInto(onlinePleaRepository); caseRepository = new CaseRepository(); - provider.injectEntityManagerInto(caseRepository); + hibernateTestEntityManagerProvider.injectEntityManagerInto(caseRepository); - caseId = UUID.randomUUID(); + caseId = randomUUID(); final CaseDetail caseDetail = getCaseWithDefendant(caseId); caseRepository.save(caseDetail); final OnlinePlea insertedOnlinePlea = buildOnlinePlea(caseDetail, clock.now()); - caseId2 = UUID.randomUUID(); + caseId2 = randomUUID(); final CaseDetail caseDetail1 = getCaseWithDefendant(caseId2); caseRepository.save(caseDetail1); diff --git a/sjp-viewstore/sjp-viewstore-persistence/src/test/java/uk/gov/moj/cpp/sjp/persistence/repository/PendingDatesToAvoidRepositoryTest.java b/sjp-viewstore/sjp-viewstore-persistence/src/test/java/uk/gov/moj/cpp/sjp/persistence/repository/PendingDatesToAvoidRepositoryTest.java index cc3d0c10a1..da22f32286 100644 --- a/sjp-viewstore/sjp-viewstore-persistence/src/test/java/uk/gov/moj/cpp/sjp/persistence/repository/PendingDatesToAvoidRepositoryTest.java +++ b/sjp-viewstore/sjp-viewstore-persistence/src/test/java/uk/gov/moj/cpp/sjp/persistence/repository/PendingDatesToAvoidRepositoryTest.java @@ -4,12 +4,12 @@ import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.hasSize; +import uk.gov.justice.services.common.util.UtcClock; import uk.gov.justice.services.test.utils.persistence.HibernateTestEntityManagerProvider; import uk.gov.moj.cpp.sjp.persistence.builder.DatesToAvoidTestData; import uk.gov.moj.cpp.sjp.persistence.entity.CaseDetail; import uk.gov.moj.cpp.sjp.persistence.entity.PendingDatesToAvoid; -import java.time.ZonedDateTime; import java.util.Arrays; import java.util.Collections; import java.util.List; @@ -24,7 +24,9 @@ class PendingDatesToAvoidRepositoryTest { private static final String PERSISTENCE_UNIT = "sjp-test-persistence-unit"; @RegisterExtension - static HibernateTestEntityManagerProvider provider = new HibernateTestEntityManagerProvider(PERSISTENCE_UNIT); + static HibernateTestEntityManagerProvider hibernateTestEntityManagerProvider = new HibernateTestEntityManagerProvider(PERSISTENCE_UNIT); + + private final UtcClock clock = new UtcClock(); private PendingDatesToAvoidRepository pendingDatesToAvoidRepository; @@ -33,41 +35,41 @@ class PendingDatesToAvoidRepositoryTest { private List testData; @BeforeEach - void setUp() { + void createRepositoriesWithInjectedEntityManagerAndSaveTestData() { pendingDatesToAvoidRepository = new PendingDatesToAvoidRepository(); - provider.injectEntityManagerInto(pendingDatesToAvoidRepository); + hibernateTestEntityManagerProvider.injectEntityManagerInto(pendingDatesToAvoidRepository); caseRepository = new CaseRepository(); - provider.injectEntityManagerInto(caseRepository); + hibernateTestEntityManagerProvider.injectEntityManagerInto(caseRepository); testData = Arrays.asList( //TFL combinations new DatesToAvoidTestData("TFL", null, false, false, - ZonedDateTime.now()), + clock.now()), new DatesToAvoidTestData("TFL", null, true, false, - ZonedDateTime.now()), + clock.now()), new DatesToAvoidTestData("TFL", null, false, true, - ZonedDateTime.now()), + clock.now()), new DatesToAvoidTestData("TFL", "Witness cannot do Thursdays", false, false, - ZonedDateTime.now()), + clock.now()), new DatesToAvoidTestData("TFL", null, false, false, - ZonedDateTime.now().minusDays(3)), + clock.now().minusDays(3)), new DatesToAvoidTestData("TFL", null, false, false, - ZonedDateTime.now().minusDays(1)), + clock.now().minusDays(1)), //TVL combinations new DatesToAvoidTestData("TVL", null, false, false, - ZonedDateTime.now()), + clock.now()), new DatesToAvoidTestData("TVL", null, true, false, - ZonedDateTime.now()), + clock.now()), new DatesToAvoidTestData("TVL", null, false, true, - ZonedDateTime.now()), + clock.now()), new DatesToAvoidTestData("TVL", "Witness cannot do Thursdays", false, false, - ZonedDateTime.now()), + clock.now()), new DatesToAvoidTestData("TVL", null, false, false, - ZonedDateTime.now().minusDays(5)), + clock.now().minusDays(5)), new DatesToAvoidTestData("TVL", null, false, false, - ZonedDateTime.now().minusDays(8)) + clock.now().minusDays(8)) ); testData.forEach(this::setupAndSaveDatesToAvoidData); } diff --git a/sjp-viewstore/sjp-viewstore-persistence/src/test/java/uk/gov/moj/cpp/sjp/persistence/repository/PressTransparencyReportMetadataRepositoryTest.java b/sjp-viewstore/sjp-viewstore-persistence/src/test/java/uk/gov/moj/cpp/sjp/persistence/repository/PressTransparencyReportMetadataRepositoryTest.java index 2be08bb245..e7e630c8c7 100644 --- a/sjp-viewstore/sjp-viewstore-persistence/src/test/java/uk/gov/moj/cpp/sjp/persistence/repository/PressTransparencyReportMetadataRepositoryTest.java +++ b/sjp-viewstore/sjp-viewstore-persistence/src/test/java/uk/gov/moj/cpp/sjp/persistence/repository/PressTransparencyReportMetadataRepositoryTest.java @@ -1,5 +1,6 @@ package uk.gov.moj.cpp.sjp.persistence.repository; +import static java.util.UUID.randomUUID; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.is; import static uk.gov.moj.cpp.sjp.domain.DocumentFormat.PDF; @@ -20,7 +21,7 @@ class PressTransparencyReportMetadataRepositoryTest { private static final String PERSISTENCE_UNIT = "sjp-test-persistence-unit"; @RegisterExtension - static HibernateTestEntityManagerProvider provider = new HibernateTestEntityManagerProvider(PERSISTENCE_UNIT); + static HibernateTestEntityManagerProvider hibernateTestEntityManagerProvider = new HibernateTestEntityManagerProvider(PERSISTENCE_UNIT); private PressTransparencyReportMetadataRepository pressTransparencyReportMetadataRepository; @@ -29,21 +30,21 @@ class PressTransparencyReportMetadataRepositoryTest { private static final LocalDateTime from = LocalDateTime.of(2018, 11, 25, 0, 0, 0); @BeforeEach - void setUp() { + void createRepositoryWithInjectedEntityManager() { pressTransparencyReportMetadataRepository = new PressTransparencyReportMetadataRepository(); - provider.injectEntityManagerInto(pressTransparencyReportMetadataRepository); + hibernateTestEntityManagerProvider.injectEntityManagerInto(pressTransparencyReportMetadataRepository); } @Test void shouldReturnTheLatestPressReportMetadata() { // given - final UUID earlierReportId = UUID.randomUUID(); - final UUID earlierReportServiceId = UUID.randomUUID(); + final UUID earlierReportId = randomUUID(); + final UUID earlierReportServiceId = randomUUID(); final PressTransparencyReportMetadata earlierTransparencyReportMetadata = populatePressTransparencyMetadata(earlierReportId, earlierReportServiceId, earlierGeneratedAt, 12, 2); pressTransparencyReportMetadataRepository.save(earlierTransparencyReportMetadata); - final UUID latestReportId = UUID.randomUUID(); - final UUID latestReportServiceId = UUID.randomUUID(); + final UUID latestReportId = randomUUID(); + final UUID latestReportServiceId = randomUUID(); final PressTransparencyReportMetadata latestTransparencyReportMetadata = populatePressTransparencyMetadata(latestReportId, latestReportServiceId, latestGeneratedAt, 13, 3); pressTransparencyReportMetadataRepository.save(latestTransparencyReportMetadata); diff --git a/sjp-viewstore/sjp-viewstore-persistence/src/test/java/uk/gov/moj/cpp/sjp/persistence/repository/ReadyCaseRepositoryTest.java b/sjp-viewstore/sjp-viewstore-persistence/src/test/java/uk/gov/moj/cpp/sjp/persistence/repository/ReadyCaseRepositoryTest.java index 025ee506cb..0956996608 100644 --- a/sjp-viewstore/sjp-viewstore-persistence/src/test/java/uk/gov/moj/cpp/sjp/persistence/repository/ReadyCaseRepositoryTest.java +++ b/sjp-viewstore/sjp-viewstore-persistence/src/test/java/uk/gov/moj/cpp/sjp/persistence/repository/ReadyCaseRepositoryTest.java @@ -1,6 +1,7 @@ package uk.gov.moj.cpp.sjp.persistence.repository; import static java.time.LocalDate.now; +import static java.util.UUID.randomUUID; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.containsInAnyOrder; import static org.hamcrest.Matchers.equalTo; @@ -25,26 +26,26 @@ class ReadyCaseRepositoryTest { private static final String PERSISTENCE_UNIT = "sjp-test-persistence-unit"; @RegisterExtension - static HibernateTestEntityManagerProvider provider = new HibernateTestEntityManagerProvider(PERSISTENCE_UNIT); + static HibernateTestEntityManagerProvider hibernateTestEntityManagerProvider = new HibernateTestEntityManagerProvider(PERSISTENCE_UNIT); private ReadyCaseRepository readyCaseRepository; @BeforeEach - void setUp() { + void createRepositoryWithInjectedEntityManager() { readyCaseRepository = new ReadyCaseRepository(); - provider.injectEntityManagerInto(readyCaseRepository); + hibernateTestEntityManagerProvider.injectEntityManagerInto(readyCaseRepository); } @Test void shouldGetReadyCasesByAssigneeId() { - final UUID assigneeId1 = UUID.randomUUID(); - final UUID assigneeId2 = UUID.randomUUID(); - final UUID assigneeId3 = UUID.randomUUID(); + final UUID assigneeId1 = randomUUID(); + final UUID assigneeId2 = randomUUID(); + final UUID assigneeId3 = randomUUID(); - final ReadyCase readyCase1 = new ReadyCase(UUID.randomUUID(), PIA, null, MAGISTRATE, 3, "TFL", now().minusDays(30), now()); - final ReadyCase readyCase2 = new ReadyCase(UUID.randomUUID(), PIA, assigneeId1, MAGISTRATE, 3, "TFL", now().minusDays(30), now()); - final ReadyCase readyCase3 = new ReadyCase(UUID.randomUUID(), PLEADED_GUILTY, assigneeId1, MAGISTRATE, 2, "TFL", now().minusDays(15), now()); - final ReadyCase readyCase4 = new ReadyCase(UUID.randomUUID(), PIA, assigneeId2, MAGISTRATE, 3, "TFL", now().minusDays(30), now()); + final ReadyCase readyCase1 = new ReadyCase(randomUUID(), PIA, null, MAGISTRATE, 3, "TFL", now().minusDays(30), now()); + final ReadyCase readyCase2 = new ReadyCase(randomUUID(), PIA, assigneeId1, MAGISTRATE, 3, "TFL", now().minusDays(30), now()); + final ReadyCase readyCase3 = new ReadyCase(randomUUID(), PLEADED_GUILTY, assigneeId1, MAGISTRATE, 2, "TFL", now().minusDays(15), now()); + final ReadyCase readyCase4 = new ReadyCase(randomUUID(), PIA, assigneeId2, MAGISTRATE, 3, "TFL", now().minusDays(30), now()); readyCaseRepository.save(readyCase1); readyCaseRepository.save(readyCase2); @@ -58,8 +59,8 @@ void shouldGetReadyCasesByAssigneeId() { @Test void shouldSaveAndLoadAllFields() { - final UUID assigneeId = UUID.randomUUID(); - final UUID caseId = UUID.randomUUID(); + final UUID assigneeId = randomUUID(); + final UUID caseId = randomUUID(); // save a case final ReadyCase readyCase = new ReadyCase(caseId, diff --git a/sjp-viewstore/sjp-viewstore-persistence/src/test/java/uk/gov/moj/cpp/sjp/persistence/repository/ReserveCaseRepositoryTest.java b/sjp-viewstore/sjp-viewstore-persistence/src/test/java/uk/gov/moj/cpp/sjp/persistence/repository/ReserveCaseRepositoryTest.java index 67f551435c..c1f0bb8e40 100644 --- a/sjp-viewstore/sjp-viewstore-persistence/src/test/java/uk/gov/moj/cpp/sjp/persistence/repository/ReserveCaseRepositoryTest.java +++ b/sjp-viewstore/sjp-viewstore-persistence/src/test/java/uk/gov/moj/cpp/sjp/persistence/repository/ReserveCaseRepositoryTest.java @@ -1,9 +1,9 @@ package uk.gov.moj.cpp.sjp.persistence.repository; -import static java.time.ZonedDateTime.now; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.equalTo; +import uk.gov.justice.services.common.util.UtcClock; import uk.gov.justice.services.test.utils.persistence.HibernateTestEntityManagerProvider; import uk.gov.moj.cpp.sjp.persistence.builder.CaseDetailBuilder; import uk.gov.moj.cpp.sjp.persistence.entity.CaseDetail; @@ -23,19 +23,21 @@ class ReserveCaseRepositoryTest { private static final String PERSISTENCE_UNIT = "sjp-test-persistence-unit"; @RegisterExtension - static HibernateTestEntityManagerProvider provider = new HibernateTestEntityManagerProvider(PERSISTENCE_UNIT); + static HibernateTestEntityManagerProvider hibernateTestEntityManagerProvider = new HibernateTestEntityManagerProvider(PERSISTENCE_UNIT); + + private final UtcClock clock = new UtcClock(); private ReserveCaseRepository reserveCaseRepository; private CaseRepository caseRepository; @BeforeEach - void setUp() { + void createRepositoriesWithInjectedEntityManager() { reserveCaseRepository = new ReserveCaseRepository(); - provider.injectEntityManagerInto(reserveCaseRepository); + hibernateTestEntityManagerProvider.injectEntityManagerInto(reserveCaseRepository); caseRepository = new CaseRepository(); - provider.injectEntityManagerInto(caseRepository); + hibernateTestEntityManagerProvider.injectEntityManagerInto(caseRepository); } @Test @@ -60,7 +62,7 @@ void shouldSaveAndLoadWithCaseDetail() { final ReserveCase reserveCase = new ReserveCase(UUID.randomUUID(), "ABC1234", reservedBy, - now()); + clock.now()); caseDetailBuilder.withReserveCase(reserveCase); caseRepository.save(caseDetailBuilder.build()); @@ -79,7 +81,7 @@ void shouldDeleteAndLoadWithCaseDetail() { final ReserveCase reserveCase = new ReserveCase(UUID.randomUUID(), "ABC1234", reservedBy, - now()); + clock.now()); caseDetailBuilder.withReserveCase(reserveCase); final CaseDetail caseDetail = caseDetailBuilder.build(); caseRepository.save(caseDetail); diff --git a/sjp-viewstore/sjp-viewstore-persistence/src/test/java/uk/gov/moj/cpp/sjp/persistence/repository/TransparencyReportMetadataRepositoryTest.java b/sjp-viewstore/sjp-viewstore-persistence/src/test/java/uk/gov/moj/cpp/sjp/persistence/repository/TransparencyReportMetadataRepositoryTest.java index d2de600087..25e5b22122 100644 --- a/sjp-viewstore/sjp-viewstore-persistence/src/test/java/uk/gov/moj/cpp/sjp/persistence/repository/TransparencyReportMetadataRepositoryTest.java +++ b/sjp-viewstore/sjp-viewstore-persistence/src/test/java/uk/gov/moj/cpp/sjp/persistence/repository/TransparencyReportMetadataRepositoryTest.java @@ -1,5 +1,6 @@ package uk.gov.moj.cpp.sjp.persistence.repository; +import static java.util.UUID.randomUUID; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.is; import static uk.gov.moj.cpp.sjp.domain.DocumentFormat.PDF; @@ -7,6 +8,7 @@ import static uk.gov.moj.cpp.sjp.domain.DocumentRequestType.DELTA; import static uk.gov.moj.cpp.sjp.domain.DocumentRequestType.FULL; +import uk.gov.justice.services.common.util.UtcClock; import uk.gov.justice.services.test.utils.persistence.HibernateTestEntityManagerProvider; import uk.gov.moj.cpp.sjp.persistence.entity.TransparencyReportMetadata; @@ -22,7 +24,7 @@ class TransparencyReportMetadataRepositoryTest { private static final String PERSISTENCE_UNIT = "sjp-test-persistence-unit"; @RegisterExtension - static HibernateTestEntityManagerProvider provider = new HibernateTestEntityManagerProvider(PERSISTENCE_UNIT); + static HibernateTestEntityManagerProvider hibernateTestEntityManagerProvider = new HibernateTestEntityManagerProvider(PERSISTENCE_UNIT); private TransparencyReportMetadataRepository transparencyReportMetadataRepository; @@ -31,25 +33,25 @@ class TransparencyReportMetadataRepositoryTest { private static final LocalDateTime from = LocalDateTime.of(2018, 11, 25, 0, 0, 0); @BeforeEach - void setUp() { + void createRepositoryWithInjectedEntityManager() { transparencyReportMetadataRepository = new TransparencyReportMetadataRepository(); - provider.injectEntityManagerInto(transparencyReportMetadataRepository); + hibernateTestEntityManagerProvider.injectEntityManagerInto(transparencyReportMetadataRepository); } @Test void shouldReturnTheLatestReportMetadata() { // given - final UUID earlierReportId = UUID.randomUUID(); - final UUID earlierReportWelshServiceId = UUID.randomUUID(); - final UUID earlierReportEnglishServiceId = UUID.randomUUID(); - final UUID earlierReportServiceId = UUID.randomUUID(); + final UUID earlierReportId = randomUUID(); + final UUID earlierReportWelshServiceId = randomUUID(); + final UUID earlierReportEnglishServiceId = randomUUID(); + final UUID earlierReportServiceId = randomUUID(); final TransparencyReportMetadata earlierTransparencyReportMetadata = populateTransparencyMetadata(earlierReportServiceId, earlierReportId, earlierReportWelshServiceId, earlierReportEnglishServiceId, earlierGeneratedAt, 12, 11, 2, 1); transparencyReportMetadataRepository.save(earlierTransparencyReportMetadata); - final UUID latestReportId = UUID.randomUUID(); - final UUID latestReportWelshServiceId = UUID.randomUUID(); - final UUID latestReportEnglishServiceId = UUID.randomUUID(); - final UUID latestReportServiceId = UUID.randomUUID(); + final UUID latestReportId = randomUUID(); + final UUID latestReportWelshServiceId = randomUUID(); + final UUID latestReportEnglishServiceId = randomUUID(); + final UUID latestReportServiceId = randomUUID(); final TransparencyReportMetadata latestTransparencyReportMetadata = populateTransparencyMetadata(latestReportServiceId, latestReportId, latestReportWelshServiceId, latestReportEnglishServiceId, latestGeneratedAt, 13, 12, 3, 2); transparencyReportMetadataRepository.save(latestTransparencyReportMetadata); @@ -72,7 +74,7 @@ private TransparencyReportMetadata populateTransparencyMetadata(final UUID repor final UUID englishServiceId, final LocalDateTime earlierGeneratedAt, final int welshSizeInBytes, final int englishSizeInBytes, final int welshNumberOfPages, final int englishNumberOfPages) { - final TransparencyReportMetadata earlierTransparencyReportMetadata = new TransparencyReportMetadata(id, PDF.name(), FULL.name(), "title", ENGLISH.name(), LocalDateTime.now()); + final TransparencyReportMetadata earlierTransparencyReportMetadata = new TransparencyReportMetadata(id, PDF.name(), FULL.name(), "title", ENGLISH.name(), new UtcClock().now().toLocalDateTime()); earlierTransparencyReportMetadata.setId(id); earlierTransparencyReportMetadata.setGeneratedAt(earlierGeneratedAt); earlierTransparencyReportMetadata.setWelshSizeInBytes(welshSizeInBytes);