[ONOS-4527,ONOS-4524,ONOS-4536,ONOS-4541,ONOS-4549,ONOS-4550,ONOS-4557
,ONOS-4558,ONOS-4545,ONOS-4543,ONOS-4546]
Checkstyle error in generated code handled and defect fixed.
Change-Id: Ifef5a22f91d4ee21767f1e2c6d0dd5b5b0b8cfcc
diff --git a/src/main/java/org/onosproject/yangutils/translator/tojava/JavaCodeGeneratorUtil.java b/src/main/java/org/onosproject/yangutils/translator/tojava/JavaCodeGeneratorUtil.java
index 6ec67e4..5c06f42 100644
--- a/src/main/java/org/onosproject/yangutils/translator/tojava/JavaCodeGeneratorUtil.java
+++ b/src/main/java/org/onosproject/yangutils/translator/tojava/JavaCodeGeneratorUtil.java
@@ -66,11 +66,10 @@
*
* @param rootNode root node of the data model tree
* @param yangPlugin YANG plugin config
- * @param fileName YANG file name
* @throws TranslatorException when fails to generate java code file the current
* node
*/
- public static void generateJavaCode(YangNode rootNode, YangPluginConfig yangPlugin, String fileName)
+ public static void generateJavaCode(YangNode rootNode, YangPluginConfig yangPlugin)
throws TranslatorException {
YangNode codeGenNode = rootNode;
@@ -80,7 +79,7 @@
if (curTraversal != PARENT) {
if (codeGenNode instanceof JavaCodeGenerator) {
setCurNode(codeGenNode);
- generateCodeEntry(codeGenNode, yangPlugin, fileName);
+ generateCodeEntry(codeGenNode, yangPlugin);
} else {
/*
* For grouping and uses, there is no code generation, skip the generation for the child.
@@ -100,11 +99,11 @@
curTraversal = CHILD;
codeGenNode = codeGenNode.getChild();
} else if (codeGenNode.getNextSibling() != null) {
- generateCodeExit(codeGenNode, fileName);
+ generateCodeExit(codeGenNode);
curTraversal = SIBILING;
codeGenNode = codeGenNode.getNextSibling();
} else {
- generateCodeExit(codeGenNode, fileName);
+ generateCodeExit(codeGenNode);
curTraversal = PARENT;
codeGenNode = codeGenNode.getParent();
}
@@ -117,20 +116,17 @@
* @param codeGenNode current data model node for which the code needs to be
* generated
* @param yangPlugin YANG plugin config
- * @param fileName YANG file name
* @throws TranslatorException when fails to generate java code file the current
* node
*/
- private static void generateCodeEntry(YangNode codeGenNode, YangPluginConfig yangPlugin, String fileName)
+ private static void generateCodeEntry(YangNode codeGenNode, YangPluginConfig yangPlugin)
throws TranslatorException {
if (codeGenNode instanceof JavaCodeGenerator) {
((JavaCodeGenerator) codeGenNode).generateCodeEntry(yangPlugin);
} else {
- TranslatorException ex = new TranslatorException(
+ throw new TranslatorException(
"Generated data model node cannot be translated to target language code");
- ex.setFileName(fileName);
- throw ex;
}
}
@@ -139,19 +135,16 @@
*
* @param codeGenNode current data model node for which the code needs to be
* generated
- * @param fileName YANG file name
* @throws TranslatorException when fails to generate java code file the current
* node
*/
- private static void generateCodeExit(YangNode codeGenNode, String fileName) throws TranslatorException {
+ private static void generateCodeExit(YangNode codeGenNode) throws TranslatorException {
if (codeGenNode instanceof JavaCodeGenerator) {
((JavaCodeGenerator) codeGenNode).generateCodeExit();
} else {
- TranslatorException ex = new TranslatorException(
+ throw new TranslatorException(
"Generated data model node cannot be translated to target language code");
- ex.setFileName(fileName);
- throw ex;
}
}
@@ -162,26 +155,28 @@
private static void freeRestResources() {
YangNode freedNode = getCurNode();
- YangNode tempNode = freedNode;
- TraversalType curTraversal = ROOT;
+ if (getCurNode() != null) {
+ YangNode tempNode = freedNode;
+ TraversalType curTraversal = ROOT;
- while (freedNode != tempNode.getParent()) {
+ while (freedNode != tempNode.getParent()) {
- if (curTraversal != PARENT && freedNode.getChild() != null) {
- curTraversal = CHILD;
- freedNode = freedNode.getChild();
- } else if (freedNode.getNextSibling() != null) {
- curTraversal = SIBILING;
- if (freedNode != tempNode) {
- free(freedNode);
+ if (curTraversal != PARENT && freedNode.getChild() != null) {
+ curTraversal = CHILD;
+ freedNode = freedNode.getChild();
+ } else if (freedNode.getNextSibling() != null) {
+ curTraversal = SIBILING;
+ if (freedNode != tempNode) {
+ free(freedNode);
+ }
+ freedNode = freedNode.getNextSibling();
+ } else {
+ curTraversal = PARENT;
+ if (freedNode != tempNode) {
+ free(freedNode);
+ }
+ freedNode = freedNode.getParent();
}
- freedNode = freedNode.getNextSibling();
- } else {
- curTraversal = PARENT;
- if (freedNode != tempNode) {
- free(freedNode);
- }
- freedNode = freedNode.getParent();
}
}
}
@@ -213,36 +208,38 @@
public static void translatorErrorHandler(YangNode rootNode)
throws IOException {
- /**
- * Free other resources where translator has failed.
- */
- freeRestResources();
+ if (rootNode != null) {
+ /**
+ * Free other resources where translator has failed.
+ */
+ freeRestResources();
- /**
- * Start removing all open files.
- */
- YangNode tempNode = rootNode;
- setCurNode(tempNode.getChild());
- TraversalType curTraversal = ROOT;
+ /**
+ * Start removing all open files.
+ */
+ YangNode tempNode = rootNode;
+ setCurNode(tempNode.getChild());
+ TraversalType curTraversal = ROOT;
- while (tempNode != null) {
+ while (tempNode != null) {
- if (curTraversal != PARENT) {
- close(tempNode);
+ if (curTraversal != PARENT) {
+ close(tempNode);
+ }
+ if (curTraversal != PARENT && tempNode.getChild() != null) {
+ curTraversal = CHILD;
+ tempNode = tempNode.getChild();
+ } else if (tempNode.getNextSibling() != null) {
+ curTraversal = SIBILING;
+ tempNode = tempNode.getNextSibling();
+ } else {
+ curTraversal = PARENT;
+ tempNode = tempNode.getParent();
+ }
}
- if (curTraversal != PARENT && tempNode.getChild() != null) {
- curTraversal = CHILD;
- tempNode = tempNode.getChild();
- } else if (tempNode.getNextSibling() != null) {
- curTraversal = SIBILING;
- tempNode = tempNode.getNextSibling();
- } else {
- curTraversal = PARENT;
- tempNode = tempNode.getParent();
- }
+
+ freeRestResources();
}
-
- freeRestResources();
}
/**