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 3ed5858 No need to nest in else.
3ed5858 is described below
commit 3ed58583dc11f583f0fe1fc8a681ce76e38b7c3d
Author: Gary Gregory <[email protected]>
AuthorDate: Fri Mar 5 15:02:43 2021 -0500
No need to nest in else.
---
.../org/apache/commons/text/AlphabetConverter.java | 82 +++++++++++-----------
.../java/org/apache/commons/text/StrBuilder.java | 12 ++--
.../org/apache/commons/text/TextStringBuilder.java | 36 +++++-----
.../commons/text/io/StringSubstitutorReader.java | 3 +-
.../text/lookup/ResourceBundleStringLookup.java | 3 +-
.../text/similarity/JaroWinklerDistance.java | 5 +-
.../text/similarity/JaroWinklerSimilarity.java | 5 +-
.../similarity/LevenshteinDetailedDistance.java | 6 +-
.../text/similarity/LevenshteinDistance.java | 6 +-
9 files changed, 80 insertions(+), 78 deletions(-)
diff --git a/src/main/java/org/apache/commons/text/AlphabetConverter.java
b/src/main/java/org/apache/commons/text/AlphabetConverter.java
index e6ac753..88a7bcd 100644
--- a/src/main/java/org/apache/commons/text/AlphabetConverter.java
+++ b/src/main/java/org/apache/commons/text/AlphabetConverter.java
@@ -232,23 +232,21 @@ public final class AlphabetConverter {
if (level > 0) {
for (final int encodingLetter : encoding) {
- if (originals.hasNext()) {
-
- // this skips the doNotEncode chars if they are in the
- // leftmost place
- if (level != encodedLetterLength
- || !doNotEncodeMap.containsKey(encodingLetter)) {
- addSingleEncoding(level - 1,
- currentEncoding
- + codePointToString(encodingLetter),
- encoding,
- originals,
- doNotEncodeMap
- );
- }
- } else {
+ if (!originals.hasNext()) {
return; // done encoding all the original alphabet
}
+ // this skips the doNotEncode chars if they are in the
+ // leftmost place
+ if (level != encodedLetterLength
+ || !doNotEncodeMap.containsKey(encodingLetter)) {
+ addSingleEncoding(level - 1,
+ currentEncoding
+ + codePointToString(encodingLetter),
+ encoding,
+ originals,
+ doNotEncodeMap
+ );
+ }
}
} else {
Integer next = originals.next();
@@ -470,41 +468,41 @@ public final class AlphabetConverter {
encodedToOriginal,
encodedLetterLength);
- } else if (encodingCopy.size() - doNotEncodeCopy.size() < 2) {
+ }
+ if (encodingCopy.size() - doNotEncodeCopy.size() < 2) {
throw new IllegalArgumentException(
"Must have at least two encoding characters (excluding "
+ "those in the 'do not encode' list), but has "
+ (encodingCopy.size() - doNotEncodeCopy.size()));
- } else {
- // we start with one which is our minimum, and because we do the
- // first division outside the loop
- int lettersSoFar = 1;
-
- // the first division takes into account that the doNotEncode
- // letters can't be in the leftmost place
- int lettersLeft = (originalCopy.size() - doNotEncodeCopy.size())
- / (encodingCopy.size() - doNotEncodeCopy.size());
-
- while (lettersLeft / encodingCopy.size() >= 1) {
- lettersLeft = lettersLeft / encodingCopy.size();
- lettersSoFar++;
- }
+ }
+ // we start with one which is our minimum, and because we do the
+ // first division outside the loop
+ int lettersSoFar = 1;
+
+ // the first division takes into account that the doNotEncode
+ // letters can't be in the leftmost place
+ int lettersLeft = (originalCopy.size() - doNotEncodeCopy.size())
+ / (encodingCopy.size() - doNotEncodeCopy.size());
+
+ while (lettersLeft / encodingCopy.size() >= 1) {
+ lettersLeft = lettersLeft / encodingCopy.size();
+ lettersSoFar++;
+ }
- encodedLetterLength = lettersSoFar + 1;
+ encodedLetterLength = lettersSoFar + 1;
- final AlphabetConverter ac =
- new AlphabetConverter(originalToEncoded,
- encodedToOriginal,
- encodedLetterLength);
+ final AlphabetConverter ac =
+ new AlphabetConverter(originalToEncoded,
+ encodedToOriginal,
+ encodedLetterLength);
- ac.addSingleEncoding(encodedLetterLength,
- StringUtils.EMPTY,
- encodingCopy,
- originalCopy.iterator(),
- doNotEncodeMap);
+ ac.addSingleEncoding(encodedLetterLength,
+ StringUtils.EMPTY,
+ encodingCopy,
+ originalCopy.iterator(),
+ doNotEncodeMap);
- return ac;
- }
+ return ac;
}
/**
diff --git a/src/main/java/org/apache/commons/text/StrBuilder.java
b/src/main/java/org/apache/commons/text/StrBuilder.java
index b09bc7f..8e71915 100644
--- a/src/main/java/org/apache/commons/text/StrBuilder.java
+++ b/src/main/java/org/apache/commons/text/StrBuilder.java
@@ -2416,11 +2416,11 @@ public class StrBuilder implements CharSequence,
Appendable, Serializable, Build
public String leftString(final int length) {
if (length <= 0) {
return StringUtils.EMPTY;
- } else if (length >= size) {
+ }
+ if (length >= size) {
return new String(buffer, 0, size);
- } else {
- return new String(buffer, 0, length);
}
+ return new String(buffer, 0, length);
}
//-----------------------------------------------------------------------
@@ -2771,11 +2771,11 @@ public class StrBuilder implements CharSequence,
Appendable, Serializable, Build
public String rightString(final int length) {
if (length <= 0) {
return StringUtils.EMPTY;
- } else if (length >= size) {
+ }
+ if (length >= size) {
return new String(buffer, 0, size);
- } else {
- return new String(buffer, size - length, length);
}
+ return new String(buffer, size - length, length);
}
/**
diff --git a/src/main/java/org/apache/commons/text/TextStringBuilder.java
b/src/main/java/org/apache/commons/text/TextStringBuilder.java
index d2fb665..c7c0884 100644
--- a/src/main/java/org/apache/commons/text/TextStringBuilder.java
+++ b/src/main/java/org/apache/commons/text/TextStringBuilder.java
@@ -2420,11 +2420,11 @@ public class TextStringBuilder implements CharSequence,
Appendable, Serializable
public String leftString(final int length) {
if (length <= 0) {
return StringUtils.EMPTY;
- } else if (length >= size) {
+ }
+ if (length >= size) {
return new String(buffer, 0, size);
- } else {
- return new String(buffer, 0, length);
}
+ return new String(buffer, 0, length);
}
/**
@@ -2508,21 +2508,21 @@ public class TextStringBuilder implements CharSequence,
Appendable, Serializable
public int readFrom(final Readable readable) throws IOException {
if (readable instanceof Reader) {
return readFrom((Reader) readable);
- } else if (readable instanceof CharBuffer) {
+ }
+ if (readable instanceof CharBuffer) {
return readFrom((CharBuffer) readable);
- } else {
- final int oldSize = size;
- while (true) {
- ensureCapacity(size + 1);
- final CharBuffer buf = CharBuffer.wrap(buffer, size,
buffer.length - size);
- final int read = readable.read(buf);
- if (read == EOS) {
- break;
- }
- size += read;
+ }
+ final int oldSize = size;
+ while (true) {
+ ensureCapacity(size + 1);
+ final CharBuffer buf = CharBuffer.wrap(buffer, size, buffer.length
- size);
+ final int read = readable.read(buf);
+ if (read == EOS) {
+ break;
}
- return size - oldSize;
+ size += read;
}
+ return size - oldSize;
}
/**
@@ -2828,11 +2828,11 @@ public class TextStringBuilder implements CharSequence,
Appendable, Serializable
public String rightString(final int length) {
if (length <= 0) {
return StringUtils.EMPTY;
- } else if (length >= size) {
+ }
+ if (length >= size) {
return new String(buffer, 0, size);
- } else {
- return new String(buffer, size - length, length);
}
+ return new String(buffer, size - length, length);
}
/**
diff --git
a/src/main/java/org/apache/commons/text/io/StringSubstitutorReader.java
b/src/main/java/org/apache/commons/text/io/StringSubstitutorReader.java
index fbe151b..f5a26d9 100644
--- a/src/main/java/org/apache/commons/text/io/StringSubstitutorReader.java
+++ b/src/main/java/org/apache/commons/text/io/StringSubstitutorReader.java
@@ -231,7 +231,8 @@ public class StringSubstitutorReader extends FilterReader {
balance = 1;
pos = prefixMatcher.size();
break;
- } else if (isBufferMatchAt(prefixEscapeMatcher, 0)) {
+ }
+ if (isBufferMatchAt(prefixEscapeMatcher, 0)) {
balance = 1;
pos = prefixEscapeMatcher.size();
break;
diff --git
a/src/main/java/org/apache/commons/text/lookup/ResourceBundleStringLookup.java
b/src/main/java/org/apache/commons/text/lookup/ResourceBundleStringLookup.java
index cd27168..7c0a7b0 100644
---
a/src/main/java/org/apache/commons/text/lookup/ResourceBundleStringLookup.java
+++
b/src/main/java/org/apache/commons/text/lookup/ResourceBundleStringLookup.java
@@ -94,7 +94,8 @@ final class ResourceBundleStringLookup extends
AbstractStringLookup {
if (anyBundle && keyLen != 2) {
throw IllegalArgumentExceptions
.format("Bad resource bundle key format [%s]; expected format
is BundleName:KeyName.", key);
- } else if (bundleName != null && keyLen != 1) {
+ }
+ if (bundleName != null && keyLen != 1) {
throw IllegalArgumentExceptions.format("Bad resource bundle key
format [%s]; expected format is KeyName.",
key);
}
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 ab1b7ea..d5f0a56 100644
--- a/src/main/java/org/apache/commons/text/similarity/JaroWinklerDistance.java
+++ b/src/main/java/org/apache/commons/text/similarity/JaroWinklerDistance.java
@@ -146,11 +146,10 @@ public class JaroWinklerDistance implements
EditDistance<Double> {
}
int prefix = 0;
for (int mi = 0; mi < Math.min(4, min.length()); mi++) {
- if (first.charAt(mi) == second.charAt(mi)) {
- prefix++;
- } else {
+ if (first.charAt(mi) != second.charAt(mi)) {
break;
}
+ prefix++;
}
return new int[] {matches, halfTranspositions, prefix};
}
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 7ff5869..21a4274 100644
---
a/src/main/java/org/apache/commons/text/similarity/JaroWinklerSimilarity.java
+++
b/src/main/java/org/apache/commons/text/similarity/JaroWinklerSimilarity.java
@@ -152,11 +152,10 @@ public class JaroWinklerSimilarity implements
SimilarityScore<Double> {
}
int prefix = 0;
for (int mi = 0; mi < Math.min(4, min.length()); mi++) {
- if (first.charAt(mi) == second.charAt(mi)) {
- prefix++;
- } else {
+ if (first.charAt(mi) != second.charAt(mi)) {
break;
}
+ prefix++;
}
return new int[] {matches, halfTranspositions, prefix};
}
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 2560d22..e505242 100644
---
a/src/main/java/org/apache/commons/text/similarity/LevenshteinDetailedDistance.java
+++
b/src/main/java/org/apache/commons/text/similarity/LevenshteinDetailedDistance.java
@@ -221,7 +221,8 @@ public class LevenshteinDetailedDistance implements
EditDistance<LevenshteinResu
// if one string is empty, the edit distance is necessarily the length
of the other
if (n == 0) {
return m <= threshold ? new LevenshteinResults(m, m, 0, 0) : new
LevenshteinResults(-1, 0, 0, 0);
- } else if (m == 0) {
+ }
+ if (m == 0) {
return n <= threshold ? new LevenshteinResults(n, 0, n, 0) : new
LevenshteinResults(-1, 0, 0, 0);
}
@@ -363,7 +364,8 @@ public class LevenshteinDetailedDistance implements
EditDistance<LevenshteinResu
if (n == 0) {
return new LevenshteinResults(m, m, 0, 0);
- } else if (m == 0) {
+ }
+ if (m == 0) {
return new LevenshteinResults(n, 0, n, 0);
}
boolean swapped = false;
diff --git
a/src/main/java/org/apache/commons/text/similarity/LevenshteinDistance.java
b/src/main/java/org/apache/commons/text/similarity/LevenshteinDistance.java
index 913ec24..1154027 100644
--- a/src/main/java/org/apache/commons/text/similarity/LevenshteinDistance.java
+++ b/src/main/java/org/apache/commons/text/similarity/LevenshteinDistance.java
@@ -228,7 +228,8 @@ public class LevenshteinDistance implements
EditDistance<Integer> {
// of the other
if (n == 0) {
return m <= threshold ? m : -1;
- } else if (m == 0) {
+ }
+ if (m == 0) {
return n <= threshold ? n : -1;
}
@@ -353,7 +354,8 @@ public class LevenshteinDistance implements
EditDistance<Integer> {
if (n == 0) {
return m;
- } else if (m == 0) {
+ }
+ if (m == 0) {
return n;
}
