Cleanup AbstractBindingAdapter

@NonNullByDefault does not quite work here, revert back to explicit
@NonNull annotations.

Change-Id: I4f2779f611316701be8bb41199d9a36f03d0b1d9
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>

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 b94aedd1d53ff5c3c6984a62b9976d8598e40586..4ef7267214582bc7df299259ccf2f3caf8847ea4 100644 (file)
--- 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<T> implements Delegator<T> {
-    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<T> implements Delegator<T> {
         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();
     }
 }