Code Review
/
yangtools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
DeclaredStatements can contain default implementations
[yangtools.git]
/
yang
/
yang-model-api
/
src
/
main
/
java
/
org
/
opendaylight
/
yangtools
/
yang
/
model
/
api
/
stmt
/
PatternStatement.java
diff --git
a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/PatternStatement.java
b/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/PatternStatement.java
index e1cc96c4c708753b17c77a50ba58b72453fa0f75..078e1a109c224ad581aecbfb455f2430725927d7 100644
(file)
--- a/
yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/PatternStatement.java
+++ b/
yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/PatternStatement.java
@@
-7,15
+7,15
@@
*/
package org.opendaylight.yangtools.yang.model.api.stmt;
*/
package org.opendaylight.yangtools.yang.model.api.stmt;
+import java.util.Optional;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
-import org.opendaylight.yangtools.yang.model.api.meta.DeclaredStatement;
import org.opendaylight.yangtools.yang.model.api.type.PatternConstraint;
import org.opendaylight.yangtools.yang.model.api.type.PatternConstraint;
-public interface PatternStatement extends
DeclaredStatement<PatternConstraint>, DocumentedConstraintGroup
{
-
- @Nonnull
- PatternConstraint getValue();
+public interface PatternStatement extends
ConstrainedDocumentedDeclaredStatement<PatternConstraint>
{
+ default @Nonnull PatternConstraint getValue() {
+ return argument();
+ }
/**
* Return a modifier statement, if present. In RFC6020 semantics, there are no modifiers and this methods always
/**
* Return a modifier statement, if present. In RFC6020 semantics, there are no modifiers and this methods always
@@
-23,5
+23,8
@@
public interface PatternStatement extends DeclaredStatement<PatternConstraint>,
*
* @return modifier statement, nul if not present.
*/
*
* @return modifier statement, nul if not present.
*/
- @Nullable ModifierStatement getModifierStatement();
+ default @Nullable ModifierStatement getModifierStatement() {
+ final Optional<ModifierStatement> opt = findFirstDeclaredSubstatement(ModifierStatement.class);
+ return opt.isPresent() ? opt.get() : null;
+ }
}
}