From b1179114cc5b7a1e2d54149e82544b97adfe0e6e Mon Sep 17 00:00:00 2001 From: amckenzie Date: Thu, 26 Sep 2019 14:44:37 +0100 Subject: [PATCH] Move all system events into their own module --- CHANGELOG.md | 2 + .../event-store-management-core/pom.xml | 87 +++++++++++++++++++ .../commands/CatchupCommandHandler.java | 7 +- .../catchup/observers/CatchupLifecycle.java | 12 +-- .../catchup/observers/CatchupObserver.java | 49 +++++++++++ .../process/CatchupDurationCalculator.java | 2 +- .../catchup/process/CatchupInProgress.java | 0 .../process/CatchupSubscriptionContext.java | 2 +- .../catchup/process/CatchupTypeSelector.java | 6 +- .../process/CatchupsInProgressCache.java | 4 +- .../EventCatchupByComponentRunner.java | 2 +- .../process/EventCatchupProcessor.java | 6 +- .../process/EventCatchupProcessorBean.java | 0 .../catchup/process/EventCatchupRunner.java | 4 +- .../RunCatchupForComponentSelector.java | 2 +- .../management/logging/MdcLogger.java | 0 .../commands/RebuildCommandHandler.java | 2 +- .../rebuild/observers/RebuildObserver.java | 4 +- ...PublishQueueDrainedShutteringObserver.java | 0 .../ShutterCommandHandlerObserver.java | 0 .../observers/ShutteringException.java | 0 .../CommandHandlerQueueInterrogator.java | 0 .../CommandHandlerQueueSupplierFactory.java | 0 .../process/PublishQueueInterrogator.java | 0 .../AddRemoveTriggerCommandHandler.java | 0 .../process/EventLogTriggerManipulator.java | 0 .../EventStoreTriggerManipulatorProvider.java | 0 .../commands/VerifyCatchupCommandHandler.java | 0 .../process/ActiveStreamIdProvider.java | 0 .../process/AllEventsInStreamsVerifier.java | 0 .../process/CatchupVerificationException.java | 0 .../process/CatchupVerificationProcess.java | 0 .../process/EventLinkageChecker.java | 0 .../EventLogActiveEventRowCounter.java | 0 .../process/ProcessedEventCountVerifier.java | 0 .../process/ProcessedEventLinkVerifier.java | 0 .../process/PublishedEventCountVerifier.java | 0 .../process/PublishedEventLinkVerifier.java | 0 .../process/StreamBufferEmptyVerifier.java | 0 .../validation/process/TableRowCounter.java | 0 .../process/VerificationResult.java | 0 .../validation/process/Verifier.java | 0 .../validation/process/VerifierProvider.java | 0 .../src/main/resources/META-INF/beans.xml | 0 .../commands/CatchupCommandHandlerTest.java | 6 +- .../observers/CatchupLifecycleTest.java | 14 +-- .../observers/CatchupObserverTest.java | 8 +- .../CatchupDurationCalculatorTest.java | 2 +- .../process/CatchupTypeSelectorTest.java | 4 +- .../process/CatchupsInProgressCacheTest.java | 4 +- .../EventCatchupByComponentRunnerTest.java | 2 +- .../EventCatchupProcessorBeanTest.java | 0 .../process/EventCatchupProcessorTest.java | 6 +- .../process/EventCatchupRunnerTest.java | 4 +- .../RunCatchupForComponentSelectorTest.java | 6 +- .../management/logging/MdcLoggerTest.java | 0 .../commands/RebuildCommandHandlerTest.java | 2 +- .../observers/RebuildObserverTest.java | 5 +- ...ishQueueDrainedShutteringObserverTest.java | 0 .../ShutterCommandHandlerObserverTest.java | 0 .../CommandHandlerQueueInterrogatorTest.java | 0 ...ommandHandlerQueueSupplierFactoryTest.java | 0 .../process/PublishQueueInterrogatorTest.java | 0 .../AddRemoveTriggerCommandHandlerTest.java | 0 .../EventLogTriggerManipulatorTest.java | 0 ...ntStoreTriggerManipulatorProviderTest.java | 0 .../VerifyCatchupCommandHandlerTest.java | 0 .../process/ActiveStreamIdProviderTest.java | 0 .../AllEventsInStreamsVerifierTest.java | 0 .../CatchupVerificationProcessTest.java | 0 .../process/EventLinkageCheckerTest.java | 0 .../EventLogActiveEventRowCounterTest.java | 0 .../ProcessedEventCountVerifierTest.java | 0 .../ProcessedEventLinkVerifierTest.java | 0 .../PublishedEventCountVerifierTest.java | 0 .../PublishedEventLinkVerifierTest.java | 0 .../StreamBufferEmptyVerifierTest.java | 0 .../process/TableRowCounterTest.java | 0 .../process/VerificationResultTest.java | 0 .../process/VerifierProviderTest.java | 0 .../event-store-management-events/pom.xml | 22 +++++ .../catchup}/CatchupCompletedEvent.java | 2 +- .../CatchupCompletedForSubscriptionEvent.java | 3 +- .../catchup}/CatchupRequestedEvent.java | 3 +- .../events/catchup}/CatchupStartedEvent.java | 4 +- .../CatchupStartedForSubscriptionEvent.java | 4 +- .../events/catchup}/CatchupType.java | 2 +- .../events/rebuild}/RebuildCompleteEvent.java | 2 +- .../rebuild}/RebuildRequestedEvent.java | 2 +- event-store-management/pom.xml | 72 ++------------- .../catchup/observers/CatchupObserver.java | 49 ----------- 91 files changed, 231 insertions(+), 188 deletions(-) create mode 100644 event-store-management/event-store-management-core/pom.xml rename event-store-management/{ => event-store-management-core}/src/main/java/uk/gov/justice/services/eventstore/management/catchup/commands/CatchupCommandHandler.java (82%) rename event-store-management/{ => event-store-management-core}/src/main/java/uk/gov/justice/services/eventstore/management/catchup/observers/CatchupLifecycle.java (88%) create mode 100644 event-store-management/event-store-management-core/src/main/java/uk/gov/justice/services/eventstore/management/catchup/observers/CatchupObserver.java rename event-store-management/{ => event-store-management-core}/src/main/java/uk/gov/justice/services/eventstore/management/catchup/process/CatchupDurationCalculator.java (85%) rename event-store-management/{ => event-store-management-core}/src/main/java/uk/gov/justice/services/eventstore/management/catchup/process/CatchupInProgress.java (100%) rename event-store-management/{ => event-store-management-core}/src/main/java/uk/gov/justice/services/eventstore/management/catchup/process/CatchupSubscriptionContext.java (96%) rename event-store-management/{ => event-store-management-core}/src/main/java/uk/gov/justice/services/eventstore/management/catchup/process/CatchupTypeSelector.java (69%) rename event-store-management/{ => event-store-management-core}/src/main/java/uk/gov/justice/services/eventstore/management/catchup/process/CatchupsInProgressCache.java (89%) rename event-store-management/{ => event-store-management-core}/src/main/java/uk/gov/justice/services/eventstore/management/catchup/process/EventCatchupByComponentRunner.java (95%) rename event-store-management/{ => event-store-management-core}/src/main/java/uk/gov/justice/services/eventstore/management/catchup/process/EventCatchupProcessor.java (93%) rename event-store-management/{ => event-store-management-core}/src/main/java/uk/gov/justice/services/eventstore/management/catchup/process/EventCatchupProcessorBean.java (100%) rename event-store-management/{ => event-store-management-core}/src/main/java/uk/gov/justice/services/eventstore/management/catchup/process/EventCatchupRunner.java (89%) rename event-store-management/{ => event-store-management-core}/src/main/java/uk/gov/justice/services/eventstore/management/catchup/process/RunCatchupForComponentSelector.java (87%) rename event-store-management/{ => event-store-management-core}/src/main/java/uk/gov/justice/services/eventstore/management/logging/MdcLogger.java (100%) rename event-store-management/{ => event-store-management-core}/src/main/java/uk/gov/justice/services/eventstore/management/rebuild/commands/RebuildCommandHandler.java (91%) rename event-store-management/{ => event-store-management-core}/src/main/java/uk/gov/justice/services/eventstore/management/rebuild/observers/RebuildObserver.java (91%) rename event-store-management/{ => event-store-management-core}/src/main/java/uk/gov/justice/services/eventstore/management/shuttering/observers/PublishQueueDrainedShutteringObserver.java (100%) rename event-store-management/{ => event-store-management-core}/src/main/java/uk/gov/justice/services/eventstore/management/shuttering/observers/ShutterCommandHandlerObserver.java (100%) rename event-store-management/{ => event-store-management-core}/src/main/java/uk/gov/justice/services/eventstore/management/shuttering/observers/ShutteringException.java (100%) rename event-store-management/{ => event-store-management-core}/src/main/java/uk/gov/justice/services/eventstore/management/shuttering/process/CommandHandlerQueueInterrogator.java (100%) rename event-store-management/{ => event-store-management-core}/src/main/java/uk/gov/justice/services/eventstore/management/shuttering/process/CommandHandlerQueueSupplierFactory.java (100%) rename event-store-management/{ => event-store-management-core}/src/main/java/uk/gov/justice/services/eventstore/management/shuttering/process/PublishQueueInterrogator.java (100%) rename event-store-management/{ => event-store-management-core}/src/main/java/uk/gov/justice/services/eventstore/management/untrigger/commands/AddRemoveTriggerCommandHandler.java (100%) rename event-store-management/{ => event-store-management-core}/src/main/java/uk/gov/justice/services/eventstore/management/untrigger/process/EventLogTriggerManipulator.java (100%) rename event-store-management/{ => event-store-management-core}/src/main/java/uk/gov/justice/services/eventstore/management/untrigger/process/EventStoreTriggerManipulatorProvider.java (100%) rename event-store-management/{ => event-store-management-core}/src/main/java/uk/gov/justice/services/eventstore/management/validation/commands/VerifyCatchupCommandHandler.java (100%) rename event-store-management/{ => event-store-management-core}/src/main/java/uk/gov/justice/services/eventstore/management/validation/process/ActiveStreamIdProvider.java (100%) rename event-store-management/{ => event-store-management-core}/src/main/java/uk/gov/justice/services/eventstore/management/validation/process/AllEventsInStreamsVerifier.java (100%) rename event-store-management/{ => event-store-management-core}/src/main/java/uk/gov/justice/services/eventstore/management/validation/process/CatchupVerificationException.java (100%) rename event-store-management/{ => event-store-management-core}/src/main/java/uk/gov/justice/services/eventstore/management/validation/process/CatchupVerificationProcess.java (100%) rename event-store-management/{ => event-store-management-core}/src/main/java/uk/gov/justice/services/eventstore/management/validation/process/EventLinkageChecker.java (100%) rename event-store-management/{ => event-store-management-core}/src/main/java/uk/gov/justice/services/eventstore/management/validation/process/EventLogActiveEventRowCounter.java (100%) rename event-store-management/{ => event-store-management-core}/src/main/java/uk/gov/justice/services/eventstore/management/validation/process/ProcessedEventCountVerifier.java (100%) rename event-store-management/{ => event-store-management-core}/src/main/java/uk/gov/justice/services/eventstore/management/validation/process/ProcessedEventLinkVerifier.java (100%) rename event-store-management/{ => event-store-management-core}/src/main/java/uk/gov/justice/services/eventstore/management/validation/process/PublishedEventCountVerifier.java (100%) rename event-store-management/{ => event-store-management-core}/src/main/java/uk/gov/justice/services/eventstore/management/validation/process/PublishedEventLinkVerifier.java (100%) rename event-store-management/{ => event-store-management-core}/src/main/java/uk/gov/justice/services/eventstore/management/validation/process/StreamBufferEmptyVerifier.java (100%) rename event-store-management/{ => event-store-management-core}/src/main/java/uk/gov/justice/services/eventstore/management/validation/process/TableRowCounter.java (100%) rename event-store-management/{ => event-store-management-core}/src/main/java/uk/gov/justice/services/eventstore/management/validation/process/VerificationResult.java (100%) rename event-store-management/{ => event-store-management-core}/src/main/java/uk/gov/justice/services/eventstore/management/validation/process/Verifier.java (100%) rename event-store-management/{ => event-store-management-core}/src/main/java/uk/gov/justice/services/eventstore/management/validation/process/VerifierProvider.java (100%) rename event-store-management/{ => event-store-management-core}/src/main/resources/META-INF/beans.xml (100%) rename event-store-management/{ => event-store-management-core}/src/test/java/uk/gov/justice/services/eventstore/management/catchup/commands/CatchupCommandHandlerTest.java (87%) rename event-store-management/{ => event-store-management-core}/src/test/java/uk/gov/justice/services/eventstore/management/catchup/observers/CatchupLifecycleTest.java (92%) rename event-store-management/{ => event-store-management-core}/src/test/java/uk/gov/justice/services/eventstore/management/catchup/observers/CatchupObserverTest.java (86%) rename event-store-management/{ => event-store-management-core}/src/test/java/uk/gov/justice/services/eventstore/management/catchup/process/CatchupDurationCalculatorTest.java (93%) rename event-store-management/{ => event-store-management-core}/src/test/java/uk/gov/justice/services/eventstore/management/catchup/process/CatchupTypeSelectorTest.java (86%) rename event-store-management/{ => event-store-management-core}/src/test/java/uk/gov/justice/services/eventstore/management/catchup/process/CatchupsInProgressCacheTest.java (97%) rename event-store-management/{ => event-store-management-core}/src/test/java/uk/gov/justice/services/eventstore/management/catchup/process/EventCatchupByComponentRunnerTest.java (97%) rename event-store-management/{ => event-store-management-core}/src/test/java/uk/gov/justice/services/eventstore/management/catchup/process/EventCatchupProcessorBeanTest.java (100%) rename event-store-management/{ => event-store-management-core}/src/test/java/uk/gov/justice/services/eventstore/management/catchup/process/EventCatchupProcessorTest.java (96%) rename event-store-management/{ => event-store-management-core}/src/test/java/uk/gov/justice/services/eventstore/management/catchup/process/EventCatchupRunnerTest.java (93%) rename event-store-management/{ => event-store-management-core}/src/test/java/uk/gov/justice/services/eventstore/management/catchup/process/RunCatchupForComponentSelectorTest.java (89%) rename event-store-management/{ => event-store-management-core}/src/test/java/uk/gov/justice/services/eventstore/management/logging/MdcLoggerTest.java (100%) rename event-store-management/{ => event-store-management-core}/src/test/java/uk/gov/justice/services/eventstore/management/rebuild/commands/RebuildCommandHandlerTest.java (95%) rename event-store-management/{ => event-store-management-core}/src/test/java/uk/gov/justice/services/eventstore/management/rebuild/observers/RebuildObserverTest.java (93%) rename event-store-management/{ => event-store-management-core}/src/test/java/uk/gov/justice/services/eventstore/management/shuttering/observers/PublishQueueDrainedShutteringObserverTest.java (100%) rename event-store-management/{ => event-store-management-core}/src/test/java/uk/gov/justice/services/eventstore/management/shuttering/observers/ShutterCommandHandlerObserverTest.java (100%) rename event-store-management/{ => event-store-management-core}/src/test/java/uk/gov/justice/services/eventstore/management/shuttering/process/CommandHandlerQueueInterrogatorTest.java (100%) rename event-store-management/{ => event-store-management-core}/src/test/java/uk/gov/justice/services/eventstore/management/shuttering/process/CommandHandlerQueueSupplierFactoryTest.java (100%) rename event-store-management/{ => event-store-management-core}/src/test/java/uk/gov/justice/services/eventstore/management/shuttering/process/PublishQueueInterrogatorTest.java (100%) rename event-store-management/{ => event-store-management-core}/src/test/java/uk/gov/justice/services/eventstore/management/untrigger/commands/AddRemoveTriggerCommandHandlerTest.java (100%) rename event-store-management/{ => event-store-management-core}/src/test/java/uk/gov/justice/services/eventstore/management/untrigger/process/EventLogTriggerManipulatorTest.java (100%) rename event-store-management/{ => event-store-management-core}/src/test/java/uk/gov/justice/services/eventstore/management/untrigger/process/EventStoreTriggerManipulatorProviderTest.java (100%) rename event-store-management/{ => event-store-management-core}/src/test/java/uk/gov/justice/services/eventstore/management/validation/commands/VerifyCatchupCommandHandlerTest.java (100%) rename event-store-management/{ => event-store-management-core}/src/test/java/uk/gov/justice/services/eventstore/management/validation/process/ActiveStreamIdProviderTest.java (100%) rename event-store-management/{ => event-store-management-core}/src/test/java/uk/gov/justice/services/eventstore/management/validation/process/AllEventsInStreamsVerifierTest.java (100%) rename event-store-management/{ => event-store-management-core}/src/test/java/uk/gov/justice/services/eventstore/management/validation/process/CatchupVerificationProcessTest.java (100%) rename event-store-management/{ => event-store-management-core}/src/test/java/uk/gov/justice/services/eventstore/management/validation/process/EventLinkageCheckerTest.java (100%) rename event-store-management/{ => event-store-management-core}/src/test/java/uk/gov/justice/services/eventstore/management/validation/process/EventLogActiveEventRowCounterTest.java (100%) rename event-store-management/{ => event-store-management-core}/src/test/java/uk/gov/justice/services/eventstore/management/validation/process/ProcessedEventCountVerifierTest.java (100%) rename event-store-management/{ => event-store-management-core}/src/test/java/uk/gov/justice/services/eventstore/management/validation/process/ProcessedEventLinkVerifierTest.java (100%) rename event-store-management/{ => event-store-management-core}/src/test/java/uk/gov/justice/services/eventstore/management/validation/process/PublishedEventCountVerifierTest.java (100%) rename event-store-management/{ => event-store-management-core}/src/test/java/uk/gov/justice/services/eventstore/management/validation/process/PublishedEventLinkVerifierTest.java (100%) rename event-store-management/{ => event-store-management-core}/src/test/java/uk/gov/justice/services/eventstore/management/validation/process/StreamBufferEmptyVerifierTest.java (100%) rename event-store-management/{ => event-store-management-core}/src/test/java/uk/gov/justice/services/eventstore/management/validation/process/TableRowCounterTest.java (100%) rename event-store-management/{ => event-store-management-core}/src/test/java/uk/gov/justice/services/eventstore/management/validation/process/VerificationResultTest.java (100%) rename event-store-management/{ => event-store-management-core}/src/test/java/uk/gov/justice/services/eventstore/management/validation/process/VerifierProviderTest.java (100%) create mode 100644 event-store-management/event-store-management-events/pom.xml rename event-store-management/{src/main/java/uk/gov/justice/services/eventstore/management/catchup/events => event-store-management-events/src/main/java/uk/gov/justice/services/eventstore/management/events/catchup}/CatchupCompletedEvent.java (94%) rename event-store-management/{src/main/java/uk/gov/justice/services/eventstore/management/catchup/events => event-store-management-events/src/main/java/uk/gov/justice/services/eventstore/management/events/catchup}/CatchupCompletedForSubscriptionEvent.java (95%) rename event-store-management/{src/main/java/uk/gov/justice/services/eventstore/management/catchup/events => event-store-management-events/src/main/java/uk/gov/justice/services/eventstore/management/events/catchup}/CatchupRequestedEvent.java (91%) rename event-store-management/{src/main/java/uk/gov/justice/services/eventstore/management/catchup/events => event-store-management-events/src/main/java/uk/gov/justice/services/eventstore/management/events/catchup}/CatchupStartedEvent.java (88%) rename event-store-management/{src/main/java/uk/gov/justice/services/eventstore/management/catchup/events => event-store-management-events/src/main/java/uk/gov/justice/services/eventstore/management/events/catchup}/CatchupStartedForSubscriptionEvent.java (91%) rename event-store-management/{src/main/java/uk/gov/justice/services/eventstore/management/catchup/commands => event-store-management-events/src/main/java/uk/gov/justice/services/eventstore/management/events/catchup}/CatchupType.java (77%) rename event-store-management/{src/main/java/uk/gov/justice/services/eventstore/management/rebuild/events => event-store-management-events/src/main/java/uk/gov/justice/services/eventstore/management/events/rebuild}/RebuildCompleteEvent.java (94%) rename event-store-management/{src/main/java/uk/gov/justice/services/eventstore/management/rebuild/events => event-store-management-events/src/main/java/uk/gov/justice/services/eventstore/management/events/rebuild}/RebuildRequestedEvent.java (94%) delete mode 100644 event-store-management/src/main/java/uk/gov/justice/services/eventstore/management/catchup/observers/CatchupObserver.java diff --git a/CHANGELOG.md b/CHANGELOG.md index f46e182e3..a1492296b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,8 @@ on [Keep a CHANGELOG](http://keepachangelog.com/). This project adheres to [Semantic Versioning](http://semver.org/). ## [Unreleased] +### Changed +- All system events moved into their own module 'event-store-management-events' ## [2.1.0] - 2019-09-26 ### Changed diff --git a/event-store-management/event-store-management-core/pom.xml b/event-store-management/event-store-management-core/pom.xml new file mode 100644 index 000000000..c65535949 --- /dev/null +++ b/event-store-management/event-store-management-core/pom.xml @@ -0,0 +1,87 @@ + + + + event-store + uk.gov.justice.event-store + 2.2.0-SNAPSHOT + + 4.0.0 + + event-store-management-core + + + + javax + javaee-api + provided + + + uk.gov.justice.framework-api + framework-api-messaging-jms + + + uk.gov.justice.utils + utilities-core + + + uk.gov.justice.event-store + published-event-processor + ${project.version} + + + uk.gov.justice.services + jmx-command-handling + + + uk.gov.justice.event-store + subscription-manager + ${project.version} + + + uk.gov.justice.services + framework-management + ${framework.version} + + + uk.gov.justice.services + jmx-api + ${framework.version} + + + uk.gov.justice.event-store + event-store-management-events + ${project.version} + + + + + org.mockito + mockito-core + test + + + junit + junit + test + + + uk.gov.justice.services + test-utils-core + test + + + org.slf4j + slf4j-log4j12 + test + + + uk.gov.justice.event-store + test-utils-persistence + ${project.version} + test + + + + diff --git a/event-store-management/src/main/java/uk/gov/justice/services/eventstore/management/catchup/commands/CatchupCommandHandler.java b/event-store-management/event-store-management-core/src/main/java/uk/gov/justice/services/eventstore/management/catchup/commands/CatchupCommandHandler.java similarity index 82% rename from event-store-management/src/main/java/uk/gov/justice/services/eventstore/management/catchup/commands/CatchupCommandHandler.java rename to event-store-management/event-store-management-core/src/main/java/uk/gov/justice/services/eventstore/management/catchup/commands/CatchupCommandHandler.java index 42d179d9a..1f8fe301a 100644 --- a/event-store-management/src/main/java/uk/gov/justice/services/eventstore/management/catchup/commands/CatchupCommandHandler.java +++ b/event-store-management/event-store-management-core/src/main/java/uk/gov/justice/services/eventstore/management/catchup/commands/CatchupCommandHandler.java @@ -1,13 +1,14 @@ package uk.gov.justice.services.eventstore.management.catchup.commands; import static java.lang.String.format; -import static uk.gov.justice.services.eventstore.management.catchup.commands.CatchupType.EVENT_CATCHUP; -import static uk.gov.justice.services.eventstore.management.catchup.commands.CatchupType.INDEX_CATCHUP; +import static uk.gov.justice.services.eventstore.management.events.catchup.CatchupType.EVENT_CATCHUP; +import static uk.gov.justice.services.eventstore.management.events.catchup.CatchupType.INDEX_CATCHUP; import static uk.gov.justice.services.jmx.api.command.CatchupCommand.CATCHUP; import static uk.gov.justice.services.jmx.api.command.IndexerCatchupCommand.INDEXER_CATCHUP; import uk.gov.justice.services.common.util.UtcClock; -import uk.gov.justice.services.eventstore.management.catchup.events.CatchupRequestedEvent; +import uk.gov.justice.services.eventstore.management.events.catchup.CatchupRequestedEvent; +import uk.gov.justice.services.eventstore.management.events.catchup.CatchupType; import uk.gov.justice.services.jmx.api.command.CatchupCommand; import uk.gov.justice.services.jmx.api.command.IndexerCatchupCommand; import uk.gov.justice.services.jmx.api.command.SystemCommand; diff --git a/event-store-management/src/main/java/uk/gov/justice/services/eventstore/management/catchup/observers/CatchupLifecycle.java b/event-store-management/event-store-management-core/src/main/java/uk/gov/justice/services/eventstore/management/catchup/observers/CatchupLifecycle.java similarity index 88% rename from event-store-management/src/main/java/uk/gov/justice/services/eventstore/management/catchup/observers/CatchupLifecycle.java rename to event-store-management/event-store-management-core/src/main/java/uk/gov/justice/services/eventstore/management/catchup/observers/CatchupLifecycle.java index a9579b0ef..297c24d03 100644 --- a/event-store-management/src/main/java/uk/gov/justice/services/eventstore/management/catchup/observers/CatchupLifecycle.java +++ b/event-store-management/event-store-management-core/src/main/java/uk/gov/justice/services/eventstore/management/catchup/observers/CatchupLifecycle.java @@ -3,16 +3,16 @@ import static java.lang.String.format; import uk.gov.justice.services.common.util.UtcClock; -import uk.gov.justice.services.eventstore.management.catchup.commands.CatchupType; -import uk.gov.justice.services.eventstore.management.catchup.events.CatchupCompletedEvent; -import uk.gov.justice.services.eventstore.management.catchup.events.CatchupCompletedForSubscriptionEvent; -import uk.gov.justice.services.eventstore.management.catchup.events.CatchupRequestedEvent; -import uk.gov.justice.services.eventstore.management.catchup.events.CatchupStartedEvent; -import uk.gov.justice.services.eventstore.management.catchup.events.CatchupStartedForSubscriptionEvent; import uk.gov.justice.services.eventstore.management.catchup.process.CatchupDurationCalculator; import uk.gov.justice.services.eventstore.management.catchup.process.CatchupInProgress; import uk.gov.justice.services.eventstore.management.catchup.process.CatchupsInProgressCache; import uk.gov.justice.services.eventstore.management.catchup.process.EventCatchupRunner; +import uk.gov.justice.services.eventstore.management.events.catchup.CatchupCompletedEvent; +import uk.gov.justice.services.eventstore.management.events.catchup.CatchupCompletedForSubscriptionEvent; +import uk.gov.justice.services.eventstore.management.events.catchup.CatchupRequestedEvent; +import uk.gov.justice.services.eventstore.management.events.catchup.CatchupStartedEvent; +import uk.gov.justice.services.eventstore.management.events.catchup.CatchupStartedForSubscriptionEvent; +import uk.gov.justice.services.eventstore.management.events.catchup.CatchupType; import uk.gov.justice.services.jmx.api.command.SystemCommand; import java.time.Duration; diff --git a/event-store-management/event-store-management-core/src/main/java/uk/gov/justice/services/eventstore/management/catchup/observers/CatchupObserver.java b/event-store-management/event-store-management-core/src/main/java/uk/gov/justice/services/eventstore/management/catchup/observers/CatchupObserver.java new file mode 100644 index 000000000..42bd5cb44 --- /dev/null +++ b/event-store-management/event-store-management-core/src/main/java/uk/gov/justice/services/eventstore/management/catchup/observers/CatchupObserver.java @@ -0,0 +1,49 @@ +package uk.gov.justice.services.eventstore.management.catchup.observers; + +import uk.gov.justice.services.eventstore.management.events.catchup.CatchupCompletedForSubscriptionEvent; +import uk.gov.justice.services.eventstore.management.events.catchup.CatchupRequestedEvent; +import uk.gov.justice.services.eventstore.management.events.catchup.CatchupStartedEvent; +import uk.gov.justice.services.eventstore.management.events.catchup.CatchupStartedForSubscriptionEvent; +import uk.gov.justice.services.eventstore.management.logging.MdcLogger; + +import javax.enterprise.context.ApplicationScoped; +import javax.enterprise.event.Observes; +import javax.inject.Inject; + +@ApplicationScoped +public class CatchupObserver { + + @Inject + private CatchupLifecycle catchupLifecycle; + + @Inject + private MdcLogger mdcLogger; + + public void onCatchupRequested(@Observes final CatchupRequestedEvent catchupRequestedEvent) { + + mdcLogger + .mdcLoggerConsumer() + .accept(() -> catchupLifecycle.handleCatchupRequested(catchupRequestedEvent)); + } + + public void onCatchupStarted(@Observes final CatchupStartedEvent catchupStartedEvent) { + + mdcLogger + .mdcLoggerConsumer() + .accept(() -> catchupLifecycle.handleCatchupStarted(catchupStartedEvent)); + } + + public void onCatchupStartedForSubscription(@Observes final CatchupStartedForSubscriptionEvent catchupStartedForSubscriptionEvent) { + + mdcLogger + .mdcLoggerConsumer() + .accept(() -> catchupLifecycle.handleCatchupStartedForSubscription(catchupStartedForSubscriptionEvent)); + } + + public void onCatchupCompleteForSubscription(@Observes final CatchupCompletedForSubscriptionEvent catchupCompletedForSubscriptionEvent) { + + mdcLogger + .mdcLoggerConsumer() + .accept(() -> catchupLifecycle.handleCatchupCompleteForSubscription(catchupCompletedForSubscriptionEvent)); + } +} diff --git a/event-store-management/src/main/java/uk/gov/justice/services/eventstore/management/catchup/process/CatchupDurationCalculator.java b/event-store-management/event-store-management-core/src/main/java/uk/gov/justice/services/eventstore/management/catchup/process/CatchupDurationCalculator.java similarity index 85% rename from event-store-management/src/main/java/uk/gov/justice/services/eventstore/management/catchup/process/CatchupDurationCalculator.java rename to event-store-management/event-store-management-core/src/main/java/uk/gov/justice/services/eventstore/management/catchup/process/CatchupDurationCalculator.java index e70b4739b..09c79cf97 100644 --- a/event-store-management/src/main/java/uk/gov/justice/services/eventstore/management/catchup/process/CatchupDurationCalculator.java +++ b/event-store-management/event-store-management-core/src/main/java/uk/gov/justice/services/eventstore/management/catchup/process/CatchupDurationCalculator.java @@ -2,7 +2,7 @@ import static java.time.Duration.between; -import uk.gov.justice.services.eventstore.management.catchup.events.CatchupCompletedForSubscriptionEvent; +import uk.gov.justice.services.eventstore.management.events.catchup.CatchupCompletedForSubscriptionEvent; import java.time.Duration; import java.time.Instant; diff --git a/event-store-management/src/main/java/uk/gov/justice/services/eventstore/management/catchup/process/CatchupInProgress.java b/event-store-management/event-store-management-core/src/main/java/uk/gov/justice/services/eventstore/management/catchup/process/CatchupInProgress.java similarity index 100% rename from event-store-management/src/main/java/uk/gov/justice/services/eventstore/management/catchup/process/CatchupInProgress.java rename to event-store-management/event-store-management-core/src/main/java/uk/gov/justice/services/eventstore/management/catchup/process/CatchupInProgress.java diff --git a/event-store-management/src/main/java/uk/gov/justice/services/eventstore/management/catchup/process/CatchupSubscriptionContext.java b/event-store-management/event-store-management-core/src/main/java/uk/gov/justice/services/eventstore/management/catchup/process/CatchupSubscriptionContext.java similarity index 96% rename from event-store-management/src/main/java/uk/gov/justice/services/eventstore/management/catchup/process/CatchupSubscriptionContext.java rename to event-store-management/event-store-management-core/src/main/java/uk/gov/justice/services/eventstore/management/catchup/process/CatchupSubscriptionContext.java index 70bfc6a70..d134aa99e 100644 --- a/event-store-management/src/main/java/uk/gov/justice/services/eventstore/management/catchup/process/CatchupSubscriptionContext.java +++ b/event-store-management/event-store-management-core/src/main/java/uk/gov/justice/services/eventstore/management/catchup/process/CatchupSubscriptionContext.java @@ -1,6 +1,6 @@ package uk.gov.justice.services.eventstore.management.catchup.process; -import uk.gov.justice.services.eventstore.management.catchup.commands.CatchupType; +import uk.gov.justice.services.eventstore.management.events.catchup.CatchupType; import uk.gov.justice.services.jmx.api.command.SystemCommand; import uk.gov.justice.subscription.domain.subscriptiondescriptor.Subscription; diff --git a/event-store-management/src/main/java/uk/gov/justice/services/eventstore/management/catchup/process/CatchupTypeSelector.java b/event-store-management/event-store-management-core/src/main/java/uk/gov/justice/services/eventstore/management/catchup/process/CatchupTypeSelector.java similarity index 69% rename from event-store-management/src/main/java/uk/gov/justice/services/eventstore/management/catchup/process/CatchupTypeSelector.java rename to event-store-management/event-store-management-core/src/main/java/uk/gov/justice/services/eventstore/management/catchup/process/CatchupTypeSelector.java index 1342a1b3d..002dea8d5 100644 --- a/event-store-management/src/main/java/uk/gov/justice/services/eventstore/management/catchup/process/CatchupTypeSelector.java +++ b/event-store-management/event-store-management-core/src/main/java/uk/gov/justice/services/eventstore/management/catchup/process/CatchupTypeSelector.java @@ -2,10 +2,10 @@ import static uk.gov.justice.services.core.annotation.Component.EVENT_INDEXER; import static uk.gov.justice.services.core.annotation.Component.EVENT_LISTENER; -import static uk.gov.justice.services.eventstore.management.catchup.commands.CatchupType.EVENT_CATCHUP; -import static uk.gov.justice.services.eventstore.management.catchup.commands.CatchupType.INDEX_CATCHUP; +import static uk.gov.justice.services.eventstore.management.events.catchup.CatchupType.EVENT_CATCHUP; +import static uk.gov.justice.services.eventstore.management.events.catchup.CatchupType.INDEX_CATCHUP; -import uk.gov.justice.services.eventstore.management.catchup.commands.CatchupType; +import uk.gov.justice.services.eventstore.management.events.catchup.CatchupType; public class CatchupTypeSelector { diff --git a/event-store-management/src/main/java/uk/gov/justice/services/eventstore/management/catchup/process/CatchupsInProgressCache.java b/event-store-management/event-store-management-core/src/main/java/uk/gov/justice/services/eventstore/management/catchup/process/CatchupsInProgressCache.java similarity index 89% rename from event-store-management/src/main/java/uk/gov/justice/services/eventstore/management/catchup/process/CatchupsInProgressCache.java rename to event-store-management/event-store-management-core/src/main/java/uk/gov/justice/services/eventstore/management/catchup/process/CatchupsInProgressCache.java index 2562d334a..bbdb71801 100644 --- a/event-store-management/src/main/java/uk/gov/justice/services/eventstore/management/catchup/process/CatchupsInProgressCache.java +++ b/event-store-management/event-store-management-core/src/main/java/uk/gov/justice/services/eventstore/management/catchup/process/CatchupsInProgressCache.java @@ -1,8 +1,8 @@ package uk.gov.justice.services.eventstore.management.catchup.process; -import static uk.gov.justice.services.eventstore.management.catchup.commands.CatchupType.INDEX_CATCHUP; +import static uk.gov.justice.services.eventstore.management.events.catchup.CatchupType.INDEX_CATCHUP; -import uk.gov.justice.services.eventstore.management.catchup.commands.CatchupType; +import uk.gov.justice.services.eventstore.management.events.catchup.CatchupType; import java.util.ArrayList; import java.util.List; diff --git a/event-store-management/src/main/java/uk/gov/justice/services/eventstore/management/catchup/process/EventCatchupByComponentRunner.java b/event-store-management/event-store-management-core/src/main/java/uk/gov/justice/services/eventstore/management/catchup/process/EventCatchupByComponentRunner.java similarity index 95% rename from event-store-management/src/main/java/uk/gov/justice/services/eventstore/management/catchup/process/EventCatchupByComponentRunner.java rename to event-store-management/event-store-management-core/src/main/java/uk/gov/justice/services/eventstore/management/catchup/process/EventCatchupByComponentRunner.java index f42af6dbd..673734033 100644 --- a/event-store-management/src/main/java/uk/gov/justice/services/eventstore/management/catchup/process/EventCatchupByComponentRunner.java +++ b/event-store-management/event-store-management-core/src/main/java/uk/gov/justice/services/eventstore/management/catchup/process/EventCatchupByComponentRunner.java @@ -2,7 +2,7 @@ import static java.lang.String.format; -import uk.gov.justice.services.eventstore.management.catchup.commands.CatchupType; +import uk.gov.justice.services.eventstore.management.events.catchup.CatchupType; import uk.gov.justice.services.jmx.api.command.SystemCommand; import uk.gov.justice.subscription.domain.subscriptiondescriptor.Subscription; import uk.gov.justice.subscription.domain.subscriptiondescriptor.SubscriptionsDescriptor; diff --git a/event-store-management/src/main/java/uk/gov/justice/services/eventstore/management/catchup/process/EventCatchupProcessor.java b/event-store-management/event-store-management-core/src/main/java/uk/gov/justice/services/eventstore/management/catchup/process/EventCatchupProcessor.java similarity index 93% rename from event-store-management/src/main/java/uk/gov/justice/services/eventstore/management/catchup/process/EventCatchupProcessor.java rename to event-store-management/event-store-management-core/src/main/java/uk/gov/justice/services/eventstore/management/catchup/process/EventCatchupProcessor.java index b8821b04f..5ee1c9b02 100644 --- a/event-store-management/src/main/java/uk/gov/justice/services/eventstore/management/catchup/process/EventCatchupProcessor.java +++ b/event-store-management/event-store-management-core/src/main/java/uk/gov/justice/services/eventstore/management/catchup/process/EventCatchupProcessor.java @@ -9,9 +9,9 @@ import uk.gov.justice.services.eventsourcing.repository.jdbc.event.MissingEventNumberException; import uk.gov.justice.services.eventsourcing.repository.jdbc.event.PublishedEvent; import uk.gov.justice.services.eventsourcing.source.api.service.core.PublishedEventSource; -import uk.gov.justice.services.eventstore.management.catchup.commands.CatchupType; -import uk.gov.justice.services.eventstore.management.catchup.events.CatchupCompletedForSubscriptionEvent; -import uk.gov.justice.services.eventstore.management.catchup.events.CatchupStartedForSubscriptionEvent; +import uk.gov.justice.services.eventstore.management.events.catchup.CatchupCompletedForSubscriptionEvent; +import uk.gov.justice.services.eventstore.management.events.catchup.CatchupStartedForSubscriptionEvent; +import uk.gov.justice.services.eventstore.management.events.catchup.CatchupType; import uk.gov.justice.services.jmx.api.command.SystemCommand; import uk.gov.justice.services.subscription.ProcessedEventTrackingService; import uk.gov.justice.subscription.domain.subscriptiondescriptor.Subscription; diff --git a/event-store-management/src/main/java/uk/gov/justice/services/eventstore/management/catchup/process/EventCatchupProcessorBean.java b/event-store-management/event-store-management-core/src/main/java/uk/gov/justice/services/eventstore/management/catchup/process/EventCatchupProcessorBean.java similarity index 100% rename from event-store-management/src/main/java/uk/gov/justice/services/eventstore/management/catchup/process/EventCatchupProcessorBean.java rename to event-store-management/event-store-management-core/src/main/java/uk/gov/justice/services/eventstore/management/catchup/process/EventCatchupProcessorBean.java diff --git a/event-store-management/src/main/java/uk/gov/justice/services/eventstore/management/catchup/process/EventCatchupRunner.java b/event-store-management/event-store-management-core/src/main/java/uk/gov/justice/services/eventstore/management/catchup/process/EventCatchupRunner.java similarity index 89% rename from event-store-management/src/main/java/uk/gov/justice/services/eventstore/management/catchup/process/EventCatchupRunner.java rename to event-store-management/event-store-management-core/src/main/java/uk/gov/justice/services/eventstore/management/catchup/process/EventCatchupRunner.java index 94fcb54a9..734284df1 100644 --- a/event-store-management/src/main/java/uk/gov/justice/services/eventstore/management/catchup/process/EventCatchupRunner.java +++ b/event-store-management/event-store-management-core/src/main/java/uk/gov/justice/services/eventstore/management/catchup/process/EventCatchupRunner.java @@ -3,8 +3,8 @@ import static java.lang.String.format; import uk.gov.justice.services.common.util.UtcClock; -import uk.gov.justice.services.eventstore.management.catchup.commands.CatchupType; -import uk.gov.justice.services.eventstore.management.catchup.events.CatchupStartedEvent; +import uk.gov.justice.services.eventstore.management.events.catchup.CatchupStartedEvent; +import uk.gov.justice.services.eventstore.management.events.catchup.CatchupType; import uk.gov.justice.services.jmx.api.command.SystemCommand; import uk.gov.justice.subscription.domain.subscriptiondescriptor.SubscriptionsDescriptor; import uk.gov.justice.subscription.registry.SubscriptionsDescriptorsRegistry; diff --git a/event-store-management/src/main/java/uk/gov/justice/services/eventstore/management/catchup/process/RunCatchupForComponentSelector.java b/event-store-management/event-store-management-core/src/main/java/uk/gov/justice/services/eventstore/management/catchup/process/RunCatchupForComponentSelector.java similarity index 87% rename from event-store-management/src/main/java/uk/gov/justice/services/eventstore/management/catchup/process/RunCatchupForComponentSelector.java rename to event-store-management/event-store-management-core/src/main/java/uk/gov/justice/services/eventstore/management/catchup/process/RunCatchupForComponentSelector.java index 8a79db07b..4c0c39e0e 100644 --- a/event-store-management/src/main/java/uk/gov/justice/services/eventstore/management/catchup/process/RunCatchupForComponentSelector.java +++ b/event-store-management/event-store-management-core/src/main/java/uk/gov/justice/services/eventstore/management/catchup/process/RunCatchupForComponentSelector.java @@ -1,6 +1,6 @@ package uk.gov.justice.services.eventstore.management.catchup.process; -import uk.gov.justice.services.eventstore.management.catchup.commands.CatchupType; +import uk.gov.justice.services.eventstore.management.events.catchup.CatchupType; import javax.inject.Inject; diff --git a/event-store-management/src/main/java/uk/gov/justice/services/eventstore/management/logging/MdcLogger.java b/event-store-management/event-store-management-core/src/main/java/uk/gov/justice/services/eventstore/management/logging/MdcLogger.java similarity index 100% rename from event-store-management/src/main/java/uk/gov/justice/services/eventstore/management/logging/MdcLogger.java rename to event-store-management/event-store-management-core/src/main/java/uk/gov/justice/services/eventstore/management/logging/MdcLogger.java diff --git a/event-store-management/src/main/java/uk/gov/justice/services/eventstore/management/rebuild/commands/RebuildCommandHandler.java b/event-store-management/event-store-management-core/src/main/java/uk/gov/justice/services/eventstore/management/rebuild/commands/RebuildCommandHandler.java similarity index 91% rename from event-store-management/src/main/java/uk/gov/justice/services/eventstore/management/rebuild/commands/RebuildCommandHandler.java rename to event-store-management/event-store-management-core/src/main/java/uk/gov/justice/services/eventstore/management/rebuild/commands/RebuildCommandHandler.java index 9d4277788..2a8d0aae0 100644 --- a/event-store-management/src/main/java/uk/gov/justice/services/eventstore/management/rebuild/commands/RebuildCommandHandler.java +++ b/event-store-management/event-store-management-core/src/main/java/uk/gov/justice/services/eventstore/management/rebuild/commands/RebuildCommandHandler.java @@ -4,7 +4,7 @@ import static uk.gov.justice.services.jmx.api.command.RebuildCommand.REBUILD; import uk.gov.justice.services.common.util.UtcClock; -import uk.gov.justice.services.eventstore.management.rebuild.events.RebuildRequestedEvent; +import uk.gov.justice.services.eventstore.management.events.rebuild.RebuildRequestedEvent; import uk.gov.justice.services.jmx.api.command.RebuildCommand; import uk.gov.justice.services.jmx.command.HandlesSystemCommand; diff --git a/event-store-management/src/main/java/uk/gov/justice/services/eventstore/management/rebuild/observers/RebuildObserver.java b/event-store-management/event-store-management-core/src/main/java/uk/gov/justice/services/eventstore/management/rebuild/observers/RebuildObserver.java similarity index 91% rename from event-store-management/src/main/java/uk/gov/justice/services/eventstore/management/rebuild/observers/RebuildObserver.java rename to event-store-management/event-store-management-core/src/main/java/uk/gov/justice/services/eventstore/management/rebuild/observers/RebuildObserver.java index 5a62d5501..dcbabfc8c 100644 --- a/event-store-management/src/main/java/uk/gov/justice/services/eventstore/management/rebuild/observers/RebuildObserver.java +++ b/event-store-management/event-store-management-core/src/main/java/uk/gov/justice/services/eventstore/management/rebuild/observers/RebuildObserver.java @@ -5,9 +5,9 @@ import uk.gov.justice.services.common.util.UtcClock; import uk.gov.justice.services.eventsourcing.publishedevent.rebuild.PublishedEventRebuilder; +import uk.gov.justice.services.eventstore.management.events.rebuild.RebuildCompleteEvent; +import uk.gov.justice.services.eventstore.management.events.rebuild.RebuildRequestedEvent; import uk.gov.justice.services.eventstore.management.logging.MdcLogger; -import uk.gov.justice.services.eventstore.management.rebuild.events.RebuildCompleteEvent; -import uk.gov.justice.services.eventstore.management.rebuild.events.RebuildRequestedEvent; import uk.gov.justice.services.jmx.api.command.SystemCommand; import java.time.ZonedDateTime; diff --git a/event-store-management/src/main/java/uk/gov/justice/services/eventstore/management/shuttering/observers/PublishQueueDrainedShutteringObserver.java b/event-store-management/event-store-management-core/src/main/java/uk/gov/justice/services/eventstore/management/shuttering/observers/PublishQueueDrainedShutteringObserver.java similarity index 100% rename from event-store-management/src/main/java/uk/gov/justice/services/eventstore/management/shuttering/observers/PublishQueueDrainedShutteringObserver.java rename to event-store-management/event-store-management-core/src/main/java/uk/gov/justice/services/eventstore/management/shuttering/observers/PublishQueueDrainedShutteringObserver.java diff --git a/event-store-management/src/main/java/uk/gov/justice/services/eventstore/management/shuttering/observers/ShutterCommandHandlerObserver.java b/event-store-management/event-store-management-core/src/main/java/uk/gov/justice/services/eventstore/management/shuttering/observers/ShutterCommandHandlerObserver.java similarity index 100% rename from event-store-management/src/main/java/uk/gov/justice/services/eventstore/management/shuttering/observers/ShutterCommandHandlerObserver.java rename to event-store-management/event-store-management-core/src/main/java/uk/gov/justice/services/eventstore/management/shuttering/observers/ShutterCommandHandlerObserver.java diff --git a/event-store-management/src/main/java/uk/gov/justice/services/eventstore/management/shuttering/observers/ShutteringException.java b/event-store-management/event-store-management-core/src/main/java/uk/gov/justice/services/eventstore/management/shuttering/observers/ShutteringException.java similarity index 100% rename from event-store-management/src/main/java/uk/gov/justice/services/eventstore/management/shuttering/observers/ShutteringException.java rename to event-store-management/event-store-management-core/src/main/java/uk/gov/justice/services/eventstore/management/shuttering/observers/ShutteringException.java diff --git a/event-store-management/src/main/java/uk/gov/justice/services/eventstore/management/shuttering/process/CommandHandlerQueueInterrogator.java b/event-store-management/event-store-management-core/src/main/java/uk/gov/justice/services/eventstore/management/shuttering/process/CommandHandlerQueueInterrogator.java similarity index 100% rename from event-store-management/src/main/java/uk/gov/justice/services/eventstore/management/shuttering/process/CommandHandlerQueueInterrogator.java rename to event-store-management/event-store-management-core/src/main/java/uk/gov/justice/services/eventstore/management/shuttering/process/CommandHandlerQueueInterrogator.java diff --git a/event-store-management/src/main/java/uk/gov/justice/services/eventstore/management/shuttering/process/CommandHandlerQueueSupplierFactory.java b/event-store-management/event-store-management-core/src/main/java/uk/gov/justice/services/eventstore/management/shuttering/process/CommandHandlerQueueSupplierFactory.java similarity index 100% rename from event-store-management/src/main/java/uk/gov/justice/services/eventstore/management/shuttering/process/CommandHandlerQueueSupplierFactory.java rename to event-store-management/event-store-management-core/src/main/java/uk/gov/justice/services/eventstore/management/shuttering/process/CommandHandlerQueueSupplierFactory.java diff --git a/event-store-management/src/main/java/uk/gov/justice/services/eventstore/management/shuttering/process/PublishQueueInterrogator.java b/event-store-management/event-store-management-core/src/main/java/uk/gov/justice/services/eventstore/management/shuttering/process/PublishQueueInterrogator.java similarity index 100% rename from event-store-management/src/main/java/uk/gov/justice/services/eventstore/management/shuttering/process/PublishQueueInterrogator.java rename to event-store-management/event-store-management-core/src/main/java/uk/gov/justice/services/eventstore/management/shuttering/process/PublishQueueInterrogator.java diff --git a/event-store-management/src/main/java/uk/gov/justice/services/eventstore/management/untrigger/commands/AddRemoveTriggerCommandHandler.java b/event-store-management/event-store-management-core/src/main/java/uk/gov/justice/services/eventstore/management/untrigger/commands/AddRemoveTriggerCommandHandler.java similarity index 100% rename from event-store-management/src/main/java/uk/gov/justice/services/eventstore/management/untrigger/commands/AddRemoveTriggerCommandHandler.java rename to event-store-management/event-store-management-core/src/main/java/uk/gov/justice/services/eventstore/management/untrigger/commands/AddRemoveTriggerCommandHandler.java diff --git a/event-store-management/src/main/java/uk/gov/justice/services/eventstore/management/untrigger/process/EventLogTriggerManipulator.java b/event-store-management/event-store-management-core/src/main/java/uk/gov/justice/services/eventstore/management/untrigger/process/EventLogTriggerManipulator.java similarity index 100% rename from event-store-management/src/main/java/uk/gov/justice/services/eventstore/management/untrigger/process/EventLogTriggerManipulator.java rename to event-store-management/event-store-management-core/src/main/java/uk/gov/justice/services/eventstore/management/untrigger/process/EventLogTriggerManipulator.java diff --git a/event-store-management/src/main/java/uk/gov/justice/services/eventstore/management/untrigger/process/EventStoreTriggerManipulatorProvider.java b/event-store-management/event-store-management-core/src/main/java/uk/gov/justice/services/eventstore/management/untrigger/process/EventStoreTriggerManipulatorProvider.java similarity index 100% rename from event-store-management/src/main/java/uk/gov/justice/services/eventstore/management/untrigger/process/EventStoreTriggerManipulatorProvider.java rename to event-store-management/event-store-management-core/src/main/java/uk/gov/justice/services/eventstore/management/untrigger/process/EventStoreTriggerManipulatorProvider.java diff --git a/event-store-management/src/main/java/uk/gov/justice/services/eventstore/management/validation/commands/VerifyCatchupCommandHandler.java b/event-store-management/event-store-management-core/src/main/java/uk/gov/justice/services/eventstore/management/validation/commands/VerifyCatchupCommandHandler.java similarity index 100% rename from event-store-management/src/main/java/uk/gov/justice/services/eventstore/management/validation/commands/VerifyCatchupCommandHandler.java rename to event-store-management/event-store-management-core/src/main/java/uk/gov/justice/services/eventstore/management/validation/commands/VerifyCatchupCommandHandler.java diff --git a/event-store-management/src/main/java/uk/gov/justice/services/eventstore/management/validation/process/ActiveStreamIdProvider.java b/event-store-management/event-store-management-core/src/main/java/uk/gov/justice/services/eventstore/management/validation/process/ActiveStreamIdProvider.java similarity index 100% rename from event-store-management/src/main/java/uk/gov/justice/services/eventstore/management/validation/process/ActiveStreamIdProvider.java rename to event-store-management/event-store-management-core/src/main/java/uk/gov/justice/services/eventstore/management/validation/process/ActiveStreamIdProvider.java diff --git a/event-store-management/src/main/java/uk/gov/justice/services/eventstore/management/validation/process/AllEventsInStreamsVerifier.java b/event-store-management/event-store-management-core/src/main/java/uk/gov/justice/services/eventstore/management/validation/process/AllEventsInStreamsVerifier.java similarity index 100% rename from event-store-management/src/main/java/uk/gov/justice/services/eventstore/management/validation/process/AllEventsInStreamsVerifier.java rename to event-store-management/event-store-management-core/src/main/java/uk/gov/justice/services/eventstore/management/validation/process/AllEventsInStreamsVerifier.java diff --git a/event-store-management/src/main/java/uk/gov/justice/services/eventstore/management/validation/process/CatchupVerificationException.java b/event-store-management/event-store-management-core/src/main/java/uk/gov/justice/services/eventstore/management/validation/process/CatchupVerificationException.java similarity index 100% rename from event-store-management/src/main/java/uk/gov/justice/services/eventstore/management/validation/process/CatchupVerificationException.java rename to event-store-management/event-store-management-core/src/main/java/uk/gov/justice/services/eventstore/management/validation/process/CatchupVerificationException.java diff --git a/event-store-management/src/main/java/uk/gov/justice/services/eventstore/management/validation/process/CatchupVerificationProcess.java b/event-store-management/event-store-management-core/src/main/java/uk/gov/justice/services/eventstore/management/validation/process/CatchupVerificationProcess.java similarity index 100% rename from event-store-management/src/main/java/uk/gov/justice/services/eventstore/management/validation/process/CatchupVerificationProcess.java rename to event-store-management/event-store-management-core/src/main/java/uk/gov/justice/services/eventstore/management/validation/process/CatchupVerificationProcess.java diff --git a/event-store-management/src/main/java/uk/gov/justice/services/eventstore/management/validation/process/EventLinkageChecker.java b/event-store-management/event-store-management-core/src/main/java/uk/gov/justice/services/eventstore/management/validation/process/EventLinkageChecker.java similarity index 100% rename from event-store-management/src/main/java/uk/gov/justice/services/eventstore/management/validation/process/EventLinkageChecker.java rename to event-store-management/event-store-management-core/src/main/java/uk/gov/justice/services/eventstore/management/validation/process/EventLinkageChecker.java diff --git a/event-store-management/src/main/java/uk/gov/justice/services/eventstore/management/validation/process/EventLogActiveEventRowCounter.java b/event-store-management/event-store-management-core/src/main/java/uk/gov/justice/services/eventstore/management/validation/process/EventLogActiveEventRowCounter.java similarity index 100% rename from event-store-management/src/main/java/uk/gov/justice/services/eventstore/management/validation/process/EventLogActiveEventRowCounter.java rename to event-store-management/event-store-management-core/src/main/java/uk/gov/justice/services/eventstore/management/validation/process/EventLogActiveEventRowCounter.java diff --git a/event-store-management/src/main/java/uk/gov/justice/services/eventstore/management/validation/process/ProcessedEventCountVerifier.java b/event-store-management/event-store-management-core/src/main/java/uk/gov/justice/services/eventstore/management/validation/process/ProcessedEventCountVerifier.java similarity index 100% rename from event-store-management/src/main/java/uk/gov/justice/services/eventstore/management/validation/process/ProcessedEventCountVerifier.java rename to event-store-management/event-store-management-core/src/main/java/uk/gov/justice/services/eventstore/management/validation/process/ProcessedEventCountVerifier.java diff --git a/event-store-management/src/main/java/uk/gov/justice/services/eventstore/management/validation/process/ProcessedEventLinkVerifier.java b/event-store-management/event-store-management-core/src/main/java/uk/gov/justice/services/eventstore/management/validation/process/ProcessedEventLinkVerifier.java similarity index 100% rename from event-store-management/src/main/java/uk/gov/justice/services/eventstore/management/validation/process/ProcessedEventLinkVerifier.java rename to event-store-management/event-store-management-core/src/main/java/uk/gov/justice/services/eventstore/management/validation/process/ProcessedEventLinkVerifier.java diff --git a/event-store-management/src/main/java/uk/gov/justice/services/eventstore/management/validation/process/PublishedEventCountVerifier.java b/event-store-management/event-store-management-core/src/main/java/uk/gov/justice/services/eventstore/management/validation/process/PublishedEventCountVerifier.java similarity index 100% rename from event-store-management/src/main/java/uk/gov/justice/services/eventstore/management/validation/process/PublishedEventCountVerifier.java rename to event-store-management/event-store-management-core/src/main/java/uk/gov/justice/services/eventstore/management/validation/process/PublishedEventCountVerifier.java diff --git a/event-store-management/src/main/java/uk/gov/justice/services/eventstore/management/validation/process/PublishedEventLinkVerifier.java b/event-store-management/event-store-management-core/src/main/java/uk/gov/justice/services/eventstore/management/validation/process/PublishedEventLinkVerifier.java similarity index 100% rename from event-store-management/src/main/java/uk/gov/justice/services/eventstore/management/validation/process/PublishedEventLinkVerifier.java rename to event-store-management/event-store-management-core/src/main/java/uk/gov/justice/services/eventstore/management/validation/process/PublishedEventLinkVerifier.java diff --git a/event-store-management/src/main/java/uk/gov/justice/services/eventstore/management/validation/process/StreamBufferEmptyVerifier.java b/event-store-management/event-store-management-core/src/main/java/uk/gov/justice/services/eventstore/management/validation/process/StreamBufferEmptyVerifier.java similarity index 100% rename from event-store-management/src/main/java/uk/gov/justice/services/eventstore/management/validation/process/StreamBufferEmptyVerifier.java rename to event-store-management/event-store-management-core/src/main/java/uk/gov/justice/services/eventstore/management/validation/process/StreamBufferEmptyVerifier.java diff --git a/event-store-management/src/main/java/uk/gov/justice/services/eventstore/management/validation/process/TableRowCounter.java b/event-store-management/event-store-management-core/src/main/java/uk/gov/justice/services/eventstore/management/validation/process/TableRowCounter.java similarity index 100% rename from event-store-management/src/main/java/uk/gov/justice/services/eventstore/management/validation/process/TableRowCounter.java rename to event-store-management/event-store-management-core/src/main/java/uk/gov/justice/services/eventstore/management/validation/process/TableRowCounter.java diff --git a/event-store-management/src/main/java/uk/gov/justice/services/eventstore/management/validation/process/VerificationResult.java b/event-store-management/event-store-management-core/src/main/java/uk/gov/justice/services/eventstore/management/validation/process/VerificationResult.java similarity index 100% rename from event-store-management/src/main/java/uk/gov/justice/services/eventstore/management/validation/process/VerificationResult.java rename to event-store-management/event-store-management-core/src/main/java/uk/gov/justice/services/eventstore/management/validation/process/VerificationResult.java diff --git a/event-store-management/src/main/java/uk/gov/justice/services/eventstore/management/validation/process/Verifier.java b/event-store-management/event-store-management-core/src/main/java/uk/gov/justice/services/eventstore/management/validation/process/Verifier.java similarity index 100% rename from event-store-management/src/main/java/uk/gov/justice/services/eventstore/management/validation/process/Verifier.java rename to event-store-management/event-store-management-core/src/main/java/uk/gov/justice/services/eventstore/management/validation/process/Verifier.java diff --git a/event-store-management/src/main/java/uk/gov/justice/services/eventstore/management/validation/process/VerifierProvider.java b/event-store-management/event-store-management-core/src/main/java/uk/gov/justice/services/eventstore/management/validation/process/VerifierProvider.java similarity index 100% rename from event-store-management/src/main/java/uk/gov/justice/services/eventstore/management/validation/process/VerifierProvider.java rename to event-store-management/event-store-management-core/src/main/java/uk/gov/justice/services/eventstore/management/validation/process/VerifierProvider.java diff --git a/event-store-management/src/main/resources/META-INF/beans.xml b/event-store-management/event-store-management-core/src/main/resources/META-INF/beans.xml similarity index 100% rename from event-store-management/src/main/resources/META-INF/beans.xml rename to event-store-management/event-store-management-core/src/main/resources/META-INF/beans.xml diff --git a/event-store-management/src/test/java/uk/gov/justice/services/eventstore/management/catchup/commands/CatchupCommandHandlerTest.java b/event-store-management/event-store-management-core/src/test/java/uk/gov/justice/services/eventstore/management/catchup/commands/CatchupCommandHandlerTest.java similarity index 87% rename from event-store-management/src/test/java/uk/gov/justice/services/eventstore/management/catchup/commands/CatchupCommandHandlerTest.java rename to event-store-management/event-store-management-core/src/test/java/uk/gov/justice/services/eventstore/management/catchup/commands/CatchupCommandHandlerTest.java index 1c8e82f93..1f89fc6f4 100644 --- a/event-store-management/src/test/java/uk/gov/justice/services/eventstore/management/catchup/commands/CatchupCommandHandlerTest.java +++ b/event-store-management/event-store-management-core/src/test/java/uk/gov/justice/services/eventstore/management/catchup/commands/CatchupCommandHandlerTest.java @@ -4,11 +4,11 @@ import static java.time.ZonedDateTime.of; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import static uk.gov.justice.services.eventstore.management.catchup.commands.CatchupType.EVENT_CATCHUP; -import static uk.gov.justice.services.eventstore.management.catchup.commands.CatchupType.INDEX_CATCHUP; +import static uk.gov.justice.services.eventstore.management.events.catchup.CatchupType.EVENT_CATCHUP; +import static uk.gov.justice.services.eventstore.management.events.catchup.CatchupType.INDEX_CATCHUP; import uk.gov.justice.services.common.util.UtcClock; -import uk.gov.justice.services.eventstore.management.catchup.events.CatchupRequestedEvent; +import uk.gov.justice.services.eventstore.management.events.catchup.CatchupRequestedEvent; import uk.gov.justice.services.jmx.api.command.CatchupCommand; import uk.gov.justice.services.jmx.api.command.IndexerCatchupCommand; diff --git a/event-store-management/src/test/java/uk/gov/justice/services/eventstore/management/catchup/observers/CatchupLifecycleTest.java b/event-store-management/event-store-management-core/src/test/java/uk/gov/justice/services/eventstore/management/catchup/observers/CatchupLifecycleTest.java similarity index 92% rename from event-store-management/src/test/java/uk/gov/justice/services/eventstore/management/catchup/observers/CatchupLifecycleTest.java rename to event-store-management/event-store-management-core/src/test/java/uk/gov/justice/services/eventstore/management/catchup/observers/CatchupLifecycleTest.java index f60178202..5e230d329 100644 --- a/event-store-management/src/test/java/uk/gov/justice/services/eventstore/management/catchup/observers/CatchupLifecycleTest.java +++ b/event-store-management/event-store-management-core/src/test/java/uk/gov/justice/services/eventstore/management/catchup/observers/CatchupLifecycleTest.java @@ -9,19 +9,19 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verifyZeroInteractions; import static org.mockito.Mockito.when; -import static uk.gov.justice.services.eventstore.management.catchup.commands.CatchupType.EVENT_CATCHUP; +import static uk.gov.justice.services.eventstore.management.events.catchup.CatchupType.EVENT_CATCHUP; import uk.gov.justice.services.common.util.UtcClock; -import uk.gov.justice.services.eventstore.management.catchup.commands.CatchupType; -import uk.gov.justice.services.eventstore.management.catchup.events.CatchupCompletedEvent; -import uk.gov.justice.services.eventstore.management.catchup.events.CatchupCompletedForSubscriptionEvent; -import uk.gov.justice.services.eventstore.management.catchup.events.CatchupRequestedEvent; -import uk.gov.justice.services.eventstore.management.catchup.events.CatchupStartedEvent; -import uk.gov.justice.services.eventstore.management.catchup.events.CatchupStartedForSubscriptionEvent; import uk.gov.justice.services.eventstore.management.catchup.process.CatchupDurationCalculator; import uk.gov.justice.services.eventstore.management.catchup.process.CatchupInProgress; import uk.gov.justice.services.eventstore.management.catchup.process.CatchupsInProgressCache; import uk.gov.justice.services.eventstore.management.catchup.process.EventCatchupRunner; +import uk.gov.justice.services.eventstore.management.events.catchup.CatchupCompletedEvent; +import uk.gov.justice.services.eventstore.management.events.catchup.CatchupCompletedForSubscriptionEvent; +import uk.gov.justice.services.eventstore.management.events.catchup.CatchupRequestedEvent; +import uk.gov.justice.services.eventstore.management.events.catchup.CatchupStartedEvent; +import uk.gov.justice.services.eventstore.management.events.catchup.CatchupStartedForSubscriptionEvent; +import uk.gov.justice.services.eventstore.management.events.catchup.CatchupType; import uk.gov.justice.services.jmx.api.command.CatchupCommand; import uk.gov.justice.services.jmx.api.command.SystemCommand; diff --git a/event-store-management/src/test/java/uk/gov/justice/services/eventstore/management/catchup/observers/CatchupObserverTest.java b/event-store-management/event-store-management-core/src/test/java/uk/gov/justice/services/eventstore/management/catchup/observers/CatchupObserverTest.java similarity index 86% rename from event-store-management/src/test/java/uk/gov/justice/services/eventstore/management/catchup/observers/CatchupObserverTest.java rename to event-store-management/event-store-management-core/src/test/java/uk/gov/justice/services/eventstore/management/catchup/observers/CatchupObserverTest.java index 9bd966127..d6464bece 100644 --- a/event-store-management/src/test/java/uk/gov/justice/services/eventstore/management/catchup/observers/CatchupObserverTest.java +++ b/event-store-management/event-store-management-core/src/test/java/uk/gov/justice/services/eventstore/management/catchup/observers/CatchupObserverTest.java @@ -4,10 +4,10 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import uk.gov.justice.services.eventstore.management.catchup.events.CatchupCompletedForSubscriptionEvent; -import uk.gov.justice.services.eventstore.management.catchup.events.CatchupRequestedEvent; -import uk.gov.justice.services.eventstore.management.catchup.events.CatchupStartedEvent; -import uk.gov.justice.services.eventstore.management.catchup.events.CatchupStartedForSubscriptionEvent; +import uk.gov.justice.services.eventstore.management.events.catchup.CatchupCompletedForSubscriptionEvent; +import uk.gov.justice.services.eventstore.management.events.catchup.CatchupRequestedEvent; +import uk.gov.justice.services.eventstore.management.events.catchup.CatchupStartedEvent; +import uk.gov.justice.services.eventstore.management.events.catchup.CatchupStartedForSubscriptionEvent; import uk.gov.justice.services.eventstore.management.logging.MdcLogger; import java.util.function.Consumer; diff --git a/event-store-management/src/test/java/uk/gov/justice/services/eventstore/management/catchup/process/CatchupDurationCalculatorTest.java b/event-store-management/event-store-management-core/src/test/java/uk/gov/justice/services/eventstore/management/catchup/process/CatchupDurationCalculatorTest.java similarity index 93% rename from event-store-management/src/test/java/uk/gov/justice/services/eventstore/management/catchup/process/CatchupDurationCalculatorTest.java rename to event-store-management/event-store-management-core/src/test/java/uk/gov/justice/services/eventstore/management/catchup/process/CatchupDurationCalculatorTest.java index f749a4323..9b0bee97e 100644 --- a/event-store-management/src/test/java/uk/gov/justice/services/eventstore/management/catchup/process/CatchupDurationCalculatorTest.java +++ b/event-store-management/event-store-management-core/src/test/java/uk/gov/justice/services/eventstore/management/catchup/process/CatchupDurationCalculatorTest.java @@ -6,7 +6,7 @@ import static org.mockito.Mockito.when; import uk.gov.justice.services.common.util.UtcClock; -import uk.gov.justice.services.eventstore.management.catchup.events.CatchupCompletedForSubscriptionEvent; +import uk.gov.justice.services.eventstore.management.events.catchup.CatchupCompletedForSubscriptionEvent; import java.time.Duration; import java.time.ZonedDateTime; diff --git a/event-store-management/src/test/java/uk/gov/justice/services/eventstore/management/catchup/process/CatchupTypeSelectorTest.java b/event-store-management/event-store-management-core/src/test/java/uk/gov/justice/services/eventstore/management/catchup/process/CatchupTypeSelectorTest.java similarity index 86% rename from event-store-management/src/test/java/uk/gov/justice/services/eventstore/management/catchup/process/CatchupTypeSelectorTest.java rename to event-store-management/event-store-management-core/src/test/java/uk/gov/justice/services/eventstore/management/catchup/process/CatchupTypeSelectorTest.java index 7cbc548f1..9fa4f0c58 100644 --- a/event-store-management/src/test/java/uk/gov/justice/services/eventstore/management/catchup/process/CatchupTypeSelectorTest.java +++ b/event-store-management/event-store-management-core/src/test/java/uk/gov/justice/services/eventstore/management/catchup/process/CatchupTypeSelectorTest.java @@ -2,8 +2,8 @@ import static org.hamcrest.CoreMatchers.is; import static org.junit.Assert.assertThat; -import static uk.gov.justice.services.eventstore.management.catchup.commands.CatchupType.EVENT_CATCHUP; -import static uk.gov.justice.services.eventstore.management.catchup.commands.CatchupType.INDEX_CATCHUP; +import static uk.gov.justice.services.eventstore.management.events.catchup.CatchupType.EVENT_CATCHUP; +import static uk.gov.justice.services.eventstore.management.events.catchup.CatchupType.INDEX_CATCHUP; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/event-store-management/src/test/java/uk/gov/justice/services/eventstore/management/catchup/process/CatchupsInProgressCacheTest.java b/event-store-management/event-store-management-core/src/test/java/uk/gov/justice/services/eventstore/management/catchup/process/CatchupsInProgressCacheTest.java similarity index 97% rename from event-store-management/src/test/java/uk/gov/justice/services/eventstore/management/catchup/process/CatchupsInProgressCacheTest.java rename to event-store-management/event-store-management-core/src/test/java/uk/gov/justice/services/eventstore/management/catchup/process/CatchupsInProgressCacheTest.java index 520a7a8d2..1c915517b 100644 --- a/event-store-management/src/test/java/uk/gov/justice/services/eventstore/management/catchup/process/CatchupsInProgressCacheTest.java +++ b/event-store-management/event-store-management-core/src/test/java/uk/gov/justice/services/eventstore/management/catchup/process/CatchupsInProgressCacheTest.java @@ -4,8 +4,8 @@ import static org.junit.Assert.assertThat; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -import static uk.gov.justice.services.eventstore.management.catchup.commands.CatchupType.EVENT_CATCHUP; -import static uk.gov.justice.services.eventstore.management.catchup.commands.CatchupType.INDEX_CATCHUP; +import static uk.gov.justice.services.eventstore.management.events.catchup.CatchupType.EVENT_CATCHUP; +import static uk.gov.justice.services.eventstore.management.events.catchup.CatchupType.INDEX_CATCHUP; import uk.gov.justice.services.common.util.UtcClock; diff --git a/event-store-management/src/test/java/uk/gov/justice/services/eventstore/management/catchup/process/EventCatchupByComponentRunnerTest.java b/event-store-management/event-store-management-core/src/test/java/uk/gov/justice/services/eventstore/management/catchup/process/EventCatchupByComponentRunnerTest.java similarity index 97% rename from event-store-management/src/test/java/uk/gov/justice/services/eventstore/management/catchup/process/EventCatchupByComponentRunnerTest.java rename to event-store-management/event-store-management-core/src/test/java/uk/gov/justice/services/eventstore/management/catchup/process/EventCatchupByComponentRunnerTest.java index 9b286062e..106ff5c0d 100644 --- a/event-store-management/src/test/java/uk/gov/justice/services/eventstore/management/catchup/process/EventCatchupByComponentRunnerTest.java +++ b/event-store-management/event-store-management-core/src/test/java/uk/gov/justice/services/eventstore/management/catchup/process/EventCatchupByComponentRunnerTest.java @@ -5,7 +5,7 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verifyZeroInteractions; import static org.mockito.Mockito.when; -import static uk.gov.justice.services.eventstore.management.catchup.commands.CatchupType.EVENT_CATCHUP; +import static uk.gov.justice.services.eventstore.management.events.catchup.CatchupType.EVENT_CATCHUP; import uk.gov.justice.services.jmx.api.command.CatchupCommand; import uk.gov.justice.subscription.domain.subscriptiondescriptor.Subscription; diff --git a/event-store-management/src/test/java/uk/gov/justice/services/eventstore/management/catchup/process/EventCatchupProcessorBeanTest.java b/event-store-management/event-store-management-core/src/test/java/uk/gov/justice/services/eventstore/management/catchup/process/EventCatchupProcessorBeanTest.java similarity index 100% rename from event-store-management/src/test/java/uk/gov/justice/services/eventstore/management/catchup/process/EventCatchupProcessorBeanTest.java rename to event-store-management/event-store-management-core/src/test/java/uk/gov/justice/services/eventstore/management/catchup/process/EventCatchupProcessorBeanTest.java diff --git a/event-store-management/src/test/java/uk/gov/justice/services/eventstore/management/catchup/process/EventCatchupProcessorTest.java b/event-store-management/event-store-management-core/src/test/java/uk/gov/justice/services/eventstore/management/catchup/process/EventCatchupProcessorTest.java similarity index 96% rename from event-store-management/src/test/java/uk/gov/justice/services/eventstore/management/catchup/process/EventCatchupProcessorTest.java rename to event-store-management/event-store-management-core/src/test/java/uk/gov/justice/services/eventstore/management/catchup/process/EventCatchupProcessorTest.java index 6e978eba4..458db0433 100644 --- a/event-store-management/src/test/java/uk/gov/justice/services/eventstore/management/catchup/process/EventCatchupProcessorTest.java +++ b/event-store-management/event-store-management-core/src/test/java/uk/gov/justice/services/eventstore/management/catchup/process/EventCatchupProcessorTest.java @@ -11,7 +11,7 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import static uk.gov.justice.services.eventstore.management.catchup.commands.CatchupType.EVENT_CATCHUP; +import static uk.gov.justice.services.eventstore.management.events.catchup.CatchupType.EVENT_CATCHUP; import uk.gov.justice.services.common.util.UtcClock; import uk.gov.justice.services.event.sourcing.subscription.catchup.consumer.manager.ConcurrentEventStreamConsumerManager; @@ -19,8 +19,8 @@ import uk.gov.justice.services.eventsourcing.repository.jdbc.event.MissingEventNumberException; import uk.gov.justice.services.eventsourcing.repository.jdbc.event.PublishedEvent; import uk.gov.justice.services.eventsourcing.source.api.service.core.PublishedEventSource; -import uk.gov.justice.services.eventstore.management.catchup.events.CatchupCompletedForSubscriptionEvent; -import uk.gov.justice.services.eventstore.management.catchup.events.CatchupStartedForSubscriptionEvent; +import uk.gov.justice.services.eventstore.management.events.catchup.CatchupCompletedForSubscriptionEvent; +import uk.gov.justice.services.eventstore.management.events.catchup.CatchupStartedForSubscriptionEvent; import uk.gov.justice.services.jmx.api.command.SystemCommand; import uk.gov.justice.services.subscription.ProcessedEventTrackingService; import uk.gov.justice.subscription.domain.subscriptiondescriptor.Subscription; diff --git a/event-store-management/src/test/java/uk/gov/justice/services/eventstore/management/catchup/process/EventCatchupRunnerTest.java b/event-store-management/event-store-management-core/src/test/java/uk/gov/justice/services/eventstore/management/catchup/process/EventCatchupRunnerTest.java similarity index 93% rename from event-store-management/src/test/java/uk/gov/justice/services/eventstore/management/catchup/process/EventCatchupRunnerTest.java rename to event-store-management/event-store-management-core/src/test/java/uk/gov/justice/services/eventstore/management/catchup/process/EventCatchupRunnerTest.java index d1e689622..2183d500a 100644 --- a/event-store-management/src/test/java/uk/gov/justice/services/eventstore/management/catchup/process/EventCatchupRunnerTest.java +++ b/event-store-management/event-store-management-core/src/test/java/uk/gov/justice/services/eventstore/management/catchup/process/EventCatchupRunnerTest.java @@ -4,10 +4,10 @@ import static org.mockito.Mockito.inOrder; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -import static uk.gov.justice.services.eventstore.management.catchup.commands.CatchupType.EVENT_CATCHUP; +import static uk.gov.justice.services.eventstore.management.events.catchup.CatchupType.EVENT_CATCHUP; import uk.gov.justice.services.common.util.UtcClock; -import uk.gov.justice.services.eventstore.management.catchup.events.CatchupStartedEvent; +import uk.gov.justice.services.eventstore.management.events.catchup.CatchupStartedEvent; import uk.gov.justice.services.jmx.api.command.CatchupCommand; import uk.gov.justice.subscription.domain.subscriptiondescriptor.SubscriptionsDescriptor; import uk.gov.justice.subscription.registry.SubscriptionsDescriptorsRegistry; diff --git a/event-store-management/src/test/java/uk/gov/justice/services/eventstore/management/catchup/process/RunCatchupForComponentSelectorTest.java b/event-store-management/event-store-management-core/src/test/java/uk/gov/justice/services/eventstore/management/catchup/process/RunCatchupForComponentSelectorTest.java similarity index 89% rename from event-store-management/src/test/java/uk/gov/justice/services/eventstore/management/catchup/process/RunCatchupForComponentSelectorTest.java rename to event-store-management/event-store-management-core/src/test/java/uk/gov/justice/services/eventstore/management/catchup/process/RunCatchupForComponentSelectorTest.java index d9f959ec9..c6347f684 100644 --- a/event-store-management/src/test/java/uk/gov/justice/services/eventstore/management/catchup/process/RunCatchupForComponentSelectorTest.java +++ b/event-store-management/event-store-management-core/src/test/java/uk/gov/justice/services/eventstore/management/catchup/process/RunCatchupForComponentSelectorTest.java @@ -3,10 +3,10 @@ import static org.hamcrest.CoreMatchers.is; import static org.junit.Assert.assertThat; import static org.mockito.Mockito.when; -import static uk.gov.justice.services.eventstore.management.catchup.commands.CatchupType.EVENT_CATCHUP; -import static uk.gov.justice.services.eventstore.management.catchup.commands.CatchupType.INDEX_CATCHUP; +import static uk.gov.justice.services.eventstore.management.events.catchup.CatchupType.EVENT_CATCHUP; +import static uk.gov.justice.services.eventstore.management.events.catchup.CatchupType.INDEX_CATCHUP; -import uk.gov.justice.services.eventstore.management.catchup.commands.CatchupType; +import uk.gov.justice.services.eventstore.management.events.catchup.CatchupType; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/event-store-management/src/test/java/uk/gov/justice/services/eventstore/management/logging/MdcLoggerTest.java b/event-store-management/event-store-management-core/src/test/java/uk/gov/justice/services/eventstore/management/logging/MdcLoggerTest.java similarity index 100% rename from event-store-management/src/test/java/uk/gov/justice/services/eventstore/management/logging/MdcLoggerTest.java rename to event-store-management/event-store-management-core/src/test/java/uk/gov/justice/services/eventstore/management/logging/MdcLoggerTest.java diff --git a/event-store-management/src/test/java/uk/gov/justice/services/eventstore/management/rebuild/commands/RebuildCommandHandlerTest.java b/event-store-management/event-store-management-core/src/test/java/uk/gov/justice/services/eventstore/management/rebuild/commands/RebuildCommandHandlerTest.java similarity index 95% rename from event-store-management/src/test/java/uk/gov/justice/services/eventstore/management/rebuild/commands/RebuildCommandHandlerTest.java rename to event-store-management/event-store-management-core/src/test/java/uk/gov/justice/services/eventstore/management/rebuild/commands/RebuildCommandHandlerTest.java index c339335d5..e7dc21b5b 100644 --- a/event-store-management/src/test/java/uk/gov/justice/services/eventstore/management/rebuild/commands/RebuildCommandHandlerTest.java +++ b/event-store-management/event-store-management-core/src/test/java/uk/gov/justice/services/eventstore/management/rebuild/commands/RebuildCommandHandlerTest.java @@ -6,7 +6,7 @@ import static org.mockito.Mockito.when; import uk.gov.justice.services.common.util.UtcClock; -import uk.gov.justice.services.eventstore.management.rebuild.events.RebuildRequestedEvent; +import uk.gov.justice.services.eventstore.management.events.rebuild.RebuildRequestedEvent; import uk.gov.justice.services.jmx.api.command.RebuildCommand; import uk.gov.justice.services.management.shuttering.events.ShutteringRequestedEvent; import uk.gov.justice.services.management.shuttering.events.UnshutteringRequestedEvent; diff --git a/event-store-management/src/test/java/uk/gov/justice/services/eventstore/management/rebuild/observers/RebuildObserverTest.java b/event-store-management/event-store-management-core/src/test/java/uk/gov/justice/services/eventstore/management/rebuild/observers/RebuildObserverTest.java similarity index 93% rename from event-store-management/src/test/java/uk/gov/justice/services/eventstore/management/rebuild/observers/RebuildObserverTest.java rename to event-store-management/event-store-management-core/src/test/java/uk/gov/justice/services/eventstore/management/rebuild/observers/RebuildObserverTest.java index 94aa95252..5c530883d 100644 --- a/event-store-management/src/test/java/uk/gov/justice/services/eventstore/management/rebuild/observers/RebuildObserverTest.java +++ b/event-store-management/event-store-management-core/src/test/java/uk/gov/justice/services/eventstore/management/rebuild/observers/RebuildObserverTest.java @@ -7,9 +7,9 @@ import uk.gov.justice.services.common.util.UtcClock; import uk.gov.justice.services.eventsourcing.publishedevent.rebuild.PublishedEventRebuilder; +import uk.gov.justice.services.eventstore.management.events.rebuild.RebuildCompleteEvent; +import uk.gov.justice.services.eventstore.management.events.rebuild.RebuildRequestedEvent; import uk.gov.justice.services.eventstore.management.logging.MdcLogger; -import uk.gov.justice.services.eventstore.management.rebuild.events.RebuildCompleteEvent; -import uk.gov.justice.services.eventstore.management.rebuild.events.RebuildRequestedEvent; import uk.gov.justice.services.jmx.api.command.RebuildCommand; import java.time.ZonedDateTime; @@ -25,7 +25,6 @@ import org.mockito.runners.MockitoJUnitRunner; import org.slf4j.Logger; - @RunWith(MockitoJUnitRunner.class) public class RebuildObserverTest { diff --git a/event-store-management/src/test/java/uk/gov/justice/services/eventstore/management/shuttering/observers/PublishQueueDrainedShutteringObserverTest.java b/event-store-management/event-store-management-core/src/test/java/uk/gov/justice/services/eventstore/management/shuttering/observers/PublishQueueDrainedShutteringObserverTest.java similarity index 100% rename from event-store-management/src/test/java/uk/gov/justice/services/eventstore/management/shuttering/observers/PublishQueueDrainedShutteringObserverTest.java rename to event-store-management/event-store-management-core/src/test/java/uk/gov/justice/services/eventstore/management/shuttering/observers/PublishQueueDrainedShutteringObserverTest.java diff --git a/event-store-management/src/test/java/uk/gov/justice/services/eventstore/management/shuttering/observers/ShutterCommandHandlerObserverTest.java b/event-store-management/event-store-management-core/src/test/java/uk/gov/justice/services/eventstore/management/shuttering/observers/ShutterCommandHandlerObserverTest.java similarity index 100% rename from event-store-management/src/test/java/uk/gov/justice/services/eventstore/management/shuttering/observers/ShutterCommandHandlerObserverTest.java rename to event-store-management/event-store-management-core/src/test/java/uk/gov/justice/services/eventstore/management/shuttering/observers/ShutterCommandHandlerObserverTest.java diff --git a/event-store-management/src/test/java/uk/gov/justice/services/eventstore/management/shuttering/process/CommandHandlerQueueInterrogatorTest.java b/event-store-management/event-store-management-core/src/test/java/uk/gov/justice/services/eventstore/management/shuttering/process/CommandHandlerQueueInterrogatorTest.java similarity index 100% rename from event-store-management/src/test/java/uk/gov/justice/services/eventstore/management/shuttering/process/CommandHandlerQueueInterrogatorTest.java rename to event-store-management/event-store-management-core/src/test/java/uk/gov/justice/services/eventstore/management/shuttering/process/CommandHandlerQueueInterrogatorTest.java diff --git a/event-store-management/src/test/java/uk/gov/justice/services/eventstore/management/shuttering/process/CommandHandlerQueueSupplierFactoryTest.java b/event-store-management/event-store-management-core/src/test/java/uk/gov/justice/services/eventstore/management/shuttering/process/CommandHandlerQueueSupplierFactoryTest.java similarity index 100% rename from event-store-management/src/test/java/uk/gov/justice/services/eventstore/management/shuttering/process/CommandHandlerQueueSupplierFactoryTest.java rename to event-store-management/event-store-management-core/src/test/java/uk/gov/justice/services/eventstore/management/shuttering/process/CommandHandlerQueueSupplierFactoryTest.java diff --git a/event-store-management/src/test/java/uk/gov/justice/services/eventstore/management/shuttering/process/PublishQueueInterrogatorTest.java b/event-store-management/event-store-management-core/src/test/java/uk/gov/justice/services/eventstore/management/shuttering/process/PublishQueueInterrogatorTest.java similarity index 100% rename from event-store-management/src/test/java/uk/gov/justice/services/eventstore/management/shuttering/process/PublishQueueInterrogatorTest.java rename to event-store-management/event-store-management-core/src/test/java/uk/gov/justice/services/eventstore/management/shuttering/process/PublishQueueInterrogatorTest.java diff --git a/event-store-management/src/test/java/uk/gov/justice/services/eventstore/management/untrigger/commands/AddRemoveTriggerCommandHandlerTest.java b/event-store-management/event-store-management-core/src/test/java/uk/gov/justice/services/eventstore/management/untrigger/commands/AddRemoveTriggerCommandHandlerTest.java similarity index 100% rename from event-store-management/src/test/java/uk/gov/justice/services/eventstore/management/untrigger/commands/AddRemoveTriggerCommandHandlerTest.java rename to event-store-management/event-store-management-core/src/test/java/uk/gov/justice/services/eventstore/management/untrigger/commands/AddRemoveTriggerCommandHandlerTest.java diff --git a/event-store-management/src/test/java/uk/gov/justice/services/eventstore/management/untrigger/process/EventLogTriggerManipulatorTest.java b/event-store-management/event-store-management-core/src/test/java/uk/gov/justice/services/eventstore/management/untrigger/process/EventLogTriggerManipulatorTest.java similarity index 100% rename from event-store-management/src/test/java/uk/gov/justice/services/eventstore/management/untrigger/process/EventLogTriggerManipulatorTest.java rename to event-store-management/event-store-management-core/src/test/java/uk/gov/justice/services/eventstore/management/untrigger/process/EventLogTriggerManipulatorTest.java diff --git a/event-store-management/src/test/java/uk/gov/justice/services/eventstore/management/untrigger/process/EventStoreTriggerManipulatorProviderTest.java b/event-store-management/event-store-management-core/src/test/java/uk/gov/justice/services/eventstore/management/untrigger/process/EventStoreTriggerManipulatorProviderTest.java similarity index 100% rename from event-store-management/src/test/java/uk/gov/justice/services/eventstore/management/untrigger/process/EventStoreTriggerManipulatorProviderTest.java rename to event-store-management/event-store-management-core/src/test/java/uk/gov/justice/services/eventstore/management/untrigger/process/EventStoreTriggerManipulatorProviderTest.java diff --git a/event-store-management/src/test/java/uk/gov/justice/services/eventstore/management/validation/commands/VerifyCatchupCommandHandlerTest.java b/event-store-management/event-store-management-core/src/test/java/uk/gov/justice/services/eventstore/management/validation/commands/VerifyCatchupCommandHandlerTest.java similarity index 100% rename from event-store-management/src/test/java/uk/gov/justice/services/eventstore/management/validation/commands/VerifyCatchupCommandHandlerTest.java rename to event-store-management/event-store-management-core/src/test/java/uk/gov/justice/services/eventstore/management/validation/commands/VerifyCatchupCommandHandlerTest.java diff --git a/event-store-management/src/test/java/uk/gov/justice/services/eventstore/management/validation/process/ActiveStreamIdProviderTest.java b/event-store-management/event-store-management-core/src/test/java/uk/gov/justice/services/eventstore/management/validation/process/ActiveStreamIdProviderTest.java similarity index 100% rename from event-store-management/src/test/java/uk/gov/justice/services/eventstore/management/validation/process/ActiveStreamIdProviderTest.java rename to event-store-management/event-store-management-core/src/test/java/uk/gov/justice/services/eventstore/management/validation/process/ActiveStreamIdProviderTest.java diff --git a/event-store-management/src/test/java/uk/gov/justice/services/eventstore/management/validation/process/AllEventsInStreamsVerifierTest.java b/event-store-management/event-store-management-core/src/test/java/uk/gov/justice/services/eventstore/management/validation/process/AllEventsInStreamsVerifierTest.java similarity index 100% rename from event-store-management/src/test/java/uk/gov/justice/services/eventstore/management/validation/process/AllEventsInStreamsVerifierTest.java rename to event-store-management/event-store-management-core/src/test/java/uk/gov/justice/services/eventstore/management/validation/process/AllEventsInStreamsVerifierTest.java diff --git a/event-store-management/src/test/java/uk/gov/justice/services/eventstore/management/validation/process/CatchupVerificationProcessTest.java b/event-store-management/event-store-management-core/src/test/java/uk/gov/justice/services/eventstore/management/validation/process/CatchupVerificationProcessTest.java similarity index 100% rename from event-store-management/src/test/java/uk/gov/justice/services/eventstore/management/validation/process/CatchupVerificationProcessTest.java rename to event-store-management/event-store-management-core/src/test/java/uk/gov/justice/services/eventstore/management/validation/process/CatchupVerificationProcessTest.java diff --git a/event-store-management/src/test/java/uk/gov/justice/services/eventstore/management/validation/process/EventLinkageCheckerTest.java b/event-store-management/event-store-management-core/src/test/java/uk/gov/justice/services/eventstore/management/validation/process/EventLinkageCheckerTest.java similarity index 100% rename from event-store-management/src/test/java/uk/gov/justice/services/eventstore/management/validation/process/EventLinkageCheckerTest.java rename to event-store-management/event-store-management-core/src/test/java/uk/gov/justice/services/eventstore/management/validation/process/EventLinkageCheckerTest.java diff --git a/event-store-management/src/test/java/uk/gov/justice/services/eventstore/management/validation/process/EventLogActiveEventRowCounterTest.java b/event-store-management/event-store-management-core/src/test/java/uk/gov/justice/services/eventstore/management/validation/process/EventLogActiveEventRowCounterTest.java similarity index 100% rename from event-store-management/src/test/java/uk/gov/justice/services/eventstore/management/validation/process/EventLogActiveEventRowCounterTest.java rename to event-store-management/event-store-management-core/src/test/java/uk/gov/justice/services/eventstore/management/validation/process/EventLogActiveEventRowCounterTest.java diff --git a/event-store-management/src/test/java/uk/gov/justice/services/eventstore/management/validation/process/ProcessedEventCountVerifierTest.java b/event-store-management/event-store-management-core/src/test/java/uk/gov/justice/services/eventstore/management/validation/process/ProcessedEventCountVerifierTest.java similarity index 100% rename from event-store-management/src/test/java/uk/gov/justice/services/eventstore/management/validation/process/ProcessedEventCountVerifierTest.java rename to event-store-management/event-store-management-core/src/test/java/uk/gov/justice/services/eventstore/management/validation/process/ProcessedEventCountVerifierTest.java diff --git a/event-store-management/src/test/java/uk/gov/justice/services/eventstore/management/validation/process/ProcessedEventLinkVerifierTest.java b/event-store-management/event-store-management-core/src/test/java/uk/gov/justice/services/eventstore/management/validation/process/ProcessedEventLinkVerifierTest.java similarity index 100% rename from event-store-management/src/test/java/uk/gov/justice/services/eventstore/management/validation/process/ProcessedEventLinkVerifierTest.java rename to event-store-management/event-store-management-core/src/test/java/uk/gov/justice/services/eventstore/management/validation/process/ProcessedEventLinkVerifierTest.java diff --git a/event-store-management/src/test/java/uk/gov/justice/services/eventstore/management/validation/process/PublishedEventCountVerifierTest.java b/event-store-management/event-store-management-core/src/test/java/uk/gov/justice/services/eventstore/management/validation/process/PublishedEventCountVerifierTest.java similarity index 100% rename from event-store-management/src/test/java/uk/gov/justice/services/eventstore/management/validation/process/PublishedEventCountVerifierTest.java rename to event-store-management/event-store-management-core/src/test/java/uk/gov/justice/services/eventstore/management/validation/process/PublishedEventCountVerifierTest.java diff --git a/event-store-management/src/test/java/uk/gov/justice/services/eventstore/management/validation/process/PublishedEventLinkVerifierTest.java b/event-store-management/event-store-management-core/src/test/java/uk/gov/justice/services/eventstore/management/validation/process/PublishedEventLinkVerifierTest.java similarity index 100% rename from event-store-management/src/test/java/uk/gov/justice/services/eventstore/management/validation/process/PublishedEventLinkVerifierTest.java rename to event-store-management/event-store-management-core/src/test/java/uk/gov/justice/services/eventstore/management/validation/process/PublishedEventLinkVerifierTest.java diff --git a/event-store-management/src/test/java/uk/gov/justice/services/eventstore/management/validation/process/StreamBufferEmptyVerifierTest.java b/event-store-management/event-store-management-core/src/test/java/uk/gov/justice/services/eventstore/management/validation/process/StreamBufferEmptyVerifierTest.java similarity index 100% rename from event-store-management/src/test/java/uk/gov/justice/services/eventstore/management/validation/process/StreamBufferEmptyVerifierTest.java rename to event-store-management/event-store-management-core/src/test/java/uk/gov/justice/services/eventstore/management/validation/process/StreamBufferEmptyVerifierTest.java diff --git a/event-store-management/src/test/java/uk/gov/justice/services/eventstore/management/validation/process/TableRowCounterTest.java b/event-store-management/event-store-management-core/src/test/java/uk/gov/justice/services/eventstore/management/validation/process/TableRowCounterTest.java similarity index 100% rename from event-store-management/src/test/java/uk/gov/justice/services/eventstore/management/validation/process/TableRowCounterTest.java rename to event-store-management/event-store-management-core/src/test/java/uk/gov/justice/services/eventstore/management/validation/process/TableRowCounterTest.java diff --git a/event-store-management/src/test/java/uk/gov/justice/services/eventstore/management/validation/process/VerificationResultTest.java b/event-store-management/event-store-management-core/src/test/java/uk/gov/justice/services/eventstore/management/validation/process/VerificationResultTest.java similarity index 100% rename from event-store-management/src/test/java/uk/gov/justice/services/eventstore/management/validation/process/VerificationResultTest.java rename to event-store-management/event-store-management-core/src/test/java/uk/gov/justice/services/eventstore/management/validation/process/VerificationResultTest.java diff --git a/event-store-management/src/test/java/uk/gov/justice/services/eventstore/management/validation/process/VerifierProviderTest.java b/event-store-management/event-store-management-core/src/test/java/uk/gov/justice/services/eventstore/management/validation/process/VerifierProviderTest.java similarity index 100% rename from event-store-management/src/test/java/uk/gov/justice/services/eventstore/management/validation/process/VerifierProviderTest.java rename to event-store-management/event-store-management-core/src/test/java/uk/gov/justice/services/eventstore/management/validation/process/VerifierProviderTest.java diff --git a/event-store-management/event-store-management-events/pom.xml b/event-store-management/event-store-management-events/pom.xml new file mode 100644 index 000000000..48c5feeda --- /dev/null +++ b/event-store-management/event-store-management-events/pom.xml @@ -0,0 +1,22 @@ + + + + event-store-management + uk.gov.justice.event-store + 2.2.0-SNAPSHOT + + 4.0.0 + + event-store-management-events + + + + uk.gov.justice.services + jmx-api + ${framework.version} + + + + diff --git a/event-store-management/src/main/java/uk/gov/justice/services/eventstore/management/catchup/events/CatchupCompletedEvent.java b/event-store-management/event-store-management-events/src/main/java/uk/gov/justice/services/eventstore/management/events/catchup/CatchupCompletedEvent.java similarity index 94% rename from event-store-management/src/main/java/uk/gov/justice/services/eventstore/management/catchup/events/CatchupCompletedEvent.java rename to event-store-management/event-store-management-events/src/main/java/uk/gov/justice/services/eventstore/management/events/catchup/CatchupCompletedEvent.java index 8c1021ff2..226cde12b 100644 --- a/event-store-management/src/main/java/uk/gov/justice/services/eventstore/management/catchup/events/CatchupCompletedEvent.java +++ b/event-store-management/event-store-management-events/src/main/java/uk/gov/justice/services/eventstore/management/events/catchup/CatchupCompletedEvent.java @@ -1,4 +1,4 @@ -package uk.gov.justice.services.eventstore.management.catchup.events; +package uk.gov.justice.services.eventstore.management.events.catchup; import uk.gov.justice.services.jmx.api.command.SystemCommand; diff --git a/event-store-management/src/main/java/uk/gov/justice/services/eventstore/management/catchup/events/CatchupCompletedForSubscriptionEvent.java b/event-store-management/event-store-management-events/src/main/java/uk/gov/justice/services/eventstore/management/events/catchup/CatchupCompletedForSubscriptionEvent.java similarity index 95% rename from event-store-management/src/main/java/uk/gov/justice/services/eventstore/management/catchup/events/CatchupCompletedForSubscriptionEvent.java rename to event-store-management/event-store-management-events/src/main/java/uk/gov/justice/services/eventstore/management/events/catchup/CatchupCompletedForSubscriptionEvent.java index 08903b703..c272955aa 100644 --- a/event-store-management/src/main/java/uk/gov/justice/services/eventstore/management/catchup/events/CatchupCompletedForSubscriptionEvent.java +++ b/event-store-management/event-store-management-events/src/main/java/uk/gov/justice/services/eventstore/management/events/catchup/CatchupCompletedForSubscriptionEvent.java @@ -1,6 +1,5 @@ -package uk.gov.justice.services.eventstore.management.catchup.events; +package uk.gov.justice.services.eventstore.management.events.catchup; -import uk.gov.justice.services.eventstore.management.catchup.commands.CatchupType; import uk.gov.justice.services.jmx.api.command.SystemCommand; import java.time.ZonedDateTime; diff --git a/event-store-management/src/main/java/uk/gov/justice/services/eventstore/management/catchup/events/CatchupRequestedEvent.java b/event-store-management/event-store-management-events/src/main/java/uk/gov/justice/services/eventstore/management/events/catchup/CatchupRequestedEvent.java similarity index 91% rename from event-store-management/src/main/java/uk/gov/justice/services/eventstore/management/catchup/events/CatchupRequestedEvent.java rename to event-store-management/event-store-management-events/src/main/java/uk/gov/justice/services/eventstore/management/events/catchup/CatchupRequestedEvent.java index 441004654..e184dea00 100644 --- a/event-store-management/src/main/java/uk/gov/justice/services/eventstore/management/catchup/events/CatchupRequestedEvent.java +++ b/event-store-management/event-store-management-events/src/main/java/uk/gov/justice/services/eventstore/management/events/catchup/CatchupRequestedEvent.java @@ -1,6 +1,5 @@ -package uk.gov.justice.services.eventstore.management.catchup.events; +package uk.gov.justice.services.eventstore.management.events.catchup; -import uk.gov.justice.services.eventstore.management.catchup.commands.CatchupType; import uk.gov.justice.services.jmx.api.command.SystemCommand; import java.time.ZonedDateTime; diff --git a/event-store-management/src/main/java/uk/gov/justice/services/eventstore/management/catchup/events/CatchupStartedEvent.java b/event-store-management/event-store-management-events/src/main/java/uk/gov/justice/services/eventstore/management/events/catchup/CatchupStartedEvent.java similarity index 88% rename from event-store-management/src/main/java/uk/gov/justice/services/eventstore/management/catchup/events/CatchupStartedEvent.java rename to event-store-management/event-store-management-events/src/main/java/uk/gov/justice/services/eventstore/management/events/catchup/CatchupStartedEvent.java index 670a74617..e7f0f64a0 100644 --- a/event-store-management/src/main/java/uk/gov/justice/services/eventstore/management/catchup/events/CatchupStartedEvent.java +++ b/event-store-management/event-store-management-events/src/main/java/uk/gov/justice/services/eventstore/management/events/catchup/CatchupStartedEvent.java @@ -1,6 +1,4 @@ -package uk.gov.justice.services.eventstore.management.catchup.events; - -import uk.gov.justice.services.eventstore.management.catchup.commands.CatchupType; +package uk.gov.justice.services.eventstore.management.events.catchup; import java.time.ZonedDateTime; import java.util.Objects; diff --git a/event-store-management/src/main/java/uk/gov/justice/services/eventstore/management/catchup/events/CatchupStartedForSubscriptionEvent.java b/event-store-management/event-store-management-events/src/main/java/uk/gov/justice/services/eventstore/management/events/catchup/CatchupStartedForSubscriptionEvent.java similarity index 91% rename from event-store-management/src/main/java/uk/gov/justice/services/eventstore/management/catchup/events/CatchupStartedForSubscriptionEvent.java rename to event-store-management/event-store-management-events/src/main/java/uk/gov/justice/services/eventstore/management/events/catchup/CatchupStartedForSubscriptionEvent.java index 4b5fb2061..1a1128ce8 100644 --- a/event-store-management/src/main/java/uk/gov/justice/services/eventstore/management/catchup/events/CatchupStartedForSubscriptionEvent.java +++ b/event-store-management/event-store-management-events/src/main/java/uk/gov/justice/services/eventstore/management/events/catchup/CatchupStartedForSubscriptionEvent.java @@ -1,6 +1,4 @@ -package uk.gov.justice.services.eventstore.management.catchup.events; - -import uk.gov.justice.services.eventstore.management.catchup.commands.CatchupType; +package uk.gov.justice.services.eventstore.management.events.catchup; import java.time.ZonedDateTime; import java.util.Objects; diff --git a/event-store-management/src/main/java/uk/gov/justice/services/eventstore/management/catchup/commands/CatchupType.java b/event-store-management/event-store-management-events/src/main/java/uk/gov/justice/services/eventstore/management/events/catchup/CatchupType.java similarity index 77% rename from event-store-management/src/main/java/uk/gov/justice/services/eventstore/management/catchup/commands/CatchupType.java rename to event-store-management/event-store-management-events/src/main/java/uk/gov/justice/services/eventstore/management/events/catchup/CatchupType.java index f9fc6d1af..7651f80d2 100644 --- a/event-store-management/src/main/java/uk/gov/justice/services/eventstore/management/catchup/commands/CatchupType.java +++ b/event-store-management/event-store-management-events/src/main/java/uk/gov/justice/services/eventstore/management/events/catchup/CatchupType.java @@ -1,4 +1,4 @@ -package uk.gov.justice.services.eventstore.management.catchup.commands; +package uk.gov.justice.services.eventstore.management.events.catchup; public enum CatchupType { diff --git a/event-store-management/src/main/java/uk/gov/justice/services/eventstore/management/rebuild/events/RebuildCompleteEvent.java b/event-store-management/event-store-management-events/src/main/java/uk/gov/justice/services/eventstore/management/events/rebuild/RebuildCompleteEvent.java similarity index 94% rename from event-store-management/src/main/java/uk/gov/justice/services/eventstore/management/rebuild/events/RebuildCompleteEvent.java rename to event-store-management/event-store-management-events/src/main/java/uk/gov/justice/services/eventstore/management/events/rebuild/RebuildCompleteEvent.java index 15b7bceb5..c1d27fffb 100644 --- a/event-store-management/src/main/java/uk/gov/justice/services/eventstore/management/rebuild/events/RebuildCompleteEvent.java +++ b/event-store-management/event-store-management-events/src/main/java/uk/gov/justice/services/eventstore/management/events/rebuild/RebuildCompleteEvent.java @@ -1,4 +1,4 @@ -package uk.gov.justice.services.eventstore.management.rebuild.events; +package uk.gov.justice.services.eventstore.management.events.rebuild; import uk.gov.justice.services.jmx.api.command.SystemCommand; diff --git a/event-store-management/src/main/java/uk/gov/justice/services/eventstore/management/rebuild/events/RebuildRequestedEvent.java b/event-store-management/event-store-management-events/src/main/java/uk/gov/justice/services/eventstore/management/events/rebuild/RebuildRequestedEvent.java similarity index 94% rename from event-store-management/src/main/java/uk/gov/justice/services/eventstore/management/rebuild/events/RebuildRequestedEvent.java rename to event-store-management/event-store-management-events/src/main/java/uk/gov/justice/services/eventstore/management/events/rebuild/RebuildRequestedEvent.java index 88c71b8b4..cdc41655d 100644 --- a/event-store-management/src/main/java/uk/gov/justice/services/eventstore/management/rebuild/events/RebuildRequestedEvent.java +++ b/event-store-management/event-store-management-events/src/main/java/uk/gov/justice/services/eventstore/management/events/rebuild/RebuildRequestedEvent.java @@ -1,4 +1,4 @@ -package uk.gov.justice.services.eventstore.management.rebuild.events; +package uk.gov.justice.services.eventstore.management.events.rebuild; import uk.gov.justice.services.jmx.api.command.SystemCommand; diff --git a/event-store-management/pom.xml b/event-store-management/pom.xml index 3eb77a457..9b73e3eed 100644 --- a/event-store-management/pom.xml +++ b/event-store-management/pom.xml @@ -10,73 +10,11 @@ 4.0.0 event-store-management + pom - - - javax - javaee-api - provided - - - uk.gov.justice.framework-api - framework-api-messaging-jms - - - uk.gov.justice.utils - utilities-core - - - uk.gov.justice.event-store - published-event-processor - ${project.version} - - - uk.gov.justice.services - jmx-command-handling - - - uk.gov.justice.event-store - subscription-manager - ${project.version} - - - uk.gov.justice.services - framework-management - ${framework.version} - - - uk.gov.justice.services - jmx-api - ${framework.version} - - - - - org.mockito - mockito-core - test - - - junit - junit - test - - - uk.gov.justice.services - test-utils-core - test - - - org.slf4j - slf4j-log4j12 - test - - - uk.gov.justice.event-store - test-utils-persistence - ${project.version} - test - - + + event-store-management-core + event-store-management-events + diff --git a/event-store-management/src/main/java/uk/gov/justice/services/eventstore/management/catchup/observers/CatchupObserver.java b/event-store-management/src/main/java/uk/gov/justice/services/eventstore/management/catchup/observers/CatchupObserver.java deleted file mode 100644 index 624a87748..000000000 --- a/event-store-management/src/main/java/uk/gov/justice/services/eventstore/management/catchup/observers/CatchupObserver.java +++ /dev/null @@ -1,49 +0,0 @@ -package uk.gov.justice.services.eventstore.management.catchup.observers; - -import uk.gov.justice.services.eventstore.management.catchup.events.CatchupCompletedForSubscriptionEvent; -import uk.gov.justice.services.eventstore.management.catchup.events.CatchupRequestedEvent; -import uk.gov.justice.services.eventstore.management.catchup.events.CatchupStartedEvent; -import uk.gov.justice.services.eventstore.management.catchup.events.CatchupStartedForSubscriptionEvent; -import uk.gov.justice.services.eventstore.management.logging.MdcLogger; - -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.event.Observes; -import javax.inject.Inject; - -@ApplicationScoped -public class CatchupObserver { - - @Inject - private CatchupLifecycle catchupLifecycle; - - @Inject - private MdcLogger mdcLogger; - - public void onCatchupRequested(@Observes final CatchupRequestedEvent catchupRequestedEvent) { - - mdcLogger.mdcLoggerConsumer().accept(() -> { - catchupLifecycle.handleCatchupRequested(catchupRequestedEvent); - }); - } - - public void onCatchupStarted(@Observes final CatchupStartedEvent catchupStartedEvent) { - - mdcLogger.mdcLoggerConsumer().accept(() -> { - catchupLifecycle.handleCatchupStarted(catchupStartedEvent); - }); - } - - public void onCatchupStartedForSubscription(@Observes final CatchupStartedForSubscriptionEvent catchupStartedForSubscriptionEvent) { - - mdcLogger.mdcLoggerConsumer().accept(() -> { - catchupLifecycle.handleCatchupStartedForSubscription(catchupStartedForSubscriptionEvent); - }); - } - - public void onCatchupCompleteForSubscription(@Observes final CatchupCompletedForSubscriptionEvent catchupCompletedForSubscriptionEvent) { - - mdcLogger.mdcLoggerConsumer().accept(() -> { - catchupLifecycle.handleCatchupCompleteForSubscription(catchupCompletedForSubscriptionEvent); - }); - } -}