Remove AbstractExplicitGenerator.recursiveRuntimeType()

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

diff --git a/binding/mdsal-binding-generator/src/main/java/org/opendaylight/mdsal/binding/generator/impl/reactor/AbstractExplicitGenerator.java b/binding/mdsal-binding-generator/src/main/java/org/opendaylight/mdsal/binding/generator/impl/reactor/AbstractExplicitGenerator.java
index 3ca83a023da644a1810f1292f44bb8a3cf01eeec..67883f3f94d382f3cb9ad94428b978e07c7ddb1b 100644 (file)
--- a/binding/mdsal-binding-generator/src/main/java/org/opendaylight/mdsal/binding/generator/impl/reactor/AbstractExplicitGenerator.java
+++ b/binding/mdsal-binding-generator/src/main/java/org/opendaylight/mdsal/binding/generator/impl/reactor/AbstractExplicitGenerator.java
@@ -92,15 +92,11 @@ public abstract class AbstractExplicitGenerator<S extends EffectiveStatement<?,
     }
 
     final Optional<R> runtimeTypeOf(final @NonNull S stmt) {
-        return recursiveRuntimeType().map(childType -> rebaseRuntimeType(childType, stmt));
-    }
-
-    public final Optional<R> recursiveRuntimeType() {
-        AbstractExplicitGenerator<S, R> gen = this;
+        var gen = this;
         do {
             final var ret = gen.runtimeType();
             if (ret.isPresent()) {
-                return ret;
+                return Optional.of(rebaseRuntimeType(ret.orElseThrow(), stmt));
             }
 
             gen = gen.previous();