You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by cm...@apache.org on 2012/03/13 22:08:40 UTC

svn commit: r1300355 - in /camel/branches/camel-2.8.x/components/camel-mybatis/src: main/java/org/apache/camel/component/mybatis/ test/java/org/apache/camel/component/mybatis/ test/resources/

Author: cmueller
Date: Tue Mar 13 21:08:40 2012
New Revision: 1300355

URL: http://svn.apache.org/viewvc?rev=1300355&view=rev
Log:
CAMEL-5081: org.apache.camel.component.mybatis.MyBatisBatchConsumerTest.testBatchConsumer() fails unpredictable

Modified:
    camel/branches/camel-2.8.x/components/camel-mybatis/src/main/java/org/apache/camel/component/mybatis/DefaultMyBatisProcessingStrategy.java
    camel/branches/camel-2.8.x/components/camel-mybatis/src/main/java/org/apache/camel/component/mybatis/MyBatisComponent.java
    camel/branches/camel-2.8.x/components/camel-mybatis/src/main/java/org/apache/camel/component/mybatis/MyBatisConsumer.java
    camel/branches/camel-2.8.x/components/camel-mybatis/src/main/java/org/apache/camel/component/mybatis/MyBatisProcessingStrategy.java
    camel/branches/camel-2.8.x/components/camel-mybatis/src/main/java/org/apache/camel/component/mybatis/MyBatisProducer.java
    camel/branches/camel-2.8.x/components/camel-mybatis/src/test/java/org/apache/camel/component/mybatis/MyBatisBatchConsumerTest.java
    camel/branches/camel-2.8.x/components/camel-mybatis/src/test/java/org/apache/camel/component/mybatis/MyBatisTestSupport.java
    camel/branches/camel-2.8.x/components/camel-mybatis/src/test/resources/SqlMapConfig.xml

Modified: camel/branches/camel-2.8.x/components/camel-mybatis/src/main/java/org/apache/camel/component/mybatis/DefaultMyBatisProcessingStrategy.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.8.x/components/camel-mybatis/src/main/java/org/apache/camel/component/mybatis/DefaultMyBatisProcessingStrategy.java?rev=1300355&r1=1300354&r2=1300355&view=diff
==============================================================================
--- camel/branches/camel-2.8.x/components/camel-mybatis/src/main/java/org/apache/camel/component/mybatis/DefaultMyBatisProcessingStrategy.java (original)
+++ camel/branches/camel-2.8.x/components/camel-mybatis/src/main/java/org/apache/camel/component/mybatis/DefaultMyBatisProcessingStrategy.java Tue Mar 13 21:08:40 2012
@@ -40,7 +40,7 @@ public class DefaultMyBatisProcessingStr
         }
     }
 
-    public List poll(MyBatisConsumer consumer, MyBatisEndpoint endpoint) throws Exception {
+    public List<?> poll(MyBatisConsumer consumer, MyBatisEndpoint endpoint) throws Exception {
         SqlSession session = endpoint.getSqlSessionFactory().openSession();
         try {
             return session.selectList(endpoint.getStatement(), null);

Modified: camel/branches/camel-2.8.x/components/camel-mybatis/src/main/java/org/apache/camel/component/mybatis/MyBatisComponent.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.8.x/components/camel-mybatis/src/main/java/org/apache/camel/component/mybatis/MyBatisComponent.java?rev=1300355&r1=1300354&r2=1300355&view=diff
==============================================================================
--- camel/branches/camel-2.8.x/components/camel-mybatis/src/main/java/org/apache/camel/component/mybatis/MyBatisComponent.java (original)
+++ camel/branches/camel-2.8.x/components/camel-mybatis/src/main/java/org/apache/camel/component/mybatis/MyBatisComponent.java Tue Mar 13 21:08:40 2012
@@ -18,14 +18,12 @@ package org.apache.camel.component.mybat
 
 import java.io.IOException;
 import java.io.InputStream;
-import java.io.Reader;
 import java.util.Map;
 
 import org.apache.camel.Endpoint;
 import org.apache.camel.impl.DefaultComponent;
 import org.apache.camel.util.IOHelper;
 import org.apache.camel.util.ObjectHelper;
-import org.apache.ibatis.io.Resources;
 import org.apache.ibatis.session.SqlSessionFactory;
 import org.apache.ibatis.session.SqlSessionFactoryBuilder;
 

Modified: camel/branches/camel-2.8.x/components/camel-mybatis/src/main/java/org/apache/camel/component/mybatis/MyBatisConsumer.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.8.x/components/camel-mybatis/src/main/java/org/apache/camel/component/mybatis/MyBatisConsumer.java?rev=1300355&r1=1300354&r2=1300355&view=diff
==============================================================================
--- camel/branches/camel-2.8.x/components/camel-mybatis/src/main/java/org/apache/camel/component/mybatis/MyBatisConsumer.java (original)
+++ camel/branches/camel-2.8.x/components/camel-mybatis/src/main/java/org/apache/camel/component/mybatis/MyBatisConsumer.java Tue Mar 13 21:08:40 2012
@@ -146,7 +146,7 @@ public class MyBatisConsumer extends Sch
             pendingExchanges = total - index - 1;
 
             // process the current exchange
-            LOG.debug("Processing exchange: {}", exchange);
+            LOG.debug("Processing exchange: {} with properties: {}", exchange, exchange.getProperties());
             getProcessor().process(exchange);
 
             try {

Modified: camel/branches/camel-2.8.x/components/camel-mybatis/src/main/java/org/apache/camel/component/mybatis/MyBatisProcessingStrategy.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.8.x/components/camel-mybatis/src/main/java/org/apache/camel/component/mybatis/MyBatisProcessingStrategy.java?rev=1300355&r1=1300354&r2=1300355&view=diff
==============================================================================
--- camel/branches/camel-2.8.x/components/camel-mybatis/src/main/java/org/apache/camel/component/mybatis/MyBatisProcessingStrategy.java (original)
+++ camel/branches/camel-2.8.x/components/camel-mybatis/src/main/java/org/apache/camel/component/mybatis/MyBatisProcessingStrategy.java Tue Mar 13 21:08:40 2012
@@ -35,7 +35,7 @@ public interface MyBatisProcessingStrate
      * @return Results of the query as a {@link List}
      * @throws Exception can be thrown in case of error
      */
-    List poll(MyBatisConsumer consumer, MyBatisEndpoint endpoint) throws Exception;
+    List<?> poll(MyBatisConsumer consumer, MyBatisEndpoint endpoint) throws Exception;
 
     /**
      * Commit callback if there are a statements to be run after processing.

Modified: camel/branches/camel-2.8.x/components/camel-mybatis/src/main/java/org/apache/camel/component/mybatis/MyBatisProducer.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.8.x/components/camel-mybatis/src/main/java/org/apache/camel/component/mybatis/MyBatisProducer.java?rev=1300355&r1=1300354&r2=1300355&view=diff
==============================================================================
--- camel/branches/camel-2.8.x/components/camel-mybatis/src/main/java/org/apache/camel/component/mybatis/MyBatisProducer.java (original)
+++ camel/branches/camel-2.8.x/components/camel-mybatis/src/main/java/org/apache/camel/component/mybatis/MyBatisProducer.java Tue Mar 13 21:08:40 2012
@@ -108,7 +108,7 @@ public class MyBatisProducer extends Def
             Object in = exchange.getIn().getBody();
             if (in != null) {
                 // lets handle arrays or collections of objects
-                Iterator iter = ObjectHelper.createIterator(in);
+                Iterator<?> iter = ObjectHelper.createIterator(in);
                 while (iter.hasNext()) {
                     Object value = iter.next();
                     LOG.trace("Inserting: {} using statement: {}", value, statement);
@@ -134,7 +134,7 @@ public class MyBatisProducer extends Def
             Object in = exchange.getIn().getBody();
             if (in != null) {
                 // lets handle arrays or collections of objects
-                Iterator iter = ObjectHelper.createIterator(in);
+                Iterator<?> iter = ObjectHelper.createIterator(in);
                 while (iter.hasNext()) {
                     Object value = iter.next();
                     LOG.trace("Updating: {} using statement: {}", value, statement);
@@ -160,7 +160,7 @@ public class MyBatisProducer extends Def
             Object in = exchange.getIn().getBody();
             if (in != null) {
                 // lets handle arrays or collections of objects
-                Iterator iter = ObjectHelper.createIterator(in);
+                Iterator<?> iter = ObjectHelper.createIterator(in);
                 while (iter.hasNext()) {
                     Object value = iter.next();
                     LOG.trace("Deleting: {} using statement: {}", value, statement);

Modified: camel/branches/camel-2.8.x/components/camel-mybatis/src/test/java/org/apache/camel/component/mybatis/MyBatisBatchConsumerTest.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.8.x/components/camel-mybatis/src/test/java/org/apache/camel/component/mybatis/MyBatisBatchConsumerTest.java?rev=1300355&r1=1300354&r2=1300355&view=diff
==============================================================================
--- camel/branches/camel-2.8.x/components/camel-mybatis/src/test/java/org/apache/camel/component/mybatis/MyBatisBatchConsumerTest.java (original)
+++ camel/branches/camel-2.8.x/components/camel-mybatis/src/test/java/org/apache/camel/component/mybatis/MyBatisBatchConsumerTest.java Tue Mar 13 21:08:40 2012
@@ -21,9 +21,6 @@ import org.apache.camel.builder.RouteBui
 import org.apache.camel.component.mock.MockEndpoint;
 import org.junit.Test;
 
-/**
- * @version 
- */
 public class MyBatisBatchConsumerTest extends MyBatisTestSupport {
 
     @Test

Modified: camel/branches/camel-2.8.x/components/camel-mybatis/src/test/java/org/apache/camel/component/mybatis/MyBatisTestSupport.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.8.x/components/camel-mybatis/src/test/java/org/apache/camel/component/mybatis/MyBatisTestSupport.java?rev=1300355&r1=1300354&r2=1300355&view=diff
==============================================================================
--- camel/branches/camel-2.8.x/components/camel-mybatis/src/test/java/org/apache/camel/component/mybatis/MyBatisTestSupport.java (original)
+++ camel/branches/camel-2.8.x/components/camel-mybatis/src/test/java/org/apache/camel/component/mybatis/MyBatisTestSupport.java Tue Mar 13 21:08:40 2012
@@ -46,25 +46,46 @@ public abstract class MyBatisTestSupport
 
         // lets create the database...
         Connection connection = createConnection();
-        Statement statement = connection.createStatement();
-        statement.execute(createStatement());
-        connection.commit();
-        connection.close();
+        Statement statement = null;
+        
+        try {
+            statement = connection.createStatement();
+            statement.execute(createStatement());
+            connection.commit();
+        } catch (SQLException sqle) {
+            connection.rollback();
+        } finally {
+            if (statement != null) {
+                try {
+                    statement.close();
+                } catch (SQLException e) {
+                    // noop
+                }
+            }
+            
+            if (connection != null) {
+                try {
+                    connection.close();
+                } catch (SQLException e) {
+                    // noop
+                }
+            }
+        }
 
         if (createTestData()) {
-            Account account = new Account();
-            account.setId(123);
-            account.setFirstName("James");
-            account.setLastName("Strachan");
-            account.setEmailAddress("TryGuessing@gmail.com");
-            template.sendBody("mybatis:insertAccount?statementType=Insert", account);
-
-            account = new Account();
-            account.setId(456);
-            account.setFirstName("Claus");
-            account.setLastName("Ibsen");
-            account.setEmailAddress("Noname@gmail.com");
-            template.sendBody("mybatis:insertAccount?statementType=Insert", account);
+            Account account1 = new Account();
+            account1.setId(123);
+            account1.setFirstName("James");
+            account1.setLastName("Strachan");
+            account1.setEmailAddress("TryGuessing@gmail.com");
+
+            Account account2 = new Account();
+            account2.setId(456);
+            account2.setFirstName("Claus");
+            account2.setLastName("Ibsen");
+            account2.setEmailAddress("Noname@gmail.com");
+            
+            template.sendBody("mybatis:insertAccount?statementType=Insert", new Account[]{account1, account2});
         }
     }
 

Modified: camel/branches/camel-2.8.x/components/camel-mybatis/src/test/resources/SqlMapConfig.xml
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.8.x/components/camel-mybatis/src/test/resources/SqlMapConfig.xml?rev=1300355&r1=1300354&r2=1300355&view=diff
==============================================================================
--- camel/branches/camel-2.8.x/components/camel-mybatis/src/test/resources/SqlMapConfig.xml (original)
+++ camel/branches/camel-2.8.x/components/camel-mybatis/src/test/resources/SqlMapConfig.xml Tue Mar 13 21:08:40 2012
@@ -38,8 +38,6 @@
             <dataSource type="POOLED">
                 <property name="driver" value="org.apache.derby.jdbc.EmbeddedDriver"/>
                 <property name="url" value="jdbc:derby:memory:mybatis;create=true"/>
-                <property name="username" value="sa"/>
-                <property name="password" value=""/>
             </dataSource>
         </environment>
     </environments>