This is an automated email from the ASF dual-hosted git repository.
asf-gitbox-commits pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/groovy.git
The following commit(s) were added to refs/heads/master by this push:
new 98c0d86fde Trivial refactor: Remove unnecessary qualification
98c0d86fde is described below
commit 98c0d86fdedcda0cf2ad8247e2bba737a360f6ca
Author: Daniel Sun <[email protected]>
AuthorDate: Sun May 31 12:16:06 2026 +0900
Trivial refactor: Remove unnecessary qualification
---
src/main/java/groovy/concurrent/Agent.java | 41 +++++++++++++---------
src/main/java/groovy/concurrent/AsyncChannel.java | 3 +-
.../concurrent/AwaitableAdapterRegistry.java | 3 +-
.../java/groovy/concurrent/DataflowVariable.java | 6 ++--
.../groovy/runtime/async/DefaultAsyncScope.java | 3 +-
5 files changed, 33 insertions(+), 23 deletions(-)
diff --git a/src/main/java/groovy/concurrent/Agent.java
b/src/main/java/groovy/concurrent/Agent.java
index 977caa7cdf..a8041c9c40 100644
--- a/src/main/java/groovy/concurrent/Agent.java
+++ b/src/main/java/groovy/concurrent/Agent.java
@@ -21,14 +21,23 @@ package groovy.concurrent;
import org.apache.groovy.runtime.async.AsyncSupport;
import org.apache.groovy.runtime.async.GroovyPromise;
+import java.util.Collection;
+import java.util.List;
import java.util.Objects;
+import java.util.Queue;
+import java.util.concurrent.Callable;
import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.ConcurrentLinkedQueue;
import java.util.concurrent.Executor;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import java.util.concurrent.Flow;
+import java.util.concurrent.Future;
+import java.util.concurrent.FutureTask;
import java.util.concurrent.RejectedExecutionException;
import java.util.concurrent.SubmissionPublisher;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.locks.ReentrantReadWriteLock;
import java.util.function.Function;
@@ -311,8 +320,8 @@ public final class Agent<T> {
*/
private static final class SerialExecutor implements ExecutorService {
private final Executor delegate;
- private final java.util.Queue<Runnable> queue = new
java.util.concurrent.ConcurrentLinkedQueue<>();
- private final java.util.concurrent.atomic.AtomicBoolean active = new
java.util.concurrent.atomic.AtomicBoolean();
+ private final Queue<Runnable> queue = new ConcurrentLinkedQueue<>();
+ private final AtomicBoolean active = new AtomicBoolean();
private volatile boolean shutdown;
/**
@@ -331,7 +340,7 @@ public final class Agent<T> {
*/
@Override
public void execute(Runnable command) {
- if (shutdown) throw new
java.util.concurrent.RejectedExecutionException("shutdown");
+ if (shutdown) throw new RejectedExecutionException("shutdown");
queue.add(command);
scheduleNext();
}
@@ -368,9 +377,9 @@ public final class Agent<T> {
* @return an empty task list
*/
@Override
- public java.util.List<Runnable> shutdownNow() {
+ public List<Runnable> shutdownNow() {
shutdown = true;
- return java.util.List.of();
+ return List.of();
}
/**
@@ -394,7 +403,7 @@ public final class Agent<T> {
* @return {@code true} if this executor is terminated
*/
@Override
- public boolean awaitTermination(long timeout,
java.util.concurrent.TimeUnit unit) {
+ public boolean awaitTermination(long timeout, TimeUnit unit) {
return isTerminated();
}
@@ -406,8 +415,8 @@ public final class Agent<T> {
* @return a future for the submitted task
*/
@Override
- public <T> java.util.concurrent.Future<T>
submit(java.util.concurrent.Callable<T> task) {
- java.util.concurrent.FutureTask<T> ft = new
java.util.concurrent.FutureTask<>(task);
+ public <T> Future<T> submit(Callable<T> task) {
+ FutureTask<T> ft = new FutureTask<>(task);
execute(ft);
return ft;
}
@@ -421,8 +430,8 @@ public final class Agent<T> {
* @return a future for the submitted task
*/
@Override
- public <T> java.util.concurrent.Future<T> submit(Runnable task, T
result) {
- java.util.concurrent.FutureTask<T> ft = new
java.util.concurrent.FutureTask<>(task, result);
+ public <T> Future<T> submit(Runnable task, T result) {
+ FutureTask<T> ft = new FutureTask<>(task, result);
execute(ft);
return ft;
}
@@ -434,8 +443,8 @@ public final class Agent<T> {
* @return a future for the submitted task
*/
@Override
- public java.util.concurrent.Future<?> submit(Runnable task) {
- java.util.concurrent.FutureTask<Void> ft = new
java.util.concurrent.FutureTask<>(task, null);
+ public Future<?> submit(Runnable task) {
+ FutureTask<Void> ft = new FutureTask<>(task, null);
execute(ft);
return ft;
}
@@ -449,7 +458,7 @@ public final class Agent<T> {
* @throws UnsupportedOperationException always
*/
@Override
- public <T> java.util.List<java.util.concurrent.Future<T>>
invokeAll(java.util.Collection<? extends java.util.concurrent.Callable<T>>
tasks) {
+ public <T> List<Future<T>> invokeAll(Collection<? extends Callable<T>>
tasks) {
throw new UnsupportedOperationException();
}
@@ -464,7 +473,7 @@ public final class Agent<T> {
* @throws UnsupportedOperationException always
*/
@Override
- public <T> java.util.List<java.util.concurrent.Future<T>>
invokeAll(java.util.Collection<? extends java.util.concurrent.Callable<T>>
tasks, long timeout, java.util.concurrent.TimeUnit unit) {
+ public <T> List<Future<T>> invokeAll(Collection<? extends Callable<T>>
tasks, long timeout, TimeUnit unit) {
throw new UnsupportedOperationException();
}
@@ -477,7 +486,7 @@ public final class Agent<T> {
* @throws UnsupportedOperationException always
*/
@Override
- public <T> T invokeAny(java.util.Collection<? extends
java.util.concurrent.Callable<T>> tasks) {
+ public <T> T invokeAny(Collection<? extends Callable<T>> tasks) {
throw new UnsupportedOperationException();
}
@@ -492,7 +501,7 @@ public final class Agent<T> {
* @throws UnsupportedOperationException always
*/
@Override
- public <T> T invokeAny(java.util.Collection<? extends
java.util.concurrent.Callable<T>> tasks, long timeout,
java.util.concurrent.TimeUnit unit) {
+ public <T> T invokeAny(Collection<? extends Callable<T>> tasks, long
timeout, TimeUnit unit) {
throw new UnsupportedOperationException();
}
}
diff --git a/src/main/java/groovy/concurrent/AsyncChannel.java
b/src/main/java/groovy/concurrent/AsyncChannel.java
index 6f1ed839fb..4c28ada7c6 100644
--- a/src/main/java/groovy/concurrent/AsyncChannel.java
+++ b/src/main/java/groovy/concurrent/AsyncChannel.java
@@ -22,6 +22,7 @@ import org.apache.groovy.runtime.async.AsyncSupport;
import org.apache.groovy.runtime.async.DefaultAsyncChannel;
import java.util.List;
+import java.util.concurrent.atomic.AtomicInteger;
import java.util.function.Function;
import java.util.function.Predicate;
@@ -185,7 +186,7 @@ public interface AsyncChannel<T> extends Iterable<T> {
*/
default AsyncChannel<T> merge(AsyncChannel<? extends T> other) {
AsyncChannel<T> out = create(getCapacity());
- var remaining = new java.util.concurrent.atomic.AtomicInteger(2);
+ var remaining = new AtomicInteger(2);
Runnable closer = () -> {
if (remaining.decrementAndGet() == 0) out.close();
};
diff --git a/src/main/java/groovy/concurrent/AwaitableAdapterRegistry.java
b/src/main/java/groovy/concurrent/AwaitableAdapterRegistry.java
index 0121243ef2..991238b931 100644
--- a/src/main/java/groovy/concurrent/AwaitableAdapterRegistry.java
+++ b/src/main/java/groovy/concurrent/AwaitableAdapterRegistry.java
@@ -29,6 +29,7 @@ import java.util.ServiceLoader;
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.CompletionStage;
import java.util.concurrent.CopyOnWriteArrayList;
+import java.util.concurrent.ExecutionException;
import java.util.concurrent.Future;
/**
@@ -183,7 +184,7 @@ public final class AwaitableAdapterRegistry {
CompletableFuture.runAsync(() -> {
try {
cf.complete(future.get());
- } catch (java.util.concurrent.ExecutionException e) {
+ } catch (ExecutionException e) {
cf.completeExceptionally(e.getCause());
} catch (Throwable e) {
cf.completeExceptionally(e);
diff --git a/src/main/java/groovy/concurrent/DataflowVariable.java
b/src/main/java/groovy/concurrent/DataflowVariable.java
index 32211ca112..70a441b9c8 100644
--- a/src/main/java/groovy/concurrent/DataflowVariable.java
+++ b/src/main/java/groovy/concurrent/DataflowVariable.java
@@ -21,12 +21,10 @@ package groovy.concurrent;
import org.apache.groovy.runtime.async.GroovyPromise;
import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.CompletionException;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.TimeoutException;
-import java.util.function.BiConsumer;
-import java.util.function.BiFunction;
-import java.util.function.Consumer;
import java.util.function.Function;
/**
@@ -83,7 +81,7 @@ public class DataflowVariable<T> implements Awaitable<T> {
String current;
try {
current = String.valueOf(future.getNow(null));
- } catch (java.util.concurrent.CompletionException e) {
+ } catch (CompletionException e) {
current = "error: " + e.getCause();
}
throw new IllegalStateException(
diff --git
a/src/main/java/org/apache/groovy/runtime/async/DefaultAsyncScope.java
b/src/main/java/org/apache/groovy/runtime/async/DefaultAsyncScope.java
index 818f405188..18d6d1c931 100644
--- a/src/main/java/org/apache/groovy/runtime/async/DefaultAsyncScope.java
+++ b/src/main/java/org/apache/groovy/runtime/async/DefaultAsyncScope.java
@@ -32,6 +32,7 @@ import java.util.concurrent.Executor;
import java.util.concurrent.ScheduledFuture;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.TimeoutException;
+import java.util.concurrent.atomic.AtomicBoolean;
import java.util.function.Function;
import java.util.function.Supplier;
@@ -265,7 +266,7 @@ public final class DefaultAsyncScope implements AsyncScope {
Function<AsyncScope, T> body) throws
TimeoutException {
Objects.requireNonNull(timeout, "timeout must not be null");
Objects.requireNonNull(body, "body must not be null");
- var timedOut = new java.util.concurrent.atomic.AtomicBoolean(false);
+ var timedOut = new AtomicBoolean(false);
Thread bodyThread = Thread.currentThread();
try (DefaultAsyncScope scope = new DefaultAsyncScope(executor)) {
ScheduledFuture<?> timer = AsyncSupport.getScheduler().schedule(()
-> {
