X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=binding%2Fmdsal-binding-generator%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fmdsal%2Fbinding%2Fgenerator%2Fimpl%2Freactor%2FModuleGenerator.java;h=edb1aee7dde9b5a2aab2e0c68ee9c84302dbcade;hb=0ee55d1f9da11dd03ff05fc67d10cbcbfe63fd2c;hp=98d842c51cb4504482177ad660102a3932f6c7c8;hpb=89a12a10b9573dcc84a5636c046cbd0610bc2111;p=mdsal.git

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 98d842c51c..edb1aee7dd 100644
--- 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,21 +10,22 @@ 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.List;
 import java.util.Map;
 import org.eclipse.jdt.annotation.NonNull;
 import org.opendaylight.mdsal.binding.generator.impl.reactor.CollisionDomain.Member;
+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.YangSourceDefinition;
 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.yangtools.yang.common.AbstractQName;
 import org.opendaylight.yangtools.yang.common.QNameModule;
-import org.opendaylight.yangtools.yang.model.api.Module;
-import org.opendaylight.yangtools.yang.model.api.stmt.ChoiceEffectiveStatement;
-import org.opendaylight.yangtools.yang.model.api.stmt.DataTreeEffectiveStatement;
 import org.opendaylight.yangtools.yang.model.api.stmt.ModuleEffectiveStatement;
 import org.opendaylight.yangtools.yang.model.util.SchemaInferenceStack;
 
@@ -32,9 +33,8 @@ import org.opendaylight.yangtools.yang.model.util.SchemaInferenceStack;
  * Generator corresponding to a {@code module} statement. These generators are roots for generating types for a
  * particular {@link QNameModule} as mapped into the root package.
  */
-public final class ModuleGenerator extends AbstractCompositeGenerator<ModuleEffectiveStatement> {
+public final class ModuleGenerator extends AbstractCompositeGenerator<ModuleEffectiveStatement, ModuleRuntimeType> {
     private final @NonNull JavaTypeName yangModuleInfo;
-    private final @NonNull ClassPlacement placement;
 
     /**
      * Note that for sake of simplicity of lookup and child mapping, this instance serves as the root for all child
@@ -48,24 +48,7 @@ public final class ModuleGenerator extends AbstractCompositeGenerator<ModuleEffe
     ModuleGenerator(final ModuleEffectiveStatement statement) {
         super(statement);
         yangModuleInfo = JavaTypeName.create(javaPackage(), BindingMapping.MODULE_INFO_CLASS_NAME);
-        placement = computePlacement();
-        prefixMember = placement != ClassPlacement.NONE || haveSecondary()
-            ? domain().addPrefix(this, new ModuleNamingStrategy(statement.argument())) : null;
-    }
-
-    private @NonNull ClassPlacement computePlacement() {
-        return statement().findFirstEffectiveSubstatement(DataTreeEffectiveStatement.class).isPresent()
-            || statement().findFirstEffectiveSubstatement(ChoiceEffectiveStatement.class).isPresent()
-            ? ClassPlacement.TOP_LEVEL : ClassPlacement.NONE;
-    }
-
-    private boolean haveSecondary() {
-        for (Generator child : this) {
-            if (child instanceof AbstractImplicitGenerator) {
-                return true;
-            }
-        }
-        return false;
+        prefixMember = domain().addPrefix(this, new ModuleNamingStrategy(statement.argument()));
     }
 
     @Override
@@ -84,7 +67,7 @@ public final class ModuleGenerator extends AbstractCompositeGenerator<ModuleEffe
     }
 
     @Override
-    AbstractCompositeGenerator<?> getPackageParent() {
+    AbstractCompositeGenerator<?, ?> getPackageParent() {
         return this;
     }
 
@@ -93,11 +76,6 @@ public final class ModuleGenerator extends AbstractCompositeGenerator<ModuleEffe
         return domain();
     }
 
-    @Override
-    ClassPlacement classPlacement() {
-        return placement;
-    }
-
     @Override
     Member createMember(final CollisionDomain domain) {
         return domain.addSecondary(this, prefixMember, BindingMapping.DATA_ROOT_SUFFIX);
@@ -117,17 +95,7 @@ public final class ModuleGenerator extends AbstractCompositeGenerator<ModuleEffe
         }
 
         addGetterMethods(builder, builderFactory);
-
-        if (builderFactory instanceof TypeBuilderFactory.Codegen) {
-            final ModuleEffectiveStatement stmt = statement();
-            verify(stmt instanceof Module, "Unexpected module %s", stmt);
-            final Module module = (Module) stmt;
-
-            YangSourceDefinition.of(module).ifPresent(builder::setYangSourceDefinition);
-            TypeComments.description(module).ifPresent(builder::addComment);
-            module.getDescription().ifPresent(builder::setDescription);
-            module.getReference().ifPresent(builder::setReference);
-        }
+        builderFactory.addCodegenInformation(statement(), builder);
 
         return builder.build();
     }
@@ -140,4 +108,17 @@ public final class ModuleGenerator extends AbstractCompositeGenerator<ModuleEffe
         builder.addConstant(BindingTypes.QNAME, BindingMapping.QNAME_STATIC_FIELD_NAME,
             Map.entry(yangModuleInfo, localName.getLocalName()));
     }
+
+    @Override
+    CompositeRuntimeTypeBuilder<ModuleEffectiveStatement, ModuleRuntimeType> createBuilder(
+            final ModuleEffectiveStatement statement) {
+        return new CompositeRuntimeTypeBuilder<>(statement) {
+            @Override
+            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);
+            }
+        };
+    }
 }