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 <skitt@redhat.com>

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 c56863f1ee6bb4028e750f9b5dd6d02aea59d213..31feac209bbb5cb0d0dc0ee185e4e6caaa0dd5ed 100644 (file)
--- 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<Integer> getQueueSizeGuage(final MeteredMessageQueue monitoredQueue) {
     }
 
     private static Gauge<Integer> getQueueSizeGuage(final MeteredMessageQueue monitoredQueue) {

-        return () -> monitoredQueue.size();
+        return monitoredQueue::size;

     }
 
     private void registerQueueSizeMetric(String metricName, Gauge<Integer> metric) {
     }
 
     private void registerQueueSizeMetric(String metricName, Gauge<Integer> 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 d9b7adc3c966dab83f951b7a50572a79e53af984..c89d7ffd45c062b245e6276ae9d9f02658350df4 100644 (file)
--- 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);
 
 
         LOG.debug("Deleting files: {}", files);
 

-        files.forEach(file -> file.delete());
+        files.forEach(File::delete);

         return null;
     }
 
         return null;
     }
 


@@ -229,7 +229,7 @@ public class LocalSnapshotStore extends SnapshotStore {
 
         LOG.debug("Deleting files: {}", files);
 
 
         LOG.debug("Deleting files: {}", files);
 

-        files.forEach(file -> file.delete());
+        files.forEach(File::delete);

         return null;
     }
 
         return null;
     }
 


@@ -265,7 +265,7 @@ public class LocalSnapshotStore extends SnapshotStore {
     private Collection<SnapshotMetadata> getSnapshotMetadatas(final String persistenceId,
             final SnapshotSelectionCriteria criteria) {
         return getSnapshotFiles(persistenceId).stream().flatMap(file -> toStream(extractMetadata(file)))
     private Collection<SnapshotMetadata> 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<SnapshotMetadata> toStream(@Nullable final SnapshotMetadata md) {
     }
 
     private static Stream<SnapshotMetadata> 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 d2e6b02490edffce2690e954247667f7f3a3c284..043aa467c07c86ef8a7f73f192d9b7511a9f88b9 100644 (file)
--- 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 {
 
     @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());
     }
 
         actorSystem = ActorSystem.create("testsystem", config.get());
     }