From 337a466d08987077b4f7b60d810fcf3865cb88ae Mon Sep 17 00:00:00 2001
From: Robert Varga <robert.varga@pantheon.tech>
Date: Mon, 30 Apr 2018 10:18:38 +0200
Subject: [PATCH] Simplify AbstractDOMBroker.isSupported()

This is simple check if all datastore are instances of the specified
contract -- simplify the expression with Streams.allMatch()
and Class.isInstance().

Change-Id: I260d3b2296f085023a722c3f59e08c4926e91b2d
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
---
 .../cluster/databroker/AbstractDOMBroker.java      | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/databroker/AbstractDOMBroker.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/databroker/AbstractDOMBroker.java
index e3b1c3039b..799e94a3ca 100644
--- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/databroker/AbstractDOMBroker.java
+++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/databroker/AbstractDOMBroker.java
@@ -62,7 +62,7 @@ public abstract class AbstractDOMBroker extends AbstractDOMTransactionFactory<DO
             extBuilder.put(DOMDataTreeCommitCohortRegistry.class, new DOMDataTreeCommitCohortRegistry() {
                 @Override
                 public <T extends DOMDataTreeCommitCohort> DOMDataTreeCommitCohortRegistration<T> registerCommitCohort(
-                        DOMDataTreeIdentifier path, T cohort) {
+                        final DOMDataTreeIdentifier path, final T cohort) {
                     DOMStore store = getDOMStore(path.getDatastoreType());
                     return ((DOMDataTreeCommitCohortRegistry) store).registerCommitCohort(path, cohort);
                 }
@@ -72,15 +72,9 @@ public abstract class AbstractDOMBroker extends AbstractDOMTransactionFactory<DO
         extensions = extBuilder.build();
     }
 
-    private static boolean isSupported(Map<LogicalDatastoreType, DOMStore> datastores,
-            Class<?> expDOMStoreInterface) {
-        for (DOMStore ds : datastores.values()) {
-            if (!expDOMStoreInterface.isAssignableFrom(ds.getClass())) {
-                return false;
-            }
-        }
-
-        return true;
+    private static boolean isSupported(final Map<LogicalDatastoreType, DOMStore> datastores,
+            final Class<?> expDOMStoreInterface) {
+        return datastores.values().stream().allMatch(expDOMStoreInterface::isInstance);
     }
 
     public void setCloseable(final AutoCloseable closeable) {
-- 
2.36.6