Add Guava requires

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

diff --git a/yang/yang-parser-reactor/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/ReplicaStatementContext.java b/yang/yang-parser-reactor/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/ReplicaStatementContext.java
index 68f750ce4b3ab74dfef50370a367bd301b12bdb2..9e69fa29afdbf2e3ac955ff7f749e3659b005add 100644 (file)
--- a/yang/yang-parser-reactor/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/ReplicaStatementContext.java
+++ b/yang/yang-parser-reactor/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/ReplicaStatementContext.java
@@ -7,7 +7,6 @@
  */
 package org.opendaylight.yangtools.yang.parser.stmt.reactor;
 
-import static com.google.common.base.Verify.verify;
 import static java.util.Objects.requireNonNull;
 
 import java.util.Collection;
@@ -41,8 +40,9 @@ final class ReplicaStatementContext<A, D extends DeclaredStatement<A>, E extends
         this.parent = requireNonNull(parent);
         this.source = requireNonNull(source);
         if (source.isSupportedToBuildEffective()) {
-            verify(source.fullyDefined(), "Source %s is not fully defined", source);
             source.incRef();
+            // FIXME: is this call really needed? it is inherited from source
+            setFullyDefined();
         }
     }
 
@@ -120,7 +120,8 @@ final class ReplicaStatementContext<A, D extends DeclaredStatement<A>, E extends
     @Override
     ReactorStmtCtx<?, ?, ?> asEffectiveChildOf(final StatementContextBase<?, ?, ?> newParent, final CopyType type,
             final QNameModule targetModule) {
-        return source.asEffectiveChildOf(newParent, type, targetModule);
+        final ReactorStmtCtx<?, ?, ?> ret = source.asEffectiveChildOf(newParent, type, targetModule);
+        return ret == null ? null : this;
     }
 
     @Override
@@ -181,7 +182,7 @@ final class ReplicaStatementContext<A, D extends DeclaredStatement<A>, E extends
      */
     @Override
     @Deprecated
-    public Optional<SchemaPath> schemaPath() {
+    public SchemaPath schemaPath() {
         return substatementGetSchemaPath();
     }