diff --git a/activiti-cloud-connectors/activiti-cloud-starter-connector/src/test/java/org/activiti/cloud/connectors/starter/test/it/ActivitiCloudConnectorServiceIT.java b/activiti-cloud-connectors/activiti-cloud-starter-connector/src/test/java/org/activiti/cloud/connectors/starter/test/it/ActivitiCloudConnectorServiceIT.java index 88e2f5011e..2d48e9438d 100644 --- a/activiti-cloud-connectors/activiti-cloud-starter-connector/src/test/java/org/activiti/cloud/connectors/starter/test/it/ActivitiCloudConnectorServiceIT.java +++ b/activiti-cloud-connectors/activiti-cloud-starter-connector/src/test/java/org/activiti/cloud/connectors/starter/test/it/ActivitiCloudConnectorServiceIT.java @@ -15,7 +15,12 @@ */ package org.activiti.cloud.connectors.starter.test.it; -import java.time.Duration; +import static org.assertj.core.api.Assertions.assertThat; +import static org.awaitility.Awaitility.await; + +import java.util.HashMap; +import java.util.Map; +import java.util.UUID; import org.activiti.api.runtime.model.impl.IntegrationContextImpl; import org.activiti.cloud.api.process.model.CloudBpmnError; import org.activiti.cloud.api.process.model.IntegrationError; @@ -23,7 +28,6 @@ import org.activiti.cloud.api.process.model.impl.IntegrationRequestImpl; import org.activiti.cloud.connectors.starter.ActivitiCloudConnectorApp; import org.activiti.cloud.services.test.containers.RabbitMQContainerApplicationInitializer; -import org.awaitility.Awaitility; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -36,13 +40,6 @@ import org.springframework.test.context.ActiveProfiles; import org.springframework.test.context.ContextConfiguration; -import java.util.HashMap; -import java.util.Map; -import java.util.UUID; - -import static org.assertj.core.api.Assertions.assertThat; -import static org.awaitility.Awaitility.await; - @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, classes = ActivitiCloudConnectorApp.class) @DirtiesContext(classMode = DirtiesContext.ClassMode.BEFORE_CLASS) @ActiveProfiles(ConnectorsITStreamHandlers.CONNECTOR_IT) diff --git a/activiti-cloud-service-common/activiti-cloud-service-messaging-config/src/main/java/org/activiti/cloud/common/messaging/config/ConditionalFunctionBindingConfiguration.java b/activiti-cloud-service-common/activiti-cloud-service-messaging-config/src/main/java/org/activiti/cloud/common/messaging/config/ConditionalFunctionBindingConfiguration.java index c8cae14e85..242361c1bf 100644 --- a/activiti-cloud-service-common/activiti-cloud-service-messaging-config/src/main/java/org/activiti/cloud/common/messaging/config/ConditionalFunctionBindingConfiguration.java +++ b/activiti-cloud-service-common/activiti-cloud-service-messaging-config/src/main/java/org/activiti/cloud/common/messaging/config/ConditionalFunctionBindingConfiguration.java @@ -20,7 +20,6 @@ import java.util.function.Function; import org.activiti.cloud.common.messaging.functional.ConditionalFunctionBinding; import org.activiti.cloud.common.messaging.functional.ConnectorGateway; -import org.activiti.cloud.common.messaging.functional.ConsumerGateway; import org.springframework.beans.BeansException; import org.springframework.beans.factory.config.BeanPostProcessor; import org.springframework.beans.factory.support.DefaultListableBeanFactory; diff --git a/activiti-cloud-service-common/activiti-cloud-service-messaging-config/src/main/java/org/activiti/cloud/common/messaging/config/ConnectorConfiguration.java b/activiti-cloud-service-common/activiti-cloud-service-messaging-config/src/main/java/org/activiti/cloud/common/messaging/config/ConnectorConfiguration.java index 0a8d48b7ab..7fc693e308 100644 --- a/activiti-cloud-service-common/activiti-cloud-service-messaging-config/src/main/java/org/activiti/cloud/common/messaging/config/ConnectorConfiguration.java +++ b/activiti-cloud-service-common/activiti-cloud-service-messaging-config/src/main/java/org/activiti/cloud/common/messaging/config/ConnectorConfiguration.java @@ -64,7 +64,6 @@ public Object postProcessAfterInitialization(Object bean, String beanName) throw if (Connector.class.isInstance(bean)) { String connectorName = beanName; String functionName = connectorName + "Connector"; - Connector connector = Connector.class.cast(bean); final AtomicReference responseDestination = new AtomicReference<>(); @@ -126,7 +125,7 @@ public Object postProcessAfterInitialization(Object bean, String beanName) throw .gateway(connectorFlow, spec -> spec.replyTimeout(0L)) .get(); - integrationFlowContext.registration(connectorFlow) + integrationFlowContext.registration(inputChannelFlow) .register(); } return bean; diff --git a/activiti-cloud-service-common/activiti-cloud-services-test/src/main/java/org/activiti/cloud/starters/test/MyProducer.java b/activiti-cloud-service-common/activiti-cloud-services-test/src/main/java/org/activiti/cloud/starters/test/MyProducer.java index 83a7bc8f07..37aefae46d 100644 --- a/activiti-cloud-service-common/activiti-cloud-services-test/src/main/java/org/activiti/cloud/starters/test/MyProducer.java +++ b/activiti-cloud-service-common/activiti-cloud-services-test/src/main/java/org/activiti/cloud/starters/test/MyProducer.java @@ -16,8 +16,6 @@ package org.activiti.cloud.starters.test; import org.activiti.cloud.api.model.shared.events.CloudRuntimeEvent; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.messaging.MessageChannel; import org.springframework.messaging.support.MessageBuilder;