This is an automated email from the ASF dual-hosted git repository.
kturner pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/fluo.git
The following commit(s) were added to refs/heads/master by this push:
new f39ac03 Replace anonymous types with lambda (#1040)
f39ac03 is described below
commit f39ac03e8f16a7a33842a5d518b7aead724efdb9
Author: Christopher McTague <[email protected]>
AuthorDate: Mon Jul 9 09:17:00 2018 -0400
Replace anonymous types with lambda (#1040)
---
.../apache/fluo/api/observer/ObserverProvider.java | 8 ++-----
modules/cluster/pom.xml | 5 -----
.../org/apache/fluo/cluster/runner/AppRunner.java | 8 +------
.../org/apache/fluo/core/async/CommitManager.java | 10 +++------
.../apache/fluo/core/impl/SharedBatchWriter.java | 9 +++-----
.../org/apache/fluo/core/impl/TransactorCache.java | 9 +++-----
.../org/apache/fluo/core/impl/VisibilityCache.java | 7 +-----
.../fluo/core/impl/scanner/ScannerBuilderImpl.java | 9 +++-----
.../fluo/core/log/TracingScannerBuilder.java | 17 ++++++---------
.../org/apache/fluo/core/metrics/ReporterUtil.java | 16 ++++++--------
.../org/apache/fluo/core/oracle/OracleServer.java | 10 +--------
.../org/apache/fluo/core/util/CuratorUtil.java | 11 ++++------
.../main/java/org/apache/fluo/core/util/Halt.java | 25 ++++++----------------
.../fluo/core/worker/NotificationProcessor.java | 9 ++------
.../fluo/integration/impl/ParallelScannerIT.java | 15 ++++++-------
15 files changed, 48 insertions(+), 120 deletions(-)
diff --git
a/modules/api/src/main/java/org/apache/fluo/api/observer/ObserverProvider.java
b/modules/api/src/main/java/org/apache/fluo/api/observer/ObserverProvider.java
index 95438d6..5da1862 100644
---
a/modules/api/src/main/java/org/apache/fluo/api/observer/ObserverProvider.java
+++
b/modules/api/src/main/java/org/apache/fluo/api/observer/ObserverProvider.java
@@ -137,12 +137,8 @@ public interface ObserverProvider {
* @param colRegistry register all observed columns with this consumer
*/
default void provideColumns(BiConsumer<Column, NotificationType>
colRegistry, Context ctx) {
- Registry or = new Registry() {
- @Override
- public IdentityOption forColumn(Column observedColumn, NotificationType
ntfyType) {
- return new ColumnProviderRegistry(observedColumn, ntfyType,
colRegistry);
- }
- };
+ Registry or = (observedColumn, ntfyType) -> new
ColumnProviderRegistry(observedColumn, ntfyType,
+ colRegistry);
provide(or, ctx);
}
diff --git a/modules/cluster/pom.xml b/modules/cluster/pom.xml
index 68f2a1d..4fe810e 100644
--- a/modules/cluster/pom.xml
+++ b/modules/cluster/pom.xml
@@ -51,11 +51,6 @@
<version>4.0</version>
</dependency>
<dependency>
- <groupId>javax.inject</groupId>
- <artifactId>javax.inject</artifactId>
- <version>1</version>
- </dependency>
- <dependency>
<groupId>org.apache.accumulo</groupId>
<artifactId>accumulo-core</artifactId>
<exclusions>
diff --git
a/modules/cluster/src/main/java/org/apache/fluo/cluster/runner/AppRunner.java
b/modules/cluster/src/main/java/org/apache/fluo/cluster/runner/AppRunner.java
index 355e16b..8621a90 100644
---
a/modules/cluster/src/main/java/org/apache/fluo/cluster/runner/AppRunner.java
+++
b/modules/cluster/src/main/java/org/apache/fluo/cluster/runner/AppRunner.java
@@ -157,13 +157,7 @@ public abstract class AppRunner {
@Override
protected void configure() {
requestStaticInjection(clazz);
- bind(FluoConfiguration.class).toProvider(new
Provider<FluoConfiguration>() {
- @Override
- public FluoConfiguration get() {
- // TODO Auto-generated method stub
- return fluoConfig;
- }
- });
+ bind(FluoConfiguration.class).toProvider((Provider<FluoConfiguration>)
() -> fluoConfig);
}
}
diff --git
a/modules/core/src/main/java/org/apache/fluo/core/async/CommitManager.java
b/modules/core/src/main/java/org/apache/fluo/core/async/CommitManager.java
index 1b589cf..ece178c 100644
--- a/modules/core/src/main/java/org/apache/fluo/core/async/CommitManager.java
+++ b/modules/core/src/main/java/org/apache/fluo/core/async/CommitManager.java
@@ -44,13 +44,9 @@ public class CommitManager {
memoryLimit = new
Limit(FluoConfigurationImpl.getTxCommitMemory(env.getConfiguration()));
commitingTransactions = new AtomicInteger(0);
- env.getSharedResources().getMetricRegistry()
- .register(env.getMetricNames().getCommitsProcessing(), new
Gauge<Integer>() {
- @Override
- public Integer getValue() {
- return commitingTransactions.get();
- }
- });
+ env.getSharedResources().getMetricRegistry().register(
+ env.getMetricNames().getCommitsProcessing(),
+ (Gauge<Integer>) () -> commitingTransactions.get());
}
diff --git
a/modules/core/src/main/java/org/apache/fluo/core/impl/SharedBatchWriter.java
b/modules/core/src/main/java/org/apache/fluo/core/impl/SharedBatchWriter.java
index d87e9a7..012f2d3 100644
---
a/modules/core/src/main/java/org/apache/fluo/core/impl/SharedBatchWriter.java
+++
b/modules/core/src/main/java/org/apache/fluo/core/impl/SharedBatchWriter.java
@@ -141,12 +141,9 @@ public class SharedBatchWriter {
this.bw = bw;
this.mutQueue = new ArrayBlockingQueue<>(100000);
Thread thread = new FluoThreadFactory("sharedBW").newThread(new
FlushTask());
- thread.setUncaughtExceptionHandler(new UncaughtExceptionHandler() {
- @Override
- public void uncaughtException(Thread t, Throwable e) {
- System.err.println("Uncaught exception in shared batch writer");
- e.printStackTrace();
- }
+ thread.setUncaughtExceptionHandler((t, e) -> {
+ System.err.println("Uncaught exception in shared batch writer");
+ e.printStackTrace();
});
thread.setDaemon(true);
thread.start();
diff --git
a/modules/core/src/main/java/org/apache/fluo/core/impl/TransactorCache.java
b/modules/core/src/main/java/org/apache/fluo/core/impl/TransactorCache.java
index 2831329..17105a9 100644
--- a/modules/core/src/main/java/org/apache/fluo/core/impl/TransactorCache.java
+++ b/modules/core/src/main/java/org/apache/fluo/core/impl/TransactorCache.java
@@ -77,12 +77,9 @@ public class TransactorCache implements AutoCloseable {
public void addTimedoutTransactor(final Long transactorId, final long lockTs,
final Long startTime) {
try {
- AtomicLong cachedLockTs = timeoutCache.get(transactorId, new
Callable<AtomicLong>() {
- @Override
- public AtomicLong call() throws Exception {
- logTimedoutTransactor(transactorId, lockTs, startTime);
- return new AtomicLong(lockTs);
- }
+ AtomicLong cachedLockTs = timeoutCache.get(transactorId, () -> {
+ logTimedoutTransactor(transactorId, lockTs, startTime);
+ return new AtomicLong(lockTs);
});
long currVal = cachedLockTs.get();
diff --git
a/modules/core/src/main/java/org/apache/fluo/core/impl/VisibilityCache.java
b/modules/core/src/main/java/org/apache/fluo/core/impl/VisibilityCache.java
index 439b9a8..8cbcde3 100644
--- a/modules/core/src/main/java/org/apache/fluo/core/impl/VisibilityCache.java
+++ b/modules/core/src/main/java/org/apache/fluo/core/impl/VisibilityCache.java
@@ -66,12 +66,7 @@ public class VisibilityCache {
}
try {
- return visCache.get(colvis, new Callable<ColumnVisibility>() {
- @Override
- public ColumnVisibility call() throws Exception {
- return new ColumnVisibility(ByteUtil.toText(colvis));
- }
- });
+ return visCache.get(colvis, () -> new
ColumnVisibility(ByteUtil.toText(colvis)));
} catch (ExecutionException e) {
throw new RuntimeException(e);
}
diff --git
a/modules/core/src/main/java/org/apache/fluo/core/impl/scanner/ScannerBuilderImpl.java
b/modules/core/src/main/java/org/apache/fluo/core/impl/scanner/ScannerBuilderImpl.java
index 21db046..b6f4c6f 100644
---
a/modules/core/src/main/java/org/apache/fluo/core/impl/scanner/ScannerBuilderImpl.java
+++
b/modules/core/src/main/java/org/apache/fluo/core/impl/scanner/ScannerBuilderImpl.java
@@ -79,12 +79,9 @@ public class ScannerBuilderImpl implements ScannerBuilder {
@Override
public RowScannerBuilder byRow() {
- return new RowScannerBuilder() {
- @Override
- public RowScanner build() {
- SnapshotScanner snapScanner = tx.newSnapshotScanner(span, columns);
- return new RowScannerImpl(snapScanner, columns);
- }
+ return () -> {
+ SnapshotScanner snapScanner = tx.newSnapshotScanner(span, columns);
+ return new RowScannerImpl(snapScanner, columns);
};
}
}
diff --git
a/modules/core/src/main/java/org/apache/fluo/core/log/TracingScannerBuilder.java
b/modules/core/src/main/java/org/apache/fluo/core/log/TracingScannerBuilder.java
index 3964711..e0a9d8a 100644
---
a/modules/core/src/main/java/org/apache/fluo/core/log/TracingScannerBuilder.java
+++
b/modules/core/src/main/java/org/apache/fluo/core/log/TracingScannerBuilder.java
@@ -87,16 +87,13 @@ public class TracingScannerBuilder implements
ScannerBuilder {
@Override
public RowScannerBuilder byRow() {
String scanId = Integer.toHexString(Math.abs(Objects.hash(span, columns,
txid)));
- return new RowScannerBuilder() {
- @Override
- public RowScanner build() {
- log.trace("txid: {} scanId: {}
scanner().over({}).fetch({}).byRow().build()", txid, scanId,
- Hex.encNonAscii(span), Hex.encNonAscii(columns));
- if (TracingCellScanner.log.isTraceEnabled()) {
- return new TracingRowScanner(wrappedBuilder.byRow().build(), txid,
scanId);
- } else {
- return wrappedBuilder.byRow().build();
- }
+ return () -> {
+ log.trace("txid: {} scanId: {}
scanner().over({}).fetch({}).byRow().build()", txid, scanId,
+ Hex.encNonAscii(span), Hex.encNonAscii(columns));
+ if (TracingCellScanner.log.isTraceEnabled()) {
+ return new TracingRowScanner(wrappedBuilder.byRow().build(), txid,
scanId);
+ } else {
+ return wrappedBuilder.byRow().build();
}
};
}
diff --git
a/modules/core/src/main/java/org/apache/fluo/core/metrics/ReporterUtil.java
b/modules/core/src/main/java/org/apache/fluo/core/metrics/ReporterUtil.java
index f40e122..7b940ae 100644
--- a/modules/core/src/main/java/org/apache/fluo/core/metrics/ReporterUtil.java
+++ b/modules/core/src/main/java/org/apache/fluo/core/metrics/ReporterUtil.java
@@ -74,16 +74,12 @@ public class ReporterUtil {
log.info("Started {} metrics reporters", allReporters.size());
- return new AutoCloseable() {
-
- @Override
- public void close() {
- for (AutoCloseable closeable : allReporters) {
- try {
- closeable.close();
- } catch (Exception e) {
- e.printStackTrace();
- }
+ return () -> {
+ for (AutoCloseable closeable : allReporters) {
+ try {
+ closeable.close();
+ } catch (Exception e) {
+ e.printStackTrace();
}
}
};
diff --git
a/modules/core/src/main/java/org/apache/fluo/core/oracle/OracleServer.java
b/modules/core/src/main/java/org/apache/fluo/core/oracle/OracleServer.java
index 0c35240..7bb6b10 100644
--- a/modules/core/src/main/java/org/apache/fluo/core/oracle/OracleServer.java
+++ b/modules/core/src/main/java/org/apache/fluo/core/oracle/OracleServer.java
@@ -299,15 +299,7 @@ public class OracleServer implements OracleService.Iface,
PathChildrenCacheListe
serverArgs.outputProtocolFactory(new TCompactProtocol.Factory());
server = new THsHaServer(serverArgs);
- Runnable st = new Runnable() {
-
- @Override
- public void run() {
- server.serve();
- }
- };
-
- serverThread = new Thread(st);
+ serverThread = new Thread(server::serve);
serverThread.setDaemon(true);
serverThread.start();
diff --git
a/modules/core/src/main/java/org/apache/fluo/core/util/CuratorUtil.java
b/modules/core/src/main/java/org/apache/fluo/core/util/CuratorUtil.java
index 1aa2d94..ffaad60 100644
--- a/modules/core/src/main/java/org/apache/fluo/core/util/CuratorUtil.java
+++ b/modules/core/src/main/java/org/apache/fluo/core/util/CuratorUtil.java
@@ -193,13 +193,10 @@ public class CuratorUtil {
final String uuid = new String(uuidBytes, StandardCharsets.UTF_8);
final NodeCache nodeCache = new NodeCache(curator,
ZookeeperPath.CONFIG_FLUO_APPLICATION_ID);
- nodeCache.getListenable().addListener(new NodeCacheListener() {
- @Override
- public void nodeChanged() throws Exception {
- ChildData node = nodeCache.getCurrentData();
- if (node == null || !uuid.equals(new String(node.getData(),
StandardCharsets.UTF_8))) {
- Halt.halt("Fluo Application UUID has changed or disappeared");
- }
+ nodeCache.getListenable().addListener(() -> {
+ ChildData node = nodeCache.getCurrentData();
+ if (node == null || !uuid.equals(new String(node.getData(),
StandardCharsets.UTF_8))) {
+ Halt.halt("Fluo Application UUID has changed or disappeared");
}
});
nodeCache.start();
diff --git a/modules/core/src/main/java/org/apache/fluo/core/util/Halt.java
b/modules/core/src/main/java/org/apache/fluo/core/util/Halt.java
index 9b41b4a..477328e 100644
--- a/modules/core/src/main/java/org/apache/fluo/core/util/Halt.java
+++ b/modules/core/src/main/java/org/apache/fluo/core/util/Halt.java
@@ -27,33 +27,20 @@ public class Halt {
private Halt() {}
public static void halt(final String msg) {
- halt(0, new Runnable() {
- @Override
- public void run() {
- log.error(fatal, msg);
- }
- });
+ halt(0, () -> log.error(fatal, msg));
}
public static void halt(final String msg, int status) {
- halt(status, new Runnable() {
- @Override
- public void run() {
- log.error(fatal, msg);
- }
- });
+ halt(status, () -> log.error(fatal, msg));
}
public static void halt(final int status, Runnable runnable) {
try {
// give ourselves a little time to try and do something
- Thread thread = new Thread() {
- @Override
- public void run() {
- UtilWaitThread.sleep(100);
- Runtime.getRuntime().halt(status);
- }
- };
+ Thread thread = new Thread(() -> {
+ UtilWaitThread.sleep(100);
+ Runtime.getRuntime().halt(status);
+ });
thread.setDaemon(true);
thread.start();
diff --git
a/modules/core/src/main/java/org/apache/fluo/core/worker/NotificationProcessor.java
b/modules/core/src/main/java/org/apache/fluo/core/worker/NotificationProcessor.java
index 5dca687..16b6d21 100644
---
a/modules/core/src/main/java/org/apache/fluo/core/worker/NotificationProcessor.java
+++
b/modules/core/src/main/java/org/apache/fluo/core/worker/NotificationProcessor.java
@@ -56,13 +56,8 @@ public class NotificationProcessor implements AutoCloseable {
this.executor = FluoExecutors.newFixedThreadPool(numThreads, queue,
"ntfyProc");
this.tracker = new NotificationTracker();
this.observers = env.getConfiguredObservers().getObservers(env);
- env.getSharedResources().getMetricRegistry()
- .register(env.getMetricNames().getNotificationQueued(), new
Gauge<Integer>() {
- @Override
- public Integer getValue() {
- return queue.size();
- }
- });
+ env.getSharedResources().getMetricRegistry().register(
+ env.getMetricNames().getNotificationQueued(), (Gauge<Integer>) () ->
queue.size());
}
// little utility class that tracks all notifications in queue
diff --git
a/modules/integration/src/test/java/org/apache/fluo/integration/impl/ParallelScannerIT.java
b/modules/integration/src/test/java/org/apache/fluo/integration/impl/ParallelScannerIT.java
index ae0ebd1..f314e8a 100644
---
a/modules/integration/src/test/java/org/apache/fluo/integration/impl/ParallelScannerIT.java
+++
b/modules/integration/src/test/java/org/apache/fluo/integration/impl/ParallelScannerIT.java
@@ -102,15 +102,12 @@ public class ParallelScannerIT extends ITBaseImpl {
// create a thread that will unlock column while transaction tx3 is
executing
- Runnable finishCommitTask = new Runnable() {
- @Override
- public void run() {
- try {
- Thread.sleep(500);
- tx2.finishCommit(cd2, commitTs);
- } catch (Exception e) {
- e.printStackTrace();
- }
+ Runnable finishCommitTask = () -> {
+ try {
+ Thread.sleep(500);
+ tx2.finishCommit(cd2, commitTs);
+ } catch (Exception e) {
+ e.printStackTrace();
}
};
