Node API - Find root by anchor method performance

[cps.git] / cps-ri / src / main / java / org / onap / cps / spi / entities / FragmentEntityArranger.java

diff --git a/cps-ri/src/main/java/org/onap/cps/spi/entities/FragmentEntityArranger.java b/cps-ri/src/main/java/org/onap/cps/spi/entities/FragmentEntityArranger.java
index 50187a4..27891c5 100644 (file)
--- a/cps-ri/src/main/java/org/onap/cps/spi/entities/FragmentEntityArranger.java
+++ b/cps-ri/src/main/java/org/onap/cps/spi/entities/FragmentEntityArranger.java
@@ -57,6 +57,7 @@ public class FragmentEntityArranger {
         fragmentEntity.setAttributes(fragmentExtract.getAttributes());
         fragmentEntity.setParentId(fragmentExtract.getParentId());
         fragmentEntity.setChildFragments(new HashSet<>());
+        fragmentEntity.setDataspace(anchorEntity.getDataspace());
         return fragmentEntity;
     }
 
@@ -70,10 +71,7 @@ public class FragmentEntityArranger {
                 parentFragmentEntity.getChildFragments().add(fragmentEntity);
             }
         }
-        if (fragmentEntitiesWithoutParentInResultSet.iterator().hasNext()) {
-            return fragmentEntitiesWithoutParentInResultSet.iterator().next();
-        }
-        return null;
+        return fragmentEntitiesWithoutParentInResultSet.stream().findFirst().orElse(null);
     }
 
 }