mybatis#101: Compatibility with java 11, and remove star imports

Author: epochcoder

src/main/java/org/apache/ibatis/executor/resultset/DefaultResultSetHandler.java

@@ -24,6 +24,7 @@
 import java.text.MessageFormat;
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Collection;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
@@ -673,9 +674,9 @@ private Object createResultObject(ResultSetWrapper rsw, ResultMap resultMap, Res
       }
 
       // (issue #101)
-      if (resultMap.hasResultMapsUsingConstructorCollection()
-          && resultObject instanceof PendingConstructorCreation pcc) {
-        linkNestedPendingCreations(rsw, resultMap, columnPrefix, parentRowKey, pcc, resultObject, constructorArgs);
+      if (resultMap.hasResultMapsUsingConstructorCollection() && resultObject instanceof PendingConstructorCreation) {
+        linkNestedPendingCreations(rsw, resultMap, columnPrefix, parentRowKey,
+            (PendingConstructorCreation) resultObject, constructorArgs);
       }
     }
 
@@ -1098,25 +1099,25 @@ private void handleRowValuesForNestedResultMap(ResultSetWrapper rsw, ResultMap r
   // NESTED RESULT MAP (PENDING CONSTRUCTOR CREATIONS)
   //
   private void linkNestedPendingCreations(ResultSetWrapper rsw, ResultMap resultMap, String columnPrefix,
-      CacheKey parentRowKey, PendingConstructorCreation pendingCreation, Object resultObject,
-      List<Object> constructorArgs) throws SQLException {
+      CacheKey parentRowKey, PendingConstructorCreation pendingCreation, List<Object> constructorArgs)
+      throws SQLException {
     final CacheKey rowKey = createRowKey(resultMap, rsw, columnPrefix);
     final CacheKey combinedKey = combineKeys(rowKey, parentRowKey);
 
     if (combinedKey != CacheKey.NULL_CACHE_KEY) {
-      nestedResultObjects.put(combinedKey, resultObject);
+      nestedResultObjects.put(combinedKey, pendingCreation);
     }
 
     final List<ResultMapping> constructorMappings = resultMap.getConstructorResultMappings();
     for (int index = 0; index < constructorMappings.size(); index++) {
-      final var constructorMapping = constructorMappings.get(index);
-      final var nestedResultMapId = constructorMapping.getNestedResultMapId();
+      final ResultMapping constructorMapping = constructorMappings.get(index);
+      final String nestedResultMapId = constructorMapping.getNestedResultMapId();
 
       if (nestedResultMapId == null) {
         continue;
       }
 
-      final var javaType = constructorMapping.getJavaType();
+      final Class<?> javaType = constructorMapping.getJavaType();
       if (javaType == null || !objectFactory.isCollection(javaType)) {
         continue;
       }
@@ -1131,8 +1132,8 @@ private void linkNestedPendingCreations(ResultSetWrapper rsw, ResultMap resultMa
       final boolean alreadyCreatedCollection = hasValue && objectFactory.isCollection(actualValue.getClass());
 
       if (!isInnerCreation) {
-        final var value = pendingCreation.initializeCollectionForResultMapping(objectFactory, nestedResultMap,
-            constructorMapping, index);
+        final Collection<Object> value = pendingCreation.initializeCollectionForResultMapping(objectFactory,
+            nestedResultMap, constructorMapping, index);
         if (!alreadyCreatedCollection) {
           // override values with empty collection
           constructorArgs.set(index, value);
@@ -1151,9 +1152,8 @@ private void linkNestedPendingCreations(ResultSetWrapper rsw, ResultMap resultMa
         }
       } else {
         final PendingConstructorCreation innerCreation = (PendingConstructorCreation) actualValue;
-
-        final var value = pendingCreation.initializeCollectionForResultMapping(objectFactory, nestedResultMap,
-            constructorMapping, index);
+        final Collection<Object> value = pendingCreation.initializeCollectionForResultMapping(objectFactory,
+            nestedResultMap, constructorMapping, index);
         // we will fill this collection when building the final object
         constructorArgs.set(index, value);
         // link the creation for building later

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

@@ -19,11 +19,25 @@
 import static com.googlecode.catchexception.apis.BDDCatchException.when;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 import static org.assertj.core.api.BDDAssertions.then;
-import static org.junit.jupiter.api.Assertions.*;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNotSame;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertSame;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.io.IOException;
 import java.lang.reflect.Method;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
 
 import javassist.util.proxy.Proxy;
 
@@ -34,11 +48,19 @@
 import org.apache.ibatis.BaseDataTest;
 import org.apache.ibatis.binding.MapperProxy.MapperMethodInvoker;
 import org.apache.ibatis.cursor.Cursor;
-import org.apache.ibatis.domain.blog.*;
+import org.apache.ibatis.domain.blog.Author;
+import org.apache.ibatis.domain.blog.Blog;
+import org.apache.ibatis.domain.blog.DraftPost;
+import org.apache.ibatis.domain.blog.Post;
+import org.apache.ibatis.domain.blog.Section;
 import org.apache.ibatis.exceptions.PersistenceException;
 import org.apache.ibatis.executor.result.DefaultResultHandler;
 import org.apache.ibatis.mapping.Environment;
-import org.apache.ibatis.session.*;
+import org.apache.ibatis.session.Configuration;
+import org.apache.ibatis.session.RowBounds;
+import org.apache.ibatis.session.SqlSession;
+import org.apache.ibatis.session.SqlSessionFactory;
+import org.apache.ibatis.session.SqlSessionFactoryBuilder;
 import org.apache.ibatis.transaction.TransactionFactory;
 import org.apache.ibatis.transaction.jdbc.JdbcTransactionFactory;
 import org.junit.jupiter.api.Assertions;

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

@@ -18,7 +18,20 @@
 import java.util.List;
 import java.util.Map;
 
-import org.apache.ibatis.annotations.*;
+import org.apache.ibatis.annotations.Arg;
+import org.apache.ibatis.annotations.CacheNamespace;
+import org.apache.ibatis.annotations.Case;
+import org.apache.ibatis.annotations.ConstructorArgs;
+import org.apache.ibatis.annotations.Many;
+import org.apache.ibatis.annotations.MapKey;
+import org.apache.ibatis.annotations.One;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Result;
+import org.apache.ibatis.annotations.ResultType;
+import org.apache.ibatis.annotations.Results;
+import org.apache.ibatis.annotations.Select;
+import org.apache.ibatis.annotations.SelectProvider;
+import org.apache.ibatis.annotations.TypeDiscriminator;
 import org.apache.ibatis.cursor.Cursor;
 import org.apache.ibatis.domain.blog.Author;
 import org.apache.ibatis.domain.blog.Blog;

src/test/java/org/apache/ibatis/executor/resultset/DefaultResultSetHandlerTest.java

@@ -20,7 +20,13 @@
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
-import java.sql.*;
+import java.sql.Connection;
+import java.sql.DatabaseMetaData;
+import java.sql.ResultSet;
+import java.sql.ResultSetMetaData;
+import java.sql.SQLException;
+import java.sql.Statement;
+import java.sql.Types;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashMap;
@@ -30,7 +36,11 @@
 import org.apache.ibatis.executor.Executor;
 import org.apache.ibatis.executor.ExecutorException;
 import org.apache.ibatis.executor.parameter.ParameterHandler;
-import org.apache.ibatis.mapping.*;
+import org.apache.ibatis.mapping.BoundSql;
+import org.apache.ibatis.mapping.MappedStatement;
+import org.apache.ibatis.mapping.ResultMap;
+import org.apache.ibatis.mapping.ResultMapping;
+import org.apache.ibatis.mapping.SqlCommandType;
 import org.apache.ibatis.session.Configuration;
 import org.apache.ibatis.session.ResultHandler;
 import org.apache.ibatis.session.RowBounds;

src/test/java/org/apache/ibatis/immutable/ImmutableConstructorTest.java

@@ -15,7 +15,9 @@
  */
 package org.apache.ibatis.immutable;
 
-import static org.assertj.core.api.Assertions.*;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+import static org.assertj.core.api.Assertions.tuple;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import java.util.List;

src/test/java/org/apache/ibatis/session/SqlSessionTest.java

@@ -15,17 +15,32 @@
  */
 package org.apache.ibatis.session;
 
-import static org.junit.jupiter.api.Assertions.*;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
 
 import java.io.Reader;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
 
 import javassist.util.proxy.Proxy;
 
 import org.apache.ibatis.BaseDataTest;
 import org.apache.ibatis.binding.BindingException;
 import org.apache.ibatis.cache.impl.PerpetualCache;
-import org.apache.ibatis.domain.blog.*;
+import org.apache.ibatis.domain.blog.Author;
+import org.apache.ibatis.domain.blog.Blog;
+import org.apache.ibatis.domain.blog.Comment;
+import org.apache.ibatis.domain.blog.DraftPost;
+import org.apache.ibatis.domain.blog.Post;
+import org.apache.ibatis.domain.blog.Section;
+import org.apache.ibatis.domain.blog.Tag;
 import org.apache.ibatis.domain.blog.immutable.ImmutableAuthor;
 import org.apache.ibatis.domain.blog.mappers.AuthorMapper;
 import org.apache.ibatis.domain.blog.mappers.AuthorMapperWithMultipleHandlers;

src/test/java/org/apache/ibatis/submitted/custom_collection_handling/CustomObjectFactory.java

@@ -17,7 +17,17 @@
 
 import java.lang.reflect.Array;
 import java.lang.reflect.Constructor;
-import java.util.*;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.LinkedHashMap;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.Set;
+import java.util.SortedSet;
+import java.util.TreeSet;
 import java.util.stream.Collectors;
 
 import org.apache.ibatis.reflection.ReflectionException;