Merge pull request nutzam#1347 from happyday517/master

add: 增加自动生成Table/View名称功能，补充文档

Author: wendal

doc/manual/dao/entity.man

@@ -43,7 +43,8 @@
         public class PetBean {
             ...
         }}}
-         * 将对应到数据表 "pet_bean"
+         * 将对应到数据表 "pet_bean" (since 1.r.63)
+         * (since 1.r.63) 你也可以通过Daos.setTableNameMaker来设置你自己的Table名称生成器，同理，setViewNameMaker设置View名称生成器。它们将在你没有指定具体表名/视图名时，根据当前class对象生成名称
          * @Table("t_pet") 将对应到 "t_pet"
 
     描述字段

src/org/nutz/dao/entity/annotation/Table.java

@@ -62,6 +62,6 @@
 @Documented
 public @interface Table {
 
-    String value();
+    String value() default "";
 
 }

src/org/nutz/dao/entity/annotation/View.java

@@ -23,5 +23,5 @@
 @Target({ElementType.TYPE})
 @Documented
 public @interface View {
-    String value();
+    String value() default "";
 }

src/org/nutz/dao/impl/entity/AnnotationEntityMaker.java

@@ -112,13 +112,14 @@ public <T> Entity<T> make(Class<T> type) {
          */
         String tableName = null;
         if (null == ti.annTable) {
-        	tableName = Strings.lowerWord(type.getSimpleName(), '_');
+        	tableName = Daos.getTableNameMaker().make(type);
         	if (null == ti.annView)
         	    log.warnf("No @Table found, fallback to use table name='%s' for type '%s'", tableName, type.getName());
         } else {
-        	tableName = ti.annTable.value();
+        	tableName = ti.annTable.value().isEmpty() ? Daos.getTableNameMaker().make(type) : ti.annTable.value();
         }
-        String viewName = null == ti.annView ? tableName : ti.annView.value();
+        String viewName = null == ti.annView ? tableName : 
+            (ti.annView.value().isEmpty() ? Daos.getViewNameMaker().make(type) : ti.annView.value());
         en.setTableName(tableName);
         en.setViewName(viewName);
 

src/org/nutz/dao/util/Daos.java

@@ -1032,6 +1032,41 @@ public static Set<String> sql2003Keywords() {
 
     /** varchar 字段的默认字段长度 */
     public static int DEFAULT_VARCHAR_WIDTH = 128;
+    
+    /** Table&View名称生成器 */
+    public static interface NameMaker {
+        String make(Class<?> klass);
+    }
+    /** 默认的Table名称生成器 */
+    private static NameMaker tableNameMaker = new NameMaker() {
+        @Override
+        public String make(Class<?> klass) {
+            return Strings.lowerWord(klass.getSimpleName(), '_');
+        }
+    };
+    /** 默认的View名称生成器 */
+    private static NameMaker viewNameMaker = new NameMaker() {
+        @Override
+        public String make(Class<?> klass) {
+            return Strings.lowerWord(klass.getSimpleName(), '_');
+        }
+    };
+
+    public static NameMaker getTableNameMaker() {
+        return tableNameMaker;
+    }
+
+    public static void setTableNameMaker(NameMaker tableNameMaker) {
+        Daos.tableNameMaker = tableNameMaker;
+    }
+
+    public static NameMaker getViewNameMaker() {
+        return viewNameMaker;
+    }
+
+    public static void setViewNameMaker(NameMaker viewNameMaker) {
+        Daos.viewNameMaker = viewNameMaker;
+    }
 }
 
 class ExtDaoInvocationHandler implements InvocationHandler {