This is an automated email from the ASF dual-hosted git repository. ggregory pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/commons-text.git
commit ea9edfcbed052ce18f24b236174dd716267977f3 Author: Gary Gregory <garydgreg...@gmail.com> AuthorDate: Tue Oct 24 08:33:12 2023 -0400 Use compact array declarations Use final Reduce nesting if-else --- src/main/java/org/apache/commons/text/StringSubstitutor.java | 2 +- .../java/org/apache/commons/text/diff/StringsComparator.java | 12 +++++------- .../java/org/apache/commons/text/StringTokenizerTest.java | 2 +- .../org/apache/commons/text/numbers/DoubleFormatTest.java | 2 +- 4 files changed, 8 insertions(+), 10 deletions(-) diff --git a/src/main/java/org/apache/commons/text/StringSubstitutor.java b/src/main/java/org/apache/commons/text/StringSubstitutor.java index 3b7f493a..9f1b7470 100644 --- a/src/main/java/org/apache/commons/text/StringSubstitutor.java +++ b/src/main/java/org/apache/commons/text/StringSubstitutor.java @@ -1557,7 +1557,7 @@ public class StringSubstitutor { */ @Override public String toString() { - StringBuilder builder = new StringBuilder(); + final StringBuilder builder = new StringBuilder(); builder.append("StringSubstitutor [disableSubstitutionInValues=").append(disableSubstitutionInValues).append(", enableSubstitutionInVariables=") .append(enableSubstitutionInVariables).append(", enableUndefinedVariableException=").append(enableUndefinedVariableException) .append(", escapeChar=").append(escapeChar).append(", prefixMatcher=").append(prefixMatcher).append(", preserveEscapes=") diff --git a/src/main/java/org/apache/commons/text/diff/StringsComparator.java b/src/main/java/org/apache/commons/text/diff/StringsComparator.java index 5bdb4e49..3c5b0470 100644 --- a/src/main/java/org/apache/commons/text/diff/StringsComparator.java +++ b/src/main/java/org/apache/commons/text/diff/StringsComparator.java @@ -171,14 +171,12 @@ public class StringsComparator { script.append(new KeepCommand<>(left.charAt(i))); ++i; ++j; + } else if (end1 - start1 > end2 - start2) { + script.append(new DeleteCommand<>(left.charAt(i))); + ++i; } else { - if (end1 - start1 > end2 - start2) { - script.append(new DeleteCommand<>(left.charAt(i))); - ++i; - } else { - script.append(new InsertCommand<>(right.charAt(j))); - ++j; - } + script.append(new InsertCommand<>(right.charAt(j))); + ++j; } } diff --git a/src/test/java/org/apache/commons/text/StringTokenizerTest.java b/src/test/java/org/apache/commons/text/StringTokenizerTest.java index 458cc813..2b46346d 100644 --- a/src/test/java/org/apache/commons/text/StringTokenizerTest.java +++ b/src/test/java/org/apache/commons/text/StringTokenizerTest.java @@ -778,7 +778,7 @@ public class StringTokenizerTest { list.set(1, "y"); list.add("x"); - assertEquals(Arrays.asList(new String[] {"z", "y", "x"}), list); + assertEquals(Arrays.asList("z", "y", "x"), list); // The tokenizer is unchanged assertEquals(Arrays.asList(array), tok.getTokenList()); diff --git a/src/test/java/org/apache/commons/text/numbers/DoubleFormatTest.java b/src/test/java/org/apache/commons/text/numbers/DoubleFormatTest.java index b624bed4..7c0b2d11 100644 --- a/src/test/java/org/apache/commons/text/numbers/DoubleFormatTest.java +++ b/src/test/java/org/apache/commons/text/numbers/DoubleFormatTest.java @@ -360,7 +360,7 @@ public class DoubleFormatTest { */ @ParameterizedTest @MethodSource - void testMaximumPrecision(DoubleFunction<String> fmt, double value) { + void testMaximumPrecision(final DoubleFunction<String> fmt, final double value) { final String s = fmt.apply(value); final double d = Double.parseDouble(s); Assertions.assertEquals(value, d, () -> value + " formatted as " + s);