Update to use refactored event-store

CJSCommonPlatform · Apr 25, 2019 · 7cffa5b · 7cffa5b
1 parent e27f1c9
commit 7cffa5b
Show file tree

Hide file tree

Showing 4 changed files with 39 additions and 19 deletions.
diff --git a/...justice/services/eventsourcing/jdbc/snapshot/StandaloneSnapshotJdbcRepositoryFactory.java b/...justice/services/eventsourcing/jdbc/snapshot/StandaloneSnapshotJdbcRepositoryFactory.java
@@ -2,16 +2,29 @@
 
 import static uk.gov.justice.services.test.utils.core.reflection.ReflectionUtil.setField;
 
+import uk.gov.justice.services.eventsourcing.source.core.EventStoreDataSourceProvider;
+import uk.gov.justice.services.test.utils.persistence.SettableEventStoreDataSourceProvider;
+
+import javax.inject.Inject;
 import javax.sql.DataSource;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 
 public class StandaloneSnapshotJdbcRepositoryFactory {
 
     public SnapshotJdbcRepository getSnapshotJdbcRepository(final DataSource dataSource) {
 
         final SnapshotJdbcRepository snapshotJdbcRepository = new SnapshotJdbcRepository();
 
-        setField(snapshotJdbcRepository, "dataSource", dataSource);
+        final SettableEventStoreDataSourceProvider eventStoreDataSourceProvider = new SettableEventStoreDataSourceProvider();
+        final Logger logger = LoggerFactory.getLogger(SnapshotJdbcRepository.class);
+
+        eventStoreDataSourceProvider.setDataSource(dataSource);
+
+        setField(snapshotJdbcRepository, "eventStoreDataSourceProvider", eventStoreDataSourceProvider);
+        setField(snapshotJdbcRepository, "logger", logger);
 
         return snapshotJdbcRepository;
     }

diff --git a/...a/uk/gov/justice/services/eventsourcing/repository/jdbc/event/EventRepositoryFactory.java b/...a/uk/gov/justice/services/eventsourcing/repository/jdbc/event/EventRepositoryFactory.java
@@ -6,20 +6,24 @@
 import uk.gov.justice.services.eventsourcing.repository.jdbc.AnsiSQLEventLogInsertionStrategy;
 import uk.gov.justice.services.jdbc.persistence.JdbcResultSetStreamer;
 import uk.gov.justice.services.jdbc.persistence.PreparedStatementWrapperFactory;
+import uk.gov.justice.services.test.utils.persistence.SettableEventStoreDataSourceProvider;
 
 import javax.sql.DataSource;
 
 public class EventRepositoryFactory {
 
     public EventJdbcRepository getEventJdbcRepository(final DataSource dataSource) {
-        final EventJdbcRepository eventJdbcRepository = new EventJdbcRepository(
-                new AnsiSQLEventLogInsertionStrategy(),
-                new JdbcResultSetStreamer(),
-                new PreparedStatementWrapperFactory(),
-                dataSource,
-                getLogger(EventJdbcRepository.class));
-
-        setField(eventJdbcRepository, "dataSource", dataSource);
+
+        final EventJdbcRepository eventJdbcRepository = new EventJdbcRepository();
+
+        final SettableEventStoreDataSourceProvider eventStoreDataSourceProvider = new SettableEventStoreDataSourceProvider();
+        eventStoreDataSourceProvider.setDataSource(dataSource);
+
+        setField(eventJdbcRepository, "eventInsertionStrategy", new AnsiSQLEventLogInsertionStrategy());
+        setField(eventJdbcRepository, "jdbcResultSetStreamer", new JdbcResultSetStreamer());
+        setField(eventJdbcRepository, "preparedStatementWrapperFactory", new PreparedStatementWrapperFactory());
+        setField(eventJdbcRepository, "eventStoreDataSourceProvider", eventStoreDataSourceProvider);
+        setField(eventJdbcRepository, "logger", getLogger(EventJdbcRepository.class));
 
         return eventJdbcRepository;
     }

diff --git a/...ustice/services/eventsourcing/repository/jdbc/event/EventStreamJdbsRepositoryFactory.java b/...ustice/services/eventsourcing/repository/jdbc/event/EventStreamJdbsRepositoryFactory.java
@@ -6,20 +6,23 @@
 import uk.gov.justice.services.eventsourcing.repository.jdbc.eventstream.EventStreamJdbcRepository;
 import uk.gov.justice.services.jdbc.persistence.JdbcResultSetStreamer;
 import uk.gov.justice.services.jdbc.persistence.PreparedStatementWrapperFactory;
+import uk.gov.justice.services.test.utils.persistence.SettableEventStoreDataSourceProvider;
 
 import javax.sql.DataSource;
 
 public class EventStreamJdbsRepositoryFactory {
 
     public EventStreamJdbcRepository getEventStreamJdbcRepository(final DataSource dataSource) {
 
-        final EventStreamJdbcRepository eventStreamJdbcRepository = new EventStreamJdbcRepository(
-                new JdbcResultSetStreamer(),
-                new PreparedStatementWrapperFactory(),
-                dataSource,
-                new UtcClock());
+        final EventStreamJdbcRepository eventStreamJdbcRepository = new EventStreamJdbcRepository();
 
-        setField(eventStreamJdbcRepository, "dataSource", dataSource);
+        final SettableEventStoreDataSourceProvider eventStoreDataSourceProvider = new SettableEventStoreDataSourceProvider();
+        eventStoreDataSourceProvider.setDataSource(dataSource);
+
+        setField(eventStreamJdbcRepository, "jdbcResultSetStreamer", new JdbcResultSetStreamer());
+        setField(eventStreamJdbcRepository, "preparedStatementWrapperFactory", new PreparedStatementWrapperFactory());
+        setField(eventStreamJdbcRepository, "eventStoreDataSourceProvider", eventStoreDataSourceProvider);
+        setField(eventStreamJdbcRepository, "clock", new UtcClock());
 
         return eventStreamJdbcRepository;
     }

diff --git a/pom.xml b/pom.xml
@@ -31,12 +31,12 @@
     <properties>
         <cpp.repo.name>cake-shop</cpp.repo.name>
         <common-bom.version>1.28.0</common-bom.version>
-        <framework.version>6.0.0-M14</framework.version>
+        <framework.version>6.0.0-M20</framework.version>
         <embedded-artemis.version>1.2.0</embedded-artemis.version>
-        <event-store.version>2.0.0-M14</event-store.version>
-        <framework-generators.version>2.0.0-M11</framework-generators.version>
+        <event-store.version>2.0.0-M17</event-store.version>
+        <framework-generators.version>2.0.0-M13</framework-generators.version>
         <file.service.version>1.17.4</file.service.version>
-        <framework-api.version>4.0.0-M8</framework-api.version>
+        <framework-api.version>4.0.0-M13</framework-api.version>
         <generator-maven-plugin.version>2.6.2</generator-maven-plugin.version>
         <json-schema-catalog.version>1.6.0</json-schema-catalog.version>
         <jboss-ejb3-ext-api.version>2.2.0.Final</jboss-ejb3-ext-api.version>