Chore: use correct ordering of imports (#3711)

flowable · Aug 17, 2023 · 92a1394 · 92a1394
1 parent 047b61d
commit 92a1394
Show file tree

Hide file tree

Showing 23 changed files with 44 additions and 39 deletions.
diff --git a/.../java/org/flowable/app/rest/service/api/repository/AppDefinitionResourceDataResource.java b/.../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/...in/java/org/flowable/app/rest/service/api/repository/AppDeploymentCollectionResource.java b/...in/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/.../java/org/flowable/app/rest/service/api/repository/AppDeploymentResourceDataResource.java b/.../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/...tion/src/test/java/org/flowable/cmmn/validation/validator/impl/AbstractValidatorTest.java b/...tion/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/...mn-engine/src/main/java/org/flowable/cmmn/engine/impl/event/FlowableCmmnEventBuilder.java b/...mn-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/.../org/flowable/cmmn/engine/impl/persistence/entity/HistoricPlanItemInstanceEntityImpl.java b/.../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/...le-cmmn-rest/src/main/java/org/flowable/cmmn/rest/service/api/CmmnRestApiInterceptor.java b/...le-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/...in/java/org/flowable/cmmn/rest/service/api/repository/DeploymentResourceDataResource.java b/...in/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/...dmn-engine-configurator/src/test/java/org/flowable/dmn/test/runtime/DecisionTaskTest.java b/...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/...-generator/src/main/java/org/flowable/dmn/image/DecisionRequirementsDiagramGenerator.java b/...-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/...rc/main/java/org/flowable/dmn/image/impl/DefaultDecisionRequirementsDiagramGenerator.java b/...rc/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/...rest/src/main/java/org/flowable/dmn/rest/service/api/repository/BaseDecisionResource.java b/...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/...a/org/flowable/dmn/rest/service/api/repository/BaseDmnDeploymentResourceDataResource.java b/...a/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
@@ -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/...n/src/main/java/org/flowable/common/engine/impl/de/odysseus/el/ExpressionFactoryImpl.java b/...n/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
@@ -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
@@ -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
@@ -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/...ain/java/org/flowable/rest/service/api/repository/BaseDeploymentResourceDataResource.java b/...ain/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
@@ -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/...lowable-rest/src/test/java/org/flowable/rest/conf/jpa/JPAFlowableEngineConfiguration.java b/...lowable-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/...ing-boot-autoconfigure/src/main/java/org/flowable/spring/boot/FlowableMailProperties.java b/...ing-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
@@ -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;