You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by ki...@apache.org on 2021/04/18 20:37:53 UTC
[commons-text] 01/03: [TEXT-199] Remove redundant local variable
This is an automated email from the ASF dual-hosted git repository.
kinow pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-text.git
commit 7792db0f58dab20b93d43f9702c53c6351a27411
Author: Arturo Bernal <ar...@gmail.com>
AuthorDate: Sun Apr 18 12:51:56 2021 +0200
[TEXT-199] Remove redundant local variable
---
.../java/org/apache/commons/text/ExtendedMessageFormat.java | 5 ++---
src/main/java/org/apache/commons/text/StrBuilder.java | 3 +--
.../java/org/apache/commons/text/TextStringBuilder.java | 3 +--
.../commons/text/similarity/JaroWinklerSimilarity.java | 3 +--
.../java/org/apache/commons/text/StringEscapeUtilsTest.java | 13 +++++--------
5 files changed, 10 insertions(+), 17 deletions(-)
diff --git a/src/main/java/org/apache/commons/text/ExtendedMessageFormat.java b/src/main/java/org/apache/commons/text/ExtendedMessageFormat.java
index d7694a6..de45715 100644
--- a/src/main/java/org/apache/commons/text/ExtendedMessageFormat.java
+++ b/src/main/java/org/apache/commons/text/ExtendedMessageFormat.java
@@ -531,13 +531,12 @@ public class ExtendedMessageFormat extends MessageFormat {
final int start = pos.getIndex();
final char[] c = pattern.toCharArray();
- final int lastHold = start;
for (int i = pos.getIndex(); i < pattern.length(); i++) {
switch (c[pos.getIndex()]) {
case QUOTE:
next(pos);
- return appendTo == null ? null : appendTo.append(c, lastHold,
- pos.getIndex() - lastHold);
+ return appendTo == null ? null : appendTo.append(c, start,
+ pos.getIndex() - start);
default:
next(pos);
}
diff --git a/src/main/java/org/apache/commons/text/StrBuilder.java b/src/main/java/org/apache/commons/text/StrBuilder.java
index 8e71915..03296a3 100644
--- a/src/main/java/org/apache/commons/text/StrBuilder.java
+++ b/src/main/java/org/apache/commons/text/StrBuilder.java
@@ -2813,9 +2813,8 @@ public class StrBuilder implements CharSequence, Appendable, Serializable, Build
} else if (length > size) {
ensureCapacity(length);
final int oldEnd = size;
- final int newEnd = length;
size = length;
- for (int i = oldEnd; i < newEnd; i++) {
+ for (int i = oldEnd; i < length; i++) {
buffer[i] = '\0';
}
}
diff --git a/src/main/java/org/apache/commons/text/TextStringBuilder.java b/src/main/java/org/apache/commons/text/TextStringBuilder.java
index 13e3572..e8aae03 100644
--- a/src/main/java/org/apache/commons/text/TextStringBuilder.java
+++ b/src/main/java/org/apache/commons/text/TextStringBuilder.java
@@ -2882,9 +2882,8 @@ public class TextStringBuilder implements CharSequence, Appendable, Serializable
} else if (length > size) {
ensureCapacity(length);
final int oldEnd = size;
- final int newEnd = length;
size = length;
- Arrays.fill(buffer, oldEnd, newEnd, '\0');
+ Arrays.fill(buffer, oldEnd, length, '\0');
}
return this;
}
diff --git a/src/main/java/org/apache/commons/text/similarity/JaroWinklerSimilarity.java b/src/main/java/org/apache/commons/text/similarity/JaroWinklerSimilarity.java
index 21a4274..3f51860 100644
--- a/src/main/java/org/apache/commons/text/similarity/JaroWinklerSimilarity.java
+++ b/src/main/java/org/apache/commons/text/similarity/JaroWinklerSimilarity.java
@@ -93,8 +93,7 @@ public class JaroWinklerSimilarity implements SimilarityScore<Double> {
return 0d;
}
final double j = ((m / left.length() + m / right.length() + (m - (double) mtp[1] / 2) / m)) / 3;
- final double jw = j < 0.7d ? j : j + defaultScalingFactor * mtp[2] * (1d - j);
- return jw;
+ return j < 0.7d ? j : j + defaultScalingFactor * mtp[2] * (1d - j);
}
/**
diff --git a/src/test/java/org/apache/commons/text/StringEscapeUtilsTest.java b/src/test/java/org/apache/commons/text/StringEscapeUtilsTest.java
index 6e68957..01aa6c4 100644
--- a/src/test/java/org/apache/commons/text/StringEscapeUtilsTest.java
+++ b/src/test/java/org/apache/commons/text/StringEscapeUtilsTest.java
@@ -82,12 +82,11 @@ public class StringEscapeUtilsTest {
private void assertUnescapeJava(final String unescaped, final String original, final String message)
throws IOException {
- final String expected = unescaped;
final String actual = StringEscapeUtils.unescapeJava(original);
- assertEquals(expected, actual, "unescape(String) failed"
+ assertEquals(unescaped, actual, "unescape(String) failed"
+ (message == null ? "" : (": " + message))
- + ": expected '" + StringEscapeUtils.escapeJava(expected)
+ + ": expected '" + StringEscapeUtils.escapeJava(unescaped)
// we escape this so we can see it in the error message
+ "' actual '" + StringEscapeUtils.escapeJava(actual) + "'");
@@ -333,14 +332,13 @@ public void testEscapeEcmaScript() {
public void testEscapeJavaWithSlash() {
final String input = "String with a slash (/) in it";
- final String expected = input;
final String actual = StringEscapeUtils.escapeJava(input);
/*
* In 2.4 StringEscapeUtils.escapeJava(String) escapes '/' characters, which are not a valid character
* to escape in a Java string.
*/
- assertEquals(expected, actual);
+ assertEquals(input, actual);
}
@Test
@@ -502,10 +500,9 @@ public void testEscapeEcmaScript() {
assertEquals("\u0080\u009F", StringEscapeUtils.unescapeHtml4("€Ÿ"), "hex number unescape");
// Test all Character values:
for (char i = Character.MIN_VALUE; i < Character.MAX_VALUE; i++) {
- final char c1 = i;
final char c2 = (char) (i + 1);
- final String expected = Character.toString(c1) + Character.toString(c2);
- final String escapedC1 = "&#x" + Integer.toHexString(c1) + ";";
+ final String expected = Character.toString(i) + Character.toString(c2);
+ final String escapedC1 = "&#x" + Integer.toHexString(i) + ";";
final String escapedC2 = "&#x" + Integer.toHexString(c2) + ";";
assertEquals(expected, StringEscapeUtils.unescapeHtml4(escapedC1 + escapedC2),
"hex number unescape index " + i);