Revert "[SDC-BE] Update kafka ssl config"

This reverts commit 3bc3a5c724e9a6ea8a112dca72a9a3128eddca19.

Reason for revert: deployment issue with SIP TLS

Change-Id: I24a9cc51cd8785b7407fee1b2aad9919d69e1d2e
Signed-off-by: MichaelMorris <michael.morris@est.tech>
Issue-ID: SDC-4476

diff --git a/common-app-api/src/main/java/org/openecomp/sdc/be/config/DistributionEngineConfiguration.java b/common-app-api/src/main/java/org/openecomp/sdc/be/config/DistributionEngineConfiguration.java
index b56708e..205588a 100644 (file)
--- a/common-app-api/src/main/java/org/openecomp/sdc/be/config/DistributionEngineConfiguration.java
+++ b/common-app-api/src/main/java/org/openecomp/sdc/be/config/DistributionEngineConfiguration.java
@@ -24,7 +24,6 @@ import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
-import org.onap.config.api.JettySSLUtils;
 import org.openecomp.sdc.common.api.BasicConfiguration;
 import org.openecomp.sdc.common.http.config.ExternalServiceConfig;
 
@@ -460,8 +459,4 @@ public class DistributionEngineConfiguration extends BasicConfiguration {
             return "ArtifactTypesConfig [info=" + info + ", lifecycle=" + lifecycle + "]";
         }
     }
-
-    public JettySSLUtils.JettySslConfig getSSLConfig() {
-        return JettySSLUtils.getSSLConfig();
-    }
 }

diff --git a/common-app-api/src/test/java/org/openecomp/sdc/be/config/DistributionEngineConfigurationTest.java b/common-app-api/src/test/java/org/openecomp/sdc/be/config/DistributionEngineConfigurationTest.java
index 8a33c3e..cd6705d 100644 (file)
--- a/common-app-api/src/test/java/org/openecomp/sdc/be/config/DistributionEngineConfigurationTest.java
+++ b/common-app-api/src/test/java/org/openecomp/sdc/be/config/DistributionEngineConfigurationTest.java
@@ -41,7 +41,7 @@ public class DistributionEngineConfigurationTest {
        public void validateBean() {
                assertThat(DistributionEngineConfiguration.class, allOf(
                                hasValidBeanConstructor(),
-                               hasValidGettersAndSettersExcluding("environments", "SSLConfig")
+                               hasValidGettersAndSettersExcluding("environments")
                ));
        }