Propagate EffectiveModelContext to more places

[yangtools.git] / yang / yang-data-util / src / main / java / org / opendaylight / yangtools / yang / data / util / DataSchemaContextTree.java

diff --git a/yang/yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/DataSchemaContextTree.java b/yang/yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/DataSchemaContextTree.java
index 6d55e77745b5b8a4cfbc069f3833606a2611883f..07b71bb46b6974eed7eb0694a56ab5a0f2fcd785 100644 (file)
--- a/yang/yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/DataSchemaContextTree.java
+++ b/yang/yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/DataSchemaContextTree.java
@@ -12,35 +12,33 @@ import com.google.common.cache.CacheLoader;
 import com.google.common.cache.LoadingCache;
 import java.util.Optional;
 import org.eclipse.jdt.annotation.NonNull;
-import org.eclipse.jdt.annotation.Nullable;
 import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier;
-import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.PathArgument;
 import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode;
-import org.opendaylight.yangtools.yang.model.api.SchemaContext;
+import org.opendaylight.yangtools.yang.model.api.EffectiveModelContext;
 
 /**
- * Semantic tree binding a {@link SchemaContext} to a {@link NormalizedNode} tree. Since the layout of the schema
- * and data has differences, the mapping is not trivial -- which is where this class comes in.
+ * Semantic tree binding a {@link EffectiveModelContext} to a {@link NormalizedNode} tree. Since the layout of the
+ * schema and data has differences, the mapping is not trivial -- which is where this class comes in.
  *
  * @author Robert Varga
  */
 // FIXME: 6.0.0: @NonNullByDefault
 public final class DataSchemaContextTree {
-    private static final LoadingCache<SchemaContext, DataSchemaContextTree> TREES = CacheBuilder.newBuilder()
-            .weakKeys().weakValues().build(new CacheLoader<SchemaContext, DataSchemaContextTree>() {
+    private static final LoadingCache<EffectiveModelContext, DataSchemaContextTree> TREES = CacheBuilder.newBuilder()
+            .weakKeys().weakValues().build(new CacheLoader<EffectiveModelContext, DataSchemaContextTree>() {
                 @Override
-                public DataSchemaContextTree load(final SchemaContext key) throws Exception {
+                public DataSchemaContextTree load(final EffectiveModelContext key) {
                     return new DataSchemaContextTree(key);
                 }
             });
 
     private final DataSchemaContextNode<?> root;
 
-    private DataSchemaContextTree(final SchemaContext ctx) {
+    private DataSchemaContextTree(final EffectiveModelContext ctx) {
         root = DataSchemaContextNode.from(ctx);
     }
 
-    public static @NonNull DataSchemaContextTree from(final @NonNull SchemaContext ctx) {
+    public static @NonNull DataSchemaContextTree from(final @NonNull EffectiveModelContext ctx) {
         return TREES.getUnchecked(ctx);
     }
 
@@ -55,27 +53,6 @@ public final class DataSchemaContextTree {
         return getRoot().findChild(path);
     }
 
-    /**
-     * Get a child node as identified by an absolute {@link YangInstanceIdentifier}.
-     *
-     * @param path Path towards the child node
-     * @return Child node if present, or null when corresponding child is not found.
-     * @throws NullPointerException if {@code path} is null
-     *
-     * @deprecated Use {@link #findChild(YangInstanceIdentifier)} instead.
-     */
-    @Deprecated(forRemoval = true)
-    public @Nullable DataSchemaContextNode<?> getChild(final YangInstanceIdentifier path) {
-        DataSchemaContextNode<?> currentOp = root;
-        for (PathArgument arg : path.getPathArguments()) {
-            currentOp = currentOp.getChild(arg);
-            if (currentOp == null) {
-                return null;
-            }
-        }
-        return currentOp;
-    }
-
     public DataSchemaContextNode<?> getRoot() {
         return root;
     }