From e1b0bc6e1db18aa9fe0314ee77559c116742f3cd Mon Sep 17 00:00:00 2001 From: PJ Fanning Date: Thu, 17 Dec 2020 19:59:01 +0000 Subject: [PATCH] [github-207] add SLF4JLogger git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1884568 13f79535-47bb-0310-9956-ffa450edef68 --- build.gradle | 3 + build.xml | 23 ++- osgi/pom.xml | 5 +- src/java/org/apache/poi/util/SLF4JLogger.java | 157 ++++++++++++++++++ .../poi/poifs/crypt/dsig/SignatureInfo.java | 4 +- 5 files changed, 175 insertions(+), 17 deletions(-) create mode 100644 src/java/org/apache/poi/util/SLF4JLogger.java diff --git a/build.gradle b/build.gradle index 68fd7f800f..91742edd99 100644 --- a/build.gradle +++ b/build.gradle @@ -114,6 +114,7 @@ subprojects { japicmpversion = '4.1.2' junitVersion = '4.13.1' mockitoVersion = '3.6.0' + slf4jVersion = '1.7.30' xmlbeansVersion = '4.0.0' } @@ -220,12 +221,14 @@ project('main') { compile 'commons-logging:commons-logging:1.2' compile 'org.apache.commons:commons-collections4:4.4' compile "org.apache.commons:commons-math3:${commonsMathVersion}" + compile "org.slf4j:slf4j-api:${slf4jVersion}" compile 'javax.activation:activation:1.1.1' compile 'com.zaxxer:SparseBitSet:1.2' testCompile "junit:junit:${junitVersion}" testCompile "org.mockito:mockito-core:${mockitoVersion}" testCompile 'org.reflections:reflections:0.9.12' + testRuntime "org.slf4j:slf4j-simple:${slf4jVersion}" } jar { diff --git a/build.xml b/build.xml index c65c35664b..4a9f81773a 100644 --- a/build.xml +++ b/build.xml @@ -118,8 +118,6 @@ under the License. - - @@ -271,6 +269,7 @@ under the License. + @@ -281,6 +280,7 @@ under the License. + @@ -289,7 +289,6 @@ under the License. - @@ -310,7 +309,6 @@ under the License. - @@ -420,6 +418,7 @@ under the License. + @@ -431,7 +430,6 @@ under the License. - @@ -441,7 +439,6 @@ under the License. - @@ -476,7 +473,6 @@ under the License. - @@ -655,6 +651,8 @@ under the License. + + @@ -664,7 +662,6 @@ under the License. - @@ -693,6 +690,8 @@ under the License. + + @@ -711,7 +710,6 @@ under the License. - @@ -724,7 +722,6 @@ under the License. - @@ -745,7 +742,6 @@ under the License. - @@ -1608,7 +1604,7 @@ under the License. - + @@ -2514,7 +2510,6 @@ org/apache/poi/schemas/ooxml/system/ooxml/rectaf36doctype.xsb - @@ -2524,6 +2519,8 @@ org/apache/poi/schemas/ooxml/system/ooxml/rectaf36doctype.xsb + + diff --git a/osgi/pom.xml b/osgi/pom.xml index 0d19cd3341..ce11df9228 100644 --- a/osgi/pom.xml +++ b/osgi/pom.xml @@ -87,6 +87,7 @@ org.apache.xml.security.*;resolution:=optional, org.bouncycastle.*;resolution:=optional, org.apache.commons.logging.*;resolution:=optional, + org.slf4j.*;resolution:=optional, !com.github.luben.zstd.*, !org.tukaani.xz.*, !org.brotli.dec.*, @@ -174,7 +175,7 @@ junit junit test - 4.12 + 4.13.1 @@ -229,7 +230,7 @@ org.slf4j slf4j-simple - 1.7.25 + 1.7.30 test diff --git a/src/java/org/apache/poi/util/SLF4JLogger.java b/src/java/org/apache/poi/util/SLF4JLogger.java new file mode 100644 index 0000000000..236fc2cee6 --- /dev/null +++ b/src/java/org/apache/poi/util/SLF4JLogger.java @@ -0,0 +1,157 @@ +/* ==================================================================== + Licensed to the Apache Software Foundation (ASF) under one or more + contributor license agreements. See the NOTICE file distributed with + this work for additional information regarding copyright ownership. + The ASF licenses this file to You 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. +==================================================================== */ +package org.apache.poi.util; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +/** + * An implementation of the {@link POILogger} using the + * SLF4J framework. Which itself can be configured to + * send log to various different log frameworks and even allows to create + * a small wrapper for custom log frameworks. + */ +public class SLF4JLogger implements POILogger +{ + private Logger log; + + @Override + public void initialize(final String cat) { + this.log = LoggerFactory.getLogger(cat); + } + + /** + * Log a message + * + * @param level One of DEBUG, INFO, WARN, ERROR, FATAL + * @param obj1 The object to log. + */ + @Override + public void _log(final int level, final Object obj1) { + switch (level) { + case FATAL: + case ERROR: + if (log.isErrorEnabled()) { + log.error(obj1.toString()); + } + break; + case WARN: + if (log.isWarnEnabled()) { + log.warn(obj1.toString()); + } + break; + case INFO: + if (log.isInfoEnabled()) { + log.info(obj1.toString()); + } + break; + case DEBUG: + if (log.isDebugEnabled()) { + log.debug(obj1.toString()); + } + break; + default: + if (log.isTraceEnabled()) { + log.trace(obj1.toString()); + } + break; + } + } + + /** + * Log a message + * + * @param level One of DEBUG, INFO, WARN, ERROR, FATAL + * @param obj1 The object to log. This is converted to a string. + * @param exception An exception to be logged + */ + @Override + public void _log(final int level, final Object obj1, final Throwable exception) { + switch (level) { + case FATAL: + case ERROR: + if (log.isErrorEnabled()) { + if (obj1 != null) { + log.error(obj1.toString(), exception); + } else { + log.error(exception.toString(), exception); + } + } + break; + case WARN: + if (log.isWarnEnabled()) { + if (obj1 != null) { + log.warn(obj1.toString(), exception); + } else { + log.warn(exception.toString(), exception); + } + } + break; + case INFO: + if (log.isInfoEnabled()) { + if (obj1 != null) { + log.info(obj1.toString(), exception); + } else { + log.info(exception.toString(), exception); + } + } + break; + case DEBUG: + if (log.isDebugEnabled()) { + if (obj1 != null) { + log.debug(obj1.toString(), exception); + } else { + log.debug(exception.toString(), exception); + } + } + break; + default: + if (log.isTraceEnabled()) { + if (obj1 != null) { + log.trace(obj1.toString(), exception); + } else { + log.trace(exception.toString(), exception); + } + } + break; + } + } + + /** + * Check if a logger is enabled to log at the specified level + * + * @param level One of DEBUG, INFO, WARN, ERROR, FATAL + */ + @Override + public boolean check(final int level) + { + switch (level) { + case FATAL: + case ERROR: + return log.isErrorEnabled(); + case WARN: + return log.isWarnEnabled(); + case INFO: + return log.isInfoEnabled(); + case DEBUG: + return log.isDebugEnabled(); + default: + return false; + } + } +} + diff --git a/src/ooxml/java/org/apache/poi/poifs/crypt/dsig/SignatureInfo.java b/src/ooxml/java/org/apache/poi/poifs/crypt/dsig/SignatureInfo.java index de73c19c0a..de378ec362 100644 --- a/src/ooxml/java/org/apache/poi/poifs/crypt/dsig/SignatureInfo.java +++ b/src/ooxml/java/org/apache/poi/poifs/crypt/dsig/SignatureInfo.java @@ -152,8 +152,8 @@ import org.w3c.dom.events.MutationEvent; *

To use SignatureInfo and its sibling classes, you'll need to have the following libs * in the classpath:

*
    - *
  • BouncyCastle bcpkix and bcprov (tested against 1.65)
    • - *
  • Apache Santuario "xmlsec" (tested against 2.1.5)
    • + *
  • BouncyCastle bcpkix and bcprov (tested against 1.67)
    • + *
  • Apache Santuario "xmlsec" (tested against 2.2.0)
    • *
  • and slf4j-api (tested against 1.7.30)
    • *
*/