summaryrefslogtreecommitdiffstats
path: root/catalog-model/src
diff options
context:
space:
mode:
authormojahidi <mojahidul.islam@amdocs.com>2019-03-06 17:38:43 +0530
committermojahidi <mojahidul.islam@amdocs.com>2019-03-06 17:40:02 +0530
commitdb91542f3b768260cdf535e05a3976271a70de23 (patch)
tree3692784cfe4ea7ecaa314bec00335f5ea191fc27 /catalog-model/src
parent289c7e0c82d38f9d17a41bc9712ac8f05c788154 (diff)
Bug Fix - Requirement and capabilities feature
Fixed - bugs Change-Id: I6d5dea6ff1e508caf6580c86c430a0bfcbc23c88 Issue-ID: SDC-2142 Signed-off-by: mojahidi <mojahidul.islam@amdocs.com>
Diffstat (limited to 'catalog-model/src')
-rw-r--r--catalog-model/src/main/java/org/openecomp/sdc/be/model/jsontitan/operations/NodeTemplateOperation.java6
1 files changed, 0 insertions, 6 deletions
diff --git a/catalog-model/src/main/java/org/openecomp/sdc/be/model/jsontitan/operations/NodeTemplateOperation.java b/catalog-model/src/main/java/org/openecomp/sdc/be/model/jsontitan/operations/NodeTemplateOperation.java
index 7bd36eacd1..3e91d74bd1 100644
--- a/catalog-model/src/main/java/org/openecomp/sdc/be/model/jsontitan/operations/NodeTemplateOperation.java
+++ b/catalog-model/src/main/java/org/openecomp/sdc/be/model/jsontitan/operations/NodeTemplateOperation.java
@@ -672,13 +672,10 @@ public class NodeTemplateOperation extends BaseOperation {
Map<String, ListCapabilityDataDefinition> capabilities,
ComponentInstanceDataDefinition componentInstance,
MapListCapabilityDataDefinition calculatedCap) {
- if (capabilities != null) {
MapListCapabilityDataDefinition allCalculatedCap =
new MapListCapabilityDataDefinition(calculatedCap);
populateCapability(capabilities, componentInstance, allCalculatedCap);
return allCalculatedCap;
- }
- return null;
}
private void populateCapability(Map<String, ListCapabilityDataDefinition> capabilities,
@@ -702,14 +699,11 @@ public class NodeTemplateOperation extends BaseOperation {
Map<String, ListRequirementDataDefinition> requirements,
ComponentInstanceDataDefinition componentInstance,
MapListRequirementDataDefinition calculatedReqs) {
- if (requirements != null) {
MapListRequirementDataDefinition allCalculatedReq =
new MapListRequirementDataDefinition(calculatedReqs);
populateRequirement(requirements, componentInstance, allCalculatedReq);
return allCalculatedReq;
- }
- return null;
}
private void populateRequirement(Map<String, ListRequirementDataDefinition> requirements,
ComponentInstanceDataDefinition componentInstance,