Update TypeDefinition design

[yangtools.git] / yang / yang-model-util / src / main / java / org / opendaylight / yangtools / yang / model / util / type / AbstractDerivedType.java

diff --git a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/AbstractDerivedType.java b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/AbstractDerivedType.java
index eefc4a68b5834a34f27b40d24ba1436c1a854d6f..99feb4780dbe7225d0bf46513617e761425fc46d 100644 (file)
--- a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/AbstractDerivedType.java
+++ b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/AbstractDerivedType.java
@@ -50,8 +50,8 @@ abstract class AbstractDerivedType<T extends TypeDefinition<T>> extends Abstract
     }
 
     @Override
-    public final Object getDefaultValue() {
-        return defaultValue != null ? defaultValue : baseType.getDefaultValue();
+    public final Optional<? extends Object> getDefaultValue() {
+        return defaultValue != null ? Optional.of(defaultValue) : baseType.getDefaultValue();
     }
 
     @Override
@@ -71,8 +71,8 @@ abstract class AbstractDerivedType<T extends TypeDefinition<T>> extends Abstract
     }
 
     @Override
-    public final String getUnits() {
-        return units != null ? units : baseType.getUnits();
+    public final Optional<String> getUnits() {
+        return units != null ? Optional.of(units) : baseType.getUnits();
     }
 
     @Override