feat: support springboot3

Author: xiaoxiake

pom.xml

@@ -12,7 +12,7 @@
 
     <groupId>com.baomidou</groupId>
     <artifactId>dynamic-datasource-spring-boot-starter</artifactId>
-    <version>3.5.2</version>
+    <version>3.6.0.RC1</version>
     <packaging>jar</packaging>
 
     <name>dynamic-datasource-spring-boot-starter</name>
@@ -86,6 +86,12 @@
             <version>${mybatis.plus.version}</version>
             <optional>true</optional>
         </dependency>
+        <dependency>
+            <groupId>jakarta.servlet</groupId>
+            <artifactId>jakarta.servlet-api</artifactId>
+            <version>5.0.0</version>
+            <optional>true</optional>
+        </dependency>
         <dependency>
             <groupId>com.zaxxer</groupId>
             <artifactId>HikariCP-java7</artifactId>

src/main/java/com/baomidou/dynamic/datasource/processor/DsHeaderProcessor.java

@@ -42,4 +42,4 @@ public String doDetermineDatasource(MethodInvocation invocation, String key) {
         HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
         return request.getHeader(key.substring(8));
     }
-}
+}

src/main/java/com/baomidou/dynamic/datasource/processor/DsSessionProcessor.java

@@ -42,4 +42,4 @@ public String doDetermineDatasource(MethodInvocation invocation, String key) {
         HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
         return request.getSession().getAttribute(key.substring(9)).toString();
     }
-}
+}

src/main/java/com/baomidou/dynamic/datasource/processor/DsSpelExpressionProcessor.java

@@ -101,4 +101,4 @@ public static class ExpressionRootObject {
 
         private final Object target;
     }
-}
+}

src/main/java/com/baomidou/dynamic/datasource/processor/jakarta/DsJakartaHeaderProcessor.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.jakarta;
+
+import com.baomidou.dynamic.datasource.processor.DsProcessor;
+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 = (HttpServletRequest) ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
+        return request.getHeader(key.substring(8));
+    }
+}

src/main/java/com/baomidou/dynamic/datasource/processor/jakarta/DsJakartaSessionProcessor.java

@@ -0,0 +1,46 @@
+/*
+ * 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.jakarta;
+
+import com.baomidou.dynamic.datasource.processor.DsProcessor;
+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 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 = (HttpServletRequest) ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
+        return request.getSession().getAttribute(key.substring(9)).toString();
+    }
+}

src/main/java/com/baomidou/dynamic/datasource/spring/boot/autoconfigure/DynamicDataSourceAutoConfiguration.java

@@ -27,6 +27,8 @@
 import com.baomidou.dynamic.datasource.processor.DsProcessor;
 import com.baomidou.dynamic.datasource.processor.DsSessionProcessor;
 import com.baomidou.dynamic.datasource.processor.DsSpelExpressionProcessor;
+import com.baomidou.dynamic.datasource.processor.jakarta.DsJakartaHeaderProcessor;
+import com.baomidou.dynamic.datasource.processor.jakarta.DsJakartaSessionProcessor;
 import com.baomidou.dynamic.datasource.provider.DynamicDataSourceProvider;
 import com.baomidou.dynamic.datasource.provider.YmlDynamicDataSourceProvider;
 import com.baomidou.dynamic.datasource.spring.boot.autoconfigure.druid.DruidDynamicDataSourceConfiguration;
@@ -37,6 +39,7 @@
 import org.springframework.beans.factory.InitializingBean;
 import org.springframework.beans.factory.ObjectProvider;
 import org.springframework.beans.factory.config.BeanDefinition;
+import org.springframework.boot.SpringBootVersion;
 import org.springframework.boot.autoconfigure.AutoConfigureBefore;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
@@ -127,8 +130,16 @@ public DataSourceInitEvent dataSourceInitEvent() {
     @Bean
     @ConditionalOnMissingBean
     public DsProcessor dsProcessor(BeanFactory beanFactory) {
-        DsHeaderProcessor headerProcessor = new DsHeaderProcessor();
-        DsSessionProcessor sessionProcessor = new DsSessionProcessor();
+        String version = SpringBootVersion.getVersion();
+        DsProcessor headerProcessor;
+        DsProcessor sessionProcessor;
+        if (version.startsWith("3")) {
+            headerProcessor = new DsJakartaHeaderProcessor();
+            sessionProcessor = new DsJakartaSessionProcessor();
+        } else {
+            headerProcessor = new DsHeaderProcessor();
+            sessionProcessor = new DsSessionProcessor();
+        }
         DsSpelExpressionProcessor spelExpressionProcessor = new DsSpelExpressionProcessor();
         spelExpressionProcessor.setBeanResolver(new BeanFactoryResolver(beanFactory));
         headerProcessor.setNextProcessor(sessionProcessor);
@@ -145,4 +156,4 @@ public void afterPropertiesSet() {
         }
     }
 
-}
+}

src/main/java/com/baomidou/dynamic/datasource/spring/boot/autoconfigure/druid/DruidLogConfigUtil.java

@@ -49,7 +49,7 @@ public static LogFilter initFilter(Class<? extends LogFilter> clazz, Map<String,
                 Method method = METHODS.get(key);
                 if (method != null) {
                     try {
-                        method.invoke(filter, DsConfigUtil.convertValue(method,item.getValue()));
+                        method.invoke(filter, DsConfigUtil.convertValue(method, item.getValue()));
                     } catch (Exception e) {
                         log.warn("druid {} set param {} error", clazz.getName(), key, e);
                     }
@@ -62,4 +62,4 @@ public static LogFilter initFilter(Class<? extends LogFilter> clazz, Map<String,
             return null;
         }
     }
-}
+}

src/main/java/com/baomidou/dynamic/datasource/spring/boot/autoconfigure/druid/DruidStatConfigUtil.java

@@ -55,7 +55,7 @@ public static StatFilter toStatFilter(Map<String, Object> c, Map<String, Object>
             Method method = METHODS.get(key);
             if (method != null) {
                 try {
-                    method.invoke(filter, DsConfigUtil.convertValue(method,item.getValue()));
+                    method.invoke(filter, DsConfigUtil.convertValue(method, item.getValue()));
                 } catch (Exception e) {
                     log.warn("druid stat set param {} error", key, e);
                 }
@@ -65,4 +65,4 @@ public static StatFilter toStatFilter(Map<String, Object> c, Map<String, Object>
         }
         return filter;
     }
-}
+}

src/main/java/com/baomidou/dynamic/datasource/spring/boot/autoconfigure/druid/DruidWallConfigUtil.java

@@ -52,7 +52,7 @@ public static WallConfig toWallConfig(Map<String, Object> c, Map<String, Object>
             Method method = METHODS.get(key);
             if (method != null) {
                 try {
-                    method.invoke(wallConfig, DsConfigUtil.convertValue(method,item.getValue()));
+                    method.invoke(wallConfig, DsConfigUtil.convertValue(method, item.getValue()));
                 } catch (Exception e) {
                     log.warn("druid wall set param {} error", key, e);
                 }
@@ -62,4 +62,4 @@ public static WallConfig toWallConfig(Map<String, Object> c, Map<String, Object>
         }
         return wallConfig;
     }
-}
+}