Allow not setting catalog facade config

Issue-ID: SDC-4764
Change-Id: Ibc55a3f86aab527fcb024b99547038b1fc79d35f
Signed-off-by: Fiete Ostkamp <fiete.ostkamp@telekom.de>

diff --git a/catalog-fe/src/main/java/org/openecomp/sdc/fe/impl/HealthCheckScheduledTask.java b/catalog-fe/src/main/java/org/openecomp/sdc/fe/impl/HealthCheckScheduledTask.java
index c7c0e9e..b1caace 100644 (file)
--- a/catalog-fe/src/main/java/org/openecomp/sdc/fe/impl/HealthCheckScheduledTask.java
+++ b/catalog-fe/src/main/java/org/openecomp/sdc/fe/impl/HealthCheckScheduledTask.java
@@ -165,14 +165,17 @@ public class HealthCheckScheduledTask implements Runnable {
         return certificateInfoConfigured ? clientCertificate: null;
     }
 
-    private String getExternalComponentHcUri(String baseComponent) {
+    @VisibleForTesting
+    String getExternalComponentHcUri(String baseComponent) {
         String healthCheckUri = null;
         switch (baseComponent) {
             case HC_COMPONENT_ON_BOARDING:
                 healthCheckUri = service.getConfig().getOnboarding().getHealthCheckUriFe();
                 break;
             case HC_COMPONENT_CATALOG_FACADE_MS:
-                healthCheckUri = service.getConfig().getCatalogFacadeMs().getHealthCheckUri();
+                if (service.getConfig().getCatalogFacadeMs() != null) {
+                    healthCheckUri = service.getConfig().getCatalogFacadeMs().getHealthCheckUri();
+                }
                 break;
             default:
                 log.debug("Unsupported base component {}", baseComponent);

diff --git a/catalog-fe/src/test/java/org/openecomp/sdc/fe/impl/HealthCheckScheduledTaskTest.java b/catalog-fe/src/test/java/org/openecomp/sdc/fe/impl/HealthCheckScheduledTaskTest.java
index 38863f5..77e8fd6 100644 (file)
--- a/catalog-fe/src/test/java/org/openecomp/sdc/fe/impl/HealthCheckScheduledTaskTest.java
+++ b/catalog-fe/src/test/java/org/openecomp/sdc/fe/impl/HealthCheckScheduledTaskTest.java
@@ -81,6 +81,12 @@ public class HealthCheckScheduledTaskTest {
         assertNull(healthCheckScheduledTask.getExternalComponentHcUrl("test"));
     }
 
+    @Test
+    public void getCatalogFacadeMsUriWhenConfigurationIsNull_shouldReturnNullWithoutNPE() {
+        when(configuration.getCatalogFacadeMs()).thenReturn(null);
+        assertNull(healthCheckScheduledTask.getExternalComponentHcUri(Constants.HC_COMPONENT_CATALOG_FACADE_MS));
+    }
+
     @Test
     public void getOnboardingUrlWhenConfigurationIsProvided() {
         when(configuration.getOnboarding()).thenReturn(onboardingConfig);