From b9580d1a52021f8b77907c3068c6910a69a04178 Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Fri, 15 Oct 2021 20:31:06 +0200 Subject: [PATCH 1/1] Remove getOriginalIfPossible() We already have originalNodeOf(), which does precisely the same thing as we just transplanted. Change-Id: Ibcafaa23027be1e52e4bb1d8c1f752683fab1aff Signed-off-by: Robert Varga --- .../runtime/api/AbstractBindingRuntimeContext.java | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/binding/mdsal-binding-runtime-api/src/main/java/org/opendaylight/mdsal/binding/runtime/api/AbstractBindingRuntimeContext.java b/binding/mdsal-binding-runtime-api/src/main/java/org/opendaylight/mdsal/binding/runtime/api/AbstractBindingRuntimeContext.java index 0cf67bc68f..cbbeda4110 100644 --- a/binding/mdsal-binding-runtime-api/src/main/java/org/opendaylight/mdsal/binding/runtime/api/AbstractBindingRuntimeContext.java +++ b/binding/mdsal-binding-runtime-api/src/main/java/org/opendaylight/mdsal/binding/runtime/api/AbstractBindingRuntimeContext.java @@ -126,18 +126,14 @@ public abstract class AbstractBindingRuntimeContext implements BindingRuntimeCon private static @Nullable SchemaNode getRootOriginalIfPossible(final SchemaNode data) { SchemaNode previous = null; - SchemaNode next = getOriginalIfPossible(data); + SchemaNode next = originalNodeOf(data); while (next != null) { previous = next; - next = getOriginalIfPossible(next); + next = originalNodeOf(next); } return previous; } - private static @Nullable SchemaNode getOriginalIfPossible(final SchemaNode node) { - return node instanceof DerivableSchemaNode ? ((DerivableSchemaNode) node).getOriginal().orElse(null) : null; - } - @Override public final ActionDefinition getActionDefinition(final Class> cls) { return (ActionDefinition) getTypes().findSchema(Type.of(cls)).orElse(null); -- 2.36.6