Merge pull request mybatis#344 from kazuki43zoo/polish

Polish

Author: kazuki43zoo

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

@@ -23,7 +23,9 @@
 
 import java.io.IOException;
 import java.sql.SQLException;
+import java.util.Optional;
 import java.util.Properties;
+import java.util.stream.Stream;
 
 import javax.sql.DataSource;
 
@@ -434,61 +436,51 @@ protected SqlSessionFactory buildSqlSessionFactory() throws IOException {
     } else {
       LOGGER.debug(() -> "Property 'configuration' or 'configLocation' not specified, using default MyBatis Configuration");
       targetConfiguration = new Configuration();
-      if (this.configurationProperties != null) {
-        targetConfiguration.setVariables(this.configurationProperties);
-      }
-    }
-
-    if (this.objectFactory != null) {
-      targetConfiguration.setObjectFactory(this.objectFactory);
+      Optional.ofNullable(this.configurationProperties).ifPresent(targetConfiguration::setVariables);
     }
 
-    if (this.objectWrapperFactory != null) {
-      targetConfiguration.setObjectWrapperFactory(this.objectWrapperFactory);
-    }
-
-    if (this.vfs != null) {
-      targetConfiguration.setVfsImpl(this.vfs);
-    }
+    Optional.ofNullable(this.objectFactory).ifPresent(targetConfiguration::setObjectFactory);
+    Optional.ofNullable(this.objectWrapperFactory).ifPresent(targetConfiguration::setObjectWrapperFactory);
+    Optional.ofNullable(this.vfs).ifPresent(targetConfiguration::setVfsImpl);
 
     if (hasLength(this.typeAliasesPackage)) {
       String[] typeAliasPackageArray = tokenizeToStringArray(this.typeAliasesPackage,
           ConfigurableApplicationContext.CONFIG_LOCATION_DELIMITERS);
-      for (String packageToScan : typeAliasPackageArray) {
+      Stream.of(typeAliasPackageArray).forEach(packageToScan -> {
         targetConfiguration.getTypeAliasRegistry().registerAliases(packageToScan,
-                typeAliasesSuperType == null ? Object.class : typeAliasesSuperType);
+            typeAliasesSuperType == null ? Object.class : typeAliasesSuperType);
         LOGGER.debug(() -> "Scanned package: '" + packageToScan + "' for aliases");
-      }
+      });
     }
 
     if (!isEmpty(this.typeAliases)) {
-      for (Class<?> typeAlias : this.typeAliases) {
+      Stream.of(this.typeAliases).forEach(typeAlias -> {
         targetConfiguration.getTypeAliasRegistry().registerAlias(typeAlias);
         LOGGER.debug(() -> "Registered type alias: '" + typeAlias + "'");
-      }
+      });
     }
 
     if (!isEmpty(this.plugins)) {
-      for (Interceptor plugin : this.plugins) {
+      Stream.of(this.plugins).forEach(plugin -> {
         targetConfiguration.addInterceptor(plugin);
         LOGGER.debug(() -> "Registered plugin: '" + plugin + "'");
-      }
+      });
     }
 
     if (hasLength(this.typeHandlersPackage)) {
       String[] typeHandlersPackageArray = tokenizeToStringArray(this.typeHandlersPackage,
           ConfigurableApplicationContext.CONFIG_LOCATION_DELIMITERS);
-      for (String packageToScan : typeHandlersPackageArray) {
+      Stream.of(typeHandlersPackageArray).forEach(packageToScan -> {
         targetConfiguration.getTypeHandlerRegistry().register(packageToScan);
         LOGGER.debug(() -> "Scanned package: '" + packageToScan + "' for type handlers");
-      }
+      });
     }
 
     if (!isEmpty(this.typeHandlers)) {
-      for (TypeHandler<?> typeHandler : this.typeHandlers) {
+      Stream.of(this.typeHandlers).forEach(typeHandler -> {
         targetConfiguration.getTypeHandlerRegistry().register(typeHandler);
         LOGGER.debug(() -> "Registered type handler: '" + typeHandler + "'");
-      }
+      });
     }
 
     if (this.databaseIdProvider != null) {//fix #64 set databaseId before parse mapper xmls
@@ -499,9 +491,7 @@ protected SqlSessionFactory buildSqlSessionFactory() throws IOException {
       }
     }
 
-    if (this.cache != null) {
-      targetConfiguration.addCache(this.cache);
-    }
+    Optional.ofNullable(this.cache).ifPresent(targetConfiguration::addCache);
 
     if (xmlConfigBuilder != null) {
       try {
@@ -514,11 +504,9 @@ protected SqlSessionFactory buildSqlSessionFactory() throws IOException {
       }
     }
 
-    if (this.transactionFactory == null) {
-      this.transactionFactory = new SpringManagedTransactionFactory();
-    }
-
-    targetConfiguration.setEnvironment(new Environment(this.environment, this.transactionFactory, this.dataSource));
+    targetConfiguration.setEnvironment(new Environment(this.environment,
+        this.transactionFactory == null ? new SpringManagedTransactionFactory() : this.transactionFactory,
+        this.dataSource));
 
     if (!isEmpty(this.mapperLocations)) {
       for (Resource mapperLocation : this.mapperLocations) {

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

@@ -1,5 +1,5 @@
 /**
- *    Copyright 2010-2018 the original author or authors.
+ *    Copyright 2010-2019 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.
@@ -412,7 +412,7 @@ public List<BatchResult> flushStatements() {
   * @see "org.springframework.beans.factory.support.DisposableBeanAdapter#CLOSE_METHOD_NAME"
   */
   @Override
-  public void destroy() throws Exception {
+  public void destroy() {
   //This method forces spring disposer to avoid call of SqlSessionTemplate.close() which gives UnsupportedOperationException
   }
 

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

@@ -1,5 +1,5 @@
 /**
- *    Copyright 2010-2017 the original author or authors.
+ *    Copyright 2010-2019 the original author or authors.
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
  *    you may not use this file except in compliance with the License.
@@ -19,6 +19,7 @@
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
+import java.util.Optional;
 import java.util.stream.Collectors;
 
 import org.mybatis.spring.mapper.ClassPathMapperScanner;
@@ -77,9 +78,7 @@ void registerBeanDefinitions(AnnotationAttributes annoAttrs, BeanDefinitionRegis
     ClassPathMapperScanner scanner = new ClassPathMapperScanner(registry);
 
     // this check is needed in Spring 3.1
-    if (resourceLoader != null) {
-      scanner.setResourceLoader(resourceLoader);
-    }
+    Optional.ofNullable(resourceLoader).ifPresent(scanner::setResourceLoader);
 
     Class<? extends Annotation> annotationClass = annoAttrs.getClass("annotationClass");
     if (!Annotation.class.equals(annotationClass)) {

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

@@ -1,5 +1,5 @@
 /**
- *    Copyright 2010-2017 the original author or authors.
+ *    Copyright 2010-2019 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.
@@ -49,7 +49,7 @@ public MyBatisCursorItemReader() {
   }
 
   @Override
-  protected T doRead() throws Exception {
+  protected T doRead() {
     T next = null;
     if (cursorIterator.hasNext()) {
       next = cursorIterator.next();
@@ -58,7 +58,7 @@ protected T doRead() throws Exception {
   }
 
   @Override
-  protected void doOpen() throws Exception {
+  protected void doOpen() {
     Map<String, Object> parameters = new HashMap<>();
     if (parameterValues != null) {
       parameters.putAll(parameterValues);

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

@@ -1,5 +1,5 @@
 /**
- *    Copyright 2010-2017 the original author or authors.
+ *    Copyright 2010-2019 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.
@@ -20,6 +20,8 @@
 import org.mybatis.spring.batch.MyBatisBatchItemWriter;
 import org.springframework.core.convert.converter.Converter;
 
+import java.util.Optional;
+
 /**
  * A builder for the {@link MyBatisBatchItemWriter}.
  *
@@ -107,12 +109,8 @@ public MyBatisBatchItemWriter<T> build() {
     writer.setSqlSessionTemplate(this.sqlSessionTemplate);
     writer.setSqlSessionFactory(this.sqlSessionFactory);
     writer.setStatementId(this.statementId);
-    if (this.assertUpdates != null) {
-      writer.setAssertUpdates(this.assertUpdates);
-    }
-    if (this.itemToParameterConverter != null) {
-      writer.setItemToParameterConverter(this.itemToParameterConverter);
-    }
+    Optional.ofNullable(this.assertUpdates).ifPresent(writer::setAssertUpdates);
+    Optional.ofNullable(this.itemToParameterConverter).ifPresent(writer::setItemToParameterConverter);
     return writer;
   }
 

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

@@ -1,5 +1,5 @@
 /**
- *    Copyright 2010-2017 the original author or authors.
+ *    Copyright 2010-2019 the original author or authors.
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
  *    you may not use this file except in compliance with the License.
@@ -19,6 +19,7 @@
 import org.mybatis.spring.batch.MyBatisCursorItemReader;
 
 import java.util.Map;
+import java.util.Optional;
 
 /**
  * A builder for the {@link MyBatisCursorItemReader}.
@@ -107,12 +108,8 @@ public MyBatisCursorItemReader<T> build() {
     reader.setSqlSessionFactory(this.sqlSessionFactory);
     reader.setQueryId(this.queryId);
     reader.setParameterValues(this.parameterValues);
-    if (this.saveState != null) {
-      reader.setSaveState(saveState);
-    }
-    if (this.maxItemCount != null) {
-      reader.setMaxItemCount(this.maxItemCount);
-    }
+    Optional.ofNullable(this.saveState).ifPresent(reader::setSaveState);
+    Optional.ofNullable(this.maxItemCount).ifPresent(reader::setMaxItemCount);
     return reader;
   }
 

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

@@ -1,5 +1,5 @@
 /**
- *    Copyright 2010-2017 the original author or authors.
+ *    Copyright 2010-2019 the original author or authors.
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
  *    you may not use this file except in compliance with the License.
@@ -19,6 +19,7 @@
 import org.mybatis.spring.batch.MyBatisPagingItemReader;
 
 import java.util.Map;
+import java.util.Optional;
 
 /**
  * A builder for the {@link MyBatisPagingItemReader}.
@@ -120,15 +121,9 @@ public MyBatisPagingItemReader<T> build() {
     reader.setSqlSessionFactory(this.sqlSessionFactory);
     reader.setQueryId(this.queryId);
     reader.setParameterValues(this.parameterValues);
-    if (this.pageSize != null) {
-      reader.setPageSize(this.pageSize);
-    }
-    if (this.saveState != null) {
-      reader.setSaveState(saveState);
-    }
-    if (this.maxItemCount != null) {
-      reader.setMaxItemCount(this.maxItemCount);
-    }
+    Optional.ofNullable(this.pageSize).ifPresent(reader::setPageSize);
+    Optional.ofNullable(this.saveState).ifPresent(reader::setSaveState);
+    Optional.ofNullable(this.maxItemCount).ifPresent(reader::setMaxItemCount);
     return reader;
   }
 

src/main/java/org/mybatis/spring/transaction/SpringManagedTransaction.java

@@ -1,5 +1,5 @@
 /**
- *    Copyright 2010-2017 the original author or authors.
+ *    Copyright 2010-2019 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.
@@ -117,15 +117,15 @@ public void rollback() throws SQLException {
    * {@inheritDoc}
    */
   @Override
-  public void close() throws SQLException {
+  public void close() {
     DataSourceUtils.releaseConnection(this.connection, this.dataSource);
   }
 
   /**
    * {@inheritDoc}
    */
   @Override
-  public Integer getTimeout() throws SQLException {
+  public Integer getTimeout() {
     ConnectionHolder holder = (ConnectionHolder) TransactionSynchronizationManager.getResource(dataSource);
     if (holder != null && holder.hasTimeout()) {
       return holder.getTimeToLiveInSeconds();