fix #227

mybatis-plus/src/main/java/com/baomidou/mybatisplus/annotations/TableId.java

@@ -1,12 +1,12 @@
 /**
  * Copyright (c) 2011-2014, hubin (jobob@qq.com).
- *
+ * <p>
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- *
+ * <p>
  * http://www.apache.org/licenses/LICENSE-2.0
- *
+ * <p>
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -26,7 +26,7 @@ import com.baomidou.mybatisplus.enums.IdType;
  * <p>
  * 表主键标识
  * </p>
- * 
+ *
  * @author hubin
  * @Date 2016-01-23
  */
@@ -34,19 +34,19 @@ import com.baomidou.mybatisplus.enums.IdType;
 @Target(ElementType.FIELD)
 public @interface TableId {
 
-	/*
-	 * <p>
-	 * 字段值（驼峰命名方式，该值可无）
-	 * </p>
-	 */
-	String value() default "";
+    /*
+     * <p>
+     * 字段值（驼峰命名方式，该值可无）
+     * </p>
+     */
+    String value() default "";
 
-	/*
-	 * <p>
-	 * 主键ID，默认 INPUT
-	 * </p>
-	 * {@link IdType}
-	 */
-	IdType type() default IdType.INPUT;
+    /*
+     * <p>
+     * 主键ID
+     * </p>
+     * {@link IdType}
+     */
+    IdType type();
 
 }

mybatis-plus/src/main/java/com/baomidou/mybatisplus/toolkit/TableInfoHelper.java

@@ -15,6 +15,19 @@
  */
 package com.baomidou.mybatisplus.toolkit;
 
+import java.lang.reflect.Field;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+
+import org.apache.ibatis.builder.MapperBuilderAssistant;
+import org.apache.ibatis.logging.Log;
+import org.apache.ibatis.logging.LogFactory;
+import org.apache.ibatis.session.Configuration;
+import org.apache.ibatis.session.SqlSessionFactory;
+
 import com.baomidou.mybatisplus.annotations.TableField;
 import com.baomidou.mybatisplus.annotations.TableId;
 import com.baomidou.mybatisplus.annotations.TableName;
@@ -22,21 +35,8 @@ import com.baomidou.mybatisplus.entity.GlobalConfiguration;
 import com.baomidou.mybatisplus.entity.TableFieldInfo;
 import com.baomidou.mybatisplus.entity.TableInfo;
 import com.baomidou.mybatisplus.enums.FieldStrategy;
-import com.baomidou.mybatisplus.enums.IdType;
 import com.baomidou.mybatisplus.exceptions.MybatisPlusException;
 import com.baomidou.mybatisplus.mapper.SqlRunner;
-import org.apache.ibatis.builder.MapperBuilderAssistant;
-import org.apache.ibatis.logging.Log;
-import org.apache.ibatis.logging.LogFactory;
-import org.apache.ibatis.session.Configuration;
-import org.apache.ibatis.session.SqlSessionFactory;
-
-import java.lang.reflect.Field;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
 
 /**
  * <p>
@@ -48,325 +48,316 @@ import java.util.concurrent.ConcurrentHashMap;
  */
 public class TableInfoHelper {
 
-	private static final Log logger = LogFactory.getLog(TableInfoHelper.class);
-	/**
-	 * 缓存反射类表信息
-	 */
-	private static final Map<String, TableInfo> tableInfoCache = new ConcurrentHashMap<String, TableInfo>();
-	/**
-	 * 默认表主键
-	 */
-	private static final String DEFAULT_ID_NAME = "id";
+    private static final Log logger = LogFactory.getLog(TableInfoHelper.class);
+    /**
+     * 缓存反射类表信息
+     */
+    private static final Map<String, TableInfo> tableInfoCache = new ConcurrentHashMap<String, TableInfo>();
+    /**
+     * 默认表主键
+     */
+    private static final String DEFAULT_ID_NAME = "id";
 
-	/**
-	 * <p>
-	 * 获取实体映射表信息
-	 * <p>
-	 *
-	 * @param clazz
-	 *            反射实体类
-	 * @return
-	 */
-	public static TableInfo getTableInfo(Class<?> clazz) {
-		return tableInfoCache.get(clazz.getName());
-	}
+    /**
+     * <p>
+     * 获取实体映射表信息
+     * <p>
+     *
+     * @param clazz 反射实体类
+     * @return
+     */
+    public static TableInfo getTableInfo(Class<?> clazz) {
+        return tableInfoCache.get(clazz.getName());
+    }
 
-	/**
-	 * <p>
-	 * 实体类反射获取表信息【初始化】
-	 * <p>
-	 *
-	 * @param clazz
-	 *            反射实体类
-	 * @return
-	 */
-	public synchronized static TableInfo initTableInfo(MapperBuilderAssistant builderAssistant, Class<?> clazz) {
-		TableInfo ti = tableInfoCache.get(clazz.getName());
-		if (ti != null) {
-			return ti;
-		}
-		TableInfo tableInfo = new TableInfo();
-		GlobalConfiguration globalCache;
-		if (null != builderAssistant) {
-			tableInfo.setCurrentNamespace(builderAssistant.getCurrentNamespace());
-			tableInfo.setConfigMark(builderAssistant.getConfiguration());
-			globalCache = GlobalConfiguration.getGlobalConfig(builderAssistant.getConfiguration());
-		} else {
-			// 兼容测试场景
-			globalCache = GlobalConfiguration.DEFAULT;
-		}
-		/* 表名 */
-		TableName table = clazz.getAnnotation(TableName.class);
-		String tableName = clazz.getSimpleName();
-		if (table != null && StringUtils.isNotEmpty(table.value())) {
-			tableName = table.value();
-		} else {
-			// 开启字段下划线申明
-			if (globalCache.isDbColumnUnderline()) {
-				tableName = StringUtils.camelToUnderline(tableName);
-			}
-			// 大写命名判断
-			if (globalCache.isCapitalMode()) {
-				tableName = tableName.toUpperCase();
-			} else {
-				// 首字母小写
-				tableName = StringUtils.firstToLowerCase(tableName);
-			}
-		}
-		tableInfo.setTableName(tableName);
-		/* 表结果集映射 */
-		if (table != null && StringUtils.isNotEmpty(table.resultMap())) {
-			tableInfo.setResultMap(table.resultMap());
-		}
-		List<TableFieldInfo> fieldList = new ArrayList<TableFieldInfo>();
-		List<Field> list = getAllFields(clazz);
-		boolean existTableId = existTableId(list);
-		for (Field field : list) {
+    /**
+     * <p>
+     * 实体类反射获取表信息【初始化】
+     * <p>
+     *
+     * @param clazz 反射实体类
+     * @return
+     */
+    public synchronized static TableInfo initTableInfo(MapperBuilderAssistant builderAssistant, Class<?> clazz) {
+        TableInfo ti = tableInfoCache.get(clazz.getName());
+        if (ti != null) {
+            return ti;
+        }
+        TableInfo tableInfo = new TableInfo();
+        GlobalConfiguration globalCache;
+        if (null != builderAssistant) {
+            tableInfo.setCurrentNamespace(builderAssistant.getCurrentNamespace());
+            tableInfo.setConfigMark(builderAssistant.getConfiguration());
+            globalCache = GlobalConfiguration.getGlobalConfig(builderAssistant.getConfiguration());
+        } else {
+            // 兼容测试场景
+            globalCache = GlobalConfiguration.DEFAULT;
+        }
+        /* 表名 */
+        TableName table = clazz.getAnnotation(TableName.class);
+        String tableName = clazz.getSimpleName();
+        if (table != null && StringUtils.isNotEmpty(table.value())) {
+            tableName = table.value();
+        } else {
+            // 开启字段下划线申明
+            if (globalCache.isDbColumnUnderline()) {
+                tableName = StringUtils.camelToUnderline(tableName);
+            }
+            // 大写命名判断
+            if (globalCache.isCapitalMode()) {
+                tableName = tableName.toUpperCase();
+            } else {
+                // 首字母小写
+                tableName = StringUtils.firstToLowerCase(tableName);
+            }
+        }
+        tableInfo.setTableName(tableName);
+        /* 表结果集映射 */
+        if (table != null && StringUtils.isNotEmpty(table.resultMap())) {
+            tableInfo.setResultMap(table.resultMap());
+        }
+        List<TableFieldInfo> fieldList = new ArrayList<TableFieldInfo>();
+        List<Field> list = getAllFields(clazz);
+        boolean existTableId = existTableId(list);
+        for (Field field : list) {
 
-			/**
-			 * 主键ID 初始化
-			 */
-			if (existTableId) {
-				if (initTableId(globalCache, tableInfo, field, clazz)) {
-					continue;
-				}
-			} else if (initFieldId(globalCache, tableInfo, field, clazz)) {
-				continue;
-			}
+            /**
+             * 主键ID 初始化
+             */
+            if (existTableId) {
+                if (initTableId(globalCache, tableInfo, field, clazz)) {
+                    continue;
+                }
+            } else if (initFieldId(globalCache, tableInfo, field, clazz)) {
+                continue;
+            }
 
-			/**
-			 * 字段初始化
-			 */
-			if (initTableField(globalCache, fieldList, field, clazz)) {
-				continue;
-			}
+            /**
+             * 字段初始化
+             */
+            if (initTableField(globalCache, fieldList, field, clazz)) {
+                continue;
+            }
 
-			/**
-			 * 字段, 使用 camelToUnderline 转换驼峰写法为下划线分割法, 如果已指定 TableField , 便不会执行这里
-			 */
-			fieldList.add(new TableFieldInfo(globalCache, field.getName(), field.getType().getName()));
-		}
+            /**
+             * 字段, 使用 camelToUnderline 转换驼峰写法为下划线分割法, 如果已指定 TableField , 便不会执行这里
+             */
+            fieldList.add(new TableFieldInfo(globalCache, field.getName(), field.getType().getName()));
+        }
 
 		/* 字段列表 */
-		tableInfo.setFieldList(fieldList);
-		/*
-		 * 未发现主键注解，提示警告信息
+        tableInfo.setFieldList(fieldList);
+        /*
+         * 未发现主键注解，提示警告信息
 		 */
-		if (StringUtils.isEmpty(tableInfo.getKeyColumn())) {
-			logger.warn(String.format("Warn: Could not find @TableId in Class: %s.", clazz.getName()));
-		}
-		/*
-		 * 注入
+        if (StringUtils.isEmpty(tableInfo.getKeyColumn())) {
+            logger.warn(String.format("Warn: Could not find @TableId in Class: %s.", clazz.getName()));
+        }
+        /*
+         * 注入
 		 */
-		tableInfoCache.put(clazz.getName(), tableInfo);
-		return tableInfo;
-	}
+        tableInfoCache.put(clazz.getName(), tableInfo);
+        return tableInfo;
+    }
 
-	/**
-	 * <p>
-	 * 判断主键注解是否存在
-	 * </p>
-	 *
-	 * @param list
-	 *            字段列表
-	 * @return
-	 */
-	public static boolean existTableId(List<Field> list) {
-		boolean exist = false;
-		for (Field field : list) {
-			TableId tableId = field.getAnnotation(TableId.class);
-			if (tableId != null) {
-				exist = true;
-				break;
-			}
-		}
-		return exist;
-	}
+    /**
+     * <p>
+     * 判断主键注解是否存在
+     * </p>
+     *
+     * @param list 字段列表
+     * @return
+     */
+    public static boolean existTableId(List<Field> list) {
+        boolean exist = false;
+        for (Field field : list) {
+            TableId tableId = field.getAnnotation(TableId.class);
+            if (tableId != null) {
+                exist = true;
+                break;
+            }
+        }
+        return exist;
+    }
 
-	/**
-	 * <p>
-	 * 主键属性初始化
-	 * </p>
-	 *
-	 * @param tableInfo
-	 * @param field
-	 * @param clazz
-	 * @return true 继续下一个属性判断，返回 continue;
-	 */
-	private static boolean initTableId(GlobalConfiguration globalConfig, TableInfo tableInfo, Field field, Class<?> clazz) {
-		TableId tableId = field.getAnnotation(TableId.class);
-		if (tableId != null) {
-			if (StringUtils.isEmpty(tableInfo.getKeyColumn())) {
-				/*
+    /**
+     * <p>
+     * 主键属性初始化
+     * </p>
+     *
+     * @param tableInfo
+     * @param field
+     * @param clazz
+     * @return true 继续下一个属性判断，返回 continue;
+     */
+    private static boolean initTableId(GlobalConfiguration globalConfig, TableInfo tableInfo, Field field, Class<?> clazz) {
+        TableId tableId = field.getAnnotation(TableId.class);
+        if (tableId != null) {
+            if (StringUtils.isEmpty(tableInfo.getKeyColumn())) {
+                /*
 				 * 主键策略（ 注解 > 全局 > 默认 ）
 				 */
-				if (IdType.INPUT != tableId.type()) {
-					tableInfo.setIdType(tableId.type());
-				} else {
-					tableInfo.setIdType(globalConfig.getIdType());
-				}
+                if (StringUtils.checkValNull(tableId.type())) {
+                    tableInfo.setIdType(tableId.type());
+                } else {
+                    tableInfo.setIdType(globalConfig.getIdType());
+                }
 				/* 字段 */
-				String column = field.getName();
-				if (StringUtils.isNotEmpty(tableId.value())) {
-					column = tableId.value();
-					tableInfo.setKeyRelated(true);
-				} else {
-					// 开启字段下划线申明
-					if (globalConfig.isDbColumnUnderline()) {
-						column = StringUtils.camelToUnderline(column);
-						// fixed 217
-						tableInfo.setKeyRelated(true);
-					}
-					// 全局大写命名
-					if (globalConfig.isCapitalMode()) {
-						column = column.toUpperCase();
-					}
-				}
-				tableInfo.setKeyColumn(column);
-				tableInfo.setKeyProperty(field.getName());
-				return true;
-			} else {
-				throwExceptionId(clazz);
-			}
-		} else {
-			// fixed 217
-			tableInfo.setIdType(globalConfig.getIdType());
-		}
-		return false;
-	}
+                String column = field.getName();
+                if (StringUtils.isNotEmpty(tableId.value())) {
+                    column = tableId.value();
+                    tableInfo.setKeyRelated(true);
+                } else {
+                    // 开启字段下划线申明
+                    if (globalConfig.isDbColumnUnderline()) {
+                        column = StringUtils.camelToUnderline(column);
+                    }
+                    // 全局大写命名
+                    if (globalConfig.isCapitalMode()) {
+                        column = column.toUpperCase();
+                    }
+                }
+                tableInfo.setKeyColumn(column);
+                tableInfo.setKeyProperty(field.getName());
+                return true;
+            } else {
+                throwExceptionId(clazz);
+            }
+        }
+        return false;
+    }
 
-	/**
-	 * <p>
-	 * 主键属性初始化
-	 * </p>
-	 *
-	 * @param tableInfo
-	 * @param field
-	 * @param clazz
-	 * @return true 继续下一个属性判断，返回 continue;
-	 */
-	private static boolean initFieldId(GlobalConfiguration globalConfig, TableInfo tableInfo, Field field, Class<?> clazz) {
-		String column = field.getName();
-		if (globalConfig.isCapitalMode()) {
-			column = column.toUpperCase();
-		}
-		if (DEFAULT_ID_NAME.equalsIgnoreCase(column)) {
-			if (StringUtils.isEmpty(tableInfo.getKeyColumn())) {
-				tableInfo.setIdType(globalConfig.getIdType());
-				tableInfo.setKeyColumn(column);
-				tableInfo.setKeyProperty(field.getName());
-				return true;
-			} else {
-				throwExceptionId(clazz);
-			}
-		}
-		return false;
-	}
+    /**
+     * <p>
+     * 主键属性初始化
+     * </p>
+     *
+     * @param tableInfo
+     * @param field
+     * @param clazz
+     * @return true 继续下一个属性判断，返回 continue;
+     */
+    private static boolean initFieldId(GlobalConfiguration globalConfig, TableInfo tableInfo, Field field, Class<?> clazz) {
+        String column = field.getName();
+        if (globalConfig.isCapitalMode()) {
+            column = column.toUpperCase();
+        }
+        if (DEFAULT_ID_NAME.equalsIgnoreCase(column)) {
+            if (StringUtils.isEmpty(tableInfo.getKeyColumn())) {
+                tableInfo.setIdType(globalConfig.getIdType());
+                tableInfo.setKeyColumn(column);
+                tableInfo.setKeyProperty(field.getName());
+                return true;
+            } else {
+                throwExceptionId(clazz);
+            }
+        }
+        return false;
+    }
 
-	/**
-	 * <p>
-	 * 发现设置多个主键注解抛出异常
-	 * </p>
-	 */
-	private static void throwExceptionId(Class<?> clazz) {
-		StringBuilder errorMsg = new StringBuilder();
-		errorMsg.append("There must be only one, Discover multiple @TableId annotation in ");
-		errorMsg.append(clazz.getName());
-		throw new MybatisPlusException(errorMsg.toString());
-	}
+    /**
+     * <p>
+     * 发现设置多个主键注解抛出异常
+     * </p>
+     */
+    private static void throwExceptionId(Class<?> clazz) {
+        StringBuilder errorMsg = new StringBuilder();
+        errorMsg.append("There must be only one, Discover multiple @TableId annotation in ");
+        errorMsg.append(clazz.getName());
+        throw new MybatisPlusException(errorMsg.toString());
+    }
 
-	/**
-	 * <p>
-	 * 字段属性初始化
-	 * </p>
-	 *
-	 * @param fieldList
-	 * @param clazz
-	 * @return true 继续下一个属性判断，返回 continue;
-	 */
-	private static boolean initTableField(GlobalConfiguration globalCache, List<TableFieldInfo> fieldList, Field field,
-			Class<?> clazz) {
+    /**
+     * <p>
+     * 字段属性初始化
+     * </p>
+     *
+     * @param fieldList
+     * @param clazz
+     * @return true 继续下一个属性判断，返回 continue;
+     */
+    private static boolean initTableField(GlobalConfiguration globalCache, List<TableFieldInfo> fieldList, Field field,
+                                          Class<?> clazz) {
 		/* 获取注解属性，自定义字段 */
-		TableField tableField = field.getAnnotation(TableField.class);
-		if (tableField != null) {
-			String columnName = field.getName();
-			if (StringUtils.isNotEmpty(tableField.value())) {
-				columnName = tableField.value();
-			}
+        TableField tableField = field.getAnnotation(TableField.class);
+        if (tableField != null) {
+            String columnName = field.getName();
+            if (StringUtils.isNotEmpty(tableField.value())) {
+                columnName = tableField.value();
+            }
 
-			Class<?> fieldType = field.getType();
-			FieldStrategy validate = tableField.validate();
+            Class<?> fieldType = field.getType();
+            FieldStrategy validate = tableField.validate();
 			/* 字符串类型默认 FieldStrategy.NOT_EMPTY */
-			if (String.class.isAssignableFrom(fieldType) && FieldStrategy.NOT_NULL.equals(validate)) {
-				validate = FieldStrategy.NOT_EMPTY;
-			}
+            if (String.class.isAssignableFrom(fieldType) && FieldStrategy.NOT_NULL.equals(validate)) {
+                validate = FieldStrategy.NOT_EMPTY;
+            }
 
 			/*
 			 * el 语法支持，可以传入多个参数以逗号分开
 			 */
-			String el = field.getName();
-			if (StringUtils.isNotEmpty(tableField.el())) {
-				el = tableField.el();
-			}
-			String[] columns = columnName.split(";");
-			String[] els = el.split(";");
-			if (columns.length == els.length) {
-				for (int i = 0; i < columns.length; i++) {
-					fieldList.add(new TableFieldInfo(globalCache, columns[i], field.getName(), els[i], validate, field.getType()
-							.getName()));
-				}
-			} else {
-				String errorMsg = "Class: %s, Field: %s, 'value' 'el' Length must be consistent.";
-				throw new MybatisPlusException(String.format(errorMsg, clazz.getName(), field.getName()));
-			}
+            String el = field.getName();
+            if (StringUtils.isNotEmpty(tableField.el())) {
+                el = tableField.el();
+            }
+            String[] columns = columnName.split(";");
+            String[] els = el.split(";");
+            if (columns.length == els.length) {
+                for (int i = 0; i < columns.length; i++) {
+                    fieldList.add(new TableFieldInfo(globalCache, columns[i], field.getName(), els[i], validate, field.getType()
+                            .getName()));
+                }
+            } else {
+                String errorMsg = "Class: %s, Field: %s, 'value' 'el' Length must be consistent.";
+                throw new MybatisPlusException(String.format(errorMsg, clazz.getName(), field.getName()));
+            }
 
-			return true;
-		}
+            return true;
+        }
 
-		return false;
-	}
+        return false;
+    }
 
-	/**
-	 * 获取该类的所有属性列表
-	 *
-	 * @param clazz
-	 *            反射类
-	 * @return
-	 */
-	private static List<Field> getAllFields(Class<?> clazz) {
-		List<Field> fieldList = ReflectionKit.getFieldList(clazz);
-		if (CollectionUtils.isNotEmpty(fieldList)) {
-			Iterator<Field> iterator = fieldList.iterator();
-			while (iterator.hasNext()) {
-				Field field = iterator.next();
+    /**
+     * 获取该类的所有属性列表
+     *
+     * @param clazz 反射类
+     * @return
+     */
+    private static List<Field> getAllFields(Class<?> clazz) {
+        List<Field> fieldList = ReflectionKit.getFieldList(clazz);
+        if (CollectionUtils.isNotEmpty(fieldList)) {
+            Iterator<Field> iterator = fieldList.iterator();
+            while (iterator.hasNext()) {
+                Field field = iterator.next();
 				/* 过滤注解非表字段属性 */
-				TableField tableField = field.getAnnotation(TableField.class);
-				if (tableField != null && !tableField.exist()) {
-					iterator.remove();
-				}
-			}
-		}
-		return fieldList;
-	}
+                TableField tableField = field.getAnnotation(TableField.class);
+                if (tableField != null && !tableField.exist()) {
+                    iterator.remove();
+                }
+            }
+        }
+        return fieldList;
+    }
 
-	/**
-	 * 初始化SqlSessionFactory (供Mybatis原生调用)
-	 *
-	 * @param sqlSessionFactory
-	 * @return
-	 */
-	public static void initSqlSessionFactory(SqlSessionFactory sqlSessionFactory) {
-		Configuration configuration = sqlSessionFactory.getConfiguration();
-		GlobalConfiguration globalConfig = GlobalConfiguration.getGlobalConfig(configuration);
-		// SqlRunner
-		SqlRunner.FACTORY = sqlSessionFactory;
-		if (globalConfig == null) {
-			GlobalConfiguration defaultCache = GlobalConfiguration.defaults();
-			defaultCache.setSqlSessionFactory(sqlSessionFactory);
-			GlobalConfiguration.setGlobalConfig(configuration, defaultCache);
-		} else {
-			globalConfig.setSqlSessionFactory(sqlSessionFactory);
-		}
-	}
+    /**
+     * 初始化SqlSessionFactory (供Mybatis原生调用)
+     *
+     * @param sqlSessionFactory
+     * @return
+     */
+    public static void initSqlSessionFactory(SqlSessionFactory sqlSessionFactory) {
+        Configuration configuration = sqlSessionFactory.getConfiguration();
+        GlobalConfiguration globalConfig = GlobalConfiguration.getGlobalConfig(configuration);
+        // SqlRunner
+        SqlRunner.FACTORY = sqlSessionFactory;
+        if (globalConfig == null) {
+            GlobalConfiguration defaultCache = GlobalConfiguration.defaults();
+            defaultCache.setSqlSessionFactory(sqlSessionFactory);
+            GlobalConfiguration.setGlobalConfig(configuration, defaultCache);
+        } else {
+            globalConfig.setSqlSessionFactory(sqlSessionFactory);
+        }
+    }
 
 }