Binding generator v2 - Unions fix

[mdsal.git] / binding2 / mdsal-binding2-generator-util / src / main / java / org / opendaylight / mdsal / binding / javav2 / generator / util / AbstractBaseType.java

diff --git a/binding2/mdsal-binding2-generator-util/src/main/java/org/opendaylight/mdsal/binding/javav2/generator/util/AbstractBaseType.java b/binding2/mdsal-binding2-generator-util/src/main/java/org/opendaylight/mdsal/binding/javav2/generator/util/AbstractBaseType.java
index bd0b0478c300bbbec761466eb9d8dfcfa3cd7e78..4615d2791e05a9795f7e999946a1aa3b639b6211 100644 (file)
--- a/binding2/mdsal-binding2-generator-util/src/main/java/org/opendaylight/mdsal/binding/javav2/generator/util/AbstractBaseType.java
+++ b/binding2/mdsal-binding2-generator-util/src/main/java/org/opendaylight/mdsal/binding/javav2/generator/util/AbstractBaseType.java
@@ -42,8 +42,8 @@ public abstract class AbstractBaseType implements Type {
     protected AbstractBaseType(final String pkName, final String name) {
         Preconditions.checkNotNull(pkName, "Package Name for Generated Type cannot be null!");
         Preconditions.checkNotNull(name, "Name of Generated Type cannot be null!");
-        this.packageName = NonJavaCharsConverter.convertFullPackageName(pkName);
-        this.name = NonJavaCharsConverter.normalizeClassIdentifier(pkName, name);
+        this.packageName = JavaIdentifierNormalizer.normalizeFullPackageName(pkName);
+        this.name = JavaIdentifierNormalizer.normalizeClassIdentifier(pkName, name);
     }
 
     /**
@@ -65,8 +65,8 @@ public abstract class AbstractBaseType implements Type {
             this.packageName = pkName;
             this.name = name;
         } else {
-            this.packageName = NonJavaCharsConverter.convertFullPackageName(pkName);
-            this.name = NonJavaCharsConverter.normalizeClassIdentifier(pkName, name);
+            this.packageName = JavaIdentifierNormalizer.normalizeFullPackageName(pkName);
+            this.name = JavaIdentifierNormalizer.normalizeClassIdentifier(pkName, name);
         }
     }