summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichaelMorris <michael.morris@est.tech>2023-06-02 12:43:55 +0000
committerVasyl Razinkov <vasyl.razinkov@est.tech>2023-06-02 16:20:43 +0000
commit9fb750f15ee84c4318d729c91c4ba50b61d73b3e (patch)
tree2b83a35fd8e3659642041e8cd1b651e1468edfda
parentfccb576dfeb307bf30de6994fe462d1bfdd51fd5 (diff)
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
-rw-r--r--common-app-api/src/main/java/org/openecomp/sdc/be/config/DistributionEngineConfiguration.java5
-rw-r--r--common-app-api/src/test/java/org/openecomp/sdc/be/config/DistributionEngineConfigurationTest.java2
2 files changed, 1 insertions, 6 deletions
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 b56708efb9..205588adab 100644
--- 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 8a33c3eb40..cd6705dfdf 100644
--- 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")
));
}