From 6074bee15aa3b35bcb4758b6856ebab38fbfef00 Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Sat, 9 Apr 2022 23:01:27 +0200 Subject: [PATCH] Make DataSchemaContextTree.NodeAndStack a record This is a simple carrier, make it a record. Change-Id: I92e8f81c4831137e60b3c8d4feaf5ce878f8f06b Signed-off-by: Robert Varga --- .../yang/data/util/DataSchemaContextTree.java | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) diff --git a/data/yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/DataSchemaContextTree.java b/data/yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/DataSchemaContextTree.java index ccdd646082..07984925dc 100644 --- a/data/yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/DataSchemaContextTree.java +++ b/data/yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/DataSchemaContextTree.java @@ -28,23 +28,11 @@ import org.opendaylight.yangtools.yang.model.util.SchemaInferenceStack; * @author Robert Varga */ public final class DataSchemaContextTree extends AbstractEffectiveModelContextProvider { - // FIXME: record once we have JDK17+ - public static final class NodeAndStack { - private final @NonNull DataSchemaContextNode node; - private final @NonNull SchemaInferenceStack stack; - - NodeAndStack(final DataSchemaContextNode node, final @NonNull SchemaInferenceStack stack) { + public record NodeAndStack(@NonNull DataSchemaContextNode node, @NonNull SchemaInferenceStack stack) { + public NodeAndStack(final @NonNull DataSchemaContextNode node, final @NonNull SchemaInferenceStack stack) { this.node = requireNonNull(node); this.stack = requireNonNull(stack); } - - public @NonNull DataSchemaContextNode node() { - return node; - } - - public @NonNull SchemaInferenceStack stack() { - return stack; - } } private static final LoadingCache TREES = -- 2.36.6