Merge pull request #517 from jeffgbutler/master

Remove implementationPackage attribute from javaClientConfiguration

Author: jeffgbutler

core/mybatis-generator-core/src/main/java/org/mybatis/generator/api/IntrospectedTable.java

@@ -647,25 +647,6 @@ public String getCountByExampleStatementId() {
                 .get(InternalAttribute.ATTR_COUNT_BY_EXAMPLE_STATEMENT_ID);
     }
 
-    protected String calculateJavaClientImplementationPackage() {
-        JavaClientGeneratorConfiguration config = context
-                .getJavaClientGeneratorConfiguration();
-        if (config == null) {
-            return null;
-        }
-
-        StringBuilder sb = new StringBuilder();
-        if (stringHasValue(config.getImplementationPackage())) {
-            sb.append(config.getImplementationPackage());
-        } else {
-            sb.append(config.getTargetPackage());
-        }
-
-        sb.append(fullyQualifiedTable.getSubPackageForClientOrSqlMap(isSubPackagesEnabled(config)));
-
-        return sb.toString();
-    }
-
     private boolean isSubPackagesEnabled(PropertyHolder propertyHolder) {
         return isTrue(propertyHolder.getProperty(PropertyRegistry.ANY_ENABLE_SUB_PACKAGES));
     }

core/mybatis-generator-core/src/main/java/org/mybatis/generator/config/JavaClientGeneratorConfiguration.java

@@ -1,5 +1,5 @@
 /**
- *    Copyright 2006-2018 the original author or authors.
+ *    Copyright 2006-2019 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.
@@ -22,7 +22,6 @@
 
 public class JavaClientGeneratorConfiguration extends TypedPropertyHolder {
     private String targetPackage;
-    private String implementationPackage;
     private String targetProject;
 
     public JavaClientGeneratorConfiguration() {
@@ -45,14 +44,6 @@ public void setTargetPackage(String targetPackage) {
         this.targetPackage = targetPackage;
     }
 
-    public String getImplementationPackage() {
-        return implementationPackage;
-    }
-
-    public void setImplementationPackage(String implementationPackage) {
-        this.implementationPackage = implementationPackage;
-    }
-
     public void validate(List<String> errors, String contextId) {
         if (!stringHasValue(targetProject)) {
             errors.add(getString("ValidationError.2", contextId)); //$NON-NLS-1$

core/mybatis-generator-core/src/main/java/org/mybatis/generator/config/xml/MyBatisGeneratorConfigurationParser.java

@@ -615,14 +615,10 @@ private void parseJavaClientGenerator(Context context, Node node) {
         String type = attributes.getProperty("type"); //$NON-NLS-1$
         String targetPackage = attributes.getProperty("targetPackage"); //$NON-NLS-1$
         String targetProject = attributes.getProperty("targetProject"); //$NON-NLS-1$
-        String implementationPackage = attributes
-                .getProperty("implementationPackage"); //$NON-NLS-1$
 
         javaClientGeneratorConfiguration.setConfigurationType(type);
         javaClientGeneratorConfiguration.setTargetPackage(targetPackage);
         javaClientGeneratorConfiguration.setTargetProject(targetProject);
-        javaClientGeneratorConfiguration
-                .setImplementationPackage(implementationPackage);
 
         NodeList nodeList = node.getChildNodes();
         for (int i = 0; i < nodeList.getLength(); i++) {

core/mybatis-generator-core/src/main/resources/org/mybatis/generator/config/xml/mybatis-generator-config_1_0.dtd

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-       Copyright 2006-2018 the original author or authors.
+       Copyright 2006-2019 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.
@@ -143,8 +143,7 @@
 <!ATTLIST javaClientGenerator
   type CDATA #REQUIRED
   targetPackage CDATA #REQUIRED
-  targetProject CDATA #REQUIRED
-  implementationPackage CDATA #IMPLIED>
+  targetProject CDATA #REQUIRED>
 
 <!--
   The table element is used to specify a database table that will be the source information

core/mybatis-generator-core/src/site/xhtml/configreference/javaClientGenerator.xhtml

@@ -121,26 +121,6 @@ specify this element, then MyBatis Generator (MBG) will not generate Java client
   </tr>
 </table>
 
-<h2>Optional Attributes</h2>
-<table border="1" cellspacing="0" cellpadding="5">
-  <tr>
-    <th>Attribute</th>
-    <th>Description</th>
-  </tr>
-  <tr>
-    <td valign="top">implementationPackage</td>
-    <td>If specified, implementation classes will be placed in this package.
-        In the default generators, the property "enableSubPackages"
-        controls how the actual package is calculated.  If true,
-        then the calculated package will be the implementationPackage plus
-        sub packages for the table's catalog and schema if they exist.
-        If "enableSubPackages" is false (the default) then the calculated package will be
-        exactly what is specified in the implementationPackage attribute.
-        MBG will create folders as required for the generated
-        packages.</td>
-  </tr>
-</table>
-
 <h2>Child Elements</h2>
 <ul>
   <li><a href="property.html">&lt;property&gt;</a> (0..N)</li>

core/mybatis-generator-core/src/site/xhtml/whatsNew.xhtml

@@ -102,6 +102,8 @@ deprecated and will be removed in a future version</b> - so please switch to the
       are replaced by a new set of renderer classes. Note that the new renderer classes will produce
       code that is the same as the prior methods with very few exceptions - and those exceptions are related to
       bugs in the old methods.</li>
+  <li>The attribute "implementationPackage" has been removed from the <code>&lt;javaClientGenerator&gt;</code>
+      configuration. It was only used for iBatis.</li>
 </ul>
 
 <h3>Other Changes</h3>