[ONOS-4947][ONOS-4954][ONOS-4952]Defect Fixed: Invalid name in case of qualified info for child nodes
Change-Id: I0b94455333afd9322c1e583a5c3ec311dbe99991
diff --git a/plugin/src/main/java/org/onosproject/yangutils/translator/tojava/JavaCodeGeneratorUtil.java b/plugin/src/main/java/org/onosproject/yangutils/translator/tojava/JavaCodeGeneratorUtil.java
index 9c37bb8..2534756 100644
--- a/plugin/src/main/java/org/onosproject/yangutils/translator/tojava/JavaCodeGeneratorUtil.java
+++ b/plugin/src/main/java/org/onosproject/yangutils/translator/tojava/JavaCodeGeneratorUtil.java
@@ -19,12 +19,14 @@
import java.io.IOException;
import org.onosproject.yangutils.datamodel.TraversalType;
+import org.onosproject.yangutils.datamodel.YangInput;
import org.onosproject.yangutils.datamodel.YangNode;
-import org.onosproject.yangutils.datamodel.javadatamodel.JavaFileInfo;
+import org.onosproject.yangutils.datamodel.YangNodeType;
+import org.onosproject.yangutils.datamodel.YangOutput;
import org.onosproject.yangutils.translator.exception.InvalidNodeForTranslatorException;
import org.onosproject.yangutils.translator.exception.TranslatorException;
import org.onosproject.yangutils.datamodel.javadatamodel.YangPluginConfig;
-
+import org.onosproject.yangutils.datamodel.javadatamodel.JavaFileInfo;
import static org.onosproject.yangutils.datamodel.TraversalType.CHILD;
import static org.onosproject.yangutils.datamodel.TraversalType.PARENT;
import static org.onosproject.yangutils.datamodel.TraversalType.ROOT;
@@ -305,4 +307,43 @@
private static void setRootNode(YangNode rootNode) {
JavaCodeGeneratorUtil.rootNode = rootNode;
}
+
+ /**
+ * Searches child node in data model tree.
+ *
+ * @param parentNode parent node
+ * @param nodeType node type
+ * @param nodeName node name
+ * @return child node
+ */
+ public static YangNode searchYangNode(YangNode parentNode, YangNodeType nodeType, String nodeName) {
+ YangNode child = parentNode.getChild();
+ TraversalType curTraversal = ROOT;
+ if (child == null) {
+ throw new IllegalArgumentException("given parent node does not contain any child nodes");
+ }
+
+ while (child != null) {
+ if (curTraversal != PARENT) {
+ if (child instanceof YangInput || child instanceof YangOutput) {
+ if (child.getNodeType().equals(nodeType)) {
+ return child;
+ }
+ } else if (child.getName().equals(nodeName) && child.getNodeType().equals(nodeType)) {
+ return child;
+ }
+ }
+ if (curTraversal != PARENT && child.getChild() != null) {
+ curTraversal = CHILD;
+ child = child.getChild();
+ } else if (child.getNextSibling() != null) {
+ curTraversal = SIBILING;
+ child = child.getNextSibling();
+ } else {
+ curTraversal = PARENT;
+ child = child.getParent();
+ }
+ }
+ return null;
+ }
}
diff --git a/plugin/src/main/java/org/onosproject/yangutils/translator/tojava/TempJavaEventFragmentFiles.java b/plugin/src/main/java/org/onosproject/yangutils/translator/tojava/TempJavaEventFragmentFiles.java
index 01587b7..9ca6b4e 100644
--- a/plugin/src/main/java/org/onosproject/yangutils/translator/tojava/TempJavaEventFragmentFiles.java
+++ b/plugin/src/main/java/org/onosproject/yangutils/translator/tojava/TempJavaEventFragmentFiles.java
@@ -100,7 +100,7 @@
/**
* File name for generated class file for special type like union, typedef suffix.
*/
- private static final String EVENT_LISTENER_FILE_NAME_SUFFIX = "Listener";
+ private static final String EVENT_LISTENER_FILE_NAME_SUFFIX = "EventListener";
private static final String JAVA_FILE_EXTENSION = ".java";
diff --git a/plugin/src/main/java/org/onosproject/yangutils/translator/tojava/TempJavaFragmentFiles.java b/plugin/src/main/java/org/onosproject/yangutils/translator/tojava/TempJavaFragmentFiles.java
index 480c321..36473ce 100644
--- a/plugin/src/main/java/org/onosproject/yangutils/translator/tojava/TempJavaFragmentFiles.java
+++ b/plugin/src/main/java/org/onosproject/yangutils/translator/tojava/TempJavaFragmentFiles.java
@@ -33,8 +33,6 @@
import org.onosproject.yangutils.translator.exception.TranslatorException;
import org.onosproject.yangutils.translator.tojava.javamodel.JavaLeafInfoContainer;
import org.onosproject.yangutils.translator.tojava.javamodel.YangJavaGroupingTranslator;
-import org.onosproject.yangutils.translator.tojava.javamodel.YangJavaModuleTranslator;
-import org.onosproject.yangutils.translator.tojava.javamodel.YangJavaSubModuleTranslator;
import org.onosproject.yangutils.translator.tojava.utils.JavaExtendsListHolder;
import static org.onosproject.yangutils.datamodel.utils.DataModelUtils.getParentNodeInGenCode;
@@ -494,7 +492,7 @@
JavaFileInfo fileInfo = ((JavaFileInfoContainer) targetNode).getJavaFileInfo();
boolean isQualified;
- if ((targetNode instanceof YangJavaModuleTranslator || targetNode instanceof YangJavaSubModuleTranslator)
+ if ((tempJavaFragmentFiles instanceof TempJavaServiceFragmentFiles)
&& (qualifiedTypeInfo.getClassInfo().contentEquals(SERVICE)
|| qualifiedTypeInfo.getClassInfo().contentEquals(COMPONENT)
|| qualifiedTypeInfo.getClassInfo().contentEquals(getCapitalCase(ACTIVATE))
@@ -507,7 +505,7 @@
isQualified = true;
} else {
String className;
- if (targetNode instanceof YangJavaModuleTranslator || targetNode instanceof YangJavaSubModuleTranslator) {
+ if (tempJavaFragmentFiles instanceof TempJavaServiceFragmentFiles) {
className = getCapitalCase(fileInfo.getJavaName()) + "Service";
} else {
className = getCapitalCase(fileInfo.getJavaName());
diff --git a/plugin/src/main/java/org/onosproject/yangutils/translator/tojava/utils/ClassDefinitionGenerator.java b/plugin/src/main/java/org/onosproject/yangutils/translator/tojava/utils/ClassDefinitionGenerator.java
index ce97834..a4109c5 100644
--- a/plugin/src/main/java/org/onosproject/yangutils/translator/tojava/utils/ClassDefinitionGenerator.java
+++ b/plugin/src/main/java/org/onosproject/yangutils/translator/tojava/utils/ClassDefinitionGenerator.java
@@ -386,7 +386,7 @@
throw new RuntimeException("Event listener interface name is error");
}
intfDef = intfDef.substring(0, intfDef.length() - 8);
- intfDef = intfDef + "Event>" + SPACE + OPEN_CURLY_BRACKET + NEW_LINE;
+ intfDef = intfDef + ">" + SPACE + OPEN_CURLY_BRACKET + NEW_LINE;
return intfDef;
}
diff --git a/plugin/src/main/java/org/onosproject/yangutils/utils/UtilConstants.java b/plugin/src/main/java/org/onosproject/yangutils/utils/UtilConstants.java
index d570fa7..0d76d7b 100644
--- a/plugin/src/main/java/org/onosproject/yangutils/utils/UtilConstants.java
+++ b/plugin/src/main/java/org/onosproject/yangutils/utils/UtilConstants.java
@@ -1191,7 +1191,7 @@
/**
* For event listener file generation.
*/
- public static final String EVENT_LISTENER_STRING = "Listener";
+ public static final String EVENT_LISTENER_STRING = "EventListener";
/**
* For event subject file generation.