Fix #4717 to expand camel-quarkus-mybatis test coverage

Author: zhfeng

integration-tests/mybatis/pom.xml

@@ -37,11 +37,11 @@
         </dependency>
         <dependency>
             <groupId>org.apache.camel.quarkus</groupId>
-            <artifactId>camel-quarkus-mock</artifactId>
+            <artifactId>camel-quarkus-jta</artifactId>
         </dependency>
         <dependency>
             <groupId>org.apache.camel.quarkus</groupId>
-            <artifactId>camel-quarkus-jta</artifactId>
+            <artifactId>camel-quarkus-mock</artifactId>
         </dependency>
         <dependency>
             <groupId>org.apache.camel.quarkus</groupId>

integration-tests/mybatis/src/main/java/org/apache/camel/quarkus/component/mybatis/it/MyBatisRoute.java

@@ -20,23 +20,49 @@
 import javax.enterprise.context.ApplicationScoped;
 
 import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.quarkus.component.mybatis.it.entity.Account;
 
 @ApplicationScoped
 public class MyBatisRoute extends RouteBuilder {
     @Override
     public void configure() throws Exception {
         from("direct:selectOne")
-                .to("mybatis:selectAccountById?statementType=SelectOne")
-                .to("mock:result");
+                .to("mybatis:selectAccountById?statementType=SelectOne");
+
+        from("direct:selectList")
+                .to("mybatis:selectAllAccounts?statementType=SelectList");
 
         from("direct:insertOne")
                 .transacted()
                 .to("mybatis:insertAccount?statementType=Insert")
-                .to("mock:result");
+                .process(exchange -> {
+                    Account account = exchange.getIn().getBody(Account.class);
+                    if (account.getFirstName().equals("Rollback")) {
+                        throw new RuntimeException("Rollback");
+                    }
+                });
+
+        from("direct:insertList")
+                .transacted()
+                .to("mybatis:batchInsertAccount?statementType=InsertList");
 
         from("direct:deleteOne")
                 .transacted()
-                .to("mybatis:deleteAccountById?statementType=Delete")
-                .to("mock:result");
+                .to("mybatis:deleteAccountById?statementType=Delete");
+
+        from("direct:deleteList")
+                .transacted()
+                .to("mybatis:batchDeleteAccountById?statementType=DeleteList");
+
+        from("direct:updateOne")
+                .transacted()
+                .to("mybatis:updateAccount?statementType=Update");
+
+        from("direct:updateList")
+                .transacted()
+                .to("mybatis:batchUpdateAccount?statementType=UpdateList");
+
+        from("mybatis:selectUnprocessedAccounts?onConsume=consumeAccount").routeId("mybatis-consumer").autoStartup(false)
+                .to("mock:results");
     }
 }

integration-tests/mybatis/src/main/java/org/apache/camel/quarkus/component/mybatis/it/MybatisResource.java

@@ -16,25 +16,33 @@
  */
 package org.apache.camel.quarkus.component.mybatis.it;
 
+import java.util.List;
+import java.util.Map;
+
 import javax.enterprise.context.ApplicationScoped;
 import javax.inject.Inject;
 import javax.transaction.Transactional;
 import javax.ws.rs.Consumes;
 import javax.ws.rs.DELETE;
 import javax.ws.rs.GET;
 import javax.ws.rs.NotFoundException;
+import javax.ws.rs.PATCH;
 import javax.ws.rs.POST;
 import javax.ws.rs.Path;
 import javax.ws.rs.Produces;
 import javax.ws.rs.QueryParam;
 import javax.ws.rs.core.MediaType;
 
+import org.apache.camel.CamelContext;
 import org.apache.camel.ProducerTemplate;
+import org.apache.camel.component.mock.MockEndpoint;
 import org.apache.camel.quarkus.component.mybatis.it.entity.Account;
 
 @Path("/mybatis")
 @ApplicationScoped
 public class MybatisResource {
+    @Inject
+    CamelContext context;
 
     @Inject
     ProducerTemplate template;
@@ -50,6 +58,13 @@ public Account selectOne(@QueryParam("id") Integer id) {
         return account;
     }
 
+    @Path("/selectList")
+    @GET
+    @Produces(MediaType.APPLICATION_JSON)
+    public List selectList() {
+        return template.requestBody("direct:selectList", null, List.class);
+    }
+
     @Path("/insertOne")
     @POST
     @Consumes(MediaType.APPLICATION_JSON)
@@ -60,6 +75,16 @@ public Integer insertOne(Account account) {
         return getCounts();
     }
 
+    @Path("/insertList")
+    @POST
+    @Consumes(MediaType.APPLICATION_JSON)
+    @Produces(MediaType.TEXT_PLAIN)
+    @Transactional
+    public Integer insertList(List<Account> accounts) {
+        template.sendBody("direct:insertList", accounts);
+        return getCounts();
+    }
+
     @Path("/deleteOne")
     @DELETE
     @Produces(MediaType.TEXT_PLAIN)
@@ -69,7 +94,49 @@ public Integer deleteOne(@QueryParam("id") Integer id) {
         return getCounts();
     }
 
+    @Path("/deleteList")
+    @DELETE
+    @Produces(MediaType.TEXT_PLAIN)
+    @Transactional
+    public Integer deleteList(List<Integer> ids) {
+        template.sendBody("direct:deleteList", ids);
+        return getCounts();
+    }
+
+    @Path("/updateOne")
+    @PATCH
+    @Consumes(MediaType.APPLICATION_JSON)
+    @Produces(MediaType.TEXT_PLAIN)
+    @Transactional
+    public Integer updateOne(Account account) {
+        template.sendBody("direct:updateOne", account);
+        return getCounts();
+    }
+
+    @Path("/updateList")
+    @PATCH
+    @Consumes(MediaType.APPLICATION_JSON)
+    @Produces(MediaType.TEXT_PLAIN)
+    @Transactional
+    public Integer updateList(Map<String, Object> params) {
+        template.sendBody("direct:updateList", params);
+        return getCounts();
+    }
+
     private Integer getCounts() {
         return template.requestBody("mybatis:count?statementType=SelectOne", null, Integer.class);
     }
+
+    @Path("/consumer")
+    @GET
+    @Produces(MediaType.APPLICATION_JSON)
+    public List consumer() throws Exception {
+        MockEndpoint results = context.getEndpoint("mock:results", MockEndpoint.class);
+        results.expectedMessageCount(2);
+
+        context.getRouteController().startRoute("mybatis-consumer");
+        MockEndpoint.assertIsSatisfied(context);
+
+        return template.requestBody("mybatis:selectProcessedAccounts?statementType=SelectList", null, List.class);
+    }
 }

integration-tests/mybatis/src/main/resources/application.properties

@@ -20,6 +20,8 @@ quarkus.datasource.username=username-default
 quarkus.datasource.jdbc.url=jdbc:h2:tcp://localhost/mem:default
 quarkus.datasource.jdbc.transactions=xa
 
+quarkus.transaction-manager.enable-recovery=true
+
 quarkus.mybatis.environment=development
 quarkus.mybatis.xmlconfig.enable=true
 quarkus.mybatis.xmlconfig.path=SqlMapConfig.xml

integration-tests/mybatis/src/main/resources/insert.sql

@@ -21,9 +21,10 @@ CREATE TABLE ACCOUNT (
     ACC_ID INTEGER,
     ACC_FIRST_NAME VARCHAR(255),
     ACC_LAST_NAME VARCHAR(255),
-    ACC_EMAIL VARCHAR(255)
+    ACC_EMAIL VARCHAR(255),
+    PROCESSED BOOLEAN DEFAULT false
 );
 
-INSERT INTO ACCOUNT VALUES (123, 'James', 'Strachan', '[email protected]');
-INSERT INTO ACCOUNT VALUES (456, 'Claus', 'Ibsen', '[email protected]');
+INSERT INTO ACCOUNT VALUES (123, 'James', 'Strachan', '[email protected]', false);
+INSERT INTO ACCOUNT VALUES (456, 'Claus', 'Ibsen', '[email protected]', false);
 

integration-tests/mybatis/src/test/java/org/apache/camel/quarkus/component/mybatis/it/MyBatisConsumerTest.java

@@ -0,0 +1,47 @@
+/*
+ * 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.quarkus.component.mybatis.it;
+
+import io.quarkus.test.common.QuarkusTestResource;
+import io.quarkus.test.h2.H2DatabaseTestResource;
+import io.quarkus.test.junit.QuarkusTest;
+import io.restassured.RestAssured;
+import org.junit.jupiter.api.Test;
+
+import static org.hamcrest.Matchers.equalTo;
+
+@QuarkusTest
+@QuarkusTestResource(H2DatabaseTestResource.class)
+public class MyBatisConsumerTest {
+
+    @Test
+    public void testSelectList() {
+        RestAssured.get("/mybatis/consumer")
+                .then()
+                .statusCode(200)
+                .body("size()", equalTo(2))
+                .body("[0].id", equalTo(123))
+                .body("[0].firstName", equalTo("James"))
+                .body("[0].lastName", equalTo("Strachan"))
+                .body("[0].emailAddress", equalTo("[email protected]"))
+                .body("[1].id", equalTo(456))
+                .body("[1].firstName", equalTo("Claus"))
+                .body("[1].lastName", equalTo("Ibsen"))
+                .body("[1].emailAddress", equalTo("[email protected]"));
+    }
+}