Repackaging

Author: jeffgbutler

src/test/java/examples/simple/legacy/LastName.java renamed to src/test/java/examples/simple/LastName.java

@@ -13,7 +13,7 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-package examples.simple.legacy;
+package examples.simple;
 
 public class LastName {
     private String name;

src/test/java/examples/simple/legacy/LastNameTypeHandler.java renamed to src/test/java/examples/simple/LastNameTypeHandler.java

@@ -13,7 +13,7 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-package examples.simple.legacy;
+package examples.simple;
 
 import java.sql.CallableStatement;
 import java.sql.PreparedStatement;

src/test/java/examples/simple/legacy/SimpleTableDynamicSqlSupport.java renamed to src/test/java/examples/simple/SimpleTableDynamicSqlSupport.java

@@ -13,7 +13,7 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-package examples.simple.legacy;
+package examples.simple;
 
 import java.sql.JDBCType;
 import java.util.Date;

src/test/java/examples/simple/SimpleTableMapperNewStyle.java

@@ -15,7 +15,7 @@
  */
 package examples.simple;
 
-import static examples.simple.legacy.SimpleTableDynamicSqlSupport.*;
+import static examples.simple.SimpleTableDynamicSqlSupport.*;
 import static org.mybatis.dynamic.sql.SqlBuilder.*;
 
 import java.util.List;
@@ -48,10 +48,6 @@
 import org.mybatis.dynamic.sql.util.mybatis3.MyBatis3UpdateModelToIntAdapter;
 import org.mybatis.dynamic.sql.util.mybatis3.MyBatis3Utils;
 
-import examples.simple.legacy.LastNameTypeHandler;
-import examples.simple.legacy.SimpleTableRecord;
-import examples.simple.legacy.YesNoTypeHandler;
-
 /**
  * 
  * Note: this is the canonical mapper with the new style methods

src/test/java/examples/simple/SimpleTableMapperNewStyleTest.java

@@ -15,7 +15,7 @@
  */
 package examples.simple;
 
-import static examples.simple.legacy.SimpleTableDynamicSqlSupport.*;
+import static examples.simple.SimpleTableDynamicSqlSupport.*;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.jupiter.api.Assertions.assertAll;
 import static org.mybatis.dynamic.sql.SqlBuilder.*;
@@ -43,9 +43,6 @@
 import org.mybatis.dynamic.sql.util.mybatis3.MyBatis3DeleteHelper;
 import org.mybatis.dynamic.sql.util.mybatis3.MyBatis3SelectListHelper;
 
-import examples.simple.legacy.LastName;
-import examples.simple.legacy.SimpleTableRecord;
-
 public class SimpleTableMapperNewStyleTest {
 
     private static final String JDBC_URL = "jdbc:hsqldb:mem:aname";

src/test/java/examples/simple/legacy/SimpleTableRecord.java renamed to src/test/java/examples/simple/SimpleTableRecord.java

@@ -13,7 +13,7 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-package examples.simple.legacy;
+package examples.simple;
 
 import java.util.Date;
 

src/test/java/examples/simple/legacy/YesNoTypeHandler.java renamed to src/test/java/examples/simple/YesNoTypeHandler.java

@@ -13,7 +13,7 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-package examples.simple.legacy;
+package examples.simple;
 
 import java.sql.CallableStatement;
 import java.sql.PreparedStatement;

src/test/java/examples/simple/legacy/SampleWhereClausesTest.java

@@ -15,7 +15,7 @@
  */
 package examples.simple.legacy;
 
-import static examples.simple.legacy.SimpleTableDynamicSqlSupport.*;
+import static examples.simple.SimpleTableDynamicSqlSupport.*;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mybatis.dynamic.sql.SqlBuilder.*;
 

src/test/java/examples/simple/legacy/SimpleTableAnnotatedMapper.java

@@ -15,7 +15,7 @@
  */
 package examples.simple.legacy;
 
-import static examples.simple.legacy.SimpleTableDynamicSqlSupport.*;
+import static examples.simple.SimpleTableDynamicSqlSupport.*;
 import static org.mybatis.dynamic.sql.SqlBuilder.*;
 
 import java.util.List;
@@ -46,6 +46,10 @@
 import org.mybatis.dynamic.sql.update.render.UpdateStatementProvider;
 import org.mybatis.dynamic.sql.util.SqlProviderAdapter;
 
+import examples.simple.LastNameTypeHandler;
+import examples.simple.SimpleTableRecord;
+import examples.simple.YesNoTypeHandler;
+
 /**
  * 
  * Note: this is the canonical mapper and represents the desired output for MyBatis Generator 

src/test/java/examples/simple/legacy/SimpleTableAnnotatedMapperTest.java

@@ -15,7 +15,7 @@
  */
 package examples.simple.legacy;
 
-import static examples.simple.legacy.SimpleTableDynamicSqlSupport.*;
+import static examples.simple.SimpleTableDynamicSqlSupport.*;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.jupiter.api.Assertions.assertAll;
 import static org.mybatis.dynamic.sql.SqlBuilder.*;
@@ -41,6 +41,9 @@
 import org.mybatis.dynamic.sql.render.RenderingStrategy;
 import org.mybatis.dynamic.sql.update.render.UpdateStatementProvider;
 
+import examples.simple.LastName;
+import examples.simple.SimpleTableRecord;
+
 public class SimpleTableAnnotatedMapperTest {
 
     private static final String JDBC_URL = "jdbc:hsqldb:mem:aname";