bugfix: impl of supportsSourceType is not defined (#7104)

* bugfix: impl of supportsSourceType is not defined
apache · Jan 12, 2025 · 90aa994 · 90aa994
1 parent 2438d77
commit 90aa994
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 64 deletions.
diff --git a/changes/en-us/2.x.md b/changes/en-us/2.x.md
@@ -10,7 +10,8 @@ Add changes here for all PR submitted to the 2.x branch.
 
 ### bugfix:
 
-- [[#PR_NO](https://github.com/apache/incubator-seata/pull/#PR_NO)] fix XXX
+- [[#7104](https://github.com/apache/incubator-seata/pull/7104)] fix impl of supportsSourceType is not defined
+
 
 ### optimize:
 

diff --git a/changes/zh-cn/2.x.md b/changes/zh-cn/2.x.md
@@ -10,7 +10,7 @@
 
 ### bugfix:
 
-- [[#PR_NO](https://github.com/apache/incubator-seata/pull/#PR_NO)] 修复XXX
+- [[#7104](https://github.com/apache/incubator-seata/pull/7104)] 修复SeataApplicationListener在低版本springboot未实现supportsSourceType方法的问题
 
 ### optimize:
 

diff --git a/...in/java/org/apache/seata/spring/boot/autoconfigure/listener/SeataApplicationListener.java b/...in/java/org/apache/seata/spring/boot/autoconfigure/listener/SeataApplicationListener.java
diff --git a/...rc/main/java/org/apache/seata/spring/boot/autoconfigure/loader/SeataPropertiesLoader.java b/...rc/main/java/org/apache/seata/spring/boot/autoconfigure/loader/SeataPropertiesLoader.java
@@ -16,6 +16,7 @@
  */
 package org.apache.seata.spring.boot.autoconfigure.loader;
 
+import org.apache.seata.common.holder.ObjectHolder;
 import org.apache.seata.common.util.CollectionUtils;
 import org.apache.seata.common.util.StringUtils;
 import org.apache.seata.config.ConfigurationFactory;
@@ -43,6 +44,7 @@
 import static org.apache.seata.common.ConfigurationKeys.SERVER_PREFIX;
 import static org.apache.seata.common.ConfigurationKeys.STORE_PREFIX;
 import static org.apache.seata.common.ConfigurationKeys.TRANSPORT_PREFIX;
+import static org.apache.seata.common.Constants.OBJECT_KEY_SPRING_CONFIGURABLE_ENVIRONMENT;
 
 @Order(Ordered.HIGHEST_PRECEDENCE)
 public class SeataPropertiesLoader implements ApplicationContextInitializer<ConfigurableApplicationContext> {
@@ -53,6 +55,10 @@ public class SeataPropertiesLoader implements ApplicationContextInitializer<Conf
     @Override
     public void initialize(ConfigurableApplicationContext applicationContext) {
         ConfigurableEnvironment environment = applicationContext.getEnvironment();
+        if (ObjectHolder.INSTANCE.getObject(OBJECT_KEY_SPRING_CONFIGURABLE_ENVIRONMENT) == null) {
+            ObjectHolder.INSTANCE.setObject(OBJECT_KEY_SPRING_CONFIGURABLE_ENVIRONMENT,
+                    applicationContext.getEnvironment());
+        }
         FileConfiguration configuration = ConfigurationFactory.getOriginFileInstanceRegistry();
         FileConfig fileConfig = configuration.getFileConfig();
         Map<String, Object> configs = fileConfig.getAllConfig();

diff --git a/...utoconfigure/seata-spring-autoconfigure-core/src/main/resources/META-INF/spring.factories b/...utoconfigure/seata-spring-autoconfigure-core/src/main/resources/META-INF/spring.factories
@@ -24,6 +24,3 @@ org.apache.seata.spring.boot.autoconfigure.SeataCoreEnvironmentPostProcessor
 
 org.springframework.context.ApplicationContextInitializer=\
 org.apache.seata.spring.boot.autoconfigure.loader.SeataPropertiesLoader
-
-org.springframework.context.ApplicationListener=\
-org.apache.seata.spring.boot.autoconfigure.listener.SeataApplicationListener