From 94251106f5c02565083268f5719fded5624d4753 Mon Sep 17 00:00:00 2001 From: zhangliang Date: Sun, 15 Oct 2023 13:20:11 +0800 Subject: [PATCH 1/2] Rename elasticjob-lifecycle module name --- .../user-manual/usage/operation-api/_index.cn.md | 12 ++++++------ .../user-manual/usage/operation-api/_index.en.md | 12 ++++++------ lifecycle/pom.xml | 2 +- .../lifecycle/api/JobAPIFactory.java | 16 ++++++++-------- .../lifecycle/api/JobConfigurationAPI.java | 2 +- .../lifecycle/api/JobOperateAPI.java | 2 +- .../lifecycle/api/JobStatisticsAPI.java | 4 ++-- .../lifecycle/api/ServerStatisticsAPI.java | 4 ++-- .../lifecycle/api/ShardingOperateAPI.java | 2 +- .../lifecycle/api/ShardingStatisticsAPI.java | 4 ++-- .../lifecycle/domain/JobBriefInfo.java | 2 +- .../lifecycle/domain/ServerBriefInfo.java | 2 +- .../lifecycle/domain/ShardingInfo.java | 2 +- .../internal/operate/JobOperateAPIImpl.java | 4 ++-- .../internal/operate/ShardingOperateAPIImpl.java | 4 ++-- .../internal/reg/RegistryCenterFactory.java | 2 +- .../settings/JobConfigurationAPIImpl.java | 4 ++-- .../statistics/JobStatisticsAPIImpl.java | 6 +++--- .../statistics/ServerStatisticsAPIImpl.java | 6 +++--- .../statistics/ShardingStatisticsAPIImpl.java | 6 +++--- .../AbstractEmbedZookeeperBaseTest.java | 2 +- .../lifecycle/api/JobAPIFactoryTest.java | 4 ++-- .../lifecycle/domain/ShardingStatusTest.java | 2 +- .../fixture/LifecycleYamlConstants.java | 2 +- .../internal/operate/JobOperateAPIImplTest.java | 4 ++-- .../operate/ShardingOperateAPIImplTest.java | 4 ++-- .../internal/reg/RegistryCenterFactoryTest.java | 4 ++-- .../settings/JobConfigurationAPIImplTest.java | 6 +++--- .../statistics/JobStatisticsAPIImplTest.java | 8 ++++---- .../statistics/ServerStatisticsAPIImplTest.java | 6 +++--- .../ShardingStatisticsAPIImplTest.java | 6 +++--- lifecycle/src/test/resources/logback-test.xml | 2 +- 32 files changed, 74 insertions(+), 74 deletions(-) rename lifecycle/src/main/java/org/apache/shardingsphere/elasticjob/{engine => }/lifecycle/api/JobAPIFactory.java (84%) rename lifecycle/src/main/java/org/apache/shardingsphere/elasticjob/{engine => }/lifecycle/api/JobConfigurationAPI.java (95%) rename lifecycle/src/main/java/org/apache/shardingsphere/elasticjob/{engine => }/lifecycle/api/JobOperateAPI.java (97%) rename lifecycle/src/main/java/org/apache/shardingsphere/elasticjob/{engine => }/lifecycle/api/JobStatisticsAPI.java (91%) rename lifecycle/src/main/java/org/apache/shardingsphere/elasticjob/{engine => }/lifecycle/api/ServerStatisticsAPI.java (88%) rename lifecycle/src/main/java/org/apache/shardingsphere/elasticjob/{engine => }/lifecycle/api/ShardingOperateAPI.java (94%) rename lifecycle/src/main/java/org/apache/shardingsphere/elasticjob/{engine => }/lifecycle/api/ShardingStatisticsAPI.java (88%) rename lifecycle/src/main/java/org/apache/shardingsphere/elasticjob/{engine => }/lifecycle/domain/JobBriefInfo.java (95%) rename lifecycle/src/main/java/org/apache/shardingsphere/elasticjob/{engine => }/lifecycle/domain/ServerBriefInfo.java (96%) rename lifecycle/src/main/java/org/apache/shardingsphere/elasticjob/{engine => }/lifecycle/domain/ShardingInfo.java (96%) rename lifecycle/src/main/java/org/apache/shardingsphere/elasticjob/{engine => }/lifecycle/internal/operate/JobOperateAPIImpl.java (97%) rename lifecycle/src/main/java/org/apache/shardingsphere/elasticjob/{engine => }/lifecycle/internal/operate/ShardingOperateAPIImpl.java (92%) rename lifecycle/src/main/java/org/apache/shardingsphere/elasticjob/{engine => }/lifecycle/internal/reg/RegistryCenterFactory.java (97%) rename lifecycle/src/main/java/org/apache/shardingsphere/elasticjob/{engine => }/lifecycle/internal/settings/JobConfigurationAPIImpl.java (93%) rename lifecycle/src/main/java/org/apache/shardingsphere/elasticjob/{engine => }/lifecycle/internal/statistics/JobStatisticsAPIImpl.java (96%) rename lifecycle/src/main/java/org/apache/shardingsphere/elasticjob/{engine => }/lifecycle/internal/statistics/ServerStatisticsAPIImpl.java (93%) rename lifecycle/src/main/java/org/apache/shardingsphere/elasticjob/{engine => }/lifecycle/internal/statistics/ShardingStatisticsAPIImpl.java (92%) rename lifecycle/src/test/java/org/apache/shardingsphere/elasticjob/{engine => }/lifecycle/AbstractEmbedZookeeperBaseTest.java (98%) rename lifecycle/src/test/java/org/apache/shardingsphere/elasticjob/{engine => }/lifecycle/api/JobAPIFactoryTest.java (93%) rename lifecycle/src/test/java/org/apache/shardingsphere/elasticjob/{engine => }/lifecycle/domain/ShardingStatusTest.java (96%) rename lifecycle/src/test/java/org/apache/shardingsphere/elasticjob/{engine => }/lifecycle/fixture/LifecycleYamlConstants.java (97%) rename lifecycle/src/test/java/org/apache/shardingsphere/elasticjob/{engine => }/lifecycle/internal/operate/JobOperateAPIImplTest.java (98%) rename lifecycle/src/test/java/org/apache/shardingsphere/elasticjob/{engine => }/lifecycle/internal/operate/ShardingOperateAPIImplTest.java (91%) rename lifecycle/src/test/java/org/apache/shardingsphere/elasticjob/{engine => }/lifecycle/internal/reg/RegistryCenterFactoryTest.java (94%) rename lifecycle/src/test/java/org/apache/shardingsphere/elasticjob/{engine => }/lifecycle/internal/settings/JobConfigurationAPIImplTest.java (95%) rename lifecycle/src/test/java/org/apache/shardingsphere/elasticjob/{engine => }/lifecycle/internal/statistics/JobStatisticsAPIImplTest.java (96%) rename lifecycle/src/test/java/org/apache/shardingsphere/elasticjob/{engine => }/lifecycle/internal/statistics/ServerStatisticsAPIImplTest.java (94%) rename lifecycle/src/test/java/org/apache/shardingsphere/elasticjob/{engine => }/lifecycle/internal/statistics/ShardingStatisticsAPIImplTest.java (95%) diff --git a/docs/content/user-manual/usage/operation-api/_index.cn.md b/docs/content/user-manual/usage/operation-api/_index.cn.md index a3346ae7b9..4cae0e2d22 100644 --- a/docs/content/user-manual/usage/operation-api/_index.cn.md +++ b/docs/content/user-manual/usage/operation-api/_index.cn.md @@ -10,7 +10,7 @@ ElasticJob 提供了 Java API，可以通过直接对注册中心进行操作的 ## 配置类 API -类名称：`org.apache.shardingsphere.elasticjob.engine.lifecycle.api.JobConfigurationAPI` +类名称：`org.apache.shardingsphere.elasticjob.lifecycle.api.JobConfigurationAPI` ### 获取作业配置 @@ -37,7 +37,7 @@ ElasticJob 提供了 Java API，可以通过直接对注册中心进行操作的 ## 操作类 API -类名称：`org.apache.shardingsphere.elasticjob.engine.lifecycle.api.JobOperateAPI` +类名称：`org.apache.shardingsphere.elasticjob.lifecycle.api.JobOperateAPI` ### 触发作业执行 @@ -85,7 +85,7 @@ ElasticJob 提供了 Java API，可以通过直接对注册中心进行操作的 ## 操作分片的 API -类名称：`org.apache.shardingsphere.elasticjob.engine.lifecycle.api.ShardingOperateAPI` +类名称：`org.apache.shardingsphere.elasticjob.lifecycle.api.ShardingOperateAPI` ### 禁用作业分片 @@ -105,7 +105,7 @@ ElasticJob 提供了 Java API，可以通过直接对注册中心进行操作的 ## 作业统计 API -类名称：`org.apache.shardingsphere.elasticjob.engine.lifecycle.api.JobStatisticsAPI` +类名称：`org.apache.shardingsphere.elasticjob.lifecycle.api.JobStatisticsAPI` ### 获取作业总数 @@ -139,7 +139,7 @@ ElasticJob 提供了 Java API，可以通过直接对注册中心进行操作的 ## 作业服务器状态展示 API -类名称：`org.apache.shardingsphere.elasticjob.engine.lifecycle.api.ServerStatisticsAPI` +类名称：`org.apache.shardingsphere.elasticjob.lifecycle.api.ServerStatisticsAPI` ### 获取作业服务器总数 @@ -155,7 +155,7 @@ ElasticJob 提供了 Java API，可以通过直接对注册中心进行操作的 ## 作业分片状态展示 API -类名称：`org.apache.shardingsphere.elasticjob.engine.lifecycle.api.ShardingStatisticsAPI` +类名称：`org.apache.shardingsphere.elasticjob.lifecycle.api.ShardingStatisticsAPI` ### 获取作业分片信息集合 diff --git a/docs/content/user-manual/usage/operation-api/_index.en.md b/docs/content/user-manual/usage/operation-api/_index.en.md index 11ade7c643..846fe21379 100644 --- a/docs/content/user-manual/usage/operation-api/_index.en.md +++ b/docs/content/user-manual/usage/operation-api/_index.en.md @@ -10,7 +10,7 @@ The module is still in incubation. ## Configuration API -Class name: `org.apache.shardingsphere.elasticjob.engine.lifecycle.api.JobConfigurationAPI` +Class name: `org.apache.shardingsphere.elasticjob.lifecycle.api.JobConfigurationAPI` ### Get job configuration @@ -37,7 +37,7 @@ Method signature：void removeJobConfiguration(String jobName) ## Operation API -Class name：`org.apache.shardingsphere.elasticjob.engine.lifecycle.api.JobOperateAPI` +Class name：`org.apache.shardingsphere.elasticjob.lifecycle.api.JobOperateAPI` ### Trigger job execution @@ -85,7 +85,7 @@ Method signature：void remove(Optional jobName, Optional server ## Operate sharding API -Class name：`org.apache.shardingsphere.elasticjob.engine.lifecycle.api.ShardingOperateAPI` +Class name：`org.apache.shardingsphere.elasticjob.lifecycle.api.ShardingOperateAPI` ### Disable job sharding @@ -105,7 +105,7 @@ Method signature：void enable(String jobName, String item) ## Job statistics API -Class name：`org.apache.shardingsphere.elasticjob.engine.lifecycle.api.JobStatisticsAPI` +Class name：`org.apache.shardingsphere.elasticjob.lifecycle.api.JobStatisticsAPI` ### Get the total count of jobs @@ -139,7 +139,7 @@ Method signature：Collection getJobsBriefInfo(String ip) ## Job server status display API -Class name：`org.apache.shardingsphere.elasticjob.engine.lifecycle.api.ServerStatisticsAPI` +Class name：`org.apache.shardingsphere.elasticjob.lifecycle.api.ServerStatisticsAPI` ### Total count of job servers @@ -155,7 +155,7 @@ Method signature：Collection getAllServersBriefInfo() ## Job sharding status display API -Class name：`org.apache.shardingsphere.elasticjob.engine.lifecycle.api.ShardingStatisticsAPI` +Class name：`org.apache.shardingsphere.elasticjob.lifecycle.api.ShardingStatisticsAPI` ### Get job sharding information collection diff --git a/lifecycle/pom.xml b/lifecycle/pom.xml index 31498a04cc..0ee436659d 100644 --- a/lifecycle/pom.xml +++ b/lifecycle/pom.xml @@ -23,7 +23,7 @@ elasticjob 3.1.0-SNAPSHOT - elasticjob-engine-lifecycle + elasticjob-lifecycle ${project.artifactId} diff --git a/lifecycle/src/main/java/org/apache/shardingsphere/elasticjob/engine/lifecycle/api/JobAPIFactory.java b/lifecycle/src/main/java/org/apache/shardingsphere/elasticjob/lifecycle/api/JobAPIFactory.java similarity index 84% rename from lifecycle/src/main/java/org/apache/shardingsphere/elasticjob/engine/lifecycle/api/JobAPIFactory.java rename to lifecycle/src/main/java/org/apache/shardingsphere/elasticjob/lifecycle/api/JobAPIFactory.java index bb9677832a..e37b80cf42 100644 --- a/lifecycle/src/main/java/org/apache/shardingsphere/elasticjob/engine/lifecycle/api/JobAPIFactory.java +++ b/lifecycle/src/main/java/org/apache/shardingsphere/elasticjob/lifecycle/api/JobAPIFactory.java @@ -15,17 +15,17 @@ * limitations under the License. */ -package org.apache.shardingsphere.elasticjob.engine.lifecycle.api; +package org.apache.shardingsphere.elasticjob.lifecycle.api; import lombok.AccessLevel; import lombok.NoArgsConstructor; -import org.apache.shardingsphere.elasticjob.engine.lifecycle.internal.operate.JobOperateAPIImpl; -import org.apache.shardingsphere.elasticjob.engine.lifecycle.internal.operate.ShardingOperateAPIImpl; -import org.apache.shardingsphere.elasticjob.engine.lifecycle.internal.reg.RegistryCenterFactory; -import org.apache.shardingsphere.elasticjob.engine.lifecycle.internal.settings.JobConfigurationAPIImpl; -import org.apache.shardingsphere.elasticjob.engine.lifecycle.internal.statistics.JobStatisticsAPIImpl; -import org.apache.shardingsphere.elasticjob.engine.lifecycle.internal.statistics.ServerStatisticsAPIImpl; -import org.apache.shardingsphere.elasticjob.engine.lifecycle.internal.statistics.ShardingStatisticsAPIImpl; +import org.apache.shardingsphere.elasticjob.lifecycle.internal.operate.JobOperateAPIImpl; +import org.apache.shardingsphere.elasticjob.lifecycle.internal.operate.ShardingOperateAPIImpl; +import org.apache.shardingsphere.elasticjob.lifecycle.internal.reg.RegistryCenterFactory; +import org.apache.shardingsphere.elasticjob.lifecycle.internal.settings.JobConfigurationAPIImpl; +import org.apache.shardingsphere.elasticjob.lifecycle.internal.statistics.JobStatisticsAPIImpl; +import org.apache.shardingsphere.elasticjob.lifecycle.internal.statistics.ServerStatisticsAPIImpl; +import org.apache.shardingsphere.elasticjob.lifecycle.internal.statistics.ShardingStatisticsAPIImpl; /** * Job API factory. diff --git a/lifecycle/src/main/java/org/apache/shardingsphere/elasticjob/engine/lifecycle/api/JobConfigurationAPI.java b/lifecycle/src/main/java/org/apache/shardingsphere/elasticjob/lifecycle/api/JobConfigurationAPI.java similarity index 95% rename from lifecycle/src/main/java/org/apache/shardingsphere/elasticjob/engine/lifecycle/api/JobConfigurationAPI.java rename to lifecycle/src/main/java/org/apache/shardingsphere/elasticjob/lifecycle/api/JobConfigurationAPI.java index f6f383c942..0425f48738 100644 --- a/lifecycle/src/main/java/org/apache/shardingsphere/elasticjob/engine/lifecycle/api/JobConfigurationAPI.java +++ b/lifecycle/src/main/java/org/apache/shardingsphere/elasticjob/lifecycle/api/JobConfigurationAPI.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.elasticjob.engine.lifecycle.api; +package org.apache.shardingsphere.elasticjob.lifecycle.api; import org.apache.shardingsphere.elasticjob.infra.pojo.JobConfigurationPOJO; diff --git a/lifecycle/src/main/java/org/apache/shardingsphere/elasticjob/engine/lifecycle/api/JobOperateAPI.java b/lifecycle/src/main/java/org/apache/shardingsphere/elasticjob/lifecycle/api/JobOperateAPI.java similarity index 97% rename from lifecycle/src/main/java/org/apache/shardingsphere/elasticjob/engine/lifecycle/api/JobOperateAPI.java rename to lifecycle/src/main/java/org/apache/shardingsphere/elasticjob/lifecycle/api/JobOperateAPI.java index d5826335bc..48fe82fa51 100644 --- a/lifecycle/src/main/java/org/apache/shardingsphere/elasticjob/engine/lifecycle/api/JobOperateAPI.java +++ b/lifecycle/src/main/java/org/apache/shardingsphere/elasticjob/lifecycle/api/JobOperateAPI.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.elasticjob.engine.lifecycle.api; +package org.apache.shardingsphere.elasticjob.lifecycle.api; import java.io.IOException; diff --git a/lifecycle/src/main/java/org/apache/shardingsphere/elasticjob/engine/lifecycle/api/JobStatisticsAPI.java b/lifecycle/src/main/java/org/apache/shardingsphere/elasticjob/lifecycle/api/JobStatisticsAPI.java similarity index 91% rename from lifecycle/src/main/java/org/apache/shardingsphere/elasticjob/engine/lifecycle/api/JobStatisticsAPI.java rename to lifecycle/src/main/java/org/apache/shardingsphere/elasticjob/lifecycle/api/JobStatisticsAPI.java index 17f3549f7b..361987a089 100644 --- a/lifecycle/src/main/java/org/apache/shardingsphere/elasticjob/engine/lifecycle/api/JobStatisticsAPI.java +++ b/lifecycle/src/main/java/org/apache/shardingsphere/elasticjob/lifecycle/api/JobStatisticsAPI.java @@ -15,9 +15,9 @@ * limitations under the License. */ -package org.apache.shardingsphere.elasticjob.engine.lifecycle.api; +package org.apache.shardingsphere.elasticjob.lifecycle.api; -import org.apache.shardingsphere.elasticjob.engine.lifecycle.domain.JobBriefInfo; +import org.apache.shardingsphere.elasticjob.lifecycle.domain.JobBriefInfo; import java.util.Collection; diff --git a/lifecycle/src/main/java/org/apache/shardingsphere/elasticjob/engine/lifecycle/api/ServerStatisticsAPI.java b/lifecycle/src/main/java/org/apache/shardingsphere/elasticjob/lifecycle/api/ServerStatisticsAPI.java similarity index 88% rename from lifecycle/src/main/java/org/apache/shardingsphere/elasticjob/engine/lifecycle/api/ServerStatisticsAPI.java rename to lifecycle/src/main/java/org/apache/shardingsphere/elasticjob/lifecycle/api/ServerStatisticsAPI.java index 4f36052c8f..66855d125d 100644 --- a/lifecycle/src/main/java/org/apache/shardingsphere/elasticjob/engine/lifecycle/api/ServerStatisticsAPI.java +++ b/lifecycle/src/main/java/org/apache/shardingsphere/elasticjob/lifecycle/api/ServerStatisticsAPI.java @@ -15,9 +15,9 @@ * limitations under the License. */ -package org.apache.shardingsphere.elasticjob.engine.lifecycle.api; +package org.apache.shardingsphere.elasticjob.lifecycle.api; -import org.apache.shardingsphere.elasticjob.engine.lifecycle.domain.ServerBriefInfo; +import org.apache.shardingsphere.elasticjob.lifecycle.domain.ServerBriefInfo; import java.util.Collection; diff --git a/lifecycle/src/main/java/org/apache/shardingsphere/elasticjob/engine/lifecycle/api/ShardingOperateAPI.java b/lifecycle/src/main/java/org/apache/shardingsphere/elasticjob/lifecycle/api/ShardingOperateAPI.java similarity index 94% rename from lifecycle/src/main/java/org/apache/shardingsphere/elasticjob/engine/lifecycle/api/ShardingOperateAPI.java rename to lifecycle/src/main/java/org/apache/shardingsphere/elasticjob/lifecycle/api/ShardingOperateAPI.java index 8bbf8dde34..a60c42dd0b 100644 --- a/lifecycle/src/main/java/org/apache/shardingsphere/elasticjob/engine/lifecycle/api/ShardingOperateAPI.java +++ b/lifecycle/src/main/java/org/apache/shardingsphere/elasticjob/lifecycle/api/ShardingOperateAPI.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.elasticjob.engine.lifecycle.api; +package org.apache.shardingsphere.elasticjob.lifecycle.api; /** * Sharding operate API. diff --git a/lifecycle/src/main/java/org/apache/shardingsphere/elasticjob/engine/lifecycle/api/ShardingStatisticsAPI.java b/lifecycle/src/main/java/org/apache/shardingsphere/elasticjob/lifecycle/api/ShardingStatisticsAPI.java similarity index 88% rename from lifecycle/src/main/java/org/apache/shardingsphere/elasticjob/engine/lifecycle/api/ShardingStatisticsAPI.java rename to lifecycle/src/main/java/org/apache/shardingsphere/elasticjob/lifecycle/api/ShardingStatisticsAPI.java index e1cdb61dd2..9f8fd4fd8c 100644 --- a/lifecycle/src/main/java/org/apache/shardingsphere/elasticjob/engine/lifecycle/api/ShardingStatisticsAPI.java +++ b/lifecycle/src/main/java/org/apache/shardingsphere/elasticjob/lifecycle/api/ShardingStatisticsAPI.java @@ -15,9 +15,9 @@ * limitations under the License. */ -package org.apache.shardingsphere.elasticjob.engine.lifecycle.api; +package org.apache.shardingsphere.elasticjob.lifecycle.api; -import org.apache.shardingsphere.elasticjob.engine.lifecycle.domain.ShardingInfo; +import org.apache.shardingsphere.elasticjob.lifecycle.domain.ShardingInfo; import java.util.Collection; diff --git a/lifecycle/src/main/java/org/apache/shardingsphere/elasticjob/engine/lifecycle/domain/JobBriefInfo.java b/lifecycle/src/main/java/org/apache/shardingsphere/elasticjob/lifecycle/domain/JobBriefInfo.java similarity index 95% rename from lifecycle/src/main/java/org/apache/shardingsphere/elasticjob/engine/lifecycle/domain/JobBriefInfo.java rename to lifecycle/src/main/java/org/apache/shardingsphere/elasticjob/lifecycle/domain/JobBriefInfo.java index 0b269ce8ae..59d7286937 100644 --- a/lifecycle/src/main/java/org/apache/shardingsphere/elasticjob/engine/lifecycle/domain/JobBriefInfo.java +++ b/lifecycle/src/main/java/org/apache/shardingsphere/elasticjob/lifecycle/domain/JobBriefInfo.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.elasticjob.engine.lifecycle.domain; +package org.apache.shardingsphere.elasticjob.lifecycle.domain; import lombok.Getter; import lombok.Setter; diff --git a/lifecycle/src/main/java/org/apache/shardingsphere/elasticjob/engine/lifecycle/domain/ServerBriefInfo.java b/lifecycle/src/main/java/org/apache/shardingsphere/elasticjob/lifecycle/domain/ServerBriefInfo.java similarity index 96% rename from lifecycle/src/main/java/org/apache/shardingsphere/elasticjob/engine/lifecycle/domain/ServerBriefInfo.java rename to lifecycle/src/main/java/org/apache/shardingsphere/elasticjob/lifecycle/domain/ServerBriefInfo.java index eb03255faf..1c6e08cde6 100644 --- a/lifecycle/src/main/java/org/apache/shardingsphere/elasticjob/engine/lifecycle/domain/ServerBriefInfo.java +++ b/lifecycle/src/main/java/org/apache/shardingsphere/elasticjob/lifecycle/domain/ServerBriefInfo.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.elasticjob.engine.lifecycle.domain; +package org.apache.shardingsphere.elasticjob.lifecycle.domain; import lombok.Getter; import lombok.RequiredArgsConstructor; diff --git a/lifecycle/src/main/java/org/apache/shardingsphere/elasticjob/engine/lifecycle/domain/ShardingInfo.java b/lifecycle/src/main/java/org/apache/shardingsphere/elasticjob/lifecycle/domain/ShardingInfo.java similarity index 96% rename from lifecycle/src/main/java/org/apache/shardingsphere/elasticjob/engine/lifecycle/domain/ShardingInfo.java rename to lifecycle/src/main/java/org/apache/shardingsphere/elasticjob/lifecycle/domain/ShardingInfo.java index 111e16f981..fb0cf13d94 100644 --- a/lifecycle/src/main/java/org/apache/shardingsphere/elasticjob/engine/lifecycle/domain/ShardingInfo.java +++ b/lifecycle/src/main/java/org/apache/shardingsphere/elasticjob/lifecycle/domain/ShardingInfo.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.elasticjob.engine.lifecycle.domain; +package org.apache.shardingsphere.elasticjob.lifecycle.domain; import lombok.Getter; import lombok.Setter; diff --git a/lifecycle/src/main/java/org/apache/shardingsphere/elasticjob/engine/lifecycle/internal/operate/JobOperateAPIImpl.java b/lifecycle/src/main/java/org/apache/shardingsphere/elasticjob/lifecycle/internal/operate/JobOperateAPIImpl.java similarity index 97% rename from lifecycle/src/main/java/org/apache/shardingsphere/elasticjob/engine/lifecycle/internal/operate/JobOperateAPIImpl.java rename to lifecycle/src/main/java/org/apache/shardingsphere/elasticjob/lifecycle/internal/operate/JobOperateAPIImpl.java index 09f519ee84..899a2e7b13 100644 --- a/lifecycle/src/main/java/org/apache/shardingsphere/elasticjob/engine/lifecycle/internal/operate/JobOperateAPIImpl.java +++ b/lifecycle/src/main/java/org/apache/shardingsphere/elasticjob/lifecycle/internal/operate/JobOperateAPIImpl.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.elasticjob.engine.lifecycle.internal.operate; +package org.apache.shardingsphere.elasticjob.lifecycle.internal.operate; import com.google.common.base.Preconditions; import org.apache.shardingsphere.elasticjob.infra.handler.sharding.JobInstance; @@ -24,7 +24,7 @@ import org.apache.shardingsphere.elasticjob.engine.internal.server.ServerStatus; import org.apache.shardingsphere.elasticjob.engine.internal.snapshot.SnapshotService; import org.apache.shardingsphere.elasticjob.engine.internal.storage.JobNodePath; -import org.apache.shardingsphere.elasticjob.engine.lifecycle.api.JobOperateAPI; +import org.apache.shardingsphere.elasticjob.lifecycle.api.JobOperateAPI; import org.apache.shardingsphere.elasticjob.reg.base.CoordinatorRegistryCenter; import java.io.IOException; diff --git a/lifecycle/src/main/java/org/apache/shardingsphere/elasticjob/engine/lifecycle/internal/operate/ShardingOperateAPIImpl.java b/lifecycle/src/main/java/org/apache/shardingsphere/elasticjob/lifecycle/internal/operate/ShardingOperateAPIImpl.java similarity index 92% rename from lifecycle/src/main/java/org/apache/shardingsphere/elasticjob/engine/lifecycle/internal/operate/ShardingOperateAPIImpl.java rename to lifecycle/src/main/java/org/apache/shardingsphere/elasticjob/lifecycle/internal/operate/ShardingOperateAPIImpl.java index be8f6e498f..58ea9020f7 100644 --- a/lifecycle/src/main/java/org/apache/shardingsphere/elasticjob/engine/lifecycle/internal/operate/ShardingOperateAPIImpl.java +++ b/lifecycle/src/main/java/org/apache/shardingsphere/elasticjob/lifecycle/internal/operate/ShardingOperateAPIImpl.java @@ -15,10 +15,10 @@ * limitations under the License. */ -package org.apache.shardingsphere.elasticjob.engine.lifecycle.internal.operate; +package org.apache.shardingsphere.elasticjob.lifecycle.internal.operate; import org.apache.shardingsphere.elasticjob.engine.internal.storage.JobNodePath; -import org.apache.shardingsphere.elasticjob.engine.lifecycle.api.ShardingOperateAPI; +import org.apache.shardingsphere.elasticjob.lifecycle.api.ShardingOperateAPI; import org.apache.shardingsphere.elasticjob.reg.base.CoordinatorRegistryCenter; /** diff --git a/lifecycle/src/main/java/org/apache/shardingsphere/elasticjob/engine/lifecycle/internal/reg/RegistryCenterFactory.java b/lifecycle/src/main/java/org/apache/shardingsphere/elasticjob/lifecycle/internal/reg/RegistryCenterFactory.java similarity index 97% rename from lifecycle/src/main/java/org/apache/shardingsphere/elasticjob/engine/lifecycle/internal/reg/RegistryCenterFactory.java rename to lifecycle/src/main/java/org/apache/shardingsphere/elasticjob/lifecycle/internal/reg/RegistryCenterFactory.java index 8789f26d88..dc63c17fbe 100644 --- a/lifecycle/src/main/java/org/apache/shardingsphere/elasticjob/engine/lifecycle/internal/reg/RegistryCenterFactory.java +++ b/lifecycle/src/main/java/org/apache/shardingsphere/elasticjob/lifecycle/internal/reg/RegistryCenterFactory.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.elasticjob.engine.lifecycle.internal.reg; +package org.apache.shardingsphere.elasticjob.lifecycle.internal.reg; import com.google.common.base.Strings; import com.google.common.hash.HashCode; diff --git a/lifecycle/src/main/java/org/apache/shardingsphere/elasticjob/engine/lifecycle/internal/settings/JobConfigurationAPIImpl.java b/lifecycle/src/main/java/org/apache/shardingsphere/elasticjob/lifecycle/internal/settings/JobConfigurationAPIImpl.java similarity index 93% rename from lifecycle/src/main/java/org/apache/shardingsphere/elasticjob/engine/lifecycle/internal/settings/JobConfigurationAPIImpl.java rename to lifecycle/src/main/java/org/apache/shardingsphere/elasticjob/lifecycle/internal/settings/JobConfigurationAPIImpl.java index 3bc737b54b..39150556cc 100644 --- a/lifecycle/src/main/java/org/apache/shardingsphere/elasticjob/engine/lifecycle/internal/settings/JobConfigurationAPIImpl.java +++ b/lifecycle/src/main/java/org/apache/shardingsphere/elasticjob/lifecycle/internal/settings/JobConfigurationAPIImpl.java @@ -15,14 +15,14 @@ * limitations under the License. */ -package org.apache.shardingsphere.elasticjob.engine.lifecycle.internal.settings; +package org.apache.shardingsphere.elasticjob.lifecycle.internal.settings; import com.google.common.base.Preconditions; import com.google.common.base.Strings; import lombok.RequiredArgsConstructor; import org.apache.shardingsphere.elasticjob.infra.pojo.JobConfigurationPOJO; import org.apache.shardingsphere.elasticjob.engine.internal.storage.JobNodePath; -import org.apache.shardingsphere.elasticjob.engine.lifecycle.api.JobConfigurationAPI; +import org.apache.shardingsphere.elasticjob.lifecycle.api.JobConfigurationAPI; import org.apache.shardingsphere.elasticjob.reg.base.CoordinatorRegistryCenter; import org.apache.shardingsphere.elasticjob.infra.yaml.YamlEngine; diff --git a/lifecycle/src/main/java/org/apache/shardingsphere/elasticjob/engine/lifecycle/internal/statistics/JobStatisticsAPIImpl.java b/lifecycle/src/main/java/org/apache/shardingsphere/elasticjob/lifecycle/internal/statistics/JobStatisticsAPIImpl.java similarity index 96% rename from lifecycle/src/main/java/org/apache/shardingsphere/elasticjob/engine/lifecycle/internal/statistics/JobStatisticsAPIImpl.java rename to lifecycle/src/main/java/org/apache/shardingsphere/elasticjob/lifecycle/internal/statistics/JobStatisticsAPIImpl.java index 99a02d05fb..e3bd455af1 100644 --- a/lifecycle/src/main/java/org/apache/shardingsphere/elasticjob/engine/lifecycle/internal/statistics/JobStatisticsAPIImpl.java +++ b/lifecycle/src/main/java/org/apache/shardingsphere/elasticjob/lifecycle/internal/statistics/JobStatisticsAPIImpl.java @@ -15,15 +15,15 @@ * limitations under the License. */ -package org.apache.shardingsphere.elasticjob.engine.lifecycle.internal.statistics; +package org.apache.shardingsphere.elasticjob.lifecycle.internal.statistics; import lombok.RequiredArgsConstructor; import org.apache.shardingsphere.elasticjob.api.JobConfiguration; import org.apache.shardingsphere.elasticjob.infra.handler.sharding.JobInstance; import org.apache.shardingsphere.elasticjob.infra.pojo.JobConfigurationPOJO; import org.apache.shardingsphere.elasticjob.engine.internal.storage.JobNodePath; -import org.apache.shardingsphere.elasticjob.engine.lifecycle.api.JobStatisticsAPI; -import org.apache.shardingsphere.elasticjob.engine.lifecycle.domain.JobBriefInfo; +import org.apache.shardingsphere.elasticjob.lifecycle.api.JobStatisticsAPI; +import org.apache.shardingsphere.elasticjob.lifecycle.domain.JobBriefInfo; import org.apache.shardingsphere.elasticjob.reg.base.CoordinatorRegistryCenter; import org.apache.shardingsphere.elasticjob.infra.yaml.YamlEngine; diff --git a/lifecycle/src/main/java/org/apache/shardingsphere/elasticjob/engine/lifecycle/internal/statistics/ServerStatisticsAPIImpl.java b/lifecycle/src/main/java/org/apache/shardingsphere/elasticjob/lifecycle/internal/statistics/ServerStatisticsAPIImpl.java similarity index 93% rename from lifecycle/src/main/java/org/apache/shardingsphere/elasticjob/engine/lifecycle/internal/statistics/ServerStatisticsAPIImpl.java rename to lifecycle/src/main/java/org/apache/shardingsphere/elasticjob/lifecycle/internal/statistics/ServerStatisticsAPIImpl.java index 6b0eab5ac9..edbe7b3815 100644 --- a/lifecycle/src/main/java/org/apache/shardingsphere/elasticjob/engine/lifecycle/internal/statistics/ServerStatisticsAPIImpl.java +++ b/lifecycle/src/main/java/org/apache/shardingsphere/elasticjob/lifecycle/internal/statistics/ServerStatisticsAPIImpl.java @@ -15,14 +15,14 @@ * limitations under the License. */ -package org.apache.shardingsphere.elasticjob.engine.lifecycle.internal.statistics; +package org.apache.shardingsphere.elasticjob.lifecycle.internal.statistics; import lombok.RequiredArgsConstructor; import org.apache.shardingsphere.elasticjob.infra.handler.sharding.JobInstance; import org.apache.shardingsphere.elasticjob.infra.yaml.YamlEngine; import org.apache.shardingsphere.elasticjob.engine.internal.storage.JobNodePath; -import org.apache.shardingsphere.elasticjob.engine.lifecycle.api.ServerStatisticsAPI; -import org.apache.shardingsphere.elasticjob.engine.lifecycle.domain.ServerBriefInfo; +import org.apache.shardingsphere.elasticjob.lifecycle.api.ServerStatisticsAPI; +import org.apache.shardingsphere.elasticjob.lifecycle.domain.ServerBriefInfo; import org.apache.shardingsphere.elasticjob.reg.base.CoordinatorRegistryCenter; import java.util.ArrayList; diff --git a/lifecycle/src/main/java/org/apache/shardingsphere/elasticjob/engine/lifecycle/internal/statistics/ShardingStatisticsAPIImpl.java b/lifecycle/src/main/java/org/apache/shardingsphere/elasticjob/lifecycle/internal/statistics/ShardingStatisticsAPIImpl.java similarity index 92% rename from lifecycle/src/main/java/org/apache/shardingsphere/elasticjob/engine/lifecycle/internal/statistics/ShardingStatisticsAPIImpl.java rename to lifecycle/src/main/java/org/apache/shardingsphere/elasticjob/lifecycle/internal/statistics/ShardingStatisticsAPIImpl.java index 93cd8803a6..097dd652dd 100644 --- a/lifecycle/src/main/java/org/apache/shardingsphere/elasticjob/engine/lifecycle/internal/statistics/ShardingStatisticsAPIImpl.java +++ b/lifecycle/src/main/java/org/apache/shardingsphere/elasticjob/lifecycle/internal/statistics/ShardingStatisticsAPIImpl.java @@ -15,14 +15,14 @@ * limitations under the License. */ -package org.apache.shardingsphere.elasticjob.engine.lifecycle.internal.statistics; +package org.apache.shardingsphere.elasticjob.lifecycle.internal.statistics; import lombok.RequiredArgsConstructor; import org.apache.shardingsphere.elasticjob.infra.handler.sharding.JobInstance; import org.apache.shardingsphere.elasticjob.infra.yaml.YamlEngine; import org.apache.shardingsphere.elasticjob.engine.internal.storage.JobNodePath; -import org.apache.shardingsphere.elasticjob.engine.lifecycle.api.ShardingStatisticsAPI; -import org.apache.shardingsphere.elasticjob.engine.lifecycle.domain.ShardingInfo; +import org.apache.shardingsphere.elasticjob.lifecycle.api.ShardingStatisticsAPI; +import org.apache.shardingsphere.elasticjob.lifecycle.domain.ShardingInfo; import org.apache.shardingsphere.elasticjob.reg.base.CoordinatorRegistryCenter; import java.util.ArrayList; diff --git a/lifecycle/src/test/java/org/apache/shardingsphere/elasticjob/engine/lifecycle/AbstractEmbedZookeeperBaseTest.java b/lifecycle/src/test/java/org/apache/shardingsphere/elasticjob/lifecycle/AbstractEmbedZookeeperBaseTest.java similarity index 98% rename from lifecycle/src/test/java/org/apache/shardingsphere/elasticjob/engine/lifecycle/AbstractEmbedZookeeperBaseTest.java rename to lifecycle/src/test/java/org/apache/shardingsphere/elasticjob/lifecycle/AbstractEmbedZookeeperBaseTest.java index 7f370328b7..b2ab7d1bde 100644 --- a/lifecycle/src/test/java/org/apache/shardingsphere/elasticjob/engine/lifecycle/AbstractEmbedZookeeperBaseTest.java +++ b/lifecycle/src/test/java/org/apache/shardingsphere/elasticjob/lifecycle/AbstractEmbedZookeeperBaseTest.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.elasticjob.engine.lifecycle; +package org.apache.shardingsphere.elasticjob.lifecycle; import lombok.extern.slf4j.Slf4j; import org.apache.curator.framework.CuratorFramework; diff --git a/lifecycle/src/test/java/org/apache/shardingsphere/elasticjob/engine/lifecycle/api/JobAPIFactoryTest.java b/lifecycle/src/test/java/org/apache/shardingsphere/elasticjob/lifecycle/api/JobAPIFactoryTest.java similarity index 93% rename from lifecycle/src/test/java/org/apache/shardingsphere/elasticjob/engine/lifecycle/api/JobAPIFactoryTest.java rename to lifecycle/src/test/java/org/apache/shardingsphere/elasticjob/lifecycle/api/JobAPIFactoryTest.java index 59726e7508..53eb758cbd 100644 --- a/lifecycle/src/test/java/org/apache/shardingsphere/elasticjob/engine/lifecycle/api/JobAPIFactoryTest.java +++ b/lifecycle/src/test/java/org/apache/shardingsphere/elasticjob/lifecycle/api/JobAPIFactoryTest.java @@ -15,9 +15,9 @@ * limitations under the License. */ -package org.apache.shardingsphere.elasticjob.engine.lifecycle.api; +package org.apache.shardingsphere.elasticjob.lifecycle.api; -import org.apache.shardingsphere.elasticjob.engine.lifecycle.AbstractEmbedZookeeperBaseTest; +import org.apache.shardingsphere.elasticjob.lifecycle.AbstractEmbedZookeeperBaseTest; import org.junit.jupiter.api.Test; import static org.hamcrest.CoreMatchers.instanceOf; diff --git a/lifecycle/src/test/java/org/apache/shardingsphere/elasticjob/engine/lifecycle/domain/ShardingStatusTest.java b/lifecycle/src/test/java/org/apache/shardingsphere/elasticjob/lifecycle/domain/ShardingStatusTest.java similarity index 96% rename from lifecycle/src/test/java/org/apache/shardingsphere/elasticjob/engine/lifecycle/domain/ShardingStatusTest.java rename to lifecycle/src/test/java/org/apache/shardingsphere/elasticjob/lifecycle/domain/ShardingStatusTest.java index e4b2803e77..3c4deaa911 100644 --- a/lifecycle/src/test/java/org/apache/shardingsphere/elasticjob/engine/lifecycle/domain/ShardingStatusTest.java +++ b/lifecycle/src/test/java/org/apache/shardingsphere/elasticjob/lifecycle/domain/ShardingStatusTest.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.elasticjob.engine.lifecycle.domain; +package org.apache.shardingsphere.elasticjob.lifecycle.domain; import org.junit.jupiter.api.Test; diff --git a/lifecycle/src/test/java/org/apache/shardingsphere/elasticjob/engine/lifecycle/fixture/LifecycleYamlConstants.java b/lifecycle/src/test/java/org/apache/shardingsphere/elasticjob/lifecycle/fixture/LifecycleYamlConstants.java similarity index 97% rename from lifecycle/src/test/java/org/apache/shardingsphere/elasticjob/engine/lifecycle/fixture/LifecycleYamlConstants.java rename to lifecycle/src/test/java/org/apache/shardingsphere/elasticjob/lifecycle/fixture/LifecycleYamlConstants.java index c8a0f6a9e5..bf4b710da7 100644 --- a/lifecycle/src/test/java/org/apache/shardingsphere/elasticjob/engine/lifecycle/fixture/LifecycleYamlConstants.java +++ b/lifecycle/src/test/java/org/apache/shardingsphere/elasticjob/lifecycle/fixture/LifecycleYamlConstants.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.elasticjob.engine.lifecycle.fixture; +package org.apache.shardingsphere.elasticjob.lifecycle.fixture; import lombok.AccessLevel; import lombok.NoArgsConstructor; diff --git a/lifecycle/src/test/java/org/apache/shardingsphere/elasticjob/engine/lifecycle/internal/operate/JobOperateAPIImplTest.java b/lifecycle/src/test/java/org/apache/shardingsphere/elasticjob/lifecycle/internal/operate/JobOperateAPIImplTest.java similarity index 98% rename from lifecycle/src/test/java/org/apache/shardingsphere/elasticjob/engine/lifecycle/internal/operate/JobOperateAPIImplTest.java rename to lifecycle/src/test/java/org/apache/shardingsphere/elasticjob/lifecycle/internal/operate/JobOperateAPIImplTest.java index 2462a71886..d42db686fa 100644 --- a/lifecycle/src/test/java/org/apache/shardingsphere/elasticjob/engine/lifecycle/internal/operate/JobOperateAPIImplTest.java +++ b/lifecycle/src/test/java/org/apache/shardingsphere/elasticjob/lifecycle/internal/operate/JobOperateAPIImplTest.java @@ -15,9 +15,9 @@ * limitations under the License. */ -package org.apache.shardingsphere.elasticjob.engine.lifecycle.internal.operate; +package org.apache.shardingsphere.elasticjob.lifecycle.internal.operate; -import org.apache.shardingsphere.elasticjob.engine.lifecycle.api.JobOperateAPI; +import org.apache.shardingsphere.elasticjob.lifecycle.api.JobOperateAPI; import org.apache.shardingsphere.elasticjob.reg.base.CoordinatorRegistryCenter; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/lifecycle/src/test/java/org/apache/shardingsphere/elasticjob/engine/lifecycle/internal/operate/ShardingOperateAPIImplTest.java b/lifecycle/src/test/java/org/apache/shardingsphere/elasticjob/lifecycle/internal/operate/ShardingOperateAPIImplTest.java similarity index 91% rename from lifecycle/src/test/java/org/apache/shardingsphere/elasticjob/engine/lifecycle/internal/operate/ShardingOperateAPIImplTest.java rename to lifecycle/src/test/java/org/apache/shardingsphere/elasticjob/lifecycle/internal/operate/ShardingOperateAPIImplTest.java index 92fefd9d98..1a0ed2e9a3 100644 --- a/lifecycle/src/test/java/org/apache/shardingsphere/elasticjob/engine/lifecycle/internal/operate/ShardingOperateAPIImplTest.java +++ b/lifecycle/src/test/java/org/apache/shardingsphere/elasticjob/lifecycle/internal/operate/ShardingOperateAPIImplTest.java @@ -15,9 +15,9 @@ * limitations under the License. */ -package org.apache.shardingsphere.elasticjob.engine.lifecycle.internal.operate; +package org.apache.shardingsphere.elasticjob.lifecycle.internal.operate; -import org.apache.shardingsphere.elasticjob.engine.lifecycle.api.ShardingOperateAPI; +import org.apache.shardingsphere.elasticjob.lifecycle.api.ShardingOperateAPI; import org.apache.shardingsphere.elasticjob.reg.base.CoordinatorRegistryCenter; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/lifecycle/src/test/java/org/apache/shardingsphere/elasticjob/engine/lifecycle/internal/reg/RegistryCenterFactoryTest.java b/lifecycle/src/test/java/org/apache/shardingsphere/elasticjob/lifecycle/internal/reg/RegistryCenterFactoryTest.java similarity index 94% rename from lifecycle/src/test/java/org/apache/shardingsphere/elasticjob/engine/lifecycle/internal/reg/RegistryCenterFactoryTest.java rename to lifecycle/src/test/java/org/apache/shardingsphere/elasticjob/lifecycle/internal/reg/RegistryCenterFactoryTest.java index bd8e9d245b..22c6eaaa09 100644 --- a/lifecycle/src/test/java/org/apache/shardingsphere/elasticjob/engine/lifecycle/internal/reg/RegistryCenterFactoryTest.java +++ b/lifecycle/src/test/java/org/apache/shardingsphere/elasticjob/lifecycle/internal/reg/RegistryCenterFactoryTest.java @@ -15,9 +15,9 @@ * limitations under the License. */ -package org.apache.shardingsphere.elasticjob.engine.lifecycle.internal.reg; +package org.apache.shardingsphere.elasticjob.lifecycle.internal.reg; -import org.apache.shardingsphere.elasticjob.engine.lifecycle.AbstractEmbedZookeeperBaseTest; +import org.apache.shardingsphere.elasticjob.lifecycle.AbstractEmbedZookeeperBaseTest; import org.apache.shardingsphere.elasticjob.reg.base.CoordinatorRegistryCenter; import org.apache.shardingsphere.elasticjob.reg.zookeeper.ZookeeperConfiguration; import org.apache.shardingsphere.elasticjob.reg.zookeeper.ZookeeperRegistryCenter; diff --git a/lifecycle/src/test/java/org/apache/shardingsphere/elasticjob/engine/lifecycle/internal/settings/JobConfigurationAPIImplTest.java b/lifecycle/src/test/java/org/apache/shardingsphere/elasticjob/lifecycle/internal/settings/JobConfigurationAPIImplTest.java similarity index 95% rename from lifecycle/src/test/java/org/apache/shardingsphere/elasticjob/engine/lifecycle/internal/settings/JobConfigurationAPIImplTest.java rename to lifecycle/src/test/java/org/apache/shardingsphere/elasticjob/lifecycle/internal/settings/JobConfigurationAPIImplTest.java index 7184da3d0b..93793787de 100644 --- a/lifecycle/src/test/java/org/apache/shardingsphere/elasticjob/engine/lifecycle/internal/settings/JobConfigurationAPIImplTest.java +++ b/lifecycle/src/test/java/org/apache/shardingsphere/elasticjob/lifecycle/internal/settings/JobConfigurationAPIImplTest.java @@ -15,12 +15,12 @@ * limitations under the License. */ -package org.apache.shardingsphere.elasticjob.engine.lifecycle.internal.settings; +package org.apache.shardingsphere.elasticjob.lifecycle.internal.settings; import org.apache.shardingsphere.elasticjob.dataflow.props.DataflowJobProperties; import org.apache.shardingsphere.elasticjob.infra.pojo.JobConfigurationPOJO; -import org.apache.shardingsphere.elasticjob.engine.lifecycle.api.JobConfigurationAPI; -import org.apache.shardingsphere.elasticjob.engine.lifecycle.fixture.LifecycleYamlConstants; +import org.apache.shardingsphere.elasticjob.lifecycle.api.JobConfigurationAPI; +import org.apache.shardingsphere.elasticjob.lifecycle.fixture.LifecycleYamlConstants; import org.apache.shardingsphere.elasticjob.reg.base.CoordinatorRegistryCenter; import org.apache.shardingsphere.elasticjob.script.props.ScriptJobProperties; import org.junit.jupiter.api.BeforeEach; diff --git a/lifecycle/src/test/java/org/apache/shardingsphere/elasticjob/engine/lifecycle/internal/statistics/JobStatisticsAPIImplTest.java b/lifecycle/src/test/java/org/apache/shardingsphere/elasticjob/lifecycle/internal/statistics/JobStatisticsAPIImplTest.java similarity index 96% rename from lifecycle/src/test/java/org/apache/shardingsphere/elasticjob/engine/lifecycle/internal/statistics/JobStatisticsAPIImplTest.java rename to lifecycle/src/test/java/org/apache/shardingsphere/elasticjob/lifecycle/internal/statistics/JobStatisticsAPIImplTest.java index 4085ec6b44..1c4a3b0805 100644 --- a/lifecycle/src/test/java/org/apache/shardingsphere/elasticjob/engine/lifecycle/internal/statistics/JobStatisticsAPIImplTest.java +++ b/lifecycle/src/test/java/org/apache/shardingsphere/elasticjob/lifecycle/internal/statistics/JobStatisticsAPIImplTest.java @@ -15,11 +15,11 @@ * limitations under the License. */ -package org.apache.shardingsphere.elasticjob.engine.lifecycle.internal.statistics; +package org.apache.shardingsphere.elasticjob.lifecycle.internal.statistics; -import org.apache.shardingsphere.elasticjob.engine.lifecycle.api.JobStatisticsAPI; -import org.apache.shardingsphere.elasticjob.engine.lifecycle.domain.JobBriefInfo; -import org.apache.shardingsphere.elasticjob.engine.lifecycle.fixture.LifecycleYamlConstants; +import org.apache.shardingsphere.elasticjob.lifecycle.api.JobStatisticsAPI; +import org.apache.shardingsphere.elasticjob.lifecycle.domain.JobBriefInfo; +import org.apache.shardingsphere.elasticjob.lifecycle.fixture.LifecycleYamlConstants; import org.apache.shardingsphere.elasticjob.reg.base.CoordinatorRegistryCenter; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/lifecycle/src/test/java/org/apache/shardingsphere/elasticjob/engine/lifecycle/internal/statistics/ServerStatisticsAPIImplTest.java b/lifecycle/src/test/java/org/apache/shardingsphere/elasticjob/lifecycle/internal/statistics/ServerStatisticsAPIImplTest.java similarity index 94% rename from lifecycle/src/test/java/org/apache/shardingsphere/elasticjob/engine/lifecycle/internal/statistics/ServerStatisticsAPIImplTest.java rename to lifecycle/src/test/java/org/apache/shardingsphere/elasticjob/lifecycle/internal/statistics/ServerStatisticsAPIImplTest.java index a502c2a96a..f1e71fe25a 100644 --- a/lifecycle/src/test/java/org/apache/shardingsphere/elasticjob/engine/lifecycle/internal/statistics/ServerStatisticsAPIImplTest.java +++ b/lifecycle/src/test/java/org/apache/shardingsphere/elasticjob/lifecycle/internal/statistics/ServerStatisticsAPIImplTest.java @@ -15,10 +15,10 @@ * limitations under the License. */ -package org.apache.shardingsphere.elasticjob.engine.lifecycle.internal.statistics; +package org.apache.shardingsphere.elasticjob.lifecycle.internal.statistics; -import org.apache.shardingsphere.elasticjob.engine.lifecycle.api.ServerStatisticsAPI; -import org.apache.shardingsphere.elasticjob.engine.lifecycle.domain.ServerBriefInfo; +import org.apache.shardingsphere.elasticjob.lifecycle.api.ServerStatisticsAPI; +import org.apache.shardingsphere.elasticjob.lifecycle.domain.ServerBriefInfo; import org.apache.shardingsphere.elasticjob.reg.base.CoordinatorRegistryCenter; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/lifecycle/src/test/java/org/apache/shardingsphere/elasticjob/engine/lifecycle/internal/statistics/ShardingStatisticsAPIImplTest.java b/lifecycle/src/test/java/org/apache/shardingsphere/elasticjob/lifecycle/internal/statistics/ShardingStatisticsAPIImplTest.java similarity index 95% rename from lifecycle/src/test/java/org/apache/shardingsphere/elasticjob/engine/lifecycle/internal/statistics/ShardingStatisticsAPIImplTest.java rename to lifecycle/src/test/java/org/apache/shardingsphere/elasticjob/lifecycle/internal/statistics/ShardingStatisticsAPIImplTest.java index 98a60d2b71..863bf8bd04 100644 --- a/lifecycle/src/test/java/org/apache/shardingsphere/elasticjob/engine/lifecycle/internal/statistics/ShardingStatisticsAPIImplTest.java +++ b/lifecycle/src/test/java/org/apache/shardingsphere/elasticjob/lifecycle/internal/statistics/ShardingStatisticsAPIImplTest.java @@ -15,10 +15,10 @@ * limitations under the License. */ -package org.apache.shardingsphere.elasticjob.engine.lifecycle.internal.statistics; +package org.apache.shardingsphere.elasticjob.lifecycle.internal.statistics; -import org.apache.shardingsphere.elasticjob.engine.lifecycle.api.ShardingStatisticsAPI; -import org.apache.shardingsphere.elasticjob.engine.lifecycle.domain.ShardingInfo; +import org.apache.shardingsphere.elasticjob.lifecycle.api.ShardingStatisticsAPI; +import org.apache.shardingsphere.elasticjob.lifecycle.domain.ShardingInfo; import org.apache.shardingsphere.elasticjob.reg.base.CoordinatorRegistryCenter; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/lifecycle/src/test/resources/logback-test.xml b/lifecycle/src/test/resources/logback-test.xml index 5c47f5f36c..0e0ccda830 100644 --- a/lifecycle/src/test/resources/logback-test.xml +++ b/lifecycle/src/test/resources/logback-test.xml @@ -17,7 +17,7 @@ --> - + From 00abb85954a5adc8c1197e2bd87441cd7bc590d3 Mon Sep 17 00:00:00 2001 From: zhangliang Date: Sun, 15 Oct 2023 13:20:31 +0800 Subject: [PATCH 2/2] Rename elasticjob-lifecycle module name --- .../lifecycle/internal/statistics/JobStatisticsAPIImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lifecycle/src/main/java/org/apache/shardingsphere/elasticjob/lifecycle/internal/statistics/JobStatisticsAPIImpl.java b/lifecycle/src/main/java/org/apache/shardingsphere/elasticjob/lifecycle/internal/statistics/JobStatisticsAPIImpl.java index e3bd455af1..7e745eb95e 100644 --- a/lifecycle/src/main/java/org/apache/shardingsphere/elasticjob/lifecycle/internal/statistics/JobStatisticsAPIImpl.java +++ b/lifecycle/src/main/java/org/apache/shardingsphere/elasticjob/lifecycle/internal/statistics/JobStatisticsAPIImpl.java @@ -113,7 +113,7 @@ private boolean isHasShardingFlag(final JobNodePath jobNodePath, final List(instances).containsAll(shardingInstances) || shardingInstances.isEmpty(); } private int getJobInstanceCount(final String jobName) {