svn commit: r656617 - in /activemq/camel/trunk/components/camel-sql/src/main/java/org/apache/camel/component/sql: SqlComponent.java SqlEndpoint.java SqlProducer.java

[ro...@apache.org]

Author: romkal
Date: Thu May 15 05:15:45 2008
New Revision: 656617

URL: http://svn.apache.org/viewvc?rev=656617&view=rev
Log:
removed generics from SQL component classes

Modified:
    activemq/camel/trunk/components/camel-sql/src/main/java/org/apache/camel/component/sql/SqlComponent.java
    activemq/camel/trunk/components/camel-sql/src/main/java/org/apache/camel/component/sql/SqlEndpoint.java
    activemq/camel/trunk/components/camel-sql/src/main/java/org/apache/camel/component/sql/SqlProducer.java

Modified: activemq/camel/trunk/components/camel-sql/src/main/java/org/apache/camel/component/sql/SqlComponent.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-sql/src/main/java/org/apache/camel/component/sql/SqlComponent.java?rev=656617&r1=656616&r2=656617&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-sql/src/main/java/org/apache/camel/component/sql/SqlComponent.java (original)
+++ activemq/camel/trunk/components/camel-sql/src/main/java/org/apache/camel/component/sql/SqlComponent.java Thu May 15 05:15:45 2008
@@ -23,12 +23,11 @@
 import org.apache.camel.CamelContext;
 import org.apache.camel.Endpoint;
 import org.apache.camel.impl.DefaultComponent;
-import org.apache.camel.impl.DefaultExchange;
 
 /**
  * @version $Revision:520964 $
  */
-public class SqlComponent extends DefaultComponent<DefaultExchange> {
+public class SqlComponent extends DefaultComponent {
 
     private DataSource dataSource;
 
@@ -40,7 +39,7 @@
     }
 
     @Override
-    protected Endpoint<DefaultExchange> createEndpoint(String uri, String remaining, Map parameters)
+    protected Endpoint createEndpoint(String uri, String remaining, Map parameters)
         throws Exception {
         return new SqlEndpoint(uri, remaining.replaceAll("#", "?"), this, dataSource, parameters);
     }

Modified: activemq/camel/trunk/components/camel-sql/src/main/java/org/apache/camel/component/sql/SqlEndpoint.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-sql/src/main/java/org/apache/camel/component/sql/SqlEndpoint.java?rev=656617&r1=656616&r2=656617&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-sql/src/main/java/org/apache/camel/component/sql/SqlEndpoint.java (original)
+++ activemq/camel/trunk/components/camel-sql/src/main/java/org/apache/camel/component/sql/SqlEndpoint.java Thu May 15 05:15:45 2008
@@ -25,7 +25,6 @@
 import org.apache.camel.Processor;
 import org.apache.camel.Producer;
 import org.apache.camel.impl.DefaultEndpoint;
-import org.apache.camel.impl.DefaultExchange;
 import org.apache.camel.util.IntrospectionSupport;
 import org.springframework.jdbc.core.JdbcTemplate;
 
@@ -36,7 +35,7 @@
  *
  * @author romkal
  */
-public class SqlEndpoint extends DefaultEndpoint<DefaultExchange> {
+public class SqlEndpoint extends DefaultEndpoint {
 
     private JdbcTemplate jdbcTemplate;
 
@@ -55,11 +54,11 @@
         this.query = query;
     }
     
-    public Consumer<DefaultExchange> createConsumer(Processor processor) throws Exception {
+    public Consumer createConsumer(Processor processor) throws Exception {
         throw new UnsupportedOperationException("Not yet implemented");
     }
 
-    public Producer<DefaultExchange> createProducer() throws Exception {
+    public Producer createProducer() throws Exception {
         return new SqlProducer(this, query, jdbcTemplate);
     }
 

Modified: activemq/camel/trunk/components/camel-sql/src/main/java/org/apache/camel/component/sql/SqlProducer.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-sql/src/main/java/org/apache/camel/component/sql/SqlProducer.java?rev=656617&r1=656616&r2=656617&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-sql/src/main/java/org/apache/camel/component/sql/SqlProducer.java (original)
+++ activemq/camel/trunk/components/camel-sql/src/main/java/org/apache/camel/component/sql/SqlProducer.java Thu May 15 05:15:45 2008
@@ -22,7 +22,6 @@
 import java.util.List;
 
 import org.apache.camel.Exchange;
-import org.apache.camel.impl.DefaultExchange;
 import org.apache.camel.impl.DefaultProducer;
 import org.springframework.dao.DataAccessException;
 import org.springframework.jdbc.core.ColumnMapRowMapper;
@@ -30,7 +29,7 @@
 import org.springframework.jdbc.core.PreparedStatementCallback;
 import org.springframework.jdbc.core.RowMapperResultSetExtractor;
 
-public class SqlProducer extends DefaultProducer<DefaultExchange> {
+public class SqlProducer extends DefaultProducer {
 
     public static final String UPDATE_COUNT = "org.apache.camel.sql.update-count";
 
@@ -59,7 +58,7 @@
                 if (isResultSet) {
                     RowMapperResultSetExtractor mapper = new RowMapperResultSetExtractor(
                                                                                          new ColumnMapRowMapper());
-                    List result = (List)mapper.extractData(ps.getResultSet());
+                    List<?> result = (List<?>)mapper.extractData(ps.getResultSet());
                     exchange.getOut().setBody(result);
                 } else {
                     exchange.getIn().setHeader(UPDATE_COUNT, ps.getUpdateCount());