From 8948745321b2aacd4805396f06f7d9af22b0ea33 Mon Sep 17 00:00:00 2001 From: vran Date: Sat, 4 Jun 2022 18:01:09 +0800 Subject: [PATCH] refactor: rename pojo class name --- .../api/DocumentDescriptionController.java | 2 +- .../api/DocumentDiscussionController.java | 2 +- .../com/databasir/api/LoginController.java | 2 +- .../com/databasir/api/ProjectController.java | 2 +- .../databasir/api/UserProjectController.java | 6 +- .../api/advice/OperationLogAspect.java | 10 +- .../api/common/LoginUserContext.java | 2 +- .../OAuth2AuthenticationSuccessHandler.java | 8 +- ...DatabasirAuthenticationSuccessHandler.java | 8 +- .../security/DatabasirUserDetailService.java | 8 +- .../config/security/DatabasirUserDetails.java | 14 +- .../api/validator/UserOperationValidator.java | 4 +- .../job/ProjectSyncJobScheduler.java | 4 +- .../job/ProjectSyncTaskScheduler.java | 10 +- .../core/domain/app/OpenAuthAppService.java | 16 +- .../converter/OAuthAppResponseConverter.java | 4 +- ...oConverter.java => OauthAppConverter.java} | 12 +- .../app/handler/GithubOpenAuthHandler.java | 6 +- .../app/handler/GitlabOpenAuthHandler.java | 6 +- .../app/handler/OAuthProcessContext.java | 4 +- .../domain/app/handler/OpenAuthHandler.java | 6 +- .../domain/app/handler/OpenAuthHandlers.java | 6 +- ...verter.java => DatabaseTypeConverter.java} | 14 +- .../database/service/DatabaseTypeService.java | 22 +-- .../DatabaseTypeUpdateValidator.java | 6 +- ...java => DocumentDescriptionConverter.java} | 6 +- .../service/DocumentDescriptionService.java | 8 +- .../DiscussionResponseConverter.java | 8 +- .../converter/DiscussionEventConverter.java | 4 +- .../service/DocumentDiscussionService.java | 18 +- .../converter/DatabaseMetaConverter.java | 50 +++--- ...er.java => DocumentFullTextConverter.java} | 12 +- .../converter/DocumentPojoConverter.java | 20 +-- .../converter/DocumentResponseConverter.java | 26 +-- .../DocumentSimpleResponseConverter.java | 10 +- ...platePropertiesUpdateRequestConverter.java | 6 +- ...mentTemplatePropertyResponseConverter.java | 4 +- .../converter/TableResponseConverter.java | 12 +- .../document/event/DocumentUpdated.java | 2 + .../document/service/DocumentService.java | 123 ++++++-------- .../service/DocumentTemplateService.java | 6 +- ...PojoConverter.java => GroupConverter.java} | 8 +- .../converter/GroupResponseConverter.java | 10 +- .../domain/group/service/GroupService.java | 50 +++--- .../log/converter/OperationLogConverter.java | 42 +++++ .../converter/OperationLogPojoConverter.java | 42 ----- .../OperationLogRequestConverter.java | 4 +- .../log/service/OperationLogService.java | 42 ++--- .../domain/login/service/LoginService.java | 30 ++-- .../core/domain/mock/MockDataService.java | 42 ++--- ...verter.java => MockDataRuleConverter.java} | 8 +- .../MockDataRuleResponseConverter.java | 8 +- .../mock/generator/MockDataContext.java | 22 +-- .../mock/generator/MockDataGenerator.java | 16 +- .../mock/validator/MockDataSaveValidator.java | 4 +- .../mock/validator/MockDataValidator.java | 12 +- ...onverter.java => DataSourceConverter.java} | 14 +- ...joConverter.java => ProjectConverter.java} | 14 +- .../converter/ProjectResponseConverter.java | 22 +-- .../ProjectSimpleTaskResponseConverter.java | 6 +- .../project/service/ProjectService.java | 50 +++--- .../core/domain/search/SearchService.java | 16 +- .../converter/SearchResponseConverter.java | 24 +-- .../domain/system/service/SystemService.java | 22 +-- .../FavoriteProjectPageResponseConverter.java | 10 +- ...rPojoConverter.java => UserConverter.java} | 6 +- .../user/converter/UserResponseConverter.java | 14 +- .../event/converter/UserEventConverter.java | 6 +- .../user/service/UserProjectService.java | 24 +-- .../core/domain/user/service/UserService.java | 52 +++--- .../CustomDatabaseConnectionFactory.java | 6 +- .../connection/DatabaseConnectionService.java | 12 +- .../subscriber/DocumentEventSubscriber.java | 83 ++++++++-- .../subscriber/GroupEventSubscriber.java | 6 +- .../subscriber/ProjectEventSubscriber.java | 4 +- .../SystemStartedEventSubscriber.java | 32 ++-- .../event/subscriber/UserEventSubscriber.java | 4 +- .../core/infrastructure/mail/MailSender.java | 8 +- .../service/DatabaseTypeServiceTest.java | 4 +- .../DocumentDescriptionServiceTest.java | 4 +- .../group/service/GroupServiceTest.java | 16 +- .../login/service/LoginServiceTest.java | 4 +- .../project/service/ProjectServiceTest.java | 4 +- .../domain/user/service/UserServiceTest.java | 22 +-- .../java/com/databasir/dao/Databasir.java | 156 +++++++++--------- .../main/java/com/databasir/dao/Indexes.java | 58 +++---- .../main/java/com/databasir/dao/Keys.java | 132 +++++++-------- .../main/java/com/databasir/dao/Tables.java | 104 ++++++------ ...erty.java => DataSourcePropertyTable.java} | 32 ++-- .../{DataSource.java => DataSourceTable.java} | 32 ++-- ...cument.java => DatabaseDocumentTable.java} | 32 ++-- ...tabaseType.java => DatabaseTypeTable.java} | 32 ++-- ...ion.java => DocumentDescriptionTable.java} | 32 ++-- ...sion.java => DocumentDiscussionTable.java} | 32 ++-- ...llText.java => DocumentFullTextTable.java} | 51 +++--- ...ava => DocumentTemplatePropertyTable.java} | 32 ++-- .../tables/{Group.java => GroupTable.java} | 32 ++-- .../tables/{Login.java => LoginTable.java} | 32 ++-- ...ckDataRule.java => MockDataRuleTable.java} | 32 ++-- .../{OauthApp.java => OauthAppTable.java} | 32 ++-- ...erationLog.java => OperationLogTable.java} | 32 ++-- ...yncRule.java => ProjectSyncRuleTable.java} | 32 ++-- ...yncTask.java => ProjectSyncTaskTable.java} | 32 ++-- .../{Project.java => ProjectTable.java} | 32 ++-- .../tables/{SysKey.java => SysKeyTable.java} | 32 ++-- .../{SysMail.java => SysMailTable.java} | 32 ++-- ...ent.java => TableColumnDocumentTable.java} | 32 ++-- ...eDocument.java => TableDocumentTable.java} | 32 ++-- ...java => TableForeignKeyDocumentTable.java} | 32 ++-- ...ment.java => TableIndexDocumentTable.java} | 32 ++-- ...nt.java => TableTriggerDocumentTable.java} | 32 ++-- ...ect.java => UserFavoriteProjectTable.java} | 32 ++-- .../{UserRole.java => UserRoleTable.java} | 32 ++-- .../dao/tables/{User.java => UserTable.java} | 32 ++-- .../{DataSourcePojo.java => DataSource.java} | 10 +- ...pertyPojo.java => DataSourceProperty.java} | 10 +- ...ocumentPojo.java => DatabaseDocument.java} | 10 +- ...atabaseTypePojo.java => DatabaseType.java} | 10 +- ...tionPojo.java => DocumentDescription.java} | 10 +- ...ssionPojo.java => DocumentDiscussion.java} | 10 +- ...ullTextPojo.java => DocumentFullText.java} | 10 +- ...ojo.java => DocumentTemplateProperty.java} | 10 +- .../pojos/{GroupPojo.java => Group.java} | 10 +- .../pojos/{LoginPojo.java => Login.java} | 10 +- ...ockDataRulePojo.java => MockDataRule.java} | 10 +- .../{OauthAppPojo.java => OauthApp.java} | 10 +- ...perationLogPojo.java => OperationLog.java} | 10 +- .../pojos/{ProjectPojo.java => Project.java} | 10 +- ...SyncRulePojo.java => ProjectSyncRule.java} | 10 +- ...SyncTaskPojo.java => ProjectSyncTask.java} | 10 +- .../pojos/{SysKeyPojo.java => SysKey.java} | 10 +- .../pojos/{SysMailPojo.java => SysMail.java} | 10 +- ...mentPojo.java => TableColumnDocument.java} | 10 +- ...leDocumentPojo.java => TableDocument.java} | 10 +- ...Pojo.java => TableForeignKeyDocument.java} | 10 +- ...umentPojo.java => TableIndexDocument.java} | 10 +- ...entPojo.java => TableTriggerDocument.java} | 10 +- .../tables/pojos/{UserPojo.java => User.java} | 10 +- ...jectPojo.java => UserFavoriteProject.java} | 10 +- .../{UserRolePojo.java => UserRole.java} | 10 +- .../records/DataSourcePropertyRecord.java | 22 +-- .../dao/tables/records/DataSourceRecord.java | 32 ++-- .../records/DatabaseDocumentRecord.java | 32 ++-- .../tables/records/DatabaseTypeRecord.java | 38 ++--- .../records/DocumentDescriptionRecord.java | 28 ++-- .../records/DocumentDiscussionRecord.java | 26 +-- .../records/DocumentFullTextRecord.java | 12 +- .../DocumentTemplatePropertyRecord.java | 24 +-- .../dao/tables/records/GroupRecord.java | 24 +-- .../dao/tables/records/LoginRecord.java | 28 ++-- .../tables/records/MockDataRuleRecord.java | 32 ++-- .../dao/tables/records/OauthAppRecord.java | 36 ++-- .../tables/records/OperationLogRecord.java | 38 ++--- .../dao/tables/records/ProjectRecord.java | 26 +-- .../tables/records/ProjectSyncRuleRecord.java | 28 ++-- .../tables/records/ProjectSyncTaskRecord.java | 28 ++-- .../dao/tables/records/SysKeyRecord.java | 24 +-- .../dao/tables/records/SysMailRecord.java | 28 ++-- .../records/TableColumnDocumentRecord.java | 40 ++--- .../tables/records/TableDocumentRecord.java | 24 +-- .../TableForeignKeyDocumentRecord.java | 38 ++--- .../records/TableIndexDocumentRecord.java | 26 +-- .../records/TableTriggerDocumentRecord.java | 30 ++-- .../records/UserFavoriteProjectRecord.java | 20 +-- .../dao/tables/records/UserRecord.java | 34 ++-- .../dao/tables/records/UserRoleRecord.java | 22 +-- .../com/databasir/dao/impl/DataSourceDao.java | 20 +-- .../dao/impl/DataSourcePropertyDao.java | 10 +- .../dao/impl/DatabaseDocumentDao.java | 20 +-- .../databasir/dao/impl/DatabaseTypeDao.java | 14 +- .../dao/impl/DocumentDescriptionDao.java | 16 +- .../dao/impl/DocumentDiscussionDao.java | 10 +- .../dao/impl/DocumentFullTextDao.java | 30 ++-- .../dao/impl/DocumentTemplatePropertyDao.java | 10 +- .../java/com/databasir/dao/impl/GroupDao.java | 24 +-- .../java/com/databasir/dao/impl/LoginDao.java | 38 ++--- .../databasir/dao/impl/MockDataRuleDao.java | 16 +- .../com/databasir/dao/impl/OauthAppDao.java | 12 +- .../databasir/dao/impl/OperationLogDao.java | 6 +- .../com/databasir/dao/impl/ProjectDao.java | 16 +- .../dao/impl/ProjectSyncRuleDao.java | 34 ++-- .../dao/impl/ProjectSyncTaskDao.java | 10 +- .../com/databasir/dao/impl/SysKeyDao.java | 12 +- .../com/databasir/dao/impl/SysMailDao.java | 14 +- .../dao/impl/TableColumnDocumentDao.java | 18 +- .../databasir/dao/impl/TableDocumentDao.java | 24 +-- .../dao/impl/TableForeignKeyDocumentDao.java | 14 +- .../dao/impl/TableIndexDocumentDao.java | 14 +- .../dao/impl/TableTriggerDocumentDao.java | 14 +- .../java/com/databasir/dao/impl/UserDao.java | 26 +-- .../dao/impl/UserFavoriteProjectDao.java | 18 +- .../com/databasir/dao/impl/UserRoleDao.java | 12 +- .../strategy/DatabasirPojoNamingStrategy.java | 11 +- dao/src/main/resources/db/init/init.sql | 21 +++ 194 files changed, 2098 insertions(+), 2015 deletions(-) rename core/src/main/java/com/databasir/core/domain/app/converter/{OAuthAppPojoConverter.java => OauthAppConverter.java} (66%) rename core/src/main/java/com/databasir/core/domain/database/converter/{DatabaseTypePojoConverter.java => DatabaseTypeConverter.java} (59%) rename core/src/main/java/com/databasir/core/domain/description/converter/{DocumentDescriptionPojoConverter.java => DocumentDescriptionConverter.java} (75%) rename core/src/main/java/com/databasir/core/domain/document/converter/{DocumentFullTextPojoConverter.java => DocumentFullTextConverter.java} (81%) rename core/src/main/java/com/databasir/core/domain/group/converter/{GroupPojoConverter.java => GroupConverter.java} (78%) create mode 100644 core/src/main/java/com/databasir/core/domain/log/converter/OperationLogConverter.java delete mode 100644 core/src/main/java/com/databasir/core/domain/log/converter/OperationLogPojoConverter.java rename core/src/main/java/com/databasir/core/domain/mock/converter/{MockDataRulePojoConverter.java => MockDataRuleConverter.java} (57%) rename core/src/main/java/com/databasir/core/domain/project/converter/{DataSourcePojoConverter.java => DataSourceConverter.java} (70%) rename core/src/main/java/com/databasir/core/domain/project/converter/{ProjectPojoConverter.java => ProjectConverter.java} (71%) rename core/src/main/java/com/databasir/core/domain/user/converter/{UserPojoConverter.java => UserConverter.java} (64%) rename dao/generated-src/jooq/main/java/com/databasir/dao/tables/{DataSourceProperty.java => DataSourcePropertyTable.java} (79%) rename dao/generated-src/jooq/main/java/com/databasir/dao/tables/{DataSource.java => DataSourceTable.java} (84%) rename dao/generated-src/jooq/main/java/com/databasir/dao/tables/{DatabaseDocument.java => DatabaseDocumentTable.java} (84%) rename dao/generated-src/jooq/main/java/com/databasir/dao/tables/{DatabaseType.java => DatabaseTypeTable.java} (86%) rename dao/generated-src/jooq/main/java/com/databasir/dao/tables/{DocumentDescription.java => DocumentDescriptionTable.java} (81%) rename dao/generated-src/jooq/main/java/com/databasir/dao/tables/{DocumentDiscussion.java => DocumentDiscussionTable.java} (80%) rename dao/generated-src/jooq/main/java/com/databasir/dao/tables/{DocumentFullText.java => DocumentFullTextTable.java} (86%) rename dao/generated-src/jooq/main/java/com/databasir/dao/tables/{DocumentTemplateProperty.java => DocumentTemplatePropertyTable.java} (79%) rename dao/generated-src/jooq/main/java/com/databasir/dao/tables/{Group.java => GroupTable.java} (82%) rename dao/generated-src/jooq/main/java/com/databasir/dao/tables/{Login.java => LoginTable.java} (85%) rename dao/generated-src/jooq/main/java/com/databasir/dao/tables/{MockDataRule.java => MockDataRuleTable.java} (85%) rename dao/generated-src/jooq/main/java/com/databasir/dao/tables/{OauthApp.java => OauthAppTable.java} (86%) rename dao/generated-src/jooq/main/java/com/databasir/dao/tables/{OperationLog.java => OperationLogTable.java} (86%) rename dao/generated-src/jooq/main/java/com/databasir/dao/tables/{ProjectSyncRule.java => ProjectSyncRuleTable.java} (83%) rename dao/generated-src/jooq/main/java/com/databasir/dao/tables/{ProjectSyncTask.java => ProjectSyncTaskTable.java} (83%) rename dao/generated-src/jooq/main/java/com/databasir/dao/tables/{Project.java => ProjectTable.java} (83%) rename dao/generated-src/jooq/main/java/com/databasir/dao/tables/{SysKey.java => SysKeyTable.java} (82%) rename dao/generated-src/jooq/main/java/com/databasir/dao/tables/{SysMail.java => SysMailTable.java} (83%) rename dao/generated-src/jooq/main/java/com/databasir/dao/tables/{TableColumnDocument.java => TableColumnDocumentTable.java} (85%) rename dao/generated-src/jooq/main/java/com/databasir/dao/tables/{TableDocument.java => TableDocumentTable.java} (81%) rename dao/generated-src/jooq/main/java/com/databasir/dao/tables/{TableForeignKeyDocument.java => TableForeignKeyDocumentTable.java} (85%) rename dao/generated-src/jooq/main/java/com/databasir/dao/tables/{TableIndexDocument.java => TableIndexDocumentTable.java} (81%) rename dao/generated-src/jooq/main/java/com/databasir/dao/tables/{TableTriggerDocument.java => TableTriggerDocumentTable.java} (82%) rename dao/generated-src/jooq/main/java/com/databasir/dao/tables/{UserFavoriteProject.java => UserFavoriteProjectTable.java} (77%) rename dao/generated-src/jooq/main/java/com/databasir/dao/tables/{UserRole.java => UserRoleTable.java} (81%) rename dao/generated-src/jooq/main/java/com/databasir/dao/tables/{User.java => UserTable.java} (87%) rename dao/generated-src/jooq/main/java/com/databasir/dao/tables/pojos/{DataSourcePojo.java => DataSource.java} (96%) rename dao/generated-src/jooq/main/java/com/databasir/dao/tables/pojos/{DataSourcePropertyPojo.java => DataSourceProperty.java} (93%) rename dao/generated-src/jooq/main/java/com/databasir/dao/tables/pojos/{DatabaseDocumentPojo.java => DatabaseDocument.java} (95%) rename dao/generated-src/jooq/main/java/com/databasir/dao/tables/pojos/{DatabaseTypePojo.java => DatabaseType.java} (96%) rename dao/generated-src/jooq/main/java/com/databasir/dao/tables/pojos/{DocumentDescriptionPojo.java => DocumentDescription.java} (95%) rename dao/generated-src/jooq/main/java/com/databasir/dao/tables/pojos/{DocumentDiscussionPojo.java => DocumentDiscussion.java} (95%) rename dao/generated-src/jooq/main/java/com/databasir/dao/tables/pojos/{DocumentFullTextPojo.java => DocumentFullText.java} (98%) rename dao/generated-src/jooq/main/java/com/databasir/dao/tables/pojos/{DocumentTemplatePropertyPojo.java => DocumentTemplateProperty.java} (93%) rename dao/generated-src/jooq/main/java/com/databasir/dao/tables/pojos/{GroupPojo.java => Group.java} (94%) rename dao/generated-src/jooq/main/java/com/databasir/dao/tables/pojos/{LoginPojo.java => Login.java} (95%) rename dao/generated-src/jooq/main/java/com/databasir/dao/tables/pojos/{MockDataRulePojo.java => MockDataRule.java} (96%) rename dao/generated-src/jooq/main/java/com/databasir/dao/tables/pojos/{OauthAppPojo.java => OauthApp.java} (96%) rename dao/generated-src/jooq/main/java/com/databasir/dao/tables/pojos/{OperationLogPojo.java => OperationLog.java} (97%) rename dao/generated-src/jooq/main/java/com/databasir/dao/tables/pojos/{ProjectPojo.java => Project.java} (94%) rename dao/generated-src/jooq/main/java/com/databasir/dao/tables/pojos/{ProjectSyncRulePojo.java => ProjectSyncRule.java} (95%) rename dao/generated-src/jooq/main/java/com/databasir/dao/tables/pojos/{ProjectSyncTaskPojo.java => ProjectSyncTask.java} (94%) rename dao/generated-src/jooq/main/java/com/databasir/dao/tables/pojos/{SysKeyPojo.java => SysKey.java} (94%) rename dao/generated-src/jooq/main/java/com/databasir/dao/tables/pojos/{SysMailPojo.java => SysMail.java} (95%) rename dao/generated-src/jooq/main/java/com/databasir/dao/tables/pojos/{TableColumnDocumentPojo.java => TableColumnDocument.java} (97%) rename dao/generated-src/jooq/main/java/com/databasir/dao/tables/pojos/{TableDocumentPojo.java => TableDocument.java} (93%) rename dao/generated-src/jooq/main/java/com/databasir/dao/tables/pojos/{TableForeignKeyDocumentPojo.java => TableForeignKeyDocument.java} (97%) rename dao/generated-src/jooq/main/java/com/databasir/dao/tables/pojos/{TableIndexDocumentPojo.java => TableIndexDocument.java} (95%) rename dao/generated-src/jooq/main/java/com/databasir/dao/tables/pojos/{TableTriggerDocumentPojo.java => TableTriggerDocument.java} (96%) rename dao/generated-src/jooq/main/java/com/databasir/dao/tables/pojos/{UserPojo.java => User.java} (96%) rename dao/generated-src/jooq/main/java/com/databasir/dao/tables/pojos/{UserFavoriteProjectPojo.java => UserFavoriteProject.java} (91%) rename dao/generated-src/jooq/main/java/com/databasir/dao/tables/pojos/{UserRolePojo.java => UserRole.java} (92%) diff --git a/api/src/main/java/com/databasir/api/DocumentDescriptionController.java b/api/src/main/java/com/databasir/api/DocumentDescriptionController.java index 79f0c24..108529a 100644 --- a/api/src/main/java/com/databasir/api/DocumentDescriptionController.java +++ b/api/src/main/java/com/databasir/api/DocumentDescriptionController.java @@ -39,7 +39,7 @@ public class DocumentDescriptionController { DatabasirUserDetails principal = (DatabasirUserDetails) SecurityContextHolder.getContext() .getAuthentication() .getPrincipal(); - Integer userId = principal.getUserPojo().getId(); + Integer userId = principal.getUser().getId(); documentDescriptionService.save(groupId, projectId, userId, request); return JsonData.ok(); } diff --git a/api/src/main/java/com/databasir/api/DocumentDiscussionController.java b/api/src/main/java/com/databasir/api/DocumentDiscussionController.java index 5091a3c..27b049d 100644 --- a/api/src/main/java/com/databasir/api/DocumentDiscussionController.java +++ b/api/src/main/java/com/databasir/api/DocumentDiscussionController.java @@ -68,7 +68,7 @@ public class DocumentDiscussionController { DatabasirUserDetails principal = (DatabasirUserDetails) SecurityContextHolder.getContext() .getAuthentication() .getPrincipal(); - Integer userId = principal.getUserPojo().getId(); + Integer userId = principal.getUser().getId(); documentDiscussionService.create(groupId, projectId, userId, request); return JsonData.ok(); } diff --git a/api/src/main/java/com/databasir/api/LoginController.java b/api/src/main/java/com/databasir/api/LoginController.java index 174695f..33198de 100644 --- a/api/src/main/java/com/databasir/api/LoginController.java +++ b/api/src/main/java/com/databasir/api/LoginController.java @@ -64,7 +64,7 @@ public class LoginController { DatabasirUserDetails user = (DatabasirUserDetails) SecurityContextHolder.getContext() .getAuthentication() .getPrincipal(); - Integer userId = user.getUserPojo().getId(); + Integer userId = user.getUser().getId(); return JsonData.ok(loginService.getUserLoginData(userId)); } diff --git a/api/src/main/java/com/databasir/api/ProjectController.java b/api/src/main/java/com/databasir/api/ProjectController.java index 1453310..eaedc5f 100644 --- a/api/src/main/java/com/databasir/api/ProjectController.java +++ b/api/src/main/java/com/databasir/api/ProjectController.java @@ -87,7 +87,7 @@ public class ProjectController { DatabasirUserDetails user = (DatabasirUserDetails) SecurityContextHolder.getContext() .getAuthentication() .getPrincipal(); - Integer userId = user.getUserPojo().getId(); + Integer userId = user.getUser().getId(); return JsonData.ok(projectService.list(userId, page, condition)); } diff --git a/api/src/main/java/com/databasir/api/UserProjectController.java b/api/src/main/java/com/databasir/api/UserProjectController.java index 80c9617..ac319cc 100644 --- a/api/src/main/java/com/databasir/api/UserProjectController.java +++ b/api/src/main/java/com/databasir/api/UserProjectController.java @@ -34,7 +34,7 @@ public class UserProjectController { DatabasirUserDetails user = (DatabasirUserDetails) SecurityContextHolder.getContext() .getAuthentication() .getPrincipal(); - Integer userId = user.getUserPojo().getId(); + Integer userId = user.getUser().getId(); return JsonData.ok(userProjectService.listFavorites(pageable, userId, condition)); } @@ -47,7 +47,7 @@ public class UserProjectController { DatabasirUserDetails user = (DatabasirUserDetails) SecurityContextHolder.getContext() .getAuthentication() .getPrincipal(); - Integer userId = user.getUserPojo().getId(); + Integer userId = user.getUser().getId(); userProjectService.addFavorites(projectId, userId); return JsonData.ok(); } @@ -61,7 +61,7 @@ public class UserProjectController { DatabasirUserDetails user = (DatabasirUserDetails) SecurityContextHolder.getContext() .getAuthentication() .getPrincipal(); - Integer userId = user.getUserPojo().getId(); + Integer userId = user.getUser().getId(); userProjectService.removeFavorites(projectId, userId); return JsonData.ok(); } diff --git a/api/src/main/java/com/databasir/api/advice/OperationLogAspect.java b/api/src/main/java/com/databasir/api/advice/OperationLogAspect.java index 73e19b6..7410e90 100644 --- a/api/src/main/java/com/databasir/api/advice/OperationLogAspect.java +++ b/api/src/main/java/com/databasir/api/advice/OperationLogAspect.java @@ -6,7 +6,7 @@ import com.databasir.core.domain.log.annotation.AuditLog; import com.databasir.core.domain.log.data.OperationLogRequest; import com.databasir.core.domain.log.service.OperationLogService; import com.databasir.dao.impl.ProjectDao; -import com.databasir.dao.tables.pojos.ProjectPojo; +import com.databasir.dao.tables.pojos.Project; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.aspectj.lang.JoinPoint; @@ -75,12 +75,12 @@ public class OperationLogAspect { && operation.retrieveInvolvedGroupId() && involvedProjectId != null) { involvedGroupId = projectDao.selectOptionalById(involvedProjectId) - .map(ProjectPojo::getGroupId) + .map(Project::getGroupId) .orElse(null); } int userId = userId(); - String username = principal.getUserPojo().getUsername(); - String nickname = principal.getUserPojo().getNickname(); + String username = principal.getUser().getUsername(); + String nickname = principal.getUser().getNickname(); if (userId == AuditLog.Types.SYSTEM_USER_ID) { username = "system"; nickname = "system"; @@ -105,7 +105,7 @@ public class OperationLogAspect { DatabasirUserDetails principal = (DatabasirUserDetails) SecurityContextHolder.getContext() .getAuthentication() .getPrincipal(); - return principal.getUserPojo().getId(); + return principal.getUser().getId(); } private Optional getValueBySPEL(Method method, diff --git a/api/src/main/java/com/databasir/api/common/LoginUserContext.java b/api/src/main/java/com/databasir/api/common/LoginUserContext.java index 28a010c..f23a4bc 100644 --- a/api/src/main/java/com/databasir/api/common/LoginUserContext.java +++ b/api/src/main/java/com/databasir/api/common/LoginUserContext.java @@ -9,6 +9,6 @@ public class LoginUserContext { DatabasirUserDetails principal = (DatabasirUserDetails) SecurityContextHolder.getContext() .getAuthentication() .getPrincipal(); - return principal.getUserPojo().getId(); + return principal.getUser().getId(); } } diff --git a/api/src/main/java/com/databasir/api/config/oauth2/OAuth2AuthenticationSuccessHandler.java b/api/src/main/java/com/databasir/api/config/oauth2/OAuth2AuthenticationSuccessHandler.java index f6c359e..9cf59cb 100644 --- a/api/src/main/java/com/databasir/api/config/oauth2/OAuth2AuthenticationSuccessHandler.java +++ b/api/src/main/java/com/databasir/api/config/oauth2/OAuth2AuthenticationSuccessHandler.java @@ -36,16 +36,16 @@ public class OAuth2AuthenticationSuccessHandler implements AuthenticationSuccess HttpServletResponse response, Authentication authentication) throws IOException, ServletException { DatabasirUserDetails details = (DatabasirUserDetails) authentication.getPrincipal(); - loginService.generate(details.getUserPojo().getId()); - UserLoginResponse data = loginService.getUserLoginData(details.getUserPojo().getId()) + loginService.generate(details.getUser().getId()); + UserLoginResponse data = loginService.getUserLoginData(details.getUser().getId()) .orElseThrow(() -> { - operationLogService.saveLoginLog(details.getUserPojo(), false, null); + operationLogService.saveLoginLog(details.getUser(), false, null); return new CredentialsExpiredException("请重新登陆"); }); response.setCharacterEncoding(StandardCharsets.UTF_8.name()); response.setContentType(MediaType.APPLICATION_JSON_VALUE); objectMapper.writeValue(response.getWriter(), JsonData.ok(data)); - operationLogService.saveLoginLog(details.getUserPojo(), true, null); + operationLogService.saveLoginLog(details.getUser(), true, null); } } diff --git a/api/src/main/java/com/databasir/api/config/security/DatabasirAuthenticationSuccessHandler.java b/api/src/main/java/com/databasir/api/config/security/DatabasirAuthenticationSuccessHandler.java index 0e3f2fd..ae97519 100644 --- a/api/src/main/java/com/databasir/api/config/security/DatabasirAuthenticationSuccessHandler.java +++ b/api/src/main/java/com/databasir/api/config/security/DatabasirAuthenticationSuccessHandler.java @@ -38,13 +38,13 @@ public class DatabasirAuthenticationSuccessHandler implements AuthenticationSucc response.setCharacterEncoding(StandardCharsets.UTF_8.name()); response.setContentType(MediaType.APPLICATION_JSON_VALUE); - loginService.generate(user.getUserPojo().getId()); - UserLoginResponse data = loginService.getUserLoginData(user.getUserPojo().getId()) + loginService.generate(user.getUser().getId()); + UserLoginResponse data = loginService.getUserLoginData(user.getUser().getId()) .orElseThrow(() -> { - operationLogService.saveLoginLog(user.getUserPojo(), false, null); + operationLogService.saveLoginLog(user.getUser(), false, null); return new CredentialsExpiredException("请重新登陆"); }); - operationLogService.saveLoginLog(user.getUserPojo(), true, null); + operationLogService.saveLoginLog(user.getUser(), true, null); objectMapper.writeValue(response.getWriter(), JsonData.ok(data)); } } diff --git a/api/src/main/java/com/databasir/api/config/security/DatabasirUserDetailService.java b/api/src/main/java/com/databasir/api/config/security/DatabasirUserDetailService.java index aa57448..7821587 100644 --- a/api/src/main/java/com/databasir/api/config/security/DatabasirUserDetailService.java +++ b/api/src/main/java/com/databasir/api/config/security/DatabasirUserDetailService.java @@ -3,8 +3,8 @@ package com.databasir.api.config.security; import com.databasir.core.domain.log.service.OperationLogService; import com.databasir.dao.impl.UserDao; import com.databasir.dao.impl.UserRoleDao; -import com.databasir.dao.tables.pojos.UserPojo; -import com.databasir.dao.tables.pojos.UserRolePojo; +import com.databasir.dao.tables.pojos.User; +import com.databasir.dao.tables.pojos.UserRole; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.security.core.userdetails.UserDetails; @@ -28,12 +28,12 @@ public class DatabasirUserDetailService implements UserDetailsService { @Override public UserDetails loadUserByUsername(String username) throws UsernameNotFoundException { - UserPojo user = userDao.selectByEmailOrUsername(username) + User user = userDao.selectByEmailOrUsername(username) .orElseThrow(() -> { operationLogService.saveLoginFailedLog(username, "用户名不存在"); return new UsernameNotFoundException("用户名或密码错误"); }); - List roles = userRoleDao.selectByUserIds(Collections.singletonList(user.getId())); + List roles = userRoleDao.selectByUserIds(Collections.singletonList(user.getId())); return new DatabasirUserDetails(user, roles); } } diff --git a/api/src/main/java/com/databasir/api/config/security/DatabasirUserDetails.java b/api/src/main/java/com/databasir/api/config/security/DatabasirUserDetails.java index f419a3d..51d880e 100644 --- a/api/src/main/java/com/databasir/api/config/security/DatabasirUserDetails.java +++ b/api/src/main/java/com/databasir/api/config/security/DatabasirUserDetails.java @@ -1,7 +1,7 @@ package com.databasir.api.config.security; -import com.databasir.dao.tables.pojos.UserPojo; -import com.databasir.dao.tables.pojos.UserRolePojo; +import com.databasir.dao.tables.pojos.User; +import com.databasir.dao.tables.pojos.UserRole; import lombok.Getter; import lombok.RequiredArgsConstructor; import org.springframework.security.core.GrantedAuthority; @@ -16,10 +16,10 @@ import java.util.stream.Collectors; public class DatabasirUserDetails implements UserDetails { @Getter - private final UserPojo userPojo; + private final User user; @Getter - private final List roles; + private final List roles; @Override public Collection getAuthorities() { @@ -36,12 +36,12 @@ public class DatabasirUserDetails implements UserDetails { @Override public String getPassword() { - return userPojo.getPassword(); + return user.getPassword(); } @Override public String getUsername() { - return userPojo.getEmail(); + return user.getEmail(); } @Override @@ -61,6 +61,6 @@ public class DatabasirUserDetails implements UserDetails { @Override public boolean isEnabled() { - return userPojo.getEnabled(); + return user.getEnabled(); } } diff --git a/api/src/main/java/com/databasir/api/validator/UserOperationValidator.java b/api/src/main/java/com/databasir/api/validator/UserOperationValidator.java index 0f5d60b..c0a9469 100644 --- a/api/src/main/java/com/databasir/api/validator/UserOperationValidator.java +++ b/api/src/main/java/com/databasir/api/validator/UserOperationValidator.java @@ -12,7 +12,7 @@ public class UserOperationValidator { DatabasirUserDetails principal = (DatabasirUserDetails) SecurityContextHolder.getContext() .getAuthentication() .getPrincipal(); - if (principal.getUserPojo().getId().equals(userId)) { + if (principal.getUser().getId().equals(userId)) { throw DomainErrors.CANNOT_UPDATE_SELF_ROLE.exception(); } } @@ -21,7 +21,7 @@ public class UserOperationValidator { DatabasirUserDetails principal = (DatabasirUserDetails) SecurityContextHolder.getContext() .getAuthentication() .getPrincipal(); - return principal.getUserPojo().getId().equals(userId); + return principal.getUser().getId().equals(userId); } } diff --git a/api/src/main/java/com/databasir/job/ProjectSyncJobScheduler.java b/api/src/main/java/com/databasir/job/ProjectSyncJobScheduler.java index f71d5e3..38ad200 100644 --- a/api/src/main/java/com/databasir/job/ProjectSyncJobScheduler.java +++ b/api/src/main/java/com/databasir/job/ProjectSyncJobScheduler.java @@ -2,7 +2,7 @@ package com.databasir.job; import com.databasir.core.domain.document.service.DocumentService; import com.databasir.dao.impl.ProjectSyncRuleDao; -import com.databasir.dao.tables.pojos.ProjectSyncRulePojo; +import com.databasir.dao.tables.pojos.ProjectSyncRule; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.quartz.*; @@ -135,7 +135,7 @@ public class ProjectSyncJobScheduler { } } - private Pair jobAndTriggers(ProjectSyncRulePojo rule) { + private Pair jobAndTriggers(ProjectSyncRule rule) { JobDataMap dataMap = new JobDataMap(); Integer projectId = rule.getProjectId(); Integer ruleId = rule.getId(); diff --git a/api/src/main/java/com/databasir/job/ProjectSyncTaskScheduler.java b/api/src/main/java/com/databasir/job/ProjectSyncTaskScheduler.java index 878dbf4..66d7d93 100644 --- a/api/src/main/java/com/databasir/job/ProjectSyncTaskScheduler.java +++ b/api/src/main/java/com/databasir/job/ProjectSyncTaskScheduler.java @@ -8,8 +8,8 @@ import com.databasir.dao.enums.ProjectSyncTaskStatus; import com.databasir.dao.impl.ProjectDao; import com.databasir.dao.impl.ProjectSyncTaskDao; import com.databasir.dao.impl.UserDao; -import com.databasir.dao.tables.pojos.ProjectSyncTaskPojo; -import com.databasir.dao.tables.pojos.UserPojo; +import com.databasir.dao.tables.pojos.ProjectSyncTask; +import com.databasir.dao.tables.pojos.User; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.scheduling.annotation.Scheduled; @@ -44,9 +44,9 @@ public class ProjectSyncTaskScheduler { @Scheduled(fixedRate = 5000L) public void startSyncTask() { final int size = 10; - List tasks = projectSyncTaskDao.listNewTasks(size); + List tasks = projectSyncTaskDao.listNewTasks(size); List projectIds = tasks.stream() - .map(ProjectSyncTaskPojo::getProjectId) + .map(ProjectSyncTask::getProjectId) .distinct() .collect(Collectors.toList()); Map groupIdAndProjectIdMap = projectDao.selectGroupIdsByProjectIdIn(projectIds); @@ -88,7 +88,7 @@ public class ProjectSyncTaskScheduler { operatorUsername = "system"; operationName = "定时同步"; } else { - UserPojo user = userDao.selectById(userId); + User user = userDao.selectById(userId); operatorNickName = user.getNickname(); operatorUsername = user.getUsername(); operationName = "手动同步"; diff --git a/core/src/main/java/com/databasir/core/domain/app/OpenAuthAppService.java b/core/src/main/java/com/databasir/core/domain/app/OpenAuthAppService.java index d34b834..ab4b596 100644 --- a/core/src/main/java/com/databasir/core/domain/app/OpenAuthAppService.java +++ b/core/src/main/java/com/databasir/core/domain/app/OpenAuthAppService.java @@ -1,7 +1,7 @@ package com.databasir.core.domain.app; import com.databasir.core.domain.DomainErrors; -import com.databasir.core.domain.app.converter.OAuthAppPojoConverter; +import com.databasir.core.domain.app.converter.OauthAppConverter; import com.databasir.core.domain.app.converter.OAuthAppResponseConverter; import com.databasir.core.domain.app.data.*; import com.databasir.core.domain.app.handler.OAuthProcessResult; @@ -10,7 +10,7 @@ import com.databasir.core.domain.user.data.UserCreateRequest; import com.databasir.core.domain.user.data.UserDetailResponse; import com.databasir.core.domain.user.service.UserService; import com.databasir.dao.impl.OauthAppDao; -import com.databasir.dao.tables.pojos.OauthAppPojo; +import com.databasir.dao.tables.pojos.OauthApp; import lombok.RequiredArgsConstructor; import org.springframework.dao.DuplicateKeyException; import org.springframework.data.domain.Page; @@ -35,7 +35,7 @@ public class OpenAuthAppService { private final OAuthAppResponseConverter oauthAppResponseConverter; - private final OAuthAppPojoConverter oauthAppPojoConverter; + private final OauthAppConverter oauthAppConverter; public UserDetailResponse oauthCallback(String registrationId, Map params) { // process by handler @@ -57,7 +57,7 @@ public class OpenAuthAppService { } public List listAll() { - List apps = oauthAppDao.selectAll(); + List apps = oauthAppDao.selectAll(); return apps.stream() .map(oauthAppResponseConverter::to) .collect(Collectors.toList()); @@ -70,7 +70,7 @@ public class OpenAuthAppService { } public void updateById(OAuthAppUpdateRequest request) { - OauthAppPojo pojo = oauthAppPojoConverter.of(request); + OauthApp pojo = oauthAppConverter.of(request); try { oauthAppDao.updateById(pojo); } catch (DuplicateKeyException e) { @@ -79,7 +79,7 @@ public class OpenAuthAppService { } public Integer create(OAuthAppCreateRequest request) { - OauthAppPojo pojo = oauthAppPojoConverter.of(request); + OauthApp pojo = oauthAppConverter.of(request); try { return oauthAppDao.insertAndReturnId(pojo); } catch (DuplicateKeyException e) { @@ -88,10 +88,10 @@ public class OpenAuthAppService { } public Page listPage(Pageable page, OAuthAppPageCondition condition) { - return oauthAppDao.selectByPage(page, condition.toCondition()).map(oauthAppPojoConverter::toPageResponse); + return oauthAppDao.selectByPage(page, condition.toCondition()).map(oauthAppConverter::toPageResponse); } public Optional getOne(Integer id) { - return oauthAppDao.selectOptionalById(id).map(oauthAppPojoConverter::toDetailResponse); + return oauthAppDao.selectOptionalById(id).map(oauthAppConverter::toDetailResponse); } } diff --git a/core/src/main/java/com/databasir/core/domain/app/converter/OAuthAppResponseConverter.java b/core/src/main/java/com/databasir/core/domain/app/converter/OAuthAppResponseConverter.java index 18e5f9b..9b7cffd 100644 --- a/core/src/main/java/com/databasir/core/domain/app/converter/OAuthAppResponseConverter.java +++ b/core/src/main/java/com/databasir/core/domain/app/converter/OAuthAppResponseConverter.java @@ -1,11 +1,11 @@ package com.databasir.core.domain.app.converter; import com.databasir.core.domain.app.data.OAuthAppResponse; -import com.databasir.dao.tables.pojos.OauthAppPojo; +import com.databasir.dao.tables.pojos.OauthApp; import org.mapstruct.Mapper; @Mapper(componentModel = "spring") public interface OAuthAppResponseConverter { - OAuthAppResponse to(OauthAppPojo pojo); + OAuthAppResponse to(OauthApp pojo); } diff --git a/core/src/main/java/com/databasir/core/domain/app/converter/OAuthAppPojoConverter.java b/core/src/main/java/com/databasir/core/domain/app/converter/OauthAppConverter.java similarity index 66% rename from core/src/main/java/com/databasir/core/domain/app/converter/OAuthAppPojoConverter.java rename to core/src/main/java/com/databasir/core/domain/app/converter/OauthAppConverter.java index 1d6aed2..16d1594 100644 --- a/core/src/main/java/com/databasir/core/domain/app/converter/OAuthAppPojoConverter.java +++ b/core/src/main/java/com/databasir/core/domain/app/converter/OauthAppConverter.java @@ -4,23 +4,23 @@ import com.databasir.core.domain.app.data.OAuthAppCreateRequest; import com.databasir.core.domain.app.data.OAuthAppDetailResponse; import com.databasir.core.domain.app.data.OAuthAppPageResponse; import com.databasir.core.domain.app.data.OAuthAppUpdateRequest; -import com.databasir.dao.tables.pojos.OauthAppPojo; +import com.databasir.dao.tables.pojos.OauthApp; import org.mapstruct.Mapper; import org.mapstruct.Mapping; @Mapper(componentModel = "spring") -public interface OAuthAppPojoConverter { +public interface OauthAppConverter { @Mapping(target = "id", ignore = true) @Mapping(target = "createAt", ignore = true) @Mapping(target = "updateAt", ignore = true) - OauthAppPojo of(OAuthAppCreateRequest request); + OauthApp of(OAuthAppCreateRequest request); @Mapping(target = "createAt", ignore = true) @Mapping(target = "updateAt", ignore = true) - OauthAppPojo of(OAuthAppUpdateRequest request); + OauthApp of(OAuthAppUpdateRequest request); - OAuthAppPageResponse toPageResponse(OauthAppPojo pojo); + OAuthAppPageResponse toPageResponse(OauthApp pojo); - OAuthAppDetailResponse toDetailResponse(OauthAppPojo pojo); + OAuthAppDetailResponse toDetailResponse(OauthApp pojo); } diff --git a/core/src/main/java/com/databasir/core/domain/app/handler/GithubOpenAuthHandler.java b/core/src/main/java/com/databasir/core/domain/app/handler/GithubOpenAuthHandler.java index 54d4b8e..d546d24 100644 --- a/core/src/main/java/com/databasir/core/domain/app/handler/GithubOpenAuthHandler.java +++ b/core/src/main/java/com/databasir/core/domain/app/handler/GithubOpenAuthHandler.java @@ -4,7 +4,7 @@ import com.databasir.core.domain.DomainErrors; import com.databasir.core.domain.app.exception.DatabasirAuthenticationException; import com.databasir.core.infrastructure.remote.github.GithubRemoteService; import com.databasir.dao.enums.OAuthAppType; -import com.databasir.dao.tables.pojos.OauthAppPojo; +import com.databasir.dao.tables.pojos.OauthApp; import com.fasterxml.jackson.databind.JsonNode; import lombok.RequiredArgsConstructor; import org.jooq.tools.StringUtils; @@ -26,7 +26,7 @@ public class GithubOpenAuthHandler implements OpenAuthHandler { } @Override - public String authorizationUrl(OauthAppPojo app, Map requestParams) { + public String authorizationUrl(OauthApp app, Map requestParams) { String authUrl = app.getAuthUrl(); String clientId = app.getClientId(); String authorizeUrl = authUrl + "/login/oauth/authorize"; @@ -40,7 +40,7 @@ public class GithubOpenAuthHandler implements OpenAuthHandler { } @Override - public OAuthProcessResult process(OauthAppPojo app, Map requestParams) { + public OAuthProcessResult process(OauthApp app, Map requestParams) { String clientId = app.getClientId(); String clientSecret = app.getClientSecret(); String authUrl = app.getAuthUrl(); diff --git a/core/src/main/java/com/databasir/core/domain/app/handler/GitlabOpenAuthHandler.java b/core/src/main/java/com/databasir/core/domain/app/handler/GitlabOpenAuthHandler.java index 7155369..8f9eea6 100644 --- a/core/src/main/java/com/databasir/core/domain/app/handler/GitlabOpenAuthHandler.java +++ b/core/src/main/java/com/databasir/core/domain/app/handler/GitlabOpenAuthHandler.java @@ -4,7 +4,7 @@ import com.databasir.core.domain.DomainErrors; import com.databasir.core.domain.app.exception.DatabasirAuthenticationException; import com.databasir.core.infrastructure.remote.gitlab.GitlabRemoteService; import com.databasir.dao.enums.OAuthAppType; -import com.databasir.dao.tables.pojos.OauthAppPojo; +import com.databasir.dao.tables.pojos.OauthApp; import com.fasterxml.jackson.databind.JsonNode; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Component; @@ -24,7 +24,7 @@ public class GitlabOpenAuthHandler implements OpenAuthHandler { } @Override - public String authorizationUrl(OauthAppPojo app, Map params) { + public String authorizationUrl(OauthApp app, Map params) { if (!params.containsKey("redirect_uri")) { throw DomainErrors.MISS_REQUIRED_PARAMETERS.exception("缺少参数 redirect_uri", null); } @@ -45,7 +45,7 @@ public class GitlabOpenAuthHandler implements OpenAuthHandler { } @Override - public OAuthProcessResult process(OauthAppPojo app, Map requestParams) { + public OAuthProcessResult process(OauthApp app, Map requestParams) { if (!requestParams.containsKey("redirect_uri")) { throw DomainErrors.MISS_REQUIRED_PARAMETERS.exception("缺少参数 redirect_uri", null); } diff --git a/core/src/main/java/com/databasir/core/domain/app/handler/OAuthProcessContext.java b/core/src/main/java/com/databasir/core/domain/app/handler/OAuthProcessContext.java index 205f674..2dfec46 100644 --- a/core/src/main/java/com/databasir/core/domain/app/handler/OAuthProcessContext.java +++ b/core/src/main/java/com/databasir/core/domain/app/handler/OAuthProcessContext.java @@ -1,6 +1,6 @@ package com.databasir.core.domain.app.handler; -import com.databasir.dao.tables.pojos.OauthAppPojo; +import com.databasir.dao.tables.pojos.OauthApp; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; @@ -17,7 +17,7 @@ public class OAuthProcessContext { private String registrationId; - private OauthAppPojo app; + private OauthApp app; @Builder.Default private Map parameters = new HashMap<>(); diff --git a/core/src/main/java/com/databasir/core/domain/app/handler/OpenAuthHandler.java b/core/src/main/java/com/databasir/core/domain/app/handler/OpenAuthHandler.java index 0878538..9e1f5e6 100644 --- a/core/src/main/java/com/databasir/core/domain/app/handler/OpenAuthHandler.java +++ b/core/src/main/java/com/databasir/core/domain/app/handler/OpenAuthHandler.java @@ -1,7 +1,7 @@ package com.databasir.core.domain.app.handler; import com.databasir.dao.enums.OAuthAppType; -import com.databasir.dao.tables.pojos.OauthAppPojo; +import com.databasir.dao.tables.pojos.OauthApp; import java.util.Map; @@ -9,7 +9,7 @@ public interface OpenAuthHandler { boolean support(OAuthAppType oauthAppType); - String authorizationUrl(OauthAppPojo app, Map requestParams); + String authorizationUrl(OauthApp app, Map requestParams); - OAuthProcessResult process(OauthAppPojo app, Map requestParams); + OAuthProcessResult process(OauthApp app, Map requestParams); } diff --git a/core/src/main/java/com/databasir/core/domain/app/handler/OpenAuthHandlers.java b/core/src/main/java/com/databasir/core/domain/app/handler/OpenAuthHandlers.java index 7d59b68..358aab8 100644 --- a/core/src/main/java/com/databasir/core/domain/app/handler/OpenAuthHandlers.java +++ b/core/src/main/java/com/databasir/core/domain/app/handler/OpenAuthHandlers.java @@ -2,7 +2,7 @@ package com.databasir.core.domain.app.handler; import com.databasir.core.domain.app.exception.DatabasirAuthenticationException; import com.databasir.dao.impl.OauthAppDao; -import com.databasir.dao.tables.pojos.OauthAppPojo; +import com.databasir.dao.tables.pojos.OauthApp; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Component; @@ -20,7 +20,7 @@ public class OpenAuthHandlers { private final OauthAppDao oauthAppDao; public String authorizeUrl(String registrationId, Map parameters) { - OauthAppPojo app = oauthAppDao.selectByRegistrationId(registrationId); + OauthApp app = oauthAppDao.selectByRegistrationId(registrationId); return handlers.stream() .filter(handler -> handler.support(app.getAppType())) .findFirst() @@ -29,7 +29,7 @@ public class OpenAuthHandlers { } public OAuthProcessResult process(String registrationId, Map parameters) { - OauthAppPojo app = oauthAppDao.selectOptionByRegistrationId(registrationId) + OauthApp app = oauthAppDao.selectOptionByRegistrationId(registrationId) .orElseThrow(() -> { var bizErr = REGISTRATION_ID_NOT_FOUND.exception("应用 ID [" + registrationId + "] 不存在"); return new DatabasirAuthenticationException(bizErr); diff --git a/core/src/main/java/com/databasir/core/domain/database/converter/DatabaseTypePojoConverter.java b/core/src/main/java/com/databasir/core/domain/database/converter/DatabaseTypeConverter.java similarity index 59% rename from core/src/main/java/com/databasir/core/domain/database/converter/DatabaseTypePojoConverter.java rename to core/src/main/java/com/databasir/core/domain/database/converter/DatabaseTypeConverter.java index 3621ee8..de25878 100644 --- a/core/src/main/java/com/databasir/core/domain/database/converter/DatabaseTypePojoConverter.java +++ b/core/src/main/java/com/databasir/core/domain/database/converter/DatabaseTypeConverter.java @@ -4,25 +4,25 @@ import com.databasir.core.domain.database.data.DatabaseTypeCreateRequest; import com.databasir.core.domain.database.data.DatabaseTypeDetailResponse; import com.databasir.core.domain.database.data.DatabaseTypePageResponse; import com.databasir.core.domain.database.data.DatabaseTypeUpdateRequest; -import com.databasir.dao.tables.pojos.DatabaseTypePojo; +import com.databasir.dao.tables.pojos.DatabaseType; import org.mapstruct.Mapper; import org.mapstruct.Mapping; @Mapper(componentModel = "spring") -public interface DatabaseTypePojoConverter { +public interface DatabaseTypeConverter { @Mapping(target = "id", ignore = true) @Mapping(target = "updateAt", ignore = true) @Mapping(target = "createAt", ignore = true) @Mapping(target = "jdbcDriverFilePath", source = "jdbcDriverFilePath") - DatabaseTypePojo of(DatabaseTypeCreateRequest request, String jdbcDriverFilePath); + DatabaseType of(DatabaseTypeCreateRequest request, String jdbcDriverFilePath); @Mapping(target = "jdbcDriverFilePath", source = "jdbcDriverFilePath") - DatabaseTypePojo of(DatabaseTypeUpdateRequest request, String jdbcDriverFilePath); + DatabaseType of(DatabaseTypeUpdateRequest request, String jdbcDriverFilePath); - DatabaseTypePojo of(DatabaseTypeUpdateRequest request); + DatabaseType of(DatabaseTypeUpdateRequest request); - DatabaseTypeDetailResponse toDetailResponse(DatabaseTypePojo data); + DatabaseTypeDetailResponse toDetailResponse(DatabaseType data); - DatabaseTypePageResponse toPageResponse(DatabaseTypePojo pojo, Integer projectCount); + DatabaseTypePageResponse toPageResponse(DatabaseType pojo, Integer projectCount); } diff --git a/core/src/main/java/com/databasir/core/domain/database/service/DatabaseTypeService.java b/core/src/main/java/com/databasir/core/domain/database/service/DatabaseTypeService.java index 08c9841..af21403 100644 --- a/core/src/main/java/com/databasir/core/domain/database/service/DatabaseTypeService.java +++ b/core/src/main/java/com/databasir/core/domain/database/service/DatabaseTypeService.java @@ -1,7 +1,7 @@ package com.databasir.core.domain.database.service; import com.databasir.core.domain.DomainErrors; -import com.databasir.core.domain.database.converter.DatabaseTypePojoConverter; +import com.databasir.core.domain.database.converter.DatabaseTypeConverter; import com.databasir.core.domain.database.data.*; import com.databasir.core.domain.database.validator.DatabaseTypeUpdateValidator; import com.databasir.core.infrastructure.connection.DatabaseTypes; @@ -9,7 +9,7 @@ import com.databasir.core.infrastructure.driver.DriverResources; import com.databasir.core.infrastructure.driver.DriverResult; import com.databasir.dao.impl.DatabaseTypeDao; import com.databasir.dao.impl.ProjectDao; -import com.databasir.dao.tables.pojos.DatabaseTypePojo; +import com.databasir.dao.tables.pojos.DatabaseType; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; @@ -40,7 +40,7 @@ public class DatabaseTypeService { private final ProjectDao projectDao; - private final DatabaseTypePojoConverter databaseTypePojoConverter; + private final DatabaseTypeConverter databaseTypeConverter; private final DatabaseTypeUpdateValidator databaseTypeUpdateValidator; @@ -61,7 +61,7 @@ public class DatabaseTypeService { DriverResult result = loadAndValidate(request.getJdbcDriverFileUrl(), request.getJdbcDriverFilePath(), request.getJdbcDriverClassName()); String targetPath = driverResources.copyToStandardDirectory(result.getDriverFile(), databaseType); - DatabaseTypePojo pojo = databaseTypePojoConverter.of(request, targetPath); + DatabaseType pojo = databaseTypeConverter.of(request, targetPath); // TODO workaround pojo.setJdbcDriverFileUrl(StringUtils.defaultIfBlank(request.getJdbcDriverFileUrl(), "")); try { @@ -77,7 +77,7 @@ public class DatabaseTypeService { databaseTypeDao.selectOptionalById(request.getId()).ifPresent(data -> { databaseTypeUpdateValidator.validDatabaseTypeIfNecessary(request, data); String databaseType = request.getDatabaseType(); - DatabaseTypePojo pojo; + DatabaseType pojo; if (databaseTypeUpdateValidator.shouldReloadDriver(request, data)) { // 名称修改，下载地址修改需要删除原有的 driver 并重新下载验证 driverResources.deleteByDatabaseType(data.getDatabaseType()); @@ -85,10 +85,10 @@ public class DatabaseTypeService { DriverResult result = loadAndValidate(request.getJdbcDriverFileUrl(), request.getJdbcDriverFilePath(), request.getJdbcDriverClassName()); String targetPath = driverResources.copyToStandardDirectory(result.getDriverFile(), databaseType); - pojo = databaseTypePojoConverter.of(request, targetPath); + pojo = databaseTypeConverter.of(request, targetPath); pojo.setJdbcDriverFileUrl(StringUtils.defaultIfBlank(request.getJdbcDriverFileUrl(), "")); } else { - pojo = databaseTypePojoConverter.of(request); + pojo = databaseTypeConverter.of(request); pojo.setJdbcDriverFileUrl(StringUtils.defaultIfBlank(request.getJdbcDriverFileUrl(), "")); } @@ -123,13 +123,13 @@ public class DatabaseTypeService { public Page findByPage(Pageable page, DatabaseTypePageCondition condition) { - Page pageData = databaseTypeDao.selectByPage(page, condition.toCondition()); - List databaseTypes = pageData.map(DatabaseTypePojo::getDatabaseType).toList(); + Page pageData = databaseTypeDao.selectByPage(page, condition.toCondition()); + List databaseTypes = pageData.map(DatabaseType::getDatabaseType).toList(); Map projectCountMapByDatabaseType = projectDao.countByDatabaseTypes(databaseTypes); return pageData .map(data -> { Integer count = projectCountMapByDatabaseType.getOrDefault(data.getDatabaseType(), 0); - return databaseTypePojoConverter.toPageResponse(data, count); + return databaseTypeConverter.toPageResponse(data, count); }); } @@ -150,7 +150,7 @@ public class DatabaseTypeService { public Optional selectOne(Integer id) { return databaseTypeDao.selectOptionalById(id) - .map(databaseTypePojoConverter::toDetailResponse); + .map(databaseTypeConverter::toDetailResponse); } public String resolveDriverClassName(DriverClassNameResolveRequest request) { diff --git a/core/src/main/java/com/databasir/core/domain/database/validator/DatabaseTypeUpdateValidator.java b/core/src/main/java/com/databasir/core/domain/database/validator/DatabaseTypeUpdateValidator.java index 9ba5d39..53c91f9 100644 --- a/core/src/main/java/com/databasir/core/domain/database/validator/DatabaseTypeUpdateValidator.java +++ b/core/src/main/java/com/databasir/core/domain/database/validator/DatabaseTypeUpdateValidator.java @@ -5,7 +5,7 @@ import com.databasir.core.domain.database.data.DatabaseTypeCreateRequest; import com.databasir.core.domain.database.data.DatabaseTypeUpdateRequest; import com.databasir.core.domain.database.data.DriverClassNameResolveRequest; import com.databasir.dao.impl.DatabaseTypeDao; -import com.databasir.dao.tables.pojos.DatabaseTypePojo; +import com.databasir.dao.tables.pojos.DatabaseType; import lombok.RequiredArgsConstructor; import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Component; @@ -36,7 +36,7 @@ public class DatabaseTypeUpdateValidator { } } - public void validDatabaseTypeIfNecessary(DatabaseTypeUpdateRequest request, DatabaseTypePojo origin) { + public void validDatabaseTypeIfNecessary(DatabaseTypeUpdateRequest request, DatabaseType origin) { if (!Objects.equals(request.getDatabaseType(), origin.getDatabaseType())) { if (databaseTypeDao.existsByDatabaseType(request.getDatabaseType())) { throw DomainErrors.DATABASE_TYPE_NAME_DUPLICATE.exception(); @@ -44,7 +44,7 @@ public class DatabaseTypeUpdateValidator { } } - public boolean shouldReloadDriver(DatabaseTypeUpdateRequest request, DatabaseTypePojo origin) { + public boolean shouldReloadDriver(DatabaseTypeUpdateRequest request, DatabaseType origin) { if (!Objects.equals(request.getDatabaseType(), origin.getDatabaseType())) { return true; } diff --git a/core/src/main/java/com/databasir/core/domain/description/converter/DocumentDescriptionPojoConverter.java b/core/src/main/java/com/databasir/core/domain/description/converter/DocumentDescriptionConverter.java similarity index 75% rename from core/src/main/java/com/databasir/core/domain/description/converter/DocumentDescriptionPojoConverter.java rename to core/src/main/java/com/databasir/core/domain/description/converter/DocumentDescriptionConverter.java index e6105f2..dec1007 100644 --- a/core/src/main/java/com/databasir/core/domain/description/converter/DocumentDescriptionPojoConverter.java +++ b/core/src/main/java/com/databasir/core/domain/description/converter/DocumentDescriptionConverter.java @@ -1,17 +1,17 @@ package com.databasir.core.domain.description.converter; import com.databasir.core.domain.description.data.DocumentDescriptionSaveRequest; -import com.databasir.dao.tables.pojos.DocumentDescriptionPojo; +import com.databasir.dao.tables.pojos.DocumentDescription; import org.mapstruct.Mapper; import org.mapstruct.Mapping; @Mapper(componentModel = "spring") -public interface DocumentDescriptionPojoConverter { +public interface DocumentDescriptionConverter { @Mapping(target = "id", ignore = true) @Mapping(target = "createAt", ignore = true) @Mapping(target = "updateAt", ignore = true) - DocumentDescriptionPojo of(Integer projectId, + DocumentDescription of(Integer projectId, Integer updateBy, DocumentDescriptionSaveRequest request); } diff --git a/core/src/main/java/com/databasir/core/domain/description/service/DocumentDescriptionService.java b/core/src/main/java/com/databasir/core/domain/description/service/DocumentDescriptionService.java index cf36012..fd33a08 100644 --- a/core/src/main/java/com/databasir/core/domain/description/service/DocumentDescriptionService.java +++ b/core/src/main/java/com/databasir/core/domain/description/service/DocumentDescriptionService.java @@ -1,11 +1,11 @@ package com.databasir.core.domain.description.service; -import com.databasir.core.domain.description.converter.DocumentDescriptionPojoConverter; +import com.databasir.core.domain.description.converter.DocumentDescriptionConverter; import com.databasir.core.domain.description.data.DocumentDescriptionSaveRequest; import com.databasir.core.domain.description.event.DescriptionUpdated; import com.databasir.core.infrastructure.event.EventPublisher; import com.databasir.dao.impl.DocumentDescriptionDao; -import com.databasir.dao.tables.pojos.DocumentDescriptionPojo; +import com.databasir.dao.tables.pojos.DocumentDescription; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -16,7 +16,7 @@ public class DocumentDescriptionService { private final DocumentDescriptionDao documentDescriptionDao; - private final DocumentDescriptionPojoConverter documentDescriptionPojoConverter; + private final DocumentDescriptionConverter documentDescriptionConverter; private final EventPublisher eventPublisher; @@ -26,7 +26,7 @@ public class DocumentDescriptionService { Integer userId, DocumentDescriptionSaveRequest request) { - DocumentDescriptionPojo pojo = documentDescriptionPojoConverter.of(projectId, userId, request); + DocumentDescription pojo = documentDescriptionConverter.of(projectId, userId, request); if (!documentDescriptionDao.exists(projectId, request.getTableName(), request.getColumnName())) { documentDescriptionDao.insertAndReturnId(pojo); } else { diff --git a/core/src/main/java/com/databasir/core/domain/discussion/converter/DiscussionResponseConverter.java b/core/src/main/java/com/databasir/core/domain/discussion/converter/DiscussionResponseConverter.java index 4532b83..766563f 100644 --- a/core/src/main/java/com/databasir/core/domain/discussion/converter/DiscussionResponseConverter.java +++ b/core/src/main/java/com/databasir/core/domain/discussion/converter/DiscussionResponseConverter.java @@ -1,8 +1,8 @@ package com.databasir.core.domain.discussion.converter; import com.databasir.core.domain.discussion.data.DiscussionResponse; -import com.databasir.dao.tables.pojos.DocumentDiscussionPojo; -import com.databasir.dao.tables.pojos.UserPojo; +import com.databasir.dao.tables.pojos.DocumentDiscussion; +import com.databasir.dao.tables.pojos.User; import org.mapstruct.Mapper; import org.mapstruct.Mapping; @@ -12,6 +12,6 @@ public interface DiscussionResponseConverter { @Mapping(target = "id", source = "discussion.id") @Mapping(target = "createAt", source = "discussion.createAt") @Mapping(target = "content", source = "discussion.content") - DiscussionResponse of(DocumentDiscussionPojo discussion, - UserPojo discussBy); + DiscussionResponse of(DocumentDiscussion discussion, + User discussBy); } diff --git a/core/src/main/java/com/databasir/core/domain/discussion/event/converter/DiscussionEventConverter.java b/core/src/main/java/com/databasir/core/domain/discussion/event/converter/DiscussionEventConverter.java index 120e7c5..3b288ae 100644 --- a/core/src/main/java/com/databasir/core/domain/discussion/event/converter/DiscussionEventConverter.java +++ b/core/src/main/java/com/databasir/core/domain/discussion/event/converter/DiscussionEventConverter.java @@ -1,7 +1,7 @@ package com.databasir.core.domain.discussion.event.converter; import com.databasir.core.domain.discussion.event.DiscussionCreated; -import com.databasir.dao.tables.pojos.DocumentDiscussionPojo; +import com.databasir.dao.tables.pojos.DocumentDiscussion; import org.mapstruct.Mapper; import org.mapstruct.Mapping; @@ -9,6 +9,6 @@ import org.mapstruct.Mapping; public interface DiscussionEventConverter { @Mapping(target = "createByUserId", source = "pojo.userId") - DiscussionCreated of(DocumentDiscussionPojo pojo, Integer discussionId); + DiscussionCreated of(DocumentDiscussion pojo, Integer discussionId); } diff --git a/core/src/main/java/com/databasir/core/domain/discussion/service/DocumentDiscussionService.java b/core/src/main/java/com/databasir/core/domain/discussion/service/DocumentDiscussionService.java index 89e5c9b..028c6cd 100644 --- a/core/src/main/java/com/databasir/core/domain/discussion/service/DocumentDiscussionService.java +++ b/core/src/main/java/com/databasir/core/domain/discussion/service/DocumentDiscussionService.java @@ -11,8 +11,8 @@ import com.databasir.core.infrastructure.event.EventPublisher; import com.databasir.dao.impl.DocumentDiscussionDao; import com.databasir.dao.impl.ProjectDao; import com.databasir.dao.impl.UserDao; -import com.databasir.dao.tables.pojos.DocumentDiscussionPojo; -import com.databasir.dao.tables.pojos.UserPojo; +import com.databasir.dao.tables.pojos.DocumentDiscussion; +import com.databasir.dao.tables.pojos.User; import lombok.RequiredArgsConstructor; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; @@ -54,19 +54,19 @@ public class DocumentDiscussionService { Pageable pageable, DiscussionListCondition condition) { if (projectDao.exists(groupId, projectId)) { - Page data = + Page data = documentDiscussionDao.selectByPage(pageable, condition.toCondition(projectId)); Set userIdList = data.getContent() .stream() - .map(DocumentDiscussionPojo::getUserId) + .map(DocumentDiscussion::getUserId) .collect(Collectors.toSet()); - Map userMapById = userDao.selectUserIdIn(userIdList) + Map userMapById = userDao.selectUserIdIn(userIdList) .stream() - .collect(Collectors.toMap(UserPojo::getId, Function.identity())); + .collect(Collectors.toMap(User::getId, Function.identity())); return data .map(discussionPojo -> { - UserPojo userPojo = userMapById.get(discussionPojo.getUserId()); - return discussionResponseConverter.of(discussionPojo, userPojo); + User user = userMapById.get(discussionPojo.getUserId()); + return discussionResponseConverter.of(discussionPojo, user); }); } else { throw new Forbidden(); @@ -75,7 +75,7 @@ public class DocumentDiscussionService { public void create(Integer groupId, Integer projectId, Integer userId, DiscussionCreateRequest request) { if (projectDao.exists(groupId, projectId)) { - DocumentDiscussionPojo pojo = new DocumentDiscussionPojo(); + DocumentDiscussion pojo = new DocumentDiscussion(); pojo.setUserId(userId); pojo.setProjectId(projectId); pojo.setContent(request.getContent()); diff --git a/core/src/main/java/com/databasir/core/domain/document/converter/DatabaseMetaConverter.java b/core/src/main/java/com/databasir/core/domain/document/converter/DatabaseMetaConverter.java index b693874..8bc464f 100644 --- a/core/src/main/java/com/databasir/core/domain/document/converter/DatabaseMetaConverter.java +++ b/core/src/main/java/com/databasir/core/domain/document/converter/DatabaseMetaConverter.java @@ -16,25 +16,25 @@ import java.util.stream.Collectors; @Mapper(componentModel = "spring", uses = JsonConverter.class) public interface DatabaseMetaConverter { - default DatabaseMeta of(DatabaseDocumentPojo database, - List tables, - List columns, - List indexes, - List triggers, - List foreignKeys) { - var columnMap = groupBy(columns, TableColumnDocumentPojo::getTableDocumentId); - var indexMap = groupBy(indexes, TableIndexDocumentPojo::getTableDocumentId); - var triggerMap = groupBy(triggers, TableTriggerDocumentPojo::getTableDocumentId); - var fkMap = groupBy(foreignKeys, TableForeignKeyDocumentPojo::getTableDocumentId); + default DatabaseMeta of(DatabaseDocument database, + List tables, + List columns, + List indexes, + List triggers, + List foreignKeys) { + var columnMap = groupBy(columns, TableColumnDocument::getTableDocumentId); + var indexMap = groupBy(indexes, TableIndexDocument::getTableDocumentId); + var triggerMap = groupBy(triggers, TableTriggerDocument::getTableDocumentId); + var fkMap = groupBy(foreignKeys, TableForeignKeyDocument::getTableDocumentId); return of(database, tables, columnMap, indexMap, triggerMap, fkMap); } - default DatabaseMeta of(DatabaseDocumentPojo database, - List tables, - Map> columnGroupByTableId, - Map> indexGroupByTableId, - Map> triggerGroupByTableId, - Map> fkGroupByTableId) { + default DatabaseMeta of(DatabaseDocument database, + List tables, + Map> columnGroupByTableId, + Map> indexGroupByTableId, + Map> triggerGroupByTableId, + Map> fkGroupByTableId) { List tableMetas = tables.stream() .map(table -> { Integer id = table.getId(); @@ -48,22 +48,22 @@ public interface DatabaseMetaConverter { return of(database, tableMetas); } - DatabaseMeta of(DatabaseDocumentPojo database, List tables); + DatabaseMeta of(DatabaseDocument database, List tables); - TableMeta of(TableDocumentPojo table, - List columns, - List indexes, - List triggers, - List foreignKeys); + TableMeta of(TableDocument table, + List columns, + List indexes, + List triggers, + List foreignKeys); - ColumnMeta of(TableColumnDocumentPojo pojo); + ColumnMeta of(TableColumnDocument pojo); @Mapping(target = "isUniqueKey", source = "pojo.isUnique") @Mapping(target = "columnNames", source = "pojo.columnNameArray") - IndexMeta of(TableIndexDocumentPojo pojo); + IndexMeta of(TableIndexDocument pojo); @Mapping(target = "createAt", source = "pojo.triggerCreateAt") - TriggerMeta of(TableTriggerDocumentPojo pojo); + TriggerMeta of(TableTriggerDocument pojo); List of(List table); diff --git a/core/src/main/java/com/databasir/core/domain/document/converter/DocumentFullTextPojoConverter.java b/core/src/main/java/com/databasir/core/domain/document/converter/DocumentFullTextConverter.java similarity index 81% rename from core/src/main/java/com/databasir/core/domain/document/converter/DocumentFullTextPojoConverter.java rename to core/src/main/java/com/databasir/core/domain/document/converter/DocumentFullTextConverter.java index af5addd..4518b0c 100644 --- a/core/src/main/java/com/databasir/core/domain/document/converter/DocumentFullTextPojoConverter.java +++ b/core/src/main/java/com/databasir/core/domain/document/converter/DocumentFullTextConverter.java @@ -5,7 +5,7 @@ import org.mapstruct.Mapper; import org.mapstruct.Mapping; @Mapper(componentModel = "spring") -public interface DocumentFullTextPojoConverter { +public interface DocumentFullTextConverter { /** * groupName、groupDescription, projectName, projectDescription 等信息需要动态获取，所以不保存 @@ -28,11 +28,11 @@ public interface DocumentFullTextPojoConverter { @Mapping(target = "groupDescription", ignore = true) @Mapping(target = "projectName", ignore = true) @Mapping(target = "projectDescription", ignore = true) - DocumentFullTextPojo toPojo(GroupPojo group, - ProjectPojo project, - DatabaseDocumentPojo db, - TableDocumentPojo table, - TableColumnDocumentPojo column, + DocumentFullText toPojo(Group group, + Project project, + DatabaseDocument db, + TableDocument table, + TableColumnDocument column, String tableDescription, String columnDescription); } diff --git a/core/src/main/java/com/databasir/core/domain/document/converter/DocumentPojoConverter.java b/core/src/main/java/com/databasir/core/domain/document/converter/DocumentPojoConverter.java index d068fc4..b278b1a 100644 --- a/core/src/main/java/com/databasir/core/domain/document/converter/DocumentPojoConverter.java +++ b/core/src/main/java/com/databasir/core/domain/document/converter/DocumentPojoConverter.java @@ -16,14 +16,14 @@ public interface DocumentPojoConverter { @Mapping(target = "databaseName", source = "meta.databaseName") @Mapping(target = "schemaName", source = "meta.schemaName") @Mapping(target = "isArchive", constant = "false") - DatabaseDocumentPojo toDatabasePojo(Integer projectId, + DatabaseDocument toDatabasePojo(Integer projectId, DatabaseMeta meta, Long version); - TableDocumentPojo toTablePojo(Integer databaseDocumentId, + TableDocument toTablePojo(Integer databaseDocumentId, com.databasir.core.meta.data.TableMeta meta); - default List toColumnPojo(Integer databaseDocumentId, + default List toColumnPojo(Integer databaseDocumentId, Integer tableDocumentId, List metaList) { return metaList.stream() @@ -31,11 +31,11 @@ public interface DocumentPojoConverter { .collect(Collectors.toList()); } - TableColumnDocumentPojo toColumnPojo(Integer databaseDocumentId, + TableColumnDocument toColumnPojo(Integer databaseDocumentId, Integer tableDocumentId, ColumnMeta meta); - default List toIndexPojo(Integer databaseDocumentId, + default List toIndexPojo(Integer databaseDocumentId, Integer tableDocumentId, List metaList) { return metaList.stream() @@ -45,11 +45,11 @@ public interface DocumentPojoConverter { @Mapping(target = "isUnique", source = "meta.isUniqueKey") @Mapping(target = "columnNameArray", source = "meta.columnNames") - TableIndexDocumentPojo toIndexPojo(Integer databaseDocumentId, + TableIndexDocument toIndexPojo(Integer databaseDocumentId, Integer tableDocumentId, IndexMeta meta); - default List toTriggerPojo(Integer databaseDocumentId, + default List toTriggerPojo(Integer databaseDocumentId, Integer tableDocumentId, List metaList) { return metaList.stream() @@ -59,11 +59,11 @@ public interface DocumentPojoConverter { @Mapping(target = "triggerCreateAt", source = "meta.createAt") @Mapping(target = "createAt", ignore = true) - TableTriggerDocumentPojo toTriggerPojo(Integer databaseDocumentId, + TableTriggerDocument toTriggerPojo(Integer databaseDocumentId, Integer tableDocumentId, TriggerMeta meta); - default List toForeignKeyPojo(Integer docId, + default List toForeignKeyPojo(Integer docId, Integer tableMetaId, List foreignKeys) { return foreignKeys.stream() @@ -73,7 +73,7 @@ public interface DocumentPojoConverter { @Mapping(target = "id", ignore = true) @Mapping(target = "createAt", ignore = true) - TableForeignKeyDocumentPojo toForeignKeyPojo(Integer databaseDocumentId, + TableForeignKeyDocument toForeignKeyPojo(Integer databaseDocumentId, Integer tableDocumentId, ForeignKeyMeta foreignKey); diff --git a/core/src/main/java/com/databasir/core/domain/document/converter/DocumentResponseConverter.java b/core/src/main/java/com/databasir/core/domain/document/converter/DocumentResponseConverter.java index 1e81575..eeb0c28 100644 --- a/core/src/main/java/com/databasir/core/domain/document/converter/DocumentResponseConverter.java +++ b/core/src/main/java/com/databasir/core/domain/document/converter/DocumentResponseConverter.java @@ -19,31 +19,31 @@ public interface DocumentResponseConverter { @Mapping(target = "indexes", source = "indexes") @Mapping(target = "foreignKeys", source = "foreignKeys") @Mapping(target = "triggers", source = "triggers") - TableDocumentResponse of(TableDocumentPojo tableDocument, - List columns, - List indexes, - List foreignKeys, - List triggers); + TableDocumentResponse of(TableDocument tableDocument, + List columns, + List indexes, + List foreignKeys, + List triggers); @Mapping(target = "columns", source = "columns") @Mapping(target = "indexes", source = "indexes") @Mapping(target = "foreignKeys", source = "foreignKeys") @Mapping(target = "triggers", source = "triggers") @SuppressWarnings("checkstyle:all") - TableDocumentResponse of(TableDocumentPojo tableDocument, + TableDocumentResponse of(TableDocument tableDocument, Integer discussionCount, String description, List columns, - List indexes, - List foreignKeys, - List triggers); + List indexes, + List foreignKeys, + List triggers); - TableDocumentResponse.ColumnDocumentResponse of(TableColumnDocumentPojo pojo, + TableDocumentResponse.ColumnDocumentResponse of(TableColumnDocument pojo, Integer discussionCount, String description); default List of( - List columns, + List columns, String tableName, Map discussionCountMapByJoinName, Map descriptionMapByJoinName) { @@ -57,11 +57,11 @@ public interface DocumentResponseConverter { } @Mapping(target = "columnNames", source = "columnNameArray") - TableDocumentResponse.IndexDocumentResponse of(TableIndexDocumentPojo indexDocument); + TableDocumentResponse.IndexDocumentResponse of(TableIndexDocument indexDocument); @Mapping(target = "id", source = "databaseDocument.id") @Mapping(target = "createAt", source = "databaseDocument.createAt") @Mapping(target = "documentVersion", source = "databaseDocument.version") - DatabaseDocumentResponse of(DatabaseDocumentPojo databaseDocument, + DatabaseDocumentResponse of(DatabaseDocument databaseDocument, List tables); } diff --git a/core/src/main/java/com/databasir/core/domain/document/converter/DocumentSimpleResponseConverter.java b/core/src/main/java/com/databasir/core/domain/document/converter/DocumentSimpleResponseConverter.java index 6cc79e9..3254580 100644 --- a/core/src/main/java/com/databasir/core/domain/document/converter/DocumentSimpleResponseConverter.java +++ b/core/src/main/java/com/databasir/core/domain/document/converter/DocumentSimpleResponseConverter.java @@ -3,8 +3,8 @@ package com.databasir.core.domain.document.converter; import com.databasir.core.diff.data.DiffType; import com.databasir.core.domain.document.data.DatabaseDocumentSimpleResponse; import com.databasir.core.infrastructure.converter.JsonConverter; -import com.databasir.dao.tables.pojos.DatabaseDocumentPojo; -import com.databasir.dao.tables.pojos.TableDocumentPojo; +import com.databasir.dao.tables.pojos.DatabaseDocument; +import com.databasir.dao.tables.pojos.TableDocument; import org.mapstruct.Mapper; import org.mapstruct.Mapping; import org.mapstruct.ReportingPolicy; @@ -19,16 +19,16 @@ public interface DocumentSimpleResponseConverter { @Mapping(target = "id", source = "databaseDocument.id") @Mapping(target = "createAt", source = "databaseDocument.createAt") @Mapping(target = "documentVersion", source = "databaseDocument.version") - DatabaseDocumentSimpleResponse of(DatabaseDocumentPojo databaseDocument, + DatabaseDocumentSimpleResponse of(DatabaseDocument databaseDocument, List tables, DiffType diffType, String projectName); - DatabaseDocumentSimpleResponse.TableData of(TableDocumentPojo tables, + DatabaseDocumentSimpleResponse.TableData of(TableDocument tables, Integer discussionCount, String description); - default List of(List tables, + default List of(List tables, Map discussionCountMapByTableName, Map descriptionMapByTableName) { return tables.stream() diff --git a/core/src/main/java/com/databasir/core/domain/document/converter/DocumentTemplatePropertiesUpdateRequestConverter.java b/core/src/main/java/com/databasir/core/domain/document/converter/DocumentTemplatePropertiesUpdateRequestConverter.java index c8818e3..10d4ce3 100644 --- a/core/src/main/java/com/databasir/core/domain/document/converter/DocumentTemplatePropertiesUpdateRequestConverter.java +++ b/core/src/main/java/com/databasir/core/domain/document/converter/DocumentTemplatePropertiesUpdateRequestConverter.java @@ -2,7 +2,7 @@ package com.databasir.core.domain.document.converter; import com.databasir.core.domain.document.data.DocumentTemplatePropertiesUpdateRequest; import com.databasir.dao.enums.DocumentTemplatePropertyType; -import com.databasir.dao.tables.pojos.DocumentTemplatePropertyPojo; +import com.databasir.dao.tables.pojos.DocumentTemplateProperty; import org.mapstruct.Mapper; import org.mapstruct.Mapping; @@ -13,10 +13,10 @@ import java.util.stream.Collectors; public interface DocumentTemplatePropertiesUpdateRequestConverter { @Mapping(target = "defaultValue", constant = "") - DocumentTemplatePropertyPojo toPojo(DocumentTemplatePropertiesUpdateRequest.PropertyRequest property, + DocumentTemplateProperty toPojo(DocumentTemplatePropertiesUpdateRequest.PropertyRequest property, DocumentTemplatePropertyType type); - default List toPojo(DocumentTemplatePropertiesUpdateRequest request) { + default List toPojo(DocumentTemplatePropertiesUpdateRequest request) { return request.getProperties().stream() .map(prop -> toPojo(prop, request.getType())) .collect(Collectors.toList()); diff --git a/core/src/main/java/com/databasir/core/domain/document/converter/DocumentTemplatePropertyResponseConverter.java b/core/src/main/java/com/databasir/core/domain/document/converter/DocumentTemplatePropertyResponseConverter.java index 09b354b..30f0fc5 100644 --- a/core/src/main/java/com/databasir/core/domain/document/converter/DocumentTemplatePropertyResponseConverter.java +++ b/core/src/main/java/com/databasir/core/domain/document/converter/DocumentTemplatePropertyResponseConverter.java @@ -1,7 +1,7 @@ package com.databasir.core.domain.document.converter; import com.databasir.core.domain.document.data.DocumentTemplatePropertiesResponse; -import com.databasir.dao.tables.pojos.DocumentTemplatePropertyPojo; +import com.databasir.dao.tables.pojos.DocumentTemplateProperty; import org.mapstruct.Mapper; import java.util.List; @@ -10,6 +10,6 @@ import java.util.List; public interface DocumentTemplatePropertyResponseConverter { List of( - List pojoList); + List pojoList); } diff --git a/core/src/main/java/com/databasir/core/domain/document/converter/TableResponseConverter.java b/core/src/main/java/com/databasir/core/domain/document/converter/TableResponseConverter.java index 553e3dc..adfd6c6 100644 --- a/core/src/main/java/com/databasir/core/domain/document/converter/TableResponseConverter.java +++ b/core/src/main/java/com/databasir/core/domain/document/converter/TableResponseConverter.java @@ -1,8 +1,8 @@ package com.databasir.core.domain.document.converter; import com.databasir.core.domain.document.data.TableResponse; -import com.databasir.dao.tables.pojos.TableColumnDocumentPojo; -import com.databasir.dao.tables.pojos.TableDocumentPojo; +import com.databasir.dao.tables.pojos.TableColumnDocument; +import com.databasir.dao.tables.pojos.TableDocument; import org.mapstruct.Mapper; import java.util.List; @@ -12,14 +12,14 @@ import java.util.stream.Collectors; @Mapper(componentModel = "spring") public interface TableResponseConverter { - default List from(List tables, - Map> columnMapByTableId) { + default List from(List tables, + Map> columnMapByTableId) { return tables.stream() .map(table -> from(table, columnMapByTableId.get(table.getId()))) .collect(Collectors.toList()); } - TableResponse from(TableDocumentPojo table, List columns); + TableResponse from(TableDocument table, List columns); - TableResponse.ColumnResponse from(TableColumnDocumentPojo column); + TableResponse.ColumnResponse from(TableColumnDocument column); } diff --git a/core/src/main/java/com/databasir/core/domain/document/event/DocumentUpdated.java b/core/src/main/java/com/databasir/core/domain/document/event/DocumentUpdated.java index 637685f..7df0abf 100644 --- a/core/src/main/java/com/databasir/core/domain/document/event/DocumentUpdated.java +++ b/core/src/main/java/com/databasir/core/domain/document/event/DocumentUpdated.java @@ -20,6 +20,8 @@ public class DocumentUpdated { private Integer projectId; + private Integer databaseDocumentId; + public Optional getOldVersion() { return Optional.ofNullable(oldVersion); } diff --git a/core/src/main/java/com/databasir/core/domain/document/service/DocumentService.java b/core/src/main/java/com/databasir/core/domain/document/service/DocumentService.java index 9803bac..f316a8f 100644 --- a/core/src/main/java/com/databasir/core/domain/document/service/DocumentService.java +++ b/core/src/main/java/com/databasir/core/domain/document/service/DocumentService.java @@ -81,7 +81,7 @@ public class DocumentService { private final DocumentPojoConverter documentPojoConverter; - private final DocumentFullTextPojoConverter documentFullTextPojoConverter; + private final DocumentFullTextConverter documentFullTextConverter; private final DocumentResponseConverter documentResponseConverter; @@ -102,9 +102,9 @@ public class DocumentService { projectDao.selectOptionalById(projectId) .orElseThrow(DomainErrors.PROJECT_NOT_FOUND::exception); DatabaseMeta current = retrieveDatabaseMeta(projectId); - Optional originalOption = databaseDocumentDao.selectNotArchivedByProjectId(projectId); + Optional originalOption = databaseDocumentDao.selectNotArchivedByProjectId(projectId); if (originalOption.isPresent()) { - DatabaseDocumentPojo original = originalOption.get(); + DatabaseDocument original = originalOption.get(); DatabaseMeta originalMeta = retrieveOriginalDatabaseMeta(original); RootDiff diff = Diffs.diff(originalMeta, current); if (diff.getDiffType() == DiffType.NONE) { @@ -117,34 +117,34 @@ public class DocumentService { // archive old version databaseDocumentDao.updateIsArchiveById(previousDocumentId, true); Long version = original.getVersion(); - saveNewDocument(current, version + 1, original.getProjectId()); - eventPublisher.publish(new DocumentUpdated(diff, version + 1, version, projectId)); + Integer docId = saveNewDocument(current, version + 1, original.getProjectId()); + eventPublisher.publish(new DocumentUpdated(diff, version + 1, version, projectId, docId)); } else { - saveNewDocument(current, 1L, projectId); + Integer docId = saveNewDocument(current, 1L, projectId); RootDiff diff = null; try { diff = Diffs.diff(null, current); } catch (Exception e) { log.error("diff project " + projectId + " error, fallback diff type to NONE", e); } - eventPublisher.publish(new DocumentUpdated(diff, 1L, null, projectId)); + eventPublisher.publish(new DocumentUpdated(diff, 1L, null, projectId, docId)); } } - private DatabaseMeta retrieveOriginalDatabaseMeta(DatabaseDocumentPojo original) { + private DatabaseMeta retrieveOriginalDatabaseMeta(DatabaseDocument original) { Integer docId = original.getId(); - List tables = tableDocumentDao.selectByDatabaseDocumentId(docId); - List columns = tableColumnDocumentDao.selectByDatabaseDocumentId(docId); - List indexes = tableIndexDocumentDao.selectByDatabaseMetaId(docId); - List triggers = tableTriggerDocumentDao.selectByDatabaseDocumentId(docId); - List fks = tableForeignKeyDocumentDao.selectByDatabaseDocumentId(docId); + List tables = tableDocumentDao.selectByDatabaseDocumentId(docId); + List columns = tableColumnDocumentDao.selectByDatabaseDocumentId(docId); + List indexes = tableIndexDocumentDao.selectByDatabaseMetaId(docId); + List triggers = tableTriggerDocumentDao.selectByDatabaseDocumentId(docId); + List fks = tableForeignKeyDocumentDao.selectByDatabaseDocumentId(docId); return databaseMetaConverter.of(original, tables, columns, indexes, triggers, fks); } private DatabaseMeta retrieveDatabaseMeta(Integer projectId) { - ProjectSyncRulePojo rule = projectSyncRuleDao.selectByProjectId(projectId); - DataSourcePojo dataSource = dataSourceDao.selectByProjectId(projectId); - List properties = dataSourcePropertyDao.selectByDataSourceId(dataSource.getId()); + ProjectSyncRule rule = projectSyncRuleDao.selectByProjectId(projectId); + DataSource dataSource = dataSourceDao.selectByProjectId(projectId); + List properties = dataSourcePropertyDao.selectByDataSourceId(dataSource.getId()); Connection jdbcConnection = databaseConnectionService.create(dataSource, properties); DatabasirConfig databasirConfig = new DatabasirConfig(); databasirConfig.setIgnoreTableNameRegex(jsonConverter.fromJson(rule.getIgnoreTableNameRegexArray())); @@ -168,9 +168,9 @@ public class DocumentService { } } - private void saveNewDocument(DatabaseMeta meta, - Long version, - Integer projectId) { + private Integer saveNewDocument(DatabaseMeta meta, + Long version, + Integer projectId) { var dbDocPojo = documentPojoConverter.toDatabasePojo(projectId, meta, version); final Integer docId; @@ -182,7 +182,7 @@ public class DocumentService { throw new DatabasirException(DomainErrors.DATABASE_DOCUMENT_DUPLICATE_KEY); } meta.getTables().forEach(table -> { - TableDocumentPojo tableMeta = + TableDocument tableMeta = documentPojoConverter.toTablePojo(docId, table); Integer tableMetaId = tableDocumentDao.insertAndReturnId(tableMeta); tableMeta.setId(tableMetaId); @@ -209,42 +209,27 @@ public class DocumentService { // trigger var triggers = documentPojoConverter.toTriggerPojo(docId, tableMetaId, table.getTriggers()); tableTriggerDocumentDao.batchInsert(triggers); - - // save full text - var descriptionMapByJoinName = documentDescriptionDao.selectByProjectId(projectId) - .stream() - .collect(Collectors.toMap( - d -> { - if (d.getColumnName() == null) { - return d.getTableName(); - } - return String.join(".", - d.getTableName(), - StringUtils.defaultIfBlank(d.getColumnName(), "")); - }, - DocumentDescriptionPojo::getContent, - (a, b) -> a)); - saveDocumentFullText(projectId, dbDocPojo, tableMeta, descriptionMapByJoinName); }); log.info("save new version document success: projectId = {}, name = {}, version = {}", projectId, meta.getDatabaseName(), version); + return docId; } private void saveDocumentFullText(Integer projectId, - DatabaseDocumentPojo database, - TableDocumentPojo table, + DatabaseDocument database, + TableDocument table, Map descriptionMapByJoinName) { - ProjectPojo project = projectDao.selectById(projectId); - GroupPojo group = groupDao.selectById(project.getGroupId()); - List columns = tableColumnDocumentDao.selectByTableDocumentId(table.getId()); + Project project = projectDao.selectById(projectId); + Group group = groupDao.selectById(project.getGroupId()); + List columns = tableColumnDocumentDao.selectByTableDocumentId(table.getId()); // clear outdated data before save documentFullTextDao.deleteTableFullText(table.getId()); - List fullTextPojoList = columns.stream() + List fullTextPojoList = columns.stream() .map(column -> { String tableName = table.getName(); String tableDescription = descriptionMapByJoinName.get(tableName); String columnDescription = descriptionMapByJoinName.get(tableName + "." + column.getName()); - return documentFullTextPojoConverter.toPojo(group, project, database, table, column, + return documentFullTextConverter.toPojo(group, project, database, table, column, tableDescription, columnDescription); }) .collect(Collectors.toList()); @@ -255,10 +240,10 @@ public class DocumentService { Long version, Long originalVersion) { String projectName = projectDao.selectOptionalById(projectId) - .map(ProjectPojo::getName) + .map(Project::getName) .orElseThrow(DomainErrors.PROJECT_NOT_FOUND::exception); - Optional documentOption; + Optional documentOption; if (version == null) { documentOption = databaseDocumentDao.selectNotArchivedByProjectId(projectId); } else { @@ -331,7 +316,7 @@ public class DocumentService { public List tableDiffs(Integer projectId, Long originalVersion, Long currentVersion) { var original = databaseDocumentDao.selectOptionalByProjectIdAndVersion(projectId, originalVersion) .orElseThrow(DomainErrors.DOCUMENT_VERSION_IS_INVALID::exception); - DatabaseDocumentPojo current; + DatabaseDocument current; if (currentVersion == null) { current = databaseDocumentDao.selectNotArchivedByProjectId(projectId) .orElseThrow(DomainErrors.DOCUMENT_VERSION_IS_INVALID::exception); @@ -346,7 +331,7 @@ public class DocumentService { public Optional getOneByProjectId(Integer projectId, Long version) { - Optional documentOption; + Optional documentOption; if (version == null) { documentOption = databaseDocumentDao.selectNotArchivedByProjectId(projectId); } else { @@ -359,14 +344,14 @@ public class DocumentService { var indexes = tableIndexDocumentDao.selectByDatabaseMetaId(id); var triggers = tableTriggerDocumentDao.selectByDatabaseDocumentId(id); var foreignKeys = tableForeignKeyDocumentDao.selectByDatabaseDocumentId(id); - Map> columnsGroupByTableMetaId = columns.stream() - .collect(Collectors.groupingBy(TableColumnDocumentPojo::getTableDocumentId)); - Map> indexesGroupByTableMetaId = indexes.stream() - .collect(Collectors.groupingBy(TableIndexDocumentPojo::getTableDocumentId)); - Map> triggersGroupByTableMetaId = triggers.stream() - .collect(Collectors.groupingBy(TableTriggerDocumentPojo::getTableDocumentId)); - Map> foreignKeysGroupByTableMetaId = foreignKeys.stream() - .collect(Collectors.groupingBy(TableForeignKeyDocumentPojo::getTableDocumentId)); + Map> columnsGroupByTableMetaId = columns.stream() + .collect(Collectors.groupingBy(TableColumnDocument::getTableDocumentId)); + Map> indexesGroupByTableMetaId = indexes.stream() + .collect(Collectors.groupingBy(TableIndexDocument::getTableDocumentId)); + Map> triggersGroupByTableMetaId = triggers.stream() + .collect(Collectors.groupingBy(TableTriggerDocument::getTableDocumentId)); + Map> foreignKeysGroupByTableMetaId = foreignKeys.stream() + .collect(Collectors.groupingBy(TableForeignKeyDocument::getTableDocumentId)); var tableDocumentResponseList = tables.stream() .map(table -> { Integer tableId = table.getId(); @@ -412,26 +397,26 @@ public class DocumentService { // column var columns = tableColumnDocumentDao.selectByDatabaseDocumentIdAndTableIdIn(databaseDocumentId, tableIds); - Map> columnsGroupByTableMetaId = columns.stream() - .collect(Collectors.groupingBy(TableColumnDocumentPojo::getTableDocumentId)); + Map> columnsGroupByTableMetaId = columns.stream() + .collect(Collectors.groupingBy(TableColumnDocument::getTableDocumentId)); // index var indexes = tableIndexDocumentDao.selectByDatabaseDocumentIdAndIdIn(databaseDocumentId, tableIds); - Map> indexesGroupByTableMetaId = indexes.stream() - .collect(Collectors.groupingBy(TableIndexDocumentPojo::getTableDocumentId)); + Map> indexesGroupByTableMetaId = indexes.stream() + .collect(Collectors.groupingBy(TableIndexDocument::getTableDocumentId)); // foreign keys var foreignKeys = tableForeignKeyDocumentDao.selectByDatabaseDocumentIdAndTableIdIn(databaseDocumentId, tableIds); - Map> foreignKeysGroupByTableMetaId = foreignKeys.stream() - .collect(Collectors.groupingBy(TableForeignKeyDocumentPojo::getTableDocumentId)); + Map> foreignKeysGroupByTableMetaId = foreignKeys.stream() + .collect(Collectors.groupingBy(TableForeignKeyDocument::getTableDocumentId)); // trigger var triggers = tableTriggerDocumentDao.selectByDatabaseDocumentIdAndIdIn(databaseDocumentId, tableIds); - Map> triggersGroupByTableMetaId = triggers.stream() - .collect(Collectors.groupingBy(TableTriggerDocumentPojo::getTableDocumentId)); + Map> triggersGroupByTableMetaId = triggers.stream() + .collect(Collectors.groupingBy(TableTriggerDocument::getTableDocumentId)); // discussion var discussions = documentDiscussionDao.selectAllDiscussionCount(projectId); @@ -450,7 +435,7 @@ public class DocumentService { d -> String.join(".", d.getTableName(), StringUtils.defaultIfBlank(d.getColumnName(), "")), - DocumentDescriptionPojo::getContent, + DocumentDescription::getContent, (a, b) -> a)); return tables.stream() @@ -491,7 +476,7 @@ public class DocumentService { List currentTableIds = current.stream().map(t -> t.getId()).collect(Collectors.toList()); var missedIds = CollectionUtils.disjunction(currentTableIds, request.getTableIds()); if (request.getOriginalVersion() != null) { - DatabaseDocumentPojo doc = + DatabaseDocument doc = databaseDocumentDao.selectOptionalByProjectIdAndVersion(projectId, request.getOriginalVersion()) .orElseThrow(DomainErrors.DOCUMENT_VERSION_IS_INVALID::exception); List tableNames = current.stream().map(t -> t.getName()).distinct().collect(Collectors.toList()); @@ -544,7 +529,7 @@ public class DocumentService { doc = getOneByProjectId(projectId, version) .orElseThrow(DomainErrors.DOCUMENT_VERSION_IS_INVALID::exception); } else { - DatabaseDocumentPojo databaseDoc; + DatabaseDocument databaseDoc; if (version == null) { databaseDoc = databaseDocumentDao.selectNotArchivedByProjectId(projectId) .orElseThrow(DomainErrors.DOCUMENT_VERSION_IS_INVALID::exception); @@ -567,7 +552,7 @@ public class DocumentService { } public List getTableAndColumns(Integer projectId, Long version) { - Optional documentOption; + Optional documentOption; if (version == null) { documentOption = databaseDocumentDao.selectNotArchivedByProjectId(projectId); } else { @@ -576,11 +561,11 @@ public class DocumentService { if (documentOption.isEmpty()) { return emptyList(); } else { - DatabaseDocumentPojo databaseDoc = documentOption.get(); + DatabaseDocument databaseDoc = documentOption.get(); var tables = tableDocumentDao.selectByDatabaseDocumentId(databaseDoc.getId()); var columns = tableColumnDocumentDao.selectByDatabaseDocumentId(databaseDoc.getId()); var columnMapByTableId = columns.stream() - .collect(Collectors.groupingBy(TableColumnDocumentPojo::getTableDocumentId)); + .collect(Collectors.groupingBy(TableColumnDocument::getTableDocumentId)); return tableResponseConverter.from(tables, columnMapByTableId); } } diff --git a/core/src/main/java/com/databasir/core/domain/document/service/DocumentTemplateService.java b/core/src/main/java/com/databasir/core/domain/document/service/DocumentTemplateService.java index 698fd5e..a7ec0aa 100644 --- a/core/src/main/java/com/databasir/core/domain/document/service/DocumentTemplateService.java +++ b/core/src/main/java/com/databasir/core/domain/document/service/DocumentTemplateService.java @@ -5,7 +5,7 @@ import com.databasir.core.domain.document.converter.DocumentTemplatePropertyResp import com.databasir.core.domain.document.data.DocumentTemplatePropertiesResponse; import com.databasir.core.domain.document.data.DocumentTemplatePropertiesUpdateRequest; import com.databasir.dao.impl.DocumentTemplatePropertyDao; -import com.databasir.dao.tables.pojos.DocumentTemplatePropertyPojo; +import com.databasir.dao.tables.pojos.DocumentTemplateProperty; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; @@ -27,7 +27,7 @@ public class DocumentTemplateService { private final DocumentTemplatePropertiesUpdateRequestConverter documentTemplatePropertiesUpdateRequestConverter; public DocumentTemplatePropertiesResponse getAllProperties() { - List properties = documentTemplatePropertyDao.selectAll(); + List properties = documentTemplatePropertyDao.selectAll(); var propertiesGroupByType = documentTemplatePropertyResponseConverter.of(properties) .stream() .collect(Collectors.groupingBy(d -> d.getType())); @@ -41,7 +41,7 @@ public class DocumentTemplateService { } public void updateByType(DocumentTemplatePropertiesUpdateRequest request) { - List pojoList = documentTemplatePropertiesUpdateRequestConverter.toPojo(request); + List pojoList = documentTemplatePropertiesUpdateRequestConverter.toPojo(request); documentTemplatePropertyDao.batchInsertOnDuplicateKeyUpdateValue(pojoList); } } diff --git a/core/src/main/java/com/databasir/core/domain/group/converter/GroupPojoConverter.java b/core/src/main/java/com/databasir/core/domain/group/converter/GroupConverter.java similarity index 78% rename from core/src/main/java/com/databasir/core/domain/group/converter/GroupPojoConverter.java rename to core/src/main/java/com/databasir/core/domain/group/converter/GroupConverter.java index c9c53b2..5f3fa30 100644 --- a/core/src/main/java/com/databasir/core/domain/group/converter/GroupPojoConverter.java +++ b/core/src/main/java/com/databasir/core/domain/group/converter/GroupConverter.java @@ -2,23 +2,23 @@ package com.databasir.core.domain.group.converter; import com.databasir.core.domain.group.data.GroupCreateRequest; import com.databasir.core.domain.group.data.GroupUpdateRequest; -import com.databasir.dao.tables.pojos.GroupPojo; +import com.databasir.dao.tables.pojos.Group; import org.mapstruct.Mapper; import org.mapstruct.Mapping; @Mapper(componentModel = "spring") -public interface GroupPojoConverter { +public interface GroupConverter { @Mapping(target = "id", ignore = true) @Mapping(target = "deleted", ignore = true) @Mapping(target = "createAt", ignore = true) @Mapping(target = "updateAt", ignore = true) - GroupPojo of(GroupCreateRequest groupCreateRequest); + Group of(GroupCreateRequest groupCreateRequest); @Mapping(target = "deleted", ignore = true) @Mapping(target = "createAt", ignore = true) @Mapping(target = "updateAt", ignore = true) - GroupPojo of(GroupUpdateRequest groupUpdateRequest); + Group of(GroupUpdateRequest groupUpdateRequest); default String nullToEmpty(String description) { return description == null ? "" : description; diff --git a/core/src/main/java/com/databasir/core/domain/group/converter/GroupResponseConverter.java b/core/src/main/java/com/databasir/core/domain/group/converter/GroupResponseConverter.java index da2700f..b4a9dbf 100644 --- a/core/src/main/java/com/databasir/core/domain/group/converter/GroupResponseConverter.java +++ b/core/src/main/java/com/databasir/core/domain/group/converter/GroupResponseConverter.java @@ -3,8 +3,8 @@ package com.databasir.core.domain.group.converter; import com.databasir.core.domain.group.data.GroupMemberPageResponse; import com.databasir.core.domain.group.data.GroupPageResponse; import com.databasir.core.domain.group.data.GroupResponse; -import com.databasir.dao.tables.pojos.GroupPojo; -import com.databasir.dao.tables.pojos.UserPojo; +import com.databasir.dao.tables.pojos.Group; +import com.databasir.dao.tables.pojos.User; import com.databasir.dao.value.GroupMemberDetailPojo; import org.mapstruct.Mapper; @@ -16,7 +16,7 @@ import java.util.stream.Collectors; @Mapper(componentModel = "spring") public interface GroupResponseConverter { - default List toResponse(List pojos, + default List toResponse(List pojos, Map> groupOwnerGroupByGroupId, Map projectCountMapByGroupId) { return pojos.stream() @@ -29,11 +29,11 @@ public interface GroupResponseConverter { .collect(Collectors.toList()); } - GroupPageResponse toResponse(GroupPojo groupPojo, + GroupPageResponse toResponse(Group group, List groupOwnerNames, Integer projectCount); - GroupResponse toResponse(GroupPojo groupPojo, List groupOwners); + GroupResponse toResponse(Group group, List groupOwners); GroupMemberPageResponse toResponse(GroupMemberDetailPojo data); } diff --git a/core/src/main/java/com/databasir/core/domain/group/service/GroupService.java b/core/src/main/java/com/databasir/core/domain/group/service/GroupService.java index 2dcf5ac..0e6bbb7 100644 --- a/core/src/main/java/com/databasir/core/domain/group/service/GroupService.java +++ b/core/src/main/java/com/databasir/core/domain/group/service/GroupService.java @@ -1,7 +1,7 @@ package com.databasir.core.domain.group.service; import com.databasir.core.domain.DomainErrors; -import com.databasir.core.domain.group.converter.GroupPojoConverter; +import com.databasir.core.domain.group.converter.GroupConverter; import com.databasir.core.domain.group.converter.GroupResponseConverter; import com.databasir.core.domain.group.data.*; import com.databasir.core.domain.group.event.GroupCreated; @@ -9,9 +9,9 @@ import com.databasir.core.domain.group.event.GroupDeleted; import com.databasir.core.domain.group.event.GroupUpdated; import com.databasir.core.infrastructure.event.EventPublisher; import com.databasir.dao.impl.*; -import com.databasir.dao.tables.pojos.GroupPojo; -import com.databasir.dao.tables.pojos.UserPojo; -import com.databasir.dao.tables.pojos.UserRolePojo; +import com.databasir.dao.tables.pojos.Group; +import com.databasir.dao.tables.pojos.User; +import com.databasir.dao.tables.pojos.UserRole; import com.databasir.dao.value.GroupMemberSimplePojo; import com.databasir.dao.value.GroupProjectCountPojo; import lombok.RequiredArgsConstructor; @@ -42,18 +42,18 @@ public class GroupService { private final ProjectSyncRuleDao projectSyncRuleDao; - private final GroupPojoConverter groupPojoConverter; + private final GroupConverter groupConverter; private final GroupResponseConverter groupResponseConverter; @Transactional public Integer create(GroupCreateRequest request) { - GroupPojo groupPojo = groupPojoConverter.of(request); - Integer groupId = groupDao.insertAndReturnId(groupPojo); - List roles = request.getGroupOwnerUserIds() + Group group = groupConverter.of(request); + Integer groupId = groupDao.insertAndReturnId(group); + List roles = request.getGroupOwnerUserIds() .stream() .map(userId -> { - UserRolePojo role = new UserRolePojo(); + UserRole role = new UserRole(); role.setUserId(userId); role.setRole(GROUP_OWNER); role.setGroupId(groupId); @@ -67,16 +67,16 @@ public class GroupService { @Transactional public void update(GroupUpdateRequest request) { - GroupPojo groupPojo = groupPojoConverter.of(request); - groupDao.updateById(groupPojo); - userRoleDao.deleteByRoleAndGroupId(GROUP_OWNER, groupPojo.getId()); - List roles = request.getGroupOwnerUserIds() + Group group = groupConverter.of(request); + groupDao.updateById(group); + userRoleDao.deleteByRoleAndGroupId(GROUP_OWNER, group.getId()); + List roles = request.getGroupOwnerUserIds() .stream() .map(userId -> { - UserRolePojo role = new UserRolePojo(); + UserRole role = new UserRole(); role.setUserId(userId); role.setRole(GROUP_OWNER); - role.setGroupId(groupPojo.getId()); + role.setGroupId(group.getId()); return role; }) .collect(Collectors.toList()); @@ -94,10 +94,10 @@ public class GroupService { } public Page list(Pageable pageable, GroupPageCondition condition) { - Page page = groupDao.selectByPage(pageable, condition.toCondition()); + Page page = groupDao.selectByPage(pageable, condition.toCondition()); List groupIdList = page.getContent() .stream() - .map(GroupPojo::getId) + .map(Group::getId) .collect(Collectors.toList()); var ownersGroupByGroupId = userRoleDao.selectOwnerNamesByGroupIdIn(groupIdList) .stream() @@ -105,15 +105,15 @@ public class GroupService { var projectCountMapByGroupId = projectDao.selectCountByGroupIds(groupIdList) .stream() .collect(Collectors.toMap(GroupProjectCountPojo::getGroupId, v -> v)); - return page.map(groupPojo -> { - Integer groupId = groupPojo.getId(); + return page.map(group -> { + Integer groupId = group.getId(); List owners = ownersGroupByGroupId.getOrDefault(groupId, new ArrayList<>()) .stream() .map(GroupMemberSimplePojo::getNickname) .collect(Collectors.toList()); GroupProjectCountPojo countPojo = projectCountMapByGroupId.get(groupId); Integer projectCount = countPojo == null ? 0 : countPojo.getCount(); - return groupResponseConverter.toResponse(groupPojo, owners, projectCount); + return groupResponseConverter.toResponse(group, owners, projectCount); }); } @@ -125,9 +125,9 @@ public class GroupService { } public GroupResponse get(Integer groupId) { - GroupPojo groupPojo = groupDao.selectById(groupId); - List users = userDao.selectLimitUsersByRoleAndGroup(groupId, GROUP_OWNER, 50); - return groupResponseConverter.toResponse(groupPojo, users); + Group group = groupDao.selectById(groupId); + List users = userDao.selectLimitUsersByRoleAndGroup(groupId, GROUP_OWNER, 50); + return groupResponseConverter.toResponse(group, users); } public void removeMember(Integer groupId, Integer userId) { @@ -138,7 +138,7 @@ public class GroupService { if (userRoleDao.hasRole(request.getUserId(), groupId)) { throw DomainErrors.USER_ROLE_DUPLICATE.exception(); } - UserRolePojo pojo = new UserRolePojo(); + UserRole pojo = new UserRole(); pojo.setGroupId(groupId); pojo.setUserId(request.getUserId()); pojo.setRole(request.getRole()); @@ -149,7 +149,7 @@ public class GroupService { if (!userRoleDao.hasRole(userId, groupId, role)) { // TODO 最多 20 个组长 userRoleDao.deleteByUserIdAndGroupId(userId, groupId); - UserRolePojo pojo = new UserRolePojo(); + UserRole pojo = new UserRole(); pojo.setUserId(userId); pojo.setGroupId(groupId); pojo.setRole(role); diff --git a/core/src/main/java/com/databasir/core/domain/log/converter/OperationLogConverter.java b/core/src/main/java/com/databasir/core/domain/log/converter/OperationLogConverter.java new file mode 100644 index 0000000..855f4ab --- /dev/null +++ b/core/src/main/java/com/databasir/core/domain/log/converter/OperationLogConverter.java @@ -0,0 +1,42 @@ +package com.databasir.core.domain.log.converter; + +import com.databasir.core.domain.log.data.OperationLogPageResponse; +import com.databasir.core.infrastructure.converter.JsonConverter; +import com.databasir.dao.tables.pojos.Group; +import com.databasir.dao.tables.pojos.OperationLog; +import com.databasir.dao.tables.pojos.Project; +import com.databasir.dao.tables.pojos.User; +import org.mapstruct.Mapper; +import org.mapstruct.Mapping; + +import java.util.Map; + +@Mapper(componentModel = "spring", uses = JsonConverter.class) +public interface OperationLogConverter { + + @Mapping(target = "id", source = "pojo.id") + @Mapping(target = "createAt", source = "pojo.createAt") + OperationLogPageResponse to(OperationLog pojo, + Group involvedGroup, + User involvedUser, + Project involvedProject); + + default OperationLogPageResponse to(OperationLog operationLog, + Map groupMapById, + Map userMapById, + Map projectMapById) { + Group group = null; + if (operationLog.getInvolvedGroupId() != null) { + group = groupMapById.get(operationLog.getInvolvedGroupId()); + } + User user = null; + if (operationLog.getInvolvedUserId() != null) { + user = userMapById.get(operationLog.getInvolvedUserId()); + } + Project project = null; + if (operationLog.getInvolvedProjectId() != null) { + project = projectMapById.get(operationLog.getInvolvedProjectId()); + } + return to(operationLog, group, user, project); + } +} diff --git a/core/src/main/java/com/databasir/core/domain/log/converter/OperationLogPojoConverter.java b/core/src/main/java/com/databasir/core/domain/log/converter/OperationLogPojoConverter.java deleted file mode 100644 index 58fc027..0000000 --- a/core/src/main/java/com/databasir/core/domain/log/converter/OperationLogPojoConverter.java +++ /dev/null @@ -1,42 +0,0 @@ -package com.databasir.core.domain.log.converter; - -import com.databasir.core.domain.log.data.OperationLogPageResponse; -import com.databasir.core.infrastructure.converter.JsonConverter; -import com.databasir.dao.tables.pojos.GroupPojo; -import com.databasir.dao.tables.pojos.OperationLogPojo; -import com.databasir.dao.tables.pojos.ProjectPojo; -import com.databasir.dao.tables.pojos.UserPojo; -import org.mapstruct.Mapper; -import org.mapstruct.Mapping; - -import java.util.Map; - -@Mapper(componentModel = "spring", uses = JsonConverter.class) -public interface OperationLogPojoConverter { - - @Mapping(target = "id", source = "pojo.id") - @Mapping(target = "createAt", source = "pojo.createAt") - OperationLogPageResponse to(OperationLogPojo pojo, - GroupPojo involvedGroup, - UserPojo involvedUser, - ProjectPojo involvedProject); - - default OperationLogPageResponse to(OperationLogPojo operationLogPojo, - Map groupMapById, - Map userMapById, - Map projectMapById) { - GroupPojo group = null; - if (operationLogPojo.getInvolvedGroupId() != null) { - group = groupMapById.get(operationLogPojo.getInvolvedGroupId()); - } - UserPojo user = null; - if (operationLogPojo.getInvolvedUserId() != null) { - user = userMapById.get(operationLogPojo.getInvolvedUserId()); - } - ProjectPojo project = null; - if (operationLogPojo.getInvolvedProjectId() != null) { - project = projectMapById.get(operationLogPojo.getInvolvedProjectId()); - } - return to(operationLogPojo, group, user, project); - } -} diff --git a/core/src/main/java/com/databasir/core/domain/log/converter/OperationLogRequestConverter.java b/core/src/main/java/com/databasir/core/domain/log/converter/OperationLogRequestConverter.java index 35fbf6a..2bb4ed4 100644 --- a/core/src/main/java/com/databasir/core/domain/log/converter/OperationLogRequestConverter.java +++ b/core/src/main/java/com/databasir/core/domain/log/converter/OperationLogRequestConverter.java @@ -2,12 +2,12 @@ package com.databasir.core.domain.log.converter; import com.databasir.core.domain.log.data.OperationLogRequest; import com.databasir.core.infrastructure.converter.JsonConverter; -import com.databasir.dao.tables.pojos.OperationLogPojo; +import com.databasir.dao.tables.pojos.OperationLog; import org.mapstruct.Mapper; @Mapper(componentModel = "spring", uses = JsonConverter.class) public interface OperationLogRequestConverter { - OperationLogPojo toPojo(OperationLogRequest request); + OperationLog toPojo(OperationLogRequest request); } diff --git a/core/src/main/java/com/databasir/core/domain/log/service/OperationLogService.java b/core/src/main/java/com/databasir/core/domain/log/service/OperationLogService.java index 47a5d86..14eb5de 100644 --- a/core/src/main/java/com/databasir/core/domain/log/service/OperationLogService.java +++ b/core/src/main/java/com/databasir/core/domain/log/service/OperationLogService.java @@ -2,7 +2,7 @@ package com.databasir.core.domain.log.service; import com.databasir.common.JsonData; import com.databasir.core.domain.log.annotation.AuditLog; -import com.databasir.core.domain.log.converter.OperationLogPojoConverter; +import com.databasir.core.domain.log.converter.OperationLogConverter; import com.databasir.core.domain.log.converter.OperationLogRequestConverter; import com.databasir.core.domain.log.data.OperationLogPageCondition; import com.databasir.core.domain.log.data.OperationLogPageResponse; @@ -11,10 +11,10 @@ import com.databasir.dao.impl.GroupDao; import com.databasir.dao.impl.OperationLogDao; import com.databasir.dao.impl.ProjectDao; import com.databasir.dao.impl.UserDao; -import com.databasir.dao.tables.pojos.GroupPojo; -import com.databasir.dao.tables.pojos.OperationLogPojo; -import com.databasir.dao.tables.pojos.ProjectPojo; -import com.databasir.dao.tables.pojos.UserPojo; +import com.databasir.dao.tables.pojos.Group; +import com.databasir.dao.tables.pojos.OperationLog; +import com.databasir.dao.tables.pojos.Project; +import com.databasir.dao.tables.pojos.User; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.data.domain.Page; @@ -42,10 +42,10 @@ public class OperationLogService { private final OperationLogRequestConverter operationLogRequestConverter; - private final OperationLogPojoConverter operationLogPojoConverter; + private final OperationLogConverter operationLogConverter; public Long save(OperationLogRequest request) { - OperationLogPojo pojo = operationLogRequestConverter.toPojo(request); + OperationLog pojo = operationLogRequestConverter.toPojo(request); return operationLogDao.insertAndReturnId(pojo); } @@ -62,14 +62,14 @@ public class OperationLogService { .operatorUserId(-1) .operationResponse(result) .build(); - OperationLogPojo pojo = operationLogRequestConverter.toPojo(log); + OperationLog pojo = operationLogRequestConverter.toPojo(log); operationLogDao.insertAndReturnId(pojo); } catch (Exception e) { log.error("保存登录日志失败", e); } } - public void saveLoginLog(UserPojo user, Boolean success, String msg) { + public void saveLoginLog(User user, Boolean success, String msg) { try { JsonData result; if (success) { @@ -88,7 +88,7 @@ public class OperationLogService { .operatorUserId(user.getId()) .operationResponse(result) .build(); - OperationLogPojo pojo = operationLogRequestConverter.toPojo(log); + OperationLog pojo = operationLogRequestConverter.toPojo(log); operationLogDao.insertAndReturnId(pojo); } catch (Exception e) { log.error("保存登录日志失败", e); @@ -97,27 +97,27 @@ public class OperationLogService { public Page list(Pageable page, OperationLogPageCondition condition) { - Page pojoData = operationLogDao.selectByPage(page, condition.toCondition()); + Page pojoData = operationLogDao.selectByPage(page, condition.toCondition()); List groupIds = pojoData.filter(p -> p.getInvolvedGroupId() != null) - .map(OperationLogPojo::getInvolvedGroupId) + .map(OperationLog::getInvolvedGroupId) .toList(); - Map groupMapById = groupDao.selectAllInIds(groupIds) + Map groupMapById = groupDao.selectAllInIds(groupIds) .stream() - .collect(Collectors.toMap(GroupPojo::getId, Function.identity())); + .collect(Collectors.toMap(Group::getId, Function.identity())); List userIds = pojoData.filter(p -> p.getInvolvedUserId() != null) - .map(OperationLogPojo::getInvolvedUserId) + .map(OperationLog::getInvolvedUserId) .toList(); - Map userMapById = userDao.selectInIds(userIds) + Map userMapById = userDao.selectInIds(userIds) .stream() - .collect(Collectors.toMap(UserPojo::getId, Function.identity())); + .collect(Collectors.toMap(User::getId, Function.identity())); List projectIds = pojoData.filter(p -> p.getInvolvedProjectId() != null) - .map(OperationLogPojo::getInvolvedProjectId) + .map(OperationLog::getInvolvedProjectId) .toList(); - Map projectMapById = projectDao.selectInIds(projectIds) + Map projectMapById = projectDao.selectInIds(projectIds) .stream() - .collect(Collectors.toMap(ProjectPojo::getId, Function.identity())); - return pojoData.map(pojo -> operationLogPojoConverter.to(pojo, groupMapById, userMapById, projectMapById)); + .collect(Collectors.toMap(Project::getId, Function.identity())); + return pojoData.map(pojo -> operationLogConverter.to(pojo, groupMapById, userMapById, projectMapById)); } } diff --git a/core/src/main/java/com/databasir/core/domain/login/service/LoginService.java b/core/src/main/java/com/databasir/core/domain/login/service/LoginService.java index 57dc4f8..efb6e61 100644 --- a/core/src/main/java/com/databasir/core/domain/login/service/LoginService.java +++ b/core/src/main/java/com/databasir/core/domain/login/service/LoginService.java @@ -9,9 +9,9 @@ import com.databasir.core.infrastructure.jwt.JwtTokens; import com.databasir.dao.impl.LoginDao; import com.databasir.dao.impl.UserDao; import com.databasir.dao.impl.UserRoleDao; -import com.databasir.dao.tables.pojos.LoginPojo; -import com.databasir.dao.tables.pojos.UserPojo; -import com.databasir.dao.tables.pojos.UserRolePojo; +import com.databasir.dao.tables.pojos.Login; +import com.databasir.dao.tables.pojos.User; +import com.databasir.dao.tables.pojos.UserRole; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; @@ -39,7 +39,7 @@ public class LoginService { private final JwtTokens jwtTokens; public AccessTokenRefreshResponse refreshAccessTokens(AccessTokenRefreshRequest request) { - LoginPojo login = loginDao.selectByRefreshToken(request.getRefreshToken()) + Login login = loginDao.selectByRefreshToken(request.getRefreshToken()) .orElseThrow(DomainErrors.INVALID_REFRESH_TOKEN_OPERATION::exception); // refresh-token 已过期 if (login.getRefreshTokenExpireAt().isBefore(LocalDateTime.now())) { @@ -54,7 +54,7 @@ public class LoginService { } // refresh-token 对应的用户已被删除 - UserPojo user = userDao.selectOptionalById(login.getUserId()) + User user = userDao.selectOptionalById(login.getUserId()) .orElseThrow(() -> { log.warn("user not exists but refresh token exists for " + login.getRefreshToken()); return DomainErrors.INVALID_REFRESH_TOKEN_OPERATION.exception("invalid user"); @@ -72,19 +72,19 @@ public class LoginService { } public LoginKeyResponse generate(Integer userId) { - UserPojo user = userDao.selectById(userId); + User user = userDao.selectById(userId); String accessToken = jwtTokens.accessToken(user.getEmail()); LocalDateTime accessTokenExpireAt = jwtTokens.expireAt(accessToken); String refreshToken = UUID.randomUUID().toString().replace("-", ""); LocalDateTime refreshTokenExpireAt = LocalDateTime.now().plusDays(15); - LoginPojo loginPojo = new LoginPojo(); - loginPojo.setAccessToken(accessToken); - loginPojo.setAccessTokenExpireAt(accessTokenExpireAt); - loginPojo.setRefreshToken(refreshToken); - loginPojo.setRefreshTokenExpireAt(refreshTokenExpireAt); - loginPojo.setUserId(userId); - loginDao.insertOnDuplicateKeyUpdate(loginPojo); + Login login = new Login(); + login.setAccessToken(accessToken); + login.setAccessTokenExpireAt(accessTokenExpireAt); + login.setRefreshToken(refreshToken); + login.setRefreshTokenExpireAt(refreshTokenExpireAt); + login.setUserId(userId); + loginDao.insertOnDuplicateKeyUpdate(login); return LoginKeyResponse.builder() .userId(userId) @@ -98,7 +98,7 @@ public class LoginService { public Optional getUserLoginData(Integer userId) { return loginDao.selectByUserId(userId) .map(login -> { - UserPojo user = userDao.selectById(login.getUserId()); + User user = userDao.selectById(login.getUserId()); UserLoginResponse data = new UserLoginResponse(); data.setId(user.getId()); data.setNickname(user.getNickname()); @@ -110,7 +110,7 @@ public class LoginService { .atZone(ZoneId.systemDefault()).toInstant().toEpochMilli(); data.setAccessTokenExpireAt(expireAt); data.setRefreshToken(login.getRefreshToken()); - List rolePojoList = + List rolePojoList = userRoleDao.selectByUserIds(Collections.singletonList(user.getId())); List roles = rolePojoList .stream() diff --git a/core/src/main/java/com/databasir/core/domain/mock/MockDataService.java b/core/src/main/java/com/databasir/core/domain/mock/MockDataService.java index 37d0a08..278789a 100644 --- a/core/src/main/java/com/databasir/core/domain/mock/MockDataService.java +++ b/core/src/main/java/com/databasir/core/domain/mock/MockDataService.java @@ -1,6 +1,6 @@ package com.databasir.core.domain.mock; -import com.databasir.core.domain.mock.converter.MockDataRulePojoConverter; +import com.databasir.core.domain.mock.converter.MockDataRuleConverter; import com.databasir.core.domain.mock.converter.MockDataRuleResponseConverter; import com.databasir.core.domain.mock.data.ColumnMockRuleSaveRequest; import com.databasir.core.domain.mock.data.MockDataGenerateCondition; @@ -12,10 +12,10 @@ import com.databasir.core.domain.mock.validator.MockDataValidator; import com.databasir.dao.enums.MockDataType; import com.databasir.dao.impl.MockDataRuleDao; import com.databasir.dao.impl.TableColumnDocumentDao; -import com.databasir.dao.tables.pojos.DatabaseDocumentPojo; -import com.databasir.dao.tables.pojos.MockDataRulePojo; -import com.databasir.dao.tables.pojos.TableColumnDocumentPojo; -import com.databasir.dao.tables.pojos.TableDocumentPojo; +import com.databasir.dao.tables.pojos.DatabaseDocument; +import com.databasir.dao.tables.pojos.MockDataRule; +import com.databasir.dao.tables.pojos.TableColumnDocument; +import com.databasir.dao.tables.pojos.TableDocument; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; @@ -33,7 +33,7 @@ public class MockDataService { private final TableColumnDocumentDao tableColumnDocumentDao; - private final MockDataRulePojoConverter mockDataRulePojoConverter; + private final MockDataRuleConverter mockDataRuleConverter; private final MockDataRuleResponseConverter mockDataRuleResponseConverter; @@ -43,10 +43,10 @@ public class MockDataService { public String generateMockInsertSql(Integer projectId, MockDataGenerateCondition condition) { mockDataValidator.validProject(projectId); - DatabaseDocumentPojo databaseDoc = - mockDataValidator.validAndGetDatabaseDocumentPojo(projectId, condition.getVersion()); - TableDocumentPojo tableDoc = - mockDataValidator.validAndGetTableDocumentPojo(databaseDoc.getId(), condition.getTableId()); + DatabaseDocument databaseDoc = + mockDataValidator.validAndGetDatabaseDocument(projectId, condition.getVersion()); + TableDocument tableDoc = + mockDataValidator.validAndGetTableDocument(databaseDoc.getId(), condition.getTableId()); return mockDataGenerator.createInsertSql(projectId, databaseDoc.getId(), tableDoc.getName()); } @@ -54,10 +54,10 @@ public class MockDataService { Integer tableId, List rules) { mockDataValidator.validProject(projectId); - DatabaseDocumentPojo doc = - mockDataValidator.validAndGetDatabaseDocumentPojo(projectId, null); - TableDocumentPojo tableDoc = - mockDataValidator.validAndGetTableDocumentPojo(doc.getId(), tableId); + DatabaseDocument doc = + mockDataValidator.validAndGetDatabaseDocument(projectId, null); + TableDocument tableDoc = + mockDataValidator.validAndGetTableDocument(doc.getId(), tableId); List columnNames = rules.stream() .map(ColumnMockRuleSaveRequest::getColumnName) .collect(Collectors.toList()); @@ -67,21 +67,21 @@ public class MockDataService { // verify mockDataGenerator.createInsertSql(projectId, doc.getId(), tableDoc.getName()); - List pojo = mockDataRulePojoConverter.from(projectId, rules); + List pojo = mockDataRuleConverter.from(projectId, rules); mockDataRuleDao.batchSave(pojo); } public List listRules(Integer projectId, MockDataRuleListCondition condition) { mockDataValidator.validProject(projectId); - DatabaseDocumentPojo databaseDoc = - mockDataValidator.validAndGetDatabaseDocumentPojo(projectId, condition.getVersion()); - TableDocumentPojo tableDoc = - mockDataValidator.validAndGetTableDocumentPojo(databaseDoc.getId(), condition.getTableId()); - List columns = + DatabaseDocument databaseDoc = + mockDataValidator.validAndGetDatabaseDocument(projectId, condition.getVersion()); + TableDocument tableDoc = + mockDataValidator.validAndGetTableDocument(databaseDoc.getId(), condition.getTableId()); + List columns = tableColumnDocumentDao.selectByTableDocumentId(condition.getTableId()); var ruleMapByColumnName = mockDataRuleDao.selectByProjectIdAndTableName(projectId, tableDoc.getName()) .stream() - .collect(Collectors.toMap(MockDataRulePojo::getColumnName, Function.identity())); + .collect(Collectors.toMap(MockDataRule::getColumnName, Function.identity())); return columns.stream() .map(col -> { if (ruleMapByColumnName.containsKey(col.getName())) { diff --git a/core/src/main/java/com/databasir/core/domain/mock/converter/MockDataRulePojoConverter.java b/core/src/main/java/com/databasir/core/domain/mock/converter/MockDataRuleConverter.java similarity index 57% rename from core/src/main/java/com/databasir/core/domain/mock/converter/MockDataRulePojoConverter.java rename to core/src/main/java/com/databasir/core/domain/mock/converter/MockDataRuleConverter.java index c898f8e..d2a0286 100644 --- a/core/src/main/java/com/databasir/core/domain/mock/converter/MockDataRulePojoConverter.java +++ b/core/src/main/java/com/databasir/core/domain/mock/converter/MockDataRuleConverter.java @@ -1,18 +1,18 @@ package com.databasir.core.domain.mock.converter; import com.databasir.core.domain.mock.data.ColumnMockRuleSaveRequest; -import com.databasir.dao.tables.pojos.MockDataRulePojo; +import com.databasir.dao.tables.pojos.MockDataRule; import org.mapstruct.Mapper; import java.util.List; import java.util.stream.Collectors; @Mapper(componentModel = "spring") -public interface MockDataRulePojoConverter { +public interface MockDataRuleConverter { - MockDataRulePojo from(Integer projectId, ColumnMockRuleSaveRequest request); + MockDataRule from(Integer projectId, ColumnMockRuleSaveRequest request); - default List from(Integer projectId, List request) { + default List from(Integer projectId, List request) { return request.stream() .map(rule -> from(projectId, rule)) .collect(Collectors.toList()); diff --git a/core/src/main/java/com/databasir/core/domain/mock/converter/MockDataRuleResponseConverter.java b/core/src/main/java/com/databasir/core/domain/mock/converter/MockDataRuleResponseConverter.java index 577f9ff..82d93d9 100644 --- a/core/src/main/java/com/databasir/core/domain/mock/converter/MockDataRuleResponseConverter.java +++ b/core/src/main/java/com/databasir/core/domain/mock/converter/MockDataRuleResponseConverter.java @@ -2,8 +2,8 @@ package com.databasir.core.domain.mock.converter; import com.databasir.core.domain.mock.data.MockDataRuleResponse; import com.databasir.dao.enums.MockDataType; -import com.databasir.dao.tables.pojos.MockDataRulePojo; -import com.databasir.dao.tables.pojos.TableColumnDocumentPojo; +import com.databasir.dao.tables.pojos.MockDataRule; +import com.databasir.dao.tables.pojos.TableColumnDocument; import org.mapstruct.Mapper; import org.mapstruct.Mapping; @@ -11,9 +11,9 @@ import org.mapstruct.Mapping; public interface MockDataRuleResponseConverter { @Mapping(target = "columnType", source = "column.type") - MockDataRuleResponse from(MockDataRulePojo pojo, TableColumnDocumentPojo column); + MockDataRuleResponse from(MockDataRule pojo, TableColumnDocument column); @Mapping(target = "columnName", source = "pojo.name") @Mapping(target = "columnType", source = "pojo.type") - MockDataRuleResponse from(String tableName, MockDataType mockDataType, TableColumnDocumentPojo pojo); + MockDataRuleResponse from(String tableName, MockDataType mockDataType, TableColumnDocument pojo); } diff --git a/core/src/main/java/com/databasir/core/domain/mock/generator/MockDataContext.java b/core/src/main/java/com/databasir/core/domain/mock/generator/MockDataContext.java index 6f6daaa..c13db29 100644 --- a/core/src/main/java/com/databasir/core/domain/mock/generator/MockDataContext.java +++ b/core/src/main/java/com/databasir/core/domain/mock/generator/MockDataContext.java @@ -2,8 +2,8 @@ package com.databasir.core.domain.mock.generator; import com.databasir.core.domain.DomainErrors; import com.databasir.dao.exception.DataNotExistsException; -import com.databasir.dao.tables.pojos.MockDataRulePojo; -import com.databasir.dao.tables.pojos.TableColumnDocumentPojo; +import com.databasir.dao.tables.pojos.MockDataRule; +import com.databasir.dao.tables.pojos.TableColumnDocument; import lombok.Builder; import lombok.Getter; @@ -29,17 +29,17 @@ public class MockDataContext { private Map> toReference = new LinkedHashMap<>(); @Builder.Default - private Map> ruleMap = new LinkedHashMap<>(16); + private Map> ruleMap = new LinkedHashMap<>(16); @Builder.Default - private Map> tableColumnMap = new LinkedHashMap<>(16); + private Map> tableColumnMap = new LinkedHashMap<>(16); @Builder.Default private Map> mockInProgress = new HashMap<>(); - public void addTableMockRules(String tableName, List rules) { + public void addTableMockRules(String tableName, List rules) { var columnRuleMap = rules.stream() - .collect(Collectors.toMap(MockDataRulePojo::getColumnName, Function.identity())); + .collect(Collectors.toMap(MockDataRule::getColumnName, Function.identity())); this.ruleMap.put(tableName, columnRuleMap); } @@ -54,16 +54,16 @@ public class MockDataContext { return ruleMap.get(tableName).containsKey(columnName); } - public Optional getMockRule(String tableName, String columnName) { + public Optional getMockRule(String tableName, String columnName) { if (!ruleMap.containsKey(tableName)) { return Optional.empty(); } return Optional.ofNullable(ruleMap.get(tableName).get(columnName)); } - public void addTableColumns(String tableName, List columns) { - Map columnMap = new LinkedHashMap<>(); - for (TableColumnDocumentPojo column : columns) { + public void addTableColumns(String tableName, List columns) { + Map columnMap = new LinkedHashMap<>(); + for (TableColumnDocument column : columns) { columnMap.put(column.getName(), column); } this.tableColumnMap.put(tableName, columnMap); @@ -80,7 +80,7 @@ public class MockDataContext { return tableColumnMap.get(tableName).containsKey(columnName); } - public TableColumnDocumentPojo getTableColumn(String tableName, String columnName) { + public TableColumnDocument getTableColumn(String tableName, String columnName) { if (!tableColumnMap.containsKey(tableName)) { return null; } diff --git a/core/src/main/java/com/databasir/core/domain/mock/generator/MockDataGenerator.java b/core/src/main/java/com/databasir/core/domain/mock/generator/MockDataGenerator.java index 6cc4279..e949cbe 100644 --- a/core/src/main/java/com/databasir/core/domain/mock/generator/MockDataGenerator.java +++ b/core/src/main/java/com/databasir/core/domain/mock/generator/MockDataGenerator.java @@ -8,8 +8,8 @@ import com.databasir.dao.impl.MockDataRuleDao; import com.databasir.dao.impl.ProjectDao; import com.databasir.dao.impl.TableColumnDocumentDao; import com.databasir.dao.impl.TableDocumentDao; -import com.databasir.dao.tables.pojos.MockDataRulePojo; -import com.databasir.dao.tables.pojos.TableColumnDocumentPojo; +import com.databasir.dao.tables.pojos.MockDataRule; +import com.databasir.dao.tables.pojos.TableColumnDocument; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; @@ -63,7 +63,7 @@ public class MockDataGenerator { context.addTableMockRules(tableName, columnRules); } - for (TableColumnDocumentPojo column : context.getTableColumnMap().get(tableName).values()) { + for (TableColumnDocument column : context.getTableColumnMap().get(tableName).values()) { if (context.containsColumnMockData(tableName, column.getName()) || context.isMockInProgress(tableName, column.getName())) { continue; @@ -76,11 +76,11 @@ public class MockDataGenerator { if (context.containsColumnMockData(tableName, columnName)) { return; } - TableColumnDocumentPojo column = context.getTableColumn(tableName, columnName); - Optional ruleOption = context.getMockRule(tableName, columnName); + TableColumnDocument column = context.getTableColumn(tableName, columnName); + Optional ruleOption = context.getMockRule(tableName, columnName); String rawData; if (ruleOption.isPresent()) { - MockDataRulePojo rule = ruleOption.get(); + MockDataRule rule = ruleOption.get(); if (rule.getMockDataType() == MockDataType.REF) { context.addMockInProgress(tableName, columnName); context.saveReference( @@ -103,7 +103,7 @@ public class MockDataGenerator { context.addColumnMockData(tableName, toData(rawData, column)); } - private String createByFactory(TableColumnDocumentPojo column, MockDataRulePojo rule) { + private String createByFactory(TableColumnDocument column, MockDataRule rule) { MockDataType mockType = rule == null ? MockDataType.AUTO : rule.getMockDataType(); MockColumnRule colRule = MockColumnRule.builder() .dataType(column.getDataType()) @@ -119,7 +119,7 @@ public class MockDataGenerator { .orElseThrow(); } - private ColumnMockData toData(String data, TableColumnDocumentPojo column) { + private ColumnMockData toData(String data, TableColumnDocument column) { return ColumnMockData.builder() .columnName(column.getName()) .columnType(column.getType()) diff --git a/core/src/main/java/com/databasir/core/domain/mock/validator/MockDataSaveValidator.java b/core/src/main/java/com/databasir/core/domain/mock/validator/MockDataSaveValidator.java index 2a92206..a5fb9d9 100644 --- a/core/src/main/java/com/databasir/core/domain/mock/validator/MockDataSaveValidator.java +++ b/core/src/main/java/com/databasir/core/domain/mock/validator/MockDataSaveValidator.java @@ -8,7 +8,7 @@ import com.databasir.core.domain.mock.script.SpelScriptEvaluator; import com.databasir.dao.enums.MockDataType; import com.databasir.dao.impl.TableColumnDocumentDao; import com.databasir.dao.impl.TableDocumentDao; -import com.databasir.dao.tables.pojos.TableColumnDocumentPojo; +import com.databasir.dao.tables.pojos.TableColumnDocument; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Component; @@ -44,7 +44,7 @@ public class MockDataSaveValidator { public void validTableColumn(Integer tableDocId, List requestColumnNames) { var existsColumnNames = tableColumnDocumentDao.selectByTableDocumentId(tableDocId) .stream() - .map(TableColumnDocumentPojo::getName) + .map(TableColumnDocument::getName) .collect(Collectors.toSet()); for (String colName : requestColumnNames) { if (!existsColumnNames.contains(colName)) { diff --git a/core/src/main/java/com/databasir/core/domain/mock/validator/MockDataValidator.java b/core/src/main/java/com/databasir/core/domain/mock/validator/MockDataValidator.java index 1a01253..ba9f0f5 100644 --- a/core/src/main/java/com/databasir/core/domain/mock/validator/MockDataValidator.java +++ b/core/src/main/java/com/databasir/core/domain/mock/validator/MockDataValidator.java @@ -4,8 +4,8 @@ import com.databasir.core.domain.DomainErrors; import com.databasir.dao.impl.DatabaseDocumentDao; import com.databasir.dao.impl.ProjectDao; import com.databasir.dao.impl.TableDocumentDao; -import com.databasir.dao.tables.pojos.DatabaseDocumentPojo; -import com.databasir.dao.tables.pojos.TableDocumentPojo; +import com.databasir.dao.tables.pojos.DatabaseDocument; +import com.databasir.dao.tables.pojos.TableDocument; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Component; @@ -27,8 +27,8 @@ public class MockDataValidator { } } - public DatabaseDocumentPojo validAndGetDatabaseDocumentPojo(Integer projectId, Long version) { - Optional databaseDoc; + public DatabaseDocument validAndGetDatabaseDocument(Integer projectId, Long version) { + Optional databaseDoc; if (version == null) { databaseDoc = databaseDocumentDao.selectNotArchivedByProjectId(projectId); } else { @@ -40,8 +40,8 @@ public class MockDataValidator { return databaseDoc.get(); } - public TableDocumentPojo validAndGetTableDocumentPojo(Integer databaseDocId, Integer tableId) { - Optional tableOption = + public TableDocument validAndGetTableDocument(Integer databaseDocId, Integer tableId) { + Optional tableOption = tableDocumentDao.selectByDatabaseDocumentIdAndId(databaseDocId, tableId); if (tableOption.isEmpty()) { throw DomainErrors.DATABASE_META_NOT_FOUND.exception("表数据不存在"); diff --git a/core/src/main/java/com/databasir/core/domain/project/converter/DataSourcePojoConverter.java b/core/src/main/java/com/databasir/core/domain/project/converter/DataSourceConverter.java similarity index 70% rename from core/src/main/java/com/databasir/core/domain/project/converter/DataSourcePojoConverter.java rename to core/src/main/java/com/databasir/core/domain/project/converter/DataSourceConverter.java index 0f1cd83..f4fe956 100644 --- a/core/src/main/java/com/databasir/core/domain/project/converter/DataSourcePojoConverter.java +++ b/core/src/main/java/com/databasir/core/domain/project/converter/DataSourceConverter.java @@ -3,8 +3,8 @@ package com.databasir.core.domain.project.converter; import com.databasir.core.domain.project.data.DataSourcePropertyValue; import com.databasir.core.domain.project.data.ProjectCreateRequest; import com.databasir.core.domain.project.data.ProjectUpdateRequest; -import com.databasir.dao.tables.pojos.DataSourcePojo; -import com.databasir.dao.tables.pojos.DataSourcePropertyPojo; +import com.databasir.dao.tables.pojos.DataSource; +import com.databasir.dao.tables.pojos.DataSourceProperty; import org.mapstruct.Mapper; import org.mapstruct.Mapping; @@ -12,28 +12,28 @@ import java.util.List; import java.util.stream.Collectors; @Mapper(componentModel = "spring") -public interface DataSourcePojoConverter { +public interface DataSourceConverter { @Mapping(target = "id", ignore = true) @Mapping(target = "createAt", ignore = true) @Mapping(target = "updateAt", ignore = true) @Mapping(target = "password", source = "password") - DataSourcePojo of(ProjectCreateRequest.DataSourceCreateRequest request, + DataSource of(ProjectCreateRequest.DataSourceCreateRequest request, String password, Integer projectId); @Mapping(target = "updateAt", ignore = true) @Mapping(target = "createAt", ignore = true) @Mapping(target = "password", source = "password") - DataSourcePojo of(ProjectUpdateRequest.DataSourceUpdateRequest request, + DataSource of(ProjectUpdateRequest.DataSourceUpdateRequest request, String password, Integer projectId); @Mapping(target = "id", ignore = true) @Mapping(target = "createAt", ignore = true) - DataSourcePropertyPojo of(DataSourcePropertyValue propertyValues, Integer dataSourceId); + DataSourceProperty of(DataSourcePropertyValue propertyValues, Integer dataSourceId); - default List of(List propertyValues, + default List of(List propertyValues, Integer dataSourceId) { return propertyValues.stream().map(value -> of(value, dataSourceId)).collect(Collectors.toList()); } diff --git a/core/src/main/java/com/databasir/core/domain/project/converter/ProjectPojoConverter.java b/core/src/main/java/com/databasir/core/domain/project/converter/ProjectConverter.java similarity index 71% rename from core/src/main/java/com/databasir/core/domain/project/converter/ProjectPojoConverter.java rename to core/src/main/java/com/databasir/core/domain/project/converter/ProjectConverter.java index 6b58b81..5a04aa3 100644 --- a/core/src/main/java/com/databasir/core/domain/project/converter/ProjectPojoConverter.java +++ b/core/src/main/java/com/databasir/core/domain/project/converter/ProjectConverter.java @@ -3,8 +3,8 @@ package com.databasir.core.domain.project.converter; import com.databasir.core.domain.project.data.ProjectCreateRequest; import com.databasir.core.domain.project.data.ProjectUpdateRequest; import com.databasir.core.infrastructure.converter.JsonConverter; -import com.databasir.dao.tables.pojos.ProjectPojo; -import com.databasir.dao.tables.pojos.ProjectSyncRulePojo; +import com.databasir.dao.tables.pojos.Project; +import com.databasir.dao.tables.pojos.ProjectSyncRule; import org.mapstruct.Mapper; import org.mapstruct.Mapping; import org.mapstruct.ReportingPolicy; @@ -12,20 +12,20 @@ import org.mapstruct.ReportingPolicy; import java.util.Optional; @Mapper(componentModel = "spring", unmappedTargetPolicy = ReportingPolicy.IGNORE, uses = JsonConverter.class) -public interface ProjectPojoConverter { +public interface ProjectConverter { - ProjectPojo of(ProjectCreateRequest request); + Project of(ProjectCreateRequest request); - ProjectPojo of(ProjectUpdateRequest request); + Project of(ProjectUpdateRequest request); @Mapping(target = "ignoreTableNameRegexArray", source = "request.ignoreTableNameRegexes") @Mapping(target = "ignoreColumnNameRegexArray", source = "request.ignoreColumnNameRegexes") - ProjectSyncRulePojo of(ProjectCreateRequest.ProjectSyncRuleCreateRequest request, + ProjectSyncRule of(ProjectCreateRequest.ProjectSyncRuleCreateRequest request, Integer projectId); @Mapping(target = "ignoreTableNameRegexArray", source = "request.ignoreTableNameRegexes") @Mapping(target = "ignoreColumnNameRegexArray", source = "request.ignoreColumnNameRegexes") - ProjectSyncRulePojo of(ProjectUpdateRequest.ProjectSyncRuleUpdateRequest request, + ProjectSyncRule of(ProjectUpdateRequest.ProjectSyncRuleUpdateRequest request, Integer projectId); default String optionToEmpty(Optional optional) { diff --git a/core/src/main/java/com/databasir/core/domain/project/converter/ProjectResponseConverter.java b/core/src/main/java/com/databasir/core/domain/project/converter/ProjectResponseConverter.java index ae34874..441e56e 100644 --- a/core/src/main/java/com/databasir/core/domain/project/converter/ProjectResponseConverter.java +++ b/core/src/main/java/com/databasir/core/domain/project/converter/ProjectResponseConverter.java @@ -3,10 +3,10 @@ package com.databasir.core.domain.project.converter; import com.databasir.core.domain.project.data.ProjectDetailResponse; import com.databasir.core.domain.project.data.ProjectSimpleResponse; import com.databasir.core.infrastructure.converter.JsonConverter; -import com.databasir.dao.tables.pojos.DataSourcePojo; -import com.databasir.dao.tables.pojos.DataSourcePropertyPojo; -import com.databasir.dao.tables.pojos.ProjectPojo; -import com.databasir.dao.tables.pojos.ProjectSyncRulePojo; +import com.databasir.dao.tables.pojos.DataSource; +import com.databasir.dao.tables.pojos.DataSourceProperty; +import com.databasir.dao.tables.pojos.Project; +import com.databasir.dao.tables.pojos.ProjectSyncRule; import org.mapstruct.Mapper; import org.mapstruct.Mapping; import org.mapstruct.ReportingPolicy; @@ -18,21 +18,21 @@ public interface ProjectResponseConverter { @Mapping(target = "id", source = "database.id") @Mapping(target = "createAt", source = "database.createAt") - ProjectDetailResponse toResponse(ProjectPojo database, + ProjectDetailResponse toResponse(Project database, ProjectDetailResponse.DataSourceResponse dataSource, ProjectDetailResponse.ProjectSyncRuleResponse projectSyncRule); - ProjectDetailResponse.DataSourceResponse toResponse(DataSourcePojo dataSource, - List properties); + ProjectDetailResponse.DataSourceResponse toResponse(DataSource dataSource, + List properties); @Mapping(target = "ignoreTableNameRegexes", source = "ignoreTableNameRegexArray") @Mapping(target = "ignoreColumnNameRegexes", source = "ignoreColumnNameRegexArray") - ProjectDetailResponse.ProjectSyncRuleResponse toResponse(ProjectSyncRulePojo rule); + ProjectDetailResponse.ProjectSyncRuleResponse toResponse(ProjectSyncRule rule); @Mapping(target = "id", source = "project.id") @Mapping(target = "createAt", source = "project.createAt") - ProjectSimpleResponse toSimple(ProjectPojo project, - DataSourcePojo dataSource, - ProjectSyncRulePojo syncRule, + ProjectSimpleResponse toSimple(Project project, + DataSource dataSource, + ProjectSyncRule syncRule, Boolean isFavorite); } diff --git a/core/src/main/java/com/databasir/core/domain/project/converter/ProjectSimpleTaskResponseConverter.java b/core/src/main/java/com/databasir/core/domain/project/converter/ProjectSimpleTaskResponseConverter.java index 041bf38..8ff0d1c 100644 --- a/core/src/main/java/com/databasir/core/domain/project/converter/ProjectSimpleTaskResponseConverter.java +++ b/core/src/main/java/com/databasir/core/domain/project/converter/ProjectSimpleTaskResponseConverter.java @@ -1,7 +1,7 @@ package com.databasir.core.domain.project.converter; import com.databasir.core.domain.project.data.task.ProjectSimpleTaskResponse; -import com.databasir.dao.tables.pojos.ProjectSyncTaskPojo; +import com.databasir.dao.tables.pojos.ProjectSyncTask; import org.mapstruct.Mapper; import org.mapstruct.Mapping; @@ -10,8 +10,8 @@ import java.util.List; @Mapper(componentModel = "spring") public interface ProjectSimpleTaskResponseConverter { - List of(List pojos); + List of(List pojos); @Mapping(target = "taskId", source = "id") - ProjectSimpleTaskResponse of(ProjectSyncTaskPojo pojo); + ProjectSimpleTaskResponse of(ProjectSyncTask pojo); } diff --git a/core/src/main/java/com/databasir/core/domain/project/service/ProjectService.java b/core/src/main/java/com/databasir/core/domain/project/service/ProjectService.java index f6f8d0c..825ed32 100644 --- a/core/src/main/java/com/databasir/core/domain/project/service/ProjectService.java +++ b/core/src/main/java/com/databasir/core/domain/project/service/ProjectService.java @@ -2,8 +2,8 @@ package com.databasir.core.domain.project.service; import com.databasir.common.codec.Aes; import com.databasir.core.domain.DomainErrors; -import com.databasir.core.domain.project.converter.DataSourcePojoConverter; -import com.databasir.core.domain.project.converter.ProjectPojoConverter; +import com.databasir.core.domain.project.converter.DataSourceConverter; +import com.databasir.core.domain.project.converter.ProjectConverter; import com.databasir.core.domain.project.converter.ProjectResponseConverter; import com.databasir.core.domain.project.converter.ProjectSimpleTaskResponseConverter; import com.databasir.core.domain.project.data.*; @@ -50,9 +50,9 @@ public class ProjectService { private final ProjectSyncTaskDao projectSyncTaskDao; - private final DataSourcePojoConverter dataSourcePojoConverter; + private final DataSourceConverter dataSourceConverter; - private final ProjectPojoConverter projectPojoConverter; + private final ProjectConverter projectConverter; private final ProjectResponseConverter projectResponseConverter; @@ -75,7 +75,7 @@ public class ProjectService { @Transactional public Integer create(ProjectCreateRequest request) { - ProjectPojo project = projectPojoConverter.of(request); + Project project = projectConverter.of(request); Integer projectId = null; try { projectId = projectDao.insertAndReturnId(project); @@ -84,14 +84,14 @@ public class ProjectService { } String newPassword = encryptPassword(request.getDataSource().getPassword()).get(); - DataSourcePojo dataSource = dataSourcePojoConverter.of(request.getDataSource(), newPassword, projectId); + DataSource dataSource = dataSourceConverter.of(request.getDataSource(), newPassword, projectId); Integer dataSourceId = dataSourceDao.insertAndReturnId(dataSource); List propertyValues = request.getDataSource().getProperties(); - List properties = dataSourcePojoConverter.of(propertyValues, dataSourceId); + List properties = dataSourceConverter.of(propertyValues, dataSourceId); dataSourcePropertyDao.batchInsert(properties); - ProjectSyncRulePojo syncRule = projectPojoConverter.of(request.getProjectSyncRule(), projectId); + ProjectSyncRule syncRule = projectConverter.of(request.getProjectSyncRule(), projectId); projectSyncRuleDao.insertAndReturnId(syncRule); var event = ProjectSaved.builder() @@ -113,13 +113,13 @@ public class ProjectService { if (projectDao.exists(groupId, projectId)) { // update dataSource String newPassword = encryptPassword(request.getDataSource().getPassword()).orElse(null); - DataSourcePojo dataSource = dataSourcePojoConverter.of(request.getDataSource(), newPassword, projectId); + DataSource dataSource = dataSourceConverter.of(request.getDataSource(), newPassword, projectId); dataSourceDao.updateByProjectId(dataSource); // update connection property Integer dataSourceId = dataSourceDao.selectByProjectId(projectId).getId(); List propertyValues = request.getDataSource().getProperties(); - List properties = dataSourcePojoConverter.of(propertyValues, dataSourceId); + List properties = dataSourceConverter.of(propertyValues, dataSourceId); if (properties.isEmpty()) { dataSourcePropertyDao.deleteByDataSourceId(dataSourceId); } else { @@ -128,12 +128,12 @@ public class ProjectService { } // update project sync rule - ProjectSyncRulePojo syncRule = projectPojoConverter.of(request.getProjectSyncRule(), projectId); + ProjectSyncRule syncRule = projectConverter.of(request.getProjectSyncRule(), projectId); projectSyncRuleDao.deleteByProjectId(projectId); projectSyncRuleDao.insertAndReturnId(syncRule); // update project info - ProjectPojo project = projectPojoConverter.of(request); + Project project = projectConverter.of(request); projectDao.updateById(project); ProjectSaved event = ProjectSaved.builder() @@ -155,7 +155,7 @@ public class ProjectService { if (!StringUtils.hasText(password)) { return Optional.empty(); } - SysKeyPojo sysKey = sysKeyDao.selectTopOne(); + SysKey sysKey = sysKeyDao.selectTopOne(); // String decryptedPassword = Rsa.decryptFromBase64DataByPrivateKey(password, sysKey.getRsaPrivateKey()); return Optional.of(Aes.encryptToBase64Data(password, sysKey.getAesKey())); } @@ -168,24 +168,24 @@ public class ProjectService { } public Page list(Integer userId, Pageable page, ProjectListCondition condition) { - Page pageData = projectDao.selectByCondition(page, condition.toCondition()); + Page pageData = projectDao.selectByCondition(page, condition.toCondition()); List projectIds = pageData.getContent() .stream() - .map(ProjectPojo::getId) + .map(Project::getId) .collect(Collectors.toList()); - Map dataSourceMapByProjectId = dataSourceDao.selectInProjectIds(projectIds) + Map dataSourceMapByProjectId = dataSourceDao.selectInProjectIds(projectIds) .stream() - .collect(Collectors.toMap(DataSourcePojo::getProjectId, Function.identity())); - Map syncRuleMapByProjectId = projectSyncRuleDao.selectInProjectIds(projectIds) + .collect(Collectors.toMap(DataSource::getProjectId, Function.identity())); + Map syncRuleMapByProjectId = projectSyncRuleDao.selectInProjectIds(projectIds) .stream() - .collect(Collectors.toMap(ProjectSyncRulePojo::getProjectId, Function.identity())); + .collect(Collectors.toMap(ProjectSyncRule::getProjectId, Function.identity())); Set favoriteProjectIds = userFavoriteProjectDao.selectByUserIdAndProjectIds(userId, projectIds) .stream() - .map(UserFavoriteProjectPojo::getProjectId) + .map(UserFavoriteProject::getProjectId) .collect(Collectors.toSet()); return pageData.map(project -> { - DataSourcePojo dataSource = dataSourceMapByProjectId.get(project.getId()); - ProjectSyncRulePojo syncRule = syncRuleMapByProjectId.get(project.getId()); + DataSource dataSource = dataSourceMapByProjectId.get(project.getId()); + ProjectSyncRule syncRule = syncRuleMapByProjectId.get(project.getId()); Boolean isFavorite = favoriteProjectIds.contains(project.getId()); return projectResponseConverter.toSimple(project, dataSource, syncRule, isFavorite); }); @@ -194,8 +194,8 @@ public class ProjectService { public void testConnection(ProjectTestConnectionRequest request) { String password; if (request.getProjectId() != null && !StringUtils.hasText(request.getPassword())) { - DataSourcePojo dataSource = dataSourceDao.selectByProjectId(request.getProjectId()); - SysKeyPojo sysKey = sysKeyDao.selectTopOne(); + DataSource dataSource = dataSourceDao.selectByProjectId(request.getProjectId()); + SysKey sysKey = sysKeyDao.selectTopOne(); password = Aes.decryptFromBase64Data(dataSource.getPassword(), sysKey.getAesKey()); } else if (StringUtils.hasText(request.getPassword())) { password = request.getPassword(); @@ -224,7 +224,7 @@ public class ProjectService { log.warn("create sync task failed, it's already exists, projectId={}", projectId); return Optional.empty(); } - ProjectSyncTaskPojo projectSyncTask = new ProjectSyncTaskPojo(); + ProjectSyncTask projectSyncTask = new ProjectSyncTask(); projectSyncTask.setProjectId(projectId); projectSyncTask.setStatus(ProjectSyncTaskStatus.NEW); projectSyncTask.setUserId(userId); diff --git a/core/src/main/java/com/databasir/core/domain/search/SearchService.java b/core/src/main/java/com/databasir/core/domain/search/SearchService.java index 36b4a2f..af49fd2 100644 --- a/core/src/main/java/com/databasir/core/domain/search/SearchService.java +++ b/core/src/main/java/com/databasir/core/domain/search/SearchService.java @@ -5,9 +5,9 @@ import com.databasir.core.domain.search.data.SearchResponse; import com.databasir.dao.impl.DocumentFullTextDao; import com.databasir.dao.impl.GroupDao; import com.databasir.dao.impl.ProjectDao; -import com.databasir.dao.tables.pojos.DocumentFullTextPojo; -import com.databasir.dao.tables.pojos.GroupPojo; -import com.databasir.dao.tables.pojos.ProjectPojo; +import com.databasir.dao.tables.pojos.DocumentFullText; +import com.databasir.dao.tables.pojos.Group; +import com.databasir.dao.tables.pojos.Project; import lombok.RequiredArgsConstructor; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; @@ -31,8 +31,8 @@ public class SearchService { private final ProjectDao projectDao; public SearchResponse search(Pageable pageable, String query) { - Page columnPageData = documentFullTextDao.selectColumnPage(pageable, query); - Page tablePageData = documentFullTextDao.selectTablePage(pageable, query); + Page columnPageData = documentFullTextDao.selectColumnPage(pageable, query); + Page tablePageData = documentFullTextDao.selectTablePage(pageable, query); // table 和 column 的项目名、组名等信息需要从关联表取 Set projectIds = new HashSet<>(); @@ -40,11 +40,11 @@ public class SearchService { .stream().map(o -> o.getProjectId()).collect(Collectors.toList())); projectIds.addAll(tablePageData.getContent() .stream().map(o -> o.getProjectId()).collect(Collectors.toList())); - Map projectMapById = projectDao.selectInIds(projectIds) + Map projectMapById = projectDao.selectInIds(projectIds) .stream() .collect(Collectors.toMap(o -> o.getId(), o -> o)); - Page projectPageData = documentFullTextDao.selectProjectPage(pageable, query); + Page projectPageData = documentFullTextDao.selectProjectPage(pageable, query); Set groupIds = new HashSet<>(); groupIds.addAll(columnPageData.getContent() .stream().map(o -> o.getGroupId()).collect(Collectors.toList())); @@ -52,7 +52,7 @@ public class SearchService { .stream().map(o -> o.getGroupId()).collect(Collectors.toList())); groupIds.addAll(projectPageData.getContent() .stream().map(o -> o.getGroupId()).collect(Collectors.toList())); - Map groupMapById = groupDao.selectInIds(groupIds) + Map groupMapById = groupDao.selectInIds(groupIds) .stream() .collect(Collectors.toMap(o -> o.getId(), o -> o)); diff --git a/core/src/main/java/com/databasir/core/domain/search/converter/SearchResponseConverter.java b/core/src/main/java/com/databasir/core/domain/search/converter/SearchResponseConverter.java index aa62d23..66122f0 100644 --- a/core/src/main/java/com/databasir/core/domain/search/converter/SearchResponseConverter.java +++ b/core/src/main/java/com/databasir/core/domain/search/converter/SearchResponseConverter.java @@ -1,9 +1,9 @@ package com.databasir.core.domain.search.converter; import com.databasir.core.domain.search.data.SearchResponse; -import com.databasir.dao.tables.pojos.DocumentFullTextPojo; -import com.databasir.dao.tables.pojos.GroupPojo; -import com.databasir.dao.tables.pojos.ProjectPojo; +import com.databasir.dao.tables.pojos.DocumentFullText; +import com.databasir.dao.tables.pojos.Group; +import com.databasir.dao.tables.pojos.Project; import org.mapstruct.Mapper; import org.mapstruct.Mapping; @@ -12,16 +12,16 @@ import java.util.Map; @Mapper(componentModel = "spring") public interface SearchResponseConverter { - default SearchResponse.Item toItem(DocumentFullTextPojo pojo, - Map projectMapById, - Map groupMapById) { - ProjectPojo project = projectMapById.get(pojo.getProjectId()); - GroupPojo group = groupMapById.get(pojo.getGroupId()); + default SearchResponse.Item toItem(DocumentFullText pojo, + Map projectMapById, + Map groupMapById) { + Project project = projectMapById.get(pojo.getProjectId()); + Group group = groupMapById.get(pojo.getGroupId()); return toItem(pojo, group.getName(), group.getDescription(), project.getName(), project.getDescription()); } - default SearchResponse.Item toItem(DocumentFullTextPojo pojo, - Map groupMapById) { + default SearchResponse.Item toItem(DocumentFullText pojo, + Map groupMapById) { var group = groupMapById.get(pojo.getGroupId()); return toItem(pojo, group.getName(), @@ -34,11 +34,11 @@ public interface SearchResponseConverter { @Mapping(target = "groupDescription", source = "groupDescription") @Mapping(target = "projectName", source = "projectName") @Mapping(target = "projectDescription", source = "projectDescription") - SearchResponse.Item toItem(DocumentFullTextPojo item, + SearchResponse.Item toItem(DocumentFullText item, String groupName, String groupDescription, String projectName, String projectDescription); - SearchResponse.Item toItem(DocumentFullTextPojo pojo); + SearchResponse.Item toItem(DocumentFullText pojo); } diff --git a/core/src/main/java/com/databasir/core/domain/system/service/SystemService.java b/core/src/main/java/com/databasir/core/domain/system/service/SystemService.java index 1f04be0..3b9148b 100644 --- a/core/src/main/java/com/databasir/core/domain/system/service/SystemService.java +++ b/core/src/main/java/com/databasir/core/domain/system/service/SystemService.java @@ -4,7 +4,7 @@ import com.databasir.core.domain.DomainErrors; import com.databasir.core.domain.system.data.SystemEmailResponse; import com.databasir.core.domain.system.data.SystemEmailUpdateRequest; import com.databasir.dao.impl.SysMailDao; -import com.databasir.dao.tables.pojos.SysMailPojo; +import com.databasir.dao.tables.pojos.SysMail; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; import org.springframework.util.StringUtils; @@ -41,26 +41,26 @@ public class SystemService { } public void updateEmailSetting(SystemEmailUpdateRequest request) { - SysMailPojo sysMailPojo = new SysMailPojo(); - sysMailPojo.setSmtpHost(request.getSmtpHost()); - sysMailPojo.setSmtpPort(request.getSmtpPort()); - sysMailPojo.setUsername(request.getUsername()); - sysMailPojo.setUseSsl(request.getUseSSL()); + SysMail sysMail = new SysMail(); + sysMail.setSmtpHost(request.getSmtpHost()); + sysMail.setSmtpPort(request.getSmtpPort()); + sysMail.setUsername(request.getUsername()); + sysMail.setUseSsl(request.getUseSSL()); - Optional idOpt = sysMailDao.selectOptionTopOne().map(SysMailPojo::getId); - idOpt.ifPresent(sysMailPojo::setId); + Optional idOpt = sysMailDao.selectOptionTopOne().map(SysMail::getId); + idOpt.ifPresent(sysMail::setId); if (request.getPassword() != null) { // TODO encrypt password ? - sysMailPojo.setPassword(request.getPassword()); + sysMail.setPassword(request.getPassword()); } if (idOpt.isPresent()) { if (!StringUtils.hasText(request.getPassword())) { throw DomainErrors.CONNECT_DATABASE_FAILED.exception(); } - sysMailDao.updateById(sysMailPojo); + sysMailDao.updateById(sysMail); } else { - sysMailDao.insertAndReturnId(sysMailPojo); + sysMailDao.insertAndReturnId(sysMail); } } } diff --git a/core/src/main/java/com/databasir/core/domain/user/converter/FavoriteProjectPageResponseConverter.java b/core/src/main/java/com/databasir/core/domain/user/converter/FavoriteProjectPageResponseConverter.java index 15d4543..7ffcd5e 100644 --- a/core/src/main/java/com/databasir/core/domain/user/converter/FavoriteProjectPageResponseConverter.java +++ b/core/src/main/java/com/databasir/core/domain/user/converter/FavoriteProjectPageResponseConverter.java @@ -14,9 +14,9 @@ public interface FavoriteProjectPageResponseConverter { @Mapping(target = "groupId", source = "group.id") @Mapping(target = "groupName", source = "group.name") @Mapping(target = "createAt", source = "favoriteProject.createAt") - FavoriteProjectPageResponse to(UserFavoriteProjectPojo favoriteProject, - ProjectPojo project, - DataSourcePojo dataSource, - ProjectSyncRulePojo projectSyncRule, - GroupPojo group); + FavoriteProjectPageResponse to(UserFavoriteProject favoriteProject, + Project project, + DataSource dataSource, + ProjectSyncRule projectSyncRule, + Group group); } diff --git a/core/src/main/java/com/databasir/core/domain/user/converter/UserPojoConverter.java b/core/src/main/java/com/databasir/core/domain/user/converter/UserConverter.java similarity index 64% rename from core/src/main/java/com/databasir/core/domain/user/converter/UserPojoConverter.java rename to core/src/main/java/com/databasir/core/domain/user/converter/UserConverter.java index 5bdc55f..959d060 100644 --- a/core/src/main/java/com/databasir/core/domain/user/converter/UserPojoConverter.java +++ b/core/src/main/java/com/databasir/core/domain/user/converter/UserConverter.java @@ -1,13 +1,13 @@ package com.databasir.core.domain.user.converter; import com.databasir.core.domain.user.data.UserCreateRequest; -import com.databasir.dao.tables.pojos.UserPojo; +import com.databasir.dao.tables.pojos.User; import org.mapstruct.Mapper; import org.mapstruct.Mapping; @Mapper(componentModel = "spring") -public interface UserPojoConverter { +public interface UserConverter { @Mapping(target = "password", source = "hashedPassword") - UserPojo of(UserCreateRequest request, String hashedPassword); + User of(UserCreateRequest request, String hashedPassword); } diff --git a/core/src/main/java/com/databasir/core/domain/user/converter/UserResponseConverter.java b/core/src/main/java/com/databasir/core/domain/user/converter/UserResponseConverter.java index b0b942d..0ff72fd 100644 --- a/core/src/main/java/com/databasir/core/domain/user/converter/UserResponseConverter.java +++ b/core/src/main/java/com/databasir/core/domain/user/converter/UserResponseConverter.java @@ -2,8 +2,8 @@ package com.databasir.core.domain.user.converter; import com.databasir.core.domain.user.data.UserDetailResponse; import com.databasir.core.domain.user.data.UserPageResponse; -import com.databasir.dao.tables.pojos.UserPojo; -import com.databasir.dao.tables.pojos.UserRolePojo; +import com.databasir.dao.tables.pojos.User; +import com.databasir.dao.tables.pojos.UserRole; import org.mapstruct.Mapper; import java.util.List; @@ -13,8 +13,8 @@ import java.util.stream.Collectors; @Mapper(componentModel = "spring") public interface UserResponseConverter { - default UserDetailResponse detailResponse(UserPojo user, - List userRoles, + default UserDetailResponse detailResponse(User user, + List userRoles, Map groupNameMapById) { List roles = userRoles.stream() .map(pojo -> userRoleDetailResponse(pojo, groupNameMapById.get(pojo.getGroupId()))) @@ -22,10 +22,10 @@ public interface UserResponseConverter { return detailResponse(user, roles); } - UserDetailResponse detailResponse(UserPojo pojo, List roles); + UserDetailResponse detailResponse(User pojo, List roles); - UserDetailResponse.UserRoleDetailResponse userRoleDetailResponse(UserRolePojo pojo, String groupName); + UserDetailResponse.UserRoleDetailResponse userRoleDetailResponse(UserRole pojo, String groupName); - UserPageResponse pageResponse(UserPojo pojo, Boolean isSysOwner, List inGroupIds); + UserPageResponse pageResponse(User pojo, Boolean isSysOwner, List inGroupIds); } diff --git a/core/src/main/java/com/databasir/core/domain/user/event/converter/UserEventConverter.java b/core/src/main/java/com/databasir/core/domain/user/event/converter/UserEventConverter.java index be92577..ffb9f6e 100644 --- a/core/src/main/java/com/databasir/core/domain/user/event/converter/UserEventConverter.java +++ b/core/src/main/java/com/databasir/core/domain/user/event/converter/UserEventConverter.java @@ -2,7 +2,7 @@ package com.databasir.core.domain.user.event.converter; import com.databasir.core.domain.user.event.UserCreated; import com.databasir.core.domain.user.event.UserPasswordRenewed; -import com.databasir.dao.tables.pojos.UserPojo; +import com.databasir.dao.tables.pojos.User; import org.mapstruct.Mapper; import org.mapstruct.Mapping; @@ -11,11 +11,11 @@ import java.time.LocalDateTime; @Mapper(componentModel = "spring") public interface UserEventConverter { - UserPasswordRenewed userPasswordRenewed(UserPojo pojo, + UserPasswordRenewed userPasswordRenewed(User pojo, Integer renewByUserId, LocalDateTime renewTime, String newPassword); @Mapping(target = "userId", source = "userId") - UserCreated userCreated(UserPojo pojo, String source, String rawPassword, Integer userId); + UserCreated userCreated(User pojo, String source, String rawPassword, Integer userId); } diff --git a/core/src/main/java/com/databasir/core/domain/user/service/UserProjectService.java b/core/src/main/java/com/databasir/core/domain/user/service/UserProjectService.java index e831580..c2fe8e4 100644 --- a/core/src/main/java/com/databasir/core/domain/user/service/UserProjectService.java +++ b/core/src/main/java/com/databasir/core/domain/user/service/UserProjectService.java @@ -36,29 +36,29 @@ public class UserProjectService { FavoriteProjectPageCondition condition) { var data = userFavoriteProjectDao.selectByCondition(pageable, condition.toCondition(userId)); // project data - var projectIdList = data.map(UserFavoriteProjectPojo::getProjectId).toList(); - var projectPojos = projectDao.selectInIds(projectIdList); - var projectMapById = projectPojos.stream() - .collect(Collectors.toMap(ProjectPojo::getId, Function.identity())); + var projectIdList = data.map(UserFavoriteProject::getProjectId).toList(); + var projects = projectDao.selectInIds(projectIdList); + var projectMapById = projects.stream() + .collect(Collectors.toMap(Project::getId, Function.identity())); // dataSource data var dataSourceMapByProjectId = dataSourceDao.selectInProjectIds(projectIdList) .stream() - .collect(Collectors.toMap(DataSourcePojo::getProjectId, Function.identity())); + .collect(Collectors.toMap(DataSource::getProjectId, Function.identity())); // project sync rule data var projectSyncRuleMapByProjectId = projectSyncRuleDao.selectInProjectIds(projectIdList) .stream() - .collect(Collectors.toMap(ProjectSyncRulePojo::getProjectId, Function.identity())); + .collect(Collectors.toMap(ProjectSyncRule::getProjectId, Function.identity())); // group data - var groupIdList = projectPojos.stream().map(ProjectPojo::getGroupId).collect(Collectors.toList()); + var groupIdList = projects.stream().map(Project::getGroupId).collect(Collectors.toList()); var groupMapById = groupDao.selectInIds(groupIdList) .stream() - .collect(Collectors.toMap(GroupPojo::getId, Function.identity())); + .collect(Collectors.toMap(Group::getId, Function.identity())); // response data return data.map(favorite -> { - ProjectPojo project = projectMapById.get(favorite.getProjectId()); - DataSourcePojo dataSource = dataSourceMapByProjectId.get(favorite.getProjectId()); - ProjectSyncRulePojo projectSyncRule = projectSyncRuleMapByProjectId.get(favorite.getProjectId()); - GroupPojo group = null; + Project project = projectMapById.get(favorite.getProjectId()); + DataSource dataSource = dataSourceMapByProjectId.get(favorite.getProjectId()); + ProjectSyncRule projectSyncRule = projectSyncRuleMapByProjectId.get(favorite.getProjectId()); + Group group = null; if (project != null) { group = groupMapById.get(project.getGroupId()); } diff --git a/core/src/main/java/com/databasir/core/domain/user/service/UserService.java b/core/src/main/java/com/databasir/core/domain/user/service/UserService.java index 478c88b..51e8a6a 100644 --- a/core/src/main/java/com/databasir/core/domain/user/service/UserService.java +++ b/core/src/main/java/com/databasir/core/domain/user/service/UserService.java @@ -1,7 +1,7 @@ package com.databasir.core.domain.user.service; import com.databasir.core.domain.DomainErrors; -import com.databasir.core.domain.user.converter.UserPojoConverter; +import com.databasir.core.domain.user.converter.UserConverter; import com.databasir.core.domain.user.converter.UserResponseConverter; import com.databasir.core.domain.user.data.*; import com.databasir.core.domain.user.event.UserCreated; @@ -12,9 +12,9 @@ import com.databasir.dao.impl.GroupDao; import com.databasir.dao.impl.LoginDao; import com.databasir.dao.impl.UserDao; import com.databasir.dao.impl.UserRoleDao; -import com.databasir.dao.tables.pojos.GroupPojo; -import com.databasir.dao.tables.pojos.UserPojo; -import com.databasir.dao.tables.pojos.UserRolePojo; +import com.databasir.dao.tables.pojos.Group; +import com.databasir.dao.tables.pojos.User; +import com.databasir.dao.tables.pojos.UserRole; import lombok.RequiredArgsConstructor; import org.springframework.dao.DuplicateKeyException; import org.springframework.data.domain.Page; @@ -41,7 +41,7 @@ public class UserService { private final LoginDao loginDao; - private final UserPojoConverter userPojoConverter; + private final UserConverter userConverter; private final UserResponseConverter userResponseConverter; @@ -53,19 +53,19 @@ public class UserService { private BCryptPasswordEncoder bCryptPasswordEncoder = new BCryptPasswordEncoder(); public Page list(Pageable pageable, UserPageCondition condition) { - Page users = userDao.selectByPage(pageable, condition.toCondition()); + Page users = userDao.selectByPage(pageable, condition.toCondition()); List userIds = users.getContent() .stream() - .map(UserPojo::getId) + .map(User::getId) .collect(toList()); - List userRoles = userRoleDao.selectByUserIds(userIds); + List userRoles = userRoleDao.selectByUserIds(userIds); Map> groupIdMapByUserId = userRoles .stream() .filter(ur -> ur.getGroupId() != null) - .collect(groupingBy(UserRolePojo::getUserId, mapping(UserRolePojo::getGroupId, toList()))); - Map> sysOwnerGroupByUserId = userRoles.stream() + .collect(groupingBy(UserRole::getUserId, mapping(UserRole::getGroupId, toList()))); + Map> sysOwnerGroupByUserId = userRoles.stream() .filter(ur -> ur.getRole().equals(SYS_OWNER)) - .collect(groupingBy(UserRolePojo::getUserId)); + .collect(groupingBy(UserRole::getUserId)); return users.map(user -> userResponseConverter.pageResponse(user, sysOwnerGroupByUserId.containsKey(user.getId()), groupIdMapByUserId.get(user.getId()))); @@ -77,7 +77,7 @@ public class UserService { throw DomainErrors.USERNAME_OR_EMAIL_DUPLICATE.exception(); }); String hashedPassword = bCryptPasswordEncoder.encode(userCreateRequest.getPassword()); - UserPojo pojo = userPojoConverter.of(userCreateRequest, hashedPassword); + User pojo = userConverter.of(userCreateRequest, hashedPassword); try { Integer id = userDao.insertAndReturnId(pojo); // publish event @@ -90,36 +90,36 @@ public class UserService { } public UserDetailResponse get(Integer userId) { - UserPojo pojo = userDao.selectById(userId); - List roles = userRoleDao.selectByUserIds(Collections.singletonList(userId)); + User pojo = userDao.selectById(userId); + List roles = userRoleDao.selectByUserIds(Collections.singletonList(userId)); List groupIds = roles.stream() - .map(UserRolePojo::getGroupId) + .map(UserRole::getGroupId) .filter(Objects::nonNull) .collect(toList()); Map groupNameMapById = groupDao.selectInIds(groupIds) .stream() - .collect(toMap(GroupPojo::getId, GroupPojo::getName)); + .collect(toMap(Group::getId, Group::getName)); return userResponseConverter.detailResponse(pojo, roles, groupNameMapById); } public Optional get(String email) { return userDao.selectByEmail(email) .map(user -> { - List roles = userRoleDao.selectByUserIds(Collections.singletonList(user.getId())); + List roles = userRoleDao.selectByUserIds(Collections.singletonList(user.getId())); List groupIds = roles.stream() - .map(UserRolePojo::getGroupId) + .map(UserRole::getGroupId) .filter(Objects::nonNull) .collect(toList()); Map groupNameMapById = groupDao.selectInIds(groupIds) .stream() - .collect(toMap(GroupPojo::getId, GroupPojo::getName)); + .collect(toMap(Group::getId, Group::getName)); return userResponseConverter.detailResponse(user, roles, groupNameMapById); }); } @Transactional public String renewPassword(Integer renewByUserId, Integer userId) { - UserPojo pojo = userDao.selectById(userId); + User pojo = userDao.selectById(userId); String randomPassword = UUID.randomUUID().toString() .replace("-", "") .substring(0, 8); @@ -151,7 +151,7 @@ public class UserService { public void addSysOwnerTo(Integer userId) { if (!userRoleDao.hasRole(userId, SYS_OWNER)) { - UserRolePojo role = new UserRolePojo(); + UserRole role = new UserRole(); role.setUserId(userId); role.setRole(SYS_OWNER); userRoleDao.insertAndReturnId(role); @@ -162,8 +162,8 @@ public class UserService { if (!Objects.equals(request.getNewPassword(), request.getConfirmNewPassword())) { throw DomainErrors.UPDATE_PASSWORD_CONFIRM_FAILED.exception(); } - UserPojo userPojo = userDao.selectById(userId); - if (!bCryptPasswordEncoder.matches(request.getOriginPassword(), userPojo.getPassword())) { + User user = userDao.selectById(userId); + if (!bCryptPasswordEncoder.matches(request.getOriginPassword(), user.getPassword())) { throw DomainErrors.ORIGIN_PASSWORD_NOT_CORRECT.exception(); } String newHashedPassword = bCryptPasswordEncoder.encode(request.getNewPassword()); @@ -172,9 +172,9 @@ public class UserService { } public void updateNickname(Integer userId, UserNicknameUpdateRequest request) { - UserPojo userPojo = userDao.selectById(userId); - userPojo.setNickname(request.getNickname()); - userDao.updateById(userPojo); + User user = userDao.selectById(userId); + user.setNickname(request.getNickname()); + userDao.updateById(user); } @Transactional diff --git a/core/src/main/java/com/databasir/core/infrastructure/connection/CustomDatabaseConnectionFactory.java b/core/src/main/java/com/databasir/core/infrastructure/connection/CustomDatabaseConnectionFactory.java index a1c0a4b..69e6f52 100644 --- a/core/src/main/java/com/databasir/core/infrastructure/connection/CustomDatabaseConnectionFactory.java +++ b/core/src/main/java/com/databasir/core/infrastructure/connection/CustomDatabaseConnectionFactory.java @@ -4,7 +4,7 @@ import com.alibaba.excel.util.StringUtils; import com.databasir.core.domain.DomainErrors; import com.databasir.core.infrastructure.driver.DriverResources; import com.databasir.dao.impl.DatabaseTypeDao; -import com.databasir.dao.tables.pojos.DatabaseTypePojo; +import com.databasir.dao.tables.pojos.DatabaseType; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.core.annotation.Order; @@ -39,7 +39,7 @@ public class CustomDatabaseConnectionFactory implements DatabaseConnectionFactor @Override public Connection getConnection(Context context) throws SQLException { String databaseType = context.getDatabaseType(); - DatabaseTypePojo type = databaseTypeDao.selectByDatabaseType(databaseType); + DatabaseType type = databaseTypeDao.selectByDatabaseType(databaseType); File driverFile = loadDriver(type); URLClassLoader loader = null; @@ -85,7 +85,7 @@ public class CustomDatabaseConnectionFactory implements DatabaseConnectionFactor return driver.connect(jdbcUrl, info); } - private File loadDriver(DatabaseTypePojo type) { + private File loadDriver(DatabaseType type) { if (StringUtils.isNotBlank(type.getJdbcDriverFilePath())) { return driverResources.loadFromLocal(type.getJdbcDriverFilePath()).getDriverFile(); } diff --git a/core/src/main/java/com/databasir/core/infrastructure/connection/DatabaseConnectionService.java b/core/src/main/java/com/databasir/core/infrastructure/connection/DatabaseConnectionService.java index d1234c8..da4b9eb 100644 --- a/core/src/main/java/com/databasir/core/infrastructure/connection/DatabaseConnectionService.java +++ b/core/src/main/java/com/databasir/core/infrastructure/connection/DatabaseConnectionService.java @@ -3,9 +3,9 @@ package com.databasir.core.infrastructure.connection; import com.databasir.common.codec.Aes; import com.databasir.core.domain.DomainErrors; import com.databasir.dao.impl.SysKeyDao; -import com.databasir.dao.tables.pojos.DataSourcePojo; -import com.databasir.dao.tables.pojos.DataSourcePropertyPojo; -import com.databasir.dao.tables.pojos.SysKeyPojo; +import com.databasir.dao.tables.pojos.DataSource; +import com.databasir.dao.tables.pojos.DataSourceProperty; +import com.databasir.dao.tables.pojos.SysKey; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Component; @@ -22,9 +22,9 @@ public class DatabaseConnectionService { private final SysKeyDao sysKeyDao; - public Connection create(DataSourcePojo dataSource, - List dataSourceProperties) { - SysKeyPojo sysKey = sysKeyDao.selectTopOne(); + public Connection create(DataSource dataSource, + List dataSourceProperties) { + SysKey sysKey = sysKeyDao.selectTopOne(); String username = dataSource.getUsername(); String password = Aes.decryptFromBase64Data(dataSource.getPassword(), sysKey.getAesKey()); String url = dataSource.getUrl(); diff --git a/core/src/main/java/com/databasir/core/infrastructure/event/subscriber/DocumentEventSubscriber.java b/core/src/main/java/com/databasir/core/infrastructure/event/subscriber/DocumentEventSubscriber.java index a009493..b386ef3 100644 --- a/core/src/main/java/com/databasir/core/infrastructure/event/subscriber/DocumentEventSubscriber.java +++ b/core/src/main/java/com/databasir/core/infrastructure/event/subscriber/DocumentEventSubscriber.java @@ -2,19 +2,19 @@ package com.databasir.core.infrastructure.event.subscriber; import com.databasir.core.diff.data.DiffType; import com.databasir.core.diff.data.RootDiff; +import com.databasir.core.domain.document.converter.DocumentFullTextConverter; import com.databasir.core.domain.document.event.DocumentUpdated; import com.databasir.core.infrastructure.mail.MailSender; import com.databasir.core.infrastructure.mail.MailTemplateProcessor; -import com.databasir.dao.impl.ProjectDao; -import com.databasir.dao.impl.SysMailDao; -import com.databasir.dao.impl.UserDao; -import com.databasir.dao.tables.pojos.ProjectPojo; -import com.databasir.dao.tables.pojos.UserPojo; +import com.databasir.dao.impl.*; +import com.databasir.dao.tables.pojos.*; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.jooq.tools.StringUtils; import org.springframework.context.event.EventListener; import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Component; +import org.springframework.transaction.support.TransactionTemplate; import java.util.Collections; import java.util.HashMap; @@ -25,11 +25,24 @@ import java.util.stream.Collectors; @Component @RequiredArgsConstructor @Slf4j -@Async("mailThreadPoolTaskExecutor") public class DocumentEventSubscriber { private final ProjectDao projectDao; + private final GroupDao groupDao; + + private final DatabaseDocumentDao databaseDocumentDao; + + private final TableDocumentDao tableDocumentDao; + + private final TableColumnDocumentDao tableColumnDocumentDao; + + private final DocumentDescriptionDao documentDescriptionDao; + + private final DocumentFullTextDao documentFullTextDao; + + private final DocumentFullTextConverter documentFullTextConverter; + private final MailSender mailSender; private final UserDao userDao; @@ -38,18 +51,21 @@ public class DocumentEventSubscriber { private final MailTemplateProcessor mailTemplateProcessor; + private final TransactionTemplate transactionTemplate; + @EventListener(classes = DocumentUpdated.class) - public void onDocumentUpdated(DocumentUpdated created) { + @Async("mailThreadPoolTaskExecutor") + public void sendMailOnUpdated(DocumentUpdated event) { sysMailDao.selectOptionTopOne().ifPresent(mail -> { - ProjectPojo project = projectDao.selectById(created.getProjectId()); + Project project = projectDao.selectById(event.getProjectId()); List to = userDao.selectEnabledGroupMembers(project.getGroupId()) .stream() - .map(UserPojo::getEmail) + .map(User::getEmail) .filter(userEmail -> userEmail.contains("@")) .collect(Collectors.toList()); if (!to.isEmpty()) { String subject = project.getName() + " 文档有新的内容变更"; - List> diffs = created.getDiff() + List> diffs = event.getDiff() .map(this::diffs) .orElseGet(Collections::emptyList); Map context = new HashMap<>(); @@ -61,6 +77,11 @@ public class DocumentEventSubscriber { }); } + @EventListener(classes = DocumentUpdated.class) + public void updateFullTextOnUpdated(DocumentUpdated event) { + updateFullTextIndex(event); + } + private List> diffs(RootDiff diff) { if (diff.getDiffType() == DiffType.NONE) { return Collections.emptyList(); @@ -81,4 +102,46 @@ public class DocumentEventSubscriber { } } + private void updateFullTextIndex(DocumentUpdated event) { + Integer projectId = event.getProjectId(); + Project project = projectDao.selectById(projectId); + Group group = groupDao.selectById(project.getGroupId()); + // save full text + var descriptionMapByJoinName = documentDescriptionDao.selectByProjectId(projectId) + .stream() + .collect(Collectors.toMap( + d -> { + if (d.getColumnName() == null) { + return d.getTableName(); + } + return String.join(".", + d.getTableName(), + StringUtils.defaultIfBlank(d.getColumnName(), "")); + }, + DocumentDescription::getContent, + (a, b) -> a)); + DatabaseDocument database = databaseDocumentDao.selectById(event.getDatabaseDocumentId()); + List tables = tableDocumentDao.selectByDatabaseDocumentId(event.getDatabaseDocumentId()); + + // begin transaction + transactionTemplate.executeWithoutResult(status -> { + // delete all project.table full text + int deletedRows = documentFullTextDao.deleteTableFullText(event.getProjectId()); + // recreate + for (TableDocument table : tables) { + List columns = tableColumnDocumentDao.selectByTableDocumentId(table.getId()); + List fullTextPojoList = columns.stream() + .map(column -> { + String tableName = table.getName(); + String tableDescription = descriptionMapByJoinName.get(tableName); + String columnDescription = descriptionMapByJoinName.get(tableName + "." + column.getName()); + return documentFullTextConverter.toPojo(group, project, database, table, column, + tableDescription, columnDescription); + }) + .collect(Collectors.toList()); + documentFullTextDao.batchInsert(fullTextPojoList); + } + log.info("refresh project({}) tables fultext success, deleted {} items", projectId, deletedRows); + }); + } } diff --git a/core/src/main/java/com/databasir/core/infrastructure/event/subscriber/GroupEventSubscriber.java b/core/src/main/java/com/databasir/core/infrastructure/event/subscriber/GroupEventSubscriber.java index 733a585..ba37800 100644 --- a/core/src/main/java/com/databasir/core/infrastructure/event/subscriber/GroupEventSubscriber.java +++ b/core/src/main/java/com/databasir/core/infrastructure/event/subscriber/GroupEventSubscriber.java @@ -5,7 +5,7 @@ import com.databasir.core.domain.group.event.GroupDeleted; import com.databasir.core.domain.group.event.GroupUpdated; import com.databasir.dao.Tables; import com.databasir.dao.impl.DocumentFullTextDao; -import com.databasir.dao.tables.pojos.DocumentFullTextPojo; +import com.databasir.dao.tables.pojos.DocumentFullText; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.context.event.EventListener; @@ -24,7 +24,7 @@ public class GroupEventSubscriber { public void refreshFullTextWhenUpdated(GroupUpdated event) { if (!documentFullTextDao.exists(Tables.DOCUMENT_FULL_TEXT.GROUP_ID.eq(event.getGroupId()) .and(Tables.DOCUMENT_FULL_TEXT.PROJECT_ID.isNull()))) { - DocumentFullTextPojo pojo = new DocumentFullTextPojo(); + DocumentFullText pojo = new DocumentFullText(); pojo.setGroupId(event.getGroupId()); pojo.setGroupName(event.getGroupName()); pojo.setGroupDescription(event.getGroupDescription()); @@ -48,7 +48,7 @@ public class GroupEventSubscriber { public void addFullTextWhenCreated(GroupCreated event) { if (!documentFullTextDao.exists(Tables.DOCUMENT_FULL_TEXT.GROUP_ID.eq(event.getGroupId()) .and(Tables.DOCUMENT_FULL_TEXT.PROJECT_ID.isNull()))) { - DocumentFullTextPojo pojo = new DocumentFullTextPojo(); + DocumentFullText pojo = new DocumentFullText(); pojo.setGroupId(event.getGroupId()); pojo.setGroupName(event.getGroupName()); pojo.setGroupDescription(event.getGroupDescription()); diff --git a/core/src/main/java/com/databasir/core/infrastructure/event/subscriber/ProjectEventSubscriber.java b/core/src/main/java/com/databasir/core/infrastructure/event/subscriber/ProjectEventSubscriber.java index cc6b884..7cd57e4 100644 --- a/core/src/main/java/com/databasir/core/infrastructure/event/subscriber/ProjectEventSubscriber.java +++ b/core/src/main/java/com/databasir/core/infrastructure/event/subscriber/ProjectEventSubscriber.java @@ -4,7 +4,7 @@ import com.databasir.core.domain.project.event.ProjectDeleted; import com.databasir.core.domain.project.event.ProjectSaved; import com.databasir.dao.Tables; import com.databasir.dao.impl.DocumentFullTextDao; -import com.databasir.dao.tables.pojos.DocumentFullTextPojo; +import com.databasir.dao.tables.pojos.DocumentFullText; import com.databasir.dao.value.FullTextProjectInfoUpdatePojo; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; @@ -26,7 +26,7 @@ public class ProjectEventSubscriber { public void refreshFullTextWhenUpdated(ProjectSaved event) { if (!documentFullTextDao.exists(Tables.DOCUMENT_FULL_TEXT.PROJECT_ID.eq(event.getProjectId()) .and(Tables.DOCUMENT_FULL_TEXT.TABLE_DOCUMENT_ID.isNull()))) { - DocumentFullTextPojo pojo = new DocumentFullTextPojo(); + DocumentFullText pojo = new DocumentFullText(); pojo.setGroupId(event.getGroupId()); pojo.setProjectId(event.getProjectId()); pojo.setProjectName(event.getProjectName()); diff --git a/core/src/main/java/com/databasir/core/infrastructure/event/subscriber/SystemStartedEventSubscriber.java b/core/src/main/java/com/databasir/core/infrastructure/event/subscriber/SystemStartedEventSubscriber.java index f54b911..704d0ae 100644 --- a/core/src/main/java/com/databasir/core/infrastructure/event/subscriber/SystemStartedEventSubscriber.java +++ b/core/src/main/java/com/databasir/core/infrastructure/event/subscriber/SystemStartedEventSubscriber.java @@ -8,10 +8,10 @@ import com.databasir.dao.impl.DocumentTemplatePropertyDao; import com.databasir.dao.impl.SysKeyDao; import com.databasir.dao.impl.UserDao; import com.databasir.dao.impl.UserRoleDao; -import com.databasir.dao.tables.pojos.DocumentTemplatePropertyPojo; -import com.databasir.dao.tables.pojos.SysKeyPojo; -import com.databasir.dao.tables.pojos.UserPojo; -import com.databasir.dao.tables.pojos.UserRolePojo; +import com.databasir.dao.tables.pojos.DocumentTemplateProperty; +import com.databasir.dao.tables.pojos.SysKey; +import com.databasir.dao.tables.pojos.User; +import com.databasir.dao.tables.pojos.UserRole; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.context.event.ContextRefreshedEvent; @@ -55,10 +55,10 @@ public class SystemStartedEventSubscriber { List ignoreFields = List.of("createAt", "discussionCount", "id", "columns", "indexes", "triggers", "foreignKeys", "diffType", "original", "keySeq"); Map fieldChineseMap = fieldChineseMap(); - BiFunction mapping = (field, type) -> { + BiFunction mapping = (field, type) -> { String key = field.getName(); String def = field.getName(); - DocumentTemplatePropertyPojo pojo = new DocumentTemplatePropertyPojo(); + DocumentTemplateProperty pojo = new DocumentTemplateProperty(); pojo.setType(type); pojo.setKey(key); pojo.setDefaultValue(fieldChineseMap.getOrDefault(key, def)); @@ -66,40 +66,40 @@ public class SystemStartedEventSubscriber { }; // table field name; Field[] fields = TableDocumentResponse.class.getDeclaredFields(); - List tableProperties = Arrays.stream(fields) + List tableProperties = Arrays.stream(fields) .filter(field -> !ignoreFields.contains(field.getName())) .map(field -> mapping.apply(field, DocumentTemplatePropertyType.TABLE_FIELD_NAME)) .collect(Collectors.toList()); // column field name; Field[] columnFields = TableDocumentResponse.ColumnDocumentResponse.class.getDeclaredFields(); - List columnProperties = Arrays.stream(columnFields) + List columnProperties = Arrays.stream(columnFields) .filter(f -> !ignoreFields.contains(f.getName())) .map(field -> mapping.apply(field, DocumentTemplatePropertyType.COLUMN_FIELD_NAME)) .collect(Collectors.toList()); // index field name; Field[] indexFields = TableDocumentResponse.IndexDocumentResponse.class.getDeclaredFields(); - List indexProperties = Arrays.stream(indexFields) + List indexProperties = Arrays.stream(indexFields) .filter(f -> !ignoreFields.contains(f.getName())) .map(field -> mapping.apply(field, DocumentTemplatePropertyType.INDEX_FIELD_NAME)) .collect(Collectors.toList()); // foreign key field name; Field[] fkFields = TableDocumentResponse.ForeignKeyDocumentResponse.class.getDeclaredFields(); - List fkProperties = Arrays.stream(fkFields) + List fkProperties = Arrays.stream(fkFields) .filter(f -> !ignoreFields.contains(f.getName())) .map(field -> mapping.apply(field, DocumentTemplatePropertyType.FOREIGN_KEY_FIELD_NAME)) .collect(Collectors.toList()); // trigger field name; Field[] triggerFields = TableDocumentResponse.TriggerDocumentResponse.class.getDeclaredFields(); - List triggerProperties = Arrays.stream(triggerFields) + List triggerProperties = Arrays.stream(triggerFields) .filter(f -> !ignoreFields.contains(f.getName())) .map(field -> mapping.apply(field, DocumentTemplatePropertyType.TRIGGER_FIELD_NAME)) .collect(Collectors.toList()); - List properties = new ArrayList<>(); + List properties = new ArrayList<>(); properties.addAll(tableProperties); properties.addAll(columnProperties); properties.addAll(indexProperties); @@ -145,7 +145,7 @@ public class SystemStartedEventSubscriber { private void initSysOwnerIfNecessary() { sysKeyDao.selectOptionTopOne() .orElseGet(() -> { - SysKeyPojo pojo = new SysKeyPojo(); + SysKey pojo = new SysKey(); pojo.setAesKey(Aes.randomBase64Key()); Rsa.RsaBase64Key key = Rsa.generateBase64Key(); pojo.setRsaPublicKey(key.getPublicBase64Key()); @@ -156,16 +156,16 @@ public class SystemStartedEventSubscriber { String email = "N/A"; String username = "databasir"; - Optional userOpt = userDao.selectByEmailOrUsername(username); + Optional userOpt = userDao.selectByEmailOrUsername(username); if (!userOpt.isPresent()) { - UserPojo admin = new UserPojo(); + User admin = new User(); admin.setEmail(email); admin.setUsername(username); admin.setPassword(bCryptPasswordEncoder.encode(username)); admin.setEnabled(true); admin.setNickname("Databasir Admin"); Integer userId = userDao.insertAndReturnId(admin); - UserRolePojo role = new UserRolePojo(); + UserRole role = new UserRole(); role.setUserId(userId); role.setRole(SYS_OWNER); userRoleDao.insertAndReturnId(role); diff --git a/core/src/main/java/com/databasir/core/infrastructure/event/subscriber/UserEventSubscriber.java b/core/src/main/java/com/databasir/core/infrastructure/event/subscriber/UserEventSubscriber.java index d2f9f28..92ad284 100644 --- a/core/src/main/java/com/databasir/core/infrastructure/event/subscriber/UserEventSubscriber.java +++ b/core/src/main/java/com/databasir/core/infrastructure/event/subscriber/UserEventSubscriber.java @@ -7,7 +7,7 @@ import com.databasir.core.infrastructure.mail.MailSender; import com.databasir.core.infrastructure.mail.MailTemplateProcessor; import com.databasir.dao.impl.SysMailDao; import com.databasir.dao.impl.UserDao; -import com.databasir.dao.tables.pojos.UserPojo; +import com.databasir.dao.tables.pojos.User; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.context.event.EventListener; @@ -33,7 +33,7 @@ public class UserEventSubscriber { @EventListener(classes = UserPasswordRenewed.class) public void onPasswordRenewed(UserPasswordRenewed event) { - UserPojo operator = userDao.selectById(event.getRenewByUserId()); + User operator = userDao.selectById(event.getRenewByUserId()); sysMailDao.selectOptionTopOne() .ifPresent(mailPojo -> { String renewBy = operator.getNickname(); diff --git a/core/src/main/java/com/databasir/core/infrastructure/mail/MailSender.java b/core/src/main/java/com/databasir/core/infrastructure/mail/MailSender.java index 8668709..b832e4a 100644 --- a/core/src/main/java/com/databasir/core/infrastructure/mail/MailSender.java +++ b/core/src/main/java/com/databasir/core/infrastructure/mail/MailSender.java @@ -1,7 +1,7 @@ package com.databasir.core.infrastructure.mail; import com.databasir.common.SystemException; -import com.databasir.dao.tables.pojos.SysMailPojo; +import com.databasir.dao.tables.pojos.SysMail; import org.springframework.mail.javamail.JavaMailSender; import org.springframework.mail.javamail.JavaMailSenderImpl; import org.springframework.mail.javamail.MimeMessageHelper; @@ -16,14 +16,14 @@ import java.util.Collections; @Component public class MailSender { - public void sendHtml(SysMailPojo mail, + public void sendHtml(SysMail mail, String to, String subject, String content) { this.batchSendHtml(mail, Collections.singleton(to), subject, content); } - public void batchSendHtml(SysMailPojo mail, + public void batchSendHtml(SysMail mail, Collection to, String subject, String content) { @@ -41,7 +41,7 @@ public class MailSender { } } - private JavaMailSender initJavaMailSender(SysMailPojo properties) { + private JavaMailSender initJavaMailSender(SysMail properties) { JavaMailSenderImpl sender = new JavaMailSenderImpl(); sender.setHost(properties.getSmtpHost()); if (properties.getSmtpPort() != null) { diff --git a/core/src/test/java/com/databasir/core/domain/database/service/DatabaseTypeServiceTest.java b/core/src/test/java/com/databasir/core/domain/database/service/DatabaseTypeServiceTest.java index 2035893..786f612 100644 --- a/core/src/test/java/com/databasir/core/domain/database/service/DatabaseTypeServiceTest.java +++ b/core/src/test/java/com/databasir/core/domain/database/service/DatabaseTypeServiceTest.java @@ -8,7 +8,7 @@ import com.databasir.core.domain.database.data.DatabaseTypeUpdateRequest; import com.databasir.core.infrastructure.driver.DriverResources; import com.databasir.core.infrastructure.driver.DriverResult; import com.databasir.dao.impl.DatabaseTypeDao; -import com.databasir.dao.tables.pojos.DatabaseTypePojo; +import com.databasir.dao.tables.pojos.DatabaseType; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -87,7 +87,7 @@ class DatabaseTypeServiceTest extends BaseTest { request.setUrlPattern("{{jdbc.protocol}}//{{db.url}}/{{db.schema}}"); databaseTypeService.update(request); - DatabaseTypePojo pojo = databaseTypeDao.selectByDatabaseType("new-type"); + DatabaseType pojo = databaseTypeDao.selectByDatabaseType("new-type"); Assertions.assertNotNull(pojo); Assertions.assertEquals("integration test", pojo.getDescription()); Assertions.assertEquals("jdbc:postgresql", pojo.getJdbcProtocol()); diff --git a/core/src/test/java/com/databasir/core/domain/description/service/DocumentDescriptionServiceTest.java b/core/src/test/java/com/databasir/core/domain/description/service/DocumentDescriptionServiceTest.java index bf25675..7deb207 100644 --- a/core/src/test/java/com/databasir/core/domain/description/service/DocumentDescriptionServiceTest.java +++ b/core/src/test/java/com/databasir/core/domain/description/service/DocumentDescriptionServiceTest.java @@ -3,7 +3,7 @@ package com.databasir.core.domain.description.service; import com.databasir.core.BaseTest; import com.databasir.core.domain.description.data.DocumentDescriptionSaveRequest; import com.databasir.dao.impl.DocumentDescriptionDao; -import com.databasir.dao.tables.pojos.DocumentDescriptionPojo; +import com.databasir.dao.tables.pojos.DocumentDescription; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; @@ -42,7 +42,7 @@ class DocumentDescriptionServiceTest extends BaseTest { documentDescriptionService.save(groupId, projectId, userId, updateRequest); var tableData = documentDescriptionDao.selectTableDescriptionByProjectId(projectId); Assertions.assertEquals(0, tableData.size()); - List descriptionData = documentDescriptionDao.selectByProjectId(projectId); + List descriptionData = documentDescriptionDao.selectByProjectId(projectId); Assertions.assertEquals(1, descriptionData.size()); } } \ No newline at end of file diff --git a/core/src/test/java/com/databasir/core/domain/group/service/GroupServiceTest.java b/core/src/test/java/com/databasir/core/domain/group/service/GroupServiceTest.java index 6adb66c..e0d5a2d 100644 --- a/core/src/test/java/com/databasir/core/domain/group/service/GroupServiceTest.java +++ b/core/src/test/java/com/databasir/core/domain/group/service/GroupServiceTest.java @@ -12,8 +12,8 @@ import com.databasir.dao.impl.GroupDao; import com.databasir.dao.impl.ProjectDao; import com.databasir.dao.impl.ProjectSyncRuleDao; import com.databasir.dao.impl.UserRoleDao; -import com.databasir.dao.tables.pojos.ProjectSyncRulePojo; -import com.databasir.dao.tables.pojos.UserRolePojo; +import com.databasir.dao.tables.pojos.ProjectSyncRule; +import com.databasir.dao.tables.pojos.UserRole; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.test.context.jdbc.Sql; @@ -53,7 +53,7 @@ class GroupServiceTest extends BaseTest { Integer groupId = groupService.create(request); assertNotNull(groupId); - List roles = userRoleDao.selectByUserIds(List.of(1, 2, 3)) + List roles = userRoleDao.selectByUserIds(List.of(1, 2, 3)) .stream() .filter(r -> Objects.equals(r.getGroupId(), groupId) && r.getRole().equals("GROUP_OWNER")) .collect(Collectors.toList()); @@ -71,11 +71,11 @@ class GroupServiceTest extends BaseTest { request.setGroupOwnerUserIds(List.of(1000, 1001)); groupService.update(request); - List members = userRoleDao.selectList(Tables.USER_ROLE.GROUP_ID.eq(groupId)); + List members = userRoleDao.selectList(Tables.USER_ROLE.GROUP_ID.eq(groupId)); assertEquals(3, members.size()); List ownerUserIds = members.stream() .filter(r -> r.getRole().equals("GROUP_OWNER")) - .map(UserRolePojo::getUserId) + .map(UserRole::getUserId) .collect(Collectors.toList()); assertEquals(2, ownerUserIds.size()); assertTrue(ownerUserIds.contains(1000)); @@ -95,11 +95,11 @@ class GroupServiceTest extends BaseTest { assertEquals(0, projectIds.size()); // should clear group members - List members = userRoleDao.selectList(Tables.USER_ROLE.GROUP_ID.eq(groupId)); + List members = userRoleDao.selectList(Tables.USER_ROLE.GROUP_ID.eq(groupId)); assertEquals(0, members.size()); // should clear project sync schedule - List syncRule = projectSyncRuleDao.selectInProjectIds(undeleteProjectIds); + List syncRule = projectSyncRuleDao.selectInProjectIds(undeleteProjectIds); assertTrue(syncRule.stream().allMatch(r -> !r.getIsAutoSync())); } @@ -154,7 +154,7 @@ class GroupServiceTest extends BaseTest { groupService.changeMemberRole(groupId, userId, RoleConstants.GROUP_OWNER); assertTrue(userRoleDao.hasRole(userId, groupId, RoleConstants.GROUP_OWNER)); - List roles = userRoleDao.selectByUserIds(List.of(userId)); + List roles = userRoleDao.selectByUserIds(List.of(userId)); assertEquals(1, roles.size()); } } \ No newline at end of file diff --git a/core/src/test/java/com/databasir/core/domain/login/service/LoginServiceTest.java b/core/src/test/java/com/databasir/core/domain/login/service/LoginServiceTest.java index 69f314d..6869ba1 100644 --- a/core/src/test/java/com/databasir/core/domain/login/service/LoginServiceTest.java +++ b/core/src/test/java/com/databasir/core/domain/login/service/LoginServiceTest.java @@ -7,7 +7,7 @@ import com.databasir.core.domain.login.data.AccessTokenRefreshRequest; import com.databasir.core.domain.login.data.AccessTokenRefreshResponse; import com.databasir.core.domain.login.data.LoginKeyResponse; import com.databasir.dao.impl.LoginDao; -import com.databasir.dao.tables.pojos.LoginPojo; +import com.databasir.dao.tables.pojos.Login; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; @@ -74,7 +74,7 @@ class LoginServiceTest extends BaseTest { int userId = -1000; LoginKeyResponse token = loginService.generate(userId); Assertions.assertNotNull(token); - Optional loginOpt = loginDao.selectByUserId(userId); + Optional loginOpt = loginDao.selectByUserId(userId); Assertions.assertTrue(loginOpt.isPresent()); Assertions.assertEquals(token.getAccessToken(), loginOpt.get().getAccessToken()); Assertions.assertEquals(token.getRefreshToken(), loginOpt.get().getRefreshToken()); diff --git a/core/src/test/java/com/databasir/core/domain/project/service/ProjectServiceTest.java b/core/src/test/java/com/databasir/core/domain/project/service/ProjectServiceTest.java index 92feb16..b814aae 100644 --- a/core/src/test/java/com/databasir/core/domain/project/service/ProjectServiceTest.java +++ b/core/src/test/java/com/databasir/core/domain/project/service/ProjectServiceTest.java @@ -11,7 +11,7 @@ import com.databasir.core.domain.project.data.ProjectUpdateRequest.ProjectSyncRu import com.databasir.core.infrastructure.connection.DatabaseTypes; import com.databasir.dao.impl.ProjectDao; import com.databasir.dao.impl.ProjectSyncRuleDao; -import com.databasir.dao.tables.pojos.ProjectSyncRulePojo; +import com.databasir.dao.tables.pojos.ProjectSyncRule; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; @@ -105,7 +105,7 @@ class ProjectServiceTest extends BaseTest { int projectId = -1000; projectService.delete(projectId); Assertions.assertFalse(projectDao.existsById(projectId)); - ProjectSyncRulePojo syncRule = projectSyncRuleDao.selectByProjectId(projectId); + ProjectSyncRule syncRule = projectSyncRuleDao.selectByProjectId(projectId); Assertions.assertNotNull(syncRule); Assertions.assertNotNull(syncRule.getAutoSyncCron()); Assertions.assertFalse(syncRule.getIsAutoSync()); diff --git a/core/src/test/java/com/databasir/core/domain/user/service/UserServiceTest.java b/core/src/test/java/com/databasir/core/domain/user/service/UserServiceTest.java index 987d02a..b468049 100644 --- a/core/src/test/java/com/databasir/core/domain/user/service/UserServiceTest.java +++ b/core/src/test/java/com/databasir/core/domain/user/service/UserServiceTest.java @@ -9,9 +9,9 @@ import com.databasir.core.infrastructure.event.subscriber.UserEventSubscriber; import com.databasir.dao.impl.LoginDao; import com.databasir.dao.impl.UserDao; import com.databasir.dao.impl.UserRoleDao; -import com.databasir.dao.tables.pojos.LoginPojo; -import com.databasir.dao.tables.pojos.UserPojo; -import com.databasir.dao.tables.pojos.UserRolePojo; +import com.databasir.dao.tables.pojos.Login; +import com.databasir.dao.tables.pojos.User; +import com.databasir.dao.tables.pojos.UserRole; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.mock.mockito.MockBean; @@ -78,12 +78,12 @@ class UserServiceTest extends BaseTest { void switchEnableStatusToFalse() { Integer userId = -999; userService.switchEnableStatus(userId, false); - UserPojo user = userDao.selectById(userId); + User user = userDao.selectById(userId); assertNotNull(user); assertFalse(user.getEnabled()); - Optional loginPojoOpt = loginDao.selectByUserId(userId); - assertTrue(loginPojoOpt.isEmpty()); + Optional login = loginDao.selectByUserId(userId); + assertTrue(login.isEmpty()); } @Test @@ -91,7 +91,7 @@ class UserServiceTest extends BaseTest { void removeSysOwnerFrom() { Integer userId = -998; userService.removeSysOwnerFrom(userId); - List roles = userRoleDao.selectByUserIds(Collections.singletonList(userId)) + List roles = userRoleDao.selectByUserIds(Collections.singletonList(userId)) .stream().filter(role -> role.getRole().equals(SYS_OWNER)) .collect(Collectors.toList()); assertEquals(0, roles.size()); @@ -102,7 +102,7 @@ class UserServiceTest extends BaseTest { void addSysOwnerTo() { Integer userId = -999; userService.addSysOwnerTo(userId); - List roles = userRoleDao.selectByUserIds(Collections.singletonList(userId)) + List roles = userRoleDao.selectByUserIds(Collections.singletonList(userId)) .stream().filter(role -> role.getRole().equals(SYS_OWNER)) .collect(Collectors.toList()); @@ -120,8 +120,8 @@ class UserServiceTest extends BaseTest { Integer userId = -999; userService.updatePassword(userId, request); // should delete login info - Optional loginPojoOpt = loginDao.selectByUserId(userId); - assertTrue(loginPojoOpt.isEmpty()); + Optional login = loginDao.selectByUserId(userId); + assertTrue(login.isEmpty()); } @Test @@ -133,7 +133,7 @@ class UserServiceTest extends BaseTest { request.setNickname(nickname); userService.updateNickname(userId, request); - UserPojo user = userDao.selectById(userId); + User user = userDao.selectById(userId); assertNotNull(user); assertEquals(nickname, user.getNickname()); } diff --git a/dao/generated-src/jooq/main/java/com/databasir/dao/Databasir.java b/dao/generated-src/jooq/main/java/com/databasir/dao/Databasir.java index ba98d75..eed7fb6 100644 --- a/dao/generated-src/jooq/main/java/com/databasir/dao/Databasir.java +++ b/dao/generated-src/jooq/main/java/com/databasir/dao/Databasir.java @@ -4,32 +4,32 @@ package com.databasir.dao; -import com.databasir.dao.tables.DataSource; -import com.databasir.dao.tables.DataSourceProperty; -import com.databasir.dao.tables.DatabaseDocument; -import com.databasir.dao.tables.DatabaseType; -import com.databasir.dao.tables.DocumentDescription; -import com.databasir.dao.tables.DocumentDiscussion; -import com.databasir.dao.tables.DocumentFullText; -import com.databasir.dao.tables.DocumentTemplateProperty; -import com.databasir.dao.tables.Group; -import com.databasir.dao.tables.Login; -import com.databasir.dao.tables.MockDataRule; -import com.databasir.dao.tables.OauthApp; -import com.databasir.dao.tables.OperationLog; -import com.databasir.dao.tables.Project; -import com.databasir.dao.tables.ProjectSyncRule; -import com.databasir.dao.tables.ProjectSyncTask; -import com.databasir.dao.tables.SysKey; -import com.databasir.dao.tables.SysMail; -import com.databasir.dao.tables.TableColumnDocument; -import com.databasir.dao.tables.TableDocument; -import com.databasir.dao.tables.TableForeignKeyDocument; -import com.databasir.dao.tables.TableIndexDocument; -import com.databasir.dao.tables.TableTriggerDocument; -import com.databasir.dao.tables.User; -import com.databasir.dao.tables.UserFavoriteProject; -import com.databasir.dao.tables.UserRole; +import com.databasir.dao.tables.DataSourcePropertyTable; +import com.databasir.dao.tables.DataSourceTable; +import com.databasir.dao.tables.DatabaseDocumentTable; +import com.databasir.dao.tables.DatabaseTypeTable; +import com.databasir.dao.tables.DocumentDescriptionTable; +import com.databasir.dao.tables.DocumentDiscussionTable; +import com.databasir.dao.tables.DocumentFullTextTable; +import com.databasir.dao.tables.DocumentTemplatePropertyTable; +import com.databasir.dao.tables.GroupTable; +import com.databasir.dao.tables.LoginTable; +import com.databasir.dao.tables.MockDataRuleTable; +import com.databasir.dao.tables.OauthAppTable; +import com.databasir.dao.tables.OperationLogTable; +import com.databasir.dao.tables.ProjectSyncRuleTable; +import com.databasir.dao.tables.ProjectSyncTaskTable; +import com.databasir.dao.tables.ProjectTable; +import com.databasir.dao.tables.SysKeyTable; +import com.databasir.dao.tables.SysMailTable; +import com.databasir.dao.tables.TableColumnDocumentTable; +import com.databasir.dao.tables.TableDocumentTable; +import com.databasir.dao.tables.TableForeignKeyDocumentTable; +import com.databasir.dao.tables.TableIndexDocumentTable; +import com.databasir.dao.tables.TableTriggerDocumentTable; +import com.databasir.dao.tables.UserFavoriteProjectTable; +import com.databasir.dao.tables.UserRoleTable; +import com.databasir.dao.tables.UserTable; import java.util.Arrays; import java.util.List; @@ -55,132 +55,132 @@ public class Databasir extends SchemaImpl { /** * The table databasir.data_source. */ - public final DataSource DATA_SOURCE = DataSource.DATA_SOURCE; + public final DataSourceTable DATA_SOURCE = DataSourceTable.DATA_SOURCE; /** * The table databasir.data_source_property. */ - public final DataSourceProperty DATA_SOURCE_PROPERTY = DataSourceProperty.DATA_SOURCE_PROPERTY; + public final DataSourcePropertyTable DATA_SOURCE_PROPERTY = DataSourcePropertyTable.DATA_SOURCE_PROPERTY; /** * The table databasir.database_document. */ - public final DatabaseDocument DATABASE_DOCUMENT = DatabaseDocument.DATABASE_DOCUMENT; + public final DatabaseDocumentTable DATABASE_DOCUMENT = DatabaseDocumentTable.DATABASE_DOCUMENT; /** * customer database types */ - public final DatabaseType DATABASE_TYPE = DatabaseType.DATABASE_TYPE; + public final DatabaseTypeTable DATABASE_TYPE = DatabaseTypeTable.DATABASE_TYPE; /** * custom document description */ - public final DocumentDescription DOCUMENT_DESCRIPTION = DocumentDescription.DOCUMENT_DESCRIPTION; + public final DocumentDescriptionTable DOCUMENT_DESCRIPTION = DocumentDescriptionTable.DOCUMENT_DESCRIPTION; /** * The table databasir.document_discussion. */ - public final DocumentDiscussion DOCUMENT_DISCUSSION = DocumentDiscussion.DOCUMENT_DISCUSSION; + public final DocumentDiscussionTable DOCUMENT_DISCUSSION = DocumentDiscussionTable.DOCUMENT_DISCUSSION; /** * The table databasir.document_full_text. */ - public final DocumentFullText DOCUMENT_FULL_TEXT = DocumentFullText.DOCUMENT_FULL_TEXT; + public final DocumentFullTextTable DOCUMENT_FULL_TEXT = DocumentFullTextTable.DOCUMENT_FULL_TEXT; /** * template property */ - public final DocumentTemplateProperty DOCUMENT_TEMPLATE_PROPERTY = DocumentTemplateProperty.DOCUMENT_TEMPLATE_PROPERTY; + public final DocumentTemplatePropertyTable DOCUMENT_TEMPLATE_PROPERTY = DocumentTemplatePropertyTable.DOCUMENT_TEMPLATE_PROPERTY; /** * The table databasir.group. */ - public final Group GROUP = Group.GROUP; + public final GroupTable GROUP = GroupTable.GROUP; /** * The table databasir.login. */ - public final Login LOGIN = Login.LOGIN; + public final LoginTable LOGIN = LoginTable.LOGIN; /** * The table databasir.mock_data_rule. */ - public final MockDataRule MOCK_DATA_RULE = MockDataRule.MOCK_DATA_RULE; + public final MockDataRuleTable MOCK_DATA_RULE = MockDataRuleTable.MOCK_DATA_RULE; /** * oauth app info */ - public final OauthApp OAUTH_APP = OauthApp.OAUTH_APP; + public final OauthAppTable OAUTH_APP = OauthAppTable.OAUTH_APP; /** * The table databasir.operation_log. */ - public final OperationLog OPERATION_LOG = OperationLog.OPERATION_LOG; + public final OperationLogTable OPERATION_LOG = OperationLogTable.OPERATION_LOG; /** * The table databasir.project. */ - public final Project PROJECT = Project.PROJECT; + public final ProjectTable PROJECT = ProjectTable.PROJECT; /** * The table databasir.project_sync_rule. */ - public final ProjectSyncRule PROJECT_SYNC_RULE = ProjectSyncRule.PROJECT_SYNC_RULE; + public final ProjectSyncRuleTable PROJECT_SYNC_RULE = ProjectSyncRuleTable.PROJECT_SYNC_RULE; /** * The table databasir.project_sync_task. */ - public final ProjectSyncTask PROJECT_SYNC_TASK = ProjectSyncTask.PROJECT_SYNC_TASK; + public final ProjectSyncTaskTable PROJECT_SYNC_TASK = ProjectSyncTaskTable.PROJECT_SYNC_TASK; /** * The table databasir.sys_key. */ - public final SysKey SYS_KEY = SysKey.SYS_KEY; + public final SysKeyTable SYS_KEY = SysKeyTable.SYS_KEY; /** * The table databasir.sys_mail. */ - public final SysMail SYS_MAIL = SysMail.SYS_MAIL; + public final SysMailTable SYS_MAIL = SysMailTable.SYS_MAIL; /** * The table databasir.table_column_document. */ - public final TableColumnDocument TABLE_COLUMN_DOCUMENT = TableColumnDocument.TABLE_COLUMN_DOCUMENT; + public final TableColumnDocumentTable TABLE_COLUMN_DOCUMENT = TableColumnDocumentTable.TABLE_COLUMN_DOCUMENT; /** * The table databasir.table_document. */ - public final TableDocument TABLE_DOCUMENT = TableDocument.TABLE_DOCUMENT; + public final TableDocumentTable TABLE_DOCUMENT = TableDocumentTable.TABLE_DOCUMENT; /** * The table databasir.table_foreign_key_document. */ - public final TableForeignKeyDocument TABLE_FOREIGN_KEY_DOCUMENT = TableForeignKeyDocument.TABLE_FOREIGN_KEY_DOCUMENT; + public final TableForeignKeyDocumentTable TABLE_FOREIGN_KEY_DOCUMENT = TableForeignKeyDocumentTable.TABLE_FOREIGN_KEY_DOCUMENT; /** * The table databasir.table_index_document. */ - public final TableIndexDocument TABLE_INDEX_DOCUMENT = TableIndexDocument.TABLE_INDEX_DOCUMENT; + public final TableIndexDocumentTable TABLE_INDEX_DOCUMENT = TableIndexDocumentTable.TABLE_INDEX_DOCUMENT; /** * The table databasir.table_trigger_document. */ - public final TableTriggerDocument TABLE_TRIGGER_DOCUMENT = TableTriggerDocument.TABLE_TRIGGER_DOCUMENT; + public final TableTriggerDocumentTable TABLE_TRIGGER_DOCUMENT = TableTriggerDocumentTable.TABLE_TRIGGER_DOCUMENT; /** * The table databasir.user. */ - public final User USER = User.USER; + public final UserTable USER = UserTable.USER; /** * The table databasir.user_favorite_project. */ - public final UserFavoriteProject USER_FAVORITE_PROJECT = UserFavoriteProject.USER_FAVORITE_PROJECT; + public final UserFavoriteProjectTable USER_FAVORITE_PROJECT = UserFavoriteProjectTable.USER_FAVORITE_PROJECT; /** * The table databasir.user_role. */ - public final UserRole USER_ROLE = UserRole.USER_ROLE; + public final UserRoleTable USER_ROLE = UserRoleTable.USER_ROLE; /** * No further instances allowed @@ -198,32 +198,32 @@ public class Databasir extends SchemaImpl { @Override public final List> getTables() { return Arrays.asList( - DataSource.DATA_SOURCE, - DataSourceProperty.DATA_SOURCE_PROPERTY, - DatabaseDocument.DATABASE_DOCUMENT, - DatabaseType.DATABASE_TYPE, - DocumentDescription.DOCUMENT_DESCRIPTION, - DocumentDiscussion.DOCUMENT_DISCUSSION, - DocumentFullText.DOCUMENT_FULL_TEXT, - DocumentTemplateProperty.DOCUMENT_TEMPLATE_PROPERTY, - Group.GROUP, - Login.LOGIN, - MockDataRule.MOCK_DATA_RULE, - OauthApp.OAUTH_APP, - OperationLog.OPERATION_LOG, - Project.PROJECT, - ProjectSyncRule.PROJECT_SYNC_RULE, - ProjectSyncTask.PROJECT_SYNC_TASK, - SysKey.SYS_KEY, - SysMail.SYS_MAIL, - TableColumnDocument.TABLE_COLUMN_DOCUMENT, - TableDocument.TABLE_DOCUMENT, - TableForeignKeyDocument.TABLE_FOREIGN_KEY_DOCUMENT, - TableIndexDocument.TABLE_INDEX_DOCUMENT, - TableTriggerDocument.TABLE_TRIGGER_DOCUMENT, - User.USER, - UserFavoriteProject.USER_FAVORITE_PROJECT, - UserRole.USER_ROLE + DataSourceTable.DATA_SOURCE, + DataSourcePropertyTable.DATA_SOURCE_PROPERTY, + DatabaseDocumentTable.DATABASE_DOCUMENT, + DatabaseTypeTable.DATABASE_TYPE, + DocumentDescriptionTable.DOCUMENT_DESCRIPTION, + DocumentDiscussionTable.DOCUMENT_DISCUSSION, + DocumentFullTextTable.DOCUMENT_FULL_TEXT, + DocumentTemplatePropertyTable.DOCUMENT_TEMPLATE_PROPERTY, + GroupTable.GROUP, + LoginTable.LOGIN, + MockDataRuleTable.MOCK_DATA_RULE, + OauthAppTable.OAUTH_APP, + OperationLogTable.OPERATION_LOG, + ProjectTable.PROJECT, + ProjectSyncRuleTable.PROJECT_SYNC_RULE, + ProjectSyncTaskTable.PROJECT_SYNC_TASK, + SysKeyTable.SYS_KEY, + SysMailTable.SYS_MAIL, + TableColumnDocumentTable.TABLE_COLUMN_DOCUMENT, + TableDocumentTable.TABLE_DOCUMENT, + TableForeignKeyDocumentTable.TABLE_FOREIGN_KEY_DOCUMENT, + TableIndexDocumentTable.TABLE_INDEX_DOCUMENT, + TableTriggerDocumentTable.TABLE_TRIGGER_DOCUMENT, + UserTable.USER, + UserFavoriteProjectTable.USER_FAVORITE_PROJECT, + UserRoleTable.USER_ROLE ); } } diff --git a/dao/generated-src/jooq/main/java/com/databasir/dao/Indexes.java b/dao/generated-src/jooq/main/java/com/databasir/dao/Indexes.java index 6792c1e..3f51bb8 100644 --- a/dao/generated-src/jooq/main/java/com/databasir/dao/Indexes.java +++ b/dao/generated-src/jooq/main/java/com/databasir/dao/Indexes.java @@ -4,15 +4,15 @@ package com.databasir.dao; -import com.databasir.dao.tables.DataSourceProperty; -import com.databasir.dao.tables.DocumentDiscussion; -import com.databasir.dao.tables.DocumentFullText; -import com.databasir.dao.tables.ProjectSyncTask; -import com.databasir.dao.tables.TableColumnDocument; -import com.databasir.dao.tables.TableDocument; -import com.databasir.dao.tables.TableForeignKeyDocument; -import com.databasir.dao.tables.TableIndexDocument; -import com.databasir.dao.tables.TableTriggerDocument; +import com.databasir.dao.tables.DataSourcePropertyTable; +import com.databasir.dao.tables.DocumentDiscussionTable; +import com.databasir.dao.tables.DocumentFullTextTable; +import com.databasir.dao.tables.ProjectSyncTaskTable; +import com.databasir.dao.tables.TableColumnDocumentTable; +import com.databasir.dao.tables.TableDocumentTable; +import com.databasir.dao.tables.TableForeignKeyDocumentTable; +import com.databasir.dao.tables.TableIndexDocumentTable; +import com.databasir.dao.tables.TableTriggerDocumentTable; import org.jooq.Index; import org.jooq.OrderField; @@ -30,24 +30,24 @@ public class Indexes { // INDEX definitions // ------------------------------------------------------------------------- - public static final Index DOCUMENT_FULL_TEXT_FIDX_COLUMN = Internal.createIndex(DSL.name("FIDX_COLUMN"), DocumentFullText.DOCUMENT_FULL_TEXT, new OrderField[] { DocumentFullText.DOCUMENT_FULL_TEXT.COL_NAME, DocumentFullText.DOCUMENT_FULL_TEXT.COL_COMMENT, DocumentFullText.DOCUMENT_FULL_TEXT.COL_DESCRIPTION, DocumentFullText.DOCUMENT_FULL_TEXT.DATABASE_PRODUCT_NAME }, false); - public static final Index DOCUMENT_FULL_TEXT_FIDX_GROUP = Internal.createIndex(DSL.name("FIDX_GROUP"), DocumentFullText.DOCUMENT_FULL_TEXT, new OrderField[] { DocumentFullText.DOCUMENT_FULL_TEXT.GROUP_NAME, DocumentFullText.DOCUMENT_FULL_TEXT.GROUP_DESCRIPTION }, false); - public static final Index DOCUMENT_FULL_TEXT_FIDX_PROJECT = Internal.createIndex(DSL.name("FIDX_PROJECT"), DocumentFullText.DOCUMENT_FULL_TEXT, new OrderField[] { DocumentFullText.DOCUMENT_FULL_TEXT.PROJECT_NAME, DocumentFullText.DOCUMENT_FULL_TEXT.PROJECT_DESCRIPTION, DocumentFullText.DOCUMENT_FULL_TEXT.SCHEMA_NAME, DocumentFullText.DOCUMENT_FULL_TEXT.DATABASE_NAME, DocumentFullText.DOCUMENT_FULL_TEXT.DATABASE_TYPE }, false); - public static final Index DOCUMENT_FULL_TEXT_FIDX_TABLE = Internal.createIndex(DSL.name("FIDX_TABLE"), DocumentFullText.DOCUMENT_FULL_TEXT, new OrderField[] { DocumentFullText.DOCUMENT_FULL_TEXT.TABLE_NAME, DocumentFullText.DOCUMENT_FULL_TEXT.TABLE_COMMENT, DocumentFullText.DOCUMENT_FULL_TEXT.TABLE_DESCRIPTION, DocumentFullText.DOCUMENT_FULL_TEXT.DATABASE_PRODUCT_NAME }, false); - public static final Index DATA_SOURCE_PROPERTY_IDX_DATA_SOURCE_ID = Internal.createIndex(DSL.name("idx_data_source_id"), DataSourceProperty.DATA_SOURCE_PROPERTY, new OrderField[] { DataSourceProperty.DATA_SOURCE_PROPERTY.DATA_SOURCE_ID }, false); - public static final Index TABLE_COLUMN_DOCUMENT_IDX_DATABASE_DOCUMENT_ID = Internal.createIndex(DSL.name("idx_database_document_id"), TableColumnDocument.TABLE_COLUMN_DOCUMENT, new OrderField[] { TableColumnDocument.TABLE_COLUMN_DOCUMENT.DATABASE_DOCUMENT_ID }, false); - public static final Index TABLE_DOCUMENT_IDX_DATABASE_DOCUMENT_ID = Internal.createIndex(DSL.name("idx_database_document_id"), TableDocument.TABLE_DOCUMENT, new OrderField[] { TableDocument.TABLE_DOCUMENT.DATABASE_DOCUMENT_ID }, false); - public static final Index TABLE_FOREIGN_KEY_DOCUMENT_IDX_DATABASE_DOCUMENT_ID = Internal.createIndex(DSL.name("idx_database_document_id"), TableForeignKeyDocument.TABLE_FOREIGN_KEY_DOCUMENT, new OrderField[] { TableForeignKeyDocument.TABLE_FOREIGN_KEY_DOCUMENT.DATABASE_DOCUMENT_ID }, false); - public static final Index TABLE_INDEX_DOCUMENT_IDX_DATABASE_DOCUMENT_ID = Internal.createIndex(DSL.name("idx_database_document_id"), TableIndexDocument.TABLE_INDEX_DOCUMENT, new OrderField[] { TableIndexDocument.TABLE_INDEX_DOCUMENT.DATABASE_DOCUMENT_ID }, false); - public static final Index TABLE_TRIGGER_DOCUMENT_IDX_DATABASE_DOCUMENT_ID = Internal.createIndex(DSL.name("idx_database_document_id"), TableTriggerDocument.TABLE_TRIGGER_DOCUMENT, new OrderField[] { TableTriggerDocument.TABLE_TRIGGER_DOCUMENT.DATABASE_DOCUMENT_ID }, false); - public static final Index DOCUMENT_FULL_TEXT_IDX_GROUP_ID = Internal.createIndex(DSL.name("IDX_GROUP_ID"), DocumentFullText.DOCUMENT_FULL_TEXT, new OrderField[] { DocumentFullText.DOCUMENT_FULL_TEXT.GROUP_ID }, false); - public static final Index DOCUMENT_DISCUSSION_IDX_PROJECT_ID = Internal.createIndex(DSL.name("idx_project_id"), DocumentDiscussion.DOCUMENT_DISCUSSION, new OrderField[] { DocumentDiscussion.DOCUMENT_DISCUSSION.PROJECT_ID }, false); - public static final Index DOCUMENT_FULL_TEXT_IDX_PROJECT_ID = Internal.createIndex(DSL.name("IDX_PROJECT_ID"), DocumentFullText.DOCUMENT_FULL_TEXT, new OrderField[] { DocumentFullText.DOCUMENT_FULL_TEXT.PROJECT_ID }, false); - public static final Index PROJECT_SYNC_TASK_IDX_PROJECT_ID = Internal.createIndex(DSL.name("idx_project_id"), ProjectSyncTask.PROJECT_SYNC_TASK, new OrderField[] { ProjectSyncTask.PROJECT_SYNC_TASK.PROJECT_ID }, false); - public static final Index DOCUMENT_FULL_TEXT_IDX_TABLE_DOCUMENT_ID = Internal.createIndex(DSL.name("IDX_TABLE_DOCUMENT_ID"), DocumentFullText.DOCUMENT_FULL_TEXT, new OrderField[] { DocumentFullText.DOCUMENT_FULL_TEXT.TABLE_DOCUMENT_ID }, false); - public static final Index TABLE_COLUMN_DOCUMENT_IDX_TABLE_DOCUMENT_ID = Internal.createIndex(DSL.name("idx_table_document_id"), TableColumnDocument.TABLE_COLUMN_DOCUMENT, new OrderField[] { TableColumnDocument.TABLE_COLUMN_DOCUMENT.TABLE_DOCUMENT_ID }, false); - public static final Index TABLE_FOREIGN_KEY_DOCUMENT_IDX_TABLE_DOCUMENT_ID = Internal.createIndex(DSL.name("idx_table_document_id"), TableForeignKeyDocument.TABLE_FOREIGN_KEY_DOCUMENT, new OrderField[] { TableForeignKeyDocument.TABLE_FOREIGN_KEY_DOCUMENT.TABLE_DOCUMENT_ID }, false); - public static final Index TABLE_INDEX_DOCUMENT_IDX_TABLE_DOCUMENT_ID = Internal.createIndex(DSL.name("idx_table_document_id"), TableIndexDocument.TABLE_INDEX_DOCUMENT, new OrderField[] { TableIndexDocument.TABLE_INDEX_DOCUMENT.TABLE_DOCUMENT_ID }, false); - public static final Index TABLE_TRIGGER_DOCUMENT_IDX_TABLE_DOCUMENT_ID = Internal.createIndex(DSL.name("idx_table_document_id"), TableTriggerDocument.TABLE_TRIGGER_DOCUMENT, new OrderField[] { TableTriggerDocument.TABLE_TRIGGER_DOCUMENT.TABLE_DOCUMENT_ID }, false); - public static final Index PROJECT_SYNC_TASK_IDX_USER_ID = Internal.createIndex(DSL.name("idx_user_id"), ProjectSyncTask.PROJECT_SYNC_TASK, new OrderField[] { ProjectSyncTask.PROJECT_SYNC_TASK.USER_ID }, false); + public static final Index DOCUMENT_FULL_TEXT_FIDX_COLUMN = Internal.createIndex(DSL.name("FIDX_COLUMN"), DocumentFullTextTable.DOCUMENT_FULL_TEXT, new OrderField[] { DocumentFullTextTable.DOCUMENT_FULL_TEXT.COL_NAME, DocumentFullTextTable.DOCUMENT_FULL_TEXT.COL_COMMENT, DocumentFullTextTable.DOCUMENT_FULL_TEXT.COL_DESCRIPTION, DocumentFullTextTable.DOCUMENT_FULL_TEXT.DATABASE_PRODUCT_NAME }, false); + public static final Index DOCUMENT_FULL_TEXT_FIDX_GROUP = Internal.createIndex(DSL.name("FIDX_GROUP"), DocumentFullTextTable.DOCUMENT_FULL_TEXT, new OrderField[] { DocumentFullTextTable.DOCUMENT_FULL_TEXT.GROUP_NAME, DocumentFullTextTable.DOCUMENT_FULL_TEXT.GROUP_DESCRIPTION }, false); + public static final Index DOCUMENT_FULL_TEXT_FIDX_PROJECT = Internal.createIndex(DSL.name("FIDX_PROJECT"), DocumentFullTextTable.DOCUMENT_FULL_TEXT, new OrderField[] { DocumentFullTextTable.DOCUMENT_FULL_TEXT.PROJECT_NAME, DocumentFullTextTable.DOCUMENT_FULL_TEXT.PROJECT_DESCRIPTION, DocumentFullTextTable.DOCUMENT_FULL_TEXT.SCHEMA_NAME, DocumentFullTextTable.DOCUMENT_FULL_TEXT.DATABASE_NAME, DocumentFullTextTable.DOCUMENT_FULL_TEXT.DATABASE_TYPE }, false); + public static final Index DOCUMENT_FULL_TEXT_FIDX_TABLE = Internal.createIndex(DSL.name("FIDX_TABLE"), DocumentFullTextTable.DOCUMENT_FULL_TEXT, new OrderField[] { DocumentFullTextTable.DOCUMENT_FULL_TEXT.TABLE_NAME, DocumentFullTextTable.DOCUMENT_FULL_TEXT.TABLE_COMMENT, DocumentFullTextTable.DOCUMENT_FULL_TEXT.TABLE_DESCRIPTION, DocumentFullTextTable.DOCUMENT_FULL_TEXT.DATABASE_PRODUCT_NAME }, false); + public static final Index DATA_SOURCE_PROPERTY_IDX_DATA_SOURCE_ID = Internal.createIndex(DSL.name("idx_data_source_id"), DataSourcePropertyTable.DATA_SOURCE_PROPERTY, new OrderField[] { DataSourcePropertyTable.DATA_SOURCE_PROPERTY.DATA_SOURCE_ID }, false); + public static final Index TABLE_COLUMN_DOCUMENT_IDX_DATABASE_DOCUMENT_ID = Internal.createIndex(DSL.name("idx_database_document_id"), TableColumnDocumentTable.TABLE_COLUMN_DOCUMENT, new OrderField[] { TableColumnDocumentTable.TABLE_COLUMN_DOCUMENT.DATABASE_DOCUMENT_ID }, false); + public static final Index TABLE_DOCUMENT_IDX_DATABASE_DOCUMENT_ID = Internal.createIndex(DSL.name("idx_database_document_id"), TableDocumentTable.TABLE_DOCUMENT, new OrderField[] { TableDocumentTable.TABLE_DOCUMENT.DATABASE_DOCUMENT_ID }, false); + public static final Index TABLE_FOREIGN_KEY_DOCUMENT_IDX_DATABASE_DOCUMENT_ID = Internal.createIndex(DSL.name("idx_database_document_id"), TableForeignKeyDocumentTable.TABLE_FOREIGN_KEY_DOCUMENT, new OrderField[] { TableForeignKeyDocumentTable.TABLE_FOREIGN_KEY_DOCUMENT.DATABASE_DOCUMENT_ID }, false); + public static final Index TABLE_INDEX_DOCUMENT_IDX_DATABASE_DOCUMENT_ID = Internal.createIndex(DSL.name("idx_database_document_id"), TableIndexDocumentTable.TABLE_INDEX_DOCUMENT, new OrderField[] { TableIndexDocumentTable.TABLE_INDEX_DOCUMENT.DATABASE_DOCUMENT_ID }, false); + public static final Index TABLE_TRIGGER_DOCUMENT_IDX_DATABASE_DOCUMENT_ID = Internal.createIndex(DSL.name("idx_database_document_id"), TableTriggerDocumentTable.TABLE_TRIGGER_DOCUMENT, new OrderField[] { TableTriggerDocumentTable.TABLE_TRIGGER_DOCUMENT.DATABASE_DOCUMENT_ID }, false); + public static final Index DOCUMENT_FULL_TEXT_IDX_GROUP_ID = Internal.createIndex(DSL.name("IDX_GROUP_ID"), DocumentFullTextTable.DOCUMENT_FULL_TEXT, new OrderField[] { DocumentFullTextTable.DOCUMENT_FULL_TEXT.GROUP_ID }, false); + public static final Index DOCUMENT_DISCUSSION_IDX_PROJECT_ID = Internal.createIndex(DSL.name("idx_project_id"), DocumentDiscussionTable.DOCUMENT_DISCUSSION, new OrderField[] { DocumentDiscussionTable.DOCUMENT_DISCUSSION.PROJECT_ID }, false); + public static final Index DOCUMENT_FULL_TEXT_IDX_PROJECT_ID = Internal.createIndex(DSL.name("IDX_PROJECT_ID"), DocumentFullTextTable.DOCUMENT_FULL_TEXT, new OrderField[] { DocumentFullTextTable.DOCUMENT_FULL_TEXT.PROJECT_ID }, false); + public static final Index PROJECT_SYNC_TASK_IDX_PROJECT_ID = Internal.createIndex(DSL.name("idx_project_id"), ProjectSyncTaskTable.PROJECT_SYNC_TASK, new OrderField[] { ProjectSyncTaskTable.PROJECT_SYNC_TASK.PROJECT_ID }, false); + public static final Index DOCUMENT_FULL_TEXT_IDX_TABLE_DOCUMENT_ID = Internal.createIndex(DSL.name("IDX_TABLE_DOCUMENT_ID"), DocumentFullTextTable.DOCUMENT_FULL_TEXT, new OrderField[] { DocumentFullTextTable.DOCUMENT_FULL_TEXT.TABLE_DOCUMENT_ID }, false); + public static final Index TABLE_COLUMN_DOCUMENT_IDX_TABLE_DOCUMENT_ID = Internal.createIndex(DSL.name("idx_table_document_id"), TableColumnDocumentTable.TABLE_COLUMN_DOCUMENT, new OrderField[] { TableColumnDocumentTable.TABLE_COLUMN_DOCUMENT.TABLE_DOCUMENT_ID }, false); + public static final Index TABLE_FOREIGN_KEY_DOCUMENT_IDX_TABLE_DOCUMENT_ID = Internal.createIndex(DSL.name("idx_table_document_id"), TableForeignKeyDocumentTable.TABLE_FOREIGN_KEY_DOCUMENT, new OrderField[] { TableForeignKeyDocumentTable.TABLE_FOREIGN_KEY_DOCUMENT.TABLE_DOCUMENT_ID }, false); + public static final Index TABLE_INDEX_DOCUMENT_IDX_TABLE_DOCUMENT_ID = Internal.createIndex(DSL.name("idx_table_document_id"), TableIndexDocumentTable.TABLE_INDEX_DOCUMENT, new OrderField[] { TableIndexDocumentTable.TABLE_INDEX_DOCUMENT.TABLE_DOCUMENT_ID }, false); + public static final Index TABLE_TRIGGER_DOCUMENT_IDX_TABLE_DOCUMENT_ID = Internal.createIndex(DSL.name("idx_table_document_id"), TableTriggerDocumentTable.TABLE_TRIGGER_DOCUMENT, new OrderField[] { TableTriggerDocumentTable.TABLE_TRIGGER_DOCUMENT.TABLE_DOCUMENT_ID }, false); + public static final Index PROJECT_SYNC_TASK_IDX_USER_ID = Internal.createIndex(DSL.name("idx_user_id"), ProjectSyncTaskTable.PROJECT_SYNC_TASK, new OrderField[] { ProjectSyncTaskTable.PROJECT_SYNC_TASK.USER_ID }, false); } diff --git a/dao/generated-src/jooq/main/java/com/databasir/dao/Keys.java b/dao/generated-src/jooq/main/java/com/databasir/dao/Keys.java index 073ecc8..6f55077 100644 --- a/dao/generated-src/jooq/main/java/com/databasir/dao/Keys.java +++ b/dao/generated-src/jooq/main/java/com/databasir/dao/Keys.java @@ -4,32 +4,32 @@ package com.databasir.dao; -import com.databasir.dao.tables.DataSource; -import com.databasir.dao.tables.DataSourceProperty; -import com.databasir.dao.tables.DatabaseDocument; -import com.databasir.dao.tables.DatabaseType; -import com.databasir.dao.tables.DocumentDescription; -import com.databasir.dao.tables.DocumentDiscussion; -import com.databasir.dao.tables.DocumentFullText; -import com.databasir.dao.tables.DocumentTemplateProperty; -import com.databasir.dao.tables.Group; -import com.databasir.dao.tables.Login; -import com.databasir.dao.tables.MockDataRule; -import com.databasir.dao.tables.OauthApp; -import com.databasir.dao.tables.OperationLog; -import com.databasir.dao.tables.Project; -import com.databasir.dao.tables.ProjectSyncRule; -import com.databasir.dao.tables.ProjectSyncTask; -import com.databasir.dao.tables.SysKey; -import com.databasir.dao.tables.SysMail; -import com.databasir.dao.tables.TableColumnDocument; -import com.databasir.dao.tables.TableDocument; -import com.databasir.dao.tables.TableForeignKeyDocument; -import com.databasir.dao.tables.TableIndexDocument; -import com.databasir.dao.tables.TableTriggerDocument; -import com.databasir.dao.tables.User; -import com.databasir.dao.tables.UserFavoriteProject; -import com.databasir.dao.tables.UserRole; +import com.databasir.dao.tables.DataSourcePropertyTable; +import com.databasir.dao.tables.DataSourceTable; +import com.databasir.dao.tables.DatabaseDocumentTable; +import com.databasir.dao.tables.DatabaseTypeTable; +import com.databasir.dao.tables.DocumentDescriptionTable; +import com.databasir.dao.tables.DocumentDiscussionTable; +import com.databasir.dao.tables.DocumentFullTextTable; +import com.databasir.dao.tables.DocumentTemplatePropertyTable; +import com.databasir.dao.tables.GroupTable; +import com.databasir.dao.tables.LoginTable; +import com.databasir.dao.tables.MockDataRuleTable; +import com.databasir.dao.tables.OauthAppTable; +import com.databasir.dao.tables.OperationLogTable; +import com.databasir.dao.tables.ProjectSyncRuleTable; +import com.databasir.dao.tables.ProjectSyncTaskTable; +import com.databasir.dao.tables.ProjectTable; +import com.databasir.dao.tables.SysKeyTable; +import com.databasir.dao.tables.SysMailTable; +import com.databasir.dao.tables.TableColumnDocumentTable; +import com.databasir.dao.tables.TableDocumentTable; +import com.databasir.dao.tables.TableForeignKeyDocumentTable; +import com.databasir.dao.tables.TableIndexDocumentTable; +import com.databasir.dao.tables.TableTriggerDocumentTable; +import com.databasir.dao.tables.UserFavoriteProjectTable; +import com.databasir.dao.tables.UserRoleTable; +import com.databasir.dao.tables.UserTable; import com.databasir.dao.tables.records.DataSourcePropertyRecord; import com.databasir.dao.tables.records.DataSourceRecord; import com.databasir.dao.tables.records.DatabaseDocumentRecord; @@ -74,44 +74,44 @@ public class Keys { // UNIQUE and PRIMARY KEY definitions // ------------------------------------------------------------------------- - public static final UniqueKey KEY_DATA_SOURCE_PRIMARY = Internal.createUniqueKey(DataSource.DATA_SOURCE, DSL.name("KEY_data_source_PRIMARY"), new TableField[] { DataSource.DATA_SOURCE.ID }, true); - public static final UniqueKey KEY_DATA_SOURCE_UK_PROJECT_ID = Internal.createUniqueKey(DataSource.DATA_SOURCE, DSL.name("KEY_data_source_uk_project_id"), new TableField[] { DataSource.DATA_SOURCE.PROJECT_ID }, true); - public static final UniqueKey KEY_DATA_SOURCE_PROPERTY_PRIMARY = Internal.createUniqueKey(DataSourceProperty.DATA_SOURCE_PROPERTY, DSL.name("KEY_data_source_property_PRIMARY"), new TableField[] { DataSourceProperty.DATA_SOURCE_PROPERTY.ID }, true); - public static final UniqueKey KEY_DATABASE_DOCUMENT_PRIMARY = Internal.createUniqueKey(DatabaseDocument.DATABASE_DOCUMENT, DSL.name("KEY_database_document_PRIMARY"), new TableField[] { DatabaseDocument.DATABASE_DOCUMENT.ID }, true); - public static final UniqueKey KEY_DATABASE_DOCUMENT_UK_PROJECT_ID_VERSION_IS_ARCHIVE = Internal.createUniqueKey(DatabaseDocument.DATABASE_DOCUMENT, DSL.name("KEY_database_document_uk_project_id_version_is_archive"), new TableField[] { DatabaseDocument.DATABASE_DOCUMENT.PROJECT_ID, DatabaseDocument.DATABASE_DOCUMENT.VERSION, DatabaseDocument.DATABASE_DOCUMENT.IS_ARCHIVE }, true); - public static final UniqueKey KEY_DATABASE_TYPE_PRIMARY = Internal.createUniqueKey(DatabaseType.DATABASE_TYPE, DSL.name("KEY_database_type_PRIMARY"), new TableField[] { DatabaseType.DATABASE_TYPE.ID }, true); - public static final UniqueKey KEY_DATABASE_TYPE_UK_DATABASE_TYPE_DELETED_DELETED_TOKEN = Internal.createUniqueKey(DatabaseType.DATABASE_TYPE, DSL.name("KEY_database_type_uk_database_type_deleted_deleted_token"), new TableField[] { DatabaseType.DATABASE_TYPE.DATABASE_TYPE_, DatabaseType.DATABASE_TYPE.DELETED, DatabaseType.DATABASE_TYPE.DELETED_TOKEN }, true); - public static final UniqueKey KEY_DOCUMENT_DESCRIPTION_PRIMARY = Internal.createUniqueKey(DocumentDescription.DOCUMENT_DESCRIPTION, DSL.name("KEY_document_description_PRIMARY"), new TableField[] { DocumentDescription.DOCUMENT_DESCRIPTION.ID }, true); - public static final UniqueKey KEY_DOCUMENT_DESCRIPTION_UK_PROJECT_ID_TABLE_NAME_COLUMN_NAME = Internal.createUniqueKey(DocumentDescription.DOCUMENT_DESCRIPTION, DSL.name("KEY_document_description_uk_project_id_table_name_column_name"), new TableField[] { DocumentDescription.DOCUMENT_DESCRIPTION.PROJECT_ID, DocumentDescription.DOCUMENT_DESCRIPTION.TABLE_NAME, DocumentDescription.DOCUMENT_DESCRIPTION.COLUMN_NAME }, true); - public static final UniqueKey KEY_DOCUMENT_DISCUSSION_PRIMARY = Internal.createUniqueKey(DocumentDiscussion.DOCUMENT_DISCUSSION, DSL.name("KEY_document_discussion_PRIMARY"), new TableField[] { DocumentDiscussion.DOCUMENT_DISCUSSION.ID }, true); - public static final UniqueKey KEY_DOCUMENT_FULL_TEXT_PRIMARY = Internal.createUniqueKey(DocumentFullText.DOCUMENT_FULL_TEXT, DSL.name("KEY_document_full_text_PRIMARY"), new TableField[] { DocumentFullText.DOCUMENT_FULL_TEXT.ID }, true); - public static final UniqueKey KEY_DOCUMENT_TEMPLATE_PROPERTY_PRIMARY = Internal.createUniqueKey(DocumentTemplateProperty.DOCUMENT_TEMPLATE_PROPERTY, DSL.name("KEY_document_template_property_PRIMARY"), new TableField[] { DocumentTemplateProperty.DOCUMENT_TEMPLATE_PROPERTY.ID }, true); - public static final UniqueKey KEY_DOCUMENT_TEMPLATE_PROPERTY_UK_TYPE_KEY = Internal.createUniqueKey(DocumentTemplateProperty.DOCUMENT_TEMPLATE_PROPERTY, DSL.name("KEY_document_template_property_uk_type_key"), new TableField[] { DocumentTemplateProperty.DOCUMENT_TEMPLATE_PROPERTY.TYPE, DocumentTemplateProperty.DOCUMENT_TEMPLATE_PROPERTY.KEY }, true); - public static final UniqueKey KEY_GROUP_PRIMARY = Internal.createUniqueKey(Group.GROUP, DSL.name("KEY_group_PRIMARY"), new TableField[] { Group.GROUP.ID }, true); - public static final UniqueKey KEY_LOGIN_PRIMARY = Internal.createUniqueKey(Login.LOGIN, DSL.name("KEY_login_PRIMARY"), new TableField[] { Login.LOGIN.ID }, true); - public static final UniqueKey KEY_LOGIN_UK_USER_ID = Internal.createUniqueKey(Login.LOGIN, DSL.name("KEY_login_uk_user_id"), new TableField[] { Login.LOGIN.USER_ID }, true); - public static final UniqueKey KEY_MOCK_DATA_RULE_PRIMARY = Internal.createUniqueKey(MockDataRule.MOCK_DATA_RULE, DSL.name("KEY_mock_data_rule_PRIMARY"), new TableField[] { MockDataRule.MOCK_DATA_RULE.ID }, true); - public static final UniqueKey KEY_MOCK_DATA_RULE_UK_PROJECT_ID_TABLE_NAME_COLUMN_NAME = Internal.createUniqueKey(MockDataRule.MOCK_DATA_RULE, DSL.name("KEY_mock_data_rule_uk_project_id_table_name_column_name"), new TableField[] { MockDataRule.MOCK_DATA_RULE.PROJECT_ID, MockDataRule.MOCK_DATA_RULE.TABLE_NAME, MockDataRule.MOCK_DATA_RULE.COLUMN_NAME }, true); - public static final UniqueKey KEY_OAUTH_APP_PRIMARY = Internal.createUniqueKey(OauthApp.OAUTH_APP, DSL.name("KEY_oauth_app_PRIMARY"), new TableField[] { OauthApp.OAUTH_APP.ID }, true); - public static final UniqueKey KEY_OAUTH_APP_UK_REGISTRATION_ID = Internal.createUniqueKey(OauthApp.OAUTH_APP, DSL.name("KEY_oauth_app_uk_registration_id"), new TableField[] { OauthApp.OAUTH_APP.REGISTRATION_ID }, true); - public static final UniqueKey KEY_OPERATION_LOG_PRIMARY = Internal.createUniqueKey(OperationLog.OPERATION_LOG, DSL.name("KEY_operation_log_PRIMARY"), new TableField[] { OperationLog.OPERATION_LOG.ID }, true); - public static final UniqueKey KEY_PROJECT_PRIMARY = Internal.createUniqueKey(Project.PROJECT, DSL.name("KEY_project_PRIMARY"), new TableField[] { Project.PROJECT.ID }, true); - public static final UniqueKey KEY_PROJECT_UK_GROUP_ID_NAME_DELETED_TOKEN = Internal.createUniqueKey(Project.PROJECT, DSL.name("KEY_project_uk_group_id_name_deleted_token"), new TableField[] { Project.PROJECT.GROUP_ID, Project.PROJECT.NAME, Project.PROJECT.DELETED_TOKEN }, true); - public static final UniqueKey KEY_PROJECT_SYNC_RULE_PRIMARY = Internal.createUniqueKey(ProjectSyncRule.PROJECT_SYNC_RULE, DSL.name("KEY_project_sync_rule_PRIMARY"), new TableField[] { ProjectSyncRule.PROJECT_SYNC_RULE.ID }, true); - public static final UniqueKey KEY_PROJECT_SYNC_RULE_UK_PROJECT_ID = Internal.createUniqueKey(ProjectSyncRule.PROJECT_SYNC_RULE, DSL.name("KEY_project_sync_rule_uk_project_id"), new TableField[] { ProjectSyncRule.PROJECT_SYNC_RULE.PROJECT_ID }, true); - public static final UniqueKey KEY_PROJECT_SYNC_TASK_PRIMARY = Internal.createUniqueKey(ProjectSyncTask.PROJECT_SYNC_TASK, DSL.name("KEY_project_sync_task_PRIMARY"), new TableField[] { ProjectSyncTask.PROJECT_SYNC_TASK.ID }, true); - public static final UniqueKey KEY_SYS_KEY_PRIMARY = Internal.createUniqueKey(SysKey.SYS_KEY, DSL.name("KEY_sys_key_PRIMARY"), new TableField[] { SysKey.SYS_KEY.ID }, true); - public static final UniqueKey KEY_SYS_MAIL_PRIMARY = Internal.createUniqueKey(SysMail.SYS_MAIL, DSL.name("KEY_sys_mail_PRIMARY"), new TableField[] { SysMail.SYS_MAIL.ID }, true); - public static final UniqueKey KEY_TABLE_COLUMN_DOCUMENT_PRIMARY = Internal.createUniqueKey(TableColumnDocument.TABLE_COLUMN_DOCUMENT, DSL.name("KEY_table_column_document_PRIMARY"), new TableField[] { TableColumnDocument.TABLE_COLUMN_DOCUMENT.ID }, true); - public static final UniqueKey KEY_TABLE_DOCUMENT_PRIMARY = Internal.createUniqueKey(TableDocument.TABLE_DOCUMENT, DSL.name("KEY_table_document_PRIMARY"), new TableField[] { TableDocument.TABLE_DOCUMENT.ID }, true); - public static final UniqueKey KEY_TABLE_FOREIGN_KEY_DOCUMENT_PRIMARY = Internal.createUniqueKey(TableForeignKeyDocument.TABLE_FOREIGN_KEY_DOCUMENT, DSL.name("KEY_table_foreign_key_document_PRIMARY"), new TableField[] { TableForeignKeyDocument.TABLE_FOREIGN_KEY_DOCUMENT.ID }, true); - public static final UniqueKey KEY_TABLE_INDEX_DOCUMENT_PRIMARY = Internal.createUniqueKey(TableIndexDocument.TABLE_INDEX_DOCUMENT, DSL.name("KEY_table_index_document_PRIMARY"), new TableField[] { TableIndexDocument.TABLE_INDEX_DOCUMENT.ID }, true); - public static final UniqueKey KEY_TABLE_TRIGGER_DOCUMENT_PRIMARY = Internal.createUniqueKey(TableTriggerDocument.TABLE_TRIGGER_DOCUMENT, DSL.name("KEY_table_trigger_document_PRIMARY"), new TableField[] { TableTriggerDocument.TABLE_TRIGGER_DOCUMENT.ID }, true); - public static final UniqueKey KEY_USER_PRIMARY = Internal.createUniqueKey(User.USER, DSL.name("KEY_user_PRIMARY"), new TableField[] { User.USER.ID }, true); - public static final UniqueKey KEY_USER_UK_EMAIL = Internal.createUniqueKey(User.USER, DSL.name("KEY_user_uk_email"), new TableField[] { User.USER.EMAIL, User.USER.DELETED_TOKEN }, true); - public static final UniqueKey KEY_USER_UK_USERNAME = Internal.createUniqueKey(User.USER, DSL.name("KEY_user_uk_username"), new TableField[] { User.USER.USERNAME, User.USER.DELETED_TOKEN }, true); - public static final UniqueKey KEY_USER_FAVORITE_PROJECT_PRIMARY = Internal.createUniqueKey(UserFavoriteProject.USER_FAVORITE_PROJECT, DSL.name("KEY_user_favorite_project_PRIMARY"), new TableField[] { UserFavoriteProject.USER_FAVORITE_PROJECT.ID }, true); - public static final UniqueKey KEY_USER_FAVORITE_PROJECT_UK_USER_ID_PROJECT_ID = Internal.createUniqueKey(UserFavoriteProject.USER_FAVORITE_PROJECT, DSL.name("KEY_user_favorite_project_uk_user_id_project_id"), new TableField[] { UserFavoriteProject.USER_FAVORITE_PROJECT.USER_ID, UserFavoriteProject.USER_FAVORITE_PROJECT.PROJECT_ID }, true); - public static final UniqueKey KEY_USER_ROLE_PRIMARY = Internal.createUniqueKey(UserRole.USER_ROLE, DSL.name("KEY_user_role_PRIMARY"), new TableField[] { UserRole.USER_ROLE.ID }, true); - public static final UniqueKey KEY_USER_ROLE_UK_USER_ID_GROUP_ID_ROLE = Internal.createUniqueKey(UserRole.USER_ROLE, DSL.name("KEY_user_role_uk_user_id_group_id_role"), new TableField[] { UserRole.USER_ROLE.USER_ID, UserRole.USER_ROLE.GROUP_ID, UserRole.USER_ROLE.ROLE }, true); + public static final UniqueKey KEY_DATA_SOURCE_PRIMARY = Internal.createUniqueKey(DataSourceTable.DATA_SOURCE, DSL.name("KEY_data_source_PRIMARY"), new TableField[] { DataSourceTable.DATA_SOURCE.ID }, true); + public static final UniqueKey KEY_DATA_SOURCE_UK_PROJECT_ID = Internal.createUniqueKey(DataSourceTable.DATA_SOURCE, DSL.name("KEY_data_source_uk_project_id"), new TableField[] { DataSourceTable.DATA_SOURCE.PROJECT_ID }, true); + public static final UniqueKey KEY_DATA_SOURCE_PROPERTY_PRIMARY = Internal.createUniqueKey(DataSourcePropertyTable.DATA_SOURCE_PROPERTY, DSL.name("KEY_data_source_property_PRIMARY"), new TableField[] { DataSourcePropertyTable.DATA_SOURCE_PROPERTY.ID }, true); + public static final UniqueKey KEY_DATABASE_DOCUMENT_PRIMARY = Internal.createUniqueKey(DatabaseDocumentTable.DATABASE_DOCUMENT, DSL.name("KEY_database_document_PRIMARY"), new TableField[] { DatabaseDocumentTable.DATABASE_DOCUMENT.ID }, true); + public static final UniqueKey KEY_DATABASE_DOCUMENT_UK_PROJECT_ID_VERSION_IS_ARCHIVE = Internal.createUniqueKey(DatabaseDocumentTable.DATABASE_DOCUMENT, DSL.name("KEY_database_document_uk_project_id_version_is_archive"), new TableField[] { DatabaseDocumentTable.DATABASE_DOCUMENT.PROJECT_ID, DatabaseDocumentTable.DATABASE_DOCUMENT.VERSION, DatabaseDocumentTable.DATABASE_DOCUMENT.IS_ARCHIVE }, true); + public static final UniqueKey KEY_DATABASE_TYPE_PRIMARY = Internal.createUniqueKey(DatabaseTypeTable.DATABASE_TYPE, DSL.name("KEY_database_type_PRIMARY"), new TableField[] { DatabaseTypeTable.DATABASE_TYPE.ID }, true); + public static final UniqueKey KEY_DATABASE_TYPE_UK_DATABASE_TYPE_DELETED_DELETED_TOKEN = Internal.createUniqueKey(DatabaseTypeTable.DATABASE_TYPE, DSL.name("KEY_database_type_uk_database_type_deleted_deleted_token"), new TableField[] { DatabaseTypeTable.DATABASE_TYPE.DATABASE_TYPE_, DatabaseTypeTable.DATABASE_TYPE.DELETED, DatabaseTypeTable.DATABASE_TYPE.DELETED_TOKEN }, true); + public static final UniqueKey KEY_DOCUMENT_DESCRIPTION_PRIMARY = Internal.createUniqueKey(DocumentDescriptionTable.DOCUMENT_DESCRIPTION, DSL.name("KEY_document_description_PRIMARY"), new TableField[] { DocumentDescriptionTable.DOCUMENT_DESCRIPTION.ID }, true); + public static final UniqueKey KEY_DOCUMENT_DESCRIPTION_UK_PROJECT_ID_TABLE_NAME_COLUMN_NAME = Internal.createUniqueKey(DocumentDescriptionTable.DOCUMENT_DESCRIPTION, DSL.name("KEY_document_description_uk_project_id_table_name_column_name"), new TableField[] { DocumentDescriptionTable.DOCUMENT_DESCRIPTION.PROJECT_ID, DocumentDescriptionTable.DOCUMENT_DESCRIPTION.TABLE_NAME, DocumentDescriptionTable.DOCUMENT_DESCRIPTION.COLUMN_NAME }, true); + public static final UniqueKey KEY_DOCUMENT_DISCUSSION_PRIMARY = Internal.createUniqueKey(DocumentDiscussionTable.DOCUMENT_DISCUSSION, DSL.name("KEY_document_discussion_PRIMARY"), new TableField[] { DocumentDiscussionTable.DOCUMENT_DISCUSSION.ID }, true); + public static final UniqueKey KEY_DOCUMENT_FULL_TEXT_PRIMARY = Internal.createUniqueKey(DocumentFullTextTable.DOCUMENT_FULL_TEXT, DSL.name("KEY_document_full_text_PRIMARY"), new TableField[] { DocumentFullTextTable.DOCUMENT_FULL_TEXT.ID }, true); + public static final UniqueKey KEY_DOCUMENT_TEMPLATE_PROPERTY_PRIMARY = Internal.createUniqueKey(DocumentTemplatePropertyTable.DOCUMENT_TEMPLATE_PROPERTY, DSL.name("KEY_document_template_property_PRIMARY"), new TableField[] { DocumentTemplatePropertyTable.DOCUMENT_TEMPLATE_PROPERTY.ID }, true); + public static final UniqueKey KEY_DOCUMENT_TEMPLATE_PROPERTY_UK_TYPE_KEY = Internal.createUniqueKey(DocumentTemplatePropertyTable.DOCUMENT_TEMPLATE_PROPERTY, DSL.name("KEY_document_template_property_uk_type_key"), new TableField[] { DocumentTemplatePropertyTable.DOCUMENT_TEMPLATE_PROPERTY.TYPE, DocumentTemplatePropertyTable.DOCUMENT_TEMPLATE_PROPERTY.KEY }, true); + public static final UniqueKey KEY_GROUP_PRIMARY = Internal.createUniqueKey(GroupTable.GROUP, DSL.name("KEY_group_PRIMARY"), new TableField[] { GroupTable.GROUP.ID }, true); + public static final UniqueKey KEY_LOGIN_PRIMARY = Internal.createUniqueKey(LoginTable.LOGIN, DSL.name("KEY_login_PRIMARY"), new TableField[] { LoginTable.LOGIN.ID }, true); + public static final UniqueKey KEY_LOGIN_UK_USER_ID = Internal.createUniqueKey(LoginTable.LOGIN, DSL.name("KEY_login_uk_user_id"), new TableField[] { LoginTable.LOGIN.USER_ID }, true); + public static final UniqueKey KEY_MOCK_DATA_RULE_PRIMARY = Internal.createUniqueKey(MockDataRuleTable.MOCK_DATA_RULE, DSL.name("KEY_mock_data_rule_PRIMARY"), new TableField[] { MockDataRuleTable.MOCK_DATA_RULE.ID }, true); + public static final UniqueKey KEY_MOCK_DATA_RULE_UK_PROJECT_ID_TABLE_NAME_COLUMN_NAME = Internal.createUniqueKey(MockDataRuleTable.MOCK_DATA_RULE, DSL.name("KEY_mock_data_rule_uk_project_id_table_name_column_name"), new TableField[] { MockDataRuleTable.MOCK_DATA_RULE.PROJECT_ID, MockDataRuleTable.MOCK_DATA_RULE.TABLE_NAME, MockDataRuleTable.MOCK_DATA_RULE.COLUMN_NAME }, true); + public static final UniqueKey KEY_OAUTH_APP_PRIMARY = Internal.createUniqueKey(OauthAppTable.OAUTH_APP, DSL.name("KEY_oauth_app_PRIMARY"), new TableField[] { OauthAppTable.OAUTH_APP.ID }, true); + public static final UniqueKey KEY_OAUTH_APP_UK_REGISTRATION_ID = Internal.createUniqueKey(OauthAppTable.OAUTH_APP, DSL.name("KEY_oauth_app_uk_registration_id"), new TableField[] { OauthAppTable.OAUTH_APP.REGISTRATION_ID }, true); + public static final UniqueKey KEY_OPERATION_LOG_PRIMARY = Internal.createUniqueKey(OperationLogTable.OPERATION_LOG, DSL.name("KEY_operation_log_PRIMARY"), new TableField[] { OperationLogTable.OPERATION_LOG.ID }, true); + public static final UniqueKey KEY_PROJECT_PRIMARY = Internal.createUniqueKey(ProjectTable.PROJECT, DSL.name("KEY_project_PRIMARY"), new TableField[] { ProjectTable.PROJECT.ID }, true); + public static final UniqueKey KEY_PROJECT_UK_GROUP_ID_NAME_DELETED_TOKEN = Internal.createUniqueKey(ProjectTable.PROJECT, DSL.name("KEY_project_uk_group_id_name_deleted_token"), new TableField[] { ProjectTable.PROJECT.GROUP_ID, ProjectTable.PROJECT.NAME, ProjectTable.PROJECT.DELETED_TOKEN }, true); + public static final UniqueKey KEY_PROJECT_SYNC_RULE_PRIMARY = Internal.createUniqueKey(ProjectSyncRuleTable.PROJECT_SYNC_RULE, DSL.name("KEY_project_sync_rule_PRIMARY"), new TableField[] { ProjectSyncRuleTable.PROJECT_SYNC_RULE.ID }, true); + public static final UniqueKey KEY_PROJECT_SYNC_RULE_UK_PROJECT_ID = Internal.createUniqueKey(ProjectSyncRuleTable.PROJECT_SYNC_RULE, DSL.name("KEY_project_sync_rule_uk_project_id"), new TableField[] { ProjectSyncRuleTable.PROJECT_SYNC_RULE.PROJECT_ID }, true); + public static final UniqueKey KEY_PROJECT_SYNC_TASK_PRIMARY = Internal.createUniqueKey(ProjectSyncTaskTable.PROJECT_SYNC_TASK, DSL.name("KEY_project_sync_task_PRIMARY"), new TableField[] { ProjectSyncTaskTable.PROJECT_SYNC_TASK.ID }, true); + public static final UniqueKey KEY_SYS_KEY_PRIMARY = Internal.createUniqueKey(SysKeyTable.SYS_KEY, DSL.name("KEY_sys_key_PRIMARY"), new TableField[] { SysKeyTable.SYS_KEY.ID }, true); + public static final UniqueKey KEY_SYS_MAIL_PRIMARY = Internal.createUniqueKey(SysMailTable.SYS_MAIL, DSL.name("KEY_sys_mail_PRIMARY"), new TableField[] { SysMailTable.SYS_MAIL.ID }, true); + public static final UniqueKey KEY_TABLE_COLUMN_DOCUMENT_PRIMARY = Internal.createUniqueKey(TableColumnDocumentTable.TABLE_COLUMN_DOCUMENT, DSL.name("KEY_table_column_document_PRIMARY"), new TableField[] { TableColumnDocumentTable.TABLE_COLUMN_DOCUMENT.ID }, true); + public static final UniqueKey KEY_TABLE_DOCUMENT_PRIMARY = Internal.createUniqueKey(TableDocumentTable.TABLE_DOCUMENT, DSL.name("KEY_table_document_PRIMARY"), new TableField[] { TableDocumentTable.TABLE_DOCUMENT.ID }, true); + public static final UniqueKey KEY_TABLE_FOREIGN_KEY_DOCUMENT_PRIMARY = Internal.createUniqueKey(TableForeignKeyDocumentTable.TABLE_FOREIGN_KEY_DOCUMENT, DSL.name("KEY_table_foreign_key_document_PRIMARY"), new TableField[] { TableForeignKeyDocumentTable.TABLE_FOREIGN_KEY_DOCUMENT.ID }, true); + public static final UniqueKey KEY_TABLE_INDEX_DOCUMENT_PRIMARY = Internal.createUniqueKey(TableIndexDocumentTable.TABLE_INDEX_DOCUMENT, DSL.name("KEY_table_index_document_PRIMARY"), new TableField[] { TableIndexDocumentTable.TABLE_INDEX_DOCUMENT.ID }, true); + public static final UniqueKey KEY_TABLE_TRIGGER_DOCUMENT_PRIMARY = Internal.createUniqueKey(TableTriggerDocumentTable.TABLE_TRIGGER_DOCUMENT, DSL.name("KEY_table_trigger_document_PRIMARY"), new TableField[] { TableTriggerDocumentTable.TABLE_TRIGGER_DOCUMENT.ID }, true); + public static final UniqueKey KEY_USER_PRIMARY = Internal.createUniqueKey(UserTable.USER, DSL.name("KEY_user_PRIMARY"), new TableField[] { UserTable.USER.ID }, true); + public static final UniqueKey KEY_USER_UK_EMAIL = Internal.createUniqueKey(UserTable.USER, DSL.name("KEY_user_uk_email"), new TableField[] { UserTable.USER.EMAIL, UserTable.USER.DELETED_TOKEN }, true); + public static final UniqueKey KEY_USER_UK_USERNAME = Internal.createUniqueKey(UserTable.USER, DSL.name("KEY_user_uk_username"), new TableField[] { UserTable.USER.USERNAME, UserTable.USER.DELETED_TOKEN }, true); + public static final UniqueKey KEY_USER_FAVORITE_PROJECT_PRIMARY = Internal.createUniqueKey(UserFavoriteProjectTable.USER_FAVORITE_PROJECT, DSL.name("KEY_user_favorite_project_PRIMARY"), new TableField[] { UserFavoriteProjectTable.USER_FAVORITE_PROJECT.ID }, true); + public static final UniqueKey KEY_USER_FAVORITE_PROJECT_UK_USER_ID_PROJECT_ID = Internal.createUniqueKey(UserFavoriteProjectTable.USER_FAVORITE_PROJECT, DSL.name("KEY_user_favorite_project_uk_user_id_project_id"), new TableField[] { UserFavoriteProjectTable.USER_FAVORITE_PROJECT.USER_ID, UserFavoriteProjectTable.USER_FAVORITE_PROJECT.PROJECT_ID }, true); + public static final UniqueKey KEY_USER_ROLE_PRIMARY = Internal.createUniqueKey(UserRoleTable.USER_ROLE, DSL.name("KEY_user_role_PRIMARY"), new TableField[] { UserRoleTable.USER_ROLE.ID }, true); + public static final UniqueKey KEY_USER_ROLE_UK_USER_ID_GROUP_ID_ROLE = Internal.createUniqueKey(UserRoleTable.USER_ROLE, DSL.name("KEY_user_role_uk_user_id_group_id_role"), new TableField[] { UserRoleTable.USER_ROLE.USER_ID, UserRoleTable.USER_ROLE.GROUP_ID, UserRoleTable.USER_ROLE.ROLE }, true); } diff --git a/dao/generated-src/jooq/main/java/com/databasir/dao/Tables.java b/dao/generated-src/jooq/main/java/com/databasir/dao/Tables.java index 5e29e5e..79e341a 100644 --- a/dao/generated-src/jooq/main/java/com/databasir/dao/Tables.java +++ b/dao/generated-src/jooq/main/java/com/databasir/dao/Tables.java @@ -4,32 +4,32 @@ package com.databasir.dao; -import com.databasir.dao.tables.DataSource; -import com.databasir.dao.tables.DataSourceProperty; -import com.databasir.dao.tables.DatabaseDocument; -import com.databasir.dao.tables.DatabaseType; -import com.databasir.dao.tables.DocumentDescription; -import com.databasir.dao.tables.DocumentDiscussion; -import com.databasir.dao.tables.DocumentFullText; -import com.databasir.dao.tables.DocumentTemplateProperty; -import com.databasir.dao.tables.Group; -import com.databasir.dao.tables.Login; -import com.databasir.dao.tables.MockDataRule; -import com.databasir.dao.tables.OauthApp; -import com.databasir.dao.tables.OperationLog; -import com.databasir.dao.tables.Project; -import com.databasir.dao.tables.ProjectSyncRule; -import com.databasir.dao.tables.ProjectSyncTask; -import com.databasir.dao.tables.SysKey; -import com.databasir.dao.tables.SysMail; -import com.databasir.dao.tables.TableColumnDocument; -import com.databasir.dao.tables.TableDocument; -import com.databasir.dao.tables.TableForeignKeyDocument; -import com.databasir.dao.tables.TableIndexDocument; -import com.databasir.dao.tables.TableTriggerDocument; -import com.databasir.dao.tables.User; -import com.databasir.dao.tables.UserFavoriteProject; -import com.databasir.dao.tables.UserRole; +import com.databasir.dao.tables.DataSourcePropertyTable; +import com.databasir.dao.tables.DataSourceTable; +import com.databasir.dao.tables.DatabaseDocumentTable; +import com.databasir.dao.tables.DatabaseTypeTable; +import com.databasir.dao.tables.DocumentDescriptionTable; +import com.databasir.dao.tables.DocumentDiscussionTable; +import com.databasir.dao.tables.DocumentFullTextTable; +import com.databasir.dao.tables.DocumentTemplatePropertyTable; +import com.databasir.dao.tables.GroupTable; +import com.databasir.dao.tables.LoginTable; +import com.databasir.dao.tables.MockDataRuleTable; +import com.databasir.dao.tables.OauthAppTable; +import com.databasir.dao.tables.OperationLogTable; +import com.databasir.dao.tables.ProjectSyncRuleTable; +import com.databasir.dao.tables.ProjectSyncTaskTable; +import com.databasir.dao.tables.ProjectTable; +import com.databasir.dao.tables.SysKeyTable; +import com.databasir.dao.tables.SysMailTable; +import com.databasir.dao.tables.TableColumnDocumentTable; +import com.databasir.dao.tables.TableDocumentTable; +import com.databasir.dao.tables.TableForeignKeyDocumentTable; +import com.databasir.dao.tables.TableIndexDocumentTable; +import com.databasir.dao.tables.TableTriggerDocumentTable; +import com.databasir.dao.tables.UserFavoriteProjectTable; +import com.databasir.dao.tables.UserRoleTable; +import com.databasir.dao.tables.UserTable; /** @@ -41,130 +41,130 @@ public class Tables { /** * The table databasir.data_source. */ - public static final DataSource DATA_SOURCE = DataSource.DATA_SOURCE; + public static final DataSourceTable DATA_SOURCE = DataSourceTable.DATA_SOURCE; /** * The table databasir.data_source_property. */ - public static final DataSourceProperty DATA_SOURCE_PROPERTY = DataSourceProperty.DATA_SOURCE_PROPERTY; + public static final DataSourcePropertyTable DATA_SOURCE_PROPERTY = DataSourcePropertyTable.DATA_SOURCE_PROPERTY; /** * The table databasir.database_document. */ - public static final DatabaseDocument DATABASE_DOCUMENT = DatabaseDocument.DATABASE_DOCUMENT; + public static final DatabaseDocumentTable DATABASE_DOCUMENT = DatabaseDocumentTable.DATABASE_DOCUMENT; /** * customer database types */ - public static final DatabaseType DATABASE_TYPE = DatabaseType.DATABASE_TYPE; + public static final DatabaseTypeTable DATABASE_TYPE = DatabaseTypeTable.DATABASE_TYPE; /** * custom document description */ - public static final DocumentDescription DOCUMENT_DESCRIPTION = DocumentDescription.DOCUMENT_DESCRIPTION; + public static final DocumentDescriptionTable DOCUMENT_DESCRIPTION = DocumentDescriptionTable.DOCUMENT_DESCRIPTION; /** * The table databasir.document_discussion. */ - public static final DocumentDiscussion DOCUMENT_DISCUSSION = DocumentDiscussion.DOCUMENT_DISCUSSION; + public static final DocumentDiscussionTable DOCUMENT_DISCUSSION = DocumentDiscussionTable.DOCUMENT_DISCUSSION; /** * The table databasir.document_full_text. */ - public static final DocumentFullText DOCUMENT_FULL_TEXT = DocumentFullText.DOCUMENT_FULL_TEXT; + public static final DocumentFullTextTable DOCUMENT_FULL_TEXT = DocumentFullTextTable.DOCUMENT_FULL_TEXT; /** * template property */ - public static final DocumentTemplateProperty DOCUMENT_TEMPLATE_PROPERTY = DocumentTemplateProperty.DOCUMENT_TEMPLATE_PROPERTY; + public static final DocumentTemplatePropertyTable DOCUMENT_TEMPLATE_PROPERTY = DocumentTemplatePropertyTable.DOCUMENT_TEMPLATE_PROPERTY; /** * The table databasir.group. */ - public static final Group GROUP = Group.GROUP; + public static final GroupTable GROUP = GroupTable.GROUP; /** * The table databasir.login. */ - public static final Login LOGIN = Login.LOGIN; + public static final LoginTable LOGIN = LoginTable.LOGIN; /** * The table databasir.mock_data_rule. */ - public static final MockDataRule MOCK_DATA_RULE = MockDataRule.MOCK_DATA_RULE; + public static final MockDataRuleTable MOCK_DATA_RULE = MockDataRuleTable.MOCK_DATA_RULE; /** * oauth app info */ - public static final OauthApp OAUTH_APP = OauthApp.OAUTH_APP; + public static final OauthAppTable OAUTH_APP = OauthAppTable.OAUTH_APP; /** * The table databasir.operation_log. */ - public static final OperationLog OPERATION_LOG = OperationLog.OPERATION_LOG; + public static final OperationLogTable OPERATION_LOG = OperationLogTable.OPERATION_LOG; /** * The table databasir.project. */ - public static final Project PROJECT = Project.PROJECT; + public static final ProjectTable PROJECT = ProjectTable.PROJECT; /** * The table databasir.project_sync_rule. */ - public static final ProjectSyncRule PROJECT_SYNC_RULE = ProjectSyncRule.PROJECT_SYNC_RULE; + public static final ProjectSyncRuleTable PROJECT_SYNC_RULE = ProjectSyncRuleTable.PROJECT_SYNC_RULE; /** * The table databasir.project_sync_task. */ - public static final ProjectSyncTask PROJECT_SYNC_TASK = ProjectSyncTask.PROJECT_SYNC_TASK; + public static final ProjectSyncTaskTable PROJECT_SYNC_TASK = ProjectSyncTaskTable.PROJECT_SYNC_TASK; /** * The table databasir.sys_key. */ - public static final SysKey SYS_KEY = SysKey.SYS_KEY; + public static final SysKeyTable SYS_KEY = SysKeyTable.SYS_KEY; /** * The table databasir.sys_mail. */ - public static final SysMail SYS_MAIL = SysMail.SYS_MAIL; + public static final SysMailTable SYS_MAIL = SysMailTable.SYS_MAIL; /** * The table databasir.table_column_document. */ - public static final TableColumnDocument TABLE_COLUMN_DOCUMENT = TableColumnDocument.TABLE_COLUMN_DOCUMENT; + public static final TableColumnDocumentTable TABLE_COLUMN_DOCUMENT = TableColumnDocumentTable.TABLE_COLUMN_DOCUMENT; /** * The table databasir.table_document. */ - public static final TableDocument TABLE_DOCUMENT = TableDocument.TABLE_DOCUMENT; + public static final TableDocumentTable TABLE_DOCUMENT = TableDocumentTable.TABLE_DOCUMENT; /** * The table databasir.table_foreign_key_document. */ - public static final TableForeignKeyDocument TABLE_FOREIGN_KEY_DOCUMENT = TableForeignKeyDocument.TABLE_FOREIGN_KEY_DOCUMENT; + public static final TableForeignKeyDocumentTable TABLE_FOREIGN_KEY_DOCUMENT = TableForeignKeyDocumentTable.TABLE_FOREIGN_KEY_DOCUMENT; /** * The table databasir.table_index_document. */ - public static final TableIndexDocument TABLE_INDEX_DOCUMENT = TableIndexDocument.TABLE_INDEX_DOCUMENT; + public static final TableIndexDocumentTable TABLE_INDEX_DOCUMENT = TableIndexDocumentTable.TABLE_INDEX_DOCUMENT; /** * The table databasir.table_trigger_document. */ - public static final TableTriggerDocument TABLE_TRIGGER_DOCUMENT = TableTriggerDocument.TABLE_TRIGGER_DOCUMENT; + public static final TableTriggerDocumentTable TABLE_TRIGGER_DOCUMENT = TableTriggerDocumentTable.TABLE_TRIGGER_DOCUMENT; /** * The table databasir.user. */ - public static final User USER = User.USER; + public static final UserTable USER = UserTable.USER; /** * The table databasir.user_favorite_project. */ - public static final UserFavoriteProject USER_FAVORITE_PROJECT = UserFavoriteProject.USER_FAVORITE_PROJECT; + public static final UserFavoriteProjectTable USER_FAVORITE_PROJECT = UserFavoriteProjectTable.USER_FAVORITE_PROJECT; /** * The table databasir.user_role. */ - public static final UserRole USER_ROLE = UserRole.USER_ROLE; + public static final UserRoleTable USER_ROLE = UserRoleTable.USER_ROLE; } diff --git a/dao/generated-src/jooq/main/java/com/databasir/dao/tables/DataSourceProperty.java b/dao/generated-src/jooq/main/java/com/databasir/dao/tables/DataSourcePropertyTable.java similarity index 79% rename from dao/generated-src/jooq/main/java/com/databasir/dao/tables/DataSourceProperty.java rename to dao/generated-src/jooq/main/java/com/databasir/dao/tables/DataSourcePropertyTable.java index d313f35..f372b5a 100644 --- a/dao/generated-src/jooq/main/java/com/databasir/dao/tables/DataSourceProperty.java +++ b/dao/generated-src/jooq/main/java/com/databasir/dao/tables/DataSourcePropertyTable.java @@ -34,14 +34,14 @@ import org.jooq.impl.TableImpl; * This class is generated by jOOQ. */ @SuppressWarnings({ "all", "unchecked", "rawtypes" }) -public class DataSourceProperty extends TableImpl { +public class DataSourcePropertyTable extends TableImpl { private static final long serialVersionUID = 1L; /** * The reference instance of databasir.data_source_property */ - public static final DataSourceProperty DATA_SOURCE_PROPERTY = new DataSourceProperty(); + public static final DataSourcePropertyTable DATA_SOURCE_PROPERTY = new DataSourcePropertyTable(); /** * The class holding records for this type @@ -76,11 +76,11 @@ public class DataSourceProperty extends TableImpl { */ public final TableField CREATE_AT = createField(DSL.name("create_at"), SQLDataType.LOCALDATETIME(0).nullable(false).defaultValue(DSL.field("CURRENT_TIMESTAMP", SQLDataType.LOCALDATETIME)), this, ""); - private DataSourceProperty(Name alias, Table aliased) { + private DataSourcePropertyTable(Name alias, Table aliased) { this(alias, aliased, null); } - private DataSourceProperty(Name alias, Table aliased, Field[] parameters) { + private DataSourcePropertyTable(Name alias, Table aliased, Field[] parameters) { super(alias, null, aliased, parameters, DSL.comment(""), TableOptions.table()); } @@ -88,7 +88,7 @@ public class DataSourceProperty extends TableImpl { * Create an aliased databasir.data_source_property table * reference */ - public DataSourceProperty(String alias) { + public DataSourcePropertyTable(String alias) { this(DSL.name(alias), DATA_SOURCE_PROPERTY); } @@ -96,18 +96,18 @@ public class DataSourceProperty extends TableImpl { * Create an aliased databasir.data_source_property table * reference */ - public DataSourceProperty(Name alias) { + public DataSourcePropertyTable(Name alias) { this(alias, DATA_SOURCE_PROPERTY); } /** * Create a databasir.data_source_property table reference */ - public DataSourceProperty() { + public DataSourcePropertyTable() { this(DSL.name("data_source_property"), null); } - public DataSourceProperty(Table child, ForeignKey key) { + public DataSourcePropertyTable(Table child, ForeignKey key) { super(child, key, DATA_SOURCE_PROPERTY); } @@ -132,29 +132,29 @@ public class DataSourceProperty extends TableImpl { } @Override - public DataSourceProperty as(String alias) { - return new DataSourceProperty(DSL.name(alias), this); + public DataSourcePropertyTable as(String alias) { + return new DataSourcePropertyTable(DSL.name(alias), this); } @Override - public DataSourceProperty as(Name alias) { - return new DataSourceProperty(alias, this); + public DataSourcePropertyTable as(Name alias) { + return new DataSourcePropertyTable(alias, this); } /** * Rename this table */ @Override - public DataSourceProperty rename(String name) { - return new DataSourceProperty(DSL.name(name), null); + public DataSourcePropertyTable rename(String name) { + return new DataSourcePropertyTable(DSL.name(name), null); } /** * Rename this table */ @Override - public DataSourceProperty rename(Name name) { - return new DataSourceProperty(name, null); + public DataSourcePropertyTable rename(Name name) { + return new DataSourcePropertyTable(name, null); } // ------------------------------------------------------------------------- diff --git a/dao/generated-src/jooq/main/java/com/databasir/dao/tables/DataSource.java b/dao/generated-src/jooq/main/java/com/databasir/dao/tables/DataSourceTable.java similarity index 84% rename from dao/generated-src/jooq/main/java/com/databasir/dao/tables/DataSource.java rename to dao/generated-src/jooq/main/java/com/databasir/dao/tables/DataSourceTable.java index 8588f17..0cd3dec 100644 --- a/dao/generated-src/jooq/main/java/com/databasir/dao/tables/DataSource.java +++ b/dao/generated-src/jooq/main/java/com/databasir/dao/tables/DataSourceTable.java @@ -32,14 +32,14 @@ import org.jooq.impl.TableImpl; * This class is generated by jOOQ. */ @SuppressWarnings({ "all", "unchecked", "rawtypes" }) -public class DataSource extends TableImpl { +public class DataSourceTable extends TableImpl { private static final long serialVersionUID = 1L; /** * The reference instance of databasir.data_source */ - public static final DataSource DATA_SOURCE = new DataSource(); + public static final DataSourceTable DATA_SOURCE = new DataSourceTable(); /** * The class holding records for this type @@ -99,36 +99,36 @@ public class DataSource extends TableImpl { */ public final TableField CREATE_AT = createField(DSL.name("create_at"), SQLDataType.LOCALDATETIME(0).nullable(false).defaultValue(DSL.field("CURRENT_TIMESTAMP", SQLDataType.LOCALDATETIME)), this, ""); - private DataSource(Name alias, Table aliased) { + private DataSourceTable(Name alias, Table aliased) { this(alias, aliased, null); } - private DataSource(Name alias, Table aliased, Field[] parameters) { + private DataSourceTable(Name alias, Table aliased, Field[] parameters) { super(alias, null, aliased, parameters, DSL.comment(""), TableOptions.table()); } /** * Create an aliased databasir.data_source table reference */ - public DataSource(String alias) { + public DataSourceTable(String alias) { this(DSL.name(alias), DATA_SOURCE); } /** * Create an aliased databasir.data_source table reference */ - public DataSource(Name alias) { + public DataSourceTable(Name alias) { this(alias, DATA_SOURCE); } /** * Create a databasir.data_source table reference */ - public DataSource() { + public DataSourceTable() { this(DSL.name("data_source"), null); } - public DataSource(Table child, ForeignKey key) { + public DataSourceTable(Table child, ForeignKey key) { super(child, key, DATA_SOURCE); } @@ -153,29 +153,29 @@ public class DataSource extends TableImpl { } @Override - public DataSource as(String alias) { - return new DataSource(DSL.name(alias), this); + public DataSourceTable as(String alias) { + return new DataSourceTable(DSL.name(alias), this); } @Override - public DataSource as(Name alias) { - return new DataSource(alias, this); + public DataSourceTable as(Name alias) { + return new DataSourceTable(alias, this); } /** * Rename this table */ @Override - public DataSource rename(String name) { - return new DataSource(DSL.name(name), null); + public DataSourceTable rename(String name) { + return new DataSourceTable(DSL.name(name), null); } /** * Rename this table */ @Override - public DataSource rename(Name name) { - return new DataSource(name, null); + public DataSourceTable rename(Name name) { + return new DataSourceTable(name, null); } // ------------------------------------------------------------------------- diff --git a/dao/generated-src/jooq/main/java/com/databasir/dao/tables/DatabaseDocument.java b/dao/generated-src/jooq/main/java/com/databasir/dao/tables/DatabaseDocumentTable.java similarity index 84% rename from dao/generated-src/jooq/main/java/com/databasir/dao/tables/DatabaseDocument.java rename to dao/generated-src/jooq/main/java/com/databasir/dao/tables/DatabaseDocumentTable.java index 8a4a7cb..a4e123a 100644 --- a/dao/generated-src/jooq/main/java/com/databasir/dao/tables/DatabaseDocument.java +++ b/dao/generated-src/jooq/main/java/com/databasir/dao/tables/DatabaseDocumentTable.java @@ -32,14 +32,14 @@ import org.jooq.impl.TableImpl; * This class is generated by jOOQ. */ @SuppressWarnings({ "all", "unchecked", "rawtypes" }) -public class DatabaseDocument extends TableImpl { +public class DatabaseDocumentTable extends TableImpl { private static final long serialVersionUID = 1L; /** * The reference instance of databasir.database_document */ - public static final DatabaseDocument DATABASE_DOCUMENT = new DatabaseDocument(); + public static final DatabaseDocumentTable DATABASE_DOCUMENT = new DatabaseDocumentTable(); /** * The class holding records for this type @@ -99,11 +99,11 @@ public class DatabaseDocument extends TableImpl { */ public final TableField CREATE_AT = createField(DSL.name("create_at"), SQLDataType.LOCALDATETIME(0).nullable(false).defaultValue(DSL.field("CURRENT_TIMESTAMP", SQLDataType.LOCALDATETIME)), this, ""); - private DatabaseDocument(Name alias, Table aliased) { + private DatabaseDocumentTable(Name alias, Table aliased) { this(alias, aliased, null); } - private DatabaseDocument(Name alias, Table aliased, Field[] parameters) { + private DatabaseDocumentTable(Name alias, Table aliased, Field[] parameters) { super(alias, null, aliased, parameters, DSL.comment(""), TableOptions.table()); } @@ -111,7 +111,7 @@ public class DatabaseDocument extends TableImpl { * Create an aliased databasir.database_document table * reference */ - public DatabaseDocument(String alias) { + public DatabaseDocumentTable(String alias) { this(DSL.name(alias), DATABASE_DOCUMENT); } @@ -119,18 +119,18 @@ public class DatabaseDocument extends TableImpl { * Create an aliased databasir.database_document table * reference */ - public DatabaseDocument(Name alias) { + public DatabaseDocumentTable(Name alias) { this(alias, DATABASE_DOCUMENT); } /** * Create a databasir.database_document table reference */ - public DatabaseDocument() { + public DatabaseDocumentTable() { this(DSL.name("database_document"), null); } - public DatabaseDocument(Table child, ForeignKey key) { + public DatabaseDocumentTable(Table child, ForeignKey key) { super(child, key, DATABASE_DOCUMENT); } @@ -155,29 +155,29 @@ public class DatabaseDocument extends TableImpl { } @Override - public DatabaseDocument as(String alias) { - return new DatabaseDocument(DSL.name(alias), this); + public DatabaseDocumentTable as(String alias) { + return new DatabaseDocumentTable(DSL.name(alias), this); } @Override - public DatabaseDocument as(Name alias) { - return new DatabaseDocument(alias, this); + public DatabaseDocumentTable as(Name alias) { + return new DatabaseDocumentTable(alias, this); } /** * Rename this table */ @Override - public DatabaseDocument rename(String name) { - return new DatabaseDocument(DSL.name(name), null); + public DatabaseDocumentTable rename(String name) { + return new DatabaseDocumentTable(DSL.name(name), null); } /** * Rename this table */ @Override - public DatabaseDocument rename(Name name) { - return new DatabaseDocument(name, null); + public DatabaseDocumentTable rename(Name name) { + return new DatabaseDocumentTable(name, null); } // ------------------------------------------------------------------------- diff --git a/dao/generated-src/jooq/main/java/com/databasir/dao/tables/DatabaseType.java b/dao/generated-src/jooq/main/java/com/databasir/dao/tables/DatabaseTypeTable.java similarity index 86% rename from dao/generated-src/jooq/main/java/com/databasir/dao/tables/DatabaseType.java rename to dao/generated-src/jooq/main/java/com/databasir/dao/tables/DatabaseTypeTable.java index 7ef2bfc..799e642 100644 --- a/dao/generated-src/jooq/main/java/com/databasir/dao/tables/DatabaseType.java +++ b/dao/generated-src/jooq/main/java/com/databasir/dao/tables/DatabaseTypeTable.java @@ -32,14 +32,14 @@ import org.jooq.impl.TableImpl; * customer database types */ @SuppressWarnings({ "all", "unchecked", "rawtypes" }) -public class DatabaseType extends TableImpl { +public class DatabaseTypeTable extends TableImpl { private static final long serialVersionUID = 1L; /** * The reference instance of databasir.database_type */ - public static final DatabaseType DATABASE_TYPE = new DatabaseType(); + public static final DatabaseTypeTable DATABASE_TYPE = new DatabaseTypeTable(); /** * The class holding records for this type @@ -115,36 +115,36 @@ public class DatabaseType extends TableImpl { */ public final TableField CREATE_AT = createField(DSL.name("create_at"), SQLDataType.LOCALDATETIME(0).nullable(false).defaultValue(DSL.field("CURRENT_TIMESTAMP", SQLDataType.LOCALDATETIME)), this, ""); - private DatabaseType(Name alias, Table aliased) { + private DatabaseTypeTable(Name alias, Table aliased) { this(alias, aliased, null); } - private DatabaseType(Name alias, Table aliased, Field[] parameters) { + private DatabaseTypeTable(Name alias, Table aliased, Field[] parameters) { super(alias, null, aliased, parameters, DSL.comment("customer database types"), TableOptions.table()); } /** * Create an aliased databasir.database_type table reference */ - public DatabaseType(String alias) { + public DatabaseTypeTable(String alias) { this(DSL.name(alias), DATABASE_TYPE); } /** * Create an aliased databasir.database_type table reference */ - public DatabaseType(Name alias) { + public DatabaseTypeTable(Name alias) { this(alias, DATABASE_TYPE); } /** * Create a databasir.database_type table reference */ - public DatabaseType() { + public DatabaseTypeTable() { this(DSL.name("database_type"), null); } - public DatabaseType(Table child, ForeignKey key) { + public DatabaseTypeTable(Table child, ForeignKey key) { super(child, key, DATABASE_TYPE); } @@ -169,29 +169,29 @@ public class DatabaseType extends TableImpl { } @Override - public DatabaseType as(String alias) { - return new DatabaseType(DSL.name(alias), this); + public DatabaseTypeTable as(String alias) { + return new DatabaseTypeTable(DSL.name(alias), this); } @Override - public DatabaseType as(Name alias) { - return new DatabaseType(alias, this); + public DatabaseTypeTable as(Name alias) { + return new DatabaseTypeTable(alias, this); } /** * Rename this table */ @Override - public DatabaseType rename(String name) { - return new DatabaseType(DSL.name(name), null); + public DatabaseTypeTable rename(String name) { + return new DatabaseTypeTable(DSL.name(name), null); } /** * Rename this table */ @Override - public DatabaseType rename(Name name) { - return new DatabaseType(name, null); + public DatabaseTypeTable rename(Name name) { + return new DatabaseTypeTable(name, null); } // ------------------------------------------------------------------------- diff --git a/dao/generated-src/jooq/main/java/com/databasir/dao/tables/DocumentDescription.java b/dao/generated-src/jooq/main/java/com/databasir/dao/tables/DocumentDescriptionTable.java similarity index 81% rename from dao/generated-src/jooq/main/java/com/databasir/dao/tables/DocumentDescription.java rename to dao/generated-src/jooq/main/java/com/databasir/dao/tables/DocumentDescriptionTable.java index 545aaa0..ab08d90 100644 --- a/dao/generated-src/jooq/main/java/com/databasir/dao/tables/DocumentDescription.java +++ b/dao/generated-src/jooq/main/java/com/databasir/dao/tables/DocumentDescriptionTable.java @@ -32,14 +32,14 @@ import org.jooq.impl.TableImpl; * custom document description */ @SuppressWarnings({ "all", "unchecked", "rawtypes" }) -public class DocumentDescription extends TableImpl { +public class DocumentDescriptionTable extends TableImpl { private static final long serialVersionUID = 1L; /** * The reference instance of databasir.document_description */ - public static final DocumentDescription DOCUMENT_DESCRIPTION = new DocumentDescription(); + public static final DocumentDescriptionTable DOCUMENT_DESCRIPTION = new DocumentDescriptionTable(); /** * The class holding records for this type @@ -89,11 +89,11 @@ public class DocumentDescription extends TableImpl { */ public final TableField CREATE_AT = createField(DSL.name("create_at"), SQLDataType.LOCALDATETIME(0).nullable(false).defaultValue(DSL.field("CURRENT_TIMESTAMP", SQLDataType.LOCALDATETIME)), this, ""); - private DocumentDescription(Name alias, Table aliased) { + private DocumentDescriptionTable(Name alias, Table aliased) { this(alias, aliased, null); } - private DocumentDescription(Name alias, Table aliased, Field[] parameters) { + private DocumentDescriptionTable(Name alias, Table aliased, Field[] parameters) { super(alias, null, aliased, parameters, DSL.comment("custom document description"), TableOptions.table()); } @@ -101,7 +101,7 @@ public class DocumentDescription extends TableImpl { * Create an aliased databasir.document_description table * reference */ - public DocumentDescription(String alias) { + public DocumentDescriptionTable(String alias) { this(DSL.name(alias), DOCUMENT_DESCRIPTION); } @@ -109,18 +109,18 @@ public class DocumentDescription extends TableImpl { * Create an aliased databasir.document_description table * reference */ - public DocumentDescription(Name alias) { + public DocumentDescriptionTable(Name alias) { this(alias, DOCUMENT_DESCRIPTION); } /** * Create a databasir.document_description table reference */ - public DocumentDescription() { + public DocumentDescriptionTable() { this(DSL.name("document_description"), null); } - public DocumentDescription(Table child, ForeignKey key) { + public DocumentDescriptionTable(Table child, ForeignKey key) { super(child, key, DOCUMENT_DESCRIPTION); } @@ -145,29 +145,29 @@ public class DocumentDescription extends TableImpl { } @Override - public DocumentDescription as(String alias) { - return new DocumentDescription(DSL.name(alias), this); + public DocumentDescriptionTable as(String alias) { + return new DocumentDescriptionTable(DSL.name(alias), this); } @Override - public DocumentDescription as(Name alias) { - return new DocumentDescription(alias, this); + public DocumentDescriptionTable as(Name alias) { + return new DocumentDescriptionTable(alias, this); } /** * Rename this table */ @Override - public DocumentDescription rename(String name) { - return new DocumentDescription(DSL.name(name), null); + public DocumentDescriptionTable rename(String name) { + return new DocumentDescriptionTable(DSL.name(name), null); } /** * Rename this table */ @Override - public DocumentDescription rename(Name name) { - return new DocumentDescription(name, null); + public DocumentDescriptionTable rename(Name name) { + return new DocumentDescriptionTable(name, null); } // ------------------------------------------------------------------------- diff --git a/dao/generated-src/jooq/main/java/com/databasir/dao/tables/DocumentDiscussion.java b/dao/generated-src/jooq/main/java/com/databasir/dao/tables/DocumentDiscussionTable.java similarity index 80% rename from dao/generated-src/jooq/main/java/com/databasir/dao/tables/DocumentDiscussion.java rename to dao/generated-src/jooq/main/java/com/databasir/dao/tables/DocumentDiscussionTable.java index a548660..6116a97 100644 --- a/dao/generated-src/jooq/main/java/com/databasir/dao/tables/DocumentDiscussion.java +++ b/dao/generated-src/jooq/main/java/com/databasir/dao/tables/DocumentDiscussionTable.java @@ -34,14 +34,14 @@ import org.jooq.impl.TableImpl; * This class is generated by jOOQ. */ @SuppressWarnings({ "all", "unchecked", "rawtypes" }) -public class DocumentDiscussion extends TableImpl { +public class DocumentDiscussionTable extends TableImpl { private static final long serialVersionUID = 1L; /** * The reference instance of databasir.document_discussion */ - public static final DocumentDiscussion DOCUMENT_DISCUSSION = new DocumentDiscussion(); + public static final DocumentDiscussionTable DOCUMENT_DISCUSSION = new DocumentDiscussionTable(); /** * The class holding records for this type @@ -86,11 +86,11 @@ public class DocumentDiscussion extends TableImpl { */ public final TableField CREATE_AT = createField(DSL.name("create_at"), SQLDataType.LOCALDATETIME(0).nullable(false).defaultValue(DSL.field("CURRENT_TIMESTAMP", SQLDataType.LOCALDATETIME)), this, ""); - private DocumentDiscussion(Name alias, Table aliased) { + private DocumentDiscussionTable(Name alias, Table aliased) { this(alias, aliased, null); } - private DocumentDiscussion(Name alias, Table aliased, Field[] parameters) { + private DocumentDiscussionTable(Name alias, Table aliased, Field[] parameters) { super(alias, null, aliased, parameters, DSL.comment(""), TableOptions.table()); } @@ -98,7 +98,7 @@ public class DocumentDiscussion extends TableImpl { * Create an aliased databasir.document_discussion table * reference */ - public DocumentDiscussion(String alias) { + public DocumentDiscussionTable(String alias) { this(DSL.name(alias), DOCUMENT_DISCUSSION); } @@ -106,18 +106,18 @@ public class DocumentDiscussion extends TableImpl { * Create an aliased databasir.document_discussion table * reference */ - public DocumentDiscussion(Name alias) { + public DocumentDiscussionTable(Name alias) { this(alias, DOCUMENT_DISCUSSION); } /** * Create a databasir.document_discussion table reference */ - public DocumentDiscussion() { + public DocumentDiscussionTable() { this(DSL.name("document_discussion"), null); } - public DocumentDiscussion(Table child, ForeignKey key) { + public DocumentDiscussionTable(Table child, ForeignKey key) { super(child, key, DOCUMENT_DISCUSSION); } @@ -142,29 +142,29 @@ public class DocumentDiscussion extends TableImpl { } @Override - public DocumentDiscussion as(String alias) { - return new DocumentDiscussion(DSL.name(alias), this); + public DocumentDiscussionTable as(String alias) { + return new DocumentDiscussionTable(DSL.name(alias), this); } @Override - public DocumentDiscussion as(Name alias) { - return new DocumentDiscussion(alias, this); + public DocumentDiscussionTable as(Name alias) { + return new DocumentDiscussionTable(alias, this); } /** * Rename this table */ @Override - public DocumentDiscussion rename(String name) { - return new DocumentDiscussion(DSL.name(name), null); + public DocumentDiscussionTable rename(String name) { + return new DocumentDiscussionTable(DSL.name(name), null); } /** * Rename this table */ @Override - public DocumentDiscussion rename(Name name) { - return new DocumentDiscussion(name, null); + public DocumentDiscussionTable rename(Name name) { + return new DocumentDiscussionTable(name, null); } // ------------------------------------------------------------------------- diff --git a/dao/generated-src/jooq/main/java/com/databasir/dao/tables/DocumentFullText.java b/dao/generated-src/jooq/main/java/com/databasir/dao/tables/DocumentFullTextTable.java similarity index 86% rename from dao/generated-src/jooq/main/java/com/databasir/dao/tables/DocumentFullText.java rename to dao/generated-src/jooq/main/java/com/databasir/dao/tables/DocumentFullTextTable.java index a2255b9..5b4c269 100644 --- a/dao/generated-src/jooq/main/java/com/databasir/dao/tables/DocumentFullText.java +++ b/dao/generated-src/jooq/main/java/com/databasir/dao/tables/DocumentFullTextTable.java @@ -8,28 +8,39 @@ import com.databasir.dao.Databasir; import com.databasir.dao.Indexes; import com.databasir.dao.Keys; import com.databasir.dao.tables.records.DocumentFullTextRecord; -import org.jooq.*; -import org.jooq.impl.DSL; -import org.jooq.impl.SQLDataType; -import org.jooq.impl.TableImpl; import java.time.LocalDateTime; import java.util.Arrays; import java.util.List; +import org.jooq.Field; +import org.jooq.ForeignKey; +import org.jooq.Identity; +import org.jooq.Index; +import org.jooq.Name; +import org.jooq.Record; +import org.jooq.Schema; +import org.jooq.Table; +import org.jooq.TableField; +import org.jooq.TableOptions; +import org.jooq.UniqueKey; +import org.jooq.impl.DSL; +import org.jooq.impl.SQLDataType; +import org.jooq.impl.TableImpl; + /** * This class is generated by jOOQ. */ @SuppressWarnings({ "all", "unchecked", "rawtypes" }) -public class DocumentFullText extends TableImpl { +public class DocumentFullTextTable extends TableImpl { private static final long serialVersionUID = 1L; /** * The reference instance of databasir.document_full_text */ - public static final DocumentFullText DOCUMENT_FULL_TEXT = new DocumentFullText(); + public static final DocumentFullTextTable DOCUMENT_FULL_TEXT = new DocumentFullTextTable(); /** * The class holding records for this type @@ -164,11 +175,11 @@ public class DocumentFullText extends TableImpl { */ public final TableField CREATE_AT = createField(DSL.name("create_at"), SQLDataType.LOCALDATETIME(0).nullable(false).defaultValue(DSL.field("CURRENT_TIMESTAMP", SQLDataType.LOCALDATETIME)), this, ""); - private DocumentFullText(Name alias, Table aliased) { + private DocumentFullTextTable(Name alias, Table aliased) { this(alias, aliased, null); } - private DocumentFullText(Name alias, Table aliased, Field[] parameters) { + private DocumentFullTextTable(Name alias, Table aliased, Field[] parameters) { super(alias, null, aliased, parameters, DSL.comment(""), TableOptions.table()); } @@ -176,7 +187,7 @@ public class DocumentFullText extends TableImpl { * Create an aliased databasir.document_full_text table * reference */ - public DocumentFullText(String alias) { + public DocumentFullTextTable(String alias) { this(DSL.name(alias), DOCUMENT_FULL_TEXT); } @@ -184,18 +195,18 @@ public class DocumentFullText extends TableImpl { * Create an aliased databasir.document_full_text table * reference */ - public DocumentFullText(Name alias) { + public DocumentFullTextTable(Name alias) { this(alias, DOCUMENT_FULL_TEXT); } /** * Create a databasir.document_full_text table reference */ - public DocumentFullText() { + public DocumentFullTextTable() { this(DSL.name("document_full_text"), null); } - public DocumentFullText(Table child, ForeignKey key) { + public DocumentFullTextTable(Table child, ForeignKey key) { super(child, key, DOCUMENT_FULL_TEXT); } @@ -220,28 +231,28 @@ public class DocumentFullText extends TableImpl { } @Override - public DocumentFullText as(String alias) { - return new DocumentFullText(DSL.name(alias), this); + public DocumentFullTextTable as(String alias) { + return new DocumentFullTextTable(DSL.name(alias), this); } @Override - public DocumentFullText as(Name alias) { - return new DocumentFullText(alias, this); + public DocumentFullTextTable as(Name alias) { + return new DocumentFullTextTable(alias, this); } /** * Rename this table */ @Override - public DocumentFullText rename(String name) { - return new DocumentFullText(DSL.name(name), null); + public DocumentFullTextTable rename(String name) { + return new DocumentFullTextTable(DSL.name(name), null); } /** * Rename this table */ @Override - public DocumentFullText rename(Name name) { - return new DocumentFullText(name, null); + public DocumentFullTextTable rename(Name name) { + return new DocumentFullTextTable(name, null); } } diff --git a/dao/generated-src/jooq/main/java/com/databasir/dao/tables/DocumentTemplateProperty.java b/dao/generated-src/jooq/main/java/com/databasir/dao/tables/DocumentTemplatePropertyTable.java similarity index 79% rename from dao/generated-src/jooq/main/java/com/databasir/dao/tables/DocumentTemplateProperty.java rename to dao/generated-src/jooq/main/java/com/databasir/dao/tables/DocumentTemplatePropertyTable.java index a45b373..b080a9f 100644 --- a/dao/generated-src/jooq/main/java/com/databasir/dao/tables/DocumentTemplateProperty.java +++ b/dao/generated-src/jooq/main/java/com/databasir/dao/tables/DocumentTemplatePropertyTable.java @@ -34,7 +34,7 @@ import org.jooq.impl.TableImpl; * template property */ @SuppressWarnings({ "all", "unchecked", "rawtypes" }) -public class DocumentTemplateProperty extends TableImpl { +public class DocumentTemplatePropertyTable extends TableImpl { private static final long serialVersionUID = 1L; @@ -42,7 +42,7 @@ public class DocumentTemplateProperty extends TableImpldatabasir.document_template_property */ - public static final DocumentTemplateProperty DOCUMENT_TEMPLATE_PROPERTY = new DocumentTemplateProperty(); + public static final DocumentTemplatePropertyTable DOCUMENT_TEMPLATE_PROPERTY = new DocumentTemplatePropertyTable(); /** * The class holding records for this type @@ -83,11 +83,11 @@ public class DocumentTemplateProperty extends TableImpl CREATE_AT = createField(DSL.name("create_at"), SQLDataType.LOCALDATETIME(0).nullable(false).defaultValue(DSL.field("CURRENT_TIMESTAMP", SQLDataType.LOCALDATETIME)), this, ""); - private DocumentTemplateProperty(Name alias, Table aliased) { + private DocumentTemplatePropertyTable(Name alias, Table aliased) { this(alias, aliased, null); } - private DocumentTemplateProperty(Name alias, Table aliased, Field[] parameters) { + private DocumentTemplatePropertyTable(Name alias, Table aliased, Field[] parameters) { super(alias, null, aliased, parameters, DSL.comment("template property"), TableOptions.table()); } @@ -95,7 +95,7 @@ public class DocumentTemplateProperty extends TableImpldatabasir.document_template_property table * reference */ - public DocumentTemplateProperty(String alias) { + public DocumentTemplatePropertyTable(String alias) { this(DSL.name(alias), DOCUMENT_TEMPLATE_PROPERTY); } @@ -103,7 +103,7 @@ public class DocumentTemplateProperty extends TableImpldatabasir.document_template_property table * reference */ - public DocumentTemplateProperty(Name alias) { + public DocumentTemplatePropertyTable(Name alias) { this(alias, DOCUMENT_TEMPLATE_PROPERTY); } @@ -111,11 +111,11 @@ public class DocumentTemplateProperty extends TableImpldatabasir.document_template_property table * reference */ - public DocumentTemplateProperty() { + public DocumentTemplatePropertyTable() { this(DSL.name("document_template_property"), null); } - public DocumentTemplateProperty(Table child, ForeignKey key) { + public DocumentTemplatePropertyTable(Table child, ForeignKey key) { super(child, key, DOCUMENT_TEMPLATE_PROPERTY); } @@ -140,29 +140,29 @@ public class DocumentTemplateProperty extends TableImpl { +public class GroupTable extends TableImpl { private static final long serialVersionUID = 1L; /** * The reference instance of databasir.group */ - public static final Group GROUP = new Group(); + public static final GroupTable GROUP = new GroupTable(); /** * The class holding records for this type @@ -77,36 +77,36 @@ public class Group extends TableImpl { */ public final TableField CREATE_AT = createField(DSL.name("create_at"), SQLDataType.LOCALDATETIME(0).nullable(false).defaultValue(DSL.field("CURRENT_TIMESTAMP", SQLDataType.LOCALDATETIME)), this, ""); - private Group(Name alias, Table aliased) { + private GroupTable(Name alias, Table aliased) { this(alias, aliased, null); } - private Group(Name alias, Table aliased, Field[] parameters) { + private GroupTable(Name alias, Table aliased, Field[] parameters) { super(alias, null, aliased, parameters, DSL.comment(""), TableOptions.table()); } /** * Create an aliased databasir.group table reference */ - public Group(String alias) { + public GroupTable(String alias) { this(DSL.name(alias), GROUP); } /** * Create an aliased databasir.group table reference */ - public Group(Name alias) { + public GroupTable(Name alias) { this(alias, GROUP); } /** * Create a databasir.group table reference */ - public Group() { + public GroupTable() { this(DSL.name("group"), null); } - public Group(Table child, ForeignKey key) { + public GroupTable(Table child, ForeignKey key) { super(child, key, GROUP); } @@ -126,29 +126,29 @@ public class Group extends TableImpl { } @Override - public Group as(String alias) { - return new Group(DSL.name(alias), this); + public GroupTable as(String alias) { + return new GroupTable(DSL.name(alias), this); } @Override - public Group as(Name alias) { - return new Group(alias, this); + public GroupTable as(Name alias) { + return new GroupTable(alias, this); } /** * Rename this table */ @Override - public Group rename(String name) { - return new Group(DSL.name(name), null); + public GroupTable rename(String name) { + return new GroupTable(DSL.name(name), null); } /** * Rename this table */ @Override - public Group rename(Name name) { - return new Group(name, null); + public GroupTable rename(Name name) { + return new GroupTable(name, null); } // ------------------------------------------------------------------------- diff --git a/dao/generated-src/jooq/main/java/com/databasir/dao/tables/Login.java b/dao/generated-src/jooq/main/java/com/databasir/dao/tables/LoginTable.java similarity index 85% rename from dao/generated-src/jooq/main/java/com/databasir/dao/tables/Login.java rename to dao/generated-src/jooq/main/java/com/databasir/dao/tables/LoginTable.java index 0f4cd34..c192da8 100644 --- a/dao/generated-src/jooq/main/java/com/databasir/dao/tables/Login.java +++ b/dao/generated-src/jooq/main/java/com/databasir/dao/tables/LoginTable.java @@ -32,14 +32,14 @@ import org.jooq.impl.TableImpl; * This class is generated by jOOQ. */ @SuppressWarnings({ "all", "unchecked", "rawtypes" }) -public class Login extends TableImpl { +public class LoginTable extends TableImpl { private static final long serialVersionUID = 1L; /** * The reference instance of databasir.login */ - public static final Login LOGIN = new Login(); + public static final LoginTable LOGIN = new LoginTable(); /** * The class holding records for this type @@ -89,36 +89,36 @@ public class Login extends TableImpl { */ public final TableField CREATE_AT = createField(DSL.name("create_at"), SQLDataType.LOCALDATETIME(0).nullable(false).defaultValue(DSL.field("CURRENT_TIMESTAMP", SQLDataType.LOCALDATETIME)), this, ""); - private Login(Name alias, Table aliased) { + private LoginTable(Name alias, Table aliased) { this(alias, aliased, null); } - private Login(Name alias, Table aliased, Field[] parameters) { + private LoginTable(Name alias, Table aliased, Field[] parameters) { super(alias, null, aliased, parameters, DSL.comment(""), TableOptions.table()); } /** * Create an aliased databasir.login table reference */ - public Login(String alias) { + public LoginTable(String alias) { this(DSL.name(alias), LOGIN); } /** * Create an aliased databasir.login table reference */ - public Login(Name alias) { + public LoginTable(Name alias) { this(alias, LOGIN); } /** * Create a databasir.login table reference */ - public Login() { + public LoginTable() { this(DSL.name("login"), null); } - public Login(Table child, ForeignKey key) { + public LoginTable(Table child, ForeignKey key) { super(child, key, LOGIN); } @@ -143,29 +143,29 @@ public class Login extends TableImpl { } @Override - public Login as(String alias) { - return new Login(DSL.name(alias), this); + public LoginTable as(String alias) { + return new LoginTable(DSL.name(alias), this); } @Override - public Login as(Name alias) { - return new Login(alias, this); + public LoginTable as(Name alias) { + return new LoginTable(alias, this); } /** * Rename this table */ @Override - public Login rename(String name) { - return new Login(DSL.name(name), null); + public LoginTable rename(String name) { + return new LoginTable(DSL.name(name), null); } /** * Rename this table */ @Override - public Login rename(Name name) { - return new Login(name, null); + public LoginTable rename(Name name) { + return new LoginTable(name, null); } // ------------------------------------------------------------------------- diff --git a/dao/generated-src/jooq/main/java/com/databasir/dao/tables/MockDataRule.java b/dao/generated-src/jooq/main/java/com/databasir/dao/tables/MockDataRuleTable.java similarity index 85% rename from dao/generated-src/jooq/main/java/com/databasir/dao/tables/MockDataRule.java rename to dao/generated-src/jooq/main/java/com/databasir/dao/tables/MockDataRuleTable.java index bd9df00..73eb082 100644 --- a/dao/generated-src/jooq/main/java/com/databasir/dao/tables/MockDataRule.java +++ b/dao/generated-src/jooq/main/java/com/databasir/dao/tables/MockDataRuleTable.java @@ -34,14 +34,14 @@ import org.jooq.impl.TableImpl; * This class is generated by jOOQ. */ @SuppressWarnings({ "all", "unchecked", "rawtypes" }) -public class MockDataRule extends TableImpl { +public class MockDataRuleTable extends TableImpl { private static final long serialVersionUID = 1L; /** * The reference instance of databasir.mock_data_rule */ - public static final MockDataRule MOCK_DATA_RULE = new MockDataRule(); + public static final MockDataRuleTable MOCK_DATA_RULE = new MockDataRuleTable(); /** * The class holding records for this type @@ -101,36 +101,36 @@ public class MockDataRule extends TableImpl { */ public final TableField CREATE_AT = createField(DSL.name("create_at"), SQLDataType.LOCALDATETIME(0).nullable(false).defaultValue(DSL.field("CURRENT_TIMESTAMP", SQLDataType.LOCALDATETIME)), this, ""); - private MockDataRule(Name alias, Table aliased) { + private MockDataRuleTable(Name alias, Table aliased) { this(alias, aliased, null); } - private MockDataRule(Name alias, Table aliased, Field[] parameters) { + private MockDataRuleTable(Name alias, Table aliased, Field[] parameters) { super(alias, null, aliased, parameters, DSL.comment(""), TableOptions.table()); } /** * Create an aliased databasir.mock_data_rule table reference */ - public MockDataRule(String alias) { + public MockDataRuleTable(String alias) { this(DSL.name(alias), MOCK_DATA_RULE); } /** * Create an aliased databasir.mock_data_rule table reference */ - public MockDataRule(Name alias) { + public MockDataRuleTable(Name alias) { this(alias, MOCK_DATA_RULE); } /** * Create a databasir.mock_data_rule table reference */ - public MockDataRule() { + public MockDataRuleTable() { this(DSL.name("mock_data_rule"), null); } - public MockDataRule(Table child, ForeignKey key) { + public MockDataRuleTable(Table child, ForeignKey key) { super(child, key, MOCK_DATA_RULE); } @@ -155,29 +155,29 @@ public class MockDataRule extends TableImpl { } @Override - public MockDataRule as(String alias) { - return new MockDataRule(DSL.name(alias), this); + public MockDataRuleTable as(String alias) { + return new MockDataRuleTable(DSL.name(alias), this); } @Override - public MockDataRule as(Name alias) { - return new MockDataRule(alias, this); + public MockDataRuleTable as(Name alias) { + return new MockDataRuleTable(alias, this); } /** * Rename this table */ @Override - public MockDataRule rename(String name) { - return new MockDataRule(DSL.name(name), null); + public MockDataRuleTable rename(String name) { + return new MockDataRuleTable(DSL.name(name), null); } /** * Rename this table */ @Override - public MockDataRule rename(Name name) { - return new MockDataRule(name, null); + public MockDataRuleTable rename(Name name) { + return new MockDataRuleTable(name, null); } // ------------------------------------------------------------------------- diff --git a/dao/generated-src/jooq/main/java/com/databasir/dao/tables/OauthApp.java b/dao/generated-src/jooq/main/java/com/databasir/dao/tables/OauthAppTable.java similarity index 86% rename from dao/generated-src/jooq/main/java/com/databasir/dao/tables/OauthApp.java rename to dao/generated-src/jooq/main/java/com/databasir/dao/tables/OauthAppTable.java index 6d27c3a..1b3993d 100644 --- a/dao/generated-src/jooq/main/java/com/databasir/dao/tables/OauthApp.java +++ b/dao/generated-src/jooq/main/java/com/databasir/dao/tables/OauthAppTable.java @@ -34,14 +34,14 @@ import org.jooq.impl.TableImpl; * oauth app info */ @SuppressWarnings({ "all", "unchecked", "rawtypes" }) -public class OauthApp extends TableImpl { +public class OauthAppTable extends TableImpl { private static final long serialVersionUID = 1L; /** * The reference instance of databasir.oauth_app */ - public static final OauthApp OAUTH_APP = new OauthApp(); + public static final OauthAppTable OAUTH_APP = new OauthAppTable(); /** * The class holding records for this type @@ -111,36 +111,36 @@ public class OauthApp extends TableImpl { */ public final TableField CREATE_AT = createField(DSL.name("create_at"), SQLDataType.LOCALDATETIME(0).nullable(false).defaultValue(DSL.field("CURRENT_TIMESTAMP", SQLDataType.LOCALDATETIME)), this, ""); - private OauthApp(Name alias, Table aliased) { + private OauthAppTable(Name alias, Table aliased) { this(alias, aliased, null); } - private OauthApp(Name alias, Table aliased, Field[] parameters) { + private OauthAppTable(Name alias, Table aliased, Field[] parameters) { super(alias, null, aliased, parameters, DSL.comment("oauth app info"), TableOptions.table()); } /** * Create an aliased databasir.oauth_app table reference */ - public OauthApp(String alias) { + public OauthAppTable(String alias) { this(DSL.name(alias), OAUTH_APP); } /** * Create an aliased databasir.oauth_app table reference */ - public OauthApp(Name alias) { + public OauthAppTable(Name alias) { this(alias, OAUTH_APP); } /** * Create a databasir.oauth_app table reference */ - public OauthApp() { + public OauthAppTable() { this(DSL.name("oauth_app"), null); } - public OauthApp(Table child, ForeignKey key) { + public OauthAppTable(Table child, ForeignKey key) { super(child, key, OAUTH_APP); } @@ -165,29 +165,29 @@ public class OauthApp extends TableImpl { } @Override - public OauthApp as(String alias) { - return new OauthApp(DSL.name(alias), this); + public OauthAppTable as(String alias) { + return new OauthAppTable(DSL.name(alias), this); } @Override - public OauthApp as(Name alias) { - return new OauthApp(alias, this); + public OauthAppTable as(Name alias) { + return new OauthAppTable(alias, this); } /** * Rename this table */ @Override - public OauthApp rename(String name) { - return new OauthApp(DSL.name(name), null); + public OauthAppTable rename(String name) { + return new OauthAppTable(DSL.name(name), null); } /** * Rename this table */ @Override - public OauthApp rename(Name name) { - return new OauthApp(name, null); + public OauthAppTable rename(Name name) { + return new OauthAppTable(name, null); } // ------------------------------------------------------------------------- diff --git a/dao/generated-src/jooq/main/java/com/databasir/dao/tables/OperationLog.java b/dao/generated-src/jooq/main/java/com/databasir/dao/tables/OperationLogTable.java similarity index 86% rename from dao/generated-src/jooq/main/java/com/databasir/dao/tables/OperationLog.java rename to dao/generated-src/jooq/main/java/com/databasir/dao/tables/OperationLogTable.java index 21fb03e..2f75dde 100644 --- a/dao/generated-src/jooq/main/java/com/databasir/dao/tables/OperationLog.java +++ b/dao/generated-src/jooq/main/java/com/databasir/dao/tables/OperationLogTable.java @@ -31,14 +31,14 @@ import org.jooq.impl.TableImpl; * This class is generated by jOOQ. */ @SuppressWarnings({ "all", "unchecked", "rawtypes" }) -public class OperationLog extends TableImpl { +public class OperationLogTable extends TableImpl { private static final long serialVersionUID = 1L; /** * The reference instance of databasir.operation_log */ - public static final OperationLog OPERATION_LOG = new OperationLog(); + public static final OperationLogTable OPERATION_LOG = new OperationLogTable(); /** * The class holding records for this type @@ -119,36 +119,36 @@ public class OperationLog extends TableImpl { */ public final TableField CREATE_AT = createField(DSL.name("create_at"), SQLDataType.LOCALDATETIME(0).nullable(false).defaultValue(DSL.field("CURRENT_TIMESTAMP", SQLDataType.LOCALDATETIME)), this, ""); - private OperationLog(Name alias, Table aliased) { + private OperationLogTable(Name alias, Table aliased) { this(alias, aliased, null); } - private OperationLog(Name alias, Table aliased, Field[] parameters) { + private OperationLogTable(Name alias, Table aliased, Field[] parameters) { super(alias, null, aliased, parameters, DSL.comment(""), TableOptions.table()); } /** * Create an aliased databasir.operation_log table reference */ - public OperationLog(String alias) { + public OperationLogTable(String alias) { this(DSL.name(alias), OPERATION_LOG); } /** * Create an aliased databasir.operation_log table reference */ - public OperationLog(Name alias) { + public OperationLogTable(Name alias) { this(alias, OPERATION_LOG); } /** * Create a databasir.operation_log table reference */ - public OperationLog() { + public OperationLogTable() { this(DSL.name("operation_log"), null); } - public OperationLog(Table child, ForeignKey key) { + public OperationLogTable(Table child, ForeignKey key) { super(child, key, OPERATION_LOG); } @@ -168,29 +168,29 @@ public class OperationLog extends TableImpl { } @Override - public OperationLog as(String alias) { - return new OperationLog(DSL.name(alias), this); + public OperationLogTable as(String alias) { + return new OperationLogTable(DSL.name(alias), this); } @Override - public OperationLog as(Name alias) { - return new OperationLog(alias, this); + public OperationLogTable as(Name alias) { + return new OperationLogTable(alias, this); } /** * Rename this table */ @Override - public OperationLog rename(String name) { - return new OperationLog(DSL.name(name), null); + public OperationLogTable rename(String name) { + return new OperationLogTable(DSL.name(name), null); } /** * Rename this table */ @Override - public OperationLog rename(Name name) { - return new OperationLog(name, null); + public OperationLogTable rename(Name name) { + return new OperationLogTable(name, null); } // ------------------------------------------------------------------------- diff --git a/dao/generated-src/jooq/main/java/com/databasir/dao/tables/ProjectSyncRule.java b/dao/generated-src/jooq/main/java/com/databasir/dao/tables/ProjectSyncRuleTable.java similarity index 83% rename from dao/generated-src/jooq/main/java/com/databasir/dao/tables/ProjectSyncRule.java rename to dao/generated-src/jooq/main/java/com/databasir/dao/tables/ProjectSyncRuleTable.java index fe82bad..3d574fb 100644 --- a/dao/generated-src/jooq/main/java/com/databasir/dao/tables/ProjectSyncRule.java +++ b/dao/generated-src/jooq/main/java/com/databasir/dao/tables/ProjectSyncRuleTable.java @@ -33,14 +33,14 @@ import org.jooq.impl.TableImpl; * This class is generated by jOOQ. */ @SuppressWarnings({ "all", "unchecked", "rawtypes" }) -public class ProjectSyncRule extends TableImpl { +public class ProjectSyncRuleTable extends TableImpl { private static final long serialVersionUID = 1L; /** * The reference instance of databasir.project_sync_rule */ - public static final ProjectSyncRule PROJECT_SYNC_RULE = new ProjectSyncRule(); + public static final ProjectSyncRuleTable PROJECT_SYNC_RULE = new ProjectSyncRuleTable(); /** * The class holding records for this type @@ -92,11 +92,11 @@ public class ProjectSyncRule extends TableImpl { */ public final TableField CREATE_AT = createField(DSL.name("create_at"), SQLDataType.LOCALDATETIME(0).nullable(false).defaultValue(DSL.field("CURRENT_TIMESTAMP", SQLDataType.LOCALDATETIME)), this, ""); - private ProjectSyncRule(Name alias, Table aliased) { + private ProjectSyncRuleTable(Name alias, Table aliased) { this(alias, aliased, null); } - private ProjectSyncRule(Name alias, Table aliased, Field[] parameters) { + private ProjectSyncRuleTable(Name alias, Table aliased, Field[] parameters) { super(alias, null, aliased, parameters, DSL.comment(""), TableOptions.table()); } @@ -104,7 +104,7 @@ public class ProjectSyncRule extends TableImpl { * Create an aliased databasir.project_sync_rule table * reference */ - public ProjectSyncRule(String alias) { + public ProjectSyncRuleTable(String alias) { this(DSL.name(alias), PROJECT_SYNC_RULE); } @@ -112,18 +112,18 @@ public class ProjectSyncRule extends TableImpl { * Create an aliased databasir.project_sync_rule table * reference */ - public ProjectSyncRule(Name alias) { + public ProjectSyncRuleTable(Name alias) { this(alias, PROJECT_SYNC_RULE); } /** * Create a databasir.project_sync_rule table reference */ - public ProjectSyncRule() { + public ProjectSyncRuleTable() { this(DSL.name("project_sync_rule"), null); } - public ProjectSyncRule(Table child, ForeignKey key) { + public ProjectSyncRuleTable(Table child, ForeignKey key) { super(child, key, PROJECT_SYNC_RULE); } @@ -148,29 +148,29 @@ public class ProjectSyncRule extends TableImpl { } @Override - public ProjectSyncRule as(String alias) { - return new ProjectSyncRule(DSL.name(alias), this); + public ProjectSyncRuleTable as(String alias) { + return new ProjectSyncRuleTable(DSL.name(alias), this); } @Override - public ProjectSyncRule as(Name alias) { - return new ProjectSyncRule(alias, this); + public ProjectSyncRuleTable as(Name alias) { + return new ProjectSyncRuleTable(alias, this); } /** * Rename this table */ @Override - public ProjectSyncRule rename(String name) { - return new ProjectSyncRule(DSL.name(name), null); + public ProjectSyncRuleTable rename(String name) { + return new ProjectSyncRuleTable(DSL.name(name), null); } /** * Rename this table */ @Override - public ProjectSyncRule rename(Name name) { - return new ProjectSyncRule(name, null); + public ProjectSyncRuleTable rename(Name name) { + return new ProjectSyncRuleTable(name, null); } // ------------------------------------------------------------------------- diff --git a/dao/generated-src/jooq/main/java/com/databasir/dao/tables/ProjectSyncTask.java b/dao/generated-src/jooq/main/java/com/databasir/dao/tables/ProjectSyncTaskTable.java similarity index 83% rename from dao/generated-src/jooq/main/java/com/databasir/dao/tables/ProjectSyncTask.java rename to dao/generated-src/jooq/main/java/com/databasir/dao/tables/ProjectSyncTaskTable.java index 8048ecb..643c86d 100644 --- a/dao/generated-src/jooq/main/java/com/databasir/dao/tables/ProjectSyncTask.java +++ b/dao/generated-src/jooq/main/java/com/databasir/dao/tables/ProjectSyncTaskTable.java @@ -36,14 +36,14 @@ import org.jooq.impl.TableImpl; * This class is generated by jOOQ. */ @SuppressWarnings({ "all", "unchecked", "rawtypes" }) -public class ProjectSyncTask extends TableImpl { +public class ProjectSyncTaskTable extends TableImpl { private static final long serialVersionUID = 1L; /** * The reference instance of databasir.project_sync_task */ - public static final ProjectSyncTask PROJECT_SYNC_TASK = new ProjectSyncTask(); + public static final ProjectSyncTaskTable PROJECT_SYNC_TASK = new ProjectSyncTaskTable(); /** * The class holding records for this type @@ -94,11 +94,11 @@ public class ProjectSyncTask extends TableImpl { */ public final TableField CREATE_AT = createField(DSL.name("create_at"), SQLDataType.LOCALDATETIME(0).nullable(false).defaultValue(DSL.field("CURRENT_TIMESTAMP", SQLDataType.LOCALDATETIME)), this, ""); - private ProjectSyncTask(Name alias, Table aliased) { + private ProjectSyncTaskTable(Name alias, Table aliased) { this(alias, aliased, null); } - private ProjectSyncTask(Name alias, Table aliased, Field[] parameters) { + private ProjectSyncTaskTable(Name alias, Table aliased, Field[] parameters) { super(alias, null, aliased, parameters, DSL.comment(""), TableOptions.table()); } @@ -106,7 +106,7 @@ public class ProjectSyncTask extends TableImpl { * Create an aliased databasir.project_sync_task table * reference */ - public ProjectSyncTask(String alias) { + public ProjectSyncTaskTable(String alias) { this(DSL.name(alias), PROJECT_SYNC_TASK); } @@ -114,18 +114,18 @@ public class ProjectSyncTask extends TableImpl { * Create an aliased databasir.project_sync_task table * reference */ - public ProjectSyncTask(Name alias) { + public ProjectSyncTaskTable(Name alias) { this(alias, PROJECT_SYNC_TASK); } /** * Create a databasir.project_sync_task table reference */ - public ProjectSyncTask() { + public ProjectSyncTaskTable() { this(DSL.name("project_sync_task"), null); } - public ProjectSyncTask(Table child, ForeignKey key) { + public ProjectSyncTaskTable(Table child, ForeignKey key) { super(child, key, PROJECT_SYNC_TASK); } @@ -150,29 +150,29 @@ public class ProjectSyncTask extends TableImpl { } @Override - public ProjectSyncTask as(String alias) { - return new ProjectSyncTask(DSL.name(alias), this); + public ProjectSyncTaskTable as(String alias) { + return new ProjectSyncTaskTable(DSL.name(alias), this); } @Override - public ProjectSyncTask as(Name alias) { - return new ProjectSyncTask(alias, this); + public ProjectSyncTaskTable as(Name alias) { + return new ProjectSyncTaskTable(alias, this); } /** * Rename this table */ @Override - public ProjectSyncTask rename(String name) { - return new ProjectSyncTask(DSL.name(name), null); + public ProjectSyncTaskTable rename(String name) { + return new ProjectSyncTaskTable(DSL.name(name), null); } /** * Rename this table */ @Override - public ProjectSyncTask rename(Name name) { - return new ProjectSyncTask(name, null); + public ProjectSyncTaskTable rename(Name name) { + return new ProjectSyncTaskTable(name, null); } // ------------------------------------------------------------------------- diff --git a/dao/generated-src/jooq/main/java/com/databasir/dao/tables/Project.java b/dao/generated-src/jooq/main/java/com/databasir/dao/tables/ProjectTable.java similarity index 83% rename from dao/generated-src/jooq/main/java/com/databasir/dao/tables/Project.java rename to dao/generated-src/jooq/main/java/com/databasir/dao/tables/ProjectTable.java index 928abe8..ece8a9e 100644 --- a/dao/generated-src/jooq/main/java/com/databasir/dao/tables/Project.java +++ b/dao/generated-src/jooq/main/java/com/databasir/dao/tables/ProjectTable.java @@ -32,14 +32,14 @@ import org.jooq.impl.TableImpl; * This class is generated by jOOQ. */ @SuppressWarnings({ "all", "unchecked", "rawtypes" }) -public class Project extends TableImpl { +public class ProjectTable extends TableImpl { private static final long serialVersionUID = 1L; /** * The reference instance of databasir.project */ - public static final Project PROJECT = new Project(); + public static final ProjectTable PROJECT = new ProjectTable(); /** * The class holding records for this type @@ -85,36 +85,36 @@ public class Project extends TableImpl { */ public final TableField CREATE_AT = createField(DSL.name("create_at"), SQLDataType.LOCALDATETIME(0).nullable(false).defaultValue(DSL.field("CURRENT_TIMESTAMP", SQLDataType.LOCALDATETIME)), this, ""); - private Project(Name alias, Table aliased) { + private ProjectTable(Name alias, Table aliased) { this(alias, aliased, null); } - private Project(Name alias, Table aliased, Field[] parameters) { + private ProjectTable(Name alias, Table aliased, Field[] parameters) { super(alias, null, aliased, parameters, DSL.comment(""), TableOptions.table()); } /** * Create an aliased databasir.project table reference */ - public Project(String alias) { + public ProjectTable(String alias) { this(DSL.name(alias), PROJECT); } /** * Create an aliased databasir.project table reference */ - public Project(Name alias) { + public ProjectTable(Name alias) { this(alias, PROJECT); } /** * Create a databasir.project table reference */ - public Project() { + public ProjectTable() { this(DSL.name("project"), null); } - public Project(Table child, ForeignKey key) { + public ProjectTable(Table child, ForeignKey key) { super(child, key, PROJECT); } @@ -139,29 +139,29 @@ public class Project extends TableImpl { } @Override - public Project as(String alias) { - return new Project(DSL.name(alias), this); + public ProjectTable as(String alias) { + return new ProjectTable(DSL.name(alias), this); } @Override - public Project as(Name alias) { - return new Project(alias, this); + public ProjectTable as(Name alias) { + return new ProjectTable(alias, this); } /** * Rename this table */ @Override - public Project rename(String name) { - return new Project(DSL.name(name), null); + public ProjectTable rename(String name) { + return new ProjectTable(DSL.name(name), null); } /** * Rename this table */ @Override - public Project rename(Name name) { - return new Project(name, null); + public ProjectTable rename(Name name) { + return new ProjectTable(name, null); } // ------------------------------------------------------------------------- diff --git a/dao/generated-src/jooq/main/java/com/databasir/dao/tables/SysKey.java b/dao/generated-src/jooq/main/java/com/databasir/dao/tables/SysKeyTable.java similarity index 82% rename from dao/generated-src/jooq/main/java/com/databasir/dao/tables/SysKey.java rename to dao/generated-src/jooq/main/java/com/databasir/dao/tables/SysKeyTable.java index 828e984..4cbc506 100644 --- a/dao/generated-src/jooq/main/java/com/databasir/dao/tables/SysKey.java +++ b/dao/generated-src/jooq/main/java/com/databasir/dao/tables/SysKeyTable.java @@ -30,14 +30,14 @@ import org.jooq.impl.TableImpl; * This class is generated by jOOQ. */ @SuppressWarnings({ "all", "unchecked", "rawtypes" }) -public class SysKey extends TableImpl { +public class SysKeyTable extends TableImpl { private static final long serialVersionUID = 1L; /** * The reference instance of databasir.sys_key */ - public static final SysKey SYS_KEY = new SysKey(); + public static final SysKeyTable SYS_KEY = new SysKeyTable(); /** * The class holding records for this type @@ -77,36 +77,36 @@ public class SysKey extends TableImpl { */ public final TableField CREATE_AT = createField(DSL.name("create_at"), SQLDataType.LOCALDATETIME(0).nullable(false).defaultValue(DSL.field("CURRENT_TIMESTAMP", SQLDataType.LOCALDATETIME)), this, ""); - private SysKey(Name alias, Table aliased) { + private SysKeyTable(Name alias, Table aliased) { this(alias, aliased, null); } - private SysKey(Name alias, Table aliased, Field[] parameters) { + private SysKeyTable(Name alias, Table aliased, Field[] parameters) { super(alias, null, aliased, parameters, DSL.comment(""), TableOptions.table()); } /** * Create an aliased databasir.sys_key table reference */ - public SysKey(String alias) { + public SysKeyTable(String alias) { this(DSL.name(alias), SYS_KEY); } /** * Create an aliased databasir.sys_key table reference */ - public SysKey(Name alias) { + public SysKeyTable(Name alias) { this(alias, SYS_KEY); } /** * Create a databasir.sys_key table reference */ - public SysKey() { + public SysKeyTable() { this(DSL.name("sys_key"), null); } - public SysKey(Table child, ForeignKey key) { + public SysKeyTable(Table child, ForeignKey key) { super(child, key, SYS_KEY); } @@ -126,29 +126,29 @@ public class SysKey extends TableImpl { } @Override - public SysKey as(String alias) { - return new SysKey(DSL.name(alias), this); + public SysKeyTable as(String alias) { + return new SysKeyTable(DSL.name(alias), this); } @Override - public SysKey as(Name alias) { - return new SysKey(alias, this); + public SysKeyTable as(Name alias) { + return new SysKeyTable(alias, this); } /** * Rename this table */ @Override - public SysKey rename(String name) { - return new SysKey(DSL.name(name), null); + public SysKeyTable rename(String name) { + return new SysKeyTable(DSL.name(name), null); } /** * Rename this table */ @Override - public SysKey rename(Name name) { - return new SysKey(name, null); + public SysKeyTable rename(Name name) { + return new SysKeyTable(name, null); } // ------------------------------------------------------------------------- diff --git a/dao/generated-src/jooq/main/java/com/databasir/dao/tables/SysMail.java b/dao/generated-src/jooq/main/java/com/databasir/dao/tables/SysMailTable.java similarity index 83% rename from dao/generated-src/jooq/main/java/com/databasir/dao/tables/SysMail.java rename to dao/generated-src/jooq/main/java/com/databasir/dao/tables/SysMailTable.java index 1b60115..a373d5c 100644 --- a/dao/generated-src/jooq/main/java/com/databasir/dao/tables/SysMail.java +++ b/dao/generated-src/jooq/main/java/com/databasir/dao/tables/SysMailTable.java @@ -30,14 +30,14 @@ import org.jooq.impl.TableImpl; * This class is generated by jOOQ. */ @SuppressWarnings({ "all", "unchecked", "rawtypes" }) -public class SysMail extends TableImpl { +public class SysMailTable extends TableImpl { private static final long serialVersionUID = 1L; /** * The reference instance of databasir.sys_mail */ - public static final SysMail SYS_MAIL = new SysMail(); + public static final SysMailTable SYS_MAIL = new SysMailTable(); /** * The class holding records for this type @@ -87,36 +87,36 @@ public class SysMail extends TableImpl { */ public final TableField CREATE_AT = createField(DSL.name("create_at"), SQLDataType.LOCALDATETIME(0).nullable(false).defaultValue(DSL.field("CURRENT_TIMESTAMP", SQLDataType.LOCALDATETIME)), this, ""); - private SysMail(Name alias, Table aliased) { + private SysMailTable(Name alias, Table aliased) { this(alias, aliased, null); } - private SysMail(Name alias, Table aliased, Field[] parameters) { + private SysMailTable(Name alias, Table aliased, Field[] parameters) { super(alias, null, aliased, parameters, DSL.comment(""), TableOptions.table()); } /** * Create an aliased databasir.sys_mail table reference */ - public SysMail(String alias) { + public SysMailTable(String alias) { this(DSL.name(alias), SYS_MAIL); } /** * Create an aliased databasir.sys_mail table reference */ - public SysMail(Name alias) { + public SysMailTable(Name alias) { this(alias, SYS_MAIL); } /** * Create a databasir.sys_mail table reference */ - public SysMail() { + public SysMailTable() { this(DSL.name("sys_mail"), null); } - public SysMail(Table child, ForeignKey key) { + public SysMailTable(Table child, ForeignKey key) { super(child, key, SYS_MAIL); } @@ -136,29 +136,29 @@ public class SysMail extends TableImpl { } @Override - public SysMail as(String alias) { - return new SysMail(DSL.name(alias), this); + public SysMailTable as(String alias) { + return new SysMailTable(DSL.name(alias), this); } @Override - public SysMail as(Name alias) { - return new SysMail(alias, this); + public SysMailTable as(Name alias) { + return new SysMailTable(alias, this); } /** * Rename this table */ @Override - public SysMail rename(String name) { - return new SysMail(DSL.name(name), null); + public SysMailTable rename(String name) { + return new SysMailTable(DSL.name(name), null); } /** * Rename this table */ @Override - public SysMail rename(Name name) { - return new SysMail(name, null); + public SysMailTable rename(Name name) { + return new SysMailTable(name, null); } // ------------------------------------------------------------------------- diff --git a/dao/generated-src/jooq/main/java/com/databasir/dao/tables/TableColumnDocument.java b/dao/generated-src/jooq/main/java/com/databasir/dao/tables/TableColumnDocumentTable.java similarity index 85% rename from dao/generated-src/jooq/main/java/com/databasir/dao/tables/TableColumnDocument.java rename to dao/generated-src/jooq/main/java/com/databasir/dao/tables/TableColumnDocumentTable.java index 70fbdda..67656d6 100644 --- a/dao/generated-src/jooq/main/java/com/databasir/dao/tables/TableColumnDocument.java +++ b/dao/generated-src/jooq/main/java/com/databasir/dao/tables/TableColumnDocumentTable.java @@ -34,14 +34,14 @@ import org.jooq.impl.TableImpl; * This class is generated by jOOQ. */ @SuppressWarnings({ "all", "unchecked", "rawtypes" }) -public class TableColumnDocument extends TableImpl { +public class TableColumnDocumentTable extends TableImpl { private static final long serialVersionUID = 1L; /** * The reference instance of databasir.table_column_document */ - public static final TableColumnDocument TABLE_COLUMN_DOCUMENT = new TableColumnDocument(); + public static final TableColumnDocumentTable TABLE_COLUMN_DOCUMENT = new TableColumnDocumentTable(); /** * The class holding records for this type @@ -125,11 +125,11 @@ public class TableColumnDocument extends TableImpl { */ public final TableField CREATE_AT = createField(DSL.name("create_at"), SQLDataType.LOCALDATETIME(0).nullable(false).defaultValue(DSL.field("CURRENT_TIMESTAMP", SQLDataType.LOCALDATETIME)), this, ""); - private TableColumnDocument(Name alias, Table aliased) { + private TableColumnDocumentTable(Name alias, Table aliased) { this(alias, aliased, null); } - private TableColumnDocument(Name alias, Table aliased, Field[] parameters) { + private TableColumnDocumentTable(Name alias, Table aliased, Field[] parameters) { super(alias, null, aliased, parameters, DSL.comment(""), TableOptions.table()); } @@ -137,7 +137,7 @@ public class TableColumnDocument extends TableImpl { * Create an aliased databasir.table_column_document table * reference */ - public TableColumnDocument(String alias) { + public TableColumnDocumentTable(String alias) { this(DSL.name(alias), TABLE_COLUMN_DOCUMENT); } @@ -145,18 +145,18 @@ public class TableColumnDocument extends TableImpl { * Create an aliased databasir.table_column_document table * reference */ - public TableColumnDocument(Name alias) { + public TableColumnDocumentTable(Name alias) { this(alias, TABLE_COLUMN_DOCUMENT); } /** * Create a databasir.table_column_document table reference */ - public TableColumnDocument() { + public TableColumnDocumentTable() { this(DSL.name("table_column_document"), null); } - public TableColumnDocument(Table child, ForeignKey key) { + public TableColumnDocumentTable(Table child, ForeignKey key) { super(child, key, TABLE_COLUMN_DOCUMENT); } @@ -181,29 +181,29 @@ public class TableColumnDocument extends TableImpl { } @Override - public TableColumnDocument as(String alias) { - return new TableColumnDocument(DSL.name(alias), this); + public TableColumnDocumentTable as(String alias) { + return new TableColumnDocumentTable(DSL.name(alias), this); } @Override - public TableColumnDocument as(Name alias) { - return new TableColumnDocument(alias, this); + public TableColumnDocumentTable as(Name alias) { + return new TableColumnDocumentTable(alias, this); } /** * Rename this table */ @Override - public TableColumnDocument rename(String name) { - return new TableColumnDocument(DSL.name(name), null); + public TableColumnDocumentTable rename(String name) { + return new TableColumnDocumentTable(DSL.name(name), null); } /** * Rename this table */ @Override - public TableColumnDocument rename(Name name) { - return new TableColumnDocument(name, null); + public TableColumnDocumentTable rename(Name name) { + return new TableColumnDocumentTable(name, null); } // ------------------------------------------------------------------------- diff --git a/dao/generated-src/jooq/main/java/com/databasir/dao/tables/TableDocument.java b/dao/generated-src/jooq/main/java/com/databasir/dao/tables/TableDocumentTable.java similarity index 81% rename from dao/generated-src/jooq/main/java/com/databasir/dao/tables/TableDocument.java rename to dao/generated-src/jooq/main/java/com/databasir/dao/tables/TableDocumentTable.java index 5caedc7..7e73990 100644 --- a/dao/generated-src/jooq/main/java/com/databasir/dao/tables/TableDocument.java +++ b/dao/generated-src/jooq/main/java/com/databasir/dao/tables/TableDocumentTable.java @@ -34,14 +34,14 @@ import org.jooq.impl.TableImpl; * This class is generated by jOOQ. */ @SuppressWarnings({ "all", "unchecked", "rawtypes" }) -public class TableDocument extends TableImpl { +public class TableDocumentTable extends TableImpl { private static final long serialVersionUID = 1L; /** * The reference instance of databasir.table_document */ - public static final TableDocument TABLE_DOCUMENT = new TableDocument(); + public static final TableDocumentTable TABLE_DOCUMENT = new TableDocumentTable(); /** * The class holding records for this type @@ -81,36 +81,36 @@ public class TableDocument extends TableImpl { */ public final TableField CREATE_AT = createField(DSL.name("create_at"), SQLDataType.LOCALDATETIME(0).nullable(false).defaultValue(DSL.field("CURRENT_TIMESTAMP", SQLDataType.LOCALDATETIME)), this, ""); - private TableDocument(Name alias, Table aliased) { + private TableDocumentTable(Name alias, Table aliased) { this(alias, aliased, null); } - private TableDocument(Name alias, Table aliased, Field[] parameters) { + private TableDocumentTable(Name alias, Table aliased, Field[] parameters) { super(alias, null, aliased, parameters, DSL.comment(""), TableOptions.table()); } /** * Create an aliased databasir.table_document table reference */ - public TableDocument(String alias) { + public TableDocumentTable(String alias) { this(DSL.name(alias), TABLE_DOCUMENT); } /** * Create an aliased databasir.table_document table reference */ - public TableDocument(Name alias) { + public TableDocumentTable(Name alias) { this(alias, TABLE_DOCUMENT); } /** * Create a databasir.table_document table reference */ - public TableDocument() { + public TableDocumentTable() { this(DSL.name("table_document"), null); } - public TableDocument(Table child, ForeignKey key) { + public TableDocumentTable(Table child, ForeignKey key) { super(child, key, TABLE_DOCUMENT); } @@ -135,29 +135,29 @@ public class TableDocument extends TableImpl { } @Override - public TableDocument as(String alias) { - return new TableDocument(DSL.name(alias), this); + public TableDocumentTable as(String alias) { + return new TableDocumentTable(DSL.name(alias), this); } @Override - public TableDocument as(Name alias) { - return new TableDocument(alias, this); + public TableDocumentTable as(Name alias) { + return new TableDocumentTable(alias, this); } /** * Rename this table */ @Override - public TableDocument rename(String name) { - return new TableDocument(DSL.name(name), null); + public TableDocumentTable rename(String name) { + return new TableDocumentTable(DSL.name(name), null); } /** * Rename this table */ @Override - public TableDocument rename(Name name) { - return new TableDocument(name, null); + public TableDocumentTable rename(Name name) { + return new TableDocumentTable(name, null); } // ------------------------------------------------------------------------- diff --git a/dao/generated-src/jooq/main/java/com/databasir/dao/tables/TableForeignKeyDocument.java b/dao/generated-src/jooq/main/java/com/databasir/dao/tables/TableForeignKeyDocumentTable.java similarity index 85% rename from dao/generated-src/jooq/main/java/com/databasir/dao/tables/TableForeignKeyDocument.java rename to dao/generated-src/jooq/main/java/com/databasir/dao/tables/TableForeignKeyDocumentTable.java index 2dd9be9..3906fc4 100644 --- a/dao/generated-src/jooq/main/java/com/databasir/dao/tables/TableForeignKeyDocument.java +++ b/dao/generated-src/jooq/main/java/com/databasir/dao/tables/TableForeignKeyDocumentTable.java @@ -34,7 +34,7 @@ import org.jooq.impl.TableImpl; * This class is generated by jOOQ. */ @SuppressWarnings({ "all", "unchecked", "rawtypes" }) -public class TableForeignKeyDocument extends TableImpl { +public class TableForeignKeyDocumentTable extends TableImpl { private static final long serialVersionUID = 1L; @@ -42,7 +42,7 @@ public class TableForeignKeyDocument extends TableImpldatabasir.table_foreign_key_document */ - public static final TableForeignKeyDocument TABLE_FOREIGN_KEY_DOCUMENT = new TableForeignKeyDocument(); + public static final TableForeignKeyDocumentTable TABLE_FOREIGN_KEY_DOCUMENT = new TableForeignKeyDocumentTable(); /** * The class holding records for this type @@ -125,11 +125,11 @@ public class TableForeignKeyDocument extends TableImpl CREATE_AT = createField(DSL.name("create_at"), SQLDataType.LOCALDATETIME(0).nullable(false).defaultValue(DSL.field("CURRENT_TIMESTAMP", SQLDataType.LOCALDATETIME)), this, ""); - private TableForeignKeyDocument(Name alias, Table aliased) { + private TableForeignKeyDocumentTable(Name alias, Table aliased) { this(alias, aliased, null); } - private TableForeignKeyDocument(Name alias, Table aliased, Field[] parameters) { + private TableForeignKeyDocumentTable(Name alias, Table aliased, Field[] parameters) { super(alias, null, aliased, parameters, DSL.comment(""), TableOptions.table()); } @@ -137,7 +137,7 @@ public class TableForeignKeyDocument extends TableImpldatabasir.table_foreign_key_document table * reference */ - public TableForeignKeyDocument(String alias) { + public TableForeignKeyDocumentTable(String alias) { this(DSL.name(alias), TABLE_FOREIGN_KEY_DOCUMENT); } @@ -145,7 +145,7 @@ public class TableForeignKeyDocument extends TableImpldatabasir.table_foreign_key_document table * reference */ - public TableForeignKeyDocument(Name alias) { + public TableForeignKeyDocumentTable(Name alias) { this(alias, TABLE_FOREIGN_KEY_DOCUMENT); } @@ -153,11 +153,11 @@ public class TableForeignKeyDocument extends TableImpldatabasir.table_foreign_key_document table * reference */ - public TableForeignKeyDocument() { + public TableForeignKeyDocumentTable() { this(DSL.name("table_foreign_key_document"), null); } - public TableForeignKeyDocument(Table child, ForeignKey key) { + public TableForeignKeyDocumentTable(Table child, ForeignKey key) { super(child, key, TABLE_FOREIGN_KEY_DOCUMENT); } @@ -182,29 +182,29 @@ public class TableForeignKeyDocument extends TableImpl { +public class TableIndexDocumentTable extends TableImpl { private static final long serialVersionUID = 1L; /** * The reference instance of databasir.table_index_document */ - public static final TableIndexDocument TABLE_INDEX_DOCUMENT = new TableIndexDocument(); + public static final TableIndexDocumentTable TABLE_INDEX_DOCUMENT = new TableIndexDocumentTable(); /** * The class holding records for this type @@ -88,11 +88,11 @@ public class TableIndexDocument extends TableImpl { */ public final TableField CREATE_AT = createField(DSL.name("create_at"), SQLDataType.LOCALDATETIME(0).nullable(false).defaultValue(DSL.field("CURRENT_TIMESTAMP", SQLDataType.LOCALDATETIME)), this, ""); - private TableIndexDocument(Name alias, Table aliased) { + private TableIndexDocumentTable(Name alias, Table aliased) { this(alias, aliased, null); } - private TableIndexDocument(Name alias, Table aliased, Field[] parameters) { + private TableIndexDocumentTable(Name alias, Table aliased, Field[] parameters) { super(alias, null, aliased, parameters, DSL.comment(""), TableOptions.table()); } @@ -100,7 +100,7 @@ public class TableIndexDocument extends TableImpl { * Create an aliased databasir.table_index_document table * reference */ - public TableIndexDocument(String alias) { + public TableIndexDocumentTable(String alias) { this(DSL.name(alias), TABLE_INDEX_DOCUMENT); } @@ -108,18 +108,18 @@ public class TableIndexDocument extends TableImpl { * Create an aliased databasir.table_index_document table * reference */ - public TableIndexDocument(Name alias) { + public TableIndexDocumentTable(Name alias) { this(alias, TABLE_INDEX_DOCUMENT); } /** * Create a databasir.table_index_document table reference */ - public TableIndexDocument() { + public TableIndexDocumentTable() { this(DSL.name("table_index_document"), null); } - public TableIndexDocument(Table child, ForeignKey key) { + public TableIndexDocumentTable(Table child, ForeignKey key) { super(child, key, TABLE_INDEX_DOCUMENT); } @@ -144,29 +144,29 @@ public class TableIndexDocument extends TableImpl { } @Override - public TableIndexDocument as(String alias) { - return new TableIndexDocument(DSL.name(alias), this); + public TableIndexDocumentTable as(String alias) { + return new TableIndexDocumentTable(DSL.name(alias), this); } @Override - public TableIndexDocument as(Name alias) { - return new TableIndexDocument(alias, this); + public TableIndexDocumentTable as(Name alias) { + return new TableIndexDocumentTable(alias, this); } /** * Rename this table */ @Override - public TableIndexDocument rename(String name) { - return new TableIndexDocument(DSL.name(name), null); + public TableIndexDocumentTable rename(String name) { + return new TableIndexDocumentTable(DSL.name(name), null); } /** * Rename this table */ @Override - public TableIndexDocument rename(Name name) { - return new TableIndexDocument(name, null); + public TableIndexDocumentTable rename(Name name) { + return new TableIndexDocumentTable(name, null); } // ------------------------------------------------------------------------- diff --git a/dao/generated-src/jooq/main/java/com/databasir/dao/tables/TableTriggerDocument.java b/dao/generated-src/jooq/main/java/com/databasir/dao/tables/TableTriggerDocumentTable.java similarity index 82% rename from dao/generated-src/jooq/main/java/com/databasir/dao/tables/TableTriggerDocument.java rename to dao/generated-src/jooq/main/java/com/databasir/dao/tables/TableTriggerDocumentTable.java index 50012d7..a70c997 100644 --- a/dao/generated-src/jooq/main/java/com/databasir/dao/tables/TableTriggerDocument.java +++ b/dao/generated-src/jooq/main/java/com/databasir/dao/tables/TableTriggerDocumentTable.java @@ -34,14 +34,14 @@ import org.jooq.impl.TableImpl; * This class is generated by jOOQ. */ @SuppressWarnings({ "all", "unchecked", "rawtypes" }) -public class TableTriggerDocument extends TableImpl { +public class TableTriggerDocumentTable extends TableImpl { private static final long serialVersionUID = 1L; /** * The reference instance of databasir.table_trigger_document */ - public static final TableTriggerDocument TABLE_TRIGGER_DOCUMENT = new TableTriggerDocument(); + public static final TableTriggerDocumentTable TABLE_TRIGGER_DOCUMENT = new TableTriggerDocumentTable(); /** * The class holding records for this type @@ -99,11 +99,11 @@ public class TableTriggerDocument extends TableImpl */ public final TableField CREATE_AT = createField(DSL.name("create_at"), SQLDataType.LOCALDATETIME(0).nullable(false).defaultValue(DSL.field("CURRENT_TIMESTAMP", SQLDataType.LOCALDATETIME)), this, ""); - private TableTriggerDocument(Name alias, Table aliased) { + private TableTriggerDocumentTable(Name alias, Table aliased) { this(alias, aliased, null); } - private TableTriggerDocument(Name alias, Table aliased, Field[] parameters) { + private TableTriggerDocumentTable(Name alias, Table aliased, Field[] parameters) { super(alias, null, aliased, parameters, DSL.comment(""), TableOptions.table()); } @@ -111,7 +111,7 @@ public class TableTriggerDocument extends TableImpl * Create an aliased databasir.table_trigger_document table * reference */ - public TableTriggerDocument(String alias) { + public TableTriggerDocumentTable(String alias) { this(DSL.name(alias), TABLE_TRIGGER_DOCUMENT); } @@ -119,18 +119,18 @@ public class TableTriggerDocument extends TableImpl * Create an aliased databasir.table_trigger_document table * reference */ - public TableTriggerDocument(Name alias) { + public TableTriggerDocumentTable(Name alias) { this(alias, TABLE_TRIGGER_DOCUMENT); } /** * Create a databasir.table_trigger_document table reference */ - public TableTriggerDocument() { + public TableTriggerDocumentTable() { this(DSL.name("table_trigger_document"), null); } - public TableTriggerDocument(Table child, ForeignKey key) { + public TableTriggerDocumentTable(Table child, ForeignKey key) { super(child, key, TABLE_TRIGGER_DOCUMENT); } @@ -155,29 +155,29 @@ public class TableTriggerDocument extends TableImpl } @Override - public TableTriggerDocument as(String alias) { - return new TableTriggerDocument(DSL.name(alias), this); + public TableTriggerDocumentTable as(String alias) { + return new TableTriggerDocumentTable(DSL.name(alias), this); } @Override - public TableTriggerDocument as(Name alias) { - return new TableTriggerDocument(alias, this); + public TableTriggerDocumentTable as(Name alias) { + return new TableTriggerDocumentTable(alias, this); } /** * Rename this table */ @Override - public TableTriggerDocument rename(String name) { - return new TableTriggerDocument(DSL.name(name), null); + public TableTriggerDocumentTable rename(String name) { + return new TableTriggerDocumentTable(DSL.name(name), null); } /** * Rename this table */ @Override - public TableTriggerDocument rename(Name name) { - return new TableTriggerDocument(name, null); + public TableTriggerDocumentTable rename(Name name) { + return new TableTriggerDocumentTable(name, null); } // ------------------------------------------------------------------------- diff --git a/dao/generated-src/jooq/main/java/com/databasir/dao/tables/UserFavoriteProject.java b/dao/generated-src/jooq/main/java/com/databasir/dao/tables/UserFavoriteProjectTable.java similarity index 77% rename from dao/generated-src/jooq/main/java/com/databasir/dao/tables/UserFavoriteProject.java rename to dao/generated-src/jooq/main/java/com/databasir/dao/tables/UserFavoriteProjectTable.java index 0a0e3c9..d1734ff 100644 --- a/dao/generated-src/jooq/main/java/com/databasir/dao/tables/UserFavoriteProject.java +++ b/dao/generated-src/jooq/main/java/com/databasir/dao/tables/UserFavoriteProjectTable.java @@ -32,14 +32,14 @@ import org.jooq.impl.TableImpl; * This class is generated by jOOQ. */ @SuppressWarnings({ "all", "unchecked", "rawtypes" }) -public class UserFavoriteProject extends TableImpl { +public class UserFavoriteProjectTable extends TableImpl { private static final long serialVersionUID = 1L; /** * The reference instance of databasir.user_favorite_project */ - public static final UserFavoriteProject USER_FAVORITE_PROJECT = new UserFavoriteProject(); + public static final UserFavoriteProjectTable USER_FAVORITE_PROJECT = new UserFavoriteProjectTable(); /** * The class holding records for this type @@ -69,11 +69,11 @@ public class UserFavoriteProject extends TableImpl { */ public final TableField CREATE_AT = createField(DSL.name("create_at"), SQLDataType.LOCALDATETIME(0).nullable(false).defaultValue(DSL.field("CURRENT_TIMESTAMP", SQLDataType.LOCALDATETIME)), this, ""); - private UserFavoriteProject(Name alias, Table aliased) { + private UserFavoriteProjectTable(Name alias, Table aliased) { this(alias, aliased, null); } - private UserFavoriteProject(Name alias, Table aliased, Field[] parameters) { + private UserFavoriteProjectTable(Name alias, Table aliased, Field[] parameters) { super(alias, null, aliased, parameters, DSL.comment(""), TableOptions.table()); } @@ -81,7 +81,7 @@ public class UserFavoriteProject extends TableImpl { * Create an aliased databasir.user_favorite_project table * reference */ - public UserFavoriteProject(String alias) { + public UserFavoriteProjectTable(String alias) { this(DSL.name(alias), USER_FAVORITE_PROJECT); } @@ -89,18 +89,18 @@ public class UserFavoriteProject extends TableImpl { * Create an aliased databasir.user_favorite_project table * reference */ - public UserFavoriteProject(Name alias) { + public UserFavoriteProjectTable(Name alias) { this(alias, USER_FAVORITE_PROJECT); } /** * Create a databasir.user_favorite_project table reference */ - public UserFavoriteProject() { + public UserFavoriteProjectTable() { this(DSL.name("user_favorite_project"), null); } - public UserFavoriteProject(Table child, ForeignKey key) { + public UserFavoriteProjectTable(Table child, ForeignKey key) { super(child, key, USER_FAVORITE_PROJECT); } @@ -125,29 +125,29 @@ public class UserFavoriteProject extends TableImpl { } @Override - public UserFavoriteProject as(String alias) { - return new UserFavoriteProject(DSL.name(alias), this); + public UserFavoriteProjectTable as(String alias) { + return new UserFavoriteProjectTable(DSL.name(alias), this); } @Override - public UserFavoriteProject as(Name alias) { - return new UserFavoriteProject(alias, this); + public UserFavoriteProjectTable as(Name alias) { + return new UserFavoriteProjectTable(alias, this); } /** * Rename this table */ @Override - public UserFavoriteProject rename(String name) { - return new UserFavoriteProject(DSL.name(name), null); + public UserFavoriteProjectTable rename(String name) { + return new UserFavoriteProjectTable(DSL.name(name), null); } /** * Rename this table */ @Override - public UserFavoriteProject rename(Name name) { - return new UserFavoriteProject(name, null); + public UserFavoriteProjectTable rename(Name name) { + return new UserFavoriteProjectTable(name, null); } // ------------------------------------------------------------------------- diff --git a/dao/generated-src/jooq/main/java/com/databasir/dao/tables/UserRole.java b/dao/generated-src/jooq/main/java/com/databasir/dao/tables/UserRoleTable.java similarity index 81% rename from dao/generated-src/jooq/main/java/com/databasir/dao/tables/UserRole.java rename to dao/generated-src/jooq/main/java/com/databasir/dao/tables/UserRoleTable.java index 42adcda..0e43109 100644 --- a/dao/generated-src/jooq/main/java/com/databasir/dao/tables/UserRole.java +++ b/dao/generated-src/jooq/main/java/com/databasir/dao/tables/UserRoleTable.java @@ -32,14 +32,14 @@ import org.jooq.impl.TableImpl; * This class is generated by jOOQ. */ @SuppressWarnings({ "all", "unchecked", "rawtypes" }) -public class UserRole extends TableImpl { +public class UserRoleTable extends TableImpl { private static final long serialVersionUID = 1L; /** * The reference instance of databasir.user_role */ - public static final UserRole USER_ROLE = new UserRole(); + public static final UserRoleTable USER_ROLE = new UserRoleTable(); /** * The class holding records for this type @@ -75,36 +75,36 @@ public class UserRole extends TableImpl { */ public final TableField CREATE_AT = createField(DSL.name("create_at"), SQLDataType.LOCALDATETIME(0).nullable(false).defaultValue(DSL.field("CURRENT_TIMESTAMP", SQLDataType.LOCALDATETIME)), this, ""); - private UserRole(Name alias, Table aliased) { + private UserRoleTable(Name alias, Table aliased) { this(alias, aliased, null); } - private UserRole(Name alias, Table aliased, Field[] parameters) { + private UserRoleTable(Name alias, Table aliased, Field[] parameters) { super(alias, null, aliased, parameters, DSL.comment(""), TableOptions.table()); } /** * Create an aliased databasir.user_role table reference */ - public UserRole(String alias) { + public UserRoleTable(String alias) { this(DSL.name(alias), USER_ROLE); } /** * Create an aliased databasir.user_role table reference */ - public UserRole(Name alias) { + public UserRoleTable(Name alias) { this(alias, USER_ROLE); } /** * Create a databasir.user_role table reference */ - public UserRole() { + public UserRoleTable() { this(DSL.name("user_role"), null); } - public UserRole(Table child, ForeignKey key) { + public UserRoleTable(Table child, ForeignKey key) { super(child, key, USER_ROLE); } @@ -129,29 +129,29 @@ public class UserRole extends TableImpl { } @Override - public UserRole as(String alias) { - return new UserRole(DSL.name(alias), this); + public UserRoleTable as(String alias) { + return new UserRoleTable(DSL.name(alias), this); } @Override - public UserRole as(Name alias) { - return new UserRole(alias, this); + public UserRoleTable as(Name alias) { + return new UserRoleTable(alias, this); } /** * Rename this table */ @Override - public UserRole rename(String name) { - return new UserRole(DSL.name(name), null); + public UserRoleTable rename(String name) { + return new UserRoleTable(DSL.name(name), null); } /** * Rename this table */ @Override - public UserRole rename(Name name) { - return new UserRole(name, null); + public UserRoleTable rename(Name name) { + return new UserRoleTable(name, null); } // ------------------------------------------------------------------------- diff --git a/dao/generated-src/jooq/main/java/com/databasir/dao/tables/User.java b/dao/generated-src/jooq/main/java/com/databasir/dao/tables/UserTable.java similarity index 87% rename from dao/generated-src/jooq/main/java/com/databasir/dao/tables/User.java rename to dao/generated-src/jooq/main/java/com/databasir/dao/tables/UserTable.java index eb6ef78..e11f04e 100644 --- a/dao/generated-src/jooq/main/java/com/databasir/dao/tables/User.java +++ b/dao/generated-src/jooq/main/java/com/databasir/dao/tables/UserTable.java @@ -32,14 +32,14 @@ import org.jooq.impl.TableImpl; * This class is generated by jOOQ. */ @SuppressWarnings({ "all", "unchecked", "rawtypes" }) -public class User extends TableImpl { +public class UserTable extends TableImpl { private static final long serialVersionUID = 1L; /** * The reference instance of databasir.user */ - public static final User USER = new User(); + public static final UserTable USER = new UserTable(); /** * The class holding records for this type @@ -104,36 +104,36 @@ public class User extends TableImpl { */ public final TableField CREATE_AT = createField(DSL.name("create_at"), SQLDataType.LOCALDATETIME(0).nullable(false).defaultValue(DSL.field("CURRENT_TIMESTAMP", SQLDataType.LOCALDATETIME)), this, ""); - private User(Name alias, Table aliased) { + private UserTable(Name alias, Table aliased) { this(alias, aliased, null); } - private User(Name alias, Table aliased, Field[] parameters) { + private UserTable(Name alias, Table aliased, Field[] parameters) { super(alias, null, aliased, parameters, DSL.comment(""), TableOptions.table()); } /** * Create an aliased databasir.user table reference */ - public User(String alias) { + public UserTable(String alias) { this(DSL.name(alias), USER); } /** * Create an aliased databasir.user table reference */ - public User(Name alias) { + public UserTable(Name alias) { this(alias, USER); } /** * Create a databasir.user table reference */ - public User() { + public UserTable() { this(DSL.name("user"), null); } - public User(Table child, ForeignKey key) { + public UserTable(Table child, ForeignKey key) { super(child, key, USER); } @@ -158,29 +158,29 @@ public class User extends TableImpl { } @Override - public User as(String alias) { - return new User(DSL.name(alias), this); + public UserTable as(String alias) { + return new UserTable(DSL.name(alias), this); } @Override - public User as(Name alias) { - return new User(alias, this); + public UserTable as(Name alias) { + return new UserTable(alias, this); } /** * Rename this table */ @Override - public User rename(String name) { - return new User(DSL.name(name), null); + public UserTable rename(String name) { + return new UserTable(DSL.name(name), null); } /** * Rename this table */ @Override - public User rename(Name name) { - return new User(name, null); + public UserTable rename(Name name) { + return new UserTable(name, null); } // ------------------------------------------------------------------------- diff --git a/dao/generated-src/jooq/main/java/com/databasir/dao/tables/pojos/DataSourcePojo.java b/dao/generated-src/jooq/main/java/com/databasir/dao/tables/pojos/DataSource.java similarity index 96% rename from dao/generated-src/jooq/main/java/com/databasir/dao/tables/pojos/DataSourcePojo.java rename to dao/generated-src/jooq/main/java/com/databasir/dao/tables/pojos/DataSource.java index cc9f113..ac6ffa0 100644 --- a/dao/generated-src/jooq/main/java/com/databasir/dao/tables/pojos/DataSourcePojo.java +++ b/dao/generated-src/jooq/main/java/com/databasir/dao/tables/pojos/DataSource.java @@ -12,7 +12,7 @@ import java.time.LocalDateTime; * This class is generated by jOOQ. */ @SuppressWarnings({ "all", "unchecked", "rawtypes" }) -public class DataSourcePojo implements Serializable { +public class DataSource implements Serializable { private static final long serialVersionUID = 1L; @@ -27,9 +27,9 @@ public class DataSourcePojo implements Serializable { private LocalDateTime updateAt; private LocalDateTime createAt; - public DataSourcePojo() {} + public DataSource() {} - public DataSourcePojo(DataSourcePojo value) { + public DataSource(DataSource value) { this.id = value.id; this.projectId = value.projectId; this.databaseName = value.databaseName; @@ -42,7 +42,7 @@ public class DataSourcePojo implements Serializable { this.createAt = value.createAt; } - public DataSourcePojo( + public DataSource( Integer id, Integer projectId, String databaseName, @@ -208,7 +208,7 @@ public class DataSourcePojo implements Serializable { @Override public String toString() { - StringBuilder sb = new StringBuilder("DataSourcePojo ("); + StringBuilder sb = new StringBuilder("DataSource ("); sb.append(id); sb.append(", ").append(projectId); diff --git a/dao/generated-src/jooq/main/java/com/databasir/dao/tables/pojos/DataSourcePropertyPojo.java b/dao/generated-src/jooq/main/java/com/databasir/dao/tables/pojos/DataSourceProperty.java similarity index 93% rename from dao/generated-src/jooq/main/java/com/databasir/dao/tables/pojos/DataSourcePropertyPojo.java rename to dao/generated-src/jooq/main/java/com/databasir/dao/tables/pojos/DataSourceProperty.java index d63fcfa..804db22 100644 --- a/dao/generated-src/jooq/main/java/com/databasir/dao/tables/pojos/DataSourcePropertyPojo.java +++ b/dao/generated-src/jooq/main/java/com/databasir/dao/tables/pojos/DataSourceProperty.java @@ -12,7 +12,7 @@ import java.time.LocalDateTime; * This class is generated by jOOQ. */ @SuppressWarnings({ "all", "unchecked", "rawtypes" }) -public class DataSourcePropertyPojo implements Serializable { +public class DataSourceProperty implements Serializable { private static final long serialVersionUID = 1L; @@ -22,9 +22,9 @@ public class DataSourcePropertyPojo implements Serializable { private String value; private LocalDateTime createAt; - public DataSourcePropertyPojo() {} + public DataSourceProperty() {} - public DataSourcePropertyPojo(DataSourcePropertyPojo value) { + public DataSourceProperty(DataSourceProperty value) { this.id = value.id; this.dataSourceId = value.dataSourceId; this.key = value.key; @@ -32,7 +32,7 @@ public class DataSourcePropertyPojo implements Serializable { this.createAt = value.createAt; } - public DataSourcePropertyPojo( + public DataSourceProperty( Integer id, Integer dataSourceId, String key, @@ -118,7 +118,7 @@ public class DataSourcePropertyPojo implements Serializable { @Override public String toString() { - StringBuilder sb = new StringBuilder("DataSourcePropertyPojo ("); + StringBuilder sb = new StringBuilder("DataSourceProperty ("); sb.append(id); sb.append(", ").append(dataSourceId); diff --git a/dao/generated-src/jooq/main/java/com/databasir/dao/tables/pojos/DatabaseDocumentPojo.java b/dao/generated-src/jooq/main/java/com/databasir/dao/tables/pojos/DatabaseDocument.java similarity index 95% rename from dao/generated-src/jooq/main/java/com/databasir/dao/tables/pojos/DatabaseDocumentPojo.java rename to dao/generated-src/jooq/main/java/com/databasir/dao/tables/pojos/DatabaseDocument.java index c06767d..5d7f080 100644 --- a/dao/generated-src/jooq/main/java/com/databasir/dao/tables/pojos/DatabaseDocumentPojo.java +++ b/dao/generated-src/jooq/main/java/com/databasir/dao/tables/pojos/DatabaseDocument.java @@ -12,7 +12,7 @@ import java.time.LocalDateTime; * This class is generated by jOOQ. */ @SuppressWarnings({ "all", "unchecked", "rawtypes" }) -public class DatabaseDocumentPojo implements Serializable { +public class DatabaseDocument implements Serializable { private static final long serialVersionUID = 1L; @@ -27,9 +27,9 @@ public class DatabaseDocumentPojo implements Serializable { private LocalDateTime updateAt; private LocalDateTime createAt; - public DatabaseDocumentPojo() {} + public DatabaseDocument() {} - public DatabaseDocumentPojo(DatabaseDocumentPojo value) { + public DatabaseDocument(DatabaseDocument value) { this.id = value.id; this.projectId = value.projectId; this.databaseName = value.databaseName; @@ -42,7 +42,7 @@ public class DatabaseDocumentPojo implements Serializable { this.createAt = value.createAt; } - public DatabaseDocumentPojo( + public DatabaseDocument( Integer id, Integer projectId, String databaseName, @@ -208,7 +208,7 @@ public class DatabaseDocumentPojo implements Serializable { @Override public String toString() { - StringBuilder sb = new StringBuilder("DatabaseDocumentPojo ("); + StringBuilder sb = new StringBuilder("DatabaseDocument ("); sb.append(id); sb.append(", ").append(projectId); diff --git a/dao/generated-src/jooq/main/java/com/databasir/dao/tables/pojos/DatabaseTypePojo.java b/dao/generated-src/jooq/main/java/com/databasir/dao/tables/pojos/DatabaseType.java similarity index 96% rename from dao/generated-src/jooq/main/java/com/databasir/dao/tables/pojos/DatabaseTypePojo.java rename to dao/generated-src/jooq/main/java/com/databasir/dao/tables/pojos/DatabaseType.java index 93ac800..a1d7d19 100644 --- a/dao/generated-src/jooq/main/java/com/databasir/dao/tables/pojos/DatabaseTypePojo.java +++ b/dao/generated-src/jooq/main/java/com/databasir/dao/tables/pojos/DatabaseType.java @@ -12,7 +12,7 @@ import java.time.LocalDateTime; * customer database types */ @SuppressWarnings({ "all", "unchecked", "rawtypes" }) -public class DatabaseTypePojo implements Serializable { +public class DatabaseType implements Serializable { private static final long serialVersionUID = 1L; @@ -30,9 +30,9 @@ public class DatabaseTypePojo implements Serializable { private LocalDateTime updateAt; private LocalDateTime createAt; - public DatabaseTypePojo() {} + public DatabaseType() {} - public DatabaseTypePojo(DatabaseTypePojo value) { + public DatabaseType(DatabaseType value) { this.id = value.id; this.databaseType = value.databaseType; this.icon = value.icon; @@ -48,7 +48,7 @@ public class DatabaseTypePojo implements Serializable { this.createAt = value.createAt; } - public DatabaseTypePojo( + public DatabaseType( Integer id, String databaseType, String icon, @@ -264,7 +264,7 @@ public class DatabaseTypePojo implements Serializable { @Override public String toString() { - StringBuilder sb = new StringBuilder("DatabaseTypePojo ("); + StringBuilder sb = new StringBuilder("DatabaseType ("); sb.append(id); sb.append(", ").append(databaseType); diff --git a/dao/generated-src/jooq/main/java/com/databasir/dao/tables/pojos/DocumentDescriptionPojo.java b/dao/generated-src/jooq/main/java/com/databasir/dao/tables/pojos/DocumentDescription.java similarity index 95% rename from dao/generated-src/jooq/main/java/com/databasir/dao/tables/pojos/DocumentDescriptionPojo.java rename to dao/generated-src/jooq/main/java/com/databasir/dao/tables/pojos/DocumentDescription.java index 6152b6a..6d81cba 100644 --- a/dao/generated-src/jooq/main/java/com/databasir/dao/tables/pojos/DocumentDescriptionPojo.java +++ b/dao/generated-src/jooq/main/java/com/databasir/dao/tables/pojos/DocumentDescription.java @@ -12,7 +12,7 @@ import java.time.LocalDateTime; * custom document description */ @SuppressWarnings({ "all", "unchecked", "rawtypes" }) -public class DocumentDescriptionPojo implements Serializable { +public class DocumentDescription implements Serializable { private static final long serialVersionUID = 1L; @@ -25,9 +25,9 @@ public class DocumentDescriptionPojo implements Serializable { private LocalDateTime updateAt; private LocalDateTime createAt; - public DocumentDescriptionPojo() {} + public DocumentDescription() {} - public DocumentDescriptionPojo(DocumentDescriptionPojo value) { + public DocumentDescription(DocumentDescription value) { this.id = value.id; this.content = value.content; this.projectId = value.projectId; @@ -38,7 +38,7 @@ public class DocumentDescriptionPojo implements Serializable { this.createAt = value.createAt; } - public DocumentDescriptionPojo( + public DocumentDescription( Integer id, String content, Integer projectId, @@ -172,7 +172,7 @@ public class DocumentDescriptionPojo implements Serializable { @Override public String toString() { - StringBuilder sb = new StringBuilder("DocumentDescriptionPojo ("); + StringBuilder sb = new StringBuilder("DocumentDescription ("); sb.append(id); sb.append(", ").append(content); diff --git a/dao/generated-src/jooq/main/java/com/databasir/dao/tables/pojos/DocumentDiscussionPojo.java b/dao/generated-src/jooq/main/java/com/databasir/dao/tables/pojos/DocumentDiscussion.java similarity index 95% rename from dao/generated-src/jooq/main/java/com/databasir/dao/tables/pojos/DocumentDiscussionPojo.java rename to dao/generated-src/jooq/main/java/com/databasir/dao/tables/pojos/DocumentDiscussion.java index 153b480..da86302 100644 --- a/dao/generated-src/jooq/main/java/com/databasir/dao/tables/pojos/DocumentDiscussionPojo.java +++ b/dao/generated-src/jooq/main/java/com/databasir/dao/tables/pojos/DocumentDiscussion.java @@ -12,7 +12,7 @@ import java.time.LocalDateTime; * This class is generated by jOOQ. */ @SuppressWarnings({ "all", "unchecked", "rawtypes" }) -public class DocumentDiscussionPojo implements Serializable { +public class DocumentDiscussion implements Serializable { private static final long serialVersionUID = 1L; @@ -24,9 +24,9 @@ public class DocumentDiscussionPojo implements Serializable { private String columnName; private LocalDateTime createAt; - public DocumentDiscussionPojo() {} + public DocumentDiscussion() {} - public DocumentDiscussionPojo(DocumentDiscussionPojo value) { + public DocumentDiscussion(DocumentDiscussion value) { this.id = value.id; this.content = value.content; this.userId = value.userId; @@ -36,7 +36,7 @@ public class DocumentDiscussionPojo implements Serializable { this.createAt = value.createAt; } - public DocumentDiscussionPojo( + public DocumentDiscussion( Integer id, String content, Integer userId, @@ -154,7 +154,7 @@ public class DocumentDiscussionPojo implements Serializable { @Override public String toString() { - StringBuilder sb = new StringBuilder("DocumentDiscussionPojo ("); + StringBuilder sb = new StringBuilder("DocumentDiscussion ("); sb.append(id); sb.append(", ").append(content); diff --git a/dao/generated-src/jooq/main/java/com/databasir/dao/tables/pojos/DocumentFullTextPojo.java b/dao/generated-src/jooq/main/java/com/databasir/dao/tables/pojos/DocumentFullText.java similarity index 98% rename from dao/generated-src/jooq/main/java/com/databasir/dao/tables/pojos/DocumentFullTextPojo.java rename to dao/generated-src/jooq/main/java/com/databasir/dao/tables/pojos/DocumentFullText.java index 03d8fe5..c7da122 100644 --- a/dao/generated-src/jooq/main/java/com/databasir/dao/tables/pojos/DocumentFullTextPojo.java +++ b/dao/generated-src/jooq/main/java/com/databasir/dao/tables/pojos/DocumentFullText.java @@ -12,7 +12,7 @@ import java.time.LocalDateTime; * This class is generated by jOOQ. */ @SuppressWarnings({ "all", "unchecked", "rawtypes" }) -public class DocumentFullTextPojo implements Serializable { +public class DocumentFullText implements Serializable { private static final long serialVersionUID = 1L; @@ -40,9 +40,9 @@ public class DocumentFullTextPojo implements Serializable { private LocalDateTime updateAt; private LocalDateTime createAt; - public DocumentFullTextPojo() {} + public DocumentFullText() {} - public DocumentFullTextPojo(DocumentFullTextPojo value) { + public DocumentFullText(DocumentFullText value) { this.id = value.id; this.groupId = value.groupId; this.projectId = value.projectId; @@ -68,7 +68,7 @@ public class DocumentFullTextPojo implements Serializable { this.createAt = value.createAt; } - public DocumentFullTextPojo( + public DocumentFullText( Integer id, Integer groupId, Integer projectId, @@ -462,7 +462,7 @@ public class DocumentFullTextPojo implements Serializable { @Override public String toString() { - StringBuilder sb = new StringBuilder("DocumentFullTextPojo ("); + StringBuilder sb = new StringBuilder("DocumentFullText ("); sb.append(id); sb.append(", ").append(groupId); diff --git a/dao/generated-src/jooq/main/java/com/databasir/dao/tables/pojos/DocumentTemplatePropertyPojo.java b/dao/generated-src/jooq/main/java/com/databasir/dao/tables/pojos/DocumentTemplateProperty.java similarity index 93% rename from dao/generated-src/jooq/main/java/com/databasir/dao/tables/pojos/DocumentTemplatePropertyPojo.java rename to dao/generated-src/jooq/main/java/com/databasir/dao/tables/pojos/DocumentTemplateProperty.java index 3452fa8..215a2ac 100644 --- a/dao/generated-src/jooq/main/java/com/databasir/dao/tables/pojos/DocumentTemplatePropertyPojo.java +++ b/dao/generated-src/jooq/main/java/com/databasir/dao/tables/pojos/DocumentTemplateProperty.java @@ -14,7 +14,7 @@ import java.time.LocalDateTime; * template property */ @SuppressWarnings({ "all", "unchecked", "rawtypes" }) -public class DocumentTemplatePropertyPojo implements Serializable { +public class DocumentTemplateProperty implements Serializable { private static final long serialVersionUID = 1L; @@ -25,9 +25,9 @@ public class DocumentTemplatePropertyPojo implements Serializable { private DocumentTemplatePropertyType type; private LocalDateTime createAt; - public DocumentTemplatePropertyPojo() {} + public DocumentTemplateProperty() {} - public DocumentTemplatePropertyPojo(DocumentTemplatePropertyPojo value) { + public DocumentTemplateProperty(DocumentTemplateProperty value) { this.id = value.id; this.key = value.key; this.value = value.value; @@ -36,7 +36,7 @@ public class DocumentTemplatePropertyPojo implements Serializable { this.createAt = value.createAt; } - public DocumentTemplatePropertyPojo( + public DocumentTemplateProperty( Integer id, String key, String value, @@ -140,7 +140,7 @@ public class DocumentTemplatePropertyPojo implements Serializable { @Override public String toString() { - StringBuilder sb = new StringBuilder("DocumentTemplatePropertyPojo ("); + StringBuilder sb = new StringBuilder("DocumentTemplateProperty ("); sb.append(id); sb.append(", ").append(key); diff --git a/dao/generated-src/jooq/main/java/com/databasir/dao/tables/pojos/GroupPojo.java b/dao/generated-src/jooq/main/java/com/databasir/dao/tables/pojos/Group.java similarity index 94% rename from dao/generated-src/jooq/main/java/com/databasir/dao/tables/pojos/GroupPojo.java rename to dao/generated-src/jooq/main/java/com/databasir/dao/tables/pojos/Group.java index 20f310a..089294a 100644 --- a/dao/generated-src/jooq/main/java/com/databasir/dao/tables/pojos/GroupPojo.java +++ b/dao/generated-src/jooq/main/java/com/databasir/dao/tables/pojos/Group.java @@ -12,7 +12,7 @@ import java.time.LocalDateTime; * This class is generated by jOOQ. */ @SuppressWarnings({ "all", "unchecked", "rawtypes" }) -public class GroupPojo implements Serializable { +public class Group implements Serializable { private static final long serialVersionUID = 1L; @@ -23,9 +23,9 @@ public class GroupPojo implements Serializable { private LocalDateTime updateAt; private LocalDateTime createAt; - public GroupPojo() {} + public Group() {} - public GroupPojo(GroupPojo value) { + public Group(Group value) { this.id = value.id; this.name = value.name; this.description = value.description; @@ -34,7 +34,7 @@ public class GroupPojo implements Serializable { this.createAt = value.createAt; } - public GroupPojo( + public Group( Integer id, String name, String description, @@ -136,7 +136,7 @@ public class GroupPojo implements Serializable { @Override public String toString() { - StringBuilder sb = new StringBuilder("GroupPojo ("); + StringBuilder sb = new StringBuilder("Group ("); sb.append(id); sb.append(", ").append(name); diff --git a/dao/generated-src/jooq/main/java/com/databasir/dao/tables/pojos/LoginPojo.java b/dao/generated-src/jooq/main/java/com/databasir/dao/tables/pojos/Login.java similarity index 95% rename from dao/generated-src/jooq/main/java/com/databasir/dao/tables/pojos/LoginPojo.java rename to dao/generated-src/jooq/main/java/com/databasir/dao/tables/pojos/Login.java index a816044..841b192 100644 --- a/dao/generated-src/jooq/main/java/com/databasir/dao/tables/pojos/LoginPojo.java +++ b/dao/generated-src/jooq/main/java/com/databasir/dao/tables/pojos/Login.java @@ -12,7 +12,7 @@ import java.time.LocalDateTime; * This class is generated by jOOQ. */ @SuppressWarnings({ "all", "unchecked", "rawtypes" }) -public class LoginPojo implements Serializable { +public class Login implements Serializable { private static final long serialVersionUID = 1L; @@ -25,9 +25,9 @@ public class LoginPojo implements Serializable { private LocalDateTime updateAt; private LocalDateTime createAt; - public LoginPojo() {} + public Login() {} - public LoginPojo(LoginPojo value) { + public Login(Login value) { this.id = value.id; this.userId = value.userId; this.accessToken = value.accessToken; @@ -38,7 +38,7 @@ public class LoginPojo implements Serializable { this.createAt = value.createAt; } - public LoginPojo( + public Login( Integer id, Integer userId, String accessToken, @@ -172,7 +172,7 @@ public class LoginPojo implements Serializable { @Override public String toString() { - StringBuilder sb = new StringBuilder("LoginPojo ("); + StringBuilder sb = new StringBuilder("Login ("); sb.append(id); sb.append(", ").append(userId); diff --git a/dao/generated-src/jooq/main/java/com/databasir/dao/tables/pojos/MockDataRulePojo.java b/dao/generated-src/jooq/main/java/com/databasir/dao/tables/pojos/MockDataRule.java similarity index 96% rename from dao/generated-src/jooq/main/java/com/databasir/dao/tables/pojos/MockDataRulePojo.java rename to dao/generated-src/jooq/main/java/com/databasir/dao/tables/pojos/MockDataRule.java index 713059d..bf5b039 100644 --- a/dao/generated-src/jooq/main/java/com/databasir/dao/tables/pojos/MockDataRulePojo.java +++ b/dao/generated-src/jooq/main/java/com/databasir/dao/tables/pojos/MockDataRule.java @@ -14,7 +14,7 @@ import java.time.LocalDateTime; * This class is generated by jOOQ. */ @SuppressWarnings({ "all", "unchecked", "rawtypes" }) -public class MockDataRulePojo implements Serializable { +public class MockDataRule implements Serializable { private static final long serialVersionUID = 1L; @@ -29,9 +29,9 @@ public class MockDataRulePojo implements Serializable { private LocalDateTime updateAt; private LocalDateTime createAt; - public MockDataRulePojo() {} + public MockDataRule() {} - public MockDataRulePojo(MockDataRulePojo value) { + public MockDataRule(MockDataRule value) { this.id = value.id; this.projectId = value.projectId; this.tableName = value.tableName; @@ -44,7 +44,7 @@ public class MockDataRulePojo implements Serializable { this.createAt = value.createAt; } - public MockDataRulePojo( + public MockDataRule( Integer id, Integer projectId, String tableName, @@ -210,7 +210,7 @@ public class MockDataRulePojo implements Serializable { @Override public String toString() { - StringBuilder sb = new StringBuilder("MockDataRulePojo ("); + StringBuilder sb = new StringBuilder("MockDataRule ("); sb.append(id); sb.append(", ").append(projectId); diff --git a/dao/generated-src/jooq/main/java/com/databasir/dao/tables/pojos/OauthAppPojo.java b/dao/generated-src/jooq/main/java/com/databasir/dao/tables/pojos/OauthApp.java similarity index 96% rename from dao/generated-src/jooq/main/java/com/databasir/dao/tables/pojos/OauthAppPojo.java rename to dao/generated-src/jooq/main/java/com/databasir/dao/tables/pojos/OauthApp.java index f1dbb1d..2a0d5f3 100644 --- a/dao/generated-src/jooq/main/java/com/databasir/dao/tables/pojos/OauthAppPojo.java +++ b/dao/generated-src/jooq/main/java/com/databasir/dao/tables/pojos/OauthApp.java @@ -14,7 +14,7 @@ import java.time.LocalDateTime; * oauth app info */ @SuppressWarnings({ "all", "unchecked", "rawtypes" }) -public class OauthAppPojo implements Serializable { +public class OauthApp implements Serializable { private static final long serialVersionUID = 1L; @@ -31,9 +31,9 @@ public class OauthAppPojo implements Serializable { private LocalDateTime updateAt; private LocalDateTime createAt; - public OauthAppPojo() {} + public OauthApp() {} - public OauthAppPojo(OauthAppPojo value) { + public OauthApp(OauthApp value) { this.id = value.id; this.registrationId = value.registrationId; this.appName = value.appName; @@ -48,7 +48,7 @@ public class OauthAppPojo implements Serializable { this.createAt = value.createAt; } - public OauthAppPojo( + public OauthApp( Integer id, String registrationId, String appName, @@ -246,7 +246,7 @@ public class OauthAppPojo implements Serializable { @Override public String toString() { - StringBuilder sb = new StringBuilder("OauthAppPojo ("); + StringBuilder sb = new StringBuilder("OauthApp ("); sb.append(id); sb.append(", ").append(registrationId); diff --git a/dao/generated-src/jooq/main/java/com/databasir/dao/tables/pojos/OperationLogPojo.java b/dao/generated-src/jooq/main/java/com/databasir/dao/tables/pojos/OperationLog.java similarity index 97% rename from dao/generated-src/jooq/main/java/com/databasir/dao/tables/pojos/OperationLogPojo.java rename to dao/generated-src/jooq/main/java/com/databasir/dao/tables/pojos/OperationLog.java index b8b1c8b..118f6ae 100644 --- a/dao/generated-src/jooq/main/java/com/databasir/dao/tables/pojos/OperationLogPojo.java +++ b/dao/generated-src/jooq/main/java/com/databasir/dao/tables/pojos/OperationLog.java @@ -14,7 +14,7 @@ import org.jooq.JSON; * This class is generated by jOOQ. */ @SuppressWarnings({ "all", "unchecked", "rawtypes" }) -public class OperationLogPojo implements Serializable { +public class OperationLog implements Serializable { private static final long serialVersionUID = 1L; @@ -32,9 +32,9 @@ public class OperationLogPojo implements Serializable { private Integer involvedUserId; private LocalDateTime createAt; - public OperationLogPojo() {} + public OperationLog() {} - public OperationLogPojo(OperationLogPojo value) { + public OperationLog(OperationLog value) { this.id = value.id; this.operatorUserId = value.operatorUserId; this.operatorUsername = value.operatorUsername; @@ -50,7 +50,7 @@ public class OperationLogPojo implements Serializable { this.createAt = value.createAt; } - public OperationLogPojo( + public OperationLog( Long id, Integer operatorUserId, String operatorUsername, @@ -276,7 +276,7 @@ public class OperationLogPojo implements Serializable { @Override public String toString() { - StringBuilder sb = new StringBuilder("OperationLogPojo ("); + StringBuilder sb = new StringBuilder("OperationLog ("); sb.append(id); sb.append(", ").append(operatorUserId); diff --git a/dao/generated-src/jooq/main/java/com/databasir/dao/tables/pojos/ProjectPojo.java b/dao/generated-src/jooq/main/java/com/databasir/dao/tables/pojos/Project.java similarity index 94% rename from dao/generated-src/jooq/main/java/com/databasir/dao/tables/pojos/ProjectPojo.java rename to dao/generated-src/jooq/main/java/com/databasir/dao/tables/pojos/Project.java index 3b8ae9b..6915ca7 100644 --- a/dao/generated-src/jooq/main/java/com/databasir/dao/tables/pojos/ProjectPojo.java +++ b/dao/generated-src/jooq/main/java/com/databasir/dao/tables/pojos/Project.java @@ -12,7 +12,7 @@ import java.time.LocalDateTime; * This class is generated by jOOQ. */ @SuppressWarnings({ "all", "unchecked", "rawtypes" }) -public class ProjectPojo implements Serializable { +public class Project implements Serializable { private static final long serialVersionUID = 1L; @@ -24,9 +24,9 @@ public class ProjectPojo implements Serializable { private Integer deletedToken; private LocalDateTime createAt; - public ProjectPojo() {} + public Project() {} - public ProjectPojo(ProjectPojo value) { + public Project(Project value) { this.id = value.id; this.name = value.name; this.description = value.description; @@ -36,7 +36,7 @@ public class ProjectPojo implements Serializable { this.createAt = value.createAt; } - public ProjectPojo( + public Project( Integer id, String name, String description, @@ -156,7 +156,7 @@ public class ProjectPojo implements Serializable { @Override public String toString() { - StringBuilder sb = new StringBuilder("ProjectPojo ("); + StringBuilder sb = new StringBuilder("Project ("); sb.append(id); sb.append(", ").append(name); diff --git a/dao/generated-src/jooq/main/java/com/databasir/dao/tables/pojos/ProjectSyncRulePojo.java b/dao/generated-src/jooq/main/java/com/databasir/dao/tables/pojos/ProjectSyncRule.java similarity index 95% rename from dao/generated-src/jooq/main/java/com/databasir/dao/tables/pojos/ProjectSyncRulePojo.java rename to dao/generated-src/jooq/main/java/com/databasir/dao/tables/pojos/ProjectSyncRule.java index 147a608..166cc6e 100644 --- a/dao/generated-src/jooq/main/java/com/databasir/dao/tables/pojos/ProjectSyncRulePojo.java +++ b/dao/generated-src/jooq/main/java/com/databasir/dao/tables/pojos/ProjectSyncRule.java @@ -14,7 +14,7 @@ import org.jooq.JSON; * This class is generated by jOOQ. */ @SuppressWarnings({ "all", "unchecked", "rawtypes" }) -public class ProjectSyncRulePojo implements Serializable { +public class ProjectSyncRule implements Serializable { private static final long serialVersionUID = 1L; @@ -27,9 +27,9 @@ public class ProjectSyncRulePojo implements Serializable { private LocalDateTime updateAt; private LocalDateTime createAt; - public ProjectSyncRulePojo() {} + public ProjectSyncRule() {} - public ProjectSyncRulePojo(ProjectSyncRulePojo value) { + public ProjectSyncRule(ProjectSyncRule value) { this.id = value.id; this.projectId = value.projectId; this.ignoreTableNameRegexArray = value.ignoreTableNameRegexArray; @@ -40,7 +40,7 @@ public class ProjectSyncRulePojo implements Serializable { this.createAt = value.createAt; } - public ProjectSyncRulePojo( + public ProjectSyncRule( Integer id, Integer projectId, JSON ignoreTableNameRegexArray, @@ -178,7 +178,7 @@ public class ProjectSyncRulePojo implements Serializable { @Override public String toString() { - StringBuilder sb = new StringBuilder("ProjectSyncRulePojo ("); + StringBuilder sb = new StringBuilder("ProjectSyncRule ("); sb.append(id); sb.append(", ").append(projectId); diff --git a/dao/generated-src/jooq/main/java/com/databasir/dao/tables/pojos/ProjectSyncTaskPojo.java b/dao/generated-src/jooq/main/java/com/databasir/dao/tables/pojos/ProjectSyncTask.java similarity index 94% rename from dao/generated-src/jooq/main/java/com/databasir/dao/tables/pojos/ProjectSyncTaskPojo.java rename to dao/generated-src/jooq/main/java/com/databasir/dao/tables/pojos/ProjectSyncTask.java index f80900a..b5dd8ba 100644 --- a/dao/generated-src/jooq/main/java/com/databasir/dao/tables/pojos/ProjectSyncTaskPojo.java +++ b/dao/generated-src/jooq/main/java/com/databasir/dao/tables/pojos/ProjectSyncTask.java @@ -14,7 +14,7 @@ import java.time.LocalDateTime; * This class is generated by jOOQ. */ @SuppressWarnings({ "all", "unchecked", "rawtypes" }) -public class ProjectSyncTaskPojo implements Serializable { +public class ProjectSyncTask implements Serializable { private static final long serialVersionUID = 1L; @@ -27,9 +27,9 @@ public class ProjectSyncTaskPojo implements Serializable { private LocalDateTime updateAt; private LocalDateTime createAt; - public ProjectSyncTaskPojo() {} + public ProjectSyncTask() {} - public ProjectSyncTaskPojo(ProjectSyncTaskPojo value) { + public ProjectSyncTask(ProjectSyncTask value) { this.id = value.id; this.projectId = value.projectId; this.userId = value.userId; @@ -40,7 +40,7 @@ public class ProjectSyncTaskPojo implements Serializable { this.createAt = value.createAt; } - public ProjectSyncTaskPojo( + public ProjectSyncTask( Integer id, Integer projectId, Integer userId, @@ -176,7 +176,7 @@ public class ProjectSyncTaskPojo implements Serializable { @Override public String toString() { - StringBuilder sb = new StringBuilder("ProjectSyncTaskPojo ("); + StringBuilder sb = new StringBuilder("ProjectSyncTask ("); sb.append(id); sb.append(", ").append(projectId); diff --git a/dao/generated-src/jooq/main/java/com/databasir/dao/tables/pojos/SysKeyPojo.java b/dao/generated-src/jooq/main/java/com/databasir/dao/tables/pojos/SysKey.java similarity index 94% rename from dao/generated-src/jooq/main/java/com/databasir/dao/tables/pojos/SysKeyPojo.java rename to dao/generated-src/jooq/main/java/com/databasir/dao/tables/pojos/SysKey.java index 1cc8bd2..8cfe6cf 100644 --- a/dao/generated-src/jooq/main/java/com/databasir/dao/tables/pojos/SysKeyPojo.java +++ b/dao/generated-src/jooq/main/java/com/databasir/dao/tables/pojos/SysKey.java @@ -12,7 +12,7 @@ import java.time.LocalDateTime; * This class is generated by jOOQ. */ @SuppressWarnings({ "all", "unchecked", "rawtypes" }) -public class SysKeyPojo implements Serializable { +public class SysKey implements Serializable { private static final long serialVersionUID = 1L; @@ -23,9 +23,9 @@ public class SysKeyPojo implements Serializable { private LocalDateTime updateAt; private LocalDateTime createAt; - public SysKeyPojo() {} + public SysKey() {} - public SysKeyPojo(SysKeyPojo value) { + public SysKey(SysKey value) { this.id = value.id; this.rsaPublicKey = value.rsaPublicKey; this.rsaPrivateKey = value.rsaPrivateKey; @@ -34,7 +34,7 @@ public class SysKeyPojo implements Serializable { this.createAt = value.createAt; } - public SysKeyPojo( + public SysKey( Integer id, String rsaPublicKey, String rsaPrivateKey, @@ -136,7 +136,7 @@ public class SysKeyPojo implements Serializable { @Override public String toString() { - StringBuilder sb = new StringBuilder("SysKeyPojo ("); + StringBuilder sb = new StringBuilder("SysKey ("); sb.append(id); sb.append(", ").append(rsaPublicKey); diff --git a/dao/generated-src/jooq/main/java/com/databasir/dao/tables/pojos/SysMailPojo.java b/dao/generated-src/jooq/main/java/com/databasir/dao/tables/pojos/SysMail.java similarity index 95% rename from dao/generated-src/jooq/main/java/com/databasir/dao/tables/pojos/SysMailPojo.java rename to dao/generated-src/jooq/main/java/com/databasir/dao/tables/pojos/SysMail.java index 47ccedf..e7a6c6a 100644 --- a/dao/generated-src/jooq/main/java/com/databasir/dao/tables/pojos/SysMailPojo.java +++ b/dao/generated-src/jooq/main/java/com/databasir/dao/tables/pojos/SysMail.java @@ -12,7 +12,7 @@ import java.time.LocalDateTime; * This class is generated by jOOQ. */ @SuppressWarnings({ "all", "unchecked", "rawtypes" }) -public class SysMailPojo implements Serializable { +public class SysMail implements Serializable { private static final long serialVersionUID = 1L; @@ -25,9 +25,9 @@ public class SysMailPojo implements Serializable { private LocalDateTime updateAt; private LocalDateTime createAt; - public SysMailPojo() {} + public SysMail() {} - public SysMailPojo(SysMailPojo value) { + public SysMail(SysMail value) { this.id = value.id; this.username = value.username; this.password = value.password; @@ -38,7 +38,7 @@ public class SysMailPojo implements Serializable { this.createAt = value.createAt; } - public SysMailPojo( + public SysMail( Integer id, String username, String password, @@ -172,7 +172,7 @@ public class SysMailPojo implements Serializable { @Override public String toString() { - StringBuilder sb = new StringBuilder("SysMailPojo ("); + StringBuilder sb = new StringBuilder("SysMail ("); sb.append(id); sb.append(", ").append(username); diff --git a/dao/generated-src/jooq/main/java/com/databasir/dao/tables/pojos/TableColumnDocumentPojo.java b/dao/generated-src/jooq/main/java/com/databasir/dao/tables/pojos/TableColumnDocument.java similarity index 97% rename from dao/generated-src/jooq/main/java/com/databasir/dao/tables/pojos/TableColumnDocumentPojo.java rename to dao/generated-src/jooq/main/java/com/databasir/dao/tables/pojos/TableColumnDocument.java index 207233e..d57dc9c 100644 --- a/dao/generated-src/jooq/main/java/com/databasir/dao/tables/pojos/TableColumnDocumentPojo.java +++ b/dao/generated-src/jooq/main/java/com/databasir/dao/tables/pojos/TableColumnDocument.java @@ -12,7 +12,7 @@ import java.time.LocalDateTime; * This class is generated by jOOQ. */ @SuppressWarnings({ "all", "unchecked", "rawtypes" }) -public class TableColumnDocumentPojo implements Serializable { +public class TableColumnDocument implements Serializable { private static final long serialVersionUID = 1L; @@ -31,9 +31,9 @@ public class TableColumnDocumentPojo implements Serializable { private String autoIncrement; private LocalDateTime createAt; - public TableColumnDocumentPojo() {} + public TableColumnDocument() {} - public TableColumnDocumentPojo(TableColumnDocumentPojo value) { + public TableColumnDocument(TableColumnDocument value) { this.id = value.id; this.tableDocumentId = value.tableDocumentId; this.databaseDocumentId = value.databaseDocumentId; @@ -50,7 +50,7 @@ public class TableColumnDocumentPojo implements Serializable { this.createAt = value.createAt; } - public TableColumnDocumentPojo( + public TableColumnDocument( Integer id, Integer tableDocumentId, Integer databaseDocumentId, @@ -288,7 +288,7 @@ public class TableColumnDocumentPojo implements Serializable { @Override public String toString() { - StringBuilder sb = new StringBuilder("TableColumnDocumentPojo ("); + StringBuilder sb = new StringBuilder("TableColumnDocument ("); sb.append(id); sb.append(", ").append(tableDocumentId); diff --git a/dao/generated-src/jooq/main/java/com/databasir/dao/tables/pojos/TableDocumentPojo.java b/dao/generated-src/jooq/main/java/com/databasir/dao/tables/pojos/TableDocument.java similarity index 93% rename from dao/generated-src/jooq/main/java/com/databasir/dao/tables/pojos/TableDocumentPojo.java rename to dao/generated-src/jooq/main/java/com/databasir/dao/tables/pojos/TableDocument.java index 50da9bd..29feab9 100644 --- a/dao/generated-src/jooq/main/java/com/databasir/dao/tables/pojos/TableDocumentPojo.java +++ b/dao/generated-src/jooq/main/java/com/databasir/dao/tables/pojos/TableDocument.java @@ -12,7 +12,7 @@ import java.time.LocalDateTime; * This class is generated by jOOQ. */ @SuppressWarnings({ "all", "unchecked", "rawtypes" }) -public class TableDocumentPojo implements Serializable { +public class TableDocument implements Serializable { private static final long serialVersionUID = 1L; @@ -23,9 +23,9 @@ public class TableDocumentPojo implements Serializable { private String comment; private LocalDateTime createAt; - public TableDocumentPojo() {} + public TableDocument() {} - public TableDocumentPojo(TableDocumentPojo value) { + public TableDocument(TableDocument value) { this.id = value.id; this.databaseDocumentId = value.databaseDocumentId; this.name = value.name; @@ -34,7 +34,7 @@ public class TableDocumentPojo implements Serializable { this.createAt = value.createAt; } - public TableDocumentPojo( + public TableDocument( Integer id, Integer databaseDocumentId, String name, @@ -136,7 +136,7 @@ public class TableDocumentPojo implements Serializable { @Override public String toString() { - StringBuilder sb = new StringBuilder("TableDocumentPojo ("); + StringBuilder sb = new StringBuilder("TableDocument ("); sb.append(id); sb.append(", ").append(databaseDocumentId); diff --git a/dao/generated-src/jooq/main/java/com/databasir/dao/tables/pojos/TableForeignKeyDocumentPojo.java b/dao/generated-src/jooq/main/java/com/databasir/dao/tables/pojos/TableForeignKeyDocument.java similarity index 97% rename from dao/generated-src/jooq/main/java/com/databasir/dao/tables/pojos/TableForeignKeyDocumentPojo.java rename to dao/generated-src/jooq/main/java/com/databasir/dao/tables/pojos/TableForeignKeyDocument.java index 89d7110..25f7dc8 100644 --- a/dao/generated-src/jooq/main/java/com/databasir/dao/tables/pojos/TableForeignKeyDocumentPojo.java +++ b/dao/generated-src/jooq/main/java/com/databasir/dao/tables/pojos/TableForeignKeyDocument.java @@ -12,7 +12,7 @@ import java.time.LocalDateTime; * This class is generated by jOOQ. */ @SuppressWarnings({ "all", "unchecked", "rawtypes" }) -public class TableForeignKeyDocumentPojo implements Serializable { +public class TableForeignKeyDocument implements Serializable { private static final long serialVersionUID = 1L; @@ -30,9 +30,9 @@ public class TableForeignKeyDocumentPojo implements Serializable { private String deleteRule; private LocalDateTime createAt; - public TableForeignKeyDocumentPojo() {} + public TableForeignKeyDocument() {} - public TableForeignKeyDocumentPojo(TableForeignKeyDocumentPojo value) { + public TableForeignKeyDocument(TableForeignKeyDocument value) { this.id = value.id; this.tableDocumentId = value.tableDocumentId; this.databaseDocumentId = value.databaseDocumentId; @@ -48,7 +48,7 @@ public class TableForeignKeyDocumentPojo implements Serializable { this.createAt = value.createAt; } - public TableForeignKeyDocumentPojo( + public TableForeignKeyDocument( Integer id, Integer tableDocumentId, Integer databaseDocumentId, @@ -278,7 +278,7 @@ public class TableForeignKeyDocumentPojo implements Serializable { @Override public String toString() { - StringBuilder sb = new StringBuilder("TableForeignKeyDocumentPojo ("); + StringBuilder sb = new StringBuilder("TableForeignKeyDocument ("); sb.append(id); sb.append(", ").append(tableDocumentId); diff --git a/dao/generated-src/jooq/main/java/com/databasir/dao/tables/pojos/TableIndexDocumentPojo.java b/dao/generated-src/jooq/main/java/com/databasir/dao/tables/pojos/TableIndexDocument.java similarity index 95% rename from dao/generated-src/jooq/main/java/com/databasir/dao/tables/pojos/TableIndexDocumentPojo.java rename to dao/generated-src/jooq/main/java/com/databasir/dao/tables/pojos/TableIndexDocument.java index ceb0fb4..efc7919 100644 --- a/dao/generated-src/jooq/main/java/com/databasir/dao/tables/pojos/TableIndexDocumentPojo.java +++ b/dao/generated-src/jooq/main/java/com/databasir/dao/tables/pojos/TableIndexDocument.java @@ -14,7 +14,7 @@ import org.jooq.JSON; * This class is generated by jOOQ. */ @SuppressWarnings({ "all", "unchecked", "rawtypes" }) -public class TableIndexDocumentPojo implements Serializable { +public class TableIndexDocument implements Serializable { private static final long serialVersionUID = 1L; @@ -26,9 +26,9 @@ public class TableIndexDocumentPojo implements Serializable { private JSON columnNameArray; private LocalDateTime createAt; - public TableIndexDocumentPojo() {} + public TableIndexDocument() {} - public TableIndexDocumentPojo(TableIndexDocumentPojo value) { + public TableIndexDocument(TableIndexDocument value) { this.id = value.id; this.tableDocumentId = value.tableDocumentId; this.databaseDocumentId = value.databaseDocumentId; @@ -38,7 +38,7 @@ public class TableIndexDocumentPojo implements Serializable { this.createAt = value.createAt; } - public TableIndexDocumentPojo( + public TableIndexDocument( Integer id, Integer tableDocumentId, Integer databaseDocumentId, @@ -158,7 +158,7 @@ public class TableIndexDocumentPojo implements Serializable { @Override public String toString() { - StringBuilder sb = new StringBuilder("TableIndexDocumentPojo ("); + StringBuilder sb = new StringBuilder("TableIndexDocument ("); sb.append(id); sb.append(", ").append(tableDocumentId); diff --git a/dao/generated-src/jooq/main/java/com/databasir/dao/tables/pojos/TableTriggerDocumentPojo.java b/dao/generated-src/jooq/main/java/com/databasir/dao/tables/pojos/TableTriggerDocument.java similarity index 96% rename from dao/generated-src/jooq/main/java/com/databasir/dao/tables/pojos/TableTriggerDocumentPojo.java rename to dao/generated-src/jooq/main/java/com/databasir/dao/tables/pojos/TableTriggerDocument.java index 0328f4a..22fb976 100644 --- a/dao/generated-src/jooq/main/java/com/databasir/dao/tables/pojos/TableTriggerDocumentPojo.java +++ b/dao/generated-src/jooq/main/java/com/databasir/dao/tables/pojos/TableTriggerDocument.java @@ -12,7 +12,7 @@ import java.time.LocalDateTime; * This class is generated by jOOQ. */ @SuppressWarnings({ "all", "unchecked", "rawtypes" }) -public class TableTriggerDocumentPojo implements Serializable { +public class TableTriggerDocument implements Serializable { private static final long serialVersionUID = 1L; @@ -26,9 +26,9 @@ public class TableTriggerDocumentPojo implements Serializable { private String triggerCreateAt; private LocalDateTime createAt; - public TableTriggerDocumentPojo() {} + public TableTriggerDocument() {} - public TableTriggerDocumentPojo(TableTriggerDocumentPojo value) { + public TableTriggerDocument(TableTriggerDocument value) { this.id = value.id; this.name = value.name; this.tableDocumentId = value.tableDocumentId; @@ -40,7 +40,7 @@ public class TableTriggerDocumentPojo implements Serializable { this.createAt = value.createAt; } - public TableTriggerDocumentPojo( + public TableTriggerDocument( Integer id, String name, Integer tableDocumentId, @@ -196,7 +196,7 @@ public class TableTriggerDocumentPojo implements Serializable { @Override public String toString() { - StringBuilder sb = new StringBuilder("TableTriggerDocumentPojo ("); + StringBuilder sb = new StringBuilder("TableTriggerDocument ("); sb.append(id); sb.append(", ").append(name); diff --git a/dao/generated-src/jooq/main/java/com/databasir/dao/tables/pojos/UserPojo.java b/dao/generated-src/jooq/main/java/com/databasir/dao/tables/pojos/User.java similarity index 96% rename from dao/generated-src/jooq/main/java/com/databasir/dao/tables/pojos/UserPojo.java rename to dao/generated-src/jooq/main/java/com/databasir/dao/tables/pojos/User.java index 27870bd..89e2092 100644 --- a/dao/generated-src/jooq/main/java/com/databasir/dao/tables/pojos/UserPojo.java +++ b/dao/generated-src/jooq/main/java/com/databasir/dao/tables/pojos/User.java @@ -12,7 +12,7 @@ import java.time.LocalDateTime; * This class is generated by jOOQ. */ @SuppressWarnings({ "all", "unchecked", "rawtypes" }) -public class UserPojo implements Serializable { +public class User implements Serializable { private static final long serialVersionUID = 1L; @@ -28,9 +28,9 @@ public class UserPojo implements Serializable { private LocalDateTime updateAt; private LocalDateTime createAt; - public UserPojo() {} + public User() {} - public UserPojo(UserPojo value) { + public User(User value) { this.id = value.id; this.email = value.email; this.username = value.username; @@ -44,7 +44,7 @@ public class UserPojo implements Serializable { this.createAt = value.createAt; } - public UserPojo( + public User( Integer id, String email, String username, @@ -226,7 +226,7 @@ public class UserPojo implements Serializable { @Override public String toString() { - StringBuilder sb = new StringBuilder("UserPojo ("); + StringBuilder sb = new StringBuilder("User ("); sb.append(id); sb.append(", ").append(email); diff --git a/dao/generated-src/jooq/main/java/com/databasir/dao/tables/pojos/UserFavoriteProjectPojo.java b/dao/generated-src/jooq/main/java/com/databasir/dao/tables/pojos/UserFavoriteProject.java similarity index 91% rename from dao/generated-src/jooq/main/java/com/databasir/dao/tables/pojos/UserFavoriteProjectPojo.java rename to dao/generated-src/jooq/main/java/com/databasir/dao/tables/pojos/UserFavoriteProject.java index 84db740..735e37f 100644 --- a/dao/generated-src/jooq/main/java/com/databasir/dao/tables/pojos/UserFavoriteProjectPojo.java +++ b/dao/generated-src/jooq/main/java/com/databasir/dao/tables/pojos/UserFavoriteProject.java @@ -12,7 +12,7 @@ import java.time.LocalDateTime; * This class is generated by jOOQ. */ @SuppressWarnings({ "all", "unchecked", "rawtypes" }) -public class UserFavoriteProjectPojo implements Serializable { +public class UserFavoriteProject implements Serializable { private static final long serialVersionUID = 1L; @@ -21,16 +21,16 @@ public class UserFavoriteProjectPojo implements Serializable { private Integer projectId; private LocalDateTime createAt; - public UserFavoriteProjectPojo() {} + public UserFavoriteProject() {} - public UserFavoriteProjectPojo(UserFavoriteProjectPojo value) { + public UserFavoriteProject(UserFavoriteProject value) { this.id = value.id; this.userId = value.userId; this.projectId = value.projectId; this.createAt = value.createAt; } - public UserFavoriteProjectPojo( + public UserFavoriteProject( Integer id, Integer userId, Integer projectId, @@ -100,7 +100,7 @@ public class UserFavoriteProjectPojo implements Serializable { @Override public String toString() { - StringBuilder sb = new StringBuilder("UserFavoriteProjectPojo ("); + StringBuilder sb = new StringBuilder("UserFavoriteProject ("); sb.append(id); sb.append(", ").append(userId); diff --git a/dao/generated-src/jooq/main/java/com/databasir/dao/tables/pojos/UserRolePojo.java b/dao/generated-src/jooq/main/java/com/databasir/dao/tables/pojos/UserRole.java similarity index 92% rename from dao/generated-src/jooq/main/java/com/databasir/dao/tables/pojos/UserRolePojo.java rename to dao/generated-src/jooq/main/java/com/databasir/dao/tables/pojos/UserRole.java index 3bc0bd2..e98e809 100644 --- a/dao/generated-src/jooq/main/java/com/databasir/dao/tables/pojos/UserRolePojo.java +++ b/dao/generated-src/jooq/main/java/com/databasir/dao/tables/pojos/UserRole.java @@ -12,7 +12,7 @@ import java.time.LocalDateTime; * This class is generated by jOOQ. */ @SuppressWarnings({ "all", "unchecked", "rawtypes" }) -public class UserRolePojo implements Serializable { +public class UserRole implements Serializable { private static final long serialVersionUID = 1L; @@ -22,9 +22,9 @@ public class UserRolePojo implements Serializable { private Integer groupId; private LocalDateTime createAt; - public UserRolePojo() {} + public UserRole() {} - public UserRolePojo(UserRolePojo value) { + public UserRole(UserRole value) { this.id = value.id; this.userId = value.userId; this.role = value.role; @@ -32,7 +32,7 @@ public class UserRolePojo implements Serializable { this.createAt = value.createAt; } - public UserRolePojo( + public UserRole( Integer id, Integer userId, String role, @@ -120,7 +120,7 @@ public class UserRolePojo implements Serializable { @Override public String toString() { - StringBuilder sb = new StringBuilder("UserRolePojo ("); + StringBuilder sb = new StringBuilder("UserRole ("); sb.append(id); sb.append(", ").append(userId); diff --git a/dao/generated-src/jooq/main/java/com/databasir/dao/tables/records/DataSourcePropertyRecord.java b/dao/generated-src/jooq/main/java/com/databasir/dao/tables/records/DataSourcePropertyRecord.java index e29d0db..db0ef26 100644 --- a/dao/generated-src/jooq/main/java/com/databasir/dao/tables/records/DataSourcePropertyRecord.java +++ b/dao/generated-src/jooq/main/java/com/databasir/dao/tables/records/DataSourcePropertyRecord.java @@ -4,8 +4,8 @@ package com.databasir.dao.tables.records; -import com.databasir.dao.tables.DataSourceProperty; -import com.databasir.dao.tables.pojos.DataSourcePropertyPojo; +import com.databasir.dao.tables.DataSourcePropertyTable; +import com.databasir.dao.tables.pojos.DataSourceProperty; import java.time.LocalDateTime; @@ -119,27 +119,27 @@ public class DataSourcePropertyRecord extends UpdatableRecordImpl field1() { - return DataSourceProperty.DATA_SOURCE_PROPERTY.ID; + return DataSourcePropertyTable.DATA_SOURCE_PROPERTY.ID; } @Override public Field field2() { - return DataSourceProperty.DATA_SOURCE_PROPERTY.DATA_SOURCE_ID; + return DataSourcePropertyTable.DATA_SOURCE_PROPERTY.DATA_SOURCE_ID; } @Override public Field field3() { - return DataSourceProperty.DATA_SOURCE_PROPERTY.KEY; + return DataSourcePropertyTable.DATA_SOURCE_PROPERTY.KEY; } @Override public Field field4() { - return DataSourceProperty.DATA_SOURCE_PROPERTY.VALUE; + return DataSourcePropertyTable.DATA_SOURCE_PROPERTY.VALUE; } @Override public Field field5() { - return DataSourceProperty.DATA_SOURCE_PROPERTY.CREATE_AT; + return DataSourcePropertyTable.DATA_SOURCE_PROPERTY.CREATE_AT; } @Override @@ -240,14 +240,14 @@ public class DataSourcePropertyRecord extends UpdatableRecordImpl impl @Override public Field field1() { - return DataSource.DATA_SOURCE.ID; + return DataSourceTable.DATA_SOURCE.ID; } @Override public Field field2() { - return DataSource.DATA_SOURCE.PROJECT_ID; + return DataSourceTable.DATA_SOURCE.PROJECT_ID; } @Override public Field field3() { - return DataSource.DATA_SOURCE.DATABASE_NAME; + return DataSourceTable.DATA_SOURCE.DATABASE_NAME; } @Override public Field field4() { - return DataSource.DATA_SOURCE.SCHEMA_NAME; + return DataSourceTable.DATA_SOURCE.SCHEMA_NAME; } @Override public Field field5() { - return DataSource.DATA_SOURCE.DATABASE_TYPE; + return DataSourceTable.DATA_SOURCE.DATABASE_TYPE; } @Override public Field field6() { - return DataSource.DATA_SOURCE.URL; + return DataSourceTable.DATA_SOURCE.URL; } @Override public Field field7() { - return DataSource.DATA_SOURCE.USERNAME; + return DataSourceTable.DATA_SOURCE.USERNAME; } @Override public Field field8() { - return DataSource.DATA_SOURCE.PASSWORD; + return DataSourceTable.DATA_SOURCE.PASSWORD; } @Override public Field field9() { - return DataSource.DATA_SOURCE.UPDATE_AT; + return DataSourceTable.DATA_SOURCE.UPDATE_AT; } @Override public Field field10() { - return DataSource.DATA_SOURCE.CREATE_AT; + return DataSourceTable.DATA_SOURCE.CREATE_AT; } @Override @@ -420,14 +420,14 @@ public class DataSourceRecord extends UpdatableRecordImpl impl * Create a detached DataSourceRecord */ public DataSourceRecord() { - super(DataSource.DATA_SOURCE); + super(DataSourceTable.DATA_SOURCE); } /** * Create a detached, initialised DataSourceRecord */ public DataSourceRecord(Integer id, Integer projectId, String databaseName, String schemaName, String databaseType, String url, String username, String password, LocalDateTime updateAt, LocalDateTime createAt) { - super(DataSource.DATA_SOURCE); + super(DataSourceTable.DATA_SOURCE); setId(id); setProjectId(projectId); @@ -444,8 +444,8 @@ public class DataSourceRecord extends UpdatableRecordImpl impl /** * Create a detached, initialised DataSourceRecord */ - public DataSourceRecord(DataSourcePojo value) { - super(DataSource.DATA_SOURCE); + public DataSourceRecord(DataSource value) { + super(DataSourceTable.DATA_SOURCE); if (value != null) { setId(value.getId()); diff --git a/dao/generated-src/jooq/main/java/com/databasir/dao/tables/records/DatabaseDocumentRecord.java b/dao/generated-src/jooq/main/java/com/databasir/dao/tables/records/DatabaseDocumentRecord.java index 6ee9784..2275019 100644 --- a/dao/generated-src/jooq/main/java/com/databasir/dao/tables/records/DatabaseDocumentRecord.java +++ b/dao/generated-src/jooq/main/java/com/databasir/dao/tables/records/DatabaseDocumentRecord.java @@ -4,8 +4,8 @@ package com.databasir.dao.tables.records; -import com.databasir.dao.tables.DatabaseDocument; -import com.databasir.dao.tables.pojos.DatabaseDocumentPojo; +import com.databasir.dao.tables.DatabaseDocumentTable; +import com.databasir.dao.tables.pojos.DatabaseDocument; import java.time.LocalDateTime; @@ -189,52 +189,52 @@ public class DatabaseDocumentRecord extends UpdatableRecordImpl field1() { - return DatabaseDocument.DATABASE_DOCUMENT.ID; + return DatabaseDocumentTable.DATABASE_DOCUMENT.ID; } @Override public Field field2() { - return DatabaseDocument.DATABASE_DOCUMENT.PROJECT_ID; + return DatabaseDocumentTable.DATABASE_DOCUMENT.PROJECT_ID; } @Override public Field field3() { - return DatabaseDocument.DATABASE_DOCUMENT.DATABASE_NAME; + return DatabaseDocumentTable.DATABASE_DOCUMENT.DATABASE_NAME; } @Override public Field field4() { - return DatabaseDocument.DATABASE_DOCUMENT.SCHEMA_NAME; + return DatabaseDocumentTable.DATABASE_DOCUMENT.SCHEMA_NAME; } @Override public Field field5() { - return DatabaseDocument.DATABASE_DOCUMENT.PRODUCT_NAME; + return DatabaseDocumentTable.DATABASE_DOCUMENT.PRODUCT_NAME; } @Override public Field field6() { - return DatabaseDocument.DATABASE_DOCUMENT.PRODUCT_VERSION; + return DatabaseDocumentTable.DATABASE_DOCUMENT.PRODUCT_VERSION; } @Override public Field field7() { - return DatabaseDocument.DATABASE_DOCUMENT.VERSION; + return DatabaseDocumentTable.DATABASE_DOCUMENT.VERSION; } @Override public Field field8() { - return DatabaseDocument.DATABASE_DOCUMENT.IS_ARCHIVE; + return DatabaseDocumentTable.DATABASE_DOCUMENT.IS_ARCHIVE; } @Override public Field field9() { - return DatabaseDocument.DATABASE_DOCUMENT.UPDATE_AT; + return DatabaseDocumentTable.DATABASE_DOCUMENT.UPDATE_AT; } @Override public Field field10() { - return DatabaseDocument.DATABASE_DOCUMENT.CREATE_AT; + return DatabaseDocumentTable.DATABASE_DOCUMENT.CREATE_AT; } @Override @@ -420,14 +420,14 @@ public class DatabaseDocumentRecord extends UpdatableRecordImpl @Override public Field field1() { - return DatabaseType.DATABASE_TYPE.ID; + return DatabaseTypeTable.DATABASE_TYPE.ID; } @Override public Field field2() { - return DatabaseType.DATABASE_TYPE.DATABASE_TYPE_; + return DatabaseTypeTable.DATABASE_TYPE.DATABASE_TYPE_; } @Override public Field field3() { - return DatabaseType.DATABASE_TYPE.ICON; + return DatabaseTypeTable.DATABASE_TYPE.ICON; } @Override public Field field4() { - return DatabaseType.DATABASE_TYPE.DESCRIPTION; + return DatabaseTypeTable.DATABASE_TYPE.DESCRIPTION; } @Override public Field field5() { - return DatabaseType.DATABASE_TYPE.JDBC_DRIVER_FILE_URL; + return DatabaseTypeTable.DATABASE_TYPE.JDBC_DRIVER_FILE_URL; } @Override public Field field6() { - return DatabaseType.DATABASE_TYPE.JDBC_DRIVER_FILE_PATH; + return DatabaseTypeTable.DATABASE_TYPE.JDBC_DRIVER_FILE_PATH; } @Override public Field field7() { - return DatabaseType.DATABASE_TYPE.JDBC_DRIVER_CLASS_NAME; + return DatabaseTypeTable.DATABASE_TYPE.JDBC_DRIVER_CLASS_NAME; } @Override public Field field8() { - return DatabaseType.DATABASE_TYPE.JDBC_PROTOCOL; + return DatabaseTypeTable.DATABASE_TYPE.JDBC_PROTOCOL; } @Override public Field field9() { - return DatabaseType.DATABASE_TYPE.URL_PATTERN; + return DatabaseTypeTable.DATABASE_TYPE.URL_PATTERN; } @Override public Field field10() { - return DatabaseType.DATABASE_TYPE.DELETED; + return DatabaseTypeTable.DATABASE_TYPE.DELETED; } @Override public Field field11() { - return DatabaseType.DATABASE_TYPE.DELETED_TOKEN; + return DatabaseTypeTable.DATABASE_TYPE.DELETED_TOKEN; } @Override public Field field12() { - return DatabaseType.DATABASE_TYPE.UPDATE_AT; + return DatabaseTypeTable.DATABASE_TYPE.UPDATE_AT; } @Override public Field field13() { - return DatabaseType.DATABASE_TYPE.CREATE_AT; + return DatabaseTypeTable.DATABASE_TYPE.CREATE_AT; } @Override @@ -530,14 +530,14 @@ public class DatabaseTypeRecord extends UpdatableRecordImpl * Create a detached DatabaseTypeRecord */ public DatabaseTypeRecord() { - super(DatabaseType.DATABASE_TYPE); + super(DatabaseTypeTable.DATABASE_TYPE); } /** * Create a detached, initialised DatabaseTypeRecord */ public DatabaseTypeRecord(Integer id, String databaseType, String icon, String description, String jdbcDriverFileUrl, String jdbcDriverFilePath, String jdbcDriverClassName, String jdbcProtocol, String urlPattern, Boolean deleted, Integer deletedToken, LocalDateTime updateAt, LocalDateTime createAt) { - super(DatabaseType.DATABASE_TYPE); + super(DatabaseTypeTable.DATABASE_TYPE); setId(id); setDatabaseType(databaseType); @@ -557,8 +557,8 @@ public class DatabaseTypeRecord extends UpdatableRecordImpl /** * Create a detached, initialised DatabaseTypeRecord */ - public DatabaseTypeRecord(DatabaseTypePojo value) { - super(DatabaseType.DATABASE_TYPE); + public DatabaseTypeRecord(DatabaseType value) { + super(DatabaseTypeTable.DATABASE_TYPE); if (value != null) { setId(value.getId()); diff --git a/dao/generated-src/jooq/main/java/com/databasir/dao/tables/records/DocumentDescriptionRecord.java b/dao/generated-src/jooq/main/java/com/databasir/dao/tables/records/DocumentDescriptionRecord.java index b98c636..c332c32 100644 --- a/dao/generated-src/jooq/main/java/com/databasir/dao/tables/records/DocumentDescriptionRecord.java +++ b/dao/generated-src/jooq/main/java/com/databasir/dao/tables/records/DocumentDescriptionRecord.java @@ -4,8 +4,8 @@ package com.databasir.dao.tables.records; -import com.databasir.dao.tables.DocumentDescription; -import com.databasir.dao.tables.pojos.DocumentDescriptionPojo; +import com.databasir.dao.tables.DocumentDescriptionTable; +import com.databasir.dao.tables.pojos.DocumentDescription; import java.time.LocalDateTime; @@ -161,42 +161,42 @@ public class DocumentDescriptionRecord extends UpdatableRecordImpl field1() { - return DocumentDescription.DOCUMENT_DESCRIPTION.ID; + return DocumentDescriptionTable.DOCUMENT_DESCRIPTION.ID; } @Override public Field field2() { - return DocumentDescription.DOCUMENT_DESCRIPTION.CONTENT; + return DocumentDescriptionTable.DOCUMENT_DESCRIPTION.CONTENT; } @Override public Field field3() { - return DocumentDescription.DOCUMENT_DESCRIPTION.PROJECT_ID; + return DocumentDescriptionTable.DOCUMENT_DESCRIPTION.PROJECT_ID; } @Override public Field field4() { - return DocumentDescription.DOCUMENT_DESCRIPTION.TABLE_NAME; + return DocumentDescriptionTable.DOCUMENT_DESCRIPTION.TABLE_NAME; } @Override public Field field5() { - return DocumentDescription.DOCUMENT_DESCRIPTION.COLUMN_NAME; + return DocumentDescriptionTable.DOCUMENT_DESCRIPTION.COLUMN_NAME; } @Override public Field field6() { - return DocumentDescription.DOCUMENT_DESCRIPTION.UPDATE_BY; + return DocumentDescriptionTable.DOCUMENT_DESCRIPTION.UPDATE_BY; } @Override public Field field7() { - return DocumentDescription.DOCUMENT_DESCRIPTION.UPDATE_AT; + return DocumentDescriptionTable.DOCUMENT_DESCRIPTION.UPDATE_AT; } @Override public Field field8() { - return DocumentDescription.DOCUMENT_DESCRIPTION.CREATE_AT; + return DocumentDescriptionTable.DOCUMENT_DESCRIPTION.CREATE_AT; } @Override @@ -348,14 +348,14 @@ public class DocumentDescriptionRecord extends UpdatableRecordImpl field1() { - return DocumentDiscussion.DOCUMENT_DISCUSSION.ID; + return DocumentDiscussionTable.DOCUMENT_DISCUSSION.ID; } @Override public Field field2() { - return DocumentDiscussion.DOCUMENT_DISCUSSION.CONTENT; + return DocumentDiscussionTable.DOCUMENT_DISCUSSION.CONTENT; } @Override public Field field3() { - return DocumentDiscussion.DOCUMENT_DISCUSSION.USER_ID; + return DocumentDiscussionTable.DOCUMENT_DISCUSSION.USER_ID; } @Override public Field field4() { - return DocumentDiscussion.DOCUMENT_DISCUSSION.PROJECT_ID; + return DocumentDiscussionTable.DOCUMENT_DISCUSSION.PROJECT_ID; } @Override public Field field5() { - return DocumentDiscussion.DOCUMENT_DISCUSSION.TABLE_NAME; + return DocumentDiscussionTable.DOCUMENT_DISCUSSION.TABLE_NAME; } @Override public Field field6() { - return DocumentDiscussion.DOCUMENT_DISCUSSION.COLUMN_NAME; + return DocumentDiscussionTable.DOCUMENT_DISCUSSION.COLUMN_NAME; } @Override public Field field7() { - return DocumentDiscussion.DOCUMENT_DISCUSSION.CREATE_AT; + return DocumentDiscussionTable.DOCUMENT_DISCUSSION.CREATE_AT; } @Override @@ -312,14 +312,14 @@ public class DocumentDiscussionRecord extends UpdatableRecordImpl field1() { - return DocumentTemplateProperty.DOCUMENT_TEMPLATE_PROPERTY.ID; + return DocumentTemplatePropertyTable.DOCUMENT_TEMPLATE_PROPERTY.ID; } @Override public Field field2() { - return DocumentTemplateProperty.DOCUMENT_TEMPLATE_PROPERTY.KEY; + return DocumentTemplatePropertyTable.DOCUMENT_TEMPLATE_PROPERTY.KEY; } @Override public Field field3() { - return DocumentTemplateProperty.DOCUMENT_TEMPLATE_PROPERTY.VALUE; + return DocumentTemplatePropertyTable.DOCUMENT_TEMPLATE_PROPERTY.VALUE; } @Override public Field field4() { - return DocumentTemplateProperty.DOCUMENT_TEMPLATE_PROPERTY.DEFAULT_VALUE; + return DocumentTemplatePropertyTable.DOCUMENT_TEMPLATE_PROPERTY.DEFAULT_VALUE; } @Override public Field field5() { - return DocumentTemplateProperty.DOCUMENT_TEMPLATE_PROPERTY.TYPE; + return DocumentTemplatePropertyTable.DOCUMENT_TEMPLATE_PROPERTY.TYPE; } @Override public Field field6() { - return DocumentTemplateProperty.DOCUMENT_TEMPLATE_PROPERTY.CREATE_AT; + return DocumentTemplatePropertyTable.DOCUMENT_TEMPLATE_PROPERTY.CREATE_AT; } @Override @@ -279,14 +279,14 @@ public class DocumentTemplatePropertyRecord extends UpdatableRecordImpl implements Rec @Override public Field field1() { - return Group.GROUP.ID; + return GroupTable.GROUP.ID; } @Override public Field field2() { - return Group.GROUP.NAME; + return GroupTable.GROUP.NAME; } @Override public Field field3() { - return Group.GROUP.DESCRIPTION; + return GroupTable.GROUP.DESCRIPTION; } @Override public Field field4() { - return Group.GROUP.DELETED; + return GroupTable.GROUP.DELETED; } @Override public Field field5() { - return Group.GROUP.UPDATE_AT; + return GroupTable.GROUP.UPDATE_AT; } @Override public Field field6() { - return Group.GROUP.CREATE_AT; + return GroupTable.GROUP.CREATE_AT; } @Override @@ -276,14 +276,14 @@ public class GroupRecord extends UpdatableRecordImpl implements Rec * Create a detached GroupRecord */ public GroupRecord() { - super(Group.GROUP); + super(GroupTable.GROUP); } /** * Create a detached, initialised GroupRecord */ public GroupRecord(Integer id, String name, String description, Boolean deleted, LocalDateTime updateAt, LocalDateTime createAt) { - super(Group.GROUP); + super(GroupTable.GROUP); setId(id); setName(name); @@ -296,8 +296,8 @@ public class GroupRecord extends UpdatableRecordImpl implements Rec /** * Create a detached, initialised GroupRecord */ - public GroupRecord(GroupPojo value) { - super(Group.GROUP); + public GroupRecord(Group value) { + super(GroupTable.GROUP); if (value != null) { setId(value.getId()); diff --git a/dao/generated-src/jooq/main/java/com/databasir/dao/tables/records/LoginRecord.java b/dao/generated-src/jooq/main/java/com/databasir/dao/tables/records/LoginRecord.java index ad85515..482659f 100644 --- a/dao/generated-src/jooq/main/java/com/databasir/dao/tables/records/LoginRecord.java +++ b/dao/generated-src/jooq/main/java/com/databasir/dao/tables/records/LoginRecord.java @@ -4,8 +4,8 @@ package com.databasir.dao.tables.records; -import com.databasir.dao.tables.Login; -import com.databasir.dao.tables.pojos.LoginPojo; +import com.databasir.dao.tables.LoginTable; +import com.databasir.dao.tables.pojos.Login; import java.time.LocalDateTime; @@ -161,42 +161,42 @@ public class LoginRecord extends UpdatableRecordImpl implements Rec @Override public Field field1() { - return Login.LOGIN.ID; + return LoginTable.LOGIN.ID; } @Override public Field field2() { - return Login.LOGIN.USER_ID; + return LoginTable.LOGIN.USER_ID; } @Override public Field field3() { - return Login.LOGIN.ACCESS_TOKEN; + return LoginTable.LOGIN.ACCESS_TOKEN; } @Override public Field field4() { - return Login.LOGIN.REFRESH_TOKEN; + return LoginTable.LOGIN.REFRESH_TOKEN; } @Override public Field field5() { - return Login.LOGIN.ACCESS_TOKEN_EXPIRE_AT; + return LoginTable.LOGIN.ACCESS_TOKEN_EXPIRE_AT; } @Override public Field field6() { - return Login.LOGIN.REFRESH_TOKEN_EXPIRE_AT; + return LoginTable.LOGIN.REFRESH_TOKEN_EXPIRE_AT; } @Override public Field field7() { - return Login.LOGIN.UPDATE_AT; + return LoginTable.LOGIN.UPDATE_AT; } @Override public Field field8() { - return Login.LOGIN.CREATE_AT; + return LoginTable.LOGIN.CREATE_AT; } @Override @@ -348,14 +348,14 @@ public class LoginRecord extends UpdatableRecordImpl implements Rec * Create a detached LoginRecord */ public LoginRecord() { - super(Login.LOGIN); + super(LoginTable.LOGIN); } /** * Create a detached, initialised LoginRecord */ public LoginRecord(Integer id, Integer userId, String accessToken, String refreshToken, LocalDateTime accessTokenExpireAt, LocalDateTime refreshTokenExpireAt, LocalDateTime updateAt, LocalDateTime createAt) { - super(Login.LOGIN); + super(LoginTable.LOGIN); setId(id); setUserId(userId); @@ -370,8 +370,8 @@ public class LoginRecord extends UpdatableRecordImpl implements Rec /** * Create a detached, initialised LoginRecord */ - public LoginRecord(LoginPojo value) { - super(Login.LOGIN); + public LoginRecord(Login value) { + super(LoginTable.LOGIN); if (value != null) { setId(value.getId()); diff --git a/dao/generated-src/jooq/main/java/com/databasir/dao/tables/records/MockDataRuleRecord.java b/dao/generated-src/jooq/main/java/com/databasir/dao/tables/records/MockDataRuleRecord.java index 498ba9b..c8902f0 100644 --- a/dao/generated-src/jooq/main/java/com/databasir/dao/tables/records/MockDataRuleRecord.java +++ b/dao/generated-src/jooq/main/java/com/databasir/dao/tables/records/MockDataRuleRecord.java @@ -5,8 +5,8 @@ package com.databasir.dao.tables.records; import com.databasir.dao.enums.MockDataType; -import com.databasir.dao.tables.MockDataRule; -import com.databasir.dao.tables.pojos.MockDataRulePojo; +import com.databasir.dao.tables.MockDataRuleTable; +import com.databasir.dao.tables.pojos.MockDataRule; import java.time.LocalDateTime; @@ -190,52 +190,52 @@ public class MockDataRuleRecord extends UpdatableRecordImpl @Override public Field field1() { - return MockDataRule.MOCK_DATA_RULE.ID; + return MockDataRuleTable.MOCK_DATA_RULE.ID; } @Override public Field field2() { - return MockDataRule.MOCK_DATA_RULE.PROJECT_ID; + return MockDataRuleTable.MOCK_DATA_RULE.PROJECT_ID; } @Override public Field field3() { - return MockDataRule.MOCK_DATA_RULE.TABLE_NAME; + return MockDataRuleTable.MOCK_DATA_RULE.TABLE_NAME; } @Override public Field field4() { - return MockDataRule.MOCK_DATA_RULE.COLUMN_NAME; + return MockDataRuleTable.MOCK_DATA_RULE.COLUMN_NAME; } @Override public Field field5() { - return MockDataRule.MOCK_DATA_RULE.DEPENDENT_TABLE_NAME; + return MockDataRuleTable.MOCK_DATA_RULE.DEPENDENT_TABLE_NAME; } @Override public Field field6() { - return MockDataRule.MOCK_DATA_RULE.DEPENDENT_COLUMN_NAME; + return MockDataRuleTable.MOCK_DATA_RULE.DEPENDENT_COLUMN_NAME; } @Override public Field field7() { - return MockDataRule.MOCK_DATA_RULE.MOCK_DATA_TYPE; + return MockDataRuleTable.MOCK_DATA_RULE.MOCK_DATA_TYPE; } @Override public Field field8() { - return MockDataRule.MOCK_DATA_RULE.MOCK_DATA_SCRIPT; + return MockDataRuleTable.MOCK_DATA_RULE.MOCK_DATA_SCRIPT; } @Override public Field field9() { - return MockDataRule.MOCK_DATA_RULE.UPDATE_AT; + return MockDataRuleTable.MOCK_DATA_RULE.UPDATE_AT; } @Override public Field field10() { - return MockDataRule.MOCK_DATA_RULE.CREATE_AT; + return MockDataRuleTable.MOCK_DATA_RULE.CREATE_AT; } @Override @@ -421,14 +421,14 @@ public class MockDataRuleRecord extends UpdatableRecordImpl * Create a detached MockDataRuleRecord */ public MockDataRuleRecord() { - super(MockDataRule.MOCK_DATA_RULE); + super(MockDataRuleTable.MOCK_DATA_RULE); } /** * Create a detached, initialised MockDataRuleRecord */ public MockDataRuleRecord(Integer id, Integer projectId, String tableName, String columnName, String dependentTableName, String dependentColumnName, MockDataType mockDataType, String mockDataScript, LocalDateTime updateAt, LocalDateTime createAt) { - super(MockDataRule.MOCK_DATA_RULE); + super(MockDataRuleTable.MOCK_DATA_RULE); setId(id); setProjectId(projectId); @@ -445,8 +445,8 @@ public class MockDataRuleRecord extends UpdatableRecordImpl /** * Create a detached, initialised MockDataRuleRecord */ - public MockDataRuleRecord(MockDataRulePojo value) { - super(MockDataRule.MOCK_DATA_RULE); + public MockDataRuleRecord(MockDataRule value) { + super(MockDataRuleTable.MOCK_DATA_RULE); if (value != null) { setId(value.getId()); diff --git a/dao/generated-src/jooq/main/java/com/databasir/dao/tables/records/OauthAppRecord.java b/dao/generated-src/jooq/main/java/com/databasir/dao/tables/records/OauthAppRecord.java index 54d3315..3458241 100644 --- a/dao/generated-src/jooq/main/java/com/databasir/dao/tables/records/OauthAppRecord.java +++ b/dao/generated-src/jooq/main/java/com/databasir/dao/tables/records/OauthAppRecord.java @@ -5,8 +5,8 @@ package com.databasir.dao.tables.records; import com.databasir.dao.enums.OAuthAppType; -import com.databasir.dao.tables.OauthApp; -import com.databasir.dao.tables.pojos.OauthAppPojo; +import com.databasir.dao.tables.OauthAppTable; +import com.databasir.dao.tables.pojos.OauthApp; import java.time.LocalDateTime; @@ -218,62 +218,62 @@ public class OauthAppRecord extends UpdatableRecordImpl implemen @Override public Field field1() { - return OauthApp.OAUTH_APP.ID; + return OauthAppTable.OAUTH_APP.ID; } @Override public Field field2() { - return OauthApp.OAUTH_APP.REGISTRATION_ID; + return OauthAppTable.OAUTH_APP.REGISTRATION_ID; } @Override public Field field3() { - return OauthApp.OAUTH_APP.APP_NAME; + return OauthAppTable.OAUTH_APP.APP_NAME; } @Override public Field field4() { - return OauthApp.OAUTH_APP.APP_ICON; + return OauthAppTable.OAUTH_APP.APP_ICON; } @Override public Field field5() { - return OauthApp.OAUTH_APP.APP_TYPE; + return OauthAppTable.OAUTH_APP.APP_TYPE; } @Override public Field field6() { - return OauthApp.OAUTH_APP.CLIENT_ID; + return OauthAppTable.OAUTH_APP.CLIENT_ID; } @Override public Field field7() { - return OauthApp.OAUTH_APP.CLIENT_SECRET; + return OauthAppTable.OAUTH_APP.CLIENT_SECRET; } @Override public Field field8() { - return OauthApp.OAUTH_APP.AUTH_URL; + return OauthAppTable.OAUTH_APP.AUTH_URL; } @Override public Field field9() { - return OauthApp.OAUTH_APP.RESOURCE_URL; + return OauthAppTable.OAUTH_APP.RESOURCE_URL; } @Override public Field field10() { - return OauthApp.OAUTH_APP.SCOPE; + return OauthAppTable.OAUTH_APP.SCOPE; } @Override public Field field11() { - return OauthApp.OAUTH_APP.UPDATE_AT; + return OauthAppTable.OAUTH_APP.UPDATE_AT; } @Override public Field field12() { - return OauthApp.OAUTH_APP.CREATE_AT; + return OauthAppTable.OAUTH_APP.CREATE_AT; } @Override @@ -493,14 +493,14 @@ public class OauthAppRecord extends UpdatableRecordImpl implemen * Create a detached OauthAppRecord */ public OauthAppRecord() { - super(OauthApp.OAUTH_APP); + super(OauthAppTable.OAUTH_APP); } /** * Create a detached, initialised OauthAppRecord */ public OauthAppRecord(Integer id, String registrationId, String appName, String appIcon, OAuthAppType appType, String clientId, String clientSecret, String authUrl, String resourceUrl, String scope, LocalDateTime updateAt, LocalDateTime createAt) { - super(OauthApp.OAUTH_APP); + super(OauthAppTable.OAUTH_APP); setId(id); setRegistrationId(registrationId); @@ -519,8 +519,8 @@ public class OauthAppRecord extends UpdatableRecordImpl implemen /** * Create a detached, initialised OauthAppRecord */ - public OauthAppRecord(OauthAppPojo value) { - super(OauthApp.OAUTH_APP); + public OauthAppRecord(OauthApp value) { + super(OauthAppTable.OAUTH_APP); if (value != null) { setId(value.getId()); diff --git a/dao/generated-src/jooq/main/java/com/databasir/dao/tables/records/OperationLogRecord.java b/dao/generated-src/jooq/main/java/com/databasir/dao/tables/records/OperationLogRecord.java index b5f6094..7276b3d 100644 --- a/dao/generated-src/jooq/main/java/com/databasir/dao/tables/records/OperationLogRecord.java +++ b/dao/generated-src/jooq/main/java/com/databasir/dao/tables/records/OperationLogRecord.java @@ -4,8 +4,8 @@ package com.databasir.dao.tables.records; -import com.databasir.dao.tables.OperationLog; -import com.databasir.dao.tables.pojos.OperationLogPojo; +import com.databasir.dao.tables.OperationLogTable; +import com.databasir.dao.tables.pojos.OperationLog; import java.time.LocalDateTime; @@ -244,67 +244,67 @@ public class OperationLogRecord extends UpdatableRecordImpl @Override public Field field1() { - return OperationLog.OPERATION_LOG.ID; + return OperationLogTable.OPERATION_LOG.ID; } @Override public Field field2() { - return OperationLog.OPERATION_LOG.OPERATOR_USER_ID; + return OperationLogTable.OPERATION_LOG.OPERATOR_USER_ID; } @Override public Field field3() { - return OperationLog.OPERATION_LOG.OPERATOR_USERNAME; + return OperationLogTable.OPERATION_LOG.OPERATOR_USERNAME; } @Override public Field field4() { - return OperationLog.OPERATION_LOG.OPERATOR_NICKNAME; + return OperationLogTable.OPERATION_LOG.OPERATOR_NICKNAME; } @Override public Field field5() { - return OperationLog.OPERATION_LOG.OPERATION_MODULE; + return OperationLogTable.OPERATION_LOG.OPERATION_MODULE; } @Override public Field field6() { - return OperationLog.OPERATION_LOG.OPERATION_CODE; + return OperationLogTable.OPERATION_LOG.OPERATION_CODE; } @Override public Field field7() { - return OperationLog.OPERATION_LOG.OPERATION_NAME; + return OperationLogTable.OPERATION_LOG.OPERATION_NAME; } @Override public Field field8() { - return OperationLog.OPERATION_LOG.OPERATION_RESPONSE; + return OperationLogTable.OPERATION_LOG.OPERATION_RESPONSE; } @Override public Field field9() { - return OperationLog.OPERATION_LOG.IS_SUCCESS; + return OperationLogTable.OPERATION_LOG.IS_SUCCESS; } @Override public Field field10() { - return OperationLog.OPERATION_LOG.INVOLVED_PROJECT_ID; + return OperationLogTable.OPERATION_LOG.INVOLVED_PROJECT_ID; } @Override public Field field11() { - return OperationLog.OPERATION_LOG.INVOLVED_GROUP_ID; + return OperationLogTable.OPERATION_LOG.INVOLVED_GROUP_ID; } @Override public Field field12() { - return OperationLog.OPERATION_LOG.INVOLVED_USER_ID; + return OperationLogTable.OPERATION_LOG.INVOLVED_USER_ID; } @Override public Field field13() { - return OperationLog.OPERATION_LOG.CREATE_AT; + return OperationLogTable.OPERATION_LOG.CREATE_AT; } @Override @@ -541,14 +541,14 @@ public class OperationLogRecord extends UpdatableRecordImpl * Create a detached OperationLogRecord */ public OperationLogRecord() { - super(OperationLog.OPERATION_LOG); + super(OperationLogTable.OPERATION_LOG); } /** * Create a detached, initialised OperationLogRecord */ public OperationLogRecord(Long id, Integer operatorUserId, String operatorUsername, String operatorNickname, String operationModule, String operationCode, String operationName, JSON operationResponse, Boolean isSuccess, Integer involvedProjectId, Integer involvedGroupId, Integer involvedUserId, LocalDateTime createAt) { - super(OperationLog.OPERATION_LOG); + super(OperationLogTable.OPERATION_LOG); setId(id); setOperatorUserId(operatorUserId); @@ -568,8 +568,8 @@ public class OperationLogRecord extends UpdatableRecordImpl /** * Create a detached, initialised OperationLogRecord */ - public OperationLogRecord(OperationLogPojo value) { - super(OperationLog.OPERATION_LOG); + public OperationLogRecord(OperationLog value) { + super(OperationLogTable.OPERATION_LOG); if (value != null) { setId(value.getId()); diff --git a/dao/generated-src/jooq/main/java/com/databasir/dao/tables/records/ProjectRecord.java b/dao/generated-src/jooq/main/java/com/databasir/dao/tables/records/ProjectRecord.java index 1175985..f293ff9 100644 --- a/dao/generated-src/jooq/main/java/com/databasir/dao/tables/records/ProjectRecord.java +++ b/dao/generated-src/jooq/main/java/com/databasir/dao/tables/records/ProjectRecord.java @@ -4,8 +4,8 @@ package com.databasir.dao.tables.records; -import com.databasir.dao.tables.Project; -import com.databasir.dao.tables.pojos.ProjectPojo; +import com.databasir.dao.tables.ProjectTable; +import com.databasir.dao.tables.pojos.Project; import java.time.LocalDateTime; @@ -149,37 +149,37 @@ public class ProjectRecord extends UpdatableRecordImpl implements @Override public Field field1() { - return Project.PROJECT.ID; + return ProjectTable.PROJECT.ID; } @Override public Field field2() { - return Project.PROJECT.NAME; + return ProjectTable.PROJECT.NAME; } @Override public Field field3() { - return Project.PROJECT.DESCRIPTION; + return ProjectTable.PROJECT.DESCRIPTION; } @Override public Field field4() { - return Project.PROJECT.GROUP_ID; + return ProjectTable.PROJECT.GROUP_ID; } @Override public Field field5() { - return Project.PROJECT.DELETED; + return ProjectTable.PROJECT.DELETED; } @Override public Field field6() { - return Project.PROJECT.DELETED_TOKEN; + return ProjectTable.PROJECT.DELETED_TOKEN; } @Override public Field field7() { - return Project.PROJECT.CREATE_AT; + return ProjectTable.PROJECT.CREATE_AT; } @Override @@ -314,14 +314,14 @@ public class ProjectRecord extends UpdatableRecordImpl implements * Create a detached ProjectRecord */ public ProjectRecord() { - super(Project.PROJECT); + super(ProjectTable.PROJECT); } /** * Create a detached, initialised ProjectRecord */ public ProjectRecord(Integer id, String name, String description, Integer groupId, Boolean deleted, Integer deletedToken, LocalDateTime createAt) { - super(Project.PROJECT); + super(ProjectTable.PROJECT); setId(id); setName(name); @@ -335,8 +335,8 @@ public class ProjectRecord extends UpdatableRecordImpl implements /** * Create a detached, initialised ProjectRecord */ - public ProjectRecord(ProjectPojo value) { - super(Project.PROJECT); + public ProjectRecord(Project value) { + super(ProjectTable.PROJECT); if (value != null) { setId(value.getId()); diff --git a/dao/generated-src/jooq/main/java/com/databasir/dao/tables/records/ProjectSyncRuleRecord.java b/dao/generated-src/jooq/main/java/com/databasir/dao/tables/records/ProjectSyncRuleRecord.java index f5d93fd..fff0ca4 100644 --- a/dao/generated-src/jooq/main/java/com/databasir/dao/tables/records/ProjectSyncRuleRecord.java +++ b/dao/generated-src/jooq/main/java/com/databasir/dao/tables/records/ProjectSyncRuleRecord.java @@ -4,8 +4,8 @@ package com.databasir.dao.tables.records; -import com.databasir.dao.tables.ProjectSyncRule; -import com.databasir.dao.tables.pojos.ProjectSyncRulePojo; +import com.databasir.dao.tables.ProjectSyncRuleTable; +import com.databasir.dao.tables.pojos.ProjectSyncRule; import java.time.LocalDateTime; @@ -166,42 +166,42 @@ public class ProjectSyncRuleRecord extends UpdatableRecordImpl field1() { - return ProjectSyncRule.PROJECT_SYNC_RULE.ID; + return ProjectSyncRuleTable.PROJECT_SYNC_RULE.ID; } @Override public Field field2() { - return ProjectSyncRule.PROJECT_SYNC_RULE.PROJECT_ID; + return ProjectSyncRuleTable.PROJECT_SYNC_RULE.PROJECT_ID; } @Override public Field field3() { - return ProjectSyncRule.PROJECT_SYNC_RULE.IGNORE_TABLE_NAME_REGEX_ARRAY; + return ProjectSyncRuleTable.PROJECT_SYNC_RULE.IGNORE_TABLE_NAME_REGEX_ARRAY; } @Override public Field field4() { - return ProjectSyncRule.PROJECT_SYNC_RULE.IGNORE_COLUMN_NAME_REGEX_ARRAY; + return ProjectSyncRuleTable.PROJECT_SYNC_RULE.IGNORE_COLUMN_NAME_REGEX_ARRAY; } @Override public Field field5() { - return ProjectSyncRule.PROJECT_SYNC_RULE.IS_AUTO_SYNC; + return ProjectSyncRuleTable.PROJECT_SYNC_RULE.IS_AUTO_SYNC; } @Override public Field field6() { - return ProjectSyncRule.PROJECT_SYNC_RULE.AUTO_SYNC_CRON; + return ProjectSyncRuleTable.PROJECT_SYNC_RULE.AUTO_SYNC_CRON; } @Override public Field field7() { - return ProjectSyncRule.PROJECT_SYNC_RULE.UPDATE_AT; + return ProjectSyncRuleTable.PROJECT_SYNC_RULE.UPDATE_AT; } @Override public Field field8() { - return ProjectSyncRule.PROJECT_SYNC_RULE.CREATE_AT; + return ProjectSyncRuleTable.PROJECT_SYNC_RULE.CREATE_AT; } @Override @@ -353,14 +353,14 @@ public class ProjectSyncRuleRecord extends UpdatableRecordImpl field1() { - return ProjectSyncTask.PROJECT_SYNC_TASK.ID; + return ProjectSyncTaskTable.PROJECT_SYNC_TASK.ID; } @Override public Field field2() { - return ProjectSyncTask.PROJECT_SYNC_TASK.PROJECT_ID; + return ProjectSyncTaskTable.PROJECT_SYNC_TASK.PROJECT_ID; } @Override public Field field3() { - return ProjectSyncTask.PROJECT_SYNC_TASK.USER_ID; + return ProjectSyncTaskTable.PROJECT_SYNC_TASK.USER_ID; } @Override public Field field4() { - return ProjectSyncTask.PROJECT_SYNC_TASK.STATUS; + return ProjectSyncTaskTable.PROJECT_SYNC_TASK.STATUS; } @Override public Field field5() { - return ProjectSyncTask.PROJECT_SYNC_TASK.RESULT; + return ProjectSyncTaskTable.PROJECT_SYNC_TASK.RESULT; } @Override public Field field6() { - return ProjectSyncTask.PROJECT_SYNC_TASK.RUN_AT; + return ProjectSyncTaskTable.PROJECT_SYNC_TASK.RUN_AT; } @Override public Field field7() { - return ProjectSyncTask.PROJECT_SYNC_TASK.UPDATE_AT; + return ProjectSyncTaskTable.PROJECT_SYNC_TASK.UPDATE_AT; } @Override public Field field8() { - return ProjectSyncTask.PROJECT_SYNC_TASK.CREATE_AT; + return ProjectSyncTaskTable.PROJECT_SYNC_TASK.CREATE_AT; } @Override @@ -351,14 +351,14 @@ public class ProjectSyncTaskRecord extends UpdatableRecordImpl implements R @Override public Field field1() { - return SysKey.SYS_KEY.ID; + return SysKeyTable.SYS_KEY.ID; } @Override public Field field2() { - return SysKey.SYS_KEY.RSA_PUBLIC_KEY; + return SysKeyTable.SYS_KEY.RSA_PUBLIC_KEY; } @Override public Field field3() { - return SysKey.SYS_KEY.RSA_PRIVATE_KEY; + return SysKeyTable.SYS_KEY.RSA_PRIVATE_KEY; } @Override public Field field4() { - return SysKey.SYS_KEY.AES_KEY; + return SysKeyTable.SYS_KEY.AES_KEY; } @Override public Field field5() { - return SysKey.SYS_KEY.UPDATE_AT; + return SysKeyTable.SYS_KEY.UPDATE_AT; } @Override public Field field6() { - return SysKey.SYS_KEY.CREATE_AT; + return SysKeyTable.SYS_KEY.CREATE_AT; } @Override @@ -276,14 +276,14 @@ public class SysKeyRecord extends UpdatableRecordImpl implements R * Create a detached SysKeyRecord */ public SysKeyRecord() { - super(SysKey.SYS_KEY); + super(SysKeyTable.SYS_KEY); } /** * Create a detached, initialised SysKeyRecord */ public SysKeyRecord(Integer id, String rsaPublicKey, String rsaPrivateKey, String aesKey, LocalDateTime updateAt, LocalDateTime createAt) { - super(SysKey.SYS_KEY); + super(SysKeyTable.SYS_KEY); setId(id); setRsaPublicKey(rsaPublicKey); @@ -296,8 +296,8 @@ public class SysKeyRecord extends UpdatableRecordImpl implements R /** * Create a detached, initialised SysKeyRecord */ - public SysKeyRecord(SysKeyPojo value) { - super(SysKey.SYS_KEY); + public SysKeyRecord(SysKey value) { + super(SysKeyTable.SYS_KEY); if (value != null) { setId(value.getId()); diff --git a/dao/generated-src/jooq/main/java/com/databasir/dao/tables/records/SysMailRecord.java b/dao/generated-src/jooq/main/java/com/databasir/dao/tables/records/SysMailRecord.java index 0f15c23..1490e36 100644 --- a/dao/generated-src/jooq/main/java/com/databasir/dao/tables/records/SysMailRecord.java +++ b/dao/generated-src/jooq/main/java/com/databasir/dao/tables/records/SysMailRecord.java @@ -4,8 +4,8 @@ package com.databasir.dao.tables.records; -import com.databasir.dao.tables.SysMail; -import com.databasir.dao.tables.pojos.SysMailPojo; +import com.databasir.dao.tables.SysMailTable; +import com.databasir.dao.tables.pojos.SysMail; import java.time.LocalDateTime; @@ -161,42 +161,42 @@ public class SysMailRecord extends UpdatableRecordImpl implements @Override public Field field1() { - return SysMail.SYS_MAIL.ID; + return SysMailTable.SYS_MAIL.ID; } @Override public Field field2() { - return SysMail.SYS_MAIL.USERNAME; + return SysMailTable.SYS_MAIL.USERNAME; } @Override public Field field3() { - return SysMail.SYS_MAIL.PASSWORD; + return SysMailTable.SYS_MAIL.PASSWORD; } @Override public Field field4() { - return SysMail.SYS_MAIL.SMTP_HOST; + return SysMailTable.SYS_MAIL.SMTP_HOST; } @Override public Field field5() { - return SysMail.SYS_MAIL.SMTP_PORT; + return SysMailTable.SYS_MAIL.SMTP_PORT; } @Override public Field field6() { - return SysMail.SYS_MAIL.USE_SSL; + return SysMailTable.SYS_MAIL.USE_SSL; } @Override public Field field7() { - return SysMail.SYS_MAIL.UPDATE_AT; + return SysMailTable.SYS_MAIL.UPDATE_AT; } @Override public Field field8() { - return SysMail.SYS_MAIL.CREATE_AT; + return SysMailTable.SYS_MAIL.CREATE_AT; } @Override @@ -348,14 +348,14 @@ public class SysMailRecord extends UpdatableRecordImpl implements * Create a detached SysMailRecord */ public SysMailRecord() { - super(SysMail.SYS_MAIL); + super(SysMailTable.SYS_MAIL); } /** * Create a detached, initialised SysMailRecord */ public SysMailRecord(Integer id, String username, String password, String smtpHost, Integer smtpPort, Boolean useSsl, LocalDateTime updateAt, LocalDateTime createAt) { - super(SysMail.SYS_MAIL); + super(SysMailTable.SYS_MAIL); setId(id); setUsername(username); @@ -370,8 +370,8 @@ public class SysMailRecord extends UpdatableRecordImpl implements /** * Create a detached, initialised SysMailRecord */ - public SysMailRecord(SysMailPojo value) { - super(SysMail.SYS_MAIL); + public SysMailRecord(SysMail value) { + super(SysMailTable.SYS_MAIL); if (value != null) { setId(value.getId()); diff --git a/dao/generated-src/jooq/main/java/com/databasir/dao/tables/records/TableColumnDocumentRecord.java b/dao/generated-src/jooq/main/java/com/databasir/dao/tables/records/TableColumnDocumentRecord.java index a1a9921..61afdd4 100644 --- a/dao/generated-src/jooq/main/java/com/databasir/dao/tables/records/TableColumnDocumentRecord.java +++ b/dao/generated-src/jooq/main/java/com/databasir/dao/tables/records/TableColumnDocumentRecord.java @@ -4,8 +4,8 @@ package com.databasir.dao.tables.records; -import com.databasir.dao.tables.TableColumnDocument; -import com.databasir.dao.tables.pojos.TableColumnDocumentPojo; +import com.databasir.dao.tables.TableColumnDocumentTable; +import com.databasir.dao.tables.pojos.TableColumnDocument; import java.time.LocalDateTime; @@ -253,72 +253,72 @@ public class TableColumnDocumentRecord extends UpdatableRecordImpl field1() { - return TableColumnDocument.TABLE_COLUMN_DOCUMENT.ID; + return TableColumnDocumentTable.TABLE_COLUMN_DOCUMENT.ID; } @Override public Field field2() { - return TableColumnDocument.TABLE_COLUMN_DOCUMENT.TABLE_DOCUMENT_ID; + return TableColumnDocumentTable.TABLE_COLUMN_DOCUMENT.TABLE_DOCUMENT_ID; } @Override public Field field3() { - return TableColumnDocument.TABLE_COLUMN_DOCUMENT.DATABASE_DOCUMENT_ID; + return TableColumnDocumentTable.TABLE_COLUMN_DOCUMENT.DATABASE_DOCUMENT_ID; } @Override public Field field4() { - return TableColumnDocument.TABLE_COLUMN_DOCUMENT.NAME; + return TableColumnDocumentTable.TABLE_COLUMN_DOCUMENT.NAME; } @Override public Field field5() { - return TableColumnDocument.TABLE_COLUMN_DOCUMENT.TYPE; + return TableColumnDocumentTable.TABLE_COLUMN_DOCUMENT.TYPE; } @Override public Field field6() { - return TableColumnDocument.TABLE_COLUMN_DOCUMENT.DATA_TYPE; + return TableColumnDocumentTable.TABLE_COLUMN_DOCUMENT.DATA_TYPE; } @Override public Field field7() { - return TableColumnDocument.TABLE_COLUMN_DOCUMENT.COMMENT; + return TableColumnDocumentTable.TABLE_COLUMN_DOCUMENT.COMMENT; } @Override public Field field8() { - return TableColumnDocument.TABLE_COLUMN_DOCUMENT.DEFAULT_VALUE; + return TableColumnDocumentTable.TABLE_COLUMN_DOCUMENT.DEFAULT_VALUE; } @Override public Field field9() { - return TableColumnDocument.TABLE_COLUMN_DOCUMENT.SIZE; + return TableColumnDocumentTable.TABLE_COLUMN_DOCUMENT.SIZE; } @Override public Field field10() { - return TableColumnDocument.TABLE_COLUMN_DOCUMENT.DECIMAL_DIGITS; + return TableColumnDocumentTable.TABLE_COLUMN_DOCUMENT.DECIMAL_DIGITS; } @Override public Field field11() { - return TableColumnDocument.TABLE_COLUMN_DOCUMENT.IS_PRIMARY_KEY; + return TableColumnDocumentTable.TABLE_COLUMN_DOCUMENT.IS_PRIMARY_KEY; } @Override public Field field12() { - return TableColumnDocument.TABLE_COLUMN_DOCUMENT.NULLABLE; + return TableColumnDocumentTable.TABLE_COLUMN_DOCUMENT.NULLABLE; } @Override public Field field13() { - return TableColumnDocument.TABLE_COLUMN_DOCUMENT.AUTO_INCREMENT; + return TableColumnDocumentTable.TABLE_COLUMN_DOCUMENT.AUTO_INCREMENT; } @Override public Field field14() { - return TableColumnDocument.TABLE_COLUMN_DOCUMENT.CREATE_AT; + return TableColumnDocumentTable.TABLE_COLUMN_DOCUMENT.CREATE_AT; } @Override @@ -572,14 +572,14 @@ public class TableColumnDocumentRecord extends UpdatableRecordImpl field1() { - return TableDocument.TABLE_DOCUMENT.ID; + return TableDocumentTable.TABLE_DOCUMENT.ID; } @Override public Field field2() { - return TableDocument.TABLE_DOCUMENT.DATABASE_DOCUMENT_ID; + return TableDocumentTable.TABLE_DOCUMENT.DATABASE_DOCUMENT_ID; } @Override public Field field3() { - return TableDocument.TABLE_DOCUMENT.NAME; + return TableDocumentTable.TABLE_DOCUMENT.NAME; } @Override public Field field4() { - return TableDocument.TABLE_DOCUMENT.TYPE; + return TableDocumentTable.TABLE_DOCUMENT.TYPE; } @Override public Field field5() { - return TableDocument.TABLE_DOCUMENT.COMMENT; + return TableDocumentTable.TABLE_DOCUMENT.COMMENT; } @Override public Field field6() { - return TableDocument.TABLE_DOCUMENT.CREATE_AT; + return TableDocumentTable.TABLE_DOCUMENT.CREATE_AT; } @Override @@ -276,14 +276,14 @@ public class TableDocumentRecord extends UpdatableRecordImpl field1() { - return TableForeignKeyDocument.TABLE_FOREIGN_KEY_DOCUMENT.ID; + return TableForeignKeyDocumentTable.TABLE_FOREIGN_KEY_DOCUMENT.ID; } @Override public Field field2() { - return TableForeignKeyDocument.TABLE_FOREIGN_KEY_DOCUMENT.TABLE_DOCUMENT_ID; + return TableForeignKeyDocumentTable.TABLE_FOREIGN_KEY_DOCUMENT.TABLE_DOCUMENT_ID; } @Override public Field field3() { - return TableForeignKeyDocument.TABLE_FOREIGN_KEY_DOCUMENT.DATABASE_DOCUMENT_ID; + return TableForeignKeyDocumentTable.TABLE_FOREIGN_KEY_DOCUMENT.DATABASE_DOCUMENT_ID; } @Override public Field field4() { - return TableForeignKeyDocument.TABLE_FOREIGN_KEY_DOCUMENT.KEY_SEQ; + return TableForeignKeyDocumentTable.TABLE_FOREIGN_KEY_DOCUMENT.KEY_SEQ; } @Override public Field field5() { - return TableForeignKeyDocument.TABLE_FOREIGN_KEY_DOCUMENT.FK_NAME; + return TableForeignKeyDocumentTable.TABLE_FOREIGN_KEY_DOCUMENT.FK_NAME; } @Override public Field field6() { - return TableForeignKeyDocument.TABLE_FOREIGN_KEY_DOCUMENT.FK_TABLE_NAME; + return TableForeignKeyDocumentTable.TABLE_FOREIGN_KEY_DOCUMENT.FK_TABLE_NAME; } @Override public Field field7() { - return TableForeignKeyDocument.TABLE_FOREIGN_KEY_DOCUMENT.FK_COLUMN_NAME; + return TableForeignKeyDocumentTable.TABLE_FOREIGN_KEY_DOCUMENT.FK_COLUMN_NAME; } @Override public Field field8() { - return TableForeignKeyDocument.TABLE_FOREIGN_KEY_DOCUMENT.PK_NAME; + return TableForeignKeyDocumentTable.TABLE_FOREIGN_KEY_DOCUMENT.PK_NAME; } @Override public Field field9() { - return TableForeignKeyDocument.TABLE_FOREIGN_KEY_DOCUMENT.PK_TABLE_NAME; + return TableForeignKeyDocumentTable.TABLE_FOREIGN_KEY_DOCUMENT.PK_TABLE_NAME; } @Override public Field field10() { - return TableForeignKeyDocument.TABLE_FOREIGN_KEY_DOCUMENT.PK_COLUMN_NAME; + return TableForeignKeyDocumentTable.TABLE_FOREIGN_KEY_DOCUMENT.PK_COLUMN_NAME; } @Override public Field field11() { - return TableForeignKeyDocument.TABLE_FOREIGN_KEY_DOCUMENT.UPDATE_RULE; + return TableForeignKeyDocumentTable.TABLE_FOREIGN_KEY_DOCUMENT.UPDATE_RULE; } @Override public Field field12() { - return TableForeignKeyDocument.TABLE_FOREIGN_KEY_DOCUMENT.DELETE_RULE; + return TableForeignKeyDocumentTable.TABLE_FOREIGN_KEY_DOCUMENT.DELETE_RULE; } @Override public Field field13() { - return TableForeignKeyDocument.TABLE_FOREIGN_KEY_DOCUMENT.CREATE_AT; + return TableForeignKeyDocumentTable.TABLE_FOREIGN_KEY_DOCUMENT.CREATE_AT; } @Override @@ -544,14 +544,14 @@ public class TableForeignKeyDocumentRecord extends UpdatableRecordImpl field1() { - return TableIndexDocument.TABLE_INDEX_DOCUMENT.ID; + return TableIndexDocumentTable.TABLE_INDEX_DOCUMENT.ID; } @Override public Field field2() { - return TableIndexDocument.TABLE_INDEX_DOCUMENT.TABLE_DOCUMENT_ID; + return TableIndexDocumentTable.TABLE_INDEX_DOCUMENT.TABLE_DOCUMENT_ID; } @Override public Field field3() { - return TableIndexDocument.TABLE_INDEX_DOCUMENT.DATABASE_DOCUMENT_ID; + return TableIndexDocumentTable.TABLE_INDEX_DOCUMENT.DATABASE_DOCUMENT_ID; } @Override public Field field4() { - return TableIndexDocument.TABLE_INDEX_DOCUMENT.NAME; + return TableIndexDocumentTable.TABLE_INDEX_DOCUMENT.NAME; } @Override public Field field5() { - return TableIndexDocument.TABLE_INDEX_DOCUMENT.IS_UNIQUE; + return TableIndexDocumentTable.TABLE_INDEX_DOCUMENT.IS_UNIQUE; } @Override public Field field6() { - return TableIndexDocument.TABLE_INDEX_DOCUMENT.COLUMN_NAME_ARRAY; + return TableIndexDocumentTable.TABLE_INDEX_DOCUMENT.COLUMN_NAME_ARRAY; } @Override public Field field7() { - return TableIndexDocument.TABLE_INDEX_DOCUMENT.CREATE_AT; + return TableIndexDocumentTable.TABLE_INDEX_DOCUMENT.CREATE_AT; } @Override @@ -315,14 +315,14 @@ public class TableIndexDocumentRecord extends UpdatableRecordImpl field1() { - return TableTriggerDocument.TABLE_TRIGGER_DOCUMENT.ID; + return TableTriggerDocumentTable.TABLE_TRIGGER_DOCUMENT.ID; } @Override public Field field2() { - return TableTriggerDocument.TABLE_TRIGGER_DOCUMENT.NAME; + return TableTriggerDocumentTable.TABLE_TRIGGER_DOCUMENT.NAME; } @Override public Field field3() { - return TableTriggerDocument.TABLE_TRIGGER_DOCUMENT.TABLE_DOCUMENT_ID; + return TableTriggerDocumentTable.TABLE_TRIGGER_DOCUMENT.TABLE_DOCUMENT_ID; } @Override public Field field4() { - return TableTriggerDocument.TABLE_TRIGGER_DOCUMENT.DATABASE_DOCUMENT_ID; + return TableTriggerDocumentTable.TABLE_TRIGGER_DOCUMENT.DATABASE_DOCUMENT_ID; } @Override public Field field5() { - return TableTriggerDocument.TABLE_TRIGGER_DOCUMENT.TIMING; + return TableTriggerDocumentTable.TABLE_TRIGGER_DOCUMENT.TIMING; } @Override public Field field6() { - return TableTriggerDocument.TABLE_TRIGGER_DOCUMENT.MANIPULATION; + return TableTriggerDocumentTable.TABLE_TRIGGER_DOCUMENT.MANIPULATION; } @Override public Field field7() { - return TableTriggerDocument.TABLE_TRIGGER_DOCUMENT.STATEMENT; + return TableTriggerDocumentTable.TABLE_TRIGGER_DOCUMENT.STATEMENT; } @Override public Field field8() { - return TableTriggerDocument.TABLE_TRIGGER_DOCUMENT.TRIGGER_CREATE_AT; + return TableTriggerDocumentTable.TABLE_TRIGGER_DOCUMENT.TRIGGER_CREATE_AT; } @Override public Field field9() { - return TableTriggerDocument.TABLE_TRIGGER_DOCUMENT.CREATE_AT; + return TableTriggerDocumentTable.TABLE_TRIGGER_DOCUMENT.CREATE_AT; } @Override @@ -390,14 +390,14 @@ public class TableTriggerDocumentRecord extends UpdatableRecordImpl field1() { - return UserFavoriteProject.USER_FAVORITE_PROJECT.ID; + return UserFavoriteProjectTable.USER_FAVORITE_PROJECT.ID; } @Override public Field field2() { - return UserFavoriteProject.USER_FAVORITE_PROJECT.USER_ID; + return UserFavoriteProjectTable.USER_FAVORITE_PROJECT.USER_ID; } @Override public Field field3() { - return UserFavoriteProject.USER_FAVORITE_PROJECT.PROJECT_ID; + return UserFavoriteProjectTable.USER_FAVORITE_PROJECT.PROJECT_ID; } @Override public Field field4() { - return UserFavoriteProject.USER_FAVORITE_PROJECT.CREATE_AT; + return UserFavoriteProjectTable.USER_FAVORITE_PROJECT.CREATE_AT; } @Override @@ -204,14 +204,14 @@ public class UserFavoriteProjectRecord extends UpdatableRecordImpl implements Recor @Override public Field field1() { - return User.USER.ID; + return UserTable.USER.ID; } @Override public Field field2() { - return User.USER.EMAIL; + return UserTable.USER.EMAIL; } @Override public Field field3() { - return User.USER.USERNAME; + return UserTable.USER.USERNAME; } @Override public Field field4() { - return User.USER.PASSWORD; + return UserTable.USER.PASSWORD; } @Override public Field field5() { - return User.USER.NICKNAME; + return UserTable.USER.NICKNAME; } @Override public Field field6() { - return User.USER.AVATAR; + return UserTable.USER.AVATAR; } @Override public Field field7() { - return User.USER.ENABLED; + return UserTable.USER.ENABLED; } @Override public Field field8() { - return User.USER.DELETED; + return UserTable.USER.DELETED; } @Override public Field field9() { - return User.USER.DELETED_TOKEN; + return UserTable.USER.DELETED_TOKEN; } @Override public Field field10() { - return User.USER.UPDATE_AT; + return UserTable.USER.UPDATE_AT; } @Override public Field field11() { - return User.USER.CREATE_AT; + return UserTable.USER.CREATE_AT; } @Override @@ -456,14 +456,14 @@ public class UserRecord extends UpdatableRecordImpl implements Recor * Create a detached UserRecord */ public UserRecord() { - super(User.USER); + super(UserTable.USER); } /** * Create a detached, initialised UserRecord */ public UserRecord(Integer id, String email, String username, String password, String nickname, String avatar, Boolean enabled, Boolean deleted, Integer deletedToken, LocalDateTime updateAt, LocalDateTime createAt) { - super(User.USER); + super(UserTable.USER); setId(id); setEmail(email); @@ -481,8 +481,8 @@ public class UserRecord extends UpdatableRecordImpl implements Recor /** * Create a detached, initialised UserRecord */ - public UserRecord(UserPojo value) { - super(User.USER); + public UserRecord(User value) { + super(UserTable.USER); if (value != null) { setId(value.getId()); diff --git a/dao/generated-src/jooq/main/java/com/databasir/dao/tables/records/UserRoleRecord.java b/dao/generated-src/jooq/main/java/com/databasir/dao/tables/records/UserRoleRecord.java index 0a2e641..aa59606 100644 --- a/dao/generated-src/jooq/main/java/com/databasir/dao/tables/records/UserRoleRecord.java +++ b/dao/generated-src/jooq/main/java/com/databasir/dao/tables/records/UserRoleRecord.java @@ -4,8 +4,8 @@ package com.databasir.dao.tables.records; -import com.databasir.dao.tables.UserRole; -import com.databasir.dao.tables.pojos.UserRolePojo; +import com.databasir.dao.tables.UserRoleTable; +import com.databasir.dao.tables.pojos.UserRole; import java.time.LocalDateTime; @@ -121,27 +121,27 @@ public class UserRoleRecord extends UpdatableRecordImpl implemen @Override public Field field1() { - return UserRole.USER_ROLE.ID; + return UserRoleTable.USER_ROLE.ID; } @Override public Field field2() { - return UserRole.USER_ROLE.USER_ID; + return UserRoleTable.USER_ROLE.USER_ID; } @Override public Field field3() { - return UserRole.USER_ROLE.ROLE; + return UserRoleTable.USER_ROLE.ROLE; } @Override public Field field4() { - return UserRole.USER_ROLE.GROUP_ID; + return UserRoleTable.USER_ROLE.GROUP_ID; } @Override public Field field5() { - return UserRole.USER_ROLE.CREATE_AT; + return UserRoleTable.USER_ROLE.CREATE_AT; } @Override @@ -242,14 +242,14 @@ public class UserRoleRecord extends UpdatableRecordImpl implemen * Create a detached UserRoleRecord */ public UserRoleRecord() { - super(UserRole.USER_ROLE); + super(UserRoleTable.USER_ROLE); } /** * Create a detached, initialised UserRoleRecord */ public UserRoleRecord(Integer id, Integer userId, String role, Integer groupId, LocalDateTime createAt) { - super(UserRole.USER_ROLE); + super(UserRoleTable.USER_ROLE); setId(id); setUserId(userId); @@ -261,8 +261,8 @@ public class UserRoleRecord extends UpdatableRecordImpl implemen /** * Create a detached, initialised UserRoleRecord */ - public UserRoleRecord(UserRolePojo value) { - super(UserRole.USER_ROLE); + public UserRoleRecord(UserRole value) { + super(UserRoleTable.USER_ROLE); if (value != null) { setId(value.getId()); diff --git a/dao/src/main/java/com/databasir/dao/impl/DataSourceDao.java b/dao/src/main/java/com/databasir/dao/impl/DataSourceDao.java index f8d944e..630c63c 100644 --- a/dao/src/main/java/com/databasir/dao/impl/DataSourceDao.java +++ b/dao/src/main/java/com/databasir/dao/impl/DataSourceDao.java @@ -1,7 +1,7 @@ package com.databasir.dao.impl; import com.databasir.dao.exception.DataNotExistsException; -import com.databasir.dao.tables.pojos.DataSourcePojo; +import com.databasir.dao.tables.pojos.DataSource; import com.databasir.dao.tables.records.DataSourceRecord; import lombok.Getter; import org.jooq.DSLContext; @@ -15,33 +15,33 @@ import java.util.Optional; import static com.databasir.dao.Tables.DATA_SOURCE; @Repository -public class DataSourceDao extends BaseDao { +public class DataSourceDao extends BaseDao { @Autowired @Getter private DSLContext dslContext; public DataSourceDao() { - super(DATA_SOURCE, DataSourcePojo.class); + super(DATA_SOURCE, DataSource.class); } - public Optional selectOptionalByProjectId(Integer projectId) { + public Optional selectOptionalByProjectId(Integer projectId) { return getDslContext() .select(DATA_SOURCE.fields()).from(DATA_SOURCE).where(DATA_SOURCE.PROJECT_ID.eq(projectId)) - .fetchOptionalInto(DataSourcePojo.class); + .fetchOptionalInto(DataSource.class); } - public DataSourcePojo selectByProjectId(Integer projectId) { + public DataSource selectByProjectId(Integer projectId) { return getDslContext() .select(DATA_SOURCE.fields()).from(DATA_SOURCE).where(DATA_SOURCE.PROJECT_ID.eq(projectId)) - .fetchOptionalInto(DataSourcePojo.class) + .fetchOptionalInto(DataSource.class) .orElseThrow(() -> new DataNotExistsException("data not exists in " + table().getName() + " with schemaSourceId = " + projectId)); } - public int updateByProjectId(DataSourcePojo dataSource) { + public int updateByProjectId(DataSource dataSource) { DataSourceRecord record = getDslContext().newRecord(DATA_SOURCE, dataSource); record.changed(DATA_SOURCE.ID, false); record.changed(DATA_SOURCE.PROJECT_ID, false); @@ -53,12 +53,12 @@ public class DataSourceDao extends BaseDao { .execute(); } - public List selectInProjectIds(List projectIds) { + public List selectInProjectIds(List projectIds) { if (projectIds == null || projectIds.isEmpty()) { return Collections.emptyList(); } return getDslContext() .select(DATA_SOURCE.fields()).from(DATA_SOURCE).where(DATA_SOURCE.PROJECT_ID.in(projectIds)) - .fetchInto(DataSourcePojo.class); + .fetchInto(DataSource.class); } } diff --git a/dao/src/main/java/com/databasir/dao/impl/DataSourcePropertyDao.java b/dao/src/main/java/com/databasir/dao/impl/DataSourcePropertyDao.java index 56eb5a6..a250f69 100644 --- a/dao/src/main/java/com/databasir/dao/impl/DataSourcePropertyDao.java +++ b/dao/src/main/java/com/databasir/dao/impl/DataSourcePropertyDao.java @@ -1,6 +1,6 @@ package com.databasir.dao.impl; -import com.databasir.dao.tables.pojos.DataSourcePropertyPojo; +import com.databasir.dao.tables.pojos.DataSourceProperty; import lombok.Getter; import org.jooq.DSLContext; import org.springframework.beans.factory.annotation.Autowired; @@ -11,14 +11,14 @@ import java.util.List; import static com.databasir.dao.Tables.DATA_SOURCE_PROPERTY; @Repository -public class DataSourcePropertyDao extends BaseDao { +public class DataSourcePropertyDao extends BaseDao { @Autowired @Getter private DSLContext dslContext; public DataSourcePropertyDao() { - super(DATA_SOURCE_PROPERTY, DataSourcePropertyPojo.class); + super(DATA_SOURCE_PROPERTY, DataSourceProperty.class); } public int deleteByDataSourceId(Integer dataSourceId) { @@ -27,10 +27,10 @@ public class DataSourcePropertyDao extends BaseDao { .execute(); } - public List selectByDataSourceId(Integer id) { + public List selectByDataSourceId(Integer id) { return dslContext .select(DATA_SOURCE_PROPERTY.fields()).from(DATA_SOURCE_PROPERTY) .where(DATA_SOURCE_PROPERTY.DATA_SOURCE_ID.eq(id)) - .fetchInto(DataSourcePropertyPojo.class); + .fetchInto(DataSourceProperty.class); } } diff --git a/dao/src/main/java/com/databasir/dao/impl/DatabaseDocumentDao.java b/dao/src/main/java/com/databasir/dao/impl/DatabaseDocumentDao.java index e3faa6d..9611c98 100644 --- a/dao/src/main/java/com/databasir/dao/impl/DatabaseDocumentDao.java +++ b/dao/src/main/java/com/databasir/dao/impl/DatabaseDocumentDao.java @@ -1,6 +1,6 @@ package com.databasir.dao.impl; -import com.databasir.dao.tables.pojos.DatabaseDocumentPojo; +import com.databasir.dao.tables.pojos.DatabaseDocument; import com.databasir.dao.tables.records.DatabaseDocumentRecord; import com.databasir.dao.value.DatabaseDocumentVersionPojo; import lombok.Getter; @@ -18,29 +18,29 @@ import java.util.Optional; import static com.databasir.dao.Tables.DATABASE_DOCUMENT; @Repository -public class DatabaseDocumentDao extends BaseDao { +public class DatabaseDocumentDao extends BaseDao { @Autowired @Getter private DSLContext dslContext; public DatabaseDocumentDao() { - super(DATABASE_DOCUMENT, DatabaseDocumentPojo.class); + super(DATABASE_DOCUMENT, DatabaseDocument.class); } - public Optional selectOptionalByProjectId(Integer projectId) { + public Optional selectOptionalByProjectId(Integer projectId) { return getDslContext() .select(DATABASE_DOCUMENT.fields()).from(DATABASE_DOCUMENT) .where(DATABASE_DOCUMENT.PROJECT_ID.eq(projectId)) - .fetchOptionalInto(DatabaseDocumentPojo.class); + .fetchOptionalInto(DatabaseDocument.class); } - public Optional selectOptionalByProjectIdAndVersion(Integer projectId, + public Optional selectOptionalByProjectIdAndVersion(Integer projectId, Long version) { return getDslContext() .select(DATABASE_DOCUMENT.fields()).from(DATABASE_DOCUMENT) .where(DATABASE_DOCUMENT.PROJECT_ID.eq(projectId).and(DATABASE_DOCUMENT.VERSION.eq(version))) - .fetchOptionalInto(DatabaseDocumentPojo.class); + .fetchOptionalInto(DatabaseDocument.class); } public Optional selectIdByProjectIdAndVersion(Integer projectId, @@ -51,18 +51,18 @@ public class DatabaseDocumentDao extends BaseDao { .fetchOptionalInto(Integer.class); } - public void update(DatabaseDocumentPojo toPojo) { + public void update(DatabaseDocument toPojo) { DatabaseDocumentRecord record = getDslContext().newRecord(DATABASE_DOCUMENT, toPojo); record.changed(DATABASE_DOCUMENT.ID, false); record.changed(DATABASE_DOCUMENT.CREATE_AT, false); record.update(); } - public Optional selectNotArchivedByProjectId(Integer projectId) { + public Optional selectNotArchivedByProjectId(Integer projectId) { return getDslContext() .select(DATABASE_DOCUMENT.fields()).from(DATABASE_DOCUMENT) .where(DATABASE_DOCUMENT.PROJECT_ID.eq(projectId).and(DATABASE_DOCUMENT.IS_ARCHIVE.eq(false))) - .fetchOptionalInto(DatabaseDocumentPojo.class); + .fetchOptionalInto(DatabaseDocument.class); } public void updateIsArchiveById(Integer id, Boolean isArchive) { diff --git a/dao/src/main/java/com/databasir/dao/impl/DatabaseTypeDao.java b/dao/src/main/java/com/databasir/dao/impl/DatabaseTypeDao.java index 3b2752b..b96ed83 100644 --- a/dao/src/main/java/com/databasir/dao/impl/DatabaseTypeDao.java +++ b/dao/src/main/java/com/databasir/dao/impl/DatabaseTypeDao.java @@ -1,6 +1,6 @@ package com.databasir.dao.impl; -import com.databasir.dao.tables.pojos.DatabaseTypePojo; +import com.databasir.dao.tables.pojos.DatabaseType; import lombok.Getter; import org.jooq.DSLContext; import org.springframework.beans.factory.annotation.Autowired; @@ -12,14 +12,14 @@ import java.util.Optional; import static com.databasir.dao.Tables.DATABASE_TYPE; @Repository -public class DatabaseTypeDao extends BaseDao { +public class DatabaseTypeDao extends BaseDao { @Autowired @Getter private DSLContext dslContext; public DatabaseTypeDao() { - super(DATABASE_TYPE, DatabaseTypePojo.class); + super(DATABASE_TYPE, DatabaseType.class); } public boolean existsByDatabaseType(String databaseType) { @@ -32,17 +32,17 @@ public class DatabaseTypeDao extends BaseDao { .and(DATABASE_TYPE.DELETED.eq(false))); } - public DatabaseTypePojo selectByDatabaseType(String databaseType) { + public DatabaseType selectByDatabaseType(String databaseType) { return this.selectOne(DATABASE_TYPE.DATABASE_TYPE_.eq(databaseType) .and(DATABASE_TYPE.DELETED.eq(false))); } @Override - public List selectAll() { + public List selectAll() { return this.getDslContext().selectFrom(DATABASE_TYPE) .where(DATABASE_TYPE.DELETED.eq(false)) .orderBy(DATABASE_TYPE.ID.desc()) - .fetchInto(DatabaseTypePojo.class); + .fetchInto(DatabaseType.class); } public int deleteById(Integer id) { @@ -55,7 +55,7 @@ public class DatabaseTypeDao extends BaseDao { .execute(); } - public Optional selectOptionalById(Integer id) { + public Optional selectOptionalById(Integer id) { return super.selectOptionalOne(DATABASE_TYPE.DELETED.eq(false).and(DATABASE_TYPE.ID.eq(id))); } diff --git a/dao/src/main/java/com/databasir/dao/impl/DocumentDescriptionDao.java b/dao/src/main/java/com/databasir/dao/impl/DocumentDescriptionDao.java index aa95280..158cfa9 100644 --- a/dao/src/main/java/com/databasir/dao/impl/DocumentDescriptionDao.java +++ b/dao/src/main/java/com/databasir/dao/impl/DocumentDescriptionDao.java @@ -1,6 +1,6 @@ package com.databasir.dao.impl; -import com.databasir.dao.tables.pojos.DocumentDescriptionPojo; +import com.databasir.dao.tables.pojos.DocumentDescription; import com.databasir.dao.tables.records.DocumentDescriptionRecord; import lombok.Getter; import org.jooq.Condition; @@ -13,14 +13,14 @@ import java.util.List; import static com.databasir.dao.Tables.DOCUMENT_DESCRIPTION; @Repository -public class DocumentDescriptionDao extends BaseDao { +public class DocumentDescriptionDao extends BaseDao { @Autowired @Getter private DSLContext dslContext; public DocumentDescriptionDao() { - super(DOCUMENT_DESCRIPTION, DocumentDescriptionPojo.class); + super(DOCUMENT_DESCRIPTION, DocumentDescription.class); } public boolean exists(Integer projectId, String tableName, String columnName) { @@ -34,7 +34,7 @@ public class DocumentDescriptionDao extends BaseDao { return this.exists(condition); } - public void update(DocumentDescriptionPojo pojo) { + public void update(DocumentDescription pojo) { Condition condition = DOCUMENT_DESCRIPTION.TABLE_NAME.eq(pojo.getTableName()); if (pojo.getColumnName() == null) { condition = condition.and(DOCUMENT_DESCRIPTION.COLUMN_NAME.isNull()); @@ -45,18 +45,18 @@ public class DocumentDescriptionDao extends BaseDao { getDslContext().executeUpdate(record, condition); } - public List selectByProjectId(Integer projectId) { + public List selectByProjectId(Integer projectId) { return selectByCondition(DOCUMENT_DESCRIPTION.PROJECT_ID.eq(projectId)); } - public List selectTableDescriptionByProjectId(Integer projectId) { + public List selectTableDescriptionByProjectId(Integer projectId) { return selectByCondition(DOCUMENT_DESCRIPTION.PROJECT_ID.eq(projectId) .and(DOCUMENT_DESCRIPTION.COLUMN_NAME.isNull())); } - public List selectByCondition(Condition condition) { + public List selectByCondition(Condition condition) { return this.getDslContext() .selectFrom(DOCUMENT_DESCRIPTION).where(condition) - .fetchInto(DocumentDescriptionPojo.class); + .fetchInto(DocumentDescription.class); } } diff --git a/dao/src/main/java/com/databasir/dao/impl/DocumentDiscussionDao.java b/dao/src/main/java/com/databasir/dao/impl/DocumentDiscussionDao.java index 62e8269..a3f462e 100644 --- a/dao/src/main/java/com/databasir/dao/impl/DocumentDiscussionDao.java +++ b/dao/src/main/java/com/databasir/dao/impl/DocumentDiscussionDao.java @@ -1,6 +1,6 @@ package com.databasir.dao.impl; -import com.databasir.dao.tables.pojos.DocumentDiscussionPojo; +import com.databasir.dao.tables.pojos.DocumentDiscussion; import com.databasir.dao.value.DocumentDiscussionCountPojo; import lombok.Getter; import org.jooq.Condition; @@ -15,21 +15,21 @@ import java.util.Optional; import static com.databasir.dao.Tables.DOCUMENT_DISCUSSION; @Repository -public class DocumentDiscussionDao extends BaseDao { +public class DocumentDiscussionDao extends BaseDao { @Autowired @Getter private DSLContext dslContext; public DocumentDiscussionDao() { - super(DOCUMENT_DISCUSSION, DocumentDiscussionPojo.class); + super(DOCUMENT_DISCUSSION, DocumentDiscussion.class); } - public Optional selectByProjectIdAndId(Integer projectId, Integer id) { + public Optional selectByProjectIdAndId(Integer projectId, Integer id) { return this.getDslContext() .selectFrom(DOCUMENT_DISCUSSION).where(DOCUMENT_DISCUSSION.PROJECT_ID.eq(projectId) .and(DOCUMENT_DISCUSSION.ID.eq(id))) - .fetchOptionalInto(DocumentDiscussionPojo.class); + .fetchOptionalInto(DocumentDiscussion.class); } public List selectTableDiscussionCount(Integer projectId) { diff --git a/dao/src/main/java/com/databasir/dao/impl/DocumentFullTextDao.java b/dao/src/main/java/com/databasir/dao/impl/DocumentFullTextDao.java index 2b3ee22..e0bc774 100644 --- a/dao/src/main/java/com/databasir/dao/impl/DocumentFullTextDao.java +++ b/dao/src/main/java/com/databasir/dao/impl/DocumentFullTextDao.java @@ -1,7 +1,7 @@ package com.databasir.dao.impl; import com.databasir.dao.Indexes; -import com.databasir.dao.tables.pojos.DocumentFullTextPojo; +import com.databasir.dao.tables.pojos.DocumentFullText; import com.databasir.dao.value.FullTextProjectInfoUpdatePojo; import lombok.Getter; import org.jooq.DSLContext; @@ -19,7 +19,7 @@ import java.util.Objects; import static com.databasir.dao.Tables.DOCUMENT_FULL_TEXT; @Repository -public class DocumentFullTextDao extends BaseDao { +public class DocumentFullTextDao extends BaseDao { public static final String[] EMPTY = new String[0]; @@ -28,10 +28,10 @@ public class DocumentFullTextDao extends BaseDao { private DSLContext dslContext; public DocumentFullTextDao() { - super(DOCUMENT_FULL_TEXT, DocumentFullTextPojo.class); + super(DOCUMENT_FULL_TEXT, DocumentFullText.class); } - public Page selectColumnPage(Pageable pageable, String keyword) { + public Page selectColumnPage(Pageable pageable, String keyword) { String[] matchCols = Indexes.DOCUMENT_FULL_TEXT_FIDX_COLUMN.getFields() .stream() .map(f -> f.getName()) @@ -48,15 +48,15 @@ public class DocumentFullTextDao extends BaseDao { .where(DOCUMENT_FULL_TEXT.TABLE_COLUMN_DOCUMENT_ID.isNotNull().and(fullTextMatchSqlSegment)) .fetchOne(0, int.class); // content - List content = dslContext.select(DOCUMENT_FULL_TEXT.fields()) + List content = dslContext.select(DOCUMENT_FULL_TEXT.fields()) .from(DOCUMENT_FULL_TEXT) .where(DOCUMENT_FULL_TEXT.TABLE_COLUMN_DOCUMENT_ID.isNotNull().and(fullTextMatchSqlSegment)) .limit(pageable.getOffset(), pageable.getPageSize()) - .fetchInto(DocumentFullTextPojo.class); + .fetchInto(DocumentFullText.class); return new PageImpl<>(content, pageable, total.longValue()); } - public Page selectTablePage(Pageable pageable, String keyword) { + public Page selectTablePage(Pageable pageable, String keyword) { String[] matchCols = Indexes.DOCUMENT_FULL_TEXT_FIDX_TABLE.getFields() .stream() .map(f -> f.getName()) @@ -91,18 +91,18 @@ public class DocumentFullTextDao extends BaseDao { .and(fullTextMatchSqlSegment)) .fetchOne(0, int.class); // content - List content = dslContext.select(groupColumns) + List content = dslContext.select(groupColumns) .from(DOCUMENT_FULL_TEXT) .where(DOCUMENT_FULL_TEXT.PROJECT_ID.isNotNull() .and(DOCUMENT_FULL_TEXT.TABLE_DOCUMENT_ID.isNotNull()) .and(fullTextMatchSqlSegment)) .groupBy(groupColumns) .limit(pageable.getOffset(), pageable.getPageSize()) - .fetchInto(DocumentFullTextPojo.class); + .fetchInto(DocumentFullText.class); return new PageImpl<>(content, pageable, total.longValue()); } - public Page selectProjectPage(Pageable pageable, String keyword) { + public Page selectProjectPage(Pageable pageable, String keyword) { String[] matchCols = Indexes.DOCUMENT_FULL_TEXT_FIDX_PROJECT.getFields() .stream() .map(f -> f.getName()) @@ -121,17 +121,17 @@ public class DocumentFullTextDao extends BaseDao { .and(fullTextMatchSqlSegment)) .fetchOne(0, int.class); // content - List content = dslContext.select(DOCUMENT_FULL_TEXT.fields()) + List content = dslContext.select(DOCUMENT_FULL_TEXT.fields()) .from(DOCUMENT_FULL_TEXT) .where(DOCUMENT_FULL_TEXT.PROJECT_ID.isNotNull() .and(DOCUMENT_FULL_TEXT.TABLE_DOCUMENT_ID.isNull()) .and(fullTextMatchSqlSegment)) .limit(pageable.getOffset(), pageable.getPageSize()) - .fetchInto(DocumentFullTextPojo.class); + .fetchInto(DocumentFullText.class); return new PageImpl<>(content, pageable, total.longValue()); } - public Page selectGroupPage(Pageable pageable, String keyword) { + public Page selectGroupPage(Pageable pageable, String keyword) { String[] matchCols = Indexes.DOCUMENT_FULL_TEXT_FIDX_GROUP.getFields() .stream() .map(f -> f.getName()) @@ -150,13 +150,13 @@ public class DocumentFullTextDao extends BaseDao { .and(fullTextMatchSqlSegment)) .fetchOne(0, int.class); // content - List content = dslContext.select(DOCUMENT_FULL_TEXT.fields()) + List content = dslContext.select(DOCUMENT_FULL_TEXT.fields()) .from(DOCUMENT_FULL_TEXT) .where(DOCUMENT_FULL_TEXT.GROUP_ID.isNotNull() .and(DOCUMENT_FULL_TEXT.PROJECT_ID.isNull()) .and(fullTextMatchSqlSegment)) .limit(pageable.getOffset(), pageable.getPageSize()) - .fetchInto(DocumentFullTextPojo.class); + .fetchInto(DocumentFullText.class); return new PageImpl<>(content, pageable, total.longValue()); } diff --git a/dao/src/main/java/com/databasir/dao/impl/DocumentTemplatePropertyDao.java b/dao/src/main/java/com/databasir/dao/impl/DocumentTemplatePropertyDao.java index f17a00f..f9ef0e4 100644 --- a/dao/src/main/java/com/databasir/dao/impl/DocumentTemplatePropertyDao.java +++ b/dao/src/main/java/com/databasir/dao/impl/DocumentTemplatePropertyDao.java @@ -1,6 +1,6 @@ package com.databasir.dao.impl; -import com.databasir.dao.tables.pojos.DocumentTemplatePropertyPojo; +import com.databasir.dao.tables.pojos.DocumentTemplateProperty; import com.databasir.dao.tables.records.DocumentTemplatePropertyRecord; import lombok.Getter; import org.jooq.DSLContext; @@ -15,17 +15,17 @@ import java.util.stream.Collectors; import static com.databasir.dao.Tables.DOCUMENT_TEMPLATE_PROPERTY; @Repository -public class DocumentTemplatePropertyDao extends BaseDao { +public class DocumentTemplatePropertyDao extends BaseDao { @Autowired @Getter private DSLContext dslContext; public DocumentTemplatePropertyDao() { - super(DOCUMENT_TEMPLATE_PROPERTY, DocumentTemplatePropertyPojo.class); + super(DOCUMENT_TEMPLATE_PROPERTY, DocumentTemplateProperty.class); } - public void batchInsertOnDuplicateUpdateDefaultValue(Collection data) { + public void batchInsertOnDuplicateUpdateDefaultValue(Collection data) { if (data == null || data.isEmpty()) { return; } @@ -39,7 +39,7 @@ public class DocumentTemplatePropertyDao extends BaseDao data) { + public void batchInsertOnDuplicateKeyUpdateValue(Collection data) { if (data == null || data.isEmpty()) { return; } diff --git a/dao/src/main/java/com/databasir/dao/impl/GroupDao.java b/dao/src/main/java/com/databasir/dao/impl/GroupDao.java index b53e91b..b153c3d 100644 --- a/dao/src/main/java/com/databasir/dao/impl/GroupDao.java +++ b/dao/src/main/java/com/databasir/dao/impl/GroupDao.java @@ -1,6 +1,6 @@ package com.databasir.dao.impl; -import com.databasir.dao.tables.pojos.GroupPojo; +import com.databasir.dao.tables.pojos.Group; import lombok.Getter; import org.jooq.Condition; import org.jooq.DSLContext; @@ -18,14 +18,14 @@ import java.util.Optional; import static com.databasir.dao.Tables.GROUP; @Repository -public class GroupDao extends BaseDao { +public class GroupDao extends BaseDao { @Autowired @Getter private DSLContext dslContext; public GroupDao() { - super(GROUP, GroupPojo.class); + super(GROUP, Group.class); } @Override @@ -36,46 +36,46 @@ public class GroupDao extends BaseDao { } @Override - public Page selectByPage(Pageable request, Condition condition) { + public Page selectByPage(Pageable request, Condition condition) { return super.selectByPage(request, condition.and(GROUP.DELETED.eq(false))); } @Override - public Optional selectOptionalById(T id) { + public Optional selectOptionalById(T id) { return getDslContext() .select(GROUP.fields()).from(GROUP).where(GROUP.ID.eq((Integer) id).and(GROUP.DELETED.eq(false))) - .fetchOptionalInto(GroupPojo.class); + .fetchOptionalInto(Group.class); } @Override - public List selectInIds(Collection ids) { + public List selectInIds(Collection ids) { if (ids == null || ids.isEmpty()) { return Collections.emptyList(); } return getDslContext() .select(GROUP.fields()).from(GROUP) .where(GROUP.ID.in(ids)).and(GROUP.DELETED.eq(false)) - .fetchInto(GroupPojo.class); + .fetchInto(Group.class); } /** * with deleted */ - public List selectAllInIds(List ids) { + public List selectAllInIds(List ids) { if (ids == null || ids.isEmpty()) { return Collections.emptyList(); } return getDslContext() .select(GROUP.fields()).from(GROUP) .where(GROUP.ID.in(ids)) - .fetchInto(GroupPojo.class); + .fetchInto(Group.class); } - public List selectByName(String nameContains) { + public List selectByName(String nameContains) { return getDslContext() .select(GROUP.fields()).from(GROUP) .where(GROUP.NAME.contains(nameContains)) .and(GROUP.DELETED.eq(false)) - .fetchInto(GroupPojo.class); + .fetchInto(Group.class); } } \ No newline at end of file diff --git a/dao/src/main/java/com/databasir/dao/impl/LoginDao.java b/dao/src/main/java/com/databasir/dao/impl/LoginDao.java index cd5adbb..35b0d76 100644 --- a/dao/src/main/java/com/databasir/dao/impl/LoginDao.java +++ b/dao/src/main/java/com/databasir/dao/impl/LoginDao.java @@ -1,6 +1,6 @@ package com.databasir.dao.impl; -import com.databasir.dao.tables.pojos.LoginPojo; +import com.databasir.dao.tables.pojos.Login; import lombok.Getter; import org.jooq.DSLContext; import org.springframework.beans.factory.annotation.Autowired; @@ -12,14 +12,14 @@ import java.util.Optional; import static com.databasir.dao.Tables.LOGIN; @Repository -public class LoginDao extends BaseDao { +public class LoginDao extends BaseDao { @Autowired @Getter private DSLContext dslContext; public LoginDao() { - super(LOGIN, LoginPojo.class); + super(LOGIN, Login.class); } public void deleteByUserId(Integer userId) { @@ -28,23 +28,23 @@ public class LoginDao extends BaseDao { .execute(); } - public Optional selectByUserId(Integer userId) { + public Optional selectByUserId(Integer userId) { return getDslContext() .select(LOGIN.fields()).from(LOGIN).where(LOGIN.USER_ID.eq(userId)) - .fetchOptionalInto(LoginPojo.class); + .fetchOptionalInto(Login.class); } - public Optional selectByRefreshToken(String refreshToken) { + public Optional selectByRefreshToken(String refreshToken) { return getDslContext() .select(LOGIN.fields()).from(LOGIN).where(LOGIN.REFRESH_TOKEN.eq(refreshToken)) - .fetchOptionalInto(LoginPojo.class); + .fetchOptionalInto(Login.class); } - public Optional selectByAccessToken(String accessToken) { + public Optional selectByAccessToken(String accessToken) { return getDslContext() .selectFrom(LOGIN).where(LOGIN.ACCESS_TOKEN.eq(accessToken) .and(LOGIN.ACCESS_TOKEN_EXPIRE_AT.ge(LocalDateTime.now()))) - .fetchOptionalInto(LoginPojo.class); + .fetchOptionalInto(Login.class); } public void updateAccessToken(String accessToken, LocalDateTime accessTokenExpireAt, Integer userId) { @@ -56,19 +56,19 @@ public class LoginDao extends BaseDao { .execute(); } - public void insertOnDuplicateKeyUpdate(LoginPojo loginPojo) { + public void insertOnDuplicateKeyUpdate(Login login) { getDslContext() .insertInto(LOGIN) - .set(LOGIN.USER_ID, loginPojo.getUserId()) - .set(LOGIN.ACCESS_TOKEN, loginPojo.getAccessToken()) - .set(LOGIN.ACCESS_TOKEN_EXPIRE_AT, loginPojo.getAccessTokenExpireAt()) - .set(LOGIN.REFRESH_TOKEN, loginPojo.getRefreshToken()) - .set(LOGIN.REFRESH_TOKEN_EXPIRE_AT, loginPojo.getRefreshTokenExpireAt()) + .set(LOGIN.USER_ID, login.getUserId()) + .set(LOGIN.ACCESS_TOKEN, login.getAccessToken()) + .set(LOGIN.ACCESS_TOKEN_EXPIRE_AT, login.getAccessTokenExpireAt()) + .set(LOGIN.REFRESH_TOKEN, login.getRefreshToken()) + .set(LOGIN.REFRESH_TOKEN_EXPIRE_AT, login.getRefreshTokenExpireAt()) .onDuplicateKeyUpdate() - .set(LOGIN.ACCESS_TOKEN, loginPojo.getAccessToken()) - .set(LOGIN.ACCESS_TOKEN_EXPIRE_AT, loginPojo.getAccessTokenExpireAt()) - .set(LOGIN.REFRESH_TOKEN, loginPojo.getRefreshToken()) - .set(LOGIN.REFRESH_TOKEN_EXPIRE_AT, loginPojo.getRefreshTokenExpireAt()) + .set(LOGIN.ACCESS_TOKEN, login.getAccessToken()) + .set(LOGIN.ACCESS_TOKEN_EXPIRE_AT, login.getAccessTokenExpireAt()) + .set(LOGIN.REFRESH_TOKEN, login.getRefreshToken()) + .set(LOGIN.REFRESH_TOKEN_EXPIRE_AT, login.getRefreshTokenExpireAt()) .execute(); } } diff --git a/dao/src/main/java/com/databasir/dao/impl/MockDataRuleDao.java b/dao/src/main/java/com/databasir/dao/impl/MockDataRuleDao.java index 79ee4c2..2498641 100644 --- a/dao/src/main/java/com/databasir/dao/impl/MockDataRuleDao.java +++ b/dao/src/main/java/com/databasir/dao/impl/MockDataRuleDao.java @@ -1,6 +1,6 @@ package com.databasir.dao.impl; -import com.databasir.dao.tables.pojos.MockDataRulePojo; +import com.databasir.dao.tables.pojos.MockDataRule; import com.databasir.dao.tables.records.MockDataRuleRecord; import lombok.Getter; import org.jooq.DSLContext; @@ -15,32 +15,32 @@ import java.util.stream.Collectors; import static com.databasir.dao.Tables.MOCK_DATA_RULE; @Repository -public class MockDataRuleDao extends BaseDao { +public class MockDataRuleDao extends BaseDao { @Autowired @Getter private DSLContext dslContext; public MockDataRuleDao() { - super(MOCK_DATA_RULE, MockDataRulePojo.class); + super(MOCK_DATA_RULE, MockDataRule.class); } - public List selectByProjectId(Integer projectId) { + public List selectByProjectId(Integer projectId) { return this.getDslContext() .selectFrom(MOCK_DATA_RULE) .where(MOCK_DATA_RULE.PROJECT_ID.eq(projectId)) - .fetchInto(MockDataRulePojo.class); + .fetchInto(MockDataRule.class); } - public List selectByProjectIdAndTableName(Integer projectId, String tableName) { + public List selectByProjectIdAndTableName(Integer projectId, String tableName) { return this.getDslContext() .selectFrom(MOCK_DATA_RULE) .where(MOCK_DATA_RULE.PROJECT_ID.eq(projectId) .and(MOCK_DATA_RULE.TABLE_NAME.eq(tableName))) - .fetchInto(MockDataRulePojo.class); + .fetchInto(MockDataRule.class); } - public void batchSave(Collection data) { + public void batchSave(Collection data) { if (data == null || data.isEmpty()) { return; } diff --git a/dao/src/main/java/com/databasir/dao/impl/OauthAppDao.java b/dao/src/main/java/com/databasir/dao/impl/OauthAppDao.java index e59d206..3a4955a 100644 --- a/dao/src/main/java/com/databasir/dao/impl/OauthAppDao.java +++ b/dao/src/main/java/com/databasir/dao/impl/OauthAppDao.java @@ -1,7 +1,7 @@ package com.databasir.dao.impl; import com.databasir.dao.exception.DataNotExistsException; -import com.databasir.dao.tables.pojos.OauthAppPojo; +import com.databasir.dao.tables.pojos.OauthApp; import lombok.Getter; import org.jooq.DSLContext; import org.springframework.beans.factory.annotation.Autowired; @@ -12,23 +12,23 @@ import java.util.Optional; import static com.databasir.dao.Tables.OAUTH_APP; @Repository -public class OauthAppDao extends BaseDao { +public class OauthAppDao extends BaseDao { @Autowired @Getter private DSLContext dslContext; public OauthAppDao() { - super(OAUTH_APP, OauthAppPojo.class); + super(OAUTH_APP, OauthApp.class); } - public Optional selectOptionByRegistrationId(String registrationId) { + public Optional selectOptionByRegistrationId(String registrationId) { return this.getDslContext() .select(OAUTH_APP.fields()).from(OAUTH_APP).where(OAUTH_APP.REGISTRATION_ID.eq(registrationId)) - .fetchOptionalInto(OauthAppPojo.class); + .fetchOptionalInto(OauthApp.class); } - public OauthAppPojo selectByRegistrationId(String registrationId) { + public OauthApp selectByRegistrationId(String registrationId) { return this.selectOptionByRegistrationId(registrationId) .orElseThrow(() -> new DataNotExistsException("can not found oauth app by " + registrationId)); } diff --git a/dao/src/main/java/com/databasir/dao/impl/OperationLogDao.java b/dao/src/main/java/com/databasir/dao/impl/OperationLogDao.java index b700409..01d060c 100644 --- a/dao/src/main/java/com/databasir/dao/impl/OperationLogDao.java +++ b/dao/src/main/java/com/databasir/dao/impl/OperationLogDao.java @@ -1,6 +1,6 @@ package com.databasir.dao.impl; -import com.databasir.dao.tables.pojos.OperationLogPojo; +import com.databasir.dao.tables.pojos.OperationLog; import lombok.Getter; import org.jooq.DSLContext; import org.springframework.beans.factory.annotation.Autowired; @@ -11,14 +11,14 @@ import java.io.Serializable; import static com.databasir.dao.Tables.OPERATION_LOG; @Repository -public class OperationLogDao extends BaseDao { +public class OperationLogDao extends BaseDao { @Autowired @Getter private DSLContext dslContext; public OperationLogDao() { - super(OPERATION_LOG, OperationLogPojo.class); + super(OPERATION_LOG, OperationLog.class); } @Override diff --git a/dao/src/main/java/com/databasir/dao/impl/ProjectDao.java b/dao/src/main/java/com/databasir/dao/impl/ProjectDao.java index 85b3f62..98035cb 100644 --- a/dao/src/main/java/com/databasir/dao/impl/ProjectDao.java +++ b/dao/src/main/java/com/databasir/dao/impl/ProjectDao.java @@ -1,6 +1,6 @@ package com.databasir.dao.impl; -import com.databasir.dao.tables.pojos.ProjectPojo; +import com.databasir.dao.tables.pojos.Project; import com.databasir.dao.value.GroupProjectCountPojo; import lombok.Getter; import org.jooq.Condition; @@ -23,14 +23,14 @@ import static com.databasir.dao.Tables.DATA_SOURCE; import static com.databasir.dao.Tables.PROJECT; @Repository -public class ProjectDao extends BaseDao { +public class ProjectDao extends BaseDao { @Autowired @Getter private DSLContext dslContext; public ProjectDao() { - super(PROJECT, ProjectPojo.class); + super(PROJECT, Project.class); } public int updateDeletedById(boolean b, Integer projectId) { @@ -41,11 +41,11 @@ public class ProjectDao extends BaseDao { } @Override - public Optional selectOptionalById(T id) { + public Optional selectOptionalById(T id) { return getDslContext() .select(PROJECT.fields()).from(PROJECT) .where(identity().eq(id).and(PROJECT.DELETED.eq(false))) - .fetchOptionalInto(ProjectPojo.class); + .fetchOptionalInto(Project.class); } @Override @@ -60,19 +60,19 @@ public class ProjectDao extends BaseDao { .and(PROJECT.DELETED.eq(false))); } - public Page selectByCondition(Pageable request, Condition condition) { + public Page selectByCondition(Pageable request, Condition condition) { int total = getDslContext() .selectCount().from(PROJECT) .innerJoin(DATA_SOURCE).on(DATA_SOURCE.PROJECT_ID.eq(PROJECT.ID)) .where(condition) .fetchOne(0, int.class); - List data = getDslContext() + List data = getDslContext() .select(PROJECT.fields()).from(PROJECT) .innerJoin(DATA_SOURCE).on(DATA_SOURCE.PROJECT_ID.eq(PROJECT.ID)) .where(condition) .orderBy(getSortFields(request.getSort())) .offset(request.getOffset()).limit(request.getPageSize()) - .fetchInto(ProjectPojo.class); + .fetchInto(Project.class); return new PageImpl<>(data, request, total); } diff --git a/dao/src/main/java/com/databasir/dao/impl/ProjectSyncRuleDao.java b/dao/src/main/java/com/databasir/dao/impl/ProjectSyncRuleDao.java index ea39486..0f25b15 100644 --- a/dao/src/main/java/com/databasir/dao/impl/ProjectSyncRuleDao.java +++ b/dao/src/main/java/com/databasir/dao/impl/ProjectSyncRuleDao.java @@ -1,8 +1,8 @@ package com.databasir.dao.impl; import com.databasir.dao.exception.DataNotExistsException; -import com.databasir.dao.tables.ProjectSyncRule; -import com.databasir.dao.tables.pojos.ProjectSyncRulePojo; +import com.databasir.dao.tables.ProjectSyncRuleTable; +import com.databasir.dao.tables.pojos.ProjectSyncRule; import com.databasir.dao.tables.records.ProjectSyncRuleRecord; import lombok.Getter; import org.jooq.DSLContext; @@ -16,35 +16,35 @@ import java.util.Optional; import static com.databasir.dao.Tables.PROJECT_SYNC_RULE; @Repository -public class ProjectSyncRuleDao extends BaseDao { +public class ProjectSyncRuleDao extends BaseDao { @Autowired @Getter private DSLContext dslContext; public ProjectSyncRuleDao() { - super(PROJECT_SYNC_RULE, ProjectSyncRulePojo.class); + super(PROJECT_SYNC_RULE, ProjectSyncRule.class); } - public Optional selectOptionalByProjectId(Integer projectId) { + public Optional selectOptionalByProjectId(Integer projectId) { return getDslContext() .select(PROJECT_SYNC_RULE.fields()).from(PROJECT_SYNC_RULE) .where(PROJECT_SYNC_RULE.PROJECT_ID.eq(projectId)) - .fetchOptionalInto(ProjectSyncRulePojo.class); + .fetchOptionalInto(ProjectSyncRule.class); } - public ProjectSyncRulePojo selectByProjectId(Integer projectId) { + public ProjectSyncRule selectByProjectId(Integer projectId) { return getDslContext() .select(PROJECT_SYNC_RULE.fields()).from(PROJECT_SYNC_RULE) .where(PROJECT_SYNC_RULE.PROJECT_ID.eq(projectId)) - .fetchOptionalInto(ProjectSyncRulePojo.class) + .fetchOptionalInto(ProjectSyncRule.class) .orElseThrow(() -> new DataNotExistsException("data not exists in " + table().getName() + " with projectId = " + projectId)); } - public int updateByProjectId(ProjectSyncRulePojo rule) { - ProjectSyncRule table = PROJECT_SYNC_RULE; + public int updateByProjectId(ProjectSyncRule rule) { + ProjectSyncRuleTable table = PROJECT_SYNC_RULE; ProjectSyncRuleRecord record = getDslContext().newRecord(table, rule); record.changed(table.ID, false); record.changed(table.PROJECT_ID, false); @@ -59,16 +59,16 @@ public class ProjectSyncRuleDao extends BaseDao { .execute(); } - public List selectInProjectIds(List projectIds) { + public List selectInProjectIds(List projectIds) { if (projectIds == null || projectIds.isEmpty()) { return Collections.emptyList(); } return getDslContext() .selectFrom(PROJECT_SYNC_RULE).where(PROJECT_SYNC_RULE.PROJECT_ID.in(projectIds)) - .fetchInto(ProjectSyncRulePojo.class); + .fetchInto(ProjectSyncRule.class); } - public List selectByIsAutoSyncAndProjectIds(boolean isAutoSync, List projectIds) { + public List selectByIsAutoSyncAndProjectIds(boolean isAutoSync, List projectIds) { if (projectIds == null || projectIds.isEmpty()) { return Collections.emptyList(); } @@ -77,21 +77,21 @@ public class ProjectSyncRuleDao extends BaseDao { PROJECT_SYNC_RULE.IS_AUTO_SYNC.eq(isAutoSync) .and(PROJECT_SYNC_RULE.PROJECT_ID.in(projectIds)) ) - .fetchInto(ProjectSyncRulePojo.class); + .fetchInto(ProjectSyncRule.class); } - public List selectByIsAutoSyncAndNotInProjectIds(boolean isAutoSync, + public List selectByIsAutoSyncAndNotInProjectIds(boolean isAutoSync, List projectIds) { if (projectIds == null || projectIds.isEmpty()) { return getDslContext() .selectFrom(PROJECT_SYNC_RULE) .where(PROJECT_SYNC_RULE.IS_AUTO_SYNC.eq(isAutoSync) .and(PROJECT_SYNC_RULE.PROJECT_ID.notIn(projectIds))) - .fetchInto(ProjectSyncRulePojo.class); + .fetchInto(ProjectSyncRule.class); } else { return getDslContext() .selectFrom(PROJECT_SYNC_RULE).where(PROJECT_SYNC_RULE.IS_AUTO_SYNC.eq(isAutoSync)) - .fetchInto(ProjectSyncRulePojo.class); + .fetchInto(ProjectSyncRule.class); } } diff --git a/dao/src/main/java/com/databasir/dao/impl/ProjectSyncTaskDao.java b/dao/src/main/java/com/databasir/dao/impl/ProjectSyncTaskDao.java index ad361e7..68f7249 100644 --- a/dao/src/main/java/com/databasir/dao/impl/ProjectSyncTaskDao.java +++ b/dao/src/main/java/com/databasir/dao/impl/ProjectSyncTaskDao.java @@ -1,7 +1,7 @@ package com.databasir.dao.impl; import com.databasir.dao.enums.ProjectSyncTaskStatus; -import com.databasir.dao.tables.pojos.ProjectSyncTaskPojo; +import com.databasir.dao.tables.pojos.ProjectSyncTask; import com.databasir.dao.tables.records.ProjectSyncTaskRecord; import lombok.Getter; import org.jooq.DSLContext; @@ -16,14 +16,14 @@ import java.util.List; import static com.databasir.dao.Tables.PROJECT_SYNC_TASK; @Repository -public class ProjectSyncTaskDao extends BaseDao { +public class ProjectSyncTaskDao extends BaseDao { @Autowired @Getter private DSLContext dslContext; public ProjectSyncTaskDao() { - super(PROJECT_SYNC_TASK, ProjectSyncTaskPojo.class); + super(PROJECT_SYNC_TASK, ProjectSyncTask.class); } public boolean existsByProjectId(Integer projectId, Collection statusIn) { @@ -34,13 +34,13 @@ public class ProjectSyncTaskDao extends BaseDao { PROJECT_SYNC_TASK.PROJECT_ID.eq(projectId).and(PROJECT_SYNC_TASK.STATUS.in(statusIn))); } - public List listNewTasks(Integer size) { + public List listNewTasks(Integer size) { return dslContext .selectFrom(PROJECT_SYNC_TASK) .where(PROJECT_SYNC_TASK.STATUS.eq(ProjectSyncTaskStatus.NEW)) .orderBy(PROJECT_SYNC_TASK.ID.asc()) .limit(size) - .fetchInto(ProjectSyncTaskPojo.class); + .fetchInto(ProjectSyncTask.class); } public int updateStatusAndResultById(Integer taskId, ProjectSyncTaskStatus status, String result) { diff --git a/dao/src/main/java/com/databasir/dao/impl/SysKeyDao.java b/dao/src/main/java/com/databasir/dao/impl/SysKeyDao.java index 60790f0..0acd0f7 100644 --- a/dao/src/main/java/com/databasir/dao/impl/SysKeyDao.java +++ b/dao/src/main/java/com/databasir/dao/impl/SysKeyDao.java @@ -1,7 +1,7 @@ package com.databasir.dao.impl; import com.databasir.dao.exception.DataNotExistsException; -import com.databasir.dao.tables.pojos.SysKeyPojo; +import com.databasir.dao.tables.pojos.SysKey; import lombok.Getter; import org.jooq.DSLContext; import org.springframework.beans.factory.annotation.Autowired; @@ -12,23 +12,23 @@ import java.util.Optional; import static com.databasir.dao.Tables.SYS_KEY; @Repository -public class SysKeyDao extends BaseDao { +public class SysKeyDao extends BaseDao { @Autowired @Getter private DSLContext dslContext; public SysKeyDao() { - super(SYS_KEY, SysKeyPojo.class); + super(SYS_KEY, SysKey.class); } - public Optional selectOptionTopOne() { + public Optional selectOptionTopOne() { return dslContext.select(SYS_KEY.fields()).from(SYS_KEY) .limit(1) - .fetchOptionalInto(SysKeyPojo.class); + .fetchOptionalInto(SysKey.class); } - public SysKeyPojo selectTopOne() { + public SysKey selectTopOne() { return selectOptionTopOne() .orElseThrow(() -> new DataNotExistsException("no syskey data find")); } diff --git a/dao/src/main/java/com/databasir/dao/impl/SysMailDao.java b/dao/src/main/java/com/databasir/dao/impl/SysMailDao.java index 2452043..b281c2e 100644 --- a/dao/src/main/java/com/databasir/dao/impl/SysMailDao.java +++ b/dao/src/main/java/com/databasir/dao/impl/SysMailDao.java @@ -1,7 +1,7 @@ package com.databasir.dao.impl; import com.databasir.dao.exception.DataNotExistsException; -import com.databasir.dao.tables.pojos.SysMailPojo; +import com.databasir.dao.tables.pojos.SysMail; import com.databasir.dao.tables.records.SysMailRecord; import lombok.Getter; import org.jooq.DSLContext; @@ -13,29 +13,29 @@ import java.util.Optional; import static com.databasir.dao.Tables.SYS_MAIL; @Repository -public class SysMailDao extends BaseDao { +public class SysMailDao extends BaseDao { @Autowired @Getter private DSLContext dslContext; public SysMailDao() { - super(SYS_MAIL, SysMailPojo.class); + super(SYS_MAIL, SysMail.class); } - public Optional selectOptionTopOne() { + public Optional selectOptionTopOne() { return dslContext.select(SYS_MAIL.fields()).from(SYS_MAIL) .limit(1) - .fetchOptionalInto(SysMailPojo.class); + .fetchOptionalInto(SysMail.class); } - public SysMailPojo selectTopOne() { + public SysMail selectTopOne() { return selectOptionTopOne() .orElseThrow(() -> new DataNotExistsException("no sysmail data find")); } @Override - public int updateById(SysMailPojo pojo) { + public int updateById(SysMail pojo) { SysMailRecord record = getDslContext().newRecord(SYS_MAIL, pojo); record.changed(SYS_MAIL.ID, false); if (pojo.getPassword() == null) { diff --git a/dao/src/main/java/com/databasir/dao/impl/TableColumnDocumentDao.java b/dao/src/main/java/com/databasir/dao/impl/TableColumnDocumentDao.java index b387498..3db15ba 100644 --- a/dao/src/main/java/com/databasir/dao/impl/TableColumnDocumentDao.java +++ b/dao/src/main/java/com/databasir/dao/impl/TableColumnDocumentDao.java @@ -1,6 +1,6 @@ package com.databasir.dao.impl; -import com.databasir.dao.tables.pojos.TableColumnDocumentPojo; +import com.databasir.dao.tables.pojos.TableColumnDocument; import lombok.Getter; import org.jooq.DSLContext; import org.springframework.beans.factory.annotation.Autowired; @@ -13,24 +13,24 @@ import java.util.List; import static com.databasir.dao.Tables.TABLE_COLUMN_DOCUMENT; @Repository -public class TableColumnDocumentDao extends BaseDao { +public class TableColumnDocumentDao extends BaseDao { @Autowired @Getter private DSLContext dslContext; public TableColumnDocumentDao() { - super(TABLE_COLUMN_DOCUMENT, TableColumnDocumentPojo.class); + super(TABLE_COLUMN_DOCUMENT, TableColumnDocument.class); } - public List selectByDatabaseDocumentId(Integer schemaDocumentId) { + public List selectByDatabaseDocumentId(Integer schemaDocumentId) { return getDslContext() .select(TABLE_COLUMN_DOCUMENT.fields()).from(TABLE_COLUMN_DOCUMENT) .where(TABLE_COLUMN_DOCUMENT.DATABASE_DOCUMENT_ID.eq(schemaDocumentId)) - .fetchInto(TableColumnDocumentPojo.class); + .fetchInto(TableColumnDocument.class); } - public List selectByDatabaseDocumentIdAndTableIdIn(Integer schemaDocumentId, + public List selectByDatabaseDocumentIdAndTableIdIn(Integer schemaDocumentId, Collection tableIdIn) { if (tableIdIn == null || tableIdIn.isEmpty()) { return Collections.emptyList(); @@ -39,14 +39,14 @@ public class TableColumnDocumentDao extends BaseDao { .select(TABLE_COLUMN_DOCUMENT.fields()).from(TABLE_COLUMN_DOCUMENT) .where(TABLE_COLUMN_DOCUMENT.DATABASE_DOCUMENT_ID.eq(schemaDocumentId) .and(TABLE_COLUMN_DOCUMENT.TABLE_DOCUMENT_ID.in(tableIdIn))) - .fetchInto(TableColumnDocumentPojo.class); + .fetchInto(TableColumnDocument.class); } - public List selectByTableDocumentId(Integer tableDocumentId) { + public List selectByTableDocumentId(Integer tableDocumentId) { return getDslContext() .selectFrom(TABLE_COLUMN_DOCUMENT) .where(TABLE_COLUMN_DOCUMENT.TABLE_DOCUMENT_ID.eq(tableDocumentId)) - .fetchInto(TableColumnDocumentPojo.class); + .fetchInto(TableColumnDocument.class); } public boolean exists(Integer tableDocumentId, String columnName) { diff --git a/dao/src/main/java/com/databasir/dao/impl/TableDocumentDao.java b/dao/src/main/java/com/databasir/dao/impl/TableDocumentDao.java index 90416ac..085f59f 100644 --- a/dao/src/main/java/com/databasir/dao/impl/TableDocumentDao.java +++ b/dao/src/main/java/com/databasir/dao/impl/TableDocumentDao.java @@ -1,7 +1,7 @@ package com.databasir.dao.impl; -import com.databasir.dao.tables.pojos.TableColumnDocumentPojo; -import com.databasir.dao.tables.pojos.TableDocumentPojo; +import com.databasir.dao.tables.pojos.TableColumnDocument; +import com.databasir.dao.tables.pojos.TableDocument; import lombok.Getter; import org.jooq.DSLContext; import org.springframework.beans.factory.annotation.Autowired; @@ -15,24 +15,24 @@ import java.util.Optional; import static com.databasir.dao.Tables.TABLE_DOCUMENT; @Repository -public class TableDocumentDao extends BaseDao { +public class TableDocumentDao extends BaseDao { @Autowired @Getter private DSLContext dslContext; public TableDocumentDao() { - super(TABLE_DOCUMENT, TableDocumentPojo.class); + super(TABLE_DOCUMENT, TableDocument.class); } - public List selectByDatabaseDocumentId(Integer schemaDocumentId) { + public List selectByDatabaseDocumentId(Integer schemaDocumentId) { return getDslContext() .select(TABLE_DOCUMENT.fields()).from(TABLE_DOCUMENT) .where(TABLE_DOCUMENT.DATABASE_DOCUMENT_ID.eq(schemaDocumentId)) - .fetchInto(TableDocumentPojo.class); + .fetchInto(TableDocument.class); } - public List selectByDatabaseDocumentIdAndIdIn(Integer databaseDocumentId, + public List selectByDatabaseDocumentIdAndIdIn(Integer databaseDocumentId, Collection idList) { if (idList == null || idList.isEmpty()) { return Collections.emptyList(); @@ -41,25 +41,25 @@ public class TableDocumentDao extends BaseDao { .selectFrom(TABLE_DOCUMENT) .where(TABLE_DOCUMENT.DATABASE_DOCUMENT_ID.eq(databaseDocumentId) .and(TABLE_DOCUMENT.ID.in(idList))) - .fetchInto(TableDocumentPojo.class); + .fetchInto(TableDocument.class); } - public Optional selectByDatabaseDocumentIdAndTableName(Integer databaseDocumentId, + public Optional selectByDatabaseDocumentIdAndTableName(Integer databaseDocumentId, String tableName) { return getDslContext() .select(TABLE_DOCUMENT.fields()).from(TABLE_DOCUMENT) .where(TABLE_DOCUMENT.DATABASE_DOCUMENT_ID.eq(databaseDocumentId) .and(TABLE_DOCUMENT.NAME.eq(tableName))) - .fetchOptionalInto(TableColumnDocumentPojo.class); + .fetchOptionalInto(TableColumnDocument.class); } - public Optional selectByDatabaseDocumentIdAndId(Integer databaseDocumentId, + public Optional selectByDatabaseDocumentIdAndId(Integer databaseDocumentId, Integer id) { return getDslContext() .selectFrom(TABLE_DOCUMENT) .where(TABLE_DOCUMENT.DATABASE_DOCUMENT_ID.eq(databaseDocumentId) .and(TABLE_DOCUMENT.ID.eq(id))) - .fetchOptionalInto(TableDocumentPojo.class); + .fetchOptionalInto(TableDocument.class); } public List selectTableIdsByDatabaseDocumentIdAndTableNameIn(Integer databaseDocumentId, diff --git a/dao/src/main/java/com/databasir/dao/impl/TableForeignKeyDocumentDao.java b/dao/src/main/java/com/databasir/dao/impl/TableForeignKeyDocumentDao.java index 72b985b..7ace9ec 100644 --- a/dao/src/main/java/com/databasir/dao/impl/TableForeignKeyDocumentDao.java +++ b/dao/src/main/java/com/databasir/dao/impl/TableForeignKeyDocumentDao.java @@ -1,6 +1,6 @@ package com.databasir.dao.impl; -import com.databasir.dao.tables.pojos.TableForeignKeyDocumentPojo; +import com.databasir.dao.tables.pojos.TableForeignKeyDocument; import lombok.Getter; import org.jooq.DSLContext; import org.springframework.beans.factory.annotation.Autowired; @@ -13,24 +13,24 @@ import java.util.List; import static com.databasir.dao.Tables.TABLE_FOREIGN_KEY_DOCUMENT; @Repository -public class TableForeignKeyDocumentDao extends BaseDao { +public class TableForeignKeyDocumentDao extends BaseDao { @Autowired @Getter private DSLContext dslContext; public TableForeignKeyDocumentDao() { - super(TABLE_FOREIGN_KEY_DOCUMENT, TableForeignKeyDocumentPojo.class); + super(TABLE_FOREIGN_KEY_DOCUMENT, TableForeignKeyDocument.class); } - public List selectByDatabaseDocumentId(Integer databaseDocumentId) { + public List selectByDatabaseDocumentId(Integer databaseDocumentId) { return getDslContext() .selectFrom(TABLE_FOREIGN_KEY_DOCUMENT) .where(TABLE_FOREIGN_KEY_DOCUMENT.DATABASE_DOCUMENT_ID.eq(databaseDocumentId)) - .fetchInto(TableForeignKeyDocumentPojo.class); + .fetchInto(TableForeignKeyDocument.class); } - public List selectByDatabaseDocumentIdAndTableIdIn(Integer databaseDocumentId, + public List selectByDatabaseDocumentIdAndTableIdIn(Integer databaseDocumentId, Collection tableIdIn) { if (tableIdIn == null || tableIdIn.isEmpty()) { return Collections.emptyList(); @@ -39,6 +39,6 @@ public class TableForeignKeyDocumentDao extends BaseDao { +public class TableIndexDocumentDao extends BaseDao { @Autowired @Getter private DSLContext dslContext; public TableIndexDocumentDao() { - super(TABLE_INDEX_DOCUMENT, TableIndexDocumentPojo.class); + super(TABLE_INDEX_DOCUMENT, TableIndexDocument.class); } - public List selectByDatabaseMetaId(Integer documentId) { + public List selectByDatabaseMetaId(Integer documentId) { return getDslContext() .select(TABLE_INDEX_DOCUMENT.fields()).from(TABLE_INDEX_DOCUMENT) .where(TABLE_INDEX_DOCUMENT.DATABASE_DOCUMENT_ID.eq(documentId)) - .fetchInto(TableIndexDocumentPojo.class); + .fetchInto(TableIndexDocument.class); } - public List selectByDatabaseDocumentIdAndIdIn(Integer documentId, + public List selectByDatabaseDocumentIdAndIdIn(Integer documentId, Collection tableIdIn) { if (tableIdIn == null || tableIdIn.isEmpty()) { return Collections.emptyList(); @@ -39,6 +39,6 @@ public class TableIndexDocumentDao extends BaseDao { .select(TABLE_INDEX_DOCUMENT.fields()).from(TABLE_INDEX_DOCUMENT) .where(TABLE_INDEX_DOCUMENT.DATABASE_DOCUMENT_ID.eq(documentId) .and(TABLE_INDEX_DOCUMENT.TABLE_DOCUMENT_ID.in(tableIdIn))) - .fetchInto(TableIndexDocumentPojo.class); + .fetchInto(TableIndexDocument.class); } } diff --git a/dao/src/main/java/com/databasir/dao/impl/TableTriggerDocumentDao.java b/dao/src/main/java/com/databasir/dao/impl/TableTriggerDocumentDao.java index 5b32ae9..c958832 100644 --- a/dao/src/main/java/com/databasir/dao/impl/TableTriggerDocumentDao.java +++ b/dao/src/main/java/com/databasir/dao/impl/TableTriggerDocumentDao.java @@ -1,6 +1,6 @@ package com.databasir.dao.impl; -import com.databasir.dao.tables.pojos.TableTriggerDocumentPojo; +import com.databasir.dao.tables.pojos.TableTriggerDocument; import lombok.Getter; import org.jooq.DSLContext; import org.springframework.beans.factory.annotation.Autowired; @@ -13,24 +13,24 @@ import java.util.List; import static com.databasir.dao.Tables.TABLE_TRIGGER_DOCUMENT; @Repository -public class TableTriggerDocumentDao extends BaseDao { +public class TableTriggerDocumentDao extends BaseDao { @Autowired @Getter private DSLContext dslContext; public TableTriggerDocumentDao() { - super(TABLE_TRIGGER_DOCUMENT, TableTriggerDocumentPojo.class); + super(TABLE_TRIGGER_DOCUMENT, TableTriggerDocument.class); } - public List selectByDatabaseDocumentId(Integer schemaDocumentId) { + public List selectByDatabaseDocumentId(Integer schemaDocumentId) { return getDslContext() .select(TABLE_TRIGGER_DOCUMENT.fields()).from(TABLE_TRIGGER_DOCUMENT) .where(TABLE_TRIGGER_DOCUMENT.DATABASE_DOCUMENT_ID.eq(schemaDocumentId)) - .fetchInto(TableTriggerDocumentPojo.class); + .fetchInto(TableTriggerDocument.class); } - public List selectByDatabaseDocumentIdAndIdIn(Integer documentId, + public List selectByDatabaseDocumentIdAndIdIn(Integer documentId, Collection tableIdIn) { if (tableIdIn == null || tableIdIn.isEmpty()) { return Collections.emptyList(); @@ -39,6 +39,6 @@ public class TableTriggerDocumentDao extends BaseDao { .select(TABLE_TRIGGER_DOCUMENT.fields()).from(TABLE_TRIGGER_DOCUMENT) .where(TABLE_TRIGGER_DOCUMENT.DATABASE_DOCUMENT_ID.eq(documentId) .and(TABLE_TRIGGER_DOCUMENT.TABLE_DOCUMENT_ID.in(tableIdIn))) - .fetchInto(TableTriggerDocumentPojo.class); + .fetchInto(TableTriggerDocument.class); } } diff --git a/dao/src/main/java/com/databasir/dao/impl/UserDao.java b/dao/src/main/java/com/databasir/dao/impl/UserDao.java index d8368a4..ed79a30 100644 --- a/dao/src/main/java/com/databasir/dao/impl/UserDao.java +++ b/dao/src/main/java/com/databasir/dao/impl/UserDao.java @@ -1,7 +1,7 @@ package com.databasir.dao.impl; import com.databasir.dao.Databasir; -import com.databasir.dao.tables.pojos.UserPojo; +import com.databasir.dao.tables.pojos.User; import com.databasir.dao.value.GroupMemberDetailPojo; import lombok.Getter; import org.jooq.Condition; @@ -22,14 +22,14 @@ import static com.databasir.dao.Tables.USER; import static com.databasir.dao.Tables.USER_ROLE; @Repository -public class UserDao extends BaseDao { +public class UserDao extends BaseDao { @Autowired @Getter private DSLContext dslContext; public UserDao() { - super(USER, UserPojo.class); + super(USER, User.class); } @Override @@ -73,17 +73,17 @@ public class UserDao extends BaseDao { .execute(); } - public List selectUserIdIn(Collection userIds) { + public List selectUserIdIn(Collection userIds) { if (userIds == null || userIds.isEmpty()) { return Collections.emptyList(); } return dslContext .select(USER.fields()).from(USER) .where(USER.ID.in(userIds).and(USER.DELETED.eq(false))) - .fetchInto(UserPojo.class); + .fetchInto(User.class); } - public List selectLimitUsersByRoleAndGroup(Integer groupId, + public List selectLimitUsersByRoleAndGroup(Integer groupId, String role, Integer size) { return dslContext @@ -93,30 +93,30 @@ public class UserDao extends BaseDao { .and(USER_ROLE.GROUP_ID.eq(groupId).and(USER_ROLE.ROLE.eq(role)))) .orderBy(USER_ROLE.ID.desc()) .limit(size) - .fetchInto(UserPojo.class); + .fetchInto(User.class); } - public Optional selectByEmail(String email) { + public Optional selectByEmail(String email) { return dslContext .select(USER.fields()).from(USER) .where(USER.EMAIL.eq(email).and(USER.DELETED.eq(false))) - .fetchOptionalInto(UserPojo.class); + .fetchOptionalInto(User.class); } - public Optional selectByEmailOrUsername(String emailOrUsername) { + public Optional selectByEmailOrUsername(String emailOrUsername) { return dslContext .select(USER.fields()).from(USER) .where(USER.DELETED.eq(false) .and(USER.EMAIL.eq(emailOrUsername).or(USER.USERNAME.eq(emailOrUsername)))) - .fetchOptionalInto(UserPojo.class); + .fetchOptionalInto(User.class); } - public List selectEnabledGroupMembers(Integer groupId) { + public List selectEnabledGroupMembers(Integer groupId) { return dslContext.select(USER.fields()).from(USER) .innerJoin(USER_ROLE).on(USER.ID.eq(USER_ROLE.USER_ID)) .where(USER.DELETED.eq(false) .and(USER_ROLE.GROUP_ID.eq(groupId).and(USER.ENABLED.eq(true)))) - .fetchInto(UserPojo.class); + .fetchInto(User.class); } public Page selectGroupMembers(Integer groupId, Pageable request, Condition condition) { diff --git a/dao/src/main/java/com/databasir/dao/impl/UserFavoriteProjectDao.java b/dao/src/main/java/com/databasir/dao/impl/UserFavoriteProjectDao.java index 4683df6..0c1d6a1 100644 --- a/dao/src/main/java/com/databasir/dao/impl/UserFavoriteProjectDao.java +++ b/dao/src/main/java/com/databasir/dao/impl/UserFavoriteProjectDao.java @@ -1,6 +1,6 @@ package com.databasir.dao.impl; -import com.databasir.dao.tables.pojos.UserFavoriteProjectPojo; +import com.databasir.dao.tables.pojos.UserFavoriteProject; import lombok.Getter; import org.jooq.Condition; import org.jooq.DSLContext; @@ -16,14 +16,14 @@ import java.util.List; import static com.databasir.dao.Tables.*; @Repository -public class UserFavoriteProjectDao extends BaseDao { +public class UserFavoriteProjectDao extends BaseDao { @Autowired @Getter private DSLContext dslContext; public UserFavoriteProjectDao() { - super(USER_FAVORITE_PROJECT, UserFavoriteProjectPojo.class); + super(USER_FAVORITE_PROJECT, UserFavoriteProject.class); } public boolean exists(Integer userId, Integer projectId) { @@ -32,7 +32,7 @@ public class UserFavoriteProjectDao extends BaseDao { } public void insert(Integer userId, Integer projectId) { - UserFavoriteProjectPojo pojo = new UserFavoriteProjectPojo(); + UserFavoriteProject pojo = new UserFavoriteProject(); pojo.setUserId(userId); pojo.setProjectId(projectId); this.insertAndReturnId(pojo); @@ -43,31 +43,31 @@ public class UserFavoriteProjectDao extends BaseDao { .and(USER_FAVORITE_PROJECT.PROJECT_ID.eq(projectId))); } - public Page selectByCondition(Pageable request, Condition condition) { + public Page selectByCondition(Pageable request, Condition condition) { int total = getDslContext() .selectCount().from(USER_FAVORITE_PROJECT) .innerJoin(USER).on(USER.ID.eq(USER_FAVORITE_PROJECT.USER_ID)) .innerJoin(PROJECT).on(PROJECT.ID.eq(USER_FAVORITE_PROJECT.PROJECT_ID)) .where(PROJECT.DELETED.eq(false).and(condition)) .fetchOne(0, int.class); - List data = getDslContext() + List data = getDslContext() .select(USER_FAVORITE_PROJECT.fields()).from(USER_FAVORITE_PROJECT) .innerJoin(USER).on(USER.ID.eq(USER_FAVORITE_PROJECT.USER_ID)) .innerJoin(PROJECT).on(PROJECT.ID.eq(USER_FAVORITE_PROJECT.PROJECT_ID)) .where(PROJECT.DELETED.eq(false).and(condition)) .orderBy(getSortFields(request.getSort())) .offset(request.getOffset()).limit(request.getPageSize()) - .fetchInto(UserFavoriteProjectPojo.class); + .fetchInto(UserFavoriteProject.class); return new PageImpl<>(data, request, total); } - public List selectByUserIdAndProjectIds(Integer userId, List projectIds) { + public List selectByUserIdAndProjectIds(Integer userId, List projectIds) { if (projectIds == null || projectIds.isEmpty()) { return Collections.emptyList(); } return this.getDslContext() .select(USER_FAVORITE_PROJECT.fields()).from(USER_FAVORITE_PROJECT) .where(USER_FAVORITE_PROJECT.USER_ID.eq(userId).and(USER_FAVORITE_PROJECT.PROJECT_ID.in(projectIds))) - .fetchInto(UserFavoriteProjectPojo.class); + .fetchInto(UserFavoriteProject.class); } } diff --git a/dao/src/main/java/com/databasir/dao/impl/UserRoleDao.java b/dao/src/main/java/com/databasir/dao/impl/UserRoleDao.java index a3c8899..a7d9ca4 100644 --- a/dao/src/main/java/com/databasir/dao/impl/UserRoleDao.java +++ b/dao/src/main/java/com/databasir/dao/impl/UserRoleDao.java @@ -1,6 +1,6 @@ package com.databasir.dao.impl; -import com.databasir.dao.tables.pojos.UserRolePojo; +import com.databasir.dao.tables.pojos.UserRole; import com.databasir.dao.value.GroupMemberSimplePojo; import lombok.Getter; import org.jooq.Condition; @@ -17,14 +17,14 @@ import static com.databasir.dao.Tables.USER; import static com.databasir.dao.Tables.USER_ROLE; @Repository -public class UserRoleDao extends BaseDao { +public class UserRoleDao extends BaseDao { @Autowired @Getter private DSLContext dslContext; public UserRoleDao() { - super(USER_ROLE, UserRolePojo.class); + super(USER_ROLE, UserRole.class); } public List selectOwnerNamesByGroupIdIn(List groupIdList) { @@ -43,7 +43,7 @@ public class UserRoleDao extends BaseDao { .execute(); } - public Page selectPageByGroupId(Pageable pageable, Integer groupId) { + public Page selectPageByGroupId(Pageable pageable, Integer groupId) { return super.selectByPage(pageable, USER_ROLE.GROUP_ID.eq(groupId)); } @@ -84,12 +84,12 @@ public class UserRoleDao extends BaseDao { return dslContext.fetchExists(USER_ROLE, condition); } - public List selectByUserIds(List userIds) { + public List selectByUserIds(List userIds) { if (userIds == null || userIds.isEmpty()) { return Collections.emptyList(); } return dslContext .select(USER_ROLE.fields()).from(USER_ROLE).where(USER_ROLE.USER_ID.in(userIds)) - .fetchInto(UserRolePojo.class); + .fetchInto(UserRole.class); } } diff --git a/dao/src/main/java/com/databasir/dao/strategy/DatabasirPojoNamingStrategy.java b/dao/src/main/java/com/databasir/dao/strategy/DatabasirPojoNamingStrategy.java index 32edd1a..2d461bc 100644 --- a/dao/src/main/java/com/databasir/dao/strategy/DatabasirPojoNamingStrategy.java +++ b/dao/src/main/java/com/databasir/dao/strategy/DatabasirPojoNamingStrategy.java @@ -2,20 +2,21 @@ package com.databasir.dao.strategy; import org.jooq.codegen.DefaultGeneratorStrategy; import org.jooq.meta.Definition; +import org.jooq.meta.TableDefinition; public class DatabasirPojoNamingStrategy extends DefaultGeneratorStrategy { @Override public String getJavaClassName(Definition definition, Mode mode) { - if (mode == Mode.POJO) { + if (mode == Mode.DEFAULT && definition instanceof TableDefinition) { String javaClassName = super.getJavaClassName(definition, mode); - if (javaClassName.endsWith("Pojo")) { + if (javaClassName.endsWith("Table")) { return javaClassName; } else { - return javaClassName + "Pojo"; + return javaClassName + "Table"; } - } else { - return super.getJavaClassName(definition, mode); } + + return super.getJavaClassName(definition, mode); } } diff --git a/dao/src/main/resources/db/init/init.sql b/dao/src/main/resources/db/init/init.sql index 64db82d..40470d3 100644 --- a/dao/src/main/resources/db/init/init.sql +++ b/dao/src/main/resources/db/init/init.sql @@ -413,3 +413,24 @@ CREATE TABLE document_full_text FULLTEXT fidx_group (group_name, group_description) WITH PARSER ngram ) CHARSET utf8mb4 COLLATE utf8mb4_unicode_ci; + +CREATE TABLE aggregate +( + id INT PRIMARY KEY NOT NULL, + name VARCHAR(255) NOT NULL, + project_id INT NOT NULL COMMENT 'ref to project.id', + update_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, + create_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP, + INDEX idx_project_id (project_id) +) CHARSET utf8mb4 + COLLATE utf8mb4_unicode_ci COMMENT 'aggregate means a group of table_documents'; + +CREATE TABLE table_document_aggregate +( + id INT PRIMARY KEY NOT NULL, + aggregate_id INT NOT NULL COMMENT 'ref to aggregate.id', + table_name TEXT NOT NULL COMMENT 'ref to table_document.name', + create_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP, + INDEX idx_aggregate_id (aggregate_id) +) CHARSET utf8mb4 + COLLATE utf8mb4_unicode_ci COMMENT '`table document` and `aggregate` relation';