Improve StreamingContext diagnostics

[netconf.git] / netconf / netconf-util / src / main / java / org / opendaylight / netconf / util / NodeContainerProxy.java

diff --git a/netconf/netconf-util/src/main/java/org/opendaylight/netconf/util/NodeContainerProxy.java b/netconf/netconf-util/src/main/java/org/opendaylight/netconf/util/NodeContainerProxy.java
index 3154b370f42024c5ee9ff43445427685bad4ec61..f32706242ff6876f571929c1a63dc320f2c0675f 100644 (file)
--- a/netconf/netconf-util/src/main/java/org/opendaylight/netconf/util/NodeContainerProxy.java
+++ b/netconf/netconf-util/src/main/java/org/opendaylight/netconf/util/NodeContainerProxy.java
@@ -7,15 +7,14 @@
  */
 package org.opendaylight.netconf.util;
 
-import com.google.common.base.Preconditions;
+import static java.util.Objects.requireNonNull;
+
 import com.google.common.collect.Maps;
-import com.google.common.collect.Sets;
 import java.util.Collection;
 import java.util.Collections;
-import java.util.List;
 import java.util.Map;
 import java.util.Optional;
-import java.util.Set;
+import org.eclipse.jdt.annotation.NonNull;
 import org.opendaylight.yangtools.yang.common.QName;
 import org.opendaylight.yangtools.yang.model.api.ActionDefinition;
 import org.opendaylight.yangtools.yang.model.api.AugmentationSchemaNode;
@@ -24,64 +23,67 @@ import org.opendaylight.yangtools.yang.model.api.DataSchemaNode;
 import org.opendaylight.yangtools.yang.model.api.GroupingDefinition;
 import org.opendaylight.yangtools.yang.model.api.MustDefinition;
 import org.opendaylight.yangtools.yang.model.api.NotificationDefinition;
-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.TypeDefinition;
-import org.opendaylight.yangtools.yang.model.api.UnknownSchemaNode;
 import org.opendaylight.yangtools.yang.model.api.UsesNode;
+import org.opendaylight.yangtools.yang.model.api.stmt.ContainerEffectiveStatement;
+import org.opendaylight.yangtools.yang.xpath.api.YangXPathExpression.QualifiedBound;
 
 /**
  * Simple proxy for container like schema nodes, where user provides a collection of children schema nodes.
+ *
+ * @deprecated This class is no longer used anywhere and is scheduled for removal.
  */
+@Deprecated(since = "2.0.0", forRemoval = true)
 public final class NodeContainerProxy implements ContainerSchemaNode {
 
-    private final Map<QName, DataSchemaNode> childNodes;
+    private final Map<QName, ? extends DataSchemaNode> childNodes;
     private final QName qualifiedName;
-    private final Set<AugmentationSchemaNode> availableAugmentations;
+    private final Collection<? extends AugmentationSchemaNode> availableAugmentations;
 
-    public NodeContainerProxy(final QName qualifiedName, final Map<QName, DataSchemaNode> childNodes,
-                              final Set<AugmentationSchemaNode> availableAugmentations) {
+    public NodeContainerProxy(final QName qualifiedName, final Map<QName, ? extends DataSchemaNode> childNodes,
+                              final Collection<? extends AugmentationSchemaNode> availableAugmentations) {
         this.availableAugmentations = availableAugmentations;
-        this.childNodes = Preconditions.checkNotNull(childNodes, "childNodes");
+        this.childNodes = requireNonNull(childNodes, "childNodes");
         this.qualifiedName = qualifiedName;
     }
 
-    public NodeContainerProxy(final QName qualifiedName, final Collection<DataSchemaNode> childNodes) {
+    public NodeContainerProxy(final QName qualifiedName, final Collection<? extends DataSchemaNode> childNodes) {
         this(qualifiedName, asMap(childNodes), Collections.emptySet());
     }
 
-    public NodeContainerProxy(final QName qualifiedName, final Collection<DataSchemaNode> childNodes,
-                              final Set<AugmentationSchemaNode> availableAugmentations) {
+    public NodeContainerProxy(final QName qualifiedName, final Collection<? extends DataSchemaNode> childNodes,
+                              final Collection<? extends AugmentationSchemaNode> availableAugmentations) {
         this(qualifiedName, asMap(childNodes), availableAugmentations);
     }
 
-    private static Map<QName, DataSchemaNode> asMap(final Collection<DataSchemaNode> childNodes) {
+    private static Map<QName, ? extends DataSchemaNode> asMap(final Collection<? extends DataSchemaNode> childNodes) {
         return Maps.uniqueIndex(childNodes, DataSchemaNode::getQName);
     }
 
     @Override
-    public Set<TypeDefinition<?>> getTypeDefinitions() {
+    public Collection<? extends TypeDefinition<?>> getTypeDefinitions() {
         return Collections.emptySet();
     }
 
     @Override
-    public Set<DataSchemaNode> getChildNodes() {
-        return Sets.newHashSet(childNodes.values());
+    public Collection<? extends DataSchemaNode> getChildNodes() {
+        return childNodes.values();
     }
 
     @Override
-    public Set<GroupingDefinition> getGroupings() {
+    public Collection<? extends GroupingDefinition> getGroupings() {
         return Collections.emptySet();
     }
 
     @Override
-    public Optional<DataSchemaNode> findDataChildByName(final QName name) {
-        return Optional.ofNullable(childNodes.get(name));
+    public DataSchemaNode dataChildByName(final QName name) {
+        return childNodes.get(name);
     }
 
     @Override
-    public Set<UsesNode> getUses() {
+    public Collection<? extends UsesNode> getUses() {
         return Collections.emptySet();
     }
 
@@ -91,22 +93,24 @@ public final class NodeContainerProxy implements ContainerSchemaNode {
     }
 
     @Override
-    public Set<AugmentationSchemaNode> getAvailableAugmentations() {
+    public Collection<? extends AugmentationSchemaNode> getAvailableAugmentations() {
         return availableAugmentations;
     }
 
     @Override
+    @Deprecated
     public boolean isAugmenting() {
         throw new UnsupportedOperationException();
     }
 
     @Override
+    @Deprecated
     public boolean isAddedByUses() {
         throw new UnsupportedOperationException();
     }
 
     @Override
-    public boolean isConfiguration() {
+    public Optional<Boolean> effectiveConfig() {
         throw new UnsupportedOperationException();
     }
 
@@ -116,6 +120,7 @@ public final class NodeContainerProxy implements ContainerSchemaNode {
     }
 
     @Override
+    @Deprecated
     public SchemaPath getPath() {
         throw new UnsupportedOperationException();
     }
@@ -136,27 +141,27 @@ public final class NodeContainerProxy implements ContainerSchemaNode {
     }
 
     @Override
-    public List<UnknownSchemaNode> getUnknownSchemaNodes() {
-        return Collections.emptyList();
-    }
-
-    @Override
-    public Set<NotificationDefinition> getNotifications() {
+    public Collection<? extends NotificationDefinition> getNotifications() {
         return Collections.emptySet();
     }
 
     @Override
-    public Set<ActionDefinition> getActions() {
+    public Collection<? extends ActionDefinition> getActions() {
         return Collections.emptySet();
     }
 
     @Override
-    public Optional<RevisionAwareXPath> getWhenCondition() {
+    public Optional<? extends QualifiedBound> getWhenCondition() {
         return Optional.empty();
     }
 
     @Override
-    public Collection<MustDefinition> getMustConstraints() {
+    public Collection<? extends @NonNull MustDefinition> getMustConstraints() {
         return Collections.emptySet();
     }
+
+    @Override
+    public ContainerEffectiveStatement asEffectiveStatement() {
+        throw new UnsupportedOperationException();
+    }
 }