Skip to content

Commit 998ceda

Browse files
authored
Merge pull request #1450 from hazendaz/tests
Remove unused imports, add missing type, copyright dates
2 parents 064e77a + c77f95a commit 998ceda

File tree

14 files changed

+12
-31
lines changed

14 files changed

+12
-31
lines changed

src/main/java/org/apache/ibatis/executor/BatchExecutor.java

Lines changed: 1 addition & 1 deletion
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-2019 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.

src/main/java/org/apache/ibatis/io/ExternalResources.java

Lines changed: 1 addition & 1 deletion
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-2019 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.

src/main/java/org/apache/ibatis/parsing/GenericTokenParser.java

Lines changed: 1 addition & 1 deletion
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-2019 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.

src/test/java/org/apache/ibatis/builder/XmlConfigBuilderTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@ public void registerJavaTypeInitializingTypeHandler() {
156156
TypeHandler<MyEnum> typeHandler = typeHandlerRegistry.getTypeHandler(MyEnum.class);
157157

158158
assertTrue(typeHandler instanceof EnumOrderTypeHandler);
159-
assertArrayEquals(MyEnum.values(), ((EnumOrderTypeHandler) typeHandler).constants);
159+
assertArrayEquals(MyEnum.values(), ((EnumOrderTypeHandler<MyEnum>) typeHandler).constants);
160160
}
161161

162162
@Test

src/test/java/org/apache/ibatis/cache/BaseCacheTest.java

Lines changed: 1 addition & 1 deletion
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-2019 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.

src/test/java/org/apache/ibatis/cache/CacheKeyTest.java

Lines changed: 1 addition & 4 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-2019 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,9 +22,6 @@
2222

2323
import java.io.ByteArrayInputStream;
2424
import java.io.ByteArrayOutputStream;
25-
import java.io.FileInputStream;
26-
import java.io.FileOutputStream;
27-
import java.io.IOException;
2825
import java.io.NotSerializableException;
2926
import java.io.ObjectInputStream;
3027
import java.io.ObjectOutputStream;

src/test/java/org/apache/ibatis/submitted/cglib_lazy_error/CglibNPETest.java

Lines changed: 1 addition & 5 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-2019 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.
@@ -16,12 +16,8 @@
1616
package org.apache.ibatis.submitted.cglib_lazy_error;
1717

1818
import java.io.Reader;
19-
import java.sql.Connection;
20-
import java.sql.DriverManager;
21-
2219
import org.apache.ibatis.BaseDataTest;
2320
import org.apache.ibatis.io.Resources;
24-
import org.apache.ibatis.jdbc.ScriptRunner;
2521
import org.apache.ibatis.session.SqlSession;
2622
import org.apache.ibatis.session.SqlSessionFactory;
2723
import org.apache.ibatis.session.SqlSessionFactoryBuilder;

src/test/java/org/apache/ibatis/submitted/heavy_initial_load/HeavyInitialLoadTest.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,6 @@
1616
package org.apache.ibatis.submitted.heavy_initial_load;
1717

1818
import java.io.Reader;
19-
import java.sql.Connection;
20-
import java.sql.DriverManager;
2119
import java.util.ArrayList;
2220
import java.util.Collections;
2321
import java.util.List;

src/test/java/org/apache/ibatis/submitted/multipleresultsetswithassociation/MultipleResultSetTest.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
*/
1616
package org.apache.ibatis.submitted.multipleresultsetswithassociation;
1717

18-
import java.io.IOException;
1918
import java.io.Reader;
2019
import java.sql.Connection;
2120
import java.util.List;

src/test/java/org/apache/ibatis/submitted/nonexistentvariables/NonExistentVariablesTest.java

Lines changed: 1 addition & 3 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-2019 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,8 +15,6 @@
1515
*/
1616
package org.apache.ibatis.submitted.nonexistentvariables;
1717

18-
import static org.junit.jupiter.api.Assertions.fail;
19-
2018
import java.io.Reader;
2119

2220
import org.apache.ibatis.BaseDataTest;

src/test/java/org/apache/ibatis/submitted/xml_external_ref/MultipleIncludeTest.java

Lines changed: 1 addition & 2 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-2019 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.
@@ -19,7 +19,6 @@
1919

2020
import java.io.IOException;
2121
import java.io.Reader;
22-
import java.sql.Connection;
2322
import java.sql.SQLException;
2423

2524
import org.apache.ibatis.BaseDataTest;

src/test/java/org/apache/ibatis/type/BigDecimalTypeHandlerTest.java

Lines changed: 1 addition & 3 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-2019 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.
@@ -23,8 +23,6 @@
2323
import java.math.BigDecimal;
2424

2525
import org.junit.jupiter.api.Test;
26-
import org.mockito.Mock;
27-
import org.mockito.Mockito;
2826

2927
public class BigDecimalTypeHandlerTest extends BaseTypeHandlerTest {
3028

src/test/java/org/apache/ibatis/type/ObjectTypeHandlerTest.java

Lines changed: 1 addition & 4 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-2019 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.
@@ -17,14 +17,11 @@
1717

1818
import static org.junit.jupiter.api.Assertions.assertEquals;
1919
import static org.junit.jupiter.api.Assertions.assertNull;
20-
import static org.mockito.Mockito.mock;
2120
import static org.mockito.Mockito.verify;
2221
import static org.mockito.Mockito.when;
2322

2423
import org.junit.jupiter.api.Test;
2524

26-
import java.sql.Clob;
27-
2825
public class ObjectTypeHandlerTest extends BaseTypeHandlerTest {
2926

3027
private static final TypeHandler<Object> TYPE_HANDLER = new ObjectTypeHandler();

src/test/java/org/apache/ibatis/type/UnknownTypeHandlerTest.java

Lines changed: 1 addition & 2 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-2019 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,7 +15,6 @@
1515
*/
1616
package org.apache.ibatis.type;
1717

18-
import java.sql.Clob;
1918
import java.sql.SQLException;
2019

2120
import static org.junit.jupiter.api.Assertions.assertEquals;

0 commit comments

Comments
 (0)