You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by gg...@apache.org on 2022/05/31 12:48:32 UTC
[commons-text] branch master updated (74e99127 -> 55d0920b)
This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/commons-text.git
from 74e99127 Use final
new 8493d439 PMD: UselessParentheses
new d7f28be3 PMD: UselessParentheses
new 587446d8 Use final
new 55d0920b Disable console logging for StringSubstitutorWithInterpolatorStringLookupTest
The 4 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.github/workflows/maven.yml | 2 +-
src/main/java/org/apache/commons/text/WordUtils.java | 2 +-
.../apache/commons/text/lookup/DefaultStringLookup.java | 2 +-
.../org/apache/commons/text/numbers/ParsedDecimal.java | 8 ++++----
.../commons/text/similarity/IntersectionSimilarity.java | 4 ++--
.../commons/text/similarity/JaroWinklerSimilarity.java | 2 +-
.../text/similarity/LevenshteinDetailedDistance.java | 8 ++++----
.../text/similarity/LongestCommonSubsequence.java | 2 +-
.../apache/commons/text/translate/UnicodeEscaper.java | 8 ++++----
.../java/org/apache/commons/text/StrBuilderTest.java | 2 +-
.../java/org/apache/commons/text/StrSubstitutorTest.java | 2 +-
.../org/apache/commons/text/StringEscapeUtilsTest.java | 4 ++--
.../org/apache/commons/text/TextStringBuilderTest.java | 2 +-
src/test/java/org/apache/commons/text/WordUtilsTest.java | 2 +-
.../apache/commons/text/jmh/DoubleFormatPerformance.java | 4 ++--
.../apache/commons/text/numbers/DoubleFormatTest.java | 4 ++--
.../apache/commons/text/numbers/ParsedDecimalTest.java | 4 ++--
.../commons/text/similarity/IntersectionResultTest.java | 2 +-
.../text/similarity/IntersectionSimilarityTest.java | 6 +++---
.../commons/text/similarity/JaccardDistanceTest.java | 16 ++++++++--------
.../similarity/ParameterizedEditDistanceFromTest.java | 2 +-
.../similarity/ParameterizedSimilarityScoreFromTest.java | 2 +-
22 files changed, 45 insertions(+), 45 deletions(-)
[commons-text] 01/04: PMD: UselessParentheses
Posted by gg...@apache.org.
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 8493d43980bb02175a5f983cb7c7a91b164e035a
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Tue May 31 08:41:40 2022 -0400
PMD: UselessParentheses
---
.../java/org/apache/commons/text/StrBuilderTest.java | 2 +-
.../java/org/apache/commons/text/StrSubstitutorTest.java | 2 +-
.../org/apache/commons/text/StringEscapeUtilsTest.java | 4 ++--
.../org/apache/commons/text/TextStringBuilderTest.java | 2 +-
src/test/java/org/apache/commons/text/WordUtilsTest.java | 2 +-
.../apache/commons/text/jmh/DoubleFormatPerformance.java | 4 ++--
.../apache/commons/text/numbers/DoubleFormatTest.java | 4 ++--
.../apache/commons/text/numbers/ParsedDecimalTest.java | 4 ++--
.../commons/text/similarity/IntersectionResultTest.java | 2 +-
.../text/similarity/IntersectionSimilarityTest.java | 6 +++---
.../commons/text/similarity/JaccardDistanceTest.java | 16 ++++++++--------
.../similarity/ParameterizedEditDistanceFromTest.java | 2 +-
.../similarity/ParameterizedSimilarityScoreFromTest.java | 2 +-
13 files changed, 26 insertions(+), 26 deletions(-)
diff --git a/src/test/java/org/apache/commons/text/StrBuilderTest.java b/src/test/java/org/apache/commons/text/StrBuilderTest.java
index 2b06b8c8..738fa934 100644
--- a/src/test/java/org/apache/commons/text/StrBuilderTest.java
+++ b/src/test/java/org/apache/commons/text/StrBuilderTest.java
@@ -678,7 +678,7 @@ public class StrBuilderTest {
@Test
public void testDeleteCharAtWithNegative() {
- assertThatExceptionOfType(StringIndexOutOfBoundsException.class).isThrownBy(() -> new StrBuilder().deleteCharAt((-1258)));
+ assertThatExceptionOfType(StringIndexOutOfBoundsException.class).isThrownBy(() -> new StrBuilder().deleteCharAt(-1258));
}
@Test
diff --git a/src/test/java/org/apache/commons/text/StrSubstitutorTest.java b/src/test/java/org/apache/commons/text/StrSubstitutorTest.java
index 7bd64868..858b43b6 100644
--- a/src/test/java/org/apache/commons/text/StrSubstitutorTest.java
+++ b/src/test/java/org/apache/commons/text/StrSubstitutorTest.java
@@ -476,7 +476,7 @@ public class StrSubstitutorTest {
final StrSubstitutor strSubstitutor =
new StrSubstitutor(strLookupMapStrLookup, strMatcher, strMatcher, 'b', strMatcher);
- assertFalse(strSubstitutor.replaceIn((StringBuilder) null, 1315, (-1369)));
+ assertFalse(strSubstitutor.replaceIn((StringBuilder) null, 1315, -1369));
assertEquals('b', strSubstitutor.getEscapeChar());
assertFalse(strSubstitutor.isPreserveEscapes());
}
diff --git a/src/test/java/org/apache/commons/text/StringEscapeUtilsTest.java b/src/test/java/org/apache/commons/text/StringEscapeUtilsTest.java
index 21a73fe8..4651a4e5 100644
--- a/src/test/java/org/apache/commons/text/StringEscapeUtilsTest.java
+++ b/src/test/java/org/apache/commons/text/StringEscapeUtilsTest.java
@@ -68,7 +68,7 @@ public class StringEscapeUtilsTest {
private void assertEscapeJava(final String expected, final String original, String message) throws IOException {
final String converted = StringEscapeUtils.escapeJava(original);
- message = "escapeJava(String) failed" + (message == null ? "" : (": " + message));
+ message = "escapeJava(String) failed" + (message == null ? "" : ": " + message);
assertEquals(expected, converted, message);
final StringWriter writer = new StringWriter();
@@ -85,7 +85,7 @@ public class StringEscapeUtilsTest {
final String actual = StringEscapeUtils.unescapeJava(original);
assertEquals(unescaped, actual, "unescape(String) failed"
- + (message == null ? "" : (": " + message))
+ + (message == null ? "" : ": " + message)
+ ": expected '" + StringEscapeUtils.escapeJava(unescaped)
// we escape this so we can see it in the error message
+ "' actual '" + StringEscapeUtils.escapeJava(actual) + "'");
diff --git a/src/test/java/org/apache/commons/text/TextStringBuilderTest.java b/src/test/java/org/apache/commons/text/TextStringBuilderTest.java
index 3e36f7a5..c6001851 100644
--- a/src/test/java/org/apache/commons/text/TextStringBuilderTest.java
+++ b/src/test/java/org/apache/commons/text/TextStringBuilderTest.java
@@ -695,7 +695,7 @@ public class TextStringBuilderTest {
@Test
public void testDeleteCharAtWithNegative() {
- assertThatExceptionOfType(StringIndexOutOfBoundsException.class).isThrownBy(() -> new TextStringBuilder().deleteCharAt((-1258)));
+ assertThatExceptionOfType(StringIndexOutOfBoundsException.class).isThrownBy(() -> new TextStringBuilder().deleteCharAt(-1258));
}
@Test
diff --git a/src/test/java/org/apache/commons/text/WordUtilsTest.java b/src/test/java/org/apache/commons/text/WordUtilsTest.java
index 54e4969b..6c8d97bc 100644
--- a/src/test/java/org/apache/commons/text/WordUtilsTest.java
+++ b/src/test/java/org/apache/commons/text/WordUtilsTest.java
@@ -55,7 +55,7 @@ public class WordUtilsTest {
@Test
public void testAbbreviateForNullAndEmptyString() {
- assertThat((WordUtils.abbreviate(null, 1, -1, ""))).isNull();
+ assertThat(WordUtils.abbreviate(null, 1, -1, "")).isNull();
assertThat(WordUtils.abbreviate("", 1, -1, "")).isEqualTo(StringUtils.EMPTY);
assertThat(WordUtils.abbreviate("0123456790", 0, 0, "")).isEqualTo("");
assertThat(WordUtils.abbreviate(" 0123456790", 0, -1, "")).isEqualTo("");
diff --git a/src/test/java/org/apache/commons/text/jmh/DoubleFormatPerformance.java b/src/test/java/org/apache/commons/text/jmh/DoubleFormatPerformance.java
index bbae86a2..4b584915 100644
--- a/src/test/java/org/apache/commons/text/jmh/DoubleFormatPerformance.java
+++ b/src/test/java/org/apache/commons/text/jmh/DoubleFormatPerformance.java
@@ -102,11 +102,11 @@ public class DoubleFormatPerformance {
*/
private static double randomDouble(final int minExp, final int maxExp, final UniformRandomProvider rng) {
// Create random doubles using random bits in the sign bit and the mantissa.
- final long mask = ((1L << 52) - 1) | 1L << 63;
+ final long mask = (1L << 52) - 1 | 1L << 63;
final long bits = rng.nextLong() & mask;
// The exponent must be unsigned so + 1023 to the signed exponent
final long exp = rng.nextInt(maxExp - minExp + 1) + minExp + 1023;
- return Double.longBitsToDouble(bits | (exp << 52));
+ return Double.longBitsToDouble(bits | exp << 52);
}
/** Create an array with the given length containing random doubles with exponents in the range
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 052ad590..402bb938 100644
--- a/src/test/java/org/apache/commons/text/numbers/DoubleFormatTest.java
+++ b/src/test/java/org/apache/commons/text/numbers/DoubleFormatTest.java
@@ -135,11 +135,11 @@ class DoubleFormatTest {
*/
private static double randomDouble(final int minExp, final int maxExp, final Random rnd) {
// Create random doubles using random bits in the sign bit and the mantissa.
- final long mask = ((1L << 52) - 1) | 1L << 63;
+ final long mask = (1L << 52) - 1 | 1L << 63;
final long bits = rnd.nextLong() & mask;
// The exponent must be unsigned so + 1023 to the signed exponent
final long exp = rnd.nextInt(maxExp - minExp + 1) + minExp + 1023;
- return Double.longBitsToDouble(bits | (exp << 52));
+ return Double.longBitsToDouble(bits | exp << 52);
}
/** Create a random double value using the full range of exponent values.
diff --git a/src/test/java/org/apache/commons/text/numbers/ParsedDecimalTest.java b/src/test/java/org/apache/commons/text/numbers/ParsedDecimalTest.java
index 21354585..76c2e160 100644
--- a/src/test/java/org/apache/commons/text/numbers/ParsedDecimalTest.java
+++ b/src/test/java/org/apache/commons/text/numbers/ParsedDecimalTest.java
@@ -202,10 +202,10 @@ class ParsedDecimalTest {
}
private static double createRandomDouble(final UniformRandomProvider rng) {
- final long mask = ((1L << 52) - 1) | 1L << 63;
+ final long mask = (1L << 52) - 1 | 1L << 63;
final long bits = rng.nextLong() & mask;
final long exp = rng.nextInt(2045) + 1;
- return Double.longBitsToDouble(bits | (exp << 52));
+ return Double.longBitsToDouble(bits | exp << 52);
}
/** Get the raw digits in the given decimal as a string.
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 ea8520b4..f9c53df2 100644
--- a/src/test/java/org/apache/commons/text/similarity/IntersectionResultTest.java
+++ b/src/test/java/org/apache/commons/text/similarity/IntersectionResultTest.java
@@ -43,7 +43,7 @@ public class IntersectionResultTest {
Assertions.assertNotEquals(results[i], something);
Assertions.assertNotEquals(null, results[i]);
for (int j = 0; j < results.length; j++) {
- Assertions.assertEquals(results[i].equals(results[j]), (i == j));
+ Assertions.assertEquals(results[i].equals(results[j]), i == j);
}
}
}
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 52a837e4..76b1d92c 100644
--- a/src/test/java/org/apache/commons/text/similarity/IntersectionSimilarityTest.java
+++ b/src/test/java/org/apache/commons/text/similarity/IntersectionSimilarityTest.java
@@ -58,7 +58,7 @@ public class IntersectionSimilarityTest {
for (int i = 1; i < length; i++) {
final char ch1 = ch2;
ch2 = sequence.charAt(i);
- list.add(Integer.valueOf((ch1 << 16) | ch2));
+ list.add(Integer.valueOf(ch1 << 16 | ch2));
}
}
return list;
@@ -79,7 +79,7 @@ public class IntersectionSimilarityTest {
for (int i = 1; i < length; i++) {
final char ch1 = ch2;
ch2 = sequence.charAt(i);
- set.add(Integer.valueOf((ch1 << 16) | ch2));
+ set.add(Integer.valueOf(ch1 << 16 | ch2));
}
}
return set;
@@ -165,7 +165,7 @@ public class IntersectionSimilarityTest {
for (int i = 1; i < word.length(); i++) {
final char ch1 = ch2;
ch2 = Character.toUpperCase(word.charAt(i));
- set.add(Integer.valueOf((ch1 << 16) | ch2));
+ set.add(Integer.valueOf(ch1 << 16 | ch2));
}
}
}
diff --git a/src/test/java/org/apache/commons/text/similarity/JaccardDistanceTest.java b/src/test/java/org/apache/commons/text/similarity/JaccardDistanceTest.java
index 531fbdf7..bf724a21 100644
--- a/src/test/java/org/apache/commons/text/similarity/JaccardDistanceTest.java
+++ b/src/test/java/org/apache/commons/text/similarity/JaccardDistanceTest.java
@@ -40,17 +40,17 @@ public class JaccardDistanceTest {
assertEquals(0.0, classBeingTested.apply("", ""));
assertEquals(1.0, classBeingTested.apply("left", ""));
assertEquals(1.0, classBeingTested.apply("", "right"));
- assertEquals(1.0 - (3.0 / 4), classBeingTested.apply("frog", "fog"));
+ assertEquals(1.0 - 3.0 / 4, classBeingTested.apply("frog", "fog"));
assertEquals(1.0, classBeingTested.apply("fly", "ant"));
- assertEquals(1.0 - (2.0 / 9), classBeingTested.apply("elephant", "hippo"));
- assertEquals(1.0 - (7.0 / 11), classBeingTested.apply("ABC Corporation", "ABC Corp"));
- assertEquals(1.0 - (13.0 / 17),
+ assertEquals(1.0 - 2.0 / 9, classBeingTested.apply("elephant", "hippo"));
+ assertEquals(1.0 - 7.0 / 11, classBeingTested.apply("ABC Corporation", "ABC Corp"));
+ assertEquals(1.0 - 13.0 / 17,
classBeingTested.apply("D N H Enterprises Inc", "D & H Enterprises, Inc."));
- assertEquals(1.0 - (16.0 / 18),
+ assertEquals(1.0 - 16.0 / 18,
classBeingTested.apply("My Gym Children's Fitness Center", "My Gym. Childrens Fitness"));
- assertEquals(1.0 - (9.0 / 10), classBeingTested.apply("PENNSYLVANIA", "PENNCISYLVNIA"));
- assertEquals(1.0 - (1.0 / 8), classBeingTested.apply("left", "right"));
- assertEquals(1.0 - (1.0 / 8), classBeingTested.apply("leettteft", "ritttght"));
+ assertEquals(1.0 - 9.0 / 10, classBeingTested.apply("PENNSYLVANIA", "PENNCISYLVNIA"));
+ assertEquals(1.0 - 1.0 / 8, classBeingTested.apply("left", "right"));
+ assertEquals(1.0 - 1.0 / 8, classBeingTested.apply("leettteft", "ritttght"));
assertEquals(0.0, classBeingTested.apply("the same string", "the same string"));
}
diff --git a/src/test/java/org/apache/commons/text/similarity/ParameterizedEditDistanceFromTest.java b/src/test/java/org/apache/commons/text/similarity/ParameterizedEditDistanceFromTest.java
index 618c1c56..edc496dd 100644
--- a/src/test/java/org/apache/commons/text/similarity/ParameterizedEditDistanceFromTest.java
+++ b/src/test/java/org/apache/commons/text/similarity/ParameterizedEditDistanceFromTest.java
@@ -47,7 +47,7 @@ public class ParameterizedEditDistanceFromTest<R> {
Arguments.of(new LevenshteinDistance(0), "go", "go", 0),
Arguments.of(
- (EditDistance<Boolean>) (left, right) -> left == right || (left != null && left.equals(right)),
+ (EditDistance<Boolean>) (left, right) -> left == right || left != null && left.equals(right),
"Bob's your uncle.",
"Every good boy does fine.",
false));
diff --git a/src/test/java/org/apache/commons/text/similarity/ParameterizedSimilarityScoreFromTest.java b/src/test/java/org/apache/commons/text/similarity/ParameterizedSimilarityScoreFromTest.java
index b511238b..5feda360 100644
--- a/src/test/java/org/apache/commons/text/similarity/ParameterizedSimilarityScoreFromTest.java
+++ b/src/test/java/org/apache/commons/text/similarity/ParameterizedSimilarityScoreFromTest.java
@@ -39,7 +39,7 @@ public class ParameterizedSimilarityScoreFromTest<R> {
Arguments.of(
(SimilarityScore<Boolean>) (left, right) -> left == right
- || (left != null && left.equals(right)),
+ || left != null && left.equals(right),
"Bob's your uncle.",
"Every good boy does fine.",
false
[commons-text] 02/04: PMD: UselessParentheses
Posted by gg...@apache.org.
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 d7f28be3cceeec4e3a27616525de2a21c59f2167
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Tue May 31 08:41:46 2022 -0400
PMD: UselessParentheses
---
src/main/java/org/apache/commons/text/WordUtils.java | 2 +-
src/main/java/org/apache/commons/text/numbers/ParsedDecimal.java | 8 ++++----
.../apache/commons/text/similarity/IntersectionSimilarity.java | 4 ++--
.../org/apache/commons/text/similarity/JaroWinklerSimilarity.java | 2 +-
.../commons/text/similarity/LevenshteinDetailedDistance.java | 8 ++++----
.../apache/commons/text/similarity/LongestCommonSubsequence.java | 2 +-
.../java/org/apache/commons/text/translate/UnicodeEscaper.java | 8 ++++----
7 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/src/main/java/org/apache/commons/text/WordUtils.java b/src/main/java/org/apache/commons/text/WordUtils.java
index 1d9d3d9f..561f1afe 100644
--- a/src/main/java/org/apache/commons/text/WordUtils.java
+++ b/src/main/java/org/apache/commons/text/WordUtils.java
@@ -380,7 +380,7 @@ public class WordUtils {
for (int i = 0; i < strLen;) {
final int codePoint = str.codePointAt(i);
- if (delimiterSet.contains(codePoint) || (delimiters == null && Character.isWhitespace(codePoint))) {
+ if (delimiterSet.contains(codePoint) || delimiters == null && Character.isWhitespace(codePoint)) {
lastWasGap = true;
} else if (lastWasGap) {
newCodePoints[count++] = codePoint;
diff --git a/src/main/java/org/apache/commons/text/numbers/ParsedDecimal.java b/src/main/java/org/apache/commons/text/numbers/ParsedDecimal.java
index 7581c0d1..544e11f0 100644
--- a/src/main/java/org/apache/commons/text/numbers/ParsedDecimal.java
+++ b/src/main/java/org/apache/commons/text/numbers/ParsedDecimal.java
@@ -219,7 +219,7 @@ final class ParsedDecimal {
int exp = 0;
for (; i < chars.length; ++i) {
- exp = (exp * DECIMAL_RADIX) + digitValue(chars[i]);
+ exp = exp * DECIMAL_RADIX + digitValue(chars[i]);
}
return neg ? -exp : exp;
@@ -515,7 +515,7 @@ final class ParsedDecimal {
* @return {@code true} if a grouping separator should be added
*/
private boolean requiresGroupingSeparatorAfterPosition(final int pos) {
- return pos > 1 && (pos % THOUSANDS_GROUP_SIZE) == 1;
+ return pos > 1 && pos % THOUSANDS_GROUP_SIZE == 1;
}
/**
@@ -621,8 +621,8 @@ final class ParsedDecimal {
// and the last digit is odd (half-even rounding).
final int digitAfterLast = digits[count];
- return digitAfterLast > ROUND_CENTER || (digitAfterLast == ROUND_CENTER
- && (count < digitCount - 1 || (digits[count - 1] % 2) != 0));
+ return digitAfterLast > ROUND_CENTER || digitAfterLast == ROUND_CENTER
+ && (count < digitCount - 1 || digits[count - 1] % 2 != 0);
}
/**
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 c692342c..b3bd4f34 100644
--- a/src/main/java/org/apache/commons/text/similarity/IntersectionSimilarity.java
+++ b/src/main/java/org/apache/commons/text/similarity/IntersectionSimilarity.java
@@ -187,7 +187,7 @@ public class IntersectionSimilarity<T> implements SimilarityScore<IntersectionRe
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.
- intersection = (sizeA < sizeB)
+ intersection = sizeA < sizeB
? getIntersection((Set<T>) objectsA, (Set<T>) objectsB)
: getIntersection((Set<T>) objectsB, (Set<T>) objectsA);
} else {
@@ -195,7 +195,7 @@ public class IntersectionSimilarity<T> implements SimilarityScore<IntersectionRe
final TinyBag bagA = toBag(objectsA);
final TinyBag bagB = toBag(objectsB);
// Iterate over the smaller number of unique elements
- intersection = (bagA.uniqueElementSize() < bagB.uniqueElementSize())
+ intersection = bagA.uniqueElementSize() < bagB.uniqueElementSize()
? getIntersection(bagA, bagB)
: getIntersection(bagB, bagA);
}
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 d5e26513..3659d4d9 100644
--- a/src/main/java/org/apache/commons/text/similarity/JaroWinklerSimilarity.java
+++ b/src/main/java/org/apache/commons/text/similarity/JaroWinklerSimilarity.java
@@ -155,7 +155,7 @@ public class JaroWinklerSimilarity implements SimilarityScore<Double> {
if (m == 0) {
return 0d;
}
- final double j = ((m / left.length() + m / right.length() + (m - (double) mtp[1] / 2) / m)) / 3;
+ final double j = (m / left.length() + m / right.length() + (m - (double) mtp[1] / 2) / m) / 3;
return j < 0.7d ? j : j + defaultScalingFactor * mtp[2] * (1d - j);
}
diff --git a/src/main/java/org/apache/commons/text/similarity/LevenshteinDetailedDistance.java b/src/main/java/org/apache/commons/text/similarity/LevenshteinDetailedDistance.java
index 478f8405..65ad03e9 100644
--- a/src/main/java/org/apache/commons/text/similarity/LevenshteinDetailedDistance.java
+++ b/src/main/java/org/apache/commons/text/similarity/LevenshteinDetailedDistance.java
@@ -100,8 +100,8 @@ public class LevenshteinDetailedDistance implements EditDistance<LevenshteinResu
// handling insert and delete cases.
deleted = false;
added = false;
- if (data - 1 == dataAtLeft && (data <= dataAtDiagonal && data <= dataAtTop)
- || (dataAtDiagonal == -1 && dataAtTop == -1)) { // NOPMD
+ if (data - 1 == dataAtLeft && data <= dataAtDiagonal && data <= dataAtTop
+ || dataAtDiagonal == -1 && dataAtTop == -1) { // NOPMD
columnIndex--;
if (swapped) {
addCount++;
@@ -110,8 +110,8 @@ public class LevenshteinDetailedDistance implements EditDistance<LevenshteinResu
delCount++;
deleted = true;
}
- } else if (data - 1 == dataAtTop && (data <= dataAtDiagonal && data <= dataAtLeft)
- || (dataAtDiagonal == -1 && dataAtLeft == -1)) { // NOPMD
+ } else if (data - 1 == dataAtTop && data <= dataAtDiagonal && data <= dataAtLeft
+ || dataAtDiagonal == -1 && dataAtLeft == -1) { // NOPMD
rowIndex--;
if (swapped) {
delCount++;
diff --git a/src/main/java/org/apache/commons/text/similarity/LongestCommonSubsequence.java b/src/main/java/org/apache/commons/text/similarity/LongestCommonSubsequence.java
index 3629bab6..7af20612 100644
--- a/src/main/java/org/apache/commons/text/similarity/LongestCommonSubsequence.java
+++ b/src/main/java/org/apache/commons/text/similarity/LongestCommonSubsequence.java
@@ -149,7 +149,7 @@ public class LongestCommonSubsequence implements SimilarityScore<Integer> {
// An auxiliary method for CharSequence reversal
private static String reverse(final CharSequence s) {
- return (new StringBuilder(s)).reverse().toString();
+ return new StringBuilder(s).reverse().toString();
}
/**
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 7d0c240c..9602679c 100644
--- a/src/main/java/org/apache/commons/text/translate/UnicodeEscaper.java
+++ b/src/main/java/org/apache/commons/text/translate/UnicodeEscaper.java
@@ -128,10 +128,10 @@ public class UnicodeEscaper extends CodePointTranslator {
writer.write(toUtf16Escape(codepoint));
} else {
writer.write("\\u");
- writer.write(HEX_DIGITS[(codepoint >> 12) & 15]);
- writer.write(HEX_DIGITS[(codepoint >> 8) & 15]);
- writer.write(HEX_DIGITS[(codepoint >> 4) & 15]);
- writer.write(HEX_DIGITS[(codepoint) & 15]);
+ writer.write(HEX_DIGITS[codepoint >> 12 & 15]);
+ writer.write(HEX_DIGITS[codepoint >> 8 & 15]);
+ writer.write(HEX_DIGITS[codepoint >> 4 & 15]);
+ writer.write(HEX_DIGITS[codepoint & 15]);
}
return true;
}
[commons-text] 03/04: Use final
Posted by gg...@apache.org.
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 587446d818fa79a7e6f58d92b3da74b116fe9f00
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Tue May 31 08:45:44 2022 -0400
Use final
---
src/main/java/org/apache/commons/text/lookup/DefaultStringLookup.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/main/java/org/apache/commons/text/lookup/DefaultStringLookup.java b/src/main/java/org/apache/commons/text/lookup/DefaultStringLookup.java
index 520ed384..ce01c81e 100644
--- a/src/main/java/org/apache/commons/text/lookup/DefaultStringLookup.java
+++ b/src/main/java/org/apache/commons/text/lookup/DefaultStringLookup.java
@@ -121,7 +121,7 @@ public enum DefaultStringLookup {
* Prints out to the console the mapping from enum keys to enum name.
* @param args ignored.
*/
- public static void main(String[] args) {
+ public static void main(final String[] args) {
Stream.of(values()).forEach(e -> System.out.println(e.getKey() + "=" + e.name()));
}
[commons-text] 04/04: Disable console logging for StringSubstitutorWithInterpolatorStringLookupTest
Posted by gg...@apache.org.
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 55d0920b98e97da623deffc67b867aa07d8d244f
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Tue May 31 08:46:44 2022 -0400
Disable console logging for
StringSubstitutorWithInterpolatorStringLookupTest
---
.github/workflows/maven.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
index 5b86a7d8..529b0259 100644
--- a/.github/workflows/maven.yml
+++ b/.github/workflows/maven.yml
@@ -42,4 +42,4 @@ jobs:
java-version: ${{ matrix.java }}
cache: 'maven'
- name: Build with Maven
- run: mvn
+ run: mvn -Dpolyglot.engine.WarnInterpreterOnly=false