sync 1.1.0 to master

Change-Id: I6e040f039895dd2ced55f95824473946b226fb5d
Issue-ID: SDC-707
Signed-off-by: Yuli Shlosberg <ys9693@att.com>

1 files changed, 10 insertions, 0 deletions

diff --git a/common-be/src/main/java/org/openecomp/sdc/be/datatypes/tosca/ToscaDataDefinition.java b/common-be/src/main/java/org/openecomp/sdc/be/datatypes/tosca/ToscaDataDefinition.java
index df73adaa4a..b8d164e4aa 100644
--- a/common-be/src/main/java/org/openecomp/sdc/be/datatypes/tosca/ToscaDataDefinition.java
+++ b/common-be/src/main/java/org/openecomp/sdc/be/datatypes/tosca/ToscaDataDefinition.java
@@ -24,6 +24,7 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
+import java.util.Set;
 import java.util.stream.Collectors;
 
 import org.codehaus.jackson.annotate.JsonCreator;
@@ -104,4 +105,13 @@ public abstract class ToscaDataDefinition {
 	public boolean findUidMatch(String uid){
 		return uid.equals(getToscaPresentationValue(JsonPresentationFields.UNIQUE_ID));
 	}
+	public <T extends ToscaDataDefinition>  T removeByOwnerId(Set<String> ownerIdList) {
+		return (T) this;
+	}
+	public static <T extends ToscaDataDefinition> T removeAndCollectByOwnerId(T complexStructure, Set<String> ownerIdList) {
+		return complexStructure.removeByOwnerId(ownerIdList);
+	}
+	public boolean isEmpty(){
+		return false;
+	}
 }