diff options
| author |   Tal Gitelman <tal.gitelman@att.com> | 2019-01-08 16:17:36 +0200 |
|---|---|---|
| committer | Tal Gitelman <tal.gitelman@att.com> | 2019-01-08 14:27:55 +0000 |
| commit | 7b60d28f8144b46b28cfa65e09be2cf759d431fb (patch) | |
| tree | fc7fab4b986c37c72e3a10eb294f2d91067585f1 | |
| parent | 9fb95e3c9e9ab5c239445c1511219686133437de (diff) | |
SDC distribution failed bug fix - cherry1.4.51
Change-Id: I0c86d630366541ebfd10a4fd0d678ddbfce6113b
Issue-ID: SDC-1955
Signed-off-by: Tal Gitelman <tal.gitelman@att.com>
| -rw-r--r-- | pom.xml | 2 | ||||
| -rw-r--r-- | src/main/java/org/onap/sdc/toscaparser/api/elements/NodeType.java | 25 | ||||
| -rw-r--r-- | src/main/java/org/onap/sdc/toscaparser/api/utils/ValidateUtils.java | 2 | ||||
| -rw-r--r-- | version.properties | 2 |
4 files changed, 20 insertions, 11 deletions
@@ -4,7 +4,7 @@ <groupId>org.onap.sdc.jtosca</groupId> <artifactId>jtosca</artifactId> - <version>1.4.5-SNAPSHOT</version> + <version>1.4.51-SNAPSHOT</version> <name>sdc-jtosca</name> <properties> diff --git a/src/main/java/org/onap/sdc/toscaparser/api/elements/NodeType.java b/src/main/java/org/onap/sdc/toscaparser/api/elements/NodeType.java index 07b3a87..a6d7f81 100644 --- a/src/main/java/org/onap/sdc/toscaparser/api/elements/NodeType.java +++ b/src/main/java/org/onap/sdc/toscaparser/api/elements/NodeType.java @@ -101,24 +101,33 @@ public class NodeType extends StatefulEntityType { keyword = "node"; } else { - // If value is a dict and has a type key + String getRelation = null; + // If nodeTypeByCap is a dict and has a type key // we need to lookup the node type using // the capability type String captype = (String)req.get("capability"); - String value = _getNodeTypeByCap(captype); - String getRelation = _getRelation(key,value); + nodeType = _getNodeTypeByCap(captype); + if (nodeType != null){ + getRelation = _getRelation(key, nodeType); + } else { + ThreadLocalsHolder.getCollector().appendValidationIssue(new JToscaValidationIssue("JE11", String.format( + "NodeTypeForCapabilityNotFoundError: Node type for capability type \"%s\" is not found",captype))); + } if (getRelation != null) { relation = getRelation; } keyword = key; - nodeType = value; } } - } - RelationshipType rtype = new RelationshipType(relation, keyword, customDef); - NodeType relatednode = new NodeType(nodeType, customDef); - relationship.put(rtype, relatednode); + if(relation == null || nodeType == null){ + ThreadLocalsHolder.getCollector().appendValidationIssue(new JToscaValidationIssue("JE11", String.format( + "NodeTypeForRelationNotFound: Node type \"%s\" with relationship type \"%s\" is not found",nodeType, relation))); + } else { + RelationshipType rtype = new RelationshipType(relation, keyword, customDef); + NodeType relatednode = new NodeType(nodeType, customDef); + relationship.put(rtype, relatednode); + } } } return relationship; diff --git a/src/main/java/org/onap/sdc/toscaparser/api/utils/ValidateUtils.java b/src/main/java/org/onap/sdc/toscaparser/api/utils/ValidateUtils.java index 6c26f18..9623258 100644 --- a/src/main/java/org/onap/sdc/toscaparser/api/utils/ValidateUtils.java +++ b/src/main/java/org/onap/sdc/toscaparser/api/utils/ValidateUtils.java @@ -12,7 +12,7 @@ public class ValidateUtils { public static Object strToNum(Object value) { // Convert a string representation of a number into a numeric type - // tODO(TBD) we should not allow numeric values in, input should be str + // TODO(TBD) we should not allow numeric values in, input should be str if(value instanceof Number) { return value; } diff --git a/version.properties b/version.properties index d1722d6..8887d67 100644 --- a/version.properties +++ b/version.properties @@ -5,7 +5,7 @@ major=1 minor=4 -patch=5 +patch=51 base_version=${major}.${minor}.${patch} |