CAMEL-9162: camel-elsql component
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/6cf99562
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/6cf99562
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/6cf99562
Branch: refs/heads/master
Commit: 6cf9956245fa59208d113f0045d31c82ae2afa98
Parents: f5614ef
Author: Claus Ibsen <davsclaus@apache.org>
Authored: Sun Oct 4 13:19:01 2015 +0200
Committer: Claus Ibsen <davsclaus@apache.org>
Committed: Mon Oct 5 10:54:53 2015 +0200
----------------------------------------------------------------------
components/camel-elsql/pom.xml | 106 ++++++++++
.../camel/component/elsql/ElsqlComponent.java | 147 ++++++++++++++
.../camel/component/elsql/ElsqlConsumer.java | 32 +++
.../camel/component/elsql/ElsqlEndpoint.java | 121 +++++++++++
.../camel/component/elsql/ElsqlProducer.java | 113 +++++++++++
.../camel/component/elsql/ElsqlSqlParams.java | 68 +++++++
.../elsql/ElsqlSqlPrepareStatementStrategy.java | 39 ++++
.../elsql/ElsqlSqlProcessingStrategy.java | 65 ++++++
.../src/main/resources/META-INF/LICENSE.txt | 203 +++++++++++++++++++
.../src/main/resources/META-INF/NOTICE.txt | 11 +
.../services/org/apache/camel/component/elsql | 18 ++
.../camel/component/sql/SqlComponent.java | 4 +
.../apache/camel/component/sql/SqlEndpoint.java | 4 +-
13 files changed, 929 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/6cf99562/components/camel-elsql/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-elsql/pom.xml b/components/camel-elsql/pom.xml
new file mode 100644
index 0000000..d82bb05
--- /dev/null
+++ b/components/camel-elsql/pom.xml
@@ -0,0 +1,106 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ 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.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>components</artifactId>
+ <version>2.16.1-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>camel-elsql</artifactId>
+ <packaging>bundle</packaging>
+ <name>Camel :: ElSql</name>
+ <description>Camel ElSql support</description>
+
+ <properties>
+ <camel.osgi.export.pkg>
+ org.apache.camel.component.elsql.*;${camel.osgi.version}
+ </camel.osgi.export.pkg>
+ <camel.osgi.import.pkg>
+ !org.apache.camel.component.elsql.*,
+ ${camel.osgi.import.defaults},
+ *
+ </camel.osgi.import.pkg>
+ <camel.osgi.export.service>org.apache.camel.spi.ComponentResolver;component=elsql</camel.osgi.export.service>
+ </properties>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-core</artifactId>
+ </dependency>
+ <!-- this component extends camel-sql -->
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-sql</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>com.opengamma</groupId>
+ <artifactId>elsql</artifactId>
+ <version>1.1</version>
+ </dependency>
+
+ <!-- test dependencies -->
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-test-spring</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-test</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.derby</groupId>
+ <artifactId>derby</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.hsqldb</groupId>
+ <artifactId>hsqldb</artifactId>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <!-- use per test fork mode to avoid side effects -->
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <forkCount>1</forkCount>
+ <reuseForks>false</reuseForks>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>
http://git-wip-us.apache.org/repos/asf/camel/blob/6cf99562/components/camel-elsql/src/main/java/org/apache/camel/component/elsql/ElsqlComponent.java
----------------------------------------------------------------------
diff --git a/components/camel-elsql/src/main/java/org/apache/camel/component/elsql/ElsqlComponent.java b/components/camel-elsql/src/main/java/org/apache/camel/component/elsql/ElsqlComponent.java
new file mode 100644
index 0000000..ddea39d
--- /dev/null
+++ b/components/camel-elsql/src/main/java/org/apache/camel/component/elsql/ElsqlComponent.java
@@ -0,0 +1,147 @@
+/**
+ * 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.elsql;
+
+import java.util.Map;
+import javax.sql.DataSource;
+
+import com.opengamma.elsql.ElSqlConfig;
+import org.apache.camel.CamelContext;
+import org.apache.camel.Endpoint;
+import org.apache.camel.component.sql.SqlComponent;
+import org.apache.camel.util.CamelContextHelper;
+import org.apache.camel.util.IntrospectionSupport;
+import org.springframework.jdbc.core.JdbcTemplate;
+
+public class ElsqlComponent extends SqlComponent {
+
+ private ElSqlConfig elSqlConfig;
+ private String resourceUri;
+
+ public ElsqlComponent(CamelContext context) {
+ super(context, ElsqlEndpoint.class);
+ }
+
+ @Override
+ protected Endpoint createEndpoint(String uri, String remaining, Map<String, Object> parameters) throws Exception {
+ DataSource target = null;
+
+ // endpoint options overrule component configured datasource
+ DataSource ds = resolveAndRemoveReferenceParameter(parameters, "dataSource", DataSource.class);
+ if (ds != null) {
+ target = ds;
+ }
+ String dataSourceRef = getAndRemoveParameter(parameters, "dataSourceRef", String.class);
+ if (target == null && dataSourceRef != null) {
+ target = CamelContextHelper.mandatoryLookup(getCamelContext(), dataSourceRef, DataSource.class);
+ }
+ if (target == null) {
+ // fallback and use component
+ target = getDataSource();
+ }
+ if (target == null) {
+ throw new IllegalArgumentException("DataSource must be configured");
+ }
+
+ JdbcTemplate jdbcTemplate = new JdbcTemplate(target);
+ IntrospectionSupport.setProperties(jdbcTemplate, parameters, "template.");
+
+ String elsqlName = remaining;
+ String resUri = resourceUri;
+ String[] part = remaining.split("/");
+ if (part.length == 2) {
+ elsqlName = part[0];
+ resUri = part[1];
+ } else if (part.length > 2) {
+ throw new IllegalArgumentException("Invalid uri. Must by elsql:elsqlName/resourceUri, was: " + uri);
+ }
+
+ /* TODO: add this later
+ String onConsume = getAndRemoveParameter(parameters, "consumer.onConsume", String.class);
+ if (onConsume == null) {
+ onConsume = getAndRemoveParameter(parameters, "onConsume", String.class);
+ }
+ if (onConsume != null && isUsePlaceholder()) {
+ onConsume = onConsume.replaceAll(parameterPlaceholderSubstitute, "?");
+ }
+ String onConsumeFailed = getAndRemoveParameter(parameters, "consumer.onConsumeFailed", String.class);
+ if (onConsumeFailed == null) {
+ onConsumeFailed = getAndRemoveParameter(parameters, "onConsumeFailed", String.class);
+ }
+ if (onConsumeFailed != null && isUsePlaceholder()) {
+ onConsumeFailed = onConsumeFailed.replaceAll(parameterPlaceholderSubstitute, "?");
+ }
+ String onConsumeBatchComplete = getAndRemoveParameter(parameters, "consumer.onConsumeBatchComplete", String.class);
+ if (onConsumeBatchComplete == null) {
+ onConsumeBatchComplete = getAndRemoveParameter(parameters, "onConsumeBatchComplete", String.class);
+ }
+ if (onConsumeBatchComplete != null && isUsePlaceholder()) {
+ onConsumeBatchComplete = onConsumeBatchComplete.replaceAll(parameterPlaceholderSubstitute, "?");
+ }
+ */
+
+ ElsqlEndpoint endpoint = new ElsqlEndpoint(uri, this, jdbcTemplate, elsqlName, resUri);
+// endpoint.setOnConsume(onConsume);
+// endpoint.setOnConsumeFailed(onConsumeFailed);
+// endpoint.setOnConsumeBatchComplete(onConsumeBatchComplete);
+ endpoint.setDataSource(ds);
+ endpoint.setDataSourceRef(dataSourceRef);
+ endpoint.setElSqlConfig(elSqlConfig);
+ return endpoint;
+ }
+
+ public ElSqlConfig getElSqlConfig() {
+ return elSqlConfig;
+ }
+
+ /**
+ * To use the given ElSqlConfig as configuration
+ */
+ public void setElSqlConfig(ElSqlConfig elSqlConfig) {
+ this.elSqlConfig = elSqlConfig;
+ }
+
+ public String getResourceUri() {
+ return resourceUri;
+ }
+
+ /**
+ * The eqlsql resource tile which contains the elsql SQL statements to use
+ */
+ public void setResourceUri(String resourceUri) {
+ this.resourceUri = resourceUri;
+ }
+
+ /**
+ * Sets the DataSource to use to communicate with the database.
+ */
+ @Override
+ public void setDataSource(DataSource dataSource) {
+ super.setDataSource(dataSource);
+ }
+
+ /**
+ * Sets whether to use placeholder and replace all placeholder characters with ? sign in the SQL queries.
+ * <p/>
+ * This option is default <tt>true</tt>
+ */
+ @Override
+ public void setUsePlaceholder(boolean usePlaceholder) {
+ super.setUsePlaceholder(usePlaceholder);
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/camel/blob/6cf99562/components/camel-elsql/src/main/java/org/apache/camel/component/elsql/ElsqlConsumer.java
----------------------------------------------------------------------
diff --git a/components/camel-elsql/src/main/java/org/apache/camel/component/elsql/ElsqlConsumer.java b/components/camel-elsql/src/main/java/org/apache/camel/component/elsql/ElsqlConsumer.java
new file mode 100644
index 0000000..0f1c6d7
--- /dev/null
+++ b/components/camel-elsql/src/main/java/org/apache/camel/component/elsql/ElsqlConsumer.java
@@ -0,0 +1,32 @@
+/**
+ * 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.elsql;
+
+import org.apache.camel.Processor;
+import org.apache.camel.component.sql.SqlConsumer;
+import org.apache.camel.component.sql.SqlEndpoint;
+import org.apache.camel.component.sql.SqlPrepareStatementStrategy;
+import org.apache.camel.component.sql.SqlProcessingStrategy;
+import org.springframework.jdbc.core.JdbcTemplate;
+
+public class ElsqlConsumer extends SqlConsumer {
+
+ public ElsqlConsumer(SqlEndpoint endpoint, Processor processor, JdbcTemplate jdbcTemplate, String query,
+ SqlPrepareStatementStrategy sqlPrepareStatementStrategy, SqlProcessingStrategy sqlProcessingStrategy) {
+ super(endpoint, processor, jdbcTemplate, query, sqlPrepareStatementStrategy, sqlProcessingStrategy);
+ }
+}
http://git-wip-us.apache.org/repos/asf/camel/blob/6cf99562/components/camel-elsql/src/main/java/org/apache/camel/component/elsql/ElsqlEndpoint.java
----------------------------------------------------------------------
diff --git a/components/camel-elsql/src/main/java/org/apache/camel/component/elsql/ElsqlEndpoint.java b/components/camel-elsql/src/main/java/org/apache/camel/component/elsql/ElsqlEndpoint.java
new file mode 100644
index 0000000..8ef9845
--- /dev/null
+++ b/components/camel-elsql/src/main/java/org/apache/camel/component/elsql/ElsqlEndpoint.java
@@ -0,0 +1,121 @@
+/**
+ * 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.elsql;
+
+import java.net.URL;
+
+import com.opengamma.elsql.ElSql;
+import com.opengamma.elsql.ElSqlConfig;
+import org.apache.camel.Component;
+import org.apache.camel.Consumer;
+import org.apache.camel.Processor;
+import org.apache.camel.Producer;
+import org.apache.camel.component.sql.SqlEndpoint;
+import org.apache.camel.component.sql.SqlPrepareStatementStrategy;
+import org.apache.camel.component.sql.SqlProcessingStrategy;
+import org.apache.camel.spi.Metadata;
+import org.apache.camel.spi.UriEndpoint;
+import org.apache.camel.spi.UriParam;
+import org.apache.camel.spi.UriPath;
+import org.apache.camel.util.ObjectHelper;
+import org.apache.camel.util.ResourceHelper;
+import org.springframework.jdbc.core.JdbcTemplate;
+
+@UriEndpoint(scheme = "elsql", title = "SQL", syntax = "elsql:elsqlName/resourceUri", consumerClass = ElsqlConsumer.class, label = "database,sql")
+public class ElsqlEndpoint extends SqlEndpoint {
+
+ private volatile ElSql elSql;
+
+ @UriPath
+ @Metadata(required = "true")
+ private String elsqlName;
+ @UriPath
+ private String resourceUri;
+ @UriParam
+ private ElSqlConfig elSqlConfig;
+
+ public ElsqlEndpoint(String uri, Component component, JdbcTemplate jdbcTemplate, String elsqlName, String resourceUri) {
+ super(uri, component, jdbcTemplate, null);
+ this.elsqlName = elsqlName;
+ this.resourceUri = resourceUri;
+ }
+
+ @Override
+ public Consumer createConsumer(Processor processor) throws Exception {
+ SqlProcessingStrategy proStrategy = new ElsqlSqlProcessingStrategy(elsqlName, elSql);
+ SqlPrepareStatementStrategy preStategy = new ElsqlSqlPrepareStatementStrategy();
+
+ ElsqlConsumer consumer = new ElsqlConsumer(this, processor, getJdbcTemplate(), elsqlName, preStategy, proStrategy);
+ consumer.setMaxMessagesPerPoll(getMaxMessagesPerPoll());
+ consumer.setOnConsume(getOnConsume());
+ consumer.setOnConsumeFailed(getOnConsumeFailed());
+ consumer.setOnConsumeBatchComplete(getOnConsumeBatchComplete());
+ consumer.setBreakBatchOnConsumeFail(isBreakBatchOnConsumeFail());
+ consumer.setExpectedUpdateCount(getExpectedUpdateCount());
+ consumer.setUseIterator(isUseIterator());
+ consumer.setRouteEmptyResultSet(isRouteEmptyResultSet());
+ configureConsumer(consumer);
+ return consumer;
+ }
+
+ @Override
+ public Producer createProducer() throws Exception {
+ ElsqlProducer result = new ElsqlProducer(this, elSql, elsqlName, getJdbcTemplate());
+ return result;
+ }
+
+ @Override
+ protected void doStart() throws Exception {
+ super.doStart();
+
+ ObjectHelper.notNull(elSqlConfig, "elSqlConfig", this);
+ ObjectHelper.notNull(resourceUri, "resourceUri", this);
+
+ URL url = ResourceHelper.resolveMandatoryResourceAsUrl(getCamelContext().getClassResolver(), resourceUri);
+
+ elSql = ElSql.parse(elSqlConfig, url);
+ }
+
+ /**
+ * The name of the elsql to use (is @NAMED in the elsql file)
+ */
+ public String getElsqlName() {
+ return elsqlName;
+ }
+
+ public ElSqlConfig getElSqlConfig() {
+ return elSqlConfig;
+ }
+
+ /**
+ * The elsql configuration to use
+ */
+ public void setElSqlConfig(ElSqlConfig elSqlConfig) {
+ this.elSqlConfig = elSqlConfig;
+ }
+
+ public String getResourceUri() {
+ return resourceUri;
+ }
+
+ /**
+ * The eqlsql resource tile which contains the elsql SQL statements to use
+ */
+ public void setResourceUri(String resourceUri) {
+ this.resourceUri = resourceUri;
+ }
+}
http://git-wip-us.apache.org/repos/asf/camel/blob/6cf99562/components/camel-elsql/src/main/java/org/apache/camel/component/elsql/ElsqlProducer.java
----------------------------------------------------------------------
diff --git a/components/camel-elsql/src/main/java/org/apache/camel/component/elsql/ElsqlProducer.java b/components/camel-elsql/src/main/java/org/apache/camel/component/elsql/ElsqlProducer.java
new file mode 100644
index 0000000..73925d3
--- /dev/null
+++ b/components/camel-elsql/src/main/java/org/apache/camel/component/elsql/ElsqlProducer.java
@@ -0,0 +1,113 @@
+/**
+ * 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.elsql;
+
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.util.List;
+
+import com.opengamma.elsql.ElSql;
+import org.apache.camel.Exchange;
+import org.apache.camel.component.sql.SqlConstants;
+import org.apache.camel.component.sql.SqlEndpoint;
+import org.apache.camel.component.sql.SqlOutputType;
+import org.apache.camel.impl.DefaultProducer;
+import org.springframework.dao.DataAccessException;
+import org.springframework.jdbc.core.JdbcTemplate;
+import org.springframework.jdbc.core.PreparedStatementCallback;
+
+import static org.springframework.jdbc.support.JdbcUtils.closeResultSet;
+
+public class ElsqlProducer extends DefaultProducer {
+
+ private final ElSql elSql;
+ private final String elSqlName;
+ private final JdbcTemplate jdbcTemplate;
+
+ public ElsqlProducer(SqlEndpoint endpoint, ElSql elSql, String elSqlName, JdbcTemplate jdbcTemplate) {
+ super(endpoint);
+ this.elSql = elSql;
+ this.elSqlName = elSqlName;
+ this.jdbcTemplate = jdbcTemplate;
+ }
+
+ @Override
+ public ElsqlEndpoint getEndpoint() {
+ return (ElsqlEndpoint) super.getEndpoint();
+ }
+
+ @Override
+ public void process(final Exchange exchange) throws Exception {
+ Object data = exchange.getIn().getBody();
+
+ final String sql = elSql.getSql(elSqlName, new ElsqlSqlParams(exchange, data));
+
+ jdbcTemplate.execute(sql, new PreparedStatementCallback<Object>() {
+ @Override
+ public Object doInPreparedStatement(PreparedStatement ps) throws SQLException, DataAccessException {
+ ResultSet rs = null;
+ try {
+ boolean isResultSet = ps.execute();
+ if (isResultSet) {
+ // preserve headers first, so we can override the SQL_ROW_COUNT header
+ exchange.getOut().getHeaders().putAll(exchange.getIn().getHeaders());
+
+ rs = ps.getResultSet();
+ SqlOutputType outputType = getEndpoint().getOutputType();
+ log.trace("Got result list from query: {}, outputType={}", rs, outputType);
+ if (outputType == SqlOutputType.SelectList) {
+ List<?> data = getEndpoint().queryForList(rs, true);
+ // for noop=true we still want to enrich with the row count header
+ if (getEndpoint().isNoop()) {
+ exchange.getOut().setBody(exchange.getIn().getBody());
+ } else if (getEndpoint().getOutputHeader() != null) {
+ exchange.getOut().setBody(exchange.getIn().getBody());
+ exchange.getOut().setHeader(getEndpoint().getOutputHeader(), data);
+ } else {
+ exchange.getOut().setBody(data);
+ }
+ exchange.getOut().setHeader(SqlConstants.SQL_ROW_COUNT, data.size());
+ } else if (outputType == SqlOutputType.SelectOne) {
+ Object data = getEndpoint().queryForObject(rs);
+ if (data != null) {
+ // for noop=true we still want to enrich with the row count header
+ if (getEndpoint().isNoop()) {
+ exchange.getOut().setBody(exchange.getIn().getBody());
+ } else if (getEndpoint().getOutputHeader() != null) {
+ exchange.getOut().setBody(exchange.getIn().getBody());
+ exchange.getOut().setHeader(getEndpoint().getOutputHeader(), data);
+ } else {
+ exchange.getOut().setBody(data);
+ }
+ exchange.getOut().setHeader(SqlConstants.SQL_ROW_COUNT, 1);
+ }
+ } else {
+ throw new IllegalArgumentException("Invalid outputType=" + outputType);
+ }
+ } else {
+ exchange.getIn().setHeader(SqlConstants.SQL_UPDATE_COUNT, ps.getUpdateCount());
+ }
+ } finally {
+ closeResultSet(rs);
+ }
+
+ return null;
+ }
+ });
+ }
+}
http://git-wip-us.apache.org/repos/asf/camel/blob/6cf99562/components/camel-elsql/src/main/java/org/apache/camel/component/elsql/ElsqlSqlParams.java
----------------------------------------------------------------------
diff --git a/components/camel-elsql/src/main/java/org/apache/camel/component/elsql/ElsqlSqlParams.java b/components/camel-elsql/src/main/java/org/apache/camel/component/elsql/ElsqlSqlParams.java
new file mode 100644
index 0000000..6822e8b
--- /dev/null
+++ b/components/camel-elsql/src/main/java/org/apache/camel/component/elsql/ElsqlSqlParams.java
@@ -0,0 +1,68 @@
+/**
+ * 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.elsql;
+
+import java.util.Collections;
+import java.util.Map;
+
+import com.opengamma.elsql.SqlParams;
+import org.apache.camel.Exchange;
+import org.apache.camel.language.simple.SimpleLanguage;
+
+public class ElsqlSqlParams implements SqlParams {
+
+ private final Exchange exchange;
+ private final Map<?, ?> bodyMap;
+ private final Map<?, ?> headersMap;
+
+ public ElsqlSqlParams(Exchange exchange, Object body) {
+ this.exchange = exchange;
+ this.bodyMap = safeMap(exchange.getContext().getTypeConverter().tryConvertTo(Map.class, body));
+ this.headersMap = safeMap(exchange.getIn().getHeaders());
+ }
+
+ private static Map<?, ?> safeMap(Map<?, ?> map) {
+ return (map == null || map.isEmpty()) ? Collections.emptyMap() : map;
+ }
+
+ @Override
+ public boolean contains(String variable) {
+ if (variable.startsWith("${") && variable.endsWith("}")) {
+ return SimpleLanguage.expression(variable).evaluate(exchange, Object.class) != null;
+ } else if (bodyMap.containsKey(variable)) {
+ return true;
+ } else if (headersMap.containsKey(variable)) {
+ return true;
+ }
+
+ return false;
+ }
+
+ @Override
+ public Object get(String variable) {
+ if (variable.startsWith("${") && variable.endsWith("}")) {
+ return SimpleLanguage.expression(variable).evaluate(exchange, Object.class) != null;
+ } else if (bodyMap.containsKey(variable)) {
+ return bodyMap.get(variable);
+ } else if (headersMap.containsKey(variable)) {
+ return headersMap.get(variable);
+ }
+
+ return null;
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/camel/blob/6cf99562/components/camel-elsql/src/main/java/org/apache/camel/component/elsql/ElsqlSqlPrepareStatementStrategy.java
----------------------------------------------------------------------
diff --git a/components/camel-elsql/src/main/java/org/apache/camel/component/elsql/ElsqlSqlPrepareStatementStrategy.java b/components/camel-elsql/src/main/java/org/apache/camel/component/elsql/ElsqlSqlPrepareStatementStrategy.java
new file mode 100644
index 0000000..d2ef797
--- /dev/null
+++ b/components/camel-elsql/src/main/java/org/apache/camel/component/elsql/ElsqlSqlPrepareStatementStrategy.java
@@ -0,0 +1,39 @@
+/**
+ * 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.elsql;
+
+import java.sql.PreparedStatement;
+import java.sql.SQLException;
+import java.util.Iterator;
+
+import org.apache.camel.Exchange;
+import org.apache.camel.component.sql.SqlPrepareStatementStrategy;
+
+public class ElsqlSqlPrepareStatementStrategy implements SqlPrepareStatementStrategy {
+
+ public String prepareQuery(String query, boolean allowNamedParameters) throws SQLException {
+ return query;
+ }
+
+ public Iterator<?> createPopulateIterator(String query, String preparedQuery, int expectedParams, Exchange exchange, Object value) throws SQLException {
+ return null;
+ }
+
+ public void populateStatement(PreparedStatement ps, Iterator<?> iterator, int expectedParams) throws SQLException {
+ // noop
+ }
+}
http://git-wip-us.apache.org/repos/asf/camel/blob/6cf99562/components/camel-elsql/src/main/java/org/apache/camel/component/elsql/ElsqlSqlProcessingStrategy.java
----------------------------------------------------------------------
diff --git a/components/camel-elsql/src/main/java/org/apache/camel/component/elsql/ElsqlSqlProcessingStrategy.java b/components/camel-elsql/src/main/java/org/apache/camel/component/elsql/ElsqlSqlProcessingStrategy.java
new file mode 100644
index 0000000..d22c33e
--- /dev/null
+++ b/components/camel-elsql/src/main/java/org/apache/camel/component/elsql/ElsqlSqlProcessingStrategy.java
@@ -0,0 +1,65 @@
+/**
+ * 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.elsql;
+
+import java.sql.PreparedStatement;
+import java.sql.SQLException;
+
+import com.opengamma.elsql.ElSql;
+import org.apache.camel.Exchange;
+import org.apache.camel.component.sql.SqlEndpoint;
+import org.apache.camel.component.sql.SqlProcessingStrategy;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.dao.DataAccessException;
+import org.springframework.jdbc.core.JdbcTemplate;
+import org.springframework.jdbc.core.PreparedStatementCallback;
+
+public class ElsqlSqlProcessingStrategy implements SqlProcessingStrategy {
+
+ private static final Logger LOG = LoggerFactory.getLogger(ElsqlSqlProcessingStrategy.class);
+ private final String elSqlName;
+ private final ElSql elSql;
+
+ public ElsqlSqlProcessingStrategy(String elSqlName, ElSql elSql) {
+ this.elSqlName = elSqlName;
+ this.elSql = elSql;
+ }
+
+ @Override
+ public int commit(final SqlEndpoint endpoint, final Exchange exchange, final Object data, final JdbcTemplate jdbcTemplate, final String query) throws Exception {
+ String sql = elSql.getSql(elSqlName, new ElsqlSqlParams(exchange, data));
+
+ return jdbcTemplate.execute(sql, new PreparedStatementCallback<Integer>() {
+ @Override
+ public Integer doInPreparedStatement(PreparedStatement ps) throws SQLException, DataAccessException {
+ ps.execute();
+
+ int updateCount = ps.getUpdateCount();
+ if (LOG.isTraceEnabled()) {
+ LOG.trace("Update count {}", updateCount);
+ }
+ return updateCount;
+ }
+ });
+ }
+
+ @Override
+ public int commitBatchComplete(final SqlEndpoint endpoint, final JdbcTemplate jdbcTemplate, final String query) throws Exception {
+ return 0;
+ }
+}
http://git-wip-us.apache.org/repos/asf/camel/blob/6cf99562/components/camel-elsql/src/main/resources/META-INF/LICENSE.txt
----------------------------------------------------------------------
diff --git a/components/camel-elsql/src/main/resources/META-INF/LICENSE.txt b/components/camel-elsql/src/main/resources/META-INF/LICENSE.txt
new file mode 100755
index 0000000..6b0b127
--- /dev/null
+++ b/components/camel-elsql/src/main/resources/META-INF/LICENSE.txt
@@ -0,0 +1,203 @@
+
+ Apache License
+ Version 2.0, January 2004
+ http://www.apache.org/licenses/
+
+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+ 1. Definitions.
+
+ "License" shall mean the terms and conditions for use, reproduction,
+ and distribution as defined by Sections 1 through 9 of this document.
+
+ "Licensor" shall mean the copyright owner or entity authorized by
+ the copyright owner that is granting the License.
+
+ "Legal Entity" shall mean the union of the acting entity and all
+ other entities that control, are controlled by, or are under common
+ control with that entity. For the purposes of this definition,
+ "control" means (i) the power, direct or indirect, to cause the
+ direction or management of such entity, whether by contract or
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
+ outstanding shares, or (iii) beneficial ownership of such entity.
+
+ "You" (or "Your") shall mean an individual or Legal Entity
+ exercising permissions granted by this License.
+
+ "Source" form shall mean the preferred form for making modifications,
+ including but not limited to software source code, documentation
+ source, and configuration files.
+
+ "Object" form shall mean any form resulting from mechanical
+ transformation or translation of a Source form, including but
+ not limited to compiled object code, generated documentation,
+ and conversions to other media types.
+
+ "Work" shall mean the work of authorship, whether in Source or
+ Object form, made available under the License, as indicated by a
+ copyright notice that is included in or attached to the work
+ (an example is provided in the Appendix below).
+
+ "Derivative Works" shall mean any work, whether in Source or Object
+ form, that is based on (or derived from) the Work and for which the
+ editorial revisions, annotations, elaborations, or other modifications
+ represent, as a whole, an original work of authorship. For the purposes
+ of this License, Derivative Works shall not include works that remain
+ separable from, or merely link (or bind by name) to the interfaces of,
+ the Work and Derivative Works thereof.
+
+ "Contribution" shall mean any work of authorship, including
+ the original version of the Work and any modifications or additions
+ to that Work or Derivative Works thereof, that is intentionally
+ submitted to Licensor for inclusion in the Work by the copyright owner
+ or by an individual or Legal Entity authorized to submit on behalf of
+ the copyright owner. For the purposes of this definition, "submitted"
+ means any form of electronic, verbal, or written communication sent
+ to the Licensor or its representatives, including but not limited to
+ communication on electronic mailing lists, source code control systems,
+ and issue tracking systems that are managed by, or on behalf of, the
+ Licensor for the purpose of discussing and improving the Work, but
+ excluding communication that is conspicuously marked or otherwise
+ designated in writing by the copyright owner as "Not a Contribution."
+
+ "Contributor" shall mean Licensor and any individual or Legal Entity
+ on behalf of whom a Contribution has been received by Licensor and
+ subsequently incorporated within the Work.
+
+ 2. Grant of Copyright License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ copyright license to reproduce, prepare Derivative Works of,
+ publicly display, publicly perform, sublicense, and distribute the
+ Work and such Derivative Works in Source or Object form.
+
+ 3. Grant of Patent License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ (except as stated in this section) patent license to make, have made,
+ use, offer to sell, sell, import, and otherwise transfer the Work,
+ where such license applies only to those patent claims licensable
+ by such Contributor that are necessarily infringed by their
+ Contribution(s) alone or by combination of their Contribution(s)
+ with the Work to which such Contribution(s) was submitted. If You
+ institute patent litigation against any entity (including a
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
+ or a Contribution incorporated within the Work constitutes direct
+ or contributory patent infringement, then any patent licenses
+ granted to You under this License for that Work shall terminate
+ as of the date such litigation is filed.
+
+ 4. Redistribution. You may reproduce and distribute copies of the
+ Work or Derivative Works thereof in any medium, with or without
+ modifications, and in Source or Object form, provided that You
+ meet the following conditions:
+
+ (a) You must give any other recipients of the Work or
+ Derivative Works a copy of this License; and
+
+ (b) You must cause any modified files to carry prominent notices
+ stating that You changed the files; and
+
+ (c) You must retain, in the Source form of any Derivative Works
+ that You distribute, all copyright, patent, trademark, and
+ attribution notices from the Source form of the Work,
+ excluding those notices that do not pertain to any part of
+ the Derivative Works; and
+
+ (d) If the Work includes a "NOTICE" text file as part of its
+ distribution, then any Derivative Works that You distribute must
+ include a readable copy of the attribution notices contained
+ within such NOTICE file, excluding those notices that do not
+ pertain to any part of the Derivative Works, in at least one
+ of the following places: within a NOTICE text file distributed
+ as part of the Derivative Works; within the Source form or
+ documentation, if provided along with the Derivative Works; or,
+ within a display generated by the Derivative Works, if and
+ wherever such third-party notices normally appear. The contents
+ of the NOTICE file are for informational purposes only and
+ do not modify the License. You may add Your own attribution
+ notices within Derivative Works that You distribute, alongside
+ or as an addendum to the NOTICE text from the Work, provided
+ that such additional attribution notices cannot be construed
+ as modifying the License.
+
+ You may add Your own copyright statement to Your modifications and
+ may provide additional or different license terms and conditions
+ for use, reproduction, or distribution of Your modifications, or
+ for any such Derivative Works as a whole, provided Your use,
+ reproduction, and distribution of the Work otherwise complies with
+ the conditions stated in this License.
+
+ 5. Submission of Contributions. Unless You explicitly state otherwise,
+ any Contribution intentionally submitted for inclusion in the Work
+ by You to the Licensor shall be under the terms and conditions of
+ this License, without any additional terms or conditions.
+ Notwithstanding the above, nothing herein shall supersede or modify
+ the terms of any separate license agreement you may have executed
+ with Licensor regarding such Contributions.
+
+ 6. Trademarks. This License does not grant permission to use the trade
+ names, trademarks, service marks, or product names of the Licensor,
+ except as required for reasonable and customary use in describing the
+ origin of the Work and reproducing the content of the NOTICE file.
+
+ 7. Disclaimer of Warranty. Unless required by applicable law or
+ agreed to in writing, Licensor provides the Work (and each
+ Contributor provides its Contributions) on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied, including, without limitation, any warranties or conditions
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+ PARTICULAR PURPOSE. You are solely responsible for determining the
+ appropriateness of using or redistributing the Work and assume any
+ risks associated with Your exercise of permissions under this License.
+
+ 8. Limitation of Liability. In no event and under no legal theory,
+ whether in tort (including negligence), contract, or otherwise,
+ unless required by applicable law (such as deliberate and grossly
+ negligent acts) or agreed to in writing, shall any Contributor be
+ liable to You for damages, including any direct, indirect, special,
+ incidental, or consequential damages of any character arising as a
+ result of this License or out of the use or inability to use the
+ Work (including but not limited to damages for loss of goodwill,
+ work stoppage, computer failure or malfunction, or any and all
+ other commercial damages or losses), even if such Contributor
+ has been advised of the possibility of such damages.
+
+ 9. Accepting Warranty or Additional Liability. While redistributing
+ the Work or Derivative Works thereof, You may choose to offer,
+ and charge a fee for, acceptance of support, warranty, indemnity,
+ or other liability obligations and/or rights consistent with this
+ License. However, in accepting such obligations, You may act only
+ on Your own behalf and on Your sole responsibility, not on behalf
+ of any other Contributor, and only if You agree to indemnify,
+ defend, and hold each Contributor harmless for any liability
+ incurred by, or claims asserted against, such Contributor by reason
+ of your accepting any such warranty or additional liability.
+
+ END OF TERMS AND CONDITIONS
+
+ APPENDIX: How to apply the Apache License to your work.
+
+ To apply the Apache License to your work, attach the following
+ boilerplate notice, with the fields enclosed by brackets "[]"
+ replaced with your own identifying information. (Don't include
+ the brackets!) The text should be enclosed in the appropriate
+ comment syntax for the file format. We also recommend that a
+ file or class name and description of purpose be included on the
+ same "printed page" as the copyright notice for easier
+ identification within third-party archives.
+
+ Copyright [yyyy] [name of copyright owner]
+
+ Licensed 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.
+
http://git-wip-us.apache.org/repos/asf/camel/blob/6cf99562/components/camel-elsql/src/main/resources/META-INF/NOTICE.txt
----------------------------------------------------------------------
diff --git a/components/camel-elsql/src/main/resources/META-INF/NOTICE.txt b/components/camel-elsql/src/main/resources/META-INF/NOTICE.txt
new file mode 100755
index 0000000..2e215bf
--- /dev/null
+++ b/components/camel-elsql/src/main/resources/META-INF/NOTICE.txt
@@ -0,0 +1,11 @@
+ =========================================================================
+ == NOTICE file corresponding to the section 4 d of ==
+ == the Apache License, Version 2.0, ==
+ == in this case for the Apache Camel distribution. ==
+ =========================================================================
+
+ This product includes software developed by
+ The Apache Software Foundation (http://www.apache.org/).
+
+ Please read the different LICENSE files present in the licenses directory of
+ this distribution.
http://git-wip-us.apache.org/repos/asf/camel/blob/6cf99562/components/camel-elsql/src/main/resources/META-INF/services/org/apache/camel/component/elsql
----------------------------------------------------------------------
diff --git a/components/camel-elsql/src/main/resources/META-INF/services/org/apache/camel/component/elsql b/components/camel-elsql/src/main/resources/META-INF/services/org/apache/camel/component/elsql
new file mode 100644
index 0000000..d27a646
--- /dev/null
+++ b/components/camel-elsql/src/main/resources/META-INF/services/org/apache/camel/component/elsql
@@ -0,0 +1,18 @@
+#
+# 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.
+#
+
+class=org.apache.camel.component.elsql.ElsqlComponent
http://git-wip-us.apache.org/repos/asf/camel/blob/6cf99562/components/camel-sql/src/main/java/org/apache/camel/component/sql/SqlComponent.java
----------------------------------------------------------------------
diff --git a/components/camel-sql/src/main/java/org/apache/camel/component/sql/SqlComponent.java b/components/camel-sql/src/main/java/org/apache/camel/component/sql/SqlComponent.java
index 5cdbed8..1d9ada5 100755
--- a/components/camel-sql/src/main/java/org/apache/camel/component/sql/SqlComponent.java
+++ b/components/camel-sql/src/main/java/org/apache/camel/component/sql/SqlComponent.java
@@ -45,6 +45,10 @@ public class SqlComponent extends UriEndpointComponent {
super(context, SqlEndpoint.class);
}
+ public SqlComponent(CamelContext context, Class<? extends Endpoint> endpointClass) {
+ super(context, endpointClass);
+ }
+
@Override
protected Endpoint createEndpoint(String uri, String remaining, Map<String, Object> parameters) throws Exception {
DataSource target = null;
http://git-wip-us.apache.org/repos/asf/camel/blob/6cf99562/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 b477531..af0d4ad 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
@@ -421,7 +421,7 @@ public class SqlEndpoint extends DefaultPollingEndpoint {
}
@SuppressWarnings("unchecked")
- protected List<?> queryForList(ResultSet rs, boolean allowMapToClass) throws SQLException {
+ public List<?> queryForList(ResultSet rs, boolean allowMapToClass) throws SQLException {
if (allowMapToClass && outputClass != null) {
Class<?> outputClazz = getCamelContext().getClassResolver().resolveClass(outputClass);
RowMapper rowMapper = new BeanPropertyRowMapper(outputClazz);
@@ -437,7 +437,7 @@ public class SqlEndpoint extends DefaultPollingEndpoint {
}
@SuppressWarnings("unchecked")
- protected Object queryForObject(ResultSet rs) throws SQLException {
+ public Object queryForObject(ResultSet rs) throws SQLException {
Object result = null;
if (outputClass == null) {
RowMapper rowMapper = new ColumnMapRowMapper();
|