Fixup collections return implementations

[yangtools.git] / yang / odlext-parser-support / src / main / java / org / opendaylight / yangtools / odlext / parser / YangModeledAnyxmlEffectiveStatementImpl.java

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 f201f7c4849a2b1edcf6c436e855d094ab1bf14d..9bc5584edf51fe000fc24c68a07970cf1b994e2a 100644 (file)
--- 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,28 +10,26 @@ 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 javax.annotation.Nonnull;
-import org.opendaylight.yangtools.odlext.model.api.YangModeledAnyXmlSchemaNode;
+import org.eclipse.jdt.annotation.NonNull;
+import org.opendaylight.yangtools.odlext.model.api.YangModeledAnyxmlSchemaNode;
 import org.opendaylight.yangtools.yang.common.QName;
-import org.opendaylight.yangtools.yang.model.api.AnyXmlSchemaNode;
+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>
-        implements YangModeledAnyXmlSchemaNode, AnyxmlEffectiveStatement {
-    private final AnyxmlEffectiveStatement delegate;
-    private final ContainerSchemaNode contentSchema;
+        implements YangModeledAnyxmlSchemaNode, AnyxmlEffectiveStatement {
+    private final @NonNull AnyxmlEffectiveStatement delegate;
+    private final @NonNull ContainerSchemaNode contentSchema;
 
     YangModeledAnyxmlEffectiveStatementImpl(final AnyxmlEffectiveStatement delegate,
         final ContainerSchemaNode contentSchema) {
@@ -40,18 +38,17 @@ final class YangModeledAnyxmlEffectiveStatementImpl
     }
 
     @Override
-    protected AnyxmlEffectiveStatement delegate() {
+    protected @NonNull AnyxmlEffectiveStatement delegate() {
         return delegate;
     }
 
-    @Nonnull
     @Override
-    public ContainerSchemaNode getSchemaOfAnyXmlData() {
+    public @NonNull ContainerSchemaNode getSchemaOfAnyXmlData() {
         return contentSchema;
     }
 
-    private AnyXmlSchemaNode delegateSchemaNode() {
-        return (AnyXmlSchemaNode) delegate;
+    private AnyxmlSchemaNode delegateSchemaNode() {
+        return (AnyxmlSchemaNode) delegate;
     }
 
     @Override
@@ -65,6 +62,7 @@ final class YangModeledAnyxmlEffectiveStatementImpl
     }
 
     @Override
+    @Deprecated
     public SchemaPath getPath() {
         return delegateSchemaNode().getPath();
     }
@@ -97,7 +95,7 @@ final class YangModeledAnyxmlEffectiveStatementImpl
     }
 
     @Override
-    public Optional<RevisionAwareXPath> getWhenCondition() {
+    public Optional<? extends QualifiedBound> getWhenCondition() {
         return delegateSchemaNode().getWhenCondition();
     }
 
@@ -107,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