[ONOS-3904] Derived data type and formatting fixes
Change-Id: I1d68899e0056fa0db6322e83f7e9d3ff9b3b1ee0
diff --git a/src/main/java/org/onosproject/yangutils/translator/tojava/JavaCodeGenerator.java b/src/main/java/org/onosproject/yangutils/translator/tojava/JavaCodeGenerator.java
index 0c70747..20cc584 100644
--- a/src/main/java/org/onosproject/yangutils/translator/tojava/JavaCodeGenerator.java
+++ b/src/main/java/org/onosproject/yangutils/translator/tojava/JavaCodeGenerator.java
@@ -53,11 +53,10 @@
curTraversal = TraversalType.SIBILING;
curNode = curNode.getNextSibling();
} else {
- curTraversal = TraversalType.PARENT;
curNode.generateJavaCodeExit();
+ curTraversal = TraversalType.PARENT;
curNode = curNode.getParent();
}
}
-
}
}
diff --git a/src/main/java/org/onosproject/yangutils/translator/tojava/utils/JavaCodeSnippetGen.java b/src/main/java/org/onosproject/yangutils/translator/tojava/utils/JavaCodeSnippetGen.java
index e8bade3..a470aef 100644
--- a/src/main/java/org/onosproject/yangutils/translator/tojava/utils/JavaCodeSnippetGen.java
+++ b/src/main/java/org/onosproject/yangutils/translator/tojava/utils/JavaCodeSnippetGen.java
@@ -16,6 +16,9 @@
package org.onosproject.yangutils.translator.tojava.utils;
+import java.util.List;
+import java.util.SortedSet;
+
import org.onosproject.yangutils.datamodel.YangType;
import org.onosproject.yangutils.translator.GeneratedFileType;
import org.onosproject.yangutils.translator.tojava.GeneratedMethodTypes;
@@ -47,6 +50,17 @@
}
/**
+ * reorder the import list based on the ONOS import rules.
+ *
+ * @param importInfo the set of classes/interfaces to be imported.
+ * @return string of import info.
+ */
+ public List<ImportInfo> sortImportOrder(SortedSet<ImportInfo> importInfo) {
+ /* TODO: reorder the import list based on the ONOS import rules. */
+ return null;
+ }
+
+ /**
* Get the textual java code information corresponding to the import list.
*
* @param importInfo import info.
diff --git a/src/main/java/org/onosproject/yangutils/translator/tojava/utils/MethodsGenerator.java b/src/main/java/org/onosproject/yangutils/translator/tojava/utils/MethodsGenerator.java
index 8fdaf5f..3ffc5e2 100644
--- a/src/main/java/org/onosproject/yangutils/translator/tojava/utils/MethodsGenerator.java
+++ b/src/main/java/org/onosproject/yangutils/translator/tojava/utils/MethodsGenerator.java
@@ -109,7 +109,6 @@
* @param returnType return type of method
* @return constructed method impl
*/
- @SuppressWarnings("rawtypes")
public static String constructMethodInfo(GeneratedFileType genFileTypes, String yangName,
GeneratedMethodTypes methodTypes, YangType<?> returnType) {