This is an automated email from the ASF dual-hosted git repository.
aldettinger pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/master by this push:
new 3bffb51 Fixed camel-mybatis tests and warnings
3bffb51 is described below
commit 3bffb51c4535b73af2c7160769f10a4ddc1060c2
Author: aldettinger <aldettin...@gmail.com>
AuthorDate: Sat Nov 10 18:28:22 2018 +0100
Fixed camel-mybatis tests and warnings
---
.../component/mybatis/MyBatisBeanProducer.java | 2 +-
.../mybatis/MyBatisBatchConsumerTest.java | 8 +--
.../camel/component/mybatis/MyBatisQueueTest.java | 2 +-
.../component/mybatis/MyBatisTestSupport.java | 68 +++++++++++++---------
4 files changed, 48 insertions(+), 32 deletions(-)
diff --git
a/components/camel-mybatis/src/main/java/org/apache/camel/component/mybatis/MyBatisBeanProducer.java
b/components/camel-mybatis/src/main/java/org/apache/camel/component/mybatis/MyBatisBeanProducer.java
index 0bdf76c..4569dc3 100644
---
a/components/camel-mybatis/src/main/java/org/apache/camel/component/mybatis/MyBatisBeanProducer.java
+++
b/components/camel-mybatis/src/main/java/org/apache/camel/component/mybatis/MyBatisBeanProducer.java
@@ -93,7 +93,7 @@ public class MyBatisBeanProducer extends DefaultProducer {
private BeanProcessor createBeanProcessor(SqlSession session) throws
Exception {
// discover the bean and get the mapper
// is the bean a alias type
- Class clazz =
session.getConfiguration().getTypeAliasRegistry().resolveAlias(endpoint.getBeanName());
+ Class<?> clazz =
session.getConfiguration().getTypeAliasRegistry().resolveAlias(endpoint.getBeanName());
if (clazz == null) {
// its maybe a FQN so try to use Camel to lookup the class
clazz =
getEndpoint().getCamelContext().getClassResolver().resolveMandatoryClass(endpoint.getBeanName());
diff --git
a/components/camel-mybatis/src/test/java/org/apache/camel/component/mybatis/MyBatisBatchConsumerTest.java
b/components/camel-mybatis/src/test/java/org/apache/camel/component/mybatis/MyBatisBatchConsumerTest.java
index 79fc9ea..6742a24 100644
---
a/components/camel-mybatis/src/test/java/org/apache/camel/component/mybatis/MyBatisBatchConsumerTest.java
+++
b/components/camel-mybatis/src/test/java/org/apache/camel/component/mybatis/MyBatisBatchConsumerTest.java
@@ -27,10 +27,10 @@ public class MyBatisBatchConsumerTest extends
MyBatisTestSupport {
public void testBatchConsumer() throws Exception {
MockEndpoint mock = getMockEndpoint("mock:result");
mock.expectedMessageCount(2);
- mock.message(0).property(Exchange.BATCH_INDEX).isEqualTo(0);
- mock.message(0).property(Exchange.BATCH_COMPLETE).isEqualTo(false);
- mock.message(1).property(Exchange.BATCH_INDEX).isEqualTo(1);
- mock.message(1).property(Exchange.BATCH_COMPLETE).isEqualTo(true);
+ mock.message(0).exchangeProperty(Exchange.BATCH_INDEX).isEqualTo(0);
+
mock.message(0).exchangeProperty(Exchange.BATCH_COMPLETE).isEqualTo(false);
+ mock.message(1).exchangeProperty(Exchange.BATCH_INDEX).isEqualTo(1);
+
mock.message(1).exchangeProperty(Exchange.BATCH_COMPLETE).isEqualTo(true);
mock.expectedPropertyReceived(Exchange.BATCH_SIZE, 2);
assertMockEndpointsSatisfied();
diff --git
a/components/camel-mybatis/src/test/java/org/apache/camel/component/mybatis/MyBatisQueueTest.java
b/components/camel-mybatis/src/test/java/org/apache/camel/component/mybatis/MyBatisQueueTest.java
index ccb7edc..1b308d8 100644
---
a/components/camel-mybatis/src/test/java/org/apache/camel/component/mybatis/MyBatisQueueTest.java
+++
b/components/camel-mybatis/src/test/java/org/apache/camel/component/mybatis/MyBatisQueueTest.java
@@ -28,7 +28,7 @@ public class MyBatisQueueTest extends MyBatisTestSupport {
return false;
}
- protected String createStatement() {
+ protected String getCreateStatement() {
return "create table ACCOUNT (ACC_ID INTEGER, ACC_FIRST_NAME
VARCHAR(255), ACC_LAST_NAME VARCHAR(255), ACC_EMAIL VARCHAR(255), PROCESSED
BOOLEAN DEFAULT false)";
}
diff --git
a/components/camel-mybatis/src/test/java/org/apache/camel/component/mybatis/MyBatisTestSupport.java
b/components/camel-mybatis/src/test/java/org/apache/camel/component/mybatis/MyBatisTestSupport.java
index e84a448..4d540e6 100644
---
a/components/camel-mybatis/src/test/java/org/apache/camel/component/mybatis/MyBatisTestSupport.java
+++
b/components/camel-mybatis/src/test/java/org/apache/camel/component/mybatis/MyBatisTestSupport.java
@@ -17,10 +17,10 @@
package org.apache.camel.component.mybatis;
import java.sql.Connection;
+import java.sql.ResultSet;
import java.sql.Statement;
import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.After;
import org.junit.Before;
public abstract class MyBatisTestSupport extends CamelTestSupport {
@@ -28,8 +28,31 @@ public abstract class MyBatisTestSupport extends
CamelTestSupport {
protected boolean createTestData() {
return true;
}
-
- protected String createStatement() {
+
+ /**
+ * Gets the name of the database table handling the test data.
+ *
+ * @return The name of the database table handling the test data.
+ */
+ protected String getTableName() {
+ return "ACCOUNT";
+ }
+
+ /**
+ * Gets the SQL query dropping the test data table.
+ *
+ * @return The SQL query dropping the test data table.
+ */
+ protected String getDropStatement() {
+ return "drop table ACCOUNT";
+ }
+
+ /**
+ * Gets the SQL query creating the test data table.
+ *
+ * @return The SQL query creating the test data table.
+ */
+ protected String getCreateStatement() {
return "create table ACCOUNT (ACC_ID INTEGER, ACC_FIRST_NAME
VARCHAR(255), ACC_LAST_NAME VARCHAR(255), ACC_EMAIL VARCHAR(255))";
}
@@ -38,13 +61,20 @@ public abstract class MyBatisTestSupport extends
CamelTestSupport {
public void setUp() throws Exception {
super.setUp();
- // lets create the table...
- Connection connection = createConnection();
- Statement statement = connection.createStatement();
- statement.execute(createStatement());
- connection.commit();
- statement.close();
- connection.close();
+ try (Connection connection = createConnection();
+ ResultSet checkTableExistResultSet =
connection.getMetaData().getTables(null, null, getTableName(), null);
+ Statement deletePreExistingTableStatement =
connection.createStatement();
+ Statement createTableStatement = connection.createStatement()) {
+
+ // delete any pre-existing ACCOUNT table
+ if (checkTableExistResultSet.next()) {
+ deletePreExistingTableStatement.execute(getDropStatement());
+ }
+
+ // lets create the table...
+ createTableStatement.execute(getCreateStatement());
+ connection.commit();
+ }
if (createTestData()) {
Account account1 = new Account();
@@ -58,23 +88,9 @@ public abstract class MyBatisTestSupport extends
CamelTestSupport {
account2.setFirstName("Claus");
account2.setLastName("Ibsen");
account2.setEmailAddress("non...@gmail.com");
-
- template.sendBody("mybatis:insertAccount?statementType=Insert",
new Account[]{account1, account2});
- }
- }
- @Override
- @After
- public void tearDown() throws Exception {
- // should drop the table properly to avoid any side effects while
running all the tests together under maven
- Connection connection = createConnection();
- Statement statement = connection.createStatement();
- statement.execute("drop table ACCOUNT");
- connection.commit();
- statement.close();
- connection.close();
-
- super.tearDown();
+ template.sendBody("mybatis:insertAccount?statementType=Insert",
new Account[] {account1, account2});
+ }
}
protected Connection createConnection() throws Exception {
