Make ConstraintMetaDefition attributes Optional

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

diff --git a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/RangeRestrictedTypeBuilder.java b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/RangeRestrictedTypeBuilder.java
index ba71860a3883348ef1c3993161275665d5447ece..03bd31bdb99fdcc8b70c828ad7dc8ac6c15d0005 100644 (file)
--- a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/RangeRestrictedTypeBuilder.java
+++ b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/RangeRestrictedTypeBuilder.java
@@ -65,7 +65,8 @@ public abstract class RangeRestrictedTypeBuilder<T extends RangeRestrictedTypeDe
                     ?  ((UnresolvedNumber)min).resolveRange(baseRangeConstraints) : min;
 
                 builder.add(BaseConstraints.newRangeConstraint(rMin, rMax, Optional.ofNullable(c.getDescription()),
-                    Optional.ofNullable(c.getReference()), c.getErrorAppTag(), c.getErrorMessage()));
+                    Optional.ofNullable(c.getReference()), c.getErrorAppTag().orElse(null),
+                    c.getErrorMessage().orElse(null)));
             } else {
                 builder.add(c);
             }
@@ -106,7 +107,8 @@ public abstract class RangeRestrictedTypeBuilder<T extends RangeRestrictedTypeDe
                         c, clazz.getSimpleName()), e);
                 }
                 builder.add(BaseConstraints.newRangeConstraint(min, max, Optional.ofNullable(c.getDescription()),
-                    Optional.ofNullable(c.getReference()), c.getErrorAppTag(), c.getErrorMessage()));
+                    Optional.ofNullable(c.getReference()), c.getErrorAppTag().orElse(null),
+                    c.getErrorMessage().orElse(null)));
             } else {
                 builder.add(c);
             }