X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=opendaylight%2Fmd-sal%2Fsal-binding-api%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fmd%2Fsal%2Fbinding%2Fapi%2FDataTreeIdentifier.java;h=b86d31b79082db4641126f90d9123eb9e8fb75c2;hb=a54ec60368110d22794602343c934902f6833c65;hp=428957e988869d1b0641c42fa21bdc739b767993;hpb=b42eff1340aee9b4c29265de40296926d88b9525;p=controller.git diff --git a/opendaylight/md-sal/sal-binding-api/src/main/java/org/opendaylight/controller/md/sal/binding/api/DataTreeIdentifier.java b/opendaylight/md-sal/sal-binding-api/src/main/java/org/opendaylight/controller/md/sal/binding/api/DataTreeIdentifier.java index 428957e988..b86d31b790 100644 --- a/opendaylight/md-sal/sal-binding-api/src/main/java/org/opendaylight/controller/md/sal/binding/api/DataTreeIdentifier.java +++ b/opendaylight/md-sal/sal-binding-api/src/main/java/org/opendaylight/controller/md/sal/binding/api/DataTreeIdentifier.java @@ -13,18 +13,19 @@ import javax.annotation.Nonnull; import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType; import org.opendaylight.yangtools.concepts.Immutable; import org.opendaylight.yangtools.concepts.Path; +import org.opendaylight.yangtools.yang.binding.DataObject; import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; /** * A unique identifier for a particular subtree. It is composed of the logical * data store type and the instance identifier of the root node. */ -public final class DataTreeIdentifier implements Immutable, Path, Serializable { +public final class DataTreeIdentifier implements Immutable, Path>, Serializable { private static final long serialVersionUID = 1L; - private final InstanceIdentifier rootIdentifier; + private final InstanceIdentifier rootIdentifier; private final LogicalDatastoreType datastoreType; - public DataTreeIdentifier(final LogicalDatastoreType datastoreType, final InstanceIdentifier rootIdentifier) { + public DataTreeIdentifier(final LogicalDatastoreType datastoreType, final InstanceIdentifier rootIdentifier) { this.datastoreType = Preconditions.checkNotNull(datastoreType); this.rootIdentifier = Preconditions.checkNotNull(rootIdentifier); } @@ -43,12 +44,12 @@ public final class DataTreeIdentifier implements Immutable, Path getRootIdentifier() { + public @Nonnull InstanceIdentifier getRootIdentifier() { return rootIdentifier; } @Override - public boolean contains(final DataTreeIdentifier other) { + public boolean contains(final DataTreeIdentifier other) { return datastoreType == other.datastoreType && rootIdentifier.contains(other.rootIdentifier); } @@ -69,7 +70,7 @@ public final class DataTreeIdentifier implements Immutable, Path other = (DataTreeIdentifier) obj; if (datastoreType != other.datastoreType) { return false; }