Return-Path: X-Original-To: apmail-logging-commits-archive@minotaur.apache.org Delivered-To: apmail-logging-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 109ED10ADE for ; Tue, 9 Jul 2013 13:24:40 +0000 (UTC) Received: (qmail 9195 invoked by uid 500); 9 Jul 2013 13:24:39 -0000 Delivered-To: apmail-logging-commits-archive@logging.apache.org Received: (qmail 9145 invoked by uid 500); 9 Jul 2013 13:24:38 -0000 Mailing-List: contact commits-help@logging.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@logging.apache.org Delivered-To: mailing list commits@logging.apache.org Received: (qmail 9129 invoked by uid 99); 9 Jul 2013 13:24:37 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 09 Jul 2013 13:24:37 +0000 X-ASF-Spam-Status: No, hits=-1999.6 required=5.0 tests=ALL_TRUSTED,FILL_THIS_FORM_FRAUD_PHISH,T_FILL_THIS_FORM_SHORT X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 09 Jul 2013 13:24:35 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id BDDC92388860; Tue, 9 Jul 2013 13:24:15 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1501255 - in /logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core: appender/db/jdbc/ config/plugins/ helpers/ impl/ layout/ pattern/ Date: Tue, 09 Jul 2013 13:24:15 -0000 To: commits@logging.apache.org From: ggregory@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20130709132415.BDDC92388860@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: ggregory Date: Tue Jul 9 13:24:14 2013 New Revision: 1501255 URL: http://svn.apache.org/r1501255 Log: Replace String.length() == 0 with String.isEmpty() in all but one spot. Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/db/jdbc/DriverManagerConnectionSource.java logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/config/plugins/LoggersPlugin.java logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/helpers/NameUtil.java logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/impl/Log4jLogEvent.java logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/impl/ThrowableFormatOptions.java logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/layout/HTMLLayout.java logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/layout/XMLLayout.java logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/pattern/NameAbbreviator.java Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/db/jdbc/DriverManagerConnectionSource.java URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/db/jdbc/DriverManagerConnectionSource.java?rev=1501255&r1=1501254&r2=1501255&view=diff ============================================================================== --- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/db/jdbc/DriverManagerConnectionSource.java (original) +++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/db/jdbc/DriverManagerConnectionSource.java Tue Jul 9 13:24:14 2013 @@ -95,7 +95,7 @@ public final class DriverManagerConnecti return null; } - if (username == null || username.trim().length() == 0) { + if (username == null || username.trim().isEmpty()) { username = null; password = null; } Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/config/plugins/LoggersPlugin.java URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/config/plugins/LoggersPlugin.java?rev=1501255&r1=1501254&r2=1501255&view=diff ============================================================================== --- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/config/plugins/LoggersPlugin.java (original) +++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/config/plugins/LoggersPlugin.java Tue Jul 9 13:24:14 2013 @@ -43,7 +43,7 @@ public final class LoggersPlugin { for (final LoggerConfig logger : loggers) { if (logger != null) { - if (logger.getName().length() == 0) { + if (logger.getName().isEmpty()) { root = logger; } loggerMap.put(logger.getName(), logger); Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/helpers/NameUtil.java URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/helpers/NameUtil.java?rev=1501255&r1=1501254&r2=1501255&view=diff ============================================================================== --- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/helpers/NameUtil.java (original) +++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/helpers/NameUtil.java Tue Jul 9 13:24:14 2013 @@ -29,7 +29,7 @@ public final class NameUtil { } public static String getSubName(final String name) { - if (name.length() == 0) { + if (name.isEmpty()) { return null; } final int i = name.lastIndexOf('.'); Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/impl/Log4jLogEvent.java URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/impl/Log4jLogEvent.java?rev=1501255&r1=1501254&r2=1501255&view=diff ============================================================================== --- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/impl/Log4jLogEvent.java (original) +++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/impl/Log4jLogEvent.java Tue Jul 9 13:24:14 2013 @@ -329,7 +329,7 @@ public class Log4jLogEvent implements Lo @Override public String toString() { final StringBuilder sb = new StringBuilder(); - final String n = name.length() == 0 ? "root" : name; + final String n = name.isEmpty() ? "root" : name; sb.append("Logger=").append(n); sb.append(" Level=").append(level.name()); sb.append(" Message=").append(message.getFormattedMessage()); Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/impl/ThrowableFormatOptions.java URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/impl/ThrowableFormatOptions.java?rev=1501255&r1=1501254&r2=1501255&view=diff ============================================================================== --- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/impl/ThrowableFormatOptions.java (original) +++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/impl/ThrowableFormatOptions.java Tue Jul 9 13:24:14 2013 @@ -194,7 +194,7 @@ public final class ThrowableFormatOption for (String rawOption : options) { if (rawOption != null) { final String option = rawOption.trim(); - if (option.length() == 0) { + if (option.isEmpty()) { // continue; } else if (option.startsWith("separator(") && option.endsWith(")")) { separator = option.substring("separator(".length(), option.length() - 1); Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/layout/HTMLLayout.java URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/layout/HTMLLayout.java?rev=1501255&r1=1501254&r2=1501255&view=diff ============================================================================== --- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/layout/HTMLLayout.java (original) +++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/layout/HTMLLayout.java Tue Jul 9 13:24:14 2013 @@ -145,7 +145,7 @@ public final class HTMLLayout extends Ab sbuf.append("").append(Constants.LINE_SEP); String escapedLogger = Transform.escapeTags(event.getLoggerName()); - if (escapedLogger.length() == 0) { + if (escapedLogger.isEmpty()) { escapedLogger = "root"; } sbuf.append(""); Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/layout/XMLLayout.java URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/layout/XMLLayout.java?rev=1501255&r1=1501254&r2=1501255&view=diff ============================================================================== --- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/layout/XMLLayout.java (original) +++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/layout/XMLLayout.java Tue Jul 9 13:24:14 2013 @@ -105,7 +105,7 @@ public class XMLLayout extends AbstractS buf.append("