From 3a43cbbf75a217957fb4bfb72bfc3ad4069a6aae Mon Sep 17 00:00:00 2001 From: zhouhao Date: Fri, 19 May 2017 11:29:23 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=B3=A8=E9=87=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../web/datasource/DatabaseType.java | 7 ++++++- .../web/datasource/DynamicDataSourceProxy.java | 3 ++- .../web/datasource/DynamicDataSourceService.java | 15 ++++++++++++++- .../exception/DataSourceNotFoundException.java | 2 -- 4 files changed, 22 insertions(+), 5 deletions(-) diff --git a/hsweb-datasource/hsweb-datasource-api/src/main/java/org/hswebframework/web/datasource/DatabaseType.java b/hsweb-datasource/hsweb-datasource-api/src/main/java/org/hswebframework/web/datasource/DatabaseType.java index f9ebb53b2..cab205d97 100644 --- a/hsweb-datasource/hsweb-datasource-api/src/main/java/org/hswebframework/web/datasource/DatabaseType.java +++ b/hsweb-datasource/hsweb-datasource-api/src/main/java/org/hswebframework/web/datasource/DatabaseType.java @@ -20,6 +20,12 @@ import java.util.Arrays; import java.util.Objects; import java.util.function.Predicate; +/** + * 数据库类型枚举 + * + * @author zhouhao + * @since 3.0 + */ public enum DatabaseType { unknown(null, null, null, String::isEmpty), mysql("com.mysql.jdbc.Driver", "com.mysql.jdbc.jdbc2.optional.MysqlXADataSource", "select 1", createUrlPredicate("mysql")), @@ -43,7 +49,6 @@ public enum DatabaseType { this.urlPredicate = urlPredicate; } - private final String testQuery; private final String driverClassName; diff --git a/hsweb-datasource/hsweb-datasource-api/src/main/java/org/hswebframework/web/datasource/DynamicDataSourceProxy.java b/hsweb-datasource/hsweb-datasource-api/src/main/java/org/hswebframework/web/datasource/DynamicDataSourceProxy.java index b6856d4b4..c26d4c981 100644 --- a/hsweb-datasource/hsweb-datasource-api/src/main/java/org/hswebframework/web/datasource/DynamicDataSourceProxy.java +++ b/hsweb-datasource/hsweb-datasource-api/src/main/java/org/hswebframework/web/datasource/DynamicDataSourceProxy.java @@ -8,9 +8,10 @@ import java.sql.SQLFeatureNotSupportedException; import java.util.logging.Logger; /** - * TODO 完成注释 + * 动态数据源代理,将数据源代理为动态数据源 * * @author zhouhao + * @since 3.0 */ public class DynamicDataSourceProxy implements DynamicDataSource { diff --git a/hsweb-datasource/hsweb-datasource-api/src/main/java/org/hswebframework/web/datasource/DynamicDataSourceService.java b/hsweb-datasource/hsweb-datasource-api/src/main/java/org/hswebframework/web/datasource/DynamicDataSourceService.java index 139e35933..7b84430e3 100644 --- a/hsweb-datasource/hsweb-datasource-api/src/main/java/org/hswebframework/web/datasource/DynamicDataSourceService.java +++ b/hsweb-datasource/hsweb-datasource-api/src/main/java/org/hswebframework/web/datasource/DynamicDataSourceService.java @@ -1,12 +1,25 @@ package org.hswebframework.web.datasource; +import org.hswebframework.web.datasource.exception.DataSourceNotFoundException; + /** - * TODO 完成注释 + * 动态数据源服务类 * * @author zhouhao + * @since 3.0 */ public interface DynamicDataSourceService { + + /** + * 根据数据源ID获取动态数据源,数据源不存在将抛出{@link DataSourceNotFoundException} + * + * @param dataSourceId 数据源ID + * @return 动态数据源 + */ DynamicDataSource getDataSource(String dataSourceId); + /** + * @return 默认数据源 + */ DynamicDataSource getDefaultDataSource(); } diff --git a/hsweb-datasource/hsweb-datasource-api/src/main/java/org/hswebframework/web/datasource/exception/DataSourceNotFoundException.java b/hsweb-datasource/hsweb-datasource-api/src/main/java/org/hswebframework/web/datasource/exception/DataSourceNotFoundException.java index 13b6ee21d..bb72a75c0 100644 --- a/hsweb-datasource/hsweb-datasource-api/src/main/java/org/hswebframework/web/datasource/exception/DataSourceNotFoundException.java +++ b/hsweb-datasource/hsweb-datasource-api/src/main/java/org/hswebframework/web/datasource/exception/DataSourceNotFoundException.java @@ -1,8 +1,6 @@ package org.hswebframework.web.datasource.exception; /** - * TODO 完成注释 - * * @author zhouhao */ public class DataSourceNotFoundException extends RuntimeException {