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 index d26457e3ef..33f3fb0050 100644 --- 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 @@ -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)); } diff --git a/core/mybatis-generator-core/src/main/java/org/mybatis/generator/config/JavaClientGeneratorConfiguration.java b/core/mybatis-generator-core/src/main/java/org/mybatis/generator/config/JavaClientGeneratorConfiguration.java index 704a7c83ed..69771f301a 100644 --- a/core/mybatis-generator-core/src/main/java/org/mybatis/generator/config/JavaClientGeneratorConfiguration.java +++ b/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 errors, String contextId) { if (!stringHasValue(targetProject)) { errors.add(getString("ValidationError.2", contextId)); //$NON-NLS-1$ diff --git a/core/mybatis-generator-core/src/main/java/org/mybatis/generator/config/xml/MyBatisGeneratorConfigurationParser.java b/core/mybatis-generator-core/src/main/java/org/mybatis/generator/config/xml/MyBatisGeneratorConfigurationParser.java index 7963d9fe5a..92ac271515 100644 --- a/core/mybatis-generator-core/src/main/java/org/mybatis/generator/config/xml/MyBatisGeneratorConfigurationParser.java +++ b/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++) { diff --git a/core/mybatis-generator-core/src/main/resources/org/mybatis/generator/config/xml/mybatis-generator-config_1_0.dtd b/core/mybatis-generator-core/src/main/resources/org/mybatis/generator/config/xml/mybatis-generator-config_1_0.dtd index 81a9b04e8b..f2600c7713 100644 --- a/core/mybatis-generator-core/src/main/resources/org/mybatis/generator/config/xml/mybatis-generator-config_1_0.dtd +++ b/core/mybatis-generator-core/src/main/resources/org/mybatis/generator/config/xml/mybatis-generator-config_1_0.dtd @@ -1,7 +1,7 @@