Merge pull request #1300 from kazuki43zoo/drop-usesjava8

Move parent from usesjava8 on test

Author: kazuki43zoo

src/test/java/org/apache/ibatis/submitted/usesjava8/default_method/CreateDB.sql renamed to src/test/java/org/apache/ibatis/submitted/default_method/CreateDB.sql

@@ -1,5 +1,5 @@
 --
---    Copyright 2009-2016 the original author or authors.
+--    Copyright 2009-2018 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.

src/test/java/org/apache/ibatis/submitted/usesjava8/default_method/DefaultMethodTest.java renamed to src/test/java/org/apache/ibatis/submitted/default_method/DefaultMethodTest.java

@@ -13,7 +13,7 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-package org.apache.ibatis.submitted.usesjava8.default_method;
+package org.apache.ibatis.submitted.default_method;
 
 import static org.junit.Assert.*;
 
@@ -24,7 +24,7 @@
 import org.apache.ibatis.session.SqlSession;
 import org.apache.ibatis.session.SqlSessionFactory;
 import org.apache.ibatis.session.SqlSessionFactoryBuilder;
-import org.apache.ibatis.submitted.usesjava8.default_method.Mapper.SubMapper;
+import org.apache.ibatis.submitted.default_method.Mapper.SubMapper;
 import org.junit.BeforeClass;
 import org.junit.Test;
 
@@ -36,13 +36,13 @@ public class DefaultMethodTest {
   public static void setUp() throws Exception {
     // create an SqlSessionFactory
     try (Reader reader = Resources.getResourceAsReader(
-        "org/apache/ibatis/submitted/usesjava8/default_method/mybatis-config.xml")) {
+        "org/apache/ibatis/submitted/default_method/mybatis-config.xml")) {
       sqlSessionFactory = new SqlSessionFactoryBuilder().build(reader);
     }
 
     // populate in-memory database
     BaseDataTest.runScript(sqlSessionFactory.getConfiguration().getEnvironment().getDataSource(),
-            "org/apache/ibatis/submitted/usesjava8/default_method/CreateDB.sql");
+        "org/apache/ibatis/submitted/default_method/CreateDB.sql");
   }
 
   @Test

src/test/java/org/apache/ibatis/submitted/usesjava8/default_method/Mapper.java renamed to src/test/java/org/apache/ibatis/submitted/default_method/Mapper.java

@@ -1,5 +1,5 @@
 /**
- *    Copyright 2009-2017 the original author or authors.
+ *    Copyright 2009-2018 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.
@@ -13,7 +13,7 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-package org.apache.ibatis.submitted.usesjava8.default_method;
+package org.apache.ibatis.submitted.default_method;
 
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;

src/test/java/org/apache/ibatis/submitted/usesjava8/default_method/PackageMapper.java renamed to src/test/java/org/apache/ibatis/submitted/default_method/PackageMapper.java

@@ -1,5 +1,5 @@
 /**
- *    Copyright 2009-2017 the original author or authors.
+ *    Copyright 2009-2018 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.
@@ -13,7 +13,7 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-package org.apache.ibatis.submitted.usesjava8.default_method;
+package org.apache.ibatis.submitted.default_method;
 
 import org.apache.ibatis.annotations.Select;
 

src/test/java/org/apache/ibatis/submitted/usesjava8/default_method/User.java renamed to src/test/java/org/apache/ibatis/submitted/default_method/User.java

@@ -1,5 +1,5 @@
 /**
- *    Copyright 2009-2016 the original author or authors.
+ *    Copyright 2009-2018 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.
@@ -13,7 +13,7 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-package org.apache.ibatis.submitted.usesjava8.default_method;
+package org.apache.ibatis.submitted.default_method;
 
 public class User {
 

src/test/java/org/apache/ibatis/submitted/usesjava8/default_method/mybatis-config.xml renamed to src/test/java/org/apache/ibatis/submitted/default_method/mybatis-config.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!--
 
-       Copyright 2009-2017 the original author or authors.
+       Copyright 2009-2018 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.
@@ -36,9 +36,9 @@
 	</environments>
 
 	<mappers>
-		<mapper class="org.apache.ibatis.submitted.usesjava8.default_method.Mapper" />
-		<mapper class="org.apache.ibatis.submitted.usesjava8.default_method.Mapper$SubMapper" />
-		<mapper class="org.apache.ibatis.submitted.usesjava8.default_method.PackageMapper" />
+		<mapper class="org.apache.ibatis.submitted.default_method.Mapper" />
+		<mapper class="org.apache.ibatis.submitted.default_method.Mapper$SubMapper" />
+		<mapper class="org.apache.ibatis.submitted.default_method.PackageMapper" />
 	</mappers>
 
 </configuration>

src/test/java/org/apache/ibatis/submitted/usesjava8/keycolumn/CreateDB.sql renamed to src/test/java/org/apache/ibatis/submitted/keycolumn/CreateDB.sql

@@ -1,5 +1,5 @@
 --
---    Copyright 2009-2017 the original author or authors.
+--    Copyright 2009-2018 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.

src/test/java/org/apache/ibatis/submitted/usesjava8/keycolumn/InsertMapper.java renamed to src/test/java/org/apache/ibatis/submitted/keycolumn/InsertMapper.java

@@ -1,5 +1,5 @@
 /**
- *    Copyright 2009-2017 the original author or authors.
+ *    Copyright 2009-2018 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.
@@ -13,7 +13,7 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-package org.apache.ibatis.submitted.usesjava8.keycolumn;
+package org.apache.ibatis.submitted.keycolumn;
 
 import org.apache.ibatis.annotations.Insert;
 import org.apache.ibatis.annotations.Options;

src/test/java/org/apache/ibatis/submitted/usesjava8/keycolumn/InsertMapper.xml renamed to src/test/java/org/apache/ibatis/submitted/keycolumn/InsertMapper.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!--
 
-       Copyright 2009-2017 the original author or authors.
+       Copyright 2009-2018 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,8 +19,8 @@
 <!DOCTYPE mapper
     PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="org.apache.ibatis.submitted.usesjava8.keycolumn.InsertMapper" >
-  <insert id="insertNameMapped" parameterType="org.apache.ibatis.submitted.usesjava8.keycolumn.Name" useGeneratedKeys="true" keyProperty="id" keyColumn="name_id">
+<mapper namespace="org.apache.ibatis.submitted.keycolumn.InsertMapper" >
+  <insert id="insertNameMapped" parameterType="org.apache.ibatis.submitted.keycolumn.Name" useGeneratedKeys="true" keyProperty="id" keyColumn="name_id">
     insert into mbtest.test_identity
       (first_name, last_name)
     values(#{firstName,jdbcType=VARCHAR}, #{lastName,jdbcType=VARCHAR})

src/test/java/org/apache/ibatis/submitted/usesjava8/keycolumn/InsertTest.java renamed to src/test/java/org/apache/ibatis/submitted/keycolumn/InsertTest.java

@@ -13,7 +13,7 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-package org.apache.ibatis.submitted.usesjava8.keycolumn;
+package org.apache.ibatis.submitted.keycolumn;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
@@ -64,7 +64,7 @@ public static void setUp() throws Exception {
     sqlSessionFactory = new SqlSessionFactoryBuilder().build(configuration);
 
     BaseDataTest.runScript(sqlSessionFactory.getConfiguration().getEnvironment().getDataSource(),
-            "org/apache/ibatis/submitted/usesjava8/keycolumn/CreateDB.sql");
+        "org/apache/ibatis/submitted/keycolumn/CreateDB.sql");
   }
 
   @AfterClass