Revert "Add support for selecting exact items from lists"

This reverts commit 9a3be773e9a134fae830f0b37a7378c2099768ce, as it
was accidentally pushed without review.

Change-Id: I89f93d54e577961adea82c5a19febc650200f3c5
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>

diff --git a/binding/mdsal-binding-api/src/main/java/org/opendaylight/mdsal/binding/api/query/DescendantQueryBuilder.java b/binding/mdsal-binding-api/src/main/java/org/opendaylight/mdsal/binding/api/query/DescendantQueryBuilder.java
index 189510c38cda866f180ab9c04e2a2e9b09ebb15f..a42ad169802c65ef245e4931a51c735e8eeb3cb0 100644 (file)
--- a/binding/mdsal-binding-api/src/main/java/org/opendaylight/mdsal/binding/api/query/DescendantQueryBuilder.java
+++ b/binding/mdsal-binding-api/src/main/java/org/opendaylight/mdsal/binding/api/query/DescendantQueryBuilder.java
@@ -12,8 +12,6 @@ import org.eclipse.jdt.annotation.NonNull;
 import org.opendaylight.yangtools.yang.binding.ChildOf;
 import org.opendaylight.yangtools.yang.binding.ChoiceIn;
 import org.opendaylight.yangtools.yang.binding.DataObject;
-import org.opendaylight.yangtools.yang.binding.Identifiable;
-import org.opendaylight.yangtools.yang.binding.Identifier;
 
 /**
  * Intermediate Query builder stage, which allows the specification of the query result type to be built up via
@@ -35,20 +33,6 @@ public interface DescendantQueryBuilder<T extends DataObject> extends Structural
      */
     <N extends ChildOf<? super T>> @NonNull DescendantQueryBuilder<N> extractChild(Class<N> childClass);
 
-    /**
-     * Add a child path component to the specification of what needs to be extracted, specifying an exact match in
-     * a keyed list. This method, along with its alternatives, can be used to specify which object type to select from
-     * the root path.
-     *
-     * @param <N> List type
-     * @param <K> Key type
-     * @param listKey List key
-     * @return This builder
-     * @throws NullPointerException if childClass is null
-     */
-    <N extends Identifiable<K> & ChildOf<? super T>, K extends Identifier<N>>
-        @NonNull DescendantQueryBuilder<N> extractChild(Class<@NonNull N> listItem, K listKey);
-
     /**
      * Add a child path component to the specification of what needs to be extracted. This method, along with its
      * alternatives, can be used to specify which object type to select from the root path.

diff --git a/binding/mdsal-binding-api/src/main/java/org/opendaylight/mdsal/binding/api/query/MatchBuilderPath.java b/binding/mdsal-binding-api/src/main/java/org/opendaylight/mdsal/binding/api/query/MatchBuilderPath.java
index abace24cea3d0f722756933e7a0cd453c383ebd4..e753d58bc98d16aca3cf6de1aee2c6c5b1dcaf10 100644 (file)
--- a/binding/mdsal-binding-api/src/main/java/org/opendaylight/mdsal/binding/api/query/MatchBuilderPath.java
+++ b/binding/mdsal-binding-api/src/main/java/org/opendaylight/mdsal/binding/api/query/MatchBuilderPath.java
@@ -15,8 +15,6 @@ import org.opendaylight.yangtools.yang.binding.BaseIdentity;
 import org.opendaylight.yangtools.yang.binding.ChildOf;
 import org.opendaylight.yangtools.yang.binding.ChoiceIn;
 import org.opendaylight.yangtools.yang.binding.DataObject;
-import org.opendaylight.yangtools.yang.binding.Identifiable;
-import org.opendaylight.yangtools.yang.binding.Identifier;
 import org.opendaylight.yangtools.yang.binding.TypeObject;
 import org.opendaylight.yangtools.yang.common.Empty;
 import org.opendaylight.yangtools.yang.common.Uint16;
@@ -48,20 +46,6 @@ public interface MatchBuilderPath<O extends DataObject, T extends DataObject> ex
     <C extends ChoiceIn<? super T> & DataObject, N extends ChildOf<? super C>>
         @NonNull MatchBuilderPath<O, N> extractChild(Class<C> caseClass, Class<N> childClass);
 
-    /**
-     * Add a child path component to the specification of what needs to be extracted, specifying an exact match in
-     * a keyed list. This method, along with its alternatives, can be used to specify which object type to select from
-     * the root path.
-     *
-     * @param <N> List type
-     * @param <K> Key type
-     * @param listKey List key
-     * @return This builder
-     * @throws NullPointerException if childClass is null
-     */
-    <N extends Identifiable<K> & ChildOf<? super T>, K extends Identifier<N>>
-        @NonNull MatchBuilderPath<O, N> extractChild(Class<@NonNull N> listItem, K listKey);
-
     /**
      * Match an {@code empty} leaf's value.
      *

diff --git a/binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/dom/adapter/query/DefaultDescendantQueryBuilder.java b/binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/dom/adapter/query/DefaultDescendantQueryBuilder.java
index 40041c64252245519138a3d8c5e64da34f14f357..c99ab47ee5395aed5c52e48109deea8acf2bdf66 100644 (file)
--- a/binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/dom/adapter/query/DefaultDescendantQueryBuilder.java
+++ b/binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/dom/adapter/query/DefaultDescendantQueryBuilder.java
@@ -7,7 +7,6 @@
  */
 package org.opendaylight.mdsal.binding.dom.adapter.query;
 
-import org.eclipse.jdt.annotation.NonNull;
 import org.opendaylight.mdsal.binding.api.query.DescendantQueryBuilder;
 import org.opendaylight.mdsal.binding.api.query.MatchBuilderPath;
 import org.opendaylight.mdsal.binding.api.query.QueryExpression;
@@ -16,8 +15,6 @@ import org.opendaylight.mdsal.binding.dom.codec.api.BindingCodecTree;
 import org.opendaylight.yangtools.yang.binding.ChildOf;
 import org.opendaylight.yangtools.yang.binding.ChoiceIn;
 import org.opendaylight.yangtools.yang.binding.DataObject;
-import org.opendaylight.yangtools.yang.binding.Identifiable;
-import org.opendaylight.yangtools.yang.binding.Identifier;
 import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
 import org.opendaylight.yangtools.yang.binding.InstanceIdentifier.InstanceIdentifierBuilder;
 
@@ -46,14 +43,6 @@ final class DefaultDescendantQueryBuilder<R extends DataObject, T extends DataOb
         return (DefaultDescendantQueryBuilder<R, N>) this;
     }
 
-    @Override
-    @SuppressWarnings("unchecked")
-    public <N extends Identifiable<K> & ChildOf<? super T>, K extends Identifier<N>>
-            DescendantQueryBuilder<N> extractChild(final Class<@NonNull N> listItem, final K listKey) {
-        childPath.child(listItem, listKey);
-        return (DefaultDescendantQueryBuilder<R, N>) this;
-    }
-
     @Override
     public MatchBuilderPath<T, T> matching() {
         final InstanceIdentifier<T> selectPath = childPath.build();

diff --git a/binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/dom/adapter/query/DefaultMatchBuilderPath.java b/binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/dom/adapter/query/DefaultMatchBuilderPath.java
index 226e1df337982de15afd2a95bf4b5e93bb534deb..e5e1034adb3006b24f29679f1643d79e15ca87d8 100644 (file)
--- a/binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/dom/adapter/query/DefaultMatchBuilderPath.java
+++ b/binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/dom/adapter/query/DefaultMatchBuilderPath.java
@@ -18,8 +18,6 @@ import org.opendaylight.yangtools.yang.binding.BaseIdentity;
 import org.opendaylight.yangtools.yang.binding.ChildOf;
 import org.opendaylight.yangtools.yang.binding.ChoiceIn;
 import org.opendaylight.yangtools.yang.binding.DataObject;
-import org.opendaylight.yangtools.yang.binding.Identifiable;
-import org.opendaylight.yangtools.yang.binding.Identifier;
 import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
 import org.opendaylight.yangtools.yang.binding.InstanceIdentifier.InstanceIdentifierBuilder;
 import org.opendaylight.yangtools.yang.binding.TypeObject;
@@ -56,14 +54,6 @@ final class DefaultMatchBuilderPath<O extends DataObject, T extends DataObject>
         return (MatchBuilderPath<O, N>) this;
     }
 
-    @Override
-    @SuppressWarnings("unchecked")
-    public <N extends Identifiable<K> & ChildOf<? super T>, K extends Identifier<N>>
-            MatchBuilderPath<O, N> extractChild(final Class<@NonNull N> listItem, final K listKey) {
-        target.child(listItem, listKey);
-        return (MatchBuilderPath<O, N>) this;
-    }
-
     @Override
     public ValueMatchBuilder<O, Empty> leaf(final EmptyLeafReference<T> methodRef) {
         return defaultFor(methodRef);