Rename StatementSource to StatementOrigin

'origin' is a less loaded word in that it does not have connotations
to 'source text' and similar.

JIRA: YANGTOOLS-1193
Change-Id: I07c611878f978e2ce30e1c3ad9422cb61744e6f4
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>

diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/meta/ModelStatement.java b/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/meta/ModelStatement.java
index 36aacd7998684969a656bf220c201c2ac7af3f3e..de0daaede2e7bd6f5809e71c99c9caf9a737a847 100644 (file)
--- a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/meta/ModelStatement.java
+++ b/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/meta/ModelStatement.java
@@ -13,17 +13,15 @@ import org.opendaylight.yangtools.yang.common.Empty;
 /**
  * Model statement. There are two base types of model statements:
  * <ul>
- * <li>{@link DeclaredStatement} - Statement representation as was defined in original
- * source. This representation could be used during computation of effective model
- * or during transforming YANG model from one serialization format to other.
- * </li>
- * <li>
- * {@link EffectiveStatement} - Representation of effective statement - this
- * statement may be different from declared, in such way, that it contains additional
- * substatements, provides access to model namespaces. Some effective statements may be not
- * directly declared in YANG source, but could be inferred by semantic processing of
- * other statements (eg. uses, augment).
- * </li>
+ *   <li>{@link DeclaredStatement} - Statement representation as was defined in original source. This representation
+ *       could be used during computation of effective model or during transforming YANG model from one serialization
+ *       format to another.
+ *   </li>
+ *   <li>{@link EffectiveStatement} - Representation of effective statement - this statement may be different from
+ *       declared, in such way, that it contains additional substatements, provides access to model namespaces. Some
+ *       effective statements may be not directly declared in YANG source, but could be inferred by semantic processing
+ *       of other statements (for example {@code uses}, {@code augment} and others).
+ *   </li>
  * </ul>
  *
  * @param <A> Argument type ({@link Empty} if statement does not have argument.)
@@ -44,11 +42,10 @@ public interface ModelStatement<A> {
     @NonNull A argument();
 
     /**
-     * Returns statement source, which denotes if statement was
-     * explicitly declared in original model or inferred during
-     * semantic processing of model.
+     * Returns {@link StatementOrigin}, which denotes if statement was explicitly declared in original model or inferred
+     * during semantic processing of model.
      *
-     * @return statement source.
+     * @return statement origin.
      */
-    @NonNull StatementSource getStatementSource();
+    @NonNull StatementOrigin statementOrigin();
 }

diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/meta/StatementSource.java b/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/meta/StatementOrigin.java
similarity index 50%
rename from yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/meta/StatementSource.java
rename to yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/meta/StatementOrigin.java
index 2752b3c3d24970c04cfc5f737631d76cf41a2946..9c0a41320d849de62454a184a0c367fc98531c23 100644 (file)
--- a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/meta/StatementSource.java
+++ b/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/meta/StatementOrigin.java
@@ -8,25 +8,18 @@
 package org.opendaylight.yangtools.yang.model.api.meta;
 
 /**
- * Origin of statement.
- * Represents origin of statement - if it was explicitly present
- * in model representation or if it was inferred from context.
+ * Enumeration of possible origins of a statement.
  */
-public enum StatementSource {
-
+public enum StatementOrigin {
     /**
-     * Statement was explicitly declared by author of the supplied model.
+     * Statement was explicitly declared by author of the supplied model, such as spelled out in the text of a YANG
+     * module.
      */
     DECLARATION,
-
     /**
-     * Statement was derived from context of YANG model / statement
-     * and represents effective model.
-     *
-     * <p>
-     * Effective context nodes are derived from applicable {@link #DECLARATION}
-     * statements by interpreting their semantic meaning in context
-     * of current statement.
+     * Statement was inferred to exist based on effective semantics of some other statement. As an example, the
+     * {@code rpc} statement implies presence of both {@code input} and {@code output} statements, even when they are
+     * not explicitly declared.
      */
     CONTEXT
 }

diff --git a/yang/yang-model-export/src/main/java/org/opendaylight/yangtools/yang/model/export/YinXMLEventReader.java b/yang/yang-model-export/src/main/java/org/opendaylight/yangtools/yang/model/export/YinXMLEventReader.java
index 75ecf97bb886d3ffbd4d5f9b6cc55798ee1c18cd..6395959c8fd7bc2f3531eae54d0ef09726d29f5a 100644 (file)
--- a/yang/yang-model-export/src/main/java/org/opendaylight/yangtools/yang/model/export/YinXMLEventReader.java
+++ b/yang/yang-model-export/src/main/java/org/opendaylight/yangtools/yang/model/export/YinXMLEventReader.java
@@ -181,9 +181,9 @@ final class YinXMLEventReader implements XMLEventReader {
 
         do {
             while (current.children.hasNext()) {
-                // We have to mind child statement source and not emit empty implicit children
+                // We have to mind child statement origin and not emit empty implicit children
                 final DeclaredStatement<?> child = current.children.next();
-                switch (child.getStatementSource()) {
+                switch (child.statementOrigin()) {
                     case CONTEXT:
                         final Iterator<? extends DeclaredStatement<?>> it = child.declaredSubstatements().iterator();
                         if (it.hasNext()) {
@@ -194,7 +194,7 @@ final class YinXMLEventReader implements XMLEventReader {
                         addStatement(child);
                         return;
                     default:
-                        throw new IllegalStateException("Unhandled statement source " + child.getStatementSource());
+                        throw new IllegalStateException("Unhandled statement origin " + child.statementOrigin());
                 }
             }
 

diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyUndeclaredCaseStatement.java b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyUndeclaredCaseStatement.java
index 318c3d33dc52e31474f738f3fa3fd8251f471f70..72933cd98f239241487fab6cd02072824cfa5e42 100644 (file)
--- a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyUndeclaredCaseStatement.java
+++ b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyUndeclaredCaseStatement.java
@@ -8,7 +8,7 @@
 package org.opendaylight.yangtools.yang.model.ri.stmt.impl.decl;
 
 import org.opendaylight.yangtools.yang.common.QName;
-import org.opendaylight.yangtools.yang.model.api.meta.StatementSource;
+import org.opendaylight.yangtools.yang.model.api.meta.StatementOrigin;
 
 public final class EmptyUndeclaredCaseStatement extends EmptyCaseStatement {
     public EmptyUndeclaredCaseStatement(final QName argument) {
@@ -16,7 +16,7 @@ public final class EmptyUndeclaredCaseStatement extends EmptyCaseStatement {
     }
 
     @Override
-    public StatementSource getStatementSource() {
-        return StatementSource.CONTEXT;
+    public StatementOrigin statementOrigin() {
+        return StatementOrigin.CONTEXT;
     }
 }

diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyUndeclaredInputStatement.java b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyUndeclaredInputStatement.java
index ec7d208fcc94b0edeb1aee12ca7fd17505cb782c..5c91f9699c8fb288af324f7571115700d6ff78c4 100644 (file)
--- a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyUndeclaredInputStatement.java
+++ b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyUndeclaredInputStatement.java
@@ -8,7 +8,7 @@
 package org.opendaylight.yangtools.yang.model.ri.stmt.impl.decl;
 
 import org.opendaylight.yangtools.yang.common.QName;
-import org.opendaylight.yangtools.yang.model.api.meta.StatementSource;
+import org.opendaylight.yangtools.yang.model.api.meta.StatementOrigin;
 
 public final class EmptyUndeclaredInputStatement extends EmptyInputStatement {
     public EmptyUndeclaredInputStatement(final QName argument) {
@@ -16,7 +16,7 @@ public final class EmptyUndeclaredInputStatement extends EmptyInputStatement {
     }
 
     @Override
-    public StatementSource getStatementSource() {
-        return StatementSource.CONTEXT;
+    public StatementOrigin statementOrigin() {
+        return StatementOrigin.CONTEXT;
     }
 }

diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyUndeclaredOutputStatement.java b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyUndeclaredOutputStatement.java
index 87aebf7be6a723a8de01addf23db3c8b53ea2c65..e599a3f1cd71d8a3484ee4fb4db8a01e29bdd17b 100644 (file)
--- a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyUndeclaredOutputStatement.java
+++ b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/EmptyUndeclaredOutputStatement.java
@@ -8,7 +8,7 @@
 package org.opendaylight.yangtools.yang.model.ri.stmt.impl.decl;
 
 import org.opendaylight.yangtools.yang.common.QName;
-import org.opendaylight.yangtools.yang.model.api.meta.StatementSource;
+import org.opendaylight.yangtools.yang.model.api.meta.StatementOrigin;
 
 public final class EmptyUndeclaredOutputStatement extends EmptyOutputStatement {
     public EmptyUndeclaredOutputStatement(final QName argument) {
@@ -16,7 +16,7 @@ public final class EmptyUndeclaredOutputStatement extends EmptyOutputStatement {
     }
 
     @Override
-    public StatementSource getStatementSource() {
-        return StatementSource.CONTEXT;
+    public StatementOrigin statementOrigin() {
+        return StatementOrigin.CONTEXT;
     }
 }

diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularUndeclaredCaseStatement.java b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularUndeclaredCaseStatement.java
index d6e35e937385ec0a68bd071398beb897bdc17ede..60122b6f5e6bf7ea42870ef3c2836592a5357731 100644 (file)
--- a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularUndeclaredCaseStatement.java
+++ b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularUndeclaredCaseStatement.java
@@ -10,7 +10,7 @@ package org.opendaylight.yangtools.yang.model.ri.stmt.impl.decl;
 import com.google.common.collect.ImmutableList;
 import org.opendaylight.yangtools.yang.common.QName;
 import org.opendaylight.yangtools.yang.model.api.meta.DeclaredStatement;
-import org.opendaylight.yangtools.yang.model.api.meta.StatementSource;
+import org.opendaylight.yangtools.yang.model.api.meta.StatementOrigin;
 
 public final class RegularUndeclaredCaseStatement extends RegularCaseStatement {
     public RegularUndeclaredCaseStatement(final QName argument,
@@ -19,7 +19,7 @@ public final class RegularUndeclaredCaseStatement extends RegularCaseStatement {
     }
 
     @Override
-    public StatementSource getStatementSource() {
-        return StatementSource.CONTEXT;
+    public StatementOrigin statementOrigin() {
+        return StatementOrigin.CONTEXT;
     }
 }

diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularUndeclaredInputStatement.java b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularUndeclaredInputStatement.java
index e4db556d62fda201eba5faf3126d02378df18241..a8ad0d1d85a5ec644529159d71e7007f7294e889 100644 (file)
--- a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularUndeclaredInputStatement.java
+++ b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularUndeclaredInputStatement.java
@@ -10,7 +10,7 @@ package org.opendaylight.yangtools.yang.model.ri.stmt.impl.decl;
 import com.google.common.collect.ImmutableList;
 import org.opendaylight.yangtools.yang.common.QName;
 import org.opendaylight.yangtools.yang.model.api.meta.DeclaredStatement;
-import org.opendaylight.yangtools.yang.model.api.meta.StatementSource;
+import org.opendaylight.yangtools.yang.model.api.meta.StatementOrigin;
 
 public final class RegularUndeclaredInputStatement extends RegularInputStatement {
     public RegularUndeclaredInputStatement(final QName argument,
@@ -19,7 +19,7 @@ public final class RegularUndeclaredInputStatement extends RegularInputStatement
     }
 
     @Override
-    public StatementSource getStatementSource() {
-        return StatementSource.CONTEXT;
+    public StatementOrigin statementOrigin() {
+        return StatementOrigin.CONTEXT;
     }
 }

diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularUndeclaredOutputStatement.java b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularUndeclaredOutputStatement.java
index 896d901b1fb6e0541c28f9617821c2fb9561663d..765f3d39f01b44e19ae6bcfd631c021f851bed26 100644 (file)
--- a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularUndeclaredOutputStatement.java
+++ b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/decl/RegularUndeclaredOutputStatement.java
@@ -10,7 +10,7 @@ package org.opendaylight.yangtools.yang.model.ri.stmt.impl.decl;
 import com.google.common.collect.ImmutableList;
 import org.opendaylight.yangtools.yang.common.QName;
 import org.opendaylight.yangtools.yang.model.api.meta.DeclaredStatement;
-import org.opendaylight.yangtools.yang.model.api.meta.StatementSource;
+import org.opendaylight.yangtools.yang.model.api.meta.StatementOrigin;
 
 public final class RegularUndeclaredOutputStatement extends RegularOutputStatement {
     public RegularUndeclaredOutputStatement(final QName argument,
@@ -19,7 +19,7 @@ public final class RegularUndeclaredOutputStatement extends RegularOutputStateme
     }
 
     @Override
-    public StatementSource getStatementSource() {
-        return StatementSource.CONTEXT;
+    public StatementOrigin statementOrigin() {
+        return StatementOrigin.CONTEXT;
     }
 }

diff --git a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/TypedefEffectiveStatementImpl.java b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/TypedefEffectiveStatementImpl.java
index 44c5eff532ea2056bb83aba047871ec3af882a7e..4420629d50d4d7dda19f1bc1ce9beafc240a7075 100644 (file)
--- a/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/TypedefEffectiveStatementImpl.java
+++ b/yang/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/TypedefEffectiveStatementImpl.java
@@ -23,7 +23,7 @@ import org.opendaylight.yangtools.yang.model.api.TypeDefinition;
 import org.opendaylight.yangtools.yang.model.api.UnknownSchemaNode;
 import org.opendaylight.yangtools.yang.model.api.meta.EffectiveStatement;
 import org.opendaylight.yangtools.yang.model.api.meta.IdentifierNamespace;
-import org.opendaylight.yangtools.yang.model.api.meta.StatementSource;
+import org.opendaylight.yangtools.yang.model.api.meta.StatementOrigin;
 import org.opendaylight.yangtools.yang.model.api.stmt.DefaultEffectiveStatement;
 import org.opendaylight.yangtools.yang.model.api.stmt.DescriptionEffectiveStatement;
 import org.opendaylight.yangtools.yang.model.api.stmt.ReferenceEffectiveStatement;
@@ -172,8 +172,8 @@ public final class TypedefEffectiveStatementImpl extends Default<QName, TypedefS
         }
 
         @Override
-        public StatementSource getStatementSource() {
-            return StatementSource.CONTEXT;
+        public StatementOrigin statementOrigin() {
+            return StatementOrigin.CONTEXT;
         }
 
         @Override

diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/meta/AbstractDeclaredEffectiveStatement.java b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/meta/AbstractDeclaredEffectiveStatement.java
index c66b7bb40804a5c1c5d402973f55b517dcb21849..3d0490b2b37046c91186ef821107635f367bee7b 100644 (file)
--- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/meta/AbstractDeclaredEffectiveStatement.java
+++ b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/meta/AbstractDeclaredEffectiveStatement.java
@@ -23,7 +23,7 @@ import org.opendaylight.yangtools.yang.model.api.DataSchemaNode;
 import org.opendaylight.yangtools.yang.model.api.meta.DeclaredStatement;
 import org.opendaylight.yangtools.yang.model.api.meta.EffectiveStatement;
 import org.opendaylight.yangtools.yang.model.api.meta.IdentifierNamespace;
-import org.opendaylight.yangtools.yang.model.api.meta.StatementSource;
+import org.opendaylight.yangtools.yang.model.api.meta.StatementOrigin;
 import org.opendaylight.yangtools.yang.model.api.stmt.DataTreeAwareEffectiveStatement;
 import org.opendaylight.yangtools.yang.model.api.stmt.DataTreeEffectiveStatement;
 import org.opendaylight.yangtools.yang.model.api.stmt.SchemaTreeAwareEffectiveStatement;
@@ -45,8 +45,8 @@ import org.opendaylight.yangtools.yang.model.api.stmt.SchemaTreeEffectiveStateme
 public abstract class AbstractDeclaredEffectiveStatement<A, D extends DeclaredStatement<A>>
         extends AbstractEffectiveStatement<A, D> {
     @Override
-    public final StatementSource getStatementSource() {
-        return StatementSource.DECLARATION;
+    public final StatementOrigin statementOrigin() {
+        return StatementOrigin.DECLARATION;
     }
 
     @Override

diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/meta/AbstractDeclaredStatement.java b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/meta/AbstractDeclaredStatement.java
index 0e1d5a4e3399735aac5ccd49e6b79088fc9b44e8..b88bbadbc081914609fdd15cecda9ef229731a31 100644 (file)
--- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/meta/AbstractDeclaredStatement.java
+++ b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/meta/AbstractDeclaredStatement.java
@@ -17,7 +17,7 @@ import org.eclipse.jdt.annotation.NonNull;
 import org.opendaylight.yangtools.yang.common.Empty;
 import org.opendaylight.yangtools.yang.common.QName;
 import org.opendaylight.yangtools.yang.model.api.meta.DeclaredStatement;
-import org.opendaylight.yangtools.yang.model.api.meta.StatementSource;
+import org.opendaylight.yangtools.yang.model.api.meta.StatementOrigin;
 
 /**
  * An abstract base class for {@link DeclaredStatement} implementations. It provides various further stateless and
@@ -26,8 +26,8 @@ import org.opendaylight.yangtools.yang.model.api.meta.StatementSource;
 @Beta
 public abstract class AbstractDeclaredStatement<A> extends AbstractModelStatement<A> implements DeclaredStatement<A> {
     @Override
-    public StatementSource getStatementSource() {
-        return StatementSource.DECLARATION;
+    public StatementOrigin statementOrigin() {
+        return StatementOrigin.DECLARATION;
     }
 
     @Override

diff --git a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/meta/AbstractUndeclaredEffectiveStatement.java b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/meta/AbstractUndeclaredEffectiveStatement.java
index 38c52796289d110bfbbd318abfe2a806af62d4c9..a8799594a31f53dba11f6addfdaf4368ec50a0c8 100644 (file)
--- a/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/meta/AbstractUndeclaredEffectiveStatement.java
+++ b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/meta/AbstractUndeclaredEffectiveStatement.java
@@ -23,7 +23,7 @@ import org.opendaylight.yangtools.yang.model.api.DataSchemaNode;
 import org.opendaylight.yangtools.yang.model.api.meta.DeclaredStatement;
 import org.opendaylight.yangtools.yang.model.api.meta.EffectiveStatement;
 import org.opendaylight.yangtools.yang.model.api.meta.IdentifierNamespace;
-import org.opendaylight.yangtools.yang.model.api.meta.StatementSource;
+import org.opendaylight.yangtools.yang.model.api.meta.StatementOrigin;
 import org.opendaylight.yangtools.yang.model.api.stmt.DataTreeAwareEffectiveStatement;
 import org.opendaylight.yangtools.yang.model.api.stmt.DataTreeEffectiveStatement;
 import org.opendaylight.yangtools.yang.model.api.stmt.SchemaTreeAwareEffectiveStatement;
@@ -33,8 +33,8 @@ import org.opendaylight.yangtools.yang.model.api.stmt.SchemaTreeEffectiveStateme
 public abstract class AbstractUndeclaredEffectiveStatement<A, D extends DeclaredStatement<A>>
         extends AbstractEffectiveStatement<A, D>  {
     @Override
-    public final StatementSource getStatementSource() {
-        return StatementSource.CONTEXT;
+    public final StatementOrigin statementOrigin() {
+        return StatementOrigin.CONTEXT;
     }
 
     @Override

diff --git a/yang/yang-parser-reactor/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/StatementContextWriter.java b/yang/yang-parser-reactor/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/StatementContextWriter.java
index 6f29dff5f968a601535e439e7d27642705579747..940e47f8f5365fbf93cb478eab8a51e97e9dbb31 100644 (file)
--- a/yang/yang-parser-reactor/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/StatementContextWriter.java
+++ b/yang/yang-parser-reactor/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/StatementContextWriter.java
@@ -16,7 +16,7 @@ import static java.util.Objects.requireNonNull;
 import java.util.Optional;
 import org.eclipse.jdt.annotation.Nullable;
 import org.opendaylight.yangtools.yang.common.QName;
-import org.opendaylight.yangtools.yang.model.api.meta.StatementSource;
+import org.opendaylight.yangtools.yang.model.api.meta.StatementOrigin;
 import org.opendaylight.yangtools.yang.parser.spi.meta.ModelProcessingPhase;
 import org.opendaylight.yangtools.yang.parser.spi.source.StatementSourceReference;
 import org.opendaylight.yangtools.yang.parser.spi.source.StatementWriter;
@@ -88,7 +88,7 @@ final class StatementContextWriter implements StatementWriter {
         //       - allow endDeclared() to be moved to AbstractResumedStatement
         //       - remove the need for verify()
         StatementContextBase<?, ?, ?> parentContext = current.getParentContext();
-        while (parentContext != null && StatementSource.CONTEXT == parentContext.source()) {
+        while (parentContext != null && StatementOrigin.CONTEXT == parentContext.origin()) {
             parentContext.endDeclared(phase);
             parentContext = parentContext.getParentContext();
         }
@@ -108,7 +108,7 @@ final class StatementContextWriter implements StatementWriter {
 
         // Fast path: we are entering a statement which was emitted in previous phase
         AbstractResumedStatement<?, ?, ?> existing = current.lookupSubstatement(childId);
-        while (existing != null && StatementSource.CONTEXT == existing.source()) {
+        while (existing != null && StatementOrigin.CONTEXT == existing.origin()) {
             existing = existing.lookupSubstatement(childId);
         }
 

diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/meta/AbstractImplicitStatementSupport.java b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/meta/AbstractImplicitStatementSupport.java
index 8c05cd9cefb5d5ff985d186fd9128308ff5df726..c1e599e6b8e4e34d3da15b702b043babb4dcced7 100644 (file)
--- a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/meta/AbstractImplicitStatementSupport.java
+++ b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/meta/AbstractImplicitStatementSupport.java
@@ -13,7 +13,7 @@ import org.opendaylight.yangtools.yang.common.QName;
 import org.opendaylight.yangtools.yang.model.api.meta.DeclaredStatement;
 import org.opendaylight.yangtools.yang.model.api.meta.EffectiveStatement;
 import org.opendaylight.yangtools.yang.model.api.meta.StatementDefinition;
-import org.opendaylight.yangtools.yang.model.api.meta.StatementSource;
+import org.opendaylight.yangtools.yang.model.api.meta.StatementOrigin;
 import org.opendaylight.yangtools.yang.model.api.stmt.SchemaTreeEffectiveStatement;
 import org.opendaylight.yangtools.yang.parser.spi.meta.AbstractSchemaTreeStatementSupport;
 import org.opendaylight.yangtools.yang.parser.spi.meta.EffectiveStmtCtx.Current;
@@ -34,7 +34,7 @@ abstract class AbstractImplicitStatementSupport<D extends DeclaredStatement<QNam
 
     @Override
     public final E copyEffective(final Current<QName, D> stmt, final E original) {
-        final StatementSource source = stmt.source();
+        final StatementOrigin source = stmt.origin();
         switch (source) {
             case CONTEXT:
                 return copyUndeclaredEffective(stmt, original);
@@ -48,14 +48,14 @@ abstract class AbstractImplicitStatementSupport<D extends DeclaredStatement<QNam
     @Override
     protected E createEffective(final Current<QName, D> stmt,
             final ImmutableList<? extends EffectiveStatement<?, ?>> substatements) {
-        final StatementSource source = stmt.source();
-        switch (source) {
+        final StatementOrigin origin = stmt.origin();
+        switch (origin) {
             case CONTEXT:
                 return createUndeclaredEffective(stmt, substatements);
             case DECLARATION:
                 return createDeclaredEffective(stmt, substatements);
             default:
-                throw new IllegalStateException("Unhandled statement source " + source);
+                throw new IllegalStateException("Unhandled statement origin " + origin);
         }
     }
 

diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/meta/CaseStatementSupport.java b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/meta/CaseStatementSupport.java
index 799398764e17d881b32dfcbb0f4be154f78dd150..4cbf7a9417d8bcbc7d6da200203b9fc05ffcb06d 100644 (file)
--- a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/meta/CaseStatementSupport.java
+++ b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/meta/CaseStatementSupport.java
@@ -23,7 +23,7 @@ import org.opendaylight.yangtools.yang.model.api.Status;
 import org.opendaylight.yangtools.yang.model.api.YangStmtMapping;
 import org.opendaylight.yangtools.yang.model.api.meta.DeclaredStatement;
 import org.opendaylight.yangtools.yang.model.api.meta.EffectiveStatement;
-import org.opendaylight.yangtools.yang.model.api.meta.StatementSource;
+import org.opendaylight.yangtools.yang.model.api.meta.StatementOrigin;
 import org.opendaylight.yangtools.yang.model.api.stmt.CaseEffectiveStatement;
 import org.opendaylight.yangtools.yang.model.api.stmt.CaseStatement;
 import org.opendaylight.yangtools.yang.model.api.stmt.StatusEffectiveStatement;
@@ -96,14 +96,14 @@ public final class CaseStatementSupport
     @Override
     protected CaseStatement createDeclared(final StmtContext<QName, CaseStatement, ?> ctx,
             final ImmutableList<? extends DeclaredStatement<?>> substatements) {
-        final StatementSource source = ctx.source();
-        switch (source) {
+        final StatementOrigin origin = ctx.origin();
+        switch (origin) {
             case CONTEXT:
                 return ImplicitStatements.createCase(ctx.getArgument(), substatements);
             case DECLARATION:
                 return DeclaredStatements.createCase(ctx.getArgument(), substatements);
             default:
-                throw new IllegalStateException("Unhandled statement source " + source);
+                throw new IllegalStateException("Unhandled statement origin " + origin);
         }
     }
 

diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/meta/InputStatementSupport.java b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/meta/InputStatementSupport.java
index 2458dda4c569ed81f376f2499c527dd9afea6c1e..2c2fbc266fa19d138df594f5c6de277f29233e23 100644 (file)
--- a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/meta/InputStatementSupport.java
+++ b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/meta/InputStatementSupport.java
@@ -17,7 +17,7 @@ import org.opendaylight.yangtools.yang.common.YangConstants;
 import org.opendaylight.yangtools.yang.model.api.YangStmtMapping;
 import org.opendaylight.yangtools.yang.model.api.meta.DeclaredStatement;
 import org.opendaylight.yangtools.yang.model.api.meta.EffectiveStatement;
-import org.opendaylight.yangtools.yang.model.api.meta.StatementSource;
+import org.opendaylight.yangtools.yang.model.api.meta.StatementOrigin;
 import org.opendaylight.yangtools.yang.model.api.stmt.InputEffectiveStatement;
 import org.opendaylight.yangtools.yang.model.api.stmt.InputStatement;
 import org.opendaylight.yangtools.yang.model.ri.stmt.DeclaredStatements;
@@ -82,14 +82,14 @@ public final class InputStatementSupport
     @Override
     protected InputStatement createDeclared(final StmtContext<QName, InputStatement, ?> ctx,
             final ImmutableList<? extends DeclaredStatement<?>> substatements) {
-        final StatementSource source = ctx.source();
-        switch (source) {
+        final StatementOrigin origin = ctx.origin();
+        switch (origin) {
             case CONTEXT:
                 return ImplicitStatements.createInput(ctx.getArgument(), substatements);
             case DECLARATION:
                 return DeclaredStatements.createInput(ctx.getArgument(), substatements);
             default:
-                throw new IllegalStateException("Unhandled statement source " + source);
+                throw new IllegalStateException("Unhandled statement origin " + origin);
         }
     }
 

diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/meta/OutputStatementSupport.java b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/meta/OutputStatementSupport.java
index 3c21eb479da9cafaff7fe644784f274f0c0b3d41..ca39985599fe63a98b68b89a4bed4fc68eb96cb3 100644 (file)
--- a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/meta/OutputStatementSupport.java
+++ b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/meta/OutputStatementSupport.java
@@ -17,7 +17,7 @@ import org.opendaylight.yangtools.yang.common.YangConstants;
 import org.opendaylight.yangtools.yang.model.api.YangStmtMapping;
 import org.opendaylight.yangtools.yang.model.api.meta.DeclaredStatement;
 import org.opendaylight.yangtools.yang.model.api.meta.EffectiveStatement;
-import org.opendaylight.yangtools.yang.model.api.meta.StatementSource;
+import org.opendaylight.yangtools.yang.model.api.meta.StatementOrigin;
 import org.opendaylight.yangtools.yang.model.api.stmt.OutputEffectiveStatement;
 import org.opendaylight.yangtools.yang.model.api.stmt.OutputStatement;
 import org.opendaylight.yangtools.yang.model.ri.stmt.DeclaredStatements;
@@ -82,14 +82,14 @@ public final class OutputStatementSupport
     @Override
     protected OutputStatement createDeclared(final StmtContext<QName, OutputStatement, ?> ctx,
             final ImmutableList<? extends DeclaredStatement<?>> substatements) {
-        final StatementSource source = ctx.source();
-        switch (source) {
+        final StatementOrigin origin = ctx.origin();
+        switch (origin) {
             case CONTEXT:
                 return ImplicitStatements.createOutput(ctx.getArgument(), substatements);
             case DECLARATION:
                 return DeclaredStatements.createOutput(ctx.getArgument(), substatements);
             default:
-                throw new IllegalStateException("Unhandled statement source " + source);
+                throw new IllegalStateException("Unhandled statement origin " + origin);
         }
     }
 

diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/type/BuiltinEffectiveStatement.java b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/type/BuiltinEffectiveStatement.java
index 401b7aca0827c2992efed0fc36649cbbeabfbba1..3cb3911c864ea9d666948ef87d6878e1acb02c80 100644 (file)
--- a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/type/BuiltinEffectiveStatement.java
+++ b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/type/BuiltinEffectiveStatement.java
@@ -19,7 +19,7 @@ import org.opendaylight.yangtools.yang.common.QName;
 import org.opendaylight.yangtools.yang.model.api.TypeDefinition;
 import org.opendaylight.yangtools.yang.model.api.meta.EffectiveStatement;
 import org.opendaylight.yangtools.yang.model.api.meta.IdentifierNamespace;
-import org.opendaylight.yangtools.yang.model.api.meta.StatementSource;
+import org.opendaylight.yangtools.yang.model.api.meta.StatementOrigin;
 import org.opendaylight.yangtools.yang.model.api.stmt.TypeEffectiveStatement;
 import org.opendaylight.yangtools.yang.model.api.stmt.TypeStatement;
 import org.opendaylight.yangtools.yang.model.ri.type.BaseTypes;
@@ -82,7 +82,7 @@ enum BuiltinEffectiveStatement implements TypeEffectiveStatement<TypeStatement>
     }
 
     @Override
-    public final StatementSource getStatementSource() {
-        return StatementSource.CONTEXT;
+    public final StatementOrigin statementOrigin() {
+        return StatementOrigin.CONTEXT;
     }
 }

diff --git a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/parser/stmt/rfc7950/Bug9241Test.java b/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/parser/stmt/rfc7950/Bug9241Test.java
index fbab2f1e3fd31c71f6529af54555e11d309ac85d..8b33a770a9ee55293c0037f8f85968e623bcc50f 100644 (file)
--- a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/parser/stmt/rfc7950/Bug9241Test.java
+++ b/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/parser/stmt/rfc7950/Bug9241Test.java
@@ -20,7 +20,7 @@ import org.opendaylight.yangtools.yang.model.api.Module;
 import org.opendaylight.yangtools.yang.model.api.OutputSchemaNode;
 import org.opendaylight.yangtools.yang.model.api.SchemaContext;
 import org.opendaylight.yangtools.yang.model.api.meta.EffectiveStatement;
-import org.opendaylight.yangtools.yang.model.api.meta.StatementSource;
+import org.opendaylight.yangtools.yang.model.api.meta.StatementOrigin;
 import org.opendaylight.yangtools.yang.stmt.StmtTestUtils;
 
 public class Bug9241Test {
@@ -40,11 +40,11 @@ public class Bug9241Test {
         final InputSchemaNode input = actionInCont.getInput();
         assertNotNull(input);
         assertEquals(1, input.getChildNodes().size());
-        assertEquals(StatementSource.CONTEXT, ((EffectiveStatement<?, ?>) input).getStatementSource());
+        assertEquals(StatementOrigin.CONTEXT, ((EffectiveStatement<?, ?>) input).statementOrigin());
 
         final OutputSchemaNode output = actionInCont.getOutput();
         assertNotNull(output);
         assertEquals(1, output.getChildNodes().size());
-        assertEquals(StatementSource.CONTEXT, ((EffectiveStatement<?, ?>) output).getStatementSource());
+        assertEquals(StatementOrigin.CONTEXT, ((EffectiveStatement<?, ?>) output).statementOrigin());
     }
 }

diff --git a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/RpcStmtTest.java b/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/RpcStmtTest.java
index 50fcda68d9319a445bc85994d2371e8cf41922bc..22e451cc28551c0a561180fd3c3b9a1f92ea60d4 100644 (file)
--- a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/RpcStmtTest.java
+++ b/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/RpcStmtTest.java
@@ -27,7 +27,7 @@ import org.opendaylight.yangtools.yang.model.api.OutputSchemaNode;
 import org.opendaylight.yangtools.yang.model.api.RpcDefinition;
 import org.opendaylight.yangtools.yang.model.api.SchemaContext;
 import org.opendaylight.yangtools.yang.model.api.meta.EffectiveStatement;
-import org.opendaylight.yangtools.yang.model.api.meta.StatementSource;
+import org.opendaylight.yangtools.yang.model.api.meta.StatementOrigin;
 import org.opendaylight.yangtools.yang.parser.rfc7950.reactor.RFC7950Reactors;
 import org.opendaylight.yangtools.yang.parser.spi.meta.ReactorException;
 
@@ -112,11 +112,11 @@ public class RpcStmtTest {
         final InputSchemaNode input = barRpc.getInput();
         assertNotNull(input);
         assertEquals(2, input.getChildNodes().size());
-        assertEquals(StatementSource.CONTEXT, ((EffectiveStatement<?, ?>) input).getStatementSource());
+        assertEquals(StatementOrigin.CONTEXT, ((EffectiveStatement<?, ?>) input).statementOrigin());
 
         final OutputSchemaNode output = barRpc.getOutput();
         assertNotNull(output);
         assertEquals(2, output.getChildNodes().size());
-        assertEquals(StatementSource.CONTEXT, ((EffectiveStatement<?, ?>) output).getStatementSource());
+        assertEquals(StatementOrigin.CONTEXT, ((EffectiveStatement<?, ?>) output).statementOrigin());
     }
 }

diff --git a/yang/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/meta/CommonStmtCtx.java b/yang/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/meta/CommonStmtCtx.java
index 85986d81dbc9437b8ee3a88bd220419489a358f4..35dffbaedfd6510d0542467ea6f657115e5ba06c 100644 (file)
--- a/yang/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/meta/CommonStmtCtx.java
+++ b/yang/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/meta/CommonStmtCtx.java
@@ -16,7 +16,7 @@ import org.eclipse.jdt.annotation.Nullable;
 import org.opendaylight.yangtools.yang.model.api.meta.DeclaredStatement;
 import org.opendaylight.yangtools.yang.model.api.meta.EffectiveStatement;
 import org.opendaylight.yangtools.yang.model.api.meta.StatementDefinition;
-import org.opendaylight.yangtools.yang.model.api.meta.StatementSource;
+import org.opendaylight.yangtools.yang.model.api.meta.StatementOrigin;
 import org.opendaylight.yangtools.yang.parser.spi.source.StatementSourceReference;
 
 /**
@@ -64,8 +64,8 @@ public interface CommonStmtCtx {
      *
      * @return origin of statement
      */
-    default @NonNull StatementSource source() {
-        return sourceReference().getStatementSource();
+    default @NonNull StatementOrigin origin() {
+        return sourceReference().statementOrigin();
     }
 
     /**

diff --git a/yang/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/meta/StmtContext.java b/yang/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/meta/StmtContext.java
index af2d10d03f29df8435e42f8333bc305e30a14083..719fdace3839502b58d17019772c87180069cddf 100644 (file)
--- a/yang/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/meta/StmtContext.java
+++ b/yang/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/meta/StmtContext.java
@@ -23,7 +23,7 @@ import org.opendaylight.yangtools.yang.common.YangVersion;
 import org.opendaylight.yangtools.yang.model.api.meta.DeclaredStatement;
 import org.opendaylight.yangtools.yang.model.api.meta.EffectiveStatement;
 import org.opendaylight.yangtools.yang.model.api.meta.StatementDefinition;
-import org.opendaylight.yangtools.yang.model.api.meta.StatementSource;
+import org.opendaylight.yangtools.yang.model.api.meta.StatementOrigin;
 import org.opendaylight.yangtools.yang.model.repo.api.SourceIdentifier;
 import org.opendaylight.yangtools.yang.parser.spi.source.StatementSourceReference;
 
@@ -42,8 +42,8 @@ public interface StmtContext<A, D extends DeclaredStatement<A>, E extends Effect
     }
 
     @Deprecated(forRemoval = true)
-    default @NonNull StatementSource getStatementSource() {
-        return source();
+    default @NonNull StatementOrigin getStatementSource() {
+        return origin();
     }
 
     @Deprecated(forRemoval = true)

diff --git a/yang/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/source/DeclarationInTextSource.java b/yang/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/source/DeclarationInTextSource.java
index a8e7f0198d6249a2a1f31d05b87e02d0f910328d..90fe135d93630ad85eee6e26331b60183a4a479b 100644 (file)
--- a/yang/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/source/DeclarationInTextSource.java
+++ b/yang/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/source/DeclarationInTextSource.java
@@ -9,7 +9,7 @@ package org.opendaylight.yangtools.yang.parser.spi.source;
 
 import java.util.Objects;
 import org.eclipse.jdt.annotation.NonNull;
-import org.opendaylight.yangtools.yang.model.api.meta.StatementSource;
+import org.opendaylight.yangtools.yang.model.api.meta.StatementOrigin;
 
 /**
  * Reference of statement source present in textual source format. Utility implementation
@@ -105,8 +105,8 @@ public abstract class DeclarationInTextSource implements StatementSourceReferenc
     }
 
     @Override
-    public final StatementSource getStatementSource() {
-        return StatementSource.DECLARATION;
+    public final StatementOrigin statementOrigin() {
+        return StatementOrigin.DECLARATION;
     }
 
     @Override

diff --git a/yang/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/source/ImplicitSubstatement.java b/yang/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/source/ImplicitSubstatement.java
index c1455e0d5c8a57bc89154a0b6c484770bcfdb257..998a0731387344f9b5327b139aea20554e44b33f 100644 (file)
--- a/yang/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/source/ImplicitSubstatement.java
+++ b/yang/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/source/ImplicitSubstatement.java
@@ -10,7 +10,7 @@ package org.opendaylight.yangtools.yang.parser.spi.source;
 import static java.util.Objects.requireNonNull;
 
 import com.google.common.annotations.Beta;
-import org.opendaylight.yangtools.yang.model.api.meta.StatementSource;
+import org.opendaylight.yangtools.yang.model.api.meta.StatementOrigin;
 
 /**
  * An implicit sub-statement, which is implied to be always present in its parent, even if it does not appear
@@ -39,8 +39,8 @@ public final class ImplicitSubstatement implements StatementSourceReference {
     }
 
     @Override
-    public StatementSource getStatementSource() {
-        return StatementSource.CONTEXT;
+    public StatementOrigin statementOrigin() {
+        return StatementOrigin.CONTEXT;
     }
 
     @Override

diff --git a/yang/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/source/StatementSourceReference.java b/yang/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/source/StatementSourceReference.java
index 59c3dfdf7787e4f4c7e5d9c801a2435a82a93a39..f0527c7fbc70383356d6df4dba9db7359f919b3e 100644 (file)
--- a/yang/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/source/StatementSourceReference.java
+++ b/yang/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/source/StatementSourceReference.java
@@ -8,7 +8,7 @@
 package org.opendaylight.yangtools.yang.parser.spi.source;
 
 import org.eclipse.jdt.annotation.NonNull;
-import org.opendaylight.yangtools.yang.model.api.meta.StatementSource;
+import org.opendaylight.yangtools.yang.model.api.meta.StatementOrigin;
 
 /**
  * Reference of statement source. Statement source reference serves to provide information, why a statement was defined
@@ -22,10 +22,10 @@ public interface StatementSourceReference {
     /**
      * Returns source type.
      *
-     * @return {@link StatementSource#DECLARATION} if statement was explicitly declared in YANG model source,
-     *         {@link StatementSource#CONTEXT} if statement was inferred.
+     * @return {@link StatementOrigin#DECLARATION} if statement was explicitly declared in YANG model source,
+     *         {@link StatementOrigin#CONTEXT} if statement was inferred.
      */
-    @NonNull StatementSource getStatementSource();
+    @NonNull StatementOrigin statementOrigin();
 
     /**
      * Returns human readable representation of statement source.

diff --git a/yang/yang-parser-spi/src/test/java/org/opendaylight/yangtools/yang/parser/spi/source/DeclarationInTextSourceTest.java b/yang/yang-parser-spi/src/test/java/org/opendaylight/yangtools/yang/parser/spi/source/DeclarationInTextSourceTest.java
index 719717166600d1777715e8483ffa30c2e36ea0e1..9df40424fc1a3ce989643ef8c4f7548255e1f20e 100644 (file)
--- a/yang/yang-parser-spi/src/test/java/org/opendaylight/yangtools/yang/parser/spi/source/DeclarationInTextSourceTest.java
+++ b/yang/yang-parser-spi/src/test/java/org/opendaylight/yangtools/yang/parser/spi/source/DeclarationInTextSourceTest.java
@@ -10,12 +10,12 @@ package org.opendaylight.yangtools.yang.parser.spi.source;
 import static org.junit.Assert.assertEquals;
 
 import org.junit.Test;
-import org.opendaylight.yangtools.yang.model.api.meta.StatementSource;
+import org.opendaylight.yangtools.yang.model.api.meta.StatementOrigin;
 
 public class DeclarationInTextSourceTest {
     @Test
     public void testStatementSource() {
-        assertEquals(StatementSource.DECLARATION, DeclarationInTextSource.atLine("foo", 5).getStatementSource());
+        assertEquals(StatementOrigin.DECLARATION, DeclarationInTextSource.atLine("foo", 5).statementOrigin());
     }
 
     @Test

diff --git a/yang/yang-parser-spi/src/test/java/org/opendaylight/yangtools/yang/parser/spi/source/ImplicitStatementTest.java b/yang/yang-parser-spi/src/test/java/org/opendaylight/yangtools/yang/parser/spi/source/ImplicitStatementTest.java
index b06cdd3739de008af335c6c4c29dcb7a6e5087d9..22548c3cdf9009408b157b0a88de44261a974ad0 100644 (file)
--- a/yang/yang-parser-spi/src/test/java/org/opendaylight/yangtools/yang/parser/spi/source/ImplicitStatementTest.java
+++ b/yang/yang-parser-spi/src/test/java/org/opendaylight/yangtools/yang/parser/spi/source/ImplicitStatementTest.java
@@ -12,14 +12,14 @@ import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.mock;
 
 import org.junit.Test;
-import org.opendaylight.yangtools.yang.model.api.meta.StatementSource;
+import org.opendaylight.yangtools.yang.model.api.meta.StatementOrigin;
 
 public class ImplicitStatementTest {
     @Test
     public void testForwarding() {
         final StatementSourceReference ref = mock(StatementSourceReference.class);
         final ImplicitSubstatement stmt = ImplicitSubstatement.of(ref);
-        assertEquals(StatementSource.CONTEXT, stmt.getStatementSource());
+        assertEquals(StatementOrigin.CONTEXT, stmt.statementOrigin());
 
         doReturn("ref").when(ref).toString();
         assertEquals("ref", stmt.toString());