From c358e6dafb7627feb37fcbf1583d31c6170cc958 Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Wed, 18 Nov 2020 13:46:36 +0100 Subject: [PATCH] Remove an orElse(null) indirection We do not need to update foundNode() if we do not find anything, hence sync on optional directly. Improves interactions and solves an Eclipse warning. Change-Id: Ibc553d50d48ccd22480bdc33163364bc8a509c83 Signed-off-by: Robert Varga (cherry picked from commit 8c0f44e010826c36a232df28385dc591c7f878fd) --- .../yangtools/yang/model/util/SchemaContextUtil.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/SchemaContextUtil.java b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/SchemaContextUtil.java index a0c53dc1fb..ea1a9bf677 100644 --- a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/SchemaContextUtil.java +++ b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/SchemaContextUtil.java @@ -450,10 +450,10 @@ public final class SchemaContextUtil { } if (foundNode == null && parent instanceof ActionNodeContainer) { - foundNode = ((ActionNodeContainer) parent).getActions().stream() - .filter(act -> current.equals(act.getQName())).findFirst().orElse(null); - if (foundNode != null && nextPath.iterator().hasNext()) { - foundNode = findNodeIn(foundNode, nextPath); + final Optional next = ((ActionNodeContainer) parent).getActions().stream() + .filter(act -> current.equals(act.getQName())).findFirst(); + if (next.isPresent() && nextPath.iterator().hasNext()) { + foundNode = findNodeIn(next.orElseThrow(), nextPath); } } -- 2.36.6