Merge pull request #2296 from terrymanu/dev

Rename elasticjob-lifecycle module name
apache · Oct 15, 2023 · 99f87a3 · 99f87a3
2 parents 445d3c0 + 00abb85
commit 99f87a3
Show file tree

Hide file tree

Showing 32 changed files with 75 additions and 75 deletions.
diff --git 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
@@ -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<String> jobName, Optional<String> 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<JobBriefInfo> 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<ServerBriefInfo> 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
@@ -23,7 +23,7 @@
         <artifactId>elasticjob</artifactId>
         <version>3.1.0-SNAPSHOT</version>
     </parent>
-    <artifactId>elasticjob-engine-lifecycle</artifactId>
+    <artifactId>elasticjob-lifecycle</artifactId>
     <name>${project.artifactId}</name>
 
     <dependencies>

diff --git a/...b/engine/lifecycle/api/JobAPIFactory.java → ...asticjob/lifecycle/api/JobAPIFactory.java b/...b/engine/lifecycle/api/JobAPIFactory.java → ...asticjob/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/...ne/lifecycle/api/JobConfigurationAPI.java → ...ob/lifecycle/api/JobConfigurationAPI.java b/...ne/lifecycle/api/JobConfigurationAPI.java → ...ob/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/...b/engine/lifecycle/api/JobOperateAPI.java → ...asticjob/lifecycle/api/JobOperateAPI.java b/...b/engine/lifecycle/api/JobOperateAPI.java → ...asticjob/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/...ngine/lifecycle/api/JobStatisticsAPI.java → ...icjob/lifecycle/api/JobStatisticsAPI.java b/...ngine/lifecycle/api/JobStatisticsAPI.java → ...icjob/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/...ne/lifecycle/api/ServerStatisticsAPI.java → ...ob/lifecycle/api/ServerStatisticsAPI.java b/...ne/lifecycle/api/ServerStatisticsAPI.java → ...ob/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/...ine/lifecycle/api/ShardingOperateAPI.java → ...job/lifecycle/api/ShardingOperateAPI.java b/...ine/lifecycle/api/ShardingOperateAPI.java → ...job/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/api/ShardingStatisticsAPI.java → .../lifecycle/api/ShardingStatisticsAPI.java b/.../lifecycle/api/ShardingStatisticsAPI.java → .../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/...engine/lifecycle/domain/JobBriefInfo.java → ...ticjob/lifecycle/domain/JobBriefInfo.java b/...engine/lifecycle/domain/JobBriefInfo.java → ...ticjob/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/...ine/lifecycle/domain/ServerBriefInfo.java → ...job/lifecycle/domain/ServerBriefInfo.java b/...ine/lifecycle/domain/ServerBriefInfo.java → ...job/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/...engine/lifecycle/domain/ShardingInfo.java → ...ticjob/lifecycle/domain/ShardingInfo.java b/...engine/lifecycle/domain/ShardingInfo.java → ...ticjob/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/...e/internal/operate/JobOperateAPIImpl.java → ...e/internal/operate/JobOperateAPIImpl.java b/...e/internal/operate/JobOperateAPIImpl.java → ...e/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/...ernal/operate/ShardingOperateAPIImpl.java → ...ernal/operate/ShardingOperateAPIImpl.java b/...ernal/operate/ShardingOperateAPIImpl.java → ...ernal/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/...e/internal/reg/RegistryCenterFactory.java → ...e/internal/reg/RegistryCenterFactory.java b/...e/internal/reg/RegistryCenterFactory.java → ...e/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/...nal/settings/JobConfigurationAPIImpl.java → ...nal/settings/JobConfigurationAPIImpl.java b/...nal/settings/JobConfigurationAPIImpl.java → ...nal/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/...rnal/statistics/JobStatisticsAPIImpl.java → ...rnal/statistics/JobStatisticsAPIImpl.java b/...rnal/statistics/JobStatisticsAPIImpl.java → ...rnal/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;
 
@@ -113,7 +113,7 @@ private boolean isHasShardingFlag(final JobNodePath jobNodePath, final List<Stri
                 shardingInstances.add(instanceId);
             }
         }
-        return !instances.containsAll(shardingInstances) || shardingInstances.isEmpty();
+        return !new HashSet<>(instances).containsAll(shardingInstances) || shardingInstances.isEmpty();
     }
 
     private int getJobInstanceCount(final String jobName) {

diff --git a/...l/statistics/ServerStatisticsAPIImpl.java → ...l/statistics/ServerStatisticsAPIImpl.java b/...l/statistics/ServerStatisticsAPIImpl.java → ...l/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/...statistics/ShardingStatisticsAPIImpl.java → ...statistics/ShardingStatisticsAPIImpl.java b/...statistics/ShardingStatisticsAPIImpl.java → ...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/...cycle/AbstractEmbedZookeeperBaseTest.java → ...cycle/AbstractEmbedZookeeperBaseTest.java b/...cycle/AbstractEmbedZookeeperBaseTest.java → ...cycle/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/...gine/lifecycle/api/JobAPIFactoryTest.java → ...cjob/lifecycle/api/JobAPIFactoryTest.java b/...gine/lifecycle/api/JobAPIFactoryTest.java → ...cjob/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/domain/ShardingStatusTest.java → .../lifecycle/domain/ShardingStatusTest.java b/.../lifecycle/domain/ShardingStatusTest.java → .../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/...cycle/fixture/LifecycleYamlConstants.java → ...cycle/fixture/LifecycleYamlConstants.java b/...cycle/fixture/LifecycleYamlConstants.java → ...cycle/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;