This is an automated email from the ASF dual-hosted git repository.
zhangliang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/shardingsphere-elasticjob.git
The following commit(s) were added to refs/heads/master by this push:
new 125f06fdb Move TaskContext to kernel module (#2319)
125f06fdb is described below
commit 125f06fdb18faec3bc0d4a30e8221d3f111fe3b6
Author: Liang Zhang <[email protected]>
AuthorDate: Thu Oct 26 23:45:24 2023 +0800
Move TaskContext to kernel module (#2319)
* Move TaskContext to kernel module
* Move TaskContext to kernel module
---
.../elasticjob/tracing/event/JobStatusTraceEvent.java | 2 +-
.../elasticjob/kernel/internal}/context/ExecutionType.java | 2 +-
.../elasticjob/kernel/internal}/context/TaskContext.java | 2 +-
.../elasticjob/kernel/internal/schedule/LiteJob.java | 2 +-
.../elasticjob/kernel/internal/schedule/LiteJobFacade.java | 2 +-
.../elasticjob/kernel/internal}/context/TaskContextTest.java | 11 ++++++-----
.../elasticjob/kernel/internal}/context/fixture/TaskNode.java | 4 ++--
7 files changed, 13 insertions(+), 12 deletions(-)
diff --git
a/ecosystem/tracing/api/src/main/java/org/apache/shardingsphere/elasticjob/tracing/event/JobStatusTraceEvent.java
b/ecosystem/tracing/api/src/main/java/org/apache/shardingsphere/elasticjob/tracing/event/JobStatusTraceEvent.java
index cef09d3fd..91b938c8b 100644
---
a/ecosystem/tracing/api/src/main/java/org/apache/shardingsphere/elasticjob/tracing/event/JobStatusTraceEvent.java
+++
b/ecosystem/tracing/api/src/main/java/org/apache/shardingsphere/elasticjob/tracing/event/JobStatusTraceEvent.java
@@ -28,8 +28,8 @@ import java.util.UUID;
/**
* Job status trace event.
*/
-@RequiredArgsConstructor
@AllArgsConstructor
+@RequiredArgsConstructor
@Getter
public final class JobStatusTraceEvent implements JobEvent {
diff --git
a/infra/src/main/java/org/apache/shardingsphere/elasticjob/infra/context/ExecutionType.java
b/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/context/ExecutionType.java
similarity index 93%
rename from
infra/src/main/java/org/apache/shardingsphere/elasticjob/infra/context/ExecutionType.java
rename to
kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/context/ExecutionType.java
index fb7cff1b4..8d771282f 100755
---
a/infra/src/main/java/org/apache/shardingsphere/elasticjob/infra/context/ExecutionType.java
+++
b/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/context/ExecutionType.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.elasticjob.infra.context;
+package org.apache.shardingsphere.elasticjob.kernel.internal.context;
/**
* Execution type.
diff --git
a/infra/src/main/java/org/apache/shardingsphere/elasticjob/infra/context/TaskContext.java
b/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/context/TaskContext.java
similarity index 98%
rename from
infra/src/main/java/org/apache/shardingsphere/elasticjob/infra/context/TaskContext.java
rename to
kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/context/TaskContext.java
index e2f32ec66..f416b4d71 100755
---
a/infra/src/main/java/org/apache/shardingsphere/elasticjob/infra/context/TaskContext.java
+++
b/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/context/TaskContext.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.elasticjob.infra.context;
+package org.apache.shardingsphere.elasticjob.kernel.internal.context;
import com.google.common.base.Preconditions;
import com.google.common.base.Splitter;
diff --git
a/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/schedule/LiteJob.java
b/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/schedule/LiteJob.java
index 4d828f1d4..8189e05c0 100644
---
a/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/schedule/LiteJob.java
+++
b/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/schedule/LiteJob.java
@@ -23,7 +23,7 @@ import org.quartz.Job;
import org.quartz.JobExecutionContext;
/**
- * Lite job class.
+ * Lite job.
*/
@Setter
public final class LiteJob implements Job {
diff --git
a/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/schedule/LiteJobFacade.java
b/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/schedule/LiteJobFacade.java
index 479f720da..593c856a4 100644
---
a/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/schedule/LiteJobFacade.java
+++
b/kernel/src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/schedule/LiteJobFacade.java
@@ -26,7 +26,7 @@ import
org.apache.shardingsphere.elasticjob.kernel.internal.sharding.ExecutionCo
import
org.apache.shardingsphere.elasticjob.kernel.internal.sharding.ExecutionService;
import
org.apache.shardingsphere.elasticjob.kernel.internal.sharding.ShardingService;
import org.apache.shardingsphere.elasticjob.executor.JobFacade;
-import org.apache.shardingsphere.elasticjob.infra.context.TaskContext;
+import
org.apache.shardingsphere.elasticjob.kernel.internal.context.TaskContext;
import
org.apache.shardingsphere.elasticjob.infra.exception.JobExecutionEnvironmentException;
import org.apache.shardingsphere.elasticjob.infra.listener.ElasticJobListener;
import org.apache.shardingsphere.elasticjob.infra.listener.ShardingContexts;
diff --git
a/infra/src/test/java/org/apache/shardingsphere/elasticjob/infra/context/TaskContextTest.java
b/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/internal/context/TaskContextTest.java
similarity index 91%
rename from
infra/src/test/java/org/apache/shardingsphere/elasticjob/infra/context/TaskContextTest.java
rename to
kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/internal/context/TaskContextTest.java
index c5f2f26fd..9d1037018 100644
---
a/infra/src/test/java/org/apache/shardingsphere/elasticjob/infra/context/TaskContextTest.java
+++
b/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/internal/context/TaskContextTest.java
@@ -15,10 +15,11 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.elasticjob.infra.context;
+package org.apache.shardingsphere.elasticjob.kernel.internal.context;
-import org.apache.shardingsphere.elasticjob.infra.context.TaskContext.MetaInfo;
-import org.apache.shardingsphere.elasticjob.infra.context.fixture.TaskNode;
+import
org.apache.shardingsphere.elasticjob.kernel.internal.context.TaskContext.MetaInfo;
+import
org.apache.shardingsphere.elasticjob.kernel.internal.context.fixture.TaskNode;
+import org.hamcrest.CoreMatchers;
import org.junit.jupiter.api.Test;
import java.util.Collections;
@@ -36,7 +37,7 @@ class TaskContextTest {
TaskContext actual = new TaskContext("test_job",
Collections.singletonList(0), ExecutionType.READY, "slave-S0");
assertThat(actual.getMetaInfo().getJobName(), is("test_job"));
assertThat(actual.getMetaInfo().getShardingItems().get(0), is(0));
- assertThat(actual.getType(), is(ExecutionType.READY));
+ assertThat(actual.getType(), CoreMatchers.is(ExecutionType.READY));
assertThat(actual.getSlaveId(), is("slave-S0"));
assertThat(actual.getId(),
startsWith(TaskNode.builder().build().getTaskNodeValue().substring(0,
TaskNode.builder().build().getTaskNodeValue().length() - 1)));
}
@@ -59,7 +60,7 @@ class TaskContextTest {
assertThat(actual.getId(),
is(TaskNode.builder().build().getTaskNodeValue()));
assertThat(actual.getMetaInfo().getJobName(), is("test_job"));
assertThat(actual.getMetaInfo().getShardingItems().get(0), is(0));
- assertThat(actual.getType(), is(ExecutionType.READY));
+ assertThat(actual.getType(), CoreMatchers.is(ExecutionType.READY));
assertThat(actual.getSlaveId(), is("slave-S0"));
}
diff --git
a/infra/src/test/java/org/apache/shardingsphere/elasticjob/infra/context/fixture/TaskNode.java
b/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/internal/context/fixture/TaskNode.java
similarity index 90%
rename from
infra/src/test/java/org/apache/shardingsphere/elasticjob/infra/context/fixture/TaskNode.java
rename to
kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/internal/context/fixture/TaskNode.java
index 94202fb85..7c8ed0024 100644
---
a/infra/src/test/java/org/apache/shardingsphere/elasticjob/infra/context/fixture/TaskNode.java
+++
b/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/internal/context/fixture/TaskNode.java
@@ -15,10 +15,10 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.elasticjob.infra.context.fixture;
+package org.apache.shardingsphere.elasticjob.kernel.internal.context.fixture;
import lombok.Builder;
-import org.apache.shardingsphere.elasticjob.infra.context.ExecutionType;
+import
org.apache.shardingsphere.elasticjob.kernel.internal.context.ExecutionType;
@Builder
public final class TaskNode {
