Move findSubstatementArgument()/hasSubstatement() to BoundStmtCtx

[yangtools.git] / yang / yang-parser-spi / src / main / java / org / opendaylight / yangtools / yang / parser / spi / meta / StmtContext.java

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 f8a537394ed2f886514390f319a2524a6bff8863..dcbafed8370a66040a122221326d568ceb72555d 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
@@ -36,7 +36,7 @@ import org.opendaylight.yangtools.yang.parser.spi.source.StatementSourceReferenc
  * @param <E> Effective Statement representation
  */
 public interface StmtContext<A, D extends DeclaredStatement<A>, E extends EffectiveStatement<A, D>>
-        extends BoundStmtCtx<A>, NamespaceStmtCtx, StmtContextCompat {
+        extends NamespaceStmtCtx, BoundStmtCtxCompat<A, D> {
     @Deprecated(forRemoval = true)
     default @NonNull StatementDefinition getPublicDefinition() {
         return publicDefinition();
@@ -115,8 +115,6 @@ public interface StmtContext<A, D extends DeclaredStatement<A>, E extends Effect
         return verifyNotNull(getParentContext(), "Root context %s does not have a parent", this);
     }
 
-    boolean isConfiguration();
-
     boolean isEnabledSemanticVersioning();
 
     /**
@@ -149,11 +147,6 @@ public interface StmtContext<A, D extends DeclaredStatement<A>, E extends Effect
         return Streams.concat(declaredSubstatements().stream(), effectiveSubstatements().stream());
     }
 
-    /**
-     * Builds {@link DeclaredStatement} for statement context.
-     */
-    D buildDeclared();
-
     /**
      * Builds {@link EffectiveStatement} for statement context.
      */
@@ -361,38 +354,4 @@ public interface StmtContext<A, D extends DeclaredStatement<A>, E extends Effect
 
         void setIsSupportedToBuildEffective(boolean isSupportedToBuild);
     }
-
-    /**
-     * Search of any child statement context of specified type and return its argument. If such a statement exists, it
-     * is assumed to have the right argument. Users should be careful to use this method for statements which have
-     * cardinality {@code 0..1}, otherwise this method can return any one of the statement's argument.
-     *
-     * <p>
-     * The default implementation defers to
-     * {@link StmtContextDefaults#findSubstatementArgument(StmtContext, Class)}, subclasses are expected to provide
-     * optimized implementation if possible.
-     *
-     * @param <X> Substatement argument type
-     * @param <Z> Substatement effective statement representation
-     * @param type Effective statement representation being look up
-     * @return {@link Optional#empty()} if no statement exists, otherwise the argument value
-     */
-    default <X, Z extends EffectiveStatement<X, ?>> @NonNull Optional<X> findSubstatementArgument(
-            final @NonNull Class<Z> type) {
-        return StmtContextDefaults.findSubstatementArgument(this, type);
-    }
-
-    /**
-     * Check if there is any child statement context of specified type.
-     *
-     * <p>
-     * The default implementation defers to {@link StmtContextDefaults#hasSubstatement(StmtContext, Class)},
-     * subclasses are expected to provide optimized implementation if possible.
-     *
-     * @param type Effective statement representation being look up
-     * @return True if such a child statement exists, false otherwise
-     */
-    default boolean hasSubstatement(final @NonNull Class<? extends EffectiveStatement<?, ?>> type) {
-        return StmtContextDefaults.hasSubstatement(this, type);
-    }
 }