Temp PR for adding missing code - do not merge yet

activiti-api-impl/activiti-api-process-runtime-impl/src/main/java/org/activiti/runtime/api/connector/ConnectorActionDefinitionFinder.java

@@ -10,8 +10,13 @@ import org.apache.commons.lang3.StringUtils;
 
 public class ConnectorActionDefinitionFinder {
 
-    public Optional<ActionDefinition> find(String implementation,
-                                           List<ConnectorDefinition> connectorDefinitions) {
+    private final List<ConnectorDefinition> connectorDefinitions;
+
+    public ConnectorActionDefinitionFinder(List<ConnectorDefinition> connectorDefinitions) {
+        this.connectorDefinitions = connectorDefinitions;
+    }
+
+    public Optional<ActionDefinition> find(String implementation){
 
         Optional<ActionDefinition> actionDefinitionOptional = Optional.empty();
 

activiti-api-impl/activiti-api-process-runtime-impl/src/main/java/org/activiti/runtime/api/connector/DefaultServiceTaskBehavior.java

@@ -44,12 +44,10 @@ public class DefaultServiceTaskBehavior extends AbstractBpmnActivityBehavior {
 
     public DefaultServiceTaskBehavior(ApplicationContext applicationContext,
                                       IntegrationContextBuilder integrationContextBuilder,
-                                      List<ConnectorDefinition> connectorDefinitions,
                                       ConnectorActionDefinitionFinder connectorActionDefinitionFinder,
                                       VariablesMatchHelper variablesMatchHelper) {
         this.applicationContext = applicationContext;
         this.integrationContextBuilder = integrationContextBuilder;
-        this.connectorDefinitions = connectorDefinitions;
         this.connectorActionDefinitionFinder = connectorActionDefinitionFinder;
         this.variablesMatchHelper = variablesMatchHelper;
     }
@@ -67,8 +65,7 @@ public class DefaultServiceTaskBehavior extends AbstractBpmnActivityBehavior {
         List<VariableDefinition> outBoundVariableDefinitions = null;
         if(connectorActionDefinitionFinder != null && connectorDefinitions != null) {
 
-            Optional<ActionDefinition> actionDefinitionOptional = connectorActionDefinitionFinder.find(implementation,
-                    connectorDefinitions);
+            Optional<ActionDefinition> actionDefinitionOptional = connectorActionDefinitionFinder.find(implementation);
             ActionDefinition actionDefinition = null;
             if (actionDefinitionOptional.isPresent()) {
                 actionDefinition = actionDefinitionOptional.get();
@@ -83,11 +80,11 @@ public class DefaultServiceTaskBehavior extends AbstractBpmnActivityBehavior {
                         Connector.class);
             }
             outBoundVariableDefinitions = actionDefinition == null ? null : actionDefinition.getOutput();
-        }else{
+        }else {
             context = integrationContextBuilder.from(execution,
-                    null);
+                            null);
             connector = applicationContext.getBean(implementation,
-                    Connector.class);
+                            Connector.class);
         }
 
         IntegrationContext results = connector.execute(context);

activiti-api-impl/activiti-api-process-runtime-impl/src/main/java/org/activiti/runtime/api/connector/IntegrationContextBuilder.java

@@ -68,7 +68,7 @@ public class IntegrationContextBuilder {
                 integrationContext.setParentProcessInstanceId(processInstance.getParentProcessInstanceId());
             }
         }
-        
+
         String implementation = ((ServiceTask) execution.getCurrentFlowElement()).getImplementation();
 
         integrationContext.setConnectorType(implementation);
@@ -79,7 +79,7 @@ public class IntegrationContextBuilder {
 
         return integrationContext;
     }
-    
+
     private Map<String, Object> buildInBoundVariables(ActionDefinition actionDefinition,
                                                       DelegateExecution execution) {
 

activiti-api-impl/activiti-api-process-runtime-impl/src/main/java/org/conf/activiti/runtime/api/ConnectorsAutoConfiguration.java

@@ -36,11 +36,11 @@ import java.util.List;
 public class ConnectorsAutoConfiguration {
 
     @Autowired
-    private ConnectorService connectorService;
+    private ConnectorDefinitionService connectorDefinitionService;
 
     @Bean
     public List<ConnectorDefinition> connectorDefinitions() throws IOException {
-        return connectorService.get();
+        return connectorDefinitionService.get();
     }
 
     @Bean
@@ -53,12 +53,12 @@ public class ConnectorsAutoConfiguration {
     public DefaultServiceTaskBehavior defaultServiceTaskBehavior(ApplicationContext applicationContext,
                                                                  IntegrationContextBuilder integrationContextBuilder, ConnectorActionDefinitionFinder connectorActionDefinitionFinder, VariablesMatchHelper variablesMatchHelper) throws IOException {
         return new DefaultServiceTaskBehavior(applicationContext,
-                integrationContextBuilder, connectorDefinitions(), connectorActionDefinitionFinder, variablesMatchHelper);
+                integrationContextBuilder, connectorActionDefinitionFinder, variablesMatchHelper);
     }
 
     @Bean
     public ConnectorActionDefinitionFinder connectorActionDefinitionFinder() {
-        return new ConnectorActionDefinitionFinder();
+        return new ConnectorActionDefinitionFinder(connectorDefinitions());
     }
 
     @Bean

activiti-spring-boot-starter/src/test/resources/connectors/process-image.json

@@ -8,7 +8,7 @@
       "id": "processImageActionId",
       "name": "processImageActionName",
       "description": "...",
-      "input": [
+      "inputs": [
         {
           "id": "input-variable-1",
           "name": "input-variable-name-1",
@@ -24,7 +24,7 @@
           "description": ""
         }
       ],
-      "output": [
+      "outputs": [
         {
           "id": "approved",
           "name": "approved",

activiti-spring-boot-starter/src/test/resources/connectors/tag-image.json

@@ -8,7 +8,7 @@
       "id": "tagImageActionId",
       "name": "tagImageActionName",
       "description": "...",
-      "input": [
+      "inputs": [
         {
           "id": "input-variable-2",
           "name": "input-variable-name-2",
@@ -24,7 +24,7 @@
           "description": ""
         }
       ],
-      "output": [
+      "outputs": [
         {
           "id": "approved",
           "name": "approved",