Add unit tests for dynamic-datasource-spring-boot3-starter (#552)

.github/workflows/ci.yml

@@ -0,0 +1,67 @@
+name: CI
+
+on:
+  push:
+    branches: [ master ]
+    paths:
+      - '.github/workflows/ci.yml'
+      - '**/pom.xml'
+      - '**/src/main/**'
+      - '**/src/test/**'
+  pull_request:
+    branches: [ master ]
+    paths:
+      - '.github/workflows/ci.yml'
+      - '**/pom.xml'
+      - '**/src/main/**'
+      - '**/src/test/**'
+
+concurrency:
+  group: ${{ github.event_name }}-${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
+env:
+  MAVEN_OPTS: -Dhttps.protocols=TLSv1.2 -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=WARN -Dorg.slf4j.simpleLogger.showDateTime=true -Djava.awt.headless=true
+
+jobs:
+  test-maximum-jdk-ci:
+    name: Test CI - JDK ${{ matrix.java-version }} on ${{ matrix.os }}
+    runs-on: ${{ matrix.os }}
+    timeout-minutes: 60
+    strategy:
+      matrix:
+        os: [ ubuntu-latest ]
+        java-version: [ '17' ]
+    steps:
+      - uses: actions/checkout@v3
+      - name: Setup java
+        uses: actions/setup-java@v3
+        with:
+          distribution: 'temurin'
+          java-version: ${{ matrix.java-version }}
+          cache: 'maven'
+      - name: Build test with Maven
+        run: |
+          ./mvnw -am -pl dynamic-datasource-spring-boot3-starter -T1C -B clean test
+  test-minimum-jdk-ci:
+    name: Test CI - JDK ${{ matrix.java-version }} on ${{ matrix.os }}
+    runs-on: ${{ matrix.os }}
+    timeout-minutes: 60
+    strategy:
+      matrix:
+        os: [ ubuntu-latest ]
+        java-version: [ '8' ]
+    steps:
+      - uses: actions/checkout@v3
+      - name: Setup java
+        uses: actions/setup-java@v3
+        with:
+          distribution: 'temurin'
+          java-version: ${{ matrix.java-version }}
+          cache: 'maven'
+      - name: Build test with Maven
+        run: |
+          ./mvnw -am -pl dynamic-datasource-creator -T1C -B clean package
+          ./mvnw -am -pl dynamic-datasource-spring -T1C -B clean package
+          ./mvnw -am -pl dynamic-datasource-spring-boot-common -T1C -B clean package
+          ./mvnw -am -pl dynamic-datasource-spring-boot-starter -T1C -B clean package

README.md

@@ -21,7 +21,7 @@
         <img src="https://img.shields.io/:license-apache-brightgreen.svg" >
     </a>
     <a>
-        <img src="https://img.shields.io/badge/JDK-1.7+-green.svg" >
+        <img src="https://img.shields.io/badge/JDK-8+-green.svg" >
     </a>
     <a>
         <img src="https://img.shields.io/badge/springBoot-1.5.x__2.x.x__3.x.x-green.svg" >

dynamic-datasource-spring-boot3-starter/pom.xml

@@ -16,7 +16,7 @@
 
 
     <properties>
-        <java.version>11</java.version>
+        <java.version>17</java.version>
         <spring-boot-dependencies.version>3.1.1</spring-boot-dependencies.version>
     </properties>
 
@@ -41,6 +41,17 @@
             <artifactId>spring-boot-configuration-processor</artifactId>
             <optional>true</optional>
         </dependency>
+        <dependency>
+            <groupId>com.h2database</groupId>
+            <artifactId>h2</artifactId>
+            <version>${h2.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-test</artifactId>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
 </project>

dynamic-datasource-spring-boot3-starter/src/test/java/com/baomidou/dynamic/datasource/fixture/AddRemoveDatasourceTest.java

@@ -0,0 +1,68 @@
+/*
+ * Copyright © 2018 organization baomidou
+ *
+ * Licensed 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 com.baomidou.dynamic.datasource.fixture;
+
+import com.baomidou.dynamic.datasource.DynamicRoutingDataSource;
+import com.baomidou.dynamic.datasource.creator.DataSourceProperty;
+import com.baomidou.dynamic.datasource.creator.DefaultDataSourceCreator;
+import com.baomidou.dynamic.datasource.creator.hikaricp.HikariCpConfig;
+import org.junit.jupiter.api.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.jdbc.datasource.SimpleDriverDataSource;
+
+import javax.sql.DataSource;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.springframework.boot.test.context.SpringBootTest.WebEnvironment.RANDOM_PORT;
+
+@SpringBootTest(classes = AddRemoveDatasourceApplication.class, webEnvironment = RANDOM_PORT)
+public class AddRemoveDatasourceTest {
+
+    @Autowired
+    DataSource dataSource;
+
+    @Autowired
+    DefaultDataSourceCreator dataSourceCreator;
+
+    @Test
+    void testAddAndRemoveDataSource() {
+        HikariCpConfig hikariCpConfig = new HikariCpConfig();
+        hikariCpConfig.setConnectionTestQuery("select 1");
+        DataSourceProperty dataSourceProperty = new DataSourceProperty();
+        dataSourceProperty.setHikari(hikariCpConfig);
+        dataSourceProperty.setPoolName("slave_1");
+        dataSourceProperty.setUsername("sa");
+        dataSourceProperty.setPassword("");
+        dataSourceProperty.setType(SimpleDriverDataSource.class);
+        dataSourceProperty.setUrl("jdbc:h2:mem:test1;MODE=MySQL");
+        dataSourceProperty.setDriverClassName("org.h2.Driver");
+        DynamicRoutingDataSource ds = (DynamicRoutingDataSource) dataSource;
+        ds.addDataSource(dataSourceProperty.getPoolName(), dataSourceCreator.createDataSource(dataSourceProperty));
+        assertThat(ds.getDataSources().keySet()).contains("slave_1");
+        ds.removeDataSource("slave_1");
+        assertThat(ds.getDataSources().keySet()).doesNotContain("slave_1");
+    }
+}
+
+@SpringBootApplication
+class AddRemoveDatasourceApplication {
+    public static void main(String[] args) {
+        SpringApplication.run(AddRemoveDatasourceApplication.class, args);
+    }
+}

dynamic-datasource-spring-boot3-starter/src/test/java/com/baomidou/dynamic/datasource/fixture/LoadDatasourceFromJDBCTest.java

@@ -0,0 +1,95 @@
+/*
+ * Copyright © 2018 organization baomidou
+ *
+ * Licensed 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 com.baomidou.dynamic.datasource.fixture;
+
+import com.baomidou.dynamic.datasource.DynamicRoutingDataSource;
+import com.baomidou.dynamic.datasource.creator.DataSourceProperty;
+import com.baomidou.dynamic.datasource.creator.DefaultDataSourceCreator;
+import com.baomidou.dynamic.datasource.provider.AbstractJdbcDataSourceProvider;
+import com.baomidou.dynamic.datasource.provider.DynamicDataSourceProvider;
+import org.junit.jupiter.api.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.context.annotation.Bean;
+import org.springframework.jdbc.datasource.SimpleDriverDataSource;
+
+import javax.sql.DataSource;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.Statement;
+import java.util.HashMap;
+import java.util.Map;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.springframework.boot.test.context.SpringBootTest.WebEnvironment.RANDOM_PORT;
+
+@SpringBootTest(classes = LoadDatasourceFromJDBCApplication.class, webEnvironment = RANDOM_PORT)
+public class LoadDatasourceFromJDBCTest {
+
+    @Autowired
+    DataSource dataSource;
+
+    @Test
+    void testExistDataSource() {
+        DynamicRoutingDataSource ds = (DynamicRoutingDataSource) dataSource;
+        assertThat(ds.getDataSources().keySet()).contains("master", "db1", "db2", "db3");
+    }
+}
+
+@SuppressWarnings({"SqlDialectInspection", "SqlNoDataSourceInspection"})
+@SpringBootApplication
+class LoadDatasourceFromJDBCApplication {
+
+    public static void main(String[] args) {
+        SpringApplication.run(LoadDatasourceFromJDBCApplication.class, args);
+    }
+
+    @Bean
+    public DynamicDataSourceProvider dynamicDataSourceProvider(DefaultDataSourceCreator dataSourceCreator) {
+        return new AbstractJdbcDataSourceProvider(dataSourceCreator, "org.h2.Driver", "jdbc:h2:mem:test;MODE=MySQL", "sa", "") {
+            @Override
+            protected Map<String, DataSourceProperty> executeStmt(Statement statement) throws SQLException {
+                statement.execute("""
+                        CREATE TABLE IF NOT EXISTS `DB`
+                        (
+                            `name`   VARCHAR(30) NULL DEFAULT NULL,
+                            `username`   VARCHAR(30) NULL DEFAULT NULL,
+                            `password`   VARCHAR(30) NULL DEFAULT NULL,
+                            `url`   VARCHAR(30) NULL DEFAULT NULL,
+                            `driver`   VARCHAR(30) NULL DEFAULT NULL
+                        )""");
+                statement.executeUpdate("insert into DB values ('master','sa','','jdbc:h2:mem:test;MODE=MySQL','org.h2.Driver')");
+                statement.executeUpdate("insert into DB values ('db1','sa','','jdbc:h2:mem:test2','org.h2.Driver')");
+                statement.executeUpdate("insert into DB values ('db2','sa','','jdbc:h2:mem:test3','org.h2.Driver')");
+                statement.executeUpdate("insert into DB values ('db3','sa','','jdbc:h2:mem:test4','org.h2.Driver')");
+                Map<String, DataSourceProperty> map = new HashMap<>();
+                ResultSet rs = statement.executeQuery("select * from DB");
+                while (rs.next()) {
+                    DataSourceProperty dataSourceProperty = new DataSourceProperty();
+                    dataSourceProperty.setUsername(rs.getString("username"));
+                    dataSourceProperty.setPassword(rs.getString("password"));
+                    dataSourceProperty.setUrl(rs.getString("url"));
+                    dataSourceProperty.setDriverClassName(rs.getString("driver"));
+                    dataSourceProperty.setType(SimpleDriverDataSource.class);
+                    map.put(rs.getString("name"), dataSourceProperty);
+                }
+                return map;
+            }
+        };
+    }
+}

dynamic-datasource-spring-boot3-starter/src/test/java/com/baomidou/dynamic/datasource/fixture/NestDataSourceTest.java

@@ -0,0 +1,95 @@
+/*
+ * Copyright © 2018 organization baomidou
+ *
+ * Licensed 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 com.baomidou.dynamic.datasource.fixture;
+
+import com.baomidou.dynamic.datasource.DynamicRoutingDataSource;
+import com.baomidou.dynamic.datasource.creator.DataSourceProperty;
+import com.baomidou.dynamic.datasource.creator.DefaultDataSourceCreator;
+import com.baomidou.dynamic.datasource.fixture.service.nest.*;
+import org.h2.tools.Server;
+import org.junit.jupiter.api.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.context.annotation.Bean;
+
+import javax.sql.DataSource;
+import java.sql.SQLException;
+import java.util.List;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.springframework.boot.test.context.SpringBootTest.WebEnvironment.RANDOM_PORT;
+
+@SpringBootTest(classes = NestApplication.class, webEnvironment = RANDOM_PORT)
+public class NestDataSourceTest {
+
+    @Autowired
+    DataSource dataSource;
+
+    @Autowired
+    DefaultDataSourceCreator dataSourceCreator;
+
+    @Autowired
+    TeacherService teacherService;
+
+    @Autowired
+    StudentService studentService;
+
+    @Autowired
+    SchoolService schoolService;
+
+    @Test
+    void testNest() {
+        DataSourceProperty masterDataSourceProperty = new DataSourceProperty();
+        masterDataSourceProperty.setPoolName("master");
+        masterDataSourceProperty.setDriverClassName("org.h2.Driver");
+        masterDataSourceProperty.setUrl("jdbc:h2:mem:test;MODE=MySQL;DB_CLOSE_ON_EXIT=FALSE;INIT=RUNSCRIPT FROM 'classpath:db/add-remove-datasource.sql'");
+        masterDataSourceProperty.setUsername("sa");
+        masterDataSourceProperty.setPassword("");
+        DataSourceProperty teacherDataSourceProperty = new DataSourceProperty();
+        teacherDataSourceProperty.setPoolName("teacher");
+        teacherDataSourceProperty.setDriverClassName("org.h2.Driver");
+        teacherDataSourceProperty.setUrl("jdbc:h2:mem:test;MODE=MySQL;DB_CLOSE_ON_EXIT=FALSE;INIT=RUNSCRIPT FROM 'classpath:db/add-remove-datasource.sql'");
+        teacherDataSourceProperty.setUsername("sa");
+        teacherDataSourceProperty.setPassword("");
+        DataSourceProperty studentDataSourceProperty = new DataSourceProperty();
+        studentDataSourceProperty.setPoolName("student");
+        studentDataSourceProperty.setDriverClassName("org.h2.Driver");
+        studentDataSourceProperty.setUrl("jdbc:h2:mem:test;MODE=MySQL;DB_CLOSE_ON_EXIT=FALSE;INIT=RUNSCRIPT FROM 'classpath:db/add-remove-datasource.sql'");
+        studentDataSourceProperty.setUsername("sa");
+        studentDataSourceProperty.setPassword("");
+        DynamicRoutingDataSource ds = (DynamicRoutingDataSource) dataSource;
+        ds.addDataSource(masterDataSourceProperty.getPoolName(), dataSourceCreator.createDataSource(masterDataSourceProperty));
+        ds.addDataSource(teacherDataSourceProperty.getPoolName(), dataSourceCreator.createDataSource(teacherDataSourceProperty));
+        ds.addDataSource(studentDataSourceProperty.getPoolName(), dataSourceCreator.createDataSource(studentDataSourceProperty));
+        assertThat(ds.getDataSources().keySet()).contains("master", "teacher", "student");
+        assertThat(teacherService.addTeacherWithTx("ss", 1)).isEqualTo(1);
+        assertThat(studentService.addStudentWithTx("tt", 2)).isEqualTo(1);
+        assertThat(teacherService.selectTeachers()).isEqualTo(List.of(new Teacher(1, "tt", 2)));
+        assertThat(studentService.selectStudents()).isEqualTo(List.of(new Student(1, "tt", 2)));
+        assertThat(schoolService.addTeacherAndStudentWithTx()).isEqualTo(2);
+        assertThat(teacherService.selectTeachers()).isEqualTo(List.of(new Teacher(1, "tt", 2), new Teacher(2, "bb", 4)));
+        assertThat(studentService.selectStudents()).isEqualTo(List.of(new Student(1, "tt", 2), new Student(2, "bb", 4)));
+    }
+}
+
+@SpringBootApplication
+class NestApplication {
+    public static void main(String[] args) {
+        SpringApplication.run(NestApplication.class, args);
+    }
+}