summaryrefslogtreecommitdiffstats
path: root/common
diff options
context:
space:
mode:
authorshiria <shiri.amichai@amdocs.com>2018-07-05 13:42:33 +0300
committershiria <shiri.amichai@amdocs.com>2018-07-05 13:42:33 +0300
commitd4cc2beaef58a4fc95bdc281efd879b1d1edf279 (patch)
tree11c9a118156d8b5c959b6ff009a39c9485d0d6bc /common
parent7161627bd81110f59f071595448b645b189899ea (diff)
Fix node filter get methods
Support normative properties and capabilities as regular get methods Issue-ID: SDC-1455 Change-Id: I1ab709a17a2e03f81a7ae789b8c8fb83a1d03e81 Signed-off-by: shiria <shiri.amichai@amdocs.com>
Diffstat (limited to 'common')
-rw-r--r--common/onap-tosca-datatype/src/main/java/org/onap/sdc/tosca/datatypes/model/NodeFilter.java91
1 files changed, 55 insertions, 36 deletions
diff --git a/common/onap-tosca-datatype/src/main/java/org/onap/sdc/tosca/datatypes/model/NodeFilter.java b/common/onap-tosca-datatype/src/main/java/org/onap/sdc/tosca/datatypes/model/NodeFilter.java
index 5f3d46504d..2c95568a66 100644
--- a/common/onap-tosca-datatype/src/main/java/org/onap/sdc/tosca/datatypes/model/NodeFilter.java
+++ b/common/onap-tosca-datatype/src/main/java/org/onap/sdc/tosca/datatypes/model/NodeFilter.java
@@ -19,7 +19,8 @@ package org.onap.sdc.tosca.datatypes.model;
import org.apache.commons.collections4.CollectionUtils;
import org.onap.sdc.tosca.services.ToscaExtensionYamlUtil;
-import java.util.Iterator;
+import java.util.ArrayList;
+import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -29,66 +30,84 @@ public class NodeFilter {
private List<Map<String, List<Constraint>>> properties;
private List<Map<String, CapabilityFilter>> capabilities;
- //can't not be removed, in used in snake yaml
public List<Map<String, CapabilityFilter>> getCapabilities() {
return capabilities;
}
public void setCapabilities(List<Map<String, CapabilityFilter>> capabilities) {
- this.capabilities = capabilities;
+ this.capabilities = getNormalizeCapabilities(capabilities);
}
- //can't not be removed, in used in snake yaml
- public List<Map<String, List<Constraint>>> getProperties() {
- return properties;
+ public void setProperties(List<Map<String, List<Constraint>>> properties) {
+ this.properties = getNormalizeProperties(properties);
}
-
- //use this function in order to get node filter properties instead of getProperties function
- public List<Map<String, List<Constraint>>> getNormalizeProperties() {
- return getNormalizeProperties(properties);
+ public List<Map<String, List<Constraint>>> getProperties() {
+ return properties;
}
private List<Map<String, List<Constraint>>> getNormalizeProperties(List<Map<String, List<Constraint>>> properties) {
- ToscaExtensionYamlUtil toscaExtensionYamlUtil = new ToscaExtensionYamlUtil();
if (CollectionUtils.isEmpty(properties)) {
return properties;
}
- for (Map<String, List<Constraint>> propertyConstraintsEntity : properties) {
- String propertyKey = propertyConstraintsEntity.keySet().iterator().next();
- List<Constraint> constraints = propertyConstraintsEntity.get(propertyKey);
- Iterator<Constraint> iterator = constraints.iterator();
- while (iterator.hasNext()) {
- Constraint constraintObj = iterator.next();
- Constraint constraint = toscaExtensionYamlUtil
- .yamlToObject(toscaExtensionYamlUtil.objectToYaml(constraintObj),
- Constraint.class);
- constraints.remove(constraintObj);
- constraints.add(constraint);
- }
+ List<Map<String, List<Constraint>>> normalizeProperties = new ArrayList<>();
+ for (Map<String, List<Constraint>> propertyEntry : properties) {
+ Map<String, List<Constraint>> normalizePropertyEntry = getNormalizePropertyEntry(propertyEntry);
+ normalizeProperties.add(normalizePropertyEntry);
}
- return properties;
+ return normalizeProperties;
+
+ }
+
+ private Map<String, List<Constraint>> getNormalizePropertyEntry(Map<String, List<Constraint>> propertyEntry) {
+ Map<String, List<Constraint>> normalizePropertyEntry = new HashMap<>();
+ String propertyKey = propertyEntry.keySet().iterator().next(); //only one entry exist in the map
+ List<Constraint> constraints = propertyEntry.get(propertyKey);
+ List<Constraint> normalizeConstraints = getNormalizeConstrains(constraints);
+ normalizePropertyEntry.put(propertyKey, normalizeConstraints);
+ return normalizePropertyEntry;
}
- //use this function in order to get node filter capabilities instead of getCapabilities function
- public List<Map<String, CapabilityFilter>> getNormalizeCapabilities() {
+ private List<Constraint> getNormalizeConstrains(List<Constraint> constraints) {
ToscaExtensionYamlUtil toscaExtensionYamlUtil = new ToscaExtensionYamlUtil();
+ List<Constraint> normalizeConstraints = new ArrayList<>();
+ for (Object constraintObj : constraints) {
+ Constraint normalizeConstraint = toscaExtensionYamlUtil
+ .yamlToObject(toscaExtensionYamlUtil.objectToYaml(constraintObj),
+ Constraint.class);
+ normalizeConstraints.add(normalizeConstraint);
+ }
+ return normalizeConstraints;
+ }
+
+ public List<Map<String, CapabilityFilter>> getNormalizeCapabilities(List<Map<String, CapabilityFilter>> capabilities) {
if (CollectionUtils.isEmpty(capabilities)) {
return capabilities;
}
+ List<Map<String, CapabilityFilter>> normalizeCapabilities = new ArrayList<>();
for (Map<String, CapabilityFilter> capabilityEntry : capabilities) {
- String capabilityKey = capabilityEntry.keySet().iterator().next();
- Object capabilityFilterObj = capabilityEntry.get(capabilityKey);
- CapabilityFilter capabilityFilter = toscaExtensionYamlUtil.yamlToObject(
- toscaExtensionYamlUtil.objectToYaml(capabilityFilterObj), CapabilityFilter.class);
- capabilityFilter.setProperties(getNormalizeProperties(capabilityFilter.getProperties()));
- capabilityEntry.remove(capabilityKey);
- capabilityEntry.put(capabilityKey, capabilityFilter);
+ Map<String, CapabilityFilter> normalizeCapabilityEntry = getNormalizeCapabilityEntry(capabilityEntry);
+ normalizeCapabilities.add(normalizeCapabilityEntry);
}
- return capabilities;
+ return normalizeCapabilities;
}
- public void setProperties(List<Map<String, List<Constraint>>> properties) {
- this.properties = properties;
+ private Map<String, CapabilityFilter> getNormalizeCapabilityEntry(Map<String, CapabilityFilter> capabilityEntry) {
+ Map<String, CapabilityFilter> normalizeCapabilityEntry = new HashMap<>();
+ String capabilityKey = capabilityEntry.keySet().iterator().next(); //only one entry exist in the map
+ Object capabilityFilterObj = capabilityEntry.get(capabilityKey);
+ CapabilityFilter normalizeCapabilityFilter = getNormalizeCapabilityFilter(capabilityFilterObj);
+ normalizeCapabilityEntry.put(capabilityKey, normalizeCapabilityFilter);
+ return normalizeCapabilityEntry;
+ }
+
+
+ private CapabilityFilter getNormalizeCapabilityFilter(Object capabilityFilterObj) {
+ ToscaExtensionYamlUtil toscaExtensionYamlUtil = new ToscaExtensionYamlUtil();
+ CapabilityFilter capabilityFilter = toscaExtensionYamlUtil.yamlToObject(
+ toscaExtensionYamlUtil.objectToYaml(capabilityFilterObj), CapabilityFilter.class);
+ capabilityFilter.setProperties(getNormalizeProperties(capabilityFilter.getProperties()));
+
+ return capabilityFilter;
}
}