aboutsummaryrefslogtreecommitdiffstats
path: root/openecomp-be/lib/openecomp-core-lib
diff options
context:
space:
mode:
authorshiria <shiri.amichai@amdocs.com>2018-03-19 15:23:23 +0200
committershiria <shiri.amichai@amdocs.com>2018-03-22 08:21:36 +0200
commit43187c8495b88589f3187e110cf8d592a091c37f (patch)
tree87ffaf38a95344d76547478f0306b2a923896e44 /openecomp-be/lib/openecomp-core-lib
parentd049ca05bbfb6fa6b86b2a093b09ffc1fc0a6e37 (diff)
Update FlatEntity in TOSCA
Add support of dataType entity flat hierarchy in TOSCA Fix existing nodeType entity flat hierarchy in TOSCA Change-Id: I52cd188c595a263c70c2067fd1aac9752f7e24a4 Issue-ID: SDC-1147 Signed-off-by: shiria <shiri.amichai@amdocs.com>
Diffstat (limited to 'openecomp-be/lib/openecomp-core-lib')
-rw-r--r--openecomp-be/lib/openecomp-core-lib/openecomp-utilities-lib/src/main/java/org/openecomp/core/utilities/CommonMethods.java17
1 files changed, 9 insertions, 8 deletions
diff --git a/openecomp-be/lib/openecomp-core-lib/openecomp-utilities-lib/src/main/java/org/openecomp/core/utilities/CommonMethods.java b/openecomp-be/lib/openecomp-core-lib/openecomp-utilities-lib/src/main/java/org/openecomp/core/utilities/CommonMethods.java
index 7f207c59a9..cc924419f8 100644
--- a/openecomp-be/lib/openecomp-core-lib/openecomp-utilities-lib/src/main/java/org/openecomp/core/utilities/CommonMethods.java
+++ b/openecomp-be/lib/openecomp-core-lib/openecomp-utilities-lib/src/main/java/org/openecomp/core/utilities/CommonMethods.java
@@ -1,5 +1,5 @@
/*
- * Copyright © 2016-2017 European Support Limited
+ * Copyright © 2016-2018 European Support Limited
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -347,17 +347,18 @@ public class CommonMethods {
*
* @param <T> the type parameter
* @param <S> the type parameter
- * @param target the target
- * @param source the source
+ * @param firstMap the firstMap
+ * @param secondMap the secondMap
* @return the map
+ * Second Map is overridden data from the first map
*/
- public static <T, S> Map<T, S> mergeMaps(Map<T, S> target, Map<T, S> source) {
+ public static <T, S> Map<T, S> mergeMaps(Map<T, S> firstMap, Map<T, S> secondMap) {
Map<T, S> retMap = new HashMap<>();
- if (MapUtils.isNotEmpty(source)) {
- retMap.putAll(source);
+ if (MapUtils.isNotEmpty(firstMap)) {
+ retMap.putAll(firstMap);
}
- if (MapUtils.isNotEmpty(target)) {
- retMap.putAll(target);
+ if (MapUtils.isNotEmpty(secondMap)) {
+ retMap.putAll(secondMap);
}
return retMap;
}