ST defect fixes and review comments fixes
Change-Id: Ib8c56a88c19cd9aa23918d0f9e37c89e74cb0d13
diff --git a/utils/yangutils/src/main/java/org/onosproject/yangutils/translator/tojava/utils/JavaCodeSnippetGen.java b/utils/yangutils/src/main/java/org/onosproject/yangutils/translator/tojava/utils/JavaCodeSnippetGen.java
index 4d6a475..4d8180e 100644
--- a/utils/yangutils/src/main/java/org/onosproject/yangutils/translator/tojava/utils/JavaCodeSnippetGen.java
+++ b/utils/yangutils/src/main/java/org/onosproject/yangutils/translator/tojava/utils/JavaCodeSnippetGen.java
@@ -78,25 +78,37 @@
* @param javaAttributeTypePkg Package of the attribute type
* @param javaAttributeType java attribute type
* @param javaAttributeName name of the attribute
+ * @param isList is list attribute
* @return the textual java code for attribute definition in class
*/
public static String getJavaAttributeDefination(String javaAttributeTypePkg, String javaAttributeType,
- String javaAttributeName) {
+ String javaAttributeName, boolean isList) {
String attributeDefination = UtilConstants.PRIVATE
+ UtilConstants.SPACE;
- if (javaAttributeTypePkg != null) {
+ if (!isList) {
+ if (javaAttributeTypePkg != null) {
+ attributeDefination = attributeDefination
+ + javaAttributeTypePkg + ".";
+ }
+
attributeDefination = attributeDefination
- + javaAttributeTypePkg + ".";
+ + javaAttributeType
+ + UtilConstants.SPACE
+ + javaAttributeName
+ + UtilConstants.SEMI_COLAN;
+ } else {
+ attributeDefination = attributeDefination + UtilConstants.LIST + UtilConstants.DIAMOND_OPEN_BRACKET;
+ if (javaAttributeTypePkg != null) {
+ attributeDefination = attributeDefination
+ + javaAttributeTypePkg + ".";
+ }
+
+ attributeDefination = attributeDefination
+ + javaAttributeType + UtilConstants.DIAMOND_CLOSE_BRACKET + UtilConstants.SPACE
+ + javaAttributeName + UtilConstants.SEMI_COLAN;
}
-
- attributeDefination = attributeDefination
- + javaAttributeType
- + UtilConstants.SPACE
- + javaAttributeName
- + UtilConstants.SEMI_COLAN;
-
return attributeDefination;
}
@@ -126,6 +138,9 @@
} else if ((genFileTypes & GeneratedFileType.BUILDER_CLASS_MASK) != 0) {
return UtilConstants.CLOSE_CURLY_BRACKET;
+ } else if ((genFileTypes & GeneratedFileType.GENERATE_TYPEDEF_CLASS) != 0) {
+
+ return UtilConstants.CLOSE_CURLY_BRACKET;
}
return null;
}