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 4607f9b437b41e3cdd9819faa75b102f79625b47..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;
@@ -99,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);
     }
@@ -113,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);
+            }
+        };
+    }
 }