Clean up StatementDefinition argument definition interface

[yangtools.git] / yang / yang-model-api / src / main / java / org / opendaylight / yangtools / yang / model / api / meta / StatementDefinition.java

diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/meta/StatementDefinition.java b/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/meta/StatementDefinition.java
index f27a05ea68fc8f70278598e89c4bf672bb152a78..df3247e7b63d6576149e9686c49d03ac52edf337 100644 (file)
--- a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/meta/StatementDefinition.java
+++ b/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/meta/StatementDefinition.java
@@ -7,8 +7,8 @@
  */
 package org.opendaylight.yangtools.yang.model.api.meta;
 
+import java.util.Optional;
 import org.eclipse.jdt.annotation.NonNull;
-import org.eclipse.jdt.annotation.Nullable;
 import org.opendaylight.yangtools.concepts.Immutable;
 import org.opendaylight.yangtools.yang.common.QName;
 
@@ -36,9 +36,7 @@ public interface StatementDefinition extends Immutable {
      *
      * @return argument name or null, if statement does not take argument.
      */
-    // FIXME: 3.0.0: make this return an Optional<StatementArgumentDefinition>, which will include the boolean value
-    //               of isArgumentYinElement()
-    @Nullable QName getArgumentName();
+    @NonNull Optional<ArgumentDefinition> getArgumentDefinition();
 
     /**
      * Returns class which represents declared version of statement associated with this definition. This class should
@@ -55,14 +53,4 @@ public interface StatementDefinition extends Immutable {
      * @return class which represents effective version of statement associated with this definition
      */
     @NonNull Class<? extends EffectiveStatement<?, ?>> getEffectiveRepresentationClass();
-
-    /**
-     * Returns true, if argument of statement is represented as value of yin element. If argument of statement is
-     * represented as argument of yin element, returns false. If this statement does not have an argument, this method
-     * returns false.
-     *
-     * @return returns true, if statement argument is represented as value of yin element, otherwise returns false.
-     */
-    // FIXME: 3.0.0: integrate this with getArgumentName()
-    boolean isArgumentYinElement();
 }