From f0b511a58fd37cc69258768a704a4e43d3817438 Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Wed, 12 Apr 2023 01:01:26 +0200 Subject: [PATCH] Cleanup AbstractBindingAdapter @NonNullByDefault does not quite work here, revert back to explicit @NonNull annotations. Change-Id: I4f2779f611316701be8bb41199d9a36f03d0b1d9 Signed-off-by: Robert Varga --- .../binding/dom/adapter/AbstractBindingAdapter.java | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/dom/adapter/AbstractBindingAdapter.java b/binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/dom/adapter/AbstractBindingAdapter.java index b94aedd1d5..4ef7267214 100644 --- a/binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/dom/adapter/AbstractBindingAdapter.java +++ b/binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/dom/adapter/AbstractBindingAdapter.java @@ -9,13 +9,12 @@ package org.opendaylight.mdsal.binding.dom.adapter; import static java.util.Objects.requireNonNull; -import org.eclipse.jdt.annotation.NonNullByDefault; +import org.eclipse.jdt.annotation.NonNull; import org.opendaylight.yangtools.concepts.Delegator; -@NonNullByDefault abstract class AbstractBindingAdapter implements Delegator { - private final AdapterContext adapterContext; - private final T delegate; + private final @NonNull AdapterContext adapterContext; + private final @NonNull T delegate; AbstractBindingAdapter(final AdapterContext adapterContext, final T delegate) { this.adapterContext = requireNonNull(adapterContext); @@ -27,11 +26,11 @@ abstract class AbstractBindingAdapter implements Delegator { return delegate; } - protected final AdapterContext adapterContext() { + protected final @NonNull AdapterContext adapterContext() { return adapterContext; } - protected final CurrentAdapterSerializer currentSerializer() { + protected final @NonNull CurrentAdapterSerializer currentSerializer() { return adapterContext.currentSerializer(); } } -- 2.36.6