From 006985b43f56eee7f77269870a63b0878106dca7 Mon Sep 17 00:00:00 2001 From: David B Malkovsky Date: Thu, 17 Aug 2023 08:12:01 -0400 Subject: [PATCH] Chore: remove unused and fix order of imports (#3705) --- .../repository/AppDeploymentCollectionResource.java | 1 - .../impl/http/DefaultCmmnHttpActivityDelegate.java | 1 - .../api/history/task/HistoricTaskInstanceResource.java | 2 -- .../service/api/management/JobCollectionResource.java | 2 -- .../service/api/repository/DeploymentResource.java | 2 -- .../CaseInstanceIdentityLinkCollectionResource.java | 3 --- .../api/runtime/task/TaskVariableDataResource.java | 1 - .../flowable/engine/ProcessEngineConfiguration.java | 3 --- .../bpmn/http/DefaultBpmnHttpActivityDelegate.java | 1 - .../engine/test/bpmn/mail/EmailServiceTaskTest.java | 3 --- ...aultSpringEventRegistryChangeDetectionExecutor.java | 2 -- .../test/rabbit/EventRegistryRabbitConfiguration.java | 1 - .../api/history/HistoricTaskInstanceResource.java | 2 -- .../rest/service/api/runtime/SignalResource.java | 1 - .../runtime/process/ExecutionVariableDataResource.java | 1 - .../runtime/task/TaskVariableCollectionResource.java | 1 - .../handler/AbstractActivityBpmnParseHandler.java | 1 - .../engine/test/bpmn/mail/EmailServiceTaskTest.java | 10 +++++----- 18 files changed, 5 insertions(+), 33 deletions(-) diff --git a/modules/flowable-app-engine-rest/src/main/java/org/flowable/app/rest/service/api/repository/AppDeploymentCollectionResource.java b/modules/flowable-app-engine-rest/src/main/java/org/flowable/app/rest/service/api/repository/AppDeploymentCollectionResource.java index 597abcf4333..8bc28f6b9dd 100644 --- a/modules/flowable-app-engine-rest/src/main/java/org/flowable/app/rest/service/api/repository/AppDeploymentCollectionResource.java +++ b/modules/flowable-app-engine-rest/src/main/java/org/flowable/app/rest/service/api/repository/AppDeploymentCollectionResource.java @@ -53,7 +53,6 @@ import io.swagger.annotations.ApiResponses; import io.swagger.annotations.Authorization; import jakarta.servlet.http.HttpServletRequest; -import jakarta.servlet.http.HttpServletResponse; /** * @author Tijs Rademakers diff --git a/modules/flowable-cmmn-engine/src/main/java/org/flowable/cmmn/engine/impl/behavior/impl/http/DefaultCmmnHttpActivityDelegate.java b/modules/flowable-cmmn-engine/src/main/java/org/flowable/cmmn/engine/impl/behavior/impl/http/DefaultCmmnHttpActivityDelegate.java index 16d3b956c5e..106371235a1 100644 --- a/modules/flowable-cmmn-engine/src/main/java/org/flowable/cmmn/engine/impl/behavior/impl/http/DefaultCmmnHttpActivityDelegate.java +++ b/modules/flowable-cmmn-engine/src/main/java/org/flowable/cmmn/engine/impl/behavior/impl/http/DefaultCmmnHttpActivityDelegate.java @@ -32,7 +32,6 @@ import org.flowable.common.engine.api.FlowableException; import org.flowable.common.engine.api.async.AsyncTaskInvoker; import org.flowable.common.engine.api.variable.VariableContainer; -import org.flowable.http.common.api.HttpRequest; import org.flowable.http.common.api.HttpResponse; import org.flowable.http.common.api.client.FlowableHttpClient; import org.flowable.http.common.api.delegate.HttpRequestHandler; diff --git a/modules/flowable-cmmn-rest/src/main/java/org/flowable/cmmn/rest/service/api/history/task/HistoricTaskInstanceResource.java b/modules/flowable-cmmn-rest/src/main/java/org/flowable/cmmn/rest/service/api/history/task/HistoricTaskInstanceResource.java index 9b2d802a86b..354d97e3d34 100644 --- a/modules/flowable-cmmn-rest/src/main/java/org/flowable/cmmn/rest/service/api/history/task/HistoricTaskInstanceResource.java +++ b/modules/flowable-cmmn-rest/src/main/java/org/flowable/cmmn/rest/service/api/history/task/HistoricTaskInstanceResource.java @@ -13,8 +13,6 @@ package org.flowable.cmmn.rest.service.api.history.task; -import jakarta.servlet.http.HttpServletResponse; - import org.apache.commons.lang3.StringUtils; import org.flowable.cmmn.api.CmmnHistoryService; import org.flowable.cmmn.api.CmmnTaskService; diff --git a/modules/flowable-cmmn-rest/src/main/java/org/flowable/cmmn/rest/service/api/management/JobCollectionResource.java b/modules/flowable-cmmn-rest/src/main/java/org/flowable/cmmn/rest/service/api/management/JobCollectionResource.java index e96bbbfe7cc..ce03e15b825 100644 --- a/modules/flowable-cmmn-rest/src/main/java/org/flowable/cmmn/rest/service/api/management/JobCollectionResource.java +++ b/modules/flowable-cmmn-rest/src/main/java/org/flowable/cmmn/rest/service/api/management/JobCollectionResource.java @@ -20,8 +20,6 @@ import java.util.Map; import java.util.stream.Collectors; -import jakarta.servlet.http.HttpServletResponse; - import org.flowable.cmmn.api.CmmnManagementService; import org.flowable.cmmn.engine.CmmnEngineConfiguration; import org.flowable.cmmn.rest.service.api.BulkMoveDeadLetterActionRequest; diff --git a/modules/flowable-cmmn-rest/src/main/java/org/flowable/cmmn/rest/service/api/repository/DeploymentResource.java b/modules/flowable-cmmn-rest/src/main/java/org/flowable/cmmn/rest/service/api/repository/DeploymentResource.java index c020429ad49..09b24ad9ad2 100644 --- a/modules/flowable-cmmn-rest/src/main/java/org/flowable/cmmn/rest/service/api/repository/DeploymentResource.java +++ b/modules/flowable-cmmn-rest/src/main/java/org/flowable/cmmn/rest/service/api/repository/DeploymentResource.java @@ -13,8 +13,6 @@ package org.flowable.cmmn.rest.service.api.repository; -import jakarta.servlet.http.HttpServletResponse; - import org.flowable.cmmn.api.repository.CmmnDeployment; import org.flowable.cmmn.rest.service.api.CmmnRestResponseFactory; import org.springframework.beans.factory.annotation.Autowired; diff --git a/modules/flowable-cmmn-rest/src/main/java/org/flowable/cmmn/rest/service/api/runtime/caze/CaseInstanceIdentityLinkCollectionResource.java b/modules/flowable-cmmn-rest/src/main/java/org/flowable/cmmn/rest/service/api/runtime/caze/CaseInstanceIdentityLinkCollectionResource.java index dba44fc76ef..d726399c621 100644 --- a/modules/flowable-cmmn-rest/src/main/java/org/flowable/cmmn/rest/service/api/runtime/caze/CaseInstanceIdentityLinkCollectionResource.java +++ b/modules/flowable-cmmn-rest/src/main/java/org/flowable/cmmn/rest/service/api/runtime/caze/CaseInstanceIdentityLinkCollectionResource.java @@ -15,9 +15,6 @@ import java.util.List; -import jakarta.servlet.http.HttpServletRequest; -import jakarta.servlet.http.HttpServletResponse; - import org.flowable.cmmn.api.runtime.CaseInstance; import org.flowable.cmmn.rest.service.api.engine.RestIdentityLink; import org.flowable.common.engine.api.FlowableIllegalArgumentException; diff --git a/modules/flowable-cmmn-rest/src/main/java/org/flowable/cmmn/rest/service/api/runtime/task/TaskVariableDataResource.java b/modules/flowable-cmmn-rest/src/main/java/org/flowable/cmmn/rest/service/api/runtime/task/TaskVariableDataResource.java index 5ad6b32e390..36072add130 100644 --- a/modules/flowable-cmmn-rest/src/main/java/org/flowable/cmmn/rest/service/api/runtime/task/TaskVariableDataResource.java +++ b/modules/flowable-cmmn-rest/src/main/java/org/flowable/cmmn/rest/service/api/runtime/task/TaskVariableDataResource.java @@ -17,7 +17,6 @@ import java.io.IOException; import java.io.ObjectOutputStream; -import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; import org.flowable.cmmn.rest.service.api.CmmnRestResponseFactory; diff --git a/modules/flowable-engine/src/main/java/org/flowable/engine/ProcessEngineConfiguration.java b/modules/flowable-engine/src/main/java/org/flowable/engine/ProcessEngineConfiguration.java index 64a81419454..1b839089195 100755 --- a/modules/flowable-engine/src/main/java/org/flowable/engine/ProcessEngineConfiguration.java +++ b/modules/flowable-engine/src/main/java/org/flowable/engine/ProcessEngineConfiguration.java @@ -16,16 +16,13 @@ import java.io.InputStream; import java.nio.charset.Charset; import java.time.Duration; -import java.util.ArrayList; import java.util.HashMap; -import java.util.List; import java.util.Map; import javax.sql.DataSource; import org.flowable.common.engine.api.async.AsyncTaskExecutor; import org.flowable.common.engine.api.async.AsyncTaskInvoker; -import org.flowable.common.engine.api.engine.EngineLifecycleListener; import org.flowable.common.engine.impl.AbstractEngineConfiguration; import org.flowable.common.engine.impl.cfg.BeansConfigurationHelper; import org.flowable.common.engine.impl.cfg.mail.MailServerInfo; diff --git a/modules/flowable-engine/src/main/java/org/flowable/engine/impl/bpmn/http/DefaultBpmnHttpActivityDelegate.java b/modules/flowable-engine/src/main/java/org/flowable/engine/impl/bpmn/http/DefaultBpmnHttpActivityDelegate.java index 3f8ed3725d6..3eeb547aed4 100644 --- a/modules/flowable-engine/src/main/java/org/flowable/engine/impl/bpmn/http/DefaultBpmnHttpActivityDelegate.java +++ b/modules/flowable-engine/src/main/java/org/flowable/engine/impl/bpmn/http/DefaultBpmnHttpActivityDelegate.java @@ -44,7 +44,6 @@ import org.flowable.engine.impl.cfg.ProcessEngineConfigurationImpl; import org.flowable.engine.impl.el.FixedValue; import org.flowable.engine.impl.util.CommandContextUtil; -import org.flowable.http.common.api.HttpRequest; import org.flowable.http.common.api.HttpResponse; import org.flowable.http.common.api.client.FlowableHttpClient; import org.flowable.http.common.api.delegate.HttpRequestHandler; diff --git a/modules/flowable-engine/src/test/java/org/flowable/engine/test/bpmn/mail/EmailServiceTaskTest.java b/modules/flowable-engine/src/test/java/org/flowable/engine/test/bpmn/mail/EmailServiceTaskTest.java index d9ca0ec3d91..4d67108aca8 100644 --- a/modules/flowable-engine/src/test/java/org/flowable/engine/test/bpmn/mail/EmailServiceTaskTest.java +++ b/modules/flowable-engine/src/test/java/org/flowable/engine/test/bpmn/mail/EmailServiceTaskTest.java @@ -36,13 +36,10 @@ import jakarta.mail.internet.MimeMultipart; import org.flowable.common.engine.api.FlowableException; -import org.flowable.common.engine.impl.cfg.mail.FlowableMailClientCreator; -import org.flowable.common.engine.impl.cfg.mail.MailServerInfo; import org.flowable.common.engine.impl.history.HistoryLevel; import org.flowable.common.engine.impl.util.CollectionUtil; import org.flowable.engine.impl.test.HistoryTestHelper; import org.flowable.engine.test.Deployment; -import org.flowable.mail.common.api.client.FlowableMailClient; import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; diff --git a/modules/flowable-event-registry-spring/src/main/java/org/flowable/eventregistry/spring/management/DefaultSpringEventRegistryChangeDetectionExecutor.java b/modules/flowable-event-registry-spring/src/main/java/org/flowable/eventregistry/spring/management/DefaultSpringEventRegistryChangeDetectionExecutor.java index 7c4cb733ec9..e5ae275befc 100644 --- a/modules/flowable-event-registry-spring/src/main/java/org/flowable/eventregistry/spring/management/DefaultSpringEventRegistryChangeDetectionExecutor.java +++ b/modules/flowable-event-registry-spring/src/main/java/org/flowable/eventregistry/spring/management/DefaultSpringEventRegistryChangeDetectionExecutor.java @@ -14,8 +14,6 @@ import java.time.Duration; import java.time.Instant; -import java.time.temporal.ChronoUnit; -import java.util.Date; import org.flowable.eventregistry.api.management.EventRegistryChangeDetectionExecutor; import org.flowable.eventregistry.api.management.EventRegistryChangeDetectionManager; diff --git a/modules/flowable-event-registry-spring/src/test/java/org/flowable/eventregistry/spring/test/rabbit/EventRegistryRabbitConfiguration.java b/modules/flowable-event-registry-spring/src/test/java/org/flowable/eventregistry/spring/test/rabbit/EventRegistryRabbitConfiguration.java index 9e98f410d88..634243d3939 100644 --- a/modules/flowable-event-registry-spring/src/test/java/org/flowable/eventregistry/spring/test/rabbit/EventRegistryRabbitConfiguration.java +++ b/modules/flowable-event-registry-spring/src/test/java/org/flowable/eventregistry/spring/test/rabbit/EventRegistryRabbitConfiguration.java @@ -27,7 +27,6 @@ import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Import; import org.testcontainers.containers.RabbitMQContainer; -import org.testcontainers.utility.DockerImageName; import com.fasterxml.jackson.databind.ObjectMapper; diff --git a/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/history/HistoricTaskInstanceResource.java b/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/history/HistoricTaskInstanceResource.java index 50a8dc53e8b..a1b05dfd032 100644 --- a/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/history/HistoricTaskInstanceResource.java +++ b/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/history/HistoricTaskInstanceResource.java @@ -13,8 +13,6 @@ package org.flowable.rest.service.api.history; -import jakarta.servlet.http.HttpServletResponse; - import org.apache.commons.lang3.StringUtils; import org.flowable.common.engine.api.FlowableIllegalArgumentException; import org.flowable.engine.HistoryService; diff --git a/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/runtime/SignalResource.java b/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/runtime/SignalResource.java index 109e51eccff..e98d0c3c1b4 100644 --- a/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/runtime/SignalResource.java +++ b/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/runtime/SignalResource.java @@ -28,7 +28,6 @@ import org.springframework.http.HttpStatus; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.ResponseStatus; import org.springframework.web.bind.annotation.RestController; import io.swagger.annotations.Api; diff --git a/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/runtime/process/ExecutionVariableDataResource.java b/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/runtime/process/ExecutionVariableDataResource.java index eabd3b95344..25566ba65a7 100644 --- a/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/runtime/process/ExecutionVariableDataResource.java +++ b/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/runtime/process/ExecutionVariableDataResource.java @@ -17,7 +17,6 @@ import java.io.IOException; import java.io.ObjectOutputStream; -import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; import org.flowable.common.engine.api.FlowableException; diff --git a/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/runtime/task/TaskVariableCollectionResource.java b/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/runtime/task/TaskVariableCollectionResource.java index 94edf14c3bc..e304dafa3ca 100644 --- a/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/runtime/task/TaskVariableCollectionResource.java +++ b/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/runtime/task/TaskVariableCollectionResource.java @@ -20,7 +20,6 @@ import java.util.Map; import jakarta.servlet.http.HttpServletRequest; -import jakarta.servlet.http.HttpServletResponse; import org.flowable.common.engine.api.FlowableIllegalArgumentException; import org.flowable.common.rest.exception.FlowableConflictException; diff --git a/modules/flowable5-engine/src/main/java/org/activiti/engine/impl/bpmn/parser/handler/AbstractActivityBpmnParseHandler.java b/modules/flowable5-engine/src/main/java/org/activiti/engine/impl/bpmn/parser/handler/AbstractActivityBpmnParseHandler.java index d6e87103bde..9cf86068b15 100644 --- a/modules/flowable5-engine/src/main/java/org/activiti/engine/impl/bpmn/parser/handler/AbstractActivityBpmnParseHandler.java +++ b/modules/flowable5-engine/src/main/java/org/activiti/engine/impl/bpmn/parser/handler/AbstractActivityBpmnParseHandler.java @@ -13,7 +13,6 @@ package org.activiti.engine.impl.bpmn.parser.handler; import org.activiti.engine.ActivitiException; -import org.activiti.engine.impl.bpmn.behavior.AbstractBpmnActivityBehavior; import org.activiti.engine.impl.bpmn.behavior.MultiInstanceActivityBehavior; import org.activiti.engine.impl.bpmn.parser.BpmnParse; import org.activiti.engine.impl.el.ExpressionManager; diff --git a/modules/flowable5-test/src/test/java/org/activiti/engine/test/bpmn/mail/EmailServiceTaskTest.java b/modules/flowable5-test/src/test/java/org/activiti/engine/test/bpmn/mail/EmailServiceTaskTest.java index 67d6994d75c..678e099eb3b 100644 --- a/modules/flowable5-test/src/test/java/org/activiti/engine/test/bpmn/mail/EmailServiceTaskTest.java +++ b/modules/flowable5-test/src/test/java/org/activiti/engine/test/bpmn/mail/EmailServiceTaskTest.java @@ -22,6 +22,11 @@ import java.util.List; import java.util.Map; +import jakarta.activation.DataHandler; +import jakarta.mail.MessagingException; +import jakarta.mail.internet.MimeMessage; +import jakarta.mail.internet.MimeMultipart; + import org.activiti.engine.impl.util.CollectionUtil; import org.flowable.common.engine.api.FlowableException; import org.flowable.common.engine.impl.history.HistoryLevel; @@ -29,11 +34,6 @@ import org.flowable.engine.test.Deployment; import org.subethamail.wiser.WiserMessage; -import jakarta.activation.DataHandler; -import jakarta.mail.MessagingException; -import jakarta.mail.internet.MimeMessage; -import jakarta.mail.internet.MimeMultipart; - /** * @author Joram Barrez * @author Tim Stephenson