From 7b543476c8055e59b0628d8852af1900ef9c9ef5 Mon Sep 17 00:00:00 2001
From: Iwao AVE! <harawata@gmail.com>
Date: Mon, 9 Mar 2020 01:07:07 +0900
Subject: [PATCH] License header and format

---
 pom.xml                                       |  2 +-
 .../mybatis/spring/SqlSessionFactoryBean.java |  2 +-
 .../mybatis/spring/annotation/MapperScan.java | 10 +++++-----
 .../annotation/MapperScannerRegistrar.java    | 11 ++++++----
 ...pConfigWithDefaultMapperScanAndRepeat.java | 15 ++++++++++++++
 .../ds1/AppConfigWithDefaultMapperScans.java  | 20 +++++++++++++++----
 .../AppConfigWithDefaultPackageScan.java      | 15 ++++++++++++++
 .../org/mybatis/spring/scan/package-info.java |  2 +-
 .../org/mybatis/spring/type/package-info.java |  2 +-
 9 files changed, 62 insertions(+), 17 deletions(-)

diff --git a/pom.xml b/pom.xml
index 8b6945b27d..351441e89e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright 2010-2019 the original author or authors.
+    Copyright 2010-2020 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/main/java/org/mybatis/spring/SqlSessionFactoryBean.java b/src/main/java/org/mybatis/spring/SqlSessionFactoryBean.java
index 0a374567f4..f501953995 100644
--- a/src/main/java/org/mybatis/spring/SqlSessionFactoryBean.java
+++ b/src/main/java/org/mybatis/spring/SqlSessionFactoryBean.java
@@ -1,5 +1,5 @@
 /**
- * Copyright 2010-2019 the original author or authors.
+ * Copyright 2010-2020 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/main/java/org/mybatis/spring/annotation/MapperScan.java b/src/main/java/org/mybatis/spring/annotation/MapperScan.java
index 159a5fa89c..2d8e7d1c3e 100644
--- a/src/main/java/org/mybatis/spring/annotation/MapperScan.java
+++ b/src/main/java/org/mybatis/spring/annotation/MapperScan.java
@@ -1,5 +1,5 @@
 /**
- * Copyright 2010-2019 the original author or authors.
+ * Copyright 2010-2020 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.
@@ -32,10 +32,10 @@
  * Use this annotation to register MyBatis mapper interfaces when using Java Config. It performs when same work as
  * {@link MapperScannerConfigurer} via {@link MapperScannerRegistrar}.
  * 
- * <p>Either {@link #basePackageClasses} or {@link #basePackages} (or its alias
- * {@link #value}) may be specified to define specific packages to scan.
- * Since 2.0.4, If specific packages are not defined, scanning will occur from
- * the package of the class that declares this annotation.
+ * <p>
+ * Either {@link #basePackageClasses} or {@link #basePackages} (or its alias {@link #value}) may be specified to define
+ * specific packages to scan. Since 2.0.4, If specific packages are not defined, scanning will occur from the package of
+ * the class that declares this annotation.
  *
  * <p>
  * Configuration example:
diff --git a/src/main/java/org/mybatis/spring/annotation/MapperScannerRegistrar.java b/src/main/java/org/mybatis/spring/annotation/MapperScannerRegistrar.java
index e9b1546365..aaf9ceb8d0 100644
--- a/src/main/java/org/mybatis/spring/annotation/MapperScannerRegistrar.java
+++ b/src/main/java/org/mybatis/spring/annotation/MapperScannerRegistrar.java
@@ -1,5 +1,5 @@
 /**
- * Copyright 2010-2019 the original author or authors.
+ * Copyright 2010-2020 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.
@@ -70,11 +70,13 @@ public void registerBeanDefinitions(AnnotationMetadata importingClassMetadata, B
     AnnotationAttributes mapperScanAttrs = AnnotationAttributes
         .fromMap(importingClassMetadata.getAnnotationAttributes(MapperScan.class.getName()));
     if (mapperScanAttrs != null) {
-      registerBeanDefinitions(importingClassMetadata, mapperScanAttrs, registry, generateBaseBeanName(importingClassMetadata, 0));
+      registerBeanDefinitions(importingClassMetadata, mapperScanAttrs, registry,
+          generateBaseBeanName(importingClassMetadata, 0));
     }
   }
 
-  void registerBeanDefinitions(AnnotationMetadata annoMeta, AnnotationAttributes annoAttrs, BeanDefinitionRegistry registry, String beanName) {
+  void registerBeanDefinitions(AnnotationMetadata annoMeta, AnnotationAttributes annoAttrs,
+      BeanDefinitionRegistry registry, String beanName) {
 
     BeanDefinitionBuilder builder = BeanDefinitionBuilder.genericBeanDefinition(MapperScannerConfigurer.class);
     builder.addPropertyValue("processPropertyPlaceHolders", true);
@@ -158,7 +160,8 @@ public void registerBeanDefinitions(AnnotationMetadata importingClassMetadata, B
       if (mapperScansAttrs != null) {
         AnnotationAttributes[] annotations = mapperScansAttrs.getAnnotationArray("value");
         for (int i = 0; i < annotations.length; i++) {
-          registerBeanDefinitions(importingClassMetadata, annotations[i], registry, generateBaseBeanName(importingClassMetadata, i));
+          registerBeanDefinitions(importingClassMetadata, annotations[i], registry,
+              generateBaseBeanName(importingClassMetadata, i));
         }
       }
     }
diff --git a/src/test/java/org/mybatis/spring/annotation/mapper/ds1/AppConfigWithDefaultMapperScanAndRepeat.java b/src/test/java/org/mybatis/spring/annotation/mapper/ds1/AppConfigWithDefaultMapperScanAndRepeat.java
index a6edbcad18..ced521e6de 100644
--- a/src/test/java/org/mybatis/spring/annotation/mapper/ds1/AppConfigWithDefaultMapperScanAndRepeat.java
+++ b/src/test/java/org/mybatis/spring/annotation/mapper/ds1/AppConfigWithDefaultMapperScanAndRepeat.java
@@ -1,3 +1,18 @@
+/**
+ * Copyright 2010-2020 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.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package org.mybatis.spring.annotation.mapper.ds1;
 
 import org.mybatis.spring.annotation.MapperScan;
diff --git a/src/test/java/org/mybatis/spring/annotation/mapper/ds1/AppConfigWithDefaultMapperScans.java b/src/test/java/org/mybatis/spring/annotation/mapper/ds1/AppConfigWithDefaultMapperScans.java
index af3e1364f7..7d20102ff8 100644
--- a/src/test/java/org/mybatis/spring/annotation/mapper/ds1/AppConfigWithDefaultMapperScans.java
+++ b/src/test/java/org/mybatis/spring/annotation/mapper/ds1/AppConfigWithDefaultMapperScans.java
@@ -1,3 +1,18 @@
+/**
+ * Copyright 2010-2020 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.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package org.mybatis.spring.annotation.mapper.ds1;
 
 import org.mybatis.spring.annotation.MapperScan;
@@ -5,9 +20,6 @@
 import org.springframework.context.annotation.Configuration;
 
 @Configuration
-@MapperScans({
-  @MapperScan,
-  @MapperScan("org.mybatis.spring.annotation.mapper.ds2")
-})
+@MapperScans({ @MapperScan, @MapperScan("org.mybatis.spring.annotation.mapper.ds2") })
 public class AppConfigWithDefaultMapperScans {
 }
diff --git a/src/test/java/org/mybatis/spring/mapper/AppConfigWithDefaultPackageScan.java b/src/test/java/org/mybatis/spring/mapper/AppConfigWithDefaultPackageScan.java
index dc3e95ec1d..9bbfeda4d8 100644
--- a/src/test/java/org/mybatis/spring/mapper/AppConfigWithDefaultPackageScan.java
+++ b/src/test/java/org/mybatis/spring/mapper/AppConfigWithDefaultPackageScan.java
@@ -1,3 +1,18 @@
+/**
+ * Copyright 2010-2020 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.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package org.mybatis.spring.mapper;
 
 import org.mybatis.spring.annotation.MapperScan;
diff --git a/src/test/java/org/mybatis/spring/scan/package-info.java b/src/test/java/org/mybatis/spring/scan/package-info.java
index cbf8cf88da..14b8dcfb9c 100644
--- a/src/test/java/org/mybatis/spring/scan/package-info.java
+++ b/src/test/java/org/mybatis/spring/scan/package-info.java
@@ -1,5 +1,5 @@
 /**
- * Copyright 2010-2019 the original author or authors.
+ * Copyright 2010-2020 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/mybatis/spring/type/package-info.java b/src/test/java/org/mybatis/spring/type/package-info.java
index 9818672bd5..f4e9be7167 100644
--- a/src/test/java/org/mybatis/spring/type/package-info.java
+++ b/src/test/java/org/mybatis/spring/type/package-info.java
@@ -1,5 +1,5 @@
 /**
- * Copyright 2010-2019 the original author or authors.
+ * Copyright 2010-2020 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.