引入DAOConfig，将数据源等组建开放出给插件使用

Qieqie · Qieqie · commit c4ecfa3c025b · 2015-09-05T00:10:15.000+08:00
diff --git a/paoding-rose-jade/src/main/java/net/paoding/rose/jade/context/JadeInvocationHandler.java b/paoding-rose-jade/src/main/java/net/paoding/rose/jade/context/JadeInvocationHandler.java
@@ -70,15 +70,12 @@ public class JadeInvocationHandler implements InvocationHandler {
     
     public JadeInvocationHandler(//
             DAOMetaData daoMetaData,//
-            InterpreterFactory interpreterFactory, //
-            RowMapperFactory rowMapperFactory,//
-            DataAccessFactory dataAccessFactory,//
             CacheProvider cacheProvider, //
             StatementWrapperProvider statementWrapperProvider) {
         this.daoMetaData = daoMetaData;
-        this.rowMapperFactory = rowMapperFactory;
-        this.dataAccessFactory = dataAccessFactory;
-        this.interpreterFactory = interpreterFactory;
+        this.rowMapperFactory = daoMetaData.getConfig().getRowMapperFactory();
+        this.dataAccessFactory = daoMetaData.getConfig().getDataAccessFactory();
+        this.interpreterFactory = daoMetaData.getConfig().getInterpreterFactory();
         this.cacheProvider = cacheProvider;
         this.statementWrapperProvider = statementWrapperProvider;
     }
diff --git a/paoding-rose-jade/src/main/java/net/paoding/rose/jade/context/application/JadeFactory.java b/paoding-rose-jade/src/main/java/net/paoding/rose/jade/context/application/JadeFactory.java
@@ -19,23 +19,24 @@
 
 import javax.sql.DataSource;
 
+import org.springframework.util.ClassUtils;
+
 import net.paoding.rose.jade.context.JadeInvocationHandler;
 import net.paoding.rose.jade.dataaccess.DataAccessFactoryAdapter;
 import net.paoding.rose.jade.dataaccess.DataSourceFactory;
 import net.paoding.rose.jade.dataaccess.datasource.SimpleDataSourceFactory;
 import net.paoding.rose.jade.rowmapper.DefaultRowMapperFactory;
 import net.paoding.rose.jade.rowmapper.RowMapperFactory;
+import net.paoding.rose.jade.statement.DAOConfig;
 import net.paoding.rose.jade.statement.DAOMetaData;
 import net.paoding.rose.jade.statement.DefaultInterpreterFactory;
 import net.paoding.rose.jade.statement.Interpreter;
 import net.paoding.rose.jade.statement.StatementWrapperProvider;
 import net.paoding.rose.jade.statement.cached.CacheProvider;
 
-import org.springframework.util.ClassUtils;
-
 /**
  * 
- * @author qieqie
+ * @author 王志亮 [qieqie.wang@gmail.com]
  * 
  */
 //BUG: @SQL中的 :1.create_date应该抛出错误而非返回null
@@ -99,11 +100,11 @@ public void addInterpreter(Interpreter... interpreters) {
     @SuppressWarnings("unchecked")
     public <T> T create(Class<?> daoClass) {
         try {
-            DAOMetaData daoMetaData = new DAOMetaData(daoClass);
-            JadeInvocationHandler handler = new JadeInvocationHandler(
-                    //
-                    daoMetaData, interpreterFactory, rowMapperFactory, dataAccessFactory,
-                    cacheProvider, statementWrapperProvider);
+            DAOConfig config = new DAOConfig(dataAccessFactory, rowMapperFactory,
+                interpreterFactory);
+            DAOMetaData daoMetaData = new DAOMetaData(daoClass, config);
+            JadeInvocationHandler handler = new JadeInvocationHandler(daoMetaData, cacheProvider,
+                statementWrapperProvider);
             ClassLoader classLoader = ClassUtils.getDefaultClassLoader();
             return (T) Proxy.newProxyInstance(classLoader, new Class[] { daoClass }, handler);
         } catch (RuntimeException e) {
diff --git a/paoding-rose-jade/src/main/java/net/paoding/rose/jade/context/spring/JadeFactoryBean.java b/paoding-rose-jade/src/main/java/net/paoding/rose/jade/context/spring/JadeFactoryBean.java
@@ -17,19 +17,20 @@
 
 import java.lang.reflect.Proxy;
 
+import org.springframework.beans.factory.FactoryBean;
+import org.springframework.beans.factory.InitializingBean;
+import org.springframework.util.Assert;
+import org.springframework.util.ClassUtils;
+
 import net.paoding.rose.jade.context.JadeInvocationHandler;
 import net.paoding.rose.jade.dataaccess.DataAccessFactory;
 import net.paoding.rose.jade.rowmapper.RowMapperFactory;
+import net.paoding.rose.jade.statement.DAOConfig;
 import net.paoding.rose.jade.statement.DAOMetaData;
 import net.paoding.rose.jade.statement.InterpreterFactory;
 import net.paoding.rose.jade.statement.StatementWrapperProvider;
 import net.paoding.rose.jade.statement.cached.CacheProvider;
 
-import org.springframework.beans.factory.FactoryBean;
-import org.springframework.beans.factory.InitializingBean;
-import org.springframework.util.Assert;
-import org.springframework.util.ClassUtils;
-
 /**
  * 
  * 
@@ -51,7 +52,7 @@ public class JadeFactoryBean implements FactoryBean, InitializingBean {
     protected CacheProvider cacheProvider;
 
     protected Object daoObject;
-    
+
     // 可选的
     private StatementWrapperProvider statementWrapperProvider;
 
@@ -110,11 +111,11 @@ public void setCacheProvider(CacheProvider cacheProvider) {
     public CacheProvider getCacheProvider() {
         return cacheProvider;
     }
-    
+
     public StatementWrapperProvider getStatementWrapperProvider() {
         return statementWrapperProvider;
     }
-    
+
     public void setStatementWrapperProvider(StatementWrapperProvider statementWrapperProvider) {
         this.statementWrapperProvider = statementWrapperProvider;
     }
@@ -144,16 +145,16 @@ public Object getObject() {
 
     protected Object createDAO() {
         try {
-            DAOMetaData daoMetaData = new DAOMetaData(objectType);
-            JadeInvocationHandler handler = new JadeInvocationHandler(
-                    //
-                    daoMetaData, interpreterFactory, rowMapperFactory, dataAccessFactory,
-                    cacheProvider, statementWrapperProvider);
+            DAOConfig config = new DAOConfig(dataAccessFactory, rowMapperFactory,
+                interpreterFactory);
+            DAOMetaData daoMetaData = new DAOMetaData(objectType, config);
+            JadeInvocationHandler handler = new JadeInvocationHandler(daoMetaData, cacheProvider,
+                statementWrapperProvider);
             return Proxy.newProxyInstance(ClassUtils.getDefaultClassLoader(),
-                    new Class[] { objectType }, handler);
+                new Class[] { objectType }, handler);
         } catch (RuntimeException e) {
-            throw new IllegalStateException("failed to create bean for "
-                    + this.objectType.getName(), e);
+            throw new IllegalStateException(
+                "failed to create bean for " + this.objectType.getName(), e);
         }
     }
 
diff --git a/paoding-rose-jade/src/main/java/net/paoding/rose/jade/statement/DAOConfig.java b/paoding-rose-jade/src/main/java/net/paoding/rose/jade/statement/DAOConfig.java
@@ -0,0 +1,70 @@
+/*
+ * Copyright 2009-2015 the original author or authors.
+ *
+ * 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
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License i distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package net.paoding.rose.jade.statement;
+
+import net.paoding.rose.jade.dataaccess.DataAccessFactory;
+import net.paoding.rose.jade.rowmapper.RowMapperFactory;
+
+/**
+ * 支持DAO类的基础配置（数据源配置、SQL解析器配置、OR映射配置等等）
+ * 
+ * @author 王志亮 [qieqie.wang@gmail.com]
+ * 
+ */
+public class DAOConfig {
+
+    private final DataAccessFactory dataAccessFactory;
+
+    private final RowMapperFactory rowMapperFactory;
+
+    private final InterpreterFactory interpreterFactory;
+
+    public DAOConfig(DataAccessFactory dataAccessFactory, //
+                     RowMapperFactory rowMapperFactory, //
+                     InterpreterFactory interpreterFactory) {
+        this.dataAccessFactory = dataAccessFactory;
+        this.rowMapperFactory = rowMapperFactory;
+        this.interpreterFactory = interpreterFactory;
+    }
+
+    /**
+     * 标准数据访问器配置
+     * 
+     * @return
+     */
+    public DataAccessFactory getDataAccessFactory() {
+        return dataAccessFactory;
+    }
+
+    /**
+     * SQL解析器配置
+     * 
+     * @return
+     */
+    public InterpreterFactory getInterpreterFactory() {
+        return interpreterFactory;
+    }
+
+    /**
+     * OR映射配置
+     * 
+     * @return
+     */
+    public RowMapperFactory getRowMapperFactory() {
+        return rowMapperFactory;
+    }
+
+}
diff --git a/paoding-rose-jade/src/main/java/net/paoding/rose/jade/statement/DAOMetaData.java b/paoding-rose-jade/src/main/java/net/paoding/rose/jade/statement/DAOMetaData.java
@@ -18,7 +18,6 @@
 import java.util.Collections;
 import java.util.Map;
 
-
 /**
  * {@link DAOMetaData} 封装缓存一个DAO接口类本身的一些信息，比如类对象、类常量等等
  * 
@@ -27,6 +26,11 @@
  */
 public class DAOMetaData {
 
+    /**
+     * 
+     */
+    private final DAOConfig config;
+
     /**
      * DAO接类
      */
@@ -41,16 +45,25 @@ public class DAOMetaData {
      * 
      * @param daoClass
      */
-    public DAOMetaData(Class<?> daoClass) {
+    public DAOMetaData(Class<?> daoClass, DAOConfig config) {
         this.daoClass = daoClass;
         this.constants = Collections.unmodifiableMap(//
-                GenericUtils.getConstantFrom(daoClass, true, true));
+            GenericUtils.getConstantFrom(daoClass, true, true));
+        this.config = config;
+    }
+
+    /**
+     * 支持本DAO类的基础配置（数据源配置、解析器配置、OR映射配置等等）
+     * @return
+     */
+    public DAOConfig getConfig() {
+        return config;
     }
 
     public Class<?> getDAOClass() {
         return daoClass;
     }
-    
+
     /**
      * 泛型类型变量在本DAO类中真正的类型
      * 
