From 7f2be8742ecdb75e92ce910042530ec7fdb43526 Mon Sep 17 00:00:00 2001 From: Stephen Kitt Date: Tue, 16 May 2017 17:51:11 +0200 Subject: [PATCH 1/1] sal-clustering-commons: use lambdas This series of patches uses lambdas instead of anonymous classes for functional interfaces when possible. Lambdas are replaced with method references when appropriate. Change-Id: I2a4a800267cd00e9564dfa8b3af069fc14542f61 Signed-off-by: Stephen Kitt --- .../cluster/common/actor/MeteredBoundedMailbox.java | 2 +- .../controller/cluster/persistence/LocalSnapshotStore.java | 6 +++--- .../cluster/common/actor/MeteredBoundedMailboxTest.java | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/common/actor/MeteredBoundedMailbox.java b/opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/common/actor/MeteredBoundedMailbox.java index c56863f1ee..31feac209b 100644 --- a/opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/common/actor/MeteredBoundedMailbox.java +++ b/opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/common/actor/MeteredBoundedMailbox.java @@ -73,7 +73,7 @@ public class MeteredBoundedMailbox implements MailboxType, } private static Gauge getQueueSizeGuage(final MeteredMessageQueue monitoredQueue) { - return () -> monitoredQueue.size(); + return monitoredQueue::size; } private void registerQueueSizeMetric(String metricName, Gauge metric) { diff --git a/opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/persistence/LocalSnapshotStore.java b/opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/persistence/LocalSnapshotStore.java index d9b7adc3c9..c89d7ffd45 100644 --- a/opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/persistence/LocalSnapshotStore.java +++ b/opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/persistence/LocalSnapshotStore.java @@ -220,7 +220,7 @@ public class LocalSnapshotStore extends SnapshotStore { LOG.debug("Deleting files: {}", files); - files.forEach(file -> file.delete()); + files.forEach(File::delete); return null; } @@ -229,7 +229,7 @@ public class LocalSnapshotStore extends SnapshotStore { LOG.debug("Deleting files: {}", files); - files.forEach(file -> file.delete()); + files.forEach(File::delete); return null; } @@ -265,7 +265,7 @@ public class LocalSnapshotStore extends SnapshotStore { private Collection getSnapshotMetadatas(final String persistenceId, final SnapshotSelectionCriteria criteria) { return getSnapshotFiles(persistenceId).stream().flatMap(file -> toStream(extractMetadata(file))) - .filter(md -> criteria.matches(md)).collect(Collectors.toList()); + .filter(criteria::matches).collect(Collectors.toList()); } private static Stream toStream(@Nullable final SnapshotMetadata md) { diff --git a/opendaylight/md-sal/sal-clustering-commons/src/test/java/org/opendaylight/controller/cluster/common/actor/MeteredBoundedMailboxTest.java b/opendaylight/md-sal/sal-clustering-commons/src/test/java/org/opendaylight/controller/cluster/common/actor/MeteredBoundedMailboxTest.java index d2e6b02490..043aa467c0 100644 --- a/opendaylight/md-sal/sal-clustering-commons/src/test/java/org/opendaylight/controller/cluster/common/actor/MeteredBoundedMailboxTest.java +++ b/opendaylight/md-sal/sal-clustering-commons/src/test/java/org/opendaylight/controller/cluster/common/actor/MeteredBoundedMailboxTest.java @@ -29,7 +29,7 @@ public class MeteredBoundedMailboxTest { @BeforeClass public static void setUp() throws Exception { - config = new CommonConfig.Builder<>("testsystem").withConfigReader(() -> ConfigFactory.load()).build(); + config = new CommonConfig.Builder<>("testsystem").withConfigReader(ConfigFactory::load).build(); actorSystem = ActorSystem.create("testsystem", config.get()); } -- 2.36.6