Activate checkstyle in activiti-api-impl (Activiti#2831)

* travis cache * travis skip test install * travis skip test install * travis skip test install * fix: correct sh checkstyle in Jenkinsfile * fix missing import * fix missing import * fix missing import * Add missing imports * Fix typo
RaphaelCSS · Aug 16, 2019 · e5578f9 · e5578f9
1 parent 087ec72
commit e5578f9
Show file tree

Hide file tree

Showing 122 changed files with 1,027 additions and 691 deletions.
diff --git a/.editorconfig b/.editorconfig
@@ -0,0 +1,20 @@
+root = true
+
+[*]
+indent_style = space
+indent_size = 4
+end_of_line = lf
+charset = utf-8
+trim_trailing_whitespace = true
+insert_final_newline = true
+continuation_indent_size = 8
+
+[*.properties]
+charset = latin1
+
+[*.{yml,jsp,scala,html,xml}]
+indent_size = 2
+continuation_indent_size = 4
+
+[*.md]
+trim_trailing_whitespace = false
diff --git a/.travis.yml b/.travis.yml
@@ -18,9 +18,18 @@ notifications:
 before_script:
   - echo MAVEN_OPTS=-Xmx1536m > ~/.mavenrc
 
-# Enable integration tests
-script:
-  - mvn verify -B -DskipITs=false
+install: mvn jar:jar install:install
+
+jobs:
+    include:
+        - stage: Check style
+          name:  Check style
+          script:
+             mvn checkstyle:check -DskipCheckstyle=false
+        - stage: Build and test
+          name: Build and test
+          script:
+             mvn verify -B -DskipITs=false
 
 # Send coverage data
 after_success:
@@ -29,3 +38,7 @@ after_success:
 after_failure:
   - cat **/target/surefire-reports/*.xml | grep -B 1 -A 10 "<error"
   - cat **/target/failsafe-reports/*.xml | grep -B 1 -A 10 "<error"
+
+cache:
+  directories:
+  - $HOME/.m2
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -39,8 +39,9 @@ pipeline {
             // so we can retrieve the version in later steps
             sh "echo \$(jx-release-version) > VERSION"
             sh "mvn versions:set -DnewVersion=\$(cat VERSION)"
+            sh 'mvn checkstyle:check -DskipCheckstyle=false'
             sh 'mvn clean verify'
-            
+
             sh "git add --all"
             sh "git commit -m \"Release `cat VERSION`\" --allow-empty"
             sh "git tag -fa v\$(cat VERSION) -m \"Release version \$(cat VERSION)\""

diff --git a/README.md b/README.md
@@ -178,3 +178,12 @@ FAQ
         * with [Open Hub](https://www.openhub.net/p/activiti/contributors) which also has statistics
 
         * in [the GitHub web interface](https://github.com/activiti).
+
+# Development commands
+
+## Checkstyle
+To check if your code style respect all the rules:
+ 
+ ```bash
+ mvn checkstyle:check -DskipCheckstyle=false
+```
diff --git a/...runtime-impl/src/main/java/org/activiti/runtime/api/conf/ConnectorsAutoConfiguration.java b/...runtime-impl/src/main/java/org/activiti/runtime/api/conf/ConnectorsAutoConfiguration.java
@@ -40,12 +40,12 @@ public DefaultServiceTaskBehavior defaultServiceTaskBehavior(ApplicationContext
                                                                  IntegrationContextBuilder integrationContextBuilder,
                                                                  VariablesMappingProvider outboundVariablesProvider) {
         return new DefaultServiceTaskBehavior(applicationContext,
-                                              integrationContextBuilder,
-                                              outboundVariablesProvider);
+                integrationContextBuilder,
+                outboundVariablesProvider);
     }
 
     @Bean
-    public VariablesMappingProvider variablesMappingProvider(ProcessExtensionService processExtensionService){
+    public VariablesMappingProvider variablesMappingProvider(ProcessExtensionService processExtensionService) {
         return new VariablesMappingProvider(processExtensionService);
     }
 }
diff --git a/...ime-impl/src/main/java/org/activiti/runtime/api/conf/ProcessRuntimeAutoConfiguration.java b/...ime-impl/src/main/java/org/activiti/runtime/api/conf/ProcessRuntimeAutoConfiguration.java
@@ -16,9 +16,6 @@
 
 package org.activiti.runtime.api.conf;
 
-import java.util.Collections;
-import java.util.List;
-
 import org.activiti.api.process.model.events.BPMNActivityCancelledEvent;
 import org.activiti.api.process.model.events.BPMNActivityCompletedEvent;
 import org.activiti.api.process.model.events.BPMNActivityStartedEvent;
@@ -103,12 +100,15 @@
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
+import java.util.Collections;
+import java.util.List;
+
 @Configuration
 @AutoConfigureAfter(CommonRuntimeAutoConfiguration.class)
 public class ProcessRuntimeAutoConfiguration {
-    
+
     /**
-     * Creates default SignalPayloadEventListener bean if no existing bean found in ApplicationContext
+     * Creates default SignalPayloadEventListener bean if no existing bean found in ApplicationContext.
      */
     @Bean
     @ConditionalOnMissingBean(SignalPayloadEventListener.class)
@@ -161,7 +161,6 @@ public APIProcessInstanceConverter apiProcessInstanceConverter() {
         return new APIProcessInstanceConverter();
     }
 
-
     @Bean
     public ProcessRuntimeConfiguration processRuntimeConfiguration(@Autowired(required = false) List<ProcessRuntimeEventListener<?>> processRuntimeEventListeners,
                                                                    @Autowired(required = false) List<VariableEventListener<?>> variableEventListeners) {
@@ -218,8 +217,8 @@ public InitializingBean registerProcessCreatedEventListenerDelegate(RuntimeServi
 
     @Bean
     public InitializingBean registerProcessUpdatedEventListenerDelegate(RuntimeService runtimeService,
-                                                                          @Autowired(required = false) List<ProcessRuntimeEventListener<ProcessUpdatedEvent>> eventListeners,
-                                                                          ToProcessUpdatedConverter converter) {
+                                                                        @Autowired(required = false) List<ProcessRuntimeEventListener<ProcessUpdatedEvent>> eventListeners,
+                                                                        ToProcessUpdatedConverter converter) {
         return () -> runtimeService.addEventListener(new ProcessUpdatedListenerDelegate(getInitializedListeners(eventListeners),
                         converter),
                 ActivitiEventType.ENTITY_UPDATED);
@@ -269,12 +268,12 @@ public InitializingBean registerProcessCancelledListenerDelegate(RuntimeService
     public ToActivityConverter activityConverter() {
         return new ToActivityConverter();
     }
-    
+
     @Bean
     public ToSignalConverter signalConverter() {
         return new ToSignalConverter();
     }
-    
+
     @Bean
     public BPMNTimerConverter bpmnTimerConveter() {
         return new BPMNTimerConverter();
@@ -306,16 +305,16 @@ public InitializingBean registerActivityCancelledListenerDelegate(RuntimeService
                         new ToActivityCancelledConverter(activityConverter)),
                 ActivitiEventType.ACTIVITY_CANCELLED);
     }
-    
+
     @Bean
     public InitializingBean registerActivitySignaledListenerDelegate(RuntimeService runtimeService,
-                                                                    @Autowired(required = false) List<BPMNElementEventListener<BPMNSignalReceivedEvent>> eventListeners,
-                                                                    ToSignalConverter signalConverter) {
+                                                                     @Autowired(required = false) List<BPMNElementEventListener<BPMNSignalReceivedEvent>> eventListeners,
+                                                                     ToSignalConverter signalConverter) {
         return () -> runtimeService.addEventListener(new SignalReceivedListenerDelegate(getInitializedListeners(eventListeners),
                         new ToSignalReceivedConverter(signalConverter)),
                 ActivitiEventType.ACTIVITY_SIGNALED);
     }
-    
+
     @Bean
     public InitializingBean registerTimerFiredListenerDelegate(RuntimeService runtimeService,
                                                                @Autowired(required = false) List<BPMNElementEventListener<BPMNTimerFiredEvent>> eventListeners,
@@ -333,7 +332,7 @@ public InitializingBean registerTimerScheduledListenerDelegate(RuntimeService ru
                         new ToTimerScheduledConverter(bpmnTimerConverter)),
                 ActivitiEventType.TIMER_SCHEDULED);
     }
-    
+
     @Bean
     public InitializingBean registerTimerCancelledListenerDelegate(RuntimeService runtimeService,
                                                                   @Autowired(required = false) List<BPMNElementEventListener<BPMNTimerCancelledEvent>> eventListeners,
@@ -342,7 +341,7 @@ public InitializingBean registerTimerCancelledListenerDelegate(RuntimeService ru
                         new ToTimerCancelledConverter(bpmnTimerConverter)),
                 ActivitiEventType.JOB_CANCELED);
     }
-    
+
     @Bean
     public InitializingBean registerTimerFailedListenerDelegate(RuntimeService runtimeService,
                                                                 @Autowired(required = false) List<BPMNElementEventListener<BPMNTimerFailedEvent>> eventListeners,
@@ -351,7 +350,7 @@ public InitializingBean registerTimerFailedListenerDelegate(RuntimeService runti
                         new ToTimerFailedConverter(bpmnTimerConverter)),
                 ActivitiEventType.JOB_EXECUTION_FAILURE);
     }
-    
+
     @Bean
     public InitializingBean registerTimerExecutedListenerDelegate(RuntimeService runtimeService,
                                                                   @Autowired(required = false) List<BPMNElementEventListener<BPMNTimerExecutedEvent>> eventListeners,
@@ -360,7 +359,7 @@ public InitializingBean registerTimerExecutedListenerDelegate(RuntimeService run
                         new ToTimerExecutedConverter(bpmnTimerConverter)),
                 ActivitiEventType.JOB_EXECUTION_SUCCESS);
     }
-    
+
     @Bean
     public InitializingBean registerTimerRetriesDecrementedListenerDelegate(RuntimeService runtimeService,
                                                                             @Autowired(required = false) List<BPMNElementEventListener<BPMNTimerRetriesDecrementedEvent>> eventListeners,

diff --git a/...mpl/src/main/java/org/activiti/runtime/api/conf/impl/ProcessRuntimeConfigurationImpl.java b/...mpl/src/main/java/org/activiti/runtime/api/conf/impl/ProcessRuntimeConfigurationImpl.java
@@ -16,12 +16,12 @@
 
 package org.activiti.runtime.api.conf.impl;
 
-import java.util.Collections;
-import java.util.List;
-
 import org.activiti.api.process.runtime.conf.ProcessRuntimeConfiguration;
-import org.activiti.api.runtime.shared.events.VariableEventListener;
 import org.activiti.api.process.runtime.events.listener.ProcessRuntimeEventListener;
+import org.activiti.api.runtime.shared.events.VariableEventListener;
+
+import java.util.Collections;
+import java.util.List;
 
 public class ProcessRuntimeConfigurationImpl implements ProcessRuntimeConfiguration {
 

diff --git a/...ime-impl/src/main/java/org/activiti/runtime/api/connector/DefaultServiceTaskBehavior.java b/...ime-impl/src/main/java/org/activiti/runtime/api/connector/DefaultServiceTaskBehavior.java
@@ -16,12 +16,9 @@
 
 package org.activiti.runtime.api.connector;
 
-import java.util.Optional;
-
 import org.activiti.api.process.model.IntegrationContext;
 import org.activiti.api.process.runtime.connector.Connector;
 import org.activiti.bpmn.model.ServiceTask;
-import org.activiti.core.common.model.connector.ActionDefinition;
 import org.activiti.engine.delegate.DelegateExecution;
 import org.activiti.engine.impl.bpmn.behavior.AbstractBpmnActivityBehavior;
 import org.activiti.runtime.api.impl.VariablesMappingProvider;
@@ -73,7 +70,6 @@ private String getServiceTaskImplementation(DelegateExecution execution) {
 
     public boolean hasConnectorBean(DelegateExecution execution) {
         String implementation = getServiceTaskImplementation(execution);
-        return applicationContext.containsBean(implementation)
-                && applicationContext.getBean(implementation) instanceof Connector;
+        return applicationContext.containsBean(implementation) && applicationContext.getBean(implementation) instanceof Connector;
     }
 }
diff --git a/...time-impl/src/main/java/org/activiti/runtime/api/connector/IntegrationContextBuilder.java b/...time-impl/src/main/java/org/activiti/runtime/api/connector/IntegrationContextBuilder.java
@@ -52,27 +52,27 @@ private IntegrationContextImpl buildFromExecution(DelegateExecution execution) {
         integrationContext.setBusinessKey(execution.getProcessInstanceBusinessKey());
         integrationContext.setClientId(execution.getCurrentActivityId());
 
-        if(ExecutionEntity.class.isInstance(execution)) {
+        if (ExecutionEntity.class.isInstance(execution)) {
             ExecutionContext executionContext = new ExecutionContext(ExecutionEntity.class.cast(execution));
 
-            ExecutionEntity processInstance = executionContext.getProcessInstance(); 
+            ExecutionEntity processInstance = executionContext.getProcessInstance();
 
-            if(processInstance != null) {
+            if (processInstance != null) {
                 integrationContext.setParentProcessInstanceId(processInstance.getParentProcessInstanceId());
             }
-            
-            // Let's try to resolve process definition attributes  
+
+            // Let's try to resolve process definition attributes
             ProcessDefinition processDefinition = executionContext.getProcessDefinition();
 
-            if(processDefinition != null) {
+            if (processDefinition != null) {
                 integrationContext.setProcessDefinitionKey(processDefinition.getKey());
                 integrationContext.setProcessDefinitionVersion(processDefinition.getVersion());
             }
-            
+
         }
 
-        ServiceTask serviceTask = (ServiceTask)execution.getCurrentFlowElement();
-        if (serviceTask != null ) {
+        ServiceTask serviceTask = (ServiceTask) execution.getCurrentFlowElement();
+        if (serviceTask != null) {
             integrationContext.setConnectorType(serviceTask.getImplementation());
             integrationContext.setClientName(serviceTask.getName());
             integrationContext.setClientType(ServiceTask.class.getSimpleName());

diff --git a/...ime-impl/src/main/java/org/activiti/runtime/api/event/impl/ActivitiEntityEventHelper.java b/...ime-impl/src/main/java/org/activiti/runtime/api/event/impl/ActivitiEntityEventHelper.java
@@ -22,9 +22,9 @@
 public class ActivitiEntityEventHelper {
 
     public static boolean isProcessInstanceEntity(Object entity) {
-        return entity != null
-                && ProcessInstance.class.isAssignableFrom(entity.getClass())
-                && ((ExecutionEntity) entity).isProcessInstanceType();
+        return entity != null &&
+                ProcessInstance.class.isAssignableFrom(entity.getClass()) &&
+                ((ExecutionEntity) entity).isProcessInstanceType();
     }
 
 }
diff --git a/...-runtime-impl/src/main/java/org/activiti/runtime/api/event/impl/ProcessCompletedImpl.java b/...-runtime-impl/src/main/java/org/activiti/runtime/api/event/impl/ProcessCompletedImpl.java
@@ -16,9 +16,9 @@
 
 package org.activiti.runtime.api.event.impl;
 
-import org.activiti.api.process.runtime.events.ProcessCompletedEvent;
-import org.activiti.api.process.model.events.ProcessRuntimeEvent;
 import org.activiti.api.process.model.ProcessInstance;
+import org.activiti.api.process.model.events.ProcessRuntimeEvent;
+import org.activiti.api.process.runtime.events.ProcessCompletedEvent;
 import org.activiti.api.runtime.event.impl.RuntimeEventImpl;
 
 public class ProcessCompletedImpl extends RuntimeEventImpl<ProcessInstance, ProcessRuntimeEvent.ProcessEvents>

diff --git a/.../src/main/java/org/activiti/runtime/api/event/impl/ToAPIProcessCreatedEventConverter.java b/.../src/main/java/org/activiti/runtime/api/event/impl/ToAPIProcessCreatedEventConverter.java
@@ -16,13 +16,13 @@
 
 package org.activiti.runtime.api.event.impl;
 
-import java.util.Optional;
-
 import org.activiti.api.process.runtime.events.ProcessCreatedEvent;
 import org.activiti.engine.delegate.event.ActivitiEntityEvent;
 import org.activiti.engine.impl.persistence.entity.ExecutionEntity;
 import org.activiti.runtime.api.model.impl.APIProcessInstanceConverter;
 
+import java.util.Optional;
+
 import static org.activiti.runtime.api.event.impl.ActivitiEntityEventHelper.isProcessInstanceEntity;
 
 public class ToAPIProcessCreatedEventConverter implements EventConverter<ProcessCreatedEvent, ActivitiEntityEvent> {
@@ -45,4 +45,4 @@ public Optional<ProcessCreatedEvent> from(ActivitiEntityEvent internalEvent) {
         return Optional.ofNullable(event);
     }
 
-}
+}
diff --git a/.../src/main/java/org/activiti/runtime/api/event/impl/ToAPIProcessStartedEventConverter.java b/.../src/main/java/org/activiti/runtime/api/event/impl/ToAPIProcessStartedEventConverter.java
@@ -16,13 +16,13 @@
 
 package org.activiti.runtime.api.event.impl;
 
-import java.util.Optional;
-
 import org.activiti.api.process.runtime.events.ProcessStartedEvent;
 import org.activiti.engine.delegate.event.ActivitiProcessStartedEvent;
 import org.activiti.engine.impl.persistence.entity.ExecutionEntity;
 import org.activiti.runtime.api.model.impl.APIProcessInstanceConverter;
 
+import java.util.Optional;
+
 public class ToAPIProcessStartedEventConverter implements EventConverter<ProcessStartedEvent, ActivitiProcessStartedEvent> {
 
     private final APIProcessInstanceConverter processInstanceConverter;
@@ -41,4 +41,4 @@ public Optional<ProcessStartedEvent> from(ActivitiProcessStartedEvent internalEv
         processStartedEvent.setNestedProcessInstanceId(internalEvent.getNestedProcessInstanceId());
         return Optional.of(processStartedEvent);
     }
-}
+}
diff --git a/...-impl/src/main/java/org/activiti/runtime/api/event/impl/ToActivityCancelledConverter.java b/...-impl/src/main/java/org/activiti/runtime/api/event/impl/ToActivityCancelledConverter.java
@@ -16,13 +16,13 @@
 
 package org.activiti.runtime.api.event.impl;
 
-import java.util.Optional;
-
 import org.activiti.api.process.model.events.BPMNActivityCancelledEvent;
 import org.activiti.api.runtime.event.impl.BPMNActivityCancelledEventImpl;
 import org.activiti.engine.delegate.event.ActivitiActivityEvent;
 import org.activiti.runtime.api.model.impl.ToActivityConverter;
 
+import java.util.Optional;
+
 public class ToActivityCancelledConverter implements EventConverter<BPMNActivityCancelledEvent, ActivitiActivityEvent> {
 
     private ToActivityConverter toActivityConverter;
@@ -34,9 +34,11 @@ public ToActivityCancelledConverter(ToActivityConverter toActivityConverter) {
     @Override
     public Optional<BPMNActivityCancelledEvent> from(ActivitiActivityEvent internalEvent) {
         BPMNActivityCancelledEventImpl bpmnActivityCancelledEvent = null;
-        if(internalEvent.getActivityId() != null && !internalEvent.getActivityId().isEmpty()){ // we are making sure that it is a BPMN Activity
+
+        if (internalEvent.getActivityId() != null && !internalEvent.getActivityId().isEmpty()) { // we are making sure that it is a BPMN Activity
             bpmnActivityCancelledEvent = new BPMNActivityCancelledEventImpl(toActivityConverter.from(internalEvent));
         }
+
         return Optional.ofNullable(bpmnActivityCancelledEvent);
     }
 }