From 425040c807f03eaae14b3c02708533f4f546d9c6 Mon Sep 17 00:00:00 2001 From: ChrisC Date: Tue, 16 Mar 2021 14:12:46 +0100 Subject: Remove unused dcae-be healthcheck Remove DCAE-DS backend Healthchecks that are noisy in the logs DCAE-DS was sunset in G release Issue-ID: SDC-3514 Signed-off-by: ChrisC Change-Id: Iad9d6738ec813be9b87766ed189deda34e711ab1 --- .../org/openecomp/sdc/be/config/Configuration.java | 50 ---------------------- .../org/openecomp/sdc/common/api/Constants.java | 1 - .../org/openecomp/sdc/fe/config/Configuration.java | 50 ---------------------- .../openecomp/sdc/be/config/ConfigurationTest.java | 7 --- .../openecomp/sdc/fe/config/ConfigurationTest.java | 8 ---- 5 files changed, 116 deletions(-) (limited to 'common-app-api') diff --git a/common-app-api/src/main/java/org/openecomp/sdc/be/config/Configuration.java b/common-app-api/src/main/java/org/openecomp/sdc/be/config/Configuration.java index 14fb755ab3..5bfed0dc06 100644 --- a/common-app-api/src/main/java/org/openecomp/sdc/be/config/Configuration.java +++ b/common-app-api/src/main/java/org/openecomp/sdc/be/config/Configuration.java @@ -116,8 +116,6 @@ public class Configuration extends BasicConfiguration { private OnboardingConfig onboarding; - private DcaeConfig dcae; - private BasicAuthConfig basicAuth; private CassandrConfig cassandraConfig; @@ -1223,54 +1221,6 @@ public class Configuration extends BasicConfiguration { } } - public DcaeConfig getDcae() { - return dcae; - } - - public void setDcae(DcaeConfig dcae) { - this.dcae = dcae; - } - - public static class DcaeConfig { - - String protocol = "http"; - String host; - Integer port; - String healthCheckUri; - - public String getProtocol() { - return protocol; - } - - public void setProtocol(String protocol) { - this.protocol = protocol; - } - - public String getHost() { - return host; - } - - public void setHost(String host) { - this.host = host; - } - - public Integer getPort() { - return port; - } - - public void setPort(Integer port) { - this.port = port; - } - - public String getHealthCheckUri() { - return healthCheckUri; - } - - public void setHealthCheckUri(String healthCheckUri) { - this.healthCheckUri = healthCheckUri; - } - } - public static class EcompPortalConfig { private String protocol = "https"; private String host; diff --git a/common-app-api/src/main/java/org/openecomp/sdc/common/api/Constants.java b/common-app-api/src/main/java/org/openecomp/sdc/common/api/Constants.java index 20c85683b7..b06d55aa67 100644 --- a/common-app-api/src/main/java/org/openecomp/sdc/common/api/Constants.java +++ b/common-app-api/src/main/java/org/openecomp/sdc/common/api/Constants.java @@ -150,7 +150,6 @@ public final class Constants { //external HealthCheck components public static final String HC_COMPONENT_ON_BOARDING = "ON_BOARDING"; - public static final String HC_COMPONENT_DCAE = "DCAE"; public static final String HC_COMPONENT_ECOMP_PORTAL = "PORTAL"; diff --git a/common-app-api/src/main/java/org/openecomp/sdc/fe/config/Configuration.java b/common-app-api/src/main/java/org/openecomp/sdc/fe/config/Configuration.java index e437034ea0..e692b623f4 100644 --- a/common-app-api/src/main/java/org/openecomp/sdc/fe/config/Configuration.java +++ b/common-app-api/src/main/java/org/openecomp/sdc/fe/config/Configuration.java @@ -57,8 +57,6 @@ public class Configuration extends BasicConfiguration { private OnboardingConfig onboarding; - private DcaeConfig dcae; - private CookieConfig authCookie; private BasicAuthConfig basicAuth; @@ -251,14 +249,6 @@ public class Configuration extends BasicConfiguration { this.onboarding = onboarding; } - public DcaeConfig getDcae() { - return dcae; - } - - public void setDcae(DcaeConfig dcae) { - this.dcae = dcae; - } - public CookieConfig getAuthCookie() { return authCookie; } @@ -388,46 +378,6 @@ public class Configuration extends BasicConfiguration { } } - public static class DcaeConfig { - - String protocol = "http"; - String host; - Integer port; - String healthCheckUri; - - public String getProtocol() { - return protocol; - } - - public void setProtocol(String protocol) { - this.protocol = protocol; - } - - public String getHost() { - return host; - } - - public void setHost(String host) { - this.host = host; - } - - public Integer getPort() { - return port; - } - - public void setPort(Integer port) { - this.port = port; - } - - public String getHealthCheckUri() { - return healthCheckUri; - } - - public void setHealthCheckUri(String healthCheckUri) { - this.healthCheckUri = healthCheckUri; - } - } - public static class CookieConfig { String cookieName = "AuthenticationCookie"; String path = ""; diff --git a/common-app-api/src/test/java/org/openecomp/sdc/be/config/ConfigurationTest.java b/common-app-api/src/test/java/org/openecomp/sdc/be/config/ConfigurationTest.java index 055b41c921..23e0ab8439 100644 --- a/common-app-api/src/test/java/org/openecomp/sdc/be/config/ConfigurationTest.java +++ b/common-app-api/src/test/java/org/openecomp/sdc/be/config/ConfigurationTest.java @@ -77,13 +77,6 @@ public class ConfigurationTest { )); } @Test - public void validateBeanForDcaeConfig() { - assertThat(Configuration.DcaeConfig.class, allOf( - hasValidBeanConstructor(), - hasValidGettersAndSettersExcluding() - )); - } - @Test public void validateBeanForEcompPortalConfig() { assertThat(Configuration.EcompPortalConfig.class, allOf( hasValidBeanConstructor(), diff --git a/common-app-api/src/test/java/org/openecomp/sdc/fe/config/ConfigurationTest.java b/common-app-api/src/test/java/org/openecomp/sdc/fe/config/ConfigurationTest.java index 1968e4bb58..ae30ccf502 100644 --- a/common-app-api/src/test/java/org/openecomp/sdc/fe/config/ConfigurationTest.java +++ b/common-app-api/src/test/java/org/openecomp/sdc/fe/config/ConfigurationTest.java @@ -56,14 +56,6 @@ public class ConfigurationTest { )); } - @Test - public void validateDcaeConfigBean() { - assertThat(Configuration.DcaeConfig.class, allOf( - hasValidBeanConstructor(), - hasValidGettersAndSetters() - )); - } - @Test public void validateGetHealthCheckSocketTimeoutInMsReturnsProperTime() { final int defaultTestTimeout = 100; -- cgit 1.2.3-korg