7x31/databasir
1
0
Fork 0
mirror of https://github.com/vran-dev/databasir.git synced 2025-10-29 11:29:19 +08:00
Code Issues Packages Projects Releases Wiki Activity

feat: error message support i18n (#271)

Browse Source 
* feat: error message support i18n

* fix: ut failed
This commit is contained in:
vran
2023-08-27 19:09:34 +08:00
committed by GitHub
parent afc7b18330
commit 421ebc8005
25 changed files with 358 additions and 211 deletions
Download Patch File Download Diff File Expand all files Collapse all files

95
core/src/main/java/com/databasir/core/domain/DomainErrors.java
View File

@@ -8,53 +8,58 @@ import lombok.RequiredArgsConstructor;
@RequiredArgsConstructor
@Getter
public enum DomainErrors implements DatabasirErrors {
REFRESH_TOKEN_EXPIRED("X_0001", "refresh token expired"),
INVALID_REFRESH_TOKEN_OPERATION("X_0002", "invalid refresh token operation"),
NETWORK_ERROR("X_0003", "网络似乎不稳定，请稍后再试"),
INVALID_ACCESS_TOKEN("X_0004", "无效的 access token"),
REFRESH_TOKEN_EXPIRED("X_0001"),
INVALID_REFRESH_TOKEN_OPERATION("X_0002"),
NETWORK_ERROR("error.network.timeout"),
INVALID_ACCESS_TOKEN("X_0004"),
MISS_REQUIRED_PARAMETERS("error.parameter.required"),
NOT_SUPPORT_DATABASE_TYPE("A_10000", "不支持的数据库类型, 请检查项目配置"),
PROJECT_NOT_FOUND("A_10001", "项目不存在"),
DATABASE_META_NOT_FOUND("A_10002", "获取数据库信息失败"),
CONNECT_DATABASE_FAILED("A_10003", "连接数据库失败，请检查连接配置"),
GROUP_OWNER_MUST_NOT_BE_EMPTY("A_10004", "请至少指定一个分组组长"),
PASSWORD_MUST_NOT_BE_BLANK("A_10005", "密码不能为空"),
USERNAME_OR_EMAIL_DUPLICATE("A_10006", "用户名或邮箱已存在"),
USER_ROLE_DUPLICATE("A_10007", "用户角色已存在"),
PROJECT_NAME_DUPLICATE("A_10008", "项目名称已被占用"),
CANNOT_UPDATE_SELF_ROLE("A_10009", "无法对自己执行角色变更的操作"),
UPDATE_PASSWORD_CONFIRM_FAILED("A_10010", "两次密码输入不一致"),
ORIGIN_PASSWORD_NOT_CORRECT("A_10011", "原密码不正确"),
INVALID_CRON_EXPRESSION("A_10012", "不合法的 cron 表达式"),
REGISTRATION_ID_DUPLICATE("A_10013", "应用注册 ID 不能重复"),
REGISTRATION_ID_NOT_FOUND("A_10014", "应用 ID 不存在"),
MISS_REQUIRED_PARAMETERS("A_10015", "缺少必填参数"),
DATABASE_TYPE_NAME_DUPLICATE("A_10016", "数据库类型名已存在"),
MUST_NOT_MODIFY_SYSTEM_DEFAULT_DATABASE_TYPE("A_10017", "禁止修改系统默认数据库类型"),
DOWNLOAD_DRIVER_ERROR("A_10018", "驱动下载失败"),
INVALID_DATABASE_TYPE_URL_PATTERN("A_10019", "不合法的 url pattern"),
DOCUMENT_VERSION_IS_INVALID("A_10020", "文档版本不合法"),
CANNOT_UPDATE_SELF_ENABLED_STATUS("A_10021", "无法对自己执行启用禁用操作"),
MOCK_DATA_SCRIPT_MUST_NOT_BE_BLANK("A_10022", "脚本内容不能为空"),
TABLE_META_NOT_FOUND("A_10023", "不存在的数据库表"),
DEPENDENT_COLUMN_NAME_MUST_NOT_BE_BLANK("A_10024", "必须指定依赖的字段"),
DEPENDENT_REF_MUST_NOT_BE_BLANK("A_10025", "请选择关联表和字段"),
MUST_NOT_REF_SELF("A_10026", "不能引用自身"),
CIRCLE_REFERENCE("A_10027", "检查到循环引用"),
DUPLICATE_COLUMN("A_10028", "重复的列"),
INVALID_MOCK_DATA_SCRIPT("A_10029", "不合法的表达式"),
CANNOT_DELETE_SELF("A_10030", "无法对自己执行删除账号操作"),
DRIVER_CLASS_NOT_FOUND("A_10031", "获取驱动类名失败"),
DATABASE_DOCUMENT_DUPLICATE_KEY("A_10032", "文档版本重复"),
UPLOAD_DRIVER_FILE_ERROR("A_10033", "上传失败，请检查后重新上传"),
DRIVER_URL_AND_PATH_MUST_NOT_BE_ALL_BLANK("A_10034", "请填写下载驱动的地址或手动上传驱动文件"),
LOAD_DRIVER_FAILED("A_10045", "驱动加载失败，请检查后重试")
DATABASE_META_NOT_FOUND("error.database.metadata.get-failed"),
DATABASE_CONNECT_FAILED("error.database.connect-failed"),
DATABASE_TYPE_NOT_SUPPORT("error.database.type.not-supported"),
DATABASE_TYPE_NAME_DUPLICATE("error.database.type.name-duplicate"),
DATABASE_MUST_NOT_MODIFY_SYSTEM_DEFAULT_TYPE("error.database.type.must-not-modify-default-type"),
DRIVER_UPLOAD_FAILED("error.database.driver.upload-failed"),
DRIVER_URL_AND_PATH_MUST_NOT_BE_ALL_BLANK("error.database.driver.url-or-path-invalid"),
DRIVER_LOAD_FAILED("error.database.driver.load-failed"),
DRIVER_CLASS_NOT_FOUND("error.database.driver.class-not-found"),
DRIVER_DOWNLOAD_FAILED("error.database.driver.download-failed"),
INVALID_DATABASE_TYPE_URL_PATTERN("error.database.url-pattern.invalid"),
MISS_DB_URL("error.database.url-patter.miss-db-url"),
MISS_JDBC_PROTOCOL("error.database.url-patter.miss-protocol"),
MISS_DB_SCHEMA("error.database.url-patter.miss-db-schema"),
PASSWORD_MUST_NOT_BE_BLANK("error.user.password.must-not-be-blank"),
USERNAME_OR_EMAIL_DUPLICATE("error.user.username-or-email-duplicate"),
USER_ROLE_DUPLICATE("error.user.role.duplicate"),
UPDATE_PASSWORD_CONFIRM_FAILED("error.user.password.not-match"),
CANNOT_DELETE_SELF("error.user.must-not-delete-self"),
ORIGIN_PASSWORD_NOT_CORRECT("error.user.password.invalid"),
CANNOT_UPDATE_SELF_ROLE("error.user.role.must-not-update-self"),
CANNOT_UPDATE_SELF_ENABLED_STATUS("error.user.role.must-not-update-self"),
PROJECT_NOT_FOUND("error.project.not-found"),
PROJECT_NAME_DUPLICATE("error.project.name-duplicate"),
INVALID_CRON_EXPRESSION("error.project.cron-invalid"),
REGISTRATION_ID_DUPLICATE("error.login.app.registration-id-duplicate"),
REGISTRATION_ID_NOT_FOUND("error.login.app.registration-id-not-found"),
MISS_REDIRECT_URI("error.login.app.miss-redirect-uri"),
DOCUMENT_VERSION_IS_INVALID("error.document.version-invalid"),
DATABASE_DOCUMENT_DUPLICATE_KEY("error.document.version-duplicate"),
TABLE_META_NOT_FOUND("error.document.table.not-found"),
INVALID_MOCK_DATA_SCRIPT("error.script.mock.expression-invalid"),
MOCK_DATA_SCRIPT_MUST_NOT_BE_BLANK("error.script.mock.is-blank"),
DEPENDENT_COLUMN_NAME_MUST_NOT_BE_BLANK("error.script.mock.dependent-column-name-required"),
MUST_NOT_REF_SELF("error.script.mock.dependent-must-not-ref-self"),
CIRCLE_REFERENCE("error.script.mock.dependent-circle-reference"),
;
private final String errCode;
private final String errMessage;
public DatabasirException exception() {
return new DatabasirException(this);
}
@@ -63,11 +68,7 @@ public enum DomainErrors implements DatabasirErrors {
return new DatabasirException(this, origin);
}
public DatabasirException exception(String message, Throwable origin) {
return new DatabasirException(this, message, origin);
}
public DatabasirException exception(String s) {
return exception(s, null);
return new DatabasirException(this, s);
}
}

11
core/src/main/java/com/databasir/core/domain/app/exception/DatabasirAuthenticationException.java
View File

@@ -10,15 +10,16 @@ public class DatabasirAuthenticationException extends AuthenticationException {
private final DatabasirException databasirException;
public DatabasirAuthenticationException(DatabasirException databasirException) {
super(databasirException.getErrMessage(), databasirException);
super(databasirException.getErrCode(), databasirException);
this.databasirException = databasirException;
}
public String getErrMessage() {
return databasirException.getErrMessage();
}
public String getErrCode() {
return databasirException.getErrCode();
}
public Object[] getArgs() {
return databasirException.getArgs();
}
}

22
core/src/main/java/com/databasir/core/domain/app/handler/GitlabOpenAuthHandler.java
View File

@@ -32,7 +32,7 @@ public class GitlabOpenAuthHandler implements OpenAuthHandler {
List<OauthAppProperty> properties,
Map<String, String[]> params) {
if (!params.containsKey("redirect_uri")) {
throw DomainErrors.MISS_REQUIRED_PARAMETERS.exception("缺少参数 redirect_uri", null);
throw DomainErrors.MISS_REDIRECT_URI.exception();
}
String authUrl = CommonProperties.INSTANCE.getAuthHost(properties);
@@ -40,15 +40,15 @@ public class GitlabOpenAuthHandler implements OpenAuthHandler {
String authorizeUrl = authUrl + "/oauth/authorize";
String redirectUri = params.get("redirect_uri")[0];
UriComponentsBuilder builder = UriComponentsBuilder.fromUriString(authorizeUrl)
.queryParam("client_id", clientId)
.queryParam("redirect_uri", redirectUri)
.queryParam("state", redirectUri)
.queryParam("response_type", "code")
.queryParam("scope", "read_user");
.queryParam("client_id", clientId)
.queryParam("redirect_uri", redirectUri)
.queryParam("state", redirectUri)
.queryParam("response_type", "code")
.queryParam("scope", "read_user");
return builder
.encode()
.build()
.toUriString();
.encode()
.build()
.toUriString();
}
@Override
@@ -56,7 +56,7 @@ public class GitlabOpenAuthHandler implements OpenAuthHandler {
List<OauthAppProperty> properties,
Map<String, String[]> requestParams) {
if (!requestParams.containsKey("redirect_uri")) {
throw DomainErrors.MISS_REQUIRED_PARAMETERS.exception("缺少参数 redirect_uri", null);
throw DomainErrors.MISS_REDIRECT_URI.exception();
}
String url = CommonProperties.INSTANCE.getAuthHost(properties);
@@ -66,7 +66,7 @@ public class GitlabOpenAuthHandler implements OpenAuthHandler {
String clientId = CommonProperties.INSTANCE.get(properties, GitlabProperties.CLIENT_ID);
String secret = CommonProperties.INSTANCE.get(properties, GitlabProperties.CLIENT_SECRET);
JsonNode accessTokenData =
gitlabRemoteService.getAccessToken(url, code, clientId, secret, redirectUri);
gitlabRemoteService.getAccessToken(url, code, clientId, secret, redirectUri);
if (accessTokenData == null) {
throw new DatabasirAuthenticationException(DomainErrors.NETWORK_ERROR.exception());
}

14
core/src/main/java/com/databasir/core/domain/app/handler/WeWorkOpenAuthHandler.java
View File

@@ -36,13 +36,13 @@ public class WeWorkOpenAuthHandler implements OpenAuthHandler {
String authUrl = INSTANCE.getAuthHost(properties);
String authorizeUrl = authUrl + "/wwopen/sso/qrConnect";
UriComponentsBuilder builder = UriComponentsBuilder.fromUriString(authorizeUrl)
.queryParam("appid", INSTANCE.get(properties, WeWorkProperties.APP_ID))
.queryParam("agentid", INSTANCE.get(properties, WeWorkProperties.AGENT_ID))
.queryParam("redirect_uri", INSTANCE.get(properties, WeWorkProperties.REDIRECT_URL));
.queryParam("appid", INSTANCE.get(properties, WeWorkProperties.APP_ID))
.queryParam("agentid", INSTANCE.get(properties, WeWorkProperties.AGENT_ID))
.queryParam("redirect_uri", INSTANCE.get(properties, WeWorkProperties.REDIRECT_URL));
String url = builder
.encode()
.build()
.toUriString();
.encode()
.build()
.toUriString();
return url;
}
@@ -51,7 +51,7 @@ public class WeWorkOpenAuthHandler implements OpenAuthHandler {
List<OauthAppProperty> properties,
Map<String, String[]> requestParams) {
if (!requestParams.containsKey("redirect_uri")) {
throw DomainErrors.MISS_REQUIRED_PARAMETERS.exception("缺少参数 redirect_uri", null);
throw DomainErrors.MISS_REDIRECT_URI.exception();
}
String code = requestParams.get("code")[0];

60
core/src/main/java/com/databasir/core/domain/app/validator/OauthPropertiesValidator.java
View File

@@ -23,47 +23,43 @@ public class OauthPropertiesValidator {
public void validate(OAuthAppCreateRequest request, List<OAuthAppPlatformResponse> platforms) {
Map<String, OauthAppPropertyData> propertyMapByName = request.getProperties()
.stream()
.collect(Collectors.toMap(OauthAppPropertyData::getName, i -> i));
.stream()
.collect(Collectors.toMap(OauthAppPropertyData::getName, i -> i));
platforms.stream()
.filter(platform -> platform.getAuthAppType() == request.getAppType())
.forEach(platform -> {
List<OAuthAppPlatformProperty> properties = platform.getProperties();
properties.forEach(property -> {
if (Objects.equals(true, property.getRequired())) {
if (!propertyMapByName.containsKey(property.getName())) {
throw DomainErrors.MISS_REQUIRED_PARAMETERS.exception(
property.getLabel() + " 不能为空");
}
if (StringUtils.isBlank(propertyMapByName.get(property.getName()).getValue())) {
throw DomainErrors.MISS_REQUIRED_PARAMETERS.exception(
property.getLabel() + " 不能为空");
}
.filter(platform -> platform.getAuthAppType() == request.getAppType())
.forEach(platform -> {
List<OAuthAppPlatformProperty> properties = platform.getProperties();
properties.forEach(property -> {
if (Objects.equals(true, property.getRequired())) {
if (!propertyMapByName.containsKey(property.getName())) {
throw DomainErrors.MISS_REQUIRED_PARAMETERS.exception(property.getLabel());
}
});
if (StringUtils.isBlank(propertyMapByName.get(property.getName()).getValue())) {
throw DomainErrors.MISS_REQUIRED_PARAMETERS.exception(property.getLabel());
}
}
});
});
}
public void validate(OAuthAppUpdateRequest request, List<OAuthAppPlatformResponse> platforms) {
Map<String, OauthAppPropertyData> propertyMapByName = request.getProperties()
.stream()
.collect(Collectors.toMap(OauthAppPropertyData::getName, i -> i));
.stream()
.collect(Collectors.toMap(OauthAppPropertyData::getName, i -> i));
platforms.stream()
.filter(platform -> platform.getAuthAppType() == request.getAppType())
.forEach(platform -> {
List<OAuthAppPlatformProperty> properties = platform.getProperties();
properties.forEach(property -> {
if (Objects.equals(true, property.getRequired())) {
if (!propertyMapByName.containsKey(property.getName())) {
throw DomainErrors.MISS_REQUIRED_PARAMETERS.exception(
property.getLabel() + " 不能为空");
}
if (StringUtils.isBlank(propertyMapByName.get(property.getName()).getValue())) {
throw DomainErrors.MISS_REQUIRED_PARAMETERS.exception(
property.getLabel() + " 不能为空");
}
.filter(platform -> platform.getAuthAppType() == request.getAppType())
.forEach(platform -> {
List<OAuthAppPlatformProperty> properties = platform.getProperties();
properties.forEach(property -> {
if (Objects.equals(true, property.getRequired())) {
if (!propertyMapByName.containsKey(property.getName())) {
throw DomainErrors.MISS_REQUIRED_PARAMETERS.exception(property.getLabel());
}
});
if (StringUtils.isBlank(propertyMapByName.get(property.getName()).getValue())) {
throw DomainErrors.MISS_REQUIRED_PARAMETERS.exception(property.getLabel());
}
}
});
});
}
}

4
core/src/main/java/com/databasir/core/domain/database/service/DatabaseTypeService.java
View File

@@ -114,7 +114,7 @@ public class DatabaseTypeService {
public void deleteById(Integer id) {
databaseTypeDao.selectOptionalById(id).ifPresent(data -> {
if (DatabaseTypes.has(data.getDatabaseType())) {
throw DomainErrors.MUST_NOT_MODIFY_SYSTEM_DEFAULT_DATABASE_TYPE.exception();
throw DomainErrors.DATABASE_MUST_NOT_MODIFY_SYSTEM_DEFAULT_TYPE.exception();
}
databaseTypeDao.deleteById(id);
driverResources.deleteByDatabaseType(data.getDatabaseType());
@@ -172,7 +172,7 @@ public class DatabaseTypeService {
return path;
} catch (IOException e) {
log.error("upload driver file error", e);
throw DomainErrors.UPLOAD_DRIVER_FILE_ERROR.exception();
throw DomainErrors.DRIVER_UPLOAD_FAILED.exception();
}
}
}

3
core/src/main/java/com/databasir/core/domain/document/converter/DatabaseMetaConverter.java
View File

@@ -6,6 +6,7 @@ import com.databasir.core.meta.data.*;
import com.databasir.dao.tables.pojos.*;
import org.mapstruct.Mapper;
import org.mapstruct.Mapping;
import org.mapstruct.factory.Mappers;
import java.util.Collections;
import java.util.List;
@@ -16,6 +17,8 @@ import java.util.stream.Collectors;
@Mapper(componentModel = "spring", uses = JsonConverter.class)
public interface DatabaseMetaConverter {
public static final DatabaseMetaConverter converter = Mappers.getMapper(DatabaseMetaConverter.class);
default DatabaseMeta of(DatabaseDocument database,
List<TableDocument> tables,
List<TableColumnDocument> columns,

2
core/src/main/java/com/databasir/core/domain/document/service/DocumentSyncService.java
View File

@@ -112,7 +112,7 @@ public class DocumentSyncService {
databasirConfig.setIgnoreTableColumnNameRegex(jsonConverter.fromJson(rule.getIgnoreColumnNameRegexArray()));
try {
if (jdbcConnection == null) {
throw DomainErrors.CONNECT_DATABASE_FAILED.exception();
throw DomainErrors.DATABASE_CONNECT_FAILED.exception();
}
DatabaseMeta databaseMeta = Databasir.of(databasirConfig)
.get(jdbcConnection, dataSource.getDatabaseName(), dataSource.getSchemaName())

4
core/src/main/java/com/databasir/core/domain/mock/validator/MockDataValidator.java
View File

@@ -42,9 +42,9 @@ public class MockDataValidator {
public TableDocument validAndGetTableDocument(Integer databaseDocId, Integer tableId) {
Optional<TableDocument> tableOption =
tableDocumentDao.selectByDatabaseDocumentIdAndId(databaseDocId, tableId);
tableDocumentDao.selectByDatabaseDocumentIdAndId(databaseDocId, tableId);
if (tableOption.isEmpty()) {
throw DomainErrors.DATABASE_META_NOT_FOUND.exception("表数据不存在");
throw DomainErrors.DATABASE_META_NOT_FOUND.exception();
}
return tableOption.get();
}

2
core/src/main/java/com/databasir/core/domain/system/service/SystemService.java
View File

@@ -59,7 +59,7 @@ public class SystemService {
if (idOpt.isPresent()) {
if (!StringUtils.hasText(request.getPassword())) {
throw DomainErrors.CONNECT_DATABASE_FAILED.exception();
throw DomainErrors.DATABASE_CONNECT_FAILED.exception();
}
sysMailDao.updateById(sysMail);
} else {

22
core/src/main/java/com/databasir/core/infrastructure/connection/CustomDatabaseConnectionFactory.java
View File

@@ -45,14 +45,14 @@ public class CustomDatabaseConnectionFactory implements DatabaseConnectionFactor
URLClassLoader loader = null;
try {
loader = new URLClassLoader(
new URL[]{
driverFile.toURI().toURL()
},
this.getClass().getClassLoader()
new URL[]{
driverFile.toURI().toURL()
},
this.getClass().getClassLoader()
);
} catch (MalformedURLException e) {
log.error("load driver error " + context, e);
throw DomainErrors.CONNECT_DATABASE_FAILED.exception(e.getMessage());
throw DomainErrors.DATABASE_CONNECT_FAILED.exception(e.getMessage());
}
// retrieve the driver class
Class<?> clazz = null;
@@ -62,13 +62,13 @@ public class CustomDatabaseConnectionFactory implements DatabaseConnectionFactor
driver = (Driver) clazz.getConstructor().newInstance();
} catch (ClassNotFoundException e) {
log.error("init driver error", e);
throw DomainErrors.CONNECT_DATABASE_FAILED.exception("驱动初始化异常, 请检查驱动类名：" + e.getMessage());
throw DomainErrors.DRIVER_CLASS_NOT_FOUND.exception(e);
} catch (InvocationTargetException
| InstantiationException
| IllegalAccessException
| NoSuchMethodException e) {
log.error("init driver error", e);
throw DomainErrors.CONNECT_DATABASE_FAILED.exception("驱动初始化异常：" + e.getMessage());
throw DomainErrors.DATABASE_CONNECT_FAILED.exception(e);
}
Properties info = new Properties();
@@ -79,9 +79,9 @@ public class CustomDatabaseConnectionFactory implements DatabaseConnectionFactor
}
String urlPattern = type.getUrlPattern();
String jdbcUrl = urlPattern.replace("{{jdbc.protocol}}", type.getJdbcProtocol())
.replace("{{db.url}}", context.getUrl())
.replace("{{db.name}}", context.getDatabaseName())
.replace("{{db.schema}}", context.getSchemaName());
.replace("{{db.url}}", context.getUrl())
.replace("{{db.name}}", context.getDatabaseName())
.replace("{{db.schema}}", context.getSchemaName());
return driver.connect(jdbcUrl, info);
}
@@ -96,6 +96,6 @@ public class CustomDatabaseConnectionFactory implements DatabaseConnectionFactor
return Paths.get(targetFile).toFile();
}
String databaseType = type.getDatabaseType();
throw DomainErrors.DOWNLOAD_DRIVER_ERROR.exception("驱动加载失败, database=" + databaseType);
throw DomainErrors.DRIVER_DOWNLOAD_FAILED.exception("驱动加载失败, database=" + databaseType);
}
}

52
core/src/main/java/com/databasir/core/infrastructure/connection/DatabaseConnectionService.java
View File

@@ -33,21 +33,21 @@ public class DatabaseConnectionService {
dataSourceProperties.forEach(prop -> info.put(prop.getKey(), prop.getValue()));
try {
DatabaseConnectionFactory.Context context = DatabaseConnectionFactory.Context.builder()
.username(username)
.password(password)
.url(url)
.databaseName(dataSource.getDatabaseName())
.schemaName(dataSource.getSchemaName())
.properties(info)
.databaseType(dataSource.getDatabaseType())
.build();
.username(username)
.password(password)
.url(url)
.databaseName(dataSource.getDatabaseName())
.schemaName(dataSource.getSchemaName())
.properties(info)
.databaseType(dataSource.getDatabaseType())
.build();
return factories.stream()
.filter(factory -> factory.support(dataSource.getDatabaseType()))
.findFirst()
.orElseThrow(DomainErrors.NOT_SUPPORT_DATABASE_TYPE::exception)
.getConnection(context);
.filter(factory -> factory.support(dataSource.getDatabaseType()))
.findFirst()
.orElseThrow(DomainErrors.DATABASE_TYPE_NOT_SUPPORT::exception)
.getConnection(context);
} catch (SQLException e) {
throw DomainErrors.CONNECT_DATABASE_FAILED.exception(e.getMessage(), e);
throw DomainErrors.DATABASE_CONNECT_FAILED.exception(e);
}
}
@@ -60,21 +60,21 @@ public class DatabaseConnectionService {
Properties properties) {
try {
DatabaseConnectionFactory.Context context = DatabaseConnectionFactory.Context.builder()
.username(username)
.password(password)
.url(url)
.databaseName(databaseName)
.schemaName(schemaName)
.properties(properties)
.databaseType(databaseType)
.build();
.username(username)
.password(password)
.url(url)
.databaseName(databaseName)
.schemaName(schemaName)
.properties(properties)
.databaseType(databaseType)
.build();
factories.stream()
.filter(factory -> factory.support(databaseType))
.findFirst()
.orElseThrow(DomainErrors.NOT_SUPPORT_DATABASE_TYPE::exception)
.getConnection(context);
.filter(factory -> factory.support(databaseType))
.findFirst()
.orElseThrow(DomainErrors.DATABASE_TYPE_NOT_SUPPORT::exception)
.getConnection(context);
} catch (SQLException e) {
throw DomainErrors.CONNECT_DATABASE_FAILED.exception(e.getMessage(), e);
throw DomainErrors.DATABASE_CONNECT_FAILED.exception(e);
}
}
}

14
core/src/main/java/com/databasir/core/infrastructure/driver/DriverResources.java
View File

@@ -39,7 +39,7 @@ public class DriverResources {
if (driverFile.exists()) {
return new DriverResult(localPath, driverFile);
} else {
throw DomainErrors.LOAD_DRIVER_FAILED.exception();
throw DomainErrors.DRIVER_LOAD_FAILED.exception();
}
}
@@ -49,7 +49,7 @@ public class DriverResources {
dirPath = Files.createTempDirectory("databasir-drivers");
} catch (IOException e) {
log.error("load driver error cause create temp dir failed", e);
throw DomainErrors.DOWNLOAD_DRIVER_ERROR.exception();
throw DomainErrors.DRIVER_DOWNLOAD_FAILED.exception();
}
File file = download(remoteUrl, dirPath.toString());
return new DriverResult(file.getAbsolutePath(), file);
@@ -61,7 +61,7 @@ public class DriverResources {
Files.createDirectories(parentDirPath);
} catch (IOException e) {
log.error("create directory for driver failed", e);
throw DomainErrors.DOWNLOAD_DRIVER_ERROR.exception(e);
throw DomainErrors.DRIVER_DOWNLOAD_FAILED.exception(e);
}
// download
@@ -90,7 +90,7 @@ public class DriverResources {
return targetFile;
} else {
log.error("{} download error from {}: {} ", parentDir, driverFileUrl, response);
throw DomainErrors.DOWNLOAD_DRIVER_ERROR.exception("驱动下载失败："
throw DomainErrors.DRIVER_DOWNLOAD_FAILED.exception("驱动下载失败："
+ response.getStatusCode()
+ ", "
+ response.getStatusText());
@@ -99,7 +99,7 @@ public class DriverResources {
} catch (RestClientException e) {
String msg = String.format("download driver from %s to %s failed", driverFileUrl, parentDir);
log.error(msg, e);
throw DomainErrors.DOWNLOAD_DRIVER_ERROR.exception(msg);
throw DomainErrors.DRIVER_DOWNLOAD_FAILED.exception(msg);
}
}
@@ -183,7 +183,7 @@ public class DriverResources {
);
} catch (MalformedURLException e) {
log.error("load driver jar error ", e);
throw DomainErrors.DOWNLOAD_DRIVER_ERROR.exception(e.getMessage());
throw DomainErrors.DRIVER_DOWNLOAD_FAILED.exception(e.getMessage());
}
try {
@@ -211,7 +211,7 @@ public class DriverResources {
return targetFile;
} catch (IOException e) {
log.error("copy driver file error", e);
throw DomainErrors.DOWNLOAD_DRIVER_ERROR.exception(e.getMessage());
throw DomainErrors.DRIVER_DOWNLOAD_FAILED.exception(e.getMessage());
}
}

2
core/src/test/java/com/databasir/core/domain/login/service/LoginServiceTest.java
View File

@@ -43,7 +43,6 @@ class LoginServiceTest extends BaseTest {
DatabasirException err = Assertions.assertThrows(DatabasirException.class,
() -> loginService.refreshAccessTokens(request));
Assertions.assertEquals(DomainErrors.INVALID_REFRESH_TOKEN_OPERATION.getErrCode(), err.getErrCode());
Assertions.assertEquals("invalid user", err.getMessage());
}
@Test
@@ -54,7 +53,6 @@ class LoginServiceTest extends BaseTest {
DatabasirException err = Assertions.assertThrows(DatabasirException.class,
() -> loginService.refreshAccessTokens(request));
Assertions.assertEquals(DomainErrors.INVALID_REFRESH_TOKEN_OPERATION.getErrCode(), err.getErrCode());
Assertions.assertEquals("invalid user status", err.getMessage());
}
@Test