Author: davsclaus
Date: Thu Mar 21 11:09:43 2013
New Revision: 1459224
URL: http://svn.apache.org/r1459224
Log:
CAMEL-6186: sql producer should only access message body if there is epxected
parameters to be set on query. Added option to use old behavior if needed for
some odd reason.
Added:
camel/trunk/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerAlwaysPopulateStatementFalseTest.java
(with props)
camel/trunk/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerAlwaysPopulateStatementTest.java
- copied, changed from r1459216,
camel/trunk/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerNullBodyTest.java
Modified:
camel/trunk/components/camel-sql/src/main/java/org/apache/camel/component/sql/SqlEndpoint.java
camel/trunk/components/camel-sql/src/main/java/org/apache/camel/component/sql/SqlProducer.java
Modified:
camel/trunk/components/camel-sql/src/main/java/org/apache/camel/component/sql/SqlEndpoint.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-sql/src/main/java/org/apache/camel/component/sql/SqlEndpoint.java?rev=1459224&r1=1459223&r2=1459224&view=diff
==============================================================================
---
camel/trunk/components/camel-sql/src/main/java/org/apache/camel/component/sql/SqlEndpoint.java
(original)
+++
camel/trunk/components/camel-sql/src/main/java/org/apache/camel/component/sql/SqlEndpoint.java
Thu Mar 21 11:09:43 2013
@@ -40,6 +40,7 @@ public class SqlEndpoint extends Default
private String onConsumeFailed;
private String onConsumeBatchComplete;
private boolean allowNamedParameters = true;
+ private boolean alwaysPopulateStatement;
public SqlEndpoint() {
}
@@ -61,7 +62,7 @@ public class SqlEndpoint extends Default
}
public Producer createProducer() throws Exception {
- return new SqlProducer(this, query, jdbcTemplate, batch);
+ return new SqlProducer(this, query, jdbcTemplate, batch,
alwaysPopulateStatement);
}
public boolean isSingleton() {
@@ -148,6 +149,14 @@ public class SqlEndpoint extends Default
this.allowNamedParameters = allowNamedParameters;
}
+ public boolean isAlwaysPopulateStatement() {
+ return alwaysPopulateStatement;
+ }
+
+ public void setAlwaysPopulateStatement(boolean alwaysPopulateStatement) {
+ this.alwaysPopulateStatement = alwaysPopulateStatement;
+ }
+
@Override
protected String createEndpointUri() {
// Make sure it's properly encoded
Modified:
camel/trunk/components/camel-sql/src/main/java/org/apache/camel/component/sql/SqlProducer.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-sql/src/main/java/org/apache/camel/component/sql/SqlProducer.java?rev=1459224&r1=1459223&r2=1459224&view=diff
==============================================================================
---
camel/trunk/components/camel-sql/src/main/java/org/apache/camel/component/sql/SqlProducer.java
(original)
+++
camel/trunk/components/camel-sql/src/main/java/org/apache/camel/component/sql/SqlProducer.java
Thu Mar 21 11:09:43 2013
@@ -33,12 +33,14 @@ public class SqlProducer extends Default
private String query;
private JdbcTemplate jdbcTemplate;
private boolean batch;
+ private boolean alwaysPopulateStatement;
- public SqlProducer(SqlEndpoint endpoint, String query, JdbcTemplate
jdbcTemplate, boolean batch) {
+ public SqlProducer(SqlEndpoint endpoint, String query, JdbcTemplate
jdbcTemplate, boolean batch, boolean alwaysPopulateStatement) {
super(endpoint);
this.jdbcTemplate = jdbcTemplate;
this.query = query;
this.batch = batch;
+ this.alwaysPopulateStatement = alwaysPopulateStatement;
}
@Override
@@ -56,18 +58,21 @@ public class SqlProducer extends Default
public Map<?, ?> doInPreparedStatement(PreparedStatement ps)
throws SQLException {
int expected = ps.getParameterMetaData().getParameterCount();
- // transfer incoming message body data to prepared statement
parameters, if necessary
- if (batch) {
- Iterator<?> iterator =
exchange.getIn().getBody(Iterator.class);
- while (iterator != null && iterator.hasNext()) {
- Object value = iterator.next();
- Iterator<?> i =
getEndpoint().getPrepareStatementStrategy().createPopulateIterator(sql,
preparedQuery, expected, exchange, value);
+ // only populate if really needed
+ if (alwaysPopulateStatement || expected > 0) {
+ // transfer incoming message body data to prepared
statement parameters, if necessary
+ if (batch) {
+ Iterator<?> iterator =
exchange.getIn().getBody(Iterator.class);
+ while (iterator != null && iterator.hasNext()) {
+ Object value = iterator.next();
+ Iterator<?> i =
getEndpoint().getPrepareStatementStrategy().createPopulateIterator(sql,
preparedQuery, expected, exchange, value);
+
getEndpoint().getPrepareStatementStrategy().populateStatement(ps, i, expected);
+ ps.addBatch();
+ }
+ } else {
+ Iterator<?> i =
getEndpoint().getPrepareStatementStrategy().createPopulateIterator(sql,
preparedQuery, expected, exchange, exchange.getIn().getBody());
getEndpoint().getPrepareStatementStrategy().populateStatement(ps, i, expected);
- ps.addBatch();
}
- } else {
- Iterator<?> i =
getEndpoint().getPrepareStatementStrategy().createPopulateIterator(sql,
preparedQuery, expected, exchange, exchange.getIn().getBody());
-
getEndpoint().getPrepareStatementStrategy().populateStatement(ps, i, expected);
}
// execute the prepared statement and populate the outgoing
message
Added:
camel/trunk/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerAlwaysPopulateStatementFalseTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerAlwaysPopulateStatementFalseTest.java?rev=1459224&view=auto
==============================================================================
---
camel/trunk/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerAlwaysPopulateStatementFalseTest.java
(added)
+++
camel/trunk/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerAlwaysPopulateStatementFalseTest.java
Thu Mar 21 11:09:43 2013
@@ -0,0 +1,107 @@
+/**
+ * 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 java.sql.PreparedStatement;
+import java.sql.SQLException;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+
+import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.mock.MockEndpoint;
+import org.apache.camel.impl.JndiRegistry;
+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;
+
+/**
+ * @version
+ */
+public class SqlProducerAlwaysPopulateStatementFalseTest extends
CamelTestSupport {
+
+ private EmbeddedDatabase db;
+ private SqlPrepareStatementStrategy strategy;
+ private volatile boolean invoked;
+
+ @Before
+ public void setUp() throws Exception {
+ db = new EmbeddedDatabaseBuilder()
+
.setType(EmbeddedDatabaseType.DERBY).addScript("sql/createAndPopulateDatabase.sql").build();
+
+ strategy = new DefaultSqlPrepareStatementStrategy() {
+ @Override
+ public void populateStatement(PreparedStatement ps, Iterator<?>
iterator, int expectedParams) throws SQLException {
+ invoked = true;
+ super.populateStatement(ps, iterator, expectedParams);
+ }
+ };
+
+ super.setUp();
+ }
+
+ @Override
+ protected JndiRegistry createRegistry() throws Exception {
+ JndiRegistry jndi = super.createRegistry();
+ jndi.bind("myStrategy", strategy);
+ return jndi;
+ }
+
+ @After
+ public void tearDown() throws Exception {
+ super.tearDown();
+
+ db.shutdown();
+ }
+
+ @Test
+ public void testAlwaysPopulateFalse() throws Exception {
+ MockEndpoint mock = getMockEndpoint("mock:result");
+ mock.expectedMessageCount(1);
+
+ template.sendBody("direct:start", null);
+
+ mock.assertIsSatisfied();
+
+ List<?> received = assertIsInstanceOf(List.class,
mock.getReceivedExchanges().get(0).getIn().getBody());
+ assertEquals(2, received.size());
+ Map<?, ?> row = assertIsInstanceOf(Map.class, received.get(0));
+ assertEquals("Camel", row.get("PROJECT"));
+
+ row = assertIsInstanceOf(Map.class, received.get(1));
+ assertEquals("AMQ", row.get("PROJECT"));
+
+ assertFalse("Should not populate", invoked);
+ }
+
+ @Override
+ protected RouteBuilder createRouteBuilder() throws Exception {
+ return new RouteBuilder() {
+ public void configure() {
+ getContext().getComponent("sql",
SqlComponent.class).setDataSource(db);
+
+ from("direct:start")
+ .to("sql:select * from projects where license = 'ASF'
order by id?alwaysPopulateStatement=false&prepareStatementStrategy=#myStrategy")
+ .to("mock:result");
+ }
+ };
+ }
+}
Propchange:
camel/trunk/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerAlwaysPopulateStatementFalseTest.java
------------------------------------------------------------------------------
svn:executable = *
Copied:
camel/trunk/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerAlwaysPopulateStatementTest.java
(from r1459216,
camel/trunk/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerNullBodyTest.java)
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerAlwaysPopulateStatementTest.java?p2=camel/trunk/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerAlwaysPopulateStatementTest.java&p1=camel/trunk/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerNullBodyTest.java&r1=1459216&r2=1459224&rev=1459224&view=diff
==============================================================================
---
camel/trunk/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerNullBodyTest.java
(original)
+++
camel/trunk/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerAlwaysPopulateStatementTest.java
Thu Mar 21 11:09:43 2013
@@ -16,11 +16,15 @@
*/
package org.apache.camel.component.sql;
+import java.sql.PreparedStatement;
+import java.sql.SQLException;
+import java.util.Iterator;
import java.util.List;
import java.util.Map;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
+import org.apache.camel.impl.JndiRegistry;
import org.apache.camel.test.junit4.CamelTestSupport;
import org.junit.After;
import org.junit.Before;
@@ -32,18 +36,35 @@ import org.springframework.jdbc.datasour
/**
* @version
*/
-public class SqlProducerNullBodyTest extends CamelTestSupport {
+public class SqlProducerAlwaysPopulateStatementTest extends CamelTestSupport {
private EmbeddedDatabase db;
+ private SqlPrepareStatementStrategy strategy;
+ private volatile boolean invoked;
@Before
public void setUp() throws Exception {
db = new EmbeddedDatabaseBuilder()
.setType(EmbeddedDatabaseType.DERBY).addScript("sql/createAndPopulateDatabase.sql").build();
+
+ strategy = new DefaultSqlPrepareStatementStrategy() {
+ @Override
+ public void populateStatement(PreparedStatement ps, Iterator<?>
iterator, int expectedParams) throws SQLException {
+ invoked = true;
+ super.populateStatement(ps, iterator, expectedParams);
+ }
+ };
super.setUp();
}
+ @Override
+ protected JndiRegistry createRegistry() throws Exception {
+ JndiRegistry jndi = super.createRegistry();
+ jndi.bind("myStrategy", strategy);
+ return jndi;
+ }
+
@After
public void tearDown() throws Exception {
super.tearDown();
@@ -52,7 +73,7 @@ public class SqlProducerNullBodyTest ext
}
@Test
- public void testNullBody() throws Exception {
+ public void testAlwaysPopulate() throws Exception {
MockEndpoint mock = getMockEndpoint("mock:result");
mock.expectedMessageCount(1);
@@ -67,6 +88,8 @@ public class SqlProducerNullBodyTest ext
row = assertIsInstanceOf(Map.class, received.get(1));
assertEquals("AMQ", row.get("PROJECT"));
+
+ assertTrue("Should always populate", invoked);
}
@Override
@@ -76,7 +99,7 @@ public class SqlProducerNullBodyTest ext
getContext().getComponent("sql",
SqlComponent.class).setDataSource(db);
from("direct:start")
- .to("sql:select * from projects where license = 'ASF'
order by id")
+ .to("sql:select * from projects where license = 'ASF'
order by id?alwaysPopulateStatement=true&prepareStatementStrategy=#myStrategy")
.to("mock:result");
}
};
