From 92a139444418c2d7a2df3f431e4c9455a89e90e6 Mon Sep 17 00:00:00 2001 From: David B Malkovsky Date: Thu, 17 Aug 2023 16:05:54 -0400 Subject: [PATCH] Chore: use correct ordering of imports (#3711) --- .../AppDefinitionResourceDataResource.java | 3 ++- .../AppDeploymentCollectionResource.java | 3 ++- .../AppDeploymentResourceDataResource.java | 3 ++- .../validator/impl/AbstractValidatorTest.java | 2 +- .../impl/event/FlowableCmmnEventBuilder.java | 2 +- .../entity/HistoricPlanItemInstanceEntityImpl.java | 1 - .../rest/service/api/CmmnRestApiInterceptor.java | 2 +- .../repository/DeploymentResourceDataResource.java | 3 ++- .../dmn/test/runtime/DecisionTaskTest.java | 4 ++-- .../DecisionRequirementsDiagramGenerator.java | 4 ++-- ...efaultDecisionRequirementsDiagramGenerator.java | 4 ++-- .../api/repository/BaseDecisionResource.java | 4 ++-- .../BaseDmnDeploymentResourceDataResource.java | 4 ++-- .../java/org/flowable/dmn/xml/DiagramDiTest.java | 4 ++-- .../impl/de/odysseus/el/ExpressionFactoryImpl.java | 2 +- .../main/java/org/flowable/engine/TaskService.java | 2 +- .../flowable/engine/impl/RuntimeServiceImpl.java | 2 +- .../http/bpmn/HttpServiceTaskTestServer.java | 14 +++++++------- .../BaseDeploymentResourceDataResource.java | 4 ++-- .../rest/conf/jpa/DatabaseConfiguration.java | 3 ++- .../conf/jpa/JPAFlowableEngineConfiguration.java | 4 ++-- .../spring/boot/FlowableMailProperties.java | 4 ++-- .../flowable/spring/test/email/JndiEmailTest.java | 5 +++-- 23 files changed, 44 insertions(+), 39 deletions(-) diff --git a/modules/flowable-app-engine-rest/src/main/java/org/flowable/app/rest/service/api/repository/AppDefinitionResourceDataResource.java b/modules/flowable-app-engine-rest/src/main/java/org/flowable/app/rest/service/api/repository/AppDefinitionResourceDataResource.java index 2fbe3a5381d..3d691035424 100644 --- a/modules/flowable-app-engine-rest/src/main/java/org/flowable/app/rest/service/api/repository/AppDefinitionResourceDataResource.java +++ b/modules/flowable-app-engine-rest/src/main/java/org/flowable/app/rest/service/api/repository/AppDefinitionResourceDataResource.java @@ -15,6 +15,8 @@ import java.io.InputStream; import java.util.List; +import jakarta.servlet.http.HttpServletResponse; + import org.apache.commons.io.IOUtils; import org.flowable.app.api.AppRepositoryService; import org.flowable.app.api.repository.AppDefinition; @@ -34,7 +36,6 @@ import io.swagger.annotations.ApiResponse; import io.swagger.annotations.ApiResponses; import io.swagger.annotations.Authorization; -import jakarta.servlet.http.HttpServletResponse; /** * @author Tijs Rademakers 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 8bc28f6b9dd..d52c33fddbd 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 @@ -22,6 +22,8 @@ import java.util.Map; import java.util.zip.ZipInputStream; +import jakarta.servlet.http.HttpServletRequest; + import org.apache.commons.lang3.StringUtils; import org.flowable.app.api.AppRepositoryService; import org.flowable.app.api.repository.AppDeployment; @@ -52,7 +54,6 @@ import io.swagger.annotations.ApiResponse; import io.swagger.annotations.ApiResponses; import io.swagger.annotations.Authorization; -import jakarta.servlet.http.HttpServletRequest; /** * @author Tijs Rademakers diff --git a/modules/flowable-app-engine-rest/src/main/java/org/flowable/app/rest/service/api/repository/AppDeploymentResourceDataResource.java b/modules/flowable-app-engine-rest/src/main/java/org/flowable/app/rest/service/api/repository/AppDeploymentResourceDataResource.java index bcd584238e5..6dc2ebc31ee 100644 --- a/modules/flowable-app-engine-rest/src/main/java/org/flowable/app/rest/service/api/repository/AppDeploymentResourceDataResource.java +++ b/modules/flowable-app-engine-rest/src/main/java/org/flowable/app/rest/service/api/repository/AppDeploymentResourceDataResource.java @@ -15,6 +15,8 @@ import java.io.InputStream; import java.util.List; +import jakarta.servlet.http.HttpServletResponse; + import org.apache.commons.io.IOUtils; import org.flowable.app.api.AppRepositoryService; import org.flowable.app.api.repository.AppDeployment; @@ -34,7 +36,6 @@ import io.swagger.annotations.ApiResponse; import io.swagger.annotations.ApiResponses; import io.swagger.annotations.Authorization; -import jakarta.servlet.http.HttpServletResponse; /** * @author Tijs Rademakers diff --git a/modules/flowable-case-validation/src/test/java/org/flowable/cmmn/validation/validator/impl/AbstractValidatorTest.java b/modules/flowable-case-validation/src/test/java/org/flowable/cmmn/validation/validator/impl/AbstractValidatorTest.java index b952e47fc2d..21e308b81ca 100644 --- a/modules/flowable-case-validation/src/test/java/org/flowable/cmmn/validation/validator/impl/AbstractValidatorTest.java +++ b/modules/flowable-case-validation/src/test/java/org/flowable/cmmn/validation/validator/impl/AbstractValidatorTest.java @@ -16,8 +16,8 @@ import org.flowable.cmmn.converter.CmmnXmlConverter; import org.flowable.cmmn.model.CmmnModel; -import org.flowable.cmmn.validation.CaseValidatorFactory; import org.flowable.cmmn.validation.CaseValidator; +import org.flowable.cmmn.validation.CaseValidatorFactory; import org.flowable.cmmn.validation.validator.ValidationEntry; import org.junit.jupiter.api.BeforeEach; diff --git a/modules/flowable-cmmn-engine/src/main/java/org/flowable/cmmn/engine/impl/event/FlowableCmmnEventBuilder.java b/modules/flowable-cmmn-engine/src/main/java/org/flowable/cmmn/engine/impl/event/FlowableCmmnEventBuilder.java index 4d2d3929d36..644b0398a6c 100644 --- a/modules/flowable-cmmn-engine/src/main/java/org/flowable/cmmn/engine/impl/event/FlowableCmmnEventBuilder.java +++ b/modules/flowable-cmmn-engine/src/main/java/org/flowable/cmmn/engine/impl/event/FlowableCmmnEventBuilder.java @@ -14,8 +14,8 @@ import org.flowable.cmmn.api.event.FlowableCaseEndedEvent; import org.flowable.cmmn.api.event.FlowableCaseStageEndedEvent; -import org.flowable.cmmn.api.event.FlowableCaseStartedEvent; import org.flowable.cmmn.api.event.FlowableCaseStageStartedEvent; +import org.flowable.cmmn.api.event.FlowableCaseStartedEvent; import org.flowable.cmmn.api.runtime.CaseInstance; import org.flowable.cmmn.api.runtime.PlanItemInstance; import org.flowable.common.engine.api.delegate.event.FlowableEngineEventType; diff --git a/modules/flowable-cmmn-engine/src/main/java/org/flowable/cmmn/engine/impl/persistence/entity/HistoricPlanItemInstanceEntityImpl.java b/modules/flowable-cmmn-engine/src/main/java/org/flowable/cmmn/engine/impl/persistence/entity/HistoricPlanItemInstanceEntityImpl.java index 6daea4f8f4d..bc71ae5a0c8 100644 --- a/modules/flowable-cmmn-engine/src/main/java/org/flowable/cmmn/engine/impl/persistence/entity/HistoricPlanItemInstanceEntityImpl.java +++ b/modules/flowable-cmmn-engine/src/main/java/org/flowable/cmmn/engine/impl/persistence/entity/HistoricPlanItemInstanceEntityImpl.java @@ -16,7 +16,6 @@ import java.util.HashMap; import java.util.Map; - import org.apache.commons.lang3.StringUtils; import org.flowable.cmmn.api.runtime.PlanItemInstance; import org.flowable.cmmn.engine.CmmnEngineConfiguration; diff --git a/modules/flowable-cmmn-rest/src/main/java/org/flowable/cmmn/rest/service/api/CmmnRestApiInterceptor.java b/modules/flowable-cmmn-rest/src/main/java/org/flowable/cmmn/rest/service/api/CmmnRestApiInterceptor.java index 84ab59288ca..c43c17c33f0 100644 --- a/modules/flowable-cmmn-rest/src/main/java/org/flowable/cmmn/rest/service/api/CmmnRestApiInterceptor.java +++ b/modules/flowable-cmmn-rest/src/main/java/org/flowable/cmmn/rest/service/api/CmmnRestApiInterceptor.java @@ -32,9 +32,9 @@ import org.flowable.cmmn.api.runtime.CaseInstanceQuery; import org.flowable.cmmn.api.runtime.PlanItemInstance; import org.flowable.cmmn.api.runtime.PlanItemInstanceQuery; +import org.flowable.cmmn.api.runtime.VariableInstanceQuery; import org.flowable.cmmn.rest.service.api.engine.RestIdentityLink; import org.flowable.cmmn.rest.service.api.engine.variable.RestVariable; -import org.flowable.cmmn.api.runtime.VariableInstanceQuery; import org.flowable.cmmn.rest.service.api.history.caze.HistoricCaseInstanceQueryRequest; import org.flowable.cmmn.rest.service.api.history.milestone.HistoricMilestoneInstanceQueryRequest; import org.flowable.cmmn.rest.service.api.history.planitem.HistoricPlanItemInstanceQueryRequest; diff --git a/modules/flowable-cmmn-rest/src/main/java/org/flowable/cmmn/rest/service/api/repository/DeploymentResourceDataResource.java b/modules/flowable-cmmn-rest/src/main/java/org/flowable/cmmn/rest/service/api/repository/DeploymentResourceDataResource.java index c8c66647900..a934de66610 100644 --- a/modules/flowable-cmmn-rest/src/main/java/org/flowable/cmmn/rest/service/api/repository/DeploymentResourceDataResource.java +++ b/modules/flowable-cmmn-rest/src/main/java/org/flowable/cmmn/rest/service/api/repository/DeploymentResourceDataResource.java @@ -13,6 +13,8 @@ package org.flowable.cmmn.rest.service.api.repository; +import jakarta.servlet.http.HttpServletResponse; + import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.ResponseBody; @@ -24,7 +26,6 @@ import io.swagger.annotations.ApiResponse; import io.swagger.annotations.ApiResponses; import io.swagger.annotations.Authorization; -import jakarta.servlet.http.HttpServletResponse; /** * @author Frederik Heremans diff --git a/modules/flowable-dmn-engine-configurator/src/test/java/org/flowable/dmn/test/runtime/DecisionTaskTest.java b/modules/flowable-dmn-engine-configurator/src/test/java/org/flowable/dmn/test/runtime/DecisionTaskTest.java index 620265b40bc..a089ce65dfd 100644 --- a/modules/flowable-dmn-engine-configurator/src/test/java/org/flowable/dmn/test/runtime/DecisionTaskTest.java +++ b/modules/flowable-dmn-engine-configurator/src/test/java/org/flowable/dmn/test/runtime/DecisionTaskTest.java @@ -17,8 +17,6 @@ import java.util.List; import java.util.Map; -import com.fasterxml.jackson.databind.JsonNode; -import com.fasterxml.jackson.databind.ObjectMapper; import org.flowable.cmmn.api.CmmnRuntimeService; import org.flowable.cmmn.api.DecisionTableVariableManager; import org.flowable.cmmn.api.runtime.CaseInstance; @@ -39,6 +37,8 @@ import org.junit.Test; import org.junit.rules.ExpectedException; +import com.fasterxml.jackson.databind.JsonNode; +import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.node.ArrayNode; import com.fasterxml.jackson.databind.node.DoubleNode; import com.fasterxml.jackson.databind.node.ObjectNode; diff --git a/modules/flowable-dmn-image-generator/src/main/java/org/flowable/dmn/image/DecisionRequirementsDiagramGenerator.java b/modules/flowable-dmn-image-generator/src/main/java/org/flowable/dmn/image/DecisionRequirementsDiagramGenerator.java index 5879dce28bf..f64939b676f 100755 --- a/modules/flowable-dmn-image-generator/src/main/java/org/flowable/dmn/image/DecisionRequirementsDiagramGenerator.java +++ b/modules/flowable-dmn-image-generator/src/main/java/org/flowable/dmn/image/DecisionRequirementsDiagramGenerator.java @@ -12,11 +12,11 @@ */ package org.flowable.dmn.image; -import org.flowable.dmn.model.DmnDefinition; - import java.awt.image.BufferedImage; import java.io.InputStream; +import org.flowable.dmn.model.DmnDefinition; + /** * This interface declares methods to generate decision requirements diagram * diff --git a/modules/flowable-dmn-image-generator/src/main/java/org/flowable/dmn/image/impl/DefaultDecisionRequirementsDiagramGenerator.java b/modules/flowable-dmn-image-generator/src/main/java/org/flowable/dmn/image/impl/DefaultDecisionRequirementsDiagramGenerator.java index e45e285f08d..b000c70d6b0 100755 --- a/modules/flowable-dmn-image-generator/src/main/java/org/flowable/dmn/image/impl/DefaultDecisionRequirementsDiagramGenerator.java +++ b/modules/flowable-dmn-image-generator/src/main/java/org/flowable/dmn/image/impl/DefaultDecisionRequirementsDiagramGenerator.java @@ -26,10 +26,10 @@ import org.flowable.dmn.model.DecisionService; import org.flowable.dmn.model.DmnDefinition; import org.flowable.dmn.model.DmnElement; -import org.flowable.dmn.model.InformationRequirement; -import org.flowable.dmn.model.NamedElement; import org.flowable.dmn.model.DmnElementReference; import org.flowable.dmn.model.GraphicInfo; +import org.flowable.dmn.model.InformationRequirement; +import org.flowable.dmn.model.NamedElement; /** * Class to generate an image based the diagram interchange information in a DMN 1.2 definition. diff --git a/modules/flowable-dmn-rest/src/main/java/org/flowable/dmn/rest/service/api/repository/BaseDecisionResource.java b/modules/flowable-dmn-rest/src/main/java/org/flowable/dmn/rest/service/api/repository/BaseDecisionResource.java index 44837aa4e85..b146a5a4d8b 100644 --- a/modules/flowable-dmn-rest/src/main/java/org/flowable/dmn/rest/service/api/repository/BaseDecisionResource.java +++ b/modules/flowable-dmn-rest/src/main/java/org/flowable/dmn/rest/service/api/repository/BaseDecisionResource.java @@ -15,6 +15,8 @@ import java.io.InputStream; import java.util.List; +import jakarta.servlet.http.HttpServletResponse; + import org.apache.commons.io.IOUtils; import org.flowable.common.engine.api.FlowableException; import org.flowable.common.engine.api.FlowableIllegalArgumentException; @@ -29,8 +31,6 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.RestController; -import jakarta.servlet.http.HttpServletResponse; - /** * @author Yvo Swillens */ diff --git a/modules/flowable-dmn-rest/src/main/java/org/flowable/dmn/rest/service/api/repository/BaseDmnDeploymentResourceDataResource.java b/modules/flowable-dmn-rest/src/main/java/org/flowable/dmn/rest/service/api/repository/BaseDmnDeploymentResourceDataResource.java index 7ab451be687..fd51f7a8863 100644 --- a/modules/flowable-dmn-rest/src/main/java/org/flowable/dmn/rest/service/api/repository/BaseDmnDeploymentResourceDataResource.java +++ b/modules/flowable-dmn-rest/src/main/java/org/flowable/dmn/rest/service/api/repository/BaseDmnDeploymentResourceDataResource.java @@ -15,6 +15,8 @@ import java.io.InputStream; import java.util.List; +import jakarta.servlet.http.HttpServletResponse; + import org.apache.commons.io.IOUtils; import org.flowable.common.engine.api.FlowableException; import org.flowable.common.engine.api.FlowableIllegalArgumentException; @@ -26,8 +28,6 @@ import org.flowable.dmn.rest.service.api.DmnRestApiInterceptor; import org.springframework.beans.factory.annotation.Autowired; -import jakarta.servlet.http.HttpServletResponse; - /** * @author Yvo Swillens */ diff --git a/modules/flowable-dmn-xml-converter/src/test/java/org/flowable/dmn/xml/DiagramDiTest.java b/modules/flowable-dmn-xml-converter/src/test/java/org/flowable/dmn/xml/DiagramDiTest.java index 97cf35be7b3..371a821c473 100644 --- a/modules/flowable-dmn-xml-converter/src/test/java/org/flowable/dmn/xml/DiagramDiTest.java +++ b/modules/flowable-dmn-xml-converter/src/test/java/org/flowable/dmn/xml/DiagramDiTest.java @@ -15,13 +15,13 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.tuple; +import java.nio.charset.Charset; + import org.flowable.dmn.model.DmnDefinition; import org.flowable.dmn.model.GraphicInfo; import org.flowable.dmn.xml.converter.DmnXMLConverter; import org.junit.jupiter.api.Test; -import java.nio.charset.Charset; - public class DiagramDiTest extends AbstractConverterTest { @Test diff --git a/modules/flowable-engine-common/src/main/java/org/flowable/common/engine/impl/de/odysseus/el/ExpressionFactoryImpl.java b/modules/flowable-engine-common/src/main/java/org/flowable/common/engine/impl/de/odysseus/el/ExpressionFactoryImpl.java index 7637cc85bb4..78dbf058d10 100644 --- a/modules/flowable-engine-common/src/main/java/org/flowable/common/engine/impl/de/odysseus/el/ExpressionFactoryImpl.java +++ b/modules/flowable-engine-common/src/main/java/org/flowable/common/engine/impl/de/odysseus/el/ExpressionFactoryImpl.java @@ -27,8 +27,8 @@ import org.flowable.common.engine.impl.de.odysseus.el.tree.TreeBuilder; import org.flowable.common.engine.impl.de.odysseus.el.tree.TreeStore; import org.flowable.common.engine.impl.de.odysseus.el.tree.impl.Builder; -import org.flowable.common.engine.impl.de.odysseus.el.tree.impl.Cache; import org.flowable.common.engine.impl.de.odysseus.el.tree.impl.Builder.Feature; +import org.flowable.common.engine.impl.de.odysseus.el.tree.impl.Cache; import org.flowable.common.engine.impl.javax.el.ELContext; import org.flowable.common.engine.impl.javax.el.ELException; import org.flowable.common.engine.impl.javax.el.ExpressionFactory; diff --git a/modules/flowable-engine/src/main/java/org/flowable/engine/TaskService.java b/modules/flowable-engine/src/main/java/org/flowable/engine/TaskService.java index 463149a01b3..bdbcf60d0b9 100644 --- a/modules/flowable-engine/src/main/java/org/flowable/engine/TaskService.java +++ b/modules/flowable-engine/src/main/java/org/flowable/engine/TaskService.java @@ -19,7 +19,6 @@ import java.util.Map; import java.util.Set; -import org.flowable.task.api.TaskCompletionBuilder; import org.flowable.common.engine.api.FlowableException; import org.flowable.common.engine.api.FlowableObjectNotFoundException; import org.flowable.common.engine.api.query.NativeQuery; @@ -34,6 +33,7 @@ import org.flowable.task.api.NativeTaskQuery; import org.flowable.task.api.Task; import org.flowable.task.api.TaskBuilder; +import org.flowable.task.api.TaskCompletionBuilder; import org.flowable.task.api.TaskQuery; import org.flowable.variable.api.persistence.entity.VariableInstance; diff --git a/modules/flowable-engine/src/main/java/org/flowable/engine/impl/RuntimeServiceImpl.java b/modules/flowable-engine/src/main/java/org/flowable/engine/impl/RuntimeServiceImpl.java index 3cfd0a21c40..0457ba5a438 100644 --- a/modules/flowable-engine/src/main/java/org/flowable/engine/impl/RuntimeServiceImpl.java +++ b/modules/flowable-engine/src/main/java/org/flowable/engine/impl/RuntimeServiceImpl.java @@ -34,12 +34,12 @@ import org.flowable.engine.impl.cmd.AddEventListenerCommand; import org.flowable.engine.impl.cmd.AddIdentityLinkForProcessInstanceCmd; import org.flowable.engine.impl.cmd.AddMultiInstanceExecutionCmd; -import org.flowable.engine.impl.cmd.DeleteProcessInstancesByIdCmd; import org.flowable.engine.impl.cmd.ChangeActivityStateCmd; import org.flowable.engine.impl.cmd.CompleteAdhocSubProcessCmd; import org.flowable.engine.impl.cmd.DeleteIdentityLinkForProcessInstanceCmd; import org.flowable.engine.impl.cmd.DeleteMultiInstanceExecutionCmd; import org.flowable.engine.impl.cmd.DeleteProcessInstanceCmd; +import org.flowable.engine.impl.cmd.DeleteProcessInstancesByIdCmd; import org.flowable.engine.impl.cmd.DispatchEventCommand; import org.flowable.engine.impl.cmd.EvaluateConditionalEventsCmd; import org.flowable.engine.impl.cmd.ExecuteActivityForAdhocSubProcessCmd; diff --git a/modules/flowable-http/src/test/java/org/flowable/http/bpmn/HttpServiceTaskTestServer.java b/modules/flowable-http/src/test/java/org/flowable/http/bpmn/HttpServiceTaskTestServer.java index b6ad6b356fc..9c7e051c67d 100644 --- a/modules/flowable-http/src/test/java/org/flowable/http/bpmn/HttpServiceTaskTestServer.java +++ b/modules/flowable-http/src/test/java/org/flowable/http/bpmn/HttpServiceTaskTestServer.java @@ -23,6 +23,13 @@ import java.util.List; import java.util.Map; +import jakarta.servlet.MultipartConfigElement; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.http.Part; + import org.apache.commons.io.IOUtils; import org.apache.commons.lang3.StringUtils; import org.eclipse.jetty.http.HttpVersion; @@ -44,13 +51,6 @@ import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.node.ObjectNode; -import jakarta.servlet.MultipartConfigElement; -import jakarta.servlet.ServletException; -import jakarta.servlet.http.HttpServlet; -import jakarta.servlet.http.HttpServletRequest; -import jakarta.servlet.http.HttpServletResponse; -import jakarta.servlet.http.Part; - /** * Http Server and API to test HTTP Activity * diff --git a/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/repository/BaseDeploymentResourceDataResource.java b/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/repository/BaseDeploymentResourceDataResource.java index 97f6a98f805..ea0bb57bc51 100644 --- a/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/repository/BaseDeploymentResourceDataResource.java +++ b/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/repository/BaseDeploymentResourceDataResource.java @@ -16,6 +16,8 @@ import java.io.InputStream; import java.util.List; +import jakarta.servlet.http.HttpServletResponse; + import org.apache.commons.io.IOUtils; import org.flowable.common.engine.api.FlowableException; import org.flowable.common.engine.api.FlowableIllegalArgumentException; @@ -26,8 +28,6 @@ import org.flowable.rest.service.api.BpmnRestApiInterceptor; import org.springframework.beans.factory.annotation.Autowired; -import jakarta.servlet.http.HttpServletResponse; - /** * @author Frederik Heremans */ diff --git a/modules/flowable-rest/src/test/java/org/flowable/rest/conf/jpa/DatabaseConfiguration.java b/modules/flowable-rest/src/test/java/org/flowable/rest/conf/jpa/DatabaseConfiguration.java index 6d4d6738636..88b7b93d949 100644 --- a/modules/flowable-rest/src/test/java/org/flowable/rest/conf/jpa/DatabaseConfiguration.java +++ b/modules/flowable-rest/src/test/java/org/flowable/rest/conf/jpa/DatabaseConfiguration.java @@ -12,9 +12,10 @@ */ package org.flowable.rest.conf.jpa; -import jakarta.persistence.EntityManagerFactory; import javax.sql.DataSource; +import jakarta.persistence.EntityManagerFactory; + import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.data.jpa.repository.config.EnableJpaRepositories; diff --git a/modules/flowable-rest/src/test/java/org/flowable/rest/conf/jpa/JPAFlowableEngineConfiguration.java b/modules/flowable-rest/src/test/java/org/flowable/rest/conf/jpa/JPAFlowableEngineConfiguration.java index d6b5fcfdcd0..55bdbbf0bfc 100644 --- a/modules/flowable-rest/src/test/java/org/flowable/rest/conf/jpa/JPAFlowableEngineConfiguration.java +++ b/modules/flowable-rest/src/test/java/org/flowable/rest/conf/jpa/JPAFlowableEngineConfiguration.java @@ -14,6 +14,8 @@ import javax.sql.DataSource; +import jakarta.persistence.EntityManagerFactory; + import org.flowable.common.engine.impl.history.HistoryLevel; import org.flowable.common.engine.impl.interceptor.EngineConfigurationConstants; import org.flowable.engine.DynamicBpmnService; @@ -37,8 +39,6 @@ import org.springframework.context.annotation.Configuration; import org.springframework.transaction.PlatformTransactionManager; -import jakarta.persistence.EntityManagerFactory; - @Configuration(proxyBeanMethods = false) public class JPAFlowableEngineConfiguration { diff --git a/modules/flowable-spring-boot/flowable-spring-boot-starters/flowable-spring-boot-autoconfigure/src/main/java/org/flowable/spring/boot/FlowableMailProperties.java b/modules/flowable-spring-boot/flowable-spring-boot-starters/flowable-spring-boot-autoconfigure/src/main/java/org/flowable/spring/boot/FlowableMailProperties.java index 37e9eb5da8f..27e32f289d7 100644 --- a/modules/flowable-spring-boot/flowable-spring-boot-starters/flowable-spring-boot-autoconfigure/src/main/java/org/flowable/spring/boot/FlowableMailProperties.java +++ b/modules/flowable-spring-boot/flowable-spring-boot-starters/flowable-spring-boot-autoconfigure/src/main/java/org/flowable/spring/boot/FlowableMailProperties.java @@ -12,11 +12,11 @@ */ package org.flowable.spring.boot; -import org.springframework.boot.context.properties.ConfigurationProperties; - import java.nio.charset.Charset; import java.nio.charset.StandardCharsets; +import org.springframework.boot.context.properties.ConfigurationProperties; + /** * Flowable Mail Properties. * diff --git a/modules/flowable-spring/src/test/java/org/flowable/spring/test/email/JndiEmailTest.java b/modules/flowable-spring/src/test/java/org/flowable/spring/test/email/JndiEmailTest.java index 1edb130375e..6fe0a9db12b 100644 --- a/modules/flowable-spring/src/test/java/org/flowable/spring/test/email/JndiEmailTest.java +++ b/modules/flowable-spring/src/test/java/org/flowable/spring/test/email/JndiEmailTest.java @@ -18,12 +18,13 @@ import java.util.Map; import java.util.Properties; +import javax.naming.InitialContext; +import javax.naming.NamingException; + import jakarta.mail.NoSuchProviderException; import jakarta.mail.Provider; import jakarta.mail.Provider.Type; import jakarta.mail.Session; -import javax.naming.InitialContext; -import javax.naming.NamingException; import org.flowable.engine.runtime.ProcessInstance; import org.flowable.engine.test.Deployment;