Remove use of NoOpListenerRegistration

Use a simple lambda, as we just need a simple Registration.

JIRA: MDSAL-843
Change-Id: I85a6be83a4ea8fded2aafab4f1ba13a40200c628
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>

diff --git a/dom/mdsal-dom-spi/src/main/java/org/opendaylight/mdsal/dom/spi/FixedDOMSchemaService.java b/dom/mdsal-dom-spi/src/main/java/org/opendaylight/mdsal/dom/spi/FixedDOMSchemaService.java
index 9c73a8e325184447bccc19fe452e3cb87ce19a12..42b364665a6864a7602dea3786d44b221ee2e513 100644 (file)
--- a/dom/mdsal-dom-spi/src/main/java/org/opendaylight/mdsal/dom/spi/FixedDOMSchemaService.java
+++ b/dom/mdsal-dom-spi/src/main/java/org/opendaylight/mdsal/dom/spi/FixedDOMSchemaService.java
@@ -15,7 +15,6 @@ import java.util.List;
 import org.eclipse.jdt.annotation.NonNull;
 import org.opendaylight.mdsal.dom.api.DOMSchemaService;
 import org.opendaylight.mdsal.dom.api.DOMYangTextSourceProvider;
-import org.opendaylight.yangtools.concepts.NoOpListenerRegistration;
 import org.opendaylight.yangtools.concepts.Registration;
 import org.opendaylight.yangtools.yang.model.api.EffectiveModelContext;
 import org.opendaylight.yangtools.yang.model.api.EffectiveModelContextListener;
@@ -60,7 +59,7 @@ public class FixedDOMSchemaService extends AbstractDOMSchemaService {
     }
 
     public static @NonNull DOMSchemaService of(final EffectiveModelContext effectiveModel) {
-        final EffectiveModelContext checked = requireNonNull(effectiveModel);
+        final var checked = requireNonNull(effectiveModel);
         return of(() -> checked);
     }
 
@@ -74,13 +73,13 @@ public class FixedDOMSchemaService extends AbstractDOMSchemaService {
     }
 
     @Override
-    public final EffectiveModelContext getGlobalContext() {
+    public final @NonNull EffectiveModelContext getGlobalContext() {
         return schemaContextProvider.getEffectiveModelContext();
     }
 
     @Override
     public final Registration registerSchemaContextListener(final EffectiveModelContextListener listener) {
         listener.onModelContextUpdated(getGlobalContext());
-        return NoOpListenerRegistration.of(listener);
+        return () -> { };
     }
 }