diff --git a/activiti-api-impl/activiti-api-process-runtime-impl/src/main/java/org/conf/activiti/runtime/api/ProcessRuntimeAutoConfiguration.java b/activiti-api-impl/activiti-api-process-runtime-impl/src/main/java/org/conf/activiti/runtime/api/ProcessRuntimeAutoConfiguration.java index 5b0f99968089727ec8a525aee78bef67524fc881..b5e7f6b846d1f25993fabb50fd333a264e3385d6 100644 --- a/activiti-api-impl/activiti-api-process-runtime-impl/src/main/java/org/conf/activiti/runtime/api/ProcessRuntimeAutoConfiguration.java +++ b/activiti-api-impl/activiti-api-process-runtime-impl/src/main/java/org/conf/activiti/runtime/api/ProcessRuntimeAutoConfiguration.java @@ -40,6 +40,7 @@ import org.activiti.core.common.spring.security.policies.ProcessSecurityPolicies import org.activiti.engine.RepositoryService; import org.activiti.engine.RuntimeService; import org.activiti.engine.delegate.event.ActivitiEventType; +import org.activiti.runtime.api.conf.CommonRuntimeAutoConfiguration; import org.activiti.runtime.api.conf.impl.ProcessRuntimeConfigurationImpl; import org.activiti.runtime.api.event.impl.ToAPIProcessCreatedEventConverter; import org.activiti.runtime.api.event.impl.ToAPIProcessStartedEventConverter; @@ -71,11 +72,13 @@ import org.activiti.runtime.api.model.impl.APIVariableInstanceConverter; import org.activiti.runtime.api.model.impl.ToActivityConverter; import org.springframework.beans.factory.InitializingBean; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.autoconfigure.AutoConfigureAfter; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @Configuration +@AutoConfigureAfter(CommonRuntimeAutoConfiguration.class) public class ProcessRuntimeAutoConfiguration { @Bean @@ -121,11 +124,6 @@ public class ProcessRuntimeAutoConfiguration { return new APIProcessInstanceConverter(); } - @Bean - @ConditionalOnMissingBean - public APIVariableInstanceConverter apiVariableInstanceConverter() { - return new APIVariableInstanceConverter(); - } @Bean public ProcessRuntimeConfiguration processRuntimeConfiguration(@Autowired(required = false) List> processRuntimeEventListeners, diff --git a/activiti-api-impl/activiti-api-runtime-shared-impl/src/main/java/org/activiti/runtime/api/conf/CommonRuntimeAutoConfiguration.java b/activiti-api-impl/activiti-api-runtime-shared-impl/src/main/java/org/activiti/runtime/api/conf/CommonRuntimeAutoConfiguration.java index 501538ae98cbac9cc7a0429685e721d8c4e3c496..10610582052c5f68b0d14b7825a5fd153e173f26 100644 --- a/activiti-api-impl/activiti-api-runtime-shared-impl/src/main/java/org/activiti/runtime/api/conf/CommonRuntimeAutoConfiguration.java +++ b/activiti-api-impl/activiti-api-runtime-shared-impl/src/main/java/org/activiti/runtime/api/conf/CommonRuntimeAutoConfiguration.java @@ -20,13 +20,11 @@ import java.util.Collections; import java.util.List; import org.activiti.api.model.shared.event.VariableCreatedEvent; -import org.activiti.api.model.shared.event.VariableDeletedEvent; import org.activiti.api.model.shared.event.VariableUpdatedEvent; import org.activiti.api.runtime.shared.events.VariableEventListener; import org.activiti.engine.RuntimeService; import org.activiti.engine.delegate.event.ActivitiEventType; import org.activiti.runtime.api.event.impl.ToVariableCreatedConverter; -import org.activiti.runtime.api.event.impl.ToVariableDeletedConverter; import org.activiti.runtime.api.event.impl.ToVariableUpdatedConverter; import org.activiti.runtime.api.event.internal.VariableCreatedListenerDelegate; import org.activiti.runtime.api.event.internal.VariableUpdatedListenerDelegate; diff --git a/activiti-api-impl/activiti-api-task-runtime-impl/src/main/java/org/activiti/runtime/api/conf/TaskRuntimeAutoConfiguration.java b/activiti-api-impl/activiti-api-task-runtime-impl/src/main/java/org/activiti/runtime/api/conf/TaskRuntimeAutoConfiguration.java index 76c26399f87a59ef057eaaad54651a0196ee3cb0..0e2c092e1dcf8f2acd322a6349e42ae3f2d2adcc 100644 --- a/activiti-api-impl/activiti-api-task-runtime-impl/src/main/java/org/activiti/runtime/api/conf/TaskRuntimeAutoConfiguration.java +++ b/activiti-api-impl/activiti-api-task-runtime-impl/src/main/java/org/activiti/runtime/api/conf/TaskRuntimeAutoConfiguration.java @@ -71,11 +71,14 @@ import org.activiti.runtime.api.model.impl.APITaskConverter; import org.activiti.runtime.api.model.impl.APIVariableInstanceConverter; import org.springframework.beans.factory.InitializingBean; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.autoconfigure.AutoConfigureAfter; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; +import org.springframework.context.annotation.Import; @Configuration +@AutoConfigureAfter(CommonRuntimeAutoConfiguration.class) public class TaskRuntimeAutoConfiguration { @Bean @@ -107,12 +110,6 @@ public class TaskRuntimeAutoConfiguration { ); } - @Bean - @ConditionalOnMissingBean - public APIVariableInstanceConverter apiVariableInstanceConverter(APIVariableInstanceConverter variableInstanceConverter) { - return new APIVariableInstanceConverter(); - } - @Bean public TaskRuntimeConfiguration taskRuntimeConfiguration(@Autowired(required = false) List> taskRuntimeEventListeners, @Autowired(required = false) List> variableEventListeners) {