Updated Branches: refs/heads/master 67d3f8ead -> 2db92cdbc
Fixed bunch of CS errors Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/2db92cdb Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/2db92cdb Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/2db92cdb Branch: refs/heads/master Commit: 2db92cdbcc20b4c8f3567a9b48b4fc7bfa13ced9 Parents: 67d3f8e Author: Willem Jiang <willem.ji...@gmail.com> Authored: Fri Dec 27 11:16:16 2013 +0800 Committer: Willem Jiang <willem.ji...@gmail.com> Committed: Fri Dec 27 11:16:16 2013 +0800 ---------------------------------------------------------------------- .../org/apache/camel/component/rabbitmq/RabbitMQConsumer.java | 4 ++-- .../apache/camel/component/restlet/RestletPostFormTest.java | 7 +++---- .../camel/dataformat/xmlsecurity/XMLSecurityDataFormat.java | 6 ++++-- 3 files changed, 9 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/2db92cdb/components/camel-rabbitmq/src/main/java/org/apache/camel/component/rabbitmq/RabbitMQConsumer.java ---------------------------------------------------------------------- diff --git a/components/camel-rabbitmq/src/main/java/org/apache/camel/component/rabbitmq/RabbitMQConsumer.java b/components/camel-rabbitmq/src/main/java/org/apache/camel/component/rabbitmq/RabbitMQConsumer.java index f46e670..501f2a1 100644 --- a/components/camel-rabbitmq/src/main/java/org/apache/camel/component/rabbitmq/RabbitMQConsumer.java +++ b/components/camel-rabbitmq/src/main/java/org/apache/camel/component/rabbitmq/RabbitMQConsumer.java @@ -29,12 +29,12 @@ import org.apache.camel.Processor; import org.apache.camel.impl.DefaultConsumer; public class RabbitMQConsumer extends DefaultConsumer { - - private int closeTimeout = 30 * 1000; ExecutorService executor; Connection conn; Channel channel; + private int closeTimeout = 30 * 1000; + private final RabbitMQEndpoint endpoint; public RabbitMQConsumer(RabbitMQEndpoint endpoint, Processor processor) { http://git-wip-us.apache.org/repos/asf/camel/blob/2db92cdb/components/camel-restlet/src/test/java/org/apache/camel/component/restlet/RestletPostFormTest.java ---------------------------------------------------------------------- diff --git a/components/camel-restlet/src/test/java/org/apache/camel/component/restlet/RestletPostFormTest.java b/components/camel-restlet/src/test/java/org/apache/camel/component/restlet/RestletPostFormTest.java index 41f05e6..97dcacc 100644 --- a/components/camel-restlet/src/test/java/org/apache/camel/component/restlet/RestletPostFormTest.java +++ b/components/camel-restlet/src/test/java/org/apache/camel/component/restlet/RestletPostFormTest.java @@ -16,6 +16,9 @@ */ package org.apache.camel.component.restlet; +import java.util.ArrayList; +import java.util.List; + import org.apache.camel.Exchange; import org.apache.camel.Processor; import org.apache.camel.builder.RouteBuilder; @@ -25,13 +28,9 @@ import org.apache.http.client.entity.UrlEncodedFormEntity; import org.apache.http.client.methods.HttpEntityEnclosingRequestBase; import org.apache.http.client.methods.HttpPost; import org.apache.http.client.methods.HttpUriRequest; -import org.apache.http.entity.StringEntity; import org.apache.http.message.BasicNameValuePair; import org.junit.Test; -import java.util.ArrayList; -import java.util.List; - /** * * @version http://git-wip-us.apache.org/repos/asf/camel/blob/2db92cdb/components/camel-xmlsecurity/src/main/java/org/apache/camel/dataformat/xmlsecurity/XMLSecurityDataFormat.java ---------------------------------------------------------------------- diff --git a/components/camel-xmlsecurity/src/main/java/org/apache/camel/dataformat/xmlsecurity/XMLSecurityDataFormat.java b/components/camel-xmlsecurity/src/main/java/org/apache/camel/dataformat/xmlsecurity/XMLSecurityDataFormat.java index c73ff41..14751f1 100755 --- a/components/camel-xmlsecurity/src/main/java/org/apache/camel/dataformat/xmlsecurity/XMLSecurityDataFormat.java +++ b/components/camel-xmlsecurity/src/main/java/org/apache/camel/dataformat/xmlsecurity/XMLSecurityDataFormat.java @@ -40,12 +40,11 @@ import javax.crypto.spec.DESedeKeySpec; import javax.crypto.spec.SecretKeySpec; import javax.xml.transform.dom.DOMSource; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import org.w3c.dom.Document; import org.w3c.dom.Element; import org.w3c.dom.Node; import org.w3c.dom.NodeList; + import org.apache.camel.CamelContext; import org.apache.camel.CamelContextAware; import org.apache.camel.Exchange; @@ -62,6 +61,9 @@ import org.apache.xml.security.keys.KeyInfo; import org.apache.xml.security.utils.Constants; import org.apache.xml.security.utils.EncryptionConstants; import org.apache.xml.security.utils.XMLUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + public class XMLSecurityDataFormat implements DataFormat, CamelContextAware {
