From 5c07f0088fd71e30bfd8dc92b870f604b4297420 Mon Sep 17 00:00:00 2001 From: Norm Traxler Date: Mon, 21 Jan 2019 21:03:59 +0000 Subject: NetworkDiscCtxBuilder error handling Issue-ID: LOG-938 Change-Id: I20e8592efe5f1ca8960f228041303c8d25628018 Signed-off-by: Norm Traxler --- .../networkdiscovery/JerseyConfiguration.java | 20 +++----------------- 1 file changed, 3 insertions(+), 17 deletions(-) (limited to 'src/main/java/org/onap/pomba/contextbuilder/networkdiscovery/JerseyConfiguration.java') diff --git a/src/main/java/org/onap/pomba/contextbuilder/networkdiscovery/JerseyConfiguration.java b/src/main/java/org/onap/pomba/contextbuilder/networkdiscovery/JerseyConfiguration.java index 2bec9ad..7d97614 100644 --- a/src/main/java/org/onap/pomba/contextbuilder/networkdiscovery/JerseyConfiguration.java +++ b/src/main/java/org/onap/pomba/contextbuilder/networkdiscovery/JerseyConfiguration.java @@ -15,18 +15,15 @@ * limitations under the License. * ============LICENSE_END===================================================== */ + package org.onap.pomba.contextbuilder.networkdiscovery; -import com.fasterxml.jackson.annotation.JsonInclude; -import com.fasterxml.jackson.databind.DeserializationFeature; -import com.fasterxml.jackson.databind.MapperFeature; -import com.fasterxml.jackson.databind.ObjectMapper; -import com.fasterxml.jackson.databind.SerializationFeature; import java.security.KeyManagementException; import java.security.NoSuchAlgorithmException; import java.security.SecureRandom; import java.security.cert.X509Certificate; import java.util.logging.Logger; + import javax.net.ssl.HostnameVerifier; import javax.net.ssl.HttpsURLConnection; import javax.net.ssl.SSLContext; @@ -36,6 +33,7 @@ import javax.net.ssl.X509TrustManager; import javax.ws.rs.ApplicationPath; import javax.ws.rs.client.Client; import javax.ws.rs.client.ClientBuilder; + import org.glassfish.jersey.client.ClientConfig; import org.glassfish.jersey.logging.LoggingFeature; import org.glassfish.jersey.server.ResourceConfig; @@ -43,7 +41,6 @@ import org.glassfish.jersey.servlet.ServletProperties; import org.onap.pomba.contextbuilder.networkdiscovery.service.rs.RestServiceImpl; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Primary; import org.springframework.stereotype.Component; @Component @@ -58,17 +55,6 @@ public class JerseyConfiguration extends ResourceConfig { register(new LoggingFeature(log)); } - @Bean - @Primary - public ObjectMapper objectMapper() { - ObjectMapper objectMapper = new ObjectMapper(); - objectMapper.setSerializationInclusion(JsonInclude.Include.NON_NULL); - objectMapper.configure(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS, false); - objectMapper.enable(MapperFeature.ACCEPT_CASE_INSENSITIVE_PROPERTIES); - objectMapper.enable(DeserializationFeature.READ_ENUMS_USING_TO_STRING); - return objectMapper; - } - @Bean public Client jerseyClient() { return ClientBuilder.newClient(new ClientConfig()); -- cgit 1.2.3-korg