Fix failure to generate runtime types with duplicate schema

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

diff --git a/binding/mdsal-binding-generator-impl/src/main/java/org/opendaylight/mdsal/binding/generator/impl/RuntimeTypeGenerator.java b/binding/mdsal-binding-generator-impl/src/main/java/org/opendaylight/mdsal/binding/generator/impl/RuntimeTypeGenerator.java
index 1402fda03799d6cf059270856c12e74f4873ed80..ee661724368dccd11fe732f90483e8119c784678 100644 (file)
--- a/binding/mdsal-binding-generator-impl/src/main/java/org/opendaylight/mdsal/binding/generator/impl/RuntimeTypeGenerator.java
+++ b/binding/mdsal-binding-generator-impl/src/main/java/org/opendaylight/mdsal/binding/generator/impl/RuntimeTypeGenerator.java
@@ -7,8 +7,6 @@
  */
 package org.opendaylight.mdsal.binding.generator.impl;
 
-import com.google.common.collect.BiMap;
-import com.google.common.collect.HashBiMap;
 import com.google.common.collect.HashMultimap;
 import com.google.common.collect.Multimap;
 import java.util.Collection;
@@ -17,44 +15,52 @@ import java.util.IdentityHashMap;
 import java.util.Map;
 import java.util.Map.Entry;
 import org.eclipse.jdt.annotation.NonNull;
-import org.opendaylight.binding.runtime.api.BindingRuntimeTypes;
 import org.opendaylight.mdsal.binding.model.api.JavaTypeName;
 import org.opendaylight.mdsal.binding.model.api.Type;
 import org.opendaylight.mdsal.binding.model.api.type.builder.GeneratedTypeBuilder;
 import org.opendaylight.mdsal.binding.model.api.type.builder.GeneratedTypeBuilderBase;
 import org.opendaylight.mdsal.binding.model.api.type.builder.TypeMemberBuilder;
+import org.opendaylight.mdsal.binding.runtime.api.BindingRuntimeTypes;
 import org.opendaylight.mdsal.binding.yang.types.RuntimeTypeProvider;
 import org.opendaylight.yangtools.concepts.Builder;
 import org.opendaylight.yangtools.yang.common.QName;
 import org.opendaylight.yangtools.yang.model.api.AugmentationSchemaNode;
 import org.opendaylight.yangtools.yang.model.api.DocumentedNode;
 import org.opendaylight.yangtools.yang.model.api.DocumentedNode.WithStatus;
+import org.opendaylight.yangtools.yang.model.api.EffectiveModelContext;
 import org.opendaylight.yangtools.yang.model.api.Module;
-import org.opendaylight.yangtools.yang.model.api.SchemaContext;
+import org.opendaylight.yangtools.yang.model.api.RpcDefinition;
 import org.opendaylight.yangtools.yang.model.api.SchemaNode;
 
 final class RuntimeTypeGenerator extends AbstractTypeGenerator {
-    RuntimeTypeGenerator(final SchemaContext context, final Map<SchemaNode, JavaTypeName> renames) {
+    RuntimeTypeGenerator(final EffectiveModelContext context, final Map<SchemaNode, JavaTypeName> renames) {
         super(context, new RuntimeTypeProvider(context, renames), renames);
     }
 
     @NonNull BindingRuntimeTypes toTypeMapping() {
         final Map<Type, AugmentationSchemaNode> augmentationToSchema = new HashMap<>();
-        final BiMap<Type, WithStatus> typeToDefiningSchema = HashBiMap.create();
+        final Map<Type, WithStatus> typeToSchema = new HashMap<>();
         final Multimap<Type, Type> choiceToCases = HashMultimap.create();
         final Map<QName, Type> identities = new HashMap<>();
 
+        // Note: we are keying through WithStatus, but these nodes compare on semantics, so equivalent schema nodes
+        //       can result in two distinct types. We certainly need to keep them separate.
+        final Map<WithStatus, Type> schemaToType = new IdentityHashMap<>();
+
         /*
-         * Fun parts are here. ModuleContext maps have Builders in them, we want plan types. We may encounter each
+         * Fun parts are here. ModuleContext maps have Builders in them, we want plain types. We may encounter each
          * builder multiple times, hence we keep a builder->instance cache.
          */
         final Map<Type, Type> builderToType = new IdentityHashMap<>();
+
         for (final ModuleContext ctx : moduleContexts()) {
             for (Entry<Type, AugmentationSchemaNode> e : ctx.getTypeToAugmentation().entrySet()) {
                 augmentationToSchema.put(builtType(builderToType, e.getKey()), e.getValue());
             }
             for (Entry<Type, WithStatus> e : ctx.getTypeToSchema().entrySet()) {
-                typeToDefiningSchema.put(builtType(builderToType, e.getKey()), e.getValue());
+                final Type type = builtType(builderToType, e.getKey());
+                typeToSchema.put(type, e.getValue());
+                schemaToType.put(e.getValue(), type);
             }
             for (Entry<Type, Type> e : ctx.getChoiceToCases().entries()) {
                 choiceToCases.put(builtType(builderToType, e.getKey()), builtType(builderToType, e.getValue()));
@@ -64,7 +70,7 @@ final class RuntimeTypeGenerator extends AbstractTypeGenerator {
             }
         }
 
-        return new BindingRuntimeTypes(schemaContext(), augmentationToSchema, typeToDefiningSchema, choiceToCases,
+        return new BindingRuntimeTypes(schemaContext(), augmentationToSchema, typeToSchema, schemaToType, choiceToCases,
             identities);
     }
 
@@ -102,4 +108,9 @@ final class RuntimeTypeGenerator extends AbstractTypeGenerator {
     void addComment(final TypeMemberBuilder<?> genType, final DocumentedNode node) {
         // No-op
     }
+
+    @Override
+    void addRpcMethodComment(final TypeMemberBuilder<?> genType, final RpcDefinition node) {
+        // No-op
+    }
 }