diff --git a/src/test/java/org/apache/ibatis/binding/BindingTest.java b/src/test/java/org/apache/ibatis/binding/BindingTest.java index 69cdf57fb0c..d6ec1489cb6 100644 --- a/src/test/java/org/apache/ibatis/binding/BindingTest.java +++ b/src/test/java/org/apache/ibatis/binding/BindingTest.java @@ -15,9 +15,18 @@ */ package org.apache.ibatis.binding; -import static com.googlecode.catchexception.apis.BDDCatchException.*; +import static com.googlecode.catchexception.apis.BDDCatchException.caughtException; +import static com.googlecode.catchexception.apis.BDDCatchException.when; import static org.assertj.core.api.BDDAssertions.then; -import static org.junit.jupiter.api.Assertions.*; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNotEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNotSame; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertSame; +import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.io.IOException; import java.lang.reflect.Method; diff --git a/src/test/java/org/apache/ibatis/binding/BoundAuthorMapper.java b/src/test/java/org/apache/ibatis/binding/BoundAuthorMapper.java index a24ee8632ae..b62b279506e 100644 --- a/src/test/java/org/apache/ibatis/binding/BoundAuthorMapper.java +++ b/src/test/java/org/apache/ibatis/binding/BoundAuthorMapper.java @@ -17,7 +17,14 @@ import java.util.List; -import org.apache.ibatis.annotations.*; +import org.apache.ibatis.annotations.Arg; +import org.apache.ibatis.annotations.CacheNamespace; +import org.apache.ibatis.annotations.ConstructorArgs; +import org.apache.ibatis.annotations.Flush; +import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Result; +import org.apache.ibatis.annotations.Results; +import org.apache.ibatis.annotations.Select; import org.apache.ibatis.domain.blog.Author; import org.apache.ibatis.domain.blog.Post; import org.apache.ibatis.domain.blog.Section; diff --git a/src/test/java/org/apache/ibatis/binding/BoundBlogMapper.java b/src/test/java/org/apache/ibatis/binding/BoundBlogMapper.java index 2b702fcfdcd..bc41486bbdf 100644 --- a/src/test/java/org/apache/ibatis/binding/BoundBlogMapper.java +++ b/src/test/java/org/apache/ibatis/binding/BoundBlogMapper.java @@ -18,7 +18,20 @@ import java.util.List; import java.util.Map; -import org.apache.ibatis.annotations.*; +import org.apache.ibatis.annotations.Arg; +import org.apache.ibatis.annotations.CacheNamespace; +import org.apache.ibatis.annotations.Case; +import org.apache.ibatis.annotations.ConstructorArgs; +import org.apache.ibatis.annotations.Many; +import org.apache.ibatis.annotations.MapKey; +import org.apache.ibatis.annotations.One; +import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Result; +import org.apache.ibatis.annotations.ResultType; +import org.apache.ibatis.annotations.Results; +import org.apache.ibatis.annotations.Select; +import org.apache.ibatis.annotations.SelectProvider; +import org.apache.ibatis.annotations.TypeDiscriminator; 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/binding/FlushTest.java b/src/test/java/org/apache/ibatis/binding/FlushTest.java index 85fea8e45a6..ced9b4dc593 100644 --- a/src/test/java/org/apache/ibatis/binding/FlushTest.java +++ b/src/test/java/org/apache/ibatis/binding/FlushTest.java @@ -29,7 +29,11 @@ import org.apache.ibatis.domain.blog.Section; import org.apache.ibatis.executor.BatchResult; import org.apache.ibatis.mapping.Environment; -import org.apache.ibatis.session.*; +import org.apache.ibatis.session.Configuration; +import org.apache.ibatis.session.ExecutorType; +import org.apache.ibatis.session.SqlSession; +import org.apache.ibatis.session.SqlSessionFactory; +import org.apache.ibatis.session.SqlSessionFactoryBuilder; import org.apache.ibatis.transaction.TransactionFactory; import org.apache.ibatis.transaction.jdbc.JdbcTransactionFactory; import org.junit.jupiter.api.BeforeAll; diff --git a/src/test/java/org/apache/ibatis/builder/XmlConfigBuilderTest.java b/src/test/java/org/apache/ibatis/builder/XmlConfigBuilderTest.java index f65c576dcb8..bf8692883d2 100644 --- a/src/test/java/org/apache/ibatis/builder/XmlConfigBuilderTest.java +++ b/src/test/java/org/apache/ibatis/builder/XmlConfigBuilderTest.java @@ -15,7 +15,8 @@ */ package org.apache.ibatis.builder; -import static com.googlecode.catchexception.apis.BDDCatchException.*; +import static com.googlecode.catchexception.apis.BDDCatchException.caughtException; +import static com.googlecode.catchexception.apis.BDDCatchException.when; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.BDDAssertions.then; import static org.junit.jupiter.api.Assertions.assertArrayEquals; diff --git a/src/test/java/org/apache/ibatis/builder/XmlMapperBuilderTest.java b/src/test/java/org/apache/ibatis/builder/XmlMapperBuilderTest.java index 4321fa40c4e..1cccaef4da8 100644 --- a/src/test/java/org/apache/ibatis/builder/XmlMapperBuilderTest.java +++ b/src/test/java/org/apache/ibatis/builder/XmlMapperBuilderTest.java @@ -15,7 +15,8 @@ */ package org.apache.ibatis.builder; -import static com.googlecode.catchexception.apis.BDDCatchException.*; +import static com.googlecode.catchexception.apis.BDDCatchException.caughtException; +import static com.googlecode.catchexception.apis.BDDCatchException.when; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.BDDAssertions.then; diff --git a/src/test/java/org/apache/ibatis/builder/xml/dynamic/ExpressionEvaluatorTest.java b/src/test/java/org/apache/ibatis/builder/xml/dynamic/ExpressionEvaluatorTest.java index ae668c3c585..5d48406eae6 100644 --- a/src/test/java/org/apache/ibatis/builder/xml/dynamic/ExpressionEvaluatorTest.java +++ b/src/test/java/org/apache/ibatis/builder/xml/dynamic/ExpressionEvaluatorTest.java @@ -15,7 +15,9 @@ */ package org.apache.ibatis.builder.xml.dynamic; -import static org.junit.jupiter.api.Assertions.*; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.util.HashMap; diff --git a/src/test/java/org/apache/ibatis/builder/xsd/XmlConfigBuilderTest.java b/src/test/java/org/apache/ibatis/builder/xsd/XmlConfigBuilderTest.java index 7cb3b3836f4..e60cb10d256 100644 --- a/src/test/java/org/apache/ibatis/builder/xsd/XmlConfigBuilderTest.java +++ b/src/test/java/org/apache/ibatis/builder/xsd/XmlConfigBuilderTest.java @@ -15,7 +15,11 @@ */ package org.apache.ibatis.builder.xsd; -import static org.junit.jupiter.api.Assertions.*; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.io.InputStream; import java.util.Arrays; @@ -44,7 +48,11 @@ import org.apache.ibatis.mapping.Environment; import org.apache.ibatis.scripting.defaults.RawLanguageDriver; import org.apache.ibatis.scripting.xmltags.XMLLanguageDriver; -import org.apache.ibatis.session.*; +import org.apache.ibatis.session.AutoMappingBehavior; +import org.apache.ibatis.session.AutoMappingUnknownColumnBehavior; +import org.apache.ibatis.session.Configuration; +import org.apache.ibatis.session.ExecutorType; +import org.apache.ibatis.session.LocalCacheScope; import org.apache.ibatis.transaction.jdbc.JdbcTransactionFactory; import org.apache.ibatis.type.JdbcType; import org.junit.jupiter.api.Disabled; diff --git a/src/test/java/org/apache/ibatis/cache/CacheKeyTest.java b/src/test/java/org/apache/ibatis/cache/CacheKeyTest.java index 9727630fda9..1b53cb50bb0 100644 --- a/src/test/java/org/apache/ibatis/cache/CacheKeyTest.java +++ b/src/test/java/org/apache/ibatis/cache/CacheKeyTest.java @@ -15,7 +15,9 @@ */ package org.apache.ibatis.cache; -import static org.junit.jupiter.api.Assertions.*; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotEquals; +import static org.junit.jupiter.api.Assertions.assertThrows; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; diff --git a/src/test/java/org/apache/ibatis/cache/FifoCacheTest.java b/src/test/java/org/apache/ibatis/cache/FifoCacheTest.java index 1ab7cba32d3..9206c8c6095 100644 --- a/src/test/java/org/apache/ibatis/cache/FifoCacheTest.java +++ b/src/test/java/org/apache/ibatis/cache/FifoCacheTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2009-2022 the original author or authors. + * Copyright 2009-2023 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -15,7 +15,9 @@ */ package org.apache.ibatis.cache; -import static org.junit.jupiter.api.Assertions.*; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; import org.apache.ibatis.cache.decorators.FifoCache; import org.apache.ibatis.cache.impl.PerpetualCache; diff --git a/src/test/java/org/apache/ibatis/cache/LruCacheTest.java b/src/test/java/org/apache/ibatis/cache/LruCacheTest.java index 4fe5651be6a..12cdac2f265 100644 --- a/src/test/java/org/apache/ibatis/cache/LruCacheTest.java +++ b/src/test/java/org/apache/ibatis/cache/LruCacheTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2009-2022 the original author or authors. + * Copyright 2009-2023 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -15,7 +15,9 @@ */ package org.apache.ibatis.cache; -import static org.junit.jupiter.api.Assertions.*; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; import org.apache.ibatis.cache.decorators.LruCache; import org.apache.ibatis.cache.impl.PerpetualCache; diff --git a/src/test/java/org/apache/ibatis/cache/PerpetualCacheTest.java b/src/test/java/org/apache/ibatis/cache/PerpetualCacheTest.java index f309b87968e..cebe6b19c6c 100644 --- a/src/test/java/org/apache/ibatis/cache/PerpetualCacheTest.java +++ b/src/test/java/org/apache/ibatis/cache/PerpetualCacheTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2009-2022 the original author or authors. + * Copyright 2009-2023 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -15,7 +15,10 @@ */ package org.apache.ibatis.cache; -import static org.junit.jupiter.api.Assertions.*; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertThrows; import org.apache.ibatis.cache.decorators.SerializedCache; import org.apache.ibatis.cache.decorators.SynchronizedCache; diff --git a/src/test/java/org/apache/ibatis/cache/ScheduledCacheTest.java b/src/test/java/org/apache/ibatis/cache/ScheduledCacheTest.java index 3bfdcbbe60d..3c87bbe18c7 100644 --- a/src/test/java/org/apache/ibatis/cache/ScheduledCacheTest.java +++ b/src/test/java/org/apache/ibatis/cache/ScheduledCacheTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2009-2022 the original author or authors. + * Copyright 2009-2023 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -15,7 +15,9 @@ */ package org.apache.ibatis.cache; -import static org.junit.jupiter.api.Assertions.*; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; import org.apache.ibatis.cache.decorators.LoggingCache; import org.apache.ibatis.cache.decorators.ScheduledCache; diff --git a/src/test/java/org/apache/ibatis/cache/SoftCacheTest.java b/src/test/java/org/apache/ibatis/cache/SoftCacheTest.java index b8cd350371f..5dc12f009db 100644 --- a/src/test/java/org/apache/ibatis/cache/SoftCacheTest.java +++ b/src/test/java/org/apache/ibatis/cache/SoftCacheTest.java @@ -15,7 +15,9 @@ */ package org.apache.ibatis.cache; -import static org.junit.jupiter.api.Assertions.*; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertTrue; import org.apache.ibatis.cache.decorators.SerializedCache; import org.apache.ibatis.cache.decorators.SoftCache; diff --git a/src/test/java/org/apache/ibatis/cache/SuperCacheTest.java b/src/test/java/org/apache/ibatis/cache/SuperCacheTest.java index 7045509d41b..7ef7a377c57 100644 --- a/src/test/java/org/apache/ibatis/cache/SuperCacheTest.java +++ b/src/test/java/org/apache/ibatis/cache/SuperCacheTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2009-2022 the original author or authors. + * Copyright 2009-2023 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -17,7 +17,14 @@ import static org.junit.jupiter.api.Assertions.assertTrue; -import org.apache.ibatis.cache.decorators.*; +import org.apache.ibatis.cache.decorators.FifoCache; +import org.apache.ibatis.cache.decorators.LruCache; +import org.apache.ibatis.cache.decorators.ScheduledCache; +import org.apache.ibatis.cache.decorators.SerializedCache; +import org.apache.ibatis.cache.decorators.SoftCache; +import org.apache.ibatis.cache.decorators.SynchronizedCache; +import org.apache.ibatis.cache.decorators.TransactionalCache; +import org.apache.ibatis.cache.decorators.WeakCache; import org.apache.ibatis.cache.impl.PerpetualCache; import org.junit.jupiter.api.Test; diff --git a/src/test/java/org/apache/ibatis/databases/blog/StoredProcedures.java b/src/test/java/org/apache/ibatis/databases/blog/StoredProcedures.java index d695f7a8635..4880319f95c 100644 --- a/src/test/java/org/apache/ibatis/databases/blog/StoredProcedures.java +++ b/src/test/java/org/apache/ibatis/databases/blog/StoredProcedures.java @@ -15,7 +15,11 @@ */ package org.apache.ibatis.databases.blog; -import java.sql.*; +import java.sql.Connection; +import java.sql.DriverManager; +import java.sql.PreparedStatement; +import java.sql.ResultSet; +import java.sql.SQLException; public class StoredProcedures { public static void selectTwoSetsOfTwoAuthors(int p1, int p2, ResultSet[] rs1, ResultSet[] rs2) throws SQLException { diff --git a/src/test/java/org/apache/ibatis/datasource/pooled/MysqlTimeoutTest.java b/src/test/java/org/apache/ibatis/datasource/pooled/MysqlTimeoutTest.java index 8b44639be70..fcd60e40c63 100644 --- a/src/test/java/org/apache/ibatis/datasource/pooled/MysqlTimeoutTest.java +++ b/src/test/java/org/apache/ibatis/datasource/pooled/MysqlTimeoutTest.java @@ -15,7 +15,7 @@ */ package org.apache.ibatis.datasource.pooled; -import static org.junit.jupiter.api.Assertions.*; +import static org.junit.jupiter.api.Assertions.assertEquals; import java.sql.Connection; import java.sql.PreparedStatement; diff --git a/src/test/java/org/apache/ibatis/datasource/pooled/PooledDataSourceTest.java b/src/test/java/org/apache/ibatis/datasource/pooled/PooledDataSourceTest.java index 0e509e8e035..1847bb735c5 100644 --- a/src/test/java/org/apache/ibatis/datasource/pooled/PooledDataSourceTest.java +++ b/src/test/java/org/apache/ibatis/datasource/pooled/PooledDataSourceTest.java @@ -15,7 +15,10 @@ */ package org.apache.ibatis.datasource.pooled; -import static org.junit.jupiter.api.Assertions.*; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNotEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.sql.Connection; import java.sql.SQLException; diff --git a/src/test/java/org/apache/ibatis/datasource/unpooled/NetworkTimeoutTest.java b/src/test/java/org/apache/ibatis/datasource/unpooled/NetworkTimeoutTest.java index dc2b39545be..4455d3350a2 100644 --- a/src/test/java/org/apache/ibatis/datasource/unpooled/NetworkTimeoutTest.java +++ b/src/test/java/org/apache/ibatis/datasource/unpooled/NetworkTimeoutTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2009-2022 the original author or authors. + * Copyright 2009-2023 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -15,7 +15,7 @@ */ package org.apache.ibatis.datasource.unpooled; -import static org.junit.jupiter.api.Assertions.*; +import static org.junit.jupiter.api.Assertions.assertEquals; import java.sql.Connection; diff --git a/src/test/java/org/apache/ibatis/datasource/unpooled/UnpooledDataSourceTest.java b/src/test/java/org/apache/ibatis/datasource/unpooled/UnpooledDataSourceTest.java index 9e037ef9b2b..05750daff93 100644 --- a/src/test/java/org/apache/ibatis/datasource/unpooled/UnpooledDataSourceTest.java +++ b/src/test/java/org/apache/ibatis/datasource/unpooled/UnpooledDataSourceTest.java @@ -15,7 +15,7 @@ */ package org.apache.ibatis.datasource.unpooled; -import static org.junit.jupiter.api.Assertions.*; +import static org.junit.jupiter.api.Assertions.assertEquals; import java.net.URL; import java.net.URLClassLoader; diff --git a/src/test/java/org/apache/ibatis/domain/jpetstore/Cart.java b/src/test/java/org/apache/ibatis/domain/jpetstore/Cart.java index e38768c15f5..723dab47628 100644 --- a/src/test/java/org/apache/ibatis/domain/jpetstore/Cart.java +++ b/src/test/java/org/apache/ibatis/domain/jpetstore/Cart.java @@ -1,5 +1,5 @@ /* - * Copyright 2009-2022 the original author or authors. + * Copyright 2009-2023 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -17,7 +17,12 @@ import java.io.Serializable; import java.math.BigDecimal; -import java.util.*; +import java.util.ArrayList; +import java.util.Collections; +import java.util.HashMap; +import java.util.Iterator; +import java.util.List; +import java.util.Map; public class Cart implements Serializable { diff --git a/src/test/java/org/apache/ibatis/executor/ErrorContextTest.java b/src/test/java/org/apache/ibatis/executor/ErrorContextTest.java index 9141a4f0734..e6fe34b60b7 100644 --- a/src/test/java/org/apache/ibatis/executor/ErrorContextTest.java +++ b/src/test/java/org/apache/ibatis/executor/ErrorContextTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2009-2022 the original author or authors. + * Copyright 2009-2023 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -15,7 +15,7 @@ */ package org.apache.ibatis.executor; -import static org.junit.jupiter.api.Assertions.*; +import static org.junit.jupiter.api.Assertions.assertEquals; import org.junit.jupiter.api.Test; diff --git a/src/test/java/org/apache/ibatis/executor/loader/CglibProxyTest.java b/src/test/java/org/apache/ibatis/executor/loader/CglibProxyTest.java index 022f77cd43a..efc9cb56802 100644 --- a/src/test/java/org/apache/ibatis/executor/loader/CglibProxyTest.java +++ b/src/test/java/org/apache/ibatis/executor/loader/CglibProxyTest.java @@ -15,7 +15,9 @@ */ package org.apache.ibatis.executor.loader; -import static org.junit.jupiter.api.Assertions.*; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.io.Serializable; import java.util.ArrayList; diff --git a/src/test/java/org/apache/ibatis/executor/loader/JavassistProxyTest.java b/src/test/java/org/apache/ibatis/executor/loader/JavassistProxyTest.java index d40728cd8f4..a101d4796eb 100644 --- a/src/test/java/org/apache/ibatis/executor/loader/JavassistProxyTest.java +++ b/src/test/java/org/apache/ibatis/executor/loader/JavassistProxyTest.java @@ -15,7 +15,9 @@ */ package org.apache.ibatis.executor.loader; -import static org.junit.jupiter.api.Assertions.*; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.io.Serializable; import java.util.ArrayList; diff --git a/src/test/java/org/apache/ibatis/io/ExternalResourcesTest.java b/src/test/java/org/apache/ibatis/io/ExternalResourcesTest.java index 6f116b143fd..d74426e48a3 100644 --- a/src/test/java/org/apache/ibatis/io/ExternalResourcesTest.java +++ b/src/test/java/org/apache/ibatis/io/ExternalResourcesTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2009-2022 the original author or authors. + * Copyright 2009-2023 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -15,7 +15,9 @@ */ package org.apache.ibatis.io; -import static org.junit.jupiter.api.Assertions.*; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.fail; import java.io.File; import java.io.FileNotFoundException; diff --git a/src/test/java/org/apache/ibatis/io/ResolverUtilTest.java b/src/test/java/org/apache/ibatis/io/ResolverUtilTest.java index 9f97917eaa2..9393854180c 100644 --- a/src/test/java/org/apache/ibatis/io/ResolverUtilTest.java +++ b/src/test/java/org/apache/ibatis/io/ResolverUtilTest.java @@ -15,7 +15,11 @@ */ package org.apache.ibatis.io; -import static org.junit.jupiter.api.Assertions.*; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.security.AccessController; import java.security.PrivilegedAction; diff --git a/src/test/java/org/apache/ibatis/jdbc/PooledDataSourceTest.java b/src/test/java/org/apache/ibatis/jdbc/PooledDataSourceTest.java index b8710808174..729db5f89a8 100644 --- a/src/test/java/org/apache/ibatis/jdbc/PooledDataSourceTest.java +++ b/src/test/java/org/apache/ibatis/jdbc/PooledDataSourceTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2009-2022 the original author or authors. + * Copyright 2009-2023 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -15,7 +15,8 @@ */ package org.apache.ibatis.jdbc; -import static org.junit.jupiter.api.Assertions.*; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; import java.sql.Connection; import java.util.ArrayList; diff --git a/src/test/java/org/apache/ibatis/jdbc/ScriptRunnerTest.java b/src/test/java/org/apache/ibatis/jdbc/ScriptRunnerTest.java index 74904d75ffb..2e6bb33d0df 100644 --- a/src/test/java/org/apache/ibatis/jdbc/ScriptRunnerTest.java +++ b/src/test/java/org/apache/ibatis/jdbc/ScriptRunnerTest.java @@ -15,8 +15,14 @@ */ package org.apache.ibatis.jdbc; -import static org.junit.jupiter.api.Assertions.*; -import static org.mockito.Mockito.*; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertSame; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.fail; +import static org.mockito.ArgumentMatchers.eq; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; import java.io.IOException; import java.io.PrintWriter; diff --git a/src/test/java/org/apache/ibatis/jdbc/SelectBuilderTest.java b/src/test/java/org/apache/ibatis/jdbc/SelectBuilderTest.java index 8b73fb10405..22e9f45f8e1 100644 --- a/src/test/java/org/apache/ibatis/jdbc/SelectBuilderTest.java +++ b/src/test/java/org/apache/ibatis/jdbc/SelectBuilderTest.java @@ -15,7 +15,15 @@ */ package org.apache.ibatis.jdbc; -import static org.apache.ibatis.jdbc.SelectBuilder.*; +import static org.apache.ibatis.jdbc.SelectBuilder.FROM; +import static org.apache.ibatis.jdbc.SelectBuilder.GROUP_BY; +import static org.apache.ibatis.jdbc.SelectBuilder.HAVING; +import static org.apache.ibatis.jdbc.SelectBuilder.INNER_JOIN; +import static org.apache.ibatis.jdbc.SelectBuilder.OR; +import static org.apache.ibatis.jdbc.SelectBuilder.ORDER_BY; +import static org.apache.ibatis.jdbc.SelectBuilder.SELECT; +import static org.apache.ibatis.jdbc.SelectBuilder.SQL; +import static org.apache.ibatis.jdbc.SelectBuilder.WHERE; import static org.junit.jupiter.api.Assertions.assertEquals; import org.junit.jupiter.api.Test; diff --git a/src/test/java/org/apache/ibatis/jdbc/SqlBuilderTest.java b/src/test/java/org/apache/ibatis/jdbc/SqlBuilderTest.java index d0e1a64e55e..3dd85463c31 100644 --- a/src/test/java/org/apache/ibatis/jdbc/SqlBuilderTest.java +++ b/src/test/java/org/apache/ibatis/jdbc/SqlBuilderTest.java @@ -15,7 +15,15 @@ */ package org.apache.ibatis.jdbc; -import static org.apache.ibatis.jdbc.SqlBuilder.*; +import static org.apache.ibatis.jdbc.SqlBuilder.FROM; +import static org.apache.ibatis.jdbc.SqlBuilder.GROUP_BY; +import static org.apache.ibatis.jdbc.SqlBuilder.HAVING; +import static org.apache.ibatis.jdbc.SqlBuilder.INNER_JOIN; +import static org.apache.ibatis.jdbc.SqlBuilder.OR; +import static org.apache.ibatis.jdbc.SqlBuilder.ORDER_BY; +import static org.apache.ibatis.jdbc.SqlBuilder.SELECT; +import static org.apache.ibatis.jdbc.SqlBuilder.SQL; +import static org.apache.ibatis.jdbc.SqlBuilder.WHERE; import static org.junit.jupiter.api.Assertions.assertEquals; import org.junit.jupiter.api.Test; diff --git a/src/test/java/org/apache/ibatis/mapping/BoundSqlTest.java b/src/test/java/org/apache/ibatis/mapping/BoundSqlTest.java index 2c37ee03038..897392245fa 100644 --- a/src/test/java/org/apache/ibatis/mapping/BoundSqlTest.java +++ b/src/test/java/org/apache/ibatis/mapping/BoundSqlTest.java @@ -15,7 +15,8 @@ */ package org.apache.ibatis.mapping; -import static org.junit.jupiter.api.Assertions.*; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.util.Collections; import java.util.HashMap; diff --git a/src/test/java/org/apache/ibatis/mapping/CacheBuilderTest.java b/src/test/java/org/apache/ibatis/mapping/CacheBuilderTest.java index 3e9999a7651..bbaf3e2e526 100644 --- a/src/test/java/org/apache/ibatis/mapping/CacheBuilderTest.java +++ b/src/test/java/org/apache/ibatis/mapping/CacheBuilderTest.java @@ -15,7 +15,8 @@ */ package org.apache.ibatis.mapping; -import static com.googlecode.catchexception.apis.BDDCatchException.*; +import static com.googlecode.catchexception.apis.BDDCatchException.caughtException; +import static com.googlecode.catchexception.apis.BDDCatchException.when; import static org.assertj.core.api.BDDAssertions.then; import java.lang.reflect.Field; diff --git a/src/test/java/org/apache/ibatis/plugin/PluginTest.java b/src/test/java/org/apache/ibatis/plugin/PluginTest.java index acc99b27bac..10c9b729d5d 100644 --- a/src/test/java/org/apache/ibatis/plugin/PluginTest.java +++ b/src/test/java/org/apache/ibatis/plugin/PluginTest.java @@ -15,7 +15,8 @@ */ package org.apache.ibatis.plugin; -import static org.junit.jupiter.api.Assertions.*; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotEquals; import java.util.HashMap; import java.util.Map; diff --git a/src/test/java/org/apache/ibatis/reflection/ArrayUtilTest.java b/src/test/java/org/apache/ibatis/reflection/ArrayUtilTest.java index 8131e56bcb9..afc113a66de 100644 --- a/src/test/java/org/apache/ibatis/reflection/ArrayUtilTest.java +++ b/src/test/java/org/apache/ibatis/reflection/ArrayUtilTest.java @@ -15,7 +15,9 @@ */ package org.apache.ibatis.reflection; -import static org.junit.jupiter.api.Assertions.*; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.util.Arrays; diff --git a/src/test/java/org/apache/ibatis/reflection/MetaObjectTest.java b/src/test/java/org/apache/ibatis/reflection/MetaObjectTest.java index 29e817d78fa..2402e577bfd 100644 --- a/src/test/java/org/apache/ibatis/reflection/MetaObjectTest.java +++ b/src/test/java/org/apache/ibatis/reflection/MetaObjectTest.java @@ -15,7 +15,12 @@ */ package org.apache.ibatis.reflection; -import static org.junit.jupiter.api.Assertions.*; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNotEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.util.ArrayList; import java.util.Date; diff --git a/src/test/java/org/apache/ibatis/reflection/ReflectorTest.java b/src/test/java/org/apache/ibatis/reflection/ReflectorTest.java index 4d86886b2f4..60e81adb44a 100644 --- a/src/test/java/org/apache/ibatis/reflection/ReflectorTest.java +++ b/src/test/java/org/apache/ibatis/reflection/ReflectorTest.java @@ -15,9 +15,12 @@ */ package org.apache.ibatis.reflection; -import static com.googlecode.catchexception.apis.BDDCatchException.*; +import static com.googlecode.catchexception.apis.BDDCatchException.caughtException; +import static com.googlecode.catchexception.apis.BDDCatchException.when; import static org.assertj.core.api.BDDAssertions.then; -import static org.junit.jupiter.api.Assertions.*; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.io.Serializable; import java.util.Arrays; diff --git a/src/test/java/org/apache/ibatis/reflection/TypeParameterResolverTest.java b/src/test/java/org/apache/ibatis/reflection/TypeParameterResolverTest.java index 505b35385e7..d8b4760f219 100644 --- a/src/test/java/org/apache/ibatis/reflection/TypeParameterResolverTest.java +++ b/src/test/java/org/apache/ibatis/reflection/TypeParameterResolverTest.java @@ -15,7 +15,8 @@ */ package org.apache.ibatis.reflection; -import static org.junit.jupiter.api.Assertions.*; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.lang.reflect.Field; import java.lang.reflect.GenericArrayType; diff --git a/src/test/java/org/apache/ibatis/scripting/LanguageDriverRegistryTest.java b/src/test/java/org/apache/ibatis/scripting/LanguageDriverRegistryTest.java index ddf0fc5427a..ab02c713910 100644 --- a/src/test/java/org/apache/ibatis/scripting/LanguageDriverRegistryTest.java +++ b/src/test/java/org/apache/ibatis/scripting/LanguageDriverRegistryTest.java @@ -15,7 +15,8 @@ */ package org.apache.ibatis.scripting; -import static com.googlecode.catchexception.apis.BDDCatchException.*; +import static com.googlecode.catchexception.apis.BDDCatchException.caughtException; +import static com.googlecode.catchexception.apis.BDDCatchException.when; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.BDDAssertions.then; diff --git a/src/test/java/org/apache/ibatis/scripting/defaults/DefaultParameterHandlerTest.java b/src/test/java/org/apache/ibatis/scripting/defaults/DefaultParameterHandlerTest.java index c2ec2d052e0..a60f24b6632 100644 --- a/src/test/java/org/apache/ibatis/scripting/defaults/DefaultParameterHandlerTest.java +++ b/src/test/java/org/apache/ibatis/scripting/defaults/DefaultParameterHandlerTest.java @@ -29,7 +29,12 @@ import java.util.List; import org.apache.ibatis.builder.StaticSqlSource; -import org.apache.ibatis.mapping.*; +import org.apache.ibatis.mapping.BoundSql; +import org.apache.ibatis.mapping.MappedStatement; +import org.apache.ibatis.mapping.ParameterMapping; +import org.apache.ibatis.mapping.ResultMap; +import org.apache.ibatis.mapping.ResultMapping; +import org.apache.ibatis.mapping.SqlCommandType; import org.apache.ibatis.session.Configuration; import org.apache.ibatis.type.JdbcType; import org.apache.ibatis.type.TypeException; diff --git a/src/test/java/org/apache/ibatis/scripting/xmltags/OgnlCacheTest.java b/src/test/java/org/apache/ibatis/scripting/xmltags/OgnlCacheTest.java index 85cc97cd182..c61b116daea 100644 --- a/src/test/java/org/apache/ibatis/scripting/xmltags/OgnlCacheTest.java +++ b/src/test/java/org/apache/ibatis/scripting/xmltags/OgnlCacheTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2009-2022 the original author or authors. + * Copyright 2009-2023 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -15,7 +15,8 @@ */ package org.apache.ibatis.scripting.xmltags; -import static org.junit.jupiter.api.Assertions.*; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; import java.util.ArrayList; import java.util.HashMap; diff --git a/src/test/java/org/apache/ibatis/submitted/ancestor_ref/AncestorRefTest.java b/src/test/java/org/apache/ibatis/submitted/ancestor_ref/AncestorRefTest.java index c7b147e80b7..3748606d0e8 100644 --- a/src/test/java/org/apache/ibatis/submitted/ancestor_ref/AncestorRefTest.java +++ b/src/test/java/org/apache/ibatis/submitted/ancestor_ref/AncestorRefTest.java @@ -15,7 +15,7 @@ */ package org.apache.ibatis.submitted.ancestor_ref; -import static org.junit.jupiter.api.Assertions.*; +import static org.junit.jupiter.api.Assertions.assertEquals; import java.io.Reader; diff --git a/src/test/java/org/apache/ibatis/submitted/annotion_many_one_add_columnprefix/OneManyColumnPrefixTest.java b/src/test/java/org/apache/ibatis/submitted/annotion_many_one_add_columnprefix/OneManyColumnPrefixTest.java index c5f2e0c101d..a37d2b04c82 100644 --- a/src/test/java/org/apache/ibatis/submitted/annotion_many_one_add_columnprefix/OneManyColumnPrefixTest.java +++ b/src/test/java/org/apache/ibatis/submitted/annotion_many_one_add_columnprefix/OneManyColumnPrefixTest.java @@ -15,7 +15,8 @@ */ package org.apache.ibatis.submitted.annotion_many_one_add_columnprefix; -import static org.junit.jupiter.api.Assertions.*; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; import java.io.Reader; import java.util.List; diff --git a/src/test/java/org/apache/ibatis/submitted/annotion_many_one_add_resultmapid/OneManyResultMapTest.java b/src/test/java/org/apache/ibatis/submitted/annotion_many_one_add_resultmapid/OneManyResultMapTest.java index 9274881d1ba..f257ebb22f7 100644 --- a/src/test/java/org/apache/ibatis/submitted/annotion_many_one_add_resultmapid/OneManyResultMapTest.java +++ b/src/test/java/org/apache/ibatis/submitted/annotion_many_one_add_resultmapid/OneManyResultMapTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2009-2022 the original author or authors. + * Copyright 2009-2023 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -15,7 +15,8 @@ */ package org.apache.ibatis.submitted.annotion_many_one_add_resultmapid; -import static org.junit.jupiter.api.Assertions.*; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; import java.io.Reader; import java.util.List; diff --git a/src/test/java/org/apache/ibatis/submitted/annotion_many_one_add_resultmapid/UserDao.java b/src/test/java/org/apache/ibatis/submitted/annotion_many_one_add_resultmapid/UserDao.java index 2edbbbc603e..1315d172f5f 100644 --- a/src/test/java/org/apache/ibatis/submitted/annotion_many_one_add_resultmapid/UserDao.java +++ b/src/test/java/org/apache/ibatis/submitted/annotion_many_one_add_resultmapid/UserDao.java @@ -17,7 +17,11 @@ import java.util.List; -import org.apache.ibatis.annotations.*; +import org.apache.ibatis.annotations.Many; +import org.apache.ibatis.annotations.One; +import org.apache.ibatis.annotations.Result; +import org.apache.ibatis.annotations.Results; +import org.apache.ibatis.annotations.Select; /** * @author lvyang diff --git a/src/test/java/org/apache/ibatis/submitted/arg_name_based_constructor_automapping/ArgNameBasedConstructorAutoMappingTest.java b/src/test/java/org/apache/ibatis/submitted/arg_name_based_constructor_automapping/ArgNameBasedConstructorAutoMappingTest.java index 9581332a9af..f30ef53c16b 100644 --- a/src/test/java/org/apache/ibatis/submitted/arg_name_based_constructor_automapping/ArgNameBasedConstructorAutoMappingTest.java +++ b/src/test/java/org/apache/ibatis/submitted/arg_name_based_constructor_automapping/ArgNameBasedConstructorAutoMappingTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2009-2022 the original author or authors. + * Copyright 2009-2023 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -15,7 +15,8 @@ */ package org.apache.ibatis.submitted.arg_name_based_constructor_automapping; -import static org.junit.jupiter.api.Assertions.*; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.fail; import java.io.Reader; diff --git a/src/test/java/org/apache/ibatis/submitted/array_result_type/ArrayResultTypeTest.java b/src/test/java/org/apache/ibatis/submitted/array_result_type/ArrayResultTypeTest.java index f84254f39d1..dab2f780136 100644 --- a/src/test/java/org/apache/ibatis/submitted/array_result_type/ArrayResultTypeTest.java +++ b/src/test/java/org/apache/ibatis/submitted/array_result_type/ArrayResultTypeTest.java @@ -15,7 +15,7 @@ */ package org.apache.ibatis.submitted.array_result_type; -import static org.junit.jupiter.api.Assertions.*; +import static org.junit.jupiter.api.Assertions.assertEquals; import java.io.Reader; diff --git a/src/test/java/org/apache/ibatis/submitted/cache/CacheTest.java b/src/test/java/org/apache/ibatis/submitted/cache/CacheTest.java index 82f6d93fa83..adc3cd5ca46 100644 --- a/src/test/java/org/apache/ibatis/submitted/cache/CacheTest.java +++ b/src/test/java/org/apache/ibatis/submitted/cache/CacheTest.java @@ -15,7 +15,8 @@ */ package org.apache.ibatis.submitted.cache; -import static com.googlecode.catchexception.apis.BDDCatchException.*; +import static com.googlecode.catchexception.apis.BDDCatchException.caughtException; +import static com.googlecode.catchexception.apis.BDDCatchException.when; import static org.assertj.core.api.BDDAssertions.then; import java.io.Reader; diff --git a/src/test/java/org/apache/ibatis/submitted/column_prefix/ColumnPrefixAutoMappingTest.java b/src/test/java/org/apache/ibatis/submitted/column_prefix/ColumnPrefixAutoMappingTest.java index b791b93b086..2b8f2dbba31 100644 --- a/src/test/java/org/apache/ibatis/submitted/column_prefix/ColumnPrefixAutoMappingTest.java +++ b/src/test/java/org/apache/ibatis/submitted/column_prefix/ColumnPrefixAutoMappingTest.java @@ -15,7 +15,7 @@ */ package org.apache.ibatis.submitted.column_prefix; -import static org.junit.jupiter.api.Assertions.*; +import static org.junit.jupiter.api.Assertions.assertEquals; import java.util.List; diff --git a/src/test/java/org/apache/ibatis/submitted/column_prefix/ColumnPrefixTest.java b/src/test/java/org/apache/ibatis/submitted/column_prefix/ColumnPrefixTest.java index 6c3634f7b76..c759d7ceabb 100644 --- a/src/test/java/org/apache/ibatis/submitted/column_prefix/ColumnPrefixTest.java +++ b/src/test/java/org/apache/ibatis/submitted/column_prefix/ColumnPrefixTest.java @@ -15,7 +15,8 @@ */ package org.apache.ibatis.submitted.column_prefix; -import static org.junit.jupiter.api.Assertions.*; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNull; import java.io.Reader; import java.util.List; diff --git a/src/test/java/org/apache/ibatis/submitted/complex_column/PersonMapper.java b/src/test/java/org/apache/ibatis/submitted/complex_column/PersonMapper.java index 27a9b753059..8e66226bb33 100644 --- a/src/test/java/org/apache/ibatis/submitted/complex_column/PersonMapper.java +++ b/src/test/java/org/apache/ibatis/submitted/complex_column/PersonMapper.java @@ -15,7 +15,12 @@ */ package org.apache.ibatis.submitted.complex_column; -import org.apache.ibatis.annotations.*; +import org.apache.ibatis.annotations.One; +import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Result; +import org.apache.ibatis.annotations.ResultMap; +import org.apache.ibatis.annotations.Results; +import org.apache.ibatis.annotations.Select; public interface PersonMapper { diff --git a/src/test/java/org/apache/ibatis/submitted/constructor_automapping/ConstructorAutomappingTest.java b/src/test/java/org/apache/ibatis/submitted/constructor_automapping/ConstructorAutomappingTest.java index 5ab90bfc5e7..78677f83658 100644 --- a/src/test/java/org/apache/ibatis/submitted/constructor_automapping/ConstructorAutomappingTest.java +++ b/src/test/java/org/apache/ibatis/submitted/constructor_automapping/ConstructorAutomappingTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2009-2022 the original author or authors. + * Copyright 2009-2023 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -15,7 +15,7 @@ */ package org.apache.ibatis.submitted.constructor_automapping; -import static org.junit.jupiter.api.Assertions.*; +import static org.junit.jupiter.api.Assertions.assertEquals; import java.io.Reader; import java.util.List; diff --git a/src/test/java/org/apache/ibatis/submitted/constructor_columnprefix/ConstructorColumnPrefixTest.java b/src/test/java/org/apache/ibatis/submitted/constructor_columnprefix/ConstructorColumnPrefixTest.java index e1d213bd26d..b149d6e20ae 100644 --- a/src/test/java/org/apache/ibatis/submitted/constructor_columnprefix/ConstructorColumnPrefixTest.java +++ b/src/test/java/org/apache/ibatis/submitted/constructor_columnprefix/ConstructorColumnPrefixTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2009-2022 the original author or authors. + * Copyright 2009-2023 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -15,7 +15,7 @@ */ package org.apache.ibatis.submitted.constructor_columnprefix; -import static org.junit.jupiter.api.Assertions.*; +import static org.junit.jupiter.api.Assertions.assertEquals; import java.io.Reader; import java.util.List; diff --git a/src/test/java/org/apache/ibatis/submitted/cursor_simple/PostgresCursorTest.java b/src/test/java/org/apache/ibatis/submitted/cursor_simple/PostgresCursorTest.java index 0e6cd4f32e5..33c37db1e6f 100644 --- a/src/test/java/org/apache/ibatis/submitted/cursor_simple/PostgresCursorTest.java +++ b/src/test/java/org/apache/ibatis/submitted/cursor_simple/PostgresCursorTest.java @@ -15,7 +15,7 @@ */ package org.apache.ibatis.submitted.cursor_simple; -import static org.junit.jupiter.api.Assertions.*; +import static org.junit.jupiter.api.Assertions.assertEquals; import java.io.IOException; import java.util.Iterator; diff --git a/src/test/java/org/apache/ibatis/submitted/custom_collection_handling/CustomCollection.java b/src/test/java/org/apache/ibatis/submitted/custom_collection_handling/CustomCollection.java index 1269b9a7415..8fe5c1bdb7d 100644 --- a/src/test/java/org/apache/ibatis/submitted/custom_collection_handling/CustomCollection.java +++ b/src/test/java/org/apache/ibatis/submitted/custom_collection_handling/CustomCollection.java @@ -15,7 +15,11 @@ */ package org.apache.ibatis.submitted.custom_collection_handling; -import java.util.*; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Iterator; +import java.util.List; +import java.util.ListIterator; public class CustomCollection { diff --git a/src/test/java/org/apache/ibatis/submitted/custom_collection_handling/CustomCollectionHandlingTest.java b/src/test/java/org/apache/ibatis/submitted/custom_collection_handling/CustomCollectionHandlingTest.java index 6a5b2d84f4e..dc3f3027fc5 100644 --- a/src/test/java/org/apache/ibatis/submitted/custom_collection_handling/CustomCollectionHandlingTest.java +++ b/src/test/java/org/apache/ibatis/submitted/custom_collection_handling/CustomCollectionHandlingTest.java @@ -15,7 +15,7 @@ */ package org.apache.ibatis.submitted.custom_collection_handling; -import static org.junit.jupiter.api.Assertions.*; +import static org.junit.jupiter.api.Assertions.assertEquals; import java.io.IOException; import java.io.Reader; diff --git a/src/test/java/org/apache/ibatis/submitted/default_method/DefaultMethodTest.java b/src/test/java/org/apache/ibatis/submitted/default_method/DefaultMethodTest.java index ce8d5d17b95..8a0bbce186f 100644 --- a/src/test/java/org/apache/ibatis/submitted/default_method/DefaultMethodTest.java +++ b/src/test/java/org/apache/ibatis/submitted/default_method/DefaultMethodTest.java @@ -15,7 +15,7 @@ */ package org.apache.ibatis.submitted.default_method; -import static org.junit.jupiter.api.Assertions.*; +import static org.junit.jupiter.api.Assertions.assertEquals; import java.io.Reader; diff --git a/src/test/java/org/apache/ibatis/submitted/deferload_common_property/CommonPropertyDeferLoadTest.java b/src/test/java/org/apache/ibatis/submitted/deferload_common_property/CommonPropertyDeferLoadTest.java index 8d3e3c04dac..373fa240229 100644 --- a/src/test/java/org/apache/ibatis/submitted/deferload_common_property/CommonPropertyDeferLoadTest.java +++ b/src/test/java/org/apache/ibatis/submitted/deferload_common_property/CommonPropertyDeferLoadTest.java @@ -15,7 +15,7 @@ */ package org.apache.ibatis.submitted.deferload_common_property; -import static org.junit.jupiter.api.Assertions.*; +import static org.junit.jupiter.api.Assertions.assertNotNull; import java.io.Reader; import java.util.ArrayList; diff --git a/src/test/java/org/apache/ibatis/submitted/dirty_select/DirtySelectTest.java b/src/test/java/org/apache/ibatis/submitted/dirty_select/DirtySelectTest.java index 64d6cd31a50..b72fd88143b 100644 --- a/src/test/java/org/apache/ibatis/submitted/dirty_select/DirtySelectTest.java +++ b/src/test/java/org/apache/ibatis/submitted/dirty_select/DirtySelectTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2009-2022 the original author or authors. + * Copyright 2009-2023 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -15,7 +15,9 @@ */ package org.apache.ibatis.submitted.dirty_select; -import static org.junit.jupiter.api.Assertions.*; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; import java.util.Iterator; diff --git a/src/test/java/org/apache/ibatis/submitted/discriminator/DiscriminatorTest.java b/src/test/java/org/apache/ibatis/submitted/discriminator/DiscriminatorTest.java index 197b7b7eb27..d4a15254f9c 100644 --- a/src/test/java/org/apache/ibatis/submitted/discriminator/DiscriminatorTest.java +++ b/src/test/java/org/apache/ibatis/submitted/discriminator/DiscriminatorTest.java @@ -15,7 +15,7 @@ */ package org.apache.ibatis.submitted.discriminator; -import static org.junit.jupiter.api.Assertions.*; +import static org.junit.jupiter.api.Assertions.assertEquals; import java.io.Reader; import java.util.List; diff --git a/src/test/java/org/apache/ibatis/submitted/dynsql2/FirstNameTypeHandler.java b/src/test/java/org/apache/ibatis/submitted/dynsql2/FirstNameTypeHandler.java index 47fd3a058b6..77955e45b4b 100644 --- a/src/test/java/org/apache/ibatis/submitted/dynsql2/FirstNameTypeHandler.java +++ b/src/test/java/org/apache/ibatis/submitted/dynsql2/FirstNameTypeHandler.java @@ -15,7 +15,11 @@ */ package org.apache.ibatis.submitted.dynsql2; -import java.sql.*; +import java.sql.CallableStatement; +import java.sql.PreparedStatement; +import java.sql.ResultSet; +import java.sql.SQLException; +import java.sql.Types; import org.apache.ibatis.type.JdbcType; import org.apache.ibatis.type.TypeHandler; diff --git a/src/test/java/org/apache/ibatis/submitted/dynsql2/LastNameTypeHandler.java b/src/test/java/org/apache/ibatis/submitted/dynsql2/LastNameTypeHandler.java index cd20f38e8e0..fa4dcd0c4c7 100644 --- a/src/test/java/org/apache/ibatis/submitted/dynsql2/LastNameTypeHandler.java +++ b/src/test/java/org/apache/ibatis/submitted/dynsql2/LastNameTypeHandler.java @@ -15,7 +15,11 @@ */ package org.apache.ibatis.submitted.dynsql2; -import java.sql.*; +import java.sql.CallableStatement; +import java.sql.PreparedStatement; +import java.sql.ResultSet; +import java.sql.SQLException; +import java.sql.Types; import org.apache.ibatis.type.JdbcType; import org.apache.ibatis.type.TypeHandler; diff --git a/src/test/java/org/apache/ibatis/submitted/empty_row/ReturnInstanceForEmptyRowTest.java b/src/test/java/org/apache/ibatis/submitted/empty_row/ReturnInstanceForEmptyRowTest.java index 1a36b523005..9d33434af98 100644 --- a/src/test/java/org/apache/ibatis/submitted/empty_row/ReturnInstanceForEmptyRowTest.java +++ b/src/test/java/org/apache/ibatis/submitted/empty_row/ReturnInstanceForEmptyRowTest.java @@ -15,7 +15,10 @@ */ package org.apache.ibatis.submitted.empty_row; -import static org.junit.jupiter.api.Assertions.*; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.io.Reader; import java.util.Map; diff --git a/src/test/java/org/apache/ibatis/submitted/enum_interface_type_handler/EnumInterfaceTypeHandlerTest.java b/src/test/java/org/apache/ibatis/submitted/enum_interface_type_handler/EnumInterfaceTypeHandlerTest.java index b356018e550..3e31582b9f2 100644 --- a/src/test/java/org/apache/ibatis/submitted/enum_interface_type_handler/EnumInterfaceTypeHandlerTest.java +++ b/src/test/java/org/apache/ibatis/submitted/enum_interface_type_handler/EnumInterfaceTypeHandlerTest.java @@ -15,7 +15,7 @@ */ package org.apache.ibatis.submitted.enum_interface_type_handler; -import static org.junit.jupiter.api.Assertions.*; +import static org.junit.jupiter.api.Assertions.assertEquals; import java.io.Reader; diff --git a/src/test/java/org/apache/ibatis/submitted/enumtypehandler_on_annotation/PersonMapper.java b/src/test/java/org/apache/ibatis/submitted/enumtypehandler_on_annotation/PersonMapper.java index fa7205ae3b4..725b40adc86 100644 --- a/src/test/java/org/apache/ibatis/submitted/enumtypehandler_on_annotation/PersonMapper.java +++ b/src/test/java/org/apache/ibatis/submitted/enumtypehandler_on_annotation/PersonMapper.java @@ -15,7 +15,13 @@ */ package org.apache.ibatis.submitted.enumtypehandler_on_annotation; -import org.apache.ibatis.annotations.*; +import org.apache.ibatis.annotations.Arg; +import org.apache.ibatis.annotations.Case; +import org.apache.ibatis.annotations.ConstructorArgs; +import org.apache.ibatis.annotations.Result; +import org.apache.ibatis.annotations.Results; +import org.apache.ibatis.annotations.Select; +import org.apache.ibatis.annotations.TypeDiscriminator; import org.apache.ibatis.submitted.enumtypehandler_on_annotation.Person.PersonType; import org.apache.ibatis.type.EnumOrdinalTypeHandler; diff --git a/src/test/java/org/apache/ibatis/submitted/extends_with_constructor/NpeExtendsTest.java b/src/test/java/org/apache/ibatis/submitted/extends_with_constructor/NpeExtendsTest.java index 9655c173649..6eebad86e8a 100644 --- a/src/test/java/org/apache/ibatis/submitted/extends_with_constructor/NpeExtendsTest.java +++ b/src/test/java/org/apache/ibatis/submitted/extends_with_constructor/NpeExtendsTest.java @@ -15,7 +15,9 @@ */ package org.apache.ibatis.submitted.extends_with_constructor; -import static org.junit.jupiter.api.Assertions.*; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.util.Properties; diff --git a/src/test/java/org/apache/ibatis/submitted/force_flush_on_select/ForceFlushOnSelectTest.java b/src/test/java/org/apache/ibatis/submitted/force_flush_on_select/ForceFlushOnSelectTest.java index b73714a5059..ae1e33870bb 100644 --- a/src/test/java/org/apache/ibatis/submitted/force_flush_on_select/ForceFlushOnSelectTest.java +++ b/src/test/java/org/apache/ibatis/submitted/force_flush_on_select/ForceFlushOnSelectTest.java @@ -15,7 +15,8 @@ */ package org.apache.ibatis.submitted.force_flush_on_select; -import static org.junit.jupiter.api.Assertions.*; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotSame; import java.io.Reader; import java.sql.Connection; diff --git a/src/test/java/org/apache/ibatis/submitted/foreach/ForEachTest.java b/src/test/java/org/apache/ibatis/submitted/foreach/ForEachTest.java index 42e15142d29..63b4e5e2017 100644 --- a/src/test/java/org/apache/ibatis/submitted/foreach/ForEachTest.java +++ b/src/test/java/org/apache/ibatis/submitted/foreach/ForEachTest.java @@ -15,7 +15,8 @@ */ package org.apache.ibatis.submitted.foreach; -import static com.googlecode.catchexception.apis.BDDCatchException.*; +import static com.googlecode.catchexception.apis.BDDCatchException.caughtException; +import static com.googlecode.catchexception.apis.BDDCatchException.when; import static org.assertj.core.api.BDDAssertions.then; import java.io.IOException; diff --git a/src/test/java/org/apache/ibatis/submitted/generictyperesolution/GenericTypeResolutionTest.java b/src/test/java/org/apache/ibatis/submitted/generictyperesolution/GenericTypeResolutionTest.java index 40bb36b97b4..76c87f131e7 100644 --- a/src/test/java/org/apache/ibatis/submitted/generictyperesolution/GenericTypeResolutionTest.java +++ b/src/test/java/org/apache/ibatis/submitted/generictyperesolution/GenericTypeResolutionTest.java @@ -15,7 +15,8 @@ */ package org.apache.ibatis.submitted.generictyperesolution; -import static org.junit.jupiter.api.Assertions.*; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; import java.io.Reader; diff --git a/src/test/java/org/apache/ibatis/submitted/include_property/IncludePropertyTest.java b/src/test/java/org/apache/ibatis/submitted/include_property/IncludePropertyTest.java index da516283481..9b52284bf46 100644 --- a/src/test/java/org/apache/ibatis/submitted/include_property/IncludePropertyTest.java +++ b/src/test/java/org/apache/ibatis/submitted/include_property/IncludePropertyTest.java @@ -15,7 +15,7 @@ */ package org.apache.ibatis.submitted.include_property; -import static org.junit.jupiter.api.Assertions.*; +import static org.junit.jupiter.api.Assertions.assertEquals; import java.io.Reader; import java.util.HashMap; diff --git a/src/test/java/org/apache/ibatis/submitted/keycolumn/InsertTest.java b/src/test/java/org/apache/ibatis/submitted/keycolumn/InsertTest.java index 988dce248fb..691e3080740 100644 --- a/src/test/java/org/apache/ibatis/submitted/keycolumn/InsertTest.java +++ b/src/test/java/org/apache/ibatis/submitted/keycolumn/InsertTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2009-2022 the original author or authors. + * Copyright 2009-2023 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -15,7 +15,8 @@ */ package org.apache.ibatis.submitted.keycolumn; -import static org.junit.jupiter.api.Assertions.*; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; import java.util.List; diff --git a/src/test/java/org/apache/ibatis/submitted/keygen/Jdbc3KeyGeneratorTest.java b/src/test/java/org/apache/ibatis/submitted/keygen/Jdbc3KeyGeneratorTest.java index 80ba2e64ff7..0e8342e93d6 100644 --- a/src/test/java/org/apache/ibatis/submitted/keygen/Jdbc3KeyGeneratorTest.java +++ b/src/test/java/org/apache/ibatis/submitted/keygen/Jdbc3KeyGeneratorTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2009-2022 the original author or authors. + * Copyright 2009-2023 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -15,9 +15,11 @@ */ package org.apache.ibatis.submitted.keygen; -import static com.googlecode.catchexception.apis.BDDCatchException.*; +import static com.googlecode.catchexception.apis.BDDCatchException.caughtException; +import static com.googlecode.catchexception.apis.BDDCatchException.when; import static org.assertj.core.api.BDDAssertions.then; -import static org.junit.jupiter.api.Assertions.*; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; import java.io.Reader; import java.util.ArrayList; diff --git a/src/test/java/org/apache/ibatis/submitted/language/LanguageTest.java b/src/test/java/org/apache/ibatis/submitted/language/LanguageTest.java index e9980c73592..772454613f8 100644 --- a/src/test/java/org/apache/ibatis/submitted/language/LanguageTest.java +++ b/src/test/java/org/apache/ibatis/submitted/language/LanguageTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2009-2022 the original author or authors. + * Copyright 2009-2023 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -15,7 +15,8 @@ */ package org.apache.ibatis.submitted.language; -import static org.junit.jupiter.api.Assertions.*; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNull; import java.io.Reader; import java.util.HashMap; diff --git a/src/test/java/org/apache/ibatis/submitted/lazy_deserialize/LazyDeserializeTest.java b/src/test/java/org/apache/ibatis/submitted/lazy_deserialize/LazyDeserializeTest.java index 4d98e4a6ff4..2e52a5c3379 100644 --- a/src/test/java/org/apache/ibatis/submitted/lazy_deserialize/LazyDeserializeTest.java +++ b/src/test/java/org/apache/ibatis/submitted/lazy_deserialize/LazyDeserializeTest.java @@ -15,7 +15,10 @@ */ package org.apache.ibatis.submitted.lazy_deserialize; -import static org.junit.jupiter.api.Assertions.*; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.fail; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; diff --git a/src/test/java/org/apache/ibatis/submitted/lazy_immutable/ImmutablePOJOTest.java b/src/test/java/org/apache/ibatis/submitted/lazy_immutable/ImmutablePOJOTest.java index 33cd1ebf41c..5e1386e2f3e 100644 --- a/src/test/java/org/apache/ibatis/submitted/lazy_immutable/ImmutablePOJOTest.java +++ b/src/test/java/org/apache/ibatis/submitted/lazy_immutable/ImmutablePOJOTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2009-2022 the original author or authors. + * Copyright 2009-2023 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -15,7 +15,9 @@ */ package org.apache.ibatis.submitted.lazy_immutable; -import static org.junit.jupiter.api.Assertions.*; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; import java.io.Reader; diff --git a/src/test/java/org/apache/ibatis/submitted/lazy_properties/LazyPropertiesTest.java b/src/test/java/org/apache/ibatis/submitted/lazy_properties/LazyPropertiesTest.java index 0e282bda302..760bbb5f251 100644 --- a/src/test/java/org/apache/ibatis/submitted/lazy_properties/LazyPropertiesTest.java +++ b/src/test/java/org/apache/ibatis/submitted/lazy_properties/LazyPropertiesTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2009-2022 the original author or authors. + * Copyright 2009-2023 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -15,7 +15,8 @@ */ package org.apache.ibatis.submitted.lazy_properties; -import static org.junit.jupiter.api.Assertions.*; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; import java.io.Reader; import java.util.Collections; diff --git a/src/test/java/org/apache/ibatis/submitted/localtime/LocalTimeTest.java b/src/test/java/org/apache/ibatis/submitted/localtime/LocalTimeTest.java index 52c24cd6200..b9956e479ac 100644 --- a/src/test/java/org/apache/ibatis/submitted/localtime/LocalTimeTest.java +++ b/src/test/java/org/apache/ibatis/submitted/localtime/LocalTimeTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2009-2022 the original author or authors. + * Copyright 2009-2023 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -15,7 +15,7 @@ */ package org.apache.ibatis.submitted.localtime; -import static org.junit.jupiter.api.Assertions.*; +import static org.junit.jupiter.api.Assertions.assertEquals; import java.io.Reader; import java.time.LocalTime; diff --git a/src/test/java/org/apache/ibatis/submitted/manyanno/PostMapper.java b/src/test/java/org/apache/ibatis/submitted/manyanno/PostMapper.java index 7e361e4a1fe..f0733496244 100644 --- a/src/test/java/org/apache/ibatis/submitted/manyanno/PostMapper.java +++ b/src/test/java/org/apache/ibatis/submitted/manyanno/PostMapper.java @@ -17,7 +17,12 @@ import java.util.List; -import org.apache.ibatis.annotations.*; +import org.apache.ibatis.annotations.Arg; +import org.apache.ibatis.annotations.ConstructorArgs; +import org.apache.ibatis.annotations.Many; +import org.apache.ibatis.annotations.Result; +import org.apache.ibatis.annotations.Results; +import org.apache.ibatis.annotations.Select; public interface PostMapper { diff --git a/src/test/java/org/apache/ibatis/submitted/mapper_extend/MapperExtendTest.java b/src/test/java/org/apache/ibatis/submitted/mapper_extend/MapperExtendTest.java index 161b3b7238b..4b5e27a9ad3 100644 --- a/src/test/java/org/apache/ibatis/submitted/mapper_extend/MapperExtendTest.java +++ b/src/test/java/org/apache/ibatis/submitted/mapper_extend/MapperExtendTest.java @@ -15,7 +15,8 @@ */ package org.apache.ibatis.submitted.mapper_extend; -import static com.googlecode.catchexception.apis.BDDCatchException.*; +import static com.googlecode.catchexception.apis.BDDCatchException.caughtException; +import static com.googlecode.catchexception.apis.BDDCatchException.when; import static org.assertj.core.api.BDDAssertions.then; import java.io.Reader; diff --git a/src/test/java/org/apache/ibatis/submitted/mapper_type_parameter/MapperTypeParameterTest.java b/src/test/java/org/apache/ibatis/submitted/mapper_type_parameter/MapperTypeParameterTest.java index 91a83c66200..2acd2e848fb 100644 --- a/src/test/java/org/apache/ibatis/submitted/mapper_type_parameter/MapperTypeParameterTest.java +++ b/src/test/java/org/apache/ibatis/submitted/mapper_type_parameter/MapperTypeParameterTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2009-2022 the original author or authors. + * Copyright 2009-2023 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -15,7 +15,8 @@ */ package org.apache.ibatis.submitted.mapper_type_parameter; -import static org.junit.jupiter.api.Assertions.*; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; import java.io.Reader; import java.util.Collections; diff --git a/src/test/java/org/apache/ibatis/submitted/member_access/MemberAccessTest.java b/src/test/java/org/apache/ibatis/submitted/member_access/MemberAccessTest.java index cb845cd70fb..21a31cea2c9 100644 --- a/src/test/java/org/apache/ibatis/submitted/member_access/MemberAccessTest.java +++ b/src/test/java/org/apache/ibatis/submitted/member_access/MemberAccessTest.java @@ -15,7 +15,7 @@ */ package org.apache.ibatis.submitted.member_access; -import static org.junit.jupiter.api.Assertions.*; +import static org.junit.jupiter.api.Assertions.assertEquals; import java.io.Reader; import java.util.HashMap; diff --git a/src/test/java/org/apache/ibatis/submitted/named_constructor_args/InvalidNamedConstructorArgsTest.java b/src/test/java/org/apache/ibatis/submitted/named_constructor_args/InvalidNamedConstructorArgsTest.java index 8dbdceb2660..aaa9ddc451b 100644 --- a/src/test/java/org/apache/ibatis/submitted/named_constructor_args/InvalidNamedConstructorArgsTest.java +++ b/src/test/java/org/apache/ibatis/submitted/named_constructor_args/InvalidNamedConstructorArgsTest.java @@ -15,7 +15,8 @@ */ package org.apache.ibatis.submitted.named_constructor_args; -import static com.googlecode.catchexception.apis.BDDCatchException.*; +import static com.googlecode.catchexception.apis.BDDCatchException.caughtException; +import static com.googlecode.catchexception.apis.BDDCatchException.when; import static org.assertj.core.api.BDDAssertions.then; import java.io.Reader; diff --git a/src/test/java/org/apache/ibatis/submitted/named_constructor_args/NamedConstructorArgsTest.java b/src/test/java/org/apache/ibatis/submitted/named_constructor_args/NamedConstructorArgsTest.java index 04e3a46f688..ab63b57c20d 100644 --- a/src/test/java/org/apache/ibatis/submitted/named_constructor_args/NamedConstructorArgsTest.java +++ b/src/test/java/org/apache/ibatis/submitted/named_constructor_args/NamedConstructorArgsTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2009-2022 the original author or authors. + * Copyright 2009-2023 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -15,7 +15,7 @@ */ package org.apache.ibatis.submitted.named_constructor_args; -import static org.junit.jupiter.api.Assertions.*; +import static org.junit.jupiter.api.Assertions.assertEquals; import java.io.Reader; diff --git a/src/test/java/org/apache/ibatis/submitted/named_constructor_args/NamedConstructorArgsUseActualNameTest.java b/src/test/java/org/apache/ibatis/submitted/named_constructor_args/NamedConstructorArgsUseActualNameTest.java index 824a807040f..8161bedd356 100644 --- a/src/test/java/org/apache/ibatis/submitted/named_constructor_args/NamedConstructorArgsUseActualNameTest.java +++ b/src/test/java/org/apache/ibatis/submitted/named_constructor_args/NamedConstructorArgsUseActualNameTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2009-2022 the original author or authors. + * Copyright 2009-2023 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -15,7 +15,7 @@ */ package org.apache.ibatis.submitted.named_constructor_args; -import static org.junit.jupiter.api.Assertions.*; +import static org.junit.jupiter.api.Assertions.assertEquals; import java.io.Reader; diff --git a/src/test/java/org/apache/ibatis/submitted/nested_query_cache/NestedQueryCacheTest.java b/src/test/java/org/apache/ibatis/submitted/nested_query_cache/NestedQueryCacheTest.java index 43a4cef1aaa..3c0e6f97f4f 100644 --- a/src/test/java/org/apache/ibatis/submitted/nested_query_cache/NestedQueryCacheTest.java +++ b/src/test/java/org/apache/ibatis/submitted/nested_query_cache/NestedQueryCacheTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2009-2022 the original author or authors. + * Copyright 2009-2023 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,7 +16,7 @@ package org.apache.ibatis.submitted.nested_query_cache; import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.jupiter.api.Assertions.*; +import static org.junit.jupiter.api.Assertions.assertNotNull; import java.io.Reader; diff --git a/src/test/java/org/apache/ibatis/submitted/nestedresulthandler_association/NestedResultHandlerAssociationTest.java b/src/test/java/org/apache/ibatis/submitted/nestedresulthandler_association/NestedResultHandlerAssociationTest.java index 38ad6a184fb..7abab9351b5 100644 --- a/src/test/java/org/apache/ibatis/submitted/nestedresulthandler_association/NestedResultHandlerAssociationTest.java +++ b/src/test/java/org/apache/ibatis/submitted/nestedresulthandler_association/NestedResultHandlerAssociationTest.java @@ -15,7 +15,7 @@ */ package org.apache.ibatis.submitted.nestedresulthandler_association; -import static org.junit.jupiter.api.Assertions.*; +import static org.junit.jupiter.api.Assertions.assertEquals; import java.io.Reader; import java.text.SimpleDateFormat; diff --git a/src/test/java/org/apache/ibatis/submitted/no_param_type/NoParamTypeTest.java b/src/test/java/org/apache/ibatis/submitted/no_param_type/NoParamTypeTest.java index 913746fe843..ee610c8d942 100644 --- a/src/test/java/org/apache/ibatis/submitted/no_param_type/NoParamTypeTest.java +++ b/src/test/java/org/apache/ibatis/submitted/no_param_type/NoParamTypeTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2009-2022 the original author or authors. + * Copyright 2009-2023 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -15,7 +15,7 @@ */ package org.apache.ibatis.submitted.no_param_type; -import static org.junit.jupiter.api.Assertions.*; +import static org.junit.jupiter.api.Assertions.assertEquals; import java.io.Reader; import java.util.List; diff --git a/src/test/java/org/apache/ibatis/submitted/no_result_type_map/NoResultTypeMapTest.java b/src/test/java/org/apache/ibatis/submitted/no_result_type_map/NoResultTypeMapTest.java index 560cacd11a2..3b20ceaa7d5 100644 --- a/src/test/java/org/apache/ibatis/submitted/no_result_type_map/NoResultTypeMapTest.java +++ b/src/test/java/org/apache/ibatis/submitted/no_result_type_map/NoResultTypeMapTest.java @@ -15,7 +15,8 @@ */ package org.apache.ibatis.submitted.no_result_type_map; -import static org.junit.jupiter.api.Assertions.*; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertThrows; import java.io.Reader; import java.util.List; diff --git a/src/test/java/org/apache/ibatis/submitted/not_null_column/NotNullColumnTest.java b/src/test/java/org/apache/ibatis/submitted/not_null_column/NotNullColumnTest.java index ad0d9b1c587..2dfcae9fae4 100644 --- a/src/test/java/org/apache/ibatis/submitted/not_null_column/NotNullColumnTest.java +++ b/src/test/java/org/apache/ibatis/submitted/not_null_column/NotNullColumnTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2009-2022 the original author or authors. + * Copyright 2009-2023 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -15,7 +15,9 @@ */ package org.apache.ibatis.submitted.not_null_column; -import static org.junit.jupiter.api.Assertions.*; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.io.Reader; diff --git a/src/test/java/org/apache/ibatis/submitted/optional_on_mapper_method/OptionalOnMapperMethodTest.java b/src/test/java/org/apache/ibatis/submitted/optional_on_mapper_method/OptionalOnMapperMethodTest.java index 1c9b4c74fde..01fa8726da4 100644 --- a/src/test/java/org/apache/ibatis/submitted/optional_on_mapper_method/OptionalOnMapperMethodTest.java +++ b/src/test/java/org/apache/ibatis/submitted/optional_on_mapper_method/OptionalOnMapperMethodTest.java @@ -15,8 +15,12 @@ */ package org.apache.ibatis.submitted.optional_on_mapper_method; -import static org.junit.jupiter.api.Assertions.*; -import static org.mockito.Mockito.*; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertSame; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.Mockito.doReturn; import java.io.Reader; import java.util.Optional; diff --git a/src/test/java/org/apache/ibatis/submitted/orphan_result_maps/OrphanResultMapTest.java b/src/test/java/org/apache/ibatis/submitted/orphan_result_maps/OrphanResultMapTest.java index 6b29909e801..d73b3a58584 100644 --- a/src/test/java/org/apache/ibatis/submitted/orphan_result_maps/OrphanResultMapTest.java +++ b/src/test/java/org/apache/ibatis/submitted/orphan_result_maps/OrphanResultMapTest.java @@ -15,7 +15,9 @@ */ package org.apache.ibatis.submitted.orphan_result_maps; -import static org.junit.jupiter.api.Assertions.*; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertThrows; import org.apache.ibatis.session.Configuration; import org.junit.jupiter.api.Test; diff --git a/src/test/java/org/apache/ibatis/submitted/parent_reference_3level/BlogTest.java b/src/test/java/org/apache/ibatis/submitted/parent_reference_3level/BlogTest.java index b99d6af5806..16fd790a1fc 100644 --- a/src/test/java/org/apache/ibatis/submitted/parent_reference_3level/BlogTest.java +++ b/src/test/java/org/apache/ibatis/submitted/parent_reference_3level/BlogTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2009-2022 the original author or authors. + * Copyright 2009-2023 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -15,7 +15,8 @@ */ package org.apache.ibatis.submitted.parent_reference_3level; -import static org.junit.jupiter.api.Assertions.*; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; import java.io.Reader; diff --git a/src/test/java/org/apache/ibatis/submitted/postgres_genkeys/PostgresGeneratedKeysTest.java b/src/test/java/org/apache/ibatis/submitted/postgres_genkeys/PostgresGeneratedKeysTest.java index 5940618a792..9047d56d032 100644 --- a/src/test/java/org/apache/ibatis/submitted/postgres_genkeys/PostgresGeneratedKeysTest.java +++ b/src/test/java/org/apache/ibatis/submitted/postgres_genkeys/PostgresGeneratedKeysTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2009-2022 the original author or authors. + * Copyright 2009-2023 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -15,7 +15,7 @@ */ package org.apache.ibatis.submitted.postgres_genkeys; -import static org.junit.jupiter.api.Assertions.*; +import static org.junit.jupiter.api.Assertions.assertEquals; import org.apache.ibatis.BaseDataTest; import org.apache.ibatis.mapping.Environment; diff --git a/src/test/java/org/apache/ibatis/submitted/record_type/RecordTypeTest.java b/src/test/java/org/apache/ibatis/submitted/record_type/RecordTypeTest.java index 2582e3048bd..af368b47e13 100644 --- a/src/test/java/org/apache/ibatis/submitted/record_type/RecordTypeTest.java +++ b/src/test/java/org/apache/ibatis/submitted/record_type/RecordTypeTest.java @@ -15,7 +15,7 @@ */ package org.apache.ibatis.submitted.record_type; -import static org.junit.jupiter.api.Assertions.*; +import static org.junit.jupiter.api.Assertions.assertEquals; import java.io.Reader; diff --git a/src/test/java/org/apache/ibatis/submitted/refcursor/RefCursorTest.java b/src/test/java/org/apache/ibatis/submitted/refcursor/RefCursorTest.java index a056faa512f..6894a8c0c38 100644 --- a/src/test/java/org/apache/ibatis/submitted/refcursor/RefCursorTest.java +++ b/src/test/java/org/apache/ibatis/submitted/refcursor/RefCursorTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2009-2022 the original author or authors. + * Copyright 2009-2023 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -15,7 +15,9 @@ */ package org.apache.ibatis.submitted.refcursor; -import static org.junit.jupiter.api.Assertions.*; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; import java.util.ArrayList; import java.util.HashMap; diff --git a/src/test/java/org/apache/ibatis/submitted/result_handler_type/DefaultResultHandlerTypeTest.java b/src/test/java/org/apache/ibatis/submitted/result_handler_type/DefaultResultHandlerTypeTest.java index 669e3debc73..82054bbcfb2 100644 --- a/src/test/java/org/apache/ibatis/submitted/result_handler_type/DefaultResultHandlerTypeTest.java +++ b/src/test/java/org/apache/ibatis/submitted/result_handler_type/DefaultResultHandlerTypeTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2009-2022 the original author or authors. + * Copyright 2009-2023 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -15,7 +15,7 @@ */ package org.apache.ibatis.submitted.result_handler_type; -import static org.junit.jupiter.api.Assertions.*; +import static org.junit.jupiter.api.Assertions.assertEquals; import java.io.Reader; import java.util.List; diff --git a/src/test/java/org/apache/ibatis/submitted/results_id/IdConflictTest.java b/src/test/java/org/apache/ibatis/submitted/results_id/IdConflictTest.java index 5b8ab7935af..3933f320366 100644 --- a/src/test/java/org/apache/ibatis/submitted/results_id/IdConflictTest.java +++ b/src/test/java/org/apache/ibatis/submitted/results_id/IdConflictTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2009-2022 the original author or authors. + * Copyright 2009-2023 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -15,7 +15,8 @@ */ package org.apache.ibatis.submitted.results_id; -import static com.googlecode.catchexception.apis.BDDCatchException.*; +import static com.googlecode.catchexception.apis.BDDCatchException.caughtException; +import static com.googlecode.catchexception.apis.BDDCatchException.when; import static org.assertj.core.api.BDDAssertions.then; import org.apache.ibatis.session.Configuration; diff --git a/src/test/java/org/apache/ibatis/submitted/results_id/ResultsIdTest.java b/src/test/java/org/apache/ibatis/submitted/results_id/ResultsIdTest.java index d17335666bd..5d25b2b21ea 100644 --- a/src/test/java/org/apache/ibatis/submitted/results_id/ResultsIdTest.java +++ b/src/test/java/org/apache/ibatis/submitted/results_id/ResultsIdTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2009-2022 the original author or authors. + * Copyright 2009-2023 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -15,7 +15,7 @@ */ package org.apache.ibatis.submitted.results_id; -import static org.junit.jupiter.api.Assertions.*; +import static org.junit.jupiter.api.Assertions.assertEquals; import java.io.Reader; import java.util.List; diff --git a/src/test/java/org/apache/ibatis/submitted/selectkey/SelectKeyTest.java b/src/test/java/org/apache/ibatis/submitted/selectkey/SelectKeyTest.java index b26f8f12d0b..b0e288990f9 100644 --- a/src/test/java/org/apache/ibatis/submitted/selectkey/SelectKeyTest.java +++ b/src/test/java/org/apache/ibatis/submitted/selectkey/SelectKeyTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2009-2022 the original author or authors. + * Copyright 2009-2023 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -15,7 +15,8 @@ */ package org.apache.ibatis.submitted.selectkey; -import static org.junit.jupiter.api.Assertions.*; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; import java.io.Reader; import java.util.HashMap; diff --git a/src/test/java/org/apache/ibatis/submitted/stringlist/StringListTest.java b/src/test/java/org/apache/ibatis/submitted/stringlist/StringListTest.java index 963add96d23..4c5d058869a 100644 --- a/src/test/java/org/apache/ibatis/submitted/stringlist/StringListTest.java +++ b/src/test/java/org/apache/ibatis/submitted/stringlist/StringListTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2009-2022 the original author or authors. + * Copyright 2009-2023 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -15,7 +15,8 @@ */ package org.apache.ibatis.submitted.stringlist; -import static org.junit.jupiter.api.Assertions.*; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.fail; import java.io.Reader; import java.util.List; diff --git a/src/test/java/org/apache/ibatis/submitted/timestamp_with_timezone/TimestampWithTimezoneTypeHandlerTest.java b/src/test/java/org/apache/ibatis/submitted/timestamp_with_timezone/TimestampWithTimezoneTypeHandlerTest.java index 28ca0878190..469366b4732 100644 --- a/src/test/java/org/apache/ibatis/submitted/timestamp_with_timezone/TimestampWithTimezoneTypeHandlerTest.java +++ b/src/test/java/org/apache/ibatis/submitted/timestamp_with_timezone/TimestampWithTimezoneTypeHandlerTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2009-2022 the original author or authors. + * Copyright 2009-2023 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -15,7 +15,7 @@ */ package org.apache.ibatis.submitted.timestamp_with_timezone; -import static org.junit.jupiter.api.Assertions.*; +import static org.junit.jupiter.api.Assertions.assertEquals; import java.io.Reader; import java.time.OffsetDateTime; diff --git a/src/test/java/org/apache/ibatis/submitted/timezone_edge_case/TimezoneEdgeCaseTest.java b/src/test/java/org/apache/ibatis/submitted/timezone_edge_case/TimezoneEdgeCaseTest.java index 6d5ac363459..2e3d3aace7a 100644 --- a/src/test/java/org/apache/ibatis/submitted/timezone_edge_case/TimezoneEdgeCaseTest.java +++ b/src/test/java/org/apache/ibatis/submitted/timezone_edge_case/TimezoneEdgeCaseTest.java @@ -15,7 +15,7 @@ */ package org.apache.ibatis.submitted.timezone_edge_case; -import static org.junit.jupiter.api.Assertions.*; +import static org.junit.jupiter.api.Assertions.assertEquals; import java.io.Reader; import java.sql.Connection; diff --git a/src/test/java/org/apache/ibatis/submitted/typehandler/TypeHandlerTest.java b/src/test/java/org/apache/ibatis/submitted/typehandler/TypeHandlerTest.java index 9dd6134c30e..100272288c8 100644 --- a/src/test/java/org/apache/ibatis/submitted/typehandler/TypeHandlerTest.java +++ b/src/test/java/org/apache/ibatis/submitted/typehandler/TypeHandlerTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2009-2022 the original author or authors. + * Copyright 2009-2023 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -15,7 +15,8 @@ */ package org.apache.ibatis.submitted.typehandler; -import static org.junit.jupiter.api.Assertions.*; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; import java.io.Reader; diff --git a/src/test/java/org/apache/ibatis/submitted/use_actual_param_name/UseActualParamNameTest.java b/src/test/java/org/apache/ibatis/submitted/use_actual_param_name/UseActualParamNameTest.java index fc6a9b82475..8e442cfaefe 100644 --- a/src/test/java/org/apache/ibatis/submitted/use_actual_param_name/UseActualParamNameTest.java +++ b/src/test/java/org/apache/ibatis/submitted/use_actual_param_name/UseActualParamNameTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2009-2022 the original author or authors. + * Copyright 2009-2023 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -15,7 +15,8 @@ */ package org.apache.ibatis.submitted.use_actual_param_name; -import static org.junit.jupiter.api.Assertions.*; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; import java.io.Reader; import java.util.Arrays; diff --git a/src/test/java/org/apache/ibatis/submitted/xml_external_ref/MultipleCrossIncludeTest.java b/src/test/java/org/apache/ibatis/submitted/xml_external_ref/MultipleCrossIncludeTest.java index e6e31e725d7..deccd4ced97 100644 --- a/src/test/java/org/apache/ibatis/submitted/xml_external_ref/MultipleCrossIncludeTest.java +++ b/src/test/java/org/apache/ibatis/submitted/xml_external_ref/MultipleCrossIncludeTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2009-2022 the original author or authors. + * Copyright 2009-2023 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -15,7 +15,8 @@ */ package org.apache.ibatis.submitted.xml_external_ref; -import static org.junit.jupiter.api.Assertions.*; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertSame; import java.io.IOException; import java.io.Reader; diff --git a/src/test/java/org/apache/ibatis/submitted/xml_external_ref/MultipleIncludeTest.java b/src/test/java/org/apache/ibatis/submitted/xml_external_ref/MultipleIncludeTest.java index f917ce05a50..6e3252bf98b 100644 --- a/src/test/java/org/apache/ibatis/submitted/xml_external_ref/MultipleIncludeTest.java +++ b/src/test/java/org/apache/ibatis/submitted/xml_external_ref/MultipleIncludeTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2009-2022 the original author or authors. + * Copyright 2009-2023 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -15,7 +15,7 @@ */ package org.apache.ibatis.submitted.xml_external_ref; -import static org.junit.jupiter.api.Assertions.*; +import static org.junit.jupiter.api.Assertions.assertEquals; import java.io.IOException; import java.io.Reader; diff --git a/src/test/java/org/apache/ibatis/submitted/xml_external_ref/MultipleReverseIncludeTest.java b/src/test/java/org/apache/ibatis/submitted/xml_external_ref/MultipleReverseIncludeTest.java index 928c6caaaff..8af005473bd 100644 --- a/src/test/java/org/apache/ibatis/submitted/xml_external_ref/MultipleReverseIncludeTest.java +++ b/src/test/java/org/apache/ibatis/submitted/xml_external_ref/MultipleReverseIncludeTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2009-2022 the original author or authors. + * Copyright 2009-2023 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -15,7 +15,7 @@ */ package org.apache.ibatis.submitted.xml_external_ref; -import static org.junit.jupiter.api.Assertions.*; +import static org.junit.jupiter.api.Assertions.assertEquals; import java.io.IOException; import java.io.Reader; diff --git a/src/test/java/org/apache/ibatis/submitted/xml_external_ref/NonFullyQualifiedNamespaceTest.java b/src/test/java/org/apache/ibatis/submitted/xml_external_ref/NonFullyQualifiedNamespaceTest.java index a57c31fef42..00b27856731 100644 --- a/src/test/java/org/apache/ibatis/submitted/xml_external_ref/NonFullyQualifiedNamespaceTest.java +++ b/src/test/java/org/apache/ibatis/submitted/xml_external_ref/NonFullyQualifiedNamespaceTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2009-2022 the original author or authors. + * Copyright 2009-2023 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -15,7 +15,7 @@ */ package org.apache.ibatis.submitted.xml_external_ref; -import static org.junit.jupiter.api.Assertions.*; +import static org.junit.jupiter.api.Assertions.assertEquals; import java.io.IOException; import java.io.Reader; diff --git a/src/test/java/org/apache/ibatis/submitted/xml_external_ref/ParameterMapReferenceTest.java b/src/test/java/org/apache/ibatis/submitted/xml_external_ref/ParameterMapReferenceTest.java index af957f14c3f..209bcb68241 100644 --- a/src/test/java/org/apache/ibatis/submitted/xml_external_ref/ParameterMapReferenceTest.java +++ b/src/test/java/org/apache/ibatis/submitted/xml_external_ref/ParameterMapReferenceTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2009-2022 the original author or authors. + * Copyright 2009-2023 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -15,7 +15,7 @@ */ package org.apache.ibatis.submitted.xml_external_ref; -import static org.junit.jupiter.api.Assertions.*; +import static org.junit.jupiter.api.Assertions.assertEquals; import java.io.IOException; import java.io.Reader; diff --git a/src/test/java/org/apache/ibatis/submitted/xml_external_ref/ResultMapExtendsTest.java b/src/test/java/org/apache/ibatis/submitted/xml_external_ref/ResultMapExtendsTest.java index cf77fe2197d..b1b70039404 100644 --- a/src/test/java/org/apache/ibatis/submitted/xml_external_ref/ResultMapExtendsTest.java +++ b/src/test/java/org/apache/ibatis/submitted/xml_external_ref/ResultMapExtendsTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2009-2022 the original author or authors. + * Copyright 2009-2023 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -15,7 +15,7 @@ */ package org.apache.ibatis.submitted.xml_external_ref; -import static org.junit.jupiter.api.Assertions.*; +import static org.junit.jupiter.api.Assertions.assertEquals; import java.io.IOException; import java.io.Reader; diff --git a/src/test/java/org/apache/ibatis/submitted/xml_external_ref/ResultMapReferenceTest.java b/src/test/java/org/apache/ibatis/submitted/xml_external_ref/ResultMapReferenceTest.java index 4849c54de4d..10198a34cda 100644 --- a/src/test/java/org/apache/ibatis/submitted/xml_external_ref/ResultMapReferenceTest.java +++ b/src/test/java/org/apache/ibatis/submitted/xml_external_ref/ResultMapReferenceTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2009-2022 the original author or authors. + * Copyright 2009-2023 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -15,7 +15,7 @@ */ package org.apache.ibatis.submitted.xml_external_ref; -import static org.junit.jupiter.api.Assertions.*; +import static org.junit.jupiter.api.Assertions.assertEquals; import java.io.IOException; import java.io.Reader; diff --git a/src/test/java/org/apache/ibatis/submitted/xml_external_ref/ReverseIncludeTest.java b/src/test/java/org/apache/ibatis/submitted/xml_external_ref/ReverseIncludeTest.java index b93203b59df..75fbfac3378 100644 --- a/src/test/java/org/apache/ibatis/submitted/xml_external_ref/ReverseIncludeTest.java +++ b/src/test/java/org/apache/ibatis/submitted/xml_external_ref/ReverseIncludeTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2009-2022 the original author or authors. + * Copyright 2009-2023 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -15,7 +15,7 @@ */ package org.apache.ibatis.submitted.xml_external_ref; -import static org.junit.jupiter.api.Assertions.*; +import static org.junit.jupiter.api.Assertions.assertEquals; import java.io.IOException; import java.io.Reader; diff --git a/src/test/java/org/apache/ibatis/submitted/xml_external_ref/SameIdTest.java b/src/test/java/org/apache/ibatis/submitted/xml_external_ref/SameIdTest.java index f022d1006ad..4e338e32534 100644 --- a/src/test/java/org/apache/ibatis/submitted/xml_external_ref/SameIdTest.java +++ b/src/test/java/org/apache/ibatis/submitted/xml_external_ref/SameIdTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2009-2022 the original author or authors. + * Copyright 2009-2023 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -15,7 +15,7 @@ */ package org.apache.ibatis.submitted.xml_external_ref; -import static org.junit.jupiter.api.Assertions.*; +import static org.junit.jupiter.api.Assertions.assertEquals; import java.io.IOException; import java.io.Reader; diff --git a/src/test/java/org/apache/ibatis/submitted/xml_external_ref/ShortNameTest.java b/src/test/java/org/apache/ibatis/submitted/xml_external_ref/ShortNameTest.java index c4c6a682475..dc0141c01bc 100644 --- a/src/test/java/org/apache/ibatis/submitted/xml_external_ref/ShortNameTest.java +++ b/src/test/java/org/apache/ibatis/submitted/xml_external_ref/ShortNameTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2009-2022 the original author or authors. + * Copyright 2009-2023 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -15,7 +15,7 @@ */ package org.apache.ibatis.submitted.xml_external_ref; -import static org.junit.jupiter.api.Assertions.*; +import static org.junit.jupiter.api.Assertions.assertNotNull; import java.io.IOException; import java.io.Reader; diff --git a/src/test/java/org/apache/ibatis/submitted/xml_external_ref/XmlExternalRefTest.java b/src/test/java/org/apache/ibatis/submitted/xml_external_ref/XmlExternalRefTest.java index e1c1d3a9d72..7f533d7c08d 100644 --- a/src/test/java/org/apache/ibatis/submitted/xml_external_ref/XmlExternalRefTest.java +++ b/src/test/java/org/apache/ibatis/submitted/xml_external_ref/XmlExternalRefTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2009-2022 the original author or authors. + * Copyright 2009-2023 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -15,7 +15,9 @@ */ package org.apache.ibatis.submitted.xml_external_ref; -import static org.junit.jupiter.api.Assertions.*; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertSame; +import static org.junit.jupiter.api.Assertions.fail; import java.io.IOException; import java.io.Reader; diff --git a/src/test/java/org/apache/ibatis/transaction/jdbc/JdbcTransactionFactoryTest.java b/src/test/java/org/apache/ibatis/transaction/jdbc/JdbcTransactionFactoryTest.java index 4f9515b618a..97c541c5ebb 100644 --- a/src/test/java/org/apache/ibatis/transaction/jdbc/JdbcTransactionFactoryTest.java +++ b/src/test/java/org/apache/ibatis/transaction/jdbc/JdbcTransactionFactoryTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2009-2022 the original author or authors. + * Copyright 2009-2023 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -15,8 +15,10 @@ */ package org.apache.ibatis.transaction.jdbc; -import static org.junit.Assert.*; -import static org.mockito.Mockito.*; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.when; import java.util.Properties; diff --git a/src/test/java/org/apache/ibatis/transaction/jdbc/JdbcTransactionTest.java b/src/test/java/org/apache/ibatis/transaction/jdbc/JdbcTransactionTest.java index 150d178c59d..bd9a2e963b4 100644 --- a/src/test/java/org/apache/ibatis/transaction/jdbc/JdbcTransactionTest.java +++ b/src/test/java/org/apache/ibatis/transaction/jdbc/JdbcTransactionTest.java @@ -15,8 +15,9 @@ */ package org.apache.ibatis.transaction.jdbc; -import static org.junit.Assert.*; -import static org.mockito.Mockito.*; +import static org.junit.Assert.assertEquals; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.when; import javax.sql.DataSource; diff --git a/src/test/java/org/apache/ibatis/type/BlobByteObjectArrayTypeHandlerTest.java b/src/test/java/org/apache/ibatis/type/BlobByteObjectArrayTypeHandlerTest.java index 8435496dedd..862fbe6c237 100644 --- a/src/test/java/org/apache/ibatis/type/BlobByteObjectArrayTypeHandlerTest.java +++ b/src/test/java/org/apache/ibatis/type/BlobByteObjectArrayTypeHandlerTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2009-2022 the original author or authors. + * Copyright 2009-2023 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -19,7 +19,7 @@ import static org.mockito.Mockito.doNothing; import static org.mockito.Mockito.when; -import java.io.*; +import java.io.ByteArrayInputStream; import java.sql.Blob; import org.junit.jupiter.api.Test; diff --git a/src/test/java/org/apache/ibatis/type/BlobInputStreamTypeHandlerTest.java b/src/test/java/org/apache/ibatis/type/BlobInputStreamTypeHandlerTest.java index 5fd671fd2be..c18bd75f5b3 100644 --- a/src/test/java/org/apache/ibatis/type/BlobInputStreamTypeHandlerTest.java +++ b/src/test/java/org/apache/ibatis/type/BlobInputStreamTypeHandlerTest.java @@ -19,7 +19,11 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import java.io.*; +import java.io.BufferedReader; +import java.io.ByteArrayInputStream; +import java.io.IOException; +import java.io.InputStream; +import java.io.InputStreamReader; import java.sql.Blob; import javax.sql.DataSource; diff --git a/src/test/java/org/apache/ibatis/type/ClobReaderTypeHandlerTest.java b/src/test/java/org/apache/ibatis/type/ClobReaderTypeHandlerTest.java index beeaa1177b1..cbc095737e4 100644 --- a/src/test/java/org/apache/ibatis/type/ClobReaderTypeHandlerTest.java +++ b/src/test/java/org/apache/ibatis/type/ClobReaderTypeHandlerTest.java @@ -21,7 +21,10 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import java.io.*; +import java.io.BufferedReader; +import java.io.IOException; +import java.io.Reader; +import java.io.StringReader; import java.sql.Clob; import javax.sql.DataSource; diff --git a/src/test/java/org/apache/ibatis/type/InstantTypeHandlerTest.java b/src/test/java/org/apache/ibatis/type/InstantTypeHandlerTest.java index b1880fc0a5c..8e61f4daf10 100644 --- a/src/test/java/org/apache/ibatis/type/InstantTypeHandlerTest.java +++ b/src/test/java/org/apache/ibatis/type/InstantTypeHandlerTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2009-2022 the original author or authors. + * Copyright 2009-2023 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -15,8 +15,11 @@ */ package org.apache.ibatis.type; -import static org.junit.jupiter.api.Assertions.*; -import static org.mockito.Mockito.*; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.mockito.Mockito.never; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; import java.sql.Timestamp; import java.time.Instant; diff --git a/src/test/java/org/apache/ibatis/type/JapaneseDateTypeHandlerTest.java b/src/test/java/org/apache/ibatis/type/JapaneseDateTypeHandlerTest.java index c5ce4e89305..18e8ed3407b 100644 --- a/src/test/java/org/apache/ibatis/type/JapaneseDateTypeHandlerTest.java +++ b/src/test/java/org/apache/ibatis/type/JapaneseDateTypeHandlerTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2009-2022 the original author or authors. + * Copyright 2009-2023 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -15,8 +15,11 @@ */ package org.apache.ibatis.type; -import static org.junit.jupiter.api.Assertions.*; -import static org.mockito.Mockito.*; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.mockito.Mockito.never; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; import java.sql.Date; import java.time.LocalDate; diff --git a/src/test/java/org/apache/ibatis/type/Jsr310TypeHandlerRegistryTest.java b/src/test/java/org/apache/ibatis/type/Jsr310TypeHandlerRegistryTest.java index 5f37565f8f7..42400fc8841 100644 --- a/src/test/java/org/apache/ibatis/type/Jsr310TypeHandlerRegistryTest.java +++ b/src/test/java/org/apache/ibatis/type/Jsr310TypeHandlerRegistryTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2009-2022 the original author or authors. + * Copyright 2009-2023 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -15,7 +15,7 @@ */ package org.apache.ibatis.type; -import static org.assertj.core.api.Assertions.*; +import static org.assertj.core.api.Assertions.assertThat; import java.time.Instant; import java.time.LocalDate; diff --git a/src/test/java/org/apache/ibatis/type/LocalDateTimeTypeHandlerTest.java b/src/test/java/org/apache/ibatis/type/LocalDateTimeTypeHandlerTest.java index 1eac9c60805..f654b4fa81b 100644 --- a/src/test/java/org/apache/ibatis/type/LocalDateTimeTypeHandlerTest.java +++ b/src/test/java/org/apache/ibatis/type/LocalDateTimeTypeHandlerTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2009-2022 the original author or authors. + * Copyright 2009-2023 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -15,8 +15,11 @@ */ package org.apache.ibatis.type; -import static org.junit.jupiter.api.Assertions.*; -import static org.mockito.Mockito.*; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.mockito.Mockito.never; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; import java.time.LocalDateTime; diff --git a/src/test/java/org/apache/ibatis/type/LocalDateTypeHandlerTest.java b/src/test/java/org/apache/ibatis/type/LocalDateTypeHandlerTest.java index d1dc6976fa2..aa3482876d7 100644 --- a/src/test/java/org/apache/ibatis/type/LocalDateTypeHandlerTest.java +++ b/src/test/java/org/apache/ibatis/type/LocalDateTypeHandlerTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2009-2022 the original author or authors. + * Copyright 2009-2023 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -15,8 +15,11 @@ */ package org.apache.ibatis.type; -import static org.junit.jupiter.api.Assertions.*; -import static org.mockito.Mockito.*; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.mockito.Mockito.never; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; import java.time.LocalDate; diff --git a/src/test/java/org/apache/ibatis/type/LocalTimeTypeHandlerTest.java b/src/test/java/org/apache/ibatis/type/LocalTimeTypeHandlerTest.java index a33ea38f9c2..ec3f56ff894 100644 --- a/src/test/java/org/apache/ibatis/type/LocalTimeTypeHandlerTest.java +++ b/src/test/java/org/apache/ibatis/type/LocalTimeTypeHandlerTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2009-2022 the original author or authors. + * Copyright 2009-2023 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -15,8 +15,11 @@ */ package org.apache.ibatis.type; -import static org.junit.jupiter.api.Assertions.*; -import static org.mockito.Mockito.*; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.mockito.Mockito.never; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; import java.time.LocalTime; diff --git a/src/test/java/org/apache/ibatis/type/MonthTypeHandlerTest.java b/src/test/java/org/apache/ibatis/type/MonthTypeHandlerTest.java index fc3279e9407..cb88328803a 100644 --- a/src/test/java/org/apache/ibatis/type/MonthTypeHandlerTest.java +++ b/src/test/java/org/apache/ibatis/type/MonthTypeHandlerTest.java @@ -15,8 +15,11 @@ */ package org.apache.ibatis.type; -import static org.junit.jupiter.api.Assertions.*; -import static org.mockito.Mockito.*; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.fail; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; import java.time.Month; diff --git a/src/test/java/org/apache/ibatis/type/OffsetDateTimeTypeHandlerTest.java b/src/test/java/org/apache/ibatis/type/OffsetDateTimeTypeHandlerTest.java index 735b8b1c38f..a35619c99e3 100644 --- a/src/test/java/org/apache/ibatis/type/OffsetDateTimeTypeHandlerTest.java +++ b/src/test/java/org/apache/ibatis/type/OffsetDateTimeTypeHandlerTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2009-2022 the original author or authors. + * Copyright 2009-2023 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -15,8 +15,11 @@ */ package org.apache.ibatis.type; -import static org.junit.jupiter.api.Assertions.*; -import static org.mockito.Mockito.*; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.mockito.Mockito.never; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; import java.time.OffsetDateTime; diff --git a/src/test/java/org/apache/ibatis/type/OffsetTimeTypeHandlerTest.java b/src/test/java/org/apache/ibatis/type/OffsetTimeTypeHandlerTest.java index 6cc070dbbbe..1c0c471d28e 100644 --- a/src/test/java/org/apache/ibatis/type/OffsetTimeTypeHandlerTest.java +++ b/src/test/java/org/apache/ibatis/type/OffsetTimeTypeHandlerTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2009-2022 the original author or authors. + * Copyright 2009-2023 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -15,8 +15,11 @@ */ package org.apache.ibatis.type; -import static org.junit.jupiter.api.Assertions.*; -import static org.mockito.Mockito.*; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.mockito.Mockito.never; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; import java.time.OffsetTime; diff --git a/src/test/java/org/apache/ibatis/type/SqlxmlTypeHandlerTest.java b/src/test/java/org/apache/ibatis/type/SqlxmlTypeHandlerTest.java index da69233c4a8..3bf9f5f074c 100644 --- a/src/test/java/org/apache/ibatis/type/SqlxmlTypeHandlerTest.java +++ b/src/test/java/org/apache/ibatis/type/SqlxmlTypeHandlerTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2009-2022 the original author or authors. + * Copyright 2009-2023 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -15,8 +15,10 @@ */ package org.apache.ibatis.type; -import static org.junit.jupiter.api.Assertions.*; -import static org.mockito.Mockito.*; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; import java.sql.Connection; import java.sql.SQLXML; diff --git a/src/test/java/org/apache/ibatis/type/TypeHandlerRegistryTest.java b/src/test/java/org/apache/ibatis/type/TypeHandlerRegistryTest.java index ccc5caea923..fbccd984102 100644 --- a/src/test/java/org/apache/ibatis/type/TypeHandlerRegistryTest.java +++ b/src/test/java/org/apache/ibatis/type/TypeHandlerRegistryTest.java @@ -15,7 +15,11 @@ */ package org.apache.ibatis.type; -import static org.junit.jupiter.api.Assertions.*; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertSame; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.net.URI; import java.sql.CallableStatement; diff --git a/src/test/java/org/apache/ibatis/type/UnknownTypeHandlerTest.java b/src/test/java/org/apache/ibatis/type/UnknownTypeHandlerTest.java index 78accfc6769..c8754ef87a9 100644 --- a/src/test/java/org/apache/ibatis/type/UnknownTypeHandlerTest.java +++ b/src/test/java/org/apache/ibatis/type/UnknownTypeHandlerTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2009-2022 the original author or authors. + * Copyright 2009-2023 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -17,7 +17,10 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNull; -import static org.mockito.Mockito.*; +import static org.mockito.Mockito.doThrow; +import static org.mockito.Mockito.spy; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; import java.sql.SQLException; diff --git a/src/test/java/org/apache/ibatis/type/YearMonthTypeHandlerTest.java b/src/test/java/org/apache/ibatis/type/YearMonthTypeHandlerTest.java index b3f46fea31d..3fb4f49590b 100644 --- a/src/test/java/org/apache/ibatis/type/YearMonthTypeHandlerTest.java +++ b/src/test/java/org/apache/ibatis/type/YearMonthTypeHandlerTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2009-2022 the original author or authors. + * Copyright 2009-2023 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -15,8 +15,11 @@ */ package org.apache.ibatis.type; -import static org.junit.jupiter.api.Assertions.*; -import static org.mockito.Mockito.*; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.mockito.Mockito.never; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; import java.time.YearMonth; diff --git a/src/test/java/org/apache/ibatis/type/YearTypeHandlerTest.java b/src/test/java/org/apache/ibatis/type/YearTypeHandlerTest.java index 89087723bc0..1d9805f3b80 100644 --- a/src/test/java/org/apache/ibatis/type/YearTypeHandlerTest.java +++ b/src/test/java/org/apache/ibatis/type/YearTypeHandlerTest.java @@ -15,8 +15,10 @@ */ package org.apache.ibatis.type; -import static org.junit.jupiter.api.Assertions.*; -import static org.mockito.Mockito.*; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; import java.time.Year; diff --git a/src/test/java/org/apache/ibatis/type/ZonedDateTimeTypeHandlerTest.java b/src/test/java/org/apache/ibatis/type/ZonedDateTimeTypeHandlerTest.java index ca843c5e2dc..f29c6ab0339 100644 --- a/src/test/java/org/apache/ibatis/type/ZonedDateTimeTypeHandlerTest.java +++ b/src/test/java/org/apache/ibatis/type/ZonedDateTimeTypeHandlerTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2009-2022 the original author or authors. + * Copyright 2009-2023 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -15,8 +15,11 @@ */ package org.apache.ibatis.type; -import static org.junit.jupiter.api.Assertions.*; -import static org.mockito.Mockito.*; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.mockito.Mockito.never; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; import java.time.ZonedDateTime;