Merge pull request #983 from hazendaz/tests

[source] Cleanup source code

Author: hazendaz

src/main/java/org/mybatis/spring/MyBatisExceptionTranslator.java

@@ -79,7 +79,7 @@ public DataAccessException translateExceptionIfPossible(RuntimeException e) {
     if (e instanceof PersistenceException) {
       // Batch exceptions come inside another PersistenceException
       // recursion has a risk of infinite loop so better make another if
-      String msg = e.getMessage();
+      var msg = e.getMessage();
       if (e.getCause() instanceof PersistenceException) {
         e = (PersistenceException) e.getCause();
         if (msg == null) {
@@ -88,11 +88,12 @@ public DataAccessException translateExceptionIfPossible(RuntimeException e) {
       }
       if (e.getCause() instanceof SQLException) {
         this.initExceptionTranslator();
-        String task = e.getMessage() + "\n";
-        SQLException se = (SQLException) e.getCause();
-        DataAccessException dae = this.exceptionTranslator.translate(task, null, se);
+        var task = e.getMessage() + "\n";
+        var se = (SQLException) e.getCause();
+        var dae = this.exceptionTranslator.translate(task, null, se);
         return dae != null ? dae : new UncategorizedSQLException(task, null, se);
-      } else if (e.getCause() instanceof TransactionException) {
+      }
+      if (e.getCause() instanceof TransactionException) {
         throw (TransactionException) e.getCause();
       }
       return new MyBatisSystemException(msg, e);

src/main/java/org/mybatis/spring/SqlSessionFactoryBean.java

@@ -64,7 +64,6 @@
 import org.springframework.core.io.Resource;
 import org.springframework.core.io.support.PathMatchingResourcePatternResolver;
 import org.springframework.core.io.support.ResourcePatternResolver;
-import org.springframework.core.type.ClassMetadata;
 import org.springframework.core.type.classreading.CachingMetadataReaderFactory;
 import org.springframework.core.type.classreading.MetadataReaderFactory;
 import org.springframework.jdbc.datasource.TransactionAwareDataSourceProxy;
@@ -553,14 +552,13 @@ public void addTypeAliases(Class<?>... typeAliases) {
   private <T> T[] appendArrays(T[] oldArrays, T[] newArrays, IntFunction<T[]> generator) {
     if (oldArrays == null) {
       return newArrays;
+    }
+    if (newArrays == null) {
+      return oldArrays;
     } else {
-      if (newArrays == null) {
-        return oldArrays;
-      } else {
-        List<T> newList = new ArrayList<>(Arrays.asList(oldArrays));
-        newList.addAll(Arrays.asList(newArrays));
-        return newList.toArray(generator.apply(0));
-      }
+      List<T> newList = new ArrayList<>(Arrays.asList(oldArrays));
+      newList.addAll(Arrays.asList(newArrays));
+      return newList.toArray(generator.apply(0));
     }
   }
 
@@ -690,8 +688,8 @@ protected SqlSessionFactory buildSqlSessionFactory() throws Exception {
             continue;
           }
           try {
-            XMLMapperBuilder xmlMapperBuilder = new XMLMapperBuilder(mapperLocation.getInputStream(),
-                targetConfiguration, mapperLocation.toString(), targetConfiguration.getSqlFragments());
+            var xmlMapperBuilder = new XMLMapperBuilder(mapperLocation.getInputStream(), targetConfiguration,
+                mapperLocation.toString(), targetConfiguration.getSqlFragments());
             xmlMapperBuilder.parse();
           } catch (Exception e) {
             throw new IOException("Failed to parse mapping resource: '" + mapperLocation + "'", e);
@@ -737,14 +735,14 @@ public void onApplicationEvent(ContextRefreshedEvent event) {
 
   private Set<Class<?>> scanClasses(String packagePatterns, Class<?> assignableType) throws IOException {
     Set<Class<?>> classes = new HashSet<>();
-    String[] packagePatternArray = tokenizeToStringArray(packagePatterns,
+    var packagePatternArray = tokenizeToStringArray(packagePatterns,
         ConfigurableApplicationContext.CONFIG_LOCATION_DELIMITERS);
     for (String packagePattern : packagePatternArray) {
-      Resource[] resources = RESOURCE_PATTERN_RESOLVER.getResources(ResourcePatternResolver.CLASSPATH_ALL_URL_PREFIX
+      var resources = RESOURCE_PATTERN_RESOLVER.getResources(ResourcePatternResolver.CLASSPATH_ALL_URL_PREFIX
           + ClassUtils.convertClassNameToResourcePath(packagePattern) + "/**/*.class");
       for (Resource resource : resources) {
         try {
-          ClassMetadata classMetadata = METADATA_READER_FACTORY.getMetadataReader(resource).getClassMetadata();
+          var classMetadata = METADATA_READER_FACTORY.getMetadataReader(resource).getClassMetadata();
           Class<?> clazz = Resources.classForName(classMetadata.getClassName());
           if (assignableType == null || assignableType.isAssignableFrom(clazz)) {
             classes.add(clazz);

src/main/java/org/mybatis/spring/SqlSessionTemplate.java

@@ -327,18 +327,18 @@ public void destroy() throws Exception {
   private class SqlSessionInterceptor implements InvocationHandler {
     @Override
     public Object invoke(Object proxy, Method method, Object[] args) throws Throwable {
-      SqlSession sqlSession = getSqlSession(SqlSessionTemplate.this.sqlSessionFactory,
-          SqlSessionTemplate.this.executorType, SqlSessionTemplate.this.exceptionTranslator);
+      var sqlSession = getSqlSession(SqlSessionTemplate.this.sqlSessionFactory, SqlSessionTemplate.this.executorType,
+          SqlSessionTemplate.this.exceptionTranslator);
       try {
-        Object result = method.invoke(sqlSession, args);
+        var result = method.invoke(sqlSession, args);
         if (!isSqlSessionTransactional(sqlSession, SqlSessionTemplate.this.sqlSessionFactory)) {
           // force commit even on non-dirty sessions because some databases require
           // a commit/rollback before calling close()
           sqlSession.commit(true);
         }
         return result;
       } catch (Throwable t) {
-        Throwable unwrapped = unwrapThrowable(t);
+        var unwrapped = unwrapThrowable(t);
         if (SqlSessionTemplate.this.exceptionTranslator != null && unwrapped instanceof PersistenceException) {
           // release the connection to avoid a deadlock if the translator is no loaded. See issue #22
           closeSqlSession(sqlSession, SqlSessionTemplate.this.sqlSessionFactory);

src/main/java/org/mybatis/spring/SqlSessionUtils.java

@@ -18,14 +18,12 @@
 import static org.springframework.util.Assert.notNull;
 
 import org.apache.ibatis.exceptions.PersistenceException;
-import org.apache.ibatis.mapping.Environment;
 import org.apache.ibatis.session.ExecutorType;
 import org.apache.ibatis.session.SqlSession;
 import org.apache.ibatis.session.SqlSessionFactory;
 import org.mybatis.logging.Logger;
 import org.mybatis.logging.LoggerFactory;
 import org.mybatis.spring.transaction.SpringManagedTransactionFactory;
-import org.springframework.dao.DataAccessException;
 import org.springframework.dao.TransientDataAccessResourceException;
 import org.springframework.dao.support.PersistenceExceptionTranslator;
 import org.springframework.jdbc.datasource.DataSourceUtils;
@@ -68,7 +66,7 @@ private SqlSessionUtils() {
    *           {@code SpringManagedTransactionFactory}
    */
   public static SqlSession getSqlSession(SqlSessionFactory sessionFactory) {
-    ExecutorType executorType = sessionFactory.getConfiguration().getDefaultExecutorType();
+    var executorType = sessionFactory.getConfiguration().getDefaultExecutorType();
     return getSqlSession(sessionFactory, executorType, null);
   }
 
@@ -99,9 +97,9 @@ public static SqlSession getSqlSession(SqlSessionFactory sessionFactory, Executo
     notNull(sessionFactory, NO_SQL_SESSION_FACTORY_SPECIFIED);
     notNull(executorType, NO_EXECUTOR_TYPE_SPECIFIED);
 
-    SqlSessionHolder holder = (SqlSessionHolder) TransactionSynchronizationManager.getResource(sessionFactory);
+    var holder = (SqlSessionHolder) TransactionSynchronizationManager.getResource(sessionFactory);
 
-    SqlSession session = sessionHolder(executorType, holder);
+    var session = sessionHolder(executorType, holder);
     if (session != null) {
       return session;
     }
@@ -134,7 +132,7 @@ private static void registerSessionHolder(SqlSessionFactory sessionFactory, Exec
       PersistenceExceptionTranslator exceptionTranslator, SqlSession session) {
     SqlSessionHolder holder;
     if (TransactionSynchronizationManager.isSynchronizationActive()) {
-      Environment environment = sessionFactory.getConfiguration().getEnvironment();
+      var environment = sessionFactory.getConfiguration().getEnvironment();
 
       if (environment.getTransactionFactory() instanceof SpringManagedTransactionFactory) {
         LOGGER.debug(() -> "Registering transaction synchronization for SqlSession [" + session + "]");
@@ -145,14 +143,12 @@ private static void registerSessionHolder(SqlSessionFactory sessionFactory, Exec
             .registerSynchronization(new SqlSessionSynchronization(holder, sessionFactory));
         holder.setSynchronizedWithTransaction(true);
         holder.requested();
+      } else if (TransactionSynchronizationManager.getResource(environment.getDataSource()) == null) {
+        LOGGER.debug(() -> "SqlSession [" + session
+            + "] was not registered for synchronization because DataSource is not transactional");
       } else {
-        if (TransactionSynchronizationManager.getResource(environment.getDataSource()) == null) {
-          LOGGER.debug(() -> "SqlSession [" + session
-              + "] was not registered for synchronization because DataSource is not transactional");
-        } else {
-          throw new TransientDataAccessResourceException(
-              "SqlSessionFactory must be using a SpringManagedTransactionFactory in order to use Spring transaction synchronization");
-        }
+        throw new TransientDataAccessResourceException(
+            "SqlSessionFactory must be using a SpringManagedTransactionFactory in order to use Spring transaction synchronization");
       }
     } else {
       LOGGER.debug(() -> "SqlSession [" + session
@@ -191,8 +187,8 @@ public static void closeSqlSession(SqlSession session, SqlSessionFactory session
     notNull(session, NO_SQL_SESSION_SPECIFIED);
     notNull(sessionFactory, NO_SQL_SESSION_FACTORY_SPECIFIED);
 
-    SqlSessionHolder holder = (SqlSessionHolder) TransactionSynchronizationManager.getResource(sessionFactory);
-    if ((holder != null) && (holder.getSqlSession() == session)) {
+    var holder = (SqlSessionHolder) TransactionSynchronizationManager.getResource(sessionFactory);
+    if (holder != null && holder.getSqlSession() == session) {
       LOGGER.debug(() -> "Releasing transactional SqlSession [" + session + "]");
       holder.released();
     } else {
@@ -215,9 +211,9 @@ public static boolean isSqlSessionTransactional(SqlSession session, SqlSessionFa
     notNull(session, NO_SQL_SESSION_SPECIFIED);
     notNull(sessionFactory, NO_SQL_SESSION_FACTORY_SPECIFIED);
 
-    SqlSessionHolder holder = (SqlSessionHolder) TransactionSynchronizationManager.getResource(sessionFactory);
+    var holder = (SqlSessionHolder) TransactionSynchronizationManager.getResource(sessionFactory);
 
-    return (holder != null) && (holder.getSqlSession() == session);
+    return holder != null && holder.getSqlSession() == session;
   }
 
   /**
@@ -277,8 +273,7 @@ public void beforeCommit(boolean readOnly) {
           this.holder.getSqlSession().commit();
         } catch (PersistenceException p) {
           if (this.holder.getPersistenceExceptionTranslator() != null) {
-            DataAccessException translated = this.holder.getPersistenceExceptionTranslator()
-                .translateExceptionIfPossible(p);
+            var translated = this.holder.getPersistenceExceptionTranslator().translateExceptionIfPossible(p);
             if (translated != null) {
               throw translated;
             }

src/main/java/org/mybatis/spring/annotation/MapperScannerRegistrar.java

@@ -70,7 +70,7 @@ public void setResourceLoader(ResourceLoader resourceLoader) {
 
   @Override
   public void registerBeanDefinitions(AnnotationMetadata importingClassMetadata, BeanDefinitionRegistry registry) {
-    AnnotationAttributes mapperScanAttrs = AnnotationAttributes
+    var mapperScanAttrs = AnnotationAttributes
         .fromMap(importingClassMetadata.getAnnotationAttributes(MapperScan.class.getName()));
     if (mapperScanAttrs != null) {
       registerBeanDefinitions(importingClassMetadata, mapperScanAttrs, registry,
@@ -81,7 +81,7 @@ public void registerBeanDefinitions(AnnotationMetadata importingClassMetadata, B
   void registerBeanDefinitions(AnnotationMetadata annoMeta, AnnotationAttributes annoAttrs,
       BeanDefinitionRegistry registry, String beanName) {
 
-    BeanDefinitionBuilder builder = BeanDefinitionBuilder.genericBeanDefinition(MapperScannerConfigurer.class);
+    var builder = BeanDefinitionBuilder.genericBeanDefinition(MapperScannerConfigurer.class);
     builder.addPropertyValue("processPropertyPlaceHolders", annoAttrs.getBoolean("processPropertyPlaceHolders"));
 
     Class<? extends Annotation> annotationClass = annoAttrs.getClass("annotationClass");
@@ -104,20 +104,18 @@ void registerBeanDefinitions(AnnotationMetadata annoMeta, AnnotationAttributes a
       builder.addPropertyValue("mapperFactoryBeanClass", mapperFactoryBeanClass);
     }
 
-    String sqlSessionTemplateRef = annoAttrs.getString("sqlSessionTemplateRef");
+    var sqlSessionTemplateRef = annoAttrs.getString("sqlSessionTemplateRef");
     if (StringUtils.hasText(sqlSessionTemplateRef)) {
       builder.addPropertyValue("sqlSessionTemplateBeanName", annoAttrs.getString("sqlSessionTemplateRef"));
     }
 
-    String sqlSessionFactoryRef = annoAttrs.getString("sqlSessionFactoryRef");
+    var sqlSessionFactoryRef = annoAttrs.getString("sqlSessionFactoryRef");
     if (StringUtils.hasText(sqlSessionFactoryRef)) {
       builder.addPropertyValue("sqlSessionFactoryBeanName", annoAttrs.getString("sqlSessionFactoryRef"));
     }
 
-    List<String> basePackages = new ArrayList<>();
-
-    basePackages.addAll(Arrays.stream(annoAttrs.getStringArray("basePackages")).filter(StringUtils::hasText)
-        .collect(Collectors.toList()));
+    List<String> basePackages = new ArrayList<>(Arrays.stream(annoAttrs.getStringArray("basePackages"))
+        .filter(StringUtils::hasText).collect(Collectors.toList()));
 
     basePackages.addAll(Arrays.stream(annoAttrs.getClassArray("basePackageClasses")).map(ClassUtils::getPackageName)
         .collect(Collectors.toList()));
@@ -126,7 +124,7 @@ void registerBeanDefinitions(AnnotationMetadata annoMeta, AnnotationAttributes a
       basePackages.add(getDefaultBasePackage(annoMeta));
     }
 
-    AnnotationAttributes[] excludeFilterArray = annoAttrs.getAnnotationArray("excludeFilters");
+    var excludeFilterArray = annoAttrs.getAnnotationArray("excludeFilters");
     if (excludeFilterArray.length > 0) {
       List<TypeFilter> typeFilters = new ArrayList<>();
       List<Map<String, String>> rawTypeFilters = new ArrayList<>();
@@ -142,12 +140,12 @@ void registerBeanDefinitions(AnnotationMetadata annoMeta, AnnotationAttributes a
       builder.addPropertyValue("rawExcludeFilters", rawTypeFilters);
     }
 
-    String lazyInitialization = annoAttrs.getString("lazyInitialization");
+    var lazyInitialization = annoAttrs.getString("lazyInitialization");
     if (StringUtils.hasText(lazyInitialization)) {
       builder.addPropertyValue("lazyInitialization", lazyInitialization);
     }
 
-    String defaultScope = annoAttrs.getString("defaultScope");
+    var defaultScope = annoAttrs.getString("defaultScope");
     if (!AbstractBeanDefinition.SCOPE_DEFAULT.equals(defaultScope)) {
       builder.addPropertyValue("defaultScope", defaultScope);
     }
@@ -173,7 +171,7 @@ private List<Map<String, String>> parseFiltersHasPatterns(AnnotationAttributes f
 
     List<Map<String, String>> rawTypeFilters = new ArrayList<>();
     FilterType filterType = filterAttributes.getEnum("type");
-    String[] expressionArray = filterAttributes.getStringArray("pattern");
+    var expressionArray = filterAttributes.getStringArray("pattern");
     for (String expression : expressionArray) {
       switch (filterType) {
         case REGEX:
@@ -210,7 +208,7 @@ private List<TypeFilter> typeFiltersFor(AnnotationAttributes filterAttributes) {
           Assert.isAssignable(Annotation.class, filterClass,
               "Specified an unsupported type in 'ANNOTATION' exclude filter of @MapperScan");
           @SuppressWarnings("unchecked")
-          Class<Annotation> annoClass = (Class<Annotation>) filterClass;
+          var annoClass = (Class<Annotation>) filterClass;
           typeFilters.add(new AnnotationTypeFilter(annoClass));
           break;
         case ASSIGNABLE_TYPE:
@@ -245,11 +243,11 @@ private static String getDefaultBasePackage(AnnotationMetadata importingClassMet
   static class RepeatingRegistrar extends MapperScannerRegistrar {
     @Override
     public void registerBeanDefinitions(AnnotationMetadata importingClassMetadata, BeanDefinitionRegistry registry) {
-      AnnotationAttributes mapperScansAttrs = AnnotationAttributes
+      var mapperScansAttrs = AnnotationAttributes
           .fromMap(importingClassMetadata.getAnnotationAttributes(MapperScans.class.getName()));
       if (mapperScansAttrs != null) {
-        AnnotationAttributes[] annotations = mapperScansAttrs.getAnnotationArray("value");
-        for (int i = 0; i < annotations.length; i++) {
+        var annotations = mapperScansAttrs.getAnnotationArray("value");
+        for (var i = 0; i < annotations.length; i++) {
           registerBeanDefinitions(importingClassMetadata, annotations[i], registry,
               generateBaseBeanName(importingClassMetadata, i));
         }

src/main/java/org/mybatis/spring/batch/MyBatisBatchItemWriter.java

@@ -18,9 +18,6 @@
 import static org.springframework.util.Assert.isTrue;
 import static org.springframework.util.Assert.notNull;
 
-import java.util.List;
-
-import org.apache.ibatis.executor.BatchResult;
 import org.apache.ibatis.session.ExecutorType;
 import org.apache.ibatis.session.SqlSession;
 import org.apache.ibatis.session.SqlSessionFactory;
@@ -143,18 +140,18 @@ public void write(final Chunk<? extends T> items) {
         sqlSessionTemplate.update(statementId, itemToParameterConverter.convert(item));
       }
 
-      List<BatchResult> results = sqlSessionTemplate.flushStatements();
+      var results = sqlSessionTemplate.flushStatements();
 
       if (assertUpdates) {
         if (results.size() != 1) {
           throw new InvalidDataAccessResourceUsageException("Batch execution returned invalid results. "
               + "Expected 1 but number of BatchResult objects returned was " + results.size());
         }
 
-        int[] updateCounts = results.get(0).getUpdateCounts();
+        var updateCounts = results.get(0).getUpdateCounts();
 
-        for (int i = 0; i < updateCounts.length; i++) {
-          int value = updateCounts[i];
+        for (var i = 0; i < updateCounts.length; i++) {
+          var value = updateCounts[i];
           if (value == 0) {
             throw new EmptyResultDataAccessException("Item " + i + " of " + updateCounts.length
                 + " did not update any rows: [" + items.getItems().get(i) + "]", 1);

src/main/java/org/mybatis/spring/batch/builder/MyBatisBatchItemWriterBuilder.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2022 the original author or authors.
+ * Copyright 2010-2024 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.
@@ -120,7 +120,7 @@ public MyBatisBatchItemWriterBuilder<T> itemToParameterConverter(Converter<T, ?>
    * @return the writer
    */
   public MyBatisBatchItemWriter<T> build() {
-    MyBatisBatchItemWriter<T> writer = new MyBatisBatchItemWriter<>();
+    var writer = new MyBatisBatchItemWriter<T>();
     writer.setSqlSessionTemplate(this.sqlSessionTemplate);
     writer.setSqlSessionFactory(this.sqlSessionFactory);
     writer.setStatementId(this.statementId);

src/main/java/org/mybatis/spring/batch/builder/MyBatisCursorItemReaderBuilder.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2022 the original author or authors.
+ * Copyright 2010-2024 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.
@@ -140,7 +140,7 @@ public MyBatisCursorItemReaderBuilder<T> maxItemCount(int maxItemCount) {
    * @return the reader
    */
   public MyBatisCursorItemReader<T> build() {
-    MyBatisCursorItemReader<T> reader = new MyBatisCursorItemReader<>();
+    var reader = new MyBatisCursorItemReader<T>();
     reader.setSqlSessionFactory(this.sqlSessionFactory);
     reader.setQueryId(this.queryId);
     reader.setParameterValues(this.parameterValues);