This is an automated email from the ASF dual-hosted git repository.
garydgregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-lang.git
The following commit(s) were added to refs/heads/master by this push:
new e66ad3dd2 Internal refactoring.
e66ad3dd2 is described below
commit e66ad3dd2e8538e24940d97179c960a60dd25495
Author: Gary Gregory <[email protected]>
AuthorDate: Sun Aug 16 23:51:37 2026 -0400
Internal refactoring.
---
.../java/org/apache/commons/lang3/CharRange.java | 24 ++++++++++++++--------
1 file changed, 16 insertions(+), 8 deletions(-)
diff --git a/src/main/java/org/apache/commons/lang3/CharRange.java
b/src/main/java/org/apache/commons/lang3/CharRange.java
index 8b18790f2..b1dbb9816 100644
--- a/src/main/java/org/apache/commons/lang3/CharRange.java
+++ b/src/main/java/org/apache/commons/lang3/CharRange.java
@@ -62,7 +62,7 @@ private CharacterIterator(final CharRange r) {
// This range is an empty set
hasNext = false;
} else if (range.negated) {
- if (range.start == Character.MIN_VALUE) {
+ if (range.isStartMin()) {
current = (char) (range.end + 1);
} else {
current = Character.MIN_VALUE;
@@ -105,7 +105,7 @@ private void prepareNext() {
if (current == Character.MAX_VALUE) {
hasNext = false;
} else if (current + 1 == range.start) {
- if (range.end == Character.MAX_VALUE) {
+ if (range.isEndMax()) {
hasNext = false;
} else {
current = (char) (range.end + 1);
@@ -270,15 +270,15 @@ public boolean contains(final CharRange range) {
if (range.isEmpty()) {
return true; // range denotes the empty set
}
- if (range.start == Character.MIN_VALUE) {
+ if (range.isStartMin()) {
// range denotes [range.end + 1, Character.MAX_VALUE]
- return end == Character.MAX_VALUE && start <= range.end + 1;
+ return isEndMax() && start <= range.end + 1;
}
- if (range.end == Character.MAX_VALUE) {
+ if (range.isEndMax()) {
// range denotes [0, range.start - 1]
- return start == Character.MIN_VALUE && end + 1 >= range.start;
+ return isStartMin() && end + 1 >= range.start;
}
- return start == Character.MIN_VALUE && end == Character.MAX_VALUE;
+ return isStartMin() && isEndMax();
}
return start <= range.start && end >= range.end;
}
@@ -341,7 +341,11 @@ public int hashCode() {
* @return {@code true} if this range contains no characters, {@code
false} otherwise.
*/
boolean isEmpty() {
- return negated && start == Character.MIN_VALUE && end ==
Character.MAX_VALUE;
+ return negated && isStartMin() && isEndMax();
+ }
+
+ private boolean isEndMax() {
+ return end == Character.MAX_VALUE;
}
/**
@@ -356,6 +360,10 @@ public boolean isNegated() {
return negated;
}
+ private boolean isStartMin() {
+ return start == Character.MIN_VALUE;
+ }
+
/**
* Returns an iterator which can be used to walk through the characters
described by this range.
*
