diff options
Diffstat (limited to 'service/src/main/java/org/onap/vfc/nfvo/multivimproxy/common/util/restclient')
7 files changed, 21 insertions, 22 deletions
diff --git a/service/src/main/java/org/onap/vfc/nfvo/multivimproxy/common/util/restclient/HttpBaseRest.java b/service/src/main/java/org/onap/vfc/nfvo/multivimproxy/common/util/restclient/HttpBaseRest.java index 0672715..100f799 100644 --- a/service/src/main/java/org/onap/vfc/nfvo/multivimproxy/common/util/restclient/HttpBaseRest.java +++ b/service/src/main/java/org/onap/vfc/nfvo/multivimproxy/common/util/restclient/HttpBaseRest.java @@ -27,12 +27,12 @@ import java.util.Date; import java.util.Map; import java.util.concurrent.atomic.AtomicInteger; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; import org.eclipse.jetty.client.Address; import org.eclipse.jetty.client.HttpClient; import org.eclipse.jetty.client.HttpExchange; import org.eclipse.jetty.http.HttpMethods; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * <br/> @@ -44,7 +44,7 @@ import org.eclipse.jetty.http.HttpMethods; */ public abstract class HttpBaseRest implements Restful { - private static final Logger LOG = LogManager.getLogger(HttpRest.class); + private static final Logger LOG = LoggerFactory.getLogger(HttpRest.class); final AtomicInteger requestId = new AtomicInteger(0); diff --git a/service/src/main/java/org/onap/vfc/nfvo/multivimproxy/common/util/restclient/HttpRest.java b/service/src/main/java/org/onap/vfc/nfvo/multivimproxy/common/util/restclient/HttpRest.java index d2e2af2..30a7c4b 100644 --- a/service/src/main/java/org/onap/vfc/nfvo/multivimproxy/common/util/restclient/HttpRest.java +++ b/service/src/main/java/org/onap/vfc/nfvo/multivimproxy/common/util/restclient/HttpRest.java @@ -16,11 +16,11 @@ package org.onap.vfc.nfvo.multivimproxy.common.util.restclient; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; import org.eclipse.jetty.client.HttpClient; import org.eclipse.jetty.http.HttpMethods; import org.eclipse.jetty.util.thread.QueuedThreadPool; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * <br/> @@ -32,7 +32,7 @@ import org.eclipse.jetty.util.thread.QueuedThreadPool; */ public class HttpRest extends HttpBaseRest { - private static final Logger LOG = LogManager.getLogger(HttpRest.class); + private static final Logger LOG = LoggerFactory.getLogger(HttpRest.class); /** * Initializing Rest options.<br/> diff --git a/service/src/main/java/org/onap/vfc/nfvo/multivimproxy/common/util/restclient/HttpsRest.java b/service/src/main/java/org/onap/vfc/nfvo/multivimproxy/common/util/restclient/HttpsRest.java index 73e71ef..64f5968 100644 --- a/service/src/main/java/org/onap/vfc/nfvo/multivimproxy/common/util/restclient/HttpsRest.java +++ b/service/src/main/java/org/onap/vfc/nfvo/multivimproxy/common/util/restclient/HttpsRest.java @@ -19,8 +19,6 @@ package org.onap.vfc.nfvo.multivimproxy.common.util.restclient; import java.io.IOException; import java.io.UnsupportedEncodingException; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; import org.eclipse.jetty.client.ContentExchange; import org.eclipse.jetty.client.HttpClient; import org.eclipse.jetty.client.HttpExchange; @@ -28,10 +26,12 @@ import org.eclipse.jetty.io.ByteArrayBuffer; import org.eclipse.jetty.util.ssl.SslContextFactory; import org.eclipse.jetty.util.thread.QueuedThreadPool; import org.onap.vfc.nfvo.multivimproxy.common.util.request.RequestUtil; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public class HttpsRest extends HttpBaseRest { - private static final Logger LOG = LogManager.getLogger(HttpsRest.class); + private static final Logger LOG = LoggerFactory.getLogger(HttpsRest.class); private static final String UNSUPPORTED_EXCEPTION = "UnsupportedEncodingException: "; public void initHttpsRest() { diff --git a/service/src/main/java/org/onap/vfc/nfvo/multivimproxy/common/util/restclient/RestHttpContentExchange.java b/service/src/main/java/org/onap/vfc/nfvo/multivimproxy/common/util/restclient/RestHttpContentExchange.java index 1a620c2..f5a59cb 100644 --- a/service/src/main/java/org/onap/vfc/nfvo/multivimproxy/common/util/restclient/RestHttpContentExchange.java +++ b/service/src/main/java/org/onap/vfc/nfvo/multivimproxy/common/util/restclient/RestHttpContentExchange.java @@ -26,14 +26,14 @@ import java.util.Map; import java.util.zip.GZIPInputStream; import org.apache.commons.lang.StringUtils; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; import org.eclipse.jetty.client.ContentExchange; import org.eclipse.jetty.client.HttpDestination; import org.eclipse.jetty.http.HttpFields; import org.eclipse.jetty.http.HttpHeaders; import org.eclipse.jetty.io.Buffer; import org.eclipse.jetty.util.StringUtil; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * ContentExchange implementation classe to provide access to response. @@ -46,7 +46,7 @@ import org.eclipse.jetty.util.StringUtil; */ public class RestHttpContentExchange extends ContentExchange { - private static final Logger LOGGER = LogManager.getLogger(RestHttpContentExchange.class); + private static final Logger LOGGER = LoggerFactory.getLogger(RestHttpContentExchange.class); private boolean gzip = false; diff --git a/service/src/main/java/org/onap/vfc/nfvo/multivimproxy/common/util/restclient/RestfulConfigure.java b/service/src/main/java/org/onap/vfc/nfvo/multivimproxy/common/util/restclient/RestfulConfigure.java index 1222d2a..7d0c1eb 100644 --- a/service/src/main/java/org/onap/vfc/nfvo/multivimproxy/common/util/restclient/RestfulConfigure.java +++ b/service/src/main/java/org/onap/vfc/nfvo/multivimproxy/common/util/restclient/RestfulConfigure.java @@ -21,8 +21,8 @@ import java.io.File; import java.io.FileReader; import java.io.IOException; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import net.sf.json.JSONObject; @@ -36,7 +36,7 @@ import net.sf.json.JSONObject; */ public class RestfulConfigure { - private static final Logger LOG = LogManager.getLogger(RestfulConfigure.class); + private static final Logger LOG = LoggerFactory.getLogger(RestfulConfigure.class); private RestfulOptions options = null; diff --git a/service/src/main/java/org/onap/vfc/nfvo/multivimproxy/common/util/restclient/RestfulFactory.java b/service/src/main/java/org/onap/vfc/nfvo/multivimproxy/common/util/restclient/RestfulFactory.java index caf5c18..bc6ccae 100644 --- a/service/src/main/java/org/onap/vfc/nfvo/multivimproxy/common/util/restclient/RestfulFactory.java +++ b/service/src/main/java/org/onap/vfc/nfvo/multivimproxy/common/util/restclient/RestfulFactory.java @@ -16,12 +16,11 @@ package org.onap.vfc.nfvo.multivimproxy.common.util.restclient; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; - import java.util.HashMap; import java.util.Map; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * RestFul instance factory. <br/> @@ -43,7 +42,7 @@ public class RestfulFactory { */ public static final String PROTO_HTTP = "http"; - private static final Logger LOG = LogManager.getLogger(RestfulFactory.class); + private static final Logger LOG = LoggerFactory.getLogger(RestfulFactory.class); private static final Map<String, Restful> INSTANCES = new HashMap<>(2); diff --git a/service/src/main/java/org/onap/vfc/nfvo/multivimproxy/common/util/restclient/SystemEnvVariablesDefImpl.java b/service/src/main/java/org/onap/vfc/nfvo/multivimproxy/common/util/restclient/SystemEnvVariablesDefImpl.java index a572a2b..1981f64 100644 --- a/service/src/main/java/org/onap/vfc/nfvo/multivimproxy/common/util/restclient/SystemEnvVariablesDefImpl.java +++ b/service/src/main/java/org/onap/vfc/nfvo/multivimproxy/common/util/restclient/SystemEnvVariablesDefImpl.java @@ -19,8 +19,8 @@ package org.onap.vfc.nfvo.multivimproxy.common.util.restclient; import java.io.File; import java.io.IOException; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * System environment variable helper implementation.<br/> @@ -32,7 +32,7 @@ import org.apache.logging.log4j.Logger; */ public class SystemEnvVariablesDefImpl implements SystemEnvVariables { - private static final Logger LOG = LogManager.getLogger(SystemEnvVariablesDefImpl.class); + private static final Logger LOG = LoggerFactory.getLogger(SystemEnvVariablesDefImpl.class); @Override public String getAppRoot() { |