X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=yang%2Fyang-parser-rfc7950%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fyangtools%2Fyang%2Fparser%2Frfc7950%2Fstmt%2Fmodule%2FModuleEffectiveStatementImpl.java;h=9e4df502fb8f94efb002813a715525f3ec0505d3;hb=68e44f106cc8b3ba8e2354f3dfeb3770b868b25a;hp=6a0dcc8187e4170163fe3a60b8d5bd773fee136b;hpb=a9eef954ddbe2d13b1fca4826ecb574d4f12e542;p=yangtools.git

diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/module/ModuleEffectiveStatementImpl.java b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/module/ModuleEffectiveStatementImpl.java
index 6a0dcc8187..9e4df502fb 100644
--- a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/module/ModuleEffectiveStatementImpl.java
+++ b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/module/ModuleEffectiveStatementImpl.java
@@ -11,15 +11,15 @@ import static com.google.common.base.Verify.verifyNotNull;
 
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableMap.Builder;
+import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.Maps;
 import java.util.Map;
 import java.util.Map.Entry;
-import java.util.Objects;
 import java.util.Optional;
 import org.eclipse.jdt.annotation.NonNull;
 import org.opendaylight.yangtools.yang.common.QName;
 import org.opendaylight.yangtools.yang.common.QNameModule;
-import org.opendaylight.yangtools.yang.model.api.meta.EffectiveStatement;
+import org.opendaylight.yangtools.yang.model.api.Module;
 import org.opendaylight.yangtools.yang.model.api.meta.IdentifierNamespace;
 import org.opendaylight.yangtools.yang.model.api.stmt.ExtensionEffectiveStatement;
 import org.opendaylight.yangtools.yang.model.api.stmt.ExtensionEffectiveStatementNamespace;
@@ -46,18 +46,20 @@ import org.opendaylight.yangtools.yang.parser.spi.source.ModuleCtxToModuleQName;
 
 final class ModuleEffectiveStatementImpl extends AbstractEffectiveModule<ModuleStatement>
         implements ModuleEffectiveStatement {
-    private final Map<String, SubmoduleEffectiveStatement> nameToSubmodule;
-    private final Map<QName, ExtensionEffectiveStatement> qnameToExtension;
-    private final Map<QName, FeatureEffectiveStatement> qnameToFeature;
-    private final Map<QName, IdentityEffectiveStatement> qnameToIdentity;
-    private final Map<String, ModuleEffectiveStatement> prefixToModule;
-    private final Map<QNameModule, String> namespaceToPrefix;
+    private final ImmutableMap<String, SubmoduleEffectiveStatement> nameToSubmodule;
+    private final ImmutableMap<QName, ExtensionEffectiveStatement> qnameToExtension;
+    private final ImmutableMap<QName, FeatureEffectiveStatement> qnameToFeature;
+    private final ImmutableMap<QName, IdentityEffectiveStatement> qnameToIdentity;
+    private final ImmutableMap<String, ModuleEffectiveStatement> prefixToModule;
+    private final ImmutableMap<QNameModule, String> namespaceToPrefix;
     private final @NonNull QNameModule qnameModule;
+    private final ImmutableSet<Module> submodules;
 
-    ModuleEffectiveStatementImpl(
-            final StmtContext<String, ModuleStatement, EffectiveStatement<String, ModuleStatement>> ctx) {
-        super(ctx);
-        qnameModule = verifyNotNull(ctx.getFromNamespace(ModuleCtxToModuleQName.class, ctx));
+    private ModuleEffectiveStatementImpl(final @NonNull ModuleStmtContext ctx) {
+        super(ctx, findPrefix(ctx.delegate(), "module", ctx.getStatementArgument()));
+        submodules = ctx.getSubmodules();
+
+        qnameModule = verifyNotNull(ctx.getFromNamespace(ModuleCtxToModuleQName.class, ctx.delegate()));
 
         final String localPrefix = findFirstEffectiveSubstatementArgument(PrefixEffectiveStatement.class).get();
         final Builder<String, ModuleEffectiveStatement> prefixToModuleBuilder = ImmutableMap.builder();
@@ -80,27 +82,28 @@ final class ModuleEffectiveStatementImpl extends AbstractEffectiveModule<ModuleS
         }
         namespaceToPrefix = ImmutableMap.copyOf(tmp);
 
-        final Map<String, StmtContext<?, ?, ?>> submodules =
+        final Map<String, StmtContext<?, ?, ?>> includedSubmodules =
                 ctx.getAllFromCurrentStmtCtxNamespace(IncludedSubmoduleNameToModuleCtx.class);
-        nameToSubmodule = submodules == null ? ImmutableMap.of()
-                : ImmutableMap.copyOf(Maps.transformValues(submodules,
+        nameToSubmodule = includedSubmodules == null ? ImmutableMap.of()
+                : ImmutableMap.copyOf(Maps.transformValues(includedSubmodules,
                     submodule -> (SubmoduleEffectiveStatement) submodule.buildEffective()));
 
-        final Map<QName, StmtContext<?, ExtensionStatement, EffectiveStatement<QName, ExtensionStatement>>> extensions =
+        final Map<QName, StmtContext<?, ExtensionStatement, ExtensionEffectiveStatement>> extensions =
                 ctx.getAllFromCurrentStmtCtxNamespace(ExtensionNamespace.class);
         qnameToExtension = extensions == null ? ImmutableMap.of()
-                : ImmutableMap.copyOf(Maps.transformValues(extensions,
-                    stmt -> (ExtensionEffectiveStatement) stmt.buildEffective()));
-        final Map<QName, StmtContext<?, FeatureStatement, EffectiveStatement<QName, FeatureStatement>>> features =
+                : ImmutableMap.copyOf(Maps.transformValues(extensions, StmtContext::buildEffective));
+        final Map<QName, StmtContext<?, FeatureStatement, FeatureEffectiveStatement>> features =
                 ctx.getAllFromCurrentStmtCtxNamespace(FeatureNamespace.class);
         qnameToFeature = features == null ? ImmutableMap.of()
-                : ImmutableMap.copyOf(Maps.transformValues(features,
-                    stmt -> (FeatureEffectiveStatement) stmt.buildEffective()));
-        final Map<QName, StmtContext<?, IdentityStatement, EffectiveStatement<QName, IdentityStatement>>> identities =
+                : ImmutableMap.copyOf(Maps.transformValues(features, StmtContext::buildEffective));
+        final Map<QName, StmtContext<?, IdentityStatement, IdentityEffectiveStatement>> identities =
                 ctx.getAllFromCurrentStmtCtxNamespace(IdentityNamespace.class);
         qnameToIdentity = identities == null ? ImmutableMap.of()
-                : ImmutableMap.copyOf(Maps.transformValues(identities,
-                    stmt -> (IdentityEffectiveStatement) stmt.buildEffective()));
+                : ImmutableMap.copyOf(Maps.transformValues(identities, StmtContext::buildEffective));
+    }
+
+    ModuleEffectiveStatementImpl(final StmtContext<String, ModuleStatement, ModuleEffectiveStatement> ctx) {
+        this(ModuleStmtContext.create(ctx));
     }
 
     @Override
@@ -113,6 +116,11 @@ final class ModuleEffectiveStatementImpl extends AbstractEffectiveModule<ModuleS
         return qnameModule;
     }
 
+    @Override
+    public ImmutableSet<Module> getSubmodules() {
+        return submodules;
+    }
+
     @Override
     @SuppressWarnings("unchecked")
     public <K, V, N extends IdentifierNamespace<K, V>> Optional<? extends Map<K, V>> getNamespaceContents(
@@ -137,35 +145,4 @@ final class ModuleEffectiveStatementImpl extends AbstractEffectiveModule<ModuleS
         }
         return super.getNamespaceContents(namespace);
     }
-
-    @Override
-    public int hashCode() {
-        final int prime = 31;
-        int result = 1;
-        result = prime * result + Objects.hashCode(getName());
-        result = prime * result + Objects.hashCode(getYangVersion());
-        result = prime * result + Objects.hashCode(qnameModule);
-        return result;
-    }
-
-    @Override
-    public boolean equals(final Object obj) {
-        if (this == obj) {
-            return true;
-        }
-        if (!(obj instanceof ModuleEffectiveStatementImpl)) {
-            return false;
-        }
-        ModuleEffectiveStatementImpl other = (ModuleEffectiveStatementImpl) obj;
-        if (!Objects.equals(getName(), other.getName())) {
-            return false;
-        }
-        if (!qnameModule.equals(other.qnameModule)) {
-            return false;
-        }
-        if (!Objects.equals(getYangVersion(), other.getYangVersion())) {
-            return false;
-        }
-        return true;
-    }
 }