Make BitsTypeDefinition.Bit only a DocumentedNode.WithStatus

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

diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/TypeAwareDeclaredStatement.java b/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/TypeAwareDeclaredStatement.java
index fcbdb3df7eea5a4b70b364d8b9c113513912c755..14b507fbddbc38976cf14cc8ad45b77f179f4d12 100644 (file)
--- a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/TypeAwareDeclaredStatement.java
+++ b/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/TypeAwareDeclaredStatement.java
@@ -9,21 +9,17 @@ package org.opendaylight.yangtools.yang.model.api.stmt;
 
 import com.google.common.annotations.Beta;
 import java.util.Optional;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
+import org.eclipse.jdt.annotation.NonNull;
 import org.opendaylight.yangtools.yang.common.QName;
 import org.opendaylight.yangtools.yang.model.api.meta.DeclaredStatement;
 
 @Beta
-public interface TypeAwareDeclaredStatement extends DeclaredStatement<QName>, TypeGroup {
-    @Override
-    default @Nonnull TypeStatement getType() {
+public interface TypeAwareDeclaredStatement extends DeclaredStatement<QName> {
+    default @NonNull TypeStatement getType() {
         return findFirstDeclaredSubstatement(TypeStatement.class).get();
     }
 
-    @Override
-    default @Nullable UnitsStatement getUnits() {
-        final Optional<UnitsStatement> opt = findFirstDeclaredSubstatement(UnitsStatement.class);
-        return opt.isPresent() ? opt.get() : null;
+    default @NonNull Optional<UnitsStatement> getUnits() {
+        return findFirstDeclaredSubstatement(UnitsStatement.class);
     }
 }