From 116154d58b2e4c6032c435b2e47571e98c4aa0dc Mon Sep 17 00:00:00 2001 From: Michiel Janssen Date: Mon, 17 Aug 2026 15:40:34 +0200 Subject: [PATCH 1/2] AER-4530 Update IntRange toString --- .../aerius/shared/domain/IntRange.java | 18 +++++++++--------- .../nl/overheid/aerius/util/IntRangeTest.java | 16 ++++++++-------- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/source/imaer-shared/src/main/java/nl/overheid/aerius/shared/domain/IntRange.java b/source/imaer-shared/src/main/java/nl/overheid/aerius/shared/domain/IntRange.java index 9d0e8937..20850d48 100644 --- a/source/imaer-shared/src/main/java/nl/overheid/aerius/shared/domain/IntRange.java +++ b/source/imaer-shared/src/main/java/nl/overheid/aerius/shared/domain/IntRange.java @@ -16,8 +16,6 @@ */ package nl.overheid.aerius.shared.domain; -import java.util.function.Function; - /** * Object to use to check if a given value is within a range. * The range object can be created using a string representation of the range. like [1,10). @@ -31,12 +29,14 @@ public boolean inRange(final int value) { @Override public String toString() { - final Function same = b -> b ? "=" : ""; - final boolean withLow = low != Integer.MIN_VALUE; - final boolean withHigh = high != Integer.MAX_VALUE; - - return (withLow ? ('>' + same.apply(lowInclusive) + low) : "") - + (withLow && withHigh ? " - " : "") - + (withHigh ? ('<' + same.apply(highInclusive) + high) : ""); + if (low == Integer.MIN_VALUE) { + return "<" + (highInclusive ? "= " : " ") + high; + } else if (high == Integer.MAX_VALUE) { + return ">" + (lowInclusive ? "= " : " ") + low; + } else { + final String lowBracket = lowInclusive ? "[" : "("; + final String highBracket = highInclusive ? "]" : ")"; + return lowBracket + low + "-" + high + highBracket; + } } } diff --git a/source/imaer-util/src/test/java/nl/overheid/aerius/util/IntRangeTest.java b/source/imaer-util/src/test/java/nl/overheid/aerius/util/IntRangeTest.java index cdf0c4ce..4d5b5f01 100644 --- a/source/imaer-util/src/test/java/nl/overheid/aerius/util/IntRangeTest.java +++ b/source/imaer-util/src/test/java/nl/overheid/aerius/util/IntRangeTest.java @@ -87,13 +87,13 @@ void testToString(final String range, final String expectedString) { static List toStringData() { return List.of( - Arguments.of("[,20)", "<20"), - Arguments.of("[,20]", "<=20"), - Arguments.of("[10,20]", ">=10 - <=20"), - Arguments.of("(10,20]", ">10 - <=20"), - Arguments.of("(10,20)", ">10 - <20"), - Arguments.of("[10,20)", ">=10 - <20"), - Arguments.of("[10,)", ">=10"), - Arguments.of("(10,)", ">10")); + Arguments.of("[,20)", "< 20"), + Arguments.of("[,20]", "<= 20"), + Arguments.of("[10,20]", "[10-20]"), + Arguments.of("(10,20]", "(10-20]"), + Arguments.of("(10,20)", "(10-20)"), + Arguments.of("[10,20)", "[10-20)"), + Arguments.of("[10,)", ">= 10"), + Arguments.of("(10,)", "> 10")); } } From d2e96fbef20d20d24007c5807f3542b700c38060 Mon Sep 17 00:00:00 2001 From: Michiel Janssen <78349449+MichielJanssen-DAT@users.noreply.github.com> Date: Wed, 19 Aug 2026 16:21:33 +0200 Subject: [PATCH 2/2] Apply suggestions from code review Co-authored-by: Hilbrand Bouwkamp --- .../main/java/nl/overheid/aerius/shared/domain/IntRange.java | 4 ++-- .../src/test/java/nl/overheid/aerius/util/IntRangeTest.java | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/source/imaer-shared/src/main/java/nl/overheid/aerius/shared/domain/IntRange.java b/source/imaer-shared/src/main/java/nl/overheid/aerius/shared/domain/IntRange.java index 20850d48..c4b5101c 100644 --- a/source/imaer-shared/src/main/java/nl/overheid/aerius/shared/domain/IntRange.java +++ b/source/imaer-shared/src/main/java/nl/overheid/aerius/shared/domain/IntRange.java @@ -30,9 +30,9 @@ public boolean inRange(final int value) { @Override public String toString() { if (low == Integer.MIN_VALUE) { - return "<" + (highInclusive ? "= " : " ") + high; + return (highInclusive ? "≤ " : "< ") + high; } else if (high == Integer.MAX_VALUE) { - return ">" + (lowInclusive ? "= " : " ") + low; + return (lowInclusive ? "≥ " : "> ") + low; } else { final String lowBracket = lowInclusive ? "[" : "("; final String highBracket = highInclusive ? "]" : ")"; diff --git a/source/imaer-util/src/test/java/nl/overheid/aerius/util/IntRangeTest.java b/source/imaer-util/src/test/java/nl/overheid/aerius/util/IntRangeTest.java index 4d5b5f01..df29d6dd 100644 --- a/source/imaer-util/src/test/java/nl/overheid/aerius/util/IntRangeTest.java +++ b/source/imaer-util/src/test/java/nl/overheid/aerius/util/IntRangeTest.java @@ -88,12 +88,12 @@ void testToString(final String range, final String expectedString) { static List toStringData() { return List.of( Arguments.of("[,20)", "< 20"), - Arguments.of("[,20]", "<= 20"), + Arguments.of("[,20]", "≤ 20"), Arguments.of("[10,20]", "[10-20]"), Arguments.of("(10,20]", "(10-20]"), Arguments.of("(10,20)", "(10-20)"), Arguments.of("[10,20)", "[10-20)"), - Arguments.of("[10,)", ">= 10"), + Arguments.of("[10,)", "≥ 10"), Arguments.of("(10,)", "> 10")); } }