Fixup collections return implementations

[yangtools.git] / yang / yang-parser-rfc7950 / src / main / java / org / opendaylight / yangtools / yang / parser / rfc7950 / stmt / AbstractEffectiveModule.java

diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/AbstractEffectiveModule.java b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/AbstractEffectiveModule.java
index 4f6ef50f3c2c4516c6fb1465ed113f7b35ff4d04..aab5cb9ac333835b953d68c5fee8a504e4a12408 100644 (file)
--- a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/AbstractEffectiveModule.java
+++ b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/AbstractEffectiveModule.java
@@ -26,6 +26,7 @@ import org.eclipse.jdt.annotation.NonNull;
 import org.opendaylight.yangtools.concepts.SemVer;
 import org.opendaylight.yangtools.openconfig.model.api.OpenConfigVersionEffectiveStatement;
 import org.opendaylight.yangtools.yang.common.QName;
+import org.opendaylight.yangtools.yang.common.UnqualifiedQName;
 import org.opendaylight.yangtools.yang.common.YangVersion;
 import org.opendaylight.yangtools.yang.model.api.AugmentationSchemaNode;
 import org.opendaylight.yangtools.yang.model.api.DataSchemaNode;
@@ -63,9 +64,11 @@ import org.opendaylight.yangtools.yang.parser.spi.source.ImportPrefixToModuleCtx
 import org.opendaylight.yangtools.yang.parser.spi.source.SourceException;
 
 @Beta
-public abstract class AbstractEffectiveModule<D extends DeclaredStatement<String>,
-        E extends DataTreeAwareEffectiveStatement<String, D>> extends WithSubstatements<String, D, E>
-        implements ModuleLike, DocumentedNodeMixin<String, D>, NotificationNodeContainerCompat<String, D, E> {
+public abstract class AbstractEffectiveModule<D extends DeclaredStatement<UnqualifiedQName>,
+        E extends DataTreeAwareEffectiveStatement<UnqualifiedQName, D>>
+        extends WithSubstatements<UnqualifiedQName, D, E>
+        implements ModuleLike, DocumentedNodeMixin<UnqualifiedQName, D>,
+            NotificationNodeContainerCompat<UnqualifiedQName, D, E> {
     private final String prefix;
     private final ImmutableSet<GroupingDefinition> groupings;
     private final ImmutableSet<UsesNode> uses;
@@ -73,7 +76,7 @@ public abstract class AbstractEffectiveModule<D extends DeclaredStatement<String
     private final ImmutableMap<QName, SchemaTreeEffectiveStatement<?>> schemaTreeNamespace;
 
     protected AbstractEffectiveModule(final D declared,
-            final StmtContext<String, D, ? extends EffectiveStatement<String, ?>> ctx,
+            final StmtContext<UnqualifiedQName, D, ? extends EffectiveStatement<UnqualifiedQName, ?>> ctx,
             final ImmutableList<? extends EffectiveStatement<?, ?>> substatements, final String prefix) {
         super(declared, ctx, substatements);
 
@@ -115,13 +118,13 @@ public abstract class AbstractEffectiveModule<D extends DeclaredStatement<String
     }
 
     @Override
-    public String argument() {
+    public UnqualifiedQName argument() {
         return getDeclared().argument();
     }
 
     @Override
     public String getName() {
-        return argument();
+        return argument().getLocalName();
     }
 
     @Override
@@ -146,42 +149,42 @@ public abstract class AbstractEffectiveModule<D extends DeclaredStatement<String
     }
 
     @Override
-    public Collection<? extends ModuleImport> getImports() {
+    public Collection<? extends @NonNull ModuleImport> getImports() {
         return filterSubstatements(ModuleImport.class);
     }
 
     @Override
-    public Collection<? extends FeatureDefinition> getFeatures() {
+    public Collection<? extends @NonNull FeatureDefinition> getFeatures() {
         return filterSubstatements(FeatureDefinition.class);
     }
 
     @Override
-    public Collection<? extends NotificationDefinition> getNotifications() {
+    public Collection<? extends @NonNull NotificationDefinition> getNotifications() {
         return filterSubstatements(NotificationDefinition.class);
     }
 
     @Override
-    public Collection<? extends AugmentationSchemaNode> getAugmentations() {
+    public Collection<? extends @NonNull AugmentationSchemaNode> getAugmentations() {
         return filterSubstatements(AugmentationSchemaNode.class);
     }
 
     @Override
-    public Collection<? extends RpcDefinition> getRpcs() {
+    public Collection<? extends @NonNull RpcDefinition> getRpcs() {
         return filterSubstatements(RpcDefinition.class);
     }
 
     @Override
-    public Collection<? extends Deviation> getDeviations() {
+    public Collection<? extends @NonNull Deviation> getDeviations() {
         return filterSubstatements(Deviation.class);
     }
 
     @Override
-    public Collection<? extends ExtensionDefinition> getExtensionSchemaNodes() {
+    public Collection<? extends @NonNull ExtensionDefinition> getExtensionSchemaNodes() {
         return filterSubstatements(ExtensionDefinition.class);
     }
 
     @Override
-    public Collection<? extends IdentitySchemaNode> getIdentities() {
+    public Collection<? extends @NonNull IdentitySchemaNode> getIdentities() {
         return filterSubstatements(IdentitySchemaNode.class);
     }