Rework AugmentRuntimeType and Choice/Case linkage

[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 b67f89f7fc0ba359bac1aaef3a76555ce2d00713..edb1aee7dde9b5a2aab2e0c68ee9c84302dbcade 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
@@ -7,6 +7,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.List;
@@ -25,8 +26,6 @@ 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.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;
 
@@ -36,7 +35,6 @@ import org.opendaylight.yangtools.yang.model.util.SchemaInferenceStack;
  */
 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
@@ -50,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
@@ -95,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);
@@ -124,12 +100,6 @@ public final class ModuleGenerator extends AbstractCompositeGenerator<ModuleEffe
         return builder.build();
     }
 
-    @Override
-    ModuleRuntimeType createRuntimeType(final GeneratedType type, final ModuleEffectiveStatement statement,
-            final List<RuntimeType> children, final List<AugmentRuntimeType> augments) {
-        return new DefaultModuleRuntimeType(type, statement, children, augments);
-    }
-
     @NonNull Member getPrefixMember() {
         return verifyNotNull(prefixMember);
     }
@@ -138,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);
+            }
+        };
+    }
 }