Return-Path: X-Original-To: apmail-camel-commits-archive@www.apache.org Delivered-To: apmail-camel-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 48EF310E2E for ; Tue, 10 Dec 2013 07:40:27 +0000 (UTC) Received: (qmail 40940 invoked by uid 500); 10 Dec 2013 07:40:23 -0000 Delivered-To: apmail-camel-commits-archive@camel.apache.org Received: (qmail 40828 invoked by uid 500); 10 Dec 2013 07:40:22 -0000 Mailing-List: contact commits-help@camel.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@camel.apache.org Delivered-To: mailing list commits@camel.apache.org Received: (qmail 40813 invoked by uid 99); 10 Dec 2013 07:40:20 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 10 Dec 2013 07:40:20 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 6FD359036A5; Tue, 10 Dec 2013 07:40:20 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: ningjiang@apache.org To: commits@camel.apache.org Date: Tue, 10 Dec 2013 07:40:21 -0000 Message-Id: <0916bf30ae7c4786b1fa5393cb19cdbd@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [2/2] git commit: CAMEL-7051 Fixed some CS errors of the patch CAMEL-7051 Fixed some CS errors of the patch Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/a4c3f443 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/a4c3f443 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/a4c3f443 Branch: refs/heads/master Commit: a4c3f44381f261edafcdfcce40fb7fc4fba69834 Parents: 55522f1 Author: Willem Jiang Authored: Tue Dec 10 15:39:43 2013 +0800 Committer: Willem Jiang Committed: Tue Dec 10 15:39:43 2013 +0800 ---------------------------------------------------------------------- .../org/apache/camel/dataformat/bindy/FormatFactory.java | 3 +-- .../dataformat/bindy/csv/BindySimpleCsvMarshallDslTest.java | 8 +++++++- .../dataformat/bindy/csv/BindySimpleCsvMarshallTest.java | 8 +++++++- .../bindy/fix/BindySimpleKeyValuePairMarshallDslTest.java | 7 ++++++- .../dataformat/bindy/model/fix/complex/onetomany/Header.java | 4 ++-- .../camel/dataformat/bindy/model/fix/simple/Order.java | 4 ++-- 6 files changed, 25 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/a4c3f443/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/FormatFactory.java ---------------------------------------------------------------------- diff --git a/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/FormatFactory.java b/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/FormatFactory.java index cf7720f..2ffb326 100755 --- a/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/FormatFactory.java +++ b/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/FormatFactory.java @@ -67,8 +67,7 @@ public final class FormatFactory { @SuppressWarnings("unchecked") private static Format doGetFormat(Class clazz, String pattern, String locale, String timezone, int precision, boolean impliedDecimalSeparator) - throws Exception - { + throws Exception { if (clazz == byte.class || clazz == Byte.class) { return ObjectHelper.isNotEmpty(pattern) ? new BytePatternFormat(pattern, getLocale(locale)) http://git-wip-us.apache.org/repos/asf/camel/blob/a4c3f443/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvMarshallDslTest.java ---------------------------------------------------------------------- diff --git a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvMarshallDslTest.java b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvMarshallDslTest.java index 2453e21..902a4e6 100755 --- a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvMarshallDslTest.java +++ b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvMarshallDslTest.java @@ -17,7 +17,13 @@ package org.apache.camel.dataformat.bindy.csv; import java.math.BigDecimal; -import java.util.*; +import java.util.ArrayList; +import java.util.Calendar; +import java.util.GregorianCalendar; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.TimeZone; import org.apache.camel.EndpointInject; import org.apache.camel.Produce; http://git-wip-us.apache.org/repos/asf/camel/blob/a4c3f443/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvMarshallTest.java ---------------------------------------------------------------------- diff --git a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvMarshallTest.java b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvMarshallTest.java index ba32a7c..c40e084 100755 --- a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvMarshallTest.java +++ b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvMarshallTest.java @@ -17,7 +17,13 @@ package org.apache.camel.dataformat.bindy.csv; import java.math.BigDecimal; -import java.util.*; +import java.util.ArrayList; +import java.util.Calendar; +import java.util.GregorianCalendar; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.TimeZone; import org.apache.camel.EndpointInject; import org.apache.camel.LoggingLevel; http://git-wip-us.apache.org/repos/asf/camel/blob/a4c3f443/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fix/BindySimpleKeyValuePairMarshallDslTest.java ---------------------------------------------------------------------- diff --git a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fix/BindySimpleKeyValuePairMarshallDslTest.java b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fix/BindySimpleKeyValuePairMarshallDslTest.java index 846174c..f435efa 100644 --- a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fix/BindySimpleKeyValuePairMarshallDslTest.java +++ b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fix/BindySimpleKeyValuePairMarshallDslTest.java @@ -16,7 +16,12 @@ */ package org.apache.camel.dataformat.bindy.fix; -import java.util.*; +import java.util.ArrayList; +import java.util.Calendar; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.TimeZone; import org.apache.camel.EndpointInject; import org.apache.camel.Produce; http://git-wip-us.apache.org/repos/asf/camel/blob/a4c3f443/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/model/fix/complex/onetomany/Header.java ---------------------------------------------------------------------- diff --git a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/model/fix/complex/onetomany/Header.java b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/model/fix/complex/onetomany/Header.java index 031b832..6454575 100644 --- a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/model/fix/complex/onetomany/Header.java +++ b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/model/fix/complex/onetomany/Header.java @@ -16,11 +16,11 @@ */ package org.apache.camel.dataformat.bindy.model.fix.complex.onetomany; +import java.util.Date; + import org.apache.camel.dataformat.bindy.annotation.KeyValuePairField; import org.apache.camel.dataformat.bindy.annotation.Link; -import java.util.Date; - @Link public class Header { http://git-wip-us.apache.org/repos/asf/camel/blob/a4c3f443/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/model/fix/simple/Order.java ---------------------------------------------------------------------- diff --git a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/model/fix/simple/Order.java b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/model/fix/simple/Order.java index 11ae547..3c88fd4 100644 --- a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/model/fix/simple/Order.java +++ b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/model/fix/simple/Order.java @@ -16,12 +16,12 @@ */ package org.apache.camel.dataformat.bindy.model.fix.simple; +import java.util.Date; + import org.apache.camel.dataformat.bindy.annotation.KeyValuePairField; import org.apache.camel.dataformat.bindy.annotation.Link; import org.apache.camel.dataformat.bindy.annotation.Message; -import java.util.Date; - @Message(keyValuePairSeparator = "=", pairSeparator = "\\u0001", type = "FIX", version = "4.1") public class Order {