From b95a8ebe5608e2426465dbf0f1c0c59ab936d724 Mon Sep 17 00:00:00 2001 From: Tobias Schaefer Date: Tue, 24 Aug 2021 16:31:54 +0200 Subject: [PATCH] Code cleanups found via IntelliJ Code Inspection --- README.md | 2 +- .../bpm/feature/ProcessEngineFactory.java | 2 +- .../eventing/EventingPublisherPlugin.java | 5 +-- .../bpm/feature/eventing/ExecutionEvent.java | 26 ++++++------- .../PublishDelegateParseListener.java | 2 - .../bpm/feature/eventing/TaskEvent.java | 38 +++++++++---------- .../test/EventingPublisherPluginTest.kt | 3 +- 7 files changed, 36 insertions(+), 42 deletions(-) diff --git a/README.md b/README.md index 8259f894..b6095442 100644 --- a/README.md +++ b/README.md @@ -647,7 +647,7 @@ event streams: * Execution: All execution events (Activities are Started, Ended and Transitions are being taken) * History: All history events -### Configuration +### Configuration of Eventing Bridge ```yaml camunda: eventing: diff --git a/micronaut-camunda-bpm-feature/src/main/java/info/novatec/micronaut/camunda/bpm/feature/ProcessEngineFactory.java b/micronaut-camunda-bpm-feature/src/main/java/info/novatec/micronaut/camunda/bpm/feature/ProcessEngineFactory.java index ead60837..81fe9fc4 100644 --- a/micronaut-camunda-bpm-feature/src/main/java/info/novatec/micronaut/camunda/bpm/feature/ProcessEngineFactory.java +++ b/micronaut-camunda-bpm-feature/src/main/java/info/novatec/micronaut/camunda/bpm/feature/ProcessEngineFactory.java @@ -41,7 +41,7 @@ public class ProcessEngineFactory { private static final Logger log = LoggerFactory.getLogger(ProcessEngineFactory.class); - protected PathMatchingResourcePatternResolver resourceLoader = new PathMatchingResourcePatternResolver(); + protected final PathMatchingResourcePatternResolver resourceLoader = new PathMatchingResourcePatternResolver(); /** * The {@link ProcessEngine} is started with the application start so that the task scheduler is started immediately. diff --git a/micronaut-camunda-bpm-feature/src/main/java/info/novatec/micronaut/camunda/bpm/feature/eventing/EventingPublisherPlugin.java b/micronaut-camunda-bpm-feature/src/main/java/info/novatec/micronaut/camunda/bpm/feature/eventing/EventingPublisherPlugin.java index ddce80f3..9a2f352f 100644 --- a/micronaut-camunda-bpm-feature/src/main/java/info/novatec/micronaut/camunda/bpm/feature/eventing/EventingPublisherPlugin.java +++ b/micronaut-camunda-bpm-feature/src/main/java/info/novatec/micronaut/camunda/bpm/feature/eventing/EventingPublisherPlugin.java @@ -18,7 +18,6 @@ import info.novatec.micronaut.camunda.bpm.feature.Configuration; import io.micronaut.context.annotation.Requires; -import io.micronaut.context.event.ApplicationEventPublisher; import org.camunda.bpm.engine.ProcessEngine; import org.camunda.bpm.engine.impl.bpmn.parser.BpmnParseListener; import org.camunda.bpm.engine.impl.cfg.ProcessEngineConfigurationImpl; @@ -43,13 +42,11 @@ public class EventingPublisherPlugin implements ProcessEnginePlugin { private static final Logger log = LoggerFactory.getLogger(EventingPublisherPlugin.class); protected final Configuration configuration; - protected final ApplicationEventPublisher publisher; protected final BpmnParseListener publishDelegateParseListener; protected final HistoryEventHandler publishHistoryEventHandler; - public EventingPublisherPlugin(Configuration configuration, ApplicationEventPublisher publisher, BpmnParseListener publishDelegateParseListener, HistoryEventHandler publishHistoryEventHandler) { + public EventingPublisherPlugin(Configuration configuration, BpmnParseListener publishDelegateParseListener, HistoryEventHandler publishHistoryEventHandler) { this.configuration = configuration; - this.publisher = publisher; this.publishDelegateParseListener = publishDelegateParseListener; this.publishHistoryEventHandler = publishHistoryEventHandler; } diff --git a/micronaut-camunda-bpm-feature/src/main/java/info/novatec/micronaut/camunda/bpm/feature/eventing/ExecutionEvent.java b/micronaut-camunda-bpm-feature/src/main/java/info/novatec/micronaut/camunda/bpm/feature/eventing/ExecutionEvent.java index 91d7aa22..dc503c04 100644 --- a/micronaut-camunda-bpm-feature/src/main/java/info/novatec/micronaut/camunda/bpm/feature/eventing/ExecutionEvent.java +++ b/micronaut-camunda-bpm-feature/src/main/java/info/novatec/micronaut/camunda/bpm/feature/eventing/ExecutionEvent.java @@ -25,19 +25,19 @@ // Implementation based on https://github.com/camunda/camunda-bpm-platform/blob/master/spring-boot-starter/starter/src/main/java/org/camunda/bpm/spring/boot/starter/event/ExecutionEvent.java public class ExecutionEvent { - protected String activityInstanceId; - protected String businessKey; - protected String currentActivityId; - protected String currentActivityName; - protected String currentTransitionId; - protected String eventName; - protected String id; - protected String parentActivityInstanceId; - protected String parentId; - protected String processBusinessKey; - protected String processDefinitionId; - protected String processInstanceId; - protected String tenantId; + protected final String activityInstanceId; + protected final String businessKey; + protected final String currentActivityId; + protected final String currentActivityName; + protected final String currentTransitionId; + protected final String eventName; + protected final String id; + protected final String parentActivityInstanceId; + protected final String parentId; + protected final String processBusinessKey; + protected final String processDefinitionId; + protected final String processInstanceId; + protected final String tenantId; public ExecutionEvent(DelegateExecution delegateExecution) { this.activityInstanceId = delegateExecution.getActivityInstanceId(); diff --git a/micronaut-camunda-bpm-feature/src/main/java/info/novatec/micronaut/camunda/bpm/feature/eventing/PublishDelegateParseListener.java b/micronaut-camunda-bpm-feature/src/main/java/info/novatec/micronaut/camunda/bpm/feature/eventing/PublishDelegateParseListener.java index 45560c03..544b5cc6 100644 --- a/micronaut-camunda-bpm-feature/src/main/java/info/novatec/micronaut/camunda/bpm/feature/eventing/PublishDelegateParseListener.java +++ b/micronaut-camunda-bpm-feature/src/main/java/info/novatec/micronaut/camunda/bpm/feature/eventing/PublishDelegateParseListener.java @@ -29,8 +29,6 @@ import org.camunda.bpm.engine.impl.task.TaskDefinition; import org.camunda.bpm.engine.impl.util.xml.Element; import org.camunda.bpm.engine.impl.variable.VariableDeclaration; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import javax.inject.Singleton; import java.util.Arrays; diff --git a/micronaut-camunda-bpm-feature/src/main/java/info/novatec/micronaut/camunda/bpm/feature/eventing/TaskEvent.java b/micronaut-camunda-bpm-feature/src/main/java/info/novatec/micronaut/camunda/bpm/feature/eventing/TaskEvent.java index cfdb2576..d6313d3a 100644 --- a/micronaut-camunda-bpm-feature/src/main/java/info/novatec/micronaut/camunda/bpm/feature/eventing/TaskEvent.java +++ b/micronaut-camunda-bpm-feature/src/main/java/info/novatec/micronaut/camunda/bpm/feature/eventing/TaskEvent.java @@ -26,25 +26,25 @@ // Implementation based on https://github.com/camunda/camunda-bpm-platform/blob/master/spring-boot-starter/starter/src/main/java/org/camunda/bpm/spring/boot/starter/event/TaskEvent.java public class TaskEvent { - protected String assignee; - protected String caseDefinitionId; - protected String caseExecutionId; - protected String caseInstanceId; - protected Date createTime; - protected String deleteReason; - protected String description; - protected Date dueDate; - protected String eventName; - protected String executionId; - protected Date followUpDate; - protected String id; - protected String name; - protected String owner; - protected int priority; - protected String processDefinitionId; - protected String processInstanceId; - protected String taskDefinitionKey; - protected String tenantId; + protected final String assignee; + protected final String caseDefinitionId; + protected final String caseExecutionId; + protected final String caseInstanceId; + protected final Date createTime; + protected final String deleteReason; + protected final String description; + protected final Date dueDate; + protected final String eventName; + protected final String executionId; + protected final Date followUpDate; + protected final String id; + protected final String name; + protected final String owner; + protected final int priority; + protected final String processDefinitionId; + protected final String processInstanceId; + protected final String taskDefinitionKey; + protected final String tenantId; public TaskEvent(DelegateTask delegateTask) { this.assignee = delegateTask.getAssignee(); diff --git a/micronaut-camunda-bpm-feature/src/test/kotlin/info/novatec/micronaut/camunda/bpm/feature/test/EventingPublisherPluginTest.kt b/micronaut-camunda-bpm-feature/src/test/kotlin/info/novatec/micronaut/camunda/bpm/feature/test/EventingPublisherPluginTest.kt index 4fb55b17..c3bcbe4b 100644 --- a/micronaut-camunda-bpm-feature/src/test/kotlin/info/novatec/micronaut/camunda/bpm/feature/test/EventingPublisherPluginTest.kt +++ b/micronaut-camunda-bpm-feature/src/test/kotlin/info/novatec/micronaut/camunda/bpm/feature/test/EventingPublisherPluginTest.kt @@ -31,7 +31,6 @@ import org.junit.jupiter.api.TestInstance import javax.inject.Inject import javax.inject.Singleton -@MicronautTest class EventingPublisherPluginTest { @MicronautTest @@ -118,7 +117,7 @@ class EventingPublisherPluginTest { @Singleton open class EventListener : ApplicationEventListener { - var count = 0; + var count = 0 override fun onApplicationEvent(event: ExecutionEvent?) { count++