[SDC-20] fix toString loop and validation

Change-Id: I24f5cdc52bf1c054fed1557ecf877d87c1fa6a34
Signed-off-by: Pavel Aharoni <pa0916@att.com>

1 files changed, 11 insertions, 10 deletions

diff --git a/jtosca/src/main/java/org/openecomp/sdc/toscaparser/api/SubstitutionMappings.java b/jtosca/src/main/java/org/openecomp/sdc/toscaparser/api/SubstitutionMappings.java
index f02ec2a..153bd89 100644
--- a/jtosca/src/main/java/org/openecomp/sdc/toscaparser/api/SubstitutionMappings.java
+++ b/jtosca/src/main/java/org/openecomp/sdc/toscaparser/api/SubstitutionMappings.java
@@ -286,18 +286,19 @@ public class SubstitutionMappings {
 	@Override
 	public String toString() {
 		return "SubstitutionMappings{" +
-				"subMappingDef=" + subMappingDef +
-				", nodetemplates=" + nodetemplates +
-				", inputs=" + inputs +
-				", outputs=" + outputs +
-				", groups=" + groups +
-				", subMappedNodeTemplate=" + subMappedNodeTemplate +
-				", customDefs=" + customDefs +
-				", _capabilities=" + _capabilities +
-				", _requirements=" + _requirements +
+//				"subMappingDef=" + subMappingDef +
+//				", nodetemplates=" + nodetemplates +
+//				", inputs=" + inputs +
+//				", outputs=" + outputs +
+//				", groups=" + groups +
+				", subMappedNodeTemplate=" + (subMappedNodeTemplate==null?"":subMappedNodeTemplate.getName()) +
+//				", customDefs=" + customDefs +
+//				", _capabilities=" + _capabilities +
+//				", _requirements=" + _requirements +
 				'}';
 	}
 
+	@Deprecated
 	public String toLimitedString() {
 		return "SubstitutionMappings{" +
 				"subMappingDef=" + subMappingDef +
@@ -305,7 +306,7 @@ public class SubstitutionMappings {
 				", inputs=" + inputs +
 				", outputs=" + outputs +
 				", groups=" + groups +
-				", subMappedNodeTemplate=" + subMappedNodeTemplate.getName() +
+				", subMappedNodeTemplate=" + (subMappedNodeTemplate==null?"":subMappedNodeTemplate.getName()) +
 				", customDefs=" + customDefs +
 				", _capabilities=" + _capabilities +
 				", _requirements=" + _requirements +