Bump yangtools to 13.0.0

[mdsal.git] / binding / mdsal-binding-generator / src / main / java / org / opendaylight / mdsal / binding / generator / impl / reactor / GeneratorContext.java

diff --git a/binding/mdsal-binding-generator/src/main/java/org/opendaylight/mdsal/binding/generator/impl/reactor/GeneratorContext.java b/binding/mdsal-binding-generator/src/main/java/org/opendaylight/mdsal/binding/generator/impl/reactor/GeneratorContext.java
index ea42c5cae82291d52bcb459b91323e04bdbf41a1..92ca3341c03cc44abe9a61e0f5b7165b5df125cf 100644 (file)
--- a/binding/mdsal-binding-generator/src/main/java/org/opendaylight/mdsal/binding/generator/impl/reactor/GeneratorContext.java
+++ b/binding/mdsal-binding-generator/src/main/java/org/opendaylight/mdsal/binding/generator/impl/reactor/GeneratorContext.java
@@ -7,21 +7,28 @@
  */
 package org.opendaylight.mdsal.binding.generator.impl.reactor;
 
-import edu.umd.cs.findbugs.annotations.Nullable;
+import static java.util.Objects.requireNonNull;
+
 import org.eclipse.jdt.annotation.NonNull;
+import org.eclipse.jdt.annotation.Nullable;
 import org.opendaylight.yangtools.yang.common.QName;
 import org.opendaylight.yangtools.yang.common.QNameModule;
 import org.opendaylight.yangtools.yang.model.api.EffectiveModelContext;
 import org.opendaylight.yangtools.yang.model.api.PathExpression;
 import org.opendaylight.yangtools.yang.model.api.meta.EffectiveStatement;
-import org.opendaylight.yangtools.yang.model.spi.AbstractEffectiveModelContextProvider;
 
 /**
  * Abstract view on generation tree as viewed by a particular {@link Generator}.
  */
-abstract class GeneratorContext extends AbstractEffectiveModelContextProvider {
+abstract class GeneratorContext {
+    private final @NonNull EffectiveModelContext modelContext;
+
     GeneratorContext(final EffectiveModelContext modelContext) {
-        super(modelContext);
+        this.modelContext = requireNonNull(modelContext);
+    }
+
+    final @NonNull EffectiveModelContext modelContext() {
+        return modelContext;
     }
 
     /**
@@ -53,8 +60,7 @@ abstract class GeneratorContext extends AbstractEffectiveModelContextProvider {
 
     final @NonNull IdentityGenerator resolveIdentity(final @NonNull QName name) {
         for (Generator gen : resolveModule(name.getModule())) {
-            if (gen instanceof IdentityGenerator) {
-                final IdentityGenerator idgen = (IdentityGenerator) gen;
+            if (gen instanceof final IdentityGenerator idgen) {
                 if (name.equals(idgen.statement().argument())) {
                     return idgen;
                 }