diff options
author | 2020-01-13 17:54:03 +0530 | |
---|---|---|
committer | 2020-01-13 17:54:21 +0530 | |
commit | fdf50e5faa12b0ba2e6bc664476218cbffa3994e (patch) | |
tree | 89fbc38fe59d93ee3378f552b38029cbebede9a9 /ResmanagementService/service | |
parent | 3fabd95c45b9467010ea56020c7dc454ea7aa672 (diff) |
Fix vulnerability issue in Resmanagement
Fixed common-beanutil, log4j and
jackson vulnerability issues.
Change-Id: I043b0a4b9ff8285e1da7a340a1a90d863623f8fc
Issue-ID: VFC-1598
Signed-off-by: sonibhanu <bhanu.soni@huawei.com>
Diffstat (limited to 'ResmanagementService/service')
53 files changed, 180 insertions, 163 deletions
diff --git a/ResmanagementService/service/pom.xml b/ResmanagementService/service/pom.xml index ec9711a..e8d66d4 100644 --- a/ResmanagementService/service/pom.xml +++ b/ResmanagementService/service/pom.xml @@ -34,12 +34,16 @@ <artifactId>httpcore</artifactId> <version>4.3</version> </dependency> - <dependency> + <groupId>com.google.code.gson</groupId> + <artifactId>gson</artifactId> + <version>2.8.2</version> + </dependency> + <!--dependency> <groupId>org.codehaus.jackson</groupId> <artifactId>jackson-jaxrs</artifactId> <version>1.9.13</version> - </dependency> + </dependency--> <!-- security <dependency> <groupId>com.fasterxml.jackson.jaxrs</groupId> @@ -87,9 +91,18 @@ <groupId>commons-collections</groupId> <artifactId>commons-collections</artifactId> </exclusion> + <exclusion> + <groupId>commons-beanutils</groupId> + <artifactId>commons-beanutils</artifactId> + </exclusion> </exclusions> </dependency> <dependency> + <groupId>commons-beanutils</groupId> + <artifactId>commons-beanutils</artifactId> + <version>1.9.4</version> + </dependency> + <dependency> <groupId>org.eclipse.jetty.orbit</groupId> <artifactId>javax.servlet</artifactId> <version>3.0.0.v201112011016</version> @@ -132,10 +145,15 @@ <artifactId>snakeyaml</artifactId> <version>1.15</version> </dependency> - <dependency> + <!--dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-log4j12</artifactId> <version>1.6.1</version> + </dependency--> + <dependency> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-core</artifactId> + <version>2.13.0</version> </dependency> <!--dependency> <groupId>org.apache.log4j</groupId> @@ -239,7 +257,6 @@ <version>1.19</version> <scope>test</scope> </dependency> - <!-- UT coverage dependency end --> </dependencies> diff --git a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/common/VimUtil.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/common/VimUtil.java index fbd779d..84fa7f2 100644 --- a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/common/VimUtil.java +++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/common/VimUtil.java @@ -20,12 +20,12 @@ import java.util.HashMap; import java.util.Map; import org.apache.commons.codec.binary.Base64; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.onap.vfc.nfvo.resmanagement.common.constant.ParamConstant; import org.onap.vfc.nfvo.resmanagement.common.constant.UrlConstant; import org.onap.vfc.nfvo.resmanagement.common.util.RestfulUtil; import org.onap.vfc.nfvo.resmanagement.common.util.restclient.RestfulParametes; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import net.sf.json.JSONArray; import net.sf.json.JSONObject; @@ -40,7 +40,7 @@ import net.sf.json.JSONObject; */ public class VimUtil { - private static final Logger LOG = LoggerFactory.getLogger(VimUtil.class); + private static final Logger LOG = LogManager.getLogger(VimUtil.class); private VimUtil() { diff --git a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/common/util/JsonUtil.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/common/util/JsonUtil.java index a033cbe..9896326 100644 --- a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/common/util/JsonUtil.java +++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/common/util/JsonUtil.java @@ -16,9 +16,9 @@ package org.onap.vfc.nfvo.resmanagement.common.util; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.onap.vfc.nfvo.resmanagement.common.constant.ParamConstant; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import net.sf.json.JSONArray; import net.sf.json.JSONException; @@ -35,7 +35,7 @@ import net.sf.json.JSONObject; */ public final class JsonUtil { - private static final Logger LOG = LoggerFactory.getLogger(StringUtil.class); + private static final Logger LOG = LogManager.getLogger(StringUtil.class); private static final int TYPE_STRING = 0; diff --git a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/common/util/RestfulUtil.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/common/util/RestfulUtil.java index a8f34ce..576de89 100644 --- a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/common/util/RestfulUtil.java +++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/common/util/RestfulUtil.java @@ -24,6 +24,8 @@ 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.resmanagement.common.ResourceUtil; import org.onap.vfc.nfvo.resmanagement.common.constant.Constant; import org.onap.vfc.nfvo.resmanagement.common.constant.ParamConstant; @@ -34,8 +36,6 @@ import org.onap.vfc.nfvo.resmanagement.common.util.restclient.RestfulOptions; import org.onap.vfc.nfvo.resmanagement.common.util.restclient.RestfulParametes; import org.onap.vfc.nfvo.resmanagement.common.util.restclient.RestfulResponse; import org.onap.vfc.nfvo.resmanagement.common.util.restclient.ServiceException; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import net.sf.json.JSONArray; import net.sf.json.JSONException; @@ -66,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 = LoggerFactory.getLogger(RestfulUtil.class); + private static final Logger LOGGER = LogManager.getLogger(RestfulUtil.class); private static final Restful REST_CLIENT_HTTP = RestfulFactory.getRestInstance(RestfulFactory.PROTO_HTTP); diff --git a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/common/util/StringUtil.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/common/util/StringUtil.java index d5da530..8d4b62c 100644 --- a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/common/util/StringUtil.java +++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/common/util/StringUtil.java @@ -20,8 +20,8 @@ import java.math.BigDecimal; import java.text.DecimalFormat; import org.apache.commons.lang.StringUtils; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; /** * @@ -34,7 +34,7 @@ import org.slf4j.LoggerFactory; */ public final class StringUtil { - private static final Logger LOGGER = LoggerFactory.getLogger(StringUtil.class); + private static final Logger LOGGER = LogManager.getLogger(StringUtil.class); private StringUtil() { } diff --git a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/common/util/request/RequestUtil.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/common/util/request/RequestUtil.java index 5c8b989..894b61c 100644 --- a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/common/util/request/RequestUtil.java +++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/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.resmanagement.common.util.restclient.RestfulClientConst; import org.onap.vfc.nfvo.resmanagement.common.util.restclient.RestfulParametes; import org.onap.vfc.nfvo.resmanagement.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 = LoggerFactory.getLogger(RequestUtil.class); + private static final Logger LOGGER = LogManager.getLogger(RequestUtil.class); /** * Constructor<br/> diff --git a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/common/util/response/RoaResponseUtil.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/common/util/response/RoaResponseUtil.java index fb00a2a..9516d01 100644 --- a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/common/util/response/RoaResponseUtil.java +++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/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.resmanagement.common.constant.HttpConstant; import org.onap.vfc.nfvo.resmanagement.common.constant.ParamConstant; import org.onap.vfc.nfvo.resmanagement.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 = LoggerFactory.getLogger(RoaResponseUtil.class); + private static final Logger LOGGER = LogManager.getLogger(RoaResponseUtil.class); private RoaResponseUtil() { diff --git a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/common/util/restclient/HttpBaseRest.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/common/util/restclient/HttpBaseRest.java index c962bdc..cde2bf4 100644 --- a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/common/util/restclient/HttpBaseRest.java +++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/common/util/restclient/HttpBaseRest.java @@ -26,12 +26,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/> @@ -43,7 +43,7 @@ import org.slf4j.LoggerFactory; */ public abstract class HttpBaseRest implements Restful { - private static final Logger LOG = LoggerFactory.getLogger(HttpRest.class); + private static final Logger LOG = LogManager.getLogger(HttpRest.class); final AtomicInteger requestId = new AtomicInteger(0); diff --git a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/common/util/restclient/HttpRest.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/common/util/restclient/HttpRest.java index a36d984..25c42e6 100644 --- a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/common/util/restclient/HttpRest.java +++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/common/util/restclient/HttpRest.java @@ -16,11 +16,11 @@ package org.onap.vfc.nfvo.resmanagement.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.slf4j.LoggerFactory; */ public class HttpRest extends HttpBaseRest { - private static final Logger LOG = LoggerFactory.getLogger(HttpRest.class); + private static final Logger LOG = LogManager.getLogger(HttpRest.class); /** * Initializing Rest options.<br/> diff --git a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/common/util/restclient/HttpsRest.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/common/util/restclient/HttpsRest.java index 89b207b..9b670ce 100644 --- a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/common/util/restclient/HttpsRest.java +++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/common/util/restclient/HttpsRest.java @@ -19,6 +19,8 @@ package org.onap.vfc.nfvo.resmanagement.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; @@ -26,12 +28,10 @@ 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.resmanagement.common.util.request.RequestUtil; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; public class HttpsRest extends HttpBaseRest { - private static final Logger LOG = LoggerFactory.getLogger(HttpsRest.class); + private static final Logger LOG = LogManager.getLogger(HttpsRest.class); public static final String IOEXCEPTION = "IOException"; public void initHttpsRest() { diff --git a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/common/util/restclient/RestHttpContentExchange.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/common/util/restclient/RestHttpContentExchange.java index 0d8ec94..d6e0c2b 100644 --- a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/common/util/restclient/RestHttpContentExchange.java +++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/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.slf4j.LoggerFactory; */ public class RestHttpContentExchange extends ContentExchange { - private static final Logger LOGGER = LoggerFactory.getLogger(RestHttpContentExchange.class); + private static final Logger LOGGER = LogManager.getLogger(RestHttpContentExchange.class); private boolean gzip = false; diff --git a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/common/util/restclient/RestfulConfigure.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/common/util/restclient/RestfulConfigure.java index fc6f44a..099127b 100644 --- a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/common/util/restclient/RestfulConfigure.java +++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/common/util/restclient/RestfulConfigure.java @@ -21,8 +21,8 @@ import java.io.File; import java.io.FileReader; import java.io.IOException; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import net.sf.json.JSONObject; @@ -36,7 +36,7 @@ import net.sf.json.JSONObject; */ public class RestfulConfigure { - private static final Logger LOG = LoggerFactory.getLogger(RestfulConfigure.class); + private static final Logger LOG = LogManager.getLogger(RestfulConfigure.class); private RestfulOptions options = null; diff --git a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/common/util/restclient/RestfulFactory.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/common/util/restclient/RestfulFactory.java index ef8e28f..e721d6a 100644 --- a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/common/util/restclient/RestfulFactory.java +++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/common/util/restclient/RestfulFactory.java @@ -19,8 +19,8 @@ package org.onap.vfc.nfvo.resmanagement.common.util.restclient; import java.util.HashMap; import java.util.Map; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; /** * RestFul instance factory. <br/> @@ -42,7 +42,7 @@ public class RestfulFactory { */ public static final String PROTO_HTTP = "http"; - private static final Logger LOG = LoggerFactory.getLogger(RestfulFactory.class); + private static final Logger LOG = LogManager.getLogger(RestfulFactory.class); private static final Map<String, Restful> INSTANCES = new HashMap<>(2); diff --git a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/common/util/restclient/SystemEnvVariablesDefImpl.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/common/util/restclient/SystemEnvVariablesDefImpl.java index ce50cc8..7380881 100644 --- a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/common/util/restclient/SystemEnvVariablesDefImpl.java +++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/common/util/restclient/SystemEnvVariablesDefImpl.java @@ -19,8 +19,8 @@ package org.onap.vfc.nfvo.resmanagement.common.util.restclient; import java.io.File; import java.io.IOException; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; /** * System environment variable helper implementation.<br/> @@ -32,7 +32,7 @@ import org.slf4j.LoggerFactory; */ public class SystemEnvVariablesDefImpl implements SystemEnvVariables { - private static final Logger LOG = LoggerFactory.getLogger(SystemEnvVariablesDefImpl.class); + private static final Logger LOG = LogManager.getLogger(SystemEnvVariablesDefImpl.class); @Override public String getAppRoot() { diff --git a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/adapter/impl/ResmgrAdapter2MSBManager.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/adapter/impl/ResmgrAdapter2MSBManager.java index 7d2466e..41f1928 100644 --- a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/adapter/impl/ResmgrAdapter2MSBManager.java +++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/adapter/impl/ResmgrAdapter2MSBManager.java @@ -18,13 +18,13 @@ package org.onap.vfc.nfvo.resmanagement.service.adapter.impl; import java.util.Map; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.onap.vfc.nfvo.resmanagement.common.constant.Constant; import org.onap.vfc.nfvo.resmanagement.common.constant.HttpConstant; import org.onap.vfc.nfvo.resmanagement.common.util.RestfulUtil; import org.onap.vfc.nfvo.resmanagement.service.adapter.inf.IResmgrAdapter2MSBManager; import org.onap.vfc.nfvo.resmanagement.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 ResmgrAdapter2MSBManager implements IResmgrAdapter2MSBManager { - private static final Logger LOG = LoggerFactory.getLogger(ResmgrAdapter2MSBManager.class); + private static final Logger LOG = LogManager.getLogger(ResmgrAdapter2MSBManager.class); @Override public JSONObject registerResmgr(Map<String, String> paramsMap, JSONObject driverInfo) { diff --git a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/adapter/impl/ResmgrAdapterMgrService.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/adapter/impl/ResmgrAdapterMgrService.java index 606ce50..1946201 100644 --- a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/adapter/impl/ResmgrAdapterMgrService.java +++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/adapter/impl/ResmgrAdapterMgrService.java @@ -25,6 +25,8 @@ 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.resmanagement.common.constant.Constant; import org.onap.vfc.nfvo.resmanagement.common.constant.HttpConstant; import org.onap.vfc.nfvo.resmanagement.common.constant.ParamConstant; @@ -32,8 +34,6 @@ import org.onap.vfc.nfvo.resmanagement.common.constant.UrlConstant; import org.onap.vfc.nfvo.resmanagement.common.util.restclient.SystemEnvVariablesFactory; import org.onap.vfc.nfvo.resmanagement.service.adapter.inf.IResmgrAdapter2MSBManager; import org.onap.vfc.nfvo.resmanagement.service.adapter.inf.IResmgrAdapterMgrService; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import net.sf.json.JSONObject; @@ -47,7 +47,7 @@ import net.sf.json.JSONObject; */ public class ResmgrAdapterMgrService implements IResmgrAdapterMgrService { - private static final Logger LOG = LoggerFactory.getLogger(ResmgrAdapterMgrService.class); + private static final Logger LOG = LogManager.getLogger(ResmgrAdapterMgrService.class); public static final String RESMGRADAPTERINFO = "resmgradapterinfo.json"; diff --git a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/base/openstack/impl/LocationImpl.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/base/openstack/impl/LocationImpl.java index 3b349cf..dffa47d 100644 --- a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/base/openstack/impl/LocationImpl.java +++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/base/openstack/impl/LocationImpl.java @@ -21,6 +21,8 @@ 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.resmanagement.common.VimUtil; import org.onap.vfc.nfvo.resmanagement.common.constant.ParamConstant; import org.onap.vfc.nfvo.resmanagement.common.util.JsonUtil; @@ -30,8 +32,6 @@ import org.onap.vfc.nfvo.resmanagement.service.business.inf.LocationBusiness; import org.onap.vfc.nfvo.resmanagement.service.entity.LocationEntity; import org.onap.vfc.nfvo.resmanagement.service.entity.SitesEntity; import org.onap.vfc.nfvo.resmanagement.common.util.restclient.ServiceException; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import net.sf.json.JSONArray; import net.sf.json.JSONObject; @@ -50,7 +50,7 @@ public class LocationImpl implements Location { private Sites sites; - private static final Logger LOGGER = LoggerFactory.getLogger(LocationImpl.class); + private static final Logger LOGGER = LogManager.getLogger(LocationImpl.class); @Override public int add(JSONObject jsonObject) throws ServiceException { diff --git a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/base/openstack/impl/NetworkImpl.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/base/openstack/impl/NetworkImpl.java index 0d1a0a8..255f20a 100644 --- a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/base/openstack/impl/NetworkImpl.java +++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/base/openstack/impl/NetworkImpl.java @@ -19,13 +19,13 @@ package org.onap.vfc.nfvo.resmanagement.service.base.openstack.impl; 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.resmanagement.common.util.JsonUtil; import org.onap.vfc.nfvo.resmanagement.service.base.openstack.inf.Network; import org.onap.vfc.nfvo.resmanagement.service.business.inf.NetworkBusiness; import org.onap.vfc.nfvo.resmanagement.service.entity.NetworkEntity; import org.onap.vfc.nfvo.resmanagement.common.util.restclient.ServiceException; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import net.sf.json.JSONObject; @@ -39,7 +39,7 @@ import net.sf.json.JSONObject; */ public class NetworkImpl implements Network { - private static final Logger LOGGER = LoggerFactory.getLogger(NetworkImpl.class); + private static final Logger LOGGER = LogManager.getLogger(NetworkImpl.class); private NetworkBusiness networkBusiness; diff --git a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/base/openstack/impl/PortImpl.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/base/openstack/impl/PortImpl.java index 37c51df..5c46809 100644 --- a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/base/openstack/impl/PortImpl.java +++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/base/openstack/impl/PortImpl.java @@ -19,13 +19,13 @@ package org.onap.vfc.nfvo.resmanagement.service.base.openstack.impl; 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.resmanagement.common.util.JsonUtil; import org.onap.vfc.nfvo.resmanagement.service.base.openstack.inf.Port; import org.onap.vfc.nfvo.resmanagement.service.business.inf.PortBusiness; import org.onap.vfc.nfvo.resmanagement.service.entity.PortEntity; import org.onap.vfc.nfvo.resmanagement.common.util.restclient.ServiceException; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import net.sf.json.JSONObject; @@ -39,7 +39,7 @@ import net.sf.json.JSONObject; */ public class PortImpl implements Port { - private static final Logger LOGGER = LoggerFactory.getLogger(PortImpl.class); + private static final Logger LOGGER = LogManager.getLogger(PortImpl.class); private PortBusiness portBusiness; diff --git a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/base/openstack/impl/SitesImpl.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/base/openstack/impl/SitesImpl.java index 2f85b2c..14d24a3 100644 --- a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/base/openstack/impl/SitesImpl.java +++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/base/openstack/impl/SitesImpl.java @@ -23,6 +23,8 @@ import java.util.Map; import java.util.UUID; import org.apache.commons.lang.StringUtils; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.onap.vfc.nfvo.resmanagement.common.VimUtil; import org.onap.vfc.nfvo.resmanagement.common.constant.ParamConstant; import org.onap.vfc.nfvo.resmanagement.common.util.JsonUtil; @@ -32,8 +34,6 @@ import org.onap.vfc.nfvo.resmanagement.service.business.inf.SitesBusiness; import org.onap.vfc.nfvo.resmanagement.service.entity.SitesEntity; import org.onap.vfc.nfvo.resmanagement.service.group.inf.ResOperateService; import org.onap.vfc.nfvo.resmanagement.common.util.restclient.ServiceException; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import net.sf.json.JSONObject; @@ -47,7 +47,7 @@ import net.sf.json.JSONObject; */ public class SitesImpl implements Sites { - private static final Logger LOGGER = LoggerFactory.getLogger(SitesImpl.class); + private static final Logger LOGGER = LogManager.getLogger(SitesImpl.class); private SitesBusiness sitesBusiness; diff --git a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/business/impl/HostBusinessImpl.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/business/impl/HostBusinessImpl.java index 822baa5..9ece9c2 100644 --- a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/business/impl/HostBusinessImpl.java +++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/business/impl/HostBusinessImpl.java @@ -21,13 +21,13 @@ import java.util.Map; import java.util.UUID; import org.apache.commons.lang.StringUtils; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.onap.vfc.nfvo.resmanagement.common.ResourceUtil; import org.onap.vfc.nfvo.resmanagement.service.business.inf.HostBusiness; import org.onap.vfc.nfvo.resmanagement.service.dao.inf.HostDao; import org.onap.vfc.nfvo.resmanagement.service.entity.HostEntity; import org.onap.vfc.nfvo.resmanagement.common.util.restclient.ServiceException; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; /** * @@ -40,7 +40,7 @@ import org.slf4j.LoggerFactory; */ public class HostBusinessImpl implements HostBusiness { - private static final Logger LOGGER = LoggerFactory.getLogger(HostBusinessImpl.class); + private static final Logger LOGGER = LogManager.getLogger(HostBusinessImpl.class); private HostDao hostDao; diff --git a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/business/impl/LimitsBusinessImpl.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/business/impl/LimitsBusinessImpl.java index 08b7af1..ab17752 100644 --- a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/business/impl/LimitsBusinessImpl.java +++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/business/impl/LimitsBusinessImpl.java @@ -16,14 +16,14 @@ package org.onap.vfc.nfvo.resmanagement.service.business.impl; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.onap.vfc.nfvo.resmanagement.common.VimUtil; import org.onap.vfc.nfvo.resmanagement.common.constant.ParamConstant; import org.onap.vfc.nfvo.resmanagement.common.constant.UrlConstant; import org.onap.vfc.nfvo.resmanagement.common.util.RestfulUtil; import org.onap.vfc.nfvo.resmanagement.service.business.inf.LimitsBusiness; import org.onap.vfc.nfvo.resmanagement.common.util.restclient.ServiceException; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import net.sf.json.JSONObject; @@ -37,7 +37,7 @@ import net.sf.json.JSONObject; */ public class LimitsBusinessImpl implements LimitsBusiness { - private static final Logger LOGGER = LoggerFactory.getLogger(LimitsBusinessImpl.class); + private static final Logger LOGGER = LogManager.getLogger(LimitsBusinessImpl.class); /** * <br> diff --git a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/business/impl/LocationBusinessImpl.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/business/impl/LocationBusinessImpl.java index 3e2f047..7051fbf 100644 --- a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/business/impl/LocationBusinessImpl.java +++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/business/impl/LocationBusinessImpl.java @@ -22,6 +22,8 @@ import java.util.Map; import java.util.UUID; import org.apache.commons.lang.StringUtils; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.onap.vfc.nfvo.resmanagement.common.ResourceUtil; import org.onap.vfc.nfvo.resmanagement.common.constant.ParamConstant; import org.onap.vfc.nfvo.resmanagement.common.util.StringUtil; @@ -29,8 +31,6 @@ import org.onap.vfc.nfvo.resmanagement.service.business.inf.LocationBusiness; import org.onap.vfc.nfvo.resmanagement.service.dao.inf.LocationDao; import org.onap.vfc.nfvo.resmanagement.service.entity.LocationEntity; import org.onap.vfc.nfvo.resmanagement.common.util.restclient.ServiceException; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; /** * @@ -43,7 +43,7 @@ import org.slf4j.LoggerFactory; */ public class LocationBusinessImpl implements LocationBusiness { - private static final Logger LOGGER = LoggerFactory.getLogger(LocationBusinessImpl.class); + private static final Logger LOGGER = LogManager.getLogger(LocationBusinessImpl.class); private LocationDao locationDao; diff --git a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/business/impl/NetworkBusinessImpl.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/business/impl/NetworkBusinessImpl.java index 3606f0b..403d924 100644 --- a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/business/impl/NetworkBusinessImpl.java +++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/business/impl/NetworkBusinessImpl.java @@ -21,13 +21,13 @@ import java.util.Map; import java.util.UUID; import org.apache.commons.lang.StringUtils; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.onap.vfc.nfvo.resmanagement.common.ResourceUtil; import org.onap.vfc.nfvo.resmanagement.service.business.inf.NetworkBusiness; import org.onap.vfc.nfvo.resmanagement.service.dao.inf.NetworkDao; import org.onap.vfc.nfvo.resmanagement.service.entity.NetworkEntity; import org.onap.vfc.nfvo.resmanagement.common.util.restclient.ServiceException; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; /** * Network business implementation class.<br> @@ -39,7 +39,7 @@ import org.slf4j.LoggerFactory; */ public class NetworkBusinessImpl implements NetworkBusiness { - private static final Logger LOGGER = LoggerFactory.getLogger(NetworkBusinessImpl.class); + private static final Logger LOGGER = LogManager.getLogger(NetworkBusinessImpl.class); private NetworkDao networkDao; diff --git a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/business/impl/PortBusinessImpl.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/business/impl/PortBusinessImpl.java index d87463a..3a99e23 100644 --- a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/business/impl/PortBusinessImpl.java +++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/business/impl/PortBusinessImpl.java @@ -21,13 +21,13 @@ import java.util.Map; import java.util.UUID; import org.apache.commons.lang.StringUtils; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.onap.vfc.nfvo.resmanagement.common.ResourceUtil; import org.onap.vfc.nfvo.resmanagement.service.business.inf.PortBusiness; import org.onap.vfc.nfvo.resmanagement.service.dao.inf.PortDao; import org.onap.vfc.nfvo.resmanagement.service.entity.PortEntity; import org.onap.vfc.nfvo.resmanagement.common.util.restclient.ServiceException; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; /** * Port business implementation class.<br> @@ -39,7 +39,7 @@ import org.slf4j.LoggerFactory; */ public class PortBusinessImpl implements PortBusiness { - private static final Logger LOGGER = LoggerFactory.getLogger(PortBusinessImpl.class); + private static final Logger LOGGER = LogManager.getLogger(PortBusinessImpl.class); private PortDao portDao; diff --git a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/business/impl/SitesBusinessImpl.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/business/impl/SitesBusinessImpl.java index e5fa7e7..13e408c 100644 --- a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/business/impl/SitesBusinessImpl.java +++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/business/impl/SitesBusinessImpl.java @@ -22,14 +22,14 @@ import java.util.Map; import java.util.UUID; import org.apache.commons.lang.StringUtils; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.onap.vfc.nfvo.resmanagement.common.ResourceUtil; import org.onap.vfc.nfvo.resmanagement.common.constant.ParamConstant; import org.onap.vfc.nfvo.resmanagement.service.business.inf.SitesBusiness; import org.onap.vfc.nfvo.resmanagement.service.dao.inf.SitesDao; import org.onap.vfc.nfvo.resmanagement.service.entity.SitesEntity; import org.onap.vfc.nfvo.resmanagement.common.util.restclient.ServiceException; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; /** * Sites info interface.<br/> @@ -41,7 +41,7 @@ import org.slf4j.LoggerFactory; */ public class SitesBusinessImpl implements SitesBusiness { - private static final Logger LOGGER = LoggerFactory.getLogger(SitesBusinessImpl.class); + private static final Logger LOGGER = LogManager.getLogger(SitesBusinessImpl.class); private SitesDao sitesDao; diff --git a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/business/impl/VimBusinessImpl.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/business/impl/VimBusinessImpl.java index 6e5d143..0a66ad0 100644 --- a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/business/impl/VimBusinessImpl.java +++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/business/impl/VimBusinessImpl.java @@ -19,14 +19,14 @@ package org.onap.vfc.nfvo.resmanagement.service.business.impl; import java.util.List; import org.apache.commons.lang.StringUtils; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.onap.vfc.nfvo.resmanagement.common.ResourceUtil; import org.onap.vfc.nfvo.resmanagement.common.util.StringUtil; import org.onap.vfc.nfvo.resmanagement.service.business.inf.VimBusiness; import org.onap.vfc.nfvo.resmanagement.service.dao.inf.VimDao; import org.onap.vfc.nfvo.resmanagement.service.entity.VimEntity; import org.onap.vfc.nfvo.resmanagement.common.util.restclient.ServiceException; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; /** * Vim info interface.<br/> @@ -38,7 +38,7 @@ import org.slf4j.LoggerFactory; */ public class VimBusinessImpl implements VimBusiness { - private static final Logger LOGGER = LoggerFactory.getLogger(VimBusinessImpl.class); + private static final Logger LOGGER = LogManager.getLogger(VimBusinessImpl.class); private VimDao vimDao; diff --git a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/group/impl/GrantResServiceImpl.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/group/impl/GrantResServiceImpl.java index a2a82fd..ac255fc 100644 --- a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/group/impl/GrantResServiceImpl.java +++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/group/impl/GrantResServiceImpl.java @@ -16,14 +16,14 @@ package org.onap.vfc.nfvo.resmanagement.service.group.impl; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.onap.vfc.nfvo.resmanagement.common.VimUtil; import org.onap.vfc.nfvo.resmanagement.common.constant.ParamConstant; import org.onap.vfc.nfvo.resmanagement.common.util.restclient.ServiceException; import org.onap.vfc.nfvo.resmanagement.service.business.impl.LimitsBusinessImpl; import org.onap.vfc.nfvo.resmanagement.service.business.inf.LimitsBusiness; import org.onap.vfc.nfvo.resmanagement.service.group.inf.GrantResService; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import net.sf.json.JSONArray; import net.sf.json.JSONObject; @@ -44,7 +44,7 @@ public class GrantResServiceImpl implements GrantResService { public static final String RESOURCE_TEMPLATE = "resourceTemplate"; - private static final Logger LOGGER = LoggerFactory.getLogger(GrantResServiceImpl.class); + private static final Logger LOGGER = LogManager.getLogger(GrantResServiceImpl.class); /** * <br> diff --git a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/group/impl/IResourceAddServiceImpl.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/group/impl/IResourceAddServiceImpl.java index 24dddd8..1c56d86 100644 --- a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/group/impl/IResourceAddServiceImpl.java +++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/group/impl/IResourceAddServiceImpl.java @@ -19,6 +19,8 @@ package org.onap.vfc.nfvo.resmanagement.service.group.impl; import java.util.HashMap; import java.util.Map; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.onap.vfc.nfvo.resmanagement.common.constant.ParamConstant; import org.onap.vfc.nfvo.resmanagement.common.constant.UrlConstant; import org.onap.vfc.nfvo.resmanagement.common.util.JsonUtil; @@ -26,8 +28,6 @@ import org.onap.vfc.nfvo.resmanagement.common.util.RestfulUtil; import org.onap.vfc.nfvo.resmanagement.common.util.restclient.RestfulParametes; import org.onap.vfc.nfvo.resmanagement.common.util.restclient.ServiceException; import org.onap.vfc.nfvo.resmanagement.service.base.openstack.inf.InterfaceResManagement; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import org.springframework.transaction.annotation.Transactional; import net.sf.json.JSONArray; @@ -43,7 +43,7 @@ import net.sf.json.JSONObject; */ public class IResourceAddServiceImpl { - private static final Logger LOGGER = LoggerFactory.getLogger(IResourceAddServiceImpl.class); + private static final Logger LOGGER = LogManager.getLogger(IResourceAddServiceImpl.class); /** * Add iResource.<br> diff --git a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/group/impl/IResourceDelServiceImpl.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/group/impl/IResourceDelServiceImpl.java index a0217ad..61e0be4 100644 --- a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/group/impl/IResourceDelServiceImpl.java +++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/group/impl/IResourceDelServiceImpl.java @@ -19,13 +19,13 @@ package org.onap.vfc.nfvo.resmanagement.service.group.impl; import java.util.HashMap; import java.util.Map; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.onap.vfc.nfvo.resmanagement.common.ResourceUtil; import org.onap.vfc.nfvo.resmanagement.common.constant.ParamConstant; import org.onap.vfc.nfvo.resmanagement.service.base.openstack.inf.InterfaceResManagement; import org.onap.vfc.nfvo.resmanagement.service.base.openstack.inf.Vim; import org.onap.vfc.nfvo.resmanagement.common.util.restclient.ServiceException; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; /** * @@ -38,7 +38,7 @@ import org.slf4j.LoggerFactory; */ public class IResourceDelServiceImpl { - private static final Logger LOGGER = LoggerFactory.getLogger(IResourceDelServiceImpl.class); + private static final Logger LOGGER = LogManager.getLogger(IResourceDelServiceImpl.class); /** * diff --git a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/group/impl/IResourceUpdateServiceImpl.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/group/impl/IResourceUpdateServiceImpl.java index f8006c3..b799629 100644 --- a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/group/impl/IResourceUpdateServiceImpl.java +++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/group/impl/IResourceUpdateServiceImpl.java @@ -19,14 +19,14 @@ package org.onap.vfc.nfvo.resmanagement.service.group.impl; import java.util.HashMap; import java.util.Map; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.onap.vfc.nfvo.resmanagement.common.constant.ParamConstant; import org.onap.vfc.nfvo.resmanagement.common.constant.UrlConstant; import org.onap.vfc.nfvo.resmanagement.common.util.RestfulUtil; import org.onap.vfc.nfvo.resmanagement.service.base.openstack.inf.InterfaceResManagement; import org.onap.vfc.nfvo.resmanagement.common.util.restclient.ServiceException; import org.onap.vfc.nfvo.resmanagement.common.util.restclient.RestfulParametes; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import org.springframework.transaction.annotation.Transactional; import net.sf.json.JSONArray; @@ -42,7 +42,7 @@ import net.sf.json.JSONObject; */ public class IResourceUpdateServiceImpl { - private static final Logger LOGGER = LoggerFactory.getLogger(IResourceUpdateServiceImpl.class); + private static final Logger LOGGER = LogManager.getLogger(IResourceUpdateServiceImpl.class); /** * Update iResource.<br> diff --git a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/group/impl/NsServiceImpl.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/group/impl/NsServiceImpl.java index a228114..b0a4632 100644 --- a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/group/impl/NsServiceImpl.java +++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/group/impl/NsServiceImpl.java @@ -21,12 +21,12 @@ import java.util.Map; import java.util.UUID; import org.apache.commons.lang.StringUtils; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.onap.vfc.nfvo.resmanagement.common.util.restclient.ServiceException; import org.onap.vfc.nfvo.resmanagement.service.dao.inf.NsDao; import org.onap.vfc.nfvo.resmanagement.service.entity.NsEntity; import org.onap.vfc.nfvo.resmanagement.service.group.inf.NsService; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import net.sf.json.JSONObject; @@ -40,7 +40,7 @@ import net.sf.json.JSONObject; */ public class NsServiceImpl implements NsService { - private static final Logger LOGGER = LoggerFactory.getLogger(NsServiceImpl.class); + private static final Logger LOGGER = LogManager.getLogger(NsServiceImpl.class); private NsDao nsDao; diff --git a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/group/impl/ResOperateServiceImpl.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/group/impl/ResOperateServiceImpl.java index 453c5cd..6840702 100644 --- a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/group/impl/ResOperateServiceImpl.java +++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/group/impl/ResOperateServiceImpl.java @@ -21,6 +21,8 @@ import java.util.List; import java.util.Map; import org.apache.commons.lang.StringUtils; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.onap.vfc.nfvo.resmanagement.common.ResourceUtil; import org.onap.vfc.nfvo.resmanagement.common.constant.Constant; import org.onap.vfc.nfvo.resmanagement.common.constant.ParamConstant; @@ -39,8 +41,6 @@ import org.onap.vfc.nfvo.resmanagement.service.entity.VimEntity; import org.onap.vfc.nfvo.resmanagement.service.group.inf.ResOperateService; import org.onap.vfc.nfvo.resmanagement.common.util.restclient.ServiceException; import org.onap.vfc.nfvo.resmanagement.common.util.restclient.RestfulParametes; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import org.springframework.transaction.annotation.Transactional; import net.sf.json.JSONArray; @@ -56,7 +56,7 @@ import net.sf.json.JSONObject; */ public class ResOperateServiceImpl implements ResOperateService { - private static final Logger LOGGER = LoggerFactory.getLogger(ResOperateServiceImpl.class); + private static final Logger LOGGER = LogManager.getLogger(ResOperateServiceImpl.class); private Sites sites; diff --git a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/group/impl/VirtualLinkServiceImpl.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/group/impl/VirtualLinkServiceImpl.java index 838a45c..4e81f8b 100644 --- a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/group/impl/VirtualLinkServiceImpl.java +++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/group/impl/VirtualLinkServiceImpl.java @@ -21,13 +21,13 @@ import java.util.Map; import java.util.UUID; import org.apache.commons.lang.StringUtils; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.onap.vfc.nfvo.resmanagement.common.ResourceUtil; import org.onap.vfc.nfvo.resmanagement.service.dao.inf.VirtualLinkDao; import org.onap.vfc.nfvo.resmanagement.service.entity.VirtualLinkEntity; import org.onap.vfc.nfvo.resmanagement.service.group.inf.VirtualLinkService; import org.onap.vfc.nfvo.resmanagement.common.util.restclient.ServiceException; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import net.sf.json.JSONObject; @@ -41,7 +41,7 @@ import net.sf.json.JSONObject; */ public class VirtualLinkServiceImpl implements VirtualLinkService { - private static final Logger LOGGER = LoggerFactory.getLogger(VirtualLinkServiceImpl.class); + private static final Logger LOGGER = LogManager.getLogger(VirtualLinkServiceImpl.class); private VirtualLinkDao virtualLinkDao; diff --git a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/group/impl/VmServiceImpl.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/group/impl/VmServiceImpl.java index d7574ee..8c48e5c 100644 --- a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/group/impl/VmServiceImpl.java +++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/group/impl/VmServiceImpl.java @@ -22,6 +22,8 @@ import java.util.Map; import java.util.UUID; import org.apache.commons.lang.StringUtils; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.onap.vfc.nfvo.resmanagement.common.constant.ParamConstant; import org.onap.vfc.nfvo.resmanagement.common.constant.UrlConstant; import org.onap.vfc.nfvo.resmanagement.common.util.RestfulUtil; @@ -30,8 +32,6 @@ import org.onap.vfc.nfvo.resmanagement.common.util.restclient.ServiceException; import org.onap.vfc.nfvo.resmanagement.service.dao.inf.VmDao; import org.onap.vfc.nfvo.resmanagement.service.entity.VmEntity; import org.onap.vfc.nfvo.resmanagement.service.group.inf.VmService; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import net.sf.json.JSONArray; import net.sf.json.JSONObject; @@ -46,7 +46,7 @@ import net.sf.json.JSONObject; */ public class VmServiceImpl implements VmService { - private static final Logger LOGGER = LoggerFactory.getLogger(VmServiceImpl.class); + private static final Logger LOGGER = LogManager.getLogger(VmServiceImpl.class); private VmDao vmDao; diff --git a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/group/impl/VnfInfoServiceImpl.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/group/impl/VnfInfoServiceImpl.java index ddac68d..ed115f4 100644 --- a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/group/impl/VnfInfoServiceImpl.java +++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/group/impl/VnfInfoServiceImpl.java @@ -19,6 +19,8 @@ package org.onap.vfc.nfvo.resmanagement.service.group.impl; 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.resmanagement.common.constant.ParamConstant; import org.onap.vfc.nfvo.resmanagement.common.util.restclient.ServiceException; import org.onap.vfc.nfvo.resmanagement.service.dao.inf.VnfInfoDao; @@ -26,8 +28,6 @@ import org.onap.vfc.nfvo.resmanagement.service.entity.VmEntity; import org.onap.vfc.nfvo.resmanagement.service.entity.VnfInfoEntity; import org.onap.vfc.nfvo.resmanagement.service.group.inf.VmService; import org.onap.vfc.nfvo.resmanagement.service.group.inf.VnfInfoService; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import net.sf.json.JSONArray; import net.sf.json.JSONObject; @@ -42,7 +42,7 @@ import net.sf.json.JSONObject; */ public class VnfInfoServiceImpl implements VnfInfoService { - private static final Logger LOGGER = LoggerFactory.getLogger(VnfInfoServiceImpl.class); + private static final Logger LOGGER = LogManager.getLogger(VnfInfoServiceImpl.class); private VnfInfoDao vnfInfoDao; diff --git a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/group/impl/VnfServiceImpl.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/group/impl/VnfServiceImpl.java index 8639ae4..e7da32d 100644 --- a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/group/impl/VnfServiceImpl.java +++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/group/impl/VnfServiceImpl.java @@ -21,14 +21,14 @@ import java.util.Map; import java.util.UUID; import org.apache.commons.lang.StringUtils; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.onap.vfc.nfvo.resmanagement.common.ResourceUtil; import org.onap.vfc.nfvo.resmanagement.common.util.restclient.ServiceException; import org.onap.vfc.nfvo.resmanagement.service.dao.inf.VnfDao; import org.onap.vfc.nfvo.resmanagement.service.entity.VnfEntity; import org.onap.vfc.nfvo.resmanagement.service.group.inf.VnfInfoService; import org.onap.vfc.nfvo.resmanagement.service.group.inf.VnfService; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import net.sf.json.JSONObject; @@ -42,7 +42,7 @@ import net.sf.json.JSONObject; */ public class VnfServiceImpl implements VnfService { - private static final Logger LOGGER = LoggerFactory.getLogger(VnfServiceImpl.class); + private static final Logger LOGGER = LogManager.getLogger(VnfServiceImpl.class); private VnfDao vnfDao; diff --git a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/group/impl/VnfStatusServiceImpl.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/group/impl/VnfStatusServiceImpl.java index b445913..e64e540 100644 --- a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/group/impl/VnfStatusServiceImpl.java +++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/group/impl/VnfStatusServiceImpl.java @@ -19,12 +19,12 @@ package org.onap.vfc.nfvo.resmanagement.service.group.impl; 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.resmanagement.service.dao.inf.VnfStatusDao; import org.onap.vfc.nfvo.resmanagement.service.entity.VnfStatusEntity; import org.onap.vfc.nfvo.resmanagement.service.group.inf.VnfStatusService; import org.onap.vfc.nfvo.resmanagement.common.util.restclient.ServiceException; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import net.sf.json.JSONObject; @@ -38,7 +38,7 @@ import net.sf.json.JSONObject; */ public class VnfStatusServiceImpl implements VnfStatusService { - private static final Logger LOGGER = LoggerFactory.getLogger(VnfStatusServiceImpl.class); + private static final Logger LOGGER = LogManager.getLogger(VnfStatusServiceImpl.class); private VnfStatusDao vnfStatusDao; diff --git a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/rest/GrantResourseRoa.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/rest/GrantResourseRoa.java index 19b4441..b913b7d 100644 --- a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/rest/GrantResourseRoa.java +++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/rest/GrantResourseRoa.java @@ -24,6 +24,8 @@ import javax.ws.rs.Produces; import javax.ws.rs.core.Context; import javax.ws.rs.core.MediaType; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.onap.vfc.nfvo.resmanagement.common.ResourceUtil; import org.onap.vfc.nfvo.resmanagement.common.constant.HttpConstant; import org.onap.vfc.nfvo.resmanagement.common.constant.UrlConstant; @@ -31,8 +33,6 @@ import org.onap.vfc.nfvo.resmanagement.common.util.request.RequestUtil; import org.onap.vfc.nfvo.resmanagement.common.util.response.ResponseUtil; import org.onap.vfc.nfvo.resmanagement.service.group.inf.GrantResService; import org.onap.vfc.nfvo.resmanagement.common.util.restclient.ServiceException; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import net.sf.json.JSONObject; @@ -49,7 +49,7 @@ import net.sf.json.JSONObject; @Consumes(MediaType.APPLICATION_JSON) public class GrantResourseRoa { - private static final Logger LOGGER = LoggerFactory.getLogger(GrantResourseRoa.class); + private static final Logger LOGGER = LogManager.getLogger(GrantResourseRoa.class); private GrantResService grantResService; diff --git a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/rest/HostRoa.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/rest/HostRoa.java index 64a8113..e03b142 100644 --- a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/rest/HostRoa.java +++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/rest/HostRoa.java @@ -33,6 +33,8 @@ import javax.ws.rs.QueryParam; import javax.ws.rs.core.Context; import javax.ws.rs.core.MediaType; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.onap.vfc.nfvo.resmanagement.common.constant.HttpConstant; import org.onap.vfc.nfvo.resmanagement.common.constant.ParamConstant; import org.onap.vfc.nfvo.resmanagement.common.constant.UrlConstant; @@ -42,8 +44,6 @@ import org.onap.vfc.nfvo.resmanagement.common.util.response.RoaResponseUtil; import org.onap.vfc.nfvo.resmanagement.service.base.openstack.inf.Host; import org.onap.vfc.nfvo.resmanagement.service.entity.HostEntity; import org.onap.vfc.nfvo.resmanagement.common.util.restclient.ServiceException; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import net.sf.json.JSONObject; @@ -61,7 +61,7 @@ import net.sf.json.JSONObject; @Consumes(MediaType.APPLICATION_JSON) public class HostRoa { - private static final Logger LOGGER = LoggerFactory.getLogger(HostRoa.class); + private static final Logger LOGGER = LogManager.getLogger(HostRoa.class); private Host host; diff --git a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/rest/LimitsRoa.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/rest/LimitsRoa.java index 91d3dce..24f93f5 100644 --- a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/rest/LimitsRoa.java +++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/rest/LimitsRoa.java @@ -25,12 +25,12 @@ import javax.ws.rs.QueryParam; import javax.ws.rs.core.Context; import javax.ws.rs.core.MediaType; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.onap.vfc.nfvo.resmanagement.common.constant.ParamConstant; import org.onap.vfc.nfvo.resmanagement.common.constant.UrlConstant; import org.onap.vfc.nfvo.resmanagement.service.business.inf.LimitsBusiness; import org.onap.vfc.nfvo.resmanagement.common.util.restclient.ServiceException; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import net.sf.json.JSONObject; @@ -47,7 +47,7 @@ import net.sf.json.JSONObject; @Produces(MediaType.APPLICATION_JSON) public class LimitsRoa { - private static final Logger LOGGER = LoggerFactory.getLogger(LimitsRoa.class); + private static final Logger LOGGER = LogManager.getLogger(LimitsRoa.class); private LimitsBusiness limitsBusiness; diff --git a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/rest/LocationRoa.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/rest/LocationRoa.java index 9dcbd94..f27910b 100644 --- a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/rest/LocationRoa.java +++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/rest/LocationRoa.java @@ -34,6 +34,8 @@ import javax.ws.rs.QueryParam; import javax.ws.rs.core.Context; import javax.ws.rs.core.MediaType; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.onap.vfc.nfvo.resmanagement.common.ResourceUtil; import org.onap.vfc.nfvo.resmanagement.common.constant.HttpConstant; import org.onap.vfc.nfvo.resmanagement.common.constant.ParamConstant; @@ -47,8 +49,6 @@ import org.onap.vfc.nfvo.resmanagement.service.base.openstack.inf.Sites; import org.onap.vfc.nfvo.resmanagement.service.entity.LocationEntity; import org.onap.vfc.nfvo.resmanagement.service.entity.SitesEntity; import org.onap.vfc.nfvo.resmanagement.common.util.restclient.ServiceException; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import net.sf.json.JSONObject; @@ -65,7 +65,7 @@ import net.sf.json.JSONObject; @Consumes(MediaType.APPLICATION_JSON) public class LocationRoa { - private static final Logger LOGGER = LoggerFactory.getLogger(LocationRoa.class); + private static final Logger LOGGER = LogManager.getLogger(LocationRoa.class); private Location location; diff --git a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/rest/NetworkRoa.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/rest/NetworkRoa.java index 07834b5..7220398 100644 --- a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/rest/NetworkRoa.java +++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/rest/NetworkRoa.java @@ -33,6 +33,8 @@ import javax.ws.rs.QueryParam; import javax.ws.rs.core.Context; import javax.ws.rs.core.MediaType; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.onap.vfc.nfvo.resmanagement.common.constant.HttpConstant; import org.onap.vfc.nfvo.resmanagement.common.constant.ParamConstant; import org.onap.vfc.nfvo.resmanagement.common.constant.UrlConstant; @@ -42,8 +44,6 @@ import org.onap.vfc.nfvo.resmanagement.common.util.response.RoaResponseUtil; import org.onap.vfc.nfvo.resmanagement.service.base.openstack.inf.Network; import org.onap.vfc.nfvo.resmanagement.service.entity.NetworkEntity; import org.onap.vfc.nfvo.resmanagement.common.util.restclient.ServiceException; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import net.sf.json.JSONObject; @@ -61,7 +61,7 @@ import net.sf.json.JSONObject; @Produces({MediaType.APPLICATION_JSON}) public class NetworkRoa { - private static final Logger LOGGER = LoggerFactory.getLogger(NetworkRoa.class); + private static final Logger LOGGER = LogManager.getLogger(NetworkRoa.class); private Network network; diff --git a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/rest/NsRoa.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/rest/NsRoa.java index 43f5f62..eae4ae6 100644 --- a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/rest/NsRoa.java +++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/rest/NsRoa.java @@ -32,6 +32,8 @@ import javax.ws.rs.Produces; import javax.ws.rs.core.Context; import javax.ws.rs.core.MediaType; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.onap.vfc.nfvo.resmanagement.common.constant.HttpConstant; import org.onap.vfc.nfvo.resmanagement.common.constant.ParamConstant; import org.onap.vfc.nfvo.resmanagement.common.constant.UrlConstant; @@ -41,8 +43,6 @@ import org.onap.vfc.nfvo.resmanagement.common.util.response.RoaResponseUtil; import org.onap.vfc.nfvo.resmanagement.common.util.restclient.ServiceException; import org.onap.vfc.nfvo.resmanagement.service.entity.NsEntity; import org.onap.vfc.nfvo.resmanagement.service.group.inf.NsService; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import net.sf.json.JSONObject; @@ -51,7 +51,7 @@ import net.sf.json.JSONObject; @Consumes(MediaType.APPLICATION_JSON) public class NsRoa { - private static final Logger LOGGER = LoggerFactory.getLogger(VirtualLinkRoa.class); + private static final Logger LOGGER = LogManager.getLogger(VirtualLinkRoa.class); private NsService nsService; diff --git a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/rest/PortRoa.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/rest/PortRoa.java index 06d972d..754ef76 100644 --- a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/rest/PortRoa.java +++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/rest/PortRoa.java @@ -33,6 +33,8 @@ import javax.ws.rs.QueryParam; import javax.ws.rs.core.Context; import javax.ws.rs.core.MediaType; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.onap.vfc.nfvo.resmanagement.common.constant.HttpConstant; import org.onap.vfc.nfvo.resmanagement.common.constant.ParamConstant; import org.onap.vfc.nfvo.resmanagement.common.constant.UrlConstant; @@ -42,8 +44,6 @@ import org.onap.vfc.nfvo.resmanagement.common.util.response.RoaResponseUtil; import org.onap.vfc.nfvo.resmanagement.service.base.openstack.inf.Port; import org.onap.vfc.nfvo.resmanagement.service.entity.PortEntity; import org.onap.vfc.nfvo.resmanagement.common.util.restclient.ServiceException; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import net.sf.json.JSONObject; @@ -61,7 +61,7 @@ import net.sf.json.JSONObject; @Consumes(MediaType.APPLICATION_JSON) public class PortRoa { - private static final Logger LOGGER = LoggerFactory.getLogger(PortRoa.class); + private static final Logger LOGGER = LogManager.getLogger(PortRoa.class); private Port port; diff --git a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/rest/ResOperateRoa.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/rest/ResOperateRoa.java index 0c838d9..a14d2c0 100644 --- a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/rest/ResOperateRoa.java +++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/rest/ResOperateRoa.java @@ -27,6 +27,8 @@ import javax.ws.rs.QueryParam; import javax.ws.rs.core.Context; import javax.ws.rs.core.MediaType; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.onap.vfc.nfvo.resmanagement.common.VimUtil; import org.onap.vfc.nfvo.resmanagement.common.constant.HttpConstant; import org.onap.vfc.nfvo.resmanagement.common.constant.ParamConstant; @@ -36,8 +38,6 @@ import org.onap.vfc.nfvo.resmanagement.common.util.response.ResponseUtil; import org.onap.vfc.nfvo.resmanagement.common.util.response.RoaResponseUtil; import org.onap.vfc.nfvo.resmanagement.service.group.inf.ResOperateService; import org.onap.vfc.nfvo.resmanagement.common.util.restclient.ServiceException; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import net.sf.json.JSONObject; @@ -54,7 +54,7 @@ import net.sf.json.JSONObject; @Produces(MediaType.APPLICATION_JSON) public class ResOperateRoa { - private static final Logger LOGGER = LoggerFactory.getLogger(ResOperateRoa.class); + private static final Logger LOGGER = LogManager.getLogger(ResOperateRoa.class); private ResOperateService resOperateService; diff --git a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/rest/SitesRoa.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/rest/SitesRoa.java index 4fbdc79..b720b4f 100644 --- a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/rest/SitesRoa.java +++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/rest/SitesRoa.java @@ -32,6 +32,8 @@ import javax.ws.rs.Produces; import javax.ws.rs.core.Context; import javax.ws.rs.core.MediaType; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.onap.vfc.nfvo.resmanagement.common.VimUtil; import org.onap.vfc.nfvo.resmanagement.common.constant.HttpConstant; import org.onap.vfc.nfvo.resmanagement.common.constant.ParamConstant; @@ -42,8 +44,6 @@ import org.onap.vfc.nfvo.resmanagement.common.util.response.RoaResponseUtil; import org.onap.vfc.nfvo.resmanagement.service.base.openstack.inf.Sites; import org.onap.vfc.nfvo.resmanagement.service.entity.SitesEntity; import org.onap.vfc.nfvo.resmanagement.common.util.restclient.ServiceException; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import net.sf.json.JSONArray; import net.sf.json.JSONObject; @@ -61,7 +61,7 @@ import net.sf.json.JSONObject; @Produces(MediaType.APPLICATION_JSON) public class SitesRoa { - private static final Logger LOGGER = LoggerFactory.getLogger(SitesRoa.class); + private static final Logger LOGGER = LogManager.getLogger(SitesRoa.class); private Sites sites; diff --git a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/rest/VirtualLinkRoa.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/rest/VirtualLinkRoa.java index 0845687..aef08cb 100644 --- a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/rest/VirtualLinkRoa.java +++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/rest/VirtualLinkRoa.java @@ -31,6 +31,8 @@ import javax.ws.rs.Produces; import javax.ws.rs.core.Context; import javax.ws.rs.core.MediaType; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.onap.vfc.nfvo.resmanagement.common.ResourceUtil; import org.onap.vfc.nfvo.resmanagement.common.constant.HttpConstant; import org.onap.vfc.nfvo.resmanagement.common.constant.ParamConstant; @@ -41,8 +43,6 @@ import org.onap.vfc.nfvo.resmanagement.common.util.response.RoaResponseUtil; import org.onap.vfc.nfvo.resmanagement.service.entity.VirtualLinkEntity; import org.onap.vfc.nfvo.resmanagement.service.group.inf.VirtualLinkService; import org.onap.vfc.nfvo.resmanagement.common.util.restclient.ServiceException; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import net.sf.json.JSONObject; @@ -59,7 +59,7 @@ import net.sf.json.JSONObject; @Consumes(MediaType.APPLICATION_JSON) public class VirtualLinkRoa { - private static final Logger LOGGER = LoggerFactory.getLogger(VirtualLinkRoa.class); + private static final Logger LOGGER = LogManager.getLogger(VirtualLinkRoa.class); private VirtualLinkService virtualLink; diff --git a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/rest/VmRoa.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/rest/VmRoa.java index 8de8fb7..19470fb 100644 --- a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/rest/VmRoa.java +++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/rest/VmRoa.java @@ -31,6 +31,8 @@ import javax.ws.rs.Produces; import javax.ws.rs.core.Context; import javax.ws.rs.core.MediaType; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.onap.vfc.nfvo.resmanagement.common.ResourceUtil; import org.onap.vfc.nfvo.resmanagement.common.constant.HttpConstant; import org.onap.vfc.nfvo.resmanagement.common.constant.ParamConstant; @@ -41,8 +43,6 @@ import org.onap.vfc.nfvo.resmanagement.common.util.response.RoaResponseUtil; import org.onap.vfc.nfvo.resmanagement.service.entity.VmEntity; import org.onap.vfc.nfvo.resmanagement.service.group.inf.VmService; import org.onap.vfc.nfvo.resmanagement.common.util.restclient.ServiceException; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import net.sf.json.JSONObject; @@ -59,7 +59,7 @@ import net.sf.json.JSONObject; @Consumes(MediaType.APPLICATION_JSON) public class VmRoa { - private static final Logger LOGGER = LoggerFactory.getLogger(VmRoa.class); + private static final Logger LOGGER = LogManager.getLogger(VmRoa.class); private VmService vmService; diff --git a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/rest/VnfInfoRoa.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/rest/VnfInfoRoa.java index 07992f4..688905c 100644 --- a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/rest/VnfInfoRoa.java +++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/rest/VnfInfoRoa.java @@ -31,6 +31,8 @@ import javax.ws.rs.Produces; import javax.ws.rs.core.Context; import javax.ws.rs.core.MediaType; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.onap.vfc.nfvo.resmanagement.common.ResourceUtil; import org.onap.vfc.nfvo.resmanagement.common.constant.HttpConstant; import org.onap.vfc.nfvo.resmanagement.common.constant.ParamConstant; @@ -41,8 +43,6 @@ import org.onap.vfc.nfvo.resmanagement.common.util.response.RoaResponseUtil; import org.onap.vfc.nfvo.resmanagement.service.entity.VnfInfoEntity; import org.onap.vfc.nfvo.resmanagement.service.group.inf.VnfInfoService; import org.onap.vfc.nfvo.resmanagement.common.util.restclient.ServiceException; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import net.sf.json.JSONObject; @@ -59,7 +59,7 @@ import net.sf.json.JSONObject; @Consumes(MediaType.APPLICATION_JSON) public class VnfInfoRoa { - private static final Logger LOGGER = LoggerFactory.getLogger(VnfInfoRoa.class); + private static final Logger LOGGER = LogManager.getLogger(VnfInfoRoa.class); private VnfInfoService vnfInfoService; diff --git a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/rest/VnfRoa.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/rest/VnfRoa.java index 345ec27..8f0b2ea 100644 --- a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/rest/VnfRoa.java +++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/rest/VnfRoa.java @@ -31,6 +31,8 @@ import javax.ws.rs.Produces; import javax.ws.rs.core.Context; import javax.ws.rs.core.MediaType; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.onap.vfc.nfvo.resmanagement.common.ResourceUtil; import org.onap.vfc.nfvo.resmanagement.common.VimUtil; import org.onap.vfc.nfvo.resmanagement.common.constant.HttpConstant; @@ -42,8 +44,6 @@ import org.onap.vfc.nfvo.resmanagement.common.util.response.RoaResponseUtil; import org.onap.vfc.nfvo.resmanagement.common.util.restclient.ServiceException; import org.onap.vfc.nfvo.resmanagement.service.entity.VnfEntity; import org.onap.vfc.nfvo.resmanagement.service.group.inf.VnfService; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import net.sf.json.JSONObject; @@ -60,7 +60,7 @@ import net.sf.json.JSONObject; @Consumes(MediaType.APPLICATION_JSON) public class VnfRoa { - private static final Logger LOGGER = LoggerFactory.getLogger(VirtualLinkRoa.class); + private static final Logger LOGGER = LogManager.getLogger(VirtualLinkRoa.class); private VnfService vnfService; diff --git a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/rest/VnfStatusRoa.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/rest/VnfStatusRoa.java index 77aed64..dcdf494 100644 --- a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/rest/VnfStatusRoa.java +++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/rest/VnfStatusRoa.java @@ -31,6 +31,8 @@ import javax.ws.rs.Produces; import javax.ws.rs.core.Context; import javax.ws.rs.core.MediaType; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.onap.vfc.nfvo.resmanagement.common.ResourceUtil; import org.onap.vfc.nfvo.resmanagement.common.constant.HttpConstant; import org.onap.vfc.nfvo.resmanagement.common.constant.ParamConstant; @@ -41,8 +43,6 @@ import org.onap.vfc.nfvo.resmanagement.common.util.response.RoaResponseUtil; import org.onap.vfc.nfvo.resmanagement.common.util.restclient.ServiceException; import org.onap.vfc.nfvo.resmanagement.service.entity.VnfStatusEntity; import org.onap.vfc.nfvo.resmanagement.service.group.inf.VnfStatusService; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import net.sf.json.JSONObject; @@ -59,7 +59,7 @@ import net.sf.json.JSONObject; @Consumes(MediaType.APPLICATION_JSON) public class VnfStatusRoa { - private static final Logger LOGGER = LoggerFactory.getLogger(VnfStatusRoa.class); + private static final Logger LOGGER = LogManager.getLogger(VnfStatusRoa.class); private VnfStatusService vnfStatusService; diff --git a/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/common/util/restclient/TestRestHttpContentExchange.java b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/common/util/restclient/TestRestHttpContentExchange.java index ef0769b..09b3a91 100644 --- a/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/common/util/restclient/TestRestHttpContentExchange.java +++ b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/common/util/restclient/TestRestHttpContentExchange.java @@ -30,8 +30,8 @@ import java.util.List; import java.util.concurrent.atomic.AtomicInteger; import java.util.zip.GZIPInputStream; -import org.apache.log4j.Level; -import org.apache.log4j.LogManager; +import org.apache.logging.log4j.Level; +import org.apache.logging.log4j.LogManager; import org.eclipse.jetty.client.Address; import org.eclipse.jetty.client.CachedExchange; import org.eclipse.jetty.client.HttpDestination; @@ -111,7 +111,7 @@ public class TestRestHttpContentExchange { */ @After public void tearDown() throws Exception { - LogManager.getLogger(RestHttpContentExchange.class).setLevel(Level.ERROR); + LogManager.getLogger(RestHttpContentExchange.class).atLevel(Level.ERROR); } /** @@ -128,7 +128,7 @@ public class TestRestHttpContentExchange { exchange.setRequestURI("/the/request/uri"); exchange.onRequestCommitted(); - LogManager.getLogger(RestHttpContentExchange.class).setLevel(Level.DEBUG); + LogManager.getLogger(RestHttpContentExchange.class).atLevel(Level.DEBUG); exchange.onRequestCommitted(); } @@ -146,7 +146,7 @@ public class TestRestHttpContentExchange { exchange.setRequestURI("/the/request/uri"); exchange.onRequestComplete(); - LogManager.getLogger(RestHttpContentExchange.class).setLevel(Level.DEBUG); + LogManager.getLogger(RestHttpContentExchange.class).atLevel(Level.DEBUG); exchange.onRequestComplete(); } @@ -164,7 +164,7 @@ public class TestRestHttpContentExchange { exchange.setRequestURI("/the/request/uri"); exchange.onResponseComplete(); - LogManager.getLogger(RestHttpContentExchange.class).setLevel(Level.DEBUG); + LogManager.getLogger(RestHttpContentExchange.class).atLevel(Level.DEBUG); exchange.onResponseComplete(); final AtomicInteger isCallback = new AtomicInteger(0); |