Binding v2 - Eliminate suffix for the binding name of schema nodes in grouping

- It's not necessory to append 'Data' or 'Grouping' to the type name
  of nodes in grouping, since they're naturally not in the same path.
  for the top directory, one is in 'grp' and the other is in 'data'.

- Suffix also can't be used to resolve name collisions.
  See details in JIRA:MDSAL-271

Change-Id: I5c5cc4774644e089bedb200b25c6854f0cf077b7
Signed-off-by: Jie Han <han.jie@zte.com.cn>

diff --git a/binding2/mdsal-binding2-dom-codec/src/test/java/org/opendaylight/mdsal/binding/javav2/dom/codec/impl/NormalizedNodeSerializeDeserializeTest.java b/binding2/mdsal-binding2-dom-codec/src/test/java/org/opendaylight/mdsal/binding/javav2/dom/codec/impl/NormalizedNodeSerializeDeserializeTest.java
index 316a0a473dc1bf7f90bfb4079fb621531deba765..363ba73cb33692f5d7ac16633fe05f86086eabf8 100644 (file)
--- a/binding2/mdsal-binding2-dom-codec/src/test/java/org/opendaylight/mdsal/binding/javav2/dom/codec/impl/NormalizedNodeSerializeDeserializeTest.java
+++ b/binding2/mdsal-binding2-dom-codec/src/test/java/org/opendaylight/mdsal/binding/javav2/dom/codec/impl/NormalizedNodeSerializeDeserializeTest.java
@@ -24,7 +24,7 @@ import org.opendaylight.mdsal.binding.javav2.spec.base.InstanceIdentifier;
 import org.opendaylight.mdsal.binding.javav2.spec.base.TreeNode;
 import org.opendaylight.mdsal.gen.javav2.urn.opendaylight.params.xml.ns.yang.mdsal.test.augment.rev140709.data.TreeLeafOnlyUsesAugment;
 import org.opendaylight.mdsal.gen.javav2.urn.opendaylight.params.xml.ns.yang.mdsal.test.augment.rev140709.dto.TreeLeafOnlyUsesAugmentBuilder;
-import org.opendaylight.mdsal.gen.javav2.urn.opendaylight.params.xml.ns.yang.mdsal.test.augment.rev140709.grp.LeafFromGroupingGrouping;
+import org.opendaylight.mdsal.gen.javav2.urn.opendaylight.params.xml.ns.yang.mdsal.test.augment.rev140709.grp.LeafFromGrouping;
 import org.opendaylight.mdsal.gen.javav2.urn.opendaylight.params.xml.ns.yang.mdsal.test.binding.rev140701.data.Top;
 import org.opendaylight.mdsal.gen.javav2.urn.opendaylight.params.xml.ns.yang.mdsal.test.binding.rev140701.data.top.TopLevelList;
 import org.opendaylight.mdsal.gen.javav2.urn.opendaylight.params.xml.ns.yang.mdsal.test.binding.rev140701.dto.TopBuilder;
@@ -44,8 +44,8 @@ public class NormalizedNodeSerializeDeserializeTest extends AbstractBindingRunti
     private static final QName TOP_LEVEL_LIST_NAME_QNAME = QName.create(TopLevelList.QNAME, "name");
     private static final QName AUGMENTED_STRING_QNAME = QName.create(TopLevelList.QNAME, "augmented-string");
     private static final QName AUGMENTED_INT_QNAME = QName.create(TopLevelList.QNAME, "augmented-int");
-    private static final QName SIMPLE_VALUE_QNAME = QName.create(LeafFromGroupingGrouping.QNAME, "simple-value");
-    private static final QName SIMPLE_TYPE_QNAME = QName.create(LeafFromGroupingGrouping.QNAME, "simple-type");
+    private static final QName SIMPLE_VALUE_QNAME = QName.create(LeafFromGrouping.QNAME, "simple-value");
+    private static final QName SIMPLE_TYPE_QNAME = QName.create(LeafFromGrouping.QNAME, "simple-type");
 
     @Before
     public void setup() {
@@ -72,17 +72,17 @@ public class NormalizedNodeSerializeDeserializeTest extends AbstractBindingRunti
 
     private static AugmentationIdentifier getTopLevelListAugId() {
         Set<QName> qnames = new HashSet<>();
-        qnames.add(QName.create(LeafFromGroupingGrouping.QNAME, "simple-value"));
-        qnames.add(QName.create(LeafFromGroupingGrouping.QNAME, "simple-type"));
-        qnames.add(QName.create(LeafFromGroupingGrouping.QNAME, "second-simple-value"));
-        qnames.add(QName.create(LeafFromGroupingGrouping.QNAME, "list-via-uses"));
-        qnames.add(QName.create(LeafFromGroupingGrouping.QNAME, "container-with-uses"));
-        qnames.add(QName.create(LeafFromGroupingGrouping.QNAME, "leaf-from-grouping"));
-        qnames.add(QName.create(LeafFromGroupingGrouping.QNAME, "identity"));
-        qnames.add(QName.create(LeafFromGroupingGrouping.QNAME, "schema-unaware-union"));
-        qnames.add(QName.create(LeafFromGroupingGrouping.QNAME, "simple-type-ref"));
-        qnames.add(QName.create(LeafFromGroupingGrouping.QNAME, "identity-ref"));
-        qnames.add(QName.create(LeafFromGroupingGrouping.QNAME, "schema-unaware-union-ref"));
+        qnames.add(QName.create(LeafFromGrouping.QNAME, "simple-value"));
+        qnames.add(QName.create(LeafFromGrouping.QNAME, "simple-type"));
+        qnames.add(QName.create(LeafFromGrouping.QNAME, "second-simple-value"));
+        qnames.add(QName.create(LeafFromGrouping.QNAME, "list-via-uses"));
+        qnames.add(QName.create(LeafFromGrouping.QNAME, "container-with-uses"));
+        qnames.add(QName.create(LeafFromGrouping.QNAME, "leaf-from-grouping"));
+        qnames.add(QName.create(LeafFromGrouping.QNAME, "identity"));
+        qnames.add(QName.create(LeafFromGrouping.QNAME, "schema-unaware-union"));
+        qnames.add(QName.create(LeafFromGrouping.QNAME, "simple-type-ref"));
+        qnames.add(QName.create(LeafFromGrouping.QNAME, "identity-ref"));
+        qnames.add(QName.create(LeafFromGrouping.QNAME, "schema-unaware-union-ref"));
 
         return new AugmentationIdentifier(qnames);
     }

diff --git a/binding2/mdsal-binding2-generator-impl/src/main/java/org/opendaylight/mdsal/binding/javav2/generator/impl/GenHelperUtil.java b/binding2/mdsal-binding2-generator-impl/src/main/java/org/opendaylight/mdsal/binding/javav2/generator/impl/GenHelperUtil.java
index 28aba876601a0d96bdf169bc3185862ace45b701..fa67281bdf2721b283e196da5230a331ae2cfe79 100644 (file)
--- a/binding2/mdsal-binding2-generator-impl/src/main/java/org/opendaylight/mdsal/binding/javav2/generator/impl/GenHelperUtil.java
+++ b/binding2/mdsal-binding2-generator-impl/src/main/java/org/opendaylight/mdsal/binding/javav2/generator/impl/GenHelperUtil.java
@@ -530,14 +530,7 @@ final class GenHelperUtil {
             final SchemaContext schemaContext, final boolean verboseClassComments, final Map<String, Map<String,
             GeneratedTypeBuilder>> genTypeBuilders, final TypeProvider typeProvider, final BindingNamespaceType namespaceType) {
 
-        String suffix = "";
-        if (schemaNode instanceof GroupingDefinition) {
-            suffix = "grouping";
-        } else if (namespaceType.equals(BindingNamespaceType.Grouping)) {
-            suffix = "data";
-        }
-
-        GeneratedTypeBuilder it = addRawInterfaceDefinition(basePackageName, schemaNode, schemaContext, "", suffix,
+        GeneratedTypeBuilder it = addRawInterfaceDefinition(basePackageName, schemaNode, schemaContext, "", "",
                 verboseClassComments, genTypeBuilders, namespaceType, genCtx.get(module));
         if (namespaceType.equals(BindingNamespaceType.Data)) {
             if (parent == null) {