Upgrade log4j to 2.13.1 and add log4j api 2.13.1.

Issue-ID: OPTFRA-752
Signed-off-by: Maciej Malewski <maciej.malewski@nokia.com>
Change-Id: Ib39de5e892f00c07c812a8dc8d3ac7d1fca009cf

16 files changed, 48 insertions, 167 deletions

diff --git a/cmso-service/pom.xml b/cmso-service/pom.xml
index db8d37e..947a995 100644
--- a/cmso-service/pom.xml
+++ b/cmso-service/pom.xml
@@ -169,41 +169,12 @@
 			<artifactId>jackson-dataformat-yaml</artifactId>

 		</dependency>

 		<dependency>

-			<groupId>com.att.eelf</groupId>

-			<artifactId>eelf-core</artifactId>

-			<version>${eelf.version}</version>

-			<exclusions>

-				<exclusion>

-					<groupId>org.mockito</groupId>

-					<artifactId>mockito-core</artifactId>

-				</exclusion>

-				<exclusion>

-					<groupId>org.powermock</groupId>

-					<artifactId>powermock-module</artifactId>

-				</exclusion>

-				<exclusion>

-					<groupId>org.powermock</groupId>

-					<artifactId>powermock-api-mockito</artifactId>

-				</exclusion>

-				<exclusion>

-					<groupId>org.powermock</groupId>

-					<artifactId>powermock-module-junit4</artifactId>

-				</exclusion>

-

-			</exclusions>

-		</dependency>

-		<dependency>

 			<groupId>org.yaml</groupId>

 			<artifactId>snakeyaml</artifactId>

 			<version>1.26</version>

 		</dependency>

 		<!-- <dependency> <groupId>org.onap.aaf.authz</groupId> <artifactId>aaf-cadi-aaf</artifactId> 

 			<version>2.1.1</version> </dependency> -->

-		<dependency>

-			<groupId>javax.ws.rs</groupId>

-			<artifactId>javax.ws.rs-api</artifactId>

-			<version>2.1</version>

-		</dependency>

 

 		<!--Swagger Dependencies -->

 		<dependency>

@@ -263,8 +234,19 @@
 			<groupId>org.onap.aaf.authz</groupId>

 			<artifactId>aaf-cadi-aaf</artifactId>

 			<version>${aaf.version}</version>

+			<exclusions>

+				<exclusion>

+					<groupId>log4j</groupId>

+					<artifactId>log4j</artifactId>

+				</exclusion>

+			</exclusions>

 		</dependency>

-	</dependencies>

+        <dependency>

+            <groupId>org.onap.optf.cmso</groupId>

+            <artifactId>cmso-logger</artifactId>

+            <version>2.2.0-SNAPSHOT</version>

+        </dependency>

+    </dependencies>

 

 	<build>

 		<finalName>cmso-service</finalName>

diff --git a/cmso-service/src/main/java/org/onap/observations/Observation.java b/cmso-service/src/main/java/org/onap/observations/Observation.java
index 3d2d176..a097345 100644
--- a/cmso-service/src/main/java/org/onap/observations/Observation.java
+++ b/cmso-service/src/main/java/org/onap/observations/Observation.java
@@ -1,5 +1,6 @@
 /*
  * Copyright © 2019 AT&T Intellectual Property.
+ * Modified 2020 Nokia.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
  * in compliance with the License. You may obtain a copy of the License at
@@ -28,7 +29,7 @@ package org.onap.observations;
 
 import com.att.eelf.configuration.EELFLogger;
 import com.att.eelf.configuration.EELFManager;
-import org.apache.log4j.Level;
+import org.onap.logger.Logger;
 import org.onap.optf.cmso.Application;
 
 
@@ -42,47 +43,21 @@ public class Observation {
     private static EELFLogger errors = EELFManager.getInstance().getErrorLogger();
     private static EELFLogger debug = EELFManager.getInstance().getDebugLogger();
 
+    private static Logger logger = new Logger(log, metrics, audit, errors, debug);
+
     /**
      * Report.
      *
      * @param obs the o
-     * @param execpt the e
+     * @param except the e
      * @param arguments the arguments
      */
     // *************************************************************************************************
-    public static void report(ObservationInterface obs, Exception execpt, String... arguments) {
-        Mdc.setCaller(4);
-        Mdc.setObservation(obs);
-        if (obs.getAudit()) {
-            audit.info(obs, execpt, arguments);
-        }
-        if (obs.getMetric()) {
-            metrics.info(obs, execpt, arguments);
-        }
-        Level lev = obs.getLevel();
-        switch (lev.toInt()) {
-            case Level.WARN_INT:
-                errors.warn(obs, arguments);
-                debug.debug(obs, execpt, arguments);
-                break;
-            case Level.INFO_INT:
-                log.info(obs, execpt, arguments);
-                debug.debug(obs, execpt, arguments);
-                break;
-            case Level.ERROR_INT:
-                errors.error(obs, arguments);
-                debug.debug(obs, execpt, arguments);
-                break;
-            case Level.TRACE_INT:
-                debug.trace(obs, execpt, arguments);
-                break;
-            case Level.DEBUG_INT:
-                debug.debug(obs, execpt, arguments);
-                break;
-            default:
-                log.info(obs, execpt, arguments);
-        }
-        Mdc.clearCaller();
+    public static void report(ObservationInterface obs, Exception except, String... arguments) {
+       Mdc.setCaller(4);
+       Mdc.setObservation(obs);
+       logger.report(obs, except, arguments);
+       Mdc.clearCaller();
     }
 
     /**
@@ -94,35 +69,7 @@ public class Observation {
     public static void report(ObservationInterface obs, String... arguments) {
         Mdc.setCaller(4);
         Mdc.setObservation(obs);
-        if (obs.getAudit()) {
-            audit.info(obs, arguments);
-        }
-        if (obs.getMetric()) {
-            metrics.info(obs, arguments);
-        }
-        Level levl = obs.getLevel();
-        switch (levl.toInt()) {
-            case Level.WARN_INT:
-                errors.warn(obs, arguments);
-                debug.debug(obs, arguments);
-                break;
-            case Level.INFO_INT:
-                log.info(obs, arguments);
-                debug.debug(obs, arguments);
-                break;
-            case Level.ERROR_INT:
-                errors.error(obs, arguments);
-                debug.debug(obs, arguments);
-                break;
-            case Level.TRACE_INT:
-                debug.debug(obs, arguments);
-                break;
-            case Level.DEBUG_INT:
-                debug.debug(obs, arguments);
-                break;
-            default:
-                log.info(obs, arguments);
-        }
+        logger.report(obs, arguments);
         Mdc.clearCaller();
     }
 
diff --git a/cmso-service/src/main/java/org/onap/observations/ObservationInterface.java b/cmso-service/src/main/java/org/onap/observations/ObservationInterface.java
deleted file mode 100644
index 0dce93d..0000000
--- a/cmso-service/src/main/java/org/onap/observations/ObservationInterface.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Copyright © 2019 AT&T Intellectual Property.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
- * in compliance with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License
- * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
- * or implied. See the License for the specific language governing permissions and limitations under
- * the License.
- *
- *
- * Unless otherwise specified, all documentation contained herein is licensed under the Creative
- * Commons License, Attribution 4.0 Intl. (the "License"); you may not use this documentation except
- * in compliance with the License. You may obtain a copy of the License at
- *
- * https://creativecommons.org/licenses/by/4.0/
- *
- * Unless required by applicable law or agreed to in writing, documentation distributed under the
- * License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied. See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.onap.observations;
-
-import com.att.eelf.i18n.EELFResolvableErrorEnum;
-import javax.ws.rs.core.Response.Status;
-import org.apache.log4j.Level;
-
-public interface ObservationInterface extends EELFResolvableErrorEnum {
-    public Enum<?> getValue();
-
-    public Level getLevel();
-
-    public String getMessage();
-
-    public Status getStatus();
-
-    public String getDomain();
-
-    public String name();
-
-    public Boolean getAudit();
-
-    public Boolean getMetric();
-}
diff --git a/cmso-service/src/main/java/org/onap/observations/ObservationObject.java b/cmso-service/src/main/java/org/onap/observations/ObservationObject.java
index f1c1277..9ed1d84 100644
--- a/cmso-service/src/main/java/org/onap/observations/ObservationObject.java
+++ b/cmso-service/src/main/java/org/onap/observations/ObservationObject.java
@@ -28,8 +28,9 @@ package org.onap.observations;
 
 import com.att.eelf.i18n.EELFResolvableErrorEnum;
 import com.att.eelf.i18n.EELFResourceManager;
+import org.apache.logging.log4j.Level;
+
 import javax.ws.rs.core.Response.Status;
-import org.apache.log4j.Level;
 
 
 /**
diff --git a/cmso-service/src/main/java/org/onap/optf/cmso/common/DomainsEnum.java b/cmso-service/src/main/java/org/onap/optf/cmso/common/DomainsEnum.java
index cd6af4c..63e2b4a 100644
--- a/cmso-service/src/main/java/org/onap/optf/cmso/common/DomainsEnum.java
+++ b/cmso-service/src/main/java/org/onap/optf/cmso/common/DomainsEnum.java
@@ -1,6 +1,6 @@
 /*

- * Copyright © 2017-2018 AT&T Intellectual Property.

- * Modifications Copyright © 2018 IBM.

+ * Copyright © 2017-2018 AT&T Intellectual Property.

+ * Modifications Copyright © 2018 IBM.

  * 

  * Licensed under the Apache License, Version 2.0 (the "License");

  * you may not use this file except in compliance with the License.

diff --git a/cmso-service/src/main/java/org/onap/optf/cmso/common/LogMessages.java b/cmso-service/src/main/java/org/onap/optf/cmso/common/LogMessages.java
index 3fd6cc8..6b6b544 100644
--- a/cmso-service/src/main/java/org/onap/optf/cmso/common/LogMessages.java
+++ b/cmso-service/src/main/java/org/onap/optf/cmso/common/LogMessages.java
@@ -32,7 +32,7 @@ import java.io.IOException;
 import java.nio.file.Files;

 import java.nio.file.Paths;

 import javax.ws.rs.core.Response.Status;

-import org.apache.log4j.Level;

+import org.apache.logging.log4j.Level;

 import org.onap.observations.ObservationInterface;

 

 /**

diff --git a/cmso-service/src/main/java/org/onap/optf/cmso/optimizer/DispatchedOptimizerList.java b/cmso-service/src/main/java/org/onap/optf/cmso/optimizer/DispatchedOptimizerList.java
index 871e831..c834614 100644
--- a/cmso-service/src/main/java/org/onap/optf/cmso/optimizer/DispatchedOptimizerList.java
+++ b/cmso-service/src/main/java/org/onap/optf/cmso/optimizer/DispatchedOptimizerList.java
@@ -1,6 +1,6 @@
 /*

- * Copyright © 2017-2018 AT&T Intellectual Property.

- * Modifications Copyright © 2018 IBM.

+ * Copyright © 2017-2018 AT&T Intellectual Property.

+ * Modifications Copyright © 2018 IBM.

  * 

  * Licensed under the Apache License, Version 2.0 (the "License");

  * you may not use this file except in compliance with the License.

diff --git a/cmso-service/src/main/java/org/onap/optf/cmso/ticketmgt/bean/TmApprovalStatusEnum.java b/cmso-service/src/main/java/org/onap/optf/cmso/ticketmgt/bean/TmApprovalStatusEnum.java
index 9b004f9..7ae9df9 100644
--- a/cmso-service/src/main/java/org/onap/optf/cmso/ticketmgt/bean/TmApprovalStatusEnum.java
+++ b/cmso-service/src/main/java/org/onap/optf/cmso/ticketmgt/bean/TmApprovalStatusEnum.java
@@ -1,6 +1,6 @@
 /*

- * Copyright © 2017-2018 AT&T Intellectual Property.

- * Modifications Copyright © 2018 IBM.

+ * Copyright © 2017-2018 AT&T Intellectual Property.

+ * Modifications Copyright © 2018 IBM.

  * 

  * Licensed under the Apache License, Version 2.0 (the "License");

  * you may not use this file except in compliance with the License.

diff --git a/cmso-service/src/main/java/org/onap/optf/cmso/ticketmgt/bean/TmAsset.java b/cmso-service/src/main/java/org/onap/optf/cmso/ticketmgt/bean/TmAsset.java
index ac2d9b8..0802ec1 100644
--- a/cmso-service/src/main/java/org/onap/optf/cmso/ticketmgt/bean/TmAsset.java
+++ b/cmso-service/src/main/java/org/onap/optf/cmso/ticketmgt/bean/TmAsset.java
@@ -1,6 +1,6 @@
 /*

- * Copyright © 2017-2018 AT&T Intellectual Property.

- * Modifications Copyright © 2018 IBM.

+ * Copyright © 2017-2018 AT&T Intellectual Property.

+ * Modifications Copyright © 2018 IBM.

  * 

  * Licensed under the Apache License, Version 2.0 (the "License");

  * you may not use this file except in compliance with the License.

diff --git a/cmso-service/src/main/java/org/onap/optf/cmso/ticketmgt/bean/TmChangeInfo.java b/cmso-service/src/main/java/org/onap/optf/cmso/ticketmgt/bean/TmChangeInfo.java
index 03b031a..d6231e0 100644
--- a/cmso-service/src/main/java/org/onap/optf/cmso/ticketmgt/bean/TmChangeInfo.java
+++ b/cmso-service/src/main/java/org/onap/optf/cmso/ticketmgt/bean/TmChangeInfo.java
@@ -1,6 +1,6 @@
 /*

- * Copyright © 2017-2018 AT&T Intellectual Property.

- * Modifications Copyright © 2018 IBM.

+ * Copyright © 2017-2018 AT&T Intellectual Property.

+ * Modifications Copyright © 2018 IBM.

  * 

  * Licensed under the Apache License, Version 2.0 (the "License");

  * you may not use this file except in compliance with the License.

diff --git a/cmso-service/src/main/java/org/onap/optf/cmso/ticketmgt/bean/TmStatusEnum.java b/cmso-service/src/main/java/org/onap/optf/cmso/ticketmgt/bean/TmStatusEnum.java
index dd480b0..0bbcc92 100644
--- a/cmso-service/src/main/java/org/onap/optf/cmso/ticketmgt/bean/TmStatusEnum.java
+++ b/cmso-service/src/main/java/org/onap/optf/cmso/ticketmgt/bean/TmStatusEnum.java
@@ -1,6 +1,6 @@
 /*

- * Copyright © 2017-2018 AT&T Intellectual Property.

- * Modifications Copyright © 2018 IBM.

+ * Copyright © 2017-2018 AT&T Intellectual Property.

+ * Modifications Copyright © 2018 IBM.

  * 

  * Licensed under the Apache License, Version 2.0 (the "License");

  * you may not use this file except in compliance with the License.

diff --git a/cmso-service/src/main/java/org/onap/optf/cmso/wf/bean/WfChangeManagementResponse.java b/cmso-service/src/main/java/org/onap/optf/cmso/wf/bean/WfChangeManagementResponse.java
index cdf47f5..e2266b5 100644
--- a/cmso-service/src/main/java/org/onap/optf/cmso/wf/bean/WfChangeManagementResponse.java
+++ b/cmso-service/src/main/java/org/onap/optf/cmso/wf/bean/WfChangeManagementResponse.java
@@ -1,6 +1,6 @@
 /*

- * Copyright © 2017-2018 AT&T Intellectual Property.

- * Modifications Copyright © 2018 IBM.

+ * Copyright © 2017-2018 AT&T Intellectual Property.

+ * Modifications Copyright © 2018 IBM.

  * 

  * Licensed under the Apache License, Version 2.0 (the "License");

  * you may not use this file except in compliance with the License.

diff --git a/cmso-service/src/main/java/org/onap/optf/cmso/wf/bean/WfCmResponse200.java b/cmso-service/src/main/java/org/onap/optf/cmso/wf/bean/WfCmResponse200.java
index 65f2bcc..72b082f 100644
--- a/cmso-service/src/main/java/org/onap/optf/cmso/wf/bean/WfCmResponse200.java
+++ b/cmso-service/src/main/java/org/onap/optf/cmso/wf/bean/WfCmResponse200.java
@@ -1,6 +1,6 @@
 /*

- * Copyright © 2017-2018 AT&T Intellectual Property.

- * Modifications Copyright © 2018 IBM.

+ * Copyright © 2017-2018 AT&T Intellectual Property.

+ * Modifications Copyright © 2018 IBM.

  * 

  * Licensed under the Apache License, Version 2.0 (the "License");

  * you may not use this file except in compliance with the License.

diff --git a/cmso-service/src/main/java/org/onap/optf/cmso/wf/bean/WfMsoRequestReferences.java b/cmso-service/src/main/java/org/onap/optf/cmso/wf/bean/WfMsoRequestReferences.java
index 56743c3..334cc93 100644
--- a/cmso-service/src/main/java/org/onap/optf/cmso/wf/bean/WfMsoRequestReferences.java
+++ b/cmso-service/src/main/java/org/onap/optf/cmso/wf/bean/WfMsoRequestReferences.java
@@ -1,6 +1,6 @@
 /*

- * Copyright © 2017-2018 AT&T Intellectual Property.

- * Modifications Copyright © 2018 IBM.

+ * Copyright © 2017-2018 AT&T Intellectual Property.

+ * Modifications Copyright © 2018 IBM.

  * 

  * Licensed under the Apache License, Version 2.0 (the "License");

  * you may not use this file except in compliance with the License.

diff --git a/cmso-service/src/main/java/org/onap/optf/cmso/wf/bean/WfMsoResponse.java b/cmso-service/src/main/java/org/onap/optf/cmso/wf/bean/WfMsoResponse.java
index 1876c93..c565390 100644
--- a/cmso-service/src/main/java/org/onap/optf/cmso/wf/bean/WfMsoResponse.java
+++ b/cmso-service/src/main/java/org/onap/optf/cmso/wf/bean/WfMsoResponse.java
@@ -1,6 +1,6 @@
 /*

- * Copyright © 2017-2018 AT&T Intellectual Property.

- * Modifications Copyright © 2018 IBM.

+ * Copyright © 2017-2018 AT&T Intellectual Property.

+ * Modifications Copyright © 2018 IBM.

  * 

  * Licensed under the Apache License, Version 2.0 (the "License");

  * you may not use this file except in compliance with the License.

diff --git a/cmso-service/src/main/java/org/onap/optf/cmso/wf/bean/WfVidCmResponse.java b/cmso-service/src/main/java/org/onap/optf/cmso/wf/bean/WfVidCmResponse.java
index 395d99d..542c898 100644
--- a/cmso-service/src/main/java/org/onap/optf/cmso/wf/bean/WfVidCmResponse.java
+++ b/cmso-service/src/main/java/org/onap/optf/cmso/wf/bean/WfVidCmResponse.java
@@ -1,6 +1,6 @@
 /*

- * Copyright © 2017-2018 AT&T Intellectual Property.

- * Modifications Copyright © 2018 IBM.

+ * Copyright © 2017-2018 AT&T Intellectual Property.

+ * Modifications Copyright © 2018 IBM.

  * 

  * Licensed under the Apache License, Version 2.0 (the "License");

  * you may not use this file except in compliance with the License.