Cleanup DocumentedNode
[yangtools.git] / yang / yang-model-util / src / main / java / org / opendaylight / yangtools / yang / model / util / type / RangeRestrictedTypeBuilder.java
index 03bd31bdb99fdcc8b70c828ad7dc8ac6c15d0005..7fa9863e8978bff230712283860b8806383c69b4 100644 (file)
@@ -13,7 +13,6 @@ import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableList.Builder;
 import java.util.Collection;
 import java.util.List;
-import java.util.Optional;
 import java.util.function.Function;
 import javax.annotation.Nonnull;
 import org.opendaylight.yangtools.yang.model.api.SchemaPath;
@@ -64,9 +63,8 @@ public abstract class RangeRestrictedTypeBuilder<T extends RangeRestrictedTypeDe
                 final Number rMin = min instanceof UnresolvedNumber
                     ?  ((UnresolvedNumber)min).resolveRange(baseRangeConstraints) : min;
 
-                builder.add(BaseConstraints.newRangeConstraint(rMin, rMax, Optional.ofNullable(c.getDescription()),
-                    Optional.ofNullable(c.getReference()), c.getErrorAppTag().orElse(null),
-                    c.getErrorMessage().orElse(null)));
+                builder.add(BaseConstraints.newRangeConstraint(rMin, rMax, c.getDescription(),
+                    c.getReference(), c.getErrorAppTag().orElse(null), c.getErrorMessage().orElse(null)));
             } else {
                 builder.add(c);
             }
@@ -106,9 +104,8 @@ public abstract class RangeRestrictedTypeBuilder<T extends RangeRestrictedTypeDe
                     throw new IllegalArgumentException(String.format("Constraint %s does not fit into range of %s",
                         c, clazz.getSimpleName()), e);
                 }
-                builder.add(BaseConstraints.newRangeConstraint(min, max, Optional.ofNullable(c.getDescription()),
-                    Optional.ofNullable(c.getReference()), c.getErrorAppTag().orElse(null),
-                    c.getErrorMessage().orElse(null)));
+                builder.add(BaseConstraints.newRangeConstraint(min, max, c.getDescription(), c.getReference(),
+                    c.getErrorAppTag().orElse(null), c.getErrorMessage().orElse(null)));
             } else {
                 builder.add(c);
             }