commit 9381ebb32d9ea6f847b89976a5b90f0966990339
author Gaurav Agrawal <gaurav.agrawal@huawei.com> Thu Sep 29 19:00:33 2016 +0530
committer GauravAgrawal-Huawei <gauravjbp3ster@gmail.com> Wed Oct 05 10:50:00 2016 +0000
tree a288316b9bd2061d4ff90c8e8941c68df740cc94
parent 493e0a80339cf2fe96fd886b6c30364146e146aa

[ONOS-5330] Code-Reusability by generating code for Grouping rather then uses

Change-Id: I80a7d5c92a47e30c5ea0fe45c407a8246d9994d7

plugin/src/main/java/org/onosproject/yangutils/translator/tojava/utils/SubtreeFilteringMethodsGenerator.java

diff --git a/plugin/src/main/java/org/onosproject/yangutils/translator/tojava/utils/SubtreeFilteringMethodsGenerator.java b/plugin/src/main/java/org/onosproject/yangutils/translator/tojava/utils/SubtreeFilteringMethodsGenerator.java
index e7e83f4..e1b4913 100644
--- a/plugin/src/main/java/org/onosproject/yangutils/translator/tojava/utils/SubtreeFilteringMethodsGenerator.java
+++ b/plugin/src/main/java/org/onosproject/yangutils/translator/tojava/utils/SubtreeFilteringMethodsGenerator.java
@@ -216,16 +216,27 @@
                     getAttrTypeForFilterContentMatchWhenPrimitiveDataType(
                             attributeName);
         } else if (dataType.getDataType() == LEAFREF) {
-            YangType type = ((YangLeafRef) dataType.getDataTypeExtendedInfo())
-                    .getEffectiveDataType();
-            if (StringGenerator.isPrimitiveDataType(type.getDataType())) {
-                attrQualifiedType =
-                        getAttrTypeForFilterContentMatchWhenPrimitiveDataType(
-                                attributeName);
-            } else {
+
+            // When leafref in grouping.
+            if (((YangLeafRef) dataType.getDataTypeExtendedInfo())
+                    .isInGrouping()) {
                 attrQualifiedType =
                         getAttrTypeForFilterContentMatchWhenNonPrimitiveDataTypes(
                                 attributeName);
+            } else {
+
+                YangType type = ((YangLeafRef) dataType.getDataTypeExtendedInfo())
+                        .getEffectiveDataType();
+
+                if (StringGenerator.isPrimitiveDataType(type.getDataType())) {
+                    attrQualifiedType =
+                            getAttrTypeForFilterContentMatchWhenPrimitiveDataType(
+                                    attributeName);
+                } else {
+                    attrQualifiedType =
+                            getAttrTypeForFilterContentMatchWhenNonPrimitiveDataTypes(
+                                    attributeName);
+                }
             }
         } else {
             attrQualifiedType =