1 files changed, 92 insertions, 87 deletions
diff --git a/common-be/src/main/java/org/openecomp/sdc/be/datatypes/elements/ListDataDefinition.java b/common-be/src/main/java/org/openecomp/sdc/be/datatypes/elements/ListDataDefinition.java
index 073635a9f5..b6b75de678 100644
--- a/common-be/src/main/java/org/openecomp/sdc/be/datatypes/elements/ListDataDefinition.java
+++ b/common-be/src/main/java/org/openecomp/sdc/be/datatypes/elements/ListDataDefinition.java
@@ -7,9 +7,9 @@
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -24,93 +24,98 @@ import com.fasterxml.jackson.annotation.JsonCreator;
 import org.openecomp.sdc.be.datatypes.enums.JsonPresentationFields;
 import org.openecomp.sdc.be.datatypes.tosca.ToscaDataDefinition;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.Set;
 import java.util.stream.Collectors;
 
 public class ListDataDefinition<T extends ToscaDataDefinition> extends ToscaDataDefinition {
 
-	protected List<T> listToscaDataDefinition;
-
-	public ListDataDefinition(ListDataDefinition<T> cdt) {
-		listToscaDataDefinition = cdt.listToscaDataDefinition;
-
-	}
-
-	public ListDataDefinition(List<T> listToscaDataDefinition) {
-		this.listToscaDataDefinition = listToscaDataDefinition;
-	}
-
-	@JsonCreator
-	public ListDataDefinition() {
-		this.listToscaDataDefinition = new ArrayList<>();
-	}
-
-	public List<T> getListToscaDataDefinition() {
-		return listToscaDataDefinition;
-	}
-
-	public void add(T value) {
-		if (listToscaDataDefinition == null) {
-			listToscaDataDefinition = new ArrayList<>();
-		}
-		listToscaDataDefinition.add(value);
-	}
-
-	public void delete(T value) {
-		if (listToscaDataDefinition != null) {
-			listToscaDataDefinition.remove(value);
-		}
-	}
-
-	@Override
-	public void setOwnerIdIfEmpty(String ownerId) {
-		if (listToscaDataDefinition != null) {
-			listToscaDataDefinition.forEach(e -> e.setOwnerIdIfEmpty(ownerId));
-		}
-	}
-
-	@Override
-	public <S extends ToscaDataDefinition> S mergeFunction(S other, boolean allowDefaultValueOverride) {
-		Map<String, T> mapByName = listToMapByName(listToscaDataDefinition);
-		List<T> otherList = ((ListDataDefinition) other).getListToscaDataDefinition();
-		for (T item : otherList) {
-			mapByName.merge((String) item.getToscaPresentationValue(JsonPresentationFields.NAME), item, (thisItem, otherItem) -> thisItem.mergeFunction(otherItem, allowDefaultValueOverride));
-		}
-		((ListDataDefinition) other).listToscaDataDefinition = mapByName.values().stream().collect(Collectors.toList());
-		return other;
-	}
-
-	@Override
-	public boolean findUidMatch(String uid) {
-		return listToscaDataDefinition.stream().anyMatch(p -> p.findUidMatch(uid));
-	}
-
-	@Override
-	public <T extends ToscaDataDefinition> T removeByOwnerId(Set<String> ownerIdList) {
-		List<T> collect1 = (List<T>) listToscaDataDefinition.stream().filter(e -> ownerIdList.contains(e.getOwnerId())).collect(Collectors.toList());
-		ListDataDefinition listDef = new ListDataDefinition(collect1);
-
-		listToscaDataDefinition.removeIf(e -> ownerIdList.contains(e.getOwnerId()));
-		return (T) listDef;
-	}
-
-	@Override
-	public <T extends ToscaDataDefinition> T updateIfExist(T other, boolean allowDefaultValueOverride) {
-		
-		List<T> list = ((ListDataDefinition)other).getListToscaDataDefinition();
-		list.forEach(e -> {
-			String nameFromPrev = (String)e.getToscaPresentationValue(JsonPresentationFields.NAME);
-			if ( nameFromPrev != null ){
-				Optional<T> findAny = (Optional<T>) listToscaDataDefinition.stream().filter(o->nameFromPrev.equals(e.getToscaPresentationValue(JsonPresentationFields.NAME))).findAny();
-				if ( findAny.isPresent() ){
-					e.mergeFunction(findAny.get(), allowDefaultValueOverride);
-				}
-			}
-		});
-		return other;
-	}
-	@Override
-	public boolean isEmpty(){
-		return listToscaDataDefinition == null || listToscaDataDefinition.isEmpty();
-	}
+    List<T> listToscaDataDefinition;
+
+    public ListDataDefinition(ListDataDefinition<T> cdt) {
+        listToscaDataDefinition = cdt.listToscaDataDefinition;
+
+    }
+
+    public ListDataDefinition(List<T> listToscaDataDefinition) {
+        this.listToscaDataDefinition = listToscaDataDefinition;
+    }
+
+    @JsonCreator
+    public ListDataDefinition() {
+        this.listToscaDataDefinition = new ArrayList<>();
+    }
+
+    public List<T> getListToscaDataDefinition() {
+        return listToscaDataDefinition;
+    }
+
+    public void add(T value) {
+        if (listToscaDataDefinition == null) {
+            listToscaDataDefinition = new ArrayList<>();
+        }
+        listToscaDataDefinition.add(value);
+    }
+
+    public void delete(T value) {
+        if (listToscaDataDefinition != null) {
+            listToscaDataDefinition.remove(value);
+        }
+    }
+
+    @Override
+    public void setOwnerIdIfEmpty(String ownerId) {
+        if (listToscaDataDefinition != null) {
+            listToscaDataDefinition.forEach(e -> e.setOwnerIdIfEmpty(ownerId));
+        }
+    }
+
+    @Override
+    public <S extends ToscaDataDefinition> S mergeFunction(S other, boolean allowDefaultValueOverride) {
+        Map<String, T> mapByName = listToMapByName(listToscaDataDefinition);
+        List<T> otherList = ((ListDataDefinition) other).getListToscaDataDefinition();
+        for (T item : otherList) {
+            mapByName.merge((String) item.getToscaPresentationValue(JsonPresentationFields.NAME), item, (thisItem, otherItem) -> thisItem.mergeFunction(otherItem, allowDefaultValueOverride));
+        }
+        ((ListDataDefinition) other).listToscaDataDefinition = mapByName.values().stream().collect(Collectors.toList());
+        return other;
+    }
+
+    @Override
+    public boolean findUidMatch(String uid) {
+        return listToscaDataDefinition.stream().anyMatch(p -> p.findUidMatch(uid));
+    }
+
+    @Override
+    public <T extends ToscaDataDefinition> T removeByOwnerId(Set<String> ownerIdList) {
+        List<T> collect1 = (List<T>) listToscaDataDefinition.stream().filter(e -> ownerIdList.contains(e.getOwnerId())).collect(Collectors.toList());
+        ListDataDefinition listDef = new ListDataDefinition(collect1);
+
+        listToscaDataDefinition.removeIf(e -> ownerIdList.contains(e.getOwnerId()));
+        return (T) listDef;
+    }
+
+    @Override
+    public <T extends ToscaDataDefinition> T updateIfExist(T other, boolean allowDefaultValueOverride) {
+
+        List<T> list = ((ListDataDefinition) other).getListToscaDataDefinition();
+        list.forEach(e -> {
+            String nameFromPrev = (String) e.getToscaPresentationValue(JsonPresentationFields.NAME);
+            if (nameFromPrev != null) {
+                Optional<T> findAny = (Optional<T>) listToscaDataDefinition.stream().filter(o -> nameFromPrev.equals(e.getToscaPresentationValue(JsonPresentationFields.NAME))).findAny();
+                if (findAny.isPresent()) {
+                    e.mergeFunction(findAny.get(), allowDefaultValueOverride);
+                }
+            }
+        });
+        return other;
+    }
+
+    @Override
+    public boolean isEmpty() {
+        return listToscaDataDefinition == null || listToscaDataDefinition.isEmpty();
+    }
 }