From d8f4b453be2dd8b188ad4bca11cede52a30e7806 Mon Sep 17 00:00:00 2001 From: Maciej Malewski Date: Fri, 17 Jul 2020 08:31:51 +0200 Subject: Upgrade log4j to 2.13.1 and add log4j api 2.13.1. Issue-ID: OPTFRA-752 Signed-off-by: Maciej Malewski Change-Id: Ib39de5e892f00c07c812a8dc8d3ac7d1fca009cf --- cmso-topology/pom.xml | 40 ++++--------- .../java/org/onap/observations/Observation.java | 69 +++------------------- .../onap/observations/ObservationInterface.java | 49 --------------- .../org/onap/observations/ObservationObject.java | 2 +- .../optf/cmso/topology/common/LogMessages.java | 2 +- 5 files changed, 21 insertions(+), 141 deletions(-) delete mode 100644 cmso-topology/src/main/java/org/onap/observations/ObservationInterface.java (limited to 'cmso-topology') diff --git a/cmso-topology/pom.xml b/cmso-topology/pom.xml index 756d75b..deb6ecf 100644 --- a/cmso-topology/pom.xml +++ b/cmso-topology/pom.xml @@ -147,30 +147,6 @@ org.springframework spring-context-support - - com.att.eelf - eelf-core - ${eelf.version} - - - org.mockito - mockito-core - - - org.powermock - powermock-module - - - org.powermock - powermock-api-mockito - - - org.powermock - powermock-module-junit4 - - - - org.yaml snakeyaml @@ -178,11 +154,6 @@ - - javax.ws.rs - javax.ws.rs-api - 2.1 - @@ -237,6 +208,17 @@ org.onap.aaf.authz aaf-cadi-aaf ${aaf.version} + + + log4j + log4j + + + + + org.onap.optf.cmso + cmso-logger + 2.2.0-SNAPSHOT diff --git a/cmso-topology/src/main/java/org/onap/observations/Observation.java b/cmso-topology/src/main/java/org/onap/observations/Observation.java index e1ec30c..fdb8b51 100644 --- a/cmso-topology/src/main/java/org/onap/observations/Observation.java +++ b/cmso-topology/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.topology.Application; @@ -42,46 +43,20 @@ 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) { + public static void report(ObservationInterface obs, Exception except, 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); - } + 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-topology/src/main/java/org/onap/observations/ObservationInterface.java b/cmso-topology/src/main/java/org/onap/observations/ObservationInterface.java deleted file mode 100644 index 0dce93d..0000000 --- a/cmso-topology/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-topology/src/main/java/org/onap/observations/ObservationObject.java b/cmso-topology/src/main/java/org/onap/observations/ObservationObject.java index f1c1277..fa93cb3 100644 --- a/cmso-topology/src/main/java/org/onap/observations/ObservationObject.java +++ b/cmso-topology/src/main/java/org/onap/observations/ObservationObject.java @@ -28,8 +28,8 @@ 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-topology/src/main/java/org/onap/optf/cmso/topology/common/LogMessages.java b/cmso-topology/src/main/java/org/onap/optf/cmso/topology/common/LogMessages.java index b5f1c0e..4386435 100644 --- a/cmso-topology/src/main/java/org/onap/optf/cmso/topology/common/LogMessages.java +++ b/cmso-topology/src/main/java/org/onap/optf/cmso/topology/common/LogMessages.java @@ -34,7 +34,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; public enum LogMessages implements ObservationInterface { -- cgit 1.2.3-korg