Update for datasource changes

CJSCommonPlatform · Apr 17, 2019 · 2d8699f · 2d8699f
1 parent c438055
commit 2d8699f
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 29 deletions.
diff --git a/example-context/example-service/example-it/pom.xml b/example-context/example-service/example-it/pom.xml
@@ -190,7 +190,7 @@
         </dependency>
         <dependency>
             <groupId>uk.gov.justice.event-store</groupId>
-            <artifactId>linked-event-processor</artifactId>
+            <artifactId>published-event-processor</artifactId>
             <version>${event-store.version}</version>
             <scope>test</scope>
         </dependency>

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
@@ -4,8 +4,8 @@
 import static uk.gov.justice.services.test.utils.core.reflection.ReflectionUtil.setField;
 
 import uk.gov.justice.services.eventsourcing.repository.jdbc.AnsiSQLEventLogInsertionStrategy;
-import uk.gov.justice.services.jdbc.persistence.DefaultJdbcDataSourceProvider;
-import uk.gov.justice.services.jdbc.persistence.JdbcRepositoryHelper;
+import uk.gov.justice.services.jdbc.persistence.JdbcResultSetStreamer;
+import uk.gov.justice.services.jdbc.persistence.PreparedStatementWrapperFactory;
 
 import javax.sql.DataSource;
 
@@ -14,9 +14,9 @@ public class EventRepositoryFactory {
     public EventJdbcRepository getEventJdbcRepository(final DataSource dataSource) {
         final EventJdbcRepository eventJdbcRepository = new EventJdbcRepository(
                 new AnsiSQLEventLogInsertionStrategy(),
-                new JdbcRepositoryHelper(),
-                new DefaultJdbcDataSourceProvider(),
-                null,
+                new JdbcResultSetStreamer(),
+                new PreparedStatementWrapperFactory(),
+                dataSource,
                 getLogger(EventJdbcRepository.class));
 
         setField(eventJdbcRepository, "dataSource", dataSource);

diff --git a/...ustice/services/eventsourcing/repository/jdbc/event/EventStreamJdbsRepositoryFactory.java b/...ustice/services/eventsourcing/repository/jdbc/event/EventStreamJdbsRepositoryFactory.java
@@ -1,12 +1,11 @@
 package uk.gov.justice.services.eventsourcing.repository.jdbc.event;
 
-import static org.slf4j.LoggerFactory.getLogger;
 import static uk.gov.justice.services.test.utils.core.reflection.ReflectionUtil.setField;
 
 import uk.gov.justice.services.common.util.UtcClock;
 import uk.gov.justice.services.eventsourcing.repository.jdbc.eventstream.EventStreamJdbcRepository;
-import uk.gov.justice.services.jdbc.persistence.DefaultJdbcDataSourceProvider;
-import uk.gov.justice.services.jdbc.persistence.JdbcRepositoryHelper;
+import uk.gov.justice.services.jdbc.persistence.JdbcResultSetStreamer;
+import uk.gov.justice.services.jdbc.persistence.PreparedStatementWrapperFactory;
 
 import javax.sql.DataSource;
 
@@ -15,11 +14,10 @@ public class EventStreamJdbsRepositoryFactory {
     public EventStreamJdbcRepository getEventStreamJdbcRepository(final DataSource dataSource) {
 
         final EventStreamJdbcRepository eventStreamJdbcRepository = new EventStreamJdbcRepository(
-                new JdbcRepositoryHelper(),
-                new DefaultJdbcDataSourceProvider(),
-                new UtcClock(),
-                null,
-                getLogger(EventStreamJdbcRepository.class));
+                new JdbcResultSetStreamer(),
+                new PreparedStatementWrapperFactory(),
+                dataSource,
+                new UtcClock());
 
         setField(eventStreamJdbcRepository, "dataSource", dataSource);
 

diff --git a/.../justice/services/eventsourcing/repository/jdbc/event/LinkedEventRepositoryTruncator.java b/.../justice/services/eventsourcing/repository/jdbc/event/LinkedEventRepositoryTruncator.java
@@ -7,14 +7,14 @@
 public class LinkedEventRepositoryTruncator {
 
     private final DataSource datasource;
-    private final LinkedEventJdbcRepository linkedEventJdbcRepository;
+    private final PublishedEventInserter publishedEventInserter;
 
     public LinkedEventRepositoryTruncator(final DataSource datasource) {
         this.datasource = datasource;
-        this.linkedEventJdbcRepository = new LinkedEventJdbcRepository();
+        this.publishedEventInserter = new PublishedEventInserter();
     }
 
     public void truncate() throws SQLException {
-        linkedEventJdbcRepository.truncate(datasource.getConnection());
+        publishedEventInserter.truncate(datasource.getConnection());
     }
 }
diff --git a/...ice/services/example/cakeshop/it/helpers/StandaloneStreamStatusJdbcRepositoryFactory.java b/...ice/services/example/cakeshop/it/helpers/StandaloneStreamStatusJdbcRepositoryFactory.java
@@ -1,20 +1,14 @@
 package uk.gov.justice.services.example.cakeshop.it.helpers;
 
-import static uk.gov.justice.services.test.utils.core.reflection.ReflectionUtil.setField;
-
 import uk.gov.justice.services.event.buffer.core.repository.subscription.StreamStatusJdbcRepository;
-import uk.gov.justice.services.jdbc.persistence.JdbcRepositoryHelper;
+import uk.gov.justice.services.jdbc.persistence.PreparedStatementWrapperFactory;
 
 import javax.sql.DataSource;
 
 public class StandaloneStreamStatusJdbcRepositoryFactory {
 
     public StreamStatusJdbcRepository getStreamStatusJdbcRepository(final DataSource dataSource) {
-        final StreamStatusJdbcRepository streamStatusJdbcRepository = new StreamStatusJdbcRepository();
-
-        setField(streamStatusJdbcRepository, "dataSource", dataSource);
-        setField(streamStatusJdbcRepository, "jdbcRepositoryHelper", new JdbcRepositoryHelper());
 
-        return streamStatusJdbcRepository;
+        return new StreamStatusJdbcRepository(dataSource, new PreparedStatementWrapperFactory());
     }
 }
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-M10</framework.version>
+        <framework.version>6.0.0-M14</framework.version>
         <embedded-artemis.version>1.2.0</embedded-artemis.version>
-        <event-store.version>2.0.0-M11</event-store.version>
-        <framework-generators.version>2.0.0-M8</framework-generators.version>
+        <event-store.version>2.0.0-M14</event-store.version>
+        <framework-generators.version>2.0.0-M11</framework-generators.version>
         <file.service.version>1.17.4</file.service.version>
-        <framework-api.version>4.0.0-M5</framework-api.version>
+        <framework-api.version>4.0.0-M8</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>