Change-Id: Iacceb798cb24408e232b9b59c751b0e984871728
Issue-ID: SDC-2283
Signed-off-by: Sonsino, Ofir (os0695) <os0695@intl.att.com>
property -> propertyConvertor.convertProperty(dataTypes, property,
PropertyConvertor.PropertyType.PROPERTY)));
}
property -> propertyConvertor.convertProperty(dataTypes, property,
PropertyConvertor.PropertyType.PROPERTY)));
}
- if (MapUtils.isNotEmpty(mergedProperties) && Objects.nonNull(inputDef)) {
- resolveDefaultPropertyValue(inputDef, mergedProperties, dataTypes);
+ if (MapUtils.isNotEmpty(mergedProperties)) {
+ if (Objects.nonNull(inputDef)) {
+ resolveDefaultPropertyValue(inputDef, mergedProperties, dataTypes);
+ }
toscaNodeType.setProperties(mergedProperties);
}
// Extracted to method for code reuse
toscaNodeType.setProperties(mergedProperties);
}
// Extracted to method for code reuse