Skip to content

Commit

Permalink
Merge e49a868 into e29697f
Browse files Browse the repository at this point in the history
  • Loading branch information
@mapingo
mapingo committed Apr 25, 2019
2 parents e29697f + e49a868 commit 316d744
Show file tree
Hide file tree
Showing 23 changed files with 46 additions and 127 deletions.
20 changes: 0 additions & 20 deletions .../java/uk/gov/justice/services/event/sourcing/subscription/catchup/EventCatchupConfig.java
View file

This file was deleted.

8 changes: 3 additions & 5 deletions ...ConcurrentEventStreamConsumerManager.java → ...ConcurrentEventStreamConsumerManager.java
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,10 @@
package uk.gov.justice.services.event.sourcing.subscription.startup.manager;
package uk.gov.justice.services.event.sourcing.subscription.catchup.consumer.manager;

import static java.lang.String.format;

import uk.gov.justice.services.event.sourcing.subscription.catchup.EventCatchupException;
import uk.gov.justice.services.event.sourcing.subscription.startup.listener.EventStreamConsumptionResolver;
import uk.gov.justice.services.event.sourcing.subscription.startup.listener.FinishedProcessingMessage;
import uk.gov.justice.services.event.sourcing.subscription.startup.task.ConsumeEventQueueBean;
import uk.gov.justice.services.event.sourcing.subscription.startup.task.EventQueueConsumer;
import uk.gov.justice.services.event.sourcing.subscription.catchup.consumer.task.ConsumeEventQueueBean;
import uk.gov.justice.services.event.sourcing.subscription.catchup.consumer.task.EventQueueConsumer;
import uk.gov.justice.services.messaging.JsonEnvelope;

import java.util.Queue;
Expand Down
5 changes: 2 additions & 3 deletions ...up/manager/EventQueueConsumerFactory.java → ...er/manager/EventQueueConsumerFactory.java
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
package uk.gov.justice.services.event.sourcing.subscription.startup.manager;
package uk.gov.justice.services.event.sourcing.subscription.catchup.consumer.manager;

import static org.slf4j.LoggerFactory.getLogger;

import uk.gov.justice.services.event.sourcing.subscription.manager.TransactionalEventProcessor;
import uk.gov.justice.services.event.sourcing.subscription.startup.listener.EventStreamConsumptionResolver;
import uk.gov.justice.services.event.sourcing.subscription.startup.task.EventQueueConsumer;
import uk.gov.justice.services.event.sourcing.subscription.catchup.consumer.task.EventQueueConsumer;

import javax.inject.Inject;

Expand Down
2 changes: 1 addition & 1 deletion ...p/manager/EventStreamConsumerManager.java → ...r/manager/EventStreamConsumerManager.java
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package uk.gov.justice.services.event.sourcing.subscription.startup.manager;
package uk.gov.justice.services.event.sourcing.subscription.catchup.consumer.manager;

import uk.gov.justice.services.messaging.JsonEnvelope;

Expand Down
2 changes: 1 addition & 1 deletion ...tener/EventStreamConsumptionResolver.java → ...nager/EventStreamConsumptionResolver.java
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package uk.gov.justice.services.event.sourcing.subscription.startup.listener;
package uk.gov.justice.services.event.sourcing.subscription.catchup.consumer.manager;

/**
* Interface for listening to Event Stream Consumers.
Expand Down
2 changes: 1 addition & 1 deletion ...p/manager/EventStreamsInProgressList.java → ...r/manager/EventStreamsInProgressList.java
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package uk.gov.justice.services.event.sourcing.subscription.startup.manager;
package uk.gov.justice.services.event.sourcing.subscription.catchup.consumer.manager;

import static java.lang.Thread.currentThread;

Expand Down
2 changes: 1 addition & 1 deletion ...p/listener/FinishedProcessingMessage.java → ...er/manager/FinishedProcessingMessage.java
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package uk.gov.justice.services.event.sourcing.subscription.startup.listener;
package uk.gov.justice.services.event.sourcing.subscription.catchup.consumer.manager;

import uk.gov.justice.services.messaging.JsonEnvelope;

Expand Down
2 changes: 1 addition & 1 deletion ...n/startup/task/ConsumeEventQueueBean.java → .../consumer/task/ConsumeEventQueueBean.java
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package uk.gov.justice.services.event.sourcing.subscription.startup.task;
package uk.gov.justice.services.event.sourcing.subscription.catchup.consumer.task;

import uk.gov.justice.services.messaging.JsonEnvelope;

Expand Down
6 changes: 3 additions & 3 deletions ...tion/startup/task/EventQueueConsumer.java → ...hup/consumer/task/EventQueueConsumer.java
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
package uk.gov.justice.services.event.sourcing.subscription.startup.task;
package uk.gov.justice.services.event.sourcing.subscription.catchup.consumer.task;

import static java.lang.String.format;

import uk.gov.justice.services.event.sourcing.subscription.manager.TransactionalEventProcessor;
import uk.gov.justice.services.event.sourcing.subscription.startup.listener.EventStreamConsumptionResolver;
import uk.gov.justice.services.event.sourcing.subscription.startup.listener.FinishedProcessingMessage;
import uk.gov.justice.services.event.sourcing.subscription.catchup.consumer.manager.EventStreamConsumptionResolver;
import uk.gov.justice.services.event.sourcing.subscription.catchup.consumer.manager.FinishedProcessingMessage;
import uk.gov.justice.services.messaging.JsonEnvelope;

import java.util.Queue;
Expand Down
2 changes: 1 addition & 1 deletion .../gov/justice/services/event/sourcing/subscription/catchup/task/EventCatchupProcessor.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
import uk.gov.justice.services.core.lifecycle.events.catchup.CatchupCompletedForSubscriptionEvent;
import uk.gov.justice.services.core.lifecycle.events.catchup.CatchupStartedForSubscriptionEvent;
import uk.gov.justice.services.event.sourcing.subscription.manager.PublishedEventSourceProvider;
import uk.gov.justice.services.event.sourcing.subscription.startup.manager.EventStreamConsumerManager;
import uk.gov.justice.services.event.sourcing.subscription.catchup.consumer.manager.EventStreamConsumerManager;
import uk.gov.justice.services.eventsourcing.source.core.PublishedEventSource;
import uk.gov.justice.services.messaging.JsonEnvelope;
import uk.gov.justice.services.subscription.ProcessedEventTrackingService;
Expand Down
2 changes: 1 addition & 1 deletion ...stice/services/event/sourcing/subscription/catchup/task/EventCatchupProcessorFactory.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
import uk.gov.justice.services.core.lifecycle.events.catchup.CatchupCompletedForSubscriptionEvent;
import uk.gov.justice.services.core.lifecycle.events.catchup.CatchupStartedForSubscriptionEvent;
import uk.gov.justice.services.event.sourcing.subscription.manager.PublishedEventSourceProvider;
import uk.gov.justice.services.event.sourcing.subscription.startup.manager.EventStreamConsumerManager;
import uk.gov.justice.services.event.sourcing.subscription.catchup.consumer.manager.EventStreamConsumerManager;
import uk.gov.justice.services.subscription.ProcessedEventTrackingService;

import javax.enterprise.event.Event;
Expand Down
10 changes: 5 additions & 5 deletions .../services/event/sourcing/subscription/catchup/task/EventStreamConsumerManagerFactory.java
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
package uk.gov.justice.services.event.sourcing.subscription.catchup.task;

import uk.gov.justice.services.event.sourcing.subscription.startup.manager.ConcurrentEventStreamConsumerManager;
import uk.gov.justice.services.event.sourcing.subscription.startup.manager.EventQueueConsumerFactory;
import uk.gov.justice.services.event.sourcing.subscription.startup.manager.EventStreamConsumerManager;
import uk.gov.justice.services.event.sourcing.subscription.startup.manager.EventStreamsInProgressList;
import uk.gov.justice.services.event.sourcing.subscription.startup.task.ConsumeEventQueueBean;
import uk.gov.justice.services.event.sourcing.subscription.catchup.consumer.manager.ConcurrentEventStreamConsumerManager;
import uk.gov.justice.services.event.sourcing.subscription.catchup.consumer.manager.EventQueueConsumerFactory;
import uk.gov.justice.services.event.sourcing.subscription.catchup.consumer.manager.EventStreamConsumerManager;
import uk.gov.justice.services.event.sourcing.subscription.catchup.consumer.manager.EventStreamsInProgressList;
import uk.gov.justice.services.event.sourcing.subscription.catchup.consumer.task.ConsumeEventQueueBean;

import javax.inject.Inject;

Expand Down
57 changes: 0 additions & 57 deletions ...a/uk/gov/justice/services/event/sourcing/subscription/catchup/EventCatchupConfigTest.java
View file

This file was deleted.

10 changes: 5 additions & 5 deletions ...ava/uk/gov/justice/services/event/sourcing/subscription/catchup/EventStreamCatchupIT.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@
import static uk.gov.justice.services.core.postgres.OpenEjbConfigurationBuilder.createOpenEjbConfigurationBuilder;

import uk.gov.justice.services.cdi.LoggerProducer;
import uk.gov.justice.services.event.sourcing.subscription.startup.manager.EventQueueConsumerFactory;
import uk.gov.justice.services.event.sourcing.subscription.startup.manager.EventStreamsInProgressList;
import uk.gov.justice.services.event.sourcing.subscription.startup.task.ConsumeEventQueueBean;
import uk.gov.justice.services.event.sourcing.subscription.startup.util.DummyTransactionalEventProcessor;
import uk.gov.justice.services.event.sourcing.subscription.startup.util.TestCatchupBean;
import uk.gov.justice.services.event.sourcing.subscription.catchup.consumer.manager.EventQueueConsumerFactory;
import uk.gov.justice.services.event.sourcing.subscription.catchup.consumer.manager.EventStreamsInProgressList;
import uk.gov.justice.services.event.sourcing.subscription.catchup.consumer.task.ConsumeEventQueueBean;
import uk.gov.justice.services.event.sourcing.subscription.catchup.consumer.util.DummyTransactionalEventProcessor;
import uk.gov.justice.services.event.sourcing.subscription.catchup.consumer.util.TestCatchupBean;
import uk.gov.justice.services.messaging.JsonEnvelope;
import uk.gov.justice.services.test.utils.core.messaging.Poller;

Expand Down
7 changes: 3 additions & 4 deletions ...urrentEventStreamConsumerManagerTest.java → ...urrentEventStreamConsumerManagerTest.java
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package uk.gov.justice.services.event.sourcing.subscription.startup.manager;
package uk.gov.justice.services.event.sourcing.subscription.catchup.consumer.manager;

import static java.util.UUID.randomUUID;
import static javax.json.Json.createObjectBuilder;
Expand All @@ -14,9 +14,8 @@
import static uk.gov.justice.services.messaging.JsonEnvelope.metadataBuilder;

import uk.gov.justice.services.event.sourcing.subscription.catchup.EventCatchupException;
import uk.gov.justice.services.event.sourcing.subscription.startup.listener.FinishedProcessingMessage;
import uk.gov.justice.services.event.sourcing.subscription.startup.task.ConsumeEventQueueBean;
import uk.gov.justice.services.event.sourcing.subscription.startup.task.EventQueueConsumer;
import uk.gov.justice.services.event.sourcing.subscription.catchup.consumer.task.ConsumeEventQueueBean;
import uk.gov.justice.services.event.sourcing.subscription.catchup.consumer.task.EventQueueConsumer;
import uk.gov.justice.services.messaging.JsonEnvelope;

import java.util.List;
Expand Down
2 changes: 1 addition & 1 deletion ...nager/EventStreamsInProgressListTest.java → ...nager/EventStreamsInProgressListTest.java
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package uk.gov.justice.services.event.sourcing.subscription.startup.manager;
package uk.gov.justice.services.event.sourcing.subscription.catchup.consumer.manager;

import static org.hamcrest.CoreMatchers.is;
import static org.junit.Assert.assertThat;
Expand Down
6 changes: 3 additions & 3 deletions .../startup/task/EventQueueConsumerTest.java → ...consumer/task/EventQueueConsumerTest.java
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package uk.gov.justice.services.event.sourcing.subscription.startup.task;
package uk.gov.justice.services.event.sourcing.subscription.catchup.consumer.task;

import static java.util.UUID.fromString;
import static javax.json.Json.createObjectBuilder;
Expand All @@ -11,8 +11,8 @@
import static uk.gov.justice.services.messaging.JsonEnvelope.metadataBuilder;

import uk.gov.justice.services.event.sourcing.subscription.manager.TransactionalEventProcessor;
import uk.gov.justice.services.event.sourcing.subscription.startup.listener.EventStreamConsumptionResolver;
import uk.gov.justice.services.event.sourcing.subscription.startup.listener.FinishedProcessingMessage;
import uk.gov.justice.services.event.sourcing.subscription.catchup.consumer.manager.EventStreamConsumptionResolver;
import uk.gov.justice.services.event.sourcing.subscription.catchup.consumer.manager.FinishedProcessingMessage;
import uk.gov.justice.services.messaging.JsonEnvelope;

import java.util.Queue;
Expand Down
2 changes: 1 addition & 1 deletion ...til/DummyTransactionalEventProcessor.java → ...til/DummyTransactionalEventProcessor.java
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package uk.gov.justice.services.event.sourcing.subscription.startup.util;
package uk.gov.justice.services.event.sourcing.subscription.catchup.consumer.util;

import uk.gov.justice.services.event.sourcing.subscription.manager.TransactionalEventProcessor;
import uk.gov.justice.services.messaging.JsonEnvelope;
Expand Down
2 changes: 1 addition & 1 deletion ...bscription/startup/util/EventFactory.java → ...n/catchup/consumer/util/EventFactory.java
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package uk.gov.justice.services.event.sourcing.subscription.startup.util;
package uk.gov.justice.services.event.sourcing.subscription.catchup.consumer.util;

import static java.util.UUID.randomUUID;
import static java.util.stream.Collectors.toList;
Expand Down
12 changes: 6 additions & 6 deletions ...ription/startup/util/TestCatchupBean.java → ...atchup/consumer/util/TestCatchupBean.java
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
package uk.gov.justice.services.event.sourcing.subscription.startup.util;
package uk.gov.justice.services.event.sourcing.subscription.catchup.consumer.util;

import uk.gov.justice.services.event.sourcing.subscription.startup.manager.ConcurrentEventStreamConsumerManager;
import uk.gov.justice.services.event.sourcing.subscription.startup.manager.EventQueueConsumerFactory;
import uk.gov.justice.services.event.sourcing.subscription.startup.manager.EventStreamConsumerManager;
import uk.gov.justice.services.event.sourcing.subscription.startup.manager.EventStreamsInProgressList;
import uk.gov.justice.services.event.sourcing.subscription.startup.task.ConsumeEventQueueBean;
import uk.gov.justice.services.event.sourcing.subscription.catchup.consumer.manager.ConcurrentEventStreamConsumerManager;
import uk.gov.justice.services.event.sourcing.subscription.catchup.consumer.manager.EventQueueConsumerFactory;
import uk.gov.justice.services.event.sourcing.subscription.catchup.consumer.manager.EventStreamConsumerManager;
import uk.gov.justice.services.event.sourcing.subscription.catchup.consumer.manager.EventStreamsInProgressList;
import uk.gov.justice.services.event.sourcing.subscription.catchup.consumer.task.ConsumeEventQueueBean;
import uk.gov.justice.services.messaging.JsonEnvelope;

import java.util.stream.Stream;
Expand Down
2 changes: 1 addition & 1 deletion ...e/services/event/sourcing/subscription/catchup/task/EventCatchupProcessorFactoryTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
import uk.gov.justice.services.core.lifecycle.events.catchup.CatchupCompletedForSubscriptionEvent;
import uk.gov.justice.services.core.lifecycle.events.catchup.CatchupStartedForSubscriptionEvent;
import uk.gov.justice.services.event.sourcing.subscription.manager.PublishedEventSourceProvider;
import uk.gov.justice.services.event.sourcing.subscription.startup.manager.EventStreamConsumerManager;
import uk.gov.justice.services.event.sourcing.subscription.catchup.consumer.manager.EventStreamConsumerManager;
import uk.gov.justice.services.subscription.ProcessedEventTrackingService;

import javax.enterprise.event.Event;
Expand Down
2 changes: 1 addition & 1 deletion .../justice/services/event/sourcing/subscription/catchup/task/EventCatchupProcessorTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
import uk.gov.justice.services.core.lifecycle.events.catchup.CatchupCompletedForSubscriptionEvent;
import uk.gov.justice.services.core.lifecycle.events.catchup.CatchupStartedForSubscriptionEvent;
import uk.gov.justice.services.event.sourcing.subscription.manager.PublishedEventSourceProvider;
import uk.gov.justice.services.event.sourcing.subscription.startup.manager.EventStreamConsumerManager;
import uk.gov.justice.services.event.sourcing.subscription.catchup.consumer.manager.EventStreamConsumerManager;
import uk.gov.justice.services.eventsourcing.source.core.PublishedEventSource;
import uk.gov.justice.services.messaging.JsonEnvelope;
import uk.gov.justice.services.subscription.ProcessedEventTrackingService;
Expand Down
8 changes: 4 additions & 4 deletions ...vices/event/sourcing/subscription/catchup/task/EventStreamConsumerManagerFactoryTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@
import static org.junit.Assert.assertThat;
import static uk.gov.justice.services.test.utils.core.reflection.ReflectionUtil.getValueOfField;

import uk.gov.justice.services.event.sourcing.subscription.startup.manager.EventQueueConsumerFactory;
import uk.gov.justice.services.event.sourcing.subscription.startup.manager.EventStreamConsumerManager;
import uk.gov.justice.services.event.sourcing.subscription.startup.manager.EventStreamsInProgressList;
import uk.gov.justice.services.event.sourcing.subscription.startup.task.ConsumeEventQueueBean;
import uk.gov.justice.services.event.sourcing.subscription.catchup.consumer.manager.EventQueueConsumerFactory;
import uk.gov.justice.services.event.sourcing.subscription.catchup.consumer.manager.EventStreamConsumerManager;
import uk.gov.justice.services.event.sourcing.subscription.catchup.consumer.manager.EventStreamsInProgressList;
import uk.gov.justice.services.event.sourcing.subscription.catchup.consumer.task.ConsumeEventQueueBean;

import org.junit.Test;
import org.junit.runner.RunWith;
Expand Down

0 comments on commit 316d744

Please sign in to comment.