Improve {Action,Notification}NodeContainerCompat safety

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

diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/ConfigStatementAwareDeclaredStatement.java b/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/ConfigStatementAwareDeclaredStatement.java
index 37f8d687eb5cddf56e703edd6475c4dc30089a47..38a4745bb4df8b91cd4cd193e3999071d285cd9f 100644 (file)
--- a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/ConfigStatementAwareDeclaredStatement.java
+++ b/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/ConfigStatementAwareDeclaredStatement.java
@@ -9,13 +9,17 @@ package org.opendaylight.yangtools.yang.model.api.stmt;
 
 import com.google.common.annotations.Beta;
 import java.util.Optional;
+import org.eclipse.jdt.annotation.NonNull;
 import org.opendaylight.yangtools.yang.model.api.meta.DeclaredStatement;
 
 @Beta
-public interface ConfigStatementAwareDeclaredStatement<A> extends DeclaredStatement<A>, ConfigStatementContainer {
-    @Override
-    default ConfigStatement getConfig() {
-        final Optional<ConfigStatement> opt = findFirstDeclaredSubstatement(ConfigStatement.class);
-        return opt.isPresent() ? opt.get() : null;
+public interface ConfigStatementAwareDeclaredStatement<A> extends DeclaredStatement<A> {
+    /**
+     * Return a {@link ConfigStatement} child, if present.
+     *
+     * @return A {@link ConfigStatement}, or empty if none is present.
+     */
+    default @NonNull Optional<ConfigStatement> getConfig() {
+        return findFirstDeclaredSubstatement(ConfigStatement.class);
     }
 }