Merge pull request #400 from CJSCommonPlatform/merge-1.7-to-master

purple52 · web-flow · commit e1e4f82c1f61 · 2017-06-06T16:26:40.000+01:00
Merge 1.7 to master
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -11,9 +11,13 @@ on [Keep a CHANGELOG](http://keepachangelog.com/). This project adheres to
 ### Removed
 - Access control Provider annotation and annotation scanning; this functionality has moved to the access control library
 
-## [2.0.0-rc1]
+## [2.0.0-rc1] 2017-05-31
 
 ### Changed
+- Refactor all framework components that are not internal so that they are provided as interfaces
+via new Framework API modules
+- Rework interceptor chain so that it is specific to a service component, by allowing each component
+to provide an interceptor chain definition rather than using annotation scanning
 - Upgrade to use framework parent POM [1.3.0](https://github.com/CJSCommonPlatform/maven-framework-parent-pom/releases/tag/release-1.3.0)
 
 ### Removed
@@ -22,6 +26,28 @@ be provided, typically by generating one from the destination RAML.
 
 ### Fixed
 - Test cases for random ZonedDateTime generators and added logging to show more info when they fail
+- Javadoc errors
+
+### Added
+- Script for building dependencies locally
+- Support for generating and discovering direct adapters, if a message destination exists locally 
+a service component in the same application
+
+## [1.7.1] 2017-05-16
+
+### Added
+- Utility for browsing and deleting DLQ messages, backported from separate test utils library
+- Support for adding additional fields when building metadata
+
+## [1.7.0] 2017-05-16
+
+### Added
+- Add test event log repository to the test-utils-core module
+
+## [1.6.0] 2017-05-05
+
+### Added
+- Support for PDF generation in Alfresco interface
 
 ## [1.5.2] 2017-04-07
 
diff --git a/aggregate-snapshot/aggregate-snapshot-repository/pom.xml b/aggregate-snapshot/aggregate-snapshot-repository/pom.xml
@@ -39,4 +39,4 @@
             <scope>test</scope>
         </dependency>
     </dependencies>
-</project>
+</project>
diff --git a/aggregate-snapshot/aggregate-snapshot-service/src/test/java/uk/gov/justice/services/eventsourcing/source/core/SnapshotAwareEnvelopeEventStreamTest.java b/aggregate-snapshot/aggregate-snapshot-service/src/test/java/uk/gov/justice/services/eventsourcing/source/core/SnapshotAwareEnvelopeEventStreamTest.java
@@ -14,15 +14,11 @@
 import uk.gov.justice.domain.aggregate.TestAggregate;
 import uk.gov.justice.services.eventsourcing.source.core.snapshot.SnapshotService;
 import uk.gov.justice.services.messaging.JsonEnvelope;
-import uk.gov.justice.services.messaging.Metadata;
 
 import java.util.List;
 import java.util.UUID;
-import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
-import org.hamcrest.Matchers;
-import org.hibernate.metamodel.MetadataBuilder;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
diff --git a/event-sourcing/event-repository/event-repository-jdbc/pom.xml b/event-sourcing/event-repository/event-repository-jdbc/pom.xml
@@ -97,16 +97,17 @@
         </dependency>
         <dependency>
             <groupId>uk.gov.justice.services</groupId>
-            <artifactId>test-utils-persistence</artifactId>
+            <artifactId>test-utils-common</artifactId>
             <version>${project.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>uk.gov.justice.services</groupId>
-            <artifactId>test-utils-core</artifactId>
+            <artifactId>test-utils-persistence</artifactId>
             <version>${project.version}</version>
             <scope>test</scope>
         </dependency>
+
     </dependencies>
 
 </project>
diff --git a/event-sourcing/event-repository/event-repository-jdbc/src/main/java/uk/gov/justice/services/eventsourcing/repository/jdbc/eventlog/EventLogJdbcRepository.java b/event-sourcing/event-repository/event-repository-jdbc/src/main/java/uk/gov/justice/services/eventsourcing/repository/jdbc/eventlog/EventLogJdbcRepository.java
@@ -27,7 +27,7 @@ public class EventLogJdbcRepository extends AbstractJdbcRepository<EventLog> {
 
     //TODO @mrich 2016-09-29 - Re-enable the date_created field once liquibase scripts are configured
     @Inject
-    Logger logger;
+    protected Logger logger;
 
     @Inject
     EventLogInsertionStrategy eventLogInsertionStrategy;
diff --git a/event-sourcing/event-repository/event-repository-jdbc/src/test/java/uk/gov/justice/services/eventsourcing/repository/jdbc/eventlog/EventLogConverterTest.java b/event-sourcing/event-repository/event-repository-jdbc/src/test/java/uk/gov/justice/services/eventsourcing/repository/jdbc/eventlog/EventLogConverterTest.java
@@ -3,17 +3,17 @@
 import static org.hamcrest.CoreMatchers.equalTo;
 import static org.hamcrest.CoreMatchers.is;
 import static org.junit.Assert.assertThat;
+import static uk.gov.justice.services.messaging.DefaultJsonEnvelope.envelope;
 import static uk.gov.justice.services.messaging.JsonObjectMetadata.metadataOf;
 import static uk.gov.justice.services.messaging.JsonObjectMetadata.metadataWithRandomUUIDAndName;
-import static uk.gov.justice.services.test.utils.core.messaging.JsonEnvelopeBuilder.envelope;
 
 import uk.gov.justice.services.common.converter.StringToJsonObjectConverter;
 import uk.gov.justice.services.common.util.Clock;
 import uk.gov.justice.services.common.util.UtcClock;
 import uk.gov.justice.services.eventsourcing.repository.jdbc.exception.InvalidStreamIdException;
 import uk.gov.justice.services.messaging.DefaultJsonObjectEnvelopeConverter;
 import uk.gov.justice.services.messaging.JsonEnvelope;
-import uk.gov.justice.services.test.utils.core.helper.StoppedClock;
+import uk.gov.justice.services.test.utils.common.helper.StoppedClock;
 
 import java.util.UUID;
 
diff --git a/event-sourcing/event-source/src/test/java/uk/gov/justice/services/eventsourcing/source/core/EnvelopeEventStreamTest.java b/event-sourcing/event-source/src/test/java/uk/gov/justice/services/eventsourcing/source/core/EnvelopeEventStreamTest.java
@@ -14,15 +14,11 @@
 
 import uk.gov.justice.services.eventsourcing.source.core.exception.EventStreamException;
 import uk.gov.justice.services.messaging.JsonEnvelope;
-import uk.gov.justice.services.messaging.JsonObjectMetadata;
-import uk.gov.justice.services.test.utils.core.messaging.JsonEnvelopeBuilder;
 
 import java.util.List;
 import java.util.UUID;
-import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
-import com.jayway.jsonassert.impl.matcher.IsCollectionWithSize;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
diff --git a/example-context/example-service/example-it/src/test/java/uk/gov/justice/services/example/cakeshop/it/CakeShopIT.java b/example-context/example-service/example-it/src/test/java/uk/gov/justice/services/example/cakeshop/it/CakeShopIT.java
@@ -15,7 +15,6 @@
 import static javax.ws.rs.client.Entity.entity;
 import static javax.ws.rs.core.MediaType.APPLICATION_OCTET_STREAM_TYPE;
 import static org.apache.commons.io.IOUtils.contentEquals;
-import static org.apache.http.entity.ContentType.APPLICATION_JSON;
 import static org.apache.http.entity.ContentType.APPLICATION_OCTET_STREAM;
 import static org.apache.http.entity.mime.HttpMultipartMode.BROWSER_COMPATIBLE;
 import static org.exparity.hamcrest.date.ZonedDateTimeMatchers.within;
@@ -38,7 +37,7 @@
 import uk.gov.justice.services.eventsourcing.repository.jdbc.eventlog.EventLog;
 import uk.gov.justice.services.example.cakeshop.domain.aggregate.Recipe;
 import uk.gov.justice.services.example.cakeshop.it.util.ApiResponse;
-import uk.gov.justice.services.example.cakeshop.it.util.StandaloneEventLogJdbcRepository;
+import uk.gov.justice.services.test.utils.core.eventsource.TestEventLogRepository;
 import uk.gov.justice.services.example.cakeshop.it.util.StandaloneSnapshotJdbcRepository;
 import uk.gov.justice.services.example.cakeshop.it.util.StandaloneStreamStatusJdbcRepository;
 import uk.gov.justice.services.example.cakeshop.it.util.TestProperties;
@@ -65,7 +64,6 @@
 import javax.jms.Session;
 import javax.jms.TextMessage;
 import javax.jms.Topic;
-import javax.json.JsonObject;
 import javax.json.JsonObjectBuilder;
 import javax.sql.DataSource;
 import javax.ws.rs.client.Client;
@@ -130,7 +128,7 @@ public class CakeShopIT {
 
     private static final TestProperties TEST_PROPERTIES = new TestProperties("test.properties");
 
-    private static StandaloneEventLogJdbcRepository EVENT_LOG_REPOSITORY;
+    private static TestEventLogRepository EVENT_LOG_REPOSITORY;
     private static StandaloneStreamStatusJdbcRepository STREAM_STATUS_REPOSITORY;
     private static StandaloneSnapshotJdbcRepository SNAPSHOT_REPOSITORY;
     private static ActiveMQConnectionFactory JMS_CONNECTION_FACTORY;
@@ -143,7 +141,7 @@ public class CakeShopIT {
     @BeforeClass
     public static void beforeClass() throws Exception {
         final DataSource eventStoreDataSource = initEventStoreDb();
-        EVENT_LOG_REPOSITORY = new StandaloneEventLogJdbcRepository(eventStoreDataSource);
+        EVENT_LOG_REPOSITORY = new TestEventLogRepository(eventStoreDataSource);
         JMS_CONNECTION_FACTORY = new ActiveMQConnectionFactory(JMS_BROKER_URL);
 
         final DataSource viewStoreDatasource = initViewStoreDb();
diff --git a/example-context/example-service/example-it/src/test/java/uk/gov/justice/services/example/cakeshop/it/util/StandaloneEventLogJdbcRepository.java b/example-context/example-service/example-it/src/test/java/uk/gov/justice/services/example/cakeshop/it/util/StandaloneEventLogJdbcRepository.java
diff --git a/test-utils/test-utils-common/pom.xml b/test-utils/test-utils-common/pom.xml
@@ -11,6 +11,11 @@
 
     <artifactId>test-utils-common</artifactId>
     <dependencies>
+        <!-- Leave glassfish at top as the preferred Json provider (even though its for test) -->
+        <dependency>
+            <groupId>org.glassfish</groupId>
+            <artifactId>javax.json</artifactId>
+        </dependency>
         <dependency>
             <groupId>uk.gov.justice.services</groupId>
             <artifactId>messaging-core</artifactId>
@@ -33,6 +38,10 @@
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-log4j12</artifactId>
         </dependency>
+        <dependency>
+            <groupId>com.jayway.jsonpath</groupId>
+            <artifactId>json-path-assert</artifactId>
+        </dependency>
     </dependencies>
 
 
diff --git a/test-utils/test-utils-common/src/main/java/uk/gov/justice/services/test/utils/common/helper/StoppedClock.java b/test-utils/test-utils-common/src/main/java/uk/gov/justice/services/test/utils/common/helper/StoppedClock.java
@@ -1,4 +1,4 @@
-package uk.gov.justice.services.test.utils.core.helper;
+package uk.gov.justice.services.test.utils.common.helper;
 
 import uk.gov.justice.services.common.util.Clock;
 
diff --git a/test-utils/test-utils-common/src/test/java/uk/gov/justice/services/test/utils/common/helper/StoppedClockTest.java b/test-utils/test-utils-common/src/test/java/uk/gov/justice/services/test/utils/common/helper/StoppedClockTest.java
@@ -1,9 +1,10 @@
-package uk.gov.justice.services.test.utils.core.helper;
+package uk.gov.justice.services.test.utils.common.helper;
 
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.MatcherAssert.assertThat;
 
 import uk.gov.justice.services.common.util.Clock;
+import uk.gov.justice.services.test.utils.common.helper.StoppedClock;
 
 import java.time.ZonedDateTime;
 
diff --git a/test-utils/test-utils-core/pom.xml b/test-utils/test-utils-core/pom.xml
@@ -34,6 +34,11 @@
             <artifactId>core</artifactId>
             <version>${project.version}</version>
         </dependency>
+        <dependency>
+            <groupId>uk.gov.justice.services</groupId>
+            <artifactId>event-repository-jdbc</artifactId>
+            <version>${project.version}</version>
+        </dependency>
         <dependency>
             <groupId>org.jboss.resteasy</groupId>
             <artifactId>resteasy-client</artifactId>
@@ -100,6 +105,10 @@
                 </exclusion>
             </exclusions>
         </dependency>
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-dbcp2</artifactId>
+        </dependency>
 
         <!-- Test dependencies -->
         <dependency>
diff --git a/test-utils/test-utils-core/src/main/java/uk/gov/justice/services/test/utils/core/eventsource/TestEventLogRepository.java b/test-utils/test-utils-core/src/main/java/uk/gov/justice/services/test/utils/core/eventsource/TestEventLogRepository.java
@@ -0,0 +1,81 @@
+package uk.gov.justice.services.test.utils.core.eventsource;
+
+
+import static java.lang.String.format;
+import static java.sql.DriverManager.getDriver;
+import static java.util.stream.Collectors.toList;
+import static uk.gov.justice.services.test.utils.common.host.TestHostProvider.getHost;
+
+import uk.gov.justice.services.eventsourcing.repository.jdbc.eventlog.EventLog;
+import uk.gov.justice.services.eventsourcing.repository.jdbc.eventlog.EventLogJdbcRepository;
+
+import java.sql.SQLException;
+import java.util.List;
+import java.util.UUID;
+import java.util.stream.Stream;
+
+import javax.sql.DataSource;
+
+import org.apache.commons.dbcp2.BasicDataSource;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * Standalone repository class to access event streams. To be used in integration testing
+ */
+public class TestEventLogRepository extends EventLogJdbcRepository {
+    private static final Logger LOGGER = LoggerFactory.getLogger(TestEventLogRepository.class);
+    static final String SQL_FIND_ALL = "SELECT * FROM event_log";
+
+    private final DataSource datasource;
+
+    public TestEventLogRepository(final DataSource datasource) {
+        this.datasource = datasource;
+        this.logger = LOGGER;
+    }
+
+    public TestEventLogRepository(final String url, final String username, final String password, final String driverClassName) {
+        final BasicDataSource dataSource = new BasicDataSource();
+        dataSource.setDriverClassName(driverClassName);
+        dataSource.setUrl(url);
+        dataSource.setUsername(username);
+        dataSource.setPassword(password);
+        this.datasource = dataSource;
+        this.logger = LOGGER;
+
+    }
+
+    public TestEventLogRepository(final String contextName) throws SQLException {
+        this(jdbcUrlFrom(contextName), contextName, contextName, getDriver(jdbcUrlFrom(contextName)).getClass().getName());
+    }
+
+    public static TestEventLogRepository forContext(final String contextName) {
+        try {
+            return new TestEventLogRepository(contextName);
+        } catch (SQLException e) {
+            throw new IllegalArgumentException(format("Error instantiating repository for context: %s", contextName), e);
+        }
+    }
+
+    public List<EventLog> eventsOfStreamId(final UUID streamId) {
+        try (final Stream<EventLog> events = this.findByStreamIdOrderBySequenceIdAsc(streamId)) {
+            return events.collect(toList());
+        }
+    }
+
+    public List<EventLog> allEvents() {
+        try (final Stream<EventLog> events = this.findAll()) {
+            return events.collect(toList());
+        }
+    }
+
+    @Override
+    protected DataSource getDataSource() {
+        return datasource;
+    }
+
+    private static String jdbcUrlFrom(final String contextName) {
+        return format("jdbc:postgresql://%s/%seventstore", getHost(), contextName);
+    }
+
+}
diff --git a/test-utils/test-utils-core/src/main/java/uk/gov/justice/services/test/utils/core/messaging/JsonEnvelopeBuilder.java b/test-utils/test-utils-core/src/main/java/uk/gov/justice/services/test/utils/core/messaging/JsonEnvelopeBuilder.java
@@ -19,7 +19,7 @@
 
 /**
  * Implementation of the {@link JsonEnvelope} specifically for testing purposes that include useful
- * builder options. For production code the {@link uk.gov.justice.services.core.enveloper.Enveloper}
+ * builder options. For production code the Enveloper
  * should be used to create envelopes.
  */
 public class JsonEnvelopeBuilder {
diff --git a/test-utils/test-utils-core/src/test/java/uk/gov/justice/services/test/utils/core/messaging/JsonEnvelopeBuilderTest.java b/test-utils/test-utils-core/src/test/java/uk/gov/justice/services/test/utils/core/messaging/JsonEnvelopeBuilderTest.java
@@ -1,5 +1,6 @@
 package uk.gov.justice.services.test.utils.core.messaging;
 
+
 import static com.jayway.jsonassert.JsonAssert.with;
 import static java.math.BigDecimal.ONE;
 import static java.util.UUID.randomUUID;
@@ -13,7 +14,6 @@
 import uk.gov.justice.services.messaging.JsonObjectMetadata;
 import uk.gov.justice.services.messaging.Metadata;
 
-import java.math.BigDecimal;
 import java.util.UUID;
 
 import javax.json.Json;
diff --git a/test-utils/test-utils-core/src/test/java/uk/gov/justice/services/test/utils/core/random/RandomGeneratorTest.java b/test-utils/test-utils-core/src/test/java/uk/gov/justice/services/test/utils/core/random/RandomGeneratorTest.java
@@ -25,7 +25,7 @@
 
 import uk.gov.justice.services.common.util.Clock;
 import uk.gov.justice.services.common.util.UtcClock;
-import uk.gov.justice.services.test.utils.core.helper.StoppedClock;
+import uk.gov.justice.services.test.utils.common.helper.StoppedClock;
 
 import java.math.BigDecimal;
 import java.net.URI;
