Update IdentitySchemaNode metamodel

[yangtools.git] / yang / yang-model-api / src / main / java / org / opendaylight / yangtools / yang / model / api / IdentitySchemaNode.java

diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/IdentitySchemaNode.java b/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/IdentitySchemaNode.java
index be0fbd08fdef6fdab5d1abfb1c3ef080b36d8d76..738f14d98487d3507b4f210ad6fd19f3ffa4edc1 100644 (file)
--- a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/IdentitySchemaNode.java
+++ b/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/IdentitySchemaNode.java
@@ -7,7 +7,6 @@
  */
 package org.opendaylight.yangtools.yang.model.api;
 
-import com.google.common.collect.ImmutableSet;
 import java.util.Set;
 import javax.annotation.Nonnull;
 
@@ -21,15 +20,6 @@ import javax.annotation.Nonnull;
  * identities within a data model.
  */
 public interface IdentitySchemaNode extends SchemaNode {
-    /**
-     * Return the base identity.
-     * @deprecated use {@link #getBaseIdentities()} instead.
-     *
-     * @return an existing identity, from which the new identity is derived or
-     *         null, if the identity is defined from scratch.
-     */
-    @Deprecated IdentitySchemaNode getBaseIdentity();
-
     /**
      * The YANG 1.0 (RFC6020) implementation of IdentitySchemaNode always returns an ImmutableSet containing just one
      * base identity or an empty ImmutableSet as it does not support multiple base identities.
@@ -38,11 +28,7 @@ public interface IdentitySchemaNode extends SchemaNode {
      * @return set of existing identities from which the new identity is derived or
      *         an empty ImmutableSet if the identity is defined from scratch.
      */
-    // FIXME: version 2.0.0: make this method non-default
-    @Nonnull default Set<IdentitySchemaNode> getBaseIdentities() {
-        final IdentitySchemaNode base = getBaseIdentity();
-        return base == null ? ImmutableSet.of() : ImmutableSet.of(base);
-    }
+    @Nonnull Set<IdentitySchemaNode> getBaseIdentities();
 
     /**
      * Get identities derived from this identity.