[sdc] rebase update

[sdc.git] / common-be / src / main / java / org / openecomp / sdc / be / datatypes / elements / ListRequirementDataDefinition.java

diff --git a/common-be/src/main/java/org/openecomp/sdc/be/datatypes/elements/ListRequirementDataDefinition.java b/common-be/src/main/java/org/openecomp/sdc/be/datatypes/elements/ListRequirementDataDefinition.java
index 4c69958..b601fb0 100644 (file)
--- a/common-be/src/main/java/org/openecomp/sdc/be/datatypes/elements/ListRequirementDataDefinition.java
+++ b/common-be/src/main/java/org/openecomp/sdc/be/datatypes/elements/ListRequirementDataDefinition.java
@@ -1,3 +1,23 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * SDC
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * 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.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
 package org.openecomp.sdc.be.datatypes.elements;
 
 import java.util.List;
@@ -6,6 +26,7 @@ import java.util.stream.Collectors;
 
 import org.codehaus.jackson.annotate.JsonCreator;
 import org.codehaus.jackson.annotate.JsonValue;
+import org.openecomp.sdc.be.datatypes.tosca.ToscaDataDefinition;
 
 public class ListRequirementDataDefinition extends ListDataDefinition<RequirementDataDefinition> {
        
@@ -33,11 +54,8 @@ public class ListRequirementDataDefinition extends ListDataDefinition<Requiremen
                this.listToscaDataDefinition = listToscaDataDefinition;
        }
 
-       public ListRequirementDataDefinition mergeListItemsByName(ListRequirementDataDefinition other){
-               Map<String, RequirementDataDefinition> mapByName = listToMapByName();
-               Map<String, RequirementDataDefinition> mapOtherByName = other.listToMapByName();
-               mapByName.putAll(mapOtherByName);
-               return new ListRequirementDataDefinition(mapByName.values().stream().collect(Collectors.toList()));     
-       }
+
+       
+       
        
 }