Use Empty instead of Void for argument

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

diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/OrderedByStatement.java b/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/OrderedByStatement.java
index 325e8286c19569188582e1eb6fea6ed062914f45..212b9879a41d4c07e34fe371ef0eec648fb68f44 100644 (file)
--- a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/OrderedByStatement.java
+++ b/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/OrderedByStatement.java
@@ -7,42 +7,14 @@
  */
 package org.opendaylight.yangtools.yang.model.api.stmt;
 
-import static com.google.common.base.Verify.verifyNotNull;
-
-import org.eclipse.jdt.annotation.NonNull;
-import org.eclipse.jdt.annotation.NonNullByDefault;
+import org.opendaylight.yangtools.yang.common.Ordering;
+import org.opendaylight.yangtools.yang.model.api.YangStmtMapping;
 import org.opendaylight.yangtools.yang.model.api.meta.DeclaredStatement;
+import org.opendaylight.yangtools.yang.model.api.meta.StatementDefinition;
 
-public interface OrderedByStatement extends DeclaredStatement<OrderedByStatement.Ordering> {
-    @NonNullByDefault
-    enum Ordering {
-        SYSTEM("system"),
-        USER("user");
-
-        private final String argumentString;
-
-        Ordering(final String argumentString) {
-            this.argumentString = argumentString;
-        }
-
-        public String getArgumentString() {
-            return argumentString;
-        }
-
-        public static Ordering forArgumentString(final String argumentString) {
-            switch (argumentString) {
-                case "system":
-                    return SYSTEM;
-                case "user":
-                    return USER;
-                default:
-                    throw new IllegalArgumentException("Invalid ordering string '" + argumentString + "'");
-            }
-        }
-    }
-
-    default @NonNull Ordering getValue() {
-        // FIXME: YANGTOOLS-908: verifyNotNull() should not be needed here
-        return verifyNotNull(argument());
+public interface OrderedByStatement extends DeclaredStatement<Ordering> {
+    @Override
+    default StatementDefinition statementDefinition() {
+        return YangStmtMapping.ORDERED_BY;
     }
 }