Merge c97219d into d44469d

CJSCommonPlatform · Nov 2, 2018 · 6c7c138 · 6c7c138
2 parents d44469d + c97219d
commit 6c7c138
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 19 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,8 +5,12 @@ on [Keep a CHANGELOG](http://keepachangelog.com/). This project adheres to
 
 ## [Unreleased]
 
+### Changed
+- Remove requirement to have a subscription-descriptor.yaml on the classpath
+
 ### Added
--event-publisher-process to event-store-bom
+- event-publisher-process to event-store-bom
+- New test-utils-event-store module to hold TestEventRepository moved from framework
 
 ## [1.0.0-M4] - 2018-10-31
 

diff --git a/...n/java/uk/gov/justice/subscription/registry/SubscriptionsDescriptorsRegistryProducer.java b/...n/java/uk/gov/justice/subscription/registry/SubscriptionsDescriptorsRegistryProducer.java
@@ -1,6 +1,7 @@
 package uk.gov.justice.subscription.registry;
 
 import static java.lang.String.format;
+import static java.util.Collections.emptySet;
 import static java.util.stream.Collectors.toSet;
 
 import uk.gov.justice.subscription.SubscriptionsDescriptorParser;
@@ -20,8 +21,8 @@
 import org.slf4j.Logger;
 
 /**
- * Producer for the {@link SubscriptionsDescriptorsRegistry} creates a single instance and returns the same
- * instance.
+ * Producer for the {@link SubscriptionsDescriptorsRegistry} creates a single instance and returns
+ * the same instance.
  */
 @ApplicationScoped
 public class SubscriptionsDescriptorsRegistryProducer {
@@ -43,8 +44,8 @@ public class SubscriptionsDescriptorsRegistryProducer {
                             logger.info(format("Subscription name in registry : %s", subscription.getName())));
 
     /**
-     * Either creates the single instance of the {@link SubscriptionsDescriptorsRegistry} and returns it, or
-     * returns the previously created instance.
+     * Either creates the single instance of the {@link SubscriptionsDescriptorsRegistry} and
+     * returns it, or returns the previously created instance.
      *
      * @return the instance of the {@link SubscriptionsDescriptorsRegistry}
      */
@@ -54,15 +55,17 @@ public SubscriptionsDescriptorsRegistry subscriptionDescriptorRegistry() {
             try {
                 final List<URL> subscriptionsDescriptorsPaths = yamlFileFinder.getSubscriptionsDescriptorsPaths();
 
-                if (subscriptionsDescriptorsPaths.isEmpty()){
-                    throw new RegistryException("No event-sources.yaml files found!");
-                }
+                if (subscriptionsDescriptorsPaths.isEmpty()) {
+                    logger.info("Failed to find yaml/subscriptions-descriptor.yaml resources on the classpath");
+                    subscriptionsDescriptorsRegistry = new SubscriptionsDescriptorsRegistry(emptySet());
+                } else {
 
-                final Set<SubscriptionsDescriptor> subscriptionsDescriptors = subscriptionsDescriptorParser
-                        .getSubscriptionDescriptorsFrom(subscriptionsDescriptorsPaths)
-                        .peek(logRegisteredSubscriptionNames).collect(toSet());
+                    final Set<SubscriptionsDescriptor> subscriptionsDescriptors = subscriptionsDescriptorParser
+                            .getSubscriptionDescriptorsFrom(subscriptionsDescriptorsPaths)
+                            .peek(logRegisteredSubscriptionNames).collect(toSet());
 
-                subscriptionsDescriptorsRegistry = new SubscriptionsDescriptorsRegistry(subscriptionsDescriptors);
+                    subscriptionsDescriptorsRegistry = new SubscriptionsDescriptorsRegistry(subscriptionsDescriptors);
+                }
             } catch (final IOException e) {
                 throw new RegistryException("Failed to find yaml/subscriptions-descriptor.yaml resources on the classpath", e);
             }

diff --git a/...va/uk/gov/justice/subscription/registry/SubscriptionsDescriptorsRegistryProducerTest.java b/...va/uk/gov/justice/subscription/registry/SubscriptionsDescriptorsRegistryProducerTest.java
@@ -153,15 +153,13 @@ public void shouldThrowExceptionIfIOExceptionOccursWhenFindingSubscriptionDescri
     }
 
     @Test
-    public void shouldThrowExceptionIfIfNoSubscriptionDescriptorPathsUrlsFound() throws Exception {
+    public void shouldCreateSubscriptionsDescriptorsRegistryWithEmptySetAndLogIfNoSubscriptionYamls() throws Exception {
 
         when(yamlFileFinder.getEventSourcesPaths()).thenReturn(new ArrayList<>());
 
-        try {
-            subscriptionsDescriptorsRegistryProducer.subscriptionDescriptorRegistry();
-            fail();
-        } catch (final RegistryException e) {
-            assertThat(e.getMessage(), is("No event-sources.yaml files found!"));
-        }
+        final SubscriptionsDescriptorsRegistry subscriptionsDescriptorsRegistry = subscriptionsDescriptorsRegistryProducer.subscriptionDescriptorRegistry();
+
+        assertThat(subscriptionsDescriptorsRegistry.subscriptionsDescriptors().size(), is(0));
+        verify(logger).info("Failed to find yaml/subscriptions-descriptor.yaml resources on the classpath");
     }
 }