From f242d9b25aaf37eb3bd4c54a86f4ec951a87e5fa Mon Sep 17 00:00:00 2001 From: Zheng Feng Date: Wed, 12 Nov 2025 15:37:55 +0800 Subject: [PATCH] Remove Derby JDBC support after upstream removal MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Derby JDBC extension was removed from Quarkus upstream, so removing all related code, dependencies, tests, and configurations from quarkus-mybatis and quarkus-mybatis-plus modules. This includes: - Removed quarkus-jdbc-derby and quarkus-test-derby dependencies - Deleted DerbyUserMapper and related test resources - Removed Derby datasource configurations from application.properties - Updated tests to remove Derby-specific test cases 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude --- mybatis-plus/deployment/pom.xml | 10 ---------- mybatis-plus/integration-tests/pom.xml | 8 -------- mybatis/deployment/pom.xml | 10 ---------- .../quarkiverse/mybatis/test/MyBatisTest.java | 7 ------- .../quarkiverse/mybatis/test/TestResources.java | 2 -- .../src/test/resources/application.properties | 4 ---- mybatis/integration-tests/pom.xml | 8 -------- .../quarkiverse/it/mybatis/DerbyUserMapper.java | 15 --------------- .../quarkiverse/it/mybatis/MyBatisResource.java | 17 ----------------- .../src/main/resources/application.properties | 5 ----- .../src/main/resources/insert-derby.sql | 11 ----------- .../main/resources/mapper/DerbyUserMapper.xml | 12 ------------ .../it/mybatis/BaseMyBatisTestCase.java | 3 --- .../it/mybatis/MultipleDataSourcesTest.java | 3 --- .../quarkiverse/it/mybatis/TestResources.java | 2 -- 15 files changed, 117 deletions(-) delete mode 100644 mybatis/integration-tests/src/main/java/io/quarkiverse/it/mybatis/DerbyUserMapper.java delete mode 100644 mybatis/integration-tests/src/main/resources/insert-derby.sql delete mode 100644 mybatis/integration-tests/src/main/resources/mapper/DerbyUserMapper.xml diff --git a/mybatis-plus/deployment/pom.xml b/mybatis-plus/deployment/pom.xml index 0935d798..5df40b2e 100644 --- a/mybatis-plus/deployment/pom.xml +++ b/mybatis-plus/deployment/pom.xml @@ -33,21 +33,11 @@ quarkus-test-h2 test - - io.quarkus - quarkus-test-derby - test - io.quarkus quarkus-jdbc-h2-deployment test - - io.quarkus - quarkus-jdbc-derby - test - diff --git a/mybatis-plus/integration-tests/pom.xml b/mybatis-plus/integration-tests/pom.xml index 99f264a5..0aafef2f 100644 --- a/mybatis-plus/integration-tests/pom.xml +++ b/mybatis-plus/integration-tests/pom.xml @@ -37,10 +37,6 @@ io.quarkus quarkus-jdbc-h2 - - io.quarkus - quarkus-jdbc-derby - @@ -57,10 +53,6 @@ io.quarkus quarkus-test-h2 test - - io.quarkus - quarkus-test-derby - test diff --git a/mybatis/deployment/pom.xml b/mybatis/deployment/pom.xml index 6e9cd00f..6655ce7b 100644 --- a/mybatis/deployment/pom.xml +++ b/mybatis/deployment/pom.xml @@ -36,21 +36,11 @@ quarkus-test-h2 test - - io.quarkus - quarkus-test-derby - test - io.quarkus quarkus-jdbc-h2-deployment test - - io.quarkus - quarkus-jdbc-derby - test - diff --git a/mybatis/deployment/src/test/java/io/quarkiverse/mybatis/test/MyBatisTest.java b/mybatis/deployment/src/test/java/io/quarkiverse/mybatis/test/MyBatisTest.java index 979fbbc1..458e0c6c 100644 --- a/mybatis/deployment/src/test/java/io/quarkiverse/mybatis/test/MyBatisTest.java +++ b/mybatis/deployment/src/test/java/io/quarkiverse/mybatis/test/MyBatisTest.java @@ -6,7 +6,6 @@ import java.util.UUID; import jakarta.inject.Inject; -import jakarta.inject.Named; import org.apache.ibatis.session.SqlSessionFactory; import org.jboss.shrinkwrap.api.ShrinkWrap; @@ -29,9 +28,6 @@ public class MyBatisTest { @Inject SqlSessionFactory h2SqlSessionFactory; - @Named("derby") - SqlSessionFactory derbySqlSessionFactory; - @Test public void test() throws Exception { assertTrue(h2SqlSessionFactory.getConfiguration().getMapperRegistry().hasMapper(UserMapper.class)); @@ -40,8 +36,5 @@ public void test() throws Exception { assertEquals(user.getId(), 1); assertEquals(user.getName(), "Test User1"); assertEquals(user.getExternalId(), UUID.fromString("8c5034fe-1a00-43b7-9c75-f83ef14e3507")); - - assertEquals("Apache Derby", - derbySqlSessionFactory.openSession().getConnection().getMetaData().getDatabaseProductName()); } } diff --git a/mybatis/deployment/src/test/java/io/quarkiverse/mybatis/test/TestResources.java b/mybatis/deployment/src/test/java/io/quarkiverse/mybatis/test/TestResources.java index ef8eab6d..10a524b3 100644 --- a/mybatis/deployment/src/test/java/io/quarkiverse/mybatis/test/TestResources.java +++ b/mybatis/deployment/src/test/java/io/quarkiverse/mybatis/test/TestResources.java @@ -1,10 +1,8 @@ package io.quarkiverse.mybatis.test; import io.quarkus.test.common.QuarkusTestResource; -import io.quarkus.test.derby.DerbyDatabaseTestResource; import io.quarkus.test.h2.H2DatabaseTestResource; @QuarkusTestResource(H2DatabaseTestResource.class) -@QuarkusTestResource(DerbyDatabaseTestResource.class) public class TestResources { } diff --git a/mybatis/deployment/src/test/resources/application.properties b/mybatis/deployment/src/test/resources/application.properties index 49e97483..fbc95990 100644 --- a/mybatis/deployment/src/test/resources/application.properties +++ b/mybatis/deployment/src/test/resources/application.properties @@ -3,7 +3,3 @@ quarkus.datasource.db-kind=h2 quarkus.datasource.username=username-default quarkus.datasource.jdbc.url=jdbc:h2:tcp://localhost/mem:default quarkus.mybatis.initial-sql=insert.sql - -# Derby -quarkus.datasource.derby.db-kind=derby -quarkus.datasource.derby.jdbc.url=jdbc:derby://localhost:1527/memory:testDB;create=true diff --git a/mybatis/integration-tests/pom.xml b/mybatis/integration-tests/pom.xml index 83d55a43..a42765b0 100644 --- a/mybatis/integration-tests/pom.xml +++ b/mybatis/integration-tests/pom.xml @@ -37,10 +37,6 @@ io.quarkus quarkus-jdbc-h2 - - io.quarkus - quarkus-jdbc-derby - @@ -57,10 +53,6 @@ io.quarkus quarkus-test-h2 test - - io.quarkus - quarkus-test-derby - test diff --git a/mybatis/integration-tests/src/main/java/io/quarkiverse/it/mybatis/DerbyUserMapper.java b/mybatis/integration-tests/src/main/java/io/quarkiverse/it/mybatis/DerbyUserMapper.java deleted file mode 100644 index 78b73e8a..00000000 --- a/mybatis/integration-tests/src/main/java/io/quarkiverse/it/mybatis/DerbyUserMapper.java +++ /dev/null @@ -1,15 +0,0 @@ -package io.quarkiverse.it.mybatis; - -import org.apache.ibatis.annotations.Mapper; -import org.apache.ibatis.annotations.Select; - -import io.quarkiverse.mybatis.runtime.meta.MapperDataSource; - -@Mapper -@MapperDataSource("derby") -public interface DerbyUserMapper { - @Select("select count(*) from users") - int getUserCount(); - - User findById(Integer id); -} diff --git a/mybatis/integration-tests/src/main/java/io/quarkiverse/it/mybatis/MyBatisResource.java b/mybatis/integration-tests/src/main/java/io/quarkiverse/it/mybatis/MyBatisResource.java index 10278d29..e4413ab5 100644 --- a/mybatis/integration-tests/src/main/java/io/quarkiverse/it/mybatis/MyBatisResource.java +++ b/mybatis/integration-tests/src/main/java/io/quarkiverse/it/mybatis/MyBatisResource.java @@ -27,9 +27,6 @@ public class MyBatisResource { @Inject BookMapper bookMapper; - @Inject - DerbyUserMapper derbyUserMapper; - @Path("/user/{id}") @GET @Produces(MediaType.APPLICATION_JSON) @@ -68,13 +65,6 @@ public int getUserCount() { return userMapper.getUserCount(); } - @Path("/user/count/derby") - @GET - @Produces(MediaType.APPLICATION_JSON) - public int getDerbyUserCount() { - return derbyUserMapper.getUserCount(); - } - @Path("/user/cursor") @GET @Produces(MediaType.APPLICATION_JSON) @@ -109,11 +99,4 @@ public Book findBookById(@PathParam("id") Integer id) { public User findUserById(@PathParam("id") Integer id) { return userMapper.findById(id); } - - @Path("/user/xmlMapper/derby/{id}") - @GET - @Produces(MediaType.APPLICATION_JSON) - public User findDerbyUserById(@PathParam("id") Integer id) { - return derbyUserMapper.findById(id); - } } diff --git a/mybatis/integration-tests/src/main/resources/application.properties b/mybatis/integration-tests/src/main/resources/application.properties index 1dd7f735..43e889b2 100644 --- a/mybatis/integration-tests/src/main/resources/application.properties +++ b/mybatis/integration-tests/src/main/resources/application.properties @@ -5,9 +5,4 @@ quarkus.datasource.jdbc.url=jdbc:h2:tcp://localhost/mem:default quarkus.mybatis.initial-sql=insert.sql quarkus.mybatis.configuration-factory=io.quarkiverse.it.mybatis.PageConfigurationFactory -# Derby -quarkus.datasource.derby.db-kind=derby -quarkus.datasource.derby.jdbc.url=jdbc:derby://localhost:1527/memory:testDB;create=true -quarkus.mybatis.derby.initial-sql=insert-derby.sql - quarkus.mybatis.mapper-locations=mapper,otherMapper/ diff --git a/mybatis/integration-tests/src/main/resources/insert-derby.sql b/mybatis/integration-tests/src/main/resources/insert-derby.sql deleted file mode 100644 index 2538c7f7..00000000 --- a/mybatis/integration-tests/src/main/resources/insert-derby.sql +++ /dev/null @@ -1,11 +0,0 @@ -CREATE TABLE USERS ( - id integer not null primary key, - name varchar(80) not null, - external_id varchar(50) not null -); - -DELETE FROM users; -insert into users (id, name, external_id) values (1, 'Test User1', 'ccb16b65-8924-4c3f-8c55-681d85a16e79'); -insert into users (id, name, external_id) values (2, 'Test User2', 'ae43f233-0b69-4c4e-bfa9-656c475150ad'); -insert into users (id, name, external_id) values (3, 'Test User3', '5640e179-466c-427e-9747-4cfac09a2f9a'); -insert into users (id, name, external_id) values (4, 'Test User4', '5640e179-466c-427e-9747-4cfacsfdsdfd'); diff --git a/mybatis/integration-tests/src/main/resources/mapper/DerbyUserMapper.xml b/mybatis/integration-tests/src/main/resources/mapper/DerbyUserMapper.xml deleted file mode 100644 index 8c2a52c1..00000000 --- a/mybatis/integration-tests/src/main/resources/mapper/DerbyUserMapper.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - diff --git a/mybatis/integration-tests/src/test/java/io/quarkiverse/it/mybatis/BaseMyBatisTestCase.java b/mybatis/integration-tests/src/test/java/io/quarkiverse/it/mybatis/BaseMyBatisTestCase.java index 4419cd44..eae648a5 100644 --- a/mybatis/integration-tests/src/test/java/io/quarkiverse/it/mybatis/BaseMyBatisTestCase.java +++ b/mybatis/integration-tests/src/test/java/io/quarkiverse/it/mybatis/BaseMyBatisTestCase.java @@ -35,9 +35,6 @@ public void runTest() { RestAssured.when().get("/mybatis/user/xmlMapper/1").then() .body(is("{\"id\":1,\"name\":\"Test User1\",\"externalId\":\"ccb16b65-8924-4c3f-8c55-681d85a16e79\"}")); - RestAssured.when().get("/mybatis/user/xmlMapper/derby/1").then() - .body(is("{\"id\":1,\"name\":\"Test User1\",\"externalId\":\"ccb16b65-8924-4c3f-8c55-681d85a16e79\"}")); - RestAssured.when().get("/mybatis/user/cursor").then() .body(is("[\"Test User1\",\"Test User2\",\"New User\"]")); } diff --git a/mybatis/integration-tests/src/test/java/io/quarkiverse/it/mybatis/MultipleDataSourcesTest.java b/mybatis/integration-tests/src/test/java/io/quarkiverse/it/mybatis/MultipleDataSourcesTest.java index 66fcee63..6557bd59 100644 --- a/mybatis/integration-tests/src/test/java/io/quarkiverse/it/mybatis/MultipleDataSourcesTest.java +++ b/mybatis/integration-tests/src/test/java/io/quarkiverse/it/mybatis/MultipleDataSourcesTest.java @@ -13,8 +13,5 @@ class MultipleDataSourcesTest { public void test() { RestAssured.when().get("/mybatis/user/count/h2").then() .body(is("3")); - - RestAssured.when().get("/mybatis/user/count/derby").then() - .body(is("4")); } } diff --git a/mybatis/integration-tests/src/test/java/io/quarkiverse/it/mybatis/TestResources.java b/mybatis/integration-tests/src/test/java/io/quarkiverse/it/mybatis/TestResources.java index f2a31dad..f5cdd44b 100644 --- a/mybatis/integration-tests/src/test/java/io/quarkiverse/it/mybatis/TestResources.java +++ b/mybatis/integration-tests/src/test/java/io/quarkiverse/it/mybatis/TestResources.java @@ -1,10 +1,8 @@ package io.quarkiverse.it.mybatis; import io.quarkus.test.common.QuarkusTestResource; -import io.quarkus.test.derby.DerbyDatabaseTestResource; import io.quarkus.test.h2.H2DatabaseTestResource; @QuarkusTestResource(H2DatabaseTestResource.class) -@QuarkusTestResource(DerbyDatabaseTestResource.class) public class TestResources { }