Remove deprecated YangInstanceIdentifier methods

this patch removes the internal bridge methods to Iterable path
arguments as well as the long-deprecated getPath() method.

Change-Id: I28168741a5ad852a108b1aa6f711d44bc4748b6a
Signed-off-by: Robert Varga <rovarga@cisco.com>

diff --git a/yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/IterablePathArguments.java b/yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/IterablePathArguments.java
deleted file mode 100644 (file)
index 51b744a..0000000
--- a/yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/IterablePathArguments.java
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco Systems, Inc. and others. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0 which accompanies this distribution,
- * and is available at http://www.eclipse.org/legal/epl-v10.html
- */
-package org.opendaylight.yangtools.yang.data.api;
-
-import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.PathArgument;
-
-/*
- * This base class provides binary backwards compatibility for Helium, which
- * used an Iterable instead of collection.
- *
- * @deprecated remove this class in Beryllium
- */
-@Deprecated
-abstract class IterablePathArguments {
-    public abstract Iterable<PathArgument> getPathArguments();
-    public abstract Iterable<PathArgument> getReversePathArguments();
-}

diff --git a/yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/YangInstanceIdentifier.java b/yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/YangInstanceIdentifier.java
index 82d1ceb260731d0df04df83ecd25b7d71d48e408..32838a21f5ec6091972a8e1dd4657b4e2021ca11 100644 (file)
--- a/yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/YangInstanceIdentifier.java
+++ b/yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/YangInstanceIdentifier.java
@@ -65,7 +65,7 @@ import org.opendaylight.yangtools.yang.data.api.schema.LeafSetEntryNode;
  *
  * @see <a href="http://tools.ietf.org/html/rfc6020#section-9.13">RFC6020</a>
  */
-public abstract class YangInstanceIdentifier extends IterablePathArguments implements Path<YangInstanceIdentifier>, Immutable, Serializable {
+public abstract class YangInstanceIdentifier implements Path<YangInstanceIdentifier>, Immutable, Serializable {
     /**
      * An empty {@link YangInstanceIdentifier}. It corresponds to the path of the conceptual
      * root of the YANG namespace.
@@ -113,23 +113,11 @@ public abstract class YangInstanceIdentifier extends IterablePathArguments imple
      */
     @Nullable public abstract YangInstanceIdentifier getParent();
 
-    /**
-     * Returns a list of path arguments.
-     *
-     * @deprecated Use {@link #getPathArguments()} instead.
-     * @return Immutable list of path arguments.
-     */
-    @Deprecated
-    public final List<PathArgument> getPath() {
-        return getPathArguments();
-    }
-
     /**
      * Returns an ordered iteration of path arguments.
      *
      * @return Immutable iteration of path arguments.
      */
-    @Override
     public abstract List<PathArgument> getPathArguments();
 
     /**
@@ -138,7 +126,6 @@ public abstract class YangInstanceIdentifier extends IterablePathArguments imple
      *
      * @return Immutable iterable of path arguments in reverse order.
      */
-    @Override
     public abstract List<PathArgument> getReversePathArguments();
 
     /**