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:33 UTC
[commons-text] 01/04: PMD: UselessParentheses
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