Skip to content

Commit cd67710

Browse files
committed
[ci] Sort the imports per spec
1 parent 0c973fc commit cd67710

File tree

137 files changed

+577
-576
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

137 files changed

+577
-576
lines changed

src/main/java/org/apache/ibatis/builder/ResultMapResolver.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* Copyright 2009-2017 the original author or authors.
2+
* Copyright 2009-2020 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -47,4 +47,4 @@ public ResultMap resolve() {
4747
return assistant.addResultMap(this.id, this.type, this.extend, this.discriminator, this.resultMappings, this.autoMapping);
4848
}
4949

50-
}
50+
}

src/main/java/org/apache/ibatis/cache/decorators/ScheduledCache.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* Copyright 2009-2019 the original author or authors.
2+
* Copyright 2009-2020 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -15,10 +15,10 @@
1515
*/
1616
package org.apache.ibatis.cache.decorators;
1717

18-
import org.apache.ibatis.cache.Cache;
19-
2018
import java.util.concurrent.TimeUnit;
2119

20+
import org.apache.ibatis.cache.Cache;
21+
2222
/**
2323
* @author Clinton Begin
2424
*/

src/main/java/org/apache/ibatis/reflection/wrapper/BaseWrapper.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* Copyright 2009-2017 the original author or authors.
2+
* Copyright 2009-2020 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -104,4 +104,4 @@ protected void setCollectionValue(PropertyTokenizer prop, Object collection, Obj
104104
}
105105
}
106106

107-
}
107+
}

src/main/java/org/apache/ibatis/scripting/xmltags/DynamicContext.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* Copyright 2009-2019 the original author or authors.
2+
* Copyright 2009-2020 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -139,4 +139,4 @@ public String getSourceSetter(OgnlContext arg0, Object arg1, Object arg2) {
139139
return null;
140140
}
141141
}
142-
}
142+
}

src/main/java/org/apache/ibatis/type/ClobReaderTypeHandler.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* Copyright 2009-2019 the original author or authors.
2+
* Copyright 2009-2020 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -22,7 +22,6 @@
2222
import java.sql.ResultSet;
2323
import java.sql.SQLException;
2424

25-
2625
/**
2726
* The {@link TypeHandler} for {@link Clob}/{@link Reader} using method supported at JDBC 4.0.
2827
* @since 3.4.0

src/test/java/org/apache/ibatis/BaseDataTest.java

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* Copyright 2009-2018 the original author or authors.
2+
* Copyright 2009-2020 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -15,18 +15,19 @@
1515
*/
1616
package org.apache.ibatis;
1717

18-
import org.apache.ibatis.datasource.pooled.PooledDataSource;
19-
import org.apache.ibatis.datasource.unpooled.UnpooledDataSource;
20-
import org.apache.ibatis.io.Resources;
21-
import org.apache.ibatis.jdbc.ScriptRunner;
22-
23-
import javax.sql.DataSource;
2418
import java.io.IOException;
2519
import java.io.Reader;
2620
import java.sql.Connection;
2721
import java.sql.SQLException;
2822
import java.util.Properties;
2923

24+
import javax.sql.DataSource;
25+
26+
import org.apache.ibatis.datasource.pooled.PooledDataSource;
27+
import org.apache.ibatis.datasource.unpooled.UnpooledDataSource;
28+
import org.apache.ibatis.io.Resources;
29+
import org.apache.ibatis.jdbc.ScriptRunner;
30+
3031
public abstract class BaseDataTest {
3132

3233
public static final String BLOG_PROPERTIES = "org/apache/ibatis/databases/blog/blog-derby.properties";

src/test/java/org/apache/ibatis/autoconstructor/AutoConstructorMapper.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* Copyright 2009-2019 the original author or authors.
2+
* Copyright 2009-2020 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -15,10 +15,10 @@
1515
*/
1616
package org.apache.ibatis.autoconstructor;
1717

18-
import org.apache.ibatis.annotations.Select;
19-
2018
import java.util.List;
2119

20+
import org.apache.ibatis.annotations.Select;
21+
2222
public interface AutoConstructorMapper {
2323
@Select("SELECT * FROM subject WHERE id = #{id}")
2424
PrimitiveSubject getSubject(final int id);

src/test/java/org/apache/ibatis/autoconstructor/AutoConstructorTest.java

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* Copyright 2009-2019 the original author or authors.
2+
* Copyright 2009-2020 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -15,6 +15,12 @@
1515
*/
1616
package org.apache.ibatis.autoconstructor;
1717

18+
import static org.junit.jupiter.api.Assertions.assertNotNull;
19+
import static org.junit.jupiter.api.Assertions.assertThrows;
20+
21+
import java.io.Reader;
22+
import java.util.List;
23+
1824
import org.apache.ibatis.BaseDataTest;
1925
import org.apache.ibatis.exceptions.PersistenceException;
2026
import org.apache.ibatis.io.Resources;
@@ -25,12 +31,6 @@
2531
import org.junit.jupiter.api.BeforeAll;
2632
import org.junit.jupiter.api.Test;
2733

28-
import java.io.Reader;
29-
import java.util.List;
30-
31-
import static org.junit.jupiter.api.Assertions.assertNotNull;
32-
import static org.junit.jupiter.api.Assertions.assertThrows;
33-
3434
class AutoConstructorTest {
3535
private static SqlSessionFactory sqlSessionFactory;
3636

src/test/java/org/apache/ibatis/binding/BindingTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* Copyright 2009-2019 the original author or authors.
2+
* Copyright 2009-2020 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -36,8 +36,8 @@
3636
import net.sf.cglib.proxy.Factory;
3737

3838
import org.apache.ibatis.BaseDataTest;
39-
import org.apache.ibatis.builder.BuilderException;
4039
import org.apache.ibatis.binding.MapperProxy.MapperMethodInvoker;
40+
import org.apache.ibatis.builder.BuilderException;
4141
import org.apache.ibatis.cursor.Cursor;
4242
import org.apache.ibatis.domain.blog.Author;
4343
import org.apache.ibatis.domain.blog.Blog;

src/test/java/org/apache/ibatis/binding/BoundAuthorMapper.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* Copyright 2009-2019 the original author or authors.
2+
* Copyright 2009-2020 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -15,15 +15,15 @@
1515
*/
1616
package org.apache.ibatis.binding;
1717

18+
import java.util.List;
19+
1820
import org.apache.ibatis.annotations.*;
1921
import org.apache.ibatis.domain.blog.Author;
2022
import org.apache.ibatis.domain.blog.Post;
2123
import org.apache.ibatis.domain.blog.Section;
2224
import org.apache.ibatis.executor.BatchResult;
2325
import org.apache.ibatis.session.RowBounds;
2426

25-
import java.util.List;
26-
2727
@CacheNamespace(readWrite = false)
2828
public interface BoundAuthorMapper {
2929

0 commit comments

Comments
 (0)