Repository: camel Updated Branches: refs/heads/camel-2.19.x 6fcf16616 -> cee2be28a refs/heads/master b684edc6d -> e3139a014
CAMEL-11320: sql-stored - Should not extend polling endpoint as its not for consumer Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/e3139a01 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/e3139a01 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/e3139a01 Branch: refs/heads/master Commit: e3139a014372fcab056bd4efb8766a6354254c65 Parents: b684edc Author: Claus Ibsen <davscl...@apache.org> Authored: Wed May 24 14:45:47 2017 +0200 Committer: Claus Ibsen <davscl...@apache.org> Committed: Wed May 24 14:45:47 2017 +0200 ---------------------------------------------------------------------- .../sql/stored/SqlStoredComponent.java | 22 +++----------------- .../component/sql/stored/SqlStoredEndpoint.java | 11 ++++++++-- 2 files changed, 12 insertions(+), 21 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/e3139a01/components/camel-sql/src/main/java/org/apache/camel/component/sql/stored/SqlStoredComponent.java ---------------------------------------------------------------------- diff --git a/components/camel-sql/src/main/java/org/apache/camel/component/sql/stored/SqlStoredComponent.java b/components/camel-sql/src/main/java/org/apache/camel/component/sql/stored/SqlStoredComponent.java index ab8a9f0..25eb3b2 100644 --- a/components/camel-sql/src/main/java/org/apache/camel/component/sql/stored/SqlStoredComponent.java +++ b/components/camel-sql/src/main/java/org/apache/camel/component/sql/stored/SqlStoredComponent.java @@ -20,29 +20,13 @@ import java.util.Map; import java.util.Set; import javax.sql.DataSource; -import org.apache.camel.CamelContext; import org.apache.camel.Endpoint; -import org.apache.camel.impl.UriEndpointComponent; +import org.apache.camel.impl.DefaultComponent; import org.springframework.jdbc.core.JdbcTemplate; -public class SqlStoredComponent extends UriEndpointComponent { - private DataSource dataSource; - - public SqlStoredComponent() { - super(SqlStoredEndpoint.class); - } - - public SqlStoredComponent(Class<? extends Endpoint> endpointClass) { - super(endpointClass); - } +public class SqlStoredComponent extends DefaultComponent { - public SqlStoredComponent(CamelContext context) { - super(context, SqlStoredEndpoint.class); - } - - public SqlStoredComponent(CamelContext context, Class<? extends Endpoint> endpointClass) { - super(context, endpointClass); - } + private DataSource dataSource; @Override protected Endpoint createEndpoint(String uri, String template, Map<String, Object> parameters) throws Exception { http://git-wip-us.apache.org/repos/asf/camel/blob/e3139a01/components/camel-sql/src/main/java/org/apache/camel/component/sql/stored/SqlStoredEndpoint.java ---------------------------------------------------------------------- diff --git a/components/camel-sql/src/main/java/org/apache/camel/component/sql/stored/SqlStoredEndpoint.java b/components/camel-sql/src/main/java/org/apache/camel/component/sql/stored/SqlStoredEndpoint.java index 5204ae8..93ebdde 100644 --- a/components/camel-sql/src/main/java/org/apache/camel/component/sql/stored/SqlStoredEndpoint.java +++ b/components/camel-sql/src/main/java/org/apache/camel/component/sql/stored/SqlStoredEndpoint.java @@ -18,9 +18,11 @@ package org.apache.camel.component.sql.stored; import javax.sql.DataSource; +import org.apache.camel.Consumer; +import org.apache.camel.Processor; import org.apache.camel.Producer; import org.apache.camel.component.sql.stored.template.TemplateParser; -import org.apache.camel.impl.DefaultPollingEndpoint; +import org.apache.camel.impl.DefaultEndpoint; import org.apache.camel.spi.Metadata; import org.apache.camel.spi.UriEndpoint; import org.apache.camel.spi.UriParam; @@ -32,7 +34,7 @@ import org.springframework.jdbc.core.JdbcTemplate; * The sql component allows you to work with databases using JDBC Stored Procedure queries. */ @UriEndpoint(firstVersion = "2.17.0", scheme = "sql-stored", title = "SQL Stored Procedure", syntax = "sql-stored:template", producerOnly = true, label = "database,sql") -public class SqlStoredEndpoint extends DefaultPollingEndpoint { +public class SqlStoredEndpoint extends DefaultEndpoint { private CallableStatementWrapperFactory wrapperFactory; private JdbcTemplate jdbcTemplate; @@ -66,6 +68,11 @@ public class SqlStoredEndpoint extends DefaultPollingEndpoint { } @Override + public Consumer createConsumer(Processor processor) throws Exception { + throw new UnsupportedOperationException("Consumer not supported"); + } + + @Override protected String createEndpointUri() { // Make sure it's properly encoded return "sql-stored:" + UnsafeUriCharactersEncoder.encode(this.template);
