From af26c4bb6db6a834f0870aee1c4df2c27414d29c Mon Sep 17 00:00:00 2001 From: yangqicheng Date: Fri, 12 Jul 2024 16:58:16 +0800 Subject: [PATCH] =?UTF-8?q?REQ-2596-=E4=BF=AE=E5=A4=8Dbean=E5=B7=A5?= =?UTF-8?q?=E5=85=B7=E7=B1=BB=E8=8E=B7=E5=8F=96bean=E6=8A=A5=E9=94=99?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...ngContentUtils.java => SpringContextUtils.java} | 8 ++++---- .../workflow/core/conf/FlowableConfiguration.java | 14 +++++++++----- .../core/version/MultiVersionBeanUtils.java | 4 ++-- 3 files changed, 15 insertions(+), 11 deletions(-) rename workflow-engine-core/src/main/java/cn/axzo/workflow/core/common/utils/{SpringContentUtils.java => SpringContextUtils.java} (70%) diff --git a/workflow-engine-core/src/main/java/cn/axzo/workflow/core/common/utils/SpringContentUtils.java b/workflow-engine-core/src/main/java/cn/axzo/workflow/core/common/utils/SpringContextUtils.java similarity index 70% rename from workflow-engine-core/src/main/java/cn/axzo/workflow/core/common/utils/SpringContentUtils.java rename to workflow-engine-core/src/main/java/cn/axzo/workflow/core/common/utils/SpringContextUtils.java index 202663f32..86871e9d1 100644 --- a/workflow-engine-core/src/main/java/cn/axzo/workflow/core/common/utils/SpringContentUtils.java +++ b/workflow-engine-core/src/main/java/cn/axzo/workflow/core/common/utils/SpringContextUtils.java @@ -4,12 +4,12 @@ import org.springframework.lang.Nullable; import java.util.Map; -public class SpringContentUtils { +public class SpringContextUtils { - private static SpringContentUtils.SpringContext springContext; + private static SpringContextUtils.SpringContext springContext; - public SpringContentUtils(SpringContentUtils.SpringContext springContext) { - SpringContentUtils.springContext = springContext; + public SpringContextUtils(SpringContextUtils.SpringContext springContext) { + SpringContextUtils.springContext = springContext; } public static T getBean(Class clazz) { diff --git a/workflow-engine-core/src/main/java/cn/axzo/workflow/core/conf/FlowableConfiguration.java b/workflow-engine-core/src/main/java/cn/axzo/workflow/core/conf/FlowableConfiguration.java index 753700560..2a0c0c3c3 100644 --- a/workflow-engine-core/src/main/java/cn/axzo/workflow/core/conf/FlowableConfiguration.java +++ b/workflow-engine-core/src/main/java/cn/axzo/workflow/core/conf/FlowableConfiguration.java @@ -1,6 +1,6 @@ package cn.axzo.workflow.core.conf; -import cn.axzo.workflow.core.common.utils.SpringContentUtils; +import cn.axzo.workflow.core.common.utils.SpringContextUtils; import cn.axzo.workflow.core.engine.behavior.CustomActivityBehaviorFactory; import cn.axzo.workflow.core.engine.cmd.CustomCommandContextFactory; import cn.axzo.workflow.core.engine.id.BasedNacosSnowflakeIdGenerator; @@ -22,7 +22,6 @@ import cn.axzo.workflow.core.service.ExtAxHiTaskInstService; import com.alibaba.cloud.nacos.NacosDiscoveryProperties; import com.alibaba.cloud.nacos.NacosServiceManager; import com.google.common.collect.Lists; -import org.apache.ibatis.session.SqlSessionFactory; import org.flowable.common.engine.api.delegate.event.FlowableEventListener; import org.flowable.common.engine.impl.history.HistoryLevel; import org.flowable.form.spring.SpringFormEngineConfiguration; @@ -32,11 +31,11 @@ import org.flowable.spring.boot.EngineConfigurationConfigurer; import org.springframework.beans.BeansException; import org.springframework.beans.factory.ObjectProvider; import org.springframework.beans.factory.annotation.Value; -import org.springframework.boot.autoconfigure.condition.ConditionalOnBean; import org.springframework.context.ApplicationContext; import org.springframework.context.ApplicationContextAware; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; +import org.springframework.core.annotation.Order; import org.springframework.lang.Nullable; import org.springframework.data.redis.core.StringRedisTemplate; @@ -119,9 +118,14 @@ public class FlowableConfiguration { return new CustomActivityBehaviorFactory(); } + @Bean + @Order + public SpringContextUtils springContextUtils(SpringContext springContext) { + return new SpringContextUtils(springContext); + } + @Configuration - @ConditionalOnBean({SqlSessionFactory.class}) - public static class SpringContext implements SpringContentUtils.SpringContext, ApplicationContextAware { + public static class SpringContext implements SpringContextUtils.SpringContext, ApplicationContextAware { private ApplicationContext applicationContext; public SpringContext() { diff --git a/workflow-engine-core/src/main/java/cn/axzo/workflow/core/version/MultiVersionBeanUtils.java b/workflow-engine-core/src/main/java/cn/axzo/workflow/core/version/MultiVersionBeanUtils.java index 69e0de189..294de8973 100644 --- a/workflow-engine-core/src/main/java/cn/axzo/workflow/core/version/MultiVersionBeanUtils.java +++ b/workflow-engine-core/src/main/java/cn/axzo/workflow/core/version/MultiVersionBeanUtils.java @@ -1,7 +1,7 @@ package cn.axzo.workflow.core.version; -import cn.axzo.workflow.core.common.utils.SpringContentUtils; +import cn.axzo.workflow.core.common.utils.SpringContextUtils; import org.apache.commons.lang3.StringUtils; import org.apache.maven.artifact.versioning.DefaultArtifactVersion; import org.springframework.util.CollectionUtils; @@ -23,7 +23,7 @@ public class MultiVersionBeanUtils { * @return */ public static T getSpecifiedVersionBean(Class clazz, String version) { - Map beans = SpringContentUtils.getBeansOfType(clazz); + Map beans = SpringContextUtils.getBeansOfType(clazz); if (CollectionUtils.isEmpty(beans)) { throw new NullPointerException("no beans of type " + clazz.getName()); }