From 889d1c06a63677ae78394320753fa1c05a491462 Mon Sep 17 00:00:00 2001 From: "Timoney, Dan (dt5972)" Date: Tue, 2 Apr 2019 10:23:20 -0700 Subject: Resolve jersey conflict Updated aai-service to use glassfish version of jersey. Note: there might be additional work needed to handle host name verification properly (jersey 2 handles that differently - see details in jira) Change-Id: I0bd6df2e0ebf222f730aa02e99d4b032fd492bef Issue-ID: CCSDK-1192 Signed-off-by: Timoney, Dan (dt5972) --- .../org/onap/ccsdk/sli/adaptors/aai/AAIService.java | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) (limited to 'aai-service/provider/src/main/java/org') diff --git a/aai-service/provider/src/main/java/org/onap/ccsdk/sli/adaptors/aai/AAIService.java b/aai-service/provider/src/main/java/org/onap/ccsdk/sli/adaptors/aai/AAIService.java index d315f64b4..f83ff8ca6 100755 --- a/aai-service/provider/src/main/java/org/onap/ccsdk/sli/adaptors/aai/AAIService.java +++ b/aai-service/provider/src/main/java/org/onap/ccsdk/sli/adaptors/aai/AAIService.java @@ -97,8 +97,6 @@ import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.introspect.JacksonAnnotationIntrospector; import com.fasterxml.jackson.databind.type.TypeFactory; import com.fasterxml.jackson.module.jaxb.JaxbAnnotationIntrospector; -import com.sun.jersey.api.client.config.DefaultClientConfig; -import com.sun.jersey.client.urlconnection.HTTPSProperties; public class AAIService extends AAIDeclarations implements AAIClient, SvcLogicResource { @@ -251,7 +249,7 @@ public class AAIService extends AAIDeclarations implements AAIClient, SvcLogicRe } if(keystorePath != null && keystorePassword != null && (new File(keystorePath)).exists()) { - DefaultClientConfig config = new DefaultClientConfig(); + //DefaultClientConfig config = new DefaultClientConfig(); //both jersey and HttpURLConnection can use this SSLContext ctx = null; try { @@ -280,12 +278,13 @@ public class AAIService extends AAIDeclarations implements AAIClient, SvcLogicRe if(null!=kmf) { ctx.init(kmf.getKeyManagers(), null, null); } - config.getProperties().put(HTTPSProperties.PROPERTY_HTTPS_PROPERTIES, new HTTPSProperties( new HostnameVerifier() { - @Override - public boolean verify( String s, SSLSession sslSession ) { - return ignoreCertificateHostError; - } - }, ctx)); + /* + * config.getProperties().put(HTTPSProperties.PROPERTY_HTTPS_PROPERTIES, new + * HTTPSProperties( new HostnameVerifier() { + * + * @Override public boolean verify( String s, SSLSession sslSession ) { return + * ignoreCertificateHostError; } }, ctx)); + */ CTX = ctx; LOG.debug("SSLContext created"); -- cgit 1.2.3-korg