Clean ups: Better test flow, compact array notation, final
diff --git a/src/main/java/org/apache/commons/text/WordUtils.java b/src/main/java/org/apache/commons/text/WordUtils.java
index ea83eb2..1d9d3d9 100644
--- a/src/main/java/org/apache/commons/text/WordUtils.java
+++ b/src/main/java/org/apache/commons/text/WordUtils.java
@@ -845,40 +845,38 @@
wrappedLine.append(newLineStr);
offset = spaceToWrapAt + 1;
+ } else // really long word or URL
+ if (wrapLongWords) {
+ if (matcherSize == 0) {
+ offset--;
+ }
+ // wrap really long word one line at a time
+ wrappedLine.append(str, offset, wrapLength + offset);
+ wrappedLine.append(newLineStr);
+ offset += wrapLength;
+ matcherSize = -1;
} else {
- // really long word or URL
- if (wrapLongWords) {
- if (matcherSize == 0) {
+ // do not wrap really long word, just extend beyond limit
+ matcher = patternToWrapOn.matcher(str.substring(offset + wrapLength));
+ if (matcher.find()) {
+ matcherSize = matcher.end() - matcher.start();
+ spaceToWrapAt = matcher.start() + offset + wrapLength;
+ }
+
+ if (spaceToWrapAt >= 0) {
+ if (matcherSize == 0 && offset != 0) {
offset--;
}
- // wrap really long word one line at a time
- wrappedLine.append(str, offset, wrapLength + offset);
+ wrappedLine.append(str, offset, spaceToWrapAt);
wrappedLine.append(newLineStr);
- offset += wrapLength;
- matcherSize = -1;
+ offset = spaceToWrapAt + 1;
} else {
- // do not wrap really long word, just extend beyond limit
- matcher = patternToWrapOn.matcher(str.substring(offset + wrapLength));
- if (matcher.find()) {
- matcherSize = matcher.end() - matcher.start();
- spaceToWrapAt = matcher.start() + offset + wrapLength;
+ if (matcherSize == 0 && offset != 0) {
+ offset--;
}
-
- if (spaceToWrapAt >= 0) {
- if (matcherSize == 0 && offset != 0) {
- offset--;
- }
- wrappedLine.append(str, offset, spaceToWrapAt);
- wrappedLine.append(newLineStr);
- offset = spaceToWrapAt + 1;
- } else {
- if (matcherSize == 0 && offset != 0) {
- offset--;
- }
- wrappedLine.append(str, offset, str.length());
- offset = inputLineLength;
- matcherSize = -1;
- }
+ wrappedLine.append(str, offset, str.length());
+ offset = inputLineLength;
+ matcherSize = -1;
}
}
}
diff --git a/src/main/java/org/apache/commons/text/numbers/DoubleFormat.java b/src/main/java/org/apache/commons/text/numbers/DoubleFormat.java
index 1522330..daa54cb 100644
--- a/src/main/java/org/apache/commons/text/numbers/DoubleFormat.java
+++ b/src/main/java/org/apache/commons/text/numbers/DoubleFormat.java
@@ -221,7 +221,8 @@
public String apply(final double d) {
if (Double.isFinite(d)) {
return applyFinite(d);
- } else if (Double.isInfinite(d)) {
+ }
+ if (Double.isInfinite(d)) {
return d > 0.0
? positiveInfinity
: negativeInfinity;
diff --git a/src/main/java/org/apache/commons/text/translate/UnicodeEscaper.java b/src/main/java/org/apache/commons/text/translate/UnicodeEscaper.java
index 2892831..7d0c240 100644
--- a/src/main/java/org/apache/commons/text/translate/UnicodeEscaper.java
+++ b/src/main/java/org/apache/commons/text/translate/UnicodeEscaper.java
@@ -120,10 +120,8 @@
if (codepoint < below || codepoint > above) {
return false;
}
- } else {
- if (codepoint >= below && codepoint <= above) {
- return false;
- }
+ } else if (codepoint >= below && codepoint <= above) {
+ return false;
}
if (codepoint > 0xffff) {
diff --git a/src/test/java/org/apache/commons/text/ExtendedMessageFormatTest.java b/src/test/java/org/apache/commons/text/ExtendedMessageFormatTest.java
index 09b1365..eb5fe01 100644
--- a/src/test/java/org/apache/commons/text/ExtendedMessageFormatTest.java
+++ b/src/test/java/org/apache/commons/text/ExtendedMessageFormatTest.java
@@ -283,7 +283,7 @@
public void testBuiltInDateTimeFormat() {
final Calendar cal = Calendar.getInstance();
cal.set(2007, Calendar.JANUARY, 23, 18, 33, 5);
- final Object[] args = new Object[] {cal.getTime()};
+ final Object[] args = {cal.getTime()};
final Locale[] availableLocales = DateFormat.getAvailableLocales();
checkBuiltInFormat("1: {0,date,short}", args, availableLocales);
@@ -305,7 +305,7 @@
*/
@Test
public void testBuiltInNumberFormat() {
- final Object[] args = new Object[] {Double.valueOf("6543.21")};
+ final Object[] args = {Double.valueOf("6543.21")};
final Locale[] availableLocales = NumberFormat.getAvailableLocales();
checkBuiltInFormat("1: {0,number}", args, availableLocales);
checkBuiltInFormat("2: {0,number,integer}", args, availableLocales);
@@ -428,7 +428,7 @@
public void testExtendedAndBuiltInFormats() {
final Calendar cal = Calendar.getInstance();
cal.set(2007, Calendar.JANUARY, 23, 18, 33, 5);
- final Object[] args = new Object[] {"John Doe", cal.getTime(), Double.valueOf("12345.67")};
+ final Object[] args = {"John Doe", cal.getTime(), Double.valueOf("12345.67")};
final String builtinsPattern = "DOB: {1,date,short} Salary: {2,number,currency}";
final String extendedPattern = "Name: {0,upper} ";
final String pattern = extendedPattern + builtinsPattern;
@@ -510,7 +510,7 @@
public void testOverriddenBuiltinFormat() {
final Calendar cal = Calendar.getInstance();
cal.set(2007, Calendar.JANUARY, 23);
- final Object[] args = new Object[] {cal.getTime()};
+ final Object[] args = {cal.getTime()};
final Locale[] availableLocales = DateFormat.getAvailableLocales();
final Map<String, ? extends FormatFactory> dateRegistry =
Collections.singletonMap("date", new OverrideShortDateFormatFactory());
diff --git a/src/test/java/org/apache/commons/text/FormattableUtilsTest.java b/src/test/java/org/apache/commons/text/FormattableUtilsTest.java
index 8e68936..5111616 100644
--- a/src/test/java/org/apache/commons/text/FormattableUtilsTest.java
+++ b/src/test/java/org/apache/commons/text/FormattableUtilsTest.java
@@ -162,8 +162,8 @@
@Test
public void testIllegalEllipsisWith7Args() {
- String ellipsis = "xxxx";
- int precisionLessThanEllipsisLength = ellipsis.length() - 1;
+ final String ellipsis = "xxxx";
+ final int precisionLessThanEllipsisLength = ellipsis.length() - 1;
assertThatIllegalArgumentException().isThrownBy(() -> FormattableUtils.append("foo", createFormatter(), 0, 0,
precisionLessThanEllipsisLength, '}', ellipsis));
}
diff --git a/src/test/java/org/apache/commons/text/StrTokenizerTest.java b/src/test/java/org/apache/commons/text/StrTokenizerTest.java
index e44b093..606811a 100644
--- a/src/test/java/org/apache/commons/text/StrTokenizerTest.java
+++ b/src/test/java/org/apache/commons/text/StrTokenizerTest.java
@@ -547,7 +547,7 @@
@Test
public void testCloneReset() {
- final char[] input = new char[] {'a'};
+ final char[] input = {'a'};
final StrTokenizer tokenizer = new StrTokenizer(input);
// Start sanity check
assertEquals("a", tokenizer.nextToken());
@@ -807,7 +807,7 @@
public void testReset_charArray() {
final StrTokenizer tok = new StrTokenizer("x x x");
- final char[] array = new char[] {'a', 'b', 'c'};
+ final char[] array = {'a', 'b', 'c'};
tok.reset(array);
assertEquals("abc", tok.next());
assertFalse(tok.hasNext());
diff --git a/src/test/java/org/apache/commons/text/StringSubstitutorTest.java b/src/test/java/org/apache/commons/text/StringSubstitutorTest.java
index 2dbe6e9..d1005bc 100644
--- a/src/test/java/org/apache/commons/text/StringSubstitutorTest.java
+++ b/src/test/java/org/apache/commons/text/StringSubstitutorTest.java
@@ -1091,7 +1091,7 @@
final StringSubstitutor sub = new StringSubstitutor();
// replace(char[], int, int)
- final char[] emptyCharArray = new char[] {};
+ final char[] emptyCharArray = {};
// offset greater than array length
assertThatExceptionOfType(StringIndexOutOfBoundsException.class).isThrownBy(
() -> sub.replace(emptyCharArray, 0, 1));
diff --git a/src/test/java/org/apache/commons/text/StringTokenizerTest.java b/src/test/java/org/apache/commons/text/StringTokenizerTest.java
index b0701c4..db38f96 100644
--- a/src/test/java/org/apache/commons/text/StringTokenizerTest.java
+++ b/src/test/java/org/apache/commons/text/StringTokenizerTest.java
@@ -546,7 +546,7 @@
@Test
public void testCloneReset() {
- final char[] input = new char[] {'a' };
+ final char[] input = { 'a' };
final StringTokenizer tokenizer = new StringTokenizer(input);
// Start sanity check
assertEquals("a", tokenizer.nextToken());
@@ -812,7 +812,7 @@
public void testReset_charArray() {
final StringTokenizer tok = new StringTokenizer("x x x");
- final char[] array = new char[] {'a', 'b', 'c' };
+ final char[] array = {'a', 'b', 'c' };
tok.reset(array);
assertEquals("abc", tok.next());
assertFalse(tok.hasNext());
diff --git a/src/test/java/org/apache/commons/text/WordUtilsTest.java b/src/test/java/org/apache/commons/text/WordUtilsTest.java
index aeab223..d287a13 100644
--- a/src/test/java/org/apache/commons/text/WordUtilsTest.java
+++ b/src/test/java/org/apache/commons/text/WordUtilsTest.java
@@ -126,7 +126,7 @@
assertThat(WordUtils.capitalizeFully("", ArrayUtils.EMPTY_CHAR_ARRAY)).isEqualTo("");
assertThat(WordUtils.capitalizeFully(" ", ArrayUtils.EMPTY_CHAR_ARRAY)).isEqualTo(" ");
- char[] chars = new char[] {'-', '+', ' ', '@'};
+ char[] chars = {'-', '+', ' ', '@'};
assertThat(WordUtils.capitalizeFully("I", chars)).isEqualTo("I");
assertThat(WordUtils.capitalizeFully("i", chars)).isEqualTo("I");
assertThat(WordUtils.capitalizeFully("i-am here+123", chars)).isEqualTo("I-Am Here+123");
@@ -146,7 +146,7 @@
assertThat(WordUtils.capitalize("", ArrayUtils.EMPTY_CHAR_ARRAY)).isEqualTo("");
assertThat(WordUtils.capitalize(" ", ArrayUtils.EMPTY_CHAR_ARRAY)).isEqualTo(" ");
- char[] chars = new char[] {'-', '+', ' ', '@'};
+ char[] chars = {'-', '+', ' ', '@'};
assertThat(WordUtils.capitalize("I", chars)).isEqualTo("I");
assertThat(WordUtils.capitalize("i", chars)).isEqualTo("I");
assertThat(WordUtils.capitalize("i-am here+123", chars)).isEqualTo("I-Am Here+123");
@@ -386,7 +386,7 @@
assertThat(WordUtils.uncapitalize("", ArrayUtils.EMPTY_CHAR_ARRAY)).isEqualTo("");
assertThat(WordUtils.uncapitalize(" ", ArrayUtils.EMPTY_CHAR_ARRAY)).isEqualTo(" ");
- char[] chars = new char[] {'-', '+', ' ', '@'};
+ char[] chars = {'-', '+', ' ', '@'};
assertThat(WordUtils.uncapitalize("I", chars)).isEqualTo("i");
assertThat(WordUtils.uncapitalize("i", chars)).isEqualTo("i");
assertThat(WordUtils.uncapitalize("i am-here+123", chars)).isEqualTo("i am-here+123");
diff --git a/src/test/java/org/apache/commons/text/similarity/IntersectionResultTest.java b/src/test/java/org/apache/commons/text/similarity/IntersectionResultTest.java
index e79fb62..29131aa 100644
--- a/src/test/java/org/apache/commons/text/similarity/IntersectionResultTest.java
+++ b/src/test/java/org/apache/commons/text/similarity/IntersectionResultTest.java
@@ -85,7 +85,7 @@
@Test
public void testEquals() {
- final IntersectionResult[] results = new IntersectionResult[] {
+ final IntersectionResult[] results = {
new IntersectionResult(0, 0, 0),
new IntersectionResult(10, 0, 0),
new IntersectionResult(10, 10, 0),
@@ -107,7 +107,7 @@
@Test
public void testHashCode() {
- final IntersectionResult[] results = new IntersectionResult[] {
+ final IntersectionResult[] results = {
new IntersectionResult(10, 0, 0),
new IntersectionResult(10, 10, 0),
new IntersectionResult(10, 10, 10),
diff --git a/src/test/java/org/apache/commons/text/translate/LookupTranslatorTest.java b/src/test/java/org/apache/commons/text/translate/LookupTranslatorTest.java
index ad533f7..2024f73 100644
--- a/src/test/java/org/apache/commons/text/translate/LookupTranslatorTest.java
+++ b/src/test/java/org/apache/commons/text/translate/LookupTranslatorTest.java
@@ -64,12 +64,12 @@
@Test
public void testTranslateSupplementaryCharacter() {
/* Key: string with Mathematical double-struck capital A (U+1D538) */
- String symbol = new StringBuilder().appendCodePoint(0x1D538).toString();
+ final String symbol = new StringBuilder().appendCodePoint(0x1D538).toString();
/* Map U+1D538 to "A" */
- Map<CharSequence, CharSequence> map = new HashMap<>();
+ final Map<CharSequence, CharSequence> map = new HashMap<>();
map.put(symbol, "A");
- LookupTranslator translator = new LookupTranslator(map);
- String translated = translator.translate(symbol + "=A");
+ final LookupTranslator translator = new LookupTranslator(map);
+ final String translated = translator.translate(symbol + "=A");
/* we should get "A=A". */
assertThat(translated).as("Incorrect value").isEqualTo("A=A");
}
diff --git a/src/test/java/org/apache/commons/text/translate/NumericEntityUnescaperTest.java b/src/test/java/org/apache/commons/text/translate/NumericEntityUnescaperTest.java
index 4770b05..1204f88 100644
--- a/src/test/java/org/apache/commons/text/translate/NumericEntityUnescaperTest.java
+++ b/src/test/java/org/apache/commons/text/translate/NumericEntityUnescaperTest.java
@@ -79,7 +79,7 @@
@Test
public void testCreatesNumericEntityUnescaperOne() {
- final NumericEntityUnescaper.OPTION[] numericEntityUnescaperOPTIONArray = new NumericEntityUnescaper.OPTION[0];
+ final NumericEntityUnescaper.OPTION[] numericEntityUnescaperOPTIONArray = {};
final NumericEntityUnescaper numericEntityUnescaper =
new NumericEntityUnescaper(numericEntityUnescaperOPTIONArray);
@@ -88,7 +88,7 @@
@Test
public void testCreatesNumericEntityUnescaperTwo() {
- final NumericEntityUnescaper.OPTION[] numericEntityUnescaperOPTIONArray = new NumericEntityUnescaper.OPTION[0];
+ final NumericEntityUnescaper.OPTION[] numericEntityUnescaperOPTIONArray = {};
final NumericEntityUnescaper numericEntityUnescaper =
new NumericEntityUnescaper(numericEntityUnescaperOPTIONArray);
