Temporary disabled method getDerivedIdentities() from IdentitySchemaNode.

Signed-off-by: Martin Vitez <mvitez@cisco.com>

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 3fea02a510ad0f24a9fc8dd528ab802425042963..16f5ce190b7af28b76c19fc08f60baa0ef2224a5 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
@@ -26,11 +26,4 @@ public interface IdentitySchemaNode extends SchemaNode {
      */\r
     IdentitySchemaNode getBaseIdentity();\r
 \r
-    /**\r
-     * Get identities derived from this identity.\r
-     * \r
-     * @return collection of identities derived from this identity\r
-     */\r
-    Set<IdentitySchemaNode> getDerivedIdentities();\r
-\r
 }\r

diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/IdentitySchemaNodeBuilder.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/IdentitySchemaNodeBuilder.java
index 74099b5334b6d6440032148dbd6aac9ec88150c8..340f0f58f88ac85969bd4dca874bc91ba4211265 100644 (file)
--- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/IdentitySchemaNodeBuilder.java
+++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/IdentitySchemaNodeBuilder.java
@@ -9,7 +9,6 @@ package org.opendaylight.yangtools.yang.parser.builder.impl;
 
 import java.util.ArrayList;
 import java.util.Collections;
-import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 
@@ -26,7 +25,6 @@ public final class IdentitySchemaNodeBuilder extends AbstractSchemaNodeBuilder {
     private final IdentitySchemaNodeImpl instance;
     private IdentitySchemaNode baseIdentity;
     private IdentitySchemaNodeBuilder baseIdentityBuilder;
-    private final Set<IdentitySchemaNode> derivedIdentities = new HashSet<>();
     private String baseIdentityName;
 
     IdentitySchemaNodeBuilder(final String moduleName, final int line, final QName qname) {
@@ -49,8 +47,6 @@ public final class IdentitySchemaNodeBuilder extends AbstractSchemaNodeBuilder {
                 instance.setBaseIdentity(baseIdentity);
             }
 
-            instance.setDerivedIdentities(derivedIdentities);
-
             // UNKNOWN NODES
             if (unknownNodes == null) {
                 unknownNodes = new ArrayList<>();
@@ -83,10 +79,6 @@ public final class IdentitySchemaNodeBuilder extends AbstractSchemaNodeBuilder {
         this.baseIdentity = baseType;
     }
 
-    public void addDerivedIdentity(IdentitySchemaNode derived) {
-        derivedIdentities.add(derived);
-    }
-
     @Override
     public String toString() {
         return "identity " + qname.getLocalName();
@@ -95,7 +87,6 @@ public final class IdentitySchemaNodeBuilder extends AbstractSchemaNodeBuilder {
     public final class IdentitySchemaNodeImpl implements IdentitySchemaNode {
         private final QName qname;
         private IdentitySchemaNode baseIdentity;
-        private Set<IdentitySchemaNode> derivedIdentities = Collections.emptySet();
         private String description;
         private String reference;
         private Status status = Status.CURRENT;
@@ -120,17 +111,6 @@ public final class IdentitySchemaNodeBuilder extends AbstractSchemaNodeBuilder {
             this.baseIdentity = baseIdentity;
         }
 
-        @Override
-        public Set<IdentitySchemaNode> getDerivedIdentities() {
-            return derivedIdentities;
-        }
-
-        private void setDerivedIdentities(Set<IdentitySchemaNode> derivedIdentities) {
-            if (derivedIdentities != null) {
-                this.derivedIdentities = derivedIdentities;
-            }
-        }
-
         @Override
         public String getDescription() {
             return description;

diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/impl/YangParserImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/impl/YangParserImpl.java
index 954f6c9261018b20eeab9ecbeb27744de8b94030..89b757561644065e18ad1ec56a785bbcefacc4cc 100644 (file)
--- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/impl/YangParserImpl.java
+++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/impl/YangParserImpl.java
@@ -413,9 +413,9 @@ public final class YangParserImpl implements YangModelParser {
         for (Map.Entry<String, TreeMap<Date, ModuleBuilder>> entry : modules.entrySet()) {
             for (Map.Entry<Date, ModuleBuilder> childEntry : entry.getValue().entrySet()) {
                 final ModuleBuilder module = childEntry.getValue();
+                resolveUnknownNodes(modules, module);
                 resolveIdentities(modules, module);
                 resolveDirtyNodes(modules, module);
-                resolveUnknownNodes(modules, module);
             }
         }
     }
@@ -425,9 +425,9 @@ public final class YangParserImpl implements YangModelParser {
         for (Map.Entry<String, TreeMap<Date, ModuleBuilder>> entry : modules.entrySet()) {
             for (Map.Entry<Date, ModuleBuilder> childEntry : entry.getValue().entrySet()) {
                 final ModuleBuilder module = childEntry.getValue();
+                resolveUnknownNodesWithContext(modules, module, context);
                 resolveIdentitiesWithContext(modules, module, context);
                 resolveDirtyNodesWithContext(modules, module, context);
-                resolveUnknownNodesWithContext(modules, module, context);
             }
         }
     }
@@ -761,8 +761,6 @@ public final class YangParserImpl implements YangModelParser {
                     throw new YangParseException(module.getName(), identity.getLine(), "Failed to find base identity");
                 } else {
                     identity.setBaseIdentity(baseIdentity);
-                    IdentitySchemaNode built = identity.build();
-                    baseIdentity.addDerivedIdentity(built);
                 }
             }
         }
@@ -792,15 +790,8 @@ public final class YangParserImpl implements YangModelParser {
                     IdentitySchemaNode baseId = findBaseIdentityFromContext(modules, module, baseIdentityName, line,
                             context);
                     identity.setBaseIdentity(baseId);
-                    IdentitySchemaNode built = identity.build();
-                    if (baseId instanceof IdentitySchemaNodeBuilder.IdentitySchemaNodeImpl) {
-                        ((IdentitySchemaNodeBuilder.IdentitySchemaNodeImpl) baseId).toBuilder().addDerivedIdentity(
-                                built);
-                    }
                 } else {
                     identity.setBaseIdentity(baseIdentity);
-                    IdentitySchemaNode built = identity.build();
-                    baseIdentity.addDerivedIdentity(built);
                 }
             }
         }

diff --git a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/impl/TypesResolutionTest.java b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/impl/TypesResolutionTest.java
index aff89762e089feac5ea0b2241128c604fd6c03f5..7d47208e77476bc1e6657ad5ae31fb2d67950eca 100644 (file)
--- a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/impl/TypesResolutionTest.java
+++ b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/impl/TypesResolutionTest.java
@@ -188,14 +188,14 @@ public class TypesResolutionTest {
         assertNotNull(cryptoAlg);
         IdentitySchemaNode baseIdentity = cryptoAlg.getBaseIdentity();
         assertEquals("crypto-base", baseIdentity.getQName().getLocalName());
-        assertTrue(cryptoAlg.getDerivedIdentities().isEmpty());
+        //assertTrue(cryptoAlg.getDerivedIdentities().isEmpty());
         assertNull(baseIdentity.getBaseIdentity());
 
 
         assertNotNull(cryptoBase);
         baseIdentity = cryptoAlg.getBaseIdentity();
         assertNull(cryptoBase.getBaseIdentity());
-        assertEquals(3, cryptoBase.getDerivedIdentities().size());
+        //assertEquals(3, cryptoBase.getDerivedIdentities().size());
     }
 
     @Test