Remove deprecated InstanceIdentifier methods

This removes all deprecated methods in InstanceIdentifier,
slimming each instance down a bit.

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

diff --git a/binding/mdsal-binding-generator-impl/src/main/java/org/opendaylight/mdsal/binding/generator/impl/CodecTypeUtils.java b/binding/mdsal-binding-generator-impl/src/main/java/org/opendaylight/mdsal/binding/generator/impl/CodecTypeUtils.java
index 93bb447048e2ebb8b834d982df999ed312f92fd3..ed278c2375b3df4af0840c1eaa31ca81f9f126e6 100644 (file)
--- a/binding/mdsal-binding-generator-impl/src/main/java/org/opendaylight/mdsal/binding/generator/impl/CodecTypeUtils.java
+++ b/binding/mdsal-binding-generator-impl/src/main/java/org/opendaylight/mdsal/binding/generator/impl/CodecTypeUtils.java
@@ -7,20 +7,16 @@
  */
 package org.opendaylight.mdsal.binding.generator.impl;
 
-import org.opendaylight.yangtools.yang.binding.Identifiable;
 import org.opendaylight.yangtools.yang.binding.Identifier;
 import org.opendaylight.yangtools.yang.binding.InstanceIdentifier.IdentifiableItem;
 
 public final class CodecTypeUtils {
-
     private CodecTypeUtils() {
         throw new UnsupportedOperationException("Utility class should not be instantiated");
     }
 
     @SuppressWarnings({"unchecked","rawtypes"})
-    public static IdentifiableItem<?, ?> newIdentifiableItem(Class<?> type, Object key) {
-        Class<? extends Identifiable<?>> identifiableType = (Class<? extends Identifiable<?>>) type;
-        Identifier<? extends Identifiable<?>> identifier = (Identifier<? extends Identifiable<?>>) key;
-        return new IdentifiableItem(identifiableType,identifier);
+    public static IdentifiableItem<?, ?> newIdentifiableItem(final Class<?> type, final Object key) {
+        return IdentifiableItem.of((Class)type, (Identifier)key);
     }
 }

diff --git a/binding/yang-binding/src/main/java/org/opendaylight/yangtools/yang/binding/InstanceIdentifier.java b/binding/yang-binding/src/main/java/org/opendaylight/yangtools/yang/binding/InstanceIdentifier.java
index 6b71a31122aee22cedbb238b8e72c5c5882bb047..5d94885c58c8a705c9cc7033fad6308af621176e 100644 (file)
--- a/binding/yang-binding/src/main/java/org/opendaylight/yangtools/yang/binding/InstanceIdentifier.java
+++ b/binding/yang-binding/src/main/java/org/opendaylight/yangtools/yang/binding/InstanceIdentifier.java
@@ -229,23 +229,6 @@ public class InstanceIdentifier<T extends DataObject> implements Path<InstanceId
         return null;
     }
 
-    /**
-     * Return the key associated with the first component of specified type in
-     * an identifier.
-     *
-     * @param listItem component type
-     * @param listKey component key type
-     * @return key associated with the component, or null if the component type
-     *         is not present.
-     *
-     * @deprecated Use {@link #firstKeyOf(Class)} instead.
-     */
-    @Deprecated
-    public final <N extends Identifiable<K> & DataObject, K extends Identifier<N>> K firstKeyOf(final Class<N> listItem,
-            final Class<K> listKey) {
-        return firstKeyOf(listItem);
-    }
-
     /**
      * Return the key associated with the first component of specified type in
      * an identifier.
@@ -425,23 +408,6 @@ public class InstanceIdentifier<T extends DataObject> implements Path<InstanceId
         return childIdentifier(Item.of(container));
     }
 
-    @Deprecated
-    private List<PathArgument> legacyCache;
-
-    /**
-     * Return the path as a list.
-     *
-     * @deprecated Use {@link #getPathArguments()} instead.
-     */
-    @Deprecated
-    public final List<PathArgument> getPath() {
-        if (legacyCache == null) {
-            legacyCache = ImmutableList.<PathArgument>copyOf(pathArguments);
-        }
-
-        return legacyCache;
-    }
-
     /**
      * Create a builder rooted at this key.
      *
@@ -712,14 +678,7 @@ public class InstanceIdentifier<T extends DataObject> implements Path<InstanceId
     public static class Item<T extends DataObject> extends AbstractPathArgument<T> {
         private static final long serialVersionUID = 1L;
 
-        /**
-         * Construct an Item.
-         *
-         * @param type Backing class
-         * @deprecated Use {@link #of(Class)} instead.
-         */
-        @Deprecated
-        public Item(final Class<T> type) {
+        Item(final Class<T> type) {
             super(type);
         }
 
@@ -769,15 +728,7 @@ public class InstanceIdentifier<T extends DataObject> implements Path<InstanceId
         private static final long serialVersionUID = 1L;
         private final T key;
 
-        /**
-         * Construct an Item.
-         *
-         * @param type Backing class
-         * @param key key
-         * @deprecated Use {@link #of(Class, Identifier)} instead.
-         */
-        @Deprecated
-        public IdentifiableItem(final Class<I> type, final T key) {
+        IdentifiableItem(final Class<I> type, final T key) {
             super(type);
             this.key = requireNonNull(key, "Key may not be null.");
         }

diff --git a/binding/yang-binding/src/test/java/org/opendaylight/yangtools/yang/binding/InstanceIdentifierTest.java b/binding/yang-binding/src/test/java/org/opendaylight/yangtools/yang/binding/InstanceIdentifierTest.java
index 62f55028f175954d5e42066032a4f6cf1e69f66d..3a9d3752fd9db9db7e670a16b9e687afb5491a75 100644 (file)
--- a/binding/yang-binding/src/test/java/org/opendaylight/yangtools/yang/binding/InstanceIdentifierTest.java
+++ b/binding/yang-binding/src/test/java/org/opendaylight/yangtools/yang/binding/InstanceIdentifierTest.java
@@ -179,7 +179,7 @@ public class InstanceIdentifierTest {
         final InstanceIdentifier<Node> instanceIdentifier =
                 InstanceIdentifier.builder(Nodes.class).child(Node.class,new NodeKey(10)).build();
         final InstanceIdentifier<DataObject> instanceIdentifier1 = InstanceIdentifier.create(DataObject.class);
-        assertNotNull(instanceIdentifier.firstKeyOf(Node.class, null));
+        assertNotNull(instanceIdentifier.firstKeyOf(Node.class));
         assertNull(instanceIdentifier1.firstKeyOf(Node.class));
     }
 
@@ -233,9 +233,9 @@ public class InstanceIdentifierTest {
         assertFalse(builder3.equals(builder4));
         assertFalse(builder4.equals(builder3));
 
-        InstanceIdentifierBuilder<Nodes> iib1 = new InstanceIdentifierBuilderImpl(null, null, 31, true);
-        InstanceIdentifierBuilder<Nodes> iib2 = new InstanceIdentifierBuilderImpl(null, null, 31, false);
-        InstanceIdentifierBuilder<Nodes> iib3 = new InstanceIdentifierBuilderImpl(null, null, 31, true);
+        InstanceIdentifierBuilder<Nodes> iib1 = new InstanceIdentifierBuilderImpl<>(null, null, 31, true);
+        InstanceIdentifierBuilder<Nodes> iib2 = new InstanceIdentifierBuilderImpl<>(null, null, 31, false);
+        InstanceIdentifierBuilder<Nodes> iib3 = new InstanceIdentifierBuilderImpl<>(null, null, 31, true);
         assertFalse(iib1.equals(iib2));
         assertFalse(iib2.equals(iib1));
         assertTrue(iib1.equals(iib3));