Apply formatter and update license year

kazuki43zoo · kazuki43zoo · commit 4303e236011d · 2020-06-21T22:21:33.000+09:00
diff --git a/pom.xml b/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-       Copyright 2012-2019 the original author or authors.
+       Copyright 2012-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/scripting/velocity/ParameterMappingCollector.java b/src/main/java/org/mybatis/scripting/velocity/ParameterMappingCollector.java
@@ -1,5 +1,5 @@
 /**
- *    Copyright 2012-2018 the original author or authors.
+ *    Copyright 2012-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.
@@ -18,6 +18,7 @@
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
+
 import org.apache.ibatis.mapping.ParameterMapping;
 import org.apache.ibatis.session.Configuration;
 
diff --git a/src/main/java/org/mybatis/scripting/velocity/RepeatDirective.java b/src/main/java/org/mybatis/scripting/velocity/RepeatDirective.java
@@ -1,5 +1,5 @@
 /**
- *    Copyright 2012-2018 the original author or authors.
+ *    Copyright 2012-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.
@@ -19,6 +19,7 @@
 import java.io.StringWriter;
 import java.io.Writer;
 import java.util.Iterator;
+
 import org.apache.velocity.context.ChainedInternalContextAdapter;
 import org.apache.velocity.context.InternalContextAdapter;
 import org.apache.velocity.exception.TemplateInitException;
diff --git a/src/main/java/org/mybatis/scripting/velocity/SQLScriptSource.java b/src/main/java/org/mybatis/scripting/velocity/SQLScriptSource.java
@@ -1,5 +1,5 @@
 /**
- *    Copyright 2012-2018 the original author or authors.
+ *    Copyright 2012-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.
@@ -17,6 +17,7 @@
 
 import java.util.HashMap;
 import java.util.Map;
+
 import org.apache.ibatis.mapping.BoundSql;
 import org.apache.ibatis.mapping.ParameterMapping;
 import org.apache.ibatis.mapping.SqlSource;
diff --git a/src/main/java/org/mybatis/scripting/velocity/SetDirective.java b/src/main/java/org/mybatis/scripting/velocity/SetDirective.java
@@ -1,5 +1,5 @@
 /**
- *    Copyright 2012-2017 the original author or authors.
+ *    Copyright 2012-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.
@@ -17,6 +17,7 @@
 
 import java.io.IOException;
 import java.io.StringWriter;
+
 import org.apache.velocity.context.InternalContextAdapter;
 import org.apache.velocity.runtime.parser.node.ASTBlock;
 import org.apache.velocity.runtime.parser.node.Node;
diff --git a/src/main/java/org/mybatis/scripting/velocity/TrimDirective.java b/src/main/java/org/mybatis/scripting/velocity/TrimDirective.java
@@ -1,5 +1,5 @@
 /**
- *    Copyright 2012-2018 the original author or authors.
+ *    Copyright 2012-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.
@@ -19,6 +19,7 @@
 import java.io.StringWriter;
 import java.io.Writer;
 import java.util.Locale;
+
 import org.apache.velocity.context.InternalContextAdapter;
 import org.apache.velocity.runtime.directive.Directive;
 import org.apache.velocity.runtime.parser.node.ASTBlock;
diff --git a/src/main/java/org/mybatis/scripting/velocity/WhereDirective.java b/src/main/java/org/mybatis/scripting/velocity/WhereDirective.java
@@ -1,5 +1,5 @@
 /**
- *    Copyright 2012-2017 the original author or authors.
+ *    Copyright 2012-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.
@@ -17,6 +17,7 @@
 
 import java.io.IOException;
 import java.io.StringWriter;
+
 import org.apache.velocity.context.InternalContextAdapter;
 import org.apache.velocity.runtime.parser.node.ASTBlock;
 import org.apache.velocity.runtime.parser.node.Node;
diff --git a/src/site/xdoc/index.xml b/src/site/xdoc/index.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-       Copyright 2012-2019 the original author or authors.
+       Copyright 2012-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.
@@ -300,7 +300,7 @@ FROM City
       <subsection name="in">
         <h5>#in( collection  var  field ) body #end</h5>
         <p>
-          Generates a SQL IN clause and breaks it into groups of 1000 items seperated by an OR clause to get around database limitations on the maximum number of items that can be handled. 
+          Generates a SQL IN clause and breaks it into groups of 1000 items seperated by an OR clause to get around database limitations on the maximum number of items that can be handled.
           It also supports iterative parameter bindings via @{...} syntax.
         </p>
         <table>
diff --git a/src/test/java/org/mybatis/scripting/velocity/TrimDirectiveTest.java b/src/test/java/org/mybatis/scripting/velocity/TrimDirectiveTest.java
@@ -1,5 +1,5 @@
 /**
- *    Copyright 2012-2019 the original author or authors.
+ *    Copyright 2012-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.
@@ -15,12 +15,13 @@
  */
 package org.mybatis.scripting.velocity;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
 import java.io.StringWriter;
 import java.util.Properties;
+
 import org.apache.velocity.VelocityContext;
 import org.apache.velocity.app.VelocityEngine;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-
 import org.apache.velocity.runtime.RuntimeConstants;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
diff --git a/src/test/java/org/mybatis/scripting/velocity/WhereDirectiveTest.java b/src/test/java/org/mybatis/scripting/velocity/WhereDirectiveTest.java
@@ -1,5 +1,5 @@
 /**
- *    Copyright 2012-2019 the original author or authors.
+ *    Copyright 2012-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.
@@ -15,12 +15,13 @@
  */
 package org.mybatis.scripting.velocity;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
 import java.io.StringWriter;
 import java.util.Properties;
+
 import org.apache.velocity.VelocityContext;
 import org.apache.velocity.app.VelocityEngine;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-
 import org.apache.velocity.runtime.RuntimeConstants;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
diff --git a/src/test/java/org/mybatis/scripting/velocity/use/VelocityLanguageTest.java b/src/test/java/org/mybatis/scripting/velocity/use/VelocityLanguageTest.java
@@ -1,5 +1,5 @@
 /**
- *    Copyright 2012-2019 the original author or authors.
+ *    Copyright 2012-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.
@@ -15,26 +15,26 @@
  */
 package org.mybatis.scripting.velocity.use;
 
+import static org.junit.jupiter.api.Assertions.*;
+
 import java.io.Reader;
 import java.sql.Connection;
 import java.sql.DriverManager;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+
 import org.apache.ibatis.io.Resources;
 import org.apache.ibatis.jdbc.ScriptRunner;
 import org.apache.ibatis.session.SqlSession;
 import org.apache.ibatis.session.SqlSessionFactory;
 import org.apache.ibatis.session.SqlSessionFactoryBuilder;
-
 import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
 import org.mybatis.scripting.velocity.VelocityFacade;
 
-import static org.junit.jupiter.api.Assertions.*;
-
 /**
  * Just a test case. Not a real Velocity implementation.
  */
diff --git a/src/test/resources/org/mybatis/scripting/velocity/use/mapper.xml b/src/test/resources/org/mybatis/scripting/velocity/use/mapper.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-       Copyright 2012-2016 the original author or authors.
+       Copyright 2012-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.
@@ -69,7 +69,7 @@
     FROM names
       #trim("WHERE" "" "" "FOOFOO")
         1=1
-      #end    
+      #end
   </select>
 
   <select id="selectNamesWithIterationOverMap" resultType="org.mybatis.scripting.velocity.use.Name">
@@ -100,7 +100,7 @@
   <select id="selectNamesWithInDirective" resultType="org.mybatis.scripting.velocity.use.Name">
     SELECT *
     FROM names
-       WHERE 
+       WHERE
        #in($_parameter.names $name 'id')
          @{name.id}
        #end
@@ -118,8 +118,8 @@
     #set( $ids = $enumBinder.bind('org.mybatis.scripting.velocity.use.VelocityLanguageTest$IDS') )
     SELECT *
     FROM names
-       WHERE 
+       WHERE
         id IN (@{ids.ONE}, @{ids.TWO}, @{ids.THREE})
   </select>
 
-</mapper>
+</mapper>
