Use @Nullable in AbstractExplicitGenerator.runtimeType()

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

diff --git a/binding/mdsal-binding-generator/src/main/java/org/opendaylight/mdsal/binding/generator/impl/reactor/ModuleGenerator.java b/binding/mdsal-binding-generator/src/main/java/org/opendaylight/mdsal/binding/generator/impl/reactor/ModuleGenerator.java
index 036f30e22fe4e82b645bae693662dfdb75f1fab8..2634d538c86bd47a0d6c176c199bc134afe151ad 100644 (file)
--- a/binding/mdsal-binding-generator/src/main/java/org/opendaylight/mdsal/binding/generator/impl/reactor/ModuleGenerator.java
+++ b/binding/mdsal-binding-generator/src/main/java/org/opendaylight/mdsal/binding/generator/impl/reactor/ModuleGenerator.java
@@ -10,6 +10,7 @@ package org.opendaylight.mdsal.binding.generator.impl.reactor;
 import static com.google.common.base.Verify.verify;
 import static com.google.common.base.Verify.verifyNotNull;
 
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 import org.eclipse.jdt.annotation.NonNull;
@@ -17,15 +18,17 @@ import org.opendaylight.mdsal.binding.generator.impl.reactor.CollisionDomain.Mem
 import org.opendaylight.mdsal.binding.generator.impl.rt.DefaultModuleRuntimeType;
 import org.opendaylight.mdsal.binding.model.api.GeneratedType;
 import org.opendaylight.mdsal.binding.model.api.JavaTypeName;
-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.ri.BindingTypes;
 import org.opendaylight.mdsal.binding.runtime.api.AugmentRuntimeType;
 import org.opendaylight.mdsal.binding.runtime.api.ModuleRuntimeType;
 import org.opendaylight.mdsal.binding.runtime.api.RuntimeType;
-import org.opendaylight.mdsal.binding.spec.naming.BindingMapping;
+import org.opendaylight.mdsal.binding.runtime.api.YangDataRuntimeType;
+import org.opendaylight.yangtools.yang.binding.contract.Naming;
+import org.opendaylight.yangtools.yang.binding.contract.StatementNamespace;
 import org.opendaylight.yangtools.yang.common.AbstractQName;
 import org.opendaylight.yangtools.yang.common.QNameModule;
+import org.opendaylight.yangtools.yang.common.YangDataName;
 import org.opendaylight.yangtools.yang.model.api.stmt.ModuleEffectiveStatement;
 import org.opendaylight.yangtools.yang.model.util.SchemaInferenceStack;
 
@@ -39,15 +42,15 @@ public final class ModuleGenerator extends AbstractCompositeGenerator<ModuleEffe
     /**
      * Note that for sake of simplicity of lookup and child mapping, this instance serves as the root for all child
      * generators, but mapping to {@link CollisionDomain}s and their {@link Member}s is rather weird. This generator
-     * actually produces one of <em>secondary</em> members, more precisely the {@link BindingMapping#DATA_ROOT_SUFFIX}
-     * one. Counter-intuitively the other secondary members live as children of this generator. To support this we have
-     * also have this field, which is actually the <em>primary</em> derived from the module's name.
+     * actually produces one of <em>secondary</em> members, more precisely the {@link Naming#DATA_ROOT_SUFFIX} one.
+     * Counter-intuitively the other secondary members live as children of this generator. To support this we also have
+     * this field, which is actually the <em>primary</em> derived from the module's name.
      */
     private final Member prefixMember;
 
     ModuleGenerator(final ModuleEffectiveStatement statement) {
         super(statement);
-        yangModuleInfo = JavaTypeName.create(javaPackage(), BindingMapping.MODULE_INFO_CLASS_NAME);
+        yangModuleInfo = JavaTypeName.create(javaPackage(), Naming.MODULE_INFO_CLASS_NAME);
         prefixMember = domain().addPrefix(this, new ModuleNamingStrategy(statement.argument()));
     }
 
@@ -68,7 +71,7 @@ public final class ModuleGenerator extends AbstractCompositeGenerator<ModuleEffe
 
     @Override
     String createJavaPackage() {
-        return BindingMapping.getRootPackageName(statement().localQNameModule());
+        return Naming.getRootPackageName(statement().localQNameModule());
     }
 
     @Override
@@ -83,12 +86,12 @@ public final class ModuleGenerator extends AbstractCompositeGenerator<ModuleEffe
 
     @Override
     Member createMember(final CollisionDomain domain) {
-        return domain.addSecondary(this, prefixMember, BindingMapping.DATA_ROOT_SUFFIX);
+        return domain.addSecondary(this, prefixMember, Naming.DATA_ROOT_SUFFIX);
     }
 
     @Override
     GeneratedType createTypeImpl(final TypeBuilderFactory builderFactory) {
-        final GeneratedTypeBuilder builder = builderFactory.newGeneratedTypeBuilder(typeName());
+        final var builder = builderFactory.newGeneratedTypeBuilder(typeName());
         builder.setModuleName(statement().argument().getLocalName());
         builder.addImplementsType(BindingTypes.DATA_ROOT);
 
@@ -110,13 +113,12 @@ public final class ModuleGenerator extends AbstractCompositeGenerator<ModuleEffe
     }
 
     void addQNameConstant(final GeneratedTypeBuilderBase<?> builder, final AbstractQName localName) {
-        builder.addConstant(BindingTypes.QNAME, BindingMapping.QNAME_STATIC_FIELD_NAME,
+        builder.addConstant(BindingTypes.QNAME, Naming.QNAME_STATIC_FIELD_NAME,
             Map.entry(yangModuleInfo, localName.getLocalName()));
     }
 
-    // FIXME: use YangDataName
-    void addNameConstant(final GeneratedTypeBuilderBase<?> builder, final String templateName) {
-        builder.addConstant(BindingTypes.YANG_DATA_NAME, BindingMapping.NAME_STATIC_FIELD_NAME,
+    void addNameConstant(final GeneratedTypeBuilderBase<?> builder, final YangDataName templateName) {
+        builder.addConstant(BindingTypes.YANG_DATA_NAME, Naming.NAME_STATIC_FIELD_NAME,
             Map.entry(yangModuleInfo, templateName));
     }
 
@@ -128,7 +130,15 @@ public final class ModuleGenerator extends AbstractCompositeGenerator<ModuleEffe
             ModuleRuntimeType build(final GeneratedType type, final ModuleEffectiveStatement statement,
                     final List<RuntimeType> children, final List<AugmentRuntimeType> augments) {
                 verify(augments.isEmpty(), "Unexpected augments %s", augments);
-                return new DefaultModuleRuntimeType(type, statement, children);
+
+                final var yangDataChildren = new ArrayList<YangDataRuntimeType>();
+                for (var child : ModuleGenerator.this) {
+                    if (child instanceof YangDataGenerator yangDataGen) {
+                        yangDataChildren.add(yangDataGen.getRuntimeType());
+                    }
+                }
+
+                return new DefaultModuleRuntimeType(type, statement, children, yangDataChildren);
             }
         };
     }