Return-Path: X-Original-To: apmail-apex-commits-archive@minotaur.apache.org Delivered-To: apmail-apex-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 8CCAC17D6A for ; Fri, 25 Sep 2015 18:42:20 +0000 (UTC) Received: (qmail 65904 invoked by uid 500); 25 Sep 2015 18:42:20 -0000 Delivered-To: apmail-apex-commits-archive@apex.apache.org Received: (qmail 65867 invoked by uid 500); 25 Sep 2015 18:42:20 -0000 Mailing-List: contact commits-help@apex.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@apex.incubator.apache.org Delivered-To: mailing list commits@apex.incubator.apache.org Received: (qmail 65858 invoked by uid 99); 25 Sep 2015 18:42:20 -0000 Received: from Unknown (HELO spamd4-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 25 Sep 2015 18:42:20 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd4-us-west.apache.org (ASF Mail Server at spamd4-us-west.apache.org) with ESMTP id F35A0C0C0C for ; Fri, 25 Sep 2015 18:42:19 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd4-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: 1.774 X-Spam-Level: * X-Spam-Status: No, score=1.774 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, KAM_LAZY_DOMAIN_SECURITY=1, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, RP_MATCHES_RCVD=-0.006] autolearn=disabled Received: from mx1-eu-west.apache.org ([10.40.0.8]) by localhost (spamd4-us-west.apache.org [10.40.0.11]) (amavisd-new, port 10024) with ESMTP id JdZBL_xAsP-Q for ; Fri, 25 Sep 2015 18:42:18 +0000 (UTC) Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1-eu-west.apache.org (ASF Mail Server at mx1-eu-west.apache.org) with SMTP id 267FB20925 for ; Fri, 25 Sep 2015 18:42:16 +0000 (UTC) Received: (qmail 65819 invoked by uid 99); 25 Sep 2015 18:42:16 -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; Fri, 25 Sep 2015 18:42:16 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 5020BDFE2E; Fri, 25 Sep 2015 18:42:16 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: ishark@apache.org To: commits@apex.incubator.apache.org Date: Fri, 25 Sep 2015 18:42:16 -0000 Message-Id: <7f905e561db64c71a2c713bd42ed4996@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [1/2] incubator-apex-core git commit: APEX-156 #resolve #comment using ImportOrder instead of CustomImportOrderModule Repository: incubator-apex-core Updated Branches: refs/heads/devel-3 70d42741d -> 90bda5e21 APEX-156 #resolve #comment using ImportOrder instead of CustomImportOrderModule Project: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/commit/77aa6a2e Tree: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/tree/77aa6a2e Diff: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/diff/77aa6a2e Branch: refs/heads/devel-3 Commit: 77aa6a2e339cf0ff16956b062040634e98ba38fe Parents: 3d30347 Author: Chandni Singh Authored: Thu Sep 24 21:53:08 2015 -0700 Committer: Chandni Singh Committed: Fri Sep 25 11:11:17 2015 -0700 ---------------------------------------------------------------------- apex_checks.xml | 15 +++++++++------ api/pom.xml | 2 +- bufferserver/pom.xml | 2 +- common/pom.xml | 2 +- engine/pom.xml | 2 +- .../java/org/apache/log4j/DTLoggerFactory.java | 18 ++++++++++-------- pom.xml | 7 +++++++ 7 files changed, 30 insertions(+), 18 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-apex-core/blob/77aa6a2e/apex_checks.xml ---------------------------------------------------------------------- diff --git a/apex_checks.xml b/apex_checks.xml index b4b3277..24ce9df 100644 --- a/apex_checks.xml +++ b/apex_checks.xml @@ -135,13 +135,16 @@ - - - - - + + + + + + + + + http://git-wip-us.apache.org/repos/asf/incubator-apex-core/blob/77aa6a2e/api/pom.xml ---------------------------------------------------------------------- diff --git a/api/pom.xml b/api/pom.xml index 52fc5a7..067c40a 100644 --- a/api/pom.xml +++ b/api/pom.xml @@ -89,7 +89,7 @@ org.apache.maven.plugins maven-checkstyle-plugin - 46 + 42 http://git-wip-us.apache.org/repos/asf/incubator-apex-core/blob/77aa6a2e/bufferserver/pom.xml ---------------------------------------------------------------------- diff --git a/bufferserver/pom.xml b/bufferserver/pom.xml index 6cc9725..2341550 100644 --- a/bufferserver/pom.xml +++ b/bufferserver/pom.xml @@ -59,7 +59,7 @@ org.apache.maven.plugins maven-checkstyle-plugin - 139 + 123 http://git-wip-us.apache.org/repos/asf/incubator-apex-core/blob/77aa6a2e/common/pom.xml ---------------------------------------------------------------------- diff --git a/common/pom.xml b/common/pom.xml index 7bd61c1..20a9d1b 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -74,7 +74,7 @@ org.apache.maven.plugins maven-checkstyle-plugin - 88 + 77 http://git-wip-us.apache.org/repos/asf/incubator-apex-core/blob/77aa6a2e/engine/pom.xml ---------------------------------------------------------------------- diff --git a/engine/pom.xml b/engine/pom.xml index 94dd3a6..32f2001 100644 --- a/engine/pom.xml +++ b/engine/pom.xml @@ -145,7 +145,7 @@ org.apache.maven.plugins maven-checkstyle-plugin - 2385 + 2248 http://git-wip-us.apache.org/repos/asf/incubator-apex-core/blob/77aa6a2e/engine/src/main/java/org/apache/log4j/DTLoggerFactory.java ---------------------------------------------------------------------- diff --git a/engine/src/main/java/org/apache/log4j/DTLoggerFactory.java b/engine/src/main/java/org/apache/log4j/DTLoggerFactory.java index 6464d09..04a4238 100644 --- a/engine/src/main/java/org/apache/log4j/DTLoggerFactory.java +++ b/engine/src/main/java/org/apache/log4j/DTLoggerFactory.java @@ -46,7 +46,7 @@ public class DTLoggerFactory implements LoggerFactory private static DTLoggerFactory SINGLETON; - public synchronized static DTLoggerFactory getInstance() + public static synchronized DTLoggerFactory getInstance() { if (SINGLETON == null) { SINGLETON = new DTLoggerFactory(); @@ -57,10 +57,13 @@ public class DTLoggerFactory implements LoggerFactory private final ConcurrentMap loggerMap; private final Map patternLevel; - public ImmutableMap getPatternLevels() { - return ImmutableMap.copyOf(Maps.transformValues(patternLevel, new Function(){ + public ImmutableMap getPatternLevels() + { + return ImmutableMap.copyOf(Maps.transformValues(patternLevel, new Function() + { @Override - public String apply(Level input) { + public String apply(Level input) + { return input == null ? "" : input.toString(); } })); @@ -92,8 +95,7 @@ public class DTLoggerFactory implements LoggerFactory changeLoggersLevel(targetChanges); } initialized = true; - } - else { + } else { LOG.warn("DT Logger Factory already initialized."); } } @@ -120,8 +122,7 @@ public class DTLoggerFactory implements LoggerFactory } if (wider.charAt(i) != finer.charAt(i)) { break; - } - else if (i == wider.length() - 1) { + } else if (i == wider.length() - 1) { remove = true; } } @@ -209,6 +210,7 @@ public class DTLoggerFactory implements LoggerFactory { initialized = false; } + private void initialize() { if (!initialized) { http://git-wip-us.apache.org/repos/asf/incubator-apex-core/blob/77aa6a2e/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 28cee71..6da75f7 100644 --- a/pom.xml +++ b/pom.xml @@ -293,6 +293,13 @@ org.apache.maven.plugins maven-checkstyle-plugin 2.16 + + + com.puppycrawl.tools + checkstyle + 6.9 + + checkstyle