diff options
Diffstat (limited to 'service/src/main/java/org')
15 files changed, 47 insertions, 46 deletions
diff --git a/service/src/main/java/org/onap/vfc/nfvo/multivimproxy/common/util/JsonUtil.java b/service/src/main/java/org/onap/vfc/nfvo/multivimproxy/common/util/JsonUtil.java index 7344215..74c948f 100644 --- a/service/src/main/java/org/onap/vfc/nfvo/multivimproxy/common/util/JsonUtil.java +++ b/service/src/main/java/org/onap/vfc/nfvo/multivimproxy/common/util/JsonUtil.java @@ -16,14 +16,15 @@ package org.onap.vfc.nfvo.multivimproxy.common.util; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; import org.onap.vfc.nfvo.multivimproxy.common.constant.ParamConstant; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import net.sf.json.JSONArray; import net.sf.json.JSONException; import net.sf.json.JSONObject; + /** * * Json Utility Class.<br/> @@ -35,7 +36,7 @@ import net.sf.json.JSONObject; */ public final class JsonUtil { - private static final Logger LOG = LogManager.getLogger(StringUtil.class); + private static final Logger LOG = LoggerFactory.getLogger(StringUtil.class); private static final int TYPE_STRING = 0; diff --git a/service/src/main/java/org/onap/vfc/nfvo/multivimproxy/common/util/RestfulUtil.java b/service/src/main/java/org/onap/vfc/nfvo/multivimproxy/common/util/RestfulUtil.java index 49e46e7..c1c1189 100644 --- a/service/src/main/java/org/onap/vfc/nfvo/multivimproxy/common/util/RestfulUtil.java +++ b/service/src/main/java/org/onap/vfc/nfvo/multivimproxy/common/util/RestfulUtil.java @@ -24,8 +24,7 @@ import java.util.Map; import javax.servlet.http.HttpServletResponse; import org.apache.commons.lang.StringUtils; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; +import org.onap.vfc.nfvo.multivimproxy.common.util.ResourceUtil; import org.onap.vfc.nfvo.multivimproxy.common.constant.Constant; import org.onap.vfc.nfvo.multivimproxy.common.constant.ParamConstant; import org.onap.vfc.nfvo.multivimproxy.common.util.restclient.Restful; @@ -35,6 +34,8 @@ import org.onap.vfc.nfvo.multivimproxy.common.util.restclient.RestfulOptions; import org.onap.vfc.nfvo.multivimproxy.common.util.restclient.RestfulParametes; import org.onap.vfc.nfvo.multivimproxy.common.util.restclient.RestfulResponse; import org.onap.vfc.nfvo.multivimproxy.common.util.restclient.ServiceException; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import net.sf.json.JSONArray; import net.sf.json.JSONException; @@ -65,7 +66,7 @@ public class RestfulUtil { public static final String NO_RESULT_EXCEPTION = "org.openo.nfvo.resmanage.service.group.resoperate.add.res.no.result"; - private static final Logger LOGGER = LogManager.getLogger(RestfulUtil.class); + private static final Logger LOGGER = LoggerFactory.getLogger(RestfulUtil.class); private static final Restful REST_CLIENT_HTTP = RestfulFactory.getRestInstance(RestfulFactory.PROTO_HTTP); diff --git a/service/src/main/java/org/onap/vfc/nfvo/multivimproxy/common/util/StringUtil.java b/service/src/main/java/org/onap/vfc/nfvo/multivimproxy/common/util/StringUtil.java index 26d8ba4..3692d46 100644 --- a/service/src/main/java/org/onap/vfc/nfvo/multivimproxy/common/util/StringUtil.java +++ b/service/src/main/java/org/onap/vfc/nfvo/multivimproxy/common/util/StringUtil.java @@ -20,8 +20,8 @@ import java.math.BigDecimal; import java.text.DecimalFormat; import org.apache.commons.lang.StringUtils; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * @@ -34,7 +34,7 @@ import org.apache.logging.log4j.Logger; */ public final class StringUtil { - private static final Logger LOGGER = LogManager.getLogger(StringUtil.class); + private static final Logger LOGGER = LoggerFactory.getLogger(StringUtil.class); private StringUtil() { } diff --git a/service/src/main/java/org/onap/vfc/nfvo/multivimproxy/common/util/request/RequestUtil.java b/service/src/main/java/org/onap/vfc/nfvo/multivimproxy/common/util/request/RequestUtil.java index ca6ef91..3bda627 100644 --- a/service/src/main/java/org/onap/vfc/nfvo/multivimproxy/common/util/request/RequestUtil.java +++ b/service/src/main/java/org/onap/vfc/nfvo/multivimproxy/common/util/request/RequestUtil.java @@ -27,11 +27,11 @@ import java.util.Map; import javax.servlet.http.HttpServletRequest; import org.apache.commons.io.IOUtils; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; import org.onap.vfc.nfvo.multivimproxy.common.util.restclient.RestfulClientConst; import org.onap.vfc.nfvo.multivimproxy.common.util.restclient.RestfulParametes; import org.onap.vfc.nfvo.multivimproxy.common.util.restclient.ServiceException; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import net.sf.json.JSONException; import net.sf.json.JSONObject; @@ -47,7 +47,7 @@ import net.sf.json.JSONObject; */ public final class RequestUtil { - private static final Logger LOGGER = LogManager.getLogger(RequestUtil.class); + private static final Logger LOGGER = LoggerFactory.getLogger(RequestUtil.class); /** * Constructor<br/> diff --git a/service/src/main/java/org/onap/vfc/nfvo/multivimproxy/common/util/response/RoaResponseUtil.java b/service/src/main/java/org/onap/vfc/nfvo/multivimproxy/common/util/response/RoaResponseUtil.java index 636fe6c..4ab7b2a 100644 --- a/service/src/main/java/org/onap/vfc/nfvo/multivimproxy/common/util/response/RoaResponseUtil.java +++ b/service/src/main/java/org/onap/vfc/nfvo/multivimproxy/common/util/response/RoaResponseUtil.java @@ -20,11 +20,11 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; import org.onap.vfc.nfvo.multivimproxy.common.constant.HttpConstant; import org.onap.vfc.nfvo.multivimproxy.common.constant.ParamConstant; import org.onap.vfc.nfvo.multivimproxy.common.constant.ResponseConstant; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import net.sf.json.JSONObject; @@ -39,7 +39,7 @@ import net.sf.json.JSONObject; */ public final class RoaResponseUtil { - private static final Logger LOGGER = LogManager.getLogger(RoaResponseUtil.class); + private static final Logger LOGGER = LoggerFactory.getLogger(RoaResponseUtil.class); private RoaResponseUtil() { 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() { diff --git a/service/src/main/java/org/onap/vfc/nfvo/multivimproxy/service/adapter/impl/MultivimProxyAdapter2MSBManager.java b/service/src/main/java/org/onap/vfc/nfvo/multivimproxy/service/adapter/impl/MultivimProxyAdapter2MSBManager.java index b733930..d97c5bb 100644 --- a/service/src/main/java/org/onap/vfc/nfvo/multivimproxy/service/adapter/impl/MultivimProxyAdapter2MSBManager.java +++ b/service/src/main/java/org/onap/vfc/nfvo/multivimproxy/service/adapter/impl/MultivimProxyAdapter2MSBManager.java @@ -18,13 +18,13 @@ package org.onap.vfc.nfvo.multivimproxy.service.adapter.impl; import java.util.Map; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; import org.onap.vfc.nfvo.multivimproxy.common.constant.Constant; import org.onap.vfc.nfvo.multivimproxy.common.constant.HttpConstant; import org.onap.vfc.nfvo.multivimproxy.common.util.RestfulUtil; import org.onap.vfc.nfvo.multivimproxy.service.adapter.inf.IMultivimProxyAdapter2MSBManager; import org.onap.vfc.nfvo.multivimproxy.common.util.restclient.RestfulResponse; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import net.sf.json.JSONObject; @@ -38,7 +38,7 @@ import net.sf.json.JSONObject; */ public class MultivimProxyAdapter2MSBManager implements IMultivimProxyAdapter2MSBManager { - private static final Logger LOG = LogManager.getLogger(MultivimProxyAdapter2MSBManager.class); + private static final Logger LOG = LoggerFactory.getLogger(MultivimProxyAdapter2MSBManager.class); @Override public JSONObject registerProxy(Map<String, String> paramsMap, JSONObject driverInfo) { diff --git a/service/src/main/java/org/onap/vfc/nfvo/multivimproxy/service/adapter/impl/MultivimProxyAdapterMgrService.java b/service/src/main/java/org/onap/vfc/nfvo/multivimproxy/service/adapter/impl/MultivimProxyAdapterMgrService.java index 430e66d..63ad9ac 100644 --- a/service/src/main/java/org/onap/vfc/nfvo/multivimproxy/service/adapter/impl/MultivimProxyAdapterMgrService.java +++ b/service/src/main/java/org/onap/vfc/nfvo/multivimproxy/service/adapter/impl/MultivimProxyAdapterMgrService.java @@ -25,8 +25,6 @@ import java.util.HashMap; import java.util.Map; import java.util.concurrent.Executors; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; import org.onap.vfc.nfvo.multivimproxy.common.constant.Constant; import org.onap.vfc.nfvo.multivimproxy.common.constant.HttpConstant; import org.onap.vfc.nfvo.multivimproxy.common.constant.ParamConstant; @@ -34,6 +32,8 @@ import org.onap.vfc.nfvo.multivimproxy.common.constant.UrlConstant; import org.onap.vfc.nfvo.multivimproxy.common.util.restclient.SystemEnvVariablesFactory; import org.onap.vfc.nfvo.multivimproxy.service.adapter.inf.IMultivimProxyAdapter2MSBManager; import org.onap.vfc.nfvo.multivimproxy.service.adapter.inf.IMultivimProxyAdapterMgrService; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import net.sf.json.JSONObject; @@ -47,7 +47,7 @@ import net.sf.json.JSONObject; */ public class MultivimProxyAdapterMgrService implements IMultivimProxyAdapterMgrService { - private static final Logger LOG = LogManager.getLogger(MultivimProxyAdapterMgrService.class); + private static final Logger LOG = LoggerFactory.getLogger(MultivimProxyAdapterMgrService.class); public static final String RESMGRADAPTERINFO = "resmgradapterinfo.json"; diff --git a/service/src/main/java/org/onap/vfc/nfvo/multivimproxy/service/rest/ProxyRoa.java b/service/src/main/java/org/onap/vfc/nfvo/multivimproxy/service/rest/ProxyRoa.java index e90fc17..e9c00f8 100644 --- a/service/src/main/java/org/onap/vfc/nfvo/multivimproxy/service/rest/ProxyRoa.java +++ b/service/src/main/java/org/onap/vfc/nfvo/multivimproxy/service/rest/ProxyRoa.java @@ -33,8 +33,6 @@ import javax.ws.rs.core.Context; import javax.ws.rs.core.MediaType; import org.apache.commons.io.IOUtils; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; import org.onap.vfc.nfvo.multivimproxy.common.conf.Config; import org.onap.vfc.nfvo.multivimproxy.common.constant.Constant; import org.onap.vfc.nfvo.multivimproxy.common.constant.ParamConstant; @@ -43,6 +41,8 @@ import org.onap.vfc.nfvo.multivimproxy.common.util.RestfulUtil; import org.onap.vfc.nfvo.multivimproxy.common.util.request.RequestUtil; import org.onap.vfc.nfvo.multivimproxy.common.util.restclient.RestfulParametes; import org.onap.vfc.nfvo.multivimproxy.common.util.restclient.RestfulResponse; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import net.sf.json.JSONArray; import net.sf.json.JSONObject; @@ -51,7 +51,7 @@ import net.sf.json.JSONObject; @Consumes(MediaType.APPLICATION_JSON) public class ProxyRoa { - private static final Logger LOGGER = LogManager.getLogger(ProxyRoa.class); + private static final Logger LOGGER = LoggerFactory.getLogger(ProxyRoa.class); private static final String vimId = Config.getCloudRegionId() + "_" + Config.getCloudRegionId(); |