Rework AugmentRuntimeType and Choice/Case linkage

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

diff --git a/binding/mdsal-binding-generator/src/main/java/org/opendaylight/mdsal/binding/generator/impl/reactor/AbstractTypeObjectGenerator.java b/binding/mdsal-binding-generator/src/main/java/org/opendaylight/mdsal/binding/generator/impl/reactor/AbstractTypeObjectGenerator.java
index 2c41edb80b4ef86274aa392810fbae5e96c936ea..845fb0dcba8b4f785f946ff92d50966b9c676581 100644 (file)
--- a/binding/mdsal-binding-generator/src/main/java/org/opendaylight/mdsal/binding/generator/impl/reactor/AbstractTypeObjectGenerator.java
+++ b/binding/mdsal-binding-generator/src/main/java/org/opendaylight/mdsal/binding/generator/impl/reactor/AbstractTypeObjectGenerator.java
@@ -457,20 +457,18 @@ abstract class AbstractTypeObjectGenerator<S extends EffectiveStatement<?, ?>, R
     }
 
     @Override
-    final R createRuntimeType() {
+    final Type runtimeJavaType() {
         if (methodReturnTypeElement != null) {
-            return createRuntimeType(methodReturnTypeElement);
+            return methodReturnTypeElement;
         }
         final var genType = generatedType();
         if (genType.isPresent()) {
-            return createRuntimeType(genType.orElseThrow());
+            return genType.orElseThrow();
         }
         final var prev = verifyNotNull(previous(), "No previous generator for %s", this);
-        return prev.runtimeType().orElse(null);
+        return prev.runtimeJavaType();
     }
 
-    abstract @NonNull R createRuntimeType(Type type);
-
     final @NonNull Type methodReturnElementType(final @NonNull TypeBuilderFactory builderFactory) {
         var local = methodReturnTypeElement;
         if (local == null) {