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 aeccdea More lambdas, less boilerplate.
aeccdea is described below
commit aeccdea9ae744ca6ffcc2e03908d8142e008407a
Author: Gary Gregory <gardgreg...@gmail.com>
AuthorDate: Thu Sep 12 20:59:10 2019 -0400
More lambdas, less boilerplate.
---
.../commons/text/RandomStringGeneratorTest.java | 22 +++-------------------
.../apache/commons/text/TextStringBuilderTest.java | 16 ++++++----------
.../ParameterizedEditDistanceFromTest.java | 7 +------
.../ParameterizedSimilarityScoreFromTest.java | 7 +------
4 files changed, 11 insertions(+), 41 deletions(-)
diff --git
a/src/test/java/org/apache/commons/text/RandomStringGeneratorTest.java
b/src/test/java/org/apache/commons/text/RandomStringGeneratorTest.java
index bc343be..2494694 100644
--- a/src/test/java/org/apache/commons/text/RandomStringGeneratorTest.java
+++ b/src/test/java/org/apache/commons/text/RandomStringGeneratorTest.java
@@ -28,19 +28,9 @@ import org.junit.jupiter.api.Test;
*/
public class RandomStringGeneratorTest {
- private static final CharacterPredicate A_FILTER = new
CharacterPredicate() {
- @Override
- public boolean test(final int codePoint) {
- return codePoint == 'a';
- }
- };
+ private static final CharacterPredicate A_FILTER = codePoint -> codePoint
== 'a';
- private static final CharacterPredicate B_FILTER = new
CharacterPredicate() {
- @Override
- public boolean test(final int codePoint) {
- return codePoint == 'b';
- }
- };
+ private static final CharacterPredicate B_FILTER = codePoint -> codePoint
== 'b';
@Test
public void testInvalidLength() {
@@ -170,13 +160,7 @@ public class RandomStringGeneratorTest {
@Test
public void testUsingRandom() {
final char testChar = 'a';
- final TextRandomProvider testRandom = new TextRandomProvider() {
-
- @Override
- public int nextInt(final int n) {
- return testChar;
- }
- };
+ final TextRandomProvider testRandom = n -> testChar;
final String str = new
RandomStringGenerator.Builder().usingRandom(testRandom).build().generate(10);
for (final char c : str.toCharArray()) {
diff --git a/src/test/java/org/apache/commons/text/TextStringBuilderTest.java
b/src/test/java/org/apache/commons/text/TextStringBuilderTest.java
index ae89d55..78875a4 100644
--- a/src/test/java/org/apache/commons/text/TextStringBuilderTest.java
+++ b/src/test/java/org/apache/commons/text/TextStringBuilderTest.java
@@ -1581,18 +1581,14 @@ public class TextStringBuilderTest {
assertEquals(23, sb.lastIndexOf(A_NUMBER_MATCHER, 24));
}
- static final StringMatcher A_NUMBER_MATCHER = new StringMatcher() {
-
- @Override
- public int isMatch(final char[] buffer, int pos, final int
bufferStart, final int bufferEnd) {
- if (buffer[pos] == 'A') {
- pos++;
- if (pos < bufferEnd && buffer[pos] >= '0' && buffer[pos] <=
'9') {
- return 2;
- }
+ static final StringMatcher A_NUMBER_MATCHER = (buffer, pos, bufferStart,
bufferEnd) -> {
+ if (buffer[pos] == 'A') {
+ pos++;
+ if (pos < bufferEnd && buffer[pos] >= '0' && buffer[pos] <= '9') {
+ return 2;
}
- return 0;
}
+ return 0;
};
// -----------------------------------------------------------------------
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 7322d99..9f10817 100644
---
a/src/test/java/org/apache/commons/text/similarity/ParameterizedEditDistanceFromTest.java
+++
b/src/test/java/org/apache/commons/text/similarity/ParameterizedEditDistanceFromTest.java
@@ -47,12 +47,7 @@ public class ParameterizedEditDistanceFromTest<R> {
Arguments.of(new LevenshteinDistance(0), "go", "go", 0),
Arguments.of(
- new EditDistance<Boolean>() {
- @Override
- public Boolean apply(final CharSequence left, final
CharSequence right) {
- return 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 3022ed5..2017097 100644
---
a/src/test/java/org/apache/commons/text/similarity/ParameterizedSimilarityScoreFromTest.java
+++
b/src/test/java/org/apache/commons/text/similarity/ParameterizedSimilarityScoreFromTest.java
@@ -38,12 +38,7 @@ public class ParameterizedSimilarityScoreFromTest<R> {
Arguments.of(new LevenshteinDistance(), "hippo", "zzzzzzzz",
8),
Arguments.of(
- new SimilarityScore<Boolean>() {
- @Override
- public Boolean apply(final CharSequence left,
final CharSequence right) {
- return left == right || (left != null &&
left.equals(right));
- }
- },
+ (SimilarityScore<Boolean>) (left, right) -> left ==
right || (left != null && left.equals(right)),
"Bob's your uncle.",
"Every good boy does fine.",
false
