commit c2fd3227f49e550e78d4599e2e4fbc80320f1d56
author Bharat saraswal <bharat.saraswal@huawei.com> Wed Oct 19 16:10:27 2016 +0530
committer Bharat saraswal <bharat.saraswal@huawei.com> Thu Oct 20 12:32:44 2016 +0530
tree eba96a0f52bdaafe41e511034b42cc8b891e385a
parent 5eb588b50d366c42ac5583d1f706d18476d7a92a

[ONOS-5527,ONOS-5529] process sub tree filtering in generted code changes.

Change-Id: I2b5562ee57d887c25f4a6b55cd25006e288563c0

generator/src/main/java/org/onosproject/yangutils/translator/tojava/utils/JavaFileGenerator.java

diff --git a/generator/src/main/java/org/onosproject/yangutils/translator/tojava/utils/JavaFileGenerator.java b/generator/src/main/java/org/onosproject/yangutils/translator/tojava/utils/JavaFileGenerator.java
index ed14647..4f8c94d 100644
--- a/generator/src/main/java/org/onosproject/yangutils/translator/tojava/utils/JavaFileGenerator.java
+++ b/generator/src/main/java/org/onosproject/yangutils/translator/tojava/utils/JavaFileGenerator.java
@@ -134,6 +134,7 @@
 import static org.onosproject.yangutils.translator.tojava.utils.SubtreeFilteringMethodsGenerator.getProcessLeafListSubtreeFiltering;
 import static org.onosproject.yangutils.translator.tojava.utils.SubtreeFilteringMethodsGenerator.getProcessLeafSubtreeFiltering;
 import static org.onosproject.yangutils.translator.tojava.utils.SubtreeFilteringMethodsGenerator.getProcessSubTreeFilteringEnd;
+import static org.onosproject.yangutils.translator.tojava.utils.SubtreeFilteringMethodsGenerator.getProcessSubTreeForChoiceInterface;
 import static org.onosproject.yangutils.translator.tojava.utils.SubtreeFilteringMethodsGenerator.getProcessSubtreeFilteringStart;
 import static org.onosproject.yangutils.translator.tojava.utils.SubtreeFilteringMethodsGenerator.getProcessSubtreeFunctionBody;
 import static org.onosproject.yangutils.translator.tojava.utils.TranslatorUtils.addDefaultConstructor;
@@ -231,6 +232,12 @@
         }
         List<String> methods = new ArrayList<>();
 
+        //Add only for choice class
+        if (curNode instanceof YangChoice) {
+            insertDataIntoJavaFile(file, getProcessSubTreeForChoiceInterface(
+                    curNode));
+        }
+
         if (attrPresent) {
             // Add getter methods to interface file.
             try {
@@ -529,18 +536,18 @@
                 if (curNode instanceof YangLeavesHolder) {
                     if (((YangLeavesHolder) curNode).getListOfLeaf() != null &&
                             !((YangLeavesHolder) curNode).getListOfLeaf().isEmpty()) {
-                        methods.add(getProcessLeafSubtreeFiltering(curNode, config,
+                        methods.add(getProcessLeafSubtreeFiltering(curNode,
                                                                    path));
                     }
                     if (((YangLeavesHolder) curNode).getListOfLeafList() != null &&
                             !((YangLeavesHolder) curNode).getListOfLeafList().isEmpty()) {
-                        methods.add(getProcessLeafListSubtreeFiltering(curNode, config,
+                        methods.add(getProcessLeafListSubtreeFiltering(curNode,
                                                                        path));
                     }
                 }
 
                 if (curNode.getChild() != null) {
-                    methods.add(getProcessChildNodeSubtreeFiltering(curNode, config,
+                    methods.add(getProcessChildNodeSubtreeFiltering(curNode,
                                                                     path));
                 }
             }