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
The following commit(s) were added to refs/heads/master by this push:
new 4d2a8b5 Minor Improvement: (#192)
4d2a8b5 is described below
commit 4d2a8b5102cf34a05bd26270aa4a8207a50e61c3
Author: Arturo Bernal <arturobern...@gmail.com>
AuthorDate: Sun Dec 20 19:02:43 2020 +0100
Minor Improvement: (#192)
* Add Final
* Use StandardCharsets.UTF_8
* convert wrapper to primitive
* Use Collections.singletonList(
---
.../org/apache/commons/text/AlphabetConverter.java | 2 +-
.../apache/commons/text/RandomStringGenerator.java | 2 +-
.../commons/text/similarity/CosineSimilarity.java | 2 +-
.../text/similarity/IntersectionSimilarity.java | 2 +-
.../text/similarity/JaroWinklerDistance.java | 3 ++-
.../text/similarity/JaroWinklerSimilarity.java | 3 ++-
.../text/translate/NumericEntityUnescaper.java | 5 +++--
.../apache/commons/text/AlphabetConverterTest.java | 26 +++++++++++-----------
.../apache/commons/text/StringEscapeUtilsTest.java | 8 +++----
.../similarity/IntersectionSimilarityTest.java | 7 +++---
10 files changed, 32 insertions(+), 28 deletions(-)
diff --git a/src/main/java/org/apache/commons/text/AlphabetConverter.java
b/src/main/java/org/apache/commons/text/AlphabetConverter.java
index be76939..e6ac753 100644
--- a/src/main/java/org/apache/commons/text/AlphabetConverter.java
+++ b/src/main/java/org/apache/commons/text/AlphabetConverter.java
@@ -418,7 +418,7 @@ public final class AlphabetConverter {
final Map<String, String> encodedToOriginal = new LinkedHashMap<>();
final Map<Integer, String> doNotEncodeMap = new HashMap<>();
- int encodedLetterLength;
+ final int encodedLetterLength;
for (final int i : doNotEncodeCopy) {
if (!originalCopy.contains(i)) {
diff --git a/src/main/java/org/apache/commons/text/RandomStringGenerator.java
b/src/main/java/org/apache/commons/text/RandomStringGenerator.java
index d8e38e4..3a36e5d 100644
--- a/src/main/java/org/apache/commons/text/RandomStringGenerator.java
+++ b/src/main/java/org/apache/commons/text/RandomStringGenerator.java
@@ -173,7 +173,7 @@ public final class RandomStringGenerator {
long remaining = length;
do {
- int codePoint;
+ final int codePoint;
if (characterList != null && !characterList.isEmpty()) {
codePoint = generateRandomNumber(characterList);
} else {
diff --git
a/src/main/java/org/apache/commons/text/similarity/CosineSimilarity.java
b/src/main/java/org/apache/commons/text/similarity/CosineSimilarity.java
index 21550f2..57eb25f 100644
--- a/src/main/java/org/apache/commons/text/similarity/CosineSimilarity.java
+++ b/src/main/java/org/apache/commons/text/similarity/CosineSimilarity.java
@@ -57,7 +57,7 @@ public class CosineSimilarity {
for (final Integer value : rightVector.values()) {
d2 += Math.pow(value, 2);
}
- double cosineSimilarity;
+ final double cosineSimilarity;
if (d1 <= 0.0 || d2 <= 0.0) {
cosineSimilarity = 0.0;
} else {
diff --git
a/src/main/java/org/apache/commons/text/similarity/IntersectionSimilarity.java
b/src/main/java/org/apache/commons/text/similarity/IntersectionSimilarity.java
index d08bfbf..a64f01c 100644
---
a/src/main/java/org/apache/commons/text/similarity/IntersectionSimilarity.java
+++
b/src/main/java/org/apache/commons/text/similarity/IntersectionSimilarity.java
@@ -162,7 +162,7 @@ public class IntersectionSimilarity<T> implements
SimilarityScore<IntersectionRe
}
// Intersection = count the number of shared elements
- int intersection;
+ final int intersection;
if (objectsA instanceof Set && objectsB instanceof Set) {
// If a Set then the elements will only have a count of 1.
// Iterate over the smaller set.
diff --git
a/src/main/java/org/apache/commons/text/similarity/JaroWinklerDistance.java
b/src/main/java/org/apache/commons/text/similarity/JaroWinklerDistance.java
index 044a36c..ab1b7ea 100644
--- a/src/main/java/org/apache/commons/text/similarity/JaroWinklerDistance.java
+++ b/src/main/java/org/apache/commons/text/similarity/JaroWinklerDistance.java
@@ -99,7 +99,8 @@ public class JaroWinklerDistance implements
EditDistance<Double> {
*/
@Deprecated
protected static int[] matches(final CharSequence first, final
CharSequence second) {
- CharSequence max, min;
+ final CharSequence max;
+ final CharSequence min;
if (first.length() > second.length()) {
max = first;
min = second;
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 fa7d754..7ff5869 100644
---
a/src/main/java/org/apache/commons/text/similarity/JaroWinklerSimilarity.java
+++
b/src/main/java/org/apache/commons/text/similarity/JaroWinklerSimilarity.java
@@ -105,7 +105,8 @@ public class JaroWinklerSimilarity implements
SimilarityScore<Double> {
* @return mtp array containing: matches, half transpositions, and prefix
*/
protected static int[] matches(final CharSequence first, final
CharSequence second) {
- CharSequence max, min;
+ final CharSequence max;
+ final CharSequence min;
if (first.length() > second.length()) {
max = first;
min = second;
diff --git
a/src/main/java/org/apache/commons/text/translate/NumericEntityUnescaper.java
b/src/main/java/org/apache/commons/text/translate/NumericEntityUnescaper.java
index d41e5b5..77896fa 100644
---
a/src/main/java/org/apache/commons/text/translate/NumericEntityUnescaper.java
+++
b/src/main/java/org/apache/commons/text/translate/NumericEntityUnescaper.java
@@ -19,6 +19,7 @@ package org.apache.commons.text.translate;
import java.io.IOException;
import java.io.Writer;
import java.util.Arrays;
+import java.util.Collections;
import java.util.EnumSet;
/**
@@ -73,7 +74,7 @@ public class NumericEntityUnescaper extends
CharSequenceTranslator {
if (options.length > 0) {
this.options = EnumSet.copyOf(Arrays.asList(options));
} else {
- this.options =
EnumSet.copyOf(Arrays.asList(OPTION.semiColonRequired));
+ this.options =
EnumSet.copyOf(Collections.singletonList(OPTION.semiColonRequired));
}
}
@@ -128,7 +129,7 @@ public class NumericEntityUnescaper extends
CharSequenceTranslator {
}
}
- int entityValue;
+ final int entityValue;
try {
if (isHex) {
entityValue = Integer.parseInt(input.subSequence(start,
end).toString(), 16);
diff --git a/src/test/java/org/apache/commons/text/AlphabetConverterTest.java
b/src/test/java/org/apache/commons/text/AlphabetConverterTest.java
index 34c194a..664b3cf 100644
--- a/src/test/java/org/apache/commons/text/AlphabetConverterTest.java
+++ b/src/test/java/org/apache/commons/text/AlphabetConverterTest.java
@@ -33,27 +33,27 @@ import org.junit.jupiter.api.Test;
*/
public class AlphabetConverterTest {
- private static Character[] lowerCaseEnglish = {' ', 'a', 'b', 'c', 'd',
'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l',
+ private static final Character[] lowerCaseEnglish = {' ', 'a', 'b', 'c',
'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l',
'm', 'n', 'o', 'p', 'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y',
'z'};
- private static Character[] englishAndNumbers = {'0', '1', '2', '3', '4',
'5', '6', '7', '8', '9', 'a', 'b', 'c',
+ private static final Character[] englishAndNumbers = {'0', '1', '2', '3',
'4', '5', '6', '7', '8', '9', 'a', 'b', 'c',
'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n', 'o', 'p',
'q', 'r', 's', 't', 'u', 'v', 'w', 'x',
'y', 'z', 'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K',
'L', 'M', 'N', 'O', 'P', 'Q', 'R', 'S',
'T', 'U', 'V', 'W', 'X', 'Y', 'Z', ' '};
- private static Character[] lowerCaseEnglishAndNumbers = {'0', '1', '2',
'3', '4', '5', '6', '7', '8', '9', 'a',
+ private static final Character[] lowerCaseEnglishAndNumbers = {'0', '1',
'2', '3', '4', '5', '6', '7', '8', '9', 'a',
'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n',
'o', 'p', 'q', 'r', 's', 't', 'u', 'v',
'w', 'x', 'y', 'z', ' '};
- private static Character[] numbers = {'0', '1', '2', '3', '4', '5', '6',
'7', '8', '9'};
- private static Character[] binary = {'0', '1'};
- private static Character[] hebrew = {'_', ' ', '\u05e7', '\u05e8',
'\u05d0', '\u05d8', '\u05d5', '\u05df', '\u05dd',
+ private static final Character[] numbers = {'0', '1', '2', '3', '4', '5',
'6', '7', '8', '9'};
+ private static final Character[] binary = {'0', '1'};
+ private static final Character[] hebrew = {'_', ' ', '\u05e7', '\u05e8',
'\u05d0', '\u05d8', '\u05d5', '\u05df', '\u05dd',
'\u05e4', '\u05e9', '\u05d3', '\u05d2', '\u05db', '\u05e2',
'\u05d9', '\u05d7', '\u05dc', '\u05da',
'\u05e3', '\u05d6', '\u05e1', '\u05d1', '\u05d4', '\u05e0',
'\u05de', '\u05e6', '\u05ea', '\u05e5'};
- private static Character[] empty = {};
+ private static final Character[] empty = {};
- private static Integer[] unicode = {32, 35395, 35397, 36302, 36291, 35203,
35201, 35215, 35219, 35268, 97, 98, 99,
+ private static final Integer[] unicode = {32, 35395, 35397, 36302, 36291,
35203, 35201, 35215, 35219, 35268, 97, 98, 99,
100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 1001, 1002,
1003, 1004, 1005};
- private static Integer[] lowerCaseEnglishCodepoints = {32, 97, 98, 99,
100, 101, 102, 103, 104, 105, 106, 107,
+ private static final Integer[] lowerCaseEnglishCodepoints = {32, 97, 98,
99, 100, 101, 102, 103, 104, 105, 106, 107,
108, 109, 110, 111, 112, 113, 114, 115, 116, 117, 118, 119, 120,
121, 122};
- private static Integer[] doNotEncodeCodepoints = {32, 97, 98, 99}; //
space, a, b, c
+ private static final Integer[] doNotEncodeCodepoints = {32, 97, 98, 99};
// space, a, b, c
@Test
public void binaryTest() throws UnsupportedEncodingException {
@@ -188,7 +188,7 @@ public class AlphabetConverterTest {
public void testCreateConverterFromCharsAndEquals() {
final Character[] characterArray = new Character[2];
final char charOne = '+';
- final Character character = '+';
+ final char character = '+';
characterArray[0] = character;
characterArray[1] = characterArray[0];
final AlphabetConverter alphabetConverter =
AlphabetConverter.createConverterFromChars(characterArray,
@@ -242,7 +242,7 @@ public class AlphabetConverterTest {
@Test
public void testEquals() {
final Character[] characterArray = new Character[2];
- final Character character = 'R';
+ final char character = 'R';
characterArray[0] = character;
characterArray[1] = character;
final AlphabetConverter alphabetConverter =
AlphabetConverter.createConverterFromChars(characterArray,
@@ -266,7 +266,7 @@ public class AlphabetConverterTest {
@Test
public void testEqualsWithSameObject() {
final Character[] characterArray = new Character[2];
- final Character character = 'R';
+ final char character = 'R';
characterArray[0] = character;
characterArray[1] = character;
final AlphabetConverter alphabetConverter =
AlphabetConverter.createConverterFromChars(characterArray,
diff --git a/src/test/java/org/apache/commons/text/StringEscapeUtilsTest.java
b/src/test/java/org/apache/commons/text/StringEscapeUtilsTest.java
index d0c6ef5..3ea582a 100644
--- a/src/test/java/org/apache/commons/text/StringEscapeUtilsTest.java
+++ b/src/test/java/org/apache/commons/text/StringEscapeUtilsTest.java
@@ -257,7 +257,7 @@ public void testEscapeEcmaScript() {
// codepoint: U+1D362
final byte[] data = {(byte) 0xF0, (byte) 0x9D, (byte) 0x8D, (byte)
0xA2};
- final String original = new String(data, Charset.forName("UTF8"));
+ final String original = new String(data, StandardCharsets.UTF_8);
final String escaped = StringEscapeUtils.escapeHtml4(original);
assertEquals(original, escaped, "High Unicode should not have been
escaped");
@@ -503,9 +503,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 Character c1 = i;
- final Character c2 = (char) (i + 1);
- final String expected = c1.toString() + c2.toString();
+ 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 escapedC2 = "&#x" + Integer.toHexString(c2) + ";";
assertEquals(expected, StringEscapeUtils.unescapeHtml4(escapedC1 +
escapedC2),
diff --git
a/src/test/java/org/apache/commons/text/similarity/IntersectionSimilarityTest.java
b/src/test/java/org/apache/commons/text/similarity/IntersectionSimilarityTest.java
index c9f7049..3e26e74 100644
---
a/src/test/java/org/apache/commons/text/similarity/IntersectionSimilarityTest.java
+++
b/src/test/java/org/apache/commons/text/similarity/IntersectionSimilarityTest.java
@@ -22,6 +22,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
+import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
@@ -320,21 +321,21 @@ public class IntersectionSimilarityTest {
@Test
public void testApplyNullNull() {
assertThatIllegalArgumentException().isThrownBy(() -> {
- new IntersectionSimilarity<>(cs -> new
HashSet<>(Arrays.asList(cs))).apply(null, null);
+ new IntersectionSimilarity<>(cs -> new
HashSet<>(Collections.singletonList(cs))).apply(null, null);
});
}
@Test
public void testApplyStringNull() {
assertThatIllegalArgumentException().isThrownBy(() -> {
- new IntersectionSimilarity<>(cs -> new
HashSet<>(Arrays.asList(cs))).apply("left", null);
+ new IntersectionSimilarity<>(cs -> new
HashSet<>(Collections.singletonList(cs))).apply("left", null);
});
}
@Test
public void testApplyNullString() {
assertThatIllegalArgumentException().isThrownBy(() -> {
- new IntersectionSimilarity<>(cs -> new
HashSet<>(Arrays.asList(cs))).apply(null, "right");
+ new IntersectionSimilarity<>(cs -> new
HashSet<>(Collections.singletonList(cs))).apply(null, "right");
});
}
}
