aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/main/java/com/google/devtools/build/lib/concurrent
diff options
context:
space:
mode:
authorGravatar laurentlb <laurentlb@google.com>2017-06-30 00:32:04 +0200
committerGravatar Marcel Hlopko <hlopko@google.com>2017-06-30 13:00:58 +0200
commit3d2a68c6da2a50a9e1bcf6615e83a43701cdf95d (patch)
tree31692a985d316e33733ab6993e529b8a08c206b6 /src/main/java/com/google/devtools/build/lib/concurrent
parent2d5eeab381713f99c8c8b7b80f3d447be847b548 (diff)
Automated conversion to Java 8
With a few manual fixes for readability. RELNOTES: None. PiperOrigin-RevId: 160582556
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/concurrent')
-rw-r--r--src/main/java/com/google/devtools/build/lib/concurrent/AbstractQueueVisitor.java9
-rw-r--r--src/main/java/com/google/devtools/build/lib/concurrent/Sharder.java9
-rw-r--r--src/main/java/com/google/devtools/build/lib/concurrent/ThrowableRecordingRunnableWrapper.java17
3 files changed, 9 insertions, 26 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/concurrent/AbstractQueueVisitor.java b/src/main/java/com/google/devtools/build/lib/concurrent/AbstractQueueVisitor.java
index 7c0809d431..3eeb9377ea 100644
--- a/src/main/java/com/google/devtools/build/lib/concurrent/AbstractQueueVisitor.java
+++ b/src/main/java/com/google/devtools/build/lib/concurrent/AbstractQueueVisitor.java
@@ -44,19 +44,14 @@ public class AbstractQueueVisitor implements QuiescingExecutor {
* ThreadPoolExecutor}.
*/
public static final Function<ExecutorParams, ThreadPoolExecutor> EXECUTOR_FACTORY =
- new Function<ExecutorParams, ThreadPoolExecutor>() {
- @Override
- public ThreadPoolExecutor apply(ExecutorParams p) {
- return new ThreadPoolExecutor(
+ p ->
+ new ThreadPoolExecutor(
/*corePoolSize=*/ p.getParallelism(),
/*maximumPoolSize=*/ p.getParallelism(),
p.getKeepAliveTime(),
p.getUnits(),
p.getWorkQueue(),
new ThreadFactoryBuilder().setNameFormat(p.getPoolName() + " %d").build());
- }
- };
-
/**
* The most severe unhandled exception thrown by a worker thread, according to
* {@link #errorClassifier}. This exception gets propagated to the calling thread of
diff --git a/src/main/java/com/google/devtools/build/lib/concurrent/Sharder.java b/src/main/java/com/google/devtools/build/lib/concurrent/Sharder.java
index d43c0ffb57..008b9c78f7 100644
--- a/src/main/java/com/google/devtools/build/lib/concurrent/Sharder.java
+++ b/src/main/java/com/google/devtools/build/lib/concurrent/Sharder.java
@@ -13,11 +13,9 @@
// limitations under the License.
package com.google.devtools.build.lib.concurrent;
-import com.google.common.base.Predicate;
import com.google.common.collect.Iterables;
import com.google.common.collect.Lists;
import com.google.devtools.build.lib.util.Preconditions;
-
import java.util.Collections;
import java.util.Iterator;
import java.util.List;
@@ -61,11 +59,6 @@ public final class Sharder<T> implements Iterable<List<T>> {
@Override
public Iterator<List<T>> iterator() {
- return Iterables.filter(shards, new Predicate<List<T>>() {
- @Override
- public boolean apply(List<T> list) {
- return !list.isEmpty();
- }
- }).iterator();
+ return Iterables.filter(shards, list -> !list.isEmpty()).iterator();
}
}
diff --git a/src/main/java/com/google/devtools/build/lib/concurrent/ThrowableRecordingRunnableWrapper.java b/src/main/java/com/google/devtools/build/lib/concurrent/ThrowableRecordingRunnableWrapper.java
index 870d92b781..f66e23070f 100644
--- a/src/main/java/com/google/devtools/build/lib/concurrent/ThrowableRecordingRunnableWrapper.java
+++ b/src/main/java/com/google/devtools/build/lib/concurrent/ThrowableRecordingRunnableWrapper.java
@@ -14,11 +14,9 @@
package com.google.devtools.build.lib.concurrent;
import com.google.devtools.build.lib.util.Preconditions;
-
import java.util.concurrent.atomic.AtomicReference;
import java.util.logging.Level;
import java.util.logging.Logger;
-
import javax.annotation.Nullable;
/**
@@ -43,15 +41,12 @@ public class ThrowableRecordingRunnableWrapper {
}
public Runnable wrap(final Runnable runnable) {
- return new Runnable() {
- @Override
- public void run() {
- try {
- runnable.run();
- } catch (Throwable error) {
- errorRef.compareAndSet(null, error);
- LOG.log(Level.SEVERE, "Error thrown by runnable in " + name, error);
- }
+ return () -> {
+ try {
+ runnable.run();
+ } catch (Throwable error) {
+ errorRef.compareAndSet(null, error);
+ LOG.log(Level.SEVERE, "Error thrown by runnable in " + name, error);
}
};
}