From 0e9bb4e3fb89d2cdeb0df334e3675673519d5b67 Mon Sep 17 00:00:00 2001 From: Fiete Ostkamp Date: Mon, 23 Feb 2026 21:17:25 +0100 Subject: [PATCH] Allow not setting catalog facade config Issue-ID: SDC-4764 Change-Id: Ibc55a3f86aab527fcb024b99547038b1fc79d35f Signed-off-by: Fiete Ostkamp --- .../java/org/openecomp/sdc/fe/impl/HealthCheckScheduledTask.java | 7 +++++-- .../org/openecomp/sdc/fe/impl/HealthCheckScheduledTaskTest.java | 6 ++++++ 2 files changed, 11 insertions(+), 2 deletions(-) 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 c7c0e9e4e6..b1caacea6b 100644 --- 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 38863f5900..77e8fd61b9 100644 --- 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); -- 2.16.6