✨ 支持 spring-boot 4.0.0-M3

dynamic-datasource-creator/src/main/java/com/baomidou/dynamic/datasource/creator/c3p0/C3p0Config.java

@@ -1,3 +1,18 @@
+/*
+ * 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.creator.c3p0;
 
 import lombok.Getter;

dynamic-datasource-creator/src/main/java/com/baomidou/dynamic/datasource/creator/c3p0/C3p0DataSourceCreator.java

@@ -1,3 +1,18 @@
+/*
+ * 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.creator.c3p0;
 
 import com.baomidou.dynamic.datasource.creator.DataSourceCreator;

dynamic-datasource-spring-boot-starter/src/main/java/com/baomidou/dynamic/datasource/spring/boot/autoconfigure/DynamicDataSourcePoolMetricsAutoConfiguration.java

@@ -1,3 +1,18 @@
+/*
+ * 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.spring.boot.autoconfigure;
 
 import com.baomidou.dynamic.datasource.DynamicRoutingDataSource;

dynamic-datasource-spring-boot3-starter/src/main/java/com/baomidou/dynamic/datasource/spring/boot/autoconfigure/DynamicDataSourcePoolMetricsAutoConfiguration.java

@@ -1,3 +1,18 @@
+/*
+ * 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.spring.boot.autoconfigure;
 
 import com.baomidou.dynamic.datasource.DynamicRoutingDataSource;

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

@@ -0,0 +1,85 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xmlns="http://maven.apache.org/POM/4.0.0"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>com.baomidou</groupId>
+        <artifactId>dynamic-datasource</artifactId>
+        <version>4.3.1</version>
+    </parent>
+
+    <artifactId>dynamic-datasource-spring-boot4-starter</artifactId>
+    <url>
+        https://github.com/baomidou/dynamic-datasource-spring-boot-starter/tree/master/dynamic-datasource-spring-boot4-starter
+    </url>
+
+    <properties>
+        <java.version>17</java.version>
+        <spring-boot-dependencies.version>4.0.0-M3</spring-boot-dependencies.version>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>com.baomidou</groupId>
+            <artifactId>dynamic-datasource-spring-boot-common</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-web</artifactId>
+            <optional>true</optional>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-jdbc</artifactId>
+            <optional>true</optional>
+        </dependency>
+        <!-- TODO 待 com.alibaba:druid-spring-boot-4-starter 完成发布后修正版本号 -->
+        <dependency>
+            <groupId>com.alibaba</groupId>
+            <artifactId>druid-spring-boot-4-starter</artifactId>
+            <version>1.2.28-SNAPSHOT</version>
+            <optional>true</optional>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-actuator</artifactId>
+            <optional>true</optional>
+        </dependency>
+        <dependency>
+            <groupId>com.zaxxer</groupId>
+            <artifactId>HikariCP</artifactId>
+            <optional>true</optional>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-configuration-processor</artifactId>
+            <optional>true</optional>
+        </dependency>
+        <dependency>
+            <groupId>com.h2database</groupId>
+            <artifactId>h2</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-test</artifactId>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+                <version>${spring-boot-dependencies.version}</version>
+            </plugin>
+            <plugin>
+                <groupId>org.graalvm.buildtools</groupId>
+                <artifactId>native-maven-plugin</artifactId>
+                <version>${native-maven-plugin.version}</version>
+            </plugin>
+        </plugins>
+    </build>
+</project>

dynamic-datasource-spring-boot4-starter/src/main/java/com/baomidou/dynamic/datasource/check/SeataDataSourceProxyChecker.java

@@ -0,0 +1,78 @@
+/*
+ * 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.check;
+
+import com.baomidou.dynamic.datasource.DynamicRoutingDataSource;
+import com.baomidou.dynamic.datasource.spring.boot.autoconfigure.DynamicDataSourceProperties;
+import lombok.extern.slf4j.Slf4j;
+import org.aopalliance.aop.Advice;
+import org.springframework.aop.Advisor;
+import org.springframework.aop.framework.Advised;
+import org.springframework.aop.support.AopUtils;
+import org.springframework.beans.factory.SmartInitializingSingleton;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+import org.springframework.context.ApplicationContext;
+import org.springframework.stereotype.Component;
+
+import java.util.Map;
+
+@Slf4j
+@Component
+@ConditionalOnProperty(prefix = DynamicDataSourceProperties.PREFIX, name = "seata", havingValue = "true", matchIfMissing = false)
+public class SeataDataSourceProxyChecker implements SmartInitializingSingleton {
+    private final ApplicationContext applicationContext;
+    private final Class<?> seataAdviceClass = loadSeataAdviceClass();
+
+    public SeataDataSourceProxyChecker(ApplicationContext applicationContext) {
+        this.applicationContext = applicationContext;
+    }
+
+    @Override
+    public void afterSingletonsInstantiated() {
+        Map<String, DynamicRoutingDataSource> dataSourceMap = applicationContext.getBeansOfType(DynamicRoutingDataSource.class);
+        for (Map.Entry<String, DynamicRoutingDataSource> entry : dataSourceMap.entrySet()) {
+            String beanName = entry.getKey();
+            DynamicRoutingDataSource ds = entry.getValue();
+            if (isSeataProxyBean(ds)) {
+                log.warn("Seata auto-agent detected: AbstractDeliveringDataSource (beanName: {}). " +
+                        "Please disable seata.enableAutoDataSourceProxy to avoid unknown exceptions.", beanName);
+            }
+        }
+    }
+
+    private boolean isSeataProxyBean(DynamicRoutingDataSource bean) {
+        if (seataAdviceClass == null || !AopUtils.isAopProxy(bean) || !(bean instanceof Advised)) {
+            return false;
+        }
+        Advised advised = (Advised) bean;
+        for (Advisor advisor : advised.getAdvisors()) {
+            Advice advice = advisor.getAdvice();
+            if (seataAdviceClass.isAssignableFrom(advice.getClass())) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    private static Class<?> loadSeataAdviceClass() {
+        try {
+            return Class.forName("io.seata.spring.annotation.datasource.SeataAutoDataSourceProxyAdvice");
+        } catch (ClassNotFoundException | NoClassDefFoundError e) {
+            log.debug("SeataAutoDataSourceProxyAdvice not found, skipping Seata proxy check.", e);
+            return null;
+        }
+    }
+}

dynamic-datasource-spring-boot4-starter/src/main/java/com/baomidou/dynamic/datasource/processor/DsJakartaHeaderProcessor.java

@@ -0,0 +1,44 @@
+/*
+ * 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.processor;
+
+import jakarta.servlet.http.HttpServletRequest;
+import org.aopalliance.intercept.MethodInvocation;
+import org.springframework.web.context.request.RequestContextHolder;
+import org.springframework.web.context.request.ServletRequestAttributes;
+
+/**
+ * @author TaoYu
+ * @since 3.6.0
+ */
+public class DsJakartaHeaderProcessor extends DsProcessor {
+
+    /**
+     * header prefix
+     */
+    private static final String HEADER_PREFIX = "#header";
+
+    @Override
+    public boolean matches(String key) {
+        return key.startsWith(HEADER_PREFIX);
+    }
+
+    @Override
+    public String doDetermineDatasource(MethodInvocation invocation, String key) {
+        HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
+        return request.getHeader(key.substring(8));
+    }
+}

dynamic-datasource-spring-boot4-starter/src/main/java/com/baomidou/dynamic/datasource/processor/DsJakartaSessionProcessor.java

@@ -0,0 +1,45 @@
+/*
+ * 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.processor;
+
+/**
+ * @author TaoYu
+ * @since 3.6.0
+ */
+
+import jakarta.servlet.http.HttpServletRequest;
+import org.aopalliance.intercept.MethodInvocation;
+import org.springframework.web.context.request.RequestContextHolder;
+import org.springframework.web.context.request.ServletRequestAttributes;
+
+public class DsJakartaSessionProcessor extends DsProcessor {
+
+    /**
+     * session开头
+     */
+    private static final String SESSION_PREFIX = "#session";
+
+    @Override
+    public boolean matches(String key) {
+        return key.startsWith(SESSION_PREFIX);
+    }
+
+    @Override
+    public String doDetermineDatasource(MethodInvocation invocation, String key) {
+        HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
+        return request.getSession().getAttribute(key.substring(9)).toString();
+    }
+}

dynamic-datasource-spring-boot4-starter/src/main/java/com/baomidou/dynamic/datasource/spring/boot/autoconfigure/DruidDynamicDataSourceConfiguration.java

@@ -0,0 +1,30 @@
+package com.baomidou.dynamic.datasource.spring.boot.autoconfigure;
+
+import com.alibaba.druid.spring.boot4.autoconfigure.DruidDataSourceAutoConfigure;
+import com.alibaba.druid.spring.boot4.autoconfigure.properties.DruidStatProperties;
+import com.alibaba.druid.spring.boot4.autoconfigure.stat.DruidFilterConfiguration;
+import com.alibaba.druid.spring.boot4.autoconfigure.stat.DruidSpringAopConfiguration;
+import com.alibaba.druid.spring.boot4.autoconfigure.stat.DruidStatViewServletConfiguration;
+import com.alibaba.druid.spring.boot4.autoconfigure.stat.DruidWebStatFilterConfiguration;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
+import org.springframework.boot.context.properties.EnableConfigurationProperties;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Import;
+
+/**
+ * 从原生DruidDataSourceAutoConfigure复制
+ *
+ * @author TaoYu
+ * @since 1.1.0
+ */
+@Configuration
+@ConditionalOnClass(DruidDataSourceAutoConfigure.class)
+@EnableConfigurationProperties({DruidStatProperties.class})
+@Import({
+        DruidSpringAopConfiguration.class,
+        DruidStatViewServletConfiguration.class,
+        DruidWebStatFilterConfiguration.class,
+        DruidFilterConfiguration.class})
+public class DruidDynamicDataSourceConfiguration {
+
+}