Refactor grouping statement implementations

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

diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/WhenStatement.java b/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/WhenStatement.java
index df289fb8dcfb566266dac934beb688096efd5083..ac8d6fffa50096aafb42e5c949124027b3d47c5a 100644 (file)
--- a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/WhenStatement.java
+++ b/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/WhenStatement.java
@@ -7,13 +7,14 @@
  */
 package org.opendaylight.yangtools.yang.model.api.stmt;
 
-import javax.annotation.Nonnull;
-import org.opendaylight.yangtools.yang.model.api.RevisionAwareXPath;
-import org.opendaylight.yangtools.yang.model.api.meta.DeclaredStatement;
-
-public interface WhenStatement extends DeclaredStatement<RevisionAwareXPath>, DocumentationGroup {
+import static com.google.common.base.Verify.verifyNotNull;
 
-    @Nonnull RevisionAwareXPath getCondition();
+import org.eclipse.jdt.annotation.NonNull;
+import org.opendaylight.yangtools.yang.model.api.RevisionAwareXPath;
 
+public interface WhenStatement extends DocumentedDeclaredStatement<RevisionAwareXPath> {
+    default @NonNull RevisionAwareXPath getCondition() {
+        // FIXME: YANGTOOLS-908: verifyNotNull() should not be needed here
+        return verifyNotNull(argument());
+    }
 }
-