Rework AugmentRuntimeType and Choice/Case linkage

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

diff --git a/binding/mdsal-binding-generator/src/main/java/org/opendaylight/mdsal/binding/generator/impl/reactor/KeyGenerator.java b/binding/mdsal-binding-generator/src/main/java/org/opendaylight/mdsal/binding/generator/impl/reactor/KeyGenerator.java
index 4a28b410f16cc7aef0cf9253e8e105b6364fa233..a45c1dcb35c8d74f920b9135e2af0271a4c02363 100644 (file)
--- a/binding/mdsal-binding-generator/src/main/java/org/opendaylight/mdsal/binding/generator/impl/reactor/KeyGenerator.java
+++ b/binding/mdsal-binding-generator/src/main/java/org/opendaylight/mdsal/binding/generator/impl/reactor/KeyGenerator.java
@@ -14,6 +14,7 @@ import java.util.Set;
 import org.opendaylight.mdsal.binding.generator.impl.reactor.CollisionDomain.Member;
 import org.opendaylight.mdsal.binding.generator.impl.rt.DefaultKeyRuntimeType;
 import org.opendaylight.mdsal.binding.model.api.GeneratedTransferObject;
+import org.opendaylight.mdsal.binding.model.api.GeneratedType;
 import org.opendaylight.mdsal.binding.model.api.Type;
 import org.opendaylight.mdsal.binding.model.api.type.builder.GeneratedPropertyBuilder;
 import org.opendaylight.mdsal.binding.model.api.type.builder.GeneratedTOBuilder;
@@ -77,16 +78,21 @@ final class KeyGenerator extends AbstractExplicitGenerator<KeyEffectiveStatement
     }
 
     @Override
-    KeyRuntimeType createRuntimeType() {
-        return generatedType().map(type -> {
-            verify(type instanceof GeneratedTransferObject, "Unexpected type %s", type);
-            return new DefaultKeyRuntimeType((GeneratedTransferObject) type, statement());
-        }).orElse(null);
+    GeneratedType runtimeJavaType() {
+        return generatedType().orElse(null);
     }
 
     @Override
-    KeyRuntimeType rebaseRuntimeType(final KeyRuntimeType type, final KeyEffectiveStatement statement) {
-        return new DefaultKeyRuntimeType(type.javaType(), statement);
+    KeyRuntimeType createExternalRuntimeType(final Type type) {
+        verify(type instanceof GeneratedTransferObject, "Unexpected type %s", type);
+        return new DefaultKeyRuntimeType((GeneratedTransferObject) type, statement());
+    }
+
+    @Override
+    KeyRuntimeType createInternalRuntimeType(final ChildLookup lookup,final KeyEffectiveStatement statement,
+            final Type type) {
+        // The only reference to this runtime type is from ListGenerator which is always referencing the external type
+        throw new UnsupportedOperationException("Should never be called");
     }
 
     @Override