Visitar URL original
Cleaning up generics in SequentialExecutorService (#4982) · googleapis/google-cloud-java@d556ce4 · GitHub
Skip to content

Commit d556ce4

Browse files
sduskissduskis
authored
Cleaning up generics in SequentialExecutorService (#4982)
1 parent 708d785 commit d556ce4

3 files changed

Lines changed: 16 additions & 16 deletions

File tree

‎google-cloud-clients/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/Publisher.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ public class Publisher {
9999
private final PublisherStub publisherStub;
100100

101101
private final ScheduledExecutorService executor;
102-
private final SequentialExecutorService<PublishResponse> sequentialExecutor;
102+
private final SequentialExecutorService sequentialExecutor;
103103
private final AtomicBoolean shutdown;
104104
private final List<AutoCloseable> closeables;
105105
private final MessageWaiter messagesWaiter;
@@ -127,7 +127,7 @@ private Publisher(Builder builder) throws IOException {
127127
messagesBatchLock = new ReentrantLock();
128128
activeAlarm = new AtomicBoolean(false);
129129
executor = builder.executorProvider.getExecutor();
130-
sequentialExecutor = new SequentialExecutorService<>(executor);
130+
sequentialExecutor = new SequentialExecutorService(executor);
131131
if (builder.executorProvider.shouldAutoClose()) {
132132
closeables =
133133
Collections.<AutoCloseable>singletonList(new ExecutorAsBackgroundResource(executor));
@@ -398,9 +398,9 @@ public void run() {
398398
executor.execute(task);
399399
} else {
400400
// If ordering key is specified, publish the batch using the sequential executor.
401-
Callable<ApiFuture> func =
402-
new Callable<ApiFuture>() {
403-
public ApiFuture call() {
401+
Callable<ApiFuture<PublishResponse>> func =
402+
new Callable<ApiFuture<PublishResponse>>() {
403+
public ApiFuture<PublishResponse> call() {
404404
return publishCall(outstandingBatch);
405405
}
406406
};

‎google-cloud-clients/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/SequentialExecutorService.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ interface CancellableRunnable extends Runnable {
4141
* key will be run only when its predecessor has been completed while tasks with different keys can
4242
* be run in parallel.
4343
*/
44-
final class SequentialExecutorService<T> {
44+
final class SequentialExecutorService {
4545
private static final Logger logger = Logger.getLogger(SequentialExecutorService.class.getName());
4646

4747
private final CallbackExecutor callbackExecutor;
@@ -56,7 +56,7 @@ final class SequentialExecutorService<T> {
5656
* Runs asynchronous {@code Callable} tasks sequentially. If one of the tasks fails, other tasks
5757
* with the same key that have not been executed will be cancelled.
5858
*/
59-
ApiFuture<T> submit(final String key, final Callable<ApiFuture> callable) {
59+
<T> ApiFuture<T> submit(final String key, final Callable<ApiFuture<T>> callable) {
6060
return callbackExecutor.submit(key, callable);
6161
}
6262

@@ -146,7 +146,7 @@ private static class CallbackExecutor extends SequentialExecutor {
146146
super(executor);
147147
}
148148

149-
<T> ApiFuture<T> submit(final String key, final Callable<ApiFuture> callable) {
149+
<T> ApiFuture<T> submit(final String key, final Callable<ApiFuture<T>> callable) {
150150
final SettableApiFuture<T> future = SettableApiFuture.create();
151151
execute(
152152
key,

‎google-cloud-clients/google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/v1/SequentialExecutorServiceTest.java‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -46,9 +46,9 @@ public final class SequentialExecutorServiceTest {
4646
.setExecutorThreadCount(5 * Runtime.getRuntime().availableProcessors())
4747
.build();
4848

49-
static class AsyncTaskCallable implements Callable<ApiFuture> {
49+
static class AsyncTaskCallable implements Callable<ApiFuture<String>> {
5050
boolean isCalled = false;
51-
SettableApiFuture<String> result = SettableApiFuture.<String>create();
51+
SettableApiFuture<String> result = SettableApiFuture.create();
5252

5353
@Override
5454
public ApiFuture<String> call() {
@@ -71,8 +71,8 @@ public void finish() {
7171

7272
@Test
7373
public void testExecutorRunsNextTaskWhenPrevResponseReceived() throws Exception {
74-
SequentialExecutorService<String> sequentialExecutorService =
75-
new SequentialExecutorService<>(executorProvider.getExecutor());
74+
SequentialExecutorService sequentialExecutorService =
75+
new SequentialExecutorService(executorProvider.getExecutor());
7676
AsyncTaskCallable callable1 = new AsyncTaskCallable();
7777
AsyncTaskCallable callable2 = new AsyncTaskCallable();
7878
AsyncTaskCallable callable3 = new AsyncTaskCallable();
@@ -97,8 +97,8 @@ public void testExecutorRunsNextTaskWhenPrevResponseReceived() throws Exception
9797

9898
@Test
9999
public void testExecutorRunsDifferentKeySimultaneously() throws Exception {
100-
SequentialExecutorService<String> sequentialExecutorService =
101-
new SequentialExecutorService<>(executorProvider.getExecutor());
100+
SequentialExecutorService sequentialExecutorService =
101+
new SequentialExecutorService(executorProvider.getExecutor());
102102
AsyncTaskCallable callable1 = new AsyncTaskCallable();
103103
AsyncTaskCallable callable2 = new AsyncTaskCallable();
104104
AsyncTaskCallable callable3 = new AsyncTaskCallable();
@@ -126,8 +126,8 @@ public void testExecutorRunsDifferentKeySimultaneously() throws Exception {
126126

127127
@Test
128128
public void testExecutorCancelsAllTasksWhenOneFailed() throws Exception {
129-
SequentialExecutorService<String> sequentialExecutorService =
130-
new SequentialExecutorService<>(executorProvider.getExecutor());
129+
SequentialExecutorService sequentialExecutorService =
130+
new SequentialExecutorService(executorProvider.getExecutor());
131131
AsyncTaskCallable callable1 = new AsyncTaskCallable();
132132
AsyncTaskCallable callable2 = new AsyncTaskCallable();
133133
AsyncTaskCallable callable3 = new AsyncTaskCallable();

0 commit comments

Comments
 (0)