From 5526e6c9d69bd2c51b70b22927446720af688b2c Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Sun, 13 Mar 2022 15:32:51 +0100 Subject: [PATCH] Use Decimal64.{min,max}ValueIn() in BaseDecimalType Now that we have centralized range numbers, let's use them in in yang-model-ri. JIRA: YANGTOOLS-1405 Change-Id: Id8367366d6b11a10894ff88e3614024ce62b7050 Signed-off-by: Robert Varga --- .../yang/model/ri/type/BaseDecimalType.java | 32 ++++++------------- 1 file changed, 9 insertions(+), 23 deletions(-) diff --git a/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/BaseDecimalType.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/BaseDecimalType.java index 798f5ac616..e9c630c7d8 100644 --- a/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/BaseDecimalType.java +++ b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/BaseDecimalType.java @@ -46,29 +46,15 @@ final class BaseDecimalType extends AbstractRangeRestrictedBaseType> IMPLICIT_RANGE_STATEMENTS = ImmutableList.of( - createRangeConstraint("-922337203685477580.8", "922337203685477580.7"), - createRangeConstraint("-92233720368547758.08", "92233720368547758.07"), - createRangeConstraint("-9223372036854775.808", "9223372036854775.807"), - createRangeConstraint("-922337203685477.5808", "922337203685477.5807"), - createRangeConstraint("-92233720368547.75808", "92233720368547.75807"), - createRangeConstraint("-9223372036854.775808", "9223372036854.775807"), - createRangeConstraint("-922337203685.4775808", "922337203685.4775807"), - createRangeConstraint("-92233720368.54775808", "92233720368.54775807"), - createRangeConstraint("-9223372036.854775808", "9223372036.854775807"), - createRangeConstraint("-922337203.6854775808", "922337203.6854775807"), - createRangeConstraint("-92233720.36854775808", "92233720.36854775807"), - createRangeConstraint("-9223372.036854775808", "9223372.036854775807"), - createRangeConstraint("-922337.2036854775808", "922337.2036854775807"), - createRangeConstraint("-92233.72036854775808", "92233.72036854775807"), - createRangeConstraint("-9223.372036854775808", "9223.372036854775807"), - createRangeConstraint("-922.3372036854775808", "922.3372036854775807"), - createRangeConstraint("-92.23372036854775808", "92.23372036854775807"), - createRangeConstraint("-9.223372036854775808", "9.223372036854775807")); - - private static RangeConstraint createRangeConstraint(final String min, final String max) { - return new ResolvedRangeConstraint<>(BUILTIN_CONSTRAINT, ImmutableRangeSet.of( - Range.closed(Decimal64.valueOf(min), Decimal64.valueOf(max)))); + private static final ImmutableList> IMPLICIT_RANGE_STATEMENTS; + + static { + final var builder = ImmutableList.>builderWithExpectedSize(18); + for (int scale = 1; scale < 18; ++scale) { + builder.add(new ResolvedRangeConstraint<>(BUILTIN_CONSTRAINT, ImmutableRangeSet.of(Range.closed( + Decimal64.minValueIn(scale), Decimal64.maxValueIn(scale))))); + } + IMPLICIT_RANGE_STATEMENTS = builder.build(); } static RangeConstraint constraintsForDigits(final int fractionDigits) { -- 2.36.6