You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2013/08/26 19:30:18 UTC
git commit: CAMEL-6258: Added noop option to sql component. Thanks to
Christian Posta for the patch.
Updated Branches:
refs/heads/master 9737301ba -> 6cc102241
CAMEL-6258: Added noop option to sql component. Thanks to Christian Posta for the patch.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/6cc10224
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/6cc10224
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/6cc10224
Branch: refs/heads/master
Commit: 6cc102241f781d8d59bf47127f1974d028735f85
Parents: 9737301
Author: Claus Ibsen <da...@apache.org>
Authored: Mon Aug 26 19:30:11 2013 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Mon Aug 26 19:30:11 2013 +0200
----------------------------------------------------------------------
.../apache/camel/component/sql/SqlEndpoint.java | 10 ++
.../apache/camel/component/sql/SqlProducer.java | 14 ++-
.../component/sql/SqlProducerNoopTest.java | 111 +++++++++++++++++++
3 files changed, 133 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/6cc10224/components/camel-sql/src/main/java/org/apache/camel/component/sql/SqlEndpoint.java
----------------------------------------------------------------------
diff --git a/components/camel-sql/src/main/java/org/apache/camel/component/sql/SqlEndpoint.java b/components/camel-sql/src/main/java/org/apache/camel/component/sql/SqlEndpoint.java
index dd6d1a2..2df9f23 100644
--- a/components/camel-sql/src/main/java/org/apache/camel/component/sql/SqlEndpoint.java
+++ b/components/camel-sql/src/main/java/org/apache/camel/component/sql/SqlEndpoint.java
@@ -74,6 +74,8 @@ public class SqlEndpoint extends DefaultPollingEndpoint {
private String outputClass;
@UriParam
private int parametersCount;
+ @UriParam
+ private boolean noop;
public SqlEndpoint() {
}
@@ -236,6 +238,14 @@ public class SqlEndpoint extends DefaultPollingEndpoint {
this.parametersCount = parametersCount;
}
+ public boolean isNoop() {
+ return noop;
+ }
+
+ public void setNoop(boolean noop) {
+ this.noop = noop;
+ }
+
@Override
protected String createEndpointUri() {
// Make sure it's properly encoded
http://git-wip-us.apache.org/repos/asf/camel/blob/6cc10224/components/camel-sql/src/main/java/org/apache/camel/component/sql/SqlProducer.java
----------------------------------------------------------------------
diff --git a/components/camel-sql/src/main/java/org/apache/camel/component/sql/SqlProducer.java b/components/camel-sql/src/main/java/org/apache/camel/component/sql/SqlProducer.java
index 5047566..4b33c30 100644
--- a/components/camel-sql/src/main/java/org/apache/camel/component/sql/SqlProducer.java
+++ b/components/camel-sql/src/main/java/org/apache/camel/component/sql/SqlProducer.java
@@ -94,12 +94,22 @@ public class SqlProducer extends DefaultProducer {
log.trace("Got result list from query: {}, outputType={}", rs, outputType);
if (outputType == SqlOutputType.SelectList) {
List<Map<String, Object>> data = getEndpoint().queryForList(ps.getResultSet());
- exchange.getOut().setBody(data);
+ // for noop=true we still want to enrich with the row count header
+ if (getEndpoint().isNoop()) {
+ exchange.getOut().setBody(exchange.getIn().getBody());
+ } else {
+ exchange.getOut().setBody(data);
+ }
exchange.getOut().setHeader(SqlConstants.SQL_ROW_COUNT, data.size());
} else if (outputType == SqlOutputType.SelectOne) {
Object data = getEndpoint().queryForObject(ps.getResultSet());
if (data != null) {
- exchange.getOut().setBody(data);
+ // for noop=true we still want to enrich with the row count header
+ if (getEndpoint().isNoop()) {
+ exchange.getOut().setBody(exchange.getIn().getBody());
+ } else {
+ exchange.getOut().setBody(data);
+ }
exchange.getOut().setHeader(SqlConstants.SQL_ROW_COUNT, 1);
}
} else {
http://git-wip-us.apache.org/repos/asf/camel/blob/6cc10224/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerNoopTest.java
----------------------------------------------------------------------
diff --git a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerNoopTest.java b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerNoopTest.java
new file mode 100644
index 0000000..b3b8eb4
--- /dev/null
+++ b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerNoopTest.java
@@ -0,0 +1,111 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.component.sql;
+
+import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.mock.MockEndpoint;
+import org.apache.camel.test.junit4.CamelTestSupport;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.springframework.jdbc.datasource.embedded.EmbeddedDatabase;
+import org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseBuilder;
+import org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseType;
+
+public class SqlProducerNoopTest extends CamelTestSupport {
+
+ private EmbeddedDatabase db;
+
+ @Before
+ public void setUp() throws Exception {
+ db = new EmbeddedDatabaseBuilder()
+ .setType(EmbeddedDatabaseType.DERBY).addScript("sql/createAndPopulateDatabase.sql").build();
+
+ super.setUp();
+ }
+
+ @After
+ public void tearDown() throws Exception {
+ super.tearDown();
+
+ db.shutdown();
+ }
+
+ @Test
+ public void testInsertNoop() throws InterruptedException {
+ MockEndpoint mock = getMockEndpoint("mock:insert");
+ mock.expectedMessageCount(1);
+ mock.expectedHeaderReceived(SqlConstants.SQL_UPDATE_COUNT, 1);
+ mock.message(0).body().isEqualTo("Hi there!");
+
+ template.requestBody("direct:insert", "Hi there!");
+
+ assertMockEndpointsSatisfied();
+ }
+
+ @Test
+ public void testQueryNoop() throws InterruptedException {
+ MockEndpoint mock = getMockEndpoint("mock:query");
+ mock.expectedMessageCount(1);
+ mock.expectedHeaderReceived(SqlConstants.SQL_ROW_COUNT, 3);
+ mock.message(0).body().isEqualTo("Hi there!");
+
+ template.requestBody("direct:query", "Hi there!");
+
+ assertMockEndpointsSatisfied();
+ }
+
+ @Test
+ public void testUpdateNoop() throws InterruptedException {
+ MockEndpoint mock = getMockEndpoint("mock:update");
+ mock.expectedMessageCount(1);
+ mock.expectedHeaderReceived(SqlConstants.SQL_UPDATE_COUNT, 1);
+ mock.message(0).body().isEqualTo("Hi there!");
+
+ template.requestBody("direct:update", "Hi there!");
+
+ assertMockEndpointsSatisfied();
+ }
+
+ @Test
+ public void testDeleteNoop() throws InterruptedException {
+ MockEndpoint mock = getMockEndpoint("mock:delete");
+ mock.expectedMessageCount(1);
+ mock.expectedHeaderReceived(SqlConstants.SQL_UPDATE_COUNT, 1);
+ mock.message(0).body().isEqualTo("Hi there!");
+
+ template.requestBody("direct:delete", "Hi there!");
+
+ assertMockEndpointsSatisfied();
+ }
+
+ @Override
+ protected RouteBuilder createRouteBuilder() throws Exception {
+ return new RouteBuilder() {
+ @Override
+ public void configure() throws Exception {
+ // required for the sql component
+ getContext().getComponent("sql", SqlComponent.class).setDataSource(db);
+
+ from("direct:query").to("sql:select * from projects?noop=true").to("mock:query");
+ from("direct:update").to("sql:update projects set license='MIT' where id=3?noop=true").to("mock:update");
+ from("direct:insert").to("sql:insert into projects values (4, 'Zookeeper', 'ASF')?noop=true").to("mock:insert");
+ from("direct:delete").to("sql:delete from projects where id=1?noop=true").to("mock:delete");
+ }
+ };
+ }
+}