You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by gz...@apache.org on 2015/10/17 21:40:33 UTC
[1/3] camel git commit: Fix Checkstyle issues
Repository: camel
Updated Branches:
refs/heads/master 7430c1289 -> df0b512a9
Fix Checkstyle issues
Signed-off-by: Gregor Zurowski <gr...@zurowski.org>
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/cd3f1d24
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/cd3f1d24
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/cd3f1d24
Branch: refs/heads/master
Commit: cd3f1d2404684baab769be8b1246bfdc95e0659c
Parents: 7430c12
Author: Gregor Zurowski <gr...@zurowski.org>
Authored: Sat Oct 17 21:24:16 2015 +0200
Committer: Gregor Zurowski <gr...@zurowski.org>
Committed: Sat Oct 17 21:24:16 2015 +0200
----------------------------------------------------------------------
.../java/org/apache/camel/component/sql/DefaultSqlEndpoint.java | 3 ++-
.../src/main/java/org/apache/camel/component/sql/SqlConsumer.java | 3 ++-
.../sql/SqlComponentConfigurationAndDocumentationTest.java | 3 ++-
3 files changed, 6 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/cd3f1d24/components/camel-sql/src/main/java/org/apache/camel/component/sql/DefaultSqlEndpoint.java
----------------------------------------------------------------------
diff --git a/components/camel-sql/src/main/java/org/apache/camel/component/sql/DefaultSqlEndpoint.java b/components/camel-sql/src/main/java/org/apache/camel/component/sql/DefaultSqlEndpoint.java
index c67ecc1..2de1d64 100644
--- a/components/camel-sql/src/main/java/org/apache/camel/component/sql/DefaultSqlEndpoint.java
+++ b/components/camel-sql/src/main/java/org/apache/camel/component/sql/DefaultSqlEndpoint.java
@@ -54,7 +54,8 @@ public abstract class DefaultSqlEndpoint extends DefaultPollingEndpoint {
description = "Allows to plugin to use a custom org.apache.camel.component.sql.SqlPrepareStatementStrategy to control preparation of the query and prepared statement.")
private SqlPrepareStatementStrategy prepareStatementStrategy;
@UriParam(label = "consumer",
- description = "After processing each row then this query can be executed, if the Exchange was processed successfully, for example to mark the row as processed. The query can have parameter.")
+ description = "After processing each row then this query can be executed, if the Exchange was processed successfully, for example to mark the row as processed. The query can have"
+ + " parameter.")
private String onConsume;
@UriParam(label = "consumer",
description = "After processing each row then this query can be executed, if the Exchange failed, for example to mark the row as failed. The query can have parameter.")
http://git-wip-us.apache.org/repos/asf/camel/blob/cd3f1d24/components/camel-sql/src/main/java/org/apache/camel/component/sql/SqlConsumer.java
----------------------------------------------------------------------
diff --git a/components/camel-sql/src/main/java/org/apache/camel/component/sql/SqlConsumer.java b/components/camel-sql/src/main/java/org/apache/camel/component/sql/SqlConsumer.java
index 0f52280..ce8135a 100644
--- a/components/camel-sql/src/main/java/org/apache/camel/component/sql/SqlConsumer.java
+++ b/components/camel-sql/src/main/java/org/apache/camel/component/sql/SqlConsumer.java
@@ -63,7 +63,8 @@ public class SqlConsumer extends ScheduledBatchPollingConsumer {
}
}
- public SqlConsumer(DefaultSqlEndpoint endpoint, Processor processor, JdbcTemplate jdbcTemplate, String query, SqlPrepareStatementStrategy sqlPrepareStatementStrategy, SqlProcessingStrategy sqlProcessingStrategy) {
+ public SqlConsumer(DefaultSqlEndpoint endpoint, Processor processor, JdbcTemplate jdbcTemplate, String query, SqlPrepareStatementStrategy sqlPrepareStatementStrategy,
+ SqlProcessingStrategy sqlProcessingStrategy) {
super(endpoint, processor);
this.jdbcTemplate = jdbcTemplate;
this.namedJdbcTemplate = null;
http://git-wip-us.apache.org/repos/asf/camel/blob/cd3f1d24/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlComponentConfigurationAndDocumentationTest.java
----------------------------------------------------------------------
diff --git a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlComponentConfigurationAndDocumentationTest.java b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlComponentConfigurationAndDocumentationTest.java
index f3d0674..68bbe9c 100644
--- a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlComponentConfigurationAndDocumentationTest.java
+++ b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlComponentConfigurationAndDocumentationTest.java
@@ -48,7 +48,8 @@ public class SqlComponentConfigurationAndDocumentationTest extends CamelTestSupp
assertTrue(json.contains("\"onConsumeBatchComplete\": { \"kind\": \"parameter\", \"label\": \"consumer\", \"type\": \"string\""));
assertTrue(json.contains("\"parametersCount\": { \"kind\": \"parameter\", \"label\": \"producer,advanced\", \"type\": \"integer\""));
- assertTrue(json.contains("\"onConsume\": { \"kind\": \"parameter\", \"label\": \"consumer\", \"type\": \"string\", \"javaType\": \"java.lang.String\", \"deprecated\": \"false\", \"value\": \"foo\""));
+ assertTrue(json.contains("\"onConsume\": { \"kind\": \"parameter\", \"label\": \"consumer\", \"type\": \"string\", \"javaType\": \"java.lang.String\", \"deprecated\": \"false\", "
+ + "\"value\": \"foo\""));
}
}
[2/3] camel git commit: Fix Checkstyle issues
Posted by gz...@apache.org.
Fix Checkstyle issues
Signed-off-by: Gregor Zurowski <gr...@zurowski.org>
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/711b62af
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/711b62af
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/711b62af
Branch: refs/heads/master
Commit: 711b62af6f8217694265324ef4dc8948aa7f6005
Parents: cd3f1d2
Author: Gregor Zurowski <gr...@zurowski.org>
Authored: Sat Oct 17 21:34:21 2015 +0200
Committer: Gregor Zurowski <gr...@zurowski.org>
Committed: Sat Oct 17 21:34:21 2015 +0200
----------------------------------------------------------------------
.../org/apache/camel/dataformat/xmlrpc/XmlRpcDataFormat.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/711b62af/components/camel-xmlrpc/src/main/java/org/apache/camel/dataformat/xmlrpc/XmlRpcDataFormat.java
----------------------------------------------------------------------
diff --git a/components/camel-xmlrpc/src/main/java/org/apache/camel/dataformat/xmlrpc/XmlRpcDataFormat.java b/components/camel-xmlrpc/src/main/java/org/apache/camel/dataformat/xmlrpc/XmlRpcDataFormat.java
index cd90a0d..d04d651 100644
--- a/components/camel-xmlrpc/src/main/java/org/apache/camel/dataformat/xmlrpc/XmlRpcDataFormat.java
+++ b/components/camel-xmlrpc/src/main/java/org/apache/camel/dataformat/xmlrpc/XmlRpcDataFormat.java
@@ -23,8 +23,6 @@ import java.io.OutputStream;
import java.io.OutputStreamWriter;
import java.io.UnsupportedEncodingException;
-import org.apache.camel.spi.DataFormatName;
-import org.apache.camel.support.ServiceSupport;
import org.xml.sax.InputSource;
import org.xml.sax.SAXException;
import org.xml.sax.XMLReader;
@@ -33,6 +31,8 @@ import org.apache.camel.Exchange;
import org.apache.camel.component.xmlrpc.XmlRpcConstants;
import org.apache.camel.component.xmlrpc.XmlRpcRequestImpl;
import org.apache.camel.spi.DataFormat;
+import org.apache.camel.spi.DataFormatName;
+import org.apache.camel.support.ServiceSupport;
import org.apache.camel.util.IOHelper;
import org.apache.ws.commons.serialize.CharSetXMLWriter;
import org.apache.ws.commons.serialize.XMLWriter;
[3/3] camel git commit: Fix Checkstyle issues
Posted by gz...@apache.org.
Fix Checkstyle issues
Signed-off-by: Gregor Zurowski <gr...@zurowski.org>
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/df0b512a
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/df0b512a
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/df0b512a
Branch: refs/heads/master
Commit: df0b512a9bf1fd81c248098a29acb0840e624d82
Parents: 711b62a
Author: Gregor Zurowski <gr...@zurowski.org>
Authored: Sat Oct 17 21:39:08 2015 +0200
Committer: Gregor Zurowski <gr...@zurowski.org>
Committed: Sat Oct 17 21:39:08 2015 +0200
----------------------------------------------------------------------
.../camel/dataformat/xmlsecurity/XMLSecurityDataFormat.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/df0b512a/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 25da8f4..1261df2 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,8 +40,6 @@ import javax.crypto.spec.DESedeKeySpec;
import javax.crypto.spec.SecretKeySpec;
import javax.xml.transform.dom.DOMSource;
-import org.apache.camel.spi.DataFormatName;
-import org.apache.camel.support.ServiceSupport;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
@@ -52,6 +50,8 @@ import org.apache.camel.Exchange;
import org.apache.camel.builder.xml.DefaultNamespaceContext;
import org.apache.camel.builder.xml.XPathBuilder;
import org.apache.camel.spi.DataFormat;
+import org.apache.camel.spi.DataFormatName;
+import org.apache.camel.support.ServiceSupport;
import org.apache.camel.util.IOHelper;
import org.apache.camel.util.jsse.KeyStoreParameters;
import org.apache.xml.security.encryption.EncryptedData;