make sure to eliminate any reference to builders

We are picking up indexing information from ModuleContext, but we
also need to make sure to built these types.

Change-Id: I32c18b31885bcd1391412819e66314e5fa48ae3a
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
(cherry picked from commit 4bc170fb392d2100d676199abcf059b1116de2b5)

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 f496927d20328f637b200869991e9fb3590e4103..355a0df3217e24098f3a543106be338248e4fd03 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
@@ -12,10 +12,14 @@ import com.google.common.collect.HashBiMap;
 import com.google.common.collect.HashMultimap;
 import com.google.common.collect.Multimap;
 import java.util.HashMap;
+import java.util.IdentityHashMap;
 import java.util.Map;
+import java.util.Map.Entry;
 import java.util.Set;
 import org.opendaylight.mdsal.binding.generator.api.BindingRuntimeTypes;
 import org.opendaylight.mdsal.binding.model.api.Type;
+import org.opendaylight.mdsal.binding.model.api.type.builder.AnnotationTypeBuilder;
+import org.opendaylight.mdsal.binding.model.api.type.builder.GeneratedTOBuilder;
 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;
@@ -39,17 +43,50 @@ final class RuntimeTypeGenerator extends AbstractTypeGenerator {
         final Multimap<Type, Type> choiceToCases = HashMultimap.create();
         final Map<QName, Type> identities = new HashMap<>();
 
+        /*
+         * Fun parts are here. ModuleContext maps have Builders in them, we want plan 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()) {
-            augmentationToSchema.putAll(ctx.getTypeToAugmentation());
-            typeToDefiningSchema.putAll(ctx.getTypeToSchema());
-
-            choiceToCases.putAll(ctx.getChoiceToCases());
-            identities.putAll(ctx.getIdentities());
+            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());
+            }
+            for (Entry<Type, Type> e : ctx.getChoiceToCases().entries()) {
+                choiceToCases.put(builtType(builderToType, e.getKey()), builtType(builderToType, e.getValue()));
+            }
+            for (Entry<QName, GeneratedTOBuilder> e : ctx.getIdentities().entrySet()) {
+                identities.put(e.getKey(), builtType(builderToType, e.getValue()));
+            }
         }
 
         return new BindingRuntimeTypes(augmentationToSchema, typeToDefiningSchema, choiceToCases, identities);
     }
 
+    private static Type builtType(final Map<Type, Type> knownTypes, final Type type) {
+        final Type existing = knownTypes.get(type);
+        if (existing != null) {
+            return existing;
+        }
+
+        final Type built;
+        if (type instanceof AnnotationTypeBuilder) {
+            built = ((AnnotationTypeBuilder) type).toInstance();
+        } else if (type instanceof GeneratedTOBuilder) {
+            built = ((GeneratedTOBuilder) type).toInstance();
+        } else if (type instanceof GeneratedTypeBuilder) {
+            built = ((GeneratedTypeBuilder) type).toInstance();
+        } else {
+            built = type;
+        }
+
+        knownTypes.put(type, built);
+        return built;
+    }
+
     @Override
     void addCodegenInformation(final GeneratedTypeBuilderBase<?> genType, final Module module) {
         // No-op