Skip to content

Commit 360a8ca

Browse files
jeffgbutlerjeffgbutler
authored
Merge pull request #518 from jeffgbutler/master
Attribute "type" on javaClientGenerator configuration is now optional
2 parents f98f033 + 08556e0 commit 360a8ca

File tree

8 files changed

+27
-26
lines changed

8 files changed

+27
-26
lines changed

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

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -53,10 +53,5 @@ public void validate(List<String> errors, String contextId) {
5353
errors.add(getString("ValidationError.12", //$NON-NLS-1$
5454
"javaClientGenerator", contextId)); //$NON-NLS-1$
5555
}
56-
57-
if (!stringHasValue(getConfigurationType())) {
58-
errors.add(getString("ValidationError.20", //$NON-NLS-1$
59-
contextId));
60-
}
6156
}
6257
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@
141141
-->
142142
<!ELEMENT javaClientGenerator (property*)>
143143
<!ATTLIST javaClientGenerator
144-
type CDATA #REQUIRED
144+
type CDATA #IMPLIED
145145
targetPackage CDATA #REQUIRED
146146
targetProject CDATA #REQUIRED>
147147

‎core/mybatis-generator-core/src/main/resources/org/mybatis/generator/internal/util/messages/messages.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ ValidationError.16="id" is required in a context
3434
ValidationError.17="type" is required in a plugin in context {0}
3535
ValidationError.18={0} requires the {1} property
3636
ValidationError.19=A null or empty string is not allowed for a classpath entry
37-
ValidationError.20="type" is required for DAO Generator in context {0}
37+
ValidationError.20="type" is required for Java Client Generator in context {0}
3838
ValidationError.21="column" is required for <ignoredColumn> in table {0}
3939
ValidationError.22="column" is required for <columnOverride> in table {0}
4040
ValidationError.23=Generated key in table {0} cannot be both "pre" and identity

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

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!--
33
4-
Copyright 2006-2018 the original author or authors.
4+
Copyright 2006-2019 the original author or authors.
55
66
Licensed under the Apache License, Version 2.0 (the "License");
77
you may not use this file except in compliance with the License.
@@ -49,7 +49,13 @@ specify this element, then MyBatis Generator (MBG) will not generate Java client
4949
predefined generators:</p>
5050
<table cellpadding="5">
5151
<tr>
52-
<td colspan="2">If the &lt;context&gt; targetRuntime is <b>MyBatis3</b>:</td>
52+
<td colspan="2">If the &lt;context&gt; targetRuntime is <b>MyBatis3DynamicSql</b> this attribute is optional and ignored.</td>
53+
</tr>
54+
<tr>
55+
<td colspan="2">If the &lt;context&gt; targetRuntime is <b>MyBatis3Kotlin</b> this attribute is optional and ignored.</td>
56+
</tr>
57+
<tr>
58+
<td colspan="2">If the &lt;context&gt; targetRuntime is <b>MyBatis3</b> the following predefined values can be used:</td>
5359
</tr>
5460
<tr>
5561
<th nowrap="nowrap" valign="top">ANNOTATEDMAPPER</th>
@@ -75,7 +81,7 @@ specify this element, then MyBatis Generator (MBG) will not generate Java client
7581
infrastructure. The interfaces will be dependent on generated XML mapper files.</td>
7682
</tr>
7783
<tr>
78-
<td colspan="2">If the &lt;context&gt; targetRuntime is <b>MyBatis3Simple</b>:</td>
84+
<td colspan="2">If the &lt;context&gt; targetRuntime is <b>MyBatis3Simple</b> the following predefined values can be used:</td>
7985
</tr>
8086
<tr>
8187
<th nowrap="nowrap" valign="top">ANNOTATEDMAPPER</th>

‎core/mybatis-generator-core/src/test/resources/scripts/generatorConfig-kotlin.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
<property name="trimStrings" value="true" />
3939
</javaModelGenerator>
4040

41-
<javaClientGenerator type="ANNOTATEDMAPPER" targetPackage="mbg.test.mb3.generated.dsql.kotlin.mapper" targetProject="MAVEN">
41+
<javaClientGenerator targetPackage="mbg.test.mb3.generated.dsql.kotlin.mapper" targetProject="MAVEN">
4242
<property name="enableSubPackages" value="true" />
4343
</javaClientGenerator>
4444

@@ -91,7 +91,7 @@
9191
<property name="trimStrings" value="true" />
9292
</javaModelGenerator>
9393

94-
<javaClientGenerator type="ANNOTATEDMAPPER" targetPackage="mbg.test.mb3.generated.dsql.kotlin.readonly.mapper"
94+
<javaClientGenerator targetPackage="mbg.test.mb3.generated.dsql.kotlin.readonly.mapper"
9595
targetProject="MAVEN"/>
9696

9797
<table tableName="PKFields" alias="B" >
@@ -133,7 +133,7 @@
133133
<property name="rootClass" value="mbg.test.common.BaseClass" />
134134
</javaModelGenerator>
135135

136-
<javaClientGenerator type="ANNOTATEDMAPPER" targetPackage="mbg.test.mb3.generated.dsql.kotlin.miscellaneous.mapper" targetProject="MAVEN">
136+
<javaClientGenerator targetPackage="mbg.test.mb3.generated.dsql.kotlin.miscellaneous.mapper" targetProject="MAVEN">
137137
</javaClientGenerator>
138138

139139
<table tableName="PKFields" domainObjectName="MyObject" alias="A" >

‎core/mybatis-generator-core/src/test/resources/scripts/generatorConfig_Dsql.xml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
<property name="trimStrings" value="true" />
3838
</javaModelGenerator>
3939

40-
<javaClientGenerator type="ANNOTATEDMAPPER" targetPackage="mbg.test.mb3.generated.dsql.v1.mapper" targetProject="MAVEN">
40+
<javaClientGenerator targetPackage="mbg.test.mb3.generated.dsql.v1.mapper" targetProject="MAVEN">
4141
<property name="enableSubPackages" value="true" />
4242
</javaClientGenerator>
4343

@@ -92,7 +92,7 @@
9292
<property name="rootClass" value="mbg.test.common.BaseClass" />
9393
</javaModelGenerator>
9494

95-
<javaClientGenerator type="ANNOTATEDMAPPER" targetPackage="mbg.test.mb3.generated.dsql.v1.miscellaneous.mapper" targetProject="MAVEN">
95+
<javaClientGenerator targetPackage="mbg.test.mb3.generated.dsql.v1.miscellaneous.mapper" targetProject="MAVEN">
9696
</javaClientGenerator>
9797

9898
<table tableName="PKFields" domainObjectName="MyObject" alias="A" >
@@ -140,7 +140,7 @@
140140
<property name="trimStrings" value="true" />
141141
</javaModelGenerator>
142142

143-
<javaClientGenerator type="ANNOTATEDMAPPER" targetPackage="mbg.test.mb3.generated.dsql.v2.mapper" targetProject="MAVEN">
143+
<javaClientGenerator targetPackage="mbg.test.mb3.generated.dsql.v2.mapper" targetProject="MAVEN">
144144
<property name="enableSubPackages" value="true" />
145145
</javaClientGenerator>
146146

@@ -193,7 +193,7 @@
193193
<property name="trimStrings" value="true" />
194194
</javaModelGenerator>
195195

196-
<javaClientGenerator type="ANNOTATEDMAPPER" targetPackage="mbg.test.mb3.generated.dsql.v2.readonly.mapper"
196+
<javaClientGenerator targetPackage="mbg.test.mb3.generated.dsql.v2.readonly.mapper"
197197
targetProject="MAVEN"/>
198198

199199
<table tableName="PKFields" alias="B" >
@@ -235,7 +235,7 @@
235235
<property name="rootClass" value="mbg.test.common.BaseClass" />
236236
</javaModelGenerator>
237237

238-
<javaClientGenerator type="ANNOTATEDMAPPER" targetPackage="mbg.test.mb3.generated.dsql.v2.miscellaneous.mapper" targetProject="MAVEN">
238+
<javaClientGenerator targetPackage="mbg.test.mb3.generated.dsql.v2.miscellaneous.mapper" targetProject="MAVEN">
239239
</javaClientGenerator>
240240

241241
<table tableName="PKFields" domainObjectName="MyObject" alias="A" >

‎core/mybatis-generator-systests-kotlin/src/main/resources/generatorConfig.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
<property name="trimStrings" value="true" />
3939
</javaModelGenerator>
4040

41-
<javaClientGenerator type="ANNOTATEDMAPPER" targetPackage="mbg.test.mb3.generated.dsql.kotlin.mapper" targetProject="MAVEN">
41+
<javaClientGenerator targetPackage="mbg.test.mb3.generated.dsql.kotlin.mapper" targetProject="MAVEN">
4242
<property name="enableSubPackages" value="true" />
4343
</javaClientGenerator>
4444

@@ -91,7 +91,7 @@
9191
<property name="trimStrings" value="true" />
9292
</javaModelGenerator>
9393

94-
<javaClientGenerator type="ANNOTATEDMAPPER" targetPackage="mbg.test.mb3.generated.dsql.kotlin.readonly.mapper"
94+
<javaClientGenerator targetPackage="mbg.test.mb3.generated.dsql.kotlin.readonly.mapper"
9595
targetProject="MAVEN"/>
9696

9797
<table tableName="PKFields" alias="B" >
@@ -129,7 +129,7 @@
129129
<property name="rootClass" value="mbg.test.common.BaseClass" />
130130
</javaModelGenerator>
131131

132-
<javaClientGenerator type="ANNOTATEDMAPPER" targetPackage="mbg.test.mb3.generated.dsql.kotlin.miscellaneous.mapper" targetProject="MAVEN">
132+
<javaClientGenerator targetPackage="mbg.test.mb3.generated.dsql.kotlin.miscellaneous.mapper" targetProject="MAVEN">
133133
</javaClientGenerator>
134134

135135
<table tableName="PKFields" domainObjectName="MyObject" alias="A" >

‎core/mybatis-generator-systests-mybatis3-java8/src/main/resources/generatorConfig.xml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
<property name="trimStrings" value="true" />
3838
</javaModelGenerator>
3939

40-
<javaClientGenerator type="ANNOTATEDMAPPER" targetPackage="mbg.test.mb3.generated.dsql.v1.mapper" targetProject="MAVEN">
40+
<javaClientGenerator targetPackage="mbg.test.mb3.generated.dsql.v1.mapper" targetProject="MAVEN">
4141
<property name="enableSubPackages" value="true" />
4242
</javaClientGenerator>
4343

@@ -92,7 +92,7 @@
9292
<property name="rootClass" value="mbg.test.common.BaseClass" />
9393
</javaModelGenerator>
9494

95-
<javaClientGenerator type="ANNOTATEDMAPPER" targetPackage="mbg.test.mb3.generated.dsql.v1.miscellaneous.mapper" targetProject="MAVEN">
95+
<javaClientGenerator targetPackage="mbg.test.mb3.generated.dsql.v1.miscellaneous.mapper" targetProject="MAVEN">
9696
</javaClientGenerator>
9797

9898
<table tableName="PKFields" domainObjectName="MyObject" alias="A" >
@@ -140,7 +140,7 @@
140140
<property name="trimStrings" value="true" />
141141
</javaModelGenerator>
142142

143-
<javaClientGenerator type="ANNOTATEDMAPPER" targetPackage="mbg.test.mb3.generated.dsql.v2.mapper" targetProject="MAVEN">
143+
<javaClientGenerator targetPackage="mbg.test.mb3.generated.dsql.v2.mapper" targetProject="MAVEN">
144144
<property name="enableSubPackages" value="true" />
145145
</javaClientGenerator>
146146

@@ -193,7 +193,7 @@
193193
<property name="trimStrings" value="true" />
194194
</javaModelGenerator>
195195

196-
<javaClientGenerator type="ANNOTATEDMAPPER" targetPackage="mbg.test.mb3.generated.dsql.v2.readonly.mapper"
196+
<javaClientGenerator targetPackage="mbg.test.mb3.generated.dsql.v2.readonly.mapper"
197197
targetProject="MAVEN"/>
198198

199199
<table tableName="PKFields" alias="B" >
@@ -235,7 +235,7 @@
235235
<property name="rootClass" value="mbg.test.common.BaseClass" />
236236
</javaModelGenerator>
237237

238-
<javaClientGenerator type="ANNOTATEDMAPPER" targetPackage="mbg.test.mb3.generated.dsql.v2.miscellaneous.mapper" targetProject="MAVEN">
238+
<javaClientGenerator targetPackage="mbg.test.mb3.generated.dsql.v2.miscellaneous.mapper" targetProject="MAVEN">
239239
</javaClientGenerator>
240240

241241
<table tableName="PKFields" domainObjectName="MyObject" alias="A" >

0 commit comments

Comments
 (0)