This is an automated email from the ASF dual-hosted git repository.
sunnianjun 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 fd93fa19e Remove duplicated fixture (#2325)
fd93fa19e is described below
commit fd93fa19edfdb1b5c721ba343b01f8877e516030
Author: Liang Zhang <[email protected]>
AuthorDate: Sat Oct 28 20:41:22 2023 +0800
Remove duplicated fixture (#2325)
---
.../fixture/executor/TypedFooJobExecutor.java | 2 +-
.../executor => }/fixture/job/FailedJob.java | 2 +-
.../executor/fixture/job/DetailedFooJob.java | 39 ----------------------
.../executor/item/JobItemExecutorFactoryTest.java | 2 +-
...sphere.elasticjob.spi.type.TypedJobItemExecutor | 2 +-
5 files changed, 4 insertions(+), 43 deletions(-)
diff --git
a/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/internal/executor/fixture/executor/TypedFooJobExecutor.java
b/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/fixture/executor/TypedFooJobExecutor.java
similarity index 94%
rename from
kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/internal/executor/fixture/executor/TypedFooJobExecutor.java
rename to
kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/fixture/executor/TypedFooJobExecutor.java
index 766927ba2..50a69c9fe 100644
---
a/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/internal/executor/fixture/executor/TypedFooJobExecutor.java
+++
b/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/fixture/executor/TypedFooJobExecutor.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package
org.apache.shardingsphere.elasticjob.kernel.internal.executor.fixture.executor;
+package org.apache.shardingsphere.elasticjob.kernel.fixture.executor;
import org.apache.shardingsphere.elasticjob.api.ElasticJob;
import org.apache.shardingsphere.elasticjob.api.JobConfiguration;
diff --git
a/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/internal/executor/fixture/job/FailedJob.java
b/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/fixture/job/FailedJob.java
similarity index 91%
rename from
kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/internal/executor/fixture/job/FailedJob.java
rename to
kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/fixture/job/FailedJob.java
index 326cc2cb0..d34e381c3 100644
---
a/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/internal/executor/fixture/job/FailedJob.java
+++
b/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/fixture/job/FailedJob.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package
org.apache.shardingsphere.elasticjob.kernel.internal.executor.fixture.job;
+package org.apache.shardingsphere.elasticjob.kernel.fixture.job;
import org.apache.shardingsphere.elasticjob.api.ElasticJob;
diff --git
a/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/internal/executor/fixture/job/DetailedFooJob.java
b/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/internal/executor/fixture/job/DetailedFooJob.java
deleted file mode 100644
index 7ef0cf84b..000000000
---
a/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/internal/executor/fixture/job/DetailedFooJob.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package
org.apache.shardingsphere.elasticjob.kernel.internal.executor.fixture.job;
-
-import lombok.Getter;
-import org.apache.shardingsphere.elasticjob.kernel.fixture.job.FooJob;
-import org.apache.shardingsphere.elasticjob.spi.param.ShardingContext;
-
-import java.util.Collection;
-import java.util.concurrent.CopyOnWriteArraySet;
-
-public final class DetailedFooJob implements FooJob {
-
- private final Collection<Integer> completedJobItems = new
CopyOnWriteArraySet<>();
-
- @Getter
- private volatile boolean completed;
-
- @Override
- public void foo(final ShardingContext shardingContext) {
- completedJobItems.add(shardingContext.getShardingItem());
- completed = completedJobItems.size() ==
shardingContext.getShardingTotalCount();
- }
-}
diff --git
a/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/internal/executor/item/JobItemExecutorFactoryTest.java
b/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/internal/executor/item/JobItemExecutorFactoryTest.java
index c4baf9080..b84d952c6 100644
---
a/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/internal/executor/item/JobItemExecutorFactoryTest.java
+++
b/kernel/src/test/java/org/apache/shardingsphere/elasticjob/kernel/internal/executor/item/JobItemExecutorFactoryTest.java
@@ -21,7 +21,7 @@ import
org.apache.shardingsphere.elasticjob.infra.exception.JobConfigurationExce
import
org.apache.shardingsphere.elasticjob.kernel.fixture.executor.ClassedFooJobExecutor;
import org.apache.shardingsphere.elasticjob.kernel.fixture.job.DetailedFooJob;
import org.apache.shardingsphere.elasticjob.kernel.fixture.job.FooJob;
-import
org.apache.shardingsphere.elasticjob.kernel.internal.executor.fixture.job.FailedJob;
+import org.apache.shardingsphere.elasticjob.kernel.fixture.job.FailedJob;
import org.junit.jupiter.api.Test;
import static org.hamcrest.CoreMatchers.instanceOf;
diff --git
a/kernel/src/test/resources/META-INF/services/org.apache.shardingsphere.elasticjob.spi.type.TypedJobItemExecutor
b/kernel/src/test/resources/META-INF/services/org.apache.shardingsphere.elasticjob.spi.type.TypedJobItemExecutor
index 2199d1f8f..d2dcc73fa 100644
---
a/kernel/src/test/resources/META-INF/services/org.apache.shardingsphere.elasticjob.spi.type.TypedJobItemExecutor
+++
b/kernel/src/test/resources/META-INF/services/org.apache.shardingsphere.elasticjob.spi.type.TypedJobItemExecutor
@@ -15,4 +15,4 @@
# limitations under the License.
#
-org.apache.shardingsphere.elasticjob.kernel.internal.executor.fixture.executor.TypedFooJobExecutor
+org.apache.shardingsphere.elasticjob.kernel.fixture.executor.TypedFooJobExecutor
