Skip to content

Commit b38e06a

Browse files
abel533abel533
committed
MapperTemplate中的getSelectReturnType方法改为getEntityClass
1 parent b21bccc commit b38e06a

File tree

9 files changed

+31
-32
lines changed

9 files changed

+31
-32
lines changed

‎src/main/java/tk/mybatis/mapper/mapperhelper/MapperTemplate.java

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@
5353
* @author liuzh
5454
*/
5555
public abstract class MapperTemplate {
56-
private XMLLanguageDriver languageDriver = new XMLLanguageDriver();
56+
private static final XMLLanguageDriver languageDriver = new XMLLanguageDriver();
5757
private Map<String, Method> methodMap = new HashMap<String, Method>();
5858
private Map<String, Class<?>> entityClassMap = new HashMap<String, Class<?>>();
5959
private Class<?> mapperClass;
@@ -69,7 +69,6 @@ public MapperTemplate(Class<?> mapperClass, MapperHelper mapperHelper) {
6969
*
7070
* @param msId
7171
* @return
72-
* @throws ClassNotFoundException
7372
*/
7473
public static Class<?> getMapperClass(String msId) {
7574
if (msId.indexOf(".") == -1) {
@@ -131,8 +130,8 @@ public String getIDENTITY() {
131130
return mapperHelper.getConfig().getIDENTITY();
132131
}
133132

134-
public boolean getBEFORE() {
135-
return mapperHelper.getConfig().getBEFORE();
133+
public boolean isBEFORE() {
134+
return mapperHelper.getConfig().isBEFORE();
136135
}
137136

138137
public boolean isNotEmpty() {
@@ -265,7 +264,7 @@ public SqlSource createSqlSource(MappedStatement ms, String xmlSql) {
265264
* @param ms
266265
* @return
267266
*/
268-
public Class<?> getSelectReturnType(MappedStatement ms) {
267+
public Class<?> getEntityClass(MappedStatement ms) {
269268
String msId = ms.getId();
270269
if (entityClassMap.containsKey(msId)) {
271270
return entityClassMap.get(msId);
@@ -295,7 +294,7 @@ public Class<?> getSelectReturnType(MappedStatement ms) {
295294
* @return
296295
*/
297296
protected List<ParameterMapping> getPrimaryKeyParameterMappings(MappedStatement ms) {
298-
Class<?> entityClass = getSelectReturnType(ms);
297+
Class<?> entityClass = getEntityClass(ms);
299298
Set<EntityColumn> entityColumns = EntityHelper.getPKColumns(entityClass);
300299
List<ParameterMapping> parameterMappings = new ArrayList<ParameterMapping>();
301300
for (EntityColumn column : entityColumns) {
@@ -508,7 +507,7 @@ protected SqlNode getAllIfColumnNode(Class<?> entityClass) {
508507
* @return
509508
*/
510509
protected List<ParameterMapping> getColumnParameterMappings(MappedStatement ms) {
511-
Class<?> entityClass = getSelectReturnType(ms);
510+
Class<?> entityClass = getEntityClass(ms);
512511
Set<EntityColumn> entityColumns = EntityHelper.getColumns(entityClass);
513512
List<ParameterMapping> parameterMappings = new ArrayList<ParameterMapping>();
514513
for (EntityColumn column : entityColumns) {
@@ -530,11 +529,11 @@ protected void newSelectKeyMappedStatement(MappedStatement ms, EntityColumn colu
530529
if (ms.getConfiguration().hasKeyGenerator(keyId)) {
531530
return;
532531
}
533-
Class<?> entityClass = getSelectReturnType(ms);
532+
Class<?> entityClass = getEntityClass(ms);
534533
//defaults
535534
Configuration configuration = ms.getConfiguration();
536535
KeyGenerator keyGenerator;
537-
Boolean executeBefore = getBEFORE();
536+
Boolean executeBefore = isBEFORE();
538537
String IDENTITY = (column.getGenerator() == null || column.getGenerator().equals("")) ? getIDENTITY() : column.getGenerator();
539538
if (IDENTITY.equalsIgnoreCase("JDBC")) {
540539
keyGenerator = new Jdbc3KeyGenerator();

‎src/main/java/tk/mybatis/mapper/provider/ExampleProvider.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ public ExampleProvider(Class<?> mapperClass, MapperHelper mapperHelper) {
5353
* @return
5454
*/
5555
public SqlNode selectCountByExample(MappedStatement ms) {
56-
Class<?> entityClass = getSelectReturnType(ms);
56+
Class<?> entityClass = getEntityClass(ms);
5757

5858
List<SqlNode> sqlNodes = new ArrayList<SqlNode>();
5959
//静态的sql部分:select column ... from table
@@ -72,7 +72,7 @@ public SqlNode selectCountByExample(MappedStatement ms) {
7272
* @return
7373
*/
7474
public SqlNode deleteByExample(MappedStatement ms) {
75-
Class<?> entityClass = getSelectReturnType(ms);
75+
Class<?> entityClass = getEntityClass(ms);
7676

7777
List<SqlNode> sqlNodes = new ArrayList<SqlNode>();
7878
//静态的sql部分:select column ... from table
@@ -92,7 +92,7 @@ public SqlNode deleteByExample(MappedStatement ms) {
9292
* @return
9393
*/
9494
public SqlNode selectByExample(MappedStatement ms) {
95-
Class<?> entityClass = getSelectReturnType(ms);
95+
Class<?> entityClass = getEntityClass(ms);
9696
//将返回值修改为实体类型
9797
setResultType(ms, entityClass);
9898
List<SqlNode> sqlNodes = new ArrayList<SqlNode>();
@@ -140,7 +140,7 @@ public SqlNode selectByExampleAndRowBounds(MappedStatement ms) {
140140
* @return
141141
*/
142142
public SqlNode updateByExampleSelective(MappedStatement ms) {
143-
Class<?> entityClass = getSelectReturnType(ms);
143+
Class<?> entityClass = getEntityClass(ms);
144144
List<SqlNode> sqlNodes = new ArrayList<SqlNode>();
145145
//update table
146146
sqlNodes.add(new StaticTextSqlNode("UPDATE "));
@@ -170,7 +170,7 @@ public SqlNode updateByExampleSelective(MappedStatement ms) {
170170
* @return
171171
*/
172172
public SqlNode updateByExample(MappedStatement ms) {
173-
Class<?> entityClass = getSelectReturnType(ms);
173+
Class<?> entityClass = getEntityClass(ms);
174174
List<SqlNode> sqlNodes = new ArrayList<SqlNode>();
175175
//update table
176176
sqlNodes.add(new StaticTextSqlNode("UPDATE "));

‎src/main/java/tk/mybatis/mapper/provider/SpecialProvider.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ public SpecialProvider(Class<?> mapperClass, MapperHelper mapperHelper) {
4848
* @param ms
4949
*/
5050
public String insertList(MappedStatement ms) {
51-
final Class<?> entityClass = getSelectReturnType(ms);
51+
final Class<?> entityClass = getEntityClass(ms);
5252
EntityTable table = EntityHelper.getEntityTable(entityClass);
5353
//开始拼sql
5454
StringBuilder sql = new StringBuilder();
@@ -91,7 +91,7 @@ public String insertList(MappedStatement ms) {
9191
* @param ms
9292
*/
9393
public String insertUseGeneratedKeys(MappedStatement ms) {
94-
final Class<?> entityClass = getSelectReturnType(ms);
94+
final Class<?> entityClass = getEntityClass(ms);
9595
EntityTable table = EntityHelper.getEntityTable(entityClass);
9696
//开始拼sql
9797
StringBuilder sql = new StringBuilder();

‎src/main/java/tk/mybatis/mapper/provider/SqlServerProvider.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ public SqlServerProvider(Class<?> mapperClass, MapperHelper mapperHelper) {
5353
* @param ms
5454
*/
5555
public String insert(MappedStatement ms) {
56-
final Class<?> entityClass = getSelectReturnType(ms);
56+
final Class<?> entityClass = getEntityClass(ms);
5757
EntityTable table = EntityHelper.getEntityTable(entityClass);
5858
//开始拼sql
5959
StringBuilder sql = new StringBuilder();
@@ -94,7 +94,7 @@ public String insert(MappedStatement ms) {
9494
* @return
9595
*/
9696
public SqlNode insertSelective(MappedStatement ms) {
97-
Class<?> entityClass = getSelectReturnType(ms);
97+
Class<?> entityClass = getEntityClass(ms);
9898
List<SqlNode> sqlNodes = new ArrayList<SqlNode>();
9999
//insert into table
100100
sqlNodes.add(new StaticTextSqlNode("INSERT INTO "));

‎src/main/java/tk/mybatis/mapper/provider/base/BaseDeleteProvider.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ public BaseDeleteProvider(Class<?> mapperClass, MapperHelper mapperHelper) {
5454
* @return
5555
*/
5656
public SqlNode delete(MappedStatement ms) {
57-
Class<?> entityClass = getSelectReturnType(ms);
57+
Class<?> entityClass = getEntityClass(ms);
5858
List<SqlNode> sqlNodes = new ArrayList<SqlNode>();
5959
//delete from table
6060
sqlNodes.add(new StaticTextSqlNode("DELETE FROM "));
@@ -70,7 +70,7 @@ public SqlNode delete(MappedStatement ms) {
7070
* @param ms
7171
*/
7272
public String deleteByPrimaryKey(MappedStatement ms) {
73-
final Class<?> entityClass = getSelectReturnType(ms);
73+
final Class<?> entityClass = getEntityClass(ms);
7474
StringBuilder sql = new StringBuilder();
7575
sql.append("delete from ");
7676
sql.append(getDynamicTableName(entityClass));

‎src/main/java/tk/mybatis/mapper/provider/base/BaseInsertProvider.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ public BaseInsertProvider(Class<?> mapperClass, MapperHelper mapperHelper) {
5454
* @return
5555
*/
5656
public SqlNode insert(MappedStatement ms) {
57-
Class<?> entityClass = getSelectReturnType(ms);
57+
Class<?> entityClass = getEntityClass(ms);
5858
List<SqlNode> sqlNodes = new ArrayList<SqlNode>();
5959
//insert into table
6060
sqlNodes.add(new StaticTextSqlNode("INSERT INTO "));
@@ -127,7 +127,7 @@ public SqlNode insert(MappedStatement ms) {
127127
* @return
128128
*/
129129
public SqlNode insertSelective(MappedStatement ms) {
130-
Class<?> entityClass = getSelectReturnType(ms);
130+
Class<?> entityClass = getEntityClass(ms);
131131
List<SqlNode> sqlNodes = new ArrayList<SqlNode>();
132132
//insert into table
133133
sqlNodes.add(new StaticTextSqlNode("INSERT INTO "));

‎src/main/java/tk/mybatis/mapper/provider/base/BaseSelectProvider.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ public BaseSelectProvider(Class<?> mapperClass, MapperHelper mapperHelper) {
5454
* @return
5555
*/
5656
public SqlNode selectOne(MappedStatement ms) {
57-
Class<?> entityClass = getSelectReturnType(ms);
57+
Class<?> entityClass = getEntityClass(ms);
5858
//修改返回值类型为实体类型
5959
setResultType(ms, entityClass);
6060
List<SqlNode> sqlNodes = new ArrayList<SqlNode>();
@@ -75,7 +75,7 @@ public SqlNode selectOne(MappedStatement ms) {
7575
* @return
7676
*/
7777
public SqlNode select(MappedStatement ms) {
78-
Class<?> entityClass = getSelectReturnType(ms);
78+
Class<?> entityClass = getEntityClass(ms);
7979
//修改返回值类型为实体类型
8080
setResultType(ms, entityClass);
8181
List<SqlNode> sqlNodes = new ArrayList<SqlNode>();
@@ -109,7 +109,7 @@ public SqlNode selectByRowBounds(MappedStatement ms) {
109109
* @param ms
110110
*/
111111
public String selectByPrimaryKey(MappedStatement ms) {
112-
final Class<?> entityClass = getSelectReturnType(ms);
112+
final Class<?> entityClass = getEntityClass(ms);
113113
//将返回值修改为实体类型
114114
setResultType(ms, entityClass);
115115
StringBuilder sql = new StringBuilder();
@@ -129,7 +129,7 @@ public String selectByPrimaryKey(MappedStatement ms) {
129129
* @return
130130
*/
131131
public SqlNode selectCount(MappedStatement ms) {
132-
Class<?> entityClass = getSelectReturnType(ms);
132+
Class<?> entityClass = getEntityClass(ms);
133133
List<SqlNode> sqlNodes = new ArrayList<SqlNode>();
134134
//select count(*) from table
135135
sqlNodes.add(new StaticTextSqlNode("SELECT COUNT(*) FROM "));
@@ -146,7 +146,7 @@ public SqlNode selectCount(MappedStatement ms) {
146146
* @return
147147
*/
148148
public String selectAll(MappedStatement ms) {
149-
final Class<?> entityClass = getSelectReturnType(ms);
149+
final Class<?> entityClass = getEntityClass(ms);
150150
//修改返回值类型为实体类型
151151
setResultType(ms, entityClass);
152152
//开始拼sql

‎src/main/java/tk/mybatis/mapper/provider/base/BaseUpdateProvider.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ public BaseUpdateProvider(Class<?> mapperClass, MapperHelper mapperHelper) {
5252
* @param ms
5353
*/
5454
public SqlNode updateByPrimaryKey(MappedStatement ms) {
55-
Class<?> entityClass = getSelectReturnType(ms);
55+
Class<?> entityClass = getEntityClass(ms);
5656
List<SqlNode> sqlNodes = new ArrayList<SqlNode>();
5757
//update table
5858
sqlNodes.add(new StaticTextSqlNode("UPDATE "));
@@ -87,7 +87,7 @@ public SqlNode updateByPrimaryKey(MappedStatement ms) {
8787
* @return
8888
*/
8989
public SqlNode updateByPrimaryKeySelective(MappedStatement ms) {
90-
Class<?> entityClass = getSelectReturnType(ms);
90+
Class<?> entityClass = getEntityClass(ms);
9191
List<SqlNode> sqlNodes = new ArrayList<SqlNode>();
9292
//update table
9393
sqlNodes.add(new StaticTextSqlNode("UPDATE "));

‎src/test/java/tk/mybatis/mapper/hsqldb/HsqldbProvider.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
package tk.mybatis.mapper.hsqldb;
22

3+
import org.apache.ibatis.mapping.MappedStatement;
4+
import org.apache.ibatis.scripting.xmltags.*;
35
import tk.mybatis.mapper.entity.EntityColumn;
46
import tk.mybatis.mapper.mapperhelper.EntityHelper;
57
import tk.mybatis.mapper.mapperhelper.MapperHelper;
68
import tk.mybatis.mapper.mapperhelper.MapperTemplate;
7-
import org.apache.ibatis.mapping.MappedStatement;
8-
import org.apache.ibatis.scripting.xmltags.*;
99

1010
import java.util.ArrayList;
1111
import java.util.List;
@@ -25,7 +25,7 @@ public HsqldbProvider(Class<?> mapperClass, MapperHelper mapperHelper) {
2525
* @return
2626
*/
2727
public SqlNode selectPage(MappedStatement ms) {
28-
Class<?> entityClass = getSelectReturnType(ms);
28+
Class<?> entityClass = getEntityClass(ms);
2929
//修改返回值类型为实体类型
3030
setResultType(ms, entityClass);
3131

0 commit comments

Comments
 (0)