Skip to content

Commit 7c6d742

Browse files
committed
+ pulled back to be Java 8 compatible
1 parent c826e15 commit 7c6d742

File tree

7 files changed

+36
-30
lines changed

7 files changed

+36
-30
lines changed

src/main/java/conseq4j/execute/ConseqExecutor.java

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -24,15 +24,16 @@
2424

2525
package conseq4j.execute;
2626

27-
import conseq4j.Terminable;
28-
import lombok.NonNull;
29-
import lombok.ToString;
3027
import static org.awaitility.Awaitility.await;
31-
import javax.annotation.Nonnull;
32-
import javax.annotation.concurrent.ThreadSafe;
28+
29+
import conseq4j.Terminable;
3330
import java.util.List;
3431
import java.util.Map;
3532
import java.util.concurrent.*;
33+
import javax.annotation.Nonnull;
34+
import javax.annotation.concurrent.ThreadSafe;
35+
import lombok.NonNull;
36+
import lombok.ToString;
3637

3738
/**
3839
* Relies on the JDK {@link CompletableFuture} as the sequential executor of the tasks under the same sequence key.
@@ -171,10 +172,10 @@ int estimateActiveExecutorCount() {
171172
@Override
172173
public void terminate() {
173174
new Thread(() -> {
174-
workerExecutorService.shutdown();
175-
await().forever().until(activeSequentialTasks::isEmpty);
176-
adminService.shutdown();
177-
})
175+
workerExecutorService.shutdown();
176+
await().forever().until(activeSequentialTasks::isEmpty);
177+
adminService.shutdown();
178+
})
178179
.start();
179180
}
180181

src/main/java/conseq4j/summon/ConseqServiceFactory.java

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,19 +23,20 @@
2323
*/
2424
package conseq4j.summon;
2525

26-
import conseq4j.Terminable;
2726
import static java.lang.Math.floorMod;
28-
import lombok.NonNull;
29-
import lombok.ToString;
30-
import lombok.experimental.Delegate;
3127
import static org.awaitility.Awaitility.await;
32-
import javax.annotation.Nonnull;
33-
import javax.annotation.concurrent.ThreadSafe;
28+
29+
import conseq4j.Terminable;
3430
import java.util.Collection;
3531
import java.util.List;
3632
import java.util.Objects;
3733
import java.util.concurrent.*;
3834
import java.util.stream.Collectors;
35+
import javax.annotation.Nonnull;
36+
import javax.annotation.concurrent.ThreadSafe;
37+
import lombok.NonNull;
38+
import lombok.ToString;
39+
import lombok.experimental.Delegate;
3940

4041
/**
4142
* A factory to produce sequential executors of type {@link ExecutorService} with an upper-bound global execution

src/test/java/conseq4j/SpyingTask.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,13 +23,14 @@
2323
*/
2424
package conseq4j;
2525

26-
import lombok.Getter;
27-
import lombok.ToString;
2826
import static org.awaitility.Awaitility.await;
27+
2928
import java.time.Duration;
3029
import java.util.Random;
3130
import java.util.concurrent.Callable;
3231
import java.util.concurrent.Executors;
32+
import lombok.Getter;
33+
import lombok.ToString;
3334

3435
/**
3536
* @author Qingtian Wang

src/test/java/conseq4j/TestUtils.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,17 +25,17 @@
2525
package conseq4j;
2626

2727
import static java.util.stream.Collectors.toList;
28-
import org.awaitility.Awaitility;
2928
import static org.junit.jupiter.api.Assertions.assertTrue;
29+
3030
import java.util.List;
3131
import java.util.concurrent.ExecutionException;
3232
import java.util.concurrent.Future;
3333
import java.util.stream.IntStream;
34+
import org.awaitility.Awaitility;
3435

3536
public class TestUtils {
3637

37-
private TestUtils() {
38-
}
38+
private TestUtils() {}
3939

4040
public static int actualExecutionThreadCount(List<SpyingTask> tasks) {
4141
return (int) tasks.stream().map(SpyingTask::getRunThreadName).distinct().count();

src/test/java/conseq4j/execute/ConseqExecutorTest.java

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,20 +24,21 @@
2424

2525
package conseq4j.execute;
2626

27-
import com.google.common.collect.Range;
28-
import conseq4j.SpyingTask;
29-
import conseq4j.TestUtils;
3027
import static conseq4j.TestUtils.awaitAllComplete;
3128
import static conseq4j.TestUtils.createSpyingTasks;
3229
import static java.util.stream.Collectors.toList;
3330
import static org.awaitility.Awaitility.await;
3431
import static org.junit.jupiter.api.Assertions.assertEquals;
3532
import static org.junit.jupiter.api.Assertions.assertTrue;
36-
import org.junit.jupiter.api.Test;
33+
34+
import com.google.common.collect.Range;
35+
import conseq4j.SpyingTask;
36+
import conseq4j.TestUtils;
3737
import java.util.ArrayList;
3838
import java.util.List;
3939
import java.util.UUID;
4040
import java.util.concurrent.Future;
41+
import org.junit.jupiter.api.Test;
4142

4243
class ConseqExecutorTest {
4344
private static final int TASK_COUNT = 100;

src/test/java/conseq4j/summon/ConfigTest.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,12 @@
2525

2626
import static org.junit.jupiter.api.Assertions.assertEquals;
2727
import static org.junit.jupiter.api.Assertions.assertSame;
28-
import org.junit.jupiter.api.Test;
28+
2929
import java.util.Random;
3030
import java.util.UUID;
3131
import java.util.concurrent.Executor;
3232
import java.util.concurrent.ExecutorService;
33+
import org.junit.jupiter.api.Test;
3334

3435
/**
3536
* @author q3769

src/test/java/conseq4j/summon/ConseqServiceFactoryTest.java

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,22 +23,23 @@
2323
*/
2424
package conseq4j.summon;
2525

26-
import com.google.common.collect.Range;
27-
import conseq4j.SpyingTask;
28-
import conseq4j.TestUtils;
2926
import static conseq4j.TestUtils.createSpyingTasks;
3027
import static conseq4j.TestUtils.getIfAllCompleteNormal;
3128
import static java.util.stream.Collectors.toList;
3229
import static org.junit.jupiter.api.Assertions.*;
33-
import org.junit.jupiter.api.Nested;
34-
import org.junit.jupiter.api.Test;
30+
31+
import com.google.common.collect.Range;
32+
import conseq4j.SpyingTask;
33+
import conseq4j.TestUtils;
3534
import java.util.List;
3635
import java.util.UUID;
3736
import java.util.concurrent.Callable;
3837
import java.util.concurrent.ExecutionException;
3938
import java.util.concurrent.ExecutorService;
4039
import java.util.concurrent.Future;
4140
import java.util.stream.Collectors;
41+
import org.junit.jupiter.api.Nested;
42+
import org.junit.jupiter.api.Test;
4243

4344
/**
4445
* @author Qingtian Wang

0 commit comments

Comments
 (0)