From 12b6252d832dc4c7e0a965acc0136ca4a9574db4 Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Tue, 19 May 2015 10:57:24 +0200 Subject: [PATCH] BUG-3263: remove bridge Collection-based methods This class and its methods were used in transition on Lithium and are no longer needed, so remove them. Change-Id: I2e67d173f87b409803e46861b77aa165784444e0 Signed-off-by: Robert Varga --- .../data/api/CollectionPathArguments.java | 24 ------------------- .../yang/data/api/YangInstanceIdentifier.java | 2 +- 2 files changed, 1 insertion(+), 25 deletions(-) delete mode 100644 yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/CollectionPathArguments.java diff --git a/yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/CollectionPathArguments.java b/yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/CollectionPathArguments.java deleted file mode 100644 index af7895c86a..0000000000 --- a/yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/CollectionPathArguments.java +++ /dev/null @@ -1,24 +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 java.util.Collection; -import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.PathArgument; - -/** - * This class provides backwards compatibility with the previous switch to - * Collections. - * - * @deprecated Remove before Lithium ships - */ -@Deprecated -abstract class CollectionPathArguments extends IterablePathArguments { - @Override - public abstract Collection getPathArguments(); - @Override - public abstract Collection 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 ce8d0e45ba..85963b6c59 100644 --- 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 @@ -64,7 +64,7 @@ import org.opendaylight.yangtools.yang.data.api.schema.LeafSetEntryNode; * * @see RFC6020 */ -public abstract class YangInstanceIdentifier extends CollectionPathArguments implements Path, Immutable, Serializable { +public abstract class YangInstanceIdentifier extends IterablePathArguments implements Path, Immutable, Serializable { /** * An empty {@link YangInstanceIdentifier}. It corresponds to the path of the conceptual * root of the YANG namespace. -- 2.36.6