From 7cec021f9624ba2ad62c31ff496fbf6f949b95ca Mon Sep 17 00:00:00 2001 From: trydofor Date: Sat, 3 Feb 2024 19:23:12 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=F0=9F=94=A7=20clearly=20optional=20deps=20?= =?UTF-8?q?#202?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 3 ++- wings/slardar-hazel-session/pom.xml | 4 ++-- .../slardar/spring/bean/SlardarActuatorConfiguration.java | 2 ++ wings/slardar-webmvc/pom.xml | 2 +- wings/slardar/pom.xml | 2 +- 5 files changed, 8 insertions(+), 5 deletions(-) diff --git a/pom.xml b/pom.xml index f1186b9fd..1e54d3ad3 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ org.springframework.boot spring-boot-starter-parent - 3.2.1 + 3.2.2 @@ -24,6 +24,7 @@ 3.2.110-SNAPSHOT 3.2.2 + ${revision} ${highest-basedir} diff --git a/wings/slardar-hazel-session/pom.xml b/wings/slardar-hazel-session/pom.xml index 65fe6956a..a2dcff66a 100644 --- a/wings/slardar-hazel-session/pom.xml +++ b/wings/slardar-hazel-session/pom.xml @@ -25,12 +25,12 @@ pro.fessional.wings slardar-webmvc + org.springframework.boot spring-boot-starter-security - true + test - pro.fessional.wings testing-slardar diff --git a/wings/slardar-sprint/src/main/java/pro/fessional/wings/slardar/spring/bean/SlardarActuatorConfiguration.java b/wings/slardar-sprint/src/main/java/pro/fessional/wings/slardar/spring/bean/SlardarActuatorConfiguration.java index 0a8f08005..46ace97cb 100644 --- a/wings/slardar-sprint/src/main/java/pro/fessional/wings/slardar/spring/bean/SlardarActuatorConfiguration.java +++ b/wings/slardar-sprint/src/main/java/pro/fessional/wings/slardar/spring/bean/SlardarActuatorConfiguration.java @@ -3,6 +3,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.springframework.boot.actuate.autoconfigure.endpoint.condition.ConditionalOnAvailableEndpoint; +import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; import org.springframework.cache.CacheManager; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @@ -18,6 +19,7 @@ */ @Configuration(proxyBeanMethods = false) @ConditionalWingsEnabled +@ConditionalOnClass(ConditionalOnAvailableEndpoint.class) public class SlardarActuatorConfiguration { private final static Log log = LogFactory.getLog(SlardarActuatorConfiguration.class); diff --git a/wings/slardar-webmvc/pom.xml b/wings/slardar-webmvc/pom.xml index c74c71027..7cc195bfa 100644 --- a/wings/slardar-webmvc/pom.xml +++ b/wings/slardar-webmvc/pom.xml @@ -34,7 +34,7 @@ org.springframework.boot spring-boot-starter-undertow - + org.springframework.data spring-data-commons diff --git a/wings/slardar/pom.xml b/wings/slardar/pom.xml index e39c1ee15..32d2bbc62 100644 --- a/wings/slardar/pom.xml +++ b/wings/slardar/pom.xml @@ -96,7 +96,7 @@ commons-codec commons-codec - + io.sentry sentry-spring-boot-starter-jakarta From 36c94aa519ceee24240425a85ccc49853a179916 Mon Sep 17 00:00:00 2001 From: trydofor Date: Mon, 5 Feb 2024 17:03:00 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E2=99=BB=EF=B8=8F=20merge=20awesome=20and?= =?UTF-8?q?=20autogen=20#203?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- example/winx-common/pom.xml | 2 +- observe/docs | 2 +- observe/scripts/wings-testing.sh | 85 +++++++++++++++++++ pom.xml | 31 ++----- .../wings/devs/init/AutogenCodeTest.java | 29 ++++--- .../wings/devs/init/DatabaseWingsTest.java | 6 +- radiant/devs-coverage/pom.xml | 16 +--- radiant/pom.xml | 1 - radiant/tiny-autogen/pom.xml | 24 ------ radiant/tiny-mail/pom.xml | 4 - .../tiny/mail/database/TinyMailDatabase.java | 0 .../autogen/DefaultCatalogTinyMail.java | 0 .../autogen/DefaultSchemaTinyMail.java | 0 .../mail/database/autogen/TablesTinyMail.java | 0 .../autogen/tables/WinMailSenderTable.java | 0 .../autogen/tables/daos/WinMailSenderDao.java | 0 .../tables/interfaces/IWinMailSender.java | 0 .../autogen/tables/pojos/WinMailSender.java | 0 .../tables/records/WinMailSenderRecord.java | 0 radiant/tiny-task/pom.xml | 4 - .../tiny/task/database/TinyTaskDatabase.java | 0 .../autogen/DefaultCatalogTinyTask.java | 0 .../autogen/DefaultSchemaTinyTask.java | 0 .../task/database/autogen/TablesTinyTask.java | 0 .../autogen/tables/WinTaskDefineTable.java | 0 .../autogen/tables/WinTaskResultTable.java | 0 .../autogen/tables/daos/WinTaskDefineDao.java | 0 .../autogen/tables/daos/WinTaskResultDao.java | 0 .../tables/interfaces/IWinTaskDefine.java | 0 .../tables/interfaces/IWinTaskResult.java | 0 .../autogen/tables/pojos/WinTaskDefine.java | 0 .../autogen/tables/pojos/WinTaskResult.java | 0 .../tables/records/WinTaskDefineRecord.java | 0 .../tables/records/WinTaskResultRecord.java | 0 wings/faceless-autogen/pom.xml | 25 ------ wings/faceless-awesome/pom.xml | 30 ------- .../app/TestFacelessAwesomeApplication.java | 15 ---- .../codegen/ConstantEnumGenerator.java | 2 +- .../codegen/ConstantNaviGenerator.java | 5 +- .../sample/ConstantEnumGenSample.java | 2 +- wings/faceless-jooq/pom.xml | 2 +- wings/faceless-shard/pom.xml | 2 +- .../enums/autogen/StandardLanguage.java | 0 .../enums/autogen/StandardTimezone.java | 0 .../converter/WingsEnumConverters.java | 0 .../converter/WingsEnumConvertersTest.java | 0 .../faceless/enums/ConstantEnumI18nTest.java | 23 ++++- .../faceless/enums/ConstantEnumUtilTest.java | 13 +-- .../faceless/enums/LanguageEnumUtilTest.java | 3 +- wings/pom.xml | 4 - wings/warlock-autogen/pom.xml | 25 ------ wings/warlock-awesome/pom.xml | 31 ------- ...itional-spring-configuration-metadata.json | 15 ---- ...ot.autoconfigure.AutoConfiguration.imports | 1 - .../app/TestWarlockAwesomeApplication.java | 17 ---- wings/warlock-codegen/pom.xml | 2 +- .../project/Warlock2EnumGenerator.java | 2 +- .../project/Warlock3JooqGenerator.java | 2 +- .../project/Warlock4AuthGenerator.java | 2 +- .../project/TestWarlock0CodegenConstant.java | 2 +- wings/warlock-shadow/pom.xml | 2 +- .../warlock/database/WarlockDatabase.java | 0 .../autogen/DefaultCatalogWarlock.java | 0 .../autogen/DefaultSchemaWarlock.java | 0 .../database/autogen/TablesWarlock.java | 0 .../autogen/tables/SysConstantEnumTable.java | 0 .../autogen/tables/SysStandardI18nTable.java | 0 .../autogen/tables/WinConfRuntimeTable.java | 0 .../autogen/tables/WinPermEntryTable.java | 0 .../autogen/tables/WinRoleEntryTable.java | 0 .../autogen/tables/WinRoleGrantTable.java | 0 .../autogen/tables/WinUserAuthnTable.java | 0 .../autogen/tables/WinUserBasisTable.java | 0 .../autogen/tables/WinUserGrantTable.java | 0 .../autogen/tables/WinUserLoginTable.java | 0 .../tables/daos/SysConstantEnumDao.java | 0 .../tables/daos/SysStandardI18nDao.java | 0 .../tables/daos/WinConfRuntimeDao.java | 0 .../autogen/tables/daos/WinPermEntryDao.java | 0 .../autogen/tables/daos/WinRoleEntryDao.java | 0 .../autogen/tables/daos/WinRoleGrantDao.java | 0 .../autogen/tables/daos/WinUserAuthnDao.java | 0 .../autogen/tables/daos/WinUserBasisDao.java | 0 .../autogen/tables/daos/WinUserGrantDao.java | 0 .../autogen/tables/daos/WinUserLoginDao.java | 0 .../tables/interfaces/ISysConstantEnum.java | 0 .../tables/interfaces/ISysStandardI18n.java | 0 .../tables/interfaces/IWinConfRuntime.java | 0 .../tables/interfaces/IWinPermEntry.java | 0 .../tables/interfaces/IWinRoleEntry.java | 0 .../tables/interfaces/IWinRoleGrant.java | 0 .../tables/interfaces/IWinUserAuthn.java | 0 .../tables/interfaces/IWinUserBasis.java | 0 .../tables/interfaces/IWinUserGrant.java | 0 .../tables/interfaces/IWinUserLogin.java | 0 .../autogen/tables/pojos/SysConstantEnum.java | 0 .../autogen/tables/pojos/SysStandardI18n.java | 0 .../autogen/tables/pojos/WinConfRuntime.java | 0 .../autogen/tables/pojos/WinPermEntry.java | 0 .../autogen/tables/pojos/WinRoleEntry.java | 0 .../autogen/tables/pojos/WinRoleGrant.java | 0 .../autogen/tables/pojos/WinUserAuthn.java | 0 .../autogen/tables/pojos/WinUserBasis.java | 0 .../autogen/tables/pojos/WinUserGrant.java | 0 .../autogen/tables/pojos/WinUserLogin.java | 0 .../tables/records/SysConstantEnumRecord.java | 0 .../tables/records/SysStandardI18nRecord.java | 0 .../tables/records/WinConfRuntimeRecord.java | 0 .../tables/records/WinPermEntryRecord.java | 0 .../tables/records/WinRoleEntryRecord.java | 0 .../tables/records/WinRoleGrantRecord.java | 0 .../tables/records/WinUserAuthnRecord.java | 0 .../tables/records/WinUserBasisRecord.java | 0 .../tables/records/WinUserGrantRecord.java | 0 .../tables/records/WinUserLoginRecord.java | 0 .../warlock/enums/autogen/GrantType.java | 5 +- .../warlock/enums/autogen/UserGender.java | 5 +- .../warlock/enums/autogen/UserStatus.java | 5 +- .../security/autogen/PermConstant.java | 5 +- .../security/autogen/RoleConstant.java | 5 +- .../service/conf/RuntimeConfService.java | 0 .../conf/impl/RuntimeConfServiceImpl.java | 0 .../service/grant/WarlockGrantService.java | 0 .../grant/impl/WarlockGrantServiceDummy.java | 0 .../bean/WarlockAwesomeConfiguration.java | 0 .../spring/conf/WarlockAutoConfiguration.java | 2 + .../conf/WarlockAwesomeAutoConfiguration.java | 0 ...itional-spring-configuration-metadata.json | 5 ++ .../service/conf/RuntimeConfServiceTest.java | 0 129 files changed, 188 insertions(+), 275 deletions(-) create mode 100644 observe/scripts/wings-testing.sh delete mode 100644 radiant/tiny-autogen/pom.xml rename radiant/{tiny-autogen/src/main/java => tiny-mail/src/main/java-gen}/pro/fessional/wings/tiny/mail/database/TinyMailDatabase.java (100%) rename radiant/{tiny-autogen/src/main/java => tiny-mail/src/main/java-gen}/pro/fessional/wings/tiny/mail/database/autogen/DefaultCatalogTinyMail.java (100%) rename radiant/{tiny-autogen/src/main/java => tiny-mail/src/main/java-gen}/pro/fessional/wings/tiny/mail/database/autogen/DefaultSchemaTinyMail.java (100%) rename radiant/{tiny-autogen/src/main/java => tiny-mail/src/main/java-gen}/pro/fessional/wings/tiny/mail/database/autogen/TablesTinyMail.java (100%) rename radiant/{tiny-autogen/src/main/java => tiny-mail/src/main/java-gen}/pro/fessional/wings/tiny/mail/database/autogen/tables/WinMailSenderTable.java (100%) rename radiant/{tiny-autogen/src/main/java => tiny-mail/src/main/java-gen}/pro/fessional/wings/tiny/mail/database/autogen/tables/daos/WinMailSenderDao.java (100%) rename radiant/{tiny-autogen/src/main/java => tiny-mail/src/main/java-gen}/pro/fessional/wings/tiny/mail/database/autogen/tables/interfaces/IWinMailSender.java (100%) rename radiant/{tiny-autogen/src/main/java => tiny-mail/src/main/java-gen}/pro/fessional/wings/tiny/mail/database/autogen/tables/pojos/WinMailSender.java (100%) rename radiant/{tiny-autogen/src/main/java => tiny-mail/src/main/java-gen}/pro/fessional/wings/tiny/mail/database/autogen/tables/records/WinMailSenderRecord.java (100%) rename radiant/{tiny-autogen/src/main/java => tiny-task/src/main/java-gen}/pro/fessional/wings/tiny/task/database/TinyTaskDatabase.java (100%) rename radiant/{tiny-autogen/src/main/java => tiny-task/src/main/java-gen}/pro/fessional/wings/tiny/task/database/autogen/DefaultCatalogTinyTask.java (100%) rename radiant/{tiny-autogen/src/main/java => tiny-task/src/main/java-gen}/pro/fessional/wings/tiny/task/database/autogen/DefaultSchemaTinyTask.java (100%) rename radiant/{tiny-autogen/src/main/java => tiny-task/src/main/java-gen}/pro/fessional/wings/tiny/task/database/autogen/TablesTinyTask.java (100%) rename radiant/{tiny-autogen/src/main/java => tiny-task/src/main/java-gen}/pro/fessional/wings/tiny/task/database/autogen/tables/WinTaskDefineTable.java (100%) rename radiant/{tiny-autogen/src/main/java => tiny-task/src/main/java-gen}/pro/fessional/wings/tiny/task/database/autogen/tables/WinTaskResultTable.java (100%) rename radiant/{tiny-autogen/src/main/java => tiny-task/src/main/java-gen}/pro/fessional/wings/tiny/task/database/autogen/tables/daos/WinTaskDefineDao.java (100%) rename radiant/{tiny-autogen/src/main/java => tiny-task/src/main/java-gen}/pro/fessional/wings/tiny/task/database/autogen/tables/daos/WinTaskResultDao.java (100%) rename radiant/{tiny-autogen/src/main/java => tiny-task/src/main/java-gen}/pro/fessional/wings/tiny/task/database/autogen/tables/interfaces/IWinTaskDefine.java (100%) rename radiant/{tiny-autogen/src/main/java => tiny-task/src/main/java-gen}/pro/fessional/wings/tiny/task/database/autogen/tables/interfaces/IWinTaskResult.java (100%) rename radiant/{tiny-autogen/src/main/java => tiny-task/src/main/java-gen}/pro/fessional/wings/tiny/task/database/autogen/tables/pojos/WinTaskDefine.java (100%) rename radiant/{tiny-autogen/src/main/java => tiny-task/src/main/java-gen}/pro/fessional/wings/tiny/task/database/autogen/tables/pojos/WinTaskResult.java (100%) rename radiant/{tiny-autogen/src/main/java => tiny-task/src/main/java-gen}/pro/fessional/wings/tiny/task/database/autogen/tables/records/WinTaskDefineRecord.java (100%) rename radiant/{tiny-autogen/src/main/java => tiny-task/src/main/java-gen}/pro/fessional/wings/tiny/task/database/autogen/tables/records/WinTaskResultRecord.java (100%) delete mode 100644 wings/faceless-autogen/pom.xml delete mode 100644 wings/faceless-awesome/pom.xml delete mode 100644 wings/faceless-awesome/src/test/java/pro/fessional/wings/faceless/app/TestFacelessAwesomeApplication.java rename wings/{faceless-autogen/src/main/java => faceless/src/main/java-gen}/pro/fessional/wings/faceless/enums/autogen/StandardLanguage.java (100%) rename wings/{faceless-autogen/src/main/java => faceless/src/main/java-gen}/pro/fessional/wings/faceless/enums/autogen/StandardTimezone.java (100%) rename wings/{faceless-awesome => faceless}/src/main/java/pro/fessional/wings/faceless/converter/WingsEnumConverters.java (100%) rename wings/{faceless-awesome => faceless}/src/test/java/pro/fessional/wings/faceless/converter/WingsEnumConvertersTest.java (100%) rename wings/{faceless-awesome => faceless}/src/test/java/pro/fessional/wings/faceless/enums/ConstantEnumI18nTest.java (74%) rename wings/{faceless-awesome => faceless}/src/test/java/pro/fessional/wings/faceless/enums/ConstantEnumUtilTest.java (80%) rename wings/{faceless-awesome => faceless}/src/test/java/pro/fessional/wings/faceless/enums/LanguageEnumUtilTest.java (87%) delete mode 100644 wings/warlock-autogen/pom.xml delete mode 100644 wings/warlock-awesome/pom.xml delete mode 100644 wings/warlock-awesome/src/main/resources/META-INF/additional-spring-configuration-metadata.json delete mode 100644 wings/warlock-awesome/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports delete mode 100644 wings/warlock-awesome/src/test/java/pro/fessional/wings/warlock/app/TestWarlockAwesomeApplication.java rename wings/{warlock-autogen/src/main/java => warlock/src/main/java-gen}/pro/fessional/wings/warlock/database/WarlockDatabase.java (100%) rename wings/{warlock-autogen/src/main/java => warlock/src/main/java-gen}/pro/fessional/wings/warlock/database/autogen/DefaultCatalogWarlock.java (100%) rename wings/{warlock-autogen/src/main/java => warlock/src/main/java-gen}/pro/fessional/wings/warlock/database/autogen/DefaultSchemaWarlock.java (100%) rename wings/{warlock-autogen/src/main/java => warlock/src/main/java-gen}/pro/fessional/wings/warlock/database/autogen/TablesWarlock.java (100%) rename wings/{warlock-autogen/src/main/java => warlock/src/main/java-gen}/pro/fessional/wings/warlock/database/autogen/tables/SysConstantEnumTable.java (100%) rename wings/{warlock-autogen/src/main/java => warlock/src/main/java-gen}/pro/fessional/wings/warlock/database/autogen/tables/SysStandardI18nTable.java (100%) rename wings/{warlock-autogen/src/main/java => warlock/src/main/java-gen}/pro/fessional/wings/warlock/database/autogen/tables/WinConfRuntimeTable.java (100%) rename wings/{warlock-autogen/src/main/java => warlock/src/main/java-gen}/pro/fessional/wings/warlock/database/autogen/tables/WinPermEntryTable.java (100%) rename wings/{warlock-autogen/src/main/java => warlock/src/main/java-gen}/pro/fessional/wings/warlock/database/autogen/tables/WinRoleEntryTable.java (100%) rename wings/{warlock-autogen/src/main/java => warlock/src/main/java-gen}/pro/fessional/wings/warlock/database/autogen/tables/WinRoleGrantTable.java (100%) rename wings/{warlock-autogen/src/main/java => warlock/src/main/java-gen}/pro/fessional/wings/warlock/database/autogen/tables/WinUserAuthnTable.java (100%) rename wings/{warlock-autogen/src/main/java => warlock/src/main/java-gen}/pro/fessional/wings/warlock/database/autogen/tables/WinUserBasisTable.java (100%) rename wings/{warlock-autogen/src/main/java => warlock/src/main/java-gen}/pro/fessional/wings/warlock/database/autogen/tables/WinUserGrantTable.java (100%) rename wings/{warlock-autogen/src/main/java => warlock/src/main/java-gen}/pro/fessional/wings/warlock/database/autogen/tables/WinUserLoginTable.java (100%) rename wings/{warlock-autogen/src/main/java => warlock/src/main/java-gen}/pro/fessional/wings/warlock/database/autogen/tables/daos/SysConstantEnumDao.java (100%) rename wings/{warlock-autogen/src/main/java => warlock/src/main/java-gen}/pro/fessional/wings/warlock/database/autogen/tables/daos/SysStandardI18nDao.java (100%) rename wings/{warlock-autogen/src/main/java => warlock/src/main/java-gen}/pro/fessional/wings/warlock/database/autogen/tables/daos/WinConfRuntimeDao.java (100%) rename wings/{warlock-autogen/src/main/java => warlock/src/main/java-gen}/pro/fessional/wings/warlock/database/autogen/tables/daos/WinPermEntryDao.java (100%) rename wings/{warlock-autogen/src/main/java => warlock/src/main/java-gen}/pro/fessional/wings/warlock/database/autogen/tables/daos/WinRoleEntryDao.java (100%) rename wings/{warlock-autogen/src/main/java => warlock/src/main/java-gen}/pro/fessional/wings/warlock/database/autogen/tables/daos/WinRoleGrantDao.java (100%) rename wings/{warlock-autogen/src/main/java => warlock/src/main/java-gen}/pro/fessional/wings/warlock/database/autogen/tables/daos/WinUserAuthnDao.java (100%) rename wings/{warlock-autogen/src/main/java => warlock/src/main/java-gen}/pro/fessional/wings/warlock/database/autogen/tables/daos/WinUserBasisDao.java (100%) rename wings/{warlock-autogen/src/main/java => warlock/src/main/java-gen}/pro/fessional/wings/warlock/database/autogen/tables/daos/WinUserGrantDao.java (100%) rename wings/{warlock-autogen/src/main/java => warlock/src/main/java-gen}/pro/fessional/wings/warlock/database/autogen/tables/daos/WinUserLoginDao.java (100%) rename wings/{warlock-autogen/src/main/java => warlock/src/main/java-gen}/pro/fessional/wings/warlock/database/autogen/tables/interfaces/ISysConstantEnum.java (100%) rename wings/{warlock-autogen/src/main/java => warlock/src/main/java-gen}/pro/fessional/wings/warlock/database/autogen/tables/interfaces/ISysStandardI18n.java (100%) rename wings/{warlock-autogen/src/main/java => warlock/src/main/java-gen}/pro/fessional/wings/warlock/database/autogen/tables/interfaces/IWinConfRuntime.java (100%) rename wings/{warlock-autogen/src/main/java => warlock/src/main/java-gen}/pro/fessional/wings/warlock/database/autogen/tables/interfaces/IWinPermEntry.java (100%) rename wings/{warlock-autogen/src/main/java => warlock/src/main/java-gen}/pro/fessional/wings/warlock/database/autogen/tables/interfaces/IWinRoleEntry.java (100%) rename wings/{warlock-autogen/src/main/java => warlock/src/main/java-gen}/pro/fessional/wings/warlock/database/autogen/tables/interfaces/IWinRoleGrant.java (100%) rename wings/{warlock-autogen/src/main/java => warlock/src/main/java-gen}/pro/fessional/wings/warlock/database/autogen/tables/interfaces/IWinUserAuthn.java (100%) rename wings/{warlock-autogen/src/main/java => warlock/src/main/java-gen}/pro/fessional/wings/warlock/database/autogen/tables/interfaces/IWinUserBasis.java (100%) rename wings/{warlock-autogen/src/main/java => warlock/src/main/java-gen}/pro/fessional/wings/warlock/database/autogen/tables/interfaces/IWinUserGrant.java (100%) rename wings/{warlock-autogen/src/main/java => warlock/src/main/java-gen}/pro/fessional/wings/warlock/database/autogen/tables/interfaces/IWinUserLogin.java (100%) rename wings/{warlock-autogen/src/main/java => warlock/src/main/java-gen}/pro/fessional/wings/warlock/database/autogen/tables/pojos/SysConstantEnum.java (100%) rename wings/{warlock-autogen/src/main/java => warlock/src/main/java-gen}/pro/fessional/wings/warlock/database/autogen/tables/pojos/SysStandardI18n.java (100%) rename wings/{warlock-autogen/src/main/java => warlock/src/main/java-gen}/pro/fessional/wings/warlock/database/autogen/tables/pojos/WinConfRuntime.java (100%) rename wings/{warlock-autogen/src/main/java => warlock/src/main/java-gen}/pro/fessional/wings/warlock/database/autogen/tables/pojos/WinPermEntry.java (100%) rename wings/{warlock-autogen/src/main/java => warlock/src/main/java-gen}/pro/fessional/wings/warlock/database/autogen/tables/pojos/WinRoleEntry.java (100%) rename wings/{warlock-autogen/src/main/java => warlock/src/main/java-gen}/pro/fessional/wings/warlock/database/autogen/tables/pojos/WinRoleGrant.java (100%) rename wings/{warlock-autogen/src/main/java => warlock/src/main/java-gen}/pro/fessional/wings/warlock/database/autogen/tables/pojos/WinUserAuthn.java (100%) rename wings/{warlock-autogen/src/main/java => warlock/src/main/java-gen}/pro/fessional/wings/warlock/database/autogen/tables/pojos/WinUserBasis.java (100%) rename wings/{warlock-autogen/src/main/java => warlock/src/main/java-gen}/pro/fessional/wings/warlock/database/autogen/tables/pojos/WinUserGrant.java (100%) rename wings/{warlock-autogen/src/main/java => warlock/src/main/java-gen}/pro/fessional/wings/warlock/database/autogen/tables/pojos/WinUserLogin.java (100%) rename wings/{warlock-autogen/src/main/java => warlock/src/main/java-gen}/pro/fessional/wings/warlock/database/autogen/tables/records/SysConstantEnumRecord.java (100%) rename wings/{warlock-autogen/src/main/java => warlock/src/main/java-gen}/pro/fessional/wings/warlock/database/autogen/tables/records/SysStandardI18nRecord.java (100%) rename wings/{warlock-autogen/src/main/java => warlock/src/main/java-gen}/pro/fessional/wings/warlock/database/autogen/tables/records/WinConfRuntimeRecord.java (100%) rename wings/{warlock-autogen/src/main/java => warlock/src/main/java-gen}/pro/fessional/wings/warlock/database/autogen/tables/records/WinPermEntryRecord.java (100%) rename wings/{warlock-autogen/src/main/java => warlock/src/main/java-gen}/pro/fessional/wings/warlock/database/autogen/tables/records/WinRoleEntryRecord.java (100%) rename wings/{warlock-autogen/src/main/java => warlock/src/main/java-gen}/pro/fessional/wings/warlock/database/autogen/tables/records/WinRoleGrantRecord.java (100%) rename wings/{warlock-autogen/src/main/java => warlock/src/main/java-gen}/pro/fessional/wings/warlock/database/autogen/tables/records/WinUserAuthnRecord.java (100%) rename wings/{warlock-autogen/src/main/java => warlock/src/main/java-gen}/pro/fessional/wings/warlock/database/autogen/tables/records/WinUserBasisRecord.java (100%) rename wings/{warlock-autogen/src/main/java => warlock/src/main/java-gen}/pro/fessional/wings/warlock/database/autogen/tables/records/WinUserGrantRecord.java (100%) rename wings/{warlock-autogen/src/main/java => warlock/src/main/java-gen}/pro/fessional/wings/warlock/database/autogen/tables/records/WinUserLoginRecord.java (100%) rename wings/{warlock-autogen/src/main/java => warlock/src/main/java-gen}/pro/fessional/wings/warlock/enums/autogen/GrantType.java (96%) rename wings/{warlock-autogen/src/main/java => warlock/src/main/java-gen}/pro/fessional/wings/warlock/enums/autogen/UserGender.java (96%) rename wings/{warlock-autogen/src/main/java => warlock/src/main/java-gen}/pro/fessional/wings/warlock/enums/autogen/UserStatus.java (97%) rename wings/{warlock-autogen/src/main/java => warlock/src/main/java-gen}/pro/fessional/wings/warlock/security/autogen/PermConstant.java (94%) rename wings/{warlock-autogen/src/main/java => warlock/src/main/java-gen}/pro/fessional/wings/warlock/security/autogen/RoleConstant.java (85%) rename wings/{warlock-awesome => warlock}/src/main/java/pro/fessional/wings/warlock/service/conf/RuntimeConfService.java (100%) rename wings/{warlock-awesome => warlock}/src/main/java/pro/fessional/wings/warlock/service/conf/impl/RuntimeConfServiceImpl.java (100%) rename wings/{warlock-awesome => warlock}/src/main/java/pro/fessional/wings/warlock/service/grant/WarlockGrantService.java (100%) rename wings/{warlock-awesome => warlock}/src/main/java/pro/fessional/wings/warlock/service/grant/impl/WarlockGrantServiceDummy.java (100%) rename wings/{warlock-awesome => warlock}/src/main/java/pro/fessional/wings/warlock/spring/bean/WarlockAwesomeConfiguration.java (100%) rename wings/{warlock-awesome => warlock}/src/main/java/pro/fessional/wings/warlock/spring/conf/WarlockAwesomeAutoConfiguration.java (100%) rename wings/{warlock-awesome => warlock}/src/test/java/pro/fessional/wings/warlock/service/conf/RuntimeConfServiceTest.java (100%) diff --git a/example/winx-common/pom.xml b/example/winx-common/pom.xml index 80dcd24e6..66d32350e 100644 --- a/example/winx-common/pom.xml +++ b/example/winx-common/pom.xml @@ -31,7 +31,7 @@ pro.fessional.wings - warlock-awesome + warlock de.codecentric diff --git a/observe/docs b/observe/docs index 06bb5aa54..17cd2602a 160000 --- a/observe/docs +++ b/observe/docs @@ -1 +1 @@ -Subproject commit 06bb5aa5408aa821f4d52d3bd913e9617def8330 +Subproject commit 17cd2602a99a33c8e28ab2d341be0d4d8fdf1cea diff --git a/observe/scripts/wings-testing.sh b/observe/scripts/wings-testing.sh new file mode 100644 index 000000000..af36f15d1 --- /dev/null +++ b/observe/scripts/wings-testing.sh @@ -0,0 +1,85 @@ +#!/bin/bash + +# check maven 3.5+ +_ver_mvn=$(mvn --version | awk -F ' ' '/Apache Maven/ {print $3}') +IFS='.' read -r -a ptv <<< "$_ver_mvn" +if ((ptv[0] < 3)) || ((ptv[0] == 3 && ptv[1] < 9)); then + echo -e "\033[31mREQUIRE maven 3.9+, but $_ver_mvn \033[0m" + echo -e "asdf install maven 3.9.6[0m" + exit +fi + +# check java 21+ +_ver_jdk=$(java -version 2>&1 | awk -F '"' '/version/ {print $2}') +IFS='.' read -r -a ptj <<< "$_ver_jdk" +if ((ptj[0] < 21)); then + echo -e "\033[31mREQUIRE java 21+, but $_ver_jdk \033[0m" + echo "asdf install java temurin-21.0.1+12.0.LTS" + exit +fi + +if [[ "$MAVEN_OPTS" == "" ]]; then + MAVEN_OPTS="-Xmx2g" +fi + +if [[ "$LOG_LEVEL" == "" ]]; then + echo -e "\033[32m log level (INFO)? [INFO|DEBUG|WARN|ERROR]\033[m" + read -r _ans 1.18.20.0 ${project.basedir}/src/main/java + ${project.basedir}/src/main/java-gen ${project.basedir}/src/main/kotlin + ${project.basedir}/src/main/kotlin-gen ${project.basedir}/src/test/java ${project.basedir}/src/test/kotlin @@ -159,16 +161,6 @@ faceless ${wings.version} - - pro.fessional.wings - faceless-autogen - ${wings.version} - - - pro.fessional.wings - faceless-awesome - ${wings.version} - pro.fessional.wings faceless-flywave @@ -219,16 +211,6 @@ warlock ${wings.version} - - pro.fessional.wings - warlock-autogen - ${wings.version} - - - pro.fessional.wings - warlock-awesome - ${wings.version} - pro.fessional.wings warlock-bond @@ -285,11 +267,6 @@ ${wings.version} - - pro.fessional.wings - tiny-autogen - ${wings.version} - pro.fessional.wings tiny-task @@ -762,7 +739,9 @@ ${source.srcMainKotlin} + ${source.srcMainKotlinGen} ${source.srcMainJava} + ${source.srcMainJavaGen} @@ -979,7 +958,9 @@ ${source.srcMainKotlin} + ${source.srcMainKotlinGen} ${source.srcMainJava} + ${source.srcMainJavaGen} diff --git a/radiant/devs-codegen/src/test/java/pro/fessional/wings/devs/init/AutogenCodeTest.java b/radiant/devs-codegen/src/test/java/pro/fessional/wings/devs/init/AutogenCodeTest.java index 1a71dded9..aeedd9f89 100644 --- a/radiant/devs-codegen/src/test/java/pro/fessional/wings/devs/init/AutogenCodeTest.java +++ b/radiant/devs-codegen/src/test/java/pro/fessional/wings/devs/init/AutogenCodeTest.java @@ -26,7 +26,7 @@ * @author trydofor * @since 2023-01-23 */ -@SpringBootTest +@SpringBootTest(properties = "testing.dbname=wings") @EnabledIfSystemProperty(named = "devs-autogen", matches = "true") @TestMethodOrder(MethodOrderer.MethodName.class) public class AutogenCodeTest { @@ -51,17 +51,17 @@ void autogen01AllTestJooq() { void autogen01AllMainCode() { autogen01AllMainJooq(); - autogen10FacelessAutogen();// faceless-autogen/enums - autogen20WarlockAutogenEnum();// warlock-autogen/enums - autogen20WarlockAutogenAuth();// warlock-autogen/security + autogen10FacelessAutogen();// faceless/enums + autogen20WarlockAutogenEnum();// warlock/enums + autogen20WarlockAutogenAuth();// warlock/security } @Test @Disabled("call by autogen01AllMainCode") void autogen01AllMainJooq() { - autogen21WarlockAutogenJooq();// warlock-autogen/database - autogen31TinyMailAutogenJooq();// tiny-autogen/mail - autogen31TinyTaskAutogenJooq();// tiny-autogen/task + autogen21WarlockAutogenJooq();// warlock/database + autogen31TinyMailAutogenJooq();// tiny/mail + autogen31TinyTaskAutogenJooq();// tiny/task } // ////////////////// individual test ////////////////// @@ -72,7 +72,7 @@ void autogen10FacelessAutogen() { final JdbcDataLoadHelper helper = JdbcDataLoadHelper.use(dataSource); final List enums = ConstantEnumJdbcLoader.load(helper); ConstantEnumGenerator.builder() - .targetDirectory(projectRoot + "wings/faceless-autogen/src/main/java/") + .targetDirectory(projectRoot + "wings/faceless/src/main/java-gen/") .targetPackage("pro.fessional.wings.faceless.enums.autogen") .includeType(ProjectEnumGenerator.facelessEnums) .generate(enums); @@ -105,7 +105,8 @@ void autogen11FacelessShardTest() { @Disabled("call by autogen01AllMainCode") void autogen20WarlockAutogenEnum() { Warlock2EnumGenerator generator = new Warlock2EnumGenerator(); - generator.setTargetDir(projectRoot + "wings/warlock-autogen/src/main/java/"); + generator.setTargetDir(projectRoot + "wings/warlock/src/main/java-gen/"); + generator.setTargetPkg("pro.fessional.wings.warlock.enums.autogen"); generator.gen(jdbcUrl, jdbcUser, jdbcPass, h -> h.includeType(Warlock2EnumGenerator.warlockEnums)); } @@ -115,7 +116,8 @@ void autogen20WarlockAutogenEnum() { void autogen20WarlockAutogenAuth() { JdbcDataLoadHelper helper = JdbcDataLoadHelper.use(jdbcUrl, jdbcUser, jdbcPass); Warlock4AuthGenerator generator = new Warlock4AuthGenerator(); - generator.setTargetDir(projectRoot + "wings/warlock-autogen/src/main/java/"); + generator.setTargetDir(projectRoot + "wings/warlock/src/main/java-gen/"); + generator.setTargetPkg("pro.fessional.wings.warlock.security.autogen"); generator.genPerm(helper); generator.genRole(helper); } @@ -124,7 +126,8 @@ void autogen20WarlockAutogenAuth() { @Disabled("call by autogen01AllMainJooq") void autogen21WarlockAutogenJooq() { Warlock3JooqGenerator generator = new Warlock3JooqGenerator(); - generator.setTargetDir(projectRoot + "wings/warlock-autogen/src/main/java/"); + generator.setTargetDir(projectRoot + "wings/warlock/src/main/java-gen/"); + generator.setTargetPkg("pro.fessional.wings.warlock.database.autogen"); generator.gen(jdbcUrl, jdbcUser, jdbcPass, Warlock3JooqGenerator.includeWarlockBase(false), Warlock3JooqGenerator.includeWarlockBond(true), @@ -135,7 +138,7 @@ void autogen21WarlockAutogenJooq() { @Disabled("call by autogen01AllMainJooq") void autogen31TinyMailAutogenJooq() { ProjectJooqGenerator generator = new ProjectJooqGenerator(); - generator.setTargetDir(projectRoot + "radiant/tiny-autogen/src/main/java/"); + generator.setTargetDir(projectRoot + "radiant/tiny-mail/src/main/java-gen/"); generator.setTargetPkg("pro.fessional.wings.tiny.mail.database.autogen"); generator.gen(jdbcUrl, jdbcUser, jdbcPass, bd -> bd.databaseIncludes("win_mail_sender"), @@ -146,7 +149,7 @@ void autogen31TinyMailAutogenJooq() { @Disabled("call by autogen01AllMainJooq") void autogen31TinyTaskAutogenJooq() { ProjectJooqGenerator generator = new ProjectJooqGenerator(); - generator.setTargetDir(projectRoot + "radiant/tiny-autogen/src/main/java/"); + generator.setTargetDir(projectRoot + "radiant/tiny-task/src/main/java-gen/"); generator.setTargetPkg("pro.fessional.wings.tiny.task.database.autogen"); generator.gen(jdbcUrl, jdbcUser, jdbcPass, bd -> bd.databaseIncludes("win_task_define", "win_task_result"), diff --git a/radiant/devs-codegen/src/test/java/pro/fessional/wings/devs/init/DatabaseWingsTest.java b/radiant/devs-codegen/src/test/java/pro/fessional/wings/devs/init/DatabaseWingsTest.java index 2531bd062..f60b83277 100644 --- a/radiant/devs-codegen/src/test/java/pro/fessional/wings/devs/init/DatabaseWingsTest.java +++ b/radiant/devs-codegen/src/test/java/pro/fessional/wings/devs/init/DatabaseWingsTest.java @@ -12,6 +12,8 @@ import static pro.fessional.wings.faceless.flywave.WingsRevision.V04_20_1024_01_UserLogin; import static pro.fessional.wings.faceless.flywave.WingsRevision.V04_20_1024_02_RolePermit; import static pro.fessional.wings.faceless.flywave.WingsRevision.V05_20_1025_01_ConfRuntime; +import static pro.fessional.wings.faceless.flywave.WingsRevision.V06_20_1026_01_TinyTask; +import static pro.fessional.wings.faceless.flywave.WingsRevision.V07_20_1027_01_TinyMail; /** @@ -31,7 +33,9 @@ void resetSchemaWings() { V03_20_1023_01_AuthEnum, V04_20_1024_01_UserLogin, V04_20_1024_02_RolePermit, - V05_20_1025_01_ConfRuntime + V05_20_1025_01_ConfRuntime, + V06_20_1026_01_TinyTask, + V07_20_1027_01_TinyMail ); } } diff --git a/radiant/devs-coverage/pom.xml b/radiant/devs-coverage/pom.xml index 3fbfce8e3..8d09eeaba 100644 --- a/radiant/devs-coverage/pom.xml +++ b/radiant/devs-coverage/pom.xml @@ -37,10 +37,6 @@ pro.fessional.wings faceless - - pro.fessional.wings - faceless-awesome - pro.fessional.wings faceless-flywave @@ -77,10 +73,6 @@ pro.fessional.wings warlock - - pro.fessional.wings - warlock-awesome - pro.fessional.wings warlock-bond @@ -121,9 +113,8 @@ ${wings.rootdir}/wings/silencer-jaxb/src/main/java ${wings.rootdir}/wings/silencer-jaxb/target/generated-sources/annotations ${wings.rootdir}/wings/faceless/src/main/java + ${wings.rootdir}/wings/faceless/src/main/java-gen ${wings.rootdir}/wings/faceless/target/generated-sources/annotations - ${wings.rootdir}/wings/faceless-awesome/src/main/java - ${wings.rootdir}/wings/faceless-awesome/target/generated-sources/annotations ${wings.rootdir}/wings/faceless-flywave/src/main/java ${wings.rootdir}/wings/faceless-flywave/target/generated-sources/annotations ${wings.rootdir}/wings/faceless-flywave/src/main/kotlin @@ -142,16 +133,17 @@ ${wings.rootdir}/wings/slardar-webmvc/src/main/java ${wings.rootdir}/wings/slardar-webmvc/target/generated-sources/annotations ${wings.rootdir}/wings/warlock/src/main/java + ${wings.rootdir}/wings/warlock/src/main/java-gen ${wings.rootdir}/wings/warlock/target/generated-sources/annotations - ${wings.rootdir}/wings/warlock-awesome/src/main/java - ${wings.rootdir}/wings/warlock-awesome/target/generated-sources/annotations ${wings.rootdir}/wings/warlock-bond/src/main/java ${wings.rootdir}/wings/warlock-bond/target/generated-sources/annotations ${wings.rootdir}/wings/warlock-shadow/src/main/java ${wings.rootdir}/wings/warlock-shadow/target/generated-sources/annotations ${wings.rootdir}/radiant/tiny-mail/src/main/java + ${wings.rootdir}/radiant/tiny-mail/src/main/java-gen ${wings.rootdir}/radiant/tiny-mail/target/generated-sources/annotations ${wings.rootdir}/radiant/tiny-task/src/main/java + ${wings.rootdir}/radiant/tiny-task/src/main/java-gen ${wings.rootdir}/radiant/tiny-task/target/generated-sources/annotations diff --git a/radiant/pom.xml b/radiant/pom.xml index 9d9cd8538..65b552514 100644 --- a/radiant/pom.xml +++ b/radiant/pom.xml @@ -17,7 +17,6 @@ Radiant components under GhostShip Model - tiny-autogen tiny-mail tiny-task diff --git a/radiant/tiny-autogen/pom.xml b/radiant/tiny-autogen/pom.xml deleted file mode 100644 index d67714a75..000000000 --- a/radiant/tiny-autogen/pom.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - 4.0.0 - - - pro.fessional.wings - radiant - ${revision} - - - tiny-autogen - jar - - Radiant::Tiny::Autogen - Autogen Codes for all Tiny component - - - - pro.fessional.wings - faceless-jooq - - - diff --git a/radiant/tiny-mail/pom.xml b/radiant/tiny-mail/pom.xml index 1d715c71a..098c2991c 100644 --- a/radiant/tiny-mail/pom.xml +++ b/radiant/tiny-mail/pom.xml @@ -20,10 +20,6 @@ pro.fessional.wings slardar - - pro.fessional.wings - tiny-autogen - org.springframework.boot spring-boot-starter-mail diff --git a/radiant/tiny-autogen/src/main/java/pro/fessional/wings/tiny/mail/database/TinyMailDatabase.java b/radiant/tiny-mail/src/main/java-gen/pro/fessional/wings/tiny/mail/database/TinyMailDatabase.java similarity index 100% rename from radiant/tiny-autogen/src/main/java/pro/fessional/wings/tiny/mail/database/TinyMailDatabase.java rename to radiant/tiny-mail/src/main/java-gen/pro/fessional/wings/tiny/mail/database/TinyMailDatabase.java diff --git a/radiant/tiny-autogen/src/main/java/pro/fessional/wings/tiny/mail/database/autogen/DefaultCatalogTinyMail.java b/radiant/tiny-mail/src/main/java-gen/pro/fessional/wings/tiny/mail/database/autogen/DefaultCatalogTinyMail.java similarity index 100% rename from radiant/tiny-autogen/src/main/java/pro/fessional/wings/tiny/mail/database/autogen/DefaultCatalogTinyMail.java rename to radiant/tiny-mail/src/main/java-gen/pro/fessional/wings/tiny/mail/database/autogen/DefaultCatalogTinyMail.java diff --git a/radiant/tiny-autogen/src/main/java/pro/fessional/wings/tiny/mail/database/autogen/DefaultSchemaTinyMail.java b/radiant/tiny-mail/src/main/java-gen/pro/fessional/wings/tiny/mail/database/autogen/DefaultSchemaTinyMail.java similarity index 100% rename from radiant/tiny-autogen/src/main/java/pro/fessional/wings/tiny/mail/database/autogen/DefaultSchemaTinyMail.java rename to radiant/tiny-mail/src/main/java-gen/pro/fessional/wings/tiny/mail/database/autogen/DefaultSchemaTinyMail.java diff --git a/radiant/tiny-autogen/src/main/java/pro/fessional/wings/tiny/mail/database/autogen/TablesTinyMail.java b/radiant/tiny-mail/src/main/java-gen/pro/fessional/wings/tiny/mail/database/autogen/TablesTinyMail.java similarity index 100% rename from radiant/tiny-autogen/src/main/java/pro/fessional/wings/tiny/mail/database/autogen/TablesTinyMail.java rename to radiant/tiny-mail/src/main/java-gen/pro/fessional/wings/tiny/mail/database/autogen/TablesTinyMail.java diff --git a/radiant/tiny-autogen/src/main/java/pro/fessional/wings/tiny/mail/database/autogen/tables/WinMailSenderTable.java b/radiant/tiny-mail/src/main/java-gen/pro/fessional/wings/tiny/mail/database/autogen/tables/WinMailSenderTable.java similarity index 100% rename from radiant/tiny-autogen/src/main/java/pro/fessional/wings/tiny/mail/database/autogen/tables/WinMailSenderTable.java rename to radiant/tiny-mail/src/main/java-gen/pro/fessional/wings/tiny/mail/database/autogen/tables/WinMailSenderTable.java diff --git a/radiant/tiny-autogen/src/main/java/pro/fessional/wings/tiny/mail/database/autogen/tables/daos/WinMailSenderDao.java b/radiant/tiny-mail/src/main/java-gen/pro/fessional/wings/tiny/mail/database/autogen/tables/daos/WinMailSenderDao.java similarity index 100% rename from radiant/tiny-autogen/src/main/java/pro/fessional/wings/tiny/mail/database/autogen/tables/daos/WinMailSenderDao.java rename to radiant/tiny-mail/src/main/java-gen/pro/fessional/wings/tiny/mail/database/autogen/tables/daos/WinMailSenderDao.java diff --git a/radiant/tiny-autogen/src/main/java/pro/fessional/wings/tiny/mail/database/autogen/tables/interfaces/IWinMailSender.java b/radiant/tiny-mail/src/main/java-gen/pro/fessional/wings/tiny/mail/database/autogen/tables/interfaces/IWinMailSender.java similarity index 100% rename from radiant/tiny-autogen/src/main/java/pro/fessional/wings/tiny/mail/database/autogen/tables/interfaces/IWinMailSender.java rename to radiant/tiny-mail/src/main/java-gen/pro/fessional/wings/tiny/mail/database/autogen/tables/interfaces/IWinMailSender.java diff --git a/radiant/tiny-autogen/src/main/java/pro/fessional/wings/tiny/mail/database/autogen/tables/pojos/WinMailSender.java b/radiant/tiny-mail/src/main/java-gen/pro/fessional/wings/tiny/mail/database/autogen/tables/pojos/WinMailSender.java similarity index 100% rename from radiant/tiny-autogen/src/main/java/pro/fessional/wings/tiny/mail/database/autogen/tables/pojos/WinMailSender.java rename to radiant/tiny-mail/src/main/java-gen/pro/fessional/wings/tiny/mail/database/autogen/tables/pojos/WinMailSender.java diff --git a/radiant/tiny-autogen/src/main/java/pro/fessional/wings/tiny/mail/database/autogen/tables/records/WinMailSenderRecord.java b/radiant/tiny-mail/src/main/java-gen/pro/fessional/wings/tiny/mail/database/autogen/tables/records/WinMailSenderRecord.java similarity index 100% rename from radiant/tiny-autogen/src/main/java/pro/fessional/wings/tiny/mail/database/autogen/tables/records/WinMailSenderRecord.java rename to radiant/tiny-mail/src/main/java-gen/pro/fessional/wings/tiny/mail/database/autogen/tables/records/WinMailSenderRecord.java diff --git a/radiant/tiny-task/pom.xml b/radiant/tiny-task/pom.xml index 328827579..04282d17a 100644 --- a/radiant/tiny-task/pom.xml +++ b/radiant/tiny-task/pom.xml @@ -20,10 +20,6 @@ pro.fessional.wings slardar - - pro.fessional.wings - tiny-autogen - pro.fessional.wings slardar-webmvc diff --git a/radiant/tiny-autogen/src/main/java/pro/fessional/wings/tiny/task/database/TinyTaskDatabase.java b/radiant/tiny-task/src/main/java-gen/pro/fessional/wings/tiny/task/database/TinyTaskDatabase.java similarity index 100% rename from radiant/tiny-autogen/src/main/java/pro/fessional/wings/tiny/task/database/TinyTaskDatabase.java rename to radiant/tiny-task/src/main/java-gen/pro/fessional/wings/tiny/task/database/TinyTaskDatabase.java diff --git a/radiant/tiny-autogen/src/main/java/pro/fessional/wings/tiny/task/database/autogen/DefaultCatalogTinyTask.java b/radiant/tiny-task/src/main/java-gen/pro/fessional/wings/tiny/task/database/autogen/DefaultCatalogTinyTask.java similarity index 100% rename from radiant/tiny-autogen/src/main/java/pro/fessional/wings/tiny/task/database/autogen/DefaultCatalogTinyTask.java rename to radiant/tiny-task/src/main/java-gen/pro/fessional/wings/tiny/task/database/autogen/DefaultCatalogTinyTask.java diff --git a/radiant/tiny-autogen/src/main/java/pro/fessional/wings/tiny/task/database/autogen/DefaultSchemaTinyTask.java b/radiant/tiny-task/src/main/java-gen/pro/fessional/wings/tiny/task/database/autogen/DefaultSchemaTinyTask.java similarity index 100% rename from radiant/tiny-autogen/src/main/java/pro/fessional/wings/tiny/task/database/autogen/DefaultSchemaTinyTask.java rename to radiant/tiny-task/src/main/java-gen/pro/fessional/wings/tiny/task/database/autogen/DefaultSchemaTinyTask.java diff --git a/radiant/tiny-autogen/src/main/java/pro/fessional/wings/tiny/task/database/autogen/TablesTinyTask.java b/radiant/tiny-task/src/main/java-gen/pro/fessional/wings/tiny/task/database/autogen/TablesTinyTask.java similarity index 100% rename from radiant/tiny-autogen/src/main/java/pro/fessional/wings/tiny/task/database/autogen/TablesTinyTask.java rename to radiant/tiny-task/src/main/java-gen/pro/fessional/wings/tiny/task/database/autogen/TablesTinyTask.java diff --git a/radiant/tiny-autogen/src/main/java/pro/fessional/wings/tiny/task/database/autogen/tables/WinTaskDefineTable.java b/radiant/tiny-task/src/main/java-gen/pro/fessional/wings/tiny/task/database/autogen/tables/WinTaskDefineTable.java similarity index 100% rename from radiant/tiny-autogen/src/main/java/pro/fessional/wings/tiny/task/database/autogen/tables/WinTaskDefineTable.java rename to radiant/tiny-task/src/main/java-gen/pro/fessional/wings/tiny/task/database/autogen/tables/WinTaskDefineTable.java diff --git a/radiant/tiny-autogen/src/main/java/pro/fessional/wings/tiny/task/database/autogen/tables/WinTaskResultTable.java b/radiant/tiny-task/src/main/java-gen/pro/fessional/wings/tiny/task/database/autogen/tables/WinTaskResultTable.java similarity index 100% rename from radiant/tiny-autogen/src/main/java/pro/fessional/wings/tiny/task/database/autogen/tables/WinTaskResultTable.java rename to radiant/tiny-task/src/main/java-gen/pro/fessional/wings/tiny/task/database/autogen/tables/WinTaskResultTable.java diff --git a/radiant/tiny-autogen/src/main/java/pro/fessional/wings/tiny/task/database/autogen/tables/daos/WinTaskDefineDao.java b/radiant/tiny-task/src/main/java-gen/pro/fessional/wings/tiny/task/database/autogen/tables/daos/WinTaskDefineDao.java similarity index 100% rename from radiant/tiny-autogen/src/main/java/pro/fessional/wings/tiny/task/database/autogen/tables/daos/WinTaskDefineDao.java rename to radiant/tiny-task/src/main/java-gen/pro/fessional/wings/tiny/task/database/autogen/tables/daos/WinTaskDefineDao.java diff --git a/radiant/tiny-autogen/src/main/java/pro/fessional/wings/tiny/task/database/autogen/tables/daos/WinTaskResultDao.java b/radiant/tiny-task/src/main/java-gen/pro/fessional/wings/tiny/task/database/autogen/tables/daos/WinTaskResultDao.java similarity index 100% rename from radiant/tiny-autogen/src/main/java/pro/fessional/wings/tiny/task/database/autogen/tables/daos/WinTaskResultDao.java rename to radiant/tiny-task/src/main/java-gen/pro/fessional/wings/tiny/task/database/autogen/tables/daos/WinTaskResultDao.java diff --git a/radiant/tiny-autogen/src/main/java/pro/fessional/wings/tiny/task/database/autogen/tables/interfaces/IWinTaskDefine.java b/radiant/tiny-task/src/main/java-gen/pro/fessional/wings/tiny/task/database/autogen/tables/interfaces/IWinTaskDefine.java similarity index 100% rename from radiant/tiny-autogen/src/main/java/pro/fessional/wings/tiny/task/database/autogen/tables/interfaces/IWinTaskDefine.java rename to radiant/tiny-task/src/main/java-gen/pro/fessional/wings/tiny/task/database/autogen/tables/interfaces/IWinTaskDefine.java diff --git a/radiant/tiny-autogen/src/main/java/pro/fessional/wings/tiny/task/database/autogen/tables/interfaces/IWinTaskResult.java b/radiant/tiny-task/src/main/java-gen/pro/fessional/wings/tiny/task/database/autogen/tables/interfaces/IWinTaskResult.java similarity index 100% rename from radiant/tiny-autogen/src/main/java/pro/fessional/wings/tiny/task/database/autogen/tables/interfaces/IWinTaskResult.java rename to radiant/tiny-task/src/main/java-gen/pro/fessional/wings/tiny/task/database/autogen/tables/interfaces/IWinTaskResult.java diff --git a/radiant/tiny-autogen/src/main/java/pro/fessional/wings/tiny/task/database/autogen/tables/pojos/WinTaskDefine.java b/radiant/tiny-task/src/main/java-gen/pro/fessional/wings/tiny/task/database/autogen/tables/pojos/WinTaskDefine.java similarity index 100% rename from radiant/tiny-autogen/src/main/java/pro/fessional/wings/tiny/task/database/autogen/tables/pojos/WinTaskDefine.java rename to radiant/tiny-task/src/main/java-gen/pro/fessional/wings/tiny/task/database/autogen/tables/pojos/WinTaskDefine.java diff --git a/radiant/tiny-autogen/src/main/java/pro/fessional/wings/tiny/task/database/autogen/tables/pojos/WinTaskResult.java b/radiant/tiny-task/src/main/java-gen/pro/fessional/wings/tiny/task/database/autogen/tables/pojos/WinTaskResult.java similarity index 100% rename from radiant/tiny-autogen/src/main/java/pro/fessional/wings/tiny/task/database/autogen/tables/pojos/WinTaskResult.java rename to radiant/tiny-task/src/main/java-gen/pro/fessional/wings/tiny/task/database/autogen/tables/pojos/WinTaskResult.java diff --git a/radiant/tiny-autogen/src/main/java/pro/fessional/wings/tiny/task/database/autogen/tables/records/WinTaskDefineRecord.java b/radiant/tiny-task/src/main/java-gen/pro/fessional/wings/tiny/task/database/autogen/tables/records/WinTaskDefineRecord.java similarity index 100% rename from radiant/tiny-autogen/src/main/java/pro/fessional/wings/tiny/task/database/autogen/tables/records/WinTaskDefineRecord.java rename to radiant/tiny-task/src/main/java-gen/pro/fessional/wings/tiny/task/database/autogen/tables/records/WinTaskDefineRecord.java diff --git a/radiant/tiny-autogen/src/main/java/pro/fessional/wings/tiny/task/database/autogen/tables/records/WinTaskResultRecord.java b/radiant/tiny-task/src/main/java-gen/pro/fessional/wings/tiny/task/database/autogen/tables/records/WinTaskResultRecord.java similarity index 100% rename from radiant/tiny-autogen/src/main/java/pro/fessional/wings/tiny/task/database/autogen/tables/records/WinTaskResultRecord.java rename to radiant/tiny-task/src/main/java-gen/pro/fessional/wings/tiny/task/database/autogen/tables/records/WinTaskResultRecord.java diff --git a/wings/faceless-autogen/pom.xml b/wings/faceless-autogen/pom.xml deleted file mode 100644 index ea800896b..000000000 --- a/wings/faceless-autogen/pom.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - 4.0.0 - - - pro.fessional - wings - ${revision} - - - pro.fessional.wings - faceless-autogen - jar - - Wings::Faceless::AutoGen - Autogen Codes for all Faceless module - - - - pro.fessional.wings - faceless - - - diff --git a/wings/faceless-awesome/pom.xml b/wings/faceless-awesome/pom.xml deleted file mode 100644 index 8e7a577d9..000000000 --- a/wings/faceless-awesome/pom.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - 4.0.0 - - - pro.fessional - wings - ${revision} - - - pro.fessional.wings - faceless-awesome - jar - - Wings::Faceless::Awesome - Awesome combination of Faceless and Autogen - - - - pro.fessional.wings - faceless-autogen - - - pro.fessional.wings - testing-faceless - test - - - diff --git a/wings/faceless-awesome/src/test/java/pro/fessional/wings/faceless/app/TestFacelessAwesomeApplication.java b/wings/faceless-awesome/src/test/java/pro/fessional/wings/faceless/app/TestFacelessAwesomeApplication.java deleted file mode 100644 index d649c8a1b..000000000 --- a/wings/faceless-awesome/src/test/java/pro/fessional/wings/faceless/app/TestFacelessAwesomeApplication.java +++ /dev/null @@ -1,15 +0,0 @@ -package pro.fessional.wings.faceless.app; - -import org.springframework.boot.SpringApplication; -import org.springframework.boot.autoconfigure.SpringBootApplication; - -/** - * @author trydofor - * @since 2019-06-25 - */ -@SpringBootApplication -public class TestFacelessAwesomeApplication { - public static void main(String[] args) { - SpringApplication.run(TestFacelessAwesomeApplication.class, args); - } -} diff --git a/wings/faceless-codegen/src/main/java/pro/fessional/wings/faceless/codegen/ConstantEnumGenerator.java b/wings/faceless-codegen/src/main/java/pro/fessional/wings/faceless/codegen/ConstantEnumGenerator.java index fc80a6330..eaa3425ee 100644 --- a/wings/faceless-codegen/src/main/java/pro/fessional/wings/faceless/codegen/ConstantEnumGenerator.java +++ b/wings/faceless-codegen/src/main/java/pro/fessional/wings/faceless/codegen/ConstantEnumGenerator.java @@ -135,7 +135,7 @@ public void generate(Collection pos) { /** * first, copy ConstantEnumTemplate.java to /resource/ to avoid compile * - * @param src ./src/main/java/ + * @param src ./src/main/java-gen/ * @param pkg pro.fessional.wings.faceless.enums.constant * @param pojos data objects * @param filter filter by type, true for include, false for exclude diff --git a/wings/faceless-codegen/src/main/java/pro/fessional/wings/faceless/codegen/ConstantNaviGenerator.java b/wings/faceless-codegen/src/main/java/pro/fessional/wings/faceless/codegen/ConstantNaviGenerator.java index 1e5e61aa2..dc960ea6e 100644 --- a/wings/faceless-codegen/src/main/java/pro/fessional/wings/faceless/codegen/ConstantNaviGenerator.java +++ b/wings/faceless-codegen/src/main/java/pro/fessional/wings/faceless/codegen/ConstantNaviGenerator.java @@ -33,7 +33,7 @@ public class ConstantNaviGenerator { private static final String ROOT = ""; - private String targetDir = "src/main/java"; + private String targetDir = "src/main/java-gen"; private String packageName = ""; private String delimiter = "."; @@ -56,10 +56,13 @@ public void generate(String javaName, String prefixCode, Collection enums = ConstantEnumJdbcLoader.load(helper); ConstantEnumGenerator.builder() - .targetDirectory("wings/faceless/src/main/java/") + .targetDirectory("wings/faceless/src/main/java-gen/") .targetPackage("pro.fessional.wings.faceless.enums.autogen") .excludeType("standard_boolean") .generate(enums); diff --git a/wings/faceless-jooq/pom.xml b/wings/faceless-jooq/pom.xml index 6f8d5c512..50e20f0f5 100644 --- a/wings/faceless-jooq/pom.xml +++ b/wings/faceless-jooq/pom.xml @@ -19,7 +19,7 @@ pro.fessional.wings - faceless-awesome + faceless org.jooq diff --git a/wings/faceless-shard/pom.xml b/wings/faceless-shard/pom.xml index 080f42a94..c0b8c984d 100644 --- a/wings/faceless-shard/pom.xml +++ b/wings/faceless-shard/pom.xml @@ -19,7 +19,7 @@ pro.fessional.wings - faceless-awesome + faceless diff --git a/wings/faceless-autogen/src/main/java/pro/fessional/wings/faceless/enums/autogen/StandardLanguage.java b/wings/faceless/src/main/java-gen/pro/fessional/wings/faceless/enums/autogen/StandardLanguage.java similarity index 100% rename from wings/faceless-autogen/src/main/java/pro/fessional/wings/faceless/enums/autogen/StandardLanguage.java rename to wings/faceless/src/main/java-gen/pro/fessional/wings/faceless/enums/autogen/StandardLanguage.java diff --git a/wings/faceless-autogen/src/main/java/pro/fessional/wings/faceless/enums/autogen/StandardTimezone.java b/wings/faceless/src/main/java-gen/pro/fessional/wings/faceless/enums/autogen/StandardTimezone.java similarity index 100% rename from wings/faceless-autogen/src/main/java/pro/fessional/wings/faceless/enums/autogen/StandardTimezone.java rename to wings/faceless/src/main/java-gen/pro/fessional/wings/faceless/enums/autogen/StandardTimezone.java diff --git a/wings/faceless-awesome/src/main/java/pro/fessional/wings/faceless/converter/WingsEnumConverters.java b/wings/faceless/src/main/java/pro/fessional/wings/faceless/converter/WingsEnumConverters.java similarity index 100% rename from wings/faceless-awesome/src/main/java/pro/fessional/wings/faceless/converter/WingsEnumConverters.java rename to wings/faceless/src/main/java/pro/fessional/wings/faceless/converter/WingsEnumConverters.java diff --git a/wings/faceless-awesome/src/test/java/pro/fessional/wings/faceless/converter/WingsEnumConvertersTest.java b/wings/faceless/src/test/java/pro/fessional/wings/faceless/converter/WingsEnumConvertersTest.java similarity index 100% rename from wings/faceless-awesome/src/test/java/pro/fessional/wings/faceless/converter/WingsEnumConvertersTest.java rename to wings/faceless/src/test/java/pro/fessional/wings/faceless/converter/WingsEnumConvertersTest.java diff --git a/wings/faceless-awesome/src/test/java/pro/fessional/wings/faceless/enums/ConstantEnumI18nTest.java b/wings/faceless/src/test/java/pro/fessional/wings/faceless/enums/ConstantEnumI18nTest.java similarity index 74% rename from wings/faceless-awesome/src/test/java/pro/fessional/wings/faceless/enums/ConstantEnumI18nTest.java rename to wings/faceless/src/test/java/pro/fessional/wings/faceless/enums/ConstantEnumI18nTest.java index 88265a633..e61a69b2f 100644 --- a/wings/faceless-awesome/src/test/java/pro/fessional/wings/faceless/enums/ConstantEnumI18nTest.java +++ b/wings/faceless/src/test/java/pro/fessional/wings/faceless/enums/ConstantEnumI18nTest.java @@ -3,6 +3,7 @@ import io.qameta.allure.TmsLink; import lombok.Setter; import lombok.extern.slf4j.Slf4j; +import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.MethodOrderer.MethodName; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.TestMethodOrder; @@ -12,12 +13,12 @@ import org.springframework.context.MessageSource; import org.springframework.jdbc.core.JdbcTemplate; import pro.fessional.mirana.data.Null; +import pro.fessional.mirana.io.InputStreams; import pro.fessional.wings.faceless.enums.autogen.StandardLanguage; import pro.fessional.wings.faceless.enums.autogen.StandardTimezone; import pro.fessional.wings.faceless.service.wini18n.StandardI18nService; import static org.junit.jupiter.api.Assertions.assertEquals; -import static pro.fessional.wings.testing.faceless.database.TestingDatabaseHelper.execWingsSql; /** * @author trydofor @@ -46,8 +47,8 @@ public class ConstantEnumI18nTest { public void enumI18nCode() { StandardLanguage zhCN = StandardLanguage.ZH_CN; StandardTimezone tzUs = StandardTimezone.AMERICA_CHICAGO; - assertEquals(zhCN.getBase() + "." + zhCN.getKind() + "." + zhCN.getType() + "." + zhCN.getCode(), zhCN.getI18nCode()); - assertEquals(tzUs.getBase() + "." + tzUs.getKind() + "." + tzUs.getType() + ".id." + tzUs.getId(), tzUs.getI18nCode()); + Assertions.assertEquals(zhCN.getBase() + "." + zhCN.getKind() + "." + zhCN.getType() + "." + zhCN.getCode(), zhCN.getI18nCode()); + Assertions.assertEquals(tzUs.getBase() + "." + tzUs.getKind() + "." + tzUs.getType() + ".id." + tzUs.getId(), tzUs.getI18nCode()); } @Test @@ -67,6 +68,22 @@ public void dynamicI18nService() { assertEquals("Simplified Chinese", men); } + void execWingsSql(JdbcTemplate jdbcTemplate, String path) { + String sqls = InputStreams.readText(ConstantEnumI18nTest.class.getResourceAsStream("/wings-flywave/" + path)); + for (String sql : sqls.split( + ";+[ \\t]*[\\r\\n]+" + + "|" + + ";+[ \\t]*--[^\\r\\n]+[\\r\\n]+" + + "|" + + ";+[ \\t]*/\\*[^\\r\\n]+\\*/[ \\t]*[\\r\\n]+" + )) { + String s = sql.trim(); + if (!s.isEmpty()) { + jdbcTemplate.execute(s); + } + } + } + @Test @TmsLink("C12008") public void infoAllBeanName() { diff --git a/wings/faceless-awesome/src/test/java/pro/fessional/wings/faceless/enums/ConstantEnumUtilTest.java b/wings/faceless/src/test/java/pro/fessional/wings/faceless/enums/ConstantEnumUtilTest.java similarity index 80% rename from wings/faceless-awesome/src/test/java/pro/fessional/wings/faceless/enums/ConstantEnumUtilTest.java rename to wings/faceless/src/test/java/pro/fessional/wings/faceless/enums/ConstantEnumUtilTest.java index 8c1e27a10..10dcb7571 100644 --- a/wings/faceless-awesome/src/test/java/pro/fessional/wings/faceless/enums/ConstantEnumUtilTest.java +++ b/wings/faceless/src/test/java/pro/fessional/wings/faceless/enums/ConstantEnumUtilTest.java @@ -1,6 +1,7 @@ package pro.fessional.wings.faceless.enums; import io.qameta.allure.TmsLink; +import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import pro.fessional.wings.faceless.enums.autogen.StandardLanguage; import pro.fessional.wings.faceless.enums.autogen.StandardTimezone; @@ -21,24 +22,24 @@ public class ConstantEnumUtilTest { @TmsLink("C12009") public void enumIdOrElse() { StandardLanguage zhCn = StandardLanguage.ZH_CN; - assertEquals(zhCn, ConstantEnumUtil.idOrNull(zhCn.getId(), StandardLanguage.values())); - assertEquals(zhCn, ConstantEnumUtil.idOrElse(1, zhCn, StandardLanguage.values())); + Assertions.assertEquals(zhCn, ConstantEnumUtil.idOrNull(zhCn.getId(), StandardLanguage.values())); + Assertions.assertEquals(zhCn, ConstantEnumUtil.idOrElse(1, zhCn, StandardLanguage.values())); } @Test @TmsLink("C12010") public void enumNameOrElse() { StandardLanguage zhCn = StandardLanguage.ZH_CN; - assertEquals(zhCn, ConstantEnumUtil.nameOrNull(zhCn.name(), StandardLanguage.values())); - assertEquals(zhCn, ConstantEnumUtil.nameOrElse("", zhCn, StandardLanguage.values())); + Assertions.assertEquals(zhCn, ConstantEnumUtil.nameOrNull(zhCn.name(), StandardLanguage.values())); + Assertions.assertEquals(zhCn, ConstantEnumUtil.nameOrElse("", zhCn, StandardLanguage.values())); } @Test @TmsLink("C12011") public void enumCodeOrElse() { StandardLanguage zhCn = StandardLanguage.ZH_CN; - assertEquals(zhCn, ConstantEnumUtil.codeOrNull(zhCn.getCode(), StandardLanguage.values())); - assertEquals(zhCn, ConstantEnumUtil.codeOrElse("", zhCn, StandardLanguage.values())); + Assertions.assertEquals(zhCn, ConstantEnumUtil.codeOrNull(zhCn.getCode(), StandardLanguage.values())); + Assertions.assertEquals(zhCn, ConstantEnumUtil.codeOrElse("", zhCn, StandardLanguage.values())); } @Test diff --git a/wings/faceless-awesome/src/test/java/pro/fessional/wings/faceless/enums/LanguageEnumUtilTest.java b/wings/faceless/src/test/java/pro/fessional/wings/faceless/enums/LanguageEnumUtilTest.java similarity index 87% rename from wings/faceless-awesome/src/test/java/pro/fessional/wings/faceless/enums/LanguageEnumUtilTest.java rename to wings/faceless/src/test/java/pro/fessional/wings/faceless/enums/LanguageEnumUtilTest.java index 52a469826..6b7b76291 100644 --- a/wings/faceless-awesome/src/test/java/pro/fessional/wings/faceless/enums/LanguageEnumUtilTest.java +++ b/wings/faceless/src/test/java/pro/fessional/wings/faceless/enums/LanguageEnumUtilTest.java @@ -2,6 +2,7 @@ import io.qameta.allure.TmsLink; import lombok.extern.slf4j.Slf4j; +import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import pro.fessional.wings.faceless.enums.autogen.StandardLanguage; @@ -22,6 +23,6 @@ public void localeLanguageTag() { Locale locale = StandardLanguage.ZH_CN.toLocale(); log.info("locale={}", locale.toLanguageTag()); StandardLanguage al = LanguageEnumUtil.localeOrNull(locale, StandardLanguage.values()); - assertEquals(StandardLanguage.ZH_CN, al); + Assertions.assertEquals(StandardLanguage.ZH_CN, al); } } diff --git a/wings/pom.xml b/wings/pom.xml index 2c9b79b5c..35ee38294 100644 --- a/wings/pom.xml +++ b/wings/pom.xml @@ -22,8 +22,6 @@ silencer-curse silencer-jaxb faceless - faceless-autogen - faceless-awesome faceless-flywave faceless-jooq faceless-codegen @@ -34,8 +32,6 @@ slardar-webmvc slardar-sprint warlock - warlock-autogen - warlock-awesome warlock-bond warlock-codegen warlock-shadow diff --git a/wings/warlock-autogen/pom.xml b/wings/warlock-autogen/pom.xml deleted file mode 100644 index ffc2be32e..000000000 --- a/wings/warlock-autogen/pom.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - 4.0.0 - - - pro.fessional - wings - ${revision} - - - pro.fessional.wings - warlock-autogen - jar - - Wings::Warlock::Autogen - Autogen Codes for all Warlock module - - - - pro.fessional.wings - warlock - - - diff --git a/wings/warlock-awesome/pom.xml b/wings/warlock-awesome/pom.xml deleted file mode 100644 index f7d967afc..000000000 --- a/wings/warlock-awesome/pom.xml +++ /dev/null @@ -1,31 +0,0 @@ - - - 4.0.0 - - - pro.fessional - wings - ${revision} - - - pro.fessional.wings - warlock-awesome - jar - - Wings::Warlock::Awesome - Awesome combination of Warlock and Autogen - - - - pro.fessional.wings - warlock-autogen - - - - pro.fessional.wings - testing-warlock - test - - - diff --git a/wings/warlock-awesome/src/main/resources/META-INF/additional-spring-configuration-metadata.json b/wings/warlock-awesome/src/main/resources/META-INF/additional-spring-configuration-metadata.json deleted file mode 100644 index cbd5ec17e..000000000 --- a/wings/warlock-awesome/src/main/resources/META-INF/additional-spring-configuration-metadata.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "groups": [ - {"name": "wings.enabled.pro.fessional.wings.warlock.spring.conf"}, - {"name": "wings.enabled.pro.fessional.wings.warlock.spring.bean"} - ], - "properties": [ - {"name": "wings.enabled.pro.fessional.wings.warlock.spring.conf.WarlockAwesomeAutoConfiguration", "type": "java.lang.Boolean"}, - - {"name": "wings.enabled.pro.fessional.wings.warlock.spring.bean.WarlockAwesomeConfiguration", "type": "java.lang.Boolean"}, - {"name": "wings.enabled.pro.fessional.wings.warlock.spring.bean.WarlockAwesomeConfiguration$JooqDaoScan", "type": "java.lang.Boolean"}, - {"name": "wings.enabled.pro.fessional.wings.warlock.spring.bean.WarlockAwesomeConfiguration.registerRuntimeModeRunner", "type": "java.lang.Boolean"}, - {"name": "wings.enabled.pro.fessional.wings.warlock.spring.bean.WarlockAwesomeConfiguration.runtimeConfService", "type": "java.lang.Boolean"} - ], - "hints": [] -} \ No newline at end of file diff --git a/wings/warlock-awesome/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/wings/warlock-awesome/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports deleted file mode 100644 index ff88409b3..000000000 --- a/wings/warlock-awesome/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ /dev/null @@ -1 +0,0 @@ -pro.fessional.wings.warlock.spring.conf.WarlockAwesomeAutoConfiguration diff --git a/wings/warlock-awesome/src/test/java/pro/fessional/wings/warlock/app/TestWarlockAwesomeApplication.java b/wings/warlock-awesome/src/test/java/pro/fessional/wings/warlock/app/TestWarlockAwesomeApplication.java deleted file mode 100644 index 97cb0c989..000000000 --- a/wings/warlock-awesome/src/test/java/pro/fessional/wings/warlock/app/TestWarlockAwesomeApplication.java +++ /dev/null @@ -1,17 +0,0 @@ -package pro.fessional.wings.warlock.app; - -import org.springframework.boot.SpringApplication; -import org.springframework.boot.autoconfigure.SpringBootApplication; - -/** - * @author trydofor - * @since 2019-07-20 - */ -@SpringBootApplication -public class TestWarlockAwesomeApplication { - - public static void main(String[] args) { - SpringApplication.run(TestWarlockAwesomeApplication.class, args); - } - -} diff --git a/wings/warlock-codegen/pom.xml b/wings/warlock-codegen/pom.xml index 5fa45ed17..7d81d364c 100644 --- a/wings/warlock-codegen/pom.xml +++ b/wings/warlock-codegen/pom.xml @@ -19,7 +19,7 @@ pro.fessional.wings - warlock-awesome + warlock pro.fessional.wings diff --git a/wings/warlock-codegen/src/main/java/pro/fessional/wings/warlock/project/Warlock2EnumGenerator.java b/wings/warlock-codegen/src/main/java/pro/fessional/wings/warlock/project/Warlock2EnumGenerator.java index c4421f167..0f076985e 100644 --- a/wings/warlock-codegen/src/main/java/pro/fessional/wings/warlock/project/Warlock2EnumGenerator.java +++ b/wings/warlock-codegen/src/main/java/pro/fessional/wings/warlock/project/Warlock2EnumGenerator.java @@ -14,7 +14,7 @@ public class Warlock2EnumGenerator extends ProjectEnumGenerator { public Warlock2EnumGenerator() { - targetDir = "../warlock-autogen/src/main/java/"; + targetDir = "../warlock/src/main/java-gen/"; targetPkg = "pro.fessional.wings.warlock.enums.autogen"; } diff --git a/wings/warlock-codegen/src/main/java/pro/fessional/wings/warlock/project/Warlock3JooqGenerator.java b/wings/warlock-codegen/src/main/java/pro/fessional/wings/warlock/project/Warlock3JooqGenerator.java index ffd38d8eb..eea40ec9b 100644 --- a/wings/warlock-codegen/src/main/java/pro/fessional/wings/warlock/project/Warlock3JooqGenerator.java +++ b/wings/warlock-codegen/src/main/java/pro/fessional/wings/warlock/project/Warlock3JooqGenerator.java @@ -17,7 +17,7 @@ public class Warlock3JooqGenerator extends ProjectJooqGenerator { public Warlock3JooqGenerator() { - targetDir = "../warlock-autogen/src/main/java/"; + targetDir = "../warlock/src/main/java-gen/"; targetPkg = "pro.fessional.wings.warlock.database.autogen"; configXml = ""; } diff --git a/wings/warlock-codegen/src/main/java/pro/fessional/wings/warlock/project/Warlock4AuthGenerator.java b/wings/warlock-codegen/src/main/java/pro/fessional/wings/warlock/project/Warlock4AuthGenerator.java index e3831727f..5b8da4d0f 100644 --- a/wings/warlock-codegen/src/main/java/pro/fessional/wings/warlock/project/Warlock4AuthGenerator.java +++ b/wings/warlock-codegen/src/main/java/pro/fessional/wings/warlock/project/Warlock4AuthGenerator.java @@ -10,7 +10,7 @@ */ public class Warlock4AuthGenerator extends ProjectAuthGenerator { public Warlock4AuthGenerator() { - targetDir = "../warlock-autogen/src/main/java/"; + targetDir = "../warlock/src/main/java-gen/"; targetPkg = "pro.fessional.wings.warlock.security.autogen"; } } diff --git a/wings/warlock-codegen/src/test/java/pro/fessional/wings/warlock/project/TestWarlock0CodegenConstant.java b/wings/warlock-codegen/src/test/java/pro/fessional/wings/warlock/project/TestWarlock0CodegenConstant.java index 55b474b3a..93de743b9 100644 --- a/wings/warlock-codegen/src/test/java/pro/fessional/wings/warlock/project/TestWarlock0CodegenConstant.java +++ b/wings/warlock-codegen/src/test/java/pro/fessional/wings/warlock/project/TestWarlock0CodegenConstant.java @@ -8,5 +8,5 @@ public class TestWarlock0CodegenConstant { public static final String JDBC = "jdbc:mysql://localhost:51487/wings?connectionTimeZone=%2B08:00&forceConnectionTimeZoneToSession=true"; public static final String USER = "trydofor"; public static final String PASS = "moilioncircle"; - public static final String JAVA = "../warlock-autogen/src/main/java/"; + public static final String JAVA = "../warlock/src/main/java-gen/"; } diff --git a/wings/warlock-shadow/pom.xml b/wings/warlock-shadow/pom.xml index 3dcf1030f..569b60708 100644 --- a/wings/warlock-shadow/pom.xml +++ b/wings/warlock-shadow/pom.xml @@ -23,7 +23,7 @@ pro.fessional.wings - warlock-awesome + warlock me.zhyd.oauth diff --git a/wings/warlock-autogen/src/main/java/pro/fessional/wings/warlock/database/WarlockDatabase.java b/wings/warlock/src/main/java-gen/pro/fessional/wings/warlock/database/WarlockDatabase.java similarity index 100% rename from wings/warlock-autogen/src/main/java/pro/fessional/wings/warlock/database/WarlockDatabase.java rename to wings/warlock/src/main/java-gen/pro/fessional/wings/warlock/database/WarlockDatabase.java diff --git a/wings/warlock-autogen/src/main/java/pro/fessional/wings/warlock/database/autogen/DefaultCatalogWarlock.java b/wings/warlock/src/main/java-gen/pro/fessional/wings/warlock/database/autogen/DefaultCatalogWarlock.java similarity index 100% rename from wings/warlock-autogen/src/main/java/pro/fessional/wings/warlock/database/autogen/DefaultCatalogWarlock.java rename to wings/warlock/src/main/java-gen/pro/fessional/wings/warlock/database/autogen/DefaultCatalogWarlock.java diff --git a/wings/warlock-autogen/src/main/java/pro/fessional/wings/warlock/database/autogen/DefaultSchemaWarlock.java b/wings/warlock/src/main/java-gen/pro/fessional/wings/warlock/database/autogen/DefaultSchemaWarlock.java similarity index 100% rename from wings/warlock-autogen/src/main/java/pro/fessional/wings/warlock/database/autogen/DefaultSchemaWarlock.java rename to wings/warlock/src/main/java-gen/pro/fessional/wings/warlock/database/autogen/DefaultSchemaWarlock.java diff --git a/wings/warlock-autogen/src/main/java/pro/fessional/wings/warlock/database/autogen/TablesWarlock.java b/wings/warlock/src/main/java-gen/pro/fessional/wings/warlock/database/autogen/TablesWarlock.java similarity index 100% rename from wings/warlock-autogen/src/main/java/pro/fessional/wings/warlock/database/autogen/TablesWarlock.java rename to wings/warlock/src/main/java-gen/pro/fessional/wings/warlock/database/autogen/TablesWarlock.java diff --git a/wings/warlock-autogen/src/main/java/pro/fessional/wings/warlock/database/autogen/tables/SysConstantEnumTable.java b/wings/warlock/src/main/java-gen/pro/fessional/wings/warlock/database/autogen/tables/SysConstantEnumTable.java similarity index 100% rename from wings/warlock-autogen/src/main/java/pro/fessional/wings/warlock/database/autogen/tables/SysConstantEnumTable.java rename to wings/warlock/src/main/java-gen/pro/fessional/wings/warlock/database/autogen/tables/SysConstantEnumTable.java diff --git a/wings/warlock-autogen/src/main/java/pro/fessional/wings/warlock/database/autogen/tables/SysStandardI18nTable.java b/wings/warlock/src/main/java-gen/pro/fessional/wings/warlock/database/autogen/tables/SysStandardI18nTable.java similarity index 100% rename from wings/warlock-autogen/src/main/java/pro/fessional/wings/warlock/database/autogen/tables/SysStandardI18nTable.java rename to wings/warlock/src/main/java-gen/pro/fessional/wings/warlock/database/autogen/tables/SysStandardI18nTable.java diff --git a/wings/warlock-autogen/src/main/java/pro/fessional/wings/warlock/database/autogen/tables/WinConfRuntimeTable.java b/wings/warlock/src/main/java-gen/pro/fessional/wings/warlock/database/autogen/tables/WinConfRuntimeTable.java similarity index 100% rename from wings/warlock-autogen/src/main/java/pro/fessional/wings/warlock/database/autogen/tables/WinConfRuntimeTable.java rename to wings/warlock/src/main/java-gen/pro/fessional/wings/warlock/database/autogen/tables/WinConfRuntimeTable.java diff --git a/wings/warlock-autogen/src/main/java/pro/fessional/wings/warlock/database/autogen/tables/WinPermEntryTable.java b/wings/warlock/src/main/java-gen/pro/fessional/wings/warlock/database/autogen/tables/WinPermEntryTable.java similarity index 100% rename from wings/warlock-autogen/src/main/java/pro/fessional/wings/warlock/database/autogen/tables/WinPermEntryTable.java rename to wings/warlock/src/main/java-gen/pro/fessional/wings/warlock/database/autogen/tables/WinPermEntryTable.java diff --git a/wings/warlock-autogen/src/main/java/pro/fessional/wings/warlock/database/autogen/tables/WinRoleEntryTable.java b/wings/warlock/src/main/java-gen/pro/fessional/wings/warlock/database/autogen/tables/WinRoleEntryTable.java similarity index 100% rename from wings/warlock-autogen/src/main/java/pro/fessional/wings/warlock/database/autogen/tables/WinRoleEntryTable.java rename to wings/warlock/src/main/java-gen/pro/fessional/wings/warlock/database/autogen/tables/WinRoleEntryTable.java diff --git a/wings/warlock-autogen/src/main/java/pro/fessional/wings/warlock/database/autogen/tables/WinRoleGrantTable.java b/wings/warlock/src/main/java-gen/pro/fessional/wings/warlock/database/autogen/tables/WinRoleGrantTable.java similarity index 100% rename from wings/warlock-autogen/src/main/java/pro/fessional/wings/warlock/database/autogen/tables/WinRoleGrantTable.java rename to wings/warlock/src/main/java-gen/pro/fessional/wings/warlock/database/autogen/tables/WinRoleGrantTable.java diff --git a/wings/warlock-autogen/src/main/java/pro/fessional/wings/warlock/database/autogen/tables/WinUserAuthnTable.java b/wings/warlock/src/main/java-gen/pro/fessional/wings/warlock/database/autogen/tables/WinUserAuthnTable.java similarity index 100% rename from wings/warlock-autogen/src/main/java/pro/fessional/wings/warlock/database/autogen/tables/WinUserAuthnTable.java rename to wings/warlock/src/main/java-gen/pro/fessional/wings/warlock/database/autogen/tables/WinUserAuthnTable.java diff --git a/wings/warlock-autogen/src/main/java/pro/fessional/wings/warlock/database/autogen/tables/WinUserBasisTable.java b/wings/warlock/src/main/java-gen/pro/fessional/wings/warlock/database/autogen/tables/WinUserBasisTable.java similarity index 100% rename from wings/warlock-autogen/src/main/java/pro/fessional/wings/warlock/database/autogen/tables/WinUserBasisTable.java rename to wings/warlock/src/main/java-gen/pro/fessional/wings/warlock/database/autogen/tables/WinUserBasisTable.java diff --git a/wings/warlock-autogen/src/main/java/pro/fessional/wings/warlock/database/autogen/tables/WinUserGrantTable.java b/wings/warlock/src/main/java-gen/pro/fessional/wings/warlock/database/autogen/tables/WinUserGrantTable.java similarity index 100% rename from wings/warlock-autogen/src/main/java/pro/fessional/wings/warlock/database/autogen/tables/WinUserGrantTable.java rename to wings/warlock/src/main/java-gen/pro/fessional/wings/warlock/database/autogen/tables/WinUserGrantTable.java diff --git a/wings/warlock-autogen/src/main/java/pro/fessional/wings/warlock/database/autogen/tables/WinUserLoginTable.java b/wings/warlock/src/main/java-gen/pro/fessional/wings/warlock/database/autogen/tables/WinUserLoginTable.java similarity index 100% rename from wings/warlock-autogen/src/main/java/pro/fessional/wings/warlock/database/autogen/tables/WinUserLoginTable.java rename to wings/warlock/src/main/java-gen/pro/fessional/wings/warlock/database/autogen/tables/WinUserLoginTable.java diff --git a/wings/warlock-autogen/src/main/java/pro/fessional/wings/warlock/database/autogen/tables/daos/SysConstantEnumDao.java b/wings/warlock/src/main/java-gen/pro/fessional/wings/warlock/database/autogen/tables/daos/SysConstantEnumDao.java similarity index 100% rename from wings/warlock-autogen/src/main/java/pro/fessional/wings/warlock/database/autogen/tables/daos/SysConstantEnumDao.java rename to wings/warlock/src/main/java-gen/pro/fessional/wings/warlock/database/autogen/tables/daos/SysConstantEnumDao.java diff --git a/wings/warlock-autogen/src/main/java/pro/fessional/wings/warlock/database/autogen/tables/daos/SysStandardI18nDao.java b/wings/warlock/src/main/java-gen/pro/fessional/wings/warlock/database/autogen/tables/daos/SysStandardI18nDao.java similarity index 100% rename from wings/warlock-autogen/src/main/java/pro/fessional/wings/warlock/database/autogen/tables/daos/SysStandardI18nDao.java rename to wings/warlock/src/main/java-gen/pro/fessional/wings/warlock/database/autogen/tables/daos/SysStandardI18nDao.java diff --git a/wings/warlock-autogen/src/main/java/pro/fessional/wings/warlock/database/autogen/tables/daos/WinConfRuntimeDao.java b/wings/warlock/src/main/java-gen/pro/fessional/wings/warlock/database/autogen/tables/daos/WinConfRuntimeDao.java similarity index 100% rename from wings/warlock-autogen/src/main/java/pro/fessional/wings/warlock/database/autogen/tables/daos/WinConfRuntimeDao.java rename to wings/warlock/src/main/java-gen/pro/fessional/wings/warlock/database/autogen/tables/daos/WinConfRuntimeDao.java diff --git a/wings/warlock-autogen/src/main/java/pro/fessional/wings/warlock/database/autogen/tables/daos/WinPermEntryDao.java b/wings/warlock/src/main/java-gen/pro/fessional/wings/warlock/database/autogen/tables/daos/WinPermEntryDao.java similarity index 100% rename from wings/warlock-autogen/src/main/java/pro/fessional/wings/warlock/database/autogen/tables/daos/WinPermEntryDao.java rename to wings/warlock/src/main/java-gen/pro/fessional/wings/warlock/database/autogen/tables/daos/WinPermEntryDao.java diff --git a/wings/warlock-autogen/src/main/java/pro/fessional/wings/warlock/database/autogen/tables/daos/WinRoleEntryDao.java b/wings/warlock/src/main/java-gen/pro/fessional/wings/warlock/database/autogen/tables/daos/WinRoleEntryDao.java similarity index 100% rename from wings/warlock-autogen/src/main/java/pro/fessional/wings/warlock/database/autogen/tables/daos/WinRoleEntryDao.java rename to wings/warlock/src/main/java-gen/pro/fessional/wings/warlock/database/autogen/tables/daos/WinRoleEntryDao.java diff --git a/wings/warlock-autogen/src/main/java/pro/fessional/wings/warlock/database/autogen/tables/daos/WinRoleGrantDao.java b/wings/warlock/src/main/java-gen/pro/fessional/wings/warlock/database/autogen/tables/daos/WinRoleGrantDao.java similarity index 100% rename from wings/warlock-autogen/src/main/java/pro/fessional/wings/warlock/database/autogen/tables/daos/WinRoleGrantDao.java rename to wings/warlock/src/main/java-gen/pro/fessional/wings/warlock/database/autogen/tables/daos/WinRoleGrantDao.java diff --git a/wings/warlock-autogen/src/main/java/pro/fessional/wings/warlock/database/autogen/tables/daos/WinUserAuthnDao.java b/wings/warlock/src/main/java-gen/pro/fessional/wings/warlock/database/autogen/tables/daos/WinUserAuthnDao.java similarity index 100% rename from wings/warlock-autogen/src/main/java/pro/fessional/wings/warlock/database/autogen/tables/daos/WinUserAuthnDao.java rename to wings/warlock/src/main/java-gen/pro/fessional/wings/warlock/database/autogen/tables/daos/WinUserAuthnDao.java diff --git a/wings/warlock-autogen/src/main/java/pro/fessional/wings/warlock/database/autogen/tables/daos/WinUserBasisDao.java b/wings/warlock/src/main/java-gen/pro/fessional/wings/warlock/database/autogen/tables/daos/WinUserBasisDao.java similarity index 100% rename from wings/warlock-autogen/src/main/java/pro/fessional/wings/warlock/database/autogen/tables/daos/WinUserBasisDao.java rename to wings/warlock/src/main/java-gen/pro/fessional/wings/warlock/database/autogen/tables/daos/WinUserBasisDao.java diff --git a/wings/warlock-autogen/src/main/java/pro/fessional/wings/warlock/database/autogen/tables/daos/WinUserGrantDao.java b/wings/warlock/src/main/java-gen/pro/fessional/wings/warlock/database/autogen/tables/daos/WinUserGrantDao.java similarity index 100% rename from wings/warlock-autogen/src/main/java/pro/fessional/wings/warlock/database/autogen/tables/daos/WinUserGrantDao.java rename to wings/warlock/src/main/java-gen/pro/fessional/wings/warlock/database/autogen/tables/daos/WinUserGrantDao.java diff --git a/wings/warlock-autogen/src/main/java/pro/fessional/wings/warlock/database/autogen/tables/daos/WinUserLoginDao.java b/wings/warlock/src/main/java-gen/pro/fessional/wings/warlock/database/autogen/tables/daos/WinUserLoginDao.java similarity index 100% rename from wings/warlock-autogen/src/main/java/pro/fessional/wings/warlock/database/autogen/tables/daos/WinUserLoginDao.java rename to wings/warlock/src/main/java-gen/pro/fessional/wings/warlock/database/autogen/tables/daos/WinUserLoginDao.java diff --git a/wings/warlock-autogen/src/main/java/pro/fessional/wings/warlock/database/autogen/tables/interfaces/ISysConstantEnum.java b/wings/warlock/src/main/java-gen/pro/fessional/wings/warlock/database/autogen/tables/interfaces/ISysConstantEnum.java similarity index 100% rename from wings/warlock-autogen/src/main/java/pro/fessional/wings/warlock/database/autogen/tables/interfaces/ISysConstantEnum.java rename to wings/warlock/src/main/java-gen/pro/fessional/wings/warlock/database/autogen/tables/interfaces/ISysConstantEnum.java diff --git a/wings/warlock-autogen/src/main/java/pro/fessional/wings/warlock/database/autogen/tables/interfaces/ISysStandardI18n.java b/wings/warlock/src/main/java-gen/pro/fessional/wings/warlock/database/autogen/tables/interfaces/ISysStandardI18n.java similarity index 100% rename from wings/warlock-autogen/src/main/java/pro/fessional/wings/warlock/database/autogen/tables/interfaces/ISysStandardI18n.java rename to wings/warlock/src/main/java-gen/pro/fessional/wings/warlock/database/autogen/tables/interfaces/ISysStandardI18n.java diff --git a/wings/warlock-autogen/src/main/java/pro/fessional/wings/warlock/database/autogen/tables/interfaces/IWinConfRuntime.java b/wings/warlock/src/main/java-gen/pro/fessional/wings/warlock/database/autogen/tables/interfaces/IWinConfRuntime.java similarity index 100% rename from wings/warlock-autogen/src/main/java/pro/fessional/wings/warlock/database/autogen/tables/interfaces/IWinConfRuntime.java rename to wings/warlock/src/main/java-gen/pro/fessional/wings/warlock/database/autogen/tables/interfaces/IWinConfRuntime.java diff --git a/wings/warlock-autogen/src/main/java/pro/fessional/wings/warlock/database/autogen/tables/interfaces/IWinPermEntry.java b/wings/warlock/src/main/java-gen/pro/fessional/wings/warlock/database/autogen/tables/interfaces/IWinPermEntry.java similarity index 100% rename from wings/warlock-autogen/src/main/java/pro/fessional/wings/warlock/database/autogen/tables/interfaces/IWinPermEntry.java rename to wings/warlock/src/main/java-gen/pro/fessional/wings/warlock/database/autogen/tables/interfaces/IWinPermEntry.java diff --git a/wings/warlock-autogen/src/main/java/pro/fessional/wings/warlock/database/autogen/tables/interfaces/IWinRoleEntry.java b/wings/warlock/src/main/java-gen/pro/fessional/wings/warlock/database/autogen/tables/interfaces/IWinRoleEntry.java similarity index 100% rename from wings/warlock-autogen/src/main/java/pro/fessional/wings/warlock/database/autogen/tables/interfaces/IWinRoleEntry.java rename to wings/warlock/src/main/java-gen/pro/fessional/wings/warlock/database/autogen/tables/interfaces/IWinRoleEntry.java diff --git a/wings/warlock-autogen/src/main/java/pro/fessional/wings/warlock/database/autogen/tables/interfaces/IWinRoleGrant.java b/wings/warlock/src/main/java-gen/pro/fessional/wings/warlock/database/autogen/tables/interfaces/IWinRoleGrant.java similarity index 100% rename from wings/warlock-autogen/src/main/java/pro/fessional/wings/warlock/database/autogen/tables/interfaces/IWinRoleGrant.java rename to wings/warlock/src/main/java-gen/pro/fessional/wings/warlock/database/autogen/tables/interfaces/IWinRoleGrant.java diff --git a/wings/warlock-autogen/src/main/java/pro/fessional/wings/warlock/database/autogen/tables/interfaces/IWinUserAuthn.java b/wings/warlock/src/main/java-gen/pro/fessional/wings/warlock/database/autogen/tables/interfaces/IWinUserAuthn.java similarity index 100% rename from wings/warlock-autogen/src/main/java/pro/fessional/wings/warlock/database/autogen/tables/interfaces/IWinUserAuthn.java rename to wings/warlock/src/main/java-gen/pro/fessional/wings/warlock/database/autogen/tables/interfaces/IWinUserAuthn.java diff --git a/wings/warlock-autogen/src/main/java/pro/fessional/wings/warlock/database/autogen/tables/interfaces/IWinUserBasis.java b/wings/warlock/src/main/java-gen/pro/fessional/wings/warlock/database/autogen/tables/interfaces/IWinUserBasis.java similarity index 100% rename from wings/warlock-autogen/src/main/java/pro/fessional/wings/warlock/database/autogen/tables/interfaces/IWinUserBasis.java rename to wings/warlock/src/main/java-gen/pro/fessional/wings/warlock/database/autogen/tables/interfaces/IWinUserBasis.java diff --git a/wings/warlock-autogen/src/main/java/pro/fessional/wings/warlock/database/autogen/tables/interfaces/IWinUserGrant.java b/wings/warlock/src/main/java-gen/pro/fessional/wings/warlock/database/autogen/tables/interfaces/IWinUserGrant.java similarity index 100% rename from wings/warlock-autogen/src/main/java/pro/fessional/wings/warlock/database/autogen/tables/interfaces/IWinUserGrant.java rename to wings/warlock/src/main/java-gen/pro/fessional/wings/warlock/database/autogen/tables/interfaces/IWinUserGrant.java diff --git a/wings/warlock-autogen/src/main/java/pro/fessional/wings/warlock/database/autogen/tables/interfaces/IWinUserLogin.java b/wings/warlock/src/main/java-gen/pro/fessional/wings/warlock/database/autogen/tables/interfaces/IWinUserLogin.java similarity index 100% rename from wings/warlock-autogen/src/main/java/pro/fessional/wings/warlock/database/autogen/tables/interfaces/IWinUserLogin.java rename to wings/warlock/src/main/java-gen/pro/fessional/wings/warlock/database/autogen/tables/interfaces/IWinUserLogin.java diff --git a/wings/warlock-autogen/src/main/java/pro/fessional/wings/warlock/database/autogen/tables/pojos/SysConstantEnum.java b/wings/warlock/src/main/java-gen/pro/fessional/wings/warlock/database/autogen/tables/pojos/SysConstantEnum.java similarity index 100% rename from wings/warlock-autogen/src/main/java/pro/fessional/wings/warlock/database/autogen/tables/pojos/SysConstantEnum.java rename to wings/warlock/src/main/java-gen/pro/fessional/wings/warlock/database/autogen/tables/pojos/SysConstantEnum.java diff --git a/wings/warlock-autogen/src/main/java/pro/fessional/wings/warlock/database/autogen/tables/pojos/SysStandardI18n.java b/wings/warlock/src/main/java-gen/pro/fessional/wings/warlock/database/autogen/tables/pojos/SysStandardI18n.java similarity index 100% rename from wings/warlock-autogen/src/main/java/pro/fessional/wings/warlock/database/autogen/tables/pojos/SysStandardI18n.java rename to wings/warlock/src/main/java-gen/pro/fessional/wings/warlock/database/autogen/tables/pojos/SysStandardI18n.java diff --git a/wings/warlock-autogen/src/main/java/pro/fessional/wings/warlock/database/autogen/tables/pojos/WinConfRuntime.java b/wings/warlock/src/main/java-gen/pro/fessional/wings/warlock/database/autogen/tables/pojos/WinConfRuntime.java similarity index 100% rename from wings/warlock-autogen/src/main/java/pro/fessional/wings/warlock/database/autogen/tables/pojos/WinConfRuntime.java rename to wings/warlock/src/main/java-gen/pro/fessional/wings/warlock/database/autogen/tables/pojos/WinConfRuntime.java diff --git a/wings/warlock-autogen/src/main/java/pro/fessional/wings/warlock/database/autogen/tables/pojos/WinPermEntry.java b/wings/warlock/src/main/java-gen/pro/fessional/wings/warlock/database/autogen/tables/pojos/WinPermEntry.java similarity index 100% rename from wings/warlock-autogen/src/main/java/pro/fessional/wings/warlock/database/autogen/tables/pojos/WinPermEntry.java rename to wings/warlock/src/main/java-gen/pro/fessional/wings/warlock/database/autogen/tables/pojos/WinPermEntry.java diff --git a/wings/warlock-autogen/src/main/java/pro/fessional/wings/warlock/database/autogen/tables/pojos/WinRoleEntry.java b/wings/warlock/src/main/java-gen/pro/fessional/wings/warlock/database/autogen/tables/pojos/WinRoleEntry.java similarity index 100% rename from wings/warlock-autogen/src/main/java/pro/fessional/wings/warlock/database/autogen/tables/pojos/WinRoleEntry.java rename to wings/warlock/src/main/java-gen/pro/fessional/wings/warlock/database/autogen/tables/pojos/WinRoleEntry.java diff --git a/wings/warlock-autogen/src/main/java/pro/fessional/wings/warlock/database/autogen/tables/pojos/WinRoleGrant.java b/wings/warlock/src/main/java-gen/pro/fessional/wings/warlock/database/autogen/tables/pojos/WinRoleGrant.java similarity index 100% rename from wings/warlock-autogen/src/main/java/pro/fessional/wings/warlock/database/autogen/tables/pojos/WinRoleGrant.java rename to wings/warlock/src/main/java-gen/pro/fessional/wings/warlock/database/autogen/tables/pojos/WinRoleGrant.java diff --git a/wings/warlock-autogen/src/main/java/pro/fessional/wings/warlock/database/autogen/tables/pojos/WinUserAuthn.java b/wings/warlock/src/main/java-gen/pro/fessional/wings/warlock/database/autogen/tables/pojos/WinUserAuthn.java similarity index 100% rename from wings/warlock-autogen/src/main/java/pro/fessional/wings/warlock/database/autogen/tables/pojos/WinUserAuthn.java rename to wings/warlock/src/main/java-gen/pro/fessional/wings/warlock/database/autogen/tables/pojos/WinUserAuthn.java diff --git a/wings/warlock-autogen/src/main/java/pro/fessional/wings/warlock/database/autogen/tables/pojos/WinUserBasis.java b/wings/warlock/src/main/java-gen/pro/fessional/wings/warlock/database/autogen/tables/pojos/WinUserBasis.java similarity index 100% rename from wings/warlock-autogen/src/main/java/pro/fessional/wings/warlock/database/autogen/tables/pojos/WinUserBasis.java rename to wings/warlock/src/main/java-gen/pro/fessional/wings/warlock/database/autogen/tables/pojos/WinUserBasis.java diff --git a/wings/warlock-autogen/src/main/java/pro/fessional/wings/warlock/database/autogen/tables/pojos/WinUserGrant.java b/wings/warlock/src/main/java-gen/pro/fessional/wings/warlock/database/autogen/tables/pojos/WinUserGrant.java similarity index 100% rename from wings/warlock-autogen/src/main/java/pro/fessional/wings/warlock/database/autogen/tables/pojos/WinUserGrant.java rename to wings/warlock/src/main/java-gen/pro/fessional/wings/warlock/database/autogen/tables/pojos/WinUserGrant.java diff --git a/wings/warlock-autogen/src/main/java/pro/fessional/wings/warlock/database/autogen/tables/pojos/WinUserLogin.java b/wings/warlock/src/main/java-gen/pro/fessional/wings/warlock/database/autogen/tables/pojos/WinUserLogin.java similarity index 100% rename from wings/warlock-autogen/src/main/java/pro/fessional/wings/warlock/database/autogen/tables/pojos/WinUserLogin.java rename to wings/warlock/src/main/java-gen/pro/fessional/wings/warlock/database/autogen/tables/pojos/WinUserLogin.java diff --git a/wings/warlock-autogen/src/main/java/pro/fessional/wings/warlock/database/autogen/tables/records/SysConstantEnumRecord.java b/wings/warlock/src/main/java-gen/pro/fessional/wings/warlock/database/autogen/tables/records/SysConstantEnumRecord.java similarity index 100% rename from wings/warlock-autogen/src/main/java/pro/fessional/wings/warlock/database/autogen/tables/records/SysConstantEnumRecord.java rename to wings/warlock/src/main/java-gen/pro/fessional/wings/warlock/database/autogen/tables/records/SysConstantEnumRecord.java diff --git a/wings/warlock-autogen/src/main/java/pro/fessional/wings/warlock/database/autogen/tables/records/SysStandardI18nRecord.java b/wings/warlock/src/main/java-gen/pro/fessional/wings/warlock/database/autogen/tables/records/SysStandardI18nRecord.java similarity index 100% rename from wings/warlock-autogen/src/main/java/pro/fessional/wings/warlock/database/autogen/tables/records/SysStandardI18nRecord.java rename to wings/warlock/src/main/java-gen/pro/fessional/wings/warlock/database/autogen/tables/records/SysStandardI18nRecord.java diff --git a/wings/warlock-autogen/src/main/java/pro/fessional/wings/warlock/database/autogen/tables/records/WinConfRuntimeRecord.java b/wings/warlock/src/main/java-gen/pro/fessional/wings/warlock/database/autogen/tables/records/WinConfRuntimeRecord.java similarity index 100% rename from wings/warlock-autogen/src/main/java/pro/fessional/wings/warlock/database/autogen/tables/records/WinConfRuntimeRecord.java rename to wings/warlock/src/main/java-gen/pro/fessional/wings/warlock/database/autogen/tables/records/WinConfRuntimeRecord.java diff --git a/wings/warlock-autogen/src/main/java/pro/fessional/wings/warlock/database/autogen/tables/records/WinPermEntryRecord.java b/wings/warlock/src/main/java-gen/pro/fessional/wings/warlock/database/autogen/tables/records/WinPermEntryRecord.java similarity index 100% rename from wings/warlock-autogen/src/main/java/pro/fessional/wings/warlock/database/autogen/tables/records/WinPermEntryRecord.java rename to wings/warlock/src/main/java-gen/pro/fessional/wings/warlock/database/autogen/tables/records/WinPermEntryRecord.java diff --git a/wings/warlock-autogen/src/main/java/pro/fessional/wings/warlock/database/autogen/tables/records/WinRoleEntryRecord.java b/wings/warlock/src/main/java-gen/pro/fessional/wings/warlock/database/autogen/tables/records/WinRoleEntryRecord.java similarity index 100% rename from wings/warlock-autogen/src/main/java/pro/fessional/wings/warlock/database/autogen/tables/records/WinRoleEntryRecord.java rename to wings/warlock/src/main/java-gen/pro/fessional/wings/warlock/database/autogen/tables/records/WinRoleEntryRecord.java diff --git a/wings/warlock-autogen/src/main/java/pro/fessional/wings/warlock/database/autogen/tables/records/WinRoleGrantRecord.java b/wings/warlock/src/main/java-gen/pro/fessional/wings/warlock/database/autogen/tables/records/WinRoleGrantRecord.java similarity index 100% rename from wings/warlock-autogen/src/main/java/pro/fessional/wings/warlock/database/autogen/tables/records/WinRoleGrantRecord.java rename to wings/warlock/src/main/java-gen/pro/fessional/wings/warlock/database/autogen/tables/records/WinRoleGrantRecord.java diff --git a/wings/warlock-autogen/src/main/java/pro/fessional/wings/warlock/database/autogen/tables/records/WinUserAuthnRecord.java b/wings/warlock/src/main/java-gen/pro/fessional/wings/warlock/database/autogen/tables/records/WinUserAuthnRecord.java similarity index 100% rename from wings/warlock-autogen/src/main/java/pro/fessional/wings/warlock/database/autogen/tables/records/WinUserAuthnRecord.java rename to wings/warlock/src/main/java-gen/pro/fessional/wings/warlock/database/autogen/tables/records/WinUserAuthnRecord.java diff --git a/wings/warlock-autogen/src/main/java/pro/fessional/wings/warlock/database/autogen/tables/records/WinUserBasisRecord.java b/wings/warlock/src/main/java-gen/pro/fessional/wings/warlock/database/autogen/tables/records/WinUserBasisRecord.java similarity index 100% rename from wings/warlock-autogen/src/main/java/pro/fessional/wings/warlock/database/autogen/tables/records/WinUserBasisRecord.java rename to wings/warlock/src/main/java-gen/pro/fessional/wings/warlock/database/autogen/tables/records/WinUserBasisRecord.java diff --git a/wings/warlock-autogen/src/main/java/pro/fessional/wings/warlock/database/autogen/tables/records/WinUserGrantRecord.java b/wings/warlock/src/main/java-gen/pro/fessional/wings/warlock/database/autogen/tables/records/WinUserGrantRecord.java similarity index 100% rename from wings/warlock-autogen/src/main/java/pro/fessional/wings/warlock/database/autogen/tables/records/WinUserGrantRecord.java rename to wings/warlock/src/main/java-gen/pro/fessional/wings/warlock/database/autogen/tables/records/WinUserGrantRecord.java diff --git a/wings/warlock-autogen/src/main/java/pro/fessional/wings/warlock/database/autogen/tables/records/WinUserLoginRecord.java b/wings/warlock/src/main/java-gen/pro/fessional/wings/warlock/database/autogen/tables/records/WinUserLoginRecord.java similarity index 100% rename from wings/warlock-autogen/src/main/java/pro/fessional/wings/warlock/database/autogen/tables/records/WinUserLoginRecord.java rename to wings/warlock/src/main/java-gen/pro/fessional/wings/warlock/database/autogen/tables/records/WinUserLoginRecord.java diff --git a/wings/warlock-autogen/src/main/java/pro/fessional/wings/warlock/enums/autogen/GrantType.java b/wings/warlock/src/main/java-gen/pro/fessional/wings/warlock/enums/autogen/GrantType.java similarity index 96% rename from wings/warlock-autogen/src/main/java/pro/fessional/wings/warlock/enums/autogen/GrantType.java rename to wings/warlock/src/main/java-gen/pro/fessional/wings/warlock/enums/autogen/GrantType.java index 25196aeef..3adf01d66 100644 --- a/wings/warlock-autogen/src/main/java/pro/fessional/wings/warlock/enums/autogen/GrantType.java +++ b/wings/warlock/src/main/java-gen/pro/fessional/wings/warlock/enums/autogen/GrantType.java @@ -7,10 +7,13 @@ import pro.fessional.wings.faceless.enums.ConstantEnum; import pro.fessional.wings.faceless.enums.StandardI18nEnum; +import javax.annotation.processing.Generated; + /** * @author trydofor - * @since 2023-09-01 + * @since 2024-02-05 */ +@Generated("wings faceless codegen") public enum GrantType implements ConstantEnum, StandardI18nEnum { SUPER(1330100, "grant_type", "grant type", "classpath:/wings-tmpl/ConstantEnumTemplate.java"), diff --git a/wings/warlock-autogen/src/main/java/pro/fessional/wings/warlock/enums/autogen/UserGender.java b/wings/warlock/src/main/java-gen/pro/fessional/wings/warlock/enums/autogen/UserGender.java similarity index 96% rename from wings/warlock-autogen/src/main/java/pro/fessional/wings/warlock/enums/autogen/UserGender.java rename to wings/warlock/src/main/java-gen/pro/fessional/wings/warlock/enums/autogen/UserGender.java index 785c1e217..1c63b418e 100644 --- a/wings/warlock-autogen/src/main/java/pro/fessional/wings/warlock/enums/autogen/UserGender.java +++ b/wings/warlock/src/main/java-gen/pro/fessional/wings/warlock/enums/autogen/UserGender.java @@ -7,10 +7,13 @@ import pro.fessional.wings.faceless.enums.ConstantEnum; import pro.fessional.wings.faceless.enums.StandardI18nEnum; +import javax.annotation.processing.Generated; + /** * @author trydofor - * @since 2023-09-01 + * @since 2024-02-05 */ +@Generated("wings faceless codegen") public enum UserGender implements ConstantEnum, StandardI18nEnum { SUPER(1200100, "user_gender", "gender", "classpath:/wings-tmpl/ConstantEnumTemplate.java"), diff --git a/wings/warlock-autogen/src/main/java/pro/fessional/wings/warlock/enums/autogen/UserStatus.java b/wings/warlock/src/main/java-gen/pro/fessional/wings/warlock/enums/autogen/UserStatus.java similarity index 97% rename from wings/warlock-autogen/src/main/java/pro/fessional/wings/warlock/enums/autogen/UserStatus.java rename to wings/warlock/src/main/java-gen/pro/fessional/wings/warlock/enums/autogen/UserStatus.java index a6f849589..48aaa2250 100644 --- a/wings/warlock-autogen/src/main/java/pro/fessional/wings/warlock/enums/autogen/UserStatus.java +++ b/wings/warlock/src/main/java-gen/pro/fessional/wings/warlock/enums/autogen/UserStatus.java @@ -7,10 +7,13 @@ import pro.fessional.wings.faceless.enums.ConstantEnum; import pro.fessional.wings.faceless.enums.StandardI18nEnum; +import javax.annotation.processing.Generated; + /** * @author trydofor - * @since 2023-09-01 + * @since 2024-02-05 */ +@Generated("wings faceless codegen") public enum UserStatus implements ConstantEnum, StandardI18nEnum { SUPER(1200200, "user_status", "user status", "classpath:/wings-tmpl/ConstantEnumTemplate.java"), diff --git a/wings/warlock-autogen/src/main/java/pro/fessional/wings/warlock/security/autogen/PermConstant.java b/wings/warlock/src/main/java-gen/pro/fessional/wings/warlock/security/autogen/PermConstant.java similarity index 94% rename from wings/warlock-autogen/src/main/java/pro/fessional/wings/warlock/security/autogen/PermConstant.java rename to wings/warlock/src/main/java-gen/pro/fessional/wings/warlock/security/autogen/PermConstant.java index 3c89a254a..9c62b706a 100644 --- a/wings/warlock-autogen/src/main/java/pro/fessional/wings/warlock/security/autogen/PermConstant.java +++ b/wings/warlock/src/main/java-gen/pro/fessional/wings/warlock/security/autogen/PermConstant.java @@ -1,8 +1,11 @@ package pro.fessional.wings.warlock.security.autogen; +import javax.annotation.processing.Generated; + /** - * @since 2023-09-08 + * @since 2024-02-05 */ +@Generated("wings faceless codegen") public interface PermConstant { interface System { diff --git a/wings/warlock-autogen/src/main/java/pro/fessional/wings/warlock/security/autogen/RoleConstant.java b/wings/warlock/src/main/java-gen/pro/fessional/wings/warlock/security/autogen/RoleConstant.java similarity index 85% rename from wings/warlock-autogen/src/main/java/pro/fessional/wings/warlock/security/autogen/RoleConstant.java rename to wings/warlock/src/main/java-gen/pro/fessional/wings/warlock/security/autogen/RoleConstant.java index e37892275..db73f4304 100644 --- a/wings/warlock-autogen/src/main/java/pro/fessional/wings/warlock/security/autogen/RoleConstant.java +++ b/wings/warlock/src/main/java-gen/pro/fessional/wings/warlock/security/autogen/RoleConstant.java @@ -1,8 +1,11 @@ package pro.fessional.wings.warlock.security.autogen; +import javax.annotation.processing.Generated; + /** - * @since 2023-09-08 + * @since 2024-02-05 */ +@Generated("wings faceless codegen") public interface RoleConstant { /** diff --git a/wings/warlock-awesome/src/main/java/pro/fessional/wings/warlock/service/conf/RuntimeConfService.java b/wings/warlock/src/main/java/pro/fessional/wings/warlock/service/conf/RuntimeConfService.java similarity index 100% rename from wings/warlock-awesome/src/main/java/pro/fessional/wings/warlock/service/conf/RuntimeConfService.java rename to wings/warlock/src/main/java/pro/fessional/wings/warlock/service/conf/RuntimeConfService.java diff --git a/wings/warlock-awesome/src/main/java/pro/fessional/wings/warlock/service/conf/impl/RuntimeConfServiceImpl.java b/wings/warlock/src/main/java/pro/fessional/wings/warlock/service/conf/impl/RuntimeConfServiceImpl.java similarity index 100% rename from wings/warlock-awesome/src/main/java/pro/fessional/wings/warlock/service/conf/impl/RuntimeConfServiceImpl.java rename to wings/warlock/src/main/java/pro/fessional/wings/warlock/service/conf/impl/RuntimeConfServiceImpl.java diff --git a/wings/warlock-awesome/src/main/java/pro/fessional/wings/warlock/service/grant/WarlockGrantService.java b/wings/warlock/src/main/java/pro/fessional/wings/warlock/service/grant/WarlockGrantService.java similarity index 100% rename from wings/warlock-awesome/src/main/java/pro/fessional/wings/warlock/service/grant/WarlockGrantService.java rename to wings/warlock/src/main/java/pro/fessional/wings/warlock/service/grant/WarlockGrantService.java diff --git a/wings/warlock-awesome/src/main/java/pro/fessional/wings/warlock/service/grant/impl/WarlockGrantServiceDummy.java b/wings/warlock/src/main/java/pro/fessional/wings/warlock/service/grant/impl/WarlockGrantServiceDummy.java similarity index 100% rename from wings/warlock-awesome/src/main/java/pro/fessional/wings/warlock/service/grant/impl/WarlockGrantServiceDummy.java rename to wings/warlock/src/main/java/pro/fessional/wings/warlock/service/grant/impl/WarlockGrantServiceDummy.java diff --git a/wings/warlock-awesome/src/main/java/pro/fessional/wings/warlock/spring/bean/WarlockAwesomeConfiguration.java b/wings/warlock/src/main/java/pro/fessional/wings/warlock/spring/bean/WarlockAwesomeConfiguration.java similarity index 100% rename from wings/warlock-awesome/src/main/java/pro/fessional/wings/warlock/spring/bean/WarlockAwesomeConfiguration.java rename to wings/warlock/src/main/java/pro/fessional/wings/warlock/spring/bean/WarlockAwesomeConfiguration.java diff --git a/wings/warlock/src/main/java/pro/fessional/wings/warlock/spring/conf/WarlockAutoConfiguration.java b/wings/warlock/src/main/java/pro/fessional/wings/warlock/spring/conf/WarlockAutoConfiguration.java index 2fa90f52f..4d36addde 100644 --- a/wings/warlock/src/main/java/pro/fessional/wings/warlock/spring/conf/WarlockAutoConfiguration.java +++ b/wings/warlock/src/main/java/pro/fessional/wings/warlock/spring/conf/WarlockAutoConfiguration.java @@ -5,6 +5,7 @@ import org.springframework.context.annotation.Import; import pro.fessional.wings.silencer.spring.boot.ConditionalWingsEnabled; import pro.fessional.wings.warlock.spring.bean.WarlockAutoRunConfiguration; +import pro.fessional.wings.warlock.spring.bean.WarlockAwesomeConfiguration; import pro.fessional.wings.warlock.spring.bean.WarlockJournalConfiguration; import pro.fessional.wings.warlock.spring.bean.WarlockLockBeanConfiguration; import pro.fessional.wings.warlock.spring.bean.WarlockTableChangeConfiguration; @@ -20,6 +21,7 @@ @ConfigurationPropertiesScan(basePackageClasses = WarlockEnabledProp.class) @Import({ WarlockAutoRunConfiguration.class, + WarlockAwesomeConfiguration.class, WarlockJournalConfiguration.class, WarlockLockBeanConfiguration.class, WarlockTableChangeConfiguration.class, diff --git a/wings/warlock-awesome/src/main/java/pro/fessional/wings/warlock/spring/conf/WarlockAwesomeAutoConfiguration.java b/wings/warlock/src/main/java/pro/fessional/wings/warlock/spring/conf/WarlockAwesomeAutoConfiguration.java similarity index 100% rename from wings/warlock-awesome/src/main/java/pro/fessional/wings/warlock/spring/conf/WarlockAwesomeAutoConfiguration.java rename to wings/warlock/src/main/java/pro/fessional/wings/warlock/spring/conf/WarlockAwesomeAutoConfiguration.java diff --git a/wings/warlock/src/main/resources/META-INF/additional-spring-configuration-metadata.json b/wings/warlock/src/main/resources/META-INF/additional-spring-configuration-metadata.json index 566ded882..868c98f68 100644 --- a/wings/warlock/src/main/resources/META-INF/additional-spring-configuration-metadata.json +++ b/wings/warlock/src/main/resources/META-INF/additional-spring-configuration-metadata.json @@ -10,6 +10,11 @@ {"name": "wings.enabled.pro.fessional.wings.warlock.spring.bean.WarlockAutoRunConfiguration.databaseCheckerRunner", "type": "java.lang.Boolean"}, {"name": "wings.enabled.pro.fessional.wings.warlock.spring.bean.WarlockAutoRunConfiguration.registerEnumUtilRunner", "type": "java.lang.Boolean"}, + {"name": "wings.enabled.pro.fessional.wings.warlock.spring.bean.WarlockAwesomeConfiguration", "type": "java.lang.Boolean"}, + {"name": "wings.enabled.pro.fessional.wings.warlock.spring.bean.WarlockAwesomeConfiguration$JooqDaoScan", "type": "java.lang.Boolean"}, + {"name": "wings.enabled.pro.fessional.wings.warlock.spring.bean.WarlockAwesomeConfiguration.registerRuntimeModeRunner", "type": "java.lang.Boolean"}, + {"name": "wings.enabled.pro.fessional.wings.warlock.spring.bean.WarlockAwesomeConfiguration.runtimeConfService", "type": "java.lang.Boolean"}, + {"name": "wings.enabled.pro.fessional.wings.warlock.spring.bean.WarlockLockBeanConfiguration", "type": "java.lang.Boolean"}, {"name": "wings.enabled.pro.fessional.wings.warlock.spring.bean.WarlockLockBeanConfiguration.databaseGlobalLock", "type": "java.lang.Boolean"}, {"name": "wings.enabled.pro.fessional.wings.warlock.spring.bean.WarlockLockBeanConfiguration.jvmStaticGlobalLock", "type": "java.lang.Boolean"}, diff --git a/wings/warlock-awesome/src/test/java/pro/fessional/wings/warlock/service/conf/RuntimeConfServiceTest.java b/wings/warlock/src/test/java/pro/fessional/wings/warlock/service/conf/RuntimeConfServiceTest.java similarity index 100% rename from wings/warlock-awesome/src/test/java/pro/fessional/wings/warlock/service/conf/RuntimeConfServiceTest.java rename to wings/warlock/src/test/java/pro/fessional/wings/warlock/service/conf/RuntimeConfServiceTest.java From 16123b813303af39a7047a195f661075c8e32c71 Mon Sep 17 00:00:00 2001 From: trydofor Date: Tue, 6 Feb 2024 17:06:38 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=F0=9F=92=9A=20try=20qodana.yml=20#204?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/qodana.yml | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 .github/workflows/qodana.yml diff --git a/.github/workflows/qodana.yml b/.github/workflows/qodana.yml new file mode 100644 index 000000000..4822eeb05 --- /dev/null +++ b/.github/workflows/qodana.yml @@ -0,0 +1,20 @@ +name: Qodana +on: + workflow_dispatch: + push: + branches: + - 'main' + +jobs: + qodana: + runs-on: ubuntu-latest + permissions: + contents: write + pull-requests: write + checks: write + steps: + - uses: actions/checkout@v4 + - name: 'Qodana Scan' + uses: JetBrains/qodana-action@v2023.3 + env: + QODANA_TOKEN: ${{ secrets.QODANA_TOKEN }} \ No newline at end of file