From 296876d3a716d9fff9ef77a37ee3a810ab6f1822 Mon Sep 17 00:00:00 2001 From: Jeremy Landis Date: Mon, 20 Feb 2023 17:11:08 -0500 Subject: [PATCH 01/11] [ci] Use diamond operators (test classes) squash with diamond --- src/test/java/org/apache/ibatis/binding/BindingTest.java | 3 +-- .../ibatis/builder/xml/dynamic/DynamicSqlSourceTest.java | 6 +++--- .../ibatis/builder/xml/dynamic/ExpressionEvaluatorTest.java | 2 +- .../apache/ibatis/submitted/sqlprovider/OurSqlBuilder.java | 2 +- .../org/apache/ibatis/type/EnumOrdinalTypeHandlerTest.java | 2 +- .../java/org/apache/ibatis/type/EnumTypeHandlerTest.java | 2 +- .../org/apache/ibatis/type/TypeHandlerRegistryTest.java | 6 +++--- 7 files changed, 11 insertions(+), 12 deletions(-) diff --git a/src/test/java/org/apache/ibatis/binding/BindingTest.java b/src/test/java/org/apache/ibatis/binding/BindingTest.java index d6ec1489cb6..1e6498d1d1f 100644 --- a/src/test/java/org/apache/ibatis/binding/BindingTest.java +++ b/src/test/java/org/apache/ibatis/binding/BindingTest.java @@ -588,8 +588,7 @@ void shouldCacheMapperMethod() throws Exception { try (SqlSession session = sqlSessionFactory.openSession()) { // Create another mapper instance with a method cache we can test against: - final MapperProxyFactory mapperProxyFactory = new MapperProxyFactory( - BoundBlogMapper.class); + final MapperProxyFactory mapperProxyFactory = new MapperProxyFactory<>(BoundBlogMapper.class); assertEquals(BoundBlogMapper.class, mapperProxyFactory.getMapperInterface()); final BoundBlogMapper mapper = mapperProxyFactory.newInstance(session); assertNotSame(mapper, mapperProxyFactory.newInstance(session)); diff --git a/src/test/java/org/apache/ibatis/builder/xml/dynamic/DynamicSqlSourceTest.java b/src/test/java/org/apache/ibatis/builder/xml/dynamic/DynamicSqlSourceTest.java index b7489e99551..18e6aa94bdd 100644 --- a/src/test/java/org/apache/ibatis/builder/xml/dynamic/DynamicSqlSourceTest.java +++ b/src/test/java/org/apache/ibatis/builder/xml/dynamic/DynamicSqlSourceTest.java @@ -261,7 +261,7 @@ void shouldTrimNoSetClause() throws Exception { @Test void shouldIterateOnceForEachItemInCollection() throws Exception { - final HashMap parameterObject = new HashMap() { + final HashMap parameterObject = new HashMap<>() { { put("array", new String[] { "one", "two", "three" }); } @@ -280,7 +280,7 @@ void shouldIterateOnceForEachItemInCollection() throws Exception { @Test void shouldHandleOgnlExpression() throws Exception { - final HashMap parameterObject = new HashMap() { + final HashMap parameterObject = new HashMap<>() { { put("name", "Steve"); } @@ -294,7 +294,7 @@ void shouldHandleOgnlExpression() throws Exception { @Test void shouldSkipForEachWhenCollectionIsEmpty() throws Exception { - final HashMap parameterObject = new HashMap() { + final HashMap parameterObject = new HashMap<>() { { put("array", new Integer[] {}); } 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 5d48406eae6..5bfe7c93775 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 @@ -83,7 +83,7 @@ class Bean { @Test void shouldIterateOverIterable() { - final HashMap parameterObject = new HashMap() { + final HashMap parameterObject = new HashMap<>() { { put("array", new String[] { "1", "2", "3" }); } diff --git a/src/test/java/org/apache/ibatis/submitted/sqlprovider/OurSqlBuilder.java b/src/test/java/org/apache/ibatis/submitted/sqlprovider/OurSqlBuilder.java index 1c42f3061c6..3738c65dcf7 100644 --- a/src/test/java/org/apache/ibatis/submitted/sqlprovider/OurSqlBuilder.java +++ b/src/test/java/org/apache/ibatis/submitted/sqlprovider/OurSqlBuilder.java @@ -284,7 +284,7 @@ private Class getEntityClass(ProviderContext providerContext) { private Map getColumnMap(ProviderContext context) { Class entityClass = getEntityClass(context); Field[] fields = entityClass.getDeclaredFields(); - Map columnMap = new LinkedHashMap(); + Map columnMap = new LinkedHashMap<>(); for (Field field : fields) { BaseMapper.Column column = field.getAnnotation(BaseMapper.Column.class); if (column != null) { diff --git a/src/test/java/org/apache/ibatis/type/EnumOrdinalTypeHandlerTest.java b/src/test/java/org/apache/ibatis/type/EnumOrdinalTypeHandlerTest.java index 6cc257c2691..a51fba71eb7 100644 --- a/src/test/java/org/apache/ibatis/type/EnumOrdinalTypeHandlerTest.java +++ b/src/test/java/org/apache/ibatis/type/EnumOrdinalTypeHandlerTest.java @@ -28,7 +28,7 @@ enum MyEnum { ONE, TWO } - private static final TypeHandler TYPE_HANDLER = new EnumOrdinalTypeHandler(MyEnum.class); + private static final TypeHandler TYPE_HANDLER = new EnumOrdinalTypeHandler<>(MyEnum.class); @Override @Test diff --git a/src/test/java/org/apache/ibatis/type/EnumTypeHandlerTest.java b/src/test/java/org/apache/ibatis/type/EnumTypeHandlerTest.java index 646eb006dbd..929c420ecf8 100644 --- a/src/test/java/org/apache/ibatis/type/EnumTypeHandlerTest.java +++ b/src/test/java/org/apache/ibatis/type/EnumTypeHandlerTest.java @@ -29,7 +29,7 @@ enum MyEnum { ONE, TWO } - private static final TypeHandler TYPE_HANDLER = new EnumTypeHandler(MyEnum.class); + private static final TypeHandler TYPE_HANDLER = new EnumTypeHandler<>(MyEnum.class); @Override @Test diff --git a/src/test/java/org/apache/ibatis/type/TypeHandlerRegistryTest.java b/src/test/java/org/apache/ibatis/type/TypeHandlerRegistryTest.java index fbccd984102..b2b28f8cb25 100644 --- a/src/test/java/org/apache/ibatis/type/TypeHandlerRegistryTest.java +++ b/src/test/java/org/apache/ibatis/type/TypeHandlerRegistryTest.java @@ -62,7 +62,7 @@ void shouldRegisterAndRetrieveTypeHandler() { @Test void shouldRegisterAndRetrieveComplexTypeHandler() { - TypeHandler> fakeHandler = new TypeHandler>() { + TypeHandler> fakeHandler = new TypeHandler<>() { @Override public void setParameter(PreparedStatement ps, int i, List parameter, JdbcType jdbcType) { @@ -89,7 +89,7 @@ public List getResult(ResultSet rs, String columnName) { }; - TypeReference> type = new TypeReference>() { + TypeReference> type = new TypeReference<>() { }; typeHandlerRegistry.register(type, fakeHandler); @@ -98,7 +98,7 @@ public List getResult(ResultSet rs, String columnName) { @Test void shouldAutoRegisterAndRetrieveComplexTypeHandler() { - TypeHandler> fakeHandler = new BaseTypeHandler>() { + TypeHandler> fakeHandler = new BaseTypeHandler<>() { @Override public void setNonNullParameter(PreparedStatement ps, int i, List parameter, JdbcType jdbcType) { From d3e4faef59cc64ba39546df8bf9479d11f85821d Mon Sep 17 00:00:00 2001 From: Jeremy Landis Date: Mon, 20 Feb 2023 17:34:18 -0500 Subject: [PATCH 02/11] [ci] Add missing seial version uid at 1L (throughout tests) --- .../apache/ibatis/binding/BindingTest.java | 2 + .../ibatis/builder/ExampleObjectFactory.java | 1 + .../xml/dynamic/DynamicSqlSourceTest.java | 6 ++ .../xml/dynamic/ExpressionEvaluatorTest.java | 1 + .../ibatis/cache/SerializedCacheTest.java | 1 + .../cursor/defaults/DefaultCursorTest.java | 4 +- .../jndi/JndiDataSourceFactoryTest.java | 1 + .../org/apache/ibatis/domain/blog/Author.java | 1 + .../domain/blog/ComplexImmutableAuthor.java | 1 + .../ibatis/domain/blog/ImmutableAuthor.java | 1 + .../apache/ibatis/domain/misc/RichType.java | 1 + .../ibatis/executor/BaseExecutorTest.java | 1 + .../ibatis/executor/ExecutorTestHelper.java | 59 +++++++++++++++++++ .../DefaultResultSetHandlerTest.java | 2 + .../DefaultResultSetHandlerTest2.java | 7 ++- .../ibatis/jdbc/PooledDataSourceTest.java | 1 + .../parsing/GenericTokenParserTest.java | 4 ++ .../defaults/DefaultParameterHandlerTest.java | 4 ++ .../apache/ibatis/session/SqlSessionTest.java | 11 ++++ .../submitted/blocking_cache/Person.java | 1 + .../apache/ibatis/submitted/cache/Person.java | 1 + .../submitted/disallowdotsonnames/Person.java | 2 + .../force_flush_on_select/Person.java | 2 + .../submitted/null_associations/Bar.java | 1 + .../submitted/null_associations/Foo.java | 1 + .../order_prefix_removed/Person.java | 2 + .../submitted/overwritingproperties/Bar.java | 1 + .../submitted/overwritingproperties/Foo.java | 1 + .../submitted/xml_external_ref/Dog.java | 2 + 29 files changed, 120 insertions(+), 3 deletions(-) diff --git a/src/test/java/org/apache/ibatis/binding/BindingTest.java b/src/test/java/org/apache/ibatis/binding/BindingTest.java index 1e6498d1d1f..4bbc9c09adb 100644 --- a/src/test/java/org/apache/ibatis/binding/BindingTest.java +++ b/src/test/java/org/apache/ibatis/binding/BindingTest.java @@ -107,6 +107,7 @@ void shouldFindPostsInList() { try (SqlSession session = sqlSessionFactory.openSession()) { BoundAuthorMapper mapper = session.getMapper(BoundAuthorMapper.class); List posts = mapper.findPostsInList(new ArrayList() { + private static final long serialVersionUID = 1L; { add(1); add(3); @@ -430,6 +431,7 @@ void shouldSelectOneBlogAsMap() { try (SqlSession session = sqlSessionFactory.openSession()) { BoundBlogMapper mapper = session.getMapper(BoundBlogMapper.class); Map blog = mapper.selectBlogAsMap(new HashMap() { + private static final long serialVersionUID = 1L; { put("id", 1); } diff --git a/src/test/java/org/apache/ibatis/builder/ExampleObjectFactory.java b/src/test/java/org/apache/ibatis/builder/ExampleObjectFactory.java index cf3792b4650..100bf1d809e 100644 --- a/src/test/java/org/apache/ibatis/builder/ExampleObjectFactory.java +++ b/src/test/java/org/apache/ibatis/builder/ExampleObjectFactory.java @@ -21,6 +21,7 @@ import org.apache.ibatis.reflection.factory.DefaultObjectFactory; public class ExampleObjectFactory extends DefaultObjectFactory { + private static final long serialVersionUID = 1L; private Properties properties; @Override diff --git a/src/test/java/org/apache/ibatis/builder/xml/dynamic/DynamicSqlSourceTest.java b/src/test/java/org/apache/ibatis/builder/xml/dynamic/DynamicSqlSourceTest.java index 18e6aa94bdd..3d0cffd00bf 100644 --- a/src/test/java/org/apache/ibatis/builder/xml/dynamic/DynamicSqlSourceTest.java +++ b/src/test/java/org/apache/ibatis/builder/xml/dynamic/DynamicSqlSourceTest.java @@ -87,6 +87,7 @@ void shouldConditionallyDefault() throws Exception { final String expected = "SELECT * FROM BLOG WHERE CATEGORY = 'DEFAULT'"; DynamicSqlSource source = createDynamicSqlSource(new TextSqlNode("SELECT * FROM BLOG"), new ChooseSqlNode(new ArrayList() { + private static final long serialVersionUID = 1L; { add(new IfSqlNode(mixedContents(new TextSqlNode("WHERE CATEGORY = ?")), "false")); add(new IfSqlNode(mixedContents(new TextSqlNode("WHERE CATEGORY = 'NONE'")), "false")); @@ -101,6 +102,7 @@ void shouldConditionallyChooseFirst() throws Exception { final String expected = "SELECT * FROM BLOG WHERE CATEGORY = ?"; DynamicSqlSource source = createDynamicSqlSource(new TextSqlNode("SELECT * FROM BLOG"), new ChooseSqlNode(new ArrayList() { + private static final long serialVersionUID = 1L; { add(new IfSqlNode(mixedContents(new TextSqlNode("WHERE CATEGORY = ?")), "true")); add(new IfSqlNode(mixedContents(new TextSqlNode("WHERE CATEGORY = 'NONE'")), "false")); @@ -115,6 +117,7 @@ void shouldConditionallyChooseSecond() throws Exception { final String expected = "SELECT * FROM BLOG WHERE CATEGORY = 'NONE'"; DynamicSqlSource source = createDynamicSqlSource(new TextSqlNode("SELECT * FROM BLOG"), new ChooseSqlNode(new ArrayList() { + private static final long serialVersionUID = 1L; { add(new IfSqlNode(mixedContents(new TextSqlNode("WHERE CATEGORY = ?")), "false")); add(new IfSqlNode(mixedContents(new TextSqlNode("WHERE CATEGORY = 'NONE'")), "true")); @@ -262,6 +265,7 @@ void shouldTrimNoSetClause() throws Exception { @Test void shouldIterateOnceForEachItemInCollection() throws Exception { final HashMap parameterObject = new HashMap<>() { + private static final long serialVersionUID = 1L; { put("array", new String[] { "one", "two", "three" }); } @@ -281,6 +285,7 @@ void shouldIterateOnceForEachItemInCollection() throws Exception { @Test void shouldHandleOgnlExpression() throws Exception { final HashMap parameterObject = new HashMap<>() { + private static final long serialVersionUID = 1L; { put("name", "Steve"); } @@ -295,6 +300,7 @@ void shouldHandleOgnlExpression() throws Exception { @Test void shouldSkipForEachWhenCollectionIsEmpty() throws Exception { final HashMap parameterObject = new HashMap<>() { + private static final long serialVersionUID = 1L; { put("array", new Integer[] {}); } 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 5bfe7c93775..25fb7f34828 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 @@ -84,6 +84,7 @@ class Bean { @Test void shouldIterateOverIterable() { final HashMap parameterObject = new HashMap<>() { + private static final long serialVersionUID = 1L; { put("array", new String[] { "1", "2", "3" }); } diff --git a/src/test/java/org/apache/ibatis/cache/SerializedCacheTest.java b/src/test/java/org/apache/ibatis/cache/SerializedCacheTest.java index 368e520e31b..00658e85e3d 100644 --- a/src/test/java/org/apache/ibatis/cache/SerializedCacheTest.java +++ b/src/test/java/org/apache/ibatis/cache/SerializedCacheTest.java @@ -56,6 +56,7 @@ void throwExceptionWhenTryingToCacheNonSerializableObject() { } static class CachingObject implements Serializable { + private static final long serialVersionUID = 1L; int x; public CachingObject(int x) { diff --git a/src/test/java/org/apache/ibatis/cursor/defaults/DefaultCursorTest.java b/src/test/java/org/apache/ibatis/cursor/defaults/DefaultCursorTest.java index fadcb3dd05d..7acc8f4686c 100644 --- a/src/test/java/org/apache/ibatis/cursor/defaults/DefaultCursorTest.java +++ b/src/test/java/org/apache/ibatis/cursor/defaults/DefaultCursorTest.java @@ -99,12 +99,12 @@ void shouldCloseImmediatelyIfResultSetIsClosed() throws Exception { } } - @SuppressWarnings("serial") private MappedStatement getNestedAndOrderedMappedStatement() { final Configuration config = new Configuration(); final TypeHandlerRegistry registry = config.getTypeHandlerRegistry(); ResultMap nestedResultMap = new ResultMap.Builder(config, "roleMap", HashMap.class, new ArrayList() { + private static final long serialVersionUID = 1L; { add(new ResultMapping.Builder(config, "role", "role", registry.getTypeHandler(String.class)).build()); } @@ -113,8 +113,10 @@ private MappedStatement getNestedAndOrderedMappedStatement() { return new MappedStatement.Builder(config, "selectPerson", new StaticSqlSource(config, "select person..."), SqlCommandType.SELECT).resultMaps(new ArrayList() { + private static final long serialVersionUID = 1L; { add(new ResultMap.Builder(config, "personMap", HashMap.class, new ArrayList() { + private static final long serialVersionUID = 1L; { add(new ResultMapping.Builder(config, "id", "id", registry.getTypeHandler(Integer.class)).build()); add(new ResultMapping.Builder(config, "roles").nestedResultMapId("roleMap").build()); diff --git a/src/test/java/org/apache/ibatis/datasource/jndi/JndiDataSourceFactoryTest.java b/src/test/java/org/apache/ibatis/datasource/jndi/JndiDataSourceFactoryTest.java index c37934e8865..49d82ade875 100644 --- a/src/test/java/org/apache/ibatis/datasource/jndi/JndiDataSourceFactoryTest.java +++ b/src/test/java/org/apache/ibatis/datasource/jndi/JndiDataSourceFactoryTest.java @@ -51,6 +51,7 @@ void shouldRetrieveDataSourceFromJNDI() { createJndiDataSource(); JndiDataSourceFactory factory = new JndiDataSourceFactory(); factory.setProperties(new Properties() { + private static final long serialVersionUID = 1L; { setProperty(JndiDataSourceFactory.ENV_PREFIX + Context.INITIAL_CONTEXT_FACTORY, TEST_INITIAL_CONTEXT_FACTORY); setProperty(JndiDataSourceFactory.INITIAL_CONTEXT, TEST_INITIAL_CONTEXT); diff --git a/src/test/java/org/apache/ibatis/domain/blog/Author.java b/src/test/java/org/apache/ibatis/domain/blog/Author.java index 8c4574d5304..5202ff8a86b 100644 --- a/src/test/java/org/apache/ibatis/domain/blog/Author.java +++ b/src/test/java/org/apache/ibatis/domain/blog/Author.java @@ -19,6 +19,7 @@ public class Author implements Serializable { + private static final long serialVersionUID = 1L; protected int id; protected String username; protected String password; diff --git a/src/test/java/org/apache/ibatis/domain/blog/ComplexImmutableAuthor.java b/src/test/java/org/apache/ibatis/domain/blog/ComplexImmutableAuthor.java index 206d71bbd0c..3b29c80bf55 100644 --- a/src/test/java/org/apache/ibatis/domain/blog/ComplexImmutableAuthor.java +++ b/src/test/java/org/apache/ibatis/domain/blog/ComplexImmutableAuthor.java @@ -18,6 +18,7 @@ import java.io.Serializable; public class ComplexImmutableAuthor implements Serializable { + private static final long serialVersionUID = 1L; private final ComplexImmutableAuthorId theComplexImmutableAuthorId; protected final String bio; protected final Section favouriteSection; diff --git a/src/test/java/org/apache/ibatis/domain/blog/ImmutableAuthor.java b/src/test/java/org/apache/ibatis/domain/blog/ImmutableAuthor.java index a404ba12621..b9487a87902 100644 --- a/src/test/java/org/apache/ibatis/domain/blog/ImmutableAuthor.java +++ b/src/test/java/org/apache/ibatis/domain/blog/ImmutableAuthor.java @@ -18,6 +18,7 @@ import java.io.Serializable; public class ImmutableAuthor implements Serializable { + private static final long serialVersionUID = 1L; protected final int id; protected final String username; protected final String password; diff --git a/src/test/java/org/apache/ibatis/domain/misc/RichType.java b/src/test/java/org/apache/ibatis/domain/misc/RichType.java index 7e4159ca598..10a6fceb7f6 100644 --- a/src/test/java/org/apache/ibatis/domain/misc/RichType.java +++ b/src/test/java/org/apache/ibatis/domain/misc/RichType.java @@ -31,6 +31,7 @@ public class RichType { private Map richMap = new HashMap<>(); private List richList = new ArrayList<>() { + private static final long serialVersionUID = 1L; { add("bar"); } diff --git a/src/test/java/org/apache/ibatis/executor/BaseExecutorTest.java b/src/test/java/org/apache/ibatis/executor/BaseExecutorTest.java index 2d7975d76ee..4252ed0b4d3 100644 --- a/src/test/java/org/apache/ibatis/executor/BaseExecutorTest.java +++ b/src/test/java/org/apache/ibatis/executor/BaseExecutorTest.java @@ -294,6 +294,7 @@ void shouldSelectTwoSetsOfAuthorsViaProc() throws Exception { try { MappedStatement selectStatement = ExecutorTestHelper.prepareSelectTwoSetsOfAuthorsProc(config); List> authorSets = executor.query(selectStatement, new HashMap() { + private static final long serialVersionUID = 1L; { put("id1", 101); put("id2", 102); diff --git a/src/test/java/org/apache/ibatis/executor/ExecutorTestHelper.java b/src/test/java/org/apache/ibatis/executor/ExecutorTestHelper.java index a29f894467c..eaab5800ab5 100644 --- a/src/test/java/org/apache/ibatis/executor/ExecutorTestHelper.java +++ b/src/test/java/org/apache/ibatis/executor/ExecutorTestHelper.java @@ -70,6 +70,7 @@ static MappedStatement prepareInsertAuthorMappedStatement(final Configuration co "INSERT INTO author (id,username,password,email,bio,favourite_section) values(?,?,?,?,?,?)"), SqlCommandType.INSERT).parameterMap( new ParameterMap.Builder(config, "defaultParameterMap", Author.class, new ArrayList() { + private static final long serialVersionUID = 1L; { add(new ParameterMapping.Builder(config, "id", registry.getTypeHandler(int.class)).build()); add(new ParameterMapping.Builder(config, "username", registry.getTypeHandler(String.class)).build()); @@ -90,6 +91,7 @@ static MappedStatement prepareInsertAuthorMappedStatementWithAutoKey(final Confi "INSERT INTO author (username,password,email,bio,favourite_section) values(?,?,?,?,?)"), SqlCommandType.INSERT).parameterMap( new ParameterMap.Builder(config, "defaultParameterMap", Author.class, new ArrayList() { + private static final long serialVersionUID = 1L; { add(new ParameterMapping.Builder(config, "username", registry.getTypeHandler(String.class)).build()); add(new ParameterMapping.Builder(config, "password", registry.getTypeHandler(String.class)).build()); @@ -107,6 +109,7 @@ static MappedStatement prepareInsertAuthorProc(final Configuration config) { return new MappedStatement.Builder(config, "insertAuthorProc", new StaticSqlSource(config, "{call insertAuthor(?,?,?,?)}"), SqlCommandType.INSERT).parameterMap( new ParameterMap.Builder(config, "defaultParameterMap", Author.class, new ArrayList() { + private static final long serialVersionUID = 1L; { add(new ParameterMapping.Builder(config, "id", registry.getTypeHandler(int.class)).build()); add(new ParameterMapping.Builder(config, "username", registry.getTypeHandler(String.class)).build()); @@ -122,6 +125,7 @@ static MappedStatement prepareUpdateAuthorMappedStatement(final Configuration co new StaticSqlSource(config, "UPDATE author SET username = ?, password = ?, email = ?, bio = ? WHERE id = ?"), SqlCommandType.UPDATE).parameterMap( new ParameterMap.Builder(config, "defaultParameterMap", Author.class, new ArrayList() { + private static final long serialVersionUID = 1L; { add(new ParameterMapping.Builder(config, "username", registry.getTypeHandler(String.class)).build()); add(new ParameterMapping.Builder(config, "password", registry.getTypeHandler(String.class)).build()); @@ -138,6 +142,7 @@ static MappedStatement prepareDeleteAuthorMappedStatement(final Configuration co return new MappedStatement.Builder(config, "deleteAuthor", new StaticSqlSource(config, "DELETE FROM author WHERE id = ?"), SqlCommandType.DELETE).parameterMap( new ParameterMap.Builder(config, "defaultParameterMap", Author.class, new ArrayList() { + private static final long serialVersionUID = 1L; { add(new ParameterMapping.Builder(config, "id", registry.getTypeHandler(int.class)).build()); } @@ -149,6 +154,7 @@ static MappedStatement prepareSelectOneAuthorMappedStatement(final Configuration final ResultMap rm = new ResultMap.Builder(config, "defaultResultMap", Author.class, new ArrayList() { + private static final long serialVersionUID = 1L; { add(new ResultMapping.Builder(config, "id", "id", registry.getTypeHandler(int.class)).build()); add(new ResultMapping.Builder(config, "username", "username", registry.getTypeHandler(String.class)) @@ -165,10 +171,12 @@ static MappedStatement prepareSelectOneAuthorMappedStatement(final Configuration return new MappedStatement.Builder(config, "selectAuthor", new StaticSqlSource(config, "SELECT * FROM author WHERE id = ?"), SqlCommandType.SELECT).parameterMap( new ParameterMap.Builder(config, "defaultParameterMap", Author.class, new ArrayList() { + private static final long serialVersionUID = 1L; { add(new ParameterMapping.Builder(config, "id", registry.getTypeHandler(int.class)).build()); } }).build()).resultMaps(new ArrayList() { + private static final long serialVersionUID = 1L; { add(rm); } @@ -180,8 +188,10 @@ static MappedStatement prepareSelectAllAuthorsAutoMappedStatement(final Configur return new MappedStatement.Builder(config, "selectAuthorAutoMap", new StaticSqlSource(config, "SELECT * FROM author ORDER BY id"), SqlCommandType.SELECT) .resultMaps(new ArrayList() { + private static final long serialVersionUID = 1L; { add(new ResultMap.Builder(config, "defaultResultMap", Author.class, new ArrayList() { + private static final long serialVersionUID = 1L; { add(new ResultMapping.Builder(config, "favouriteSection", "favourite_section", registry.getTypeHandler(Section.class)).build()); @@ -197,15 +207,19 @@ static MappedStatement prepareSelectOneAuthorMappedStatementWithConstructorResul return new MappedStatement.Builder(config, "selectAuthor", new StaticSqlSource(config, "SELECT * FROM author WHERE id = ?"), SqlCommandType.SELECT).parameterMap( new ParameterMap.Builder(config, "defaultParameterMap", Author.class, new ArrayList() { + private static final long serialVersionUID = 1L; { add(new ParameterMapping.Builder(config, "id", registry.getTypeHandler(int.class)).build()); } }).build()).resultMaps(new ArrayList() { + private static final long serialVersionUID = 1L; { add(new ResultMap.Builder(config, "defaultResultMap", Author.class, new ArrayList() { + private static final long serialVersionUID = 1L; { add(new ResultMapping.Builder(config, null, "id", registry.getTypeHandler(Integer.class)) .javaType(int.class).flags(new ArrayList() { + private static final long serialVersionUID = 1L; { add(ResultFlag.CONSTRUCTOR); } @@ -231,15 +245,18 @@ static MappedStatement prepareSelectTwoSetsOfAuthorsProc(final Configuration con new StaticSqlSource(config, "{call selectTwoSetsOfAuthors(?,?)}"), SqlCommandType.SELECT) .statementType(StatementType.CALLABLE).parameterMap(new ParameterMap.Builder(config, "defaultParameterMap", Author.class, new ArrayList() { + private static final long serialVersionUID = 1L; { add(new ParameterMapping.Builder(config, "id1", registry.getTypeHandler(int.class)).build()); add(new ParameterMapping.Builder(config, "id2", registry.getTypeHandler(int.class)).build()); } }).build()) .resultMaps(new ArrayList() { + private static final long serialVersionUID = 1L; { ResultMap map = new ResultMap.Builder(config, "defaultResultMap", Author.class, new ArrayList() { + private static final long serialVersionUID = 1L; { add(new ResultMapping.Builder(config, "id", "id", registry.getTypeHandler(int.class)).build()); add(new ResultMapping.Builder(config, "username", "username", @@ -264,6 +281,7 @@ static MappedStatement prepareSelectAuthorViaOutParams(final Configuration confi new StaticSqlSource(config, "{call selectAuthorViaOutParams(?,?,?,?,?)}"), SqlCommandType.SELECT) .statementType(StatementType.CALLABLE).parameterMap(new ParameterMap.Builder(config, "defaultParameterMap", Author.class, new ArrayList() { + private static final long serialVersionUID = 1L; { add(new ParameterMapping.Builder(config, "id", registry.getTypeHandler(int.class)).build()); add(new ParameterMapping.Builder(config, "username", registry.getTypeHandler(String.class)) @@ -283,6 +301,7 @@ static MappedStatement prepareSelectDiscriminatedPost(final Configuration config final TypeHandlerRegistry registry = config.getTypeHandlerRegistry(); final ResultMap discriminatorResultMap = new ResultMap.Builder(config, "postResultMap", HashMap.class, new ArrayList() { + private static final long serialVersionUID = 1L; { add(new ResultMapping.Builder(config, "subject", "subject", registry.getTypeHandler(String.class)).build()); add(new ResultMapping.Builder(config, "body", "body", registry.getTypeHandler(String.class)).build()); @@ -291,8 +310,10 @@ static MappedStatement prepareSelectDiscriminatedPost(final Configuration config config.addResultMap(discriminatorResultMap); return new MappedStatement.Builder(config, "selectPosts", new StaticSqlSource(config, "SELECT * FROM post"), SqlCommandType.SELECT).resultMaps(new ArrayList() { + private static final long serialVersionUID = 1L; { add(new ResultMap.Builder(config, "defaultResultMap", HashMap.class, new ArrayList() { + private static final long serialVersionUID = 1L; { add(new ResultMapping.Builder(config, "id", "id", registry.getTypeHandler(int.class)).build()); add(new ResultMapping.Builder(config, "blog_id", "blog_id", registry.getTypeHandler(int.class)) @@ -301,6 +322,7 @@ static MappedStatement prepareSelectDiscriminatedPost(final Configuration config }).discriminator(new Discriminator.Builder(config, new ResultMapping.Builder(config, "section", "section", registry.getTypeHandler(String.class)).build(), new HashMap() { + private static final long serialVersionUID = 1L; { put("NEWS", discriminatorResultMap.getId()); put("VIDEOS", discriminatorResultMap.getId()); @@ -331,8 +353,10 @@ static MappedStatement createSelectAuthorWithIDof99MappedStatement(final Configu .parameterMap( new ParameterMap.Builder(config, "defaultParameterMap", Author.class, new ArrayList<>()).build()) .resultMaps(new ArrayList() { + private static final long serialVersionUID = 1L; { add(new ResultMap.Builder(config, "defaultResultMap", Author.class, new ArrayList() { + private static final long serialVersionUID = 1L; { add(new ResultMapping.Builder(config, "id", "id", registry.getTypeHandler(int.class)).build()); add(new ResultMapping.Builder(config, "username", "username", registry.getTypeHandler(String.class)) @@ -355,15 +379,18 @@ static MappedStatement prepareComplexSelectBlogMappedStatement(final Configurati + " INNER JOIN author a ON b.author_id = a.id" + " WHERE b.id = ?"); final ParameterMap parameterMap = new ParameterMap.Builder(config, "defaultParameterMap", int.class, new ArrayList() { + private static final long serialVersionUID = 1L; { add(new ParameterMapping.Builder(config, "id", registry.getTypeHandler(int.class)).build()); } }).build(); final ResultMap resultMap = new ResultMap.Builder(config, "defaultResultMap", Blog.class, new ArrayList() { + private static final long serialVersionUID = 1L; { add(new ResultMapping.Builder(config, "id", "id", registry.getTypeHandler(int.class)) .flags(new ArrayList() { + private static final long serialVersionUID = 1L; { add(ResultFlag.ID); } @@ -385,6 +412,7 @@ static MappedStatement prepareComplexSelectBlogMappedStatement(final Configurati return new MappedStatement.Builder(config, "selectBlogById", sqlSource, SqlCommandType.SELECT) .parameterMap(parameterMap).resultMaps(new ArrayList() { + private static final long serialVersionUID = 1L; { add(resultMap); } @@ -398,6 +426,7 @@ static MappedStatement prepareSelectBlogByIdAndAuthor(final Configuration config + " INNER JOIN author a ON b.author_id = a.id" + " WHERE b.id = ? and a.id = ?"); final ParameterMap parameterMap = new ParameterMap.Builder(config, "defaultParameterMap", Map.class, new ArrayList() { + private static final long serialVersionUID = 1L; { add(new ParameterMapping.Builder(config, "blogId", registry.getTypeHandler(int.class)).build()); add(new ParameterMapping.Builder(config, "authorId", registry.getTypeHandler(int.class)).build()); @@ -405,9 +434,11 @@ static MappedStatement prepareSelectBlogByIdAndAuthor(final Configuration config }).build(); final ResultMap resultMap = new ResultMap.Builder(config, "defaultResultMap", Blog.class, new ArrayList() { + private static final long serialVersionUID = 1L; { add(new ResultMapping.Builder(config, "id", "id", registry.getTypeHandler(int.class)) .flags(new ArrayList() { + private static final long serialVersionUID = 1L; { add(ResultFlag.ID); } @@ -429,6 +460,7 @@ static MappedStatement prepareSelectBlogByIdAndAuthor(final Configuration config return new MappedStatement.Builder(config, "selectBlogByIdAndAuthor", sqlSource, SqlCommandType.SELECT) .parameterMap(parameterMap).resultMaps(new ArrayList() { + private static final long serialVersionUID = 1L; { add(resultMap); } @@ -445,15 +477,18 @@ static MappedStatement prepareSelectPostsForBlogMappedStatement(final Configurat + " LEFT OUTER JOIN comment c ON c.post_id = p.id" + " WHERE p.blog_id = ?"); final ParameterMap parameterMap = new ParameterMap.Builder(config, "defaultParameterMap", Author.class, new ArrayList() { + private static final long serialVersionUID = 1L; { add(new ParameterMapping.Builder(config, "id", registry.getTypeHandler(int.class)).build()); } }).build(); final ResultMap tagResultMap = new ResultMap.Builder(config, "tagResultMap", Tag.class, new ArrayList() { + private static final long serialVersionUID = 1L; { add(new ResultMapping.Builder(config, "id", "tag_id", registry.getTypeHandler(int.class)) .flags(new ArrayList() { + private static final long serialVersionUID = 1L; { add(ResultFlag.ID); } @@ -463,9 +498,11 @@ static MappedStatement prepareSelectPostsForBlogMappedStatement(final Configurat }).build(); final ResultMap commentResultMap = new ResultMap.Builder(config, "commentResultMap", Comment.class, new ArrayList() { + private static final long serialVersionUID = 1L; { add(new ResultMapping.Builder(config, "id", "comment_id", registry.getTypeHandler(int.class)) .flags(new ArrayList() { + private static final long serialVersionUID = 1L; { add(ResultFlag.ID); } @@ -479,9 +516,11 @@ static MappedStatement prepareSelectPostsForBlogMappedStatement(final Configurat config.addResultMap(commentResultMap); final ResultMap postResultMap = new ResultMap.Builder(config, "defaultResultMap", Post.class, new ArrayList() { + private static final long serialVersionUID = 1L; { add(new ResultMapping.Builder(config, "id", "id", registry.getTypeHandler(int.class)) .flags(new ArrayList() { + private static final long serialVersionUID = 1L; { add(ResultFlag.ID); } @@ -500,6 +539,7 @@ static MappedStatement prepareSelectPostsForBlogMappedStatement(final Configurat }).build(); return new MappedStatement.Builder(config, "selectPostsForBlog", sqlSource, SqlCommandType.SELECT) .parameterMap(parameterMap).resultMaps(new ArrayList() { + private static final long serialVersionUID = 1L; { add(postResultMap); } @@ -515,15 +555,18 @@ static MappedStatement prepareSelectPostMappedStatement(final Configuration conf + " LEFT OUTER JOIN comment c ON c.post_id = p.id" + " WHERE p.id = ?"); final ParameterMap parameterMap = new ParameterMap.Builder(config, "defaultParameterMap", Author.class, new ArrayList() { + private static final long serialVersionUID = 1L; { add(new ParameterMapping.Builder(config, "id", registry.getTypeHandler(int.class)).build()); } }).build(); final ResultMap tagResultMap = new ResultMap.Builder(config, "tagResultMap", Tag.class, new ArrayList() { + private static final long serialVersionUID = 1L; { add(new ResultMapping.Builder(config, "id", "tag_id", registry.getTypeHandler(int.class)) .flags(new ArrayList() { + private static final long serialVersionUID = 1L; { add(ResultFlag.ID); } @@ -533,9 +576,11 @@ static MappedStatement prepareSelectPostMappedStatement(final Configuration conf }).build(); final ResultMap commentResultMap = new ResultMap.Builder(config, "commentResultMap", Comment.class, new ArrayList() { + private static final long serialVersionUID = 1L; { add(new ResultMapping.Builder(config, "id", "comment_id", registry.getTypeHandler(int.class)) .flags(new ArrayList() { + private static final long serialVersionUID = 1L; { add(ResultFlag.ID); } @@ -548,9 +593,11 @@ static MappedStatement prepareSelectPostMappedStatement(final Configuration conf config.addResultMap(tagResultMap); config.addResultMap(commentResultMap); final ResultMap postResultMap = new ResultMap.Builder(config, "", Post.class, new ArrayList() { + private static final long serialVersionUID = 1L; { add(new ResultMapping.Builder(config, "id", "id", registry.getTypeHandler(int.class)) .flags(new ArrayList() { + private static final long serialVersionUID = 1L; { add(ResultFlag.ID); } @@ -568,6 +615,7 @@ static MappedStatement prepareSelectPostMappedStatement(final Configuration conf return new MappedStatement.Builder(config, "selectPostsForBlog", sqlSource, SqlCommandType.SELECT) .parameterMap(parameterMap).resultMaps(new ArrayList() { + private static final long serialVersionUID = 1L; { add(postResultMap); } @@ -583,15 +631,18 @@ static MappedStatement prepareSelectPostWithBlogByAuthorMappedStatement(final Co + " LEFT OUTER JOIN comment c ON c.post_id = p.id" + " WHERE p.id = ?"); final ParameterMap parameterMap = new ParameterMap.Builder(config, "defaultParameterMap", Author.class, new ArrayList() { + private static final long serialVersionUID = 1L; { add(new ParameterMapping.Builder(config, "id", registry.getTypeHandler(int.class)).build()); } }).build(); final ResultMap tagResultMap = new ResultMap.Builder(config, "tagResultMap", Tag.class, new ArrayList() { + private static final long serialVersionUID = 1L; { add(new ResultMapping.Builder(config, "id", "tag_id", registry.getTypeHandler(int.class)) .flags(new ArrayList() { + private static final long serialVersionUID = 1L; { add(ResultFlag.ID); } @@ -601,9 +652,11 @@ static MappedStatement prepareSelectPostWithBlogByAuthorMappedStatement(final Co }).build(); final ResultMap commentResultMap = new ResultMap.Builder(config, "commentResultMap", Comment.class, new ArrayList() { + private static final long serialVersionUID = 1L; { add(new ResultMapping.Builder(config, "id", "comment_id", registry.getTypeHandler(int.class)) .flags(new ArrayList() { + private static final long serialVersionUID = 1L; { add(ResultFlag.ID); } @@ -617,9 +670,11 @@ static MappedStatement prepareSelectPostWithBlogByAuthorMappedStatement(final Co config.addResultMap(commentResultMap); final ResultMap postResultMap = new ResultMap.Builder(config, "postResultMap", Post.class, new ArrayList() { + private static final long serialVersionUID = 1L; { add(new ResultMapping.Builder(config, "id", "id", registry.getTypeHandler(int.class)) .flags(new ArrayList() { + private static final long serialVersionUID = 1L; { add(ResultFlag.ID); } @@ -627,6 +682,7 @@ static MappedStatement prepareSelectPostWithBlogByAuthorMappedStatement(final Co add(new ResultMapping.Builder(config, "blog").nestedQueryId("selectBlogByIdAndAuthor") .composites(new ArrayList() { + private static final long serialVersionUID = 1L; { add(new ResultMapping.Builder(config, "authorId", "author_id", registry.getTypeHandler(int.class)) .build()); @@ -647,6 +703,7 @@ static MappedStatement prepareSelectPostWithBlogByAuthorMappedStatement(final Co return new MappedStatement.Builder(config, "selectPostsForBlog", sqlSource, SqlCommandType.SELECT) .parameterMap(parameterMap).resultMaps(new ArrayList() { + private static final long serialVersionUID = 1L; { add(postResultMap); } @@ -660,6 +717,7 @@ static MappedStatement prepareInsertAuthorMappedStatementWithBeforeAutoKey(final MappedStatement kms = new MappedStatement.Builder(config, "insertAuthor!selectKey", new StaticSqlSource(config, "SELECT 123456 as id FROM SYSIBM.SYSDUMMY1"), SqlCommandType.SELECT) .keyProperty("id").resultMaps(new ArrayList() { + private static final long serialVersionUID = 1L; { add(rm); } @@ -669,6 +727,7 @@ static MappedStatement prepareInsertAuthorMappedStatementWithBeforeAutoKey(final "INSERT INTO author (id,username,password,email,bio,favourite_section) values(#{id},#{username},#{password},#{email},#{bio:VARCHAR},#{favouriteSection})")), SqlCommandType.INSERT).parameterMap( new ParameterMap.Builder(config, "defaultParameterMap", Author.class, new ArrayList() { + private static final long serialVersionUID = 1L; { add(new ParameterMapping.Builder(config, "id", registry.getTypeHandler(Integer.class)).build()); add(new ParameterMapping.Builder(config, "username", registry.getTypeHandler(String.class)).build()); diff --git a/src/test/java/org/apache/ibatis/executor/resultset/DefaultResultSetHandlerTest.java b/src/test/java/org/apache/ibatis/executor/resultset/DefaultResultSetHandlerTest.java index 6042d7598e2..eaab2ec7536 100644 --- a/src/test/java/org/apache/ibatis/executor/resultset/DefaultResultSetHandlerTest.java +++ b/src/test/java/org/apache/ibatis/executor/resultset/DefaultResultSetHandlerTest.java @@ -135,8 +135,10 @@ MappedStatement getMappedStatement() { final TypeHandlerRegistry registry = config.getTypeHandlerRegistry(); return new MappedStatement.Builder(config, "testSelect", new StaticSqlSource(config, "some select statement"), SqlCommandType.SELECT).resultMaps(new ArrayList() { + private static final long serialVersionUID = 1L; { add(new ResultMap.Builder(config, "testMap", HashMap.class, new ArrayList() { + private static final long serialVersionUID = 1L; { add(new ResultMapping.Builder(config, "cOlUmN1", "CoLuMn1", registry.getTypeHandler(Integer.class)) .build()); diff --git a/src/test/java/org/apache/ibatis/executor/resultset/DefaultResultSetHandlerTest2.java b/src/test/java/org/apache/ibatis/executor/resultset/DefaultResultSetHandlerTest2.java index e0ec8534325..0f3baa918a0 100644 --- a/src/test/java/org/apache/ibatis/executor/resultset/DefaultResultSetHandlerTest2.java +++ b/src/test/java/org/apache/ibatis/executor/resultset/DefaultResultSetHandlerTest2.java @@ -62,7 +62,6 @@ class DefaultResultSetHandlerTest2 { @Mock private DatabaseMetaData dbmd; - @SuppressWarnings("serial") @Test void shouldNotCallNextOnClosedResultSet_SimpleResult() throws Exception { final Configuration config = new Configuration(); @@ -70,8 +69,10 @@ void shouldNotCallNextOnClosedResultSet_SimpleResult() throws Exception { final MappedStatement ms = new MappedStatement.Builder(config, "testSelect", new StaticSqlSource(config, "some select statement"), SqlCommandType.SELECT) .resultMaps(new ArrayList() { + private static final long serialVersionUID = 1L; { add(new ResultMap.Builder(config, "testMap", HashMap.class, new ArrayList() { + private static final long serialVersionUID = 1L; { add(new ResultMapping.Builder(config, "id", "id", registry.getTypeHandler(Integer.class)).build()); } @@ -100,13 +101,13 @@ void shouldNotCallNextOnClosedResultSet_SimpleResult() throws Exception { assertEquals(0, results.size()); } - @SuppressWarnings("serial") @Test void shouldNotCallNextOnClosedResultSet_NestedResult() throws Exception { final Configuration config = new Configuration(); final TypeHandlerRegistry registry = config.getTypeHandlerRegistry(); final ResultMap nestedResultMap = new ResultMap.Builder(config, "roleMap", HashMap.class, new ArrayList() { + private static final long serialVersionUID = 1L; { add(new ResultMapping.Builder(config, "role", "role", registry.getTypeHandler(String.class)).build()); } @@ -114,8 +115,10 @@ void shouldNotCallNextOnClosedResultSet_NestedResult() throws Exception { config.addResultMap(nestedResultMap); final MappedStatement ms = new MappedStatement.Builder(config, "selectPerson", new StaticSqlSource(config, "select person..."), SqlCommandType.SELECT).resultMaps(new ArrayList() { + private static final long serialVersionUID = 1L; { add(new ResultMap.Builder(config, "personMap", HashMap.class, new ArrayList() { + private static final long serialVersionUID = 1L; { add(new ResultMapping.Builder(config, "id", "id", registry.getTypeHandler(Integer.class)).build()); add(new ResultMapping.Builder(config, "roles").nestedResultMapId("roleMap").build()); diff --git a/src/test/java/org/apache/ibatis/jdbc/PooledDataSourceTest.java b/src/test/java/org/apache/ibatis/jdbc/PooledDataSourceTest.java index 729db5f89a8..16d1d6a596c 100644 --- a/src/test/java/org/apache/ibatis/jdbc/PooledDataSourceTest.java +++ b/src/test/java/org/apache/ibatis/jdbc/PooledDataSourceTest.java @@ -37,6 +37,7 @@ void shouldProperlyMaintainPoolOf3ActiveAnd2IdleConnections() throws Exception { runScript(ds, JPETSTORE_DDL); ds.setDefaultAutoCommit(false); ds.setDriverProperties(new Properties() { + private static final long serialVersionUID = 1L; { setProperty("username", "sa"); setProperty("password", ""); diff --git a/src/test/java/org/apache/ibatis/parsing/GenericTokenParserTest.java b/src/test/java/org/apache/ibatis/parsing/GenericTokenParserTest.java index 01ea6941fb1..7444dc5b34d 100644 --- a/src/test/java/org/apache/ibatis/parsing/GenericTokenParserTest.java +++ b/src/test/java/org/apache/ibatis/parsing/GenericTokenParserTest.java @@ -50,6 +50,8 @@ public String handleToken(String content) { void shouldDemonstrateGenericTokenReplacement(String expected, String text) { GenericTokenParser parser = new GenericTokenParser("${", "}", new VariableTokenHandler(new HashMap() { + private static final long serialVersionUID = 1L; + { put("first_name", "James"); put("initial", "T"); @@ -103,6 +105,8 @@ void shouldParseFastOnJdk7u6() { // issue #760 GenericTokenParser parser = new GenericTokenParser("${", "}", new VariableTokenHandler(new HashMap() { + private static final long serialVersionUID = 1L; + { put("first_name", "James"); put("initial", "T"); 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 a60f24b6632..9998445ae79 100644 --- a/src/test/java/org/apache/ibatis/scripting/defaults/DefaultParameterHandlerTest.java +++ b/src/test/java/org/apache/ibatis/scripting/defaults/DefaultParameterHandlerTest.java @@ -83,8 +83,12 @@ MappedStatement getMappedStatement() { final TypeHandlerRegistry registry = config.getTypeHandlerRegistry(); return new MappedStatement.Builder(config, "testSelect", new StaticSqlSource(config, "some select statement"), SqlCommandType.SELECT).resultMaps(new ArrayList() { + private static final long serialVersionUID = 1L; + { add(new ResultMap.Builder(config, "testMap", HashMap.class, new ArrayList() { + private static final long serialVersionUID = 1L; + { add(new ResultMapping.Builder(config, "cOlUmN1", "CoLuMn1", registry.getTypeHandler(Integer.class)) .build()); diff --git a/src/test/java/org/apache/ibatis/session/SqlSessionTest.java b/src/test/java/org/apache/ibatis/session/SqlSessionTest.java index d5f77b33e33..bb92cc8aa2d 100644 --- a/src/test/java/org/apache/ibatis/session/SqlSessionTest.java +++ b/src/test/java/org/apache/ibatis/session/SqlSessionTest.java @@ -735,6 +735,7 @@ void shouldFindPostByIDWithDynamicSql() { try (SqlSession session = sqlMapper.openSession()) { List posts = session.selectList("org.apache.ibatis.domain.blog.mappers.PostMapper.findPost", new HashMap() { + private static final long serialVersionUID = 1L; { put("id", 1); } @@ -748,8 +749,10 @@ void shouldFindPostsInSetOfIDsWithDynamicSql() { try (SqlSession session = sqlMapper.openSession()) { List posts = session.selectList("org.apache.ibatis.domain.blog.mappers.PostMapper.findPost", new HashMap>() { + private static final long serialVersionUID = 1L; { put("ids", new ArrayList() { + private static final long serialVersionUID = 1L; { add(1); add(2); @@ -767,6 +770,7 @@ void shouldFindPostsWithBlogIdUsingDynamicSql() { try (SqlSession session = sqlMapper.openSession()) { List posts = session.selectList("org.apache.ibatis.domain.blog.mappers.PostMapper.findPost", new HashMap() { + private static final long serialVersionUID = 1L; { put("blog_id", 1); } @@ -780,6 +784,7 @@ void shouldFindPostsWithAuthorIdUsingDynamicSql() { try (SqlSession session = sqlMapper.openSession()) { List posts = session.selectList("org.apache.ibatis.domain.blog.mappers.PostMapper.findPost", new HashMap() { + private static final long serialVersionUID = 1L; { put("author_id", 101); } @@ -793,8 +798,10 @@ void shouldFindPostsWithAuthorAndBlogIdUsingDynamicSql() { try (SqlSession session = sqlMapper.openSession()) { List posts = session.selectList("org.apache.ibatis.domain.blog.mappers.PostMapper.findPost", new HashMap() { + private static final long serialVersionUID = 1L; { put("ids", new ArrayList() { + private static final long serialVersionUID = 1L; { add(1); add(2); @@ -813,6 +820,7 @@ void shouldFindPostsInList() { try (SqlSession session = sqlMapper.openSession()) { List posts = session.selectList("org.apache.ibatis.domain.blog.mappers.PostMapper.selectPostIn", new ArrayList() { + private static final long serialVersionUID = 1L; { add(1); add(3); @@ -828,6 +836,7 @@ void shouldFindOddPostsInList() { try (SqlSession session = sqlMapper.openSession()) { List posts = session.selectList("org.apache.ibatis.domain.blog.mappers.PostMapper.selectOddPostsIn", new ArrayList() { + private static final long serialVersionUID = 1L; { add(0); add(1); @@ -848,8 +857,10 @@ void shouldSelectOddPostsInKeysList() { try (SqlSession session = sqlMapper.openSession()) { List posts = session.selectList("org.apache.ibatis.domain.blog.mappers.PostMapper.selectOddPostsInKeysList", new HashMap>() { + private static final long serialVersionUID = 1L; { put("keys", new ArrayList() { + private static final long serialVersionUID = 1L; { add(0); add(1); diff --git a/src/test/java/org/apache/ibatis/submitted/blocking_cache/Person.java b/src/test/java/org/apache/ibatis/submitted/blocking_cache/Person.java index 4554128ad48..92d7426b560 100644 --- a/src/test/java/org/apache/ibatis/submitted/blocking_cache/Person.java +++ b/src/test/java/org/apache/ibatis/submitted/blocking_cache/Person.java @@ -19,6 +19,7 @@ public class Person implements Serializable { + private static final long serialVersionUID = 1L; private int id; private String firstname; private String lastname; diff --git a/src/test/java/org/apache/ibatis/submitted/cache/Person.java b/src/test/java/org/apache/ibatis/submitted/cache/Person.java index 99e0ee8923e..a58e4050239 100644 --- a/src/test/java/org/apache/ibatis/submitted/cache/Person.java +++ b/src/test/java/org/apache/ibatis/submitted/cache/Person.java @@ -19,6 +19,7 @@ public class Person implements Serializable { + private static final long serialVersionUID = 1L; private int id; private String firstname; private String lastname; diff --git a/src/test/java/org/apache/ibatis/submitted/disallowdotsonnames/Person.java b/src/test/java/org/apache/ibatis/submitted/disallowdotsonnames/Person.java index 10135f2e8b0..27950905953 100644 --- a/src/test/java/org/apache/ibatis/submitted/disallowdotsonnames/Person.java +++ b/src/test/java/org/apache/ibatis/submitted/disallowdotsonnames/Person.java @@ -18,6 +18,8 @@ import java.io.Serializable; public class Person implements Serializable { + + private static final long serialVersionUID = 1L; private Integer id; private String firstName; private String lastName; diff --git a/src/test/java/org/apache/ibatis/submitted/force_flush_on_select/Person.java b/src/test/java/org/apache/ibatis/submitted/force_flush_on_select/Person.java index 719a4152fb9..97132766faf 100644 --- a/src/test/java/org/apache/ibatis/submitted/force_flush_on_select/Person.java +++ b/src/test/java/org/apache/ibatis/submitted/force_flush_on_select/Person.java @@ -18,6 +18,8 @@ import java.io.Serializable; public class Person implements Serializable { + + private static final long serialVersionUID = 1L; private Integer id; private String firstName; private String lastName; diff --git a/src/test/java/org/apache/ibatis/submitted/null_associations/Bar.java b/src/test/java/org/apache/ibatis/submitted/null_associations/Bar.java index af74a119d13..6e254a178a7 100644 --- a/src/test/java/org/apache/ibatis/submitted/null_associations/Bar.java +++ b/src/test/java/org/apache/ibatis/submitted/null_associations/Bar.java @@ -19,6 +19,7 @@ public class Bar implements Serializable { + private static final long serialVersionUID = 1L; private long field1; private long field2; private long field3; diff --git a/src/test/java/org/apache/ibatis/submitted/null_associations/Foo.java b/src/test/java/org/apache/ibatis/submitted/null_associations/Foo.java index e73b4bed412..851f4fc510b 100644 --- a/src/test/java/org/apache/ibatis/submitted/null_associations/Foo.java +++ b/src/test/java/org/apache/ibatis/submitted/null_associations/Foo.java @@ -19,6 +19,7 @@ public class Foo implements Serializable { + private static final long serialVersionUID = 1L; private long field1; private Bar field2; private boolean field3; diff --git a/src/test/java/org/apache/ibatis/submitted/order_prefix_removed/Person.java b/src/test/java/org/apache/ibatis/submitted/order_prefix_removed/Person.java index 583932e7cae..a9168e0f7c7 100644 --- a/src/test/java/org/apache/ibatis/submitted/order_prefix_removed/Person.java +++ b/src/test/java/org/apache/ibatis/submitted/order_prefix_removed/Person.java @@ -18,6 +18,8 @@ import java.io.Serializable; public class Person implements Serializable { + + private static final long serialVersionUID = 1L; private Integer id; private String firstName; private String lastName; diff --git a/src/test/java/org/apache/ibatis/submitted/overwritingproperties/Bar.java b/src/test/java/org/apache/ibatis/submitted/overwritingproperties/Bar.java index 10b6a66a3db..ba0657a3e28 100644 --- a/src/test/java/org/apache/ibatis/submitted/overwritingproperties/Bar.java +++ b/src/test/java/org/apache/ibatis/submitted/overwritingproperties/Bar.java @@ -19,6 +19,7 @@ public class Bar implements Serializable { + private static final long serialVersionUID = 1L; private Long field1; public Bar() { diff --git a/src/test/java/org/apache/ibatis/submitted/overwritingproperties/Foo.java b/src/test/java/org/apache/ibatis/submitted/overwritingproperties/Foo.java index 093d91f5c09..8cc1a0088b7 100644 --- a/src/test/java/org/apache/ibatis/submitted/overwritingproperties/Foo.java +++ b/src/test/java/org/apache/ibatis/submitted/overwritingproperties/Foo.java @@ -19,6 +19,7 @@ public class Foo implements Serializable { + private static final long serialVersionUID = 1L; private Long field1; private Bar field2; private Integer field3; diff --git a/src/test/java/org/apache/ibatis/submitted/xml_external_ref/Dog.java b/src/test/java/org/apache/ibatis/submitted/xml_external_ref/Dog.java index b2b2993972c..cdb85ef7490 100644 --- a/src/test/java/org/apache/ibatis/submitted/xml_external_ref/Dog.java +++ b/src/test/java/org/apache/ibatis/submitted/xml_external_ref/Dog.java @@ -17,4 +17,6 @@ public class Dog extends Pet { + private static final long serialVersionUID = 1L; + } From 5fb0ea61ebb865b22086b583cdf6342574a3678e Mon Sep 17 00:00:00 2001 From: Jeremy Landis Date: Mon, 20 Feb 2023 17:40:30 -0500 Subject: [PATCH 03/11] [ci] Use mockito argument matchers instead of deprecated logic --- src/test/java/org/apache/ibatis/type/BlobTypeHandlerTest.java | 4 ++-- src/test/java/org/apache/ibatis/type/ClobTypeHandlerTest.java | 4 ++-- .../java/org/apache/ibatis/type/NClobTypeHandlerTest.java | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/test/java/org/apache/ibatis/type/BlobTypeHandlerTest.java b/src/test/java/org/apache/ibatis/type/BlobTypeHandlerTest.java index 716ec13587a..5dfe2a76f66 100644 --- a/src/test/java/org/apache/ibatis/type/BlobTypeHandlerTest.java +++ b/src/test/java/org/apache/ibatis/type/BlobTypeHandlerTest.java @@ -24,8 +24,8 @@ import java.sql.Blob; import org.junit.jupiter.api.Test; +import org.mockito.ArgumentMatchers; import org.mockito.Mock; -import org.mockito.Mockito; class BlobTypeHandlerTest extends BaseTypeHandlerTest { @@ -38,7 +38,7 @@ class BlobTypeHandlerTest extends BaseTypeHandlerTest { @Test public void shouldSetParameter() throws Exception { TYPE_HANDLER.setParameter(ps, 1, new byte[] { 1, 2, 3 }, null); - verify(ps).setBinaryStream(Mockito.eq(1), Mockito.any(InputStream.class), Mockito.eq(3)); + verify(ps).setBinaryStream(ArgumentMatchers.eq(1), ArgumentMatchers.any(InputStream.class), ArgumentMatchers.eq(3)); } @Override diff --git a/src/test/java/org/apache/ibatis/type/ClobTypeHandlerTest.java b/src/test/java/org/apache/ibatis/type/ClobTypeHandlerTest.java index 477218f0255..c9085b4d58e 100644 --- a/src/test/java/org/apache/ibatis/type/ClobTypeHandlerTest.java +++ b/src/test/java/org/apache/ibatis/type/ClobTypeHandlerTest.java @@ -24,8 +24,8 @@ import java.sql.Clob; import org.junit.jupiter.api.Test; +import org.mockito.ArgumentMatchers; import org.mockito.Mock; -import org.mockito.Mockito; class ClobTypeHandlerTest extends BaseTypeHandlerTest { @@ -38,7 +38,7 @@ class ClobTypeHandlerTest extends BaseTypeHandlerTest { @Test public void shouldSetParameter() throws Exception { TYPE_HANDLER.setParameter(ps, 1, "Hello", null); - verify(ps).setCharacterStream(Mockito.eq(1), Mockito.any(Reader.class), Mockito.eq(5)); + verify(ps).setCharacterStream(ArgumentMatchers.eq(1), ArgumentMatchers.any(Reader.class), ArgumentMatchers.eq(5)); } @Override diff --git a/src/test/java/org/apache/ibatis/type/NClobTypeHandlerTest.java b/src/test/java/org/apache/ibatis/type/NClobTypeHandlerTest.java index eabe363254c..16c25055d4a 100644 --- a/src/test/java/org/apache/ibatis/type/NClobTypeHandlerTest.java +++ b/src/test/java/org/apache/ibatis/type/NClobTypeHandlerTest.java @@ -24,8 +24,8 @@ import java.sql.Clob; import org.junit.jupiter.api.Test; +import org.mockito.ArgumentMatchers; import org.mockito.Mock; -import org.mockito.Mockito; class NClobTypeHandlerTest extends BaseTypeHandlerTest { @@ -38,7 +38,7 @@ class NClobTypeHandlerTest extends BaseTypeHandlerTest { @Test public void shouldSetParameter() throws Exception { TYPE_HANDLER.setParameter(ps, 1, "Hello", null); - verify(ps).setCharacterStream(Mockito.eq(1), Mockito.any(Reader.class), Mockito.eq(5)); + verify(ps).setCharacterStream(ArgumentMatchers.eq(1), ArgumentMatchers.any(Reader.class), ArgumentMatchers.eq(5)); } @Override From f0a7f6ea3469c2e026ef3624cc28d16c680c0dc6 Mon Sep 17 00:00:00 2001 From: Jeremy Landis Date: Mon, 20 Feb 2023 17:49:14 -0500 Subject: [PATCH 04/11] [ci] Use 'L' instead of 'l' for long --- .../java/org/apache/ibatis/type/BlobTypeHandlerTest.java | 6 +++--- .../java/org/apache/ibatis/type/ClobTypeHandlerTest.java | 6 +++--- .../java/org/apache/ibatis/type/NClobTypeHandlerTest.java | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/test/java/org/apache/ibatis/type/BlobTypeHandlerTest.java b/src/test/java/org/apache/ibatis/type/BlobTypeHandlerTest.java index 5dfe2a76f66..21239d85d5a 100644 --- a/src/test/java/org/apache/ibatis/type/BlobTypeHandlerTest.java +++ b/src/test/java/org/apache/ibatis/type/BlobTypeHandlerTest.java @@ -45,7 +45,7 @@ public void shouldSetParameter() throws Exception { @Test public void shouldGetResultFromResultSetByName() throws Exception { when(rs.getBlob("column")).thenReturn(blob); - when(blob.length()).thenReturn(3l); + when(blob.length()).thenReturn(3L); when(blob.getBytes(1, 3)).thenReturn(new byte[] { 1, 2, 3 }); assertArrayEquals(new byte[] { 1, 2, 3 }, TYPE_HANDLER.getResult(rs, "column")); } @@ -61,7 +61,7 @@ public void shouldGetResultNullFromResultSetByName() throws Exception { @Test public void shouldGetResultFromResultSetByPosition() throws Exception { when(rs.getBlob(1)).thenReturn(blob); - when(blob.length()).thenReturn(3l); + when(blob.length()).thenReturn(3L); when(blob.getBytes(1, 3)).thenReturn(new byte[] { 1, 2, 3 }); assertArrayEquals(new byte[] { 1, 2, 3 }, TYPE_HANDLER.getResult(rs, 1)); } @@ -77,7 +77,7 @@ public void shouldGetResultNullFromResultSetByPosition() throws Exception { @Test public void shouldGetResultFromCallableStatement() throws Exception { when(cs.getBlob(1)).thenReturn(blob); - when(blob.length()).thenReturn(3l); + when(blob.length()).thenReturn(3L); when(blob.getBytes(1, 3)).thenReturn(new byte[] { 1, 2, 3 }); assertArrayEquals(new byte[] { 1, 2, 3 }, TYPE_HANDLER.getResult(cs, 1)); } diff --git a/src/test/java/org/apache/ibatis/type/ClobTypeHandlerTest.java b/src/test/java/org/apache/ibatis/type/ClobTypeHandlerTest.java index c9085b4d58e..098ff3062b4 100644 --- a/src/test/java/org/apache/ibatis/type/ClobTypeHandlerTest.java +++ b/src/test/java/org/apache/ibatis/type/ClobTypeHandlerTest.java @@ -45,7 +45,7 @@ public void shouldSetParameter() throws Exception { @Test public void shouldGetResultFromResultSetByName() throws Exception { when(rs.getClob("column")).thenReturn(clob); - when(clob.length()).thenReturn(3l); + when(clob.length()).thenReturn(3L); when(clob.getSubString(1, 3)).thenReturn("Hello"); assertEquals("Hello", TYPE_HANDLER.getResult(rs, "column")); } @@ -61,7 +61,7 @@ public void shouldGetResultNullFromResultSetByName() throws Exception { @Test public void shouldGetResultFromResultSetByPosition() throws Exception { when(rs.getClob(1)).thenReturn(clob); - when(clob.length()).thenReturn(3l); + when(clob.length()).thenReturn(3L); when(clob.getSubString(1, 3)).thenReturn("Hello"); assertEquals("Hello", TYPE_HANDLER.getResult(rs, 1)); } @@ -77,7 +77,7 @@ public void shouldGetResultNullFromResultSetByPosition() throws Exception { @Test public void shouldGetResultFromCallableStatement() throws Exception { when(cs.getClob(1)).thenReturn(clob); - when(clob.length()).thenReturn(3l); + when(clob.length()).thenReturn(3L); when(clob.getSubString(1, 3)).thenReturn("Hello"); assertEquals("Hello", TYPE_HANDLER.getResult(cs, 1)); } diff --git a/src/test/java/org/apache/ibatis/type/NClobTypeHandlerTest.java b/src/test/java/org/apache/ibatis/type/NClobTypeHandlerTest.java index 16c25055d4a..31d5f3c79d3 100644 --- a/src/test/java/org/apache/ibatis/type/NClobTypeHandlerTest.java +++ b/src/test/java/org/apache/ibatis/type/NClobTypeHandlerTest.java @@ -45,7 +45,7 @@ public void shouldSetParameter() throws Exception { @Test public void shouldGetResultFromResultSetByName() throws Exception { when(rs.getClob("column")).thenReturn(clob); - when(clob.length()).thenReturn(3l); + when(clob.length()).thenReturn(3L); when(clob.getSubString(1, 3)).thenReturn("Hello"); assertEquals("Hello", TYPE_HANDLER.getResult(rs, "column")); } From c56b00ed3569c47c404649c15a13045c77a5373f Mon Sep 17 00:00:00 2001 From: Jeremy Landis Date: Mon, 20 Feb 2023 17:52:20 -0500 Subject: [PATCH 05/11] [ci] Remove new of primative as known --- src/test/java/org/apache/ibatis/binding/BindingTest.java | 2 +- src/test/java/org/apache/ibatis/cache/CacheKeyTest.java | 4 ++-- src/test/java/org/apache/ibatis/mapping/BoundSqlTest.java | 2 +- .../java/org/apache/ibatis/submitted/blobtest/BlobTest.java | 4 ++-- .../apache/ibatis/submitted/nested/NestedForEachTest.java | 2 +- .../java/org/apache/ibatis/type/ArrayTypeHandlerTest.java | 6 +++--- .../ibatis/type/BlobByteObjectArrayTypeHandlerTest.java | 6 +++--- .../apache/ibatis/type/ByteObjectArrayTypeHandlerTest.java | 6 +++--- 8 files changed, 16 insertions(+), 16 deletions(-) diff --git a/src/test/java/org/apache/ibatis/binding/BindingTest.java b/src/test/java/org/apache/ibatis/binding/BindingTest.java index 4bbc9c09adb..348ad18bb7f 100644 --- a/src/test/java/org/apache/ibatis/binding/BindingTest.java +++ b/src/test/java/org/apache/ibatis/binding/BindingTest.java @@ -123,7 +123,7 @@ void shouldFindPostsInList() { void shouldFindPostsInArray() { try (SqlSession session = sqlSessionFactory.openSession()) { BoundAuthorMapper mapper = session.getMapper(BoundAuthorMapper.class); - Integer[] params = new Integer[] { 1, 3, 5 }; + Integer[] params = { 1, 3, 5 }; List posts = mapper.findPostsInArray(params); assertEquals(3, posts.size()); session.rollback(); diff --git a/src/test/java/org/apache/ibatis/cache/CacheKeyTest.java b/src/test/java/org/apache/ibatis/cache/CacheKeyTest.java index 1b53cb50bb0..312385f2d7b 100644 --- a/src/test/java/org/apache/ibatis/cache/CacheKeyTest.java +++ b/src/test/java/org/apache/ibatis/cache/CacheKeyTest.java @@ -81,8 +81,8 @@ void shouldDemonstrateEmptyAndNullKeysAreEqual() { @Test void shouldTestCacheKeysWithBinaryArrays() { - byte[] array1 = new byte[] { 1 }; - byte[] array2 = new byte[] { 1 }; + byte[] array1 = { 1 }; + byte[] array2 = { 1 }; CacheKey key1 = new CacheKey(new Object[] { array1 }); CacheKey key2 = new CacheKey(new Object[] { array2 }); assertEquals(key1, key2); diff --git a/src/test/java/org/apache/ibatis/mapping/BoundSqlTest.java b/src/test/java/org/apache/ibatis/mapping/BoundSqlTest.java index 897392245fa..e6e5c8b4c44 100644 --- a/src/test/java/org/apache/ibatis/mapping/BoundSqlTest.java +++ b/src/test/java/org/apache/ibatis/mapping/BoundSqlTest.java @@ -41,7 +41,7 @@ void testHasAdditionalParameter() { bean.id = 1; boundSql.setAdditionalParameter("person", bean); - String[] array = new String[] { "User1", "User2" }; + String[] array = { "User1", "User2" }; boundSql.setAdditionalParameter("array", array); assertFalse(boundSql.hasAdditionalParameter("pet")); diff --git a/src/test/java/org/apache/ibatis/submitted/blobtest/BlobTest.java b/src/test/java/org/apache/ibatis/submitted/blobtest/BlobTest.java index a26762e114a..cdc89dc9f6c 100644 --- a/src/test/java/org/apache/ibatis/submitted/blobtest/BlobTest.java +++ b/src/test/java/org/apache/ibatis/submitted/blobtest/BlobTest.java @@ -50,7 +50,7 @@ void testInsertBlobThenSelectAll() { try (SqlSession sqlSession = sqlSessionFactory.openSession()) { BlobMapper blobMapper = sqlSession.getMapper(BlobMapper.class); - byte[] myblob = new byte[] { 1, 2, 3, 4, 5 }; + byte[] myblob = { 1, 2, 3, 4, 5 }; BlobRecord blobRecord = new BlobRecord(1, myblob); int rows = blobMapper.insert(blobRecord); assertEquals(1, rows); @@ -73,7 +73,7 @@ void testInsertBlobObjectsThenSelectAll() { try (SqlSession sqlSession = sqlSessionFactory.openSession()) { BlobMapper blobMapper = sqlSession.getMapper(BlobMapper.class); - Byte[] myblob = new Byte[] { 1, 2, 3, 4, 5 }; + Byte[] myblob = { 1, 2, 3, 4, 5 }; BlobRecord blobRecord = new BlobRecord(1, myblob); int rows = blobMapper.insert(blobRecord); assertEquals(1, rows); diff --git a/src/test/java/org/apache/ibatis/submitted/nested/NestedForEachTest.java b/src/test/java/org/apache/ibatis/submitted/nested/NestedForEachTest.java index e31e38654b9..5a75f1559b9 100644 --- a/src/test/java/org/apache/ibatis/submitted/nested/NestedForEachTest.java +++ b/src/test/java/org/apache/ibatis/submitted/nested/NestedForEachTest.java @@ -63,7 +63,7 @@ void testSimpleSelect() { void testSimpleSelectWithPrimitives() { try (SqlSession sqlSession = sqlSessionFactory.openSession()) { Map parameter = new HashMap<>(); - int[] array = new int[] { 1, 3, 5 }; + int[] array = { 1, 3, 5 }; parameter.put("ids", array); List> answer = sqlSession diff --git a/src/test/java/org/apache/ibatis/type/ArrayTypeHandlerTest.java b/src/test/java/org/apache/ibatis/type/ArrayTypeHandlerTest.java index bc56dbb3480..aa365d3b059 100644 --- a/src/test/java/org/apache/ibatis/type/ArrayTypeHandlerTest.java +++ b/src/test/java/org/apache/ibatis/type/ArrayTypeHandlerTest.java @@ -75,7 +75,7 @@ public void shouldFailForNonArrayParameter() { @Test public void shouldGetResultFromResultSetByName() throws Exception { when(rs.getArray("column")).thenReturn(mockArray); - String[] stringArray = new String[] { "a", "b" }; + String[] stringArray = { "a", "b" }; when(mockArray.getArray()).thenReturn(stringArray); assertEquals(stringArray, TYPE_HANDLER.getResult(rs, "column")); verify(mockArray).free(); @@ -92,7 +92,7 @@ public void shouldGetResultNullFromResultSetByName() throws Exception { @Test public void shouldGetResultFromResultSetByPosition() throws Exception { when(rs.getArray(1)).thenReturn(mockArray); - String[] stringArray = new String[] { "a", "b" }; + String[] stringArray = { "a", "b" }; when(mockArray.getArray()).thenReturn(stringArray); assertEquals(stringArray, TYPE_HANDLER.getResult(rs, 1)); verify(mockArray).free(); @@ -109,7 +109,7 @@ public void shouldGetResultNullFromResultSetByPosition() throws Exception { @Test public void shouldGetResultFromCallableStatement() throws Exception { when(cs.getArray(1)).thenReturn(mockArray); - String[] stringArray = new String[] { "a", "b" }; + String[] stringArray = { "a", "b" }; when(mockArray.getArray()).thenReturn(stringArray); assertEquals(stringArray, TYPE_HANDLER.getResult(cs, 1)); verify(mockArray).free(); diff --git a/src/test/java/org/apache/ibatis/type/BlobByteObjectArrayTypeHandlerTest.java b/src/test/java/org/apache/ibatis/type/BlobByteObjectArrayTypeHandlerTest.java index 862fbe6c237..c9ac0b064cb 100644 --- a/src/test/java/org/apache/ibatis/type/BlobByteObjectArrayTypeHandlerTest.java +++ b/src/test/java/org/apache/ibatis/type/BlobByteObjectArrayTypeHandlerTest.java @@ -52,7 +52,7 @@ public void shouldSetParameter() throws Exception { @Override @Test public void shouldGetResultFromResultSetByName() throws Exception { - byte[] byteArray = new byte[] { 1, 2 }; + byte[] byteArray = { 1, 2 }; when(rs.getBlob("column")).thenReturn(blob); when(blob.length()).thenReturn((long) byteArray.length); when(blob.getBytes(1, 2)).thenReturn(byteArray); @@ -70,7 +70,7 @@ public void shouldGetResultNullFromResultSetByName() throws Exception { @Override @Test public void shouldGetResultFromResultSetByPosition() throws Exception { - byte[] byteArray = new byte[] { 1, 2 }; + byte[] byteArray = { 1, 2 }; when(rs.getBlob(1)).thenReturn(blob); when(blob.length()).thenReturn((long) byteArray.length); when(blob.getBytes(1, 2)).thenReturn(byteArray); @@ -87,7 +87,7 @@ public void shouldGetResultNullFromResultSetByPosition() throws Exception { @Override @Test public void shouldGetResultFromCallableStatement() throws Exception { - byte[] byteArray = new byte[] { 1, 2 }; + byte[] byteArray = { 1, 2 }; when(cs.getBlob(1)).thenReturn(blob); when(blob.length()).thenReturn((long) byteArray.length); when(blob.getBytes(1, 2)).thenReturn(byteArray); diff --git a/src/test/java/org/apache/ibatis/type/ByteObjectArrayTypeHandlerTest.java b/src/test/java/org/apache/ibatis/type/ByteObjectArrayTypeHandlerTest.java index 49334be16ab..cb91c0b0900 100644 --- a/src/test/java/org/apache/ibatis/type/ByteObjectArrayTypeHandlerTest.java +++ b/src/test/java/org/apache/ibatis/type/ByteObjectArrayTypeHandlerTest.java @@ -36,7 +36,7 @@ public void shouldSetParameter() throws Exception { @Override @Test public void shouldGetResultFromResultSetByName() throws Exception { - byte[] byteArray = new byte[] { 1, 2 }; + byte[] byteArray = { 1, 2 }; when(rs.getBytes("column")).thenReturn(byteArray); assertThat(TYPE_HANDLER.getResult(rs, "column")).isEqualTo(new Byte[] { 1, 2 }); verify(rs, never()).wasNull(); @@ -53,7 +53,7 @@ public void shouldGetResultNullFromResultSetByName() throws Exception { @Override @Test public void shouldGetResultFromResultSetByPosition() throws Exception { - byte[] byteArray = new byte[] { 1, 2 }; + byte[] byteArray = { 1, 2 }; when(rs.getBytes(1)).thenReturn(byteArray); assertThat(TYPE_HANDLER.getResult(rs, 1)).isEqualTo(new Byte[] { 1, 2 }); verify(rs, never()).wasNull(); @@ -70,7 +70,7 @@ public void shouldGetResultNullFromResultSetByPosition() throws Exception { @Override @Test public void shouldGetResultFromCallableStatement() throws Exception { - byte[] byteArray = new byte[] { 1, 2 }; + byte[] byteArray = { 1, 2 }; when(cs.getBytes(1)).thenReturn(byteArray); assertThat(TYPE_HANDLER.getResult(cs, 1)).isEqualTo(new Byte[] { 1, 2 }); verify(cs, never()).wasNull(); From 7b8f2eaae049f38f18fd62073cb2ea2343404dd5 Mon Sep 17 00:00:00 2001 From: Jeremy Landis Date: Mon, 20 Feb 2023 17:55:12 -0500 Subject: [PATCH 06/11] [ci] Remove super as no super to call --- .../arg_name_based_constructor_automapping/Task.java | 1 - .../arg_name_based_constructor_automapping/User.java | 1 - .../arg_name_based_constructor_automapping/User2.java | 1 - .../java/org/apache/ibatis/submitted/blobtest/BlobRecord.java | 2 -- .../org/apache/ibatis/submitted/column_prefix/Address.java | 1 - .../ibatis/submitted/constructor_automapping/Author.java | 1 - .../ibatis/submitted/constructor_columnprefix/Article.java | 1 - .../apache/ibatis/submitted/empty_row/ImmutableParent.java | 1 - .../apache/ibatis/submitted/extendresultmap/TestModel.java | 1 - .../ibatis/submitted/mapper_type_parameter/Country.java | 3 --- .../apache/ibatis/submitted/mapper_type_parameter/Person.java | 4 ---- .../apache/ibatis/submitted/named_constructor_args/User.java | 4 ---- .../org/apache/ibatis/submitted/null_associations/Bar.java | 2 -- .../org/apache/ibatis/submitted/null_associations/Foo.java | 2 -- .../apache/ibatis/submitted/overwritingproperties/Bar.java | 1 - .../apache/ibatis/submitted/overwritingproperties/Foo.java | 1 - .../ibatis/submitted/result_handler/UserResultHandler.java | 1 - .../java/org/apache/ibatis/submitted/results_id/User.java | 2 -- .../java/org/apache/ibatis/submitted/typehandler/Product.java | 2 -- .../java/org/apache/ibatis/testcontainers/MysqlContainer.java | 1 - .../java/org/apache/ibatis/testcontainers/PgContainer.java | 1 - .../org/apache/ibatis/transaction/jdbc/TestConnection.java | 1 - 22 files changed, 35 deletions(-) diff --git a/src/test/java/org/apache/ibatis/submitted/arg_name_based_constructor_automapping/Task.java b/src/test/java/org/apache/ibatis/submitted/arg_name_based_constructor_automapping/Task.java index 7aaaf6641d9..04488b79223 100644 --- a/src/test/java/org/apache/ibatis/submitted/arg_name_based_constructor_automapping/Task.java +++ b/src/test/java/org/apache/ibatis/submitted/arg_name_based_constructor_automapping/Task.java @@ -23,7 +23,6 @@ public class Task { private User assignee; public Task(@Param("id") Integer id, @Param("name") String name) { - super(); this.id = id; this.name = name; } diff --git a/src/test/java/org/apache/ibatis/submitted/arg_name_based_constructor_automapping/User.java b/src/test/java/org/apache/ibatis/submitted/arg_name_based_constructor_automapping/User.java index 872cbda0f60..aa4e742d0d1 100644 --- a/src/test/java/org/apache/ibatis/submitted/arg_name_based_constructor_automapping/User.java +++ b/src/test/java/org/apache/ibatis/submitted/arg_name_based_constructor_automapping/User.java @@ -22,7 +22,6 @@ public class User { private Long team; public User(Integer id, String name) { - super(); this.id = id; this.name = name + "!"; } diff --git a/src/test/java/org/apache/ibatis/submitted/arg_name_based_constructor_automapping/User2.java b/src/test/java/org/apache/ibatis/submitted/arg_name_based_constructor_automapping/User2.java index f51558fc178..239d10e92a9 100644 --- a/src/test/java/org/apache/ibatis/submitted/arg_name_based_constructor_automapping/User2.java +++ b/src/test/java/org/apache/ibatis/submitted/arg_name_based_constructor_automapping/User2.java @@ -23,7 +23,6 @@ public class User2 { private final String name; public User2(Integer userId, @Param("userName") String name) { - super(); this.userId = userId; this.name = name; } diff --git a/src/test/java/org/apache/ibatis/submitted/blobtest/BlobRecord.java b/src/test/java/org/apache/ibatis/submitted/blobtest/BlobRecord.java index e573f1d50e7..ff1e9701e28 100644 --- a/src/test/java/org/apache/ibatis/submitted/blobtest/BlobRecord.java +++ b/src/test/java/org/apache/ibatis/submitted/blobtest/BlobRecord.java @@ -20,13 +20,11 @@ public class BlobRecord { private byte[] blob; public BlobRecord(int id, byte[] blob) { - super(); this.id = id; this.blob = blob; } public BlobRecord(int id, Byte[] blob) { - super(); this.id = id; final byte[] newBytes = new byte[blob.length]; for (int i = 0; i < blob.length; i++) { diff --git a/src/test/java/org/apache/ibatis/submitted/column_prefix/Address.java b/src/test/java/org/apache/ibatis/submitted/column_prefix/Address.java index 6173491d84d..092bcbac559 100644 --- a/src/test/java/org/apache/ibatis/submitted/column_prefix/Address.java +++ b/src/test/java/org/apache/ibatis/submitted/column_prefix/Address.java @@ -33,7 +33,6 @@ public class Address { private Zip zip; public Address(Integer id, String state) { - super(); this.id = id; this.state = state; } diff --git a/src/test/java/org/apache/ibatis/submitted/constructor_automapping/Author.java b/src/test/java/org/apache/ibatis/submitted/constructor_automapping/Author.java index 8e6c6830f20..9970dda6aa9 100644 --- a/src/test/java/org/apache/ibatis/submitted/constructor_automapping/Author.java +++ b/src/test/java/org/apache/ibatis/submitted/constructor_automapping/Author.java @@ -21,7 +21,6 @@ public class Author { private String name; private Author(Integer id) { - super(); this.id = id; } diff --git a/src/test/java/org/apache/ibatis/submitted/constructor_columnprefix/Article.java b/src/test/java/org/apache/ibatis/submitted/constructor_columnprefix/Article.java index 6a4bf379b96..df76938d1c7 100644 --- a/src/test/java/org/apache/ibatis/submitted/constructor_columnprefix/Article.java +++ b/src/test/java/org/apache/ibatis/submitted/constructor_columnprefix/Article.java @@ -26,7 +26,6 @@ public class Article { private final Author coauthor; public Article(EntityKey id, String name, Author author, Author coauthor) { - super(); this.id = id; this.name = name; this.author = author; diff --git a/src/test/java/org/apache/ibatis/submitted/empty_row/ImmutableParent.java b/src/test/java/org/apache/ibatis/submitted/empty_row/ImmutableParent.java index c6e8e9e9659..eea08ed265d 100644 --- a/src/test/java/org/apache/ibatis/submitted/empty_row/ImmutableParent.java +++ b/src/test/java/org/apache/ibatis/submitted/empty_row/ImmutableParent.java @@ -20,7 +20,6 @@ public class ImmutableParent { private final String col2; public ImmutableParent(String col1, String col2) { - super(); this.col1 = col1; this.col2 = col2; } diff --git a/src/test/java/org/apache/ibatis/submitted/extendresultmap/TestModel.java b/src/test/java/org/apache/ibatis/submitted/extendresultmap/TestModel.java index ebe79dec539..e1e48cf3e63 100644 --- a/src/test/java/org/apache/ibatis/submitted/extendresultmap/TestModel.java +++ b/src/test/java/org/apache/ibatis/submitted/extendresultmap/TestModel.java @@ -24,7 +24,6 @@ public TestModel() { } public TestModel(String a, String b) { - super(); this.a = a; this.b = b; } diff --git a/src/test/java/org/apache/ibatis/submitted/mapper_type_parameter/Country.java b/src/test/java/org/apache/ibatis/submitted/mapper_type_parameter/Country.java index bf0f5df328c..2a445764686 100644 --- a/src/test/java/org/apache/ibatis/submitted/mapper_type_parameter/Country.java +++ b/src/test/java/org/apache/ibatis/submitted/mapper_type_parameter/Country.java @@ -21,16 +21,13 @@ public class Country { private String name; public Country() { - super(); } public Country(Long id) { - super(); this.id = id; } public Country(Long id, String name) { - super(); this.id = id; this.name = name; } diff --git a/src/test/java/org/apache/ibatis/submitted/mapper_type_parameter/Person.java b/src/test/java/org/apache/ibatis/submitted/mapper_type_parameter/Person.java index 2e82d44eaa7..9c3b1baf719 100644 --- a/src/test/java/org/apache/ibatis/submitted/mapper_type_parameter/Person.java +++ b/src/test/java/org/apache/ibatis/submitted/mapper_type_parameter/Person.java @@ -21,21 +21,17 @@ public class Person { private String name; public Person() { - super(); } public Person(Integer id) { - super(); this.id = id; } public Person(String name) { - super(); this.name = name; } public Person(Integer id, String name) { - super(); this.id = id; this.name = name; } diff --git a/src/test/java/org/apache/ibatis/submitted/named_constructor_args/User.java b/src/test/java/org/apache/ibatis/submitted/named_constructor_args/User.java index a30e4d56755..a1dd0d33268 100644 --- a/src/test/java/org/apache/ibatis/submitted/named_constructor_args/User.java +++ b/src/test/java/org/apache/ibatis/submitted/named_constructor_args/User.java @@ -24,23 +24,19 @@ public class User { private Long team; public User(@Param("id") String id) { - super(); this.id = Integer.valueOf(id); } public User(Integer userId, @Param("name") String userName) { - super(); this.id = userId; this.name = userName; } public User(@Param("id") int id, @Param("name") String name, @Param("team") String team) { - super(); // NOP constructor to make sure MyBatis performs strict type matching. } public User(@Param("id") Integer id, @Param("name") String name, @Param("team") String team) { - super(); this.id = id; this.name = name; this.team = Long.valueOf(team); diff --git a/src/test/java/org/apache/ibatis/submitted/null_associations/Bar.java b/src/test/java/org/apache/ibatis/submitted/null_associations/Bar.java index 6e254a178a7..b348d412e36 100644 --- a/src/test/java/org/apache/ibatis/submitted/null_associations/Bar.java +++ b/src/test/java/org/apache/ibatis/submitted/null_associations/Bar.java @@ -25,11 +25,9 @@ public class Bar implements Serializable { private long field3; public Bar() { - super(); } public Bar(long field1, long field2, long field3) { - super(); this.field1 = field1; this.field2 = field2; this.field3 = field3; diff --git a/src/test/java/org/apache/ibatis/submitted/null_associations/Foo.java b/src/test/java/org/apache/ibatis/submitted/null_associations/Foo.java index 851f4fc510b..9268a0f3f82 100644 --- a/src/test/java/org/apache/ibatis/submitted/null_associations/Foo.java +++ b/src/test/java/org/apache/ibatis/submitted/null_associations/Foo.java @@ -25,11 +25,9 @@ public class Foo implements Serializable { private boolean field3; public Foo() { - super(); } public Foo(long field1, Bar field2, boolean field3) { - super(); this.field1 = field1; this.field2 = field2; this.field3 = field3; diff --git a/src/test/java/org/apache/ibatis/submitted/overwritingproperties/Bar.java b/src/test/java/org/apache/ibatis/submitted/overwritingproperties/Bar.java index ba0657a3e28..de52fb4696c 100644 --- a/src/test/java/org/apache/ibatis/submitted/overwritingproperties/Bar.java +++ b/src/test/java/org/apache/ibatis/submitted/overwritingproperties/Bar.java @@ -23,7 +23,6 @@ public class Bar implements Serializable { private Long field1; public Bar() { - super(); } public Bar(long field1) { diff --git a/src/test/java/org/apache/ibatis/submitted/overwritingproperties/Foo.java b/src/test/java/org/apache/ibatis/submitted/overwritingproperties/Foo.java index 8cc1a0088b7..f99060a72fb 100644 --- a/src/test/java/org/apache/ibatis/submitted/overwritingproperties/Foo.java +++ b/src/test/java/org/apache/ibatis/submitted/overwritingproperties/Foo.java @@ -26,7 +26,6 @@ public class Foo implements Serializable { private Integer field4; public Foo() { - super(); } public Foo(Long field1, Bar field2, Integer field3, Integer field4) { diff --git a/src/test/java/org/apache/ibatis/submitted/result_handler/UserResultHandler.java b/src/test/java/org/apache/ibatis/submitted/result_handler/UserResultHandler.java index 6641790fb95..60adacdb2e0 100644 --- a/src/test/java/org/apache/ibatis/submitted/result_handler/UserResultHandler.java +++ b/src/test/java/org/apache/ibatis/submitted/result_handler/UserResultHandler.java @@ -25,7 +25,6 @@ public class UserResultHandler implements ResultHandler { private final List users; public UserResultHandler() { - super(); users = new ArrayList<>(); } diff --git a/src/test/java/org/apache/ibatis/submitted/results_id/User.java b/src/test/java/org/apache/ibatis/submitted/results_id/User.java index 00c533f938a..6123f7c7148 100644 --- a/src/test/java/org/apache/ibatis/submitted/results_id/User.java +++ b/src/test/java/org/apache/ibatis/submitted/results_id/User.java @@ -37,11 +37,9 @@ public void setName(String name) { } public User() { - super(); } public User(Integer id, String name) { - super(); this.id = id; this.name = name; } diff --git a/src/test/java/org/apache/ibatis/submitted/typehandler/Product.java b/src/test/java/org/apache/ibatis/submitted/typehandler/Product.java index cf619c76620..7f7335935cb 100644 --- a/src/test/java/org/apache/ibatis/submitted/typehandler/Product.java +++ b/src/test/java/org/apache/ibatis/submitted/typehandler/Product.java @@ -30,11 +30,9 @@ public class Product { private String name; public Product() { - super(); } public Product(ProductId id, String name) { - super(); this.id = id; this.name = name; } diff --git a/src/test/java/org/apache/ibatis/testcontainers/MysqlContainer.java b/src/test/java/org/apache/ibatis/testcontainers/MysqlContainer.java index 764b78415b5..e00c18b3b15 100644 --- a/src/test/java/org/apache/ibatis/testcontainers/MysqlContainer.java +++ b/src/test/java/org/apache/ibatis/testcontainers/MysqlContainer.java @@ -49,6 +49,5 @@ public static PooledDataSource getPooledDataSource() { } private MysqlContainer() { - super(); } } diff --git a/src/test/java/org/apache/ibatis/testcontainers/PgContainer.java b/src/test/java/org/apache/ibatis/testcontainers/PgContainer.java index 5c49b7b2e29..c04f9cb6332 100644 --- a/src/test/java/org/apache/ibatis/testcontainers/PgContainer.java +++ b/src/test/java/org/apache/ibatis/testcontainers/PgContainer.java @@ -43,6 +43,5 @@ public static DataSource getUnpooledDataSource() { } private PgContainer() { - super(); } } diff --git a/src/test/java/org/apache/ibatis/transaction/jdbc/TestConnection.java b/src/test/java/org/apache/ibatis/transaction/jdbc/TestConnection.java index c26c026f04e..4f3e0596f66 100644 --- a/src/test/java/org/apache/ibatis/transaction/jdbc/TestConnection.java +++ b/src/test/java/org/apache/ibatis/transaction/jdbc/TestConnection.java @@ -38,7 +38,6 @@ class TestConnection implements Connection { private boolean autoCommit; TestConnection(boolean autoCommit) { - super(); this.autoCommit = autoCommit; } From 55f7c39da15e357f90c9207c933267261d166bc6 Mon Sep 17 00:00:00 2001 From: Jeremy Landis Date: Mon, 20 Feb 2023 18:04:10 -0500 Subject: [PATCH 07/11] [ci] More direct returns to save on GC --- src/test/java/org/apache/ibatis/domain/blog/Author.java | 3 +-- .../apache/ibatis/domain/blog/ComplexImmutableAuthor.java | 3 +-- .../ibatis/domain/blog/ComplexImmutableAuthorId.java | 3 +-- .../org/apache/ibatis/domain/blog/ImmutableAuthor.java | 3 +-- src/test/java/org/apache/ibatis/domain/blog/PostLite.java | 3 +-- src/test/java/org/apache/ibatis/domain/jpetstore/Cart.java | 5 ++--- .../ibatis/domain/misc/CustomBeanWrapperFactory.java | 3 +-- .../apache/ibatis/submitted/cglib_lazy_error/Person.java | 3 +-- .../column_prefix/ColumnPrefixAutoMappingTest.java | 7 ++----- .../column_prefix/ColumnPrefixNestedQueryTest.java | 7 ++----- .../ibatis/submitted/column_prefix/ColumnPrefixTest.java | 6 ++---- .../custom_collection_handling/CustomObjectFactory.java | 4 +--- .../ibatis/submitted/foreach_map/IntBoolMapEntry.java | 3 +-- .../ibatis/submitted/foreach_map/NestedBeanMapEntry.java | 3 +-- .../ibatis/submitted/foreach_map/StringStringMapEntry.java | 3 +-- .../ibatis/submitted/serializecircular/UtilityTester.java | 4 +--- .../apache/ibatis/submitted/sqlprovider/OurSqlBuilder.java | 3 +-- .../ibatis/submitted/sqlprovider/SqlProviderTest.java | 3 +-- .../submitted/typehandler/StringTrimmingTypeHandler.java | 3 +-- 19 files changed, 23 insertions(+), 49 deletions(-) diff --git a/src/test/java/org/apache/ibatis/domain/blog/Author.java b/src/test/java/org/apache/ibatis/domain/blog/Author.java index 5202ff8a86b..c8eefc414ed 100644 --- a/src/test/java/org/apache/ibatis/domain/blog/Author.java +++ b/src/test/java/org/apache/ibatis/domain/blog/Author.java @@ -134,8 +134,7 @@ public int hashCode() { result = 31 * result + (password != null ? password.hashCode() : 0); result = 31 * result + (email != null ? email.hashCode() : 0); result = 31 * result + (bio != null ? bio.hashCode() : 0); - result = 31 * result + (favouriteSection != null ? favouriteSection.hashCode() : 0); - return result; + return 31 * result + (favouriteSection != null ? favouriteSection.hashCode() : 0); } @Override diff --git a/src/test/java/org/apache/ibatis/domain/blog/ComplexImmutableAuthor.java b/src/test/java/org/apache/ibatis/domain/blog/ComplexImmutableAuthor.java index 3b29c80bf55..1c782ec9154 100644 --- a/src/test/java/org/apache/ibatis/domain/blog/ComplexImmutableAuthor.java +++ b/src/test/java/org/apache/ibatis/domain/blog/ComplexImmutableAuthor.java @@ -70,7 +70,6 @@ public boolean equals(Object o) { public int hashCode() { int myresult = theComplexImmutableAuthorId != null ? theComplexImmutableAuthorId.hashCode() : 0; myresult = 31 * myresult + (bio != null ? bio.hashCode() : 0); - myresult = 31 * myresult + (favouriteSection != null ? favouriteSection.hashCode() : 0); - return myresult; + return 31 * myresult + (favouriteSection != null ? favouriteSection.hashCode() : 0); } } diff --git a/src/test/java/org/apache/ibatis/domain/blog/ComplexImmutableAuthorId.java b/src/test/java/org/apache/ibatis/domain/blog/ComplexImmutableAuthorId.java index 37bd47ec383..64a2b5b9009 100644 --- a/src/test/java/org/apache/ibatis/domain/blog/ComplexImmutableAuthorId.java +++ b/src/test/java/org/apache/ibatis/domain/blog/ComplexImmutableAuthorId.java @@ -76,7 +76,6 @@ public int hashCode() { int myresult = id; myresult = 31 * myresult + (email != null ? email.hashCode() : 0); myresult = 31 * myresult + (username != null ? username.hashCode() : 0); - myresult = 31 * myresult + (password != null ? password.hashCode() : 0); - return myresult; + return 31 * myresult + (password != null ? password.hashCode() : 0); } } diff --git a/src/test/java/org/apache/ibatis/domain/blog/ImmutableAuthor.java b/src/test/java/org/apache/ibatis/domain/blog/ImmutableAuthor.java index b9487a87902..8554b12bee0 100644 --- a/src/test/java/org/apache/ibatis/domain/blog/ImmutableAuthor.java +++ b/src/test/java/org/apache/ibatis/domain/blog/ImmutableAuthor.java @@ -101,8 +101,7 @@ public int hashCode() { result = 31 * result + (password != null ? password.hashCode() : 0); result = 31 * result + (email != null ? email.hashCode() : 0); result = 31 * result + (bio != null ? bio.hashCode() : 0); - result = 31 * result + (favouriteSection != null ? favouriteSection.hashCode() : 0); - return result; + return 31 * result + (favouriteSection != null ? favouriteSection.hashCode() : 0); } @Override diff --git a/src/test/java/org/apache/ibatis/domain/blog/PostLite.java b/src/test/java/org/apache/ibatis/domain/blog/PostLite.java index 0f0b2152a11..d3b5967443f 100644 --- a/src/test/java/org/apache/ibatis/domain/blog/PostLite.java +++ b/src/test/java/org/apache/ibatis/domain/blog/PostLite.java @@ -67,7 +67,6 @@ public boolean equals(Object o) { @Override public int hashCode() { int myresult = theId != null ? theId.hashCode() : 0; - myresult = 31 * myresult + blogId; - return myresult; + return 31 * myresult + blogId; } } 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 723dab47628..8e15b28a99d 100644 --- a/src/test/java/org/apache/ibatis/domain/jpetstore/Cart.java +++ b/src/test/java/org/apache/ibatis/domain/jpetstore/Cart.java @@ -64,10 +64,9 @@ public Item removeItemById(String itemId) { CartItem cartItem = itemMap.remove(itemId); if (cartItem == null) { return null; - } else { - itemList.remove(cartItem); - return cartItem.getItem(); } + itemList.remove(cartItem); + return cartItem.getItem(); } public void incrementQuantityByItemId(String itemId) { diff --git a/src/test/java/org/apache/ibatis/domain/misc/CustomBeanWrapperFactory.java b/src/test/java/org/apache/ibatis/domain/misc/CustomBeanWrapperFactory.java index e856f8caab1..8b863b20c32 100644 --- a/src/test/java/org/apache/ibatis/domain/misc/CustomBeanWrapperFactory.java +++ b/src/test/java/org/apache/ibatis/domain/misc/CustomBeanWrapperFactory.java @@ -25,9 +25,8 @@ public class CustomBeanWrapperFactory implements ObjectWrapperFactory { public boolean hasWrapperFor(Object object) { if (object instanceof Author) { return true; - } else { - return false; } + return false; } @Override diff --git a/src/test/java/org/apache/ibatis/submitted/cglib_lazy_error/Person.java b/src/test/java/org/apache/ibatis/submitted/cglib_lazy_error/Person.java index 88cf4f992eb..bc623bd3ec5 100644 --- a/src/test/java/org/apache/ibatis/submitted/cglib_lazy_error/Person.java +++ b/src/test/java/org/apache/ibatis/submitted/cglib_lazy_error/Person.java @@ -25,9 +25,8 @@ public class Person { public Person getAncestor() { if (getParent() == null) { return this; - } else { - return getParent().getAncestor(); } + return getParent().getAncestor(); } @Override 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 2b8f2dbba31..69bf7e1b597 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 @@ -25,15 +25,12 @@ class ColumnPrefixAutoMappingTest extends ColumnPrefixTest { @Override protected List getPetAndRoom(SqlSession sqlSession) { - List pets = sqlSession.selectList("org.apache.ibatis.submitted.column_prefix.MapperAutoMapping.selectPets"); - return pets; + return sqlSession.selectList("org.apache.ibatis.submitted.column_prefix.MapperAutoMapping.selectPets"); } @Override protected List getPersons(SqlSession sqlSession) { - List list = sqlSession - .selectList("org.apache.ibatis.submitted.column_prefix.MapperAutoMapping.selectPersons"); - return list; + return sqlSession.selectList("org.apache.ibatis.submitted.column_prefix.MapperAutoMapping.selectPersons"); } @Override diff --git a/src/test/java/org/apache/ibatis/submitted/column_prefix/ColumnPrefixNestedQueryTest.java b/src/test/java/org/apache/ibatis/submitted/column_prefix/ColumnPrefixNestedQueryTest.java index dea8cff39cf..bbcb8b8d4d6 100644 --- a/src/test/java/org/apache/ibatis/submitted/column_prefix/ColumnPrefixNestedQueryTest.java +++ b/src/test/java/org/apache/ibatis/submitted/column_prefix/ColumnPrefixNestedQueryTest.java @@ -22,15 +22,12 @@ class ColumnPrefixNestedQueryTest extends ColumnPrefixTest { @Override protected List getPetAndRoom(SqlSession sqlSession) { - List pets = sqlSession.selectList("org.apache.ibatis.submitted.column_prefix.MapperNestedQuery.selectPets"); - return pets; + return sqlSession.selectList("org.apache.ibatis.submitted.column_prefix.MapperNestedQuery.selectPets"); } @Override protected List getPersons(SqlSession sqlSession) { - List list = sqlSession - .selectList("org.apache.ibatis.submitted.column_prefix.MapperNestedQuery.selectPersons"); - return list; + return sqlSession.selectList("org.apache.ibatis.submitted.column_prefix.MapperNestedQuery.selectPersons"); } @Override 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 c759d7ceabb..6389fe29441 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 @@ -116,13 +116,11 @@ void testComplexPerson() { } protected List getPetAndRoom(SqlSession sqlSession) { - List pets = sqlSession.selectList("org.apache.ibatis.submitted.column_prefix.Mapper.selectPets"); - return pets; + return sqlSession.selectList("org.apache.ibatis.submitted.column_prefix.Mapper.selectPets"); } protected List getPersons(SqlSession sqlSession) { - List list = sqlSession.selectList("org.apache.ibatis.submitted.column_prefix.Mapper.selectPersons"); - return list; + return sqlSession.selectList("org.apache.ibatis.submitted.column_prefix.Mapper.selectPersons"); } protected String getConfigPath() { diff --git a/src/test/java/org/apache/ibatis/submitted/custom_collection_handling/CustomObjectFactory.java b/src/test/java/org/apache/ibatis/submitted/custom_collection_handling/CustomObjectFactory.java index 925faabef24..bd486f14c34 100644 --- a/src/test/java/org/apache/ibatis/submitted/custom_collection_handling/CustomObjectFactory.java +++ b/src/test/java/org/apache/ibatis/submitted/custom_collection_handling/CustomObjectFactory.java @@ -40,9 +40,7 @@ public T create(Class type) { @Override public T create(Class type, List> constructorArgTypes, List constructorArgs) { Class classToCreate = resolveInterface(type); - @SuppressWarnings("unchecked") // we know types are assignable - T created = (T) instantiateClass(classToCreate, constructorArgTypes, constructorArgs); - return created; + return (T) instantiateClass(classToCreate, constructorArgTypes, constructorArgs); } private T instantiateClass(Class type, List> constructorArgTypes, List constructorArgs) { diff --git a/src/test/java/org/apache/ibatis/submitted/foreach_map/IntBoolMapEntry.java b/src/test/java/org/apache/ibatis/submitted/foreach_map/IntBoolMapEntry.java index d579aeac77f..e28e3c3d60f 100644 --- a/src/test/java/org/apache/ibatis/submitted/foreach_map/IntBoolMapEntry.java +++ b/src/test/java/org/apache/ibatis/submitted/foreach_map/IntBoolMapEntry.java @@ -64,8 +64,7 @@ public boolean equals(Object o) { @Override public int hashCode() { int result = key != null ? key.hashCode() : 0; - result = 31 * result + (value != null ? value.hashCode() : 0); - return result; + return 31 * result + (value != null ? value.hashCode() : 0); } @Override diff --git a/src/test/java/org/apache/ibatis/submitted/foreach_map/NestedBeanMapEntry.java b/src/test/java/org/apache/ibatis/submitted/foreach_map/NestedBeanMapEntry.java index 2158a11d902..127547cf73d 100644 --- a/src/test/java/org/apache/ibatis/submitted/foreach_map/NestedBeanMapEntry.java +++ b/src/test/java/org/apache/ibatis/submitted/foreach_map/NestedBeanMapEntry.java @@ -92,8 +92,7 @@ public int hashCode() { int result = keya != null ? keya.hashCode() : 0; result = 31 * result + (valuea != null ? valuea.hashCode() : 0); result = 31 * result + (keyb != null ? keyb.hashCode() : 0); - result = 31 * result + (valueb != null ? valueb.hashCode() : 0); - return result; + return 31 * result + (valueb != null ? valueb.hashCode() : 0); } @Override diff --git a/src/test/java/org/apache/ibatis/submitted/foreach_map/StringStringMapEntry.java b/src/test/java/org/apache/ibatis/submitted/foreach_map/StringStringMapEntry.java index 6ec4711a4e0..dcb38ef4ba3 100644 --- a/src/test/java/org/apache/ibatis/submitted/foreach_map/StringStringMapEntry.java +++ b/src/test/java/org/apache/ibatis/submitted/foreach_map/StringStringMapEntry.java @@ -64,8 +64,7 @@ public boolean equals(Object o) { @Override public int hashCode() { int result = key != null ? key.hashCode() : 0; - result = 31 * result + (value != null ? value.hashCode() : 0); - return result; + return 31 * result + (value != null ? value.hashCode() : 0); } @Override diff --git a/src/test/java/org/apache/ibatis/submitted/serializecircular/UtilityTester.java b/src/test/java/org/apache/ibatis/submitted/serializecircular/UtilityTester.java index 2a78f24bfed..2de8d8e8e49 100644 --- a/src/test/java/org/apache/ibatis/submitted/serializecircular/UtilityTester.java +++ b/src/test/java/org/apache/ibatis/submitted/serializecircular/UtilityTester.java @@ -41,9 +41,7 @@ private static byte[] serializeObject(Object myObject) throws IOException { myObjectOutputStream.writeObject(myObject); } - // Get the bytes of the serialized object - byte[] myResult = myByteArrayOutputStream.toByteArray(); - return myResult; + return myByteArrayOutputStream.toByteArray(); } catch (Exception anException) { throw new RuntimeException("Problem serializing: " + anException.toString(), anException); } diff --git a/src/test/java/org/apache/ibatis/submitted/sqlprovider/OurSqlBuilder.java b/src/test/java/org/apache/ibatis/submitted/sqlprovider/OurSqlBuilder.java index 3738c65dcf7..0258082db89 100644 --- a/src/test/java/org/apache/ibatis/submitted/sqlprovider/OurSqlBuilder.java +++ b/src/test/java/org/apache/ibatis/submitted/sqlprovider/OurSqlBuilder.java @@ -273,8 +273,7 @@ private Class getEntityClass(ProviderContext providerContext) { if (type instanceof ParameterizedType) { ParameterizedType t = (ParameterizedType) type; if (t.getRawType() == declaringClass || mapperClass.isAssignableFrom((Class) t.getRawType())) { - Class returnType = (Class) t.getActualTypeArguments()[0]; - return returnType; + return (Class) t.getActualTypeArguments()[0]; } } } diff --git a/src/test/java/org/apache/ibatis/submitted/sqlprovider/SqlProviderTest.java b/src/test/java/org/apache/ibatis/submitted/sqlprovider/SqlProviderTest.java index 669f3add003..4fcc4a831f9 100644 --- a/src/test/java/org/apache/ibatis/submitted/sqlprovider/SqlProviderTest.java +++ b/src/test/java/org/apache/ibatis/submitted/sqlprovider/SqlProviderTest.java @@ -998,9 +998,8 @@ class SqlProvider { public static String provideSql(ProviderContext context) { if ("hsql".equals(context.getDatabaseId())) { return "SELECT '" + context.getDatabaseId() + "' FROM INFORMATION_SCHEMA.SYSTEM_USERS"; - } else { - return "SELECT '" + context.getDatabaseId() + "' FROM SYSIBM.SYSDUMMY1"; } + return "SELECT '" + context.getDatabaseId() + "' FROM SYSIBM.SYSDUMMY1"; } private SqlProvider() { diff --git a/src/test/java/org/apache/ibatis/submitted/typehandler/StringTrimmingTypeHandler.java b/src/test/java/org/apache/ibatis/submitted/typehandler/StringTrimmingTypeHandler.java index 8d897b6f125..c29b2c348f3 100644 --- a/src/test/java/org/apache/ibatis/submitted/typehandler/StringTrimmingTypeHandler.java +++ b/src/test/java/org/apache/ibatis/submitted/typehandler/StringTrimmingTypeHandler.java @@ -52,8 +52,7 @@ public String getResult(CallableStatement cs, int columnIndex) throws SQLExcepti private String trim(String s) { if (s == null) { return null; - } else { - return s.trim(); } + return s.trim(); } } From b1bc2e092ce843c77c7c2e82d7250aeb048e5c71 Mon Sep 17 00:00:00 2001 From: Jeremy Landis Date: Mon, 20 Feb 2023 18:09:46 -0500 Subject: [PATCH 08/11] [ci] Various small items cleaning up assignments --- .../java/org/apache/ibatis/cache/SoftCacheTest.java | 2 +- .../org/apache/ibatis/cache/SuperCacheTest.java | 2 +- .../datasource/unpooled/UnpooledDataSourceTest.java | 12 +++++------- .../java/org/apache/ibatis/domain/blog/Author.java | 13 +++---------- .../ibatis/domain/blog/ComplexImmutableAuthor.java | 11 +++-------- .../domain/blog/ComplexImmutableAuthorId.java | 13 +++---------- .../apache/ibatis/domain/blog/ImmutableAuthor.java | 13 +++---------- .../org/apache/ibatis/domain/blog/PostLite.java | 5 +---- .../apache/ibatis/executor/BaseExecutorTest.java | 2 +- .../executor/loader/SerializableProxyTest.java | 3 +-- .../apache/ibatis/jdbc/PooledDataSourceTest.java | 3 +-- .../constructor_columnprefix/EntityKey.java | 5 +---- .../ibatis/submitted/extendresultmap/TestModel.java | 5 +---- .../submitted/foreach_map/IntBoolMapEntry.java | 6 ++---- .../submitted/foreach_map/NestedBeanMapEntry.java | 12 ++---------- .../submitted/foreach_map/StringStringMapEntry.java | 6 ++---- .../ibatis/submitted/includes/IncludeTest.java | 4 +--- 17 files changed, 32 insertions(+), 85 deletions(-) diff --git a/src/test/java/org/apache/ibatis/cache/SoftCacheTest.java b/src/test/java/org/apache/ibatis/cache/SoftCacheTest.java index 5dc12f009db..1081962863d 100644 --- a/src/test/java/org/apache/ibatis/cache/SoftCacheTest.java +++ b/src/test/java/org/apache/ibatis/cache/SoftCacheTest.java @@ -34,7 +34,7 @@ void shouldDemonstrateObjectsBeingCollectedAsNeeded() { byte[] array = new byte[5001]; // waste a bunch of memory array[5000] = 1; cache.putObject(i, array); - Object value = cache.getObject(i); + cache.getObject(i); if (cache.getSize() < i + 1) { // System.out.println("Cache exceeded with " + (i + 1) + " entries."); break; diff --git a/src/test/java/org/apache/ibatis/cache/SuperCacheTest.java b/src/test/java/org/apache/ibatis/cache/SuperCacheTest.java index 7ef7a377c57..23f717df6d5 100644 --- a/src/test/java/org/apache/ibatis/cache/SuperCacheTest.java +++ b/src/test/java/org/apache/ibatis/cache/SuperCacheTest.java @@ -47,7 +47,7 @@ void shouldDemonstrate5LevelSuperCacheHandlesLotsOfEntriesWithoutCrashing() { cache.putObject(i, i); ((TransactionalCache) cache).commit(); Object o = cache.getObject(i); - assertTrue(o == null || i == ((Integer) o)); + assertTrue(o == null || i == (Integer) o); } assertTrue(cache.getSize() < N); } 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 05750daff93..0b59d4d05f7 100644 --- a/src/test/java/org/apache/ibatis/datasource/unpooled/UnpooledDataSourceTest.java +++ b/src/test/java/org/apache/ibatis/datasource/unpooled/UnpooledDataSourceTest.java @@ -31,8 +31,8 @@ class UnpooledDataSourceTest { @Test void shouldNotRegisterTheSameDriverMultipleTimes() throws Exception { // https://github.com/mybatis/old-google-code-issues/issues/430 - UnpooledDataSource dataSource = null; - dataSource = new UnpooledDataSource("org.hsqldb.jdbcDriver", "jdbc:hsqldb:mem:multipledrivers", "sa", ""); + UnpooledDataSource dataSource = new UnpooledDataSource("org.hsqldb.jdbcDriver", "jdbc:hsqldb:mem:multipledrivers", + "sa", ""); dataSource.getConnection().close(); int before = countRegisteredDrivers(); dataSource = new UnpooledDataSource("org.hsqldb.jdbcDriver", "jdbc:hsqldb:mem:multipledrivers", "sa", ""); @@ -44,12 +44,10 @@ void shouldNotRegisterTheSameDriverMultipleTimes() throws Exception { @Test void shouldRegisterDynamicallyLoadedDriver() throws Exception { int before = countRegisteredDrivers(); - ClassLoader driverClassLoader = null; - UnpooledDataSource dataSource = null; - driverClassLoader = new URLClassLoader( + ClassLoader driverClassLoader = new URLClassLoader( new URL[] { new URL("jar:file:/PATH_TO/mysql-connector-java-5.1.25.jar!/") }); - dataSource = new UnpooledDataSource(driverClassLoader, "com.mysql.jdbc.Driver", "jdbc:mysql://127.0.0.1/test", - "root", ""); + UnpooledDataSource dataSource = new UnpooledDataSource(driverClassLoader, "com.mysql.jdbc.Driver", + "jdbc:mysql://127.0.0.1/test", "root", ""); dataSource.getConnection().close(); assertEquals(before + 1, countRegisteredDrivers()); driverClassLoader = new URLClassLoader( diff --git a/src/test/java/org/apache/ibatis/domain/blog/Author.java b/src/test/java/org/apache/ibatis/domain/blog/Author.java index c8eefc414ed..42c04bc9134 100644 --- a/src/test/java/org/apache/ibatis/domain/blog/Author.java +++ b/src/test/java/org/apache/ibatis/domain/blog/Author.java @@ -103,16 +103,9 @@ public boolean equals(Object o) { Author author = (Author) o; - if (id != author.id) { - return false; - } - if (bio != null ? !bio.equals(author.bio) : author.bio != null) { - return false; - } - if (email != null ? !email.equals(author.email) : author.email != null) { - return false; - } - if (password != null ? !password.equals(author.password) : author.password != null) { + if ((id != author.id) || (bio != null ? !bio.equals(author.bio) : author.bio != null) + || (email != null ? !email.equals(author.email) : author.email != null) + || (password != null ? !password.equals(author.password) : author.password != null)) { return false; } if (username != null ? !username.equals(author.username) : author.username != null) { diff --git a/src/test/java/org/apache/ibatis/domain/blog/ComplexImmutableAuthor.java b/src/test/java/org/apache/ibatis/domain/blog/ComplexImmutableAuthor.java index 1c782ec9154..54af5587d11 100644 --- a/src/test/java/org/apache/ibatis/domain/blog/ComplexImmutableAuthor.java +++ b/src/test/java/org/apache/ibatis/domain/blog/ComplexImmutableAuthor.java @@ -52,14 +52,9 @@ public boolean equals(Object o) { final ComplexImmutableAuthor that = (ComplexImmutableAuthor) o; - if (bio != null ? !bio.equals(that.bio) : that.bio != null) { - return false; - } - if (favouriteSection != that.favouriteSection) { - return false; - } - if (theComplexImmutableAuthorId != null ? !theComplexImmutableAuthorId.equals(that.theComplexImmutableAuthorId) - : that.theComplexImmutableAuthorId != null) { + if ((bio != null ? !bio.equals(that.bio) : that.bio != null) || (favouriteSection != that.favouriteSection) + || (theComplexImmutableAuthorId != null ? !theComplexImmutableAuthorId.equals(that.theComplexImmutableAuthorId) + : that.theComplexImmutableAuthorId != null)) { return false; } diff --git a/src/test/java/org/apache/ibatis/domain/blog/ComplexImmutableAuthorId.java b/src/test/java/org/apache/ibatis/domain/blog/ComplexImmutableAuthorId.java index 64a2b5b9009..8e7277a21d7 100644 --- a/src/test/java/org/apache/ibatis/domain/blog/ComplexImmutableAuthorId.java +++ b/src/test/java/org/apache/ibatis/domain/blog/ComplexImmutableAuthorId.java @@ -55,16 +55,9 @@ public boolean equals(Object o) { final ComplexImmutableAuthorId that = (ComplexImmutableAuthorId) o; - if (id != that.id) { - return false; - } - if (email != null ? !email.equals(that.email) : that.email != null) { - return false; - } - if (password != null ? !password.equals(that.password) : that.password != null) { - return false; - } - if (username != null ? !username.equals(that.username) : that.username != null) { + if ((id != that.id) || (email != null ? !email.equals(that.email) : that.email != null) + || (password != null ? !password.equals(that.password) : that.password != null) + || (username != null ? !username.equals(that.username) : that.username != null)) { return false; } diff --git a/src/test/java/org/apache/ibatis/domain/blog/ImmutableAuthor.java b/src/test/java/org/apache/ibatis/domain/blog/ImmutableAuthor.java index 8554b12bee0..ae51d59fc98 100644 --- a/src/test/java/org/apache/ibatis/domain/blog/ImmutableAuthor.java +++ b/src/test/java/org/apache/ibatis/domain/blog/ImmutableAuthor.java @@ -70,16 +70,9 @@ public boolean equals(Object o) { Author author = (Author) o; - if (id != author.id) { - return false; - } - if (bio != null ? !bio.equals(author.bio) : author.bio != null) { - return false; - } - if (email != null ? !email.equals(author.email) : author.email != null) { - return false; - } - if (password != null ? !password.equals(author.password) : author.password != null) { + if ((id != author.id) || (bio != null ? !bio.equals(author.bio) : author.bio != null) + || (email != null ? !email.equals(author.email) : author.email != null) + || (password != null ? !password.equals(author.password) : author.password != null)) { return false; } if (username != null ? !username.equals(author.username) : author.username != null) { diff --git a/src/test/java/org/apache/ibatis/domain/blog/PostLite.java b/src/test/java/org/apache/ibatis/domain/blog/PostLite.java index d3b5967443f..121cbd1981a 100644 --- a/src/test/java/org/apache/ibatis/domain/blog/PostLite.java +++ b/src/test/java/org/apache/ibatis/domain/blog/PostLite.java @@ -54,10 +54,7 @@ public boolean equals(Object o) { final PostLite that = (PostLite) o; - if (blogId != that.blogId) { - return false; - } - if (theId != null ? !theId.equals(that.theId) : that.theId != null) { + if ((blogId != that.blogId) || (theId != null ? !theId.equals(that.theId) : that.theId != null)) { return false; } diff --git a/src/test/java/org/apache/ibatis/executor/BaseExecutorTest.java b/src/test/java/org/apache/ibatis/executor/BaseExecutorTest.java index 4252ed0b4d3..d11a778f28c 100644 --- a/src/test/java/org/apache/ibatis/executor/BaseExecutorTest.java +++ b/src/test/java/org/apache/ibatis/executor/BaseExecutorTest.java @@ -167,7 +167,7 @@ void shouldInsertNewAuthorByProc() throws Exception { Author author = new Author(97, "someone", "******", "someone@apache.org", null, null); MappedStatement insertStatement = ExecutorTestHelper.prepareInsertAuthorProc(config); MappedStatement selectStatement = ExecutorTestHelper.prepareSelectOneAuthorMappedStatement(config); - int rows = executor.update(insertStatement, author); + executor.update(insertStatement, author); List authors = executor.query(selectStatement, 97, RowBounds.DEFAULT, Executor.NO_RESULT_HANDLER); executor.flushStatements(); executor.rollback(true); diff --git a/src/test/java/org/apache/ibatis/executor/loader/SerializableProxyTest.java b/src/test/java/org/apache/ibatis/executor/loader/SerializableProxyTest.java index 17188a9f428..24bc5101efe 100644 --- a/src/test/java/org/apache/ibatis/executor/loader/SerializableProxyTest.java +++ b/src/test/java/org/apache/ibatis/executor/loader/SerializableProxyTest.java @@ -25,7 +25,6 @@ import java.io.ObjectOutputStream; import java.io.ObjectStreamException; import java.io.Serializable; -import java.lang.reflect.Method; import java.util.ArrayList; import org.apache.ibatis.domain.blog.Author; @@ -128,7 +127,7 @@ void shouldGenerateWriteReplace() throws Exception { } Object proxy = proxyFactory.createProxy(author, new ResultLoaderMap(), new Configuration(), new DefaultObjectFactory(), new ArrayList<>(), new ArrayList<>()); - Method m = proxy.getClass().getDeclaredMethod("writeReplace"); + proxy.getClass().getDeclaredMethod("writeReplace"); } @Test diff --git a/src/test/java/org/apache/ibatis/jdbc/PooledDataSourceTest.java b/src/test/java/org/apache/ibatis/jdbc/PooledDataSourceTest.java index 16d1d6a596c..c3f738fb938 100644 --- a/src/test/java/org/apache/ibatis/jdbc/PooledDataSourceTest.java +++ b/src/test/java/org/apache/ibatis/jdbc/PooledDataSourceTest.java @@ -25,7 +25,6 @@ import org.apache.ibatis.BaseDataTest; import org.apache.ibatis.datasource.pooled.PooledDataSource; -import org.hsqldb.jdbc.JDBCConnection; import org.junit.jupiter.api.Test; class PooledDataSourceTest extends BaseDataTest { @@ -84,7 +83,7 @@ void shouldNotFailCallingToStringOverAnInvalidConnection() throws Exception { void ShouldReturnRealConnection() throws Exception { PooledDataSource ds = createPooledDataSource(JPETSTORE_PROPERTIES); Connection c = ds.getConnection(); - JDBCConnection realConnection = (JDBCConnection) PooledDataSource.unwrapConnection(c); + PooledDataSource.unwrapConnection(c); c.close(); } diff --git a/src/test/java/org/apache/ibatis/submitted/constructor_columnprefix/EntityKey.java b/src/test/java/org/apache/ibatis/submitted/constructor_columnprefix/EntityKey.java index bc4b70c4f0a..cbe84faaf35 100644 --- a/src/test/java/org/apache/ibatis/submitted/constructor_columnprefix/EntityKey.java +++ b/src/test/java/org/apache/ibatis/submitted/constructor_columnprefix/EntityKey.java @@ -39,10 +39,7 @@ public boolean equals(Object obj) { if (this == obj) { return true; } - if (obj == null) { - return false; - } - if (getClass() != obj.getClass()) { + if ((obj == null) || (getClass() != obj.getClass())) { return false; } EntityKey other = (EntityKey) obj; diff --git a/src/test/java/org/apache/ibatis/submitted/extendresultmap/TestModel.java b/src/test/java/org/apache/ibatis/submitted/extendresultmap/TestModel.java index e1e48cf3e63..e849cbe976f 100644 --- a/src/test/java/org/apache/ibatis/submitted/extendresultmap/TestModel.java +++ b/src/test/java/org/apache/ibatis/submitted/extendresultmap/TestModel.java @@ -58,10 +58,7 @@ public boolean equals(Object obj) { if (this == obj) { return true; } - if (obj == null) { - return false; - } - if (getClass() != obj.getClass()) { + if ((obj == null) || (getClass() != obj.getClass())) { return false; } TestModel other = (TestModel) obj; diff --git a/src/test/java/org/apache/ibatis/submitted/foreach_map/IntBoolMapEntry.java b/src/test/java/org/apache/ibatis/submitted/foreach_map/IntBoolMapEntry.java index e28e3c3d60f..f30764b0d0e 100644 --- a/src/test/java/org/apache/ibatis/submitted/foreach_map/IntBoolMapEntry.java +++ b/src/test/java/org/apache/ibatis/submitted/foreach_map/IntBoolMapEntry.java @@ -51,10 +51,8 @@ public boolean equals(Object o) { IntBoolMapEntry mapEntry = (IntBoolMapEntry) o; - if (key != null ? !key.equals(mapEntry.key) : mapEntry.key != null) { - return false; - } - if (value != null ? !value.equals(mapEntry.value) : mapEntry.value != null) { + if ((key != null ? !key.equals(mapEntry.key) : mapEntry.key != null) + || (value != null ? !value.equals(mapEntry.value) : mapEntry.value != null)) { return false; } diff --git a/src/test/java/org/apache/ibatis/submitted/foreach_map/NestedBeanMapEntry.java b/src/test/java/org/apache/ibatis/submitted/foreach_map/NestedBeanMapEntry.java index 127547cf73d..34e4db40c86 100644 --- a/src/test/java/org/apache/ibatis/submitted/foreach_map/NestedBeanMapEntry.java +++ b/src/test/java/org/apache/ibatis/submitted/foreach_map/NestedBeanMapEntry.java @@ -71,16 +71,8 @@ public boolean equals(Object o) { NestedBeanMapEntry map3Entry = (NestedBeanMapEntry) o; - if (!Objects.equals(keya, map3Entry.keya)) { - return false; - } - if (!Objects.equals(keyb, map3Entry.keyb)) { - return false; - } - if (!Objects.equals(valuea, map3Entry.valuea)) { - return false; - } - if (!Objects.equals(valueb, map3Entry.valueb)) { + if (!Objects.equals(keya, map3Entry.keya) || !Objects.equals(keyb, map3Entry.keyb) + || !Objects.equals(valuea, map3Entry.valuea) || !Objects.equals(valueb, map3Entry.valueb)) { return false; } diff --git a/src/test/java/org/apache/ibatis/submitted/foreach_map/StringStringMapEntry.java b/src/test/java/org/apache/ibatis/submitted/foreach_map/StringStringMapEntry.java index dcb38ef4ba3..36991bd6bb4 100644 --- a/src/test/java/org/apache/ibatis/submitted/foreach_map/StringStringMapEntry.java +++ b/src/test/java/org/apache/ibatis/submitted/foreach_map/StringStringMapEntry.java @@ -51,10 +51,8 @@ public boolean equals(Object o) { StringStringMapEntry mapEntry = (StringStringMapEntry) o; - if (key != null ? !key.equals(mapEntry.key) : mapEntry.key != null) { - return false; - } - if (value != null ? !value.equals(mapEntry.value) : mapEntry.value != null) { + if ((key != null ? !key.equals(mapEntry.key) : mapEntry.key != null) + || (value != null ? !value.equals(mapEntry.value) : mapEntry.value != null)) { return false; } diff --git a/src/test/java/org/apache/ibatis/submitted/includes/IncludeTest.java b/src/test/java/org/apache/ibatis/submitted/includes/IncludeTest.java index 6dfb09b0600..97837a7bdd6 100644 --- a/src/test/java/org/apache/ibatis/submitted/includes/IncludeTest.java +++ b/src/test/java/org/apache/ibatis/submitted/includes/IncludeTest.java @@ -16,7 +16,6 @@ package org.apache.ibatis.submitted.includes; import java.io.Reader; -import java.util.Map; import org.apache.ibatis.BaseDataTest; import org.apache.ibatis.io.Resources; @@ -54,8 +53,7 @@ void testIncludes() { @Test void testParametrizedIncludes() { try (SqlSession sqlSession = sqlSessionFactory.openSession()) { - final Map result = sqlSession.selectOne("org.apache.ibatis.submitted.includes.mapper.select"); - // Assertions.assertEquals(Integer.valueOf(1), result); + sqlSession.selectOne("org.apache.ibatis.submitted.includes.mapper.select"); } } From 642860e3a60b6285e7218c82aad45aea58789af3 Mon Sep 17 00:00:00 2001 From: Jeremy Landis Date: Mon, 20 Feb 2023 18:11:25 -0500 Subject: [PATCH 09/11] [ci] Better parsing wrapper classes --- src/test/java/org/apache/ibatis/reflection/ArrayUtilTest.java | 2 +- .../submitted/typehandlerinjection/UserStateTypeHandler.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/test/java/org/apache/ibatis/reflection/ArrayUtilTest.java b/src/test/java/org/apache/ibatis/reflection/ArrayUtilTest.java index afc113a66de..b4b475e7a9a 100644 --- a/src/test/java/org/apache/ibatis/reflection/ArrayUtilTest.java +++ b/src/test/java/org/apache/ibatis/reflection/ArrayUtilTest.java @@ -104,7 +104,7 @@ void testToString() { arr = new Object[] { "str" }; assertEquals(Arrays.toString((Object[]) arr), ArrayUtil.toString(arr)); - assertEquals(Integer.valueOf(1).toString(), ArrayUtil.toString(1)); + assertEquals(Integer.toString(1), ArrayUtil.toString(1)); assertEquals("null", ArrayUtil.toString(null)); } diff --git a/src/test/java/org/apache/ibatis/submitted/typehandlerinjection/UserStateTypeHandler.java b/src/test/java/org/apache/ibatis/submitted/typehandlerinjection/UserStateTypeHandler.java index ce442c625d0..92a1fe722e5 100644 --- a/src/test/java/org/apache/ibatis/submitted/typehandlerinjection/UserStateTypeHandler.java +++ b/src/test/java/org/apache/ibatis/submitted/typehandlerinjection/UserStateTypeHandler.java @@ -64,7 +64,7 @@ public void setParameter(PreparedStatement ps, int i, Object value, JdbcType jdb key = entry.getKey(); } } - ps.setInt(i, Integer.valueOf(key)); + ps.setInt(i, Integer.parseInt(key)); } private String lookupValue(int val) { From de5246de1c0617246c429e83d1bfbadb2a60fbbf Mon Sep 17 00:00:00 2001 From: Jeremy Landis Date: Mon, 20 Feb 2023 18:12:27 -0500 Subject: [PATCH 10/11] [ci] Remove public from methods in interfaces --- .../annotion_many_one_add_columnprefix/RoleDao.java | 2 +- .../annotion_many_one_add_resultmapid/RoleDao.java | 2 +- .../annotion_many_one_add_resultmapid/UserDao.java | 10 +++++----- .../orphan_result_maps/NestedCollectionMapper.java | 2 +- .../orphan_result_maps/SeparateCollectionMapper.java | 2 +- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/test/java/org/apache/ibatis/submitted/annotion_many_one_add_columnprefix/RoleDao.java b/src/test/java/org/apache/ibatis/submitted/annotion_many_one_add_columnprefix/RoleDao.java index 3ea9fe6521a..ee6d0cbaf24 100644 --- a/src/test/java/org/apache/ibatis/submitted/annotion_many_one_add_columnprefix/RoleDao.java +++ b/src/test/java/org/apache/ibatis/submitted/annotion_many_one_add_columnprefix/RoleDao.java @@ -32,5 +32,5 @@ public interface RoleDao { @Result(column = "name", property = "name") }) // @formatter:on - public List findAll(); + List findAll(); } diff --git a/src/test/java/org/apache/ibatis/submitted/annotion_many_one_add_resultmapid/RoleDao.java b/src/test/java/org/apache/ibatis/submitted/annotion_many_one_add_resultmapid/RoleDao.java index 239f9e924ef..f80a116d232 100644 --- a/src/test/java/org/apache/ibatis/submitted/annotion_many_one_add_resultmapid/RoleDao.java +++ b/src/test/java/org/apache/ibatis/submitted/annotion_many_one_add_resultmapid/RoleDao.java @@ -32,5 +32,5 @@ public interface RoleDao { @Result(column = "role_name", property = "roleName") }) // @formatter:on - public List findAll(); + List findAll(); } 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 1315d172f5f..f3410c4f334 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 @@ -39,7 +39,7 @@ public interface UserDao { @Result(property = "roles", many = @Many(resultMap = "org.apache.ibatis.submitted.annotion_many_one_add_resultmapid.RoleDao.roleMap1")) }) // @formatter:on - public List findAll(); + List findAll(); // @formatter:off @Select({"select", @@ -53,7 +53,7 @@ public interface UserDao { @Result(property = "roles", many = @Many(resultMap = "org.apache.ibatis.submitted.annotion_many_one_add_resultmapid.RoleDao.roleMap2")) }) // @formatter:on - public List findAll2(); + List findAll2(); // @formatter:off @Select({"select", @@ -67,7 +67,7 @@ public interface UserDao { @Result(property = "role", one = @One(resultMap = "org.apache.ibatis.submitted.annotion_many_one_add_resultmapid.RoleDao.roleMap2")) }) // @formatter:on - public List findAll3(); + List findAll3(); // @formatter:off @Select("select id teacher_id, username teacher_name from user") @@ -76,7 +76,7 @@ public interface UserDao { @Result(column = "teacher_name", property = "username") }) // @formatter:on - public List justUseResult(); + List justUseResult(); // @formatter:off @Select({"select", @@ -93,5 +93,5 @@ public interface UserDao { @Result(property = "teachers", many = @Many(resultMap = "userMap")) }) // @formatter:on - public User findHeadmaster(); + User findHeadmaster(); } diff --git a/src/test/java/org/apache/ibatis/submitted/orphan_result_maps/NestedCollectionMapper.java b/src/test/java/org/apache/ibatis/submitted/orphan_result_maps/NestedCollectionMapper.java index 4b13b613b19..c4ecc63aa10 100644 --- a/src/test/java/org/apache/ibatis/submitted/orphan_result_maps/NestedCollectionMapper.java +++ b/src/test/java/org/apache/ibatis/submitted/orphan_result_maps/NestedCollectionMapper.java @@ -17,6 +17,6 @@ public interface NestedCollectionMapper { - public Blog selectBlogWithPosts(int blogId); + Blog selectBlogWithPosts(int blogId); } diff --git a/src/test/java/org/apache/ibatis/submitted/orphan_result_maps/SeparateCollectionMapper.java b/src/test/java/org/apache/ibatis/submitted/orphan_result_maps/SeparateCollectionMapper.java index 9f6b921384e..793e112aa7a 100644 --- a/src/test/java/org/apache/ibatis/submitted/orphan_result_maps/SeparateCollectionMapper.java +++ b/src/test/java/org/apache/ibatis/submitted/orphan_result_maps/SeparateCollectionMapper.java @@ -17,6 +17,6 @@ public interface SeparateCollectionMapper { - public Blog selectBlogWithPosts(int blogId); + Blog selectBlogWithPosts(int blogId); } From 9214c1d19f0aa823ac277cb9c79368a0b60f76c8 Mon Sep 17 00:00:00 2001 From: Jeremy Landis Date: Mon, 20 Feb 2023 18:15:43 -0500 Subject: [PATCH 11/11] [ci] Formatting / update copyright dates --- .../org/apache/ibatis/domain/blog/ComplexImmutableAuthorId.java | 2 +- .../org/apache/ibatis/domain/misc/CustomBeanWrapperFactory.java | 2 +- src/test/java/org/apache/ibatis/domain/misc/RichType.java | 2 +- .../java/org/apache/ibatis/executor/ExecutorTestHelper.java | 2 +- .../submitted/arg_name_based_constructor_automapping/Task.java | 2 +- .../java/org/apache/ibatis/submitted/blocking_cache/Person.java | 2 +- src/test/java/org/apache/ibatis/submitted/cache/Person.java | 2 +- .../java/org/apache/ibatis/submitted/column_prefix/Address.java | 2 +- .../submitted/column_prefix/ColumnPrefixNestedQueryTest.java | 2 +- .../apache/ibatis/submitted/constructor_automapping/Author.java | 2 +- .../org/apache/ibatis/submitted/empty_row/ImmutableParent.java | 2 +- .../java/org/apache/ibatis/submitted/includes/IncludeTest.java | 2 +- .../apache/ibatis/submitted/mapper_type_parameter/Country.java | 2 +- .../apache/ibatis/submitted/mapper_type_parameter/Person.java | 2 +- .../org/apache/ibatis/submitted/nested/NestedForEachTest.java | 2 +- .../java/org/apache/ibatis/submitted/null_associations/Bar.java | 2 +- .../java/org/apache/ibatis/submitted/null_associations/Foo.java | 2 +- .../apache/ibatis/submitted/order_prefix_removed/Person.java | 2 +- .../submitted/orphan_result_maps/NestedCollectionMapper.java | 2 +- .../submitted/orphan_result_maps/SeparateCollectionMapper.java | 2 +- .../org/apache/ibatis/submitted/overwritingproperties/Bar.java | 2 +- .../org/apache/ibatis/submitted/overwritingproperties/Foo.java | 2 +- src/test/java/org/apache/ibatis/submitted/results_id/User.java | 2 +- .../org/apache/ibatis/submitted/sqlprovider/OurSqlBuilder.java | 2 +- .../java/org/apache/ibatis/submitted/typehandler/Product.java | 2 +- .../ibatis/submitted/typehandler/StringTrimmingTypeHandler.java | 2 +- .../java/org/apache/ibatis/submitted/xml_external_ref/Dog.java | 2 +- .../java/org/apache/ibatis/testcontainers/MysqlContainer.java | 2 +- src/test/java/org/apache/ibatis/testcontainers/PgContainer.java | 2 +- .../java/org/apache/ibatis/transaction/jdbc/TestConnection.java | 2 +- src/test/java/org/apache/ibatis/type/ArrayTypeHandlerTest.java | 2 +- src/test/java/org/apache/ibatis/type/BlobTypeHandlerTest.java | 2 +- .../org/apache/ibatis/type/ByteObjectArrayTypeHandlerTest.java | 2 +- src/test/java/org/apache/ibatis/type/ClobTypeHandlerTest.java | 2 +- src/test/java/org/apache/ibatis/type/NClobTypeHandlerTest.java | 2 +- 35 files changed, 35 insertions(+), 35 deletions(-) diff --git a/src/test/java/org/apache/ibatis/domain/blog/ComplexImmutableAuthorId.java b/src/test/java/org/apache/ibatis/domain/blog/ComplexImmutableAuthorId.java index 8e7277a21d7..1398cca73c6 100644 --- a/src/test/java/org/apache/ibatis/domain/blog/ComplexImmutableAuthorId.java +++ b/src/test/java/org/apache/ibatis/domain/blog/ComplexImmutableAuthorId.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. diff --git a/src/test/java/org/apache/ibatis/domain/misc/CustomBeanWrapperFactory.java b/src/test/java/org/apache/ibatis/domain/misc/CustomBeanWrapperFactory.java index 8b863b20c32..8b84e461475 100644 --- a/src/test/java/org/apache/ibatis/domain/misc/CustomBeanWrapperFactory.java +++ b/src/test/java/org/apache/ibatis/domain/misc/CustomBeanWrapperFactory.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. diff --git a/src/test/java/org/apache/ibatis/domain/misc/RichType.java b/src/test/java/org/apache/ibatis/domain/misc/RichType.java index 10a6fceb7f6..4f38fe9ed7d 100644 --- a/src/test/java/org/apache/ibatis/domain/misc/RichType.java +++ b/src/test/java/org/apache/ibatis/domain/misc/RichType.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. diff --git a/src/test/java/org/apache/ibatis/executor/ExecutorTestHelper.java b/src/test/java/org/apache/ibatis/executor/ExecutorTestHelper.java index eaab5800ab5..c0900f01784 100644 --- a/src/test/java/org/apache/ibatis/executor/ExecutorTestHelper.java +++ b/src/test/java/org/apache/ibatis/executor/ExecutorTestHelper.java @@ -642,7 +642,7 @@ static MappedStatement prepareSelectPostWithBlogByAuthorMappedStatement(final Co { add(new ResultMapping.Builder(config, "id", "tag_id", registry.getTypeHandler(int.class)) .flags(new ArrayList() { - private static final long serialVersionUID = 1L; + private static final long serialVersionUID = 1L; { add(ResultFlag.ID); } diff --git a/src/test/java/org/apache/ibatis/submitted/arg_name_based_constructor_automapping/Task.java b/src/test/java/org/apache/ibatis/submitted/arg_name_based_constructor_automapping/Task.java index 04488b79223..a0409c68319 100644 --- a/src/test/java/org/apache/ibatis/submitted/arg_name_based_constructor_automapping/Task.java +++ b/src/test/java/org/apache/ibatis/submitted/arg_name_based_constructor_automapping/Task.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. diff --git a/src/test/java/org/apache/ibatis/submitted/blocking_cache/Person.java b/src/test/java/org/apache/ibatis/submitted/blocking_cache/Person.java index 92d7426b560..0b6570c9dd9 100644 --- a/src/test/java/org/apache/ibatis/submitted/blocking_cache/Person.java +++ b/src/test/java/org/apache/ibatis/submitted/blocking_cache/Person.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. diff --git a/src/test/java/org/apache/ibatis/submitted/cache/Person.java b/src/test/java/org/apache/ibatis/submitted/cache/Person.java index a58e4050239..f80df9d719c 100644 --- a/src/test/java/org/apache/ibatis/submitted/cache/Person.java +++ b/src/test/java/org/apache/ibatis/submitted/cache/Person.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. diff --git a/src/test/java/org/apache/ibatis/submitted/column_prefix/Address.java b/src/test/java/org/apache/ibatis/submitted/column_prefix/Address.java index 092bcbac559..7f7ada17a50 100644 --- a/src/test/java/org/apache/ibatis/submitted/column_prefix/Address.java +++ b/src/test/java/org/apache/ibatis/submitted/column_prefix/Address.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. diff --git a/src/test/java/org/apache/ibatis/submitted/column_prefix/ColumnPrefixNestedQueryTest.java b/src/test/java/org/apache/ibatis/submitted/column_prefix/ColumnPrefixNestedQueryTest.java index bbcb8b8d4d6..21c9c76a531 100644 --- a/src/test/java/org/apache/ibatis/submitted/column_prefix/ColumnPrefixNestedQueryTest.java +++ b/src/test/java/org/apache/ibatis/submitted/column_prefix/ColumnPrefixNestedQueryTest.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. diff --git a/src/test/java/org/apache/ibatis/submitted/constructor_automapping/Author.java b/src/test/java/org/apache/ibatis/submitted/constructor_automapping/Author.java index 9970dda6aa9..c91209c2fa5 100644 --- a/src/test/java/org/apache/ibatis/submitted/constructor_automapping/Author.java +++ b/src/test/java/org/apache/ibatis/submitted/constructor_automapping/Author.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. diff --git a/src/test/java/org/apache/ibatis/submitted/empty_row/ImmutableParent.java b/src/test/java/org/apache/ibatis/submitted/empty_row/ImmutableParent.java index eea08ed265d..1e1c36d793c 100644 --- a/src/test/java/org/apache/ibatis/submitted/empty_row/ImmutableParent.java +++ b/src/test/java/org/apache/ibatis/submitted/empty_row/ImmutableParent.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. diff --git a/src/test/java/org/apache/ibatis/submitted/includes/IncludeTest.java b/src/test/java/org/apache/ibatis/submitted/includes/IncludeTest.java index 97837a7bdd6..2bbcf4da424 100644 --- a/src/test/java/org/apache/ibatis/submitted/includes/IncludeTest.java +++ b/src/test/java/org/apache/ibatis/submitted/includes/IncludeTest.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. diff --git a/src/test/java/org/apache/ibatis/submitted/mapper_type_parameter/Country.java b/src/test/java/org/apache/ibatis/submitted/mapper_type_parameter/Country.java index 2a445764686..694c3f3718b 100644 --- a/src/test/java/org/apache/ibatis/submitted/mapper_type_parameter/Country.java +++ b/src/test/java/org/apache/ibatis/submitted/mapper_type_parameter/Country.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. diff --git a/src/test/java/org/apache/ibatis/submitted/mapper_type_parameter/Person.java b/src/test/java/org/apache/ibatis/submitted/mapper_type_parameter/Person.java index 9c3b1baf719..dd89b378fca 100644 --- a/src/test/java/org/apache/ibatis/submitted/mapper_type_parameter/Person.java +++ b/src/test/java/org/apache/ibatis/submitted/mapper_type_parameter/Person.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. diff --git a/src/test/java/org/apache/ibatis/submitted/nested/NestedForEachTest.java b/src/test/java/org/apache/ibatis/submitted/nested/NestedForEachTest.java index 5a75f1559b9..d1a8be9b2d3 100644 --- a/src/test/java/org/apache/ibatis/submitted/nested/NestedForEachTest.java +++ b/src/test/java/org/apache/ibatis/submitted/nested/NestedForEachTest.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. diff --git a/src/test/java/org/apache/ibatis/submitted/null_associations/Bar.java b/src/test/java/org/apache/ibatis/submitted/null_associations/Bar.java index b348d412e36..82d052389d5 100644 --- a/src/test/java/org/apache/ibatis/submitted/null_associations/Bar.java +++ b/src/test/java/org/apache/ibatis/submitted/null_associations/Bar.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. diff --git a/src/test/java/org/apache/ibatis/submitted/null_associations/Foo.java b/src/test/java/org/apache/ibatis/submitted/null_associations/Foo.java index 9268a0f3f82..9dc93e8b76f 100644 --- a/src/test/java/org/apache/ibatis/submitted/null_associations/Foo.java +++ b/src/test/java/org/apache/ibatis/submitted/null_associations/Foo.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. diff --git a/src/test/java/org/apache/ibatis/submitted/order_prefix_removed/Person.java b/src/test/java/org/apache/ibatis/submitted/order_prefix_removed/Person.java index a9168e0f7c7..a191f7ba7d9 100644 --- a/src/test/java/org/apache/ibatis/submitted/order_prefix_removed/Person.java +++ b/src/test/java/org/apache/ibatis/submitted/order_prefix_removed/Person.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. diff --git a/src/test/java/org/apache/ibatis/submitted/orphan_result_maps/NestedCollectionMapper.java b/src/test/java/org/apache/ibatis/submitted/orphan_result_maps/NestedCollectionMapper.java index c4ecc63aa10..0738f02705e 100644 --- a/src/test/java/org/apache/ibatis/submitted/orphan_result_maps/NestedCollectionMapper.java +++ b/src/test/java/org/apache/ibatis/submitted/orphan_result_maps/NestedCollectionMapper.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. diff --git a/src/test/java/org/apache/ibatis/submitted/orphan_result_maps/SeparateCollectionMapper.java b/src/test/java/org/apache/ibatis/submitted/orphan_result_maps/SeparateCollectionMapper.java index 793e112aa7a..f35949d31c0 100644 --- a/src/test/java/org/apache/ibatis/submitted/orphan_result_maps/SeparateCollectionMapper.java +++ b/src/test/java/org/apache/ibatis/submitted/orphan_result_maps/SeparateCollectionMapper.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. diff --git a/src/test/java/org/apache/ibatis/submitted/overwritingproperties/Bar.java b/src/test/java/org/apache/ibatis/submitted/overwritingproperties/Bar.java index de52fb4696c..9e080adf606 100644 --- a/src/test/java/org/apache/ibatis/submitted/overwritingproperties/Bar.java +++ b/src/test/java/org/apache/ibatis/submitted/overwritingproperties/Bar.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. diff --git a/src/test/java/org/apache/ibatis/submitted/overwritingproperties/Foo.java b/src/test/java/org/apache/ibatis/submitted/overwritingproperties/Foo.java index f99060a72fb..9b433f435c9 100644 --- a/src/test/java/org/apache/ibatis/submitted/overwritingproperties/Foo.java +++ b/src/test/java/org/apache/ibatis/submitted/overwritingproperties/Foo.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. diff --git a/src/test/java/org/apache/ibatis/submitted/results_id/User.java b/src/test/java/org/apache/ibatis/submitted/results_id/User.java index 6123f7c7148..b6ea869530f 100644 --- a/src/test/java/org/apache/ibatis/submitted/results_id/User.java +++ b/src/test/java/org/apache/ibatis/submitted/results_id/User.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. diff --git a/src/test/java/org/apache/ibatis/submitted/sqlprovider/OurSqlBuilder.java b/src/test/java/org/apache/ibatis/submitted/sqlprovider/OurSqlBuilder.java index 0258082db89..9dbedc7d6fd 100644 --- a/src/test/java/org/apache/ibatis/submitted/sqlprovider/OurSqlBuilder.java +++ b/src/test/java/org/apache/ibatis/submitted/sqlprovider/OurSqlBuilder.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. diff --git a/src/test/java/org/apache/ibatis/submitted/typehandler/Product.java b/src/test/java/org/apache/ibatis/submitted/typehandler/Product.java index 7f7335935cb..47228eb86e4 100644 --- a/src/test/java/org/apache/ibatis/submitted/typehandler/Product.java +++ b/src/test/java/org/apache/ibatis/submitted/typehandler/Product.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. diff --git a/src/test/java/org/apache/ibatis/submitted/typehandler/StringTrimmingTypeHandler.java b/src/test/java/org/apache/ibatis/submitted/typehandler/StringTrimmingTypeHandler.java index c29b2c348f3..f9062c1b2e6 100644 --- a/src/test/java/org/apache/ibatis/submitted/typehandler/StringTrimmingTypeHandler.java +++ b/src/test/java/org/apache/ibatis/submitted/typehandler/StringTrimmingTypeHandler.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. diff --git a/src/test/java/org/apache/ibatis/submitted/xml_external_ref/Dog.java b/src/test/java/org/apache/ibatis/submitted/xml_external_ref/Dog.java index cdb85ef7490..25d672953ea 100644 --- a/src/test/java/org/apache/ibatis/submitted/xml_external_ref/Dog.java +++ b/src/test/java/org/apache/ibatis/submitted/xml_external_ref/Dog.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. diff --git a/src/test/java/org/apache/ibatis/testcontainers/MysqlContainer.java b/src/test/java/org/apache/ibatis/testcontainers/MysqlContainer.java index e00c18b3b15..0d253c6a82d 100644 --- a/src/test/java/org/apache/ibatis/testcontainers/MysqlContainer.java +++ b/src/test/java/org/apache/ibatis/testcontainers/MysqlContainer.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. diff --git a/src/test/java/org/apache/ibatis/testcontainers/PgContainer.java b/src/test/java/org/apache/ibatis/testcontainers/PgContainer.java index c04f9cb6332..cc3e6568b6d 100644 --- a/src/test/java/org/apache/ibatis/testcontainers/PgContainer.java +++ b/src/test/java/org/apache/ibatis/testcontainers/PgContainer.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. diff --git a/src/test/java/org/apache/ibatis/transaction/jdbc/TestConnection.java b/src/test/java/org/apache/ibatis/transaction/jdbc/TestConnection.java index 4f3e0596f66..603482543ee 100644 --- a/src/test/java/org/apache/ibatis/transaction/jdbc/TestConnection.java +++ b/src/test/java/org/apache/ibatis/transaction/jdbc/TestConnection.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. diff --git a/src/test/java/org/apache/ibatis/type/ArrayTypeHandlerTest.java b/src/test/java/org/apache/ibatis/type/ArrayTypeHandlerTest.java index aa365d3b059..cf4e25f0b5f 100644 --- a/src/test/java/org/apache/ibatis/type/ArrayTypeHandlerTest.java +++ b/src/test/java/org/apache/ibatis/type/ArrayTypeHandlerTest.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. diff --git a/src/test/java/org/apache/ibatis/type/BlobTypeHandlerTest.java b/src/test/java/org/apache/ibatis/type/BlobTypeHandlerTest.java index 21239d85d5a..c7334ff0002 100644 --- a/src/test/java/org/apache/ibatis/type/BlobTypeHandlerTest.java +++ b/src/test/java/org/apache/ibatis/type/BlobTypeHandlerTest.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. diff --git a/src/test/java/org/apache/ibatis/type/ByteObjectArrayTypeHandlerTest.java b/src/test/java/org/apache/ibatis/type/ByteObjectArrayTypeHandlerTest.java index cb91c0b0900..f8d329109a5 100644 --- a/src/test/java/org/apache/ibatis/type/ByteObjectArrayTypeHandlerTest.java +++ b/src/test/java/org/apache/ibatis/type/ByteObjectArrayTypeHandlerTest.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. diff --git a/src/test/java/org/apache/ibatis/type/ClobTypeHandlerTest.java b/src/test/java/org/apache/ibatis/type/ClobTypeHandlerTest.java index 098ff3062b4..5176d7a5a2f 100644 --- a/src/test/java/org/apache/ibatis/type/ClobTypeHandlerTest.java +++ b/src/test/java/org/apache/ibatis/type/ClobTypeHandlerTest.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. diff --git a/src/test/java/org/apache/ibatis/type/NClobTypeHandlerTest.java b/src/test/java/org/apache/ibatis/type/NClobTypeHandlerTest.java index 31d5f3c79d3..75bd4b725dd 100644 --- a/src/test/java/org/apache/ibatis/type/NClobTypeHandlerTest.java +++ b/src/test/java/org/apache/ibatis/type/NClobTypeHandlerTest.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.