Fix EffectiveStatement namespace access

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

diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/type/BuiltinEffectiveStatement.java b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/type/BuiltinEffectiveStatement.java
index f5d16f9ff5ff4ffa67213295163e9e02685cd46a..c8d4386a4bc43b7cb7a7a008a9871e080f3777c2 100644 (file)
--- a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/type/BuiltinEffectiveStatement.java
+++ b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/type/BuiltinEffectiveStatement.java
@@ -10,9 +10,11 @@ package org.opendaylight.yangtools.yang.parser.rfc7950.stmt.type;
 import static java.util.Objects.requireNonNull;
 
 import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableMap;
 import java.util.Collection;
 import java.util.Map;
-import javax.annotation.Nonnull;
+import java.util.Optional;
+import org.eclipse.jdt.annotation.NonNull;
 import org.opendaylight.yangtools.yang.model.api.TypeDefinition;
 import org.opendaylight.yangtools.yang.model.api.YangStmtMapping;
 import org.opendaylight.yangtools.yang.model.api.meta.EffectiveStatement;
@@ -41,14 +43,14 @@ enum BuiltinEffectiveStatement implements TypeEffectiveStatement<TypeStatement>
     UINT32(BaseTypes.uint32Type()),
     UINT64(BaseTypes.uint64Type());
 
-    private final TypeDefinition<?> typedef;
+    private final @NonNull TypeDefinition<?> typedef;
 
     BuiltinEffectiveStatement(final TypeDefinition<?> typedef) {
         this.typedef = requireNonNull(typedef);
     }
 
     @Override
-    public @Nonnull TypeDefinition<?> getTypeDefinition() {
+    public TypeDefinition<?> getTypeDefinition() {
         return typedef;
     }
 
@@ -58,25 +60,23 @@ enum BuiltinEffectiveStatement implements TypeEffectiveStatement<TypeStatement>
     }
 
     @Override
-    public final <K, V, N extends IdentifierNamespace<K, V>> V get(@Nonnull final Class<N> namespace,
-            @Nonnull final K identifier) {
-        // TODO Auto-generated method stub
-        return null;
+    public final <K, V, N extends IdentifierNamespace<K, V>> Optional<? extends V> get(final Class<N> namespace,
+            final K identifier) {
+        // FIXME: 5.0.0: implement this
+        return Optional.empty();
     }
 
     @Override
-    public final <K, V, N extends IdentifierNamespace<K, V>> Map<K, V> getAll(@Nonnull final Class<N> namespace) {
-        // TODO Auto-generated method stub
-        return null;
+    public final <K, V, N extends IdentifierNamespace<K, V>> Map<K, V> getAll(final Class<N> namespace) {
+        // FIXME: 5.0.0: implement this
+        return ImmutableMap.of();
     }
 
-    @Nonnull
     @Override
     public final Collection<? extends EffectiveStatement<?, ?>> effectiveSubstatements() {
         return ImmutableList.of();
     }
 
-    @Nonnull
     @Override
     public final StatementDefinition statementDefinition() {
         return YangStmtMapping.TYPE;
@@ -87,7 +87,6 @@ enum BuiltinEffectiveStatement implements TypeEffectiveStatement<TypeStatement>
         return getTypeDefinition().getQName().getLocalName();
     }
 
-    @Nonnull
     @Override
     public final StatementSource getStatementSource() {
         return StatementSource.CONTEXT;