Detect and repair identity/grouping/typedef conflicts

[mdsal.git] / binding / mdsal-binding-generator-impl / src / main / java / org / opendaylight / mdsal / binding / yang / types / CodegenTypeProvider.java

diff --git a/binding/mdsal-binding-generator-impl/src/main/java/org/opendaylight/mdsal/binding/yang/types/CodegenTypeProvider.java b/binding/mdsal-binding-generator-impl/src/main/java/org/opendaylight/mdsal/binding/yang/types/CodegenTypeProvider.java
index 8b8ecbb46edf716e5c1d70a8b82022a9e71194e9..3401f9a5fe0c20109d5b78ccde964c3f1e1f2601 100644 (file)
--- a/binding/mdsal-binding-generator-impl/src/main/java/org/opendaylight/mdsal/binding/yang/types/CodegenTypeProvider.java
+++ b/binding/mdsal-binding-generator-impl/src/main/java/org/opendaylight/mdsal/binding/yang/types/CodegenTypeProvider.java
@@ -10,6 +10,7 @@ package org.opendaylight.mdsal.binding.yang.types;
 import static org.opendaylight.mdsal.binding.model.util.BindingGeneratorUtil.encodeAngleBrackets;
 
 import com.google.common.annotations.Beta;
+import com.google.common.annotations.VisibleForTesting;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.Maps;
 import java.util.List;
@@ -24,8 +25,9 @@ import org.opendaylight.mdsal.binding.model.util.generated.type.builder.Abstract
 import org.opendaylight.mdsal.binding.model.util.generated.type.builder.CodegenEnumerationBuilder;
 import org.opendaylight.mdsal.binding.model.util.generated.type.builder.CodegenGeneratedTOBuilder;
 import org.opendaylight.mdsal.binding.model.util.generated.type.builder.CodegenGeneratedTypeBuilder;
-import org.opendaylight.yangtools.yang.binding.BindingMapping;
+import org.opendaylight.yangtools.yang.binding.RegexPatterns;
 import org.opendaylight.yangtools.yang.model.api.SchemaContext;
+import org.opendaylight.yangtools.yang.model.api.SchemaNode;
 import org.opendaylight.yangtools.yang.model.api.TypeDefinition;
 import org.opendaylight.yangtools.yang.model.api.type.EnumTypeDefinition;
 import org.opendaylight.yangtools.yang.model.api.type.ModifierKind;
@@ -46,10 +48,16 @@ public class CodegenTypeProvider extends AbstractTypeProvider {
      * Creates new instance of class <code>TypeProviderImpl</code>.
      *
      * @param schemaContext contains the schema data read from YANG files
+     * @param renames
      * @throws IllegalArgumentException if <code>schemaContext</code> is null.
      */
-    public CodegenTypeProvider(final SchemaContext schemaContext) {
-        super(schemaContext);
+    public CodegenTypeProvider(final SchemaContext schemaContext, final Map<SchemaNode, JavaTypeName> renames) {
+        super(schemaContext, renames);
+    }
+
+    @VisibleForTesting
+    CodegenTypeProvider(final SchemaContext schemaContext) {
+        this(schemaContext, ImmutableMap.of());
     }
 
     @Override
@@ -102,7 +110,7 @@ public class CodegenTypeProvider extends AbstractTypeProvider {
     private static String applyModifier(final ModifierKind modifier, final String pattern) {
         switch (modifier) {
             case INVERT_MATCH:
-                return BindingMapping.negatePatternString(pattern);
+                return RegexPatterns.negatePatternString(pattern);
             default:
                 LOG.warn("Ignoring unhandled modifier {}", modifier);
                 return pattern;