diff options
Diffstat (limited to 'common-be/src/main/java/org/openecomp/sdc/be/datatypes/elements/MapDataDefinition.java')
| -rw-r--r-- | common-be/src/main/java/org/openecomp/sdc/be/datatypes/elements/MapDataDefinition.java | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/common-be/src/main/java/org/openecomp/sdc/be/datatypes/elements/MapDataDefinition.java b/common-be/src/main/java/org/openecomp/sdc/be/datatypes/elements/MapDataDefinition.java index 062e5aa53d..4c5e17c87a 100644 --- a/common-be/src/main/java/org/openecomp/sdc/be/datatypes/elements/MapDataDefinition.java +++ b/common-be/src/main/java/org/openecomp/sdc/be/datatypes/elements/MapDataDefinition.java @@ -17,7 +17,6 @@ * limitations under the License. * ============LICENSE_END========================================================= */ - package org.openecomp.sdc.be.datatypes.elements; import com.fasterxml.jackson.annotation.JsonCreator; @@ -37,7 +36,6 @@ public class MapDataDefinition<T extends ToscaDataDefinition> extends ToscaDataD public MapDataDefinition(MapDataDefinition<T> cdt) { super(); mapToscaDataDefinition = cdt.mapToscaDataDefinition; - } @JsonCreator @@ -83,9 +81,7 @@ public class MapDataDefinition<T extends ToscaDataDefinition> extends ToscaDataD if (null == mapToscaDataDefinition || uid == null) { return null; } - Map.Entry<String, T> entry = mapToscaDataDefinition.entrySet().stream().filter(e -> - e.getValue().findUidMatch(uid)) - .findAny().orElse(null); + Map.Entry<String, T> entry = mapToscaDataDefinition.entrySet().stream().filter(e -> e.getValue().findUidMatch(uid)).findAny().orElse(null); if (null == entry) { return null; } @@ -95,12 +91,9 @@ public class MapDataDefinition<T extends ToscaDataDefinition> extends ToscaDataD @Override public <T extends ToscaDataDefinition> T removeByOwnerId(Set<String> ownerIdList) { if (mapToscaDataDefinition != null) { - Map<String, T> collect = (Map<String, T>) mapToscaDataDefinition.entrySet() - .stream() + Map<String, T> collect = (Map<String, T>) mapToscaDataDefinition.entrySet().stream() .filter(e -> ownerIdList.contains(e.getValue().getOwnerId())).collect(Collectors.toMap(Map.Entry::getKey, (Map.Entry::getValue))); - MapDataDefinition collectMap = new MapDataDefinition<>(collect); - mapToscaDataDefinition.entrySet().removeIf(e -> ownerIdList.contains(e.getValue().getOwnerId())); return (T) collectMap; } @@ -109,7 +102,6 @@ public class MapDataDefinition<T extends ToscaDataDefinition> extends ToscaDataD @Override public <T extends ToscaDataDefinition> T updateIfExist(T other, boolean allowDefaultValueOverride) { - Map<String, T> map = ((MapDataDefinition) other).getMapToscaDataDefinition(); if (map != null) { map.entrySet().forEach(e -> { |