From c06c7e7d35d3641661c929de7b57d7ef06b02d96 Mon Sep 17 00:00:00 2001 From: fxbin Date: Fri, 30 Jul 2021 11:52:46 +0800 Subject: [PATCH] =?UTF-8?q?refactor(all):=20=E4=BF=AE=E6=94=B9=E6=A8=A1?= =?UTF-8?q?=E5=9D=97=E5=90=8D=E4=B8=BA=EF=BC=9A=20{=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E5=90=8D}-spring-boot-starter?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 4 ++-- cosid-rest-api/build.gradle.kts | 6 +++--- .../build.gradle.kts | 0 .../spring/boot/starter/ConditionalOnCosIdEnabled.java | 0 .../cosid/spring/boot/starter/CosIdAutoConfiguration.java | 0 .../me/ahoo/cosid/spring/boot/starter/CosIdProperties.java | 0 .../me/ahoo/cosid/spring/boot/starter/EnabledSuffix.java | 0 .../starter/segment/ConditionalOnCosIdSegmentEnabled.java | 0 .../starter/segment/CosIdJdbcSegmentAutoConfiguration.java | 0 .../CosIdLifecyclePrefetchWorkerExecutorService.java | 0 .../starter/segment/CosIdRedisSegmentAutoConfiguration.java | 0 .../boot/starter/segment/CosIdSegmentAutoConfiguration.java | 0 .../segment/CosIdSpringRedisSegmentAutoConfiguration.java | 0 .../spring/boot/starter/segment/SegmentIdProperties.java | 0 .../snowflake/ConditionalOnCosIdSnowflakeEnabled.java | 0 .../snowflake/CosIdLifecycleMachineIdDistributor.java | 0 .../CosIdRedisMachineIdDistributorAutoConfiguration.java | 0 .../starter/snowflake/CosIdSnowflakeAutoConfiguration.java | 0 ...sIdSpringRedisMachineIdDistributorAutoConfiguration.java | 0 .../boot/starter/snowflake/SnowflakeIdProperties.java | 0 .../src/main/resources/META-INF/spring.factories | 0 settings.gradle.kts | 2 +- wiki/getting-started.md | 4 ++-- 23 files changed, 8 insertions(+), 8 deletions(-) rename {spring-boot-starter-cosid => cosid-spring-boot-starter}/build.gradle.kts (100%) rename {spring-boot-starter-cosid => cosid-spring-boot-starter}/src/main/java/me/ahoo/cosid/spring/boot/starter/ConditionalOnCosIdEnabled.java (100%) rename {spring-boot-starter-cosid => cosid-spring-boot-starter}/src/main/java/me/ahoo/cosid/spring/boot/starter/CosIdAutoConfiguration.java (100%) rename {spring-boot-starter-cosid => cosid-spring-boot-starter}/src/main/java/me/ahoo/cosid/spring/boot/starter/CosIdProperties.java (100%) rename {spring-boot-starter-cosid => cosid-spring-boot-starter}/src/main/java/me/ahoo/cosid/spring/boot/starter/EnabledSuffix.java (100%) rename {spring-boot-starter-cosid => cosid-spring-boot-starter}/src/main/java/me/ahoo/cosid/spring/boot/starter/segment/ConditionalOnCosIdSegmentEnabled.java (100%) rename {spring-boot-starter-cosid => cosid-spring-boot-starter}/src/main/java/me/ahoo/cosid/spring/boot/starter/segment/CosIdJdbcSegmentAutoConfiguration.java (100%) rename {spring-boot-starter-cosid => cosid-spring-boot-starter}/src/main/java/me/ahoo/cosid/spring/boot/starter/segment/CosIdLifecyclePrefetchWorkerExecutorService.java (100%) rename {spring-boot-starter-cosid => cosid-spring-boot-starter}/src/main/java/me/ahoo/cosid/spring/boot/starter/segment/CosIdRedisSegmentAutoConfiguration.java (100%) rename {spring-boot-starter-cosid => cosid-spring-boot-starter}/src/main/java/me/ahoo/cosid/spring/boot/starter/segment/CosIdSegmentAutoConfiguration.java (100%) rename {spring-boot-starter-cosid => cosid-spring-boot-starter}/src/main/java/me/ahoo/cosid/spring/boot/starter/segment/CosIdSpringRedisSegmentAutoConfiguration.java (100%) rename {spring-boot-starter-cosid => cosid-spring-boot-starter}/src/main/java/me/ahoo/cosid/spring/boot/starter/segment/SegmentIdProperties.java (100%) rename {spring-boot-starter-cosid => cosid-spring-boot-starter}/src/main/java/me/ahoo/cosid/spring/boot/starter/snowflake/ConditionalOnCosIdSnowflakeEnabled.java (100%) rename {spring-boot-starter-cosid => cosid-spring-boot-starter}/src/main/java/me/ahoo/cosid/spring/boot/starter/snowflake/CosIdLifecycleMachineIdDistributor.java (100%) rename {spring-boot-starter-cosid => cosid-spring-boot-starter}/src/main/java/me/ahoo/cosid/spring/boot/starter/snowflake/CosIdRedisMachineIdDistributorAutoConfiguration.java (100%) rename {spring-boot-starter-cosid => cosid-spring-boot-starter}/src/main/java/me/ahoo/cosid/spring/boot/starter/snowflake/CosIdSnowflakeAutoConfiguration.java (100%) rename {spring-boot-starter-cosid => cosid-spring-boot-starter}/src/main/java/me/ahoo/cosid/spring/boot/starter/snowflake/CosIdSpringRedisMachineIdDistributorAutoConfiguration.java (100%) rename {spring-boot-starter-cosid => cosid-spring-boot-starter}/src/main/java/me/ahoo/cosid/spring/boot/starter/snowflake/SnowflakeIdProperties.java (100%) rename {spring-boot-starter-cosid => cosid-spring-boot-starter}/src/main/resources/META-INF/spring.factories (100%) diff --git a/README.md b/README.md index fe4078df81..0986e35d13 100644 --- a/README.md +++ b/README.md @@ -313,7 +313,7 @@ In actual use, we generally do not use the same `IdGenerator` for all business s ``` kotlin val cosidVersion = "1.3.4"; - implementation("me.ahoo.cosid:spring-boot-starter-cosid:${cosidVersion}") + implementation("me.ahoo.cosid:cosid-spring-boot-starter:${cosidVersion}") ``` ### Maven @@ -334,7 +334,7 @@ In actual use, we generally do not use the same `IdGenerator` for all business s me.ahoo.cosid - spring-boot-starter-cosid + cosid-spring-boot-starter ${cosid.version} diff --git a/cosid-rest-api/build.gradle.kts b/cosid-rest-api/build.gradle.kts index cd5624f5c2..0b851d72a3 100644 --- a/cosid-rest-api/build.gradle.kts +++ b/cosid-rest-api/build.gradle.kts @@ -46,7 +46,7 @@ application { dependencies { implementation(platform(project(":cosid-dependencies"))) - implementation(project(":spring-boot-starter-cosid")) + implementation(project(":cosid-spring-boot-starter")) implementation("io.springfox:springfox-boot-starter") @@ -54,7 +54,7 @@ dependencies { // implementation(project(":cosid-redis")) // implementation("me.ahoo.cosky:cosky-spring-cloud-core") // or -// implementation(project(":spring-boot-starter-cosid")){ +// implementation(project(":cosid-spring-boot-starter")){ // capabilities { // requireCapability("me.ahoo.cosid:redis-support") // } @@ -64,7 +64,7 @@ dependencies { implementation(project(":cosid-spring-redis")) implementation("org.springframework.boot:spring-boot-starter-data-redis") // or -// implementation(project(":spring-boot-starter-cosid")){ +// implementation(project(":cosid-spring-boot-starter")){ // capabilities { // requireCapability("me.ahoo.cosid:spring-redis-support") // } diff --git a/spring-boot-starter-cosid/build.gradle.kts b/cosid-spring-boot-starter/build.gradle.kts similarity index 100% rename from spring-boot-starter-cosid/build.gradle.kts rename to cosid-spring-boot-starter/build.gradle.kts diff --git a/spring-boot-starter-cosid/src/main/java/me/ahoo/cosid/spring/boot/starter/ConditionalOnCosIdEnabled.java b/cosid-spring-boot-starter/src/main/java/me/ahoo/cosid/spring/boot/starter/ConditionalOnCosIdEnabled.java similarity index 100% rename from spring-boot-starter-cosid/src/main/java/me/ahoo/cosid/spring/boot/starter/ConditionalOnCosIdEnabled.java rename to cosid-spring-boot-starter/src/main/java/me/ahoo/cosid/spring/boot/starter/ConditionalOnCosIdEnabled.java diff --git a/spring-boot-starter-cosid/src/main/java/me/ahoo/cosid/spring/boot/starter/CosIdAutoConfiguration.java b/cosid-spring-boot-starter/src/main/java/me/ahoo/cosid/spring/boot/starter/CosIdAutoConfiguration.java similarity index 100% rename from spring-boot-starter-cosid/src/main/java/me/ahoo/cosid/spring/boot/starter/CosIdAutoConfiguration.java rename to cosid-spring-boot-starter/src/main/java/me/ahoo/cosid/spring/boot/starter/CosIdAutoConfiguration.java diff --git a/spring-boot-starter-cosid/src/main/java/me/ahoo/cosid/spring/boot/starter/CosIdProperties.java b/cosid-spring-boot-starter/src/main/java/me/ahoo/cosid/spring/boot/starter/CosIdProperties.java similarity index 100% rename from spring-boot-starter-cosid/src/main/java/me/ahoo/cosid/spring/boot/starter/CosIdProperties.java rename to cosid-spring-boot-starter/src/main/java/me/ahoo/cosid/spring/boot/starter/CosIdProperties.java diff --git a/spring-boot-starter-cosid/src/main/java/me/ahoo/cosid/spring/boot/starter/EnabledSuffix.java b/cosid-spring-boot-starter/src/main/java/me/ahoo/cosid/spring/boot/starter/EnabledSuffix.java similarity index 100% rename from spring-boot-starter-cosid/src/main/java/me/ahoo/cosid/spring/boot/starter/EnabledSuffix.java rename to cosid-spring-boot-starter/src/main/java/me/ahoo/cosid/spring/boot/starter/EnabledSuffix.java diff --git a/spring-boot-starter-cosid/src/main/java/me/ahoo/cosid/spring/boot/starter/segment/ConditionalOnCosIdSegmentEnabled.java b/cosid-spring-boot-starter/src/main/java/me/ahoo/cosid/spring/boot/starter/segment/ConditionalOnCosIdSegmentEnabled.java similarity index 100% rename from spring-boot-starter-cosid/src/main/java/me/ahoo/cosid/spring/boot/starter/segment/ConditionalOnCosIdSegmentEnabled.java rename to cosid-spring-boot-starter/src/main/java/me/ahoo/cosid/spring/boot/starter/segment/ConditionalOnCosIdSegmentEnabled.java diff --git a/spring-boot-starter-cosid/src/main/java/me/ahoo/cosid/spring/boot/starter/segment/CosIdJdbcSegmentAutoConfiguration.java b/cosid-spring-boot-starter/src/main/java/me/ahoo/cosid/spring/boot/starter/segment/CosIdJdbcSegmentAutoConfiguration.java similarity index 100% rename from spring-boot-starter-cosid/src/main/java/me/ahoo/cosid/spring/boot/starter/segment/CosIdJdbcSegmentAutoConfiguration.java rename to cosid-spring-boot-starter/src/main/java/me/ahoo/cosid/spring/boot/starter/segment/CosIdJdbcSegmentAutoConfiguration.java diff --git a/spring-boot-starter-cosid/src/main/java/me/ahoo/cosid/spring/boot/starter/segment/CosIdLifecyclePrefetchWorkerExecutorService.java b/cosid-spring-boot-starter/src/main/java/me/ahoo/cosid/spring/boot/starter/segment/CosIdLifecyclePrefetchWorkerExecutorService.java similarity index 100% rename from spring-boot-starter-cosid/src/main/java/me/ahoo/cosid/spring/boot/starter/segment/CosIdLifecyclePrefetchWorkerExecutorService.java rename to cosid-spring-boot-starter/src/main/java/me/ahoo/cosid/spring/boot/starter/segment/CosIdLifecyclePrefetchWorkerExecutorService.java diff --git a/spring-boot-starter-cosid/src/main/java/me/ahoo/cosid/spring/boot/starter/segment/CosIdRedisSegmentAutoConfiguration.java b/cosid-spring-boot-starter/src/main/java/me/ahoo/cosid/spring/boot/starter/segment/CosIdRedisSegmentAutoConfiguration.java similarity index 100% rename from spring-boot-starter-cosid/src/main/java/me/ahoo/cosid/spring/boot/starter/segment/CosIdRedisSegmentAutoConfiguration.java rename to cosid-spring-boot-starter/src/main/java/me/ahoo/cosid/spring/boot/starter/segment/CosIdRedisSegmentAutoConfiguration.java diff --git a/spring-boot-starter-cosid/src/main/java/me/ahoo/cosid/spring/boot/starter/segment/CosIdSegmentAutoConfiguration.java b/cosid-spring-boot-starter/src/main/java/me/ahoo/cosid/spring/boot/starter/segment/CosIdSegmentAutoConfiguration.java similarity index 100% rename from spring-boot-starter-cosid/src/main/java/me/ahoo/cosid/spring/boot/starter/segment/CosIdSegmentAutoConfiguration.java rename to cosid-spring-boot-starter/src/main/java/me/ahoo/cosid/spring/boot/starter/segment/CosIdSegmentAutoConfiguration.java diff --git a/spring-boot-starter-cosid/src/main/java/me/ahoo/cosid/spring/boot/starter/segment/CosIdSpringRedisSegmentAutoConfiguration.java b/cosid-spring-boot-starter/src/main/java/me/ahoo/cosid/spring/boot/starter/segment/CosIdSpringRedisSegmentAutoConfiguration.java similarity index 100% rename from spring-boot-starter-cosid/src/main/java/me/ahoo/cosid/spring/boot/starter/segment/CosIdSpringRedisSegmentAutoConfiguration.java rename to cosid-spring-boot-starter/src/main/java/me/ahoo/cosid/spring/boot/starter/segment/CosIdSpringRedisSegmentAutoConfiguration.java diff --git a/spring-boot-starter-cosid/src/main/java/me/ahoo/cosid/spring/boot/starter/segment/SegmentIdProperties.java b/cosid-spring-boot-starter/src/main/java/me/ahoo/cosid/spring/boot/starter/segment/SegmentIdProperties.java similarity index 100% rename from spring-boot-starter-cosid/src/main/java/me/ahoo/cosid/spring/boot/starter/segment/SegmentIdProperties.java rename to cosid-spring-boot-starter/src/main/java/me/ahoo/cosid/spring/boot/starter/segment/SegmentIdProperties.java diff --git a/spring-boot-starter-cosid/src/main/java/me/ahoo/cosid/spring/boot/starter/snowflake/ConditionalOnCosIdSnowflakeEnabled.java b/cosid-spring-boot-starter/src/main/java/me/ahoo/cosid/spring/boot/starter/snowflake/ConditionalOnCosIdSnowflakeEnabled.java similarity index 100% rename from spring-boot-starter-cosid/src/main/java/me/ahoo/cosid/spring/boot/starter/snowflake/ConditionalOnCosIdSnowflakeEnabled.java rename to cosid-spring-boot-starter/src/main/java/me/ahoo/cosid/spring/boot/starter/snowflake/ConditionalOnCosIdSnowflakeEnabled.java diff --git a/spring-boot-starter-cosid/src/main/java/me/ahoo/cosid/spring/boot/starter/snowflake/CosIdLifecycleMachineIdDistributor.java b/cosid-spring-boot-starter/src/main/java/me/ahoo/cosid/spring/boot/starter/snowflake/CosIdLifecycleMachineIdDistributor.java similarity index 100% rename from spring-boot-starter-cosid/src/main/java/me/ahoo/cosid/spring/boot/starter/snowflake/CosIdLifecycleMachineIdDistributor.java rename to cosid-spring-boot-starter/src/main/java/me/ahoo/cosid/spring/boot/starter/snowflake/CosIdLifecycleMachineIdDistributor.java diff --git a/spring-boot-starter-cosid/src/main/java/me/ahoo/cosid/spring/boot/starter/snowflake/CosIdRedisMachineIdDistributorAutoConfiguration.java b/cosid-spring-boot-starter/src/main/java/me/ahoo/cosid/spring/boot/starter/snowflake/CosIdRedisMachineIdDistributorAutoConfiguration.java similarity index 100% rename from spring-boot-starter-cosid/src/main/java/me/ahoo/cosid/spring/boot/starter/snowflake/CosIdRedisMachineIdDistributorAutoConfiguration.java rename to cosid-spring-boot-starter/src/main/java/me/ahoo/cosid/spring/boot/starter/snowflake/CosIdRedisMachineIdDistributorAutoConfiguration.java diff --git a/spring-boot-starter-cosid/src/main/java/me/ahoo/cosid/spring/boot/starter/snowflake/CosIdSnowflakeAutoConfiguration.java b/cosid-spring-boot-starter/src/main/java/me/ahoo/cosid/spring/boot/starter/snowflake/CosIdSnowflakeAutoConfiguration.java similarity index 100% rename from spring-boot-starter-cosid/src/main/java/me/ahoo/cosid/spring/boot/starter/snowflake/CosIdSnowflakeAutoConfiguration.java rename to cosid-spring-boot-starter/src/main/java/me/ahoo/cosid/spring/boot/starter/snowflake/CosIdSnowflakeAutoConfiguration.java diff --git a/spring-boot-starter-cosid/src/main/java/me/ahoo/cosid/spring/boot/starter/snowflake/CosIdSpringRedisMachineIdDistributorAutoConfiguration.java b/cosid-spring-boot-starter/src/main/java/me/ahoo/cosid/spring/boot/starter/snowflake/CosIdSpringRedisMachineIdDistributorAutoConfiguration.java similarity index 100% rename from spring-boot-starter-cosid/src/main/java/me/ahoo/cosid/spring/boot/starter/snowflake/CosIdSpringRedisMachineIdDistributorAutoConfiguration.java rename to cosid-spring-boot-starter/src/main/java/me/ahoo/cosid/spring/boot/starter/snowflake/CosIdSpringRedisMachineIdDistributorAutoConfiguration.java diff --git a/spring-boot-starter-cosid/src/main/java/me/ahoo/cosid/spring/boot/starter/snowflake/SnowflakeIdProperties.java b/cosid-spring-boot-starter/src/main/java/me/ahoo/cosid/spring/boot/starter/snowflake/SnowflakeIdProperties.java similarity index 100% rename from spring-boot-starter-cosid/src/main/java/me/ahoo/cosid/spring/boot/starter/snowflake/SnowflakeIdProperties.java rename to cosid-spring-boot-starter/src/main/java/me/ahoo/cosid/spring/boot/starter/snowflake/SnowflakeIdProperties.java diff --git a/spring-boot-starter-cosid/src/main/resources/META-INF/spring.factories b/cosid-spring-boot-starter/src/main/resources/META-INF/spring.factories similarity index 100% rename from spring-boot-starter-cosid/src/main/resources/META-INF/spring.factories rename to cosid-spring-boot-starter/src/main/resources/META-INF/spring.factories diff --git a/settings.gradle.kts b/settings.gradle.kts index 91e33e49b5..57524d8ead 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -25,7 +25,7 @@ buildscript { include(":cosid-core") include(":cosid-bom") include(":cosid-dependencies") -include(":spring-boot-starter-cosid") +include(":cosid-spring-boot-starter") include(":cosid-redis") include(":cosid-spring-redis") include(":cosid-jdbc") diff --git a/wiki/getting-started.md b/wiki/getting-started.md index 0b6ce54bc1..c026d0914b 100644 --- a/wiki/getting-started.md +++ b/wiki/getting-started.md @@ -308,7 +308,7 @@ IdGenerator idGenerator=idGeneratorProvider.get("bizA"); ``` kotlin val cosidVersion = "1.3.4"; - implementation("me.ahoo.cosid:spring-boot-starter-cosid:${cosidVersion}") + implementation("me.ahoo.cosid:cosid-spring-boot-starter:${cosidVersion}") ``` ### Maven @@ -329,7 +329,7 @@ IdGenerator idGenerator=idGeneratorProvider.get("bizA"); me.ahoo.cosid - spring-boot-starter-cosid + cosid-spring-boot-starter ${cosid.version}