From c915abc381d05873e02f5936409c1eba5777ee1c Mon Sep 17 00:00:00 2001 From: Jeremy Landis Date: Wed, 22 Jan 2020 00:28:01 -0500 Subject: [PATCH] [ci] More import sorting --- .../java/org/apache/ibatis/builder/xml/XMLConfigBuilder.java | 1 + .../java/org/apache/ibatis/datasource/DataSourceFactory.java | 1 + .../executor/loader/AbstractEnhancedDeserializationProxy.java | 2 +- .../org/apache/ibatis/executor/resultset/ResultSetWrapper.java | 1 + .../org/apache/ibatis/scripting/xmltags/OgnlClassResolver.java | 1 + .../org/apache/ibatis/transaction/jdbc/JdbcTransaction.java | 1 + .../apache/ibatis/transaction/managed/ManagedTransaction.java | 1 + src/test/java/org/apache/ibatis/binding/BindingTest.java | 1 - .../java/org/apache/ibatis/builder/ParameterExpressionTest.java | 1 + src/test/java/org/apache/ibatis/cache/BaseCacheTest.java | 1 - .../apache/ibatis/executor/loader/SerializableProxyTest.java | 1 + .../ibatis/session/AutoMappingUnknownColumnBehaviorTest.java | 1 + .../apache/ibatis/submitted/cglib_lazy_error/CglibNPETest.java | 1 + .../org/apache/ibatis/submitted/language/VelocitySqlSource.java | 1 + .../NestedResultHandlerMultipleAssociationTest.java | 1 - .../ibatis/submitted/parametrizedlist/ParametrizedListTest.java | 1 + .../apache/ibatis/submitted/rounding/RoundingHandlersTest.java | 1 - .../java/org/apache/ibatis/submitted/sqlprovider/Mapper.java | 1 + .../org/apache/ibatis/type/BlobInputStreamTypeHandlerTest.java | 1 + .../java/org/apache/ibatis/type/ClobReaderTypeHandlerTest.java | 1 + 20 files changed, 16 insertions(+), 5 deletions(-) diff --git a/src/main/java/org/apache/ibatis/builder/xml/XMLConfigBuilder.java b/src/main/java/org/apache/ibatis/builder/xml/XMLConfigBuilder.java index a7d8937d250..30b83d3c54f 100644 --- a/src/main/java/org/apache/ibatis/builder/xml/XMLConfigBuilder.java +++ b/src/main/java/org/apache/ibatis/builder/xml/XMLConfigBuilder.java @@ -18,6 +18,7 @@ import java.io.InputStream; import java.io.Reader; import java.util.Properties; + import javax.sql.DataSource; import org.apache.ibatis.builder.BaseBuilder; diff --git a/src/main/java/org/apache/ibatis/datasource/DataSourceFactory.java b/src/main/java/org/apache/ibatis/datasource/DataSourceFactory.java index 9b491a4fab5..ad9a47d0f37 100644 --- a/src/main/java/org/apache/ibatis/datasource/DataSourceFactory.java +++ b/src/main/java/org/apache/ibatis/datasource/DataSourceFactory.java @@ -16,6 +16,7 @@ package org.apache.ibatis.datasource; import java.util.Properties; + import javax.sql.DataSource; /** diff --git a/src/main/java/org/apache/ibatis/executor/loader/AbstractEnhancedDeserializationProxy.java b/src/main/java/org/apache/ibatis/executor/loader/AbstractEnhancedDeserializationProxy.java index a18078b4382..343ca3d915b 100644 --- a/src/main/java/org/apache/ibatis/executor/loader/AbstractEnhancedDeserializationProxy.java +++ b/src/main/java/org/apache/ibatis/executor/loader/AbstractEnhancedDeserializationProxy.java @@ -19,8 +19,8 @@ import java.util.List; import java.util.Locale; import java.util.Map; -import org.apache.ibatis.executor.ExecutorException; +import org.apache.ibatis.executor.ExecutorException; import org.apache.ibatis.reflection.ExceptionUtil; import org.apache.ibatis.reflection.factory.ObjectFactory; import org.apache.ibatis.reflection.property.PropertyCopier; diff --git a/src/main/java/org/apache/ibatis/executor/resultset/ResultSetWrapper.java b/src/main/java/org/apache/ibatis/executor/resultset/ResultSetWrapper.java index 08a879b757b..8370f27a39c 100644 --- a/src/main/java/org/apache/ibatis/executor/resultset/ResultSetWrapper.java +++ b/src/main/java/org/apache/ibatis/executor/resultset/ResultSetWrapper.java @@ -26,6 +26,7 @@ import java.util.Locale; import java.util.Map; import java.util.Set; + import org.apache.ibatis.io.Resources; import org.apache.ibatis.mapping.ResultMap; import org.apache.ibatis.session.Configuration; diff --git a/src/main/java/org/apache/ibatis/scripting/xmltags/OgnlClassResolver.java b/src/main/java/org/apache/ibatis/scripting/xmltags/OgnlClassResolver.java index 93589630c40..8129b0770c2 100644 --- a/src/main/java/org/apache/ibatis/scripting/xmltags/OgnlClassResolver.java +++ b/src/main/java/org/apache/ibatis/scripting/xmltags/OgnlClassResolver.java @@ -16,6 +16,7 @@ package org.apache.ibatis.scripting.xmltags; import ognl.DefaultClassResolver; + import org.apache.ibatis.io.Resources; /** diff --git a/src/main/java/org/apache/ibatis/transaction/jdbc/JdbcTransaction.java b/src/main/java/org/apache/ibatis/transaction/jdbc/JdbcTransaction.java index c9b8582e07e..2bcfbbc1389 100644 --- a/src/main/java/org/apache/ibatis/transaction/jdbc/JdbcTransaction.java +++ b/src/main/java/org/apache/ibatis/transaction/jdbc/JdbcTransaction.java @@ -17,6 +17,7 @@ import java.sql.Connection; import java.sql.SQLException; + import javax.sql.DataSource; import org.apache.ibatis.logging.Log; diff --git a/src/main/java/org/apache/ibatis/transaction/managed/ManagedTransaction.java b/src/main/java/org/apache/ibatis/transaction/managed/ManagedTransaction.java index 71f0d34211a..9fc55720c73 100644 --- a/src/main/java/org/apache/ibatis/transaction/managed/ManagedTransaction.java +++ b/src/main/java/org/apache/ibatis/transaction/managed/ManagedTransaction.java @@ -17,6 +17,7 @@ import java.sql.Connection; import java.sql.SQLException; + import javax.sql.DataSource; import org.apache.ibatis.logging.Log; diff --git a/src/test/java/org/apache/ibatis/binding/BindingTest.java b/src/test/java/org/apache/ibatis/binding/BindingTest.java index e743c7eb85d..08f2eb6c7c4 100644 --- a/src/test/java/org/apache/ibatis/binding/BindingTest.java +++ b/src/test/java/org/apache/ibatis/binding/BindingTest.java @@ -37,7 +37,6 @@ import org.apache.ibatis.BaseDataTest; import org.apache.ibatis.binding.MapperProxy.MapperMethodInvoker; -import org.apache.ibatis.builder.BuilderException; import org.apache.ibatis.cursor.Cursor; import org.apache.ibatis.domain.blog.Author; import org.apache.ibatis.domain.blog.Blog; diff --git a/src/test/java/org/apache/ibatis/builder/ParameterExpressionTest.java b/src/test/java/org/apache/ibatis/builder/ParameterExpressionTest.java index bd80859ab63..38b2891e5b0 100644 --- a/src/test/java/org/apache/ibatis/builder/ParameterExpressionTest.java +++ b/src/test/java/org/apache/ibatis/builder/ParameterExpressionTest.java @@ -16,6 +16,7 @@ package org.apache.ibatis.builder; import java.util.Map; + import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/src/test/java/org/apache/ibatis/cache/BaseCacheTest.java b/src/test/java/org/apache/ibatis/cache/BaseCacheTest.java index 898ba598a3f..47b20c1f668 100644 --- a/src/test/java/org/apache/ibatis/cache/BaseCacheTest.java +++ b/src/test/java/org/apache/ibatis/cache/BaseCacheTest.java @@ -16,7 +16,6 @@ package org.apache.ibatis.cache; import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertTrue; import java.util.HashSet; import java.util.Set; diff --git a/src/test/java/org/apache/ibatis/executor/loader/SerializableProxyTest.java b/src/test/java/org/apache/ibatis/executor/loader/SerializableProxyTest.java index 427768b2cd9..c5aa5cfce76 100644 --- a/src/test/java/org/apache/ibatis/executor/loader/SerializableProxyTest.java +++ b/src/test/java/org/apache/ibatis/executor/loader/SerializableProxyTest.java @@ -27,6 +27,7 @@ import java.io.Serializable; import java.lang.reflect.Method; import java.util.ArrayList; + import org.apache.ibatis.domain.blog.Author; import org.apache.ibatis.domain.blog.Section; import org.apache.ibatis.executor.ExecutorException; diff --git a/src/test/java/org/apache/ibatis/session/AutoMappingUnknownColumnBehaviorTest.java b/src/test/java/org/apache/ibatis/session/AutoMappingUnknownColumnBehaviorTest.java index 49fb57a690a..7ddaf8bb3ed 100644 --- a/src/test/java/org/apache/ibatis/session/AutoMappingUnknownColumnBehaviorTest.java +++ b/src/test/java/org/apache/ibatis/session/AutoMappingUnknownColumnBehaviorTest.java @@ -18,6 +18,7 @@ import static org.assertj.core.api.Assertions.assertThat; import java.util.concurrent.atomic.AtomicInteger; + import javax.sql.DataSource; import org.apache.ibatis.BaseDataTest; diff --git a/src/test/java/org/apache/ibatis/submitted/cglib_lazy_error/CglibNPETest.java b/src/test/java/org/apache/ibatis/submitted/cglib_lazy_error/CglibNPETest.java index 7dcb6620552..bbe2f2a250c 100644 --- a/src/test/java/org/apache/ibatis/submitted/cglib_lazy_error/CglibNPETest.java +++ b/src/test/java/org/apache/ibatis/submitted/cglib_lazy_error/CglibNPETest.java @@ -16,6 +16,7 @@ package org.apache.ibatis.submitted.cglib_lazy_error; import java.io.Reader; + import org.apache.ibatis.BaseDataTest; import org.apache.ibatis.io.Resources; import org.apache.ibatis.session.SqlSession; diff --git a/src/test/java/org/apache/ibatis/submitted/language/VelocitySqlSource.java b/src/test/java/org/apache/ibatis/submitted/language/VelocitySqlSource.java index 8ea355f6ade..d590faca024 100644 --- a/src/test/java/org/apache/ibatis/submitted/language/VelocitySqlSource.java +++ b/src/test/java/org/apache/ibatis/submitted/language/VelocitySqlSource.java @@ -19,6 +19,7 @@ import java.io.StringWriter; import java.util.HashMap; import java.util.Map; + import org.apache.ibatis.builder.BuilderException; import org.apache.ibatis.mapping.BoundSql; import org.apache.ibatis.mapping.SqlSource; diff --git a/src/test/java/org/apache/ibatis/submitted/nestedresulthandler_multiple_association/NestedResultHandlerMultipleAssociationTest.java b/src/test/java/org/apache/ibatis/submitted/nestedresulthandler_multiple_association/NestedResultHandlerMultipleAssociationTest.java index 62a97938d8a..8a47e5cf030 100644 --- a/src/test/java/org/apache/ibatis/submitted/nestedresulthandler_multiple_association/NestedResultHandlerMultipleAssociationTest.java +++ b/src/test/java/org/apache/ibatis/submitted/nestedresulthandler_multiple_association/NestedResultHandlerMultipleAssociationTest.java @@ -16,7 +16,6 @@ package org.apache.ibatis.submitted.nestedresulthandler_multiple_association; import java.io.Reader; - import java.util.List; import org.apache.ibatis.BaseDataTest; diff --git a/src/test/java/org/apache/ibatis/submitted/parametrizedlist/ParametrizedListTest.java b/src/test/java/org/apache/ibatis/submitted/parametrizedlist/ParametrizedListTest.java index 8826ff803ef..b76975392b8 100644 --- a/src/test/java/org/apache/ibatis/submitted/parametrizedlist/ParametrizedListTest.java +++ b/src/test/java/org/apache/ibatis/submitted/parametrizedlist/ParametrizedListTest.java @@ -18,6 +18,7 @@ import java.io.Reader; import java.util.List; import java.util.Map; + import org.apache.ibatis.BaseDataTest; import org.apache.ibatis.io.Resources; import org.apache.ibatis.session.SqlSession; diff --git a/src/test/java/org/apache/ibatis/submitted/rounding/RoundingHandlersTest.java b/src/test/java/org/apache/ibatis/submitted/rounding/RoundingHandlersTest.java index 260031ba308..89b3a79bc9e 100644 --- a/src/test/java/org/apache/ibatis/submitted/rounding/RoundingHandlersTest.java +++ b/src/test/java/org/apache/ibatis/submitted/rounding/RoundingHandlersTest.java @@ -24,7 +24,6 @@ import org.apache.ibatis.session.SqlSession; import org.apache.ibatis.session.SqlSessionFactory; import org.apache.ibatis.session.SqlSessionFactoryBuilder; - import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; diff --git a/src/test/java/org/apache/ibatis/submitted/sqlprovider/Mapper.java b/src/test/java/org/apache/ibatis/submitted/sqlprovider/Mapper.java index e2ff42df86b..ad880e520bf 100644 --- a/src/test/java/org/apache/ibatis/submitted/sqlprovider/Mapper.java +++ b/src/test/java/org/apache/ibatis/submitted/sqlprovider/Mapper.java @@ -17,6 +17,7 @@ import java.util.List; import java.util.Map; + import org.apache.ibatis.annotations.DeleteProvider; import org.apache.ibatis.annotations.InsertProvider; import org.apache.ibatis.annotations.Param; diff --git a/src/test/java/org/apache/ibatis/type/BlobInputStreamTypeHandlerTest.java b/src/test/java/org/apache/ibatis/type/BlobInputStreamTypeHandlerTest.java index 4f72e6763a1..7db13a19418 100644 --- a/src/test/java/org/apache/ibatis/type/BlobInputStreamTypeHandlerTest.java +++ b/src/test/java/org/apache/ibatis/type/BlobInputStreamTypeHandlerTest.java @@ -21,6 +21,7 @@ import java.io.*; import java.sql.Blob; + import javax.sql.DataSource; import org.apache.ibatis.BaseDataTest; diff --git a/src/test/java/org/apache/ibatis/type/ClobReaderTypeHandlerTest.java b/src/test/java/org/apache/ibatis/type/ClobReaderTypeHandlerTest.java index 84b14331dd8..f1ffb866f49 100644 --- a/src/test/java/org/apache/ibatis/type/ClobReaderTypeHandlerTest.java +++ b/src/test/java/org/apache/ibatis/type/ClobReaderTypeHandlerTest.java @@ -23,6 +23,7 @@ import java.io.*; import java.sql.Clob; + import javax.sql.DataSource; import org.apache.ibatis.BaseDataTest;