Make getIfFeaturePredicate() a default method

This is just a reference to the argument, there is no point in
forcing implementations to deal with this.

Change-Id: I40cb0c349694f9fe9e224e4458fea2b2c05fa870
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
(cherry picked from commit afae17b562f7ad0cdc9b844943dca045051f92d2)

diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/IfFeatureStatement.java b/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/IfFeatureStatement.java
index 7b1abd53f37d99692d78037c5f9ce09c83d2ca30..4c72426879a948fdde3bb5ce5319719256080aea 100644 (file)
--- a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/IfFeatureStatement.java
+++ b/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/IfFeatureStatement.java
@@ -29,5 +29,7 @@ public interface IfFeatureStatement extends DeclaredStatement<Predicate<Set<QNam
      */
     @Beta
     @Nonnull
-    Predicate<Set<QName>> getIfFeaturePredicate();
+    default Predicate<Set<QName>> getIfFeaturePredicate() {
+        return argument();
+    }
 }

diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/if_feature/IfFeatureStatementImpl.java b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/if_feature/IfFeatureStatementImpl.java
index 64abce215a501593364343b2407f8abdc5cab153..6161d9221608d47116761d248f4785ac08b40f88 100644 (file)
--- a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/if_feature/IfFeatureStatementImpl.java
+++ b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/if_feature/IfFeatureStatementImpl.java
@@ -19,9 +19,4 @@ final class IfFeatureStatementImpl extends AbstractDeclaredStatement<Predicate<S
     IfFeatureStatementImpl(final StmtContext<Predicate<Set<QName>>, IfFeatureStatement, ?> context) {
         super(context);
     }
-
-    @Override
-    public Predicate<Set<QName>> getIfFeaturePredicate() {
-        return argument();
-    }
 }