Remove timeToLive from Subscription jms_uri

CJSCommonPlatform · Mar 12, 2018 · 7269df8 · 7269df8
1 parent e59cced
commit 7269df8
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 12 deletions.
diff --git a/.../uk/gov/justice/maven/generator/io/files/parser/SubscriptionDescriptorFileParserTest.java b/.../uk/gov/justice/maven/generator/io/files/parser/SubscriptionDescriptorFileParserTest.java
@@ -2,6 +2,7 @@
 
 import static java.nio.file.Paths.get;
 import static java.util.Arrays.asList;
+import static java.util.Collections.singletonList;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.hasSize;
 import static org.hamcrest.Matchers.instanceOf;
@@ -17,6 +18,7 @@
 import java.nio.file.NoSuchFileException;
 import java.nio.file.Path;
 import java.util.Collection;
+import java.util.Collections;
 import java.util.List;
 
 import org.everit.json.schema.ValidationException;
@@ -29,7 +31,7 @@ public class SubscriptionDescriptorFileParserTest {
     @Test
     public void shouldThrowFileNotFoundException() {
         final SubscriptionDescriptorFileParser subscriptionDescriptorFileParser = new SubscriptionDescriptorFileParserFactory().create();
-        final List<Path> paths = asList(get("no-subscription.yaml"));
+        final List<Path> paths = singletonList(get("no-subscription.yaml"));
         try {
             subscriptionDescriptorFileParser.parse(baseDir, paths);
             fail();
@@ -43,7 +45,7 @@ public void shouldThrowFileNotFoundException() {
     public void shouldFailOnIncorrectSubscriptionYaml() {
         final SubscriptionDescriptorFileParser subscriptionDescriptorFileParser = new SubscriptionDescriptorFileParserFactory().create();
 
-        final List<Path> paths = asList(get("incorrect-subscription.yaml"));
+        final List<Path> paths = singletonList(get("incorrect-subscription.yaml"));
         try {
             subscriptionDescriptorFileParser.parse(baseDir, paths);
             fail();
@@ -58,7 +60,7 @@ public void shouldFailOnIncorrectSubscriptionYaml() {
     public void shouldParsePathsToYaml() {
         final SubscriptionDescriptorFileParser subscriptionDescriptorFileParser = new SubscriptionDescriptorFileParserFactory().create();
 
-        final List<Path> paths = asList(get("subscription.yaml"));
+        final List<Path> paths = singletonList(get("subscription.yaml"));
         final Collection<SubscriptionDescriptor> subscriptionDescriptors = subscriptionDescriptorFileParser.parse(baseDir, paths);
 
         assertThat(subscriptionDescriptors, hasSize(1));
@@ -82,15 +84,15 @@ private void assertExampleEventSource(Eventsource eventsource) {
         final String name = eventsource.getName();
         assertThat(name, is("examplecontext"));
         final Location location = eventsource.getLocation();
-        assertThat(location.getJmsUri(), is("jms:topic:example.event?timeToLive=1000"));
+        assertThat(location.getJmsUri(), is("jms:topic:example.event"));
         assertThat(location.getRestUri(), is("http://localhost:8080/example/event-source-api/rest"));
     }
 
     private void assertPeopleEventSource(Eventsource eventsource) {
         final String name = eventsource.getName();
         assertThat(name, is("people"));
         final Location location = eventsource.getLocation();
-        assertThat(location.getJmsUri(), is("jms:topic:people.event?timeToLive=1000"));
+        assertThat(location.getJmsUri(), is("jms:topic:people.event"));
         assertThat(location.getRestUri(), is("http://localhost:8080/people/event-source-api/rest"));
     }
 
@@ -118,4 +120,4 @@ private void assertPeopleEvents(Subscription subscription) {
         assertThat(events.get(1).getName(), is("people.person-removed"));
         assertThat(events.get(1).getSchemaUri(), is("http://justice.gov.uk/json/schemas/domains/people/people.person-removed.json"));
     }
-}
+}
diff --git a/subscription-descriptor-parser/src/test/resources/incorrect-subscription.yaml b/subscription-descriptor-parser/src/test/resources/incorrect-subscription.yaml
@@ -12,7 +12,7 @@ subscription_descriptor:
       eventsource:
         name: examplecontext
         location:
-          jms_uri:  jms:topic:example.event?timeToLive=1000
+          jms_uri:  jms:topic:example.event
           rest_uri: http://localhost:8080/example/event-source-api/rest
     - name: subscription2
       events:
@@ -24,6 +24,6 @@ subscription_descriptor:
       eventsource:
           name: people
           location:
-           jms_uri:  jms:topic:people.event?timeToLive=1000
+           jms_uri:  jms:topic:people.event
            rest_uri: http://localhost:8080/people/event-source-api/rest
-...
+...
diff --git a/subscription-descriptor-parser/src/test/resources/subscription.yaml b/subscription-descriptor-parser/src/test/resources/subscription.yaml
@@ -13,7 +13,7 @@ subscription_descriptor:
       eventsource:
         name: examplecontext
         location:
-          jms_uri:  jms:topic:example.event?timeToLive=1000
+          jms_uri:  jms:topic:example.event
           rest_uri: http://localhost:8080/example/event-source-api/rest
     - name: subscription2
       events:
@@ -25,6 +25,6 @@ subscription_descriptor:
       eventsource:
           name: people
           location:
-           jms_uri:  jms:topic:people.event?timeToLive=1000
+           jms_uri:  jms:topic:people.event
            rest_uri: http://localhost:8080/people/event-source-api/rest
-...
+...