Separate out YangIdentifierClassNamingStrategy

[mdsal.git] / binding / mdsal-binding-generator / src / main / java / org / opendaylight / mdsal / binding / generator / impl / reactor / CollisionDomain.java

diff --git a/binding/mdsal-binding-generator/src/main/java/org/opendaylight/mdsal/binding/generator/impl/reactor/CollisionDomain.java b/binding/mdsal-binding-generator/src/main/java/org/opendaylight/mdsal/binding/generator/impl/reactor/CollisionDomain.java
index ff6c52a5a3a1b507629a3898884373b3595d3f2a..0f8d9d2f7292954fb60a1902dd8d702fd219d62c 100644 (file)
--- a/binding/mdsal-binding-generator/src/main/java/org/opendaylight/mdsal/binding/generator/impl/reactor/CollisionDomain.java
+++ b/binding/mdsal-binding-generator/src/main/java/org/opendaylight/mdsal/binding/generator/impl/reactor/CollisionDomain.java
@@ -101,7 +101,7 @@ final class CollisionDomain {
 
         @Override
         final String computeCurrentPackage() {
-            return packageString(strategy.nodeIdentifier());
+            return strategy.childPackage();
         }
 
         @Override
@@ -122,8 +122,7 @@ final class CollisionDomain {
 
         @Override
         boolean equalRoot(final Member other) {
-            return other instanceof Primary primary
-                && strategy.nodeIdentifier().getLocalName().equals(primary.strategy.nodeIdentifier().getLocalName());
+            return other instanceof Primary primary && strategy.rootName().equals(primary.strategy.rootName());
         }
     }
 
@@ -331,8 +330,8 @@ final class CollisionDomain {
         return member;
     }
 
-    private static @NonNull String packageString(final AbstractQName component) {
-        // Replace dashes with dots, as dashes are not allowed in package names
+    // Replace dashes with dots, as dashes are not allowed in package names
+    static @NonNull String packageString(final AbstractQName component) {
         return component.getLocalName().replace('-', '.');
     }
 }