DTOs for anydata/anyxml are not generated within a list

[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 f496927d20328f637b200869991e9fb3590e4103..37a3cb404a12b9914f29b6e25159d2fea4bc4fa7 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,14 +12,18 @@ 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.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.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;
@@ -29,8 +33,8 @@ import org.opendaylight.yangtools.yang.model.api.SchemaContext;
 import org.opendaylight.yangtools.yang.model.api.SchemaNode;
 
 final class RuntimeTypeGenerator extends AbstractTypeGenerator {
-    RuntimeTypeGenerator(final SchemaContext context) {
-        super(context, new RuntimeTypeProvider(context));
+    RuntimeTypeGenerator(final SchemaContext context, final Map<SchemaNode, JavaTypeName> renames) {
+        super(context, new RuntimeTypeProvider(context, renames), renames);
     }
 
     BindingRuntimeTypes toTypeMapping() {
@@ -39,17 +43,43 @@ 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, GeneratedTypeBuilder> 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) {
+        if (type instanceof Builder) {
+            final Type existing = knownTypes.get(type);
+            if (existing != null) {
+                return existing;
+            }
+
+            final Type built = (Type) ((Builder<?>)type).build();
+            knownTypes.put(type, built);
+            return built;
+        }
+        return type;
+    }
+
     @Override
     void addCodegenInformation(final GeneratedTypeBuilderBase<?> genType, final Module module) {
         // No-op