Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Move TaskContext to kernel module #2319

Merged
merged 2 commits into from
Oct 26, 2023
Merged

Move TaskContext to kernel module #2319

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2415b23
Move TaskContext to kernel module
terrymanu Oct 26, 2023
75ee923
Move TaskContext to kernel module
terrymanu Oct 26, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ...src/main/java/org/apache/shardingsphere/elasticjob/tracing/event/JobStatusTraceEvent.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@
/**
* Job status trace event.
*/
@RequiredArgsConstructor
@AllArgsConstructor
@RequiredArgsConstructor
@Getter
public final class JobStatusTraceEvent implements JobEvent {

Expand Down
2 changes: 1 addition & 1 deletion ...asticjob/infra/context/ExecutionType.java → ...ernel/internal/context/ExecutionType.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion ...elasticjob/infra/context/TaskContext.java → .../kernel/internal/context/TaskContext.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion .../src/main/java/org/apache/shardingsphere/elasticjob/kernel/internal/schedule/LiteJob.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
import org.quartz.JobExecutionContext;

/**
* Lite job class.
* Lite job.
*/
@Setter
public final class LiteJob implements Job {
Expand Down
2 changes: 1 addition & 1 deletion ...ain/java/org/apache/shardingsphere/elasticjob/kernel/internal/schedule/LiteJobFacade.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
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;
Expand Down
11 changes: 6 additions & 5 deletions ...ticjob/infra/context/TaskContextTest.java → ...nel/internal/context/TaskContextTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -36,7 +37,7 @@ void assertNew() {
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)));
}
Expand All @@ -59,7 +60,7 @@ void assertTaskContextFrom() {
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"));
}

Expand Down
4 changes: 2 additions & 2 deletions ...icjob/infra/context/fixture/TaskNode.java → ...el/internal/context/fixture/TaskNode.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down