This is an automated email from the ASF dual-hosted git repository.
zhaojinchao pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/shardingsphere-elasticjob.git
The following commit(s) were added to refs/heads/master by this push:
new 64b0e2f9d Move sharding from infra to kernel (#2321)
64b0e2f9d is described below
commit 64b0e2f9d1417b8f0fcbeed61267f5af99ef9ca2
Author: Liang Zhang <[email protected]>
AuthorDate: Fri Oct 27 11:54:06 2023 +0800
Move sharding from infra to kernel (#2321)
---
.../kernel/internal/election/ElectionListenerManager.java | 2 +-
.../kernel/internal/failover/FailoverListenerManager.java | 2 +-
.../elasticjob/kernel/internal/failover/FailoverService.java | 2 +-
.../elasticjob/kernel/internal/instance/InstanceService.java | 2 +-
.../elasticjob/kernel/internal/schedule/JobRegistry.java | 2 +-
.../elasticjob/kernel/internal/schedule/JobScheduler.java | 2 +-
.../elasticjob/kernel/internal/server/ServerNode.java | 2 +-
.../kernel/internal/sharding/ExecutionContextService.java | 1 -
.../elasticjob/kernel/internal/sharding/ExecutionService.java | 1 -
.../elasticjob/kernel/internal}/sharding/JobInstance.java | 2 +-
.../elasticjob/kernel/internal/sharding/ShardingService.java | 3 +--
.../kernel/internal/sharding/strategy}/JobShardingStrategy.java | 3 ++-
.../strategy/type}/AverageAllocationJobShardingStrategy.java | 6 +++---
.../strategy/type}/OdevitySortByNameJobShardingStrategy.java | 6 +++---
.../strategy/type}/RoundRobinByNameJobShardingStrategy.java | 6 +++---
.../elasticjob/kernel/internal/trigger/TriggerNode.java | 2 +-
...elasticjob.kernel.internal.sharding.strategy.JobShardingStrategy | 6 +++---
.../kernel/internal/config/RescheduleListenerManagerTest.java | 2 +-
.../kernel/internal/election/ElectionListenerManagerTest.java | 2 +-
.../elasticjob/kernel/internal/election/LeaderServiceTest.java | 2 +-
.../kernel/internal/failover/FailoverListenerManagerTest.java | 2 +-
.../elasticjob/kernel/internal/failover/FailoverServiceTest.java | 2 +-
.../elasticjob/kernel/internal/instance/InstanceNodeTest.java | 2 +-
.../elasticjob/kernel/internal/instance/InstanceServiceTest.java | 2 +-
.../kernel/internal/instance/ShutdownListenerManagerTest.java | 2 +-
.../listener/RegistryCenterConnectionStateListenerTest.java | 2 +-
.../elasticjob/kernel/internal/reconcile/ReconcileServiceTest.java | 2 +-
.../elasticjob/kernel/internal/schedule/JobRegistryTest.java | 2 +-
.../elasticjob/kernel/internal/schedule/SchedulerFacadeTest.java | 2 +-
.../elasticjob/kernel/internal/server/ServerNodeTest.java | 2 +-
.../elasticjob/kernel/internal/server/ServerServiceTest.java | 2 +-
.../elasticjob/kernel/internal/setup/SetUpFacadeTest.java | 2 +-
.../kernel/internal/sharding/ExecutionContextServiceTest.java | 1 -
.../elasticjob/kernel/internal/sharding/ExecutionServiceTest.java | 1 -
.../elasticjob/kernel/internal}/sharding/JobInstanceTest.java | 2 +-
.../kernel/internal/sharding/ShardingListenerManagerTest.java | 1 -
.../elasticjob/kernel/internal/sharding/ShardingServiceTest.java | 1 -
.../strategy/type}/AverageAllocationJobShardingStrategyTest.java | 6 +++---
.../strategy/type}/OdevitySortByNameJobShardingStrategyTest.java | 4 ++--
.../strategy/type}/RotateServerByNameJobShardingStrategyTest.java | 4 ++--
.../kernel/internal/trigger/TriggerListenerManagerTest.java | 2 +-
.../elasticjob/lifecycle/internal/operate/JobOperateAPIImpl.java | 2 +-
.../lifecycle/internal/statistics/JobStatisticsAPIImpl.java | 2 +-
.../lifecycle/internal/statistics/ServerStatisticsAPIImpl.java | 2 +-
.../lifecycle/internal/statistics/ShardingStatisticsAPIImpl.java | 2 +-
45 files changed, 52 insertions(+), 58 deletions(-)
diff --git
a/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/election/ElectionListenerManager.java
b/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/election/ElectionListenerManager.java
index 33b69dee2..2abdb8615 100644
---
a/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/election/ElectionListenerManager.java
+++
b/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/election/ElectionListenerManager.java
@@ -17,7 +17,7 @@
package org.apache.shardingsphere.elasticjob.kernel.internal.election;
-import org.apache.shardingsphere.elasticjob.infra.sharding.JobInstance;
+import
org.apache.shardingsphere.elasticjob.kernel.internal.sharding.JobInstance;
import
org.apache.shardingsphere.elasticjob.kernel.internal.listener.AbstractListenerManager;
import
org.apache.shardingsphere.elasticjob.kernel.internal.schedule.JobRegistry;
import org.apache.shardingsphere.elasticjob.kernel.internal.server.ServerNode;
diff --git
a/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/failover/FailoverListenerManager.java
b/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/failover/FailoverListenerManager.java
index c7c3f77e9..0d15591b5 100644
---
a/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/failover/FailoverListenerManager.java
+++
b/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/failover/FailoverListenerManager.java
@@ -17,7 +17,7 @@
package org.apache.shardingsphere.elasticjob.kernel.internal.failover;
-import org.apache.shardingsphere.elasticjob.infra.sharding.JobInstance;
+import
org.apache.shardingsphere.elasticjob.kernel.internal.sharding.JobInstance;
import org.apache.shardingsphere.elasticjob.infra.pojo.JobConfigurationPOJO;
import org.apache.shardingsphere.elasticjob.infra.yaml.YamlEngine;
import
org.apache.shardingsphere.elasticjob.kernel.internal.config.ConfigurationNode;
diff --git
a/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/failover/FailoverService.java
b/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/failover/FailoverService.java
index f6b972e19..3dc7ecf5b 100644
---
a/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/failover/FailoverService.java
+++
b/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/failover/FailoverService.java
@@ -19,7 +19,7 @@ package
org.apache.shardingsphere.elasticjob.kernel.internal.failover;
import com.google.common.base.Strings;
import lombok.extern.slf4j.Slf4j;
-import org.apache.shardingsphere.elasticjob.infra.sharding.JobInstance;
+import
org.apache.shardingsphere.elasticjob.kernel.internal.sharding.JobInstance;
import
org.apache.shardingsphere.elasticjob.kernel.internal.config.ConfigurationService;
import
org.apache.shardingsphere.elasticjob.kernel.internal.schedule.JobRegistry;
import
org.apache.shardingsphere.elasticjob.kernel.internal.schedule.JobScheduleController;
diff --git
a/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/instance/InstanceService.java
b/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/instance/InstanceService.java
index e93bbdb6c..5d3e03e68 100644
---
a/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/instance/InstanceService.java
+++
b/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/instance/InstanceService.java
@@ -17,7 +17,7 @@
package org.apache.shardingsphere.elasticjob.kernel.internal.instance;
-import org.apache.shardingsphere.elasticjob.infra.sharding.JobInstance;
+import
org.apache.shardingsphere.elasticjob.kernel.internal.sharding.JobInstance;
import org.apache.shardingsphere.elasticjob.infra.yaml.YamlEngine;
import
org.apache.shardingsphere.elasticjob.kernel.internal.server.ServerService;
import
org.apache.shardingsphere.elasticjob.kernel.internal.storage.JobNodeStorage;
diff --git
a/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/schedule/JobRegistry.java
b/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/schedule/JobRegistry.java
index 9e5c7b94e..3a01e2aa3 100644
---
a/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/schedule/JobRegistry.java
+++
b/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/schedule/JobRegistry.java
@@ -19,7 +19,7 @@ package
org.apache.shardingsphere.elasticjob.kernel.internal.schedule;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
-import org.apache.shardingsphere.elasticjob.infra.sharding.JobInstance;
+import
org.apache.shardingsphere.elasticjob.kernel.internal.sharding.JobInstance;
import
org.apache.shardingsphere.elasticjob.kernel.internal.listener.ListenerNotifierManager;
import org.apache.shardingsphere.elasticjob.reg.base.CoordinatorRegistryCenter;
diff --git
a/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/schedule/JobScheduler.java
b/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/schedule/JobScheduler.java
index c63cb5e03..d27dac922 100644
---
a/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/schedule/JobScheduler.java
+++
b/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/schedule/JobScheduler.java
@@ -25,7 +25,7 @@ import
org.apache.shardingsphere.elasticjob.api.JobConfiguration;
import
org.apache.shardingsphere.elasticjob.error.handler.JobErrorHandlerPropertiesValidator;
import org.apache.shardingsphere.elasticjob.executor.ElasticJobExecutor;
import org.apache.shardingsphere.elasticjob.infra.exception.JobSystemException;
-import org.apache.shardingsphere.elasticjob.infra.sharding.JobInstance;
+import
org.apache.shardingsphere.elasticjob.kernel.internal.sharding.JobInstance;
import org.apache.shardingsphere.elasticjob.infra.listener.ElasticJobListener;
import
org.apache.shardingsphere.elasticjob.kernel.api.listener.AbstractDistributeOnceElasticJobListener;
import
org.apache.shardingsphere.elasticjob.kernel.internal.config.ConfigurationService;
diff --git
a/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/server/ServerNode.java
b/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/server/ServerNode.java
index 56a48fc29..45cbdd0d8 100644
---
a/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/server/ServerNode.java
+++
b/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/server/ServerNode.java
@@ -17,7 +17,7 @@
package org.apache.shardingsphere.elasticjob.kernel.internal.server;
-import org.apache.shardingsphere.elasticjob.infra.sharding.JobInstance;
+import
org.apache.shardingsphere.elasticjob.kernel.internal.sharding.JobInstance;
import
org.apache.shardingsphere.elasticjob.kernel.internal.schedule.JobRegistry;
import
org.apache.shardingsphere.elasticjob.kernel.internal.storage.JobNodePath;
import org.apache.shardingsphere.elasticjob.infra.env.IpUtils;
diff --git
a/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/sharding/ExecutionContextService.java
b/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/sharding/ExecutionContextService.java
index 788ffbb2a..1aa21f9bd 100644
---
a/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/sharding/ExecutionContextService.java
+++
b/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/sharding/ExecutionContextService.java
@@ -18,7 +18,6 @@
package org.apache.shardingsphere.elasticjob.kernel.internal.sharding;
import org.apache.shardingsphere.elasticjob.api.JobConfiguration;
-import org.apache.shardingsphere.elasticjob.infra.sharding.JobInstance;
import org.apache.shardingsphere.elasticjob.infra.listener.ShardingContexts;
import
org.apache.shardingsphere.elasticjob.kernel.internal.config.ConfigurationService;
import
org.apache.shardingsphere.elasticjob.kernel.internal.schedule.JobRegistry;
diff --git
a/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/sharding/ExecutionService.java
b/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/sharding/ExecutionService.java
index deac82cf5..b918e4edf 100644
---
a/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/sharding/ExecutionService.java
+++
b/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/sharding/ExecutionService.java
@@ -19,7 +19,6 @@ package
org.apache.shardingsphere.elasticjob.kernel.internal.sharding;
import com.google.common.base.Strings;
import org.apache.shardingsphere.elasticjob.api.JobConfiguration;
-import org.apache.shardingsphere.elasticjob.infra.sharding.JobInstance;
import org.apache.shardingsphere.elasticjob.infra.listener.ShardingContexts;
import
org.apache.shardingsphere.elasticjob.kernel.internal.config.ConfigurationService;
import
org.apache.shardingsphere.elasticjob.kernel.internal.schedule.JobRegistry;
diff --git
a/infra/src/main/java/org/apache/shardingsphere/elasticjob/infra/sharding/JobInstance.java
b/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/sharding/JobInstance.java
similarity index 96%
rename from
infra/src/main/java/org/apache/shardingsphere/elasticjob/infra/sharding/JobInstance.java
rename to
kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/sharding/JobInstance.java
index eb0bc1cf5..02ce1e2f3 100644
---
a/infra/src/main/java/org/apache/shardingsphere/elasticjob/infra/sharding/JobInstance.java
+++
b/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/sharding/JobInstance.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.elasticjob.infra.sharding;
+package org.apache.shardingsphere.elasticjob.kernel.internal.sharding;
import lombok.AllArgsConstructor;
import lombok.EqualsAndHashCode;
diff --git
a/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/sharding/ShardingService.java
b/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/sharding/ShardingService.java
index e52e088e8..c4e2f1e98 100644
---
a/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/sharding/ShardingService.java
+++
b/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/sharding/ShardingService.java
@@ -20,8 +20,7 @@ package
org.apache.shardingsphere.elasticjob.kernel.internal.sharding;
import lombok.extern.slf4j.Slf4j;
import org.apache.shardingsphere.elasticjob.api.JobConfiguration;
import org.apache.shardingsphere.elasticjob.kernel.internal.util.BlockUtils;
-import org.apache.shardingsphere.elasticjob.infra.sharding.JobInstance;
-import org.apache.shardingsphere.elasticjob.infra.sharding.JobShardingStrategy;
+import
org.apache.shardingsphere.elasticjob.kernel.internal.sharding.strategy.JobShardingStrategy;
import org.apache.shardingsphere.elasticjob.infra.yaml.YamlEngine;
import
org.apache.shardingsphere.elasticjob.kernel.internal.config.ConfigurationService;
import
org.apache.shardingsphere.elasticjob.kernel.internal.election.LeaderService;
diff --git
a/infra/src/main/java/org/apache/shardingsphere/elasticjob/infra/sharding/JobShardingStrategy.java
b/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/sharding/strategy/JobShardingStrategy.java
similarity index 89%
rename from
infra/src/main/java/org/apache/shardingsphere/elasticjob/infra/sharding/JobShardingStrategy.java
rename to
kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/sharding/strategy/JobShardingStrategy.java
index 761ee0286..9b627ca45 100644
---
a/infra/src/main/java/org/apache/shardingsphere/elasticjob/infra/sharding/JobShardingStrategy.java
+++
b/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/sharding/strategy/JobShardingStrategy.java
@@ -15,8 +15,9 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.elasticjob.infra.sharding;
+package org.apache.shardingsphere.elasticjob.kernel.internal.sharding.strategy;
+import
org.apache.shardingsphere.elasticjob.kernel.internal.sharding.JobInstance;
import org.apache.shardingsphere.infra.spi.type.typed.TypedSPI;
import java.util.List;
diff --git
a/infra/src/main/java/org/apache/shardingsphere/elasticjob/infra/sharding/impl/AverageAllocationJobShardingStrategy.java
b/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/sharding/strategy/type/AverageAllocationJobShardingStrategy.java
similarity index 93%
rename from
infra/src/main/java/org/apache/shardingsphere/elasticjob/infra/sharding/impl/AverageAllocationJobShardingStrategy.java
rename to
kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/sharding/strategy/type/AverageAllocationJobShardingStrategy.java
index bb20a1f24..7f26f7bd3 100644
---
a/infra/src/main/java/org/apache/shardingsphere/elasticjob/infra/sharding/impl/AverageAllocationJobShardingStrategy.java
+++
b/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/sharding/strategy/type/AverageAllocationJobShardingStrategy.java
@@ -15,10 +15,10 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.elasticjob.infra.sharding.impl;
+package
org.apache.shardingsphere.elasticjob.kernel.internal.sharding.strategy.type;
-import org.apache.shardingsphere.elasticjob.infra.sharding.JobInstance;
-import org.apache.shardingsphere.elasticjob.infra.sharding.JobShardingStrategy;
+import
org.apache.shardingsphere.elasticjob.kernel.internal.sharding.JobInstance;
+import
org.apache.shardingsphere.elasticjob.kernel.internal.sharding.strategy.JobShardingStrategy;
import java.util.ArrayList;
import java.util.Collections;
diff --git
a/infra/src/main/java/org/apache/shardingsphere/elasticjob/infra/sharding/impl/OdevitySortByNameJobShardingStrategy.java
b/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/sharding/strategy/type/OdevitySortByNameJobShardingStrategy.java
similarity index 89%
rename from
infra/src/main/java/org/apache/shardingsphere/elasticjob/infra/sharding/impl/OdevitySortByNameJobShardingStrategy.java
rename to
kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/sharding/strategy/type/OdevitySortByNameJobShardingStrategy.java
index c7454fb5a..6cfbde3c9 100644
---
a/infra/src/main/java/org/apache/shardingsphere/elasticjob/infra/sharding/impl/OdevitySortByNameJobShardingStrategy.java
+++
b/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/sharding/strategy/type/OdevitySortByNameJobShardingStrategy.java
@@ -15,10 +15,10 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.elasticjob.infra.sharding.impl;
+package
org.apache.shardingsphere.elasticjob.kernel.internal.sharding.strategy.type;
-import org.apache.shardingsphere.elasticjob.infra.sharding.JobInstance;
-import org.apache.shardingsphere.elasticjob.infra.sharding.JobShardingStrategy;
+import
org.apache.shardingsphere.elasticjob.kernel.internal.sharding.JobInstance;
+import
org.apache.shardingsphere.elasticjob.kernel.internal.sharding.strategy.JobShardingStrategy;
import java.util.Collections;
import java.util.List;
diff --git
a/infra/src/main/java/org/apache/shardingsphere/elasticjob/infra/sharding/impl/RoundRobinByNameJobShardingStrategy.java
b/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/sharding/strategy/type/RoundRobinByNameJobShardingStrategy.java
similarity index 88%
rename from
infra/src/main/java/org/apache/shardingsphere/elasticjob/infra/sharding/impl/RoundRobinByNameJobShardingStrategy.java
rename to
kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/sharding/strategy/type/RoundRobinByNameJobShardingStrategy.java
index f2843f8a4..043a2844d 100644
---
a/infra/src/main/java/org/apache/shardingsphere/elasticjob/infra/sharding/impl/RoundRobinByNameJobShardingStrategy.java
+++
b/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/sharding/strategy/type/RoundRobinByNameJobShardingStrategy.java
@@ -15,10 +15,10 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.elasticjob.infra.sharding.impl;
+package
org.apache.shardingsphere.elasticjob.kernel.internal.sharding.strategy.type;
-import org.apache.shardingsphere.elasticjob.infra.sharding.JobInstance;
-import org.apache.shardingsphere.elasticjob.infra.sharding.JobShardingStrategy;
+import
org.apache.shardingsphere.elasticjob.kernel.internal.sharding.JobInstance;
+import
org.apache.shardingsphere.elasticjob.kernel.internal.sharding.strategy.JobShardingStrategy;
import java.util.ArrayList;
import java.util.List;
diff --git
a/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/trigger/TriggerNode.java
b/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/trigger/TriggerNode.java
index 33114e051..262a38e6a 100644
---
a/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/trigger/TriggerNode.java
+++
b/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/trigger/TriggerNode.java
@@ -17,7 +17,7 @@
package org.apache.shardingsphere.elasticjob.kernel.internal.trigger;
-import org.apache.shardingsphere.elasticjob.infra.sharding.JobInstance;
+import
org.apache.shardingsphere.elasticjob.kernel.internal.sharding.JobInstance;
import
org.apache.shardingsphere.elasticjob.kernel.internal.schedule.JobRegistry;
import
org.apache.shardingsphere.elasticjob.kernel.internal.storage.JobNodePath;
diff --git
a/infra/src/main/resources/META-INF/services/org.apache.shardingsphere.elasticjob.infra.sharding.JobShardingStrategy
b/kernel/src/main/resources/META-INF/services/org.apache.shardingsphere.elasticjob.kernel.internal.sharding.strategy.JobShardingStrategy
similarity index 69%
rename from
infra/src/main/resources/META-INF/services/org.apache.shardingsphere.elasticjob.infra.sharding.JobShardingStrategy
rename to
kernel/src/main/resources/META-INF/services/org.apache.shardingsphere.elasticjob.kernel.internal.sharding.strategy.JobShardingStrategy
index 95d09b6bc..16310868c 100644
---
a/infra/src/main/resources/META-INF/services/org.apache.shardingsphere.elasticjob.infra.sharding.JobShardingStrategy
+++
b/kernel/src/main/resources/META-INF/services/org.apache.shardingsphere.elasticjob.kernel.internal.sharding.strategy.JobShardingStrategy
@@ -15,6 +15,6 @@
# limitations under the License.
#
-org.apache.shardingsphere.elasticjob.infra.sharding.impl.AverageAllocationJobShardingStrategy
-org.apache.shardingsphere.elasticjob.infra.sharding.impl.OdevitySortByNameJobShardingStrategy
-org.apache.shardingsphere.elasticjob.infra.sharding.impl.RoundRobinByNameJobShardingStrategy
+org.apache.shardingsphere.elasticjob.kernel.internal.sharding.strategy.type.AverageAllocationJobShardingStrategy
+org.apache.shardingsphere.elasticjob.kernel.internal.sharding.strategy.type.OdevitySortByNameJobShardingStrategy
+org.apache.shardingsphere.elasticjob.kernel.internal.sharding.strategy.type.RoundRobinByNameJobShardingStrategy
diff --git
a/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/internal/config/RescheduleListenerManagerTest.java
b/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/internal/config/RescheduleListenerManagerTest.java
index a61c9fd0e..9f2ddd25d 100644
---
a/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/internal/config/RescheduleListenerManagerTest.java
+++
b/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/internal/config/RescheduleListenerManagerTest.java
@@ -17,7 +17,7 @@
package org.apache.shardingsphere.elasticjob.kernel.internal.config;
-import org.apache.shardingsphere.elasticjob.infra.sharding.JobInstance;
+import
org.apache.shardingsphere.elasticjob.kernel.internal.sharding.JobInstance;
import org.apache.shardingsphere.elasticjob.kernel.fixture.LiteYamlConstants;
import
org.apache.shardingsphere.elasticjob.kernel.internal.schedule.JobRegistry;
import
org.apache.shardingsphere.elasticjob.kernel.internal.schedule.JobScheduleController;
diff --git
a/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/internal/election/ElectionListenerManagerTest.java
b/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/internal/election/ElectionListenerManagerTest.java
index 7b81a969f..eca460720 100644
---
a/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/internal/election/ElectionListenerManagerTest.java
+++
b/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/internal/election/ElectionListenerManagerTest.java
@@ -17,7 +17,7 @@
package org.apache.shardingsphere.elasticjob.kernel.internal.election;
-import org.apache.shardingsphere.elasticjob.infra.sharding.JobInstance;
+import
org.apache.shardingsphere.elasticjob.kernel.internal.sharding.JobInstance;
import
org.apache.shardingsphere.elasticjob.kernel.internal.schedule.JobRegistry;
import
org.apache.shardingsphere.elasticjob.kernel.internal.schedule.JobScheduleController;
import
org.apache.shardingsphere.elasticjob.kernel.internal.server.ServerService;
diff --git
a/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/internal/election/LeaderServiceTest.java
b/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/internal/election/LeaderServiceTest.java
index 48e4bf954..d5729780c 100644
---
a/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/internal/election/LeaderServiceTest.java
+++
b/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/internal/election/LeaderServiceTest.java
@@ -17,7 +17,7 @@
package org.apache.shardingsphere.elasticjob.kernel.internal.election;
-import org.apache.shardingsphere.elasticjob.infra.sharding.JobInstance;
+import
org.apache.shardingsphere.elasticjob.kernel.internal.sharding.JobInstance;
import
org.apache.shardingsphere.elasticjob.kernel.internal.election.LeaderService.LeaderElectionExecutionCallback;
import
org.apache.shardingsphere.elasticjob.kernel.internal.schedule.JobRegistry;
import
org.apache.shardingsphere.elasticjob.kernel.internal.schedule.JobScheduleController;
diff --git
a/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/internal/failover/FailoverListenerManagerTest.java
b/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/internal/failover/FailoverListenerManagerTest.java
index 00de558fd..3ff61b6e8 100644
---
a/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/internal/failover/FailoverListenerManagerTest.java
+++
b/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/internal/failover/FailoverListenerManagerTest.java
@@ -18,7 +18,7 @@
package org.apache.shardingsphere.elasticjob.kernel.internal.failover;
import org.apache.shardingsphere.elasticjob.api.JobConfiguration;
-import org.apache.shardingsphere.elasticjob.infra.sharding.JobInstance;
+import
org.apache.shardingsphere.elasticjob.kernel.internal.sharding.JobInstance;
import org.apache.shardingsphere.elasticjob.kernel.fixture.LiteYamlConstants;
import
org.apache.shardingsphere.elasticjob.kernel.internal.config.ConfigurationService;
import
org.apache.shardingsphere.elasticjob.kernel.internal.instance.InstanceNode;
diff --git
a/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/internal/failover/FailoverServiceTest.java
b/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/internal/failover/FailoverServiceTest.java
index 32b249589..700d42121 100644
---
a/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/internal/failover/FailoverServiceTest.java
+++
b/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/internal/failover/FailoverServiceTest.java
@@ -18,7 +18,7 @@
package org.apache.shardingsphere.elasticjob.kernel.internal.failover;
import org.apache.shardingsphere.elasticjob.api.JobConfiguration;
-import org.apache.shardingsphere.elasticjob.infra.sharding.JobInstance;
+import
org.apache.shardingsphere.elasticjob.kernel.internal.sharding.JobInstance;
import
org.apache.shardingsphere.elasticjob.kernel.internal.config.ConfigurationService;
import
org.apache.shardingsphere.elasticjob.kernel.internal.schedule.JobRegistry;
import
org.apache.shardingsphere.elasticjob.kernel.internal.schedule.JobScheduleController;
diff --git
a/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/internal/instance/InstanceNodeTest.java
b/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/internal/instance/InstanceNodeTest.java
index 694a71ba9..dff268999 100644
---
a/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/internal/instance/InstanceNodeTest.java
+++
b/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/internal/instance/InstanceNodeTest.java
@@ -17,7 +17,7 @@
package org.apache.shardingsphere.elasticjob.kernel.internal.instance;
-import org.apache.shardingsphere.elasticjob.infra.sharding.JobInstance;
+import
org.apache.shardingsphere.elasticjob.kernel.internal.sharding.JobInstance;
import
org.apache.shardingsphere.elasticjob.kernel.internal.schedule.JobRegistry;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;
diff --git
a/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/internal/instance/InstanceServiceTest.java
b/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/internal/instance/InstanceServiceTest.java
index 896e11cc2..7fbb551c6 100644
---
a/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/internal/instance/InstanceServiceTest.java
+++
b/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/internal/instance/InstanceServiceTest.java
@@ -17,7 +17,7 @@
package org.apache.shardingsphere.elasticjob.kernel.internal.instance;
-import org.apache.shardingsphere.elasticjob.infra.sharding.JobInstance;
+import
org.apache.shardingsphere.elasticjob.kernel.internal.sharding.JobInstance;
import
org.apache.shardingsphere.elasticjob.kernel.internal.schedule.JobRegistry;
import
org.apache.shardingsphere.elasticjob.kernel.internal.server.ServerService;
import
org.apache.shardingsphere.elasticjob.kernel.internal.storage.JobNodeStorage;
diff --git
a/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/internal/instance/ShutdownListenerManagerTest.java
b/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/internal/instance/ShutdownListenerManagerTest.java
index a3178ecca..d6bcf4146 100644
---
a/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/internal/instance/ShutdownListenerManagerTest.java
+++
b/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/internal/instance/ShutdownListenerManagerTest.java
@@ -17,7 +17,7 @@
package org.apache.shardingsphere.elasticjob.kernel.internal.instance;
-import org.apache.shardingsphere.elasticjob.infra.sharding.JobInstance;
+import
org.apache.shardingsphere.elasticjob.kernel.internal.sharding.JobInstance;
import
org.apache.shardingsphere.elasticjob.kernel.internal.schedule.JobRegistry;
import
org.apache.shardingsphere.elasticjob.kernel.internal.schedule.JobScheduleController;
import
org.apache.shardingsphere.elasticjob.kernel.internal.schedule.SchedulerFacade;
diff --git
a/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/internal/listener/RegistryCenterConnectionStateListenerTest.java
b/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/internal/listener/RegistryCenterConnectionStateListenerTest.java
index 4db4ebecc..2eaacd699 100644
---
a/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/internal/listener/RegistryCenterConnectionStateListenerTest.java
+++
b/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/internal/listener/RegistryCenterConnectionStateListenerTest.java
@@ -17,7 +17,7 @@
package org.apache.shardingsphere.elasticjob.kernel.internal.listener;
-import org.apache.shardingsphere.elasticjob.infra.sharding.JobInstance;
+import
org.apache.shardingsphere.elasticjob.kernel.internal.sharding.JobInstance;
import
org.apache.shardingsphere.elasticjob.kernel.internal.instance.InstanceService;
import
org.apache.shardingsphere.elasticjob.kernel.internal.schedule.JobRegistry;
import
org.apache.shardingsphere.elasticjob.kernel.internal.schedule.JobScheduleController;
diff --git
a/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/internal/reconcile/ReconcileServiceTest.java
b/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/internal/reconcile/ReconcileServiceTest.java
index b2e8a8d86..c086172ac 100644
---
a/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/internal/reconcile/ReconcileServiceTest.java
+++
b/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/internal/reconcile/ReconcileServiceTest.java
@@ -19,7 +19,7 @@ package
org.apache.shardingsphere.elasticjob.kernel.internal.reconcile;
import com.google.common.collect.Lists;
import org.apache.shardingsphere.elasticjob.api.JobConfiguration;
-import org.apache.shardingsphere.elasticjob.infra.sharding.JobInstance;
+import
org.apache.shardingsphere.elasticjob.kernel.internal.sharding.JobInstance;
import
org.apache.shardingsphere.elasticjob.kernel.internal.config.ConfigurationService;
import
org.apache.shardingsphere.elasticjob.kernel.internal.schedule.JobRegistry;
import
org.apache.shardingsphere.elasticjob.kernel.internal.sharding.ShardingService;
diff --git
a/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/internal/schedule/JobRegistryTest.java
b/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/internal/schedule/JobRegistryTest.java
index 84d6d578c..c9e8f46c8 100644
---
a/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/internal/schedule/JobRegistryTest.java
+++
b/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/internal/schedule/JobRegistryTest.java
@@ -17,7 +17,7 @@
package org.apache.shardingsphere.elasticjob.kernel.internal.schedule;
-import org.apache.shardingsphere.elasticjob.infra.sharding.JobInstance;
+import
org.apache.shardingsphere.elasticjob.kernel.internal.sharding.JobInstance;
import org.apache.shardingsphere.elasticjob.reg.base.CoordinatorRegistryCenter;
import org.apache.shardingsphere.elasticjob.kernel.util.ReflectionUtils;
import org.junit.jupiter.api.Test;
diff --git
a/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/internal/schedule/SchedulerFacadeTest.java
b/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/internal/schedule/SchedulerFacadeTest.java
index 34b5b809a..b97a253e8 100644
---
a/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/internal/schedule/SchedulerFacadeTest.java
+++
b/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/internal/schedule/SchedulerFacadeTest.java
@@ -17,7 +17,7 @@
package org.apache.shardingsphere.elasticjob.kernel.internal.schedule;
-import org.apache.shardingsphere.elasticjob.infra.sharding.JobInstance;
+import
org.apache.shardingsphere.elasticjob.kernel.internal.sharding.JobInstance;
import
org.apache.shardingsphere.elasticjob.kernel.internal.election.LeaderService;
import
org.apache.shardingsphere.elasticjob.kernel.internal.sharding.ShardingService;
import org.apache.shardingsphere.elasticjob.kernel.util.ReflectionUtils;
diff --git
a/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/internal/server/ServerNodeTest.java
b/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/internal/server/ServerNodeTest.java
index 05e851df0..2e24ad182 100644
---
a/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/internal/server/ServerNodeTest.java
+++
b/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/internal/server/ServerNodeTest.java
@@ -17,7 +17,7 @@
package org.apache.shardingsphere.elasticjob.kernel.internal.server;
-import org.apache.shardingsphere.elasticjob.infra.sharding.JobInstance;
+import
org.apache.shardingsphere.elasticjob.kernel.internal.sharding.JobInstance;
import
org.apache.shardingsphere.elasticjob.kernel.internal.schedule.JobRegistry;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;
diff --git
a/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/internal/server/ServerServiceTest.java
b/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/internal/server/ServerServiceTest.java
index efd8d7fdc..5352f9f69 100644
---
a/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/internal/server/ServerServiceTest.java
+++
b/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/internal/server/ServerServiceTest.java
@@ -17,7 +17,7 @@
package org.apache.shardingsphere.elasticjob.kernel.internal.server;
-import org.apache.shardingsphere.elasticjob.infra.sharding.JobInstance;
+import
org.apache.shardingsphere.elasticjob.kernel.internal.sharding.JobInstance;
import
org.apache.shardingsphere.elasticjob.kernel.internal.schedule.JobRegistry;
import
org.apache.shardingsphere.elasticjob.kernel.internal.schedule.JobScheduleController;
import
org.apache.shardingsphere.elasticjob.kernel.internal.storage.JobNodeStorage;
diff --git
a/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/internal/setup/SetUpFacadeTest.java
b/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/internal/setup/SetUpFacadeTest.java
index 9d53ac5ac..0a9393b62 100644
---
a/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/internal/setup/SetUpFacadeTest.java
+++
b/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/internal/setup/SetUpFacadeTest.java
@@ -17,7 +17,7 @@
package org.apache.shardingsphere.elasticjob.kernel.internal.setup;
-import org.apache.shardingsphere.elasticjob.infra.sharding.JobInstance;
+import
org.apache.shardingsphere.elasticjob.kernel.internal.sharding.JobInstance;
import
org.apache.shardingsphere.elasticjob.kernel.internal.election.LeaderService;
import
org.apache.shardingsphere.elasticjob.kernel.internal.instance.InstanceService;
import
org.apache.shardingsphere.elasticjob.kernel.internal.listener.ListenerManager;
diff --git
a/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/internal/sharding/ExecutionContextServiceTest.java
b/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/internal/sharding/ExecutionContextServiceTest.java
index 01eb0bac4..08d77ff14 100644
---
a/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/internal/sharding/ExecutionContextServiceTest.java
+++
b/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/internal/sharding/ExecutionContextServiceTest.java
@@ -19,7 +19,6 @@ package
org.apache.shardingsphere.elasticjob.kernel.internal.sharding;
import com.google.common.collect.Lists;
import org.apache.shardingsphere.elasticjob.api.JobConfiguration;
-import org.apache.shardingsphere.elasticjob.infra.sharding.JobInstance;
import org.apache.shardingsphere.elasticjob.infra.listener.ShardingContexts;
import
org.apache.shardingsphere.elasticjob.kernel.internal.config.ConfigurationService;
import
org.apache.shardingsphere.elasticjob.kernel.internal.schedule.JobRegistry;
diff --git
a/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/internal/sharding/ExecutionServiceTest.java
b/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/internal/sharding/ExecutionServiceTest.java
index 9ea81e0c1..b67b69599 100644
---
a/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/internal/sharding/ExecutionServiceTest.java
+++
b/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/internal/sharding/ExecutionServiceTest.java
@@ -18,7 +18,6 @@
package org.apache.shardingsphere.elasticjob.kernel.internal.sharding;
import org.apache.shardingsphere.elasticjob.api.JobConfiguration;
-import org.apache.shardingsphere.elasticjob.infra.sharding.JobInstance;
import org.apache.shardingsphere.elasticjob.infra.listener.ShardingContexts;
import
org.apache.shardingsphere.elasticjob.kernel.internal.config.ConfigurationService;
import
org.apache.shardingsphere.elasticjob.kernel.internal.schedule.JobRegistry;
diff --git
a/infra/src/test/java/org/apache/shardingsphere/elasticjob/infra/sharding/JobInstanceTest.java
b/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/internal/sharding/JobInstanceTest.java
similarity index 96%
rename from
infra/src/test/java/org/apache/shardingsphere/elasticjob/infra/sharding/JobInstanceTest.java
rename to
kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/internal/sharding/JobInstanceTest.java
index f76a2414d..64f7131bd 100644
---
a/infra/src/test/java/org/apache/shardingsphere/elasticjob/infra/sharding/JobInstanceTest.java
+++
b/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/internal/sharding/JobInstanceTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.elasticjob.infra.sharding;
+package org.apache.shardingsphere.elasticjob.kernel.internal.sharding;
import org.apache.shardingsphere.elasticjob.infra.env.IpUtils;
import org.apache.shardingsphere.elasticjob.infra.yaml.YamlEngine;
diff --git
a/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/internal/sharding/ShardingListenerManagerTest.java
b/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/internal/sharding/ShardingListenerManagerTest.java
index 11d83019d..5782f8d51 100644
---
a/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/internal/sharding/ShardingListenerManagerTest.java
+++
b/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/internal/sharding/ShardingListenerManagerTest.java
@@ -19,7 +19,6 @@ package
org.apache.shardingsphere.elasticjob.kernel.internal.sharding;
import com.google.common.collect.Lists;
import org.apache.shardingsphere.elasticjob.api.JobConfiguration;
-import org.apache.shardingsphere.elasticjob.infra.sharding.JobInstance;
import org.apache.shardingsphere.elasticjob.kernel.fixture.LiteYamlConstants;
import
org.apache.shardingsphere.elasticjob.kernel.internal.config.ConfigurationService;
import
org.apache.shardingsphere.elasticjob.kernel.internal.schedule.JobRegistry;
diff --git
a/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/internal/sharding/ShardingServiceTest.java
b/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/internal/sharding/ShardingServiceTest.java
index 150d5898e..df8c4f550 100644
---
a/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/internal/sharding/ShardingServiceTest.java
+++
b/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/internal/sharding/ShardingServiceTest.java
@@ -18,7 +18,6 @@
package org.apache.shardingsphere.elasticjob.kernel.internal.sharding;
import org.apache.shardingsphere.elasticjob.api.JobConfiguration;
-import org.apache.shardingsphere.elasticjob.infra.sharding.JobInstance;
import
org.apache.shardingsphere.elasticjob.kernel.internal.config.ConfigurationService;
import
org.apache.shardingsphere.elasticjob.kernel.internal.election.LeaderService;
import
org.apache.shardingsphere.elasticjob.kernel.internal.instance.InstanceNode;
diff --git
a/infra/src/test/java/org/apache/shardingsphere/elasticjob/infra/sharding/impl/AverageAllocationJobShardingStrategyTest.java
b/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/internal/sharding/strategy/type/AverageAllocationJobShardingStrategyTest.java
similarity index 93%
rename from
infra/src/test/java/org/apache/shardingsphere/elasticjob/infra/sharding/impl/AverageAllocationJobShardingStrategyTest.java
rename to
kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/internal/sharding/strategy/type/AverageAllocationJobShardingStrategyTest.java
index ab1338b02..c2fb8a81c 100644
---
a/infra/src/test/java/org/apache/shardingsphere/elasticjob/infra/sharding/impl/AverageAllocationJobShardingStrategyTest.java
+++
b/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/internal/sharding/strategy/type/AverageAllocationJobShardingStrategyTest.java
@@ -15,10 +15,10 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.elasticjob.infra.sharding.impl;
+package
org.apache.shardingsphere.elasticjob.kernel.internal.sharding.strategy.type;
-import org.apache.shardingsphere.elasticjob.infra.sharding.JobInstance;
-import org.apache.shardingsphere.elasticjob.infra.sharding.JobShardingStrategy;
+import
org.apache.shardingsphere.elasticjob.kernel.internal.sharding.JobInstance;
+import
org.apache.shardingsphere.elasticjob.kernel.internal.sharding.strategy.JobShardingStrategy;
import org.junit.jupiter.api.Test;
import java.util.Arrays;
diff --git
a/infra/src/test/java/org/apache/shardingsphere/elasticjob/infra/sharding/impl/OdevitySortByNameJobShardingStrategyTest.java
b/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/internal/sharding/strategy/type/OdevitySortByNameJobShardingStrategyTest.java
similarity index 93%
rename from
infra/src/test/java/org/apache/shardingsphere/elasticjob/infra/sharding/impl/OdevitySortByNameJobShardingStrategyTest.java
rename to
kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/internal/sharding/strategy/type/OdevitySortByNameJobShardingStrategyTest.java
index 09edfeff9..aa9da9840 100644
---
a/infra/src/test/java/org/apache/shardingsphere/elasticjob/infra/sharding/impl/OdevitySortByNameJobShardingStrategyTest.java
+++
b/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/internal/sharding/strategy/type/OdevitySortByNameJobShardingStrategyTest.java
@@ -15,9 +15,9 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.elasticjob.infra.sharding.impl;
+package
org.apache.shardingsphere.elasticjob.kernel.internal.sharding.strategy.type;
-import org.apache.shardingsphere.elasticjob.infra.sharding.JobInstance;
+import
org.apache.shardingsphere.elasticjob.kernel.internal.sharding.JobInstance;
import org.junit.jupiter.api.Test;
import java.util.Arrays;
diff --git
a/infra/src/test/java/org/apache/shardingsphere/elasticjob/infra/sharding/impl/RotateServerByNameJobShardingStrategyTest.java
b/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/internal/sharding/strategy/type/RotateServerByNameJobShardingStrategyTest.java
similarity index 94%
rename from
infra/src/test/java/org/apache/shardingsphere/elasticjob/infra/sharding/impl/RotateServerByNameJobShardingStrategyTest.java
rename to
kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/internal/sharding/strategy/type/RotateServerByNameJobShardingStrategyTest.java
index 0a059d8fa..45876d518 100644
---
a/infra/src/test/java/org/apache/shardingsphere/elasticjob/infra/sharding/impl/RotateServerByNameJobShardingStrategyTest.java
+++
b/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/internal/sharding/strategy/type/RotateServerByNameJobShardingStrategyTest.java
@@ -15,9 +15,9 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.elasticjob.infra.sharding.impl;
+package
org.apache.shardingsphere.elasticjob.kernel.internal.sharding.strategy.type;
-import org.apache.shardingsphere.elasticjob.infra.sharding.JobInstance;
+import
org.apache.shardingsphere.elasticjob.kernel.internal.sharding.JobInstance;
import org.junit.jupiter.api.Test;
import java.util.Arrays;
diff --git
a/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/internal/trigger/TriggerListenerManagerTest.java
b/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/internal/trigger/TriggerListenerManagerTest.java
index 2bfecb6fe..bb070e647 100644
---
a/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/internal/trigger/TriggerListenerManagerTest.java
+++
b/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/internal/trigger/TriggerListenerManagerTest.java
@@ -17,7 +17,7 @@
package org.apache.shardingsphere.elasticjob.kernel.internal.trigger;
-import org.apache.shardingsphere.elasticjob.infra.sharding.JobInstance;
+import
org.apache.shardingsphere.elasticjob.kernel.internal.sharding.JobInstance;
import
org.apache.shardingsphere.elasticjob.kernel.internal.schedule.JobRegistry;
import
org.apache.shardingsphere.elasticjob.kernel.internal.schedule.JobScheduleController;
import
org.apache.shardingsphere.elasticjob.kernel.internal.storage.JobNodeStorage;
diff --git
a/lifecycle/src/main/java/org/apache/shardingsphere/elasticjob/lifecycle/internal/operate/JobOperateAPIImpl.java
b/lifecycle/src/main/java/org/apache/shardingsphere/elasticjob/lifecycle/internal/operate/JobOperateAPIImpl.java
index d15d2fecf..989ddf581 100644
---
a/lifecycle/src/main/java/org/apache/shardingsphere/elasticjob/lifecycle/internal/operate/JobOperateAPIImpl.java
+++
b/lifecycle/src/main/java/org/apache/shardingsphere/elasticjob/lifecycle/internal/operate/JobOperateAPIImpl.java
@@ -18,7 +18,7 @@
package org.apache.shardingsphere.elasticjob.lifecycle.internal.operate;
import com.google.common.base.Preconditions;
-import org.apache.shardingsphere.elasticjob.infra.sharding.JobInstance;
+import
org.apache.shardingsphere.elasticjob.kernel.internal.sharding.JobInstance;
import org.apache.shardingsphere.elasticjob.infra.yaml.YamlEngine;
import
org.apache.shardingsphere.elasticjob.kernel.internal.instance.InstanceService;
import
org.apache.shardingsphere.elasticjob.kernel.internal.server.ServerStatus;
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 7af9c48da..18fb8caba 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
@@ -19,7 +19,7 @@ package
org.apache.shardingsphere.elasticjob.lifecycle.internal.statistics;
import lombok.RequiredArgsConstructor;
import org.apache.shardingsphere.elasticjob.api.JobConfiguration;
-import org.apache.shardingsphere.elasticjob.infra.sharding.JobInstance;
+import
org.apache.shardingsphere.elasticjob.kernel.internal.sharding.JobInstance;
import org.apache.shardingsphere.elasticjob.infra.pojo.JobConfigurationPOJO;
import
org.apache.shardingsphere.elasticjob.kernel.internal.storage.JobNodePath;
import org.apache.shardingsphere.elasticjob.lifecycle.api.JobStatisticsAPI;
diff --git
a/lifecycle/src/main/java/org/apache/shardingsphere/elasticjob/lifecycle/internal/statistics/ServerStatisticsAPIImpl.java
b/lifecycle/src/main/java/org/apache/shardingsphere/elasticjob/lifecycle/internal/statistics/ServerStatisticsAPIImpl.java
index 2fb6c6951..5ddf90e87 100644
---
a/lifecycle/src/main/java/org/apache/shardingsphere/elasticjob/lifecycle/internal/statistics/ServerStatisticsAPIImpl.java
+++
b/lifecycle/src/main/java/org/apache/shardingsphere/elasticjob/lifecycle/internal/statistics/ServerStatisticsAPIImpl.java
@@ -18,7 +18,7 @@
package org.apache.shardingsphere.elasticjob.lifecycle.internal.statistics;
import lombok.RequiredArgsConstructor;
-import org.apache.shardingsphere.elasticjob.infra.sharding.JobInstance;
+import
org.apache.shardingsphere.elasticjob.kernel.internal.sharding.JobInstance;
import org.apache.shardingsphere.elasticjob.infra.yaml.YamlEngine;
import
org.apache.shardingsphere.elasticjob.kernel.internal.storage.JobNodePath;
import org.apache.shardingsphere.elasticjob.lifecycle.api.ServerStatisticsAPI;
diff --git
a/lifecycle/src/main/java/org/apache/shardingsphere/elasticjob/lifecycle/internal/statistics/ShardingStatisticsAPIImpl.java
b/lifecycle/src/main/java/org/apache/shardingsphere/elasticjob/lifecycle/internal/statistics/ShardingStatisticsAPIImpl.java
index 3e9e80816..69294e87f 100644
---
a/lifecycle/src/main/java/org/apache/shardingsphere/elasticjob/lifecycle/internal/statistics/ShardingStatisticsAPIImpl.java
+++
b/lifecycle/src/main/java/org/apache/shardingsphere/elasticjob/lifecycle/internal/statistics/ShardingStatisticsAPIImpl.java
@@ -18,7 +18,7 @@
package org.apache.shardingsphere.elasticjob.lifecycle.internal.statistics;
import lombok.RequiredArgsConstructor;
-import org.apache.shardingsphere.elasticjob.infra.sharding.JobInstance;
+import
org.apache.shardingsphere.elasticjob.kernel.internal.sharding.JobInstance;
import org.apache.shardingsphere.elasticjob.infra.yaml.YamlEngine;
import
org.apache.shardingsphere.elasticjob.kernel.internal.storage.JobNodePath;
import
org.apache.shardingsphere.elasticjob.lifecycle.api.ShardingStatisticsAPI;
