Remove deprecated github-token, update dependency versions and integr…

…ation tests

.travis.yml

@@ -21,8 +21,6 @@ addons:
     organization: cjscommonplatform
     token:
       secure: MPrE0HzubH6Of0OeMlYuB5vEZNVfJE8wZG/iWdVmNHBVWWodEP4sO8s1GggKQk5rrHiSlVXs+G7OIM4X6Kg2HnjUj05G28IpirtkDnCLvIcSqAZxecO21tIBYwHn/mCdihHQOPjA8RFjc8+TSsRDNipeR3QvOzf6g5XZtOV/Ew+p5VoirIbI9jOO/qdOzHuQjZhARmI7HXqEmpkXJiObfyT5uJvO047lSbKA48VLWSfv2zFl5+8uymT+0g8fHPm9JWTNn7VLyKQQ4en7Cr9NC03Ahk8rXybB0qOrHj3fewtUGBp3pCa8bU6XaMFzSNHixueUG2mxxxI9ROB7nz+19CSOGafXZsygjDqPeT8D1wHHGGBmc90WQE3JhU9YFMXKnx5/a8OJyIAGRUE81wt3FsJUu+OvIHdQEOlM7geWYv6P52VbgmJSSvMgRnzNE3seq0LSsFxQXAQmAmDLWwWz0t2wbzO8dUmmU4jn5xoqSe2RBENaD1vDG37rvi8aGrr+Xg2005/8yIvlr+7ZZbeiHdYXqzbiDdYQyGjr8FaJLI3WPBtCRhsvJBgdQhuMFI/V44ntwAP6CzOty9Gfldlp+ybaY9UcFSKbGxBcrHPJfsS2ajgPUjW1K8KBFc7IKfy/XWhBsWOEHgVb2n4AZSV/nFTpK4HwpvHid0bEHcyTpk8=
-    github_token:
-      secure: CZAEIt+cZXQKh/q0gAyTGi2ypJA2OHRp2gKD/pcvIkR8CzmUe+qlV4tI0DV81dsK3O68rK9AzmnbdJH95zEds+MHrsLmOX6+pCjoH4z6lDcaxFE6put/UOqbHfgC5XDs+0zhb1XKcf6tnPgsYy9s2sCXVQL4DFHOuBVMZ4IgMEXxVzlAk50qthBX4QJBn5Wvui1oOMLR+lJFaS4Lu4V11TihHzszpTyQdg0ME6bN+pskrcPInNIuuSfr7928E8MzWpxmj9o0MqyhXwRH9QWE3szG3FSmFVGYfyDQ1lXscDmb0I5wUxMGP6+CfwIDPXbOtyft4ztc29SYw0NU1DwPzF+8/jZxs3od3NANb0iObmUSdLEiX+re/DHzP3cMn28X/5s8ps4BGcLMg5c9KSdXVtZB48a+7Ez2lbxpBezHZLLADnQ+zNb9B+KdkA1Lo9BFu7zvlHaO9kXjxJgWs2DOOzW0zzeBDk+ysG80GBFPJBCfHxaXxQsKNGfZxnBocGDCGwDSvfs9faDnXu7u0KLMmJBabx/HtbR8qJkNUMwA+iVPkNM2RyVfEPNZHwZfu2wB+Oo9XVX0nM4sxvbRkir2RqulafK7ZWOFLl5tmmdISj1LZ/d8mVTBeA+BFe8AsfO9b+d6CBQbVGGq8Wn4i84khbFCIH30/wDMiURU4XQT+5Q=
 before_install:
 - git clone https://github.com/CJSCommonPlatform/travis-settings.git target/travis-settings
 - ln -sfT ${PWD}/target/travis-settings/settings.xml ${HOME}/.m2/settings.xml

CHANGELOG.md

@@ -5,11 +5,25 @@ on [Keep a CHANGELOG](http://keepachangelog.com/). This project adheres to
 
 ## [Unreleased]
 
+## [2.0.0-M3] - 2019-04-23
+
 ### Added
 - Integration Test for Event Catchup
 ### Changed
 - Update Shuttering Integration Test
-
+- Update framework-api to 6.0.0-M15
+- Update event-store to 2.0.0-M15
+- Update framework-generators to 2.0.0-M12
+- Update file-service to 1.17.4-M1
+- Update framework-api to 4.0.0-M9
+- Update generator-maven-plugin to 2.7.0-M1
+- Update json-schema-catalog to 1.6.1-M2
+- Update test-utils to 1.22.0-M1
+- Update utilities to 1.17.0-M2
+- Update annotation-validator-maven-plugin to 1.0.2-M1
+- Update integration tests for refactoring submodule linked-event-processor in event-store.
+### Removed
+- Remove deprecated github_token from travis.yml
 
 ## [2.0.0-M2] - 2019-04-08
 

example-context/example-service/example-it/pom.xml

@@ -188,12 +188,6 @@
             <artifactId>jmx</artifactId>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>uk.gov.justice.event-store</groupId>
-            <artifactId>linked-event-processor</artifactId>
-            <version>${event-store.version}</version>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>uk.gov.justice.services.example</groupId>
             <artifactId>example-persistence</artifactId>

example-context/example-service/example-it/src/test/java/uk/gov/justice/services/eventsourcing/repository/jdbc/event/EventRepositoryFactory.java

@@ -4,20 +4,26 @@
 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 uk.gov.justice.services.test.utils.persistence.TestEventStoreDataSourceFactory;
+
+import java.sql.SQLException;
 
 import javax.sql.DataSource;
 
+import liquibase.exception.LiquibaseException;
+
 public class EventRepositoryFactory {
 
-    public EventJdbcRepository getEventJdbcRepository(final DataSource dataSource) {
+    public EventJdbcRepository getEventJdbcRepository(final DataSource dataSource) throws SQLException, LiquibaseException {
         final EventJdbcRepository eventJdbcRepository = new EventJdbcRepository(
                 new AnsiSQLEventLogInsertionStrategy(),
-                new JdbcRepositoryHelper(),
-                new DefaultJdbcDataSourceProvider(),
-                null,
-                getLogger(EventJdbcRepository.class));
+                new JdbcResultSetStreamer(),
+                new PreparedStatementWrapperFactory(),
+                new TestEventStoreDataSourceFactory().createDataSource("frameworkeventstore"),
+                getLogger(EventJdbcRepository.class)
+        );
 
         setField(eventJdbcRepository, "dataSource", dataSource);
 

example-context/example-service/example-it/src/test/java/uk/gov/justice/services/eventsourcing/repository/jdbc/event/EventStreamJdbsRepositoryFactory.java

@@ -1,25 +1,28 @@
 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 uk.gov.justice.services.test.utils.persistence.TestEventStoreDataSourceFactory;
+
+import java.sql.SQLException;
 
 import javax.sql.DataSource;
 
+import liquibase.exception.LiquibaseException;
+
 public class EventStreamJdbsRepositoryFactory {
 
-    public EventStreamJdbcRepository getEventStreamJdbcRepository(final DataSource dataSource) {
+    public EventStreamJdbcRepository getEventStreamJdbcRepository(final DataSource dataSource) throws SQLException, LiquibaseException {
 
         final EventStreamJdbcRepository eventStreamJdbcRepository = new EventStreamJdbcRepository(
-                new JdbcRepositoryHelper(),
-                new DefaultJdbcDataSourceProvider(),
-                new UtcClock(),
-                null,
-                getLogger(EventStreamJdbcRepository.class));
+                new JdbcResultSetStreamer(),
+                new PreparedStatementWrapperFactory(),
+                new TestEventStoreDataSourceFactory().createDataSource("frameworkeventstore"),
+                new UtcClock());
 
         setField(eventStreamJdbcRepository, "dataSource", dataSource);
 

example-context/example-service/example-it/src/test/java/uk/gov/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());
     }
 }

example-context/example-service/example-it/src/test/java/uk/gov/justice/services/example/cakeshop/it/CakeShopConcurrencyIT.java

@@ -24,13 +24,15 @@
 import uk.gov.justice.services.example.cakeshop.it.helpers.RestEasyClientFactory;
 import uk.gov.justice.services.test.utils.core.http.HttpResponsePoller;
 
+import java.sql.SQLException;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.concurrent.TimeUnit;
 
 import javax.sql.DataSource;
 import javax.ws.rs.client.Client;
 
+import liquibase.exception.LiquibaseException;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
@@ -45,6 +47,9 @@ public class CakeShopConcurrencyIT {
 
     private Client client;
 
+    public CakeShopConcurrencyIT() throws SQLException, LiquibaseException {
+    }
+
     @Before
     public void before() throws Exception {
         client = new RestEasyClientFactory().createResteasyClient();

example-context/example-service/example-it/src/test/java/uk/gov/justice/services/example/cakeshop/it/CakeShopFileServiceIT.java

@@ -33,11 +33,13 @@
 import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
+import java.sql.SQLException;
 
 import javax.sql.DataSource;
 import javax.ws.rs.client.Client;
 import javax.ws.rs.client.Invocation;
 
+import liquibase.exception.LiquibaseException;
 import org.apache.http.HttpEntity;
 import org.apache.http.HttpResponse;
 import org.apache.http.client.methods.HttpPost;
@@ -58,6 +60,9 @@ public class CakeShopFileServiceIT {
     private Querier querier;
     private CommandSender commandSender;
 
+    public CakeShopFileServiceIT() throws SQLException, LiquibaseException {
+    }
+
     @Before
     public void before() throws Exception {
         client = new RestEasyClientFactory().createResteasyClient();

example-context/example-service/example-it/src/test/java/uk/gov/justice/services/example/cakeshop/it/CakeShopIT.java

@@ -34,10 +34,13 @@
 import uk.gov.justice.services.example.cakeshop.it.helpers.Querier;
 import uk.gov.justice.services.example.cakeshop.it.helpers.RestEasyClientFactory;
 
+import java.sql.SQLException;
+
 import javax.sql.DataSource;
 import javax.ws.rs.client.Client;
 import javax.ws.rs.core.Response;
 
+import liquibase.exception.LiquibaseException;
 import org.apache.http.message.BasicNameValuePair;
 import org.junit.After;
 import org.junit.Before;
@@ -56,6 +59,9 @@ public class CakeShopIT {
     private Querier querier;
     private CommandSender commandSender;
 
+    public CakeShopIT() throws SQLException, LiquibaseException {
+    }
+
     @Before
     public void before() throws Exception {
         client = new RestEasyClientFactory().createResteasyClient();

example-context/example-service/example-it/src/test/java/uk/gov/justice/services/example/cakeshop/it/CakeShopReplayEventsIT.java

@@ -39,6 +39,7 @@
 import javax.sql.DataSource;
 import javax.ws.rs.client.Client;
 
+import liquibase.exception.LiquibaseException;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
@@ -64,6 +65,9 @@ public class CakeShopReplayEventsIT {
     private Client client;
     private MBeanHelper mBeanHelper;
 
+    public CakeShopReplayEventsIT() throws SQLException, LiquibaseException {
+    }
+
     @Before
     public void before() {
         client = new RestEasyClientFactory().createResteasyClient();

example-context/example-service/example-it/src/test/java/uk/gov/justice/services/example/cakeshop/it/CakeShopTimeStampIT.java

@@ -26,13 +26,15 @@
 import uk.gov.justice.services.example.cakeshop.it.helpers.Querier;
 import uk.gov.justice.services.example.cakeshop.it.helpers.RestEasyClientFactory;
 
+import java.sql.SQLException;
 import java.util.UUID;
 import java.util.stream.Stream;
 
 import javax.sql.DataSource;
 import javax.ws.rs.client.Client;
 import javax.ws.rs.core.Response;
 
+import liquibase.exception.LiquibaseException;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
@@ -45,6 +47,9 @@ public class CakeShopTimeStampIT {
     private Client client;
     private Querier querier;
 
+    public CakeShopTimeStampIT() throws SQLException, LiquibaseException {
+    }
+
     @Before
     public void before() throws Exception {
         client = new RestEasyClientFactory().createResteasyClient();

example-context/example-service/example-it/src/test/java/uk/gov/justice/services/example/cakeshop/it/helpers/StandaloneStreamStatusJdbcRepositoryFactory.java

@@ -3,7 +3,7 @@
 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;
 
@@ -13,7 +13,7 @@ public StreamStatusJdbcRepository getStreamStatusJdbcRepository(final DataSource
         final StreamStatusJdbcRepository streamStatusJdbcRepository = new StreamStatusJdbcRepository();
 
         setField(streamStatusJdbcRepository, "dataSource", dataSource);
-        setField(streamStatusJdbcRepository, "jdbcRepositoryHelper", new JdbcRepositoryHelper());
+        setField(streamStatusJdbcRepository, "preparedStatementWrapperFactory", new PreparedStatementWrapperFactory());
 
         return streamStatusJdbcRepository;
     }

pom.xml

@@ -31,20 +31,20 @@
     <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-M15</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>
-        <file.service.version>1.17.4</file.service.version>
-        <framework-api.version>4.0.0-M5</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>
+        <event-store.version>2.0.0-M15</event-store.version>
+        <framework-generators.version>2.0.0-M12</framework-generators.version>
+        <file.service.version>1.17.4-M1</file.service.version>
+        <framework-api.version>4.0.0-M9</framework-api.version>
+        <generator-maven-plugin.version>2.7.0-M1</generator-maven-plugin.version>
+        <json-schema-catalog.version>1.6.1-M2</json-schema-catalog.version>
         <jboss-ejb3-ext-api.version>2.2.0.Final</jboss-ejb3-ext-api.version>
         <jboss-vfs.version>3.2.12.Final</jboss-vfs.version>
-        <raml-maven-plugin.version>1.6.5</raml-maven-plugin.version>
-        <test-utils.version>1.22.0</test-utils.version>
-        <utilities.version>1.16.4</utilities.version>
-        <annotation-validator-maven-plugin.version>1.0.1</annotation-validator-maven-plugin.version>
+        <raml-maven-plugin.version>1.6.6</raml-maven-plugin.version>
+        <test-utils.version>1.22.0-M1</test-utils.version>
+        <utilities.version>1.17.0-M2</utilities.version>
+        <annotation-validator-maven-plugin.version>1.0.2-M1</annotation-validator-maven-plugin.version>
     </properties>
 
     <dependencyManagement>