Merge pull request mybatis#271 from jeffgbutler/issue-266

jeffgbutler · web-flow · commit 6fcfd322ec6d · 2017-08-13T17:57:37.000-04:00
Restore sub-package functionality
diff --git a/core/mybatis-generator-core/src/main/java/org/mybatis/generator/api/FullyQualifiedTable.java b/core/mybatis-generator-core/src/main/java/org/mybatis/generator/api/FullyQualifiedTable.java
@@ -397,4 +397,8 @@ private void addDelimiters(StringBuilder sb) {
             sb.append(endingDelimiter);
         }
     }
+
+    public String getDomainObjectSubPackage() {
+        return domainObjectSubPackage;
+    }
 }
diff --git a/core/mybatis-generator-core/src/main/java/org/mybatis/generator/api/IntrospectedTable.java b/core/mybatis-generator-core/src/main/java/org/mybatis/generator/api/IntrospectedTable.java
@@ -827,6 +827,10 @@ protected void calculateJavaClientAttributes() {
         if (stringHasValue(tableConfiguration.getMapperName())) {
             sb.append(tableConfiguration.getMapperName());
         } else {
+            if (stringHasValue(fullyQualifiedTable.getDomainObjectSubPackage())) {
+                sb.append(fullyQualifiedTable.getDomainObjectSubPackage());
+                sb.append('.');
+            }
             sb.append(fullyQualifiedTable.getDomainObjectName());
             sb.append("Mapper"); //$NON-NLS-1$
         }
@@ -838,6 +842,10 @@ protected void calculateJavaClientAttributes() {
         if (stringHasValue(tableConfiguration.getSqlProviderName())) {
             sb.append(tableConfiguration.getSqlProviderName());
         } else {
+            if (stringHasValue(fullyQualifiedTable.getDomainObjectSubPackage())) {
+                sb.append(fullyQualifiedTable.getDomainObjectSubPackage());
+                sb.append('.');
+            }
             sb.append(fullyQualifiedTable.getDomainObjectName());
             sb.append("SqlProvider"); //$NON-NLS-1$
         }
@@ -901,6 +909,8 @@ protected String calculateSqlMapPackage() {
                 if (ind != -1) {
                     sb.append('.').append(mapperName.substring(0, ind));
                 }
+            } else if (stringHasValue(fullyQualifiedTable.getDomainObjectSubPackage())) {
+                sb.append('.').append(fullyQualifiedTable.getDomainObjectSubPackage());
             }
         }
 
diff --git a/core/mybatis-generator-core/src/test/resources/scripts/generatorConfig.xml b/core/mybatis-generator-core/src/test/resources/scripts/generatorConfig.xml
@@ -48,7 +48,7 @@
       <property name="enableSubPackages" value="true" />
     </javaClientGenerator>
 
-    <table tableName="FieldsOnly" />
+    <table tableName="FieldsOnly" domainObjectName="subpackage.Fieldsonly"/>
     <table tableName="PKOnly" />
     <table tableName="PKFields" alias="B" >
       <columnOverride column="wierd$Field" delimitedColumnName="true"/>
@@ -388,7 +388,7 @@
       <property name="enableSubPackages" value="true" />
     </javaClientGenerator>
 
-    <table tableName="FieldsOnly" />
+    <table tableName="FieldsOnly" domainObjectName="subpackage.Fieldsonly"/>
     <table tableName="PKOnly" />
     <table tableName="PKFields" alias="B" >
       <columnOverride column="wierd$Field" delimitedColumnName="true"/>
diff --git a/core/mybatis-generator-systests-ibatis2-java2/src/test/resources/mbg/test/ib2j2/hierarchical/SqlMapConfig.xml b/core/mybatis-generator-systests-ibatis2-java2/src/test/resources/mbg/test/ib2j2/hierarchical/SqlMapConfig.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-       Copyright 2006-2016 the original author or authors.
+       Copyright 2006-2017 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.
@@ -35,7 +35,7 @@
   </transactionManager>
 
   <sqlMap resource="mbg/test/ib2j2/generated/hierarchical/xml/FIELDSBLOBS_SqlMap.xml" />
-  <sqlMap resource="mbg/test/ib2j2/generated/hierarchical/xml/FIELDSONLY_SqlMap.xml" />
+  <sqlMap resource="mbg/test/ib2j2/generated/hierarchical/xml/subpackage/FIELDSONLY_SqlMap.xml" />
   <sqlMap resource="mbg/test/ib2j2/generated/hierarchical/xml/PKBLOBS_SqlMap.xml" />
   <sqlMap resource="mbg/test/ib2j2/generated/hierarchical/xml/PKFIELDS_SqlMap.xml" />
   <sqlMap resource="mbg/test/ib2j2/generated/hierarchical/xml/PKFIELDSBLOBS_SqlMap.xml" />
diff --git a/core/mybatis-generator-systests-ibatis2-java5/src/test/resources/mbg/test/ib2j5/hierarchical/SqlMapConfig.xml b/core/mybatis-generator-systests-ibatis2-java5/src/test/resources/mbg/test/ib2j5/hierarchical/SqlMapConfig.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-       Copyright 2006-2016 the original author or authors.
+       Copyright 2006-2017 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.
@@ -25,7 +25,7 @@
   <settings useStatementNamespaces="true" />
 
   <sqlMap resource="mbg/test/ib2j5/generated/hierarchical/xml/FIELDSBLOBS_SqlMap.xml" />
-  <sqlMap resource="mbg/test/ib2j5/generated/hierarchical/xml/FIELDSONLY_SqlMap.xml" />
+  <sqlMap resource="mbg/test/ib2j5/generated/hierarchical/xml/subpackage/FIELDSONLY_SqlMap.xml" />
   <sqlMap resource="mbg/test/ib2j5/generated/hierarchical/xml/PKBLOBS_SqlMap.xml" />
   <sqlMap resource="mbg/test/ib2j5/generated/hierarchical/xml/PKFIELDS_SqlMap.xml" />
   <sqlMap resource="mbg/test/ib2j5/generated/hierarchical/xml/PKFIELDSBLOBS_SqlMap.xml" />
diff --git a/core/mybatis-generator-systests-mybatis3/src/main/resources/generatorConfig.xml b/core/mybatis-generator-systests-mybatis3/src/main/resources/generatorConfig.xml
@@ -48,7 +48,7 @@
       <property name="enableSubPackages" value="true" />
     </javaClientGenerator>
 
-    <table tableName="FieldsOnly" />
+    <table tableName="FieldsOnly" domainObjectName="subpackage.Fieldsonly"/>
     <table tableName="PKOnly" />
     <table tableName="PKFields" alias="B" >
       <columnOverride column="wierd$Field" delimitedColumnName="true"/>
@@ -388,7 +388,7 @@
       <property name="enableSubPackages" value="true" />
     </javaClientGenerator>
 
-    <table tableName="FieldsOnly" />
+    <table tableName="FieldsOnly" domainObjectName="subpackage.Fieldsonly"/>
     <table tableName="PKOnly" />
     <table tableName="PKFields" alias="B" >
       <columnOverride column="wierd$Field" delimitedColumnName="true"/>
diff --git a/core/mybatis-generator-systests-mybatis3/src/test/java/mbg/test/mb3/annotated/flat/AbstractAnnotatedFlatTest.java b/core/mybatis-generator-systests-mybatis3/src/test/java/mbg/test/mb3/annotated/flat/AbstractAnnotatedFlatTest.java
@@ -1,5 +1,5 @@
 /**
- *    Copyright 2006-2016 the original author or authors.
+ *    Copyright 2006-2017 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,7 +18,7 @@
 import mbg.test.mb3.AbstractTest;
 import mbg.test.mb3.generated.annotated.flat.mapper.AwfulTableMapper;
 import mbg.test.mb3.generated.annotated.flat.mapper.FieldsblobsMapper;
-import mbg.test.mb3.generated.annotated.flat.mapper.FieldsonlyMapper;
+import mbg.test.mb3.generated.annotated.flat.mapper.subpackage.FieldsonlyMapper;
 import mbg.test.mb3.generated.annotated.flat.mapper.PkblobsMapper;
 import mbg.test.mb3.generated.annotated.flat.mapper.PkfieldsMapper;
 import mbg.test.mb3.generated.annotated.flat.mapper.PkfieldsblobsMapper;
diff --git a/core/mybatis-generator-systests-mybatis3/src/test/java/mbg/test/mb3/annotated/flat/FlatJava5Test.java b/core/mybatis-generator-systests-mybatis3/src/test/java/mbg/test/mb3/annotated/flat/FlatJava5Test.java
@@ -1,5 +1,5 @@
 /**
- *    Copyright 2006-2016 the original author or authors.
+ *    Copyright 2006-2017 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,7 +32,7 @@
 
 import mbg.test.mb3.generated.annotated.flat.mapper.AwfulTableMapper;
 import mbg.test.mb3.generated.annotated.flat.mapper.FieldsblobsMapper;
-import mbg.test.mb3.generated.annotated.flat.mapper.FieldsonlyMapper;
+import mbg.test.mb3.generated.annotated.flat.mapper.subpackage.FieldsonlyMapper;
 import mbg.test.mb3.generated.annotated.flat.mapper.PkblobsMapper;
 import mbg.test.mb3.generated.annotated.flat.mapper.PkfieldsMapper;
 import mbg.test.mb3.generated.annotated.flat.mapper.PkfieldsblobsMapper;
@@ -41,8 +41,8 @@
 import mbg.test.mb3.generated.annotated.flat.model.AwfulTableExample;
 import mbg.test.mb3.generated.annotated.flat.model.Fieldsblobs;
 import mbg.test.mb3.generated.annotated.flat.model.FieldsblobsExample;
-import mbg.test.mb3.generated.annotated.flat.model.Fieldsonly;
-import mbg.test.mb3.generated.annotated.flat.model.FieldsonlyExample;
+import mbg.test.mb3.generated.annotated.flat.model.subpackage.Fieldsonly;
+import mbg.test.mb3.generated.annotated.flat.model.subpackage.FieldsonlyExample;
 import mbg.test.mb3.generated.annotated.flat.model.Pkblobs;
 import mbg.test.mb3.generated.annotated.flat.model.PkblobsExample;
 import mbg.test.mb3.generated.annotated.flat.model.Pkfields;
diff --git a/core/mybatis-generator-systests-mybatis3/src/test/java/mbg/test/mb3/annotated/flat/UpdateByExampleTest.java b/core/mybatis-generator-systests-mybatis3/src/test/java/mbg/test/mb3/annotated/flat/UpdateByExampleTest.java
@@ -1,5 +1,5 @@
 /**
- *    Copyright 2006-2016 the original author or authors.
+ *    Copyright 2006-2017 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.
@@ -25,7 +25,7 @@
 
 import mbg.test.mb3.generated.annotated.flat.mapper.AwfulTableMapper;
 import mbg.test.mb3.generated.annotated.flat.mapper.FieldsblobsMapper;
-import mbg.test.mb3.generated.annotated.flat.mapper.FieldsonlyMapper;
+import mbg.test.mb3.generated.annotated.flat.mapper.subpackage.FieldsonlyMapper;
 import mbg.test.mb3.generated.annotated.flat.mapper.PkblobsMapper;
 import mbg.test.mb3.generated.annotated.flat.mapper.PkfieldsMapper;
 import mbg.test.mb3.generated.annotated.flat.mapper.PkfieldsblobsMapper;
@@ -34,8 +34,8 @@
 import mbg.test.mb3.generated.annotated.flat.model.AwfulTableExample;
 import mbg.test.mb3.generated.annotated.flat.model.Fieldsblobs;
 import mbg.test.mb3.generated.annotated.flat.model.FieldsblobsExample;
-import mbg.test.mb3.generated.annotated.flat.model.Fieldsonly;
-import mbg.test.mb3.generated.annotated.flat.model.FieldsonlyExample;
+import mbg.test.mb3.generated.annotated.flat.model.subpackage.Fieldsonly;
+import mbg.test.mb3.generated.annotated.flat.model.subpackage.FieldsonlyExample;
 import mbg.test.mb3.generated.annotated.flat.model.Pkblobs;
 import mbg.test.mb3.generated.annotated.flat.model.PkblobsExample;
 import mbg.test.mb3.generated.annotated.flat.model.Pkfields;
diff --git a/core/mybatis-generator-systests-mybatis3/src/test/java/mbg/test/mb3/flat/FlatJava5Test.java b/core/mybatis-generator-systests-mybatis3/src/test/java/mbg/test/mb3/flat/FlatJava5Test.java
@@ -1,5 +1,5 @@
 /**
- *    Copyright 2006-2016 the original author or authors.
+ *    Copyright 2006-2017 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.
@@ -30,19 +30,21 @@
 import java.util.Date;
 import java.util.List;
 
+import org.apache.ibatis.session.RowBounds;
+import org.apache.ibatis.session.SqlSession;
+import org.junit.Test;
+
 import mbg.test.mb3.generated.flat.mapper.AwfulTableMapper;
 import mbg.test.mb3.generated.flat.mapper.FieldsblobsMapper;
-import mbg.test.mb3.generated.flat.mapper.FieldsonlyMapper;
 import mbg.test.mb3.generated.flat.mapper.PkblobsMapper;
 import mbg.test.mb3.generated.flat.mapper.PkfieldsMapper;
 import mbg.test.mb3.generated.flat.mapper.PkfieldsblobsMapper;
 import mbg.test.mb3.generated.flat.mapper.PkonlyMapper;
+import mbg.test.mb3.generated.flat.mapper.subpackage.FieldsonlyMapper;
 import mbg.test.mb3.generated.flat.model.AwfulTable;
 import mbg.test.mb3.generated.flat.model.AwfulTableExample;
 import mbg.test.mb3.generated.flat.model.Fieldsblobs;
 import mbg.test.mb3.generated.flat.model.FieldsblobsExample;
-import mbg.test.mb3.generated.flat.model.Fieldsonly;
-import mbg.test.mb3.generated.flat.model.FieldsonlyExample;
 import mbg.test.mb3.generated.flat.model.Pkblobs;
 import mbg.test.mb3.generated.flat.model.PkblobsExample;
 import mbg.test.mb3.generated.flat.model.Pkfields;
@@ -51,10 +53,8 @@
 import mbg.test.mb3.generated.flat.model.PkfieldsblobsExample;
 import mbg.test.mb3.generated.flat.model.Pkonly;
 import mbg.test.mb3.generated.flat.model.PkonlyExample;
-
-import org.apache.ibatis.session.RowBounds;
-import org.apache.ibatis.session.SqlSession;
-import org.junit.Test;
+import mbg.test.mb3.generated.flat.model.subpackage.Fieldsonly;
+import mbg.test.mb3.generated.flat.model.subpackage.FieldsonlyExample;
 
 /**
  * @author Jeff Butler
diff --git a/core/mybatis-generator-systests-mybatis3/src/test/java/mbg/test/mb3/flat/UpdateByExampleTest.java b/core/mybatis-generator-systests-mybatis3/src/test/java/mbg/test/mb3/flat/UpdateByExampleTest.java
@@ -1,5 +1,5 @@
 /**
- *    Copyright 2006-2016 the original author or authors.
+ *    Copyright 2006-2017 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.
@@ -23,19 +23,20 @@
 
 import java.util.List;
 
+import org.apache.ibatis.session.SqlSession;
+import org.junit.Test;
+
 import mbg.test.mb3.generated.flat.mapper.AwfulTableMapper;
 import mbg.test.mb3.generated.flat.mapper.FieldsblobsMapper;
-import mbg.test.mb3.generated.flat.mapper.FieldsonlyMapper;
 import mbg.test.mb3.generated.flat.mapper.PkblobsMapper;
 import mbg.test.mb3.generated.flat.mapper.PkfieldsMapper;
 import mbg.test.mb3.generated.flat.mapper.PkfieldsblobsMapper;
 import mbg.test.mb3.generated.flat.mapper.PkonlyMapper;
+import mbg.test.mb3.generated.flat.mapper.subpackage.FieldsonlyMapper;
 import mbg.test.mb3.generated.flat.model.AwfulTable;
 import mbg.test.mb3.generated.flat.model.AwfulTableExample;
 import mbg.test.mb3.generated.flat.model.Fieldsblobs;
 import mbg.test.mb3.generated.flat.model.FieldsblobsExample;
-import mbg.test.mb3.generated.flat.model.Fieldsonly;
-import mbg.test.mb3.generated.flat.model.FieldsonlyExample;
 import mbg.test.mb3.generated.flat.model.Pkblobs;
 import mbg.test.mb3.generated.flat.model.PkblobsExample;
 import mbg.test.mb3.generated.flat.model.Pkfields;
@@ -44,9 +45,8 @@
 import mbg.test.mb3.generated.flat.model.PkfieldsblobsExample;
 import mbg.test.mb3.generated.flat.model.Pkonly;
 import mbg.test.mb3.generated.flat.model.PkonlyExample;
-
-import org.apache.ibatis.session.SqlSession;
-import org.junit.Test;
+import mbg.test.mb3.generated.flat.model.subpackage.Fieldsonly;
+import mbg.test.mb3.generated.flat.model.subpackage.FieldsonlyExample;
 
 /**
  * 
diff --git a/core/mybatis-generator-systests-mybatis3/src/test/resources/mbg/test/mb3/flat/MapperConfig.xml b/core/mybatis-generator-systests-mybatis3/src/test/resources/mbg/test/mb3/flat/MapperConfig.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!--
 
-       Copyright 2006-2016 the original author or authors.
+       Copyright 2006-2017 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.
@@ -46,7 +46,7 @@
   <mappers>
     <mapper resource="mbg/test/mb3/generated/flat/xml/AwfulTableMapper.xml" />
     <mapper resource="mbg/test/mb3/generated/flat/xml/FieldsblobsMapper.xml" />
-    <mapper resource="mbg/test/mb3/generated/flat/xml/FieldsonlyMapper.xml" />
+    <mapper resource="mbg/test/mb3/generated/flat/xml/subpackage/FieldsonlyMapper.xml" />
     <mapper resource="mbg/test/mb3/generated/flat/xml/PkblobsMapper.xml" />
     <mapper resource="mbg/test/mb3/generated/flat/xml/PkfieldsMapper.xml" />
     <mapper resource="mbg/test/mb3/generated/flat/xml/PkfieldsblobsMapper.xml" />

Original file line number	Diff line number	Diff line change
`@@ -397,4 +397,8 @@ private void addDelimiters(StringBuilder sb) {`
`397`	`397`	`sb.append(endingDelimiter);`
`398`	`398`	`}`
`399`	`399`	`}`
	`400`	`+`
	`401`	`+ public String getDomainObjectSubPackage() {`
	`402`	`+ return domainObjectSubPackage;`
	`403`	`+ }`
`400`	`404`	`}`
Original file line number	Diff line number	Diff line change
`@@ -827,6 +827,10 @@ protected void calculateJavaClientAttributes() {`
`827`	`827`	`if (stringHasValue(tableConfiguration.getMapperName())) {`
`828`	`828`	`sb.append(tableConfiguration.getMapperName());`
`829`	`829`	`} else {`
	`830`	`+ if (stringHasValue(fullyQualifiedTable.getDomainObjectSubPackage())) {`
	`831`	`+ sb.append(fullyQualifiedTable.getDomainObjectSubPackage());`
	`832`	`+ sb.append('.');`
	`833`	`+ }`
`830`	`834`	`sb.append(fullyQualifiedTable.getDomainObjectName());`
`831`	`835`	`sb.append("Mapper"); //$NON-NLS-1$`
`832`	`836`	`}`
`@@ -838,6 +842,10 @@ protected void calculateJavaClientAttributes() {`
`838`	`842`	`if (stringHasValue(tableConfiguration.getSqlProviderName())) {`
`839`	`843`	`sb.append(tableConfiguration.getSqlProviderName());`
`840`	`844`	`} else {`
	`845`	`+ if (stringHasValue(fullyQualifiedTable.getDomainObjectSubPackage())) {`
	`846`	`+ sb.append(fullyQualifiedTable.getDomainObjectSubPackage());`
	`847`	`+ sb.append('.');`
	`848`	`+ }`
`841`	`849`	`sb.append(fullyQualifiedTable.getDomainObjectName());`
`842`	`850`	`sb.append("SqlProvider"); //$NON-NLS-1$`
`843`	`851`	`}`
`@@ -901,6 +909,8 @@ protected String calculateSqlMapPackage() {`
`901`	`909`	`if (ind != -1) {`
`902`	`910`	`sb.append('.').append(mapperName.substring(0, ind));`
`903`	`911`	`}`
	`912`	`+ } else if (stringHasValue(fullyQualifiedTable.getDomainObjectSubPackage())) {`
	`913`	`+ sb.append('.').append(fullyQualifiedTable.getDomainObjectSubPackage());`
`904`	`914`	`}`
`905`	`915`	`}`
`906`	`916`