From 93a13c577bc87ebf78652f6783e8919e0e74fb43 Mon Sep 17 00:00:00 2001 From: "Smokowski, Steve (ss835w)" Date: Thu, 20 Dec 2018 11:33:30 -0500 Subject: Swap Logger to SLF4J Issue-ID: SO-1346 Change-Id: Ia0d7cd7f66e6f5d6976e19e5c56efbe7d02aa98f Signed-off-by: Smokowski, Steve (ss835w) --- .../java/com/woorea/openstack/connector/HttpClientConnector.java | 6 +++--- .../java/com/woorea/openstack/connector/HttpClientResponse.java | 5 +++-- 2 files changed, 6 insertions(+), 5 deletions(-) (limited to 'openstack-client-connectors/http-connector/src/main') diff --git a/openstack-client-connectors/http-connector/src/main/java/com/woorea/openstack/connector/HttpClientConnector.java b/openstack-client-connectors/http-connector/src/main/java/com/woorea/openstack/connector/HttpClientConnector.java index 85ac96c..5a78b30 100644 --- a/openstack-client-connectors/http-connector/src/main/java/com/woorea/openstack/connector/HttpClientConnector.java +++ b/openstack-client-connectors/http-connector/src/main/java/com/woorea/openstack/connector/HttpClientConnector.java @@ -46,7 +46,8 @@ import org.apache.http.entity.ContentType; import org.apache.http.entity.StringEntity; import org.apache.http.impl.client.CloseableHttpClient; import org.apache.http.impl.client.HttpClients; -import org.apache.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import com.fasterxml.jackson.annotation.JsonInclude.Include; import com.fasterxml.jackson.annotation.JsonRootName; @@ -65,7 +66,7 @@ public class HttpClientConnector implements OpenStackClientConnector { public static ObjectMapper DEFAULT_MAPPER; public static ObjectMapper WRAPPED_MAPPER; - private static Logger LOGGER = Logger.getLogger(HttpClientConnector.class); + private static Logger LOGGER = LoggerFactory.getLogger(HttpClientConnector.class); static { DEFAULT_MAPPER = new ObjectMapper(); @@ -123,7 +124,6 @@ public class HttpClientConnector implements OpenStackClientConnector { String entityJson = mapper.writeValueAsString (request.entity().getEntity()); entity = new StringEntity(entityJson, ContentType.create(request.entity().getContentType())); - LOGGER.debug("Openstack query JSON:"+entityJson); LOGGER.debug ("Request JSON Body: " + entityJson.replaceAll("\"password\":\"[^\"]*\"", "\"password\":\"***\"")); } catch (JsonProcessingException e) { diff --git a/openstack-client-connectors/http-connector/src/main/java/com/woorea/openstack/connector/HttpClientResponse.java b/openstack-client-connectors/http-connector/src/main/java/com/woorea/openstack/connector/HttpClientResponse.java index 711d4e5..41466a6 100644 --- a/openstack-client-connectors/http-connector/src/main/java/com/woorea/openstack/connector/HttpClientResponse.java +++ b/openstack-client-connectors/http-connector/src/main/java/com/woorea/openstack/connector/HttpClientResponse.java @@ -41,7 +41,8 @@ package com.woorea.openstack.connector; import org.apache.http.Header; import org.apache.http.HttpResponse; -import org.apache.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import com.fasterxml.jackson.databind.ObjectMapper; import com.woorea.openstack.base.client.OpenStackResponse; @@ -55,7 +56,7 @@ import java.util.Map; public class HttpClientResponse implements OpenStackResponse { - private static Logger LOGGER = Logger.getLogger(HttpClientConnector.class); + private static Logger LOGGER = LoggerFactory.getLogger(HttpClientConnector.class); private HttpResponse response = null; private String entityBody = null; -- cgit 1.2.3-korg