Merge "updated code with parallel streams to normal"

2 files changed, 4 insertions, 5 deletions

diff --git a/adapters/mso-catalog-db-adapter/src/main/java/org/onap/so/adapters/catalogdb/rest/ServiceMapper.java b/adapters/mso-catalog-db-adapter/src/main/java/org/onap/so/adapters/catalogdb/rest/ServiceMapper.java
index e74663dbba..09c790cc6a 100644
--- a/adapters/mso-catalog-db-adapter/src/main/java/org/onap/so/adapters/catalogdb/rest/ServiceMapper.java
+++ b/adapters/mso-catalog-db-adapter/src/main/java/org/onap/so/adapters/catalogdb/rest/ServiceMapper.java
@@ -68,7 +68,7 @@ public class ServiceMapper {
     private List<Vnf> mapVnfs(org.onap.so.db.catalog.beans.Service service, int depth) {
         List<Vnf> vnfs = new ArrayList<>();
         logger.info("Vnf Count : {}", service.getVnfCustomizations().size());
-        service.getVnfCustomizations().parallelStream().forEach(vnf -> vnfs.add(mapVnf(vnf, depth)));
+        service.getVnfCustomizations().stream().forEach(vnf -> vnfs.add(mapVnf(vnf, depth)));
         return vnfs;
     }
 
@@ -104,7 +104,7 @@ public class ServiceMapper {
 
     private List<VfModule> mapVfModules(VnfResourceCustomization vnfResourceCustomization, int depth) {
         List<VfModule> vfModules = new ArrayList<>();
-        vnfResourceCustomization.getVfModuleCustomizations().parallelStream()
+        vnfResourceCustomization.getVfModuleCustomizations().stream()
                 .forEach(vfModule -> vfModules.add(mapVfModule(vfModule, depth)));
         return vfModules;
     }
@@ -133,8 +133,7 @@ public class ServiceMapper {
 
     private List<Cvnfc> mapCvnfcs(VfModuleCustomization vfModuleCustomization) {
         List<Cvnfc> cvnfcs = new ArrayList<>();
-        vfModuleCustomization.getCvnfcCustomization().parallelStream()
-                .forEach(cvnfcCust -> cvnfcs.add(mapCvnfcCus(cvnfcCust)));
+        vfModuleCustomization.getCvnfcCustomization().stream().forEach(cvnfcCust -> cvnfcs.add(mapCvnfcCus(cvnfcCust)));
         return cvnfcs;
     }
 
diff --git a/adapters/mso-openstack-adapters/src/main/java/org/onap/so/adapters/tasks/audit/HeatStackAudit.java b/adapters/mso-openstack-adapters/src/main/java/org/onap/so/adapters/tasks/audit/HeatStackAudit.java
index ed45346131..3ff15ffe2f 100644
--- a/adapters/mso-openstack-adapters/src/main/java/org/onap/so/adapters/tasks/audit/HeatStackAudit.java
+++ b/adapters/mso-openstack-adapters/src/main/java/org/onap/so/adapters/tasks/audit/HeatStackAudit.java
@@ -288,7 +288,7 @@ public class HeatStackAudit {
      */
     protected List<Optional<Port>> retrieveNeutronPortDetails(Resources resources, String cloudSiteId,
             String tenantId) {
-        return resources.getList().parallelStream().filter(resource -> "OS::Neutron::Port".equals(resource.getType()))
+        return resources.getList().stream().filter(resource -> "OS::Neutron::Port".equals(resource.getType()))
                 .map(resource -> neutron.getNeutronPort(resource.getPhysicalResourceId(), tenantId, cloudSiteId))
                 .collect(Collectors.toList());