X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=yang%2Fodlext-parser-support%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fyangtools%2Fodlext%2Fparser%2FYangModeledAnyxmlEffectiveStatementImpl.java;h=9bc5584edf51fe000fc24c68a07970cf1b994e2a;hb=60aaa85b10b02b29f357fb53fed5723a498e1cef;hp=fbb678c55751c3a42f7b275dcd244e1fd7975bbc;hpb=19efe56f8f20f5692a100e765a581fbc8f0b4aca;p=yangtools.git

diff --git a/yang/odlext-parser-support/src/main/java/org/opendaylight/yangtools/odlext/parser/YangModeledAnyxmlEffectiveStatementImpl.java b/yang/odlext-parser-support/src/main/java/org/opendaylight/yangtools/odlext/parser/YangModeledAnyxmlEffectiveStatementImpl.java
index fbb678c557..9bc5584edf 100644
--- a/yang/odlext-parser-support/src/main/java/org/opendaylight/yangtools/odlext/parser/YangModeledAnyxmlEffectiveStatementImpl.java
+++ b/yang/odlext-parser-support/src/main/java/org/opendaylight/yangtools/odlext/parser/YangModeledAnyxmlEffectiveStatementImpl.java
@@ -10,8 +10,6 @@ package org.opendaylight.yangtools.odlext.parser;
 import static java.util.Objects.requireNonNull;
 
 import java.util.Collection;
-import java.util.List;
-import java.util.Objects;
 import java.util.Optional;
 import org.eclipse.jdt.annotation.NonNull;
 import org.opendaylight.yangtools.odlext.model.api.YangModeledAnyxmlSchemaNode;
@@ -19,13 +17,13 @@ import org.opendaylight.yangtools.yang.common.QName;
 import org.opendaylight.yangtools.yang.model.api.AnyxmlSchemaNode;
 import org.opendaylight.yangtools.yang.model.api.ContainerSchemaNode;
 import org.opendaylight.yangtools.yang.model.api.MustDefinition;
-import org.opendaylight.yangtools.yang.model.api.RevisionAwareXPath;
 import org.opendaylight.yangtools.yang.model.api.SchemaPath;
 import org.opendaylight.yangtools.yang.model.api.Status;
 import org.opendaylight.yangtools.yang.model.api.UnknownSchemaNode;
 import org.opendaylight.yangtools.yang.model.api.meta.ForwardingEffectiveStatement;
 import org.opendaylight.yangtools.yang.model.api.stmt.AnyxmlEffectiveStatement;
 import org.opendaylight.yangtools.yang.model.api.stmt.AnyxmlStatement;
+import org.opendaylight.yangtools.yang.xpath.api.YangXPathExpression.QualifiedBound;
 
 final class YangModeledAnyxmlEffectiveStatementImpl
         extends ForwardingEffectiveStatement<QName, AnyxmlStatement, AnyxmlEffectiveStatement>
@@ -64,6 +62,7 @@ final class YangModeledAnyxmlEffectiveStatementImpl
     }
 
     @Override
+    @Deprecated
     public SchemaPath getPath() {
         return delegateSchemaNode().getPath();
     }
@@ -96,7 +95,7 @@ final class YangModeledAnyxmlEffectiveStatementImpl
     }
 
     @Override
-    public Optional<RevisionAwareXPath> getWhenCondition() {
+    public Optional<? extends QualifiedBound> getWhenCondition() {
         return delegateSchemaNode().getWhenCondition();
     }
 
@@ -106,38 +105,18 @@ final class YangModeledAnyxmlEffectiveStatementImpl
     }
 
     @Override
-    public Collection<MustDefinition> getMustConstraints() {
+    public Collection<? extends @NonNull MustDefinition> getMustConstraints() {
         return delegateSchemaNode().getMustConstraints();
     }
 
     @Override
-    public List<UnknownSchemaNode> getUnknownSchemaNodes() {
+    public Collection<? extends UnknownSchemaNode> getUnknownSchemaNodes() {
         return delegateSchemaNode().getUnknownSchemaNodes();
     }
 
     @Override
-    public int hashCode() {
-        final int prime = 31;
-        int result = 1;
-        result = prime * result + Objects.hashCode(getQName());
-        result = prime * result + Objects.hashCode(getPath());
-        return result;
-    }
-
-    @Override
-    public boolean equals(final Object obj) {
-        if (this == obj) {
-            return true;
-        }
-        if (obj == null) {
-            return false;
-        }
-        if (getClass() != obj.getClass()) {
-            return false;
-        }
-
-        YangModeledAnyxmlEffectiveStatementImpl other = (YangModeledAnyxmlEffectiveStatementImpl) obj;
-        return Objects.equals(getQName(), other.getQName()) && Objects.equals(getPath(), other.getPath());
+    public AnyxmlEffectiveStatement asEffectiveStatement() {
+        return delegateSchemaNode().asEffectiveStatement();
     }
 
     @Override