Merge dev/fluorine work across to master

[unimgr.git] / ovs-driver / src / main / java / org / opendaylight / unimgr / mef / nrp / ovs / util / NullAwareDatastoreGetter.java

diff --git a/impl/src/main/java/org/opendaylight/unimgr/utils/NullAwareDatastoreGetter.java b/ovs-driver/src/main/java/org/opendaylight/unimgr/mef/nrp/ovs/util/NullAwareDatastoreGetter.java
similarity index 73%
rename from impl/src/main/java/org/opendaylight/unimgr/utils/NullAwareDatastoreGetter.java
rename to ovs-driver/src/main/java/org/opendaylight/unimgr/mef/nrp/ovs/util/NullAwareDatastoreGetter.java
index e4ac709b136900f96d1cc9f3269e95df6a46dd01..30061ded0fac561e00bfe7b1582c892e0f5cb021 100644 (file)
--- a/impl/src/main/java/org/opendaylight/unimgr/utils/NullAwareDatastoreGetter.java
+++ b/ovs-driver/src/main/java/org/opendaylight/unimgr/mef/nrp/ovs/util/NullAwareDatastoreGetter.java
@@ -5,13 +5,7 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package org.opendaylight.unimgr.utils;
-
-import org.opendaylight.yangtools.yang.binding.Augmentation;
-import org.opendaylight.yangtools.yang.binding.ChildOf;
-import org.opendaylight.yangtools.yang.binding.DataObject;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+package org.opendaylight.unimgr.mef.nrp.ovs.util;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -19,6 +13,11 @@ import java.util.List;
 import java.util.Optional;
 import java.util.function.Function;
 import java.util.function.Supplier;
+import org.opendaylight.yangtools.yang.binding.Augmentation;
+import org.opendaylight.yangtools.yang.binding.ChildOf;
+import org.opendaylight.yangtools.yang.binding.DataObject;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class NullAwareDatastoreGetter<T> {
 
@@ -43,28 +42,32 @@ public class NullAwareDatastoreGetter<T> {
         logDataOptionalStatus(function);
 
         return new NullAwareDatastoreGetter<>(
-                dataOptional.isPresent() ? Optional.ofNullable(function.apply(dataOptional.get()).get()) : Optional.empty()
+                dataOptional.isPresent() ? Optional
+                        .ofNullable(function.apply(dataOptional.get()).get()) : Optional.empty()
         );
     }
 
-    public <R extends Augmentation<T>> NullAwareDatastoreGetter<R> collect(Function<T, Function<Class<R>, R>> function, Class<R> cls) {
+    public <R extends Augmentation<T>> NullAwareDatastoreGetter<R> collect(Function<T, Function<Class<R>, R>> function,
+                                                                           Class<R> cls) {
         logDataOptionalStatus(function);
 
         return new NullAwareDatastoreGetter<>(
-                dataOptional.isPresent() ? Optional.ofNullable(function.apply(dataOptional.get()).apply(cls)) : Optional.empty()
+                dataOptional.isPresent() ? Optional
+                        .ofNullable(function.apply(dataOptional.get()).apply(cls)) : Optional.empty()
         );
     }
 
-    public <R extends DataObject, C extends Collection<R>> List<NullAwareDatastoreGetter<R>> collectMany(Function<T, Supplier<C>> function) {
+    public <R extends DataObject, C extends Collection<R>> List<NullAwareDatastoreGetter<R>> collectMany(
+            Function<T, Supplier<C>> function) {
         logDataOptionalStatus(function);
 
         List<NullAwareDatastoreGetter<R>> result = new ArrayList<>();
 
-        Optional<C> dataCollectionOptional = dataOptional.isPresent() ? Optional.ofNullable(function.apply(dataOptional.get()).get()) : Optional.empty();
+        Optional<C> dataCollectionOptional = dataOptional.isPresent() ? Optional
+                .ofNullable(function.apply(dataOptional.get()).get()) : Optional.empty();
 
-        if (dataCollectionOptional.isPresent()) {
-            dataCollectionOptional.get().forEach(dataObject -> result.add(new NullAwareDatastoreGetter<R>(dataObject)));
-        }
+        dataCollectionOptional.ifPresent(rs -> rs
+                .forEach(dataObject -> result.add(new NullAwareDatastoreGetter<R>(dataObject))));
 
         return result;
     }
@@ -75,7 +78,8 @@ public class NullAwareDatastoreGetter<T> {
 
     private void logDataOptionalStatus(Function<?, ?> function) {
         if (dataOptional.isPresent()) {
-            LOG.trace("Before collection of: " + function.toString() + ", currently collected data is non-null: " + dataOptional.get().toString());
+            LOG.trace("Before collection of: " + function.toString()
+                    + ", currently collected data is non-null: " + dataOptional.get().toString());
         } else {
             LOG.debug("Null value encountered during collection of: " + function.toString());
         }