diff --git a/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/executor/ExecutionType.java b/api/src/main/java/org/apache/shardingsphere/elasticjob/spi/executor/ExecutionType.java similarity index 94% rename from kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/executor/ExecutionType.java rename to api/src/main/java/org/apache/shardingsphere/elasticjob/spi/executor/ExecutionType.java index b7544b3de9..4359a17858 100755 --- a/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/executor/ExecutionType.java +++ b/api/src/main/java/org/apache/shardingsphere/elasticjob/spi/executor/ExecutionType.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.elasticjob.kernel.executor; +package org.apache.shardingsphere.elasticjob.spi.executor; /** * Execution type. diff --git a/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/executor/error/handler/JobErrorHandler.java b/api/src/main/java/org/apache/shardingsphere/elasticjob/spi/executor/error/handler/JobErrorHandler.java similarity index 94% rename from kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/executor/error/handler/JobErrorHandler.java rename to api/src/main/java/org/apache/shardingsphere/elasticjob/spi/executor/error/handler/JobErrorHandler.java index f4a1f0f4d9..762981a908 100644 --- a/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/executor/error/handler/JobErrorHandler.java +++ b/api/src/main/java/org/apache/shardingsphere/elasticjob/spi/executor/error/handler/JobErrorHandler.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.elasticjob.kernel.executor.error.handler; +package org.apache.shardingsphere.elasticjob.spi.executor.error.handler; import org.apache.shardingsphere.infra.spi.type.typed.TypedSPI; diff --git a/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/executor/error/handler/JobErrorHandlerPropertiesValidator.java b/api/src/main/java/org/apache/shardingsphere/elasticjob/spi/executor/error/handler/JobErrorHandlerPropertiesValidator.java similarity index 94% rename from kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/executor/error/handler/JobErrorHandlerPropertiesValidator.java rename to api/src/main/java/org/apache/shardingsphere/elasticjob/spi/executor/error/handler/JobErrorHandlerPropertiesValidator.java index 098c6fc35e..8c7a1253f2 100644 --- a/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/executor/error/handler/JobErrorHandlerPropertiesValidator.java +++ b/api/src/main/java/org/apache/shardingsphere/elasticjob/spi/executor/error/handler/JobErrorHandlerPropertiesValidator.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.elasticjob.kernel.executor.error.handler; +package org.apache.shardingsphere.elasticjob.spi.executor.error.handler; import org.apache.shardingsphere.infra.spi.annotation.SingletonSPI; import org.apache.shardingsphere.infra.spi.type.typed.TypedSPI; diff --git a/api/src/main/java/org/apache/shardingsphere/elasticjob/spi/executor/JobItemExecutor.java b/api/src/main/java/org/apache/shardingsphere/elasticjob/spi/executor/item/JobItemExecutor.java similarity index 85% rename from api/src/main/java/org/apache/shardingsphere/elasticjob/spi/executor/JobItemExecutor.java rename to api/src/main/java/org/apache/shardingsphere/elasticjob/spi/executor/item/JobItemExecutor.java index e78c97aeb4..e933d8b927 100644 --- a/api/src/main/java/org/apache/shardingsphere/elasticjob/spi/executor/JobItemExecutor.java +++ b/api/src/main/java/org/apache/shardingsphere/elasticjob/spi/executor/item/JobItemExecutor.java @@ -15,12 +15,12 @@ * limitations under the License. */ -package org.apache.shardingsphere.elasticjob.spi.executor; +package org.apache.shardingsphere.elasticjob.spi.executor.item; import org.apache.shardingsphere.elasticjob.api.ElasticJob; import org.apache.shardingsphere.elasticjob.api.JobConfiguration; -import org.apache.shardingsphere.elasticjob.spi.executor.param.ShardingContext; -import org.apache.shardingsphere.elasticjob.spi.executor.param.JobRuntimeService; +import org.apache.shardingsphere.elasticjob.spi.executor.item.param.ShardingContext; +import org.apache.shardingsphere.elasticjob.spi.executor.item.param.JobRuntimeService; /** * Job item executor. diff --git a/api/src/main/java/org/apache/shardingsphere/elasticjob/spi/executor/param/JobRuntimeService.java b/api/src/main/java/org/apache/shardingsphere/elasticjob/spi/executor/item/param/JobRuntimeService.java similarity index 93% rename from api/src/main/java/org/apache/shardingsphere/elasticjob/spi/executor/param/JobRuntimeService.java rename to api/src/main/java/org/apache/shardingsphere/elasticjob/spi/executor/item/param/JobRuntimeService.java index 35538aae5f..375ed64b10 100644 --- a/api/src/main/java/org/apache/shardingsphere/elasticjob/spi/executor/param/JobRuntimeService.java +++ b/api/src/main/java/org/apache/shardingsphere/elasticjob/spi/executor/item/param/JobRuntimeService.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.elasticjob.spi.executor.param; +package org.apache.shardingsphere.elasticjob.spi.executor.item.param; /** * Job runtime service. diff --git a/api/src/main/java/org/apache/shardingsphere/elasticjob/spi/executor/param/ShardingContext.java b/api/src/main/java/org/apache/shardingsphere/elasticjob/spi/executor/item/param/ShardingContext.java similarity index 94% rename from api/src/main/java/org/apache/shardingsphere/elasticjob/spi/executor/param/ShardingContext.java rename to api/src/main/java/org/apache/shardingsphere/elasticjob/spi/executor/item/param/ShardingContext.java index a3f94167cd..d756377091 100644 --- a/api/src/main/java/org/apache/shardingsphere/elasticjob/spi/executor/param/ShardingContext.java +++ b/api/src/main/java/org/apache/shardingsphere/elasticjob/spi/executor/item/param/ShardingContext.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.elasticjob.spi.executor.param; +package org.apache.shardingsphere.elasticjob.spi.executor.item.param; import lombok.Getter; import lombok.RequiredArgsConstructor; diff --git a/api/src/main/java/org/apache/shardingsphere/elasticjob/spi/executor/type/ClassedJobItemExecutor.java b/api/src/main/java/org/apache/shardingsphere/elasticjob/spi/executor/item/type/ClassedJobItemExecutor.java similarity index 89% rename from api/src/main/java/org/apache/shardingsphere/elasticjob/spi/executor/type/ClassedJobItemExecutor.java rename to api/src/main/java/org/apache/shardingsphere/elasticjob/spi/executor/item/type/ClassedJobItemExecutor.java index 319618ecbc..166f419a87 100644 --- a/api/src/main/java/org/apache/shardingsphere/elasticjob/spi/executor/type/ClassedJobItemExecutor.java +++ b/api/src/main/java/org/apache/shardingsphere/elasticjob/spi/executor/item/type/ClassedJobItemExecutor.java @@ -15,10 +15,10 @@ * limitations under the License. */ -package org.apache.shardingsphere.elasticjob.spi.executor.type; +package org.apache.shardingsphere.elasticjob.spi.executor.item.type; import org.apache.shardingsphere.elasticjob.api.ElasticJob; -import org.apache.shardingsphere.elasticjob.spi.executor.JobItemExecutor; +import org.apache.shardingsphere.elasticjob.spi.executor.item.JobItemExecutor; import org.apache.shardingsphere.infra.spi.annotation.SingletonSPI; /** diff --git a/api/src/main/java/org/apache/shardingsphere/elasticjob/spi/executor/type/TypedJobItemExecutor.java b/api/src/main/java/org/apache/shardingsphere/elasticjob/spi/executor/item/type/TypedJobItemExecutor.java similarity index 88% rename from api/src/main/java/org/apache/shardingsphere/elasticjob/spi/executor/type/TypedJobItemExecutor.java rename to api/src/main/java/org/apache/shardingsphere/elasticjob/spi/executor/item/type/TypedJobItemExecutor.java index 1d2c278fd1..bdf808f714 100644 --- a/api/src/main/java/org/apache/shardingsphere/elasticjob/spi/executor/type/TypedJobItemExecutor.java +++ b/api/src/main/java/org/apache/shardingsphere/elasticjob/spi/executor/item/type/TypedJobItemExecutor.java @@ -15,10 +15,10 @@ * limitations under the License. */ -package org.apache.shardingsphere.elasticjob.spi.executor.type; +package org.apache.shardingsphere.elasticjob.spi.executor.item.type; import org.apache.shardingsphere.elasticjob.api.ElasticJob; -import org.apache.shardingsphere.elasticjob.spi.executor.JobItemExecutor; +import org.apache.shardingsphere.elasticjob.spi.executor.item.JobItemExecutor; import org.apache.shardingsphere.infra.spi.annotation.SingletonSPI; import org.apache.shardingsphere.infra.spi.type.typed.TypedSPI; diff --git a/api/src/main/java/org/apache/shardingsphere/elasticjob/spi/listener/param/ShardingContexts.java b/api/src/main/java/org/apache/shardingsphere/elasticjob/spi/listener/param/ShardingContexts.java index aa9604868b..e6877b9402 100644 --- a/api/src/main/java/org/apache/shardingsphere/elasticjob/spi/listener/param/ShardingContexts.java +++ b/api/src/main/java/org/apache/shardingsphere/elasticjob/spi/listener/param/ShardingContexts.java @@ -21,7 +21,7 @@ import lombok.RequiredArgsConstructor; import lombok.Setter; import lombok.ToString; -import org.apache.shardingsphere.elasticjob.spi.executor.param.ShardingContext; +import org.apache.shardingsphere.elasticjob.spi.executor.item.param.ShardingContext; import java.io.Serializable; import java.util.Map; diff --git a/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/tracing/event/JobEvent.java b/api/src/main/java/org/apache/shardingsphere/elasticjob/spi/tracing/event/JobEvent.java similarity index 93% rename from kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/tracing/event/JobEvent.java rename to api/src/main/java/org/apache/shardingsphere/elasticjob/spi/tracing/event/JobEvent.java index fd44f9d09b..db0b4e5a84 100644 --- a/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/tracing/event/JobEvent.java +++ b/api/src/main/java/org/apache/shardingsphere/elasticjob/spi/tracing/event/JobEvent.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.elasticjob.kernel.tracing.event; +package org.apache.shardingsphere.elasticjob.spi.tracing.event; /** * Job event. diff --git a/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/tracing/event/JobExecutionEvent.java b/api/src/main/java/org/apache/shardingsphere/elasticjob/spi/tracing/event/JobExecutionEvent.java similarity index 97% rename from kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/tracing/event/JobExecutionEvent.java rename to api/src/main/java/org/apache/shardingsphere/elasticjob/spi/tracing/event/JobExecutionEvent.java index ab5eb84c90..bd15c9ea45 100644 --- a/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/tracing/event/JobExecutionEvent.java +++ b/api/src/main/java/org/apache/shardingsphere/elasticjob/spi/tracing/event/JobExecutionEvent.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.elasticjob.kernel.tracing.event; +package org.apache.shardingsphere.elasticjob.spi.tracing.event; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/tracing/event/JobStatusTraceEvent.java b/api/src/main/java/org/apache/shardingsphere/elasticjob/spi/tracing/event/JobStatusTraceEvent.java similarity index 92% rename from kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/tracing/event/JobStatusTraceEvent.java rename to api/src/main/java/org/apache/shardingsphere/elasticjob/spi/tracing/event/JobStatusTraceEvent.java index 9233fe060b..4ea6fe8413 100644 --- a/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/tracing/event/JobStatusTraceEvent.java +++ b/api/src/main/java/org/apache/shardingsphere/elasticjob/spi/tracing/event/JobStatusTraceEvent.java @@ -15,13 +15,13 @@ * limitations under the License. */ -package org.apache.shardingsphere.elasticjob.kernel.tracing.event; +package org.apache.shardingsphere.elasticjob.spi.tracing.event; import lombok.AllArgsConstructor; import lombok.Getter; import lombok.RequiredArgsConstructor; import lombok.Setter; -import org.apache.shardingsphere.elasticjob.kernel.executor.ExecutionType; +import org.apache.shardingsphere.elasticjob.spi.executor.ExecutionType; import java.util.Date; import java.util.UUID; diff --git a/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/tracing/exception/TracingConfigurationException.java b/api/src/main/java/org/apache/shardingsphere/elasticjob/spi/tracing/exception/TracingConfigurationException.java similarity index 94% rename from kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/tracing/exception/TracingConfigurationException.java rename to api/src/main/java/org/apache/shardingsphere/elasticjob/spi/tracing/exception/TracingConfigurationException.java index 4643ef9b8c..7b31d1000a 100644 --- a/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/tracing/exception/TracingConfigurationException.java +++ b/api/src/main/java/org/apache/shardingsphere/elasticjob/spi/tracing/exception/TracingConfigurationException.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.elasticjob.kernel.tracing.exception; +package org.apache.shardingsphere.elasticjob.spi.tracing.exception; /** * Tracing configuration exception. diff --git a/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/tracing/listener/TracingListener.java b/api/src/main/java/org/apache/shardingsphere/elasticjob/spi/tracing/listener/TracingListener.java similarity index 85% rename from kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/tracing/listener/TracingListener.java rename to api/src/main/java/org/apache/shardingsphere/elasticjob/spi/tracing/listener/TracingListener.java index b95a8a15c0..4437562092 100644 --- a/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/tracing/listener/TracingListener.java +++ b/api/src/main/java/org/apache/shardingsphere/elasticjob/spi/tracing/listener/TracingListener.java @@ -15,12 +15,12 @@ * limitations under the License. */ -package org.apache.shardingsphere.elasticjob.kernel.tracing.listener; +package org.apache.shardingsphere.elasticjob.spi.tracing.listener; import com.google.common.eventbus.AllowConcurrentEvents; import com.google.common.eventbus.Subscribe; -import org.apache.shardingsphere.elasticjob.kernel.tracing.event.JobExecutionEvent; -import org.apache.shardingsphere.elasticjob.kernel.tracing.event.JobStatusTraceEvent; +import org.apache.shardingsphere.elasticjob.spi.tracing.event.JobExecutionEvent; +import org.apache.shardingsphere.elasticjob.spi.tracing.event.JobStatusTraceEvent; /** * Tracing listener. diff --git a/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/tracing/listener/TracingListenerFactory.java b/api/src/main/java/org/apache/shardingsphere/elasticjob/spi/tracing/listener/TracingListenerFactory.java similarity index 89% rename from kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/tracing/listener/TracingListenerFactory.java rename to api/src/main/java/org/apache/shardingsphere/elasticjob/spi/tracing/listener/TracingListenerFactory.java index 44485502ef..39179f7e08 100644 --- a/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/tracing/listener/TracingListenerFactory.java +++ b/api/src/main/java/org/apache/shardingsphere/elasticjob/spi/tracing/listener/TracingListenerFactory.java @@ -15,9 +15,9 @@ * limitations under the License. */ -package org.apache.shardingsphere.elasticjob.kernel.tracing.listener; +package org.apache.shardingsphere.elasticjob.spi.tracing.listener; -import org.apache.shardingsphere.elasticjob.kernel.tracing.exception.TracingConfigurationException; +import org.apache.shardingsphere.elasticjob.spi.tracing.exception.TracingConfigurationException; import org.apache.shardingsphere.infra.spi.annotation.SingletonSPI; import org.apache.shardingsphere.infra.spi.type.typed.TypedSPI; diff --git a/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/tracing/config/TracingStorageConfiguration.java b/api/src/main/java/org/apache/shardingsphere/elasticjob/spi/tracing/storage/TracingStorageConfiguration.java similarity index 93% rename from kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/tracing/config/TracingStorageConfiguration.java rename to api/src/main/java/org/apache/shardingsphere/elasticjob/spi/tracing/storage/TracingStorageConfiguration.java index 615b393b7b..e1c8602a96 100644 --- a/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/tracing/config/TracingStorageConfiguration.java +++ b/api/src/main/java/org/apache/shardingsphere/elasticjob/spi/tracing/storage/TracingStorageConfiguration.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.elasticjob.kernel.tracing.config; +package org.apache.shardingsphere.elasticjob.spi.tracing.storage; /** * Tracing storage configuration. diff --git a/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/tracing/storage/TracingStorageConverter.java b/api/src/main/java/org/apache/shardingsphere/elasticjob/spi/tracing/storage/TracingStorageConfigurationConverter.java similarity index 79% rename from kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/tracing/storage/TracingStorageConverter.java rename to api/src/main/java/org/apache/shardingsphere/elasticjob/spi/tracing/storage/TracingStorageConfigurationConverter.java index d55a2349ae..4752237eb1 100644 --- a/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/tracing/storage/TracingStorageConverter.java +++ b/api/src/main/java/org/apache/shardingsphere/elasticjob/spi/tracing/storage/TracingStorageConfigurationConverter.java @@ -15,18 +15,17 @@ * limitations under the License. */ -package org.apache.shardingsphere.elasticjob.kernel.tracing.storage; +package org.apache.shardingsphere.elasticjob.spi.tracing.storage; -import org.apache.shardingsphere.elasticjob.kernel.tracing.config.TracingStorageConfiguration; import org.apache.shardingsphere.infra.spi.annotation.SingletonSPI; /** - * Tracing storage converter. + * Tracing storage configuration converter. * * @param storage type */ @SingletonSPI -public interface TracingStorageConverter { +public interface TracingStorageConfigurationConverter { /** * Convert storage to {@link TracingStorageConfiguration}. @@ -34,7 +33,7 @@ public interface TracingStorageConverter { * @param storage storage instance * @return instance of {@link TracingStorageConfiguration} */ - TracingStorageConfiguration convertToConfiguration(T storage); + TracingStorageConfiguration toConfiguration(T storage); /** * Storage type. diff --git a/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/infra/yaml/config/YamlConfiguration.java b/api/src/main/java/org/apache/shardingsphere/elasticjob/spi/yaml/YamlConfiguration.java similarity index 93% rename from kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/infra/yaml/config/YamlConfiguration.java rename to api/src/main/java/org/apache/shardingsphere/elasticjob/spi/yaml/YamlConfiguration.java index 0dc414979d..2b55cd3067 100644 --- a/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/infra/yaml/config/YamlConfiguration.java +++ b/api/src/main/java/org/apache/shardingsphere/elasticjob/spi/yaml/YamlConfiguration.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.elasticjob.kernel.infra.yaml.config; +package org.apache.shardingsphere.elasticjob.spi.yaml; import java.io.Serializable; diff --git a/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/infra/yaml/config/YamlConfigurationConverter.java b/api/src/main/java/org/apache/shardingsphere/elasticjob/spi/yaml/YamlConfigurationConverter.java similarity index 95% rename from kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/infra/yaml/config/YamlConfigurationConverter.java rename to api/src/main/java/org/apache/shardingsphere/elasticjob/spi/yaml/YamlConfigurationConverter.java index 1e38b4028c..6ed998c8d2 100644 --- a/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/infra/yaml/config/YamlConfigurationConverter.java +++ b/api/src/main/java/org/apache/shardingsphere/elasticjob/spi/yaml/YamlConfigurationConverter.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.elasticjob.kernel.infra.yaml.config; +package org.apache.shardingsphere.elasticjob.spi.yaml; import org.apache.shardingsphere.infra.spi.annotation.SingletonSPI; import org.apache.shardingsphere.infra.spi.type.typed.TypedSPI; diff --git a/api/src/test/java/org/apache/shardingsphere/elasticjob/annotation/job/CustomJob.java b/api/src/test/java/org/apache/shardingsphere/elasticjob/annotation/job/CustomJob.java index cd2f29ebd3..56eb51b707 100644 --- a/api/src/test/java/org/apache/shardingsphere/elasticjob/annotation/job/CustomJob.java +++ b/api/src/test/java/org/apache/shardingsphere/elasticjob/annotation/job/CustomJob.java @@ -18,7 +18,7 @@ package org.apache.shardingsphere.elasticjob.annotation.job; import org.apache.shardingsphere.elasticjob.api.ElasticJob; -import org.apache.shardingsphere.elasticjob.spi.executor.param.ShardingContext; +import org.apache.shardingsphere.elasticjob.spi.executor.item.param.ShardingContext; public interface CustomJob extends ElasticJob { diff --git a/api/src/test/java/org/apache/shardingsphere/elasticjob/annotation/job/impl/SimpleTestJob.java b/api/src/test/java/org/apache/shardingsphere/elasticjob/annotation/job/impl/SimpleTestJob.java index 340a0fccd6..97119dbc41 100644 --- a/api/src/test/java/org/apache/shardingsphere/elasticjob/annotation/job/impl/SimpleTestJob.java +++ b/api/src/test/java/org/apache/shardingsphere/elasticjob/annotation/job/impl/SimpleTestJob.java @@ -21,7 +21,7 @@ import org.apache.shardingsphere.elasticjob.annotation.ElasticJobProp; import org.apache.shardingsphere.elasticjob.annotation.SimpleTracingConfigurationFactory; import org.apache.shardingsphere.elasticjob.annotation.job.CustomJob; -import org.apache.shardingsphere.elasticjob.spi.executor.param.ShardingContext; +import org.apache.shardingsphere.elasticjob.spi.executor.item.param.ShardingContext; @ElasticJobConfiguration( cron = "0/5 * * * * ?", diff --git a/api/src/test/java/org/apache/shardingsphere/elasticjob/spi/listener/param/ShardingContextsTest.java b/api/src/test/java/org/apache/shardingsphere/elasticjob/spi/listener/param/ShardingContextsTest.java index f4d32bb326..2051b1069c 100644 --- a/api/src/test/java/org/apache/shardingsphere/elasticjob/spi/listener/param/ShardingContextsTest.java +++ b/api/src/test/java/org/apache/shardingsphere/elasticjob/spi/listener/param/ShardingContextsTest.java @@ -17,7 +17,7 @@ package org.apache.shardingsphere.elasticjob.spi.listener.param; -import org.apache.shardingsphere.elasticjob.spi.executor.param.ShardingContext; +import org.apache.shardingsphere.elasticjob.spi.executor.item.param.ShardingContext; import org.junit.jupiter.api.Test; import java.util.HashMap; diff --git a/ecosystem/error-handler/dingtalk/src/main/java/org/apache/shardingsphere/elasticjob/error/handler/dingtalk/DingtalkJobErrorHandler.java b/ecosystem/error-handler/dingtalk/src/main/java/org/apache/shardingsphere/elasticjob/error/handler/dingtalk/DingtalkJobErrorHandler.java index ff78fcb59e..8103375337 100644 --- a/ecosystem/error-handler/dingtalk/src/main/java/org/apache/shardingsphere/elasticjob/error/handler/dingtalk/DingtalkJobErrorHandler.java +++ b/ecosystem/error-handler/dingtalk/src/main/java/org/apache/shardingsphere/elasticjob/error/handler/dingtalk/DingtalkJobErrorHandler.java @@ -30,7 +30,7 @@ import org.apache.http.impl.client.HttpClients; import org.apache.http.util.EntityUtils; import org.apache.shardingsphere.elasticjob.kernel.infra.json.GsonFactory; -import org.apache.shardingsphere.elasticjob.kernel.executor.error.handler.JobErrorHandler; +import org.apache.shardingsphere.elasticjob.spi.executor.error.handler.JobErrorHandler; import javax.crypto.Mac; import javax.crypto.spec.SecretKeySpec; diff --git a/ecosystem/error-handler/dingtalk/src/main/java/org/apache/shardingsphere/elasticjob/error/handler/dingtalk/DingtalkJobErrorHandlerPropertiesValidator.java b/ecosystem/error-handler/dingtalk/src/main/java/org/apache/shardingsphere/elasticjob/error/handler/dingtalk/DingtalkJobErrorHandlerPropertiesValidator.java index 5a11941011..b791cf460f 100644 --- a/ecosystem/error-handler/dingtalk/src/main/java/org/apache/shardingsphere/elasticjob/error/handler/dingtalk/DingtalkJobErrorHandlerPropertiesValidator.java +++ b/ecosystem/error-handler/dingtalk/src/main/java/org/apache/shardingsphere/elasticjob/error/handler/dingtalk/DingtalkJobErrorHandlerPropertiesValidator.java @@ -18,7 +18,7 @@ package org.apache.shardingsphere.elasticjob.error.handler.dingtalk; import org.apache.shardingsphere.elasticjob.kernel.infra.exception.PropertiesPreconditions; -import org.apache.shardingsphere.elasticjob.kernel.executor.error.handler.JobErrorHandlerPropertiesValidator; +import org.apache.shardingsphere.elasticjob.spi.executor.error.handler.JobErrorHandlerPropertiesValidator; import java.util.Properties; diff --git a/ecosystem/error-handler/dingtalk/src/main/resources/META-INF/services/org.apache.shardingsphere.elasticjob.kernel.executor.error.handler.JobErrorHandler b/ecosystem/error-handler/dingtalk/src/main/resources/META-INF/services/org.apache.shardingsphere.elasticjob.spi.executor.error.handler.JobErrorHandler similarity index 100% rename from ecosystem/error-handler/dingtalk/src/main/resources/META-INF/services/org.apache.shardingsphere.elasticjob.kernel.executor.error.handler.JobErrorHandler rename to ecosystem/error-handler/dingtalk/src/main/resources/META-INF/services/org.apache.shardingsphere.elasticjob.spi.executor.error.handler.JobErrorHandler diff --git a/ecosystem/error-handler/dingtalk/src/main/resources/META-INF/services/org.apache.shardingsphere.elasticjob.kernel.executor.error.handler.JobErrorHandlerPropertiesValidator b/ecosystem/error-handler/dingtalk/src/main/resources/META-INF/services/org.apache.shardingsphere.elasticjob.spi.executor.error.handler.JobErrorHandlerPropertiesValidator similarity index 100% rename from ecosystem/error-handler/dingtalk/src/main/resources/META-INF/services/org.apache.shardingsphere.elasticjob.kernel.executor.error.handler.JobErrorHandlerPropertiesValidator rename to ecosystem/error-handler/dingtalk/src/main/resources/META-INF/services/org.apache.shardingsphere.elasticjob.spi.executor.error.handler.JobErrorHandlerPropertiesValidator diff --git a/ecosystem/error-handler/dingtalk/src/test/java/org/apache/shardingsphere/elasticjob/error/handler/dingtalk/DingtalkJobErrorHandlerPropertiesValidatorTest.java b/ecosystem/error-handler/dingtalk/src/test/java/org/apache/shardingsphere/elasticjob/error/handler/dingtalk/DingtalkJobErrorHandlerPropertiesValidatorTest.java index 440bcf9aad..7bc3c4705d 100644 --- a/ecosystem/error-handler/dingtalk/src/test/java/org/apache/shardingsphere/elasticjob/error/handler/dingtalk/DingtalkJobErrorHandlerPropertiesValidatorTest.java +++ b/ecosystem/error-handler/dingtalk/src/test/java/org/apache/shardingsphere/elasticjob/error/handler/dingtalk/DingtalkJobErrorHandlerPropertiesValidatorTest.java @@ -17,7 +17,7 @@ package org.apache.shardingsphere.elasticjob.error.handler.dingtalk; -import org.apache.shardingsphere.elasticjob.kernel.executor.error.handler.JobErrorHandlerPropertiesValidator; +import org.apache.shardingsphere.elasticjob.spi.executor.error.handler.JobErrorHandlerPropertiesValidator; import org.apache.shardingsphere.infra.spi.type.typed.TypedSPILoader; import org.junit.jupiter.api.Test; diff --git a/ecosystem/error-handler/dingtalk/src/test/java/org/apache/shardingsphere/elasticjob/error/handler/dingtalk/DingtalkJobErrorHandlerTest.java b/ecosystem/error-handler/dingtalk/src/test/java/org/apache/shardingsphere/elasticjob/error/handler/dingtalk/DingtalkJobErrorHandlerTest.java index 49633dfd8d..60cd6dbd4e 100644 --- a/ecosystem/error-handler/dingtalk/src/test/java/org/apache/shardingsphere/elasticjob/error/handler/dingtalk/DingtalkJobErrorHandlerTest.java +++ b/ecosystem/error-handler/dingtalk/src/test/java/org/apache/shardingsphere/elasticjob/error/handler/dingtalk/DingtalkJobErrorHandlerTest.java @@ -21,7 +21,7 @@ import ch.qos.logback.classic.spi.LoggingEvent; import ch.qos.logback.core.read.ListAppender; import org.apache.shardingsphere.elasticjob.error.handler.dingtalk.fixture.DingtalkInternalController; -import org.apache.shardingsphere.elasticjob.kernel.executor.error.handler.JobErrorHandler; +import org.apache.shardingsphere.elasticjob.spi.executor.error.handler.JobErrorHandler; import org.apache.shardingsphere.elasticjob.restful.NettyRestfulService; import org.apache.shardingsphere.elasticjob.restful.NettyRestfulServiceConfiguration; import org.apache.shardingsphere.elasticjob.restful.RestfulService; diff --git a/ecosystem/error-handler/email/src/main/java/org/apache/shardingsphere/elasticjob/error/handler/email/EmailJobErrorHandler.java b/ecosystem/error-handler/email/src/main/java/org/apache/shardingsphere/elasticjob/error/handler/email/EmailJobErrorHandler.java index 05477099d7..d65f914da3 100644 --- a/ecosystem/error-handler/email/src/main/java/org/apache/shardingsphere/elasticjob/error/handler/email/EmailJobErrorHandler.java +++ b/ecosystem/error-handler/email/src/main/java/org/apache/shardingsphere/elasticjob/error/handler/email/EmailJobErrorHandler.java @@ -20,7 +20,7 @@ import com.google.common.base.Strings; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; -import org.apache.shardingsphere.elasticjob.kernel.executor.error.handler.JobErrorHandler; +import org.apache.shardingsphere.elasticjob.spi.executor.error.handler.JobErrorHandler; import javax.mail.Authenticator; import javax.mail.BodyPart; diff --git a/ecosystem/error-handler/email/src/main/java/org/apache/shardingsphere/elasticjob/error/handler/email/EmailJobErrorHandlerPropertiesValidator.java b/ecosystem/error-handler/email/src/main/java/org/apache/shardingsphere/elasticjob/error/handler/email/EmailJobErrorHandlerPropertiesValidator.java index 7ef1957d49..449df4a061 100644 --- a/ecosystem/error-handler/email/src/main/java/org/apache/shardingsphere/elasticjob/error/handler/email/EmailJobErrorHandlerPropertiesValidator.java +++ b/ecosystem/error-handler/email/src/main/java/org/apache/shardingsphere/elasticjob/error/handler/email/EmailJobErrorHandlerPropertiesValidator.java @@ -18,7 +18,7 @@ package org.apache.shardingsphere.elasticjob.error.handler.email; import org.apache.shardingsphere.elasticjob.kernel.infra.exception.PropertiesPreconditions; -import org.apache.shardingsphere.elasticjob.kernel.executor.error.handler.JobErrorHandlerPropertiesValidator; +import org.apache.shardingsphere.elasticjob.spi.executor.error.handler.JobErrorHandlerPropertiesValidator; import java.util.Properties; diff --git a/ecosystem/error-handler/email/src/main/resources/META-INF/services/org.apache.shardingsphere.elasticjob.kernel.executor.error.handler.JobErrorHandler b/ecosystem/error-handler/email/src/main/resources/META-INF/services/org.apache.shardingsphere.elasticjob.spi.executor.error.handler.JobErrorHandler similarity index 100% rename from ecosystem/error-handler/email/src/main/resources/META-INF/services/org.apache.shardingsphere.elasticjob.kernel.executor.error.handler.JobErrorHandler rename to ecosystem/error-handler/email/src/main/resources/META-INF/services/org.apache.shardingsphere.elasticjob.spi.executor.error.handler.JobErrorHandler diff --git a/ecosystem/error-handler/email/src/main/resources/META-INF/services/org.apache.shardingsphere.elasticjob.kernel.executor.error.handler.JobErrorHandlerPropertiesValidator b/ecosystem/error-handler/email/src/main/resources/META-INF/services/org.apache.shardingsphere.elasticjob.spi.executor.error.handler.JobErrorHandlerPropertiesValidator similarity index 100% rename from ecosystem/error-handler/email/src/main/resources/META-INF/services/org.apache.shardingsphere.elasticjob.kernel.executor.error.handler.JobErrorHandlerPropertiesValidator rename to ecosystem/error-handler/email/src/main/resources/META-INF/services/org.apache.shardingsphere.elasticjob.spi.executor.error.handler.JobErrorHandlerPropertiesValidator diff --git a/ecosystem/error-handler/email/src/test/java/org/apache/shardingsphere/elasticjob/error/handler/email/EmailJobErrorHandlerPropertiesValidatorTest.java b/ecosystem/error-handler/email/src/test/java/org/apache/shardingsphere/elasticjob/error/handler/email/EmailJobErrorHandlerPropertiesValidatorTest.java index b634d22e51..0d9af1d87e 100644 --- a/ecosystem/error-handler/email/src/test/java/org/apache/shardingsphere/elasticjob/error/handler/email/EmailJobErrorHandlerPropertiesValidatorTest.java +++ b/ecosystem/error-handler/email/src/test/java/org/apache/shardingsphere/elasticjob/error/handler/email/EmailJobErrorHandlerPropertiesValidatorTest.java @@ -17,7 +17,7 @@ package org.apache.shardingsphere.elasticjob.error.handler.email; -import org.apache.shardingsphere.elasticjob.kernel.executor.error.handler.JobErrorHandlerPropertiesValidator; +import org.apache.shardingsphere.elasticjob.spi.executor.error.handler.JobErrorHandlerPropertiesValidator; import org.apache.shardingsphere.infra.spi.type.typed.TypedSPILoader; import org.junit.jupiter.api.Test; diff --git a/ecosystem/error-handler/email/src/test/java/org/apache/shardingsphere/elasticjob/error/handler/email/EmailJobErrorHandlerTest.java b/ecosystem/error-handler/email/src/test/java/org/apache/shardingsphere/elasticjob/error/handler/email/EmailJobErrorHandlerTest.java index d1203870d6..97c8ed4dce 100644 --- a/ecosystem/error-handler/email/src/test/java/org/apache/shardingsphere/elasticjob/error/handler/email/EmailJobErrorHandlerTest.java +++ b/ecosystem/error-handler/email/src/test/java/org/apache/shardingsphere/elasticjob/error/handler/email/EmailJobErrorHandlerTest.java @@ -20,7 +20,7 @@ import ch.qos.logback.classic.Level; import ch.qos.logback.classic.spi.LoggingEvent; import ch.qos.logback.core.read.ListAppender; -import org.apache.shardingsphere.elasticjob.kernel.executor.error.handler.JobErrorHandler; +import org.apache.shardingsphere.elasticjob.spi.executor.error.handler.JobErrorHandler; import org.apache.shardingsphere.elasticjob.test.util.ReflectionUtils; import org.apache.shardingsphere.infra.spi.type.typed.TypedSPILoader; import org.junit.jupiter.api.BeforeAll; diff --git a/ecosystem/error-handler/normal/src/main/java/org/apache/shardingsphere/elasticjob/error/handler/normal/IgnoreJobErrorHandler.java b/ecosystem/error-handler/normal/src/main/java/org/apache/shardingsphere/elasticjob/error/handler/normal/IgnoreJobErrorHandler.java index ba09daa39c..bff139e161 100644 --- a/ecosystem/error-handler/normal/src/main/java/org/apache/shardingsphere/elasticjob/error/handler/normal/IgnoreJobErrorHandler.java +++ b/ecosystem/error-handler/normal/src/main/java/org/apache/shardingsphere/elasticjob/error/handler/normal/IgnoreJobErrorHandler.java @@ -17,7 +17,7 @@ package org.apache.shardingsphere.elasticjob.error.handler.normal; -import org.apache.shardingsphere.elasticjob.kernel.executor.error.handler.JobErrorHandler; +import org.apache.shardingsphere.elasticjob.spi.executor.error.handler.JobErrorHandler; /** * Job error handler for ignore exception. diff --git a/ecosystem/error-handler/normal/src/main/java/org/apache/shardingsphere/elasticjob/error/handler/normal/LogJobErrorHandler.java b/ecosystem/error-handler/normal/src/main/java/org/apache/shardingsphere/elasticjob/error/handler/normal/LogJobErrorHandler.java index ab09c3b3cf..506009c61a 100644 --- a/ecosystem/error-handler/normal/src/main/java/org/apache/shardingsphere/elasticjob/error/handler/normal/LogJobErrorHandler.java +++ b/ecosystem/error-handler/normal/src/main/java/org/apache/shardingsphere/elasticjob/error/handler/normal/LogJobErrorHandler.java @@ -18,7 +18,7 @@ package org.apache.shardingsphere.elasticjob.error.handler.normal; import lombok.extern.slf4j.Slf4j; -import org.apache.shardingsphere.elasticjob.kernel.executor.error.handler.JobErrorHandler; +import org.apache.shardingsphere.elasticjob.spi.executor.error.handler.JobErrorHandler; /** * Job error handler for log error message. diff --git a/ecosystem/error-handler/normal/src/main/java/org/apache/shardingsphere/elasticjob/error/handler/normal/ThrowJobErrorHandler.java b/ecosystem/error-handler/normal/src/main/java/org/apache/shardingsphere/elasticjob/error/handler/normal/ThrowJobErrorHandler.java index 01ec88a6c5..88da113910 100644 --- a/ecosystem/error-handler/normal/src/main/java/org/apache/shardingsphere/elasticjob/error/handler/normal/ThrowJobErrorHandler.java +++ b/ecosystem/error-handler/normal/src/main/java/org/apache/shardingsphere/elasticjob/error/handler/normal/ThrowJobErrorHandler.java @@ -18,7 +18,7 @@ package org.apache.shardingsphere.elasticjob.error.handler.normal; import org.apache.shardingsphere.elasticjob.kernel.infra.exception.JobSystemException; -import org.apache.shardingsphere.elasticjob.kernel.executor.error.handler.JobErrorHandler; +import org.apache.shardingsphere.elasticjob.spi.executor.error.handler.JobErrorHandler; /** * Job error handler for throw exception. diff --git a/ecosystem/error-handler/normal/src/main/resources/META-INF/services/org.apache.shardingsphere.elasticjob.kernel.executor.error.handler.JobErrorHandler b/ecosystem/error-handler/normal/src/main/resources/META-INF/services/org.apache.shardingsphere.elasticjob.spi.executor.error.handler.JobErrorHandler similarity index 100% rename from ecosystem/error-handler/normal/src/main/resources/META-INF/services/org.apache.shardingsphere.elasticjob.kernel.executor.error.handler.JobErrorHandler rename to ecosystem/error-handler/normal/src/main/resources/META-INF/services/org.apache.shardingsphere.elasticjob.spi.executor.error.handler.JobErrorHandler diff --git a/ecosystem/error-handler/normal/src/test/java/org/apache/shardingsphere/elasticjob/error/handler/normal/IgnoreJobErrorHandlerTest.java b/ecosystem/error-handler/normal/src/test/java/org/apache/shardingsphere/elasticjob/error/handler/normal/IgnoreJobErrorHandlerTest.java index b4753be052..cec199cd60 100644 --- a/ecosystem/error-handler/normal/src/test/java/org/apache/shardingsphere/elasticjob/error/handler/normal/IgnoreJobErrorHandlerTest.java +++ b/ecosystem/error-handler/normal/src/test/java/org/apache/shardingsphere/elasticjob/error/handler/normal/IgnoreJobErrorHandlerTest.java @@ -17,7 +17,7 @@ package org.apache.shardingsphere.elasticjob.error.handler.normal; -import org.apache.shardingsphere.elasticjob.kernel.executor.error.handler.JobErrorHandler; +import org.apache.shardingsphere.elasticjob.spi.executor.error.handler.JobErrorHandler; import org.apache.shardingsphere.infra.spi.type.typed.TypedSPILoader; import org.junit.jupiter.api.Test; diff --git a/ecosystem/error-handler/normal/src/test/java/org/apache/shardingsphere/elasticjob/error/handler/normal/LogJobErrorHandlerTest.java b/ecosystem/error-handler/normal/src/test/java/org/apache/shardingsphere/elasticjob/error/handler/normal/LogJobErrorHandlerTest.java index ff88b8c811..acdfb044b6 100644 --- a/ecosystem/error-handler/normal/src/test/java/org/apache/shardingsphere/elasticjob/error/handler/normal/LogJobErrorHandlerTest.java +++ b/ecosystem/error-handler/normal/src/test/java/org/apache/shardingsphere/elasticjob/error/handler/normal/LogJobErrorHandlerTest.java @@ -20,7 +20,7 @@ import ch.qos.logback.classic.Level; import ch.qos.logback.classic.spi.LoggingEvent; import ch.qos.logback.core.read.ListAppender; -import org.apache.shardingsphere.elasticjob.kernel.executor.error.handler.JobErrorHandler; +import org.apache.shardingsphere.elasticjob.spi.executor.error.handler.JobErrorHandler; import org.apache.shardingsphere.infra.spi.type.typed.TypedSPILoader; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.BeforeEach; diff --git a/ecosystem/error-handler/normal/src/test/java/org/apache/shardingsphere/elasticjob/error/handler/normal/ThrowJobErrorHandlerTest.java b/ecosystem/error-handler/normal/src/test/java/org/apache/shardingsphere/elasticjob/error/handler/normal/ThrowJobErrorHandlerTest.java index d8575671f3..7b82744729 100644 --- a/ecosystem/error-handler/normal/src/test/java/org/apache/shardingsphere/elasticjob/error/handler/normal/ThrowJobErrorHandlerTest.java +++ b/ecosystem/error-handler/normal/src/test/java/org/apache/shardingsphere/elasticjob/error/handler/normal/ThrowJobErrorHandlerTest.java @@ -18,7 +18,7 @@ package org.apache.shardingsphere.elasticjob.error.handler.normal; import org.apache.shardingsphere.elasticjob.kernel.infra.exception.JobSystemException; -import org.apache.shardingsphere.elasticjob.kernel.executor.error.handler.JobErrorHandler; +import org.apache.shardingsphere.elasticjob.spi.executor.error.handler.JobErrorHandler; import org.apache.shardingsphere.infra.spi.type.typed.TypedSPILoader; import org.junit.jupiter.api.Test; diff --git a/ecosystem/error-handler/wechat/src/main/java/org/apache/shardingsphere/elasticjob/error/handler/wechat/WechatJobErrorHandler.java b/ecosystem/error-handler/wechat/src/main/java/org/apache/shardingsphere/elasticjob/error/handler/wechat/WechatJobErrorHandler.java index 3c76acb95b..903867157b 100644 --- a/ecosystem/error-handler/wechat/src/main/java/org/apache/shardingsphere/elasticjob/error/handler/wechat/WechatJobErrorHandler.java +++ b/ecosystem/error-handler/wechat/src/main/java/org/apache/shardingsphere/elasticjob/error/handler/wechat/WechatJobErrorHandler.java @@ -29,7 +29,7 @@ import org.apache.http.impl.client.HttpClients; import org.apache.http.util.EntityUtils; import org.apache.shardingsphere.elasticjob.kernel.infra.json.GsonFactory; -import org.apache.shardingsphere.elasticjob.kernel.executor.error.handler.JobErrorHandler; +import org.apache.shardingsphere.elasticjob.spi.executor.error.handler.JobErrorHandler; import java.io.IOException; import java.io.PrintWriter; diff --git a/ecosystem/error-handler/wechat/src/main/java/org/apache/shardingsphere/elasticjob/error/handler/wechat/WechatJobErrorHandlerPropertiesValidator.java b/ecosystem/error-handler/wechat/src/main/java/org/apache/shardingsphere/elasticjob/error/handler/wechat/WechatJobErrorHandlerPropertiesValidator.java index 70845377b6..bd1e056eb8 100644 --- a/ecosystem/error-handler/wechat/src/main/java/org/apache/shardingsphere/elasticjob/error/handler/wechat/WechatJobErrorHandlerPropertiesValidator.java +++ b/ecosystem/error-handler/wechat/src/main/java/org/apache/shardingsphere/elasticjob/error/handler/wechat/WechatJobErrorHandlerPropertiesValidator.java @@ -18,7 +18,7 @@ package org.apache.shardingsphere.elasticjob.error.handler.wechat; import org.apache.shardingsphere.elasticjob.kernel.infra.exception.PropertiesPreconditions; -import org.apache.shardingsphere.elasticjob.kernel.executor.error.handler.JobErrorHandlerPropertiesValidator; +import org.apache.shardingsphere.elasticjob.spi.executor.error.handler.JobErrorHandlerPropertiesValidator; import java.util.Properties; diff --git a/ecosystem/error-handler/wechat/src/main/resources/META-INF/services/org.apache.shardingsphere.elasticjob.kernel.executor.error.handler.JobErrorHandler b/ecosystem/error-handler/wechat/src/main/resources/META-INF/services/org.apache.shardingsphere.elasticjob.spi.executor.error.handler.JobErrorHandler similarity index 100% rename from ecosystem/error-handler/wechat/src/main/resources/META-INF/services/org.apache.shardingsphere.elasticjob.kernel.executor.error.handler.JobErrorHandler rename to ecosystem/error-handler/wechat/src/main/resources/META-INF/services/org.apache.shardingsphere.elasticjob.spi.executor.error.handler.JobErrorHandler diff --git a/ecosystem/error-handler/wechat/src/main/resources/META-INF/services/org.apache.shardingsphere.elasticjob.kernel.executor.error.handler.JobErrorHandlerPropertiesValidator b/ecosystem/error-handler/wechat/src/main/resources/META-INF/services/org.apache.shardingsphere.elasticjob.spi.executor.error.handler.JobErrorHandlerPropertiesValidator similarity index 100% rename from ecosystem/error-handler/wechat/src/main/resources/META-INF/services/org.apache.shardingsphere.elasticjob.kernel.executor.error.handler.JobErrorHandlerPropertiesValidator rename to ecosystem/error-handler/wechat/src/main/resources/META-INF/services/org.apache.shardingsphere.elasticjob.spi.executor.error.handler.JobErrorHandlerPropertiesValidator diff --git a/ecosystem/error-handler/wechat/src/test/java/org/apache/shardingsphere/elasticjob/error/handler/wechat/WechatJobErrorHandlerPropertiesValidatorTest.java b/ecosystem/error-handler/wechat/src/test/java/org/apache/shardingsphere/elasticjob/error/handler/wechat/WechatJobErrorHandlerPropertiesValidatorTest.java index 286a09330e..108964c2a3 100644 --- a/ecosystem/error-handler/wechat/src/test/java/org/apache/shardingsphere/elasticjob/error/handler/wechat/WechatJobErrorHandlerPropertiesValidatorTest.java +++ b/ecosystem/error-handler/wechat/src/test/java/org/apache/shardingsphere/elasticjob/error/handler/wechat/WechatJobErrorHandlerPropertiesValidatorTest.java @@ -17,7 +17,7 @@ package org.apache.shardingsphere.elasticjob.error.handler.wechat; -import org.apache.shardingsphere.elasticjob.kernel.executor.error.handler.JobErrorHandlerPropertiesValidator; +import org.apache.shardingsphere.elasticjob.spi.executor.error.handler.JobErrorHandlerPropertiesValidator; import org.apache.shardingsphere.infra.spi.type.typed.TypedSPILoader; import org.junit.jupiter.api.Test; diff --git a/ecosystem/error-handler/wechat/src/test/java/org/apache/shardingsphere/elasticjob/error/handler/wechat/WechatJobErrorHandlerTest.java b/ecosystem/error-handler/wechat/src/test/java/org/apache/shardingsphere/elasticjob/error/handler/wechat/WechatJobErrorHandlerTest.java index 8ac0470e36..97041d52aa 100644 --- a/ecosystem/error-handler/wechat/src/test/java/org/apache/shardingsphere/elasticjob/error/handler/wechat/WechatJobErrorHandlerTest.java +++ b/ecosystem/error-handler/wechat/src/test/java/org/apache/shardingsphere/elasticjob/error/handler/wechat/WechatJobErrorHandlerTest.java @@ -21,7 +21,7 @@ import ch.qos.logback.classic.spi.LoggingEvent; import ch.qos.logback.core.read.ListAppender; import org.apache.shardingsphere.elasticjob.error.handler.wechat.fixture.WechatInternalController; -import org.apache.shardingsphere.elasticjob.kernel.executor.error.handler.JobErrorHandler; +import org.apache.shardingsphere.elasticjob.spi.executor.error.handler.JobErrorHandler; import org.apache.shardingsphere.elasticjob.restful.NettyRestfulService; import org.apache.shardingsphere.elasticjob.restful.NettyRestfulServiceConfiguration; import org.apache.shardingsphere.elasticjob.restful.RestfulService; diff --git a/ecosystem/executor/dataflow/src/main/java/org/apache/shardingsphere/elasticjob/dataflow/executor/DataflowJobExecutor.java b/ecosystem/executor/dataflow/src/main/java/org/apache/shardingsphere/elasticjob/dataflow/executor/DataflowJobExecutor.java index f3b1d3806e..2547527b3b 100644 --- a/ecosystem/executor/dataflow/src/main/java/org/apache/shardingsphere/elasticjob/dataflow/executor/DataflowJobExecutor.java +++ b/ecosystem/executor/dataflow/src/main/java/org/apache/shardingsphere/elasticjob/dataflow/executor/DataflowJobExecutor.java @@ -18,11 +18,11 @@ package org.apache.shardingsphere.elasticjob.dataflow.executor; import org.apache.shardingsphere.elasticjob.api.JobConfiguration; -import org.apache.shardingsphere.elasticjob.spi.executor.param.ShardingContext; +import org.apache.shardingsphere.elasticjob.spi.executor.item.param.ShardingContext; import org.apache.shardingsphere.elasticjob.dataflow.job.DataflowJob; import org.apache.shardingsphere.elasticjob.dataflow.props.DataflowJobProperties; -import org.apache.shardingsphere.elasticjob.spi.executor.param.JobRuntimeService; -import org.apache.shardingsphere.elasticjob.spi.executor.type.ClassedJobItemExecutor; +import org.apache.shardingsphere.elasticjob.spi.executor.item.param.JobRuntimeService; +import org.apache.shardingsphere.elasticjob.spi.executor.item.type.ClassedJobItemExecutor; import java.util.List; diff --git a/ecosystem/executor/dataflow/src/main/java/org/apache/shardingsphere/elasticjob/dataflow/job/DataflowJob.java b/ecosystem/executor/dataflow/src/main/java/org/apache/shardingsphere/elasticjob/dataflow/job/DataflowJob.java index a8009ead2f..38f330cac4 100644 --- a/ecosystem/executor/dataflow/src/main/java/org/apache/shardingsphere/elasticjob/dataflow/job/DataflowJob.java +++ b/ecosystem/executor/dataflow/src/main/java/org/apache/shardingsphere/elasticjob/dataflow/job/DataflowJob.java @@ -18,7 +18,7 @@ package org.apache.shardingsphere.elasticjob.dataflow.job; import org.apache.shardingsphere.elasticjob.api.ElasticJob; -import org.apache.shardingsphere.elasticjob.spi.executor.param.ShardingContext; +import org.apache.shardingsphere.elasticjob.spi.executor.item.param.ShardingContext; import java.util.List; diff --git a/ecosystem/executor/dataflow/src/main/resources/META-INF/services/org.apache.shardingsphere.elasticjob.spi.executor.type.ClassedJobItemExecutor b/ecosystem/executor/dataflow/src/main/resources/META-INF/services/org.apache.shardingsphere.elasticjob.spi.executor.item.type.ClassedJobItemExecutor similarity index 100% rename from ecosystem/executor/dataflow/src/main/resources/META-INF/services/org.apache.shardingsphere.elasticjob.spi.executor.type.ClassedJobItemExecutor rename to ecosystem/executor/dataflow/src/main/resources/META-INF/services/org.apache.shardingsphere.elasticjob.spi.executor.item.type.ClassedJobItemExecutor diff --git a/ecosystem/executor/dataflow/src/test/java/org/apache/shardingsphere/elasticjob/dataflow/executor/DataflowJobExecutorTest.java b/ecosystem/executor/dataflow/src/test/java/org/apache/shardingsphere/elasticjob/dataflow/executor/DataflowJobExecutorTest.java index 439efa5d91..a7603ed028 100644 --- a/ecosystem/executor/dataflow/src/test/java/org/apache/shardingsphere/elasticjob/dataflow/executor/DataflowJobExecutorTest.java +++ b/ecosystem/executor/dataflow/src/test/java/org/apache/shardingsphere/elasticjob/dataflow/executor/DataflowJobExecutorTest.java @@ -18,10 +18,10 @@ package org.apache.shardingsphere.elasticjob.dataflow.executor; import org.apache.shardingsphere.elasticjob.api.JobConfiguration; -import org.apache.shardingsphere.elasticjob.spi.executor.param.ShardingContext; +import org.apache.shardingsphere.elasticjob.spi.executor.item.param.ShardingContext; import org.apache.shardingsphere.elasticjob.dataflow.job.DataflowJob; import org.apache.shardingsphere.elasticjob.dataflow.props.DataflowJobProperties; -import org.apache.shardingsphere.elasticjob.spi.executor.param.JobRuntimeService; +import org.apache.shardingsphere.elasticjob.spi.executor.item.param.JobRuntimeService; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; diff --git a/ecosystem/executor/http/src/main/java/org/apache/shardingsphere/elasticjob/http/executor/HttpJobExecutor.java b/ecosystem/executor/http/src/main/java/org/apache/shardingsphere/elasticjob/http/executor/HttpJobExecutor.java index 19d633c40e..1ad5588d0a 100644 --- a/ecosystem/executor/http/src/main/java/org/apache/shardingsphere/elasticjob/http/executor/HttpJobExecutor.java +++ b/ecosystem/executor/http/src/main/java/org/apache/shardingsphere/elasticjob/http/executor/HttpJobExecutor.java @@ -25,9 +25,9 @@ import org.apache.shardingsphere.elasticjob.http.props.HttpJobProperties; import org.apache.shardingsphere.elasticjob.kernel.infra.exception.JobExecutionException; import org.apache.shardingsphere.elasticjob.kernel.infra.json.GsonFactory; -import org.apache.shardingsphere.elasticjob.spi.executor.param.JobRuntimeService; -import org.apache.shardingsphere.elasticjob.spi.executor.param.ShardingContext; -import org.apache.shardingsphere.elasticjob.spi.executor.type.TypedJobItemExecutor; +import org.apache.shardingsphere.elasticjob.spi.executor.item.param.JobRuntimeService; +import org.apache.shardingsphere.elasticjob.spi.executor.item.param.ShardingContext; +import org.apache.shardingsphere.elasticjob.spi.executor.item.type.TypedJobItemExecutor; import java.io.BufferedReader; import java.io.IOException; diff --git a/ecosystem/executor/http/src/main/resources/META-INF/services/org.apache.shardingsphere.elasticjob.spi.executor.type.TypedJobItemExecutor b/ecosystem/executor/http/src/main/resources/META-INF/services/org.apache.shardingsphere.elasticjob.spi.executor.item.type.TypedJobItemExecutor similarity index 100% rename from ecosystem/executor/http/src/main/resources/META-INF/services/org.apache.shardingsphere.elasticjob.spi.executor.type.TypedJobItemExecutor rename to ecosystem/executor/http/src/main/resources/META-INF/services/org.apache.shardingsphere.elasticjob.spi.executor.item.type.TypedJobItemExecutor diff --git a/ecosystem/executor/http/src/test/java/org/apache/shardingsphere/elasticjob/http/executor/HttpJobExecutorTest.java b/ecosystem/executor/http/src/test/java/org/apache/shardingsphere/elasticjob/http/executor/HttpJobExecutorTest.java index 20852386c1..ad25edb04a 100644 --- a/ecosystem/executor/http/src/test/java/org/apache/shardingsphere/elasticjob/http/executor/HttpJobExecutorTest.java +++ b/ecosystem/executor/http/src/test/java/org/apache/shardingsphere/elasticjob/http/executor/HttpJobExecutorTest.java @@ -25,8 +25,8 @@ import org.apache.shardingsphere.elasticjob.restful.NettyRestfulService; import org.apache.shardingsphere.elasticjob.restful.NettyRestfulServiceConfiguration; import org.apache.shardingsphere.elasticjob.restful.RestfulService; -import org.apache.shardingsphere.elasticjob.spi.executor.param.JobRuntimeService; -import org.apache.shardingsphere.elasticjob.spi.executor.param.ShardingContext; +import org.apache.shardingsphere.elasticjob.spi.executor.item.param.JobRuntimeService; +import org.apache.shardingsphere.elasticjob.spi.executor.item.param.ShardingContext; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.BeforeEach; diff --git a/ecosystem/executor/script/src/main/java/org/apache/shardingsphere/elasticjob/script/executor/ScriptJobExecutor.java b/ecosystem/executor/script/src/main/java/org/apache/shardingsphere/elasticjob/script/executor/ScriptJobExecutor.java index cd6177dde6..6fef6457ea 100644 --- a/ecosystem/executor/script/src/main/java/org/apache/shardingsphere/elasticjob/script/executor/ScriptJobExecutor.java +++ b/ecosystem/executor/script/src/main/java/org/apache/shardingsphere/elasticjob/script/executor/ScriptJobExecutor.java @@ -22,9 +22,9 @@ import org.apache.commons.exec.DefaultExecutor; import org.apache.shardingsphere.elasticjob.api.ElasticJob; import org.apache.shardingsphere.elasticjob.api.JobConfiguration; -import org.apache.shardingsphere.elasticjob.spi.executor.param.ShardingContext; -import org.apache.shardingsphere.elasticjob.spi.executor.param.JobRuntimeService; -import org.apache.shardingsphere.elasticjob.spi.executor.type.TypedJobItemExecutor; +import org.apache.shardingsphere.elasticjob.spi.executor.item.param.ShardingContext; +import org.apache.shardingsphere.elasticjob.spi.executor.item.param.JobRuntimeService; +import org.apache.shardingsphere.elasticjob.spi.executor.item.type.TypedJobItemExecutor; import org.apache.shardingsphere.elasticjob.kernel.infra.exception.JobConfigurationException; import org.apache.shardingsphere.elasticjob.kernel.infra.exception.JobSystemException; import org.apache.shardingsphere.elasticjob.kernel.infra.json.GsonFactory; diff --git a/ecosystem/executor/script/src/main/resources/META-INF/services/org.apache.shardingsphere.elasticjob.spi.executor.type.TypedJobItemExecutor b/ecosystem/executor/script/src/main/resources/META-INF/services/org.apache.shardingsphere.elasticjob.spi.executor.item.type.TypedJobItemExecutor similarity index 100% rename from ecosystem/executor/script/src/main/resources/META-INF/services/org.apache.shardingsphere.elasticjob.spi.executor.type.TypedJobItemExecutor rename to ecosystem/executor/script/src/main/resources/META-INF/services/org.apache.shardingsphere.elasticjob.spi.executor.item.type.TypedJobItemExecutor diff --git a/ecosystem/executor/script/src/test/java/org/apache/shardingsphere/elasticjob/script/ScriptJobExecutorTest.java b/ecosystem/executor/script/src/test/java/org/apache/shardingsphere/elasticjob/script/ScriptJobExecutorTest.java index febe4f5613..935b7fc050 100644 --- a/ecosystem/executor/script/src/test/java/org/apache/shardingsphere/elasticjob/script/ScriptJobExecutorTest.java +++ b/ecosystem/executor/script/src/test/java/org/apache/shardingsphere/elasticjob/script/ScriptJobExecutorTest.java @@ -20,8 +20,8 @@ import org.apache.commons.exec.OS; import org.apache.shardingsphere.elasticjob.api.ElasticJob; import org.apache.shardingsphere.elasticjob.api.JobConfiguration; -import org.apache.shardingsphere.elasticjob.spi.executor.param.ShardingContext; -import org.apache.shardingsphere.elasticjob.spi.executor.param.JobRuntimeService; +import org.apache.shardingsphere.elasticjob.spi.executor.item.param.ShardingContext; +import org.apache.shardingsphere.elasticjob.spi.executor.item.param.JobRuntimeService; import org.apache.shardingsphere.elasticjob.kernel.infra.exception.JobConfigurationException; import org.apache.shardingsphere.elasticjob.kernel.infra.exception.JobSystemException; import org.apache.shardingsphere.elasticjob.script.executor.ScriptJobExecutor; diff --git a/ecosystem/executor/simple/src/main/java/org/apache/shardingsphere/elasticjob/simple/executor/SimpleJobExecutor.java b/ecosystem/executor/simple/src/main/java/org/apache/shardingsphere/elasticjob/simple/executor/SimpleJobExecutor.java index 7ff8134aa9..fa51474481 100644 --- a/ecosystem/executor/simple/src/main/java/org/apache/shardingsphere/elasticjob/simple/executor/SimpleJobExecutor.java +++ b/ecosystem/executor/simple/src/main/java/org/apache/shardingsphere/elasticjob/simple/executor/SimpleJobExecutor.java @@ -18,9 +18,9 @@ package org.apache.shardingsphere.elasticjob.simple.executor; import org.apache.shardingsphere.elasticjob.api.JobConfiguration; -import org.apache.shardingsphere.elasticjob.spi.executor.param.ShardingContext; -import org.apache.shardingsphere.elasticjob.spi.executor.param.JobRuntimeService; -import org.apache.shardingsphere.elasticjob.spi.executor.type.ClassedJobItemExecutor; +import org.apache.shardingsphere.elasticjob.spi.executor.item.param.ShardingContext; +import org.apache.shardingsphere.elasticjob.spi.executor.item.param.JobRuntimeService; +import org.apache.shardingsphere.elasticjob.spi.executor.item.type.ClassedJobItemExecutor; import org.apache.shardingsphere.elasticjob.simple.job.SimpleJob; /** diff --git a/ecosystem/executor/simple/src/main/java/org/apache/shardingsphere/elasticjob/simple/job/SimpleJob.java b/ecosystem/executor/simple/src/main/java/org/apache/shardingsphere/elasticjob/simple/job/SimpleJob.java index de6005ca18..c32211310b 100644 --- a/ecosystem/executor/simple/src/main/java/org/apache/shardingsphere/elasticjob/simple/job/SimpleJob.java +++ b/ecosystem/executor/simple/src/main/java/org/apache/shardingsphere/elasticjob/simple/job/SimpleJob.java @@ -18,7 +18,7 @@ package org.apache.shardingsphere.elasticjob.simple.job; import org.apache.shardingsphere.elasticjob.api.ElasticJob; -import org.apache.shardingsphere.elasticjob.spi.executor.param.ShardingContext; +import org.apache.shardingsphere.elasticjob.spi.executor.item.param.ShardingContext; /** * Simple job. diff --git a/ecosystem/executor/simple/src/main/resources/META-INF/services/org.apache.shardingsphere.elasticjob.spi.executor.type.ClassedJobItemExecutor b/ecosystem/executor/simple/src/main/resources/META-INF/services/org.apache.shardingsphere.elasticjob.spi.executor.item.type.ClassedJobItemExecutor similarity index 100% rename from ecosystem/executor/simple/src/main/resources/META-INF/services/org.apache.shardingsphere.elasticjob.spi.executor.type.ClassedJobItemExecutor rename to ecosystem/executor/simple/src/main/resources/META-INF/services/org.apache.shardingsphere.elasticjob.spi.executor.item.type.ClassedJobItemExecutor diff --git a/ecosystem/executor/simple/src/test/java/org/apache/shardingsphere/elasticjob/simple/executor/SimpleJobExecutorTest.java b/ecosystem/executor/simple/src/test/java/org/apache/shardingsphere/elasticjob/simple/executor/SimpleJobExecutorTest.java index dba7f87ec0..969982e548 100644 --- a/ecosystem/executor/simple/src/test/java/org/apache/shardingsphere/elasticjob/simple/executor/SimpleJobExecutorTest.java +++ b/ecosystem/executor/simple/src/test/java/org/apache/shardingsphere/elasticjob/simple/executor/SimpleJobExecutorTest.java @@ -18,7 +18,7 @@ package org.apache.shardingsphere.elasticjob.simple.executor; import org.apache.shardingsphere.elasticjob.api.JobConfiguration; -import org.apache.shardingsphere.elasticjob.spi.executor.param.JobRuntimeService; +import org.apache.shardingsphere.elasticjob.spi.executor.item.param.JobRuntimeService; import org.apache.shardingsphere.elasticjob.simple.job.FooSimpleJob; import org.apache.shardingsphere.elasticjob.simple.job.SimpleJob; import org.junit.jupiter.api.BeforeEach; diff --git a/ecosystem/executor/simple/src/test/java/org/apache/shardingsphere/elasticjob/simple/job/FooSimpleJob.java b/ecosystem/executor/simple/src/test/java/org/apache/shardingsphere/elasticjob/simple/job/FooSimpleJob.java index e314e7dd14..b0910df78d 100644 --- a/ecosystem/executor/simple/src/test/java/org/apache/shardingsphere/elasticjob/simple/job/FooSimpleJob.java +++ b/ecosystem/executor/simple/src/test/java/org/apache/shardingsphere/elasticjob/simple/job/FooSimpleJob.java @@ -18,7 +18,7 @@ package org.apache.shardingsphere.elasticjob.simple.job; import lombok.Getter; -import org.apache.shardingsphere.elasticjob.spi.executor.param.ShardingContext; +import org.apache.shardingsphere.elasticjob.spi.executor.item.param.ShardingContext; @Getter public final class FooSimpleJob implements SimpleJob { diff --git a/ecosystem/tracing/rdb/src/main/java/org/apache/shardingsphere/elasticjob/tracing/rdb/config/RDBTracingStorageConfiguration.java b/ecosystem/tracing/rdb/src/main/java/org/apache/shardingsphere/elasticjob/tracing/rdb/config/RDBTracingStorageConfiguration.java index 7d80065e9d..be918f9c50 100644 --- a/ecosystem/tracing/rdb/src/main/java/org/apache/shardingsphere/elasticjob/tracing/rdb/config/RDBTracingStorageConfiguration.java +++ b/ecosystem/tracing/rdb/src/main/java/org/apache/shardingsphere/elasticjob/tracing/rdb/config/RDBTracingStorageConfiguration.java @@ -24,7 +24,7 @@ import lombok.Getter; import lombok.RequiredArgsConstructor; import lombok.SneakyThrows; -import org.apache.shardingsphere.elasticjob.kernel.tracing.config.TracingStorageConfiguration; +import org.apache.shardingsphere.elasticjob.spi.tracing.storage.TracingStorageConfiguration; import org.apache.shardingsphere.elasticjob.tracing.rdb.storage.datasource.DataSourceRegistry; import org.apache.shardingsphere.elasticjob.tracing.rdb.storage.datasource.JDBCParameterDecorator; import org.apache.shardingsphere.infra.spi.type.typed.TypedSPILoader; diff --git a/ecosystem/tracing/rdb/src/main/java/org/apache/shardingsphere/elasticjob/tracing/rdb/listener/RDBTracingListener.java b/ecosystem/tracing/rdb/src/main/java/org/apache/shardingsphere/elasticjob/tracing/rdb/listener/RDBTracingListener.java index 448905610d..cf764477f1 100644 --- a/ecosystem/tracing/rdb/src/main/java/org/apache/shardingsphere/elasticjob/tracing/rdb/listener/RDBTracingListener.java +++ b/ecosystem/tracing/rdb/src/main/java/org/apache/shardingsphere/elasticjob/tracing/rdb/listener/RDBTracingListener.java @@ -17,9 +17,9 @@ package org.apache.shardingsphere.elasticjob.tracing.rdb.listener; -import org.apache.shardingsphere.elasticjob.kernel.tracing.event.JobExecutionEvent; -import org.apache.shardingsphere.elasticjob.kernel.tracing.event.JobStatusTraceEvent; -import org.apache.shardingsphere.elasticjob.kernel.tracing.listener.TracingListener; +import org.apache.shardingsphere.elasticjob.spi.tracing.event.JobExecutionEvent; +import org.apache.shardingsphere.elasticjob.spi.tracing.event.JobStatusTraceEvent; +import org.apache.shardingsphere.elasticjob.spi.tracing.listener.TracingListener; import org.apache.shardingsphere.elasticjob.tracing.rdb.storage.repository.RDBJobEventRepository; import javax.sql.DataSource; diff --git a/ecosystem/tracing/rdb/src/main/java/org/apache/shardingsphere/elasticjob/tracing/rdb/listener/RDBTracingListenerFactory.java b/ecosystem/tracing/rdb/src/main/java/org/apache/shardingsphere/elasticjob/tracing/rdb/listener/RDBTracingListenerFactory.java index 41ab709416..a22d592521 100644 --- a/ecosystem/tracing/rdb/src/main/java/org/apache/shardingsphere/elasticjob/tracing/rdb/listener/RDBTracingListenerFactory.java +++ b/ecosystem/tracing/rdb/src/main/java/org/apache/shardingsphere/elasticjob/tracing/rdb/listener/RDBTracingListenerFactory.java @@ -17,9 +17,9 @@ package org.apache.shardingsphere.elasticjob.tracing.rdb.listener; -import org.apache.shardingsphere.elasticjob.kernel.tracing.exception.TracingConfigurationException; -import org.apache.shardingsphere.elasticjob.kernel.tracing.listener.TracingListener; -import org.apache.shardingsphere.elasticjob.kernel.tracing.listener.TracingListenerFactory; +import org.apache.shardingsphere.elasticjob.spi.tracing.exception.TracingConfigurationException; +import org.apache.shardingsphere.elasticjob.spi.tracing.listener.TracingListener; +import org.apache.shardingsphere.elasticjob.spi.tracing.listener.TracingListenerFactory; import javax.sql.DataSource; import java.sql.SQLException; diff --git a/ecosystem/tracing/rdb/src/main/java/org/apache/shardingsphere/elasticjob/tracing/rdb/storage/converter/RDBTracingStorageConverter.java b/ecosystem/tracing/rdb/src/main/java/org/apache/shardingsphere/elasticjob/tracing/rdb/storage/converter/RDBTracingStorageConfigurationConverter.java similarity index 83% rename from ecosystem/tracing/rdb/src/main/java/org/apache/shardingsphere/elasticjob/tracing/rdb/storage/converter/RDBTracingStorageConverter.java rename to ecosystem/tracing/rdb/src/main/java/org/apache/shardingsphere/elasticjob/tracing/rdb/storage/converter/RDBTracingStorageConfigurationConverter.java index 6cb81c55c1..90cc6af370 100644 --- a/ecosystem/tracing/rdb/src/main/java/org/apache/shardingsphere/elasticjob/tracing/rdb/storage/converter/RDBTracingStorageConverter.java +++ b/ecosystem/tracing/rdb/src/main/java/org/apache/shardingsphere/elasticjob/tracing/rdb/storage/converter/RDBTracingStorageConfigurationConverter.java @@ -18,9 +18,9 @@ package org.apache.shardingsphere.elasticjob.tracing.rdb.storage.converter; import lombok.extern.slf4j.Slf4j; -import org.apache.shardingsphere.elasticjob.kernel.tracing.config.TracingStorageConfiguration; +import org.apache.shardingsphere.elasticjob.spi.tracing.storage.TracingStorageConfiguration; import org.apache.shardingsphere.elasticjob.kernel.tracing.exception.TracingStorageUnavailableException; -import org.apache.shardingsphere.elasticjob.kernel.tracing.storage.TracingStorageConverter; +import org.apache.shardingsphere.elasticjob.spi.tracing.storage.TracingStorageConfigurationConverter; import org.apache.shardingsphere.elasticjob.tracing.rdb.config.RDBTracingStorageConfiguration; import org.apache.shardingsphere.elasticjob.tracing.rdb.storage.datasource.DataSourceRegistry; @@ -32,10 +32,10 @@ * RDB tracing storage converter. */ @Slf4j -public final class RDBTracingStorageConverter implements TracingStorageConverter { +public final class RDBTracingStorageConfigurationConverter implements TracingStorageConfigurationConverter { @Override - public TracingStorageConfiguration convertToConfiguration(final DataSource dataSource) { + public TracingStorageConfiguration toConfiguration(final DataSource dataSource) { try (Connection connection = dataSource.getConnection()) { log.trace("Try to get connection from {}", connection.getMetaData().getURL()); } catch (final SQLException ex) { diff --git a/ecosystem/tracing/rdb/src/main/java/org/apache/shardingsphere/elasticjob/tracing/rdb/storage/repository/RDBJobEventRepository.java b/ecosystem/tracing/rdb/src/main/java/org/apache/shardingsphere/elasticjob/tracing/rdb/storage/repository/RDBJobEventRepository.java index 0248e633b5..9bfbf6f274 100644 --- a/ecosystem/tracing/rdb/src/main/java/org/apache/shardingsphere/elasticjob/tracing/rdb/storage/repository/RDBJobEventRepository.java +++ b/ecosystem/tracing/rdb/src/main/java/org/apache/shardingsphere/elasticjob/tracing/rdb/storage/repository/RDBJobEventRepository.java @@ -19,9 +19,9 @@ import com.google.common.base.Strings; import lombok.extern.slf4j.Slf4j; -import org.apache.shardingsphere.elasticjob.kernel.tracing.event.JobExecutionEvent; -import org.apache.shardingsphere.elasticjob.kernel.tracing.event.JobStatusTraceEvent; -import org.apache.shardingsphere.elasticjob.kernel.tracing.event.JobStatusTraceEvent.State; +import org.apache.shardingsphere.elasticjob.spi.tracing.event.JobExecutionEvent; +import org.apache.shardingsphere.elasticjob.spi.tracing.event.JobStatusTraceEvent; +import org.apache.shardingsphere.elasticjob.spi.tracing.event.JobStatusTraceEvent.State; import org.apache.shardingsphere.elasticjob.kernel.tracing.exception.TracingStorageUnavailableException; import org.apache.shardingsphere.elasticjob.tracing.rdb.storage.sql.RDBStorageSQLMapper; import org.apache.shardingsphere.elasticjob.tracing.rdb.storage.sql.SQLPropertiesFactory; diff --git a/ecosystem/tracing/rdb/src/main/java/org/apache/shardingsphere/elasticjob/tracing/rdb/yaml/YamlDataSourceConfiguration.java b/ecosystem/tracing/rdb/src/main/java/org/apache/shardingsphere/elasticjob/tracing/rdb/yaml/YamlDataSourceConfiguration.java index 1c8a89471c..3cab8d6be9 100644 --- a/ecosystem/tracing/rdb/src/main/java/org/apache/shardingsphere/elasticjob/tracing/rdb/yaml/YamlDataSourceConfiguration.java +++ b/ecosystem/tracing/rdb/src/main/java/org/apache/shardingsphere/elasticjob/tracing/rdb/yaml/YamlDataSourceConfiguration.java @@ -19,7 +19,7 @@ import lombok.Getter; import lombok.Setter; -import org.apache.shardingsphere.elasticjob.kernel.tracing.config.TracingStorageConfiguration; +import org.apache.shardingsphere.elasticjob.spi.tracing.storage.TracingStorageConfiguration; import org.apache.shardingsphere.elasticjob.kernel.tracing.yaml.YamlTracingStorageConfiguration; import org.apache.shardingsphere.elasticjob.tracing.rdb.config.RDBTracingStorageConfiguration; diff --git a/ecosystem/tracing/rdb/src/main/java/org/apache/shardingsphere/elasticjob/tracing/rdb/yaml/YamlDataSourceConfigurationConverter.java b/ecosystem/tracing/rdb/src/main/java/org/apache/shardingsphere/elasticjob/tracing/rdb/yaml/YamlDataSourceConfigurationConverter.java index d995f363d6..70128c85fa 100644 --- a/ecosystem/tracing/rdb/src/main/java/org/apache/shardingsphere/elasticjob/tracing/rdb/yaml/YamlDataSourceConfigurationConverter.java +++ b/ecosystem/tracing/rdb/src/main/java/org/apache/shardingsphere/elasticjob/tracing/rdb/yaml/YamlDataSourceConfigurationConverter.java @@ -17,8 +17,8 @@ package org.apache.shardingsphere.elasticjob.tracing.rdb.yaml; -import org.apache.shardingsphere.elasticjob.kernel.infra.yaml.config.YamlConfigurationConverter; -import org.apache.shardingsphere.elasticjob.kernel.tracing.config.TracingStorageConfiguration; +import org.apache.shardingsphere.elasticjob.spi.yaml.YamlConfigurationConverter; +import org.apache.shardingsphere.elasticjob.spi.tracing.storage.TracingStorageConfiguration; import org.apache.shardingsphere.elasticjob.kernel.tracing.yaml.YamlTracingStorageConfiguration; import org.apache.shardingsphere.elasticjob.tracing.rdb.config.RDBTracingStorageConfiguration; diff --git a/ecosystem/tracing/rdb/src/main/resources/META-INF/services/org.apache.shardingsphere.elasticjob.kernel.tracing.listener.TracingListenerFactory b/ecosystem/tracing/rdb/src/main/resources/META-INF/services/org.apache.shardingsphere.elasticjob.spi.tracing.listener.TracingListenerFactory similarity index 100% rename from ecosystem/tracing/rdb/src/main/resources/META-INF/services/org.apache.shardingsphere.elasticjob.kernel.tracing.listener.TracingListenerFactory rename to ecosystem/tracing/rdb/src/main/resources/META-INF/services/org.apache.shardingsphere.elasticjob.spi.tracing.listener.TracingListenerFactory diff --git a/ecosystem/tracing/rdb/src/main/resources/META-INF/services/org.apache.shardingsphere.elasticjob.kernel.tracing.storage.TracingStorageConverter b/ecosystem/tracing/rdb/src/main/resources/META-INF/services/org.apache.shardingsphere.elasticjob.spi.tracing.storage.TracingStorageConfigurationConverter similarity index 95% rename from ecosystem/tracing/rdb/src/main/resources/META-INF/services/org.apache.shardingsphere.elasticjob.kernel.tracing.storage.TracingStorageConverter rename to ecosystem/tracing/rdb/src/main/resources/META-INF/services/org.apache.shardingsphere.elasticjob.spi.tracing.storage.TracingStorageConfigurationConverter index a4db540327..590d3becc0 100644 --- a/ecosystem/tracing/rdb/src/main/resources/META-INF/services/org.apache.shardingsphere.elasticjob.kernel.tracing.storage.TracingStorageConverter +++ b/ecosystem/tracing/rdb/src/main/resources/META-INF/services/org.apache.shardingsphere.elasticjob.spi.tracing.storage.TracingStorageConfigurationConverter @@ -15,4 +15,4 @@ # limitations under the License. # -org.apache.shardingsphere.elasticjob.tracing.rdb.storage.converter.RDBTracingStorageConverter +org.apache.shardingsphere.elasticjob.tracing.rdb.storage.converter.RDBTracingStorageConfigurationConverter diff --git a/ecosystem/tracing/rdb/src/main/resources/META-INF/services/org.apache.shardingsphere.elasticjob.kernel.infra.yaml.config.YamlConfigurationConverter b/ecosystem/tracing/rdb/src/main/resources/META-INF/services/org.apache.shardingsphere.elasticjob.spi.yaml.YamlConfigurationConverter similarity index 100% rename from ecosystem/tracing/rdb/src/main/resources/META-INF/services/org.apache.shardingsphere.elasticjob.kernel.infra.yaml.config.YamlConfigurationConverter rename to ecosystem/tracing/rdb/src/main/resources/META-INF/services/org.apache.shardingsphere.elasticjob.spi.yaml.YamlConfigurationConverter diff --git a/ecosystem/tracing/rdb/src/test/java/org/apache/shardingsphere/elasticjob/tracing/rdb/listener/RDBTracingListenerFactoryTest.java b/ecosystem/tracing/rdb/src/test/java/org/apache/shardingsphere/elasticjob/tracing/rdb/listener/RDBTracingListenerFactoryTest.java index 31384fb2ad..78a1469088 100644 --- a/ecosystem/tracing/rdb/src/test/java/org/apache/shardingsphere/elasticjob/tracing/rdb/listener/RDBTracingListenerFactoryTest.java +++ b/ecosystem/tracing/rdb/src/test/java/org/apache/shardingsphere/elasticjob/tracing/rdb/listener/RDBTracingListenerFactoryTest.java @@ -18,7 +18,7 @@ package org.apache.shardingsphere.elasticjob.tracing.rdb.listener; import org.apache.commons.dbcp2.BasicDataSource; -import org.apache.shardingsphere.elasticjob.kernel.tracing.exception.TracingConfigurationException; +import org.apache.shardingsphere.elasticjob.spi.tracing.exception.TracingConfigurationException; import org.junit.jupiter.api.Test; import javax.sql.DataSource; diff --git a/ecosystem/tracing/rdb/src/test/java/org/apache/shardingsphere/elasticjob/tracing/rdb/listener/RDBTracingListenerTest.java b/ecosystem/tracing/rdb/src/test/java/org/apache/shardingsphere/elasticjob/tracing/rdb/listener/RDBTracingListenerTest.java index d66b25566b..1f146704b7 100644 --- a/ecosystem/tracing/rdb/src/test/java/org/apache/shardingsphere/elasticjob/tracing/rdb/listener/RDBTracingListenerTest.java +++ b/ecosystem/tracing/rdb/src/test/java/org/apache/shardingsphere/elasticjob/tracing/rdb/listener/RDBTracingListenerTest.java @@ -18,12 +18,12 @@ package org.apache.shardingsphere.elasticjob.tracing.rdb.listener; import org.apache.commons.dbcp2.BasicDataSource; -import org.apache.shardingsphere.elasticjob.kernel.executor.ExecutionType; +import org.apache.shardingsphere.elasticjob.spi.executor.ExecutionType; import org.apache.shardingsphere.elasticjob.kernel.tracing.event.JobTracingEventBus; import org.apache.shardingsphere.elasticjob.kernel.tracing.config.TracingConfiguration; -import org.apache.shardingsphere.elasticjob.kernel.tracing.event.JobExecutionEvent; -import org.apache.shardingsphere.elasticjob.kernel.tracing.event.JobStatusTraceEvent; -import org.apache.shardingsphere.elasticjob.kernel.tracing.event.JobStatusTraceEvent.State; +import org.apache.shardingsphere.elasticjob.spi.tracing.event.JobExecutionEvent; +import org.apache.shardingsphere.elasticjob.spi.tracing.event.JobStatusTraceEvent; +import org.apache.shardingsphere.elasticjob.spi.tracing.event.JobStatusTraceEvent.State; import org.apache.shardingsphere.elasticjob.test.util.ReflectionUtils; import org.apache.shardingsphere.elasticjob.tracing.rdb.storage.repository.RDBJobEventRepository; import org.junit.jupiter.api.BeforeEach; diff --git a/ecosystem/tracing/rdb/src/test/java/org/apache/shardingsphere/elasticjob/tracing/rdb/storage/converter/RDBTracingStorageConverterTest.java b/ecosystem/tracing/rdb/src/test/java/org/apache/shardingsphere/elasticjob/tracing/rdb/storage/converter/RDBTracingStorageConfigurationConverterTest.java similarity index 79% rename from ecosystem/tracing/rdb/src/test/java/org/apache/shardingsphere/elasticjob/tracing/rdb/storage/converter/RDBTracingStorageConverterTest.java rename to ecosystem/tracing/rdb/src/test/java/org/apache/shardingsphere/elasticjob/tracing/rdb/storage/converter/RDBTracingStorageConfigurationConverterTest.java index 5311dcd5bb..77b4e608c3 100644 --- a/ecosystem/tracing/rdb/src/test/java/org/apache/shardingsphere/elasticjob/tracing/rdb/storage/converter/RDBTracingStorageConverterTest.java +++ b/ecosystem/tracing/rdb/src/test/java/org/apache/shardingsphere/elasticjob/tracing/rdb/storage/converter/RDBTracingStorageConfigurationConverterTest.java @@ -19,7 +19,7 @@ import com.zaxxer.hikari.HikariDataSource; import org.apache.shardingsphere.elasticjob.kernel.tracing.exception.TracingStorageUnavailableException; -import org.apache.shardingsphere.elasticjob.kernel.tracing.storage.TracingStorageConverter; +import org.apache.shardingsphere.elasticjob.spi.tracing.storage.TracingStorageConfigurationConverter; import org.apache.shardingsphere.elasticjob.kernel.tracing.storage.TracingStorageConverterFactory; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; @@ -39,7 +39,7 @@ import static org.mockito.Mockito.when; @ExtendWith(MockitoExtension.class) -class RDBTracingStorageConverterTest { +class RDBTracingStorageConfigurationConverterTest { @Mock private DataSource dataSource; @@ -55,22 +55,22 @@ void assertConvert() throws SQLException { when(dataSource.getConnection()).thenReturn(connection); when(connection.getMetaData()).thenReturn(databaseMetaData); when(databaseMetaData.getURL()).thenReturn("jdbc:url"); - RDBTracingStorageConverter converter = new RDBTracingStorageConverter(); - assertNotNull(converter.convertToConfiguration(dataSource)); + RDBTracingStorageConfigurationConverter converter = new RDBTracingStorageConfigurationConverter(); + assertNotNull(converter.toConfiguration(dataSource)); } @Test void assertConvertFailed() { assertThrows(TracingStorageUnavailableException.class, () -> { - RDBTracingStorageConverter converter = new RDBTracingStorageConverter(); + RDBTracingStorageConfigurationConverter converter = new RDBTracingStorageConfigurationConverter(); doThrow(SQLException.class).when(dataSource).getConnection(); - converter.convertToConfiguration(dataSource); + converter.toConfiguration(dataSource); }); } @Test void assertStorageType() { - TracingStorageConverter converter = TracingStorageConverterFactory.findConverter(HikariDataSource.class).orElse(null); + TracingStorageConfigurationConverter converter = TracingStorageConverterFactory.findConverter(HikariDataSource.class).orElse(null); assertNotNull(converter); assertThat(converter.storageType(), is(DataSource.class)); } diff --git a/ecosystem/tracing/rdb/src/test/java/org/apache/shardingsphere/elasticjob/tracing/rdb/storage/repository/RDBJobEventRepositoryTest.java b/ecosystem/tracing/rdb/src/test/java/org/apache/shardingsphere/elasticjob/tracing/rdb/storage/repository/RDBJobEventRepositoryTest.java index a2950c3dbf..9afa7b6f91 100644 --- a/ecosystem/tracing/rdb/src/test/java/org/apache/shardingsphere/elasticjob/tracing/rdb/storage/repository/RDBJobEventRepositoryTest.java +++ b/ecosystem/tracing/rdb/src/test/java/org/apache/shardingsphere/elasticjob/tracing/rdb/storage/repository/RDBJobEventRepositoryTest.java @@ -18,10 +18,10 @@ package org.apache.shardingsphere.elasticjob.tracing.rdb.storage.repository; import org.apache.commons.dbcp2.BasicDataSource; -import org.apache.shardingsphere.elasticjob.kernel.executor.ExecutionType; -import org.apache.shardingsphere.elasticjob.kernel.tracing.event.JobExecutionEvent; -import org.apache.shardingsphere.elasticjob.kernel.tracing.event.JobStatusTraceEvent; -import org.apache.shardingsphere.elasticjob.kernel.tracing.event.JobStatusTraceEvent.State; +import org.apache.shardingsphere.elasticjob.spi.executor.ExecutionType; +import org.apache.shardingsphere.elasticjob.spi.tracing.event.JobExecutionEvent; +import org.apache.shardingsphere.elasticjob.spi.tracing.event.JobStatusTraceEvent; +import org.apache.shardingsphere.elasticjob.spi.tracing.event.JobStatusTraceEvent.State; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/ecosystem/tracing/rdb/src/test/resources/logback-test.xml b/ecosystem/tracing/rdb/src/test/resources/logback-test.xml index 17a6dfd847..93c6fecd5d 100644 --- a/ecosystem/tracing/rdb/src/test/resources/logback-test.xml +++ b/ecosystem/tracing/rdb/src/test/resources/logback-test.xml @@ -38,5 +38,5 @@ - + diff --git a/examples/elasticjob-example-jobs/src/main/java/org/apache/shardingsphere/elasticjob/example/job/dataflow/JavaDataflowJob.java b/examples/elasticjob-example-jobs/src/main/java/org/apache/shardingsphere/elasticjob/example/job/dataflow/JavaDataflowJob.java index 08f20d1876..a2ff3209f7 100644 --- a/examples/elasticjob-example-jobs/src/main/java/org/apache/shardingsphere/elasticjob/example/job/dataflow/JavaDataflowJob.java +++ b/examples/elasticjob-example-jobs/src/main/java/org/apache/shardingsphere/elasticjob/example/job/dataflow/JavaDataflowJob.java @@ -17,7 +17,7 @@ package org.apache.shardingsphere.elasticjob.example.job.dataflow; -import org.apache.shardingsphere.elasticjob.spi.executor.param.ShardingContext; +import org.apache.shardingsphere.elasticjob.spi.executor.item.param.ShardingContext; import org.apache.shardingsphere.elasticjob.dataflow.job.DataflowJob; import org.apache.shardingsphere.elasticjob.example.fixture.entity.Foo; import org.apache.shardingsphere.elasticjob.example.fixture.repository.FooRepository; diff --git a/examples/elasticjob-example-jobs/src/main/java/org/apache/shardingsphere/elasticjob/example/job/dataflow/SpringDataflowJob.java b/examples/elasticjob-example-jobs/src/main/java/org/apache/shardingsphere/elasticjob/example/job/dataflow/SpringDataflowJob.java index e6c01aa5eb..9cc3e2c2cb 100644 --- a/examples/elasticjob-example-jobs/src/main/java/org/apache/shardingsphere/elasticjob/example/job/dataflow/SpringDataflowJob.java +++ b/examples/elasticjob-example-jobs/src/main/java/org/apache/shardingsphere/elasticjob/example/job/dataflow/SpringDataflowJob.java @@ -17,7 +17,7 @@ package org.apache.shardingsphere.elasticjob.example.job.dataflow; -import org.apache.shardingsphere.elasticjob.spi.executor.param.ShardingContext; +import org.apache.shardingsphere.elasticjob.spi.executor.item.param.ShardingContext; import org.apache.shardingsphere.elasticjob.dataflow.job.DataflowJob; import org.apache.shardingsphere.elasticjob.example.fixture.entity.Foo; import org.apache.shardingsphere.elasticjob.example.fixture.repository.FooRepository; diff --git a/examples/elasticjob-example-jobs/src/main/java/org/apache/shardingsphere/elasticjob/example/job/simple/JavaOccurErrorJob.java b/examples/elasticjob-example-jobs/src/main/java/org/apache/shardingsphere/elasticjob/example/job/simple/JavaOccurErrorJob.java index 3bc494e706..a9cf55ad07 100644 --- a/examples/elasticjob-example-jobs/src/main/java/org/apache/shardingsphere/elasticjob/example/job/simple/JavaOccurErrorJob.java +++ b/examples/elasticjob-example-jobs/src/main/java/org/apache/shardingsphere/elasticjob/example/job/simple/JavaOccurErrorJob.java @@ -17,7 +17,7 @@ package org.apache.shardingsphere.elasticjob.example.job.simple; -import org.apache.shardingsphere.elasticjob.spi.executor.param.ShardingContext; +import org.apache.shardingsphere.elasticjob.spi.executor.item.param.ShardingContext; import org.apache.shardingsphere.elasticjob.simple.job.SimpleJob; public final class JavaOccurErrorJob implements SimpleJob { diff --git a/examples/elasticjob-example-jobs/src/main/java/org/apache/shardingsphere/elasticjob/example/job/simple/JavaSimpleJob.java b/examples/elasticjob-example-jobs/src/main/java/org/apache/shardingsphere/elasticjob/example/job/simple/JavaSimpleJob.java index 5310c7d6e9..90d7690ea9 100644 --- a/examples/elasticjob-example-jobs/src/main/java/org/apache/shardingsphere/elasticjob/example/job/simple/JavaSimpleJob.java +++ b/examples/elasticjob-example-jobs/src/main/java/org/apache/shardingsphere/elasticjob/example/job/simple/JavaSimpleJob.java @@ -17,7 +17,7 @@ package org.apache.shardingsphere.elasticjob.example.job.simple; -import org.apache.shardingsphere.elasticjob.spi.executor.param.ShardingContext; +import org.apache.shardingsphere.elasticjob.spi.executor.item.param.ShardingContext; import org.apache.shardingsphere.elasticjob.simple.job.SimpleJob; import org.apache.shardingsphere.elasticjob.example.fixture.entity.Foo; import org.apache.shardingsphere.elasticjob.example.fixture.repository.FooRepository; diff --git a/examples/elasticjob-example-jobs/src/main/java/org/apache/shardingsphere/elasticjob/example/job/simple/SpringSimpleJob.java b/examples/elasticjob-example-jobs/src/main/java/org/apache/shardingsphere/elasticjob/example/job/simple/SpringSimpleJob.java index bf2ccaae80..3f2e4ee18d 100644 --- a/examples/elasticjob-example-jobs/src/main/java/org/apache/shardingsphere/elasticjob/example/job/simple/SpringSimpleJob.java +++ b/examples/elasticjob-example-jobs/src/main/java/org/apache/shardingsphere/elasticjob/example/job/simple/SpringSimpleJob.java @@ -17,7 +17,7 @@ package org.apache.shardingsphere.elasticjob.example.job.simple; -import org.apache.shardingsphere.elasticjob.spi.executor.param.ShardingContext; +import org.apache.shardingsphere.elasticjob.spi.executor.item.param.ShardingContext; import org.apache.shardingsphere.elasticjob.simple.job.SimpleJob; import org.apache.shardingsphere.elasticjob.example.fixture.entity.Foo; import org.apache.shardingsphere.elasticjob.example.fixture.repository.FooRepository; diff --git a/examples/elasticjob-example-springboot/src/main/java/org/apache/shardingsphere/elasticjob/example/job/SpringBootDataflowJob.java b/examples/elasticjob-example-springboot/src/main/java/org/apache/shardingsphere/elasticjob/example/job/SpringBootDataflowJob.java index c0eee45820..32baef85a4 100644 --- a/examples/elasticjob-example-springboot/src/main/java/org/apache/shardingsphere/elasticjob/example/job/SpringBootDataflowJob.java +++ b/examples/elasticjob-example-springboot/src/main/java/org/apache/shardingsphere/elasticjob/example/job/SpringBootDataflowJob.java @@ -17,7 +17,7 @@ package org.apache.shardingsphere.elasticjob.example.job; -import org.apache.shardingsphere.elasticjob.spi.executor.param.ShardingContext; +import org.apache.shardingsphere.elasticjob.spi.executor.item.param.ShardingContext; import org.apache.shardingsphere.elasticjob.dataflow.job.DataflowJob; import org.apache.shardingsphere.elasticjob.example.entity.Foo; import org.apache.shardingsphere.elasticjob.example.repository.FooRepository; diff --git a/examples/elasticjob-example-springboot/src/main/java/org/apache/shardingsphere/elasticjob/example/job/SpringBootOccurErrorNoticeDingtalkJob.java b/examples/elasticjob-example-springboot/src/main/java/org/apache/shardingsphere/elasticjob/example/job/SpringBootOccurErrorNoticeDingtalkJob.java index a261595d47..ad38263bff 100644 --- a/examples/elasticjob-example-springboot/src/main/java/org/apache/shardingsphere/elasticjob/example/job/SpringBootOccurErrorNoticeDingtalkJob.java +++ b/examples/elasticjob-example-springboot/src/main/java/org/apache/shardingsphere/elasticjob/example/job/SpringBootOccurErrorNoticeDingtalkJob.java @@ -17,7 +17,7 @@ package org.apache.shardingsphere.elasticjob.example.job; -import org.apache.shardingsphere.elasticjob.spi.executor.param.ShardingContext; +import org.apache.shardingsphere.elasticjob.spi.executor.item.param.ShardingContext; import org.apache.shardingsphere.elasticjob.simple.job.SimpleJob; import org.springframework.stereotype.Component; diff --git a/examples/elasticjob-example-springboot/src/main/java/org/apache/shardingsphere/elasticjob/example/job/SpringBootOccurErrorNoticeEmailJob.java b/examples/elasticjob-example-springboot/src/main/java/org/apache/shardingsphere/elasticjob/example/job/SpringBootOccurErrorNoticeEmailJob.java index f6b31f4455..42e3bf4154 100644 --- a/examples/elasticjob-example-springboot/src/main/java/org/apache/shardingsphere/elasticjob/example/job/SpringBootOccurErrorNoticeEmailJob.java +++ b/examples/elasticjob-example-springboot/src/main/java/org/apache/shardingsphere/elasticjob/example/job/SpringBootOccurErrorNoticeEmailJob.java @@ -17,7 +17,7 @@ package org.apache.shardingsphere.elasticjob.example.job; -import org.apache.shardingsphere.elasticjob.spi.executor.param.ShardingContext; +import org.apache.shardingsphere.elasticjob.spi.executor.item.param.ShardingContext; import org.apache.shardingsphere.elasticjob.simple.job.SimpleJob; import org.springframework.stereotype.Component; diff --git a/examples/elasticjob-example-springboot/src/main/java/org/apache/shardingsphere/elasticjob/example/job/SpringBootOccurErrorNoticeWechatJob.java b/examples/elasticjob-example-springboot/src/main/java/org/apache/shardingsphere/elasticjob/example/job/SpringBootOccurErrorNoticeWechatJob.java index f11efc9344..1e605122a7 100644 --- a/examples/elasticjob-example-springboot/src/main/java/org/apache/shardingsphere/elasticjob/example/job/SpringBootOccurErrorNoticeWechatJob.java +++ b/examples/elasticjob-example-springboot/src/main/java/org/apache/shardingsphere/elasticjob/example/job/SpringBootOccurErrorNoticeWechatJob.java @@ -17,7 +17,7 @@ package org.apache.shardingsphere.elasticjob.example.job; -import org.apache.shardingsphere.elasticjob.spi.executor.param.ShardingContext; +import org.apache.shardingsphere.elasticjob.spi.executor.item.param.ShardingContext; import org.apache.shardingsphere.elasticjob.simple.job.SimpleJob; import org.springframework.stereotype.Component; diff --git a/examples/elasticjob-example-springboot/src/main/java/org/apache/shardingsphere/elasticjob/example/job/SpringBootSimpleJob.java b/examples/elasticjob-example-springboot/src/main/java/org/apache/shardingsphere/elasticjob/example/job/SpringBootSimpleJob.java index 13e6a8bc5a..caf18bcfdc 100644 --- a/examples/elasticjob-example-springboot/src/main/java/org/apache/shardingsphere/elasticjob/example/job/SpringBootSimpleJob.java +++ b/examples/elasticjob-example-springboot/src/main/java/org/apache/shardingsphere/elasticjob/example/job/SpringBootSimpleJob.java @@ -17,7 +17,7 @@ package org.apache.shardingsphere.elasticjob.example.job; -import org.apache.shardingsphere.elasticjob.spi.executor.param.ShardingContext; +import org.apache.shardingsphere.elasticjob.spi.executor.item.param.ShardingContext; import org.apache.shardingsphere.elasticjob.example.entity.Foo; import org.apache.shardingsphere.elasticjob.example.repository.FooRepository; import org.apache.shardingsphere.elasticjob.simple.job.SimpleJob; diff --git a/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/executor/ElasticJobExecutor.java b/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/executor/ElasticJobExecutor.java index aa2dbc43f5..c6623896d6 100644 --- a/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/executor/ElasticJobExecutor.java +++ b/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/executor/ElasticJobExecutor.java @@ -20,20 +20,20 @@ import lombok.extern.slf4j.Slf4j; import org.apache.shardingsphere.elasticjob.api.ElasticJob; import org.apache.shardingsphere.elasticjob.api.JobConfiguration; -import org.apache.shardingsphere.elasticjob.kernel.executor.error.handler.JobErrorHandler; +import org.apache.shardingsphere.elasticjob.spi.executor.error.handler.JobErrorHandler; import org.apache.shardingsphere.elasticjob.kernel.executor.error.handler.JobErrorHandlerReloader; import org.apache.shardingsphere.elasticjob.kernel.executor.facade.JobFacade; -import org.apache.shardingsphere.elasticjob.spi.executor.JobItemExecutor; +import org.apache.shardingsphere.elasticjob.spi.executor.item.JobItemExecutor; import org.apache.shardingsphere.elasticjob.kernel.executor.item.JobItemExecutorFactory; -import org.apache.shardingsphere.elasticjob.spi.executor.type.TypedJobItemExecutor; +import org.apache.shardingsphere.elasticjob.spi.executor.item.type.TypedJobItemExecutor; import org.apache.shardingsphere.elasticjob.kernel.executor.threadpool.ExecutorServiceReloader; import org.apache.shardingsphere.elasticjob.kernel.infra.env.IpUtils; import org.apache.shardingsphere.elasticjob.kernel.infra.exception.ExceptionUtils; import org.apache.shardingsphere.elasticjob.kernel.infra.exception.JobExecutionEnvironmentException; import org.apache.shardingsphere.elasticjob.spi.listener.param.ShardingContexts; -import org.apache.shardingsphere.elasticjob.kernel.tracing.event.JobExecutionEvent; -import org.apache.shardingsphere.elasticjob.kernel.tracing.event.JobExecutionEvent.ExecutionSource; -import org.apache.shardingsphere.elasticjob.kernel.tracing.event.JobStatusTraceEvent.State; +import org.apache.shardingsphere.elasticjob.spi.tracing.event.JobExecutionEvent; +import org.apache.shardingsphere.elasticjob.spi.tracing.event.JobExecutionEvent.ExecutionSource; +import org.apache.shardingsphere.elasticjob.spi.tracing.event.JobStatusTraceEvent.State; import org.apache.shardingsphere.infra.spi.type.typed.TypedSPILoader; import java.util.Collection; @@ -52,6 +52,7 @@ public final class ElasticJobExecutor { private final JobFacade jobFacade; + @SuppressWarnings("rawtypes") private final JobItemExecutor jobItemExecutor; private final ExecutorServiceReloader executorServiceReloader; diff --git a/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/executor/error/handler/JobErrorHandlerReloader.java b/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/executor/error/handler/JobErrorHandlerReloader.java index dd925cd316..ec9e546a0a 100644 --- a/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/executor/error/handler/JobErrorHandlerReloader.java +++ b/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/executor/error/handler/JobErrorHandlerReloader.java @@ -19,6 +19,7 @@ import lombok.Getter; import org.apache.shardingsphere.elasticjob.api.JobConfiguration; +import org.apache.shardingsphere.elasticjob.spi.executor.error.handler.JobErrorHandler; import org.apache.shardingsphere.infra.spi.type.typed.TypedSPILoader; import java.io.Closeable; diff --git a/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/executor/facade/JobFacade.java b/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/executor/facade/JobFacade.java index 98f93e8b09..7c6eaf040d 100644 --- a/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/executor/facade/JobFacade.java +++ b/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/executor/facade/JobFacade.java @@ -30,12 +30,12 @@ import org.apache.shardingsphere.elasticjob.kernel.internal.sharding.ExecutionService; import org.apache.shardingsphere.elasticjob.kernel.internal.sharding.ShardingService; import org.apache.shardingsphere.elasticjob.reg.base.CoordinatorRegistryCenter; -import org.apache.shardingsphere.elasticjob.spi.executor.param.JobRuntimeService; +import org.apache.shardingsphere.elasticjob.spi.executor.item.param.JobRuntimeService; import org.apache.shardingsphere.elasticjob.kernel.tracing.event.JobTracingEventBus; import org.apache.shardingsphere.elasticjob.kernel.tracing.config.TracingConfiguration; -import org.apache.shardingsphere.elasticjob.kernel.tracing.event.JobExecutionEvent; -import org.apache.shardingsphere.elasticjob.kernel.tracing.event.JobStatusTraceEvent; -import org.apache.shardingsphere.elasticjob.kernel.tracing.event.JobStatusTraceEvent.State; +import org.apache.shardingsphere.elasticjob.spi.tracing.event.JobExecutionEvent; +import org.apache.shardingsphere.elasticjob.spi.tracing.event.JobStatusTraceEvent; +import org.apache.shardingsphere.elasticjob.spi.tracing.event.JobStatusTraceEvent.State; import java.util.Collection; import java.util.Comparator; diff --git a/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/executor/facade/JobJobRuntimeServiceImpl.java b/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/executor/facade/JobJobRuntimeServiceImpl.java index 881c904f13..952ac3bff4 100644 --- a/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/executor/facade/JobJobRuntimeServiceImpl.java +++ b/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/executor/facade/JobJobRuntimeServiceImpl.java @@ -18,7 +18,7 @@ package org.apache.shardingsphere.elasticjob.kernel.executor.facade; import lombok.RequiredArgsConstructor; -import org.apache.shardingsphere.elasticjob.spi.executor.param.JobRuntimeService; +import org.apache.shardingsphere.elasticjob.spi.executor.item.param.JobRuntimeService; /** * Job runtime service implementation. diff --git a/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/executor/item/JobItemExecutorFactory.java b/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/executor/item/JobItemExecutorFactory.java index b5db62cd3e..f28def299d 100644 --- a/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/executor/item/JobItemExecutorFactory.java +++ b/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/executor/item/JobItemExecutorFactory.java @@ -20,8 +20,8 @@ import lombok.AccessLevel; import lombok.NoArgsConstructor; import org.apache.shardingsphere.elasticjob.api.ElasticJob; -import org.apache.shardingsphere.elasticjob.spi.executor.JobItemExecutor; -import org.apache.shardingsphere.elasticjob.spi.executor.type.ClassedJobItemExecutor; +import org.apache.shardingsphere.elasticjob.spi.executor.item.JobItemExecutor; +import org.apache.shardingsphere.elasticjob.spi.executor.item.type.ClassedJobItemExecutor; import org.apache.shardingsphere.elasticjob.kernel.infra.exception.JobConfigurationException; import org.apache.shardingsphere.infra.spi.ShardingSphereServiceLoader; diff --git a/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/config/JobConfigurationPOJO.java b/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/config/JobConfigurationPOJO.java index 1d9a912412..9d5ca39c99 100644 --- a/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/config/JobConfigurationPOJO.java +++ b/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/config/JobConfigurationPOJO.java @@ -21,8 +21,8 @@ import lombok.Setter; import org.apache.shardingsphere.elasticjob.api.JobConfiguration; import org.apache.shardingsphere.elasticjob.api.JobExtraConfiguration; -import org.apache.shardingsphere.elasticjob.kernel.infra.yaml.config.YamlConfiguration; -import org.apache.shardingsphere.elasticjob.kernel.infra.yaml.config.YamlConfigurationConverter; +import org.apache.shardingsphere.elasticjob.spi.yaml.YamlConfiguration; +import org.apache.shardingsphere.elasticjob.spi.yaml.YamlConfigurationConverter; import org.apache.shardingsphere.infra.spi.type.typed.TypedSPILoader; import java.util.ArrayList; diff --git a/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/context/TaskContext.java b/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/context/TaskContext.java index 391bcaccfd..a827dccf35 100755 --- a/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/context/TaskContext.java +++ b/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/context/TaskContext.java @@ -24,7 +24,7 @@ import lombok.RequiredArgsConstructor; import lombok.Setter; import lombok.ToString; -import org.apache.shardingsphere.elasticjob.kernel.executor.ExecutionType; +import org.apache.shardingsphere.elasticjob.spi.executor.ExecutionType; import java.util.Collections; import java.util.List; 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 e49e63bf26..0311b6fc6f 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 @@ -22,7 +22,7 @@ import lombok.Getter; import org.apache.shardingsphere.elasticjob.api.ElasticJob; import org.apache.shardingsphere.elasticjob.api.JobConfiguration; -import org.apache.shardingsphere.elasticjob.kernel.executor.error.handler.JobErrorHandlerPropertiesValidator; +import org.apache.shardingsphere.elasticjob.spi.executor.error.handler.JobErrorHandlerPropertiesValidator; import org.apache.shardingsphere.elasticjob.kernel.executor.ElasticJobExecutor; import org.apache.shardingsphere.elasticjob.kernel.infra.exception.JobSystemException; import org.apache.shardingsphere.elasticjob.kernel.executor.facade.JobFacade; diff --git a/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/tracing/config/TracingConfiguration.java b/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/tracing/config/TracingConfiguration.java index c700c470d8..6f993db14d 100644 --- a/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/tracing/config/TracingConfiguration.java +++ b/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/tracing/config/TracingConfiguration.java @@ -21,6 +21,7 @@ import lombok.RequiredArgsConstructor; import org.apache.shardingsphere.elasticjob.api.JobExtraConfiguration; import org.apache.shardingsphere.elasticjob.kernel.tracing.storage.TracingStorageConverterFactory; +import org.apache.shardingsphere.elasticjob.spi.tracing.storage.TracingStorageConfiguration; import org.apache.shardingsphere.infra.spi.exception.ServiceProviderNotFoundException; /** @@ -40,6 +41,6 @@ public final class TracingConfiguration implements JobExtraConfiguration { public TracingConfiguration(final String type, final T storage) { this.type = type; tracingStorageConfiguration = TracingStorageConverterFactory.findConverter((Class) storage.getClass()) - .orElseThrow(() -> new ServiceProviderNotFoundException(storage.getClass(), storage.getClass().getSimpleName())).convertToConfiguration(storage); + .orElseThrow(() -> new ServiceProviderNotFoundException(storage.getClass(), storage.getClass().getSimpleName())).toConfiguration(storage); } } diff --git a/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/tracing/event/JobTracingEventBus.java b/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/tracing/event/JobTracingEventBus.java index 6dbd317899..86128eaf90 100644 --- a/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/tracing/event/JobTracingEventBus.java +++ b/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/tracing/event/JobTracingEventBus.java @@ -23,8 +23,9 @@ import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.concurrent.BasicThreadFactory; import org.apache.shardingsphere.elasticjob.kernel.tracing.config.TracingConfiguration; -import org.apache.shardingsphere.elasticjob.kernel.tracing.exception.TracingConfigurationException; -import org.apache.shardingsphere.elasticjob.kernel.tracing.listener.TracingListenerFactory; +import org.apache.shardingsphere.elasticjob.spi.tracing.exception.TracingConfigurationException; +import org.apache.shardingsphere.elasticjob.spi.tracing.listener.TracingListenerFactory; +import org.apache.shardingsphere.elasticjob.spi.tracing.event.JobEvent; import org.apache.shardingsphere.infra.spi.type.typed.TypedSPILoader; import java.util.concurrent.ExecutorService; diff --git a/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/tracing/storage/TracingStorageConverterFactory.java b/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/tracing/storage/TracingStorageConverterFactory.java index 674a4e6d2e..0fc466e150 100644 --- a/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/tracing/storage/TracingStorageConverterFactory.java +++ b/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/tracing/storage/TracingStorageConverterFactory.java @@ -19,26 +19,27 @@ import lombok.AccessLevel; import lombok.NoArgsConstructor; +import org.apache.shardingsphere.elasticjob.spi.tracing.storage.TracingStorageConfigurationConverter; import org.apache.shardingsphere.infra.spi.ShardingSphereServiceLoader; import java.util.Optional; /** - * Factory for {@link TracingStorageConverter}. + * Factory for {@link TracingStorageConfigurationConverter}. */ @NoArgsConstructor(access = AccessLevel.PRIVATE) public final class TracingStorageConverterFactory { /** - * Find {@link TracingStorageConverter} for specific storage type. + * Find {@link TracingStorageConfigurationConverter} for specific storage type. * * @param storageType storage type * @param storage type - * @return instance of {@link TracingStorageConverter} + * @return instance of {@link TracingStorageConfigurationConverter} */ @SuppressWarnings("unchecked") - public static Optional> findConverter(final Class storageType) { - return ShardingSphereServiceLoader.getServiceInstances(TracingStorageConverter.class).stream() - .filter(each -> each.storageType().isAssignableFrom(storageType)).map(each -> (TracingStorageConverter) each).findFirst(); + public static Optional> findConverter(final Class storageType) { + return ShardingSphereServiceLoader.getServiceInstances(TracingStorageConfigurationConverter.class).stream() + .filter(each -> each.storageType().isAssignableFrom(storageType)).map(each -> (TracingStorageConfigurationConverter) each).findFirst(); } } diff --git a/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/tracing/yaml/YamlTracingConfiguration.java b/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/tracing/yaml/YamlTracingConfiguration.java index bd1985b4b2..1990d004d6 100644 --- a/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/tracing/yaml/YamlTracingConfiguration.java +++ b/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/tracing/yaml/YamlTracingConfiguration.java @@ -19,7 +19,7 @@ import lombok.Getter; import lombok.Setter; -import org.apache.shardingsphere.elasticjob.kernel.infra.yaml.config.YamlConfiguration; +import org.apache.shardingsphere.elasticjob.spi.yaml.YamlConfiguration; import org.apache.shardingsphere.elasticjob.kernel.tracing.config.TracingConfiguration; /** diff --git a/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/tracing/yaml/YamlTracingConfigurationConverter.java b/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/tracing/yaml/YamlTracingConfigurationConverter.java index 989f99eec7..e91fdb87a2 100644 --- a/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/tracing/yaml/YamlTracingConfigurationConverter.java +++ b/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/tracing/yaml/YamlTracingConfigurationConverter.java @@ -17,9 +17,9 @@ package org.apache.shardingsphere.elasticjob.kernel.tracing.yaml; -import org.apache.shardingsphere.elasticjob.kernel.infra.yaml.config.YamlConfigurationConverter; +import org.apache.shardingsphere.elasticjob.spi.yaml.YamlConfigurationConverter; import org.apache.shardingsphere.elasticjob.kernel.tracing.config.TracingConfiguration; -import org.apache.shardingsphere.elasticjob.kernel.tracing.config.TracingStorageConfiguration; +import org.apache.shardingsphere.elasticjob.spi.tracing.storage.TracingStorageConfiguration; import org.apache.shardingsphere.infra.spi.type.typed.TypedSPILoader; /** diff --git a/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/tracing/yaml/YamlTracingStorageConfiguration.java b/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/tracing/yaml/YamlTracingStorageConfiguration.java index c3201e6d57..ceeb33a58f 100644 --- a/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/tracing/yaml/YamlTracingStorageConfiguration.java +++ b/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/tracing/yaml/YamlTracingStorageConfiguration.java @@ -17,8 +17,8 @@ package org.apache.shardingsphere.elasticjob.kernel.tracing.yaml; -import org.apache.shardingsphere.elasticjob.kernel.infra.yaml.config.YamlConfiguration; -import org.apache.shardingsphere.elasticjob.kernel.tracing.config.TracingStorageConfiguration; +import org.apache.shardingsphere.elasticjob.spi.yaml.YamlConfiguration; +import org.apache.shardingsphere.elasticjob.spi.tracing.storage.TracingStorageConfiguration; /** * YAML configuration for {@link TracingStorageConfiguration}. diff --git a/kernel/src/main/resources/META-INF/services/org.apache.shardingsphere.elasticjob.kernel.infra.yaml.config.YamlConfigurationConverter b/kernel/src/main/resources/META-INF/services/org.apache.shardingsphere.elasticjob.spi.yaml.YamlConfigurationConverter similarity index 100% rename from kernel/src/main/resources/META-INF/services/org.apache.shardingsphere.elasticjob.kernel.infra.yaml.config.YamlConfigurationConverter rename to kernel/src/main/resources/META-INF/services/org.apache.shardingsphere.elasticjob.spi.yaml.YamlConfigurationConverter diff --git a/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/executor/ElasticJobExecutorTest.java b/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/executor/ElasticJobExecutorTest.java index 5f44299d2e..220ae2df9c 100644 --- a/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/executor/ElasticJobExecutorTest.java +++ b/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/executor/ElasticJobExecutorTest.java @@ -23,8 +23,8 @@ import org.apache.shardingsphere.elasticjob.kernel.fixture.job.FooJob; import org.apache.shardingsphere.elasticjob.kernel.infra.exception.JobExecutionEnvironmentException; import org.apache.shardingsphere.elasticjob.kernel.infra.exception.JobSystemException; -import org.apache.shardingsphere.elasticjob.kernel.tracing.event.JobStatusTraceEvent.State; -import org.apache.shardingsphere.elasticjob.spi.executor.param.JobRuntimeService; +import org.apache.shardingsphere.elasticjob.spi.tracing.event.JobStatusTraceEvent.State; +import org.apache.shardingsphere.elasticjob.spi.executor.item.param.JobRuntimeService; import org.apache.shardingsphere.elasticjob.spi.listener.param.ShardingContexts; import org.apache.shardingsphere.elasticjob.test.util.ReflectionUtils; import org.junit.jupiter.api.BeforeEach; diff --git a/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/executor/error/handler/JobErrorHandlerReloaderTest.java b/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/executor/error/handler/JobErrorHandlerReloaderTest.java index 2cba36ca32..8956e5a029 100644 --- a/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/executor/error/handler/JobErrorHandlerReloaderTest.java +++ b/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/executor/error/handler/JobErrorHandlerReloaderTest.java @@ -20,6 +20,7 @@ import org.apache.shardingsphere.elasticjob.api.JobConfiguration; import org.apache.shardingsphere.elasticjob.kernel.executor.error.handler.fixture.BarJobErrorHandlerFixture; import org.apache.shardingsphere.elasticjob.kernel.executor.error.handler.fixture.FooJobErrorHandlerFixture; +import org.apache.shardingsphere.elasticjob.spi.executor.error.handler.JobErrorHandler; import org.apache.shardingsphere.elasticjob.test.util.ReflectionUtils; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; diff --git a/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/executor/error/handler/fixture/BarJobErrorHandlerFixture.java b/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/executor/error/handler/fixture/BarJobErrorHandlerFixture.java index 360da8848a..f3269d08bb 100644 --- a/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/executor/error/handler/fixture/BarJobErrorHandlerFixture.java +++ b/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/executor/error/handler/fixture/BarJobErrorHandlerFixture.java @@ -17,7 +17,7 @@ package org.apache.shardingsphere.elasticjob.kernel.executor.error.handler.fixture; -import org.apache.shardingsphere.elasticjob.kernel.executor.error.handler.JobErrorHandler; +import org.apache.shardingsphere.elasticjob.spi.executor.error.handler.JobErrorHandler; public final class BarJobErrorHandlerFixture implements JobErrorHandler { diff --git a/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/executor/error/handler/fixture/FooJobErrorHandlerFixture.java b/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/executor/error/handler/fixture/FooJobErrorHandlerFixture.java index 324306fea9..2ce50e5635 100644 --- a/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/executor/error/handler/fixture/FooJobErrorHandlerFixture.java +++ b/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/executor/error/handler/fixture/FooJobErrorHandlerFixture.java @@ -18,7 +18,7 @@ package org.apache.shardingsphere.elasticjob.kernel.executor.error.handler.fixture; import org.apache.shardingsphere.elasticjob.kernel.infra.exception.JobSystemException; -import org.apache.shardingsphere.elasticjob.kernel.executor.error.handler.JobErrorHandler; +import org.apache.shardingsphere.elasticjob.spi.executor.error.handler.JobErrorHandler; public final class FooJobErrorHandlerFixture implements JobErrorHandler { diff --git a/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/fixture/executor/ClassedFooJobExecutor.java b/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/fixture/executor/ClassedFooJobExecutor.java index fbe294734f..95be8fb150 100644 --- a/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/fixture/executor/ClassedFooJobExecutor.java +++ b/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/fixture/executor/ClassedFooJobExecutor.java @@ -18,9 +18,9 @@ package org.apache.shardingsphere.elasticjob.kernel.fixture.executor; import org.apache.shardingsphere.elasticjob.api.JobConfiguration; -import org.apache.shardingsphere.elasticjob.spi.executor.param.ShardingContext; -import org.apache.shardingsphere.elasticjob.spi.executor.param.JobRuntimeService; -import org.apache.shardingsphere.elasticjob.spi.executor.type.ClassedJobItemExecutor; +import org.apache.shardingsphere.elasticjob.spi.executor.item.param.ShardingContext; +import org.apache.shardingsphere.elasticjob.spi.executor.item.param.JobRuntimeService; +import org.apache.shardingsphere.elasticjob.spi.executor.item.type.ClassedJobItemExecutor; import org.apache.shardingsphere.elasticjob.kernel.fixture.job.FooJob; public final class ClassedFooJobExecutor implements ClassedJobItemExecutor { diff --git a/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/fixture/executor/TypedFooJobExecutor.java b/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/fixture/executor/TypedFooJobExecutor.java index 52fbcd893d..fd7b717fcf 100644 --- a/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/fixture/executor/TypedFooJobExecutor.java +++ b/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/fixture/executor/TypedFooJobExecutor.java @@ -19,9 +19,9 @@ import org.apache.shardingsphere.elasticjob.api.ElasticJob; import org.apache.shardingsphere.elasticjob.api.JobConfiguration; -import org.apache.shardingsphere.elasticjob.spi.executor.param.ShardingContext; -import org.apache.shardingsphere.elasticjob.spi.executor.param.JobRuntimeService; -import org.apache.shardingsphere.elasticjob.spi.executor.type.TypedJobItemExecutor; +import org.apache.shardingsphere.elasticjob.spi.executor.item.param.ShardingContext; +import org.apache.shardingsphere.elasticjob.spi.executor.item.param.JobRuntimeService; +import org.apache.shardingsphere.elasticjob.spi.executor.item.type.TypedJobItemExecutor; public final class TypedFooJobExecutor implements TypedJobItemExecutor { diff --git a/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/fixture/job/DetailedFooJob.java b/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/fixture/job/DetailedFooJob.java index 2a94673197..b4e33468db 100644 --- a/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/fixture/job/DetailedFooJob.java +++ b/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/fixture/job/DetailedFooJob.java @@ -18,7 +18,7 @@ package org.apache.shardingsphere.elasticjob.kernel.fixture.job; import lombok.Getter; -import org.apache.shardingsphere.elasticjob.spi.executor.param.ShardingContext; +import org.apache.shardingsphere.elasticjob.spi.executor.item.param.ShardingContext; import java.util.Collection; import java.util.concurrent.CopyOnWriteArraySet; diff --git a/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/fixture/job/FooJob.java b/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/fixture/job/FooJob.java index f114912941..10ec9232b2 100644 --- a/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/fixture/job/FooJob.java +++ b/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/fixture/job/FooJob.java @@ -18,7 +18,7 @@ package org.apache.shardingsphere.elasticjob.kernel.fixture.job; import org.apache.shardingsphere.elasticjob.api.ElasticJob; -import org.apache.shardingsphere.elasticjob.spi.executor.param.ShardingContext; +import org.apache.shardingsphere.elasticjob.spi.executor.item.param.ShardingContext; public interface FooJob extends ElasticJob { diff --git a/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/internal/context/TaskContextTest.java b/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/internal/context/TaskContextTest.java index 5c9edf8645..0192f72b6e 100644 --- a/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/internal/context/TaskContextTest.java +++ b/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/internal/context/TaskContextTest.java @@ -17,7 +17,7 @@ package org.apache.shardingsphere.elasticjob.kernel.internal.context; -import org.apache.shardingsphere.elasticjob.kernel.executor.ExecutionType; +import org.apache.shardingsphere.elasticjob.spi.executor.ExecutionType; import org.apache.shardingsphere.elasticjob.kernel.internal.context.TaskContext.MetaInfo; import org.apache.shardingsphere.elasticjob.kernel.internal.context.fixture.TaskNode; import org.hamcrest.CoreMatchers; diff --git a/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/internal/context/fixture/TaskNode.java b/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/internal/context/fixture/TaskNode.java index ae9b6383d1..3c4bfadaf6 100644 --- a/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/internal/context/fixture/TaskNode.java +++ b/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/internal/context/fixture/TaskNode.java @@ -18,7 +18,7 @@ package org.apache.shardingsphere.elasticjob.kernel.internal.context.fixture; import lombok.Builder; -import org.apache.shardingsphere.elasticjob.kernel.executor.ExecutionType; +import org.apache.shardingsphere.elasticjob.spi.executor.ExecutionType; @Builder public final class TaskNode { diff --git a/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/tracing/event/JobExecutionEventTest.java b/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/tracing/event/JobExecutionEventTest.java index b2cef1a454..22433ddd49 100644 --- a/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/tracing/event/JobExecutionEventTest.java +++ b/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/tracing/event/JobExecutionEventTest.java @@ -17,6 +17,7 @@ package org.apache.shardingsphere.elasticjob.kernel.tracing.event; +import org.apache.shardingsphere.elasticjob.spi.tracing.event.JobExecutionEvent; import org.junit.jupiter.api.Test; import static org.hamcrest.CoreMatchers.is; diff --git a/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/tracing/event/JobTracingEventBusTest.java b/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/tracing/event/JobTracingEventBusTest.java index 3387d530ab..e0bc5a4f4d 100644 --- a/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/tracing/event/JobTracingEventBusTest.java +++ b/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/tracing/event/JobTracingEventBusTest.java @@ -21,6 +21,8 @@ import org.apache.shardingsphere.elasticjob.kernel.tracing.config.TracingConfiguration; import org.apache.shardingsphere.elasticjob.kernel.tracing.fixture.config.TracingStorageFixture; import org.apache.shardingsphere.elasticjob.kernel.tracing.fixture.listener.TracingListenerFixture; +import org.apache.shardingsphere.elasticjob.spi.tracing.event.JobEvent; +import org.apache.shardingsphere.elasticjob.spi.tracing.event.JobExecutionEvent; import org.apache.shardingsphere.elasticjob.test.util.ReflectionUtils; import org.awaitility.Awaitility; import org.junit.jupiter.api.Test; diff --git a/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/tracing/fixture/config/TracingStorageConfigurationFixture.java b/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/tracing/fixture/config/TracingStorageConfigurationFixture.java index 95319dba1c..0d0714181c 100644 --- a/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/tracing/fixture/config/TracingStorageConfigurationFixture.java +++ b/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/tracing/fixture/config/TracingStorageConfigurationFixture.java @@ -19,7 +19,7 @@ import lombok.Getter; import lombok.RequiredArgsConstructor; -import org.apache.shardingsphere.elasticjob.kernel.tracing.config.TracingStorageConfiguration; +import org.apache.shardingsphere.elasticjob.spi.tracing.storage.TracingStorageConfiguration; @RequiredArgsConstructor @Getter diff --git a/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/tracing/fixture/config/TracingStorageFixtureConverter.java b/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/tracing/fixture/config/TracingStorageFixtureConfigurationConverter.java similarity index 71% rename from kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/tracing/fixture/config/TracingStorageFixtureConverter.java rename to kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/tracing/fixture/config/TracingStorageFixtureConfigurationConverter.java index 308e66655a..25134464ef 100644 --- a/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/tracing/fixture/config/TracingStorageFixtureConverter.java +++ b/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/tracing/fixture/config/TracingStorageFixtureConfigurationConverter.java @@ -17,13 +17,13 @@ package org.apache.shardingsphere.elasticjob.kernel.tracing.fixture.config; -import org.apache.shardingsphere.elasticjob.kernel.tracing.config.TracingStorageConfiguration; -import org.apache.shardingsphere.elasticjob.kernel.tracing.storage.TracingStorageConverter; +import org.apache.shardingsphere.elasticjob.spi.tracing.storage.TracingStorageConfiguration; +import org.apache.shardingsphere.elasticjob.spi.tracing.storage.TracingStorageConfigurationConverter; -public final class TracingStorageFixtureConverter implements TracingStorageConverter { +public final class TracingStorageFixtureConfigurationConverter implements TracingStorageConfigurationConverter { @Override - public TracingStorageConfiguration convertToConfiguration(final TracingStorageFixture storage) { + public TracingStorageConfiguration toConfiguration(final TracingStorageFixture storage) { return new TracingStorageConfigurationFixture(storage); } diff --git a/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/tracing/fixture/listener/TracingListenerFixture.java b/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/tracing/fixture/listener/TracingListenerFixture.java index e92be453f0..2ac4182a4e 100644 --- a/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/tracing/fixture/listener/TracingListenerFixture.java +++ b/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/tracing/fixture/listener/TracingListenerFixture.java @@ -20,9 +20,9 @@ import lombok.Getter; import lombok.RequiredArgsConstructor; import org.apache.shardingsphere.elasticjob.kernel.tracing.fixture.config.TracingStorageFixture; -import org.apache.shardingsphere.elasticjob.kernel.tracing.listener.TracingListener; -import org.apache.shardingsphere.elasticjob.kernel.tracing.event.JobExecutionEvent; -import org.apache.shardingsphere.elasticjob.kernel.tracing.event.JobStatusTraceEvent; +import org.apache.shardingsphere.elasticjob.spi.tracing.listener.TracingListener; +import org.apache.shardingsphere.elasticjob.spi.tracing.event.JobExecutionEvent; +import org.apache.shardingsphere.elasticjob.spi.tracing.event.JobStatusTraceEvent; @RequiredArgsConstructor public final class TracingListenerFixture implements TracingListener { diff --git a/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/tracing/fixture/listener/TracingListenerFixtureFactory.java b/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/tracing/fixture/listener/TracingListenerFixtureFactory.java index c61c7250e7..d2f7b5eb81 100644 --- a/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/tracing/fixture/listener/TracingListenerFixtureFactory.java +++ b/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/tracing/fixture/listener/TracingListenerFixtureFactory.java @@ -18,8 +18,8 @@ package org.apache.shardingsphere.elasticjob.kernel.tracing.fixture.listener; import org.apache.shardingsphere.elasticjob.kernel.tracing.fixture.config.TracingStorageFixture; -import org.apache.shardingsphere.elasticjob.kernel.tracing.listener.TracingListenerFactory; -import org.apache.shardingsphere.elasticjob.kernel.tracing.listener.TracingListener; +import org.apache.shardingsphere.elasticjob.spi.tracing.listener.TracingListenerFactory; +import org.apache.shardingsphere.elasticjob.spi.tracing.listener.TracingListener; public final class TracingListenerFixtureFactory implements TracingListenerFactory { diff --git a/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/tracing/storage/TracingStorageConverterFactoryTest.java b/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/tracing/storage/TracingStorageConfigurationConverterFactoryTest.java similarity index 96% rename from kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/tracing/storage/TracingStorageConverterFactoryTest.java rename to kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/tracing/storage/TracingStorageConfigurationConverterFactoryTest.java index e3f7f71255..80d47d60a6 100644 --- a/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/tracing/storage/TracingStorageConverterFactoryTest.java +++ b/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/tracing/storage/TracingStorageConfigurationConverterFactoryTest.java @@ -23,7 +23,7 @@ import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertTrue; -class TracingStorageConverterFactoryTest { +class TracingStorageConfigurationConverterFactoryTest { @Test void assertConverterExists() { diff --git a/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/tracing/yaml/YamlJobEventCallerConfiguration.java b/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/tracing/yaml/YamlJobEventCallerConfiguration.java index c5c8502209..e826072679 100644 --- a/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/tracing/yaml/YamlJobEventCallerConfiguration.java +++ b/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/tracing/yaml/YamlJobEventCallerConfiguration.java @@ -19,7 +19,7 @@ import lombok.Getter; import lombok.Setter; -import org.apache.shardingsphere.elasticjob.kernel.tracing.config.TracingStorageConfiguration; +import org.apache.shardingsphere.elasticjob.spi.tracing.storage.TracingStorageConfiguration; import org.apache.shardingsphere.elasticjob.kernel.tracing.fixture.config.TracingStorageFixture; import org.apache.shardingsphere.elasticjob.kernel.tracing.fixture.config.TracingStorageConfigurationFixture; diff --git a/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/tracing/yaml/YamlJobEventCallerConfigurationConverter.java b/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/tracing/yaml/YamlJobEventCallerConfigurationConverter.java index 011f938ff1..84e9c5eb75 100644 --- a/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/tracing/yaml/YamlJobEventCallerConfigurationConverter.java +++ b/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/tracing/yaml/YamlJobEventCallerConfigurationConverter.java @@ -17,8 +17,8 @@ package org.apache.shardingsphere.elasticjob.kernel.tracing.yaml; -import org.apache.shardingsphere.elasticjob.kernel.infra.yaml.config.YamlConfigurationConverter; -import org.apache.shardingsphere.elasticjob.kernel.tracing.config.TracingStorageConfiguration; +import org.apache.shardingsphere.elasticjob.spi.yaml.YamlConfigurationConverter; +import org.apache.shardingsphere.elasticjob.spi.tracing.storage.TracingStorageConfiguration; import org.apache.shardingsphere.elasticjob.kernel.tracing.fixture.config.TracingStorageFixture; import org.apache.shardingsphere.elasticjob.kernel.tracing.fixture.config.TracingStorageConfigurationFixture; diff --git a/kernel/src/test/resources/META-INF/services/org.apache.shardingsphere.elasticjob.kernel.executor.error.handler.JobErrorHandler b/kernel/src/test/resources/META-INF/services/org.apache.shardingsphere.elasticjob.spi.executor.error.handler.JobErrorHandler similarity index 100% rename from kernel/src/test/resources/META-INF/services/org.apache.shardingsphere.elasticjob.kernel.executor.error.handler.JobErrorHandler rename to kernel/src/test/resources/META-INF/services/org.apache.shardingsphere.elasticjob.spi.executor.error.handler.JobErrorHandler diff --git a/kernel/src/test/resources/META-INF/services/org.apache.shardingsphere.elasticjob.spi.executor.type.ClassedJobItemExecutor b/kernel/src/test/resources/META-INF/services/org.apache.shardingsphere.elasticjob.spi.executor.item.type.ClassedJobItemExecutor similarity index 100% rename from kernel/src/test/resources/META-INF/services/org.apache.shardingsphere.elasticjob.spi.executor.type.ClassedJobItemExecutor rename to kernel/src/test/resources/META-INF/services/org.apache.shardingsphere.elasticjob.spi.executor.item.type.ClassedJobItemExecutor diff --git a/kernel/src/test/resources/META-INF/services/org.apache.shardingsphere.elasticjob.spi.executor.type.TypedJobItemExecutor b/kernel/src/test/resources/META-INF/services/org.apache.shardingsphere.elasticjob.spi.executor.item.type.TypedJobItemExecutor similarity index 100% rename from kernel/src/test/resources/META-INF/services/org.apache.shardingsphere.elasticjob.spi.executor.type.TypedJobItemExecutor rename to kernel/src/test/resources/META-INF/services/org.apache.shardingsphere.elasticjob.spi.executor.item.type.TypedJobItemExecutor diff --git a/kernel/src/test/resources/META-INF/services/org.apache.shardingsphere.elasticjob.kernel.tracing.listener.TracingListenerFactory b/kernel/src/test/resources/META-INF/services/org.apache.shardingsphere.elasticjob.spi.tracing.listener.TracingListenerFactory similarity index 100% rename from kernel/src/test/resources/META-INF/services/org.apache.shardingsphere.elasticjob.kernel.tracing.listener.TracingListenerFactory rename to kernel/src/test/resources/META-INF/services/org.apache.shardingsphere.elasticjob.spi.tracing.listener.TracingListenerFactory diff --git a/kernel/src/test/resources/META-INF/services/org.apache.shardingsphere.elasticjob.kernel.tracing.storage.TracingStorageConverter b/kernel/src/test/resources/META-INF/services/org.apache.shardingsphere.elasticjob.spi.tracing.storage.TracingStorageConfigurationConverter similarity index 94% rename from kernel/src/test/resources/META-INF/services/org.apache.shardingsphere.elasticjob.kernel.tracing.storage.TracingStorageConverter rename to kernel/src/test/resources/META-INF/services/org.apache.shardingsphere.elasticjob.spi.tracing.storage.TracingStorageConfigurationConverter index 2e11a5dec6..5e15aaaed2 100644 --- a/kernel/src/test/resources/META-INF/services/org.apache.shardingsphere.elasticjob.kernel.tracing.storage.TracingStorageConverter +++ b/kernel/src/test/resources/META-INF/services/org.apache.shardingsphere.elasticjob.spi.tracing.storage.TracingStorageConfigurationConverter @@ -15,4 +15,4 @@ # limitations under the License. # -org.apache.shardingsphere.elasticjob.kernel.tracing.fixture.config.TracingStorageFixtureConverter +org.apache.shardingsphere.elasticjob.kernel.tracing.fixture.config.TracingStorageFixtureConfigurationConverter diff --git a/kernel/src/test/resources/META-INF/services/org.apache.shardingsphere.elasticjob.kernel.infra.yaml.config.YamlConfigurationConverter b/kernel/src/test/resources/META-INF/services/org.apache.shardingsphere.elasticjob.spi.yaml.YamlConfigurationConverter similarity index 100% rename from kernel/src/test/resources/META-INF/services/org.apache.shardingsphere.elasticjob.kernel.infra.yaml.config.YamlConfigurationConverter rename to kernel/src/test/resources/META-INF/services/org.apache.shardingsphere.elasticjob.spi.yaml.YamlConfigurationConverter diff --git a/spring/boot-starter/src/test/java/org/apache/shardingsphere/elasticjob/spring/boot/job/executor/CustomClassedJobExecutor.java b/spring/boot-starter/src/test/java/org/apache/shardingsphere/elasticjob/spring/boot/job/executor/CustomClassedJobExecutor.java index c3ea0c5445..a323928dae 100644 --- a/spring/boot-starter/src/test/java/org/apache/shardingsphere/elasticjob/spring/boot/job/executor/CustomClassedJobExecutor.java +++ b/spring/boot-starter/src/test/java/org/apache/shardingsphere/elasticjob/spring/boot/job/executor/CustomClassedJobExecutor.java @@ -18,9 +18,9 @@ package org.apache.shardingsphere.elasticjob.spring.boot.job.executor; import org.apache.shardingsphere.elasticjob.api.JobConfiguration; -import org.apache.shardingsphere.elasticjob.spi.executor.param.ShardingContext; -import org.apache.shardingsphere.elasticjob.spi.executor.param.JobRuntimeService; -import org.apache.shardingsphere.elasticjob.spi.executor.type.ClassedJobItemExecutor; +import org.apache.shardingsphere.elasticjob.spi.executor.item.param.ShardingContext; +import org.apache.shardingsphere.elasticjob.spi.executor.item.param.JobRuntimeService; +import org.apache.shardingsphere.elasticjob.spi.executor.item.type.ClassedJobItemExecutor; import org.apache.shardingsphere.elasticjob.spring.boot.job.fixture.job.CustomJob; public final class CustomClassedJobExecutor implements ClassedJobItemExecutor { diff --git a/spring/boot-starter/src/test/java/org/apache/shardingsphere/elasticjob/spring/boot/job/executor/PrintJobExecutor.java b/spring/boot-starter/src/test/java/org/apache/shardingsphere/elasticjob/spring/boot/job/executor/PrintJobExecutor.java index 43f7d249cc..6b826b4d14 100644 --- a/spring/boot-starter/src/test/java/org/apache/shardingsphere/elasticjob/spring/boot/job/executor/PrintJobExecutor.java +++ b/spring/boot-starter/src/test/java/org/apache/shardingsphere/elasticjob/spring/boot/job/executor/PrintJobExecutor.java @@ -20,9 +20,9 @@ import lombok.extern.slf4j.Slf4j; import org.apache.shardingsphere.elasticjob.api.ElasticJob; import org.apache.shardingsphere.elasticjob.api.JobConfiguration; -import org.apache.shardingsphere.elasticjob.spi.executor.param.ShardingContext; -import org.apache.shardingsphere.elasticjob.spi.executor.param.JobRuntimeService; -import org.apache.shardingsphere.elasticjob.spi.executor.type.TypedJobItemExecutor; +import org.apache.shardingsphere.elasticjob.spi.executor.item.param.ShardingContext; +import org.apache.shardingsphere.elasticjob.spi.executor.item.param.JobRuntimeService; +import org.apache.shardingsphere.elasticjob.spi.executor.item.type.TypedJobItemExecutor; @Slf4j public final class PrintJobExecutor implements TypedJobItemExecutor { diff --git a/spring/boot-starter/src/test/java/org/apache/shardingsphere/elasticjob/spring/boot/job/fixture/job/CustomJob.java b/spring/boot-starter/src/test/java/org/apache/shardingsphere/elasticjob/spring/boot/job/fixture/job/CustomJob.java index b3015cca8d..a23fd7b8f2 100644 --- a/spring/boot-starter/src/test/java/org/apache/shardingsphere/elasticjob/spring/boot/job/fixture/job/CustomJob.java +++ b/spring/boot-starter/src/test/java/org/apache/shardingsphere/elasticjob/spring/boot/job/fixture/job/CustomJob.java @@ -18,7 +18,7 @@ package org.apache.shardingsphere.elasticjob.spring.boot.job.fixture.job; import org.apache.shardingsphere.elasticjob.api.ElasticJob; -import org.apache.shardingsphere.elasticjob.spi.executor.param.ShardingContext; +import org.apache.shardingsphere.elasticjob.spi.executor.item.param.ShardingContext; public interface CustomJob extends ElasticJob { diff --git a/spring/boot-starter/src/test/java/org/apache/shardingsphere/elasticjob/spring/boot/job/fixture/job/impl/AnnotationCustomJob.java b/spring/boot-starter/src/test/java/org/apache/shardingsphere/elasticjob/spring/boot/job/fixture/job/impl/AnnotationCustomJob.java index 7992abc35a..6b6b81dd2c 100644 --- a/spring/boot-starter/src/test/java/org/apache/shardingsphere/elasticjob/spring/boot/job/fixture/job/impl/AnnotationCustomJob.java +++ b/spring/boot-starter/src/test/java/org/apache/shardingsphere/elasticjob/spring/boot/job/fixture/job/impl/AnnotationCustomJob.java @@ -21,7 +21,7 @@ import lombok.extern.slf4j.Slf4j; import org.apache.shardingsphere.elasticjob.annotation.ElasticJobConfiguration; import org.apache.shardingsphere.elasticjob.annotation.ElasticJobProp; -import org.apache.shardingsphere.elasticjob.spi.executor.param.ShardingContext; +import org.apache.shardingsphere.elasticjob.spi.executor.item.param.ShardingContext; import org.apache.shardingsphere.elasticjob.spring.boot.job.fixture.job.CustomJob; import org.springframework.transaction.annotation.Transactional; diff --git a/spring/boot-starter/src/test/java/org/apache/shardingsphere/elasticjob/spring/boot/job/fixture/job/impl/CustomTestJob.java b/spring/boot-starter/src/test/java/org/apache/shardingsphere/elasticjob/spring/boot/job/fixture/job/impl/CustomTestJob.java index ebda24390b..0ee8bcfa04 100644 --- a/spring/boot-starter/src/test/java/org/apache/shardingsphere/elasticjob/spring/boot/job/fixture/job/impl/CustomTestJob.java +++ b/spring/boot-starter/src/test/java/org/apache/shardingsphere/elasticjob/spring/boot/job/fixture/job/impl/CustomTestJob.java @@ -18,7 +18,7 @@ package org.apache.shardingsphere.elasticjob.spring.boot.job.fixture.job.impl; import lombok.extern.slf4j.Slf4j; -import org.apache.shardingsphere.elasticjob.spi.executor.param.ShardingContext; +import org.apache.shardingsphere.elasticjob.spi.executor.item.param.ShardingContext; import org.apache.shardingsphere.elasticjob.spring.boot.job.fixture.job.CustomJob; import org.apache.shardingsphere.elasticjob.spring.boot.job.repository.BarRepository; import org.springframework.beans.factory.annotation.Autowired; diff --git a/spring/boot-starter/src/test/resources/META-INF/services/org.apache.shardingsphere.elasticjob.spi.executor.type.ClassedJobItemExecutor b/spring/boot-starter/src/test/resources/META-INF/services/org.apache.shardingsphere.elasticjob.spi.executor.item.type.ClassedJobItemExecutor similarity index 100% rename from spring/boot-starter/src/test/resources/META-INF/services/org.apache.shardingsphere.elasticjob.spi.executor.type.ClassedJobItemExecutor rename to spring/boot-starter/src/test/resources/META-INF/services/org.apache.shardingsphere.elasticjob.spi.executor.item.type.ClassedJobItemExecutor diff --git a/spring/boot-starter/src/test/resources/META-INF/services/org.apache.shardingsphere.elasticjob.spi.executor.type.TypedJobItemExecutor b/spring/boot-starter/src/test/resources/META-INF/services/org.apache.shardingsphere.elasticjob.spi.executor.item.type.TypedJobItemExecutor similarity index 100% rename from spring/boot-starter/src/test/resources/META-INF/services/org.apache.shardingsphere.elasticjob.spi.executor.type.TypedJobItemExecutor rename to spring/boot-starter/src/test/resources/META-INF/services/org.apache.shardingsphere.elasticjob.spi.executor.item.type.TypedJobItemExecutor diff --git a/spring/core/src/test/java/org/apache/shardingsphere/elasticjob/spring/core/util/TargetJob.java b/spring/core/src/test/java/org/apache/shardingsphere/elasticjob/spring/core/util/TargetJob.java index 1b100c73b0..14db9f6f55 100644 --- a/spring/core/src/test/java/org/apache/shardingsphere/elasticjob/spring/core/util/TargetJob.java +++ b/spring/core/src/test/java/org/apache/shardingsphere/elasticjob/spring/core/util/TargetJob.java @@ -18,7 +18,7 @@ package org.apache.shardingsphere.elasticjob.spring.core.util; import org.apache.shardingsphere.elasticjob.api.ElasticJob; -import org.apache.shardingsphere.elasticjob.spi.executor.param.ShardingContext; +import org.apache.shardingsphere.elasticjob.spi.executor.item.param.ShardingContext; public class TargetJob implements ElasticJob { diff --git a/spring/namespace/src/test/java/org/apache/shardingsphere/elasticjob/spring/namespace/fixture/job/DataflowElasticJob.java b/spring/namespace/src/test/java/org/apache/shardingsphere/elasticjob/spring/namespace/fixture/job/DataflowElasticJob.java index dd2345f313..d24f774745 100644 --- a/spring/namespace/src/test/java/org/apache/shardingsphere/elasticjob/spring/namespace/fixture/job/DataflowElasticJob.java +++ b/spring/namespace/src/test/java/org/apache/shardingsphere/elasticjob/spring/namespace/fixture/job/DataflowElasticJob.java @@ -18,7 +18,7 @@ package org.apache.shardingsphere.elasticjob.spring.namespace.fixture.job; import lombok.Getter; -import org.apache.shardingsphere.elasticjob.spi.executor.param.ShardingContext; +import org.apache.shardingsphere.elasticjob.spi.executor.item.param.ShardingContext; import org.apache.shardingsphere.elasticjob.dataflow.job.DataflowJob; import java.util.Collections; diff --git a/spring/namespace/src/test/java/org/apache/shardingsphere/elasticjob/spring/namespace/fixture/job/FooSimpleElasticJob.java b/spring/namespace/src/test/java/org/apache/shardingsphere/elasticjob/spring/namespace/fixture/job/FooSimpleElasticJob.java index a2adbe1331..e6d6cec6ac 100644 --- a/spring/namespace/src/test/java/org/apache/shardingsphere/elasticjob/spring/namespace/fixture/job/FooSimpleElasticJob.java +++ b/spring/namespace/src/test/java/org/apache/shardingsphere/elasticjob/spring/namespace/fixture/job/FooSimpleElasticJob.java @@ -18,7 +18,7 @@ package org.apache.shardingsphere.elasticjob.spring.namespace.fixture.job; import lombok.Getter; -import org.apache.shardingsphere.elasticjob.spi.executor.param.ShardingContext; +import org.apache.shardingsphere.elasticjob.spi.executor.item.param.ShardingContext; import org.apache.shardingsphere.elasticjob.simple.job.SimpleJob; public class FooSimpleElasticJob implements SimpleJob { diff --git a/spring/namespace/src/test/java/org/apache/shardingsphere/elasticjob/spring/namespace/fixture/job/annotation/AnnotationSimpleJob.java b/spring/namespace/src/test/java/org/apache/shardingsphere/elasticjob/spring/namespace/fixture/job/annotation/AnnotationSimpleJob.java index eb17cc2746..b9b8c7281c 100644 --- a/spring/namespace/src/test/java/org/apache/shardingsphere/elasticjob/spring/namespace/fixture/job/annotation/AnnotationSimpleJob.java +++ b/spring/namespace/src/test/java/org/apache/shardingsphere/elasticjob/spring/namespace/fixture/job/annotation/AnnotationSimpleJob.java @@ -20,7 +20,7 @@ import lombok.Getter; import org.apache.shardingsphere.elasticjob.annotation.ElasticJobConfiguration; import org.apache.shardingsphere.elasticjob.annotation.ElasticJobProp; -import org.apache.shardingsphere.elasticjob.spi.executor.param.ShardingContext; +import org.apache.shardingsphere.elasticjob.spi.executor.item.param.ShardingContext; import org.apache.shardingsphere.elasticjob.simple.job.SimpleJob; @Getter diff --git a/spring/namespace/src/test/java/org/apache/shardingsphere/elasticjob/spring/namespace/fixture/job/ref/RefFooDataflowElasticJob.java b/spring/namespace/src/test/java/org/apache/shardingsphere/elasticjob/spring/namespace/fixture/job/ref/RefFooDataflowElasticJob.java index 2dfa998190..2d7518aa85 100644 --- a/spring/namespace/src/test/java/org/apache/shardingsphere/elasticjob/spring/namespace/fixture/job/ref/RefFooDataflowElasticJob.java +++ b/spring/namespace/src/test/java/org/apache/shardingsphere/elasticjob/spring/namespace/fixture/job/ref/RefFooDataflowElasticJob.java @@ -19,7 +19,7 @@ import lombok.Getter; import lombok.Setter; -import org.apache.shardingsphere.elasticjob.spi.executor.param.ShardingContext; +import org.apache.shardingsphere.elasticjob.spi.executor.item.param.ShardingContext; import org.apache.shardingsphere.elasticjob.dataflow.job.DataflowJob; import org.apache.shardingsphere.elasticjob.spring.namespace.fixture.service.FooService; diff --git a/spring/namespace/src/test/java/org/apache/shardingsphere/elasticjob/spring/namespace/fixture/job/ref/RefFooSimpleElasticJob.java b/spring/namespace/src/test/java/org/apache/shardingsphere/elasticjob/spring/namespace/fixture/job/ref/RefFooSimpleElasticJob.java index d65ddf5770..bd037c9fa1 100644 --- a/spring/namespace/src/test/java/org/apache/shardingsphere/elasticjob/spring/namespace/fixture/job/ref/RefFooSimpleElasticJob.java +++ b/spring/namespace/src/test/java/org/apache/shardingsphere/elasticjob/spring/namespace/fixture/job/ref/RefFooSimpleElasticJob.java @@ -19,7 +19,7 @@ import lombok.Getter; import lombok.Setter; -import org.apache.shardingsphere.elasticjob.spi.executor.param.ShardingContext; +import org.apache.shardingsphere.elasticjob.spi.executor.item.param.ShardingContext; import org.apache.shardingsphere.elasticjob.simple.job.SimpleJob; import org.apache.shardingsphere.elasticjob.spring.namespace.fixture.service.FooService; diff --git a/test/e2e/src/test/java/org/apache/shardingsphere/elasticjob/test/e2e/annotation/fixture/AnnotationSimpleJob.java b/test/e2e/src/test/java/org/apache/shardingsphere/elasticjob/test/e2e/annotation/fixture/AnnotationSimpleJob.java index babcc7c605..9ef84b84b3 100644 --- a/test/e2e/src/test/java/org/apache/shardingsphere/elasticjob/test/e2e/annotation/fixture/AnnotationSimpleJob.java +++ b/test/e2e/src/test/java/org/apache/shardingsphere/elasticjob/test/e2e/annotation/fixture/AnnotationSimpleJob.java @@ -21,7 +21,7 @@ import org.apache.shardingsphere.elasticjob.annotation.ElasticJobConfiguration; import org.apache.shardingsphere.elasticjob.annotation.ElasticJobProp; import org.apache.shardingsphere.elasticjob.simple.job.SimpleJob; -import org.apache.shardingsphere.elasticjob.spi.executor.param.ShardingContext; +import org.apache.shardingsphere.elasticjob.spi.executor.item.param.ShardingContext; @ElasticJobConfiguration( jobName = "AnnotationSimpleJob", diff --git a/test/e2e/src/test/java/org/apache/shardingsphere/elasticjob/test/e2e/annotation/fixture/AnnotationUnShardingJob.java b/test/e2e/src/test/java/org/apache/shardingsphere/elasticjob/test/e2e/annotation/fixture/AnnotationUnShardingJob.java index 0bd7def12d..f376efc69e 100644 --- a/test/e2e/src/test/java/org/apache/shardingsphere/elasticjob/test/e2e/annotation/fixture/AnnotationUnShardingJob.java +++ b/test/e2e/src/test/java/org/apache/shardingsphere/elasticjob/test/e2e/annotation/fixture/AnnotationUnShardingJob.java @@ -20,7 +20,7 @@ import lombok.Getter; import org.apache.shardingsphere.elasticjob.annotation.ElasticJobConfiguration; import org.apache.shardingsphere.elasticjob.simple.job.SimpleJob; -import org.apache.shardingsphere.elasticjob.spi.executor.param.ShardingContext; +import org.apache.shardingsphere.elasticjob.spi.executor.item.param.ShardingContext; @ElasticJobConfiguration(jobName = "AnnotationUnShardingJob", description = "desc", shardingTotalCount = 1) @Getter diff --git a/test/e2e/src/test/java/org/apache/shardingsphere/elasticjob/test/e2e/raw/fixture/executor/E2EFixtureJobExecutor.java b/test/e2e/src/test/java/org/apache/shardingsphere/elasticjob/test/e2e/raw/fixture/executor/E2EFixtureJobExecutor.java index ef57329956..e81af6fd14 100644 --- a/test/e2e/src/test/java/org/apache/shardingsphere/elasticjob/test/e2e/raw/fixture/executor/E2EFixtureJobExecutor.java +++ b/test/e2e/src/test/java/org/apache/shardingsphere/elasticjob/test/e2e/raw/fixture/executor/E2EFixtureJobExecutor.java @@ -18,9 +18,9 @@ package org.apache.shardingsphere.elasticjob.test.e2e.raw.fixture.executor; import org.apache.shardingsphere.elasticjob.api.JobConfiguration; -import org.apache.shardingsphere.elasticjob.spi.executor.param.JobRuntimeService; -import org.apache.shardingsphere.elasticjob.spi.executor.param.ShardingContext; -import org.apache.shardingsphere.elasticjob.spi.executor.type.ClassedJobItemExecutor; +import org.apache.shardingsphere.elasticjob.spi.executor.item.param.JobRuntimeService; +import org.apache.shardingsphere.elasticjob.spi.executor.item.param.ShardingContext; +import org.apache.shardingsphere.elasticjob.spi.executor.item.type.ClassedJobItemExecutor; import org.apache.shardingsphere.elasticjob.test.e2e.raw.fixture.job.E2EFixtureJob; public final class E2EFixtureJobExecutor implements ClassedJobItemExecutor { diff --git a/test/e2e/src/test/java/org/apache/shardingsphere/elasticjob/test/e2e/raw/fixture/job/E2EFixtureJob.java b/test/e2e/src/test/java/org/apache/shardingsphere/elasticjob/test/e2e/raw/fixture/job/E2EFixtureJob.java index 9b2aec429c..118002b5c8 100644 --- a/test/e2e/src/test/java/org/apache/shardingsphere/elasticjob/test/e2e/raw/fixture/job/E2EFixtureJob.java +++ b/test/e2e/src/test/java/org/apache/shardingsphere/elasticjob/test/e2e/raw/fixture/job/E2EFixtureJob.java @@ -18,7 +18,7 @@ package org.apache.shardingsphere.elasticjob.test.e2e.raw.fixture.job; import org.apache.shardingsphere.elasticjob.api.ElasticJob; -import org.apache.shardingsphere.elasticjob.spi.executor.param.ShardingContext; +import org.apache.shardingsphere.elasticjob.spi.executor.item.param.ShardingContext; public interface E2EFixtureJob extends ElasticJob { diff --git a/test/e2e/src/test/java/org/apache/shardingsphere/elasticjob/test/e2e/raw/fixture/job/E2EFixtureJobImpl.java b/test/e2e/src/test/java/org/apache/shardingsphere/elasticjob/test/e2e/raw/fixture/job/E2EFixtureJobImpl.java index 8bfe65c7f8..60ae346a11 100644 --- a/test/e2e/src/test/java/org/apache/shardingsphere/elasticjob/test/e2e/raw/fixture/job/E2EFixtureJobImpl.java +++ b/test/e2e/src/test/java/org/apache/shardingsphere/elasticjob/test/e2e/raw/fixture/job/E2EFixtureJobImpl.java @@ -18,7 +18,7 @@ package org.apache.shardingsphere.elasticjob.test.e2e.raw.fixture.job; import lombok.Getter; -import org.apache.shardingsphere.elasticjob.spi.executor.param.ShardingContext; +import org.apache.shardingsphere.elasticjob.spi.executor.item.param.ShardingContext; import java.util.Collection; import java.util.concurrent.CopyOnWriteArraySet; diff --git a/test/e2e/src/test/resources/META-INF/services/org.apache.shardingsphere.elasticjob.spi.executor.type.ClassedJobItemExecutor b/test/e2e/src/test/resources/META-INF/services/org.apache.shardingsphere.elasticjob.spi.executor.item.type.ClassedJobItemExecutor similarity index 100% rename from test/e2e/src/test/resources/META-INF/services/org.apache.shardingsphere.elasticjob.spi.executor.type.ClassedJobItemExecutor rename to test/e2e/src/test/resources/META-INF/services/org.apache.shardingsphere.elasticjob.spi.executor.item.type.ClassedJobItemExecutor