Move declaredInstance out of StatementContextBase

[yangtools.git] / yang / yang-parser-reactor / src / main / java / org / opendaylight / yangtools / yang / parser / stmt / reactor / StatementContextBase.java

diff --git a/yang/yang-parser-reactor/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/StatementContextBase.java b/yang/yang-parser-reactor/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/StatementContextBase.java
index c5e676aa4a134507b7af34f27d105209b7f7104f..0ee59976f49327045315c6bf8ee7cf4285cfaed7 100644 (file)
--- a/yang/yang-parser-reactor/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/StatementContextBase.java
+++ b/yang/yang-parser-reactor/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/StatementContextBase.java
@@ -144,7 +144,6 @@ public abstract class StatementContextBase<A, D extends DeclaredStatement<A>, E
     private List<StmtContext<?, ?, ?>> effectOfStatement = ImmutableList.of();
 
     private @Nullable ModelProcessingPhase completedPhase;
-    private @Nullable D declaredInstance;
     private @Nullable E effectiveInstance;
 
     // Master flag controlling whether this context can yield an effective statement
@@ -171,7 +170,6 @@ public abstract class StatementContextBase<A, D extends DeclaredStatement<A>, E
         this.isSupportedToBuildEffective = original.isSupportedToBuildEffective;
         this.fullyDefined = original.fullyDefined;
         this.completedPhase = original.completedPhase;
-        this.declaredInstance = original.declaredInstance;
         this.flags = original.flags;
     }
 
@@ -516,21 +514,6 @@ public abstract class StatementContextBase<A, D extends DeclaredStatement<A>, E
         fullyDefined = true;
     }
 
-    @Override
-    public D buildDeclared() {
-        final D existing = declaredInstance;
-        if (existing != null) {
-            return existing;
-        }
-        checkArgument(completedPhase == ModelProcessingPhase.FULL_DECLARATION
-                || completedPhase == ModelProcessingPhase.EFFECTIVE_MODEL);
-        return declaredInstance = createDeclared();
-    }
-
-    @NonNull D createDeclared() {
-        return definition.getFactory().createDeclared(this);
-    }
-
     @Override
     public E buildEffective() {
         final E existing = effectiveInstance;