去掉UUID和JDBC时的字段类型限制，需要自己保证类型一致。

abel533 · abel533 · commit 5ce9dd3bf1e0 · 2015-05-14T14:14:20.000+08:00
diff --git a/src/main/java/com/github/abel533/mapperhelper/EntityHelper.java b/src/main/java/com/github/abel533/mapperhelper/EntityHelper.java
@@ -110,6 +110,7 @@ public static class EntityColumn {
         private boolean uuid = false;
         private boolean identity = false;
         private String generator;
+        private String keyProperties;//useGenerator包含多列的时候需要用到
         private String orderBy;
 
         public String getProperty() {
@@ -176,6 +177,14 @@ public void setGenerator(String generator) {
             this.generator = generator;
         }
 
+        public String getKeyProperties() {
+            return keyProperties;
+        }
+
+        public void setKeyProperties(String keyProperties) {
+            this.keyProperties = keyProperties;
+        }
+
         public String getOrderBy() {
             return orderBy;
         }
@@ -423,18 +432,10 @@ public static synchronized void initEntityNameMap(Class<?> entityClass) {
             } else if (field.isAnnotationPresent(GeneratedValue.class)) {
                 GeneratedValue generatedValue = field.getAnnotation(GeneratedValue.class);
                 if (generatedValue.generator().equals("UUID")) {
-                    if (field.getType().equals(String.class)) {
-                        entityColumn.setUuid(true);
-                    } else {
-                        throw new RuntimeException(field.getName() + " - 该字段@GeneratedValue配置为UUID，但该字段类型不是String");
-                    }
+                    entityColumn.setUuid(true);
                 } else if (generatedValue.generator().equals("JDBC")) {
-                    if (Number.class.isAssignableFrom(field.getType())) {
-                        entityColumn.setIdentity(true);
-                        entityColumn.setGenerator("JDBC");
-                    } else {
-                        throw new RuntimeException(field.getName() + " - 该字段@GeneratedValue配置为UUID，但该字段类型不是String");
-                    }
+                    entityColumn.setIdentity(true);
+                    entityColumn.setGenerator("JDBC");
                 } else {
                     //允许通过generator来设置获取id的sql,例如mysql=CALL IDENTITY(),hsqldb=SELECT SCOPE_IDENTITY()
                     //允许通过拦截器参数设置公共的generator
@@ -475,13 +476,6 @@ public static synchronized void initEntityNameMap(Class<?> entityClass) {
         entityTableMap.put(entityClass, entityTable);
     }
 
-    public static void main(String[] args) {
-        System.out.println(camelhumpToUnderline("userName"));
-        System.out.println(camelhumpToUnderline("userPassWord"));
-        System.out.println(camelhumpToUnderline("ISO9001"));
-        System.out.println(camelhumpToUnderline("hello_world"));
-    }
-
     /**
      * 将驼峰风格替换为下划线风格
      */
diff --git a/src/main/java/com/github/abel533/mapperhelper/MapperTemplate.java b/src/main/java/com/github/abel533/mapperhelper/MapperTemplate.java
@@ -394,7 +394,7 @@ protected void newSelectKeyMappedStatement(MappedStatement ms, EntityHelper.Enti
         Class<?> entityClass = getSelectReturnType(ms);
         //defaults
         Configuration configuration = ms.getConfiguration();
-        KeyGenerator keyGenerator = null;
+        KeyGenerator keyGenerator;
         Boolean executeBefore = getBEFORE();
         String IDENTITY = (column.getGenerator() == null || column.getGenerator().equals("")) ? getIDENTITY() : column.getGenerator();
         if (IDENTITY.equalsIgnoreCase("JDBC")) {
