From 68af81034f311e6a25221648f48ae6db7c8e30b6 Mon Sep 17 00:00:00 2001 From: sebdet Date: Tue, 15 Sep 2020 22:43:01 +0200 Subject: Revert lib required by AAF This lib must be re-introduced for AAF otherwise at runtime there is a classnotfound Issue-ID: CLAMP-915 Signed-off-by: sebdet Change-Id: I9e928512bf44924e179b8726b7665209a82fd94f --- src/main/java/org/onap/clamp/clds/Application.java | 2 -- src/main/java/org/onap/clamp/clds/config/CamelConfiguration.java | 2 -- src/main/java/org/onap/clamp/clds/config/SslConfig.java | 1 - src/main/java/org/onap/clamp/clds/filter/ClampCadiFilter.java | 3 --- src/main/java/org/onap/clamp/util/PassDecoder.java | 2 -- 5 files changed, 10 deletions(-) (limited to 'src/main') diff --git a/src/main/java/org/onap/clamp/clds/Application.java b/src/main/java/org/onap/clamp/clds/Application.java index c2a1ab908..e83ff3e76 100644 --- a/src/main/java/org/onap/clamp/clds/Application.java +++ b/src/main/java/org/onap/clamp/clds/Application.java @@ -27,7 +27,6 @@ package org.onap.clamp.clds; import com.att.eelf.configuration.EELFLogger; import com.att.eelf.configuration.EELFManager; - import java.io.IOException; import java.io.InputStream; import java.security.KeyStore; @@ -36,7 +35,6 @@ import java.security.NoSuchAlgorithmException; import java.security.cert.CertificateException; import java.security.cert.X509Certificate; import java.util.Enumeration; - import org.apache.catalina.connector.Connector; import org.onap.clamp.clds.util.ClampVersioning; import org.onap.clamp.clds.util.ResourceFileUtils; diff --git a/src/main/java/org/onap/clamp/clds/config/CamelConfiguration.java b/src/main/java/org/onap/clamp/clds/config/CamelConfiguration.java index 7bf45e498..36e11f64f 100644 --- a/src/main/java/org/onap/clamp/clds/config/CamelConfiguration.java +++ b/src/main/java/org/onap/clamp/clds/config/CamelConfiguration.java @@ -29,10 +29,8 @@ import java.security.KeyStore; import java.security.KeyStoreException; import java.security.NoSuchAlgorithmException; import java.security.cert.CertificateException; - import javax.net.ssl.SSLContext; import javax.net.ssl.TrustManagerFactory; - import org.apache.camel.CamelContext; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.http4.HttpClientConfigurer; diff --git a/src/main/java/org/onap/clamp/clds/config/SslConfig.java b/src/main/java/org/onap/clamp/clds/config/SslConfig.java index 16af44695..6345f4b56 100644 --- a/src/main/java/org/onap/clamp/clds/config/SslConfig.java +++ b/src/main/java/org/onap/clamp/clds/config/SslConfig.java @@ -29,7 +29,6 @@ import java.security.KeyStore; import java.security.KeyStoreException; import java.security.NoSuchAlgorithmException; import java.security.cert.CertificateException; - import org.onap.clamp.clds.util.ResourceFileUtils; import org.onap.clamp.util.PassDecoder; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/main/java/org/onap/clamp/clds/filter/ClampCadiFilter.java b/src/main/java/org/onap/clamp/clds/filter/ClampCadiFilter.java index f68990a81..c673f544a 100644 --- a/src/main/java/org/onap/clamp/clds/filter/ClampCadiFilter.java +++ b/src/main/java/org/onap/clamp/clds/filter/ClampCadiFilter.java @@ -25,7 +25,6 @@ package org.onap.clamp.clds.filter; import com.att.eelf.configuration.EELFLogger; import com.att.eelf.configuration.EELFManager; - import java.io.ByteArrayInputStream; import java.io.File; import java.io.IOException; @@ -36,14 +35,12 @@ import java.nio.file.StandardCopyOption; import java.security.cert.CertificateException; import java.security.cert.CertificateFactory; import java.security.cert.X509Certificate; - import javax.servlet.FilterChain; import javax.servlet.FilterConfig; import javax.servlet.ServletException; import javax.servlet.ServletRequest; import javax.servlet.ServletResponse; import javax.servlet.http.HttpServletRequest; - import org.onap.aaf.cadi.config.Config; import org.onap.aaf.cadi.filter.CadiFilter; import org.onap.clamp.clds.util.ResourceFileUtils; diff --git a/src/main/java/org/onap/clamp/util/PassDecoder.java b/src/main/java/org/onap/clamp/util/PassDecoder.java index 5d261c023..b2e4ca2c5 100644 --- a/src/main/java/org/onap/clamp/util/PassDecoder.java +++ b/src/main/java/org/onap/clamp/util/PassDecoder.java @@ -24,12 +24,10 @@ package org.onap.clamp.util; import com.att.eelf.configuration.EELFLogger; import com.att.eelf.configuration.EELFManager; - import java.io.File; import java.io.FileInputStream; import java.io.IOException; import java.io.InputStream; - import org.onap.aaf.cadi.Symm; import org.onap.clamp.clds.util.ResourceFileUtils; -- cgit 1.2.3-korg