Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 5C86F200CD1 for ; Wed, 12 Jul 2017 06:53:32 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 5B0CB167400; Wed, 12 Jul 2017 04:53:32 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 7919F1673EE for ; Wed, 12 Jul 2017 06:53:31 +0200 (CEST) Received: (qmail 78040 invoked by uid 500); 12 Jul 2017 04:53:23 -0000 Mailing-List: contact common-commits-help@hadoop.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Delivered-To: mailing list common-commits@hadoop.apache.org Received: (qmail 72875 invoked by uid 99); 12 Jul 2017 04:53:20 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 12 Jul 2017 04:53:20 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 54C2BF5553; Wed, 12 Jul 2017 04:53:17 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: asuresh@apache.org To: common-commits@hadoop.apache.org Date: Wed, 12 Jul 2017 04:53:35 -0000 Message-Id: <0fbce10cb81b4d70bb7be700a50874d9@git.apache.org> In-Reply-To: <425b1160045940ba8eef458f92705735@git.apache.org> References: <425b1160045940ba8eef458f92705735@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [19/50] [abbrv] hadoop git commit: HADOOP-14571. Deprecate public APIs relate to log4j1 archived-at: Wed, 12 Jul 2017 04:53:32 -0000 HADOOP-14571. Deprecate public APIs relate to log4j1 This closes #244 Signed-off-by: Akira Ajisaka Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/f2aba1da Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/f2aba1da Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/f2aba1da Branch: refs/heads/YARN-5972 Commit: f2aba1da30aae482a2d65696493b609948f9b904 Parents: 1aaa7f1 Author: Wenxin He Authored: Tue Jun 27 11:51:34 2017 +0800 Committer: Akira Ajisaka Committed: Tue Jul 4 18:55:20 2017 +0900 ---------------------------------------------------------------------- .../main/java/org/apache/hadoop/io/IOUtils.java | 3 ++ .../java/org/apache/hadoop/util/LogAdapter.java | 4 +++ .../apache/hadoop/test/GenericTestUtils.java | 33 ++++++++++++++++++++ 3 files changed, 40 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/f2aba1da/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/IOUtils.java ---------------------------------------------------------------------- diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/IOUtils.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/IOUtils.java index e24f196..a3bccef 100644 --- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/IOUtils.java +++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/IOUtils.java @@ -246,7 +246,10 @@ public class IOUtils { * * @param log the log to record problems to at debug level. Can be null. * @param closeables the objects to close + * @deprecated use {@link #cleanupWithLogger(Logger, java.io.Closeable...)} + * instead */ + @Deprecated public static void cleanup(Log log, java.io.Closeable... closeables) { for (java.io.Closeable c : closeables) { if (c != null) { http://git-wip-us.apache.org/repos/asf/hadoop/blob/f2aba1da/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/LogAdapter.java ---------------------------------------------------------------------- diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/LogAdapter.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/LogAdapter.java index 6ef9093..b2bcbf5 100644 --- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/LogAdapter.java +++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/LogAdapter.java @@ -32,6 +32,10 @@ class LogAdapter { this.LOGGER = LOGGER; } + /** + * @deprecated use {@link #create(Logger)} instead + */ + @Deprecated public static LogAdapter create(Log LOG) { return new LogAdapter(LOG); } http://git-wip-us.apache.org/repos/asf/hadoop/blob/f2aba1da/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/test/GenericTestUtils.java ---------------------------------------------------------------------- diff --git a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/test/GenericTestUtils.java b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/test/GenericTestUtils.java index 00dc7f2..77a79ff 100644 --- a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/test/GenericTestUtils.java +++ b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/test/GenericTestUtils.java @@ -94,20 +94,33 @@ public abstract class GenericTestUtils { public static final String ERROR_INVALID_ARGUMENT = "Total wait time should be greater than check interval time"; + /** + * @deprecated use {@link #disableLog(org.slf4j.Logger)} instead + */ + @Deprecated @SuppressWarnings("unchecked") public static void disableLog(Log log) { // We expect that commons-logging is a wrapper around Log4j. disableLog((Log4JLogger) log); } + @Deprecated public static Logger toLog4j(org.slf4j.Logger logger) { return LogManager.getLogger(logger.getName()); } + /** + * @deprecated use {@link #disableLog(org.slf4j.Logger)} instead + */ + @Deprecated public static void disableLog(Log4JLogger log) { log.getLogger().setLevel(Level.OFF); } + /** + * @deprecated use {@link #disableLog(org.slf4j.Logger)} instead + */ + @Deprecated public static void disableLog(Logger logger) { logger.setLevel(Level.OFF); } @@ -116,20 +129,40 @@ public abstract class GenericTestUtils { disableLog(toLog4j(logger)); } + /** + * @deprecated + * use {@link #setLogLevel(org.slf4j.Logger, org.slf4j.event.Level)} instead + */ + @Deprecated @SuppressWarnings("unchecked") public static void setLogLevel(Log log, Level level) { // We expect that commons-logging is a wrapper around Log4j. setLogLevel((Log4JLogger) log, level); } + /** + * @deprecated + * use {@link #setLogLevel(org.slf4j.Logger, org.slf4j.event.Level)} instead + */ + @Deprecated public static void setLogLevel(Log4JLogger log, Level level) { log.getLogger().setLevel(level); } + /** + * @deprecated + * use {@link #setLogLevel(org.slf4j.Logger, org.slf4j.event.Level)} instead + */ + @Deprecated public static void setLogLevel(Logger logger, Level level) { logger.setLevel(level); } + /** + * @deprecated + * use {@link #setLogLevel(org.slf4j.Logger, org.slf4j.event.Level)} instead + */ + @Deprecated public static void setLogLevel(org.slf4j.Logger logger, Level level) { setLogLevel(toLog4j(logger), level); } --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org For additional commands, e-mail: common-commits-help@hadoop.apache.org