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 2021/01/17 14:12:49 UTC
[commons-codec] branch master updated: Use isEmpty().
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-codec.git
The following commit(s) were added to refs/heads/master by this push:
new 7b3e0ca Use isEmpty().
7b3e0ca is described below
commit 7b3e0ca1db1beef70cf4731a9c4f40fcd58be296
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Sun Jan 17 09:12:45 2021 -0500
Use isEmpty().
Prefix internal class name with Abstract.
Fix Checkstyle XML.
---
checkstyle-suppressions.xml | 2 +-
src/main/java/org/apache/commons/codec/language/Caverphone1.java | 2 +-
src/main/java/org/apache/commons/codec/language/Caverphone2.java | 2 +-
.../java/org/apache/commons/codec/language/ColognePhonetic.java | 8 ++++++--
.../org/apache/commons/codec/language/DaitchMokotoffSoundex.java | 2 +-
.../java/org/apache/commons/codec/language/DoubleMetaphone.java | 2 +-
src/main/java/org/apache/commons/codec/language/Nysiis.java | 2 +-
.../java/org/apache/commons/codec/language/RefinedSoundex.java | 2 +-
src/main/java/org/apache/commons/codec/language/Soundex.java | 2 +-
src/main/java/org/apache/commons/codec/language/SoundexUtils.java | 2 +-
10 files changed, 15 insertions(+), 11 deletions(-)
diff --git a/checkstyle-suppressions.xml b/checkstyle-suppressions.xml
index fd98272..f5dc46b 100644
--- a/checkstyle-suppressions.xml
+++ b/checkstyle-suppressions.xml
@@ -18,7 +18,7 @@ limitations under the License.
-->
<!DOCTYPE suppressions PUBLIC
- -//Checkstyle//DTD SuppressionFilter Configuration 1.0//EN
+ "-//Checkstyle//DTD SuppressionFilter Configuration 1.0//EN"
"https://checkstyle.org/dtds/suppressions_1_0.dtd">
<suppressions>
diff --git a/src/main/java/org/apache/commons/codec/language/Caverphone1.java b/src/main/java/org/apache/commons/codec/language/Caverphone1.java
index e50456d..9be557c 100644
--- a/src/main/java/org/apache/commons/codec/language/Caverphone1.java
+++ b/src/main/java/org/apache/commons/codec/language/Caverphone1.java
@@ -43,7 +43,7 @@ public class Caverphone1 extends AbstractCaverphone {
@Override
public String encode(final String source) {
String txt = source;
- if (txt == null || txt.length() == 0) {
+ if (txt == null || txt.isEmpty()) {
return SIX_1;
}
diff --git a/src/main/java/org/apache/commons/codec/language/Caverphone2.java b/src/main/java/org/apache/commons/codec/language/Caverphone2.java
index b43bd92..1a38ec6 100644
--- a/src/main/java/org/apache/commons/codec/language/Caverphone2.java
+++ b/src/main/java/org/apache/commons/codec/language/Caverphone2.java
@@ -43,7 +43,7 @@ public class Caverphone2 extends AbstractCaverphone {
@Override
public String encode(final String source) {
String txt = source;
- if (txt == null || txt.length() == 0) {
+ if (txt == null || txt.isEmpty()) {
return TEN_1;
}
diff --git a/src/main/java/org/apache/commons/codec/language/ColognePhonetic.java b/src/main/java/org/apache/commons/codec/language/ColognePhonetic.java
index ff78a32..3555e8e 100644
--- a/src/main/java/org/apache/commons/codec/language/ColognePhonetic.java
+++ b/src/main/java/org/apache/commons/codec/language/ColognePhonetic.java
@@ -199,7 +199,7 @@ public class ColognePhonetic implements StringEncoder {
* However, it is not shared between threads, as it is constructed on demand
* by the method {@link ColognePhonetic#colognePhonetic(String)}
*/
- private abstract class CologneBuffer {
+ abstract class CologneBuffer {
protected final char[] data;
@@ -225,6 +225,10 @@ public class ColognePhonetic implements StringEncoder {
public String toString() {
return new String(copyData(0, length));
}
+
+ public boolean isEmpty() {
+ return length() == 0;
+ }
}
private class CologneOutputBuffer extends CologneBuffer {
@@ -353,7 +357,7 @@ public class ColognePhonetic implements StringEncoder {
} else if (chr == 'S' || chr == 'Z') {
output.put('8');
} else if (chr == 'C') {
- if (output.length() == 0) {
+ if (output.isEmpty()) {
if (arrayContains(AHKLOQRUX, nextChar)) {
output.put('4');
} else {
diff --git a/src/main/java/org/apache/commons/codec/language/DaitchMokotoffSoundex.java b/src/main/java/org/apache/commons/codec/language/DaitchMokotoffSoundex.java
index 1e6674c..cff0f1e 100644
--- a/src/main/java/org/apache/commons/codec/language/DaitchMokotoffSoundex.java
+++ b/src/main/java/org/apache/commons/codec/language/DaitchMokotoffSoundex.java
@@ -270,7 +270,7 @@ public class DaitchMokotoffSoundex implements StringEncoder {
// trim leading-trailing whitespace
line = line.trim();
- if (line.length() == 0) {
+ if (line.isEmpty()) {
continue; // empty lines can be safely skipped
}
diff --git a/src/main/java/org/apache/commons/codec/language/DoubleMetaphone.java b/src/main/java/org/apache/commons/codec/language/DoubleMetaphone.java
index 91effaf..63e0922 100644
--- a/src/main/java/org/apache/commons/codec/language/DoubleMetaphone.java
+++ b/src/main/java/org/apache/commons/codec/language/DoubleMetaphone.java
@@ -888,7 +888,7 @@ public class DoubleMetaphone implements StringEncoder {
return null;
}
input = input.trim();
- if (input.length() == 0) {
+ if (input.isEmpty()) {
return null;
}
return input.toUpperCase(java.util.Locale.ENGLISH);
diff --git a/src/main/java/org/apache/commons/codec/language/Nysiis.java b/src/main/java/org/apache/commons/codec/language/Nysiis.java
index cafc916..597e785 100644
--- a/src/main/java/org/apache/commons/codec/language/Nysiis.java
+++ b/src/main/java/org/apache/commons/codec/language/Nysiis.java
@@ -253,7 +253,7 @@ public class Nysiis implements StringEncoder {
// Use the same clean rules as Soundex
str = SoundexUtils.clean(str);
- if (str.length() == 0) {
+ if (str.isEmpty()) {
return str;
}
diff --git a/src/main/java/org/apache/commons/codec/language/RefinedSoundex.java b/src/main/java/org/apache/commons/codec/language/RefinedSoundex.java
index 54dcd74..e98f1a0 100644
--- a/src/main/java/org/apache/commons/codec/language/RefinedSoundex.java
+++ b/src/main/java/org/apache/commons/codec/language/RefinedSoundex.java
@@ -189,7 +189,7 @@ public class RefinedSoundex implements StringEncoder {
return null;
}
str = SoundexUtils.clean(str);
- if (str.length() == 0) {
+ if (str.isEmpty()) {
return str;
}
diff --git a/src/main/java/org/apache/commons/codec/language/Soundex.java b/src/main/java/org/apache/commons/codec/language/Soundex.java
index c2106dd..cc9f62c 100644
--- a/src/main/java/org/apache/commons/codec/language/Soundex.java
+++ b/src/main/java/org/apache/commons/codec/language/Soundex.java
@@ -304,7 +304,7 @@ public class Soundex implements StringEncoder {
return null;
}
str = SoundexUtils.clean(str);
- if (str.length() == 0) {
+ if (str.isEmpty()) {
return str;
}
final char out[] = {'0', '0', '0', '0'};
diff --git a/src/main/java/org/apache/commons/codec/language/SoundexUtils.java b/src/main/java/org/apache/commons/codec/language/SoundexUtils.java
index 75eadf2..16dee9b 100644
--- a/src/main/java/org/apache/commons/codec/language/SoundexUtils.java
+++ b/src/main/java/org/apache/commons/codec/language/SoundexUtils.java
@@ -38,7 +38,7 @@ final class SoundexUtils {
* @return A clean String.
*/
static String clean(final String str) {
- if (str == null || str.length() == 0) {
+ if (str == null || str.isEmpty()) {
return str;
}
final int len = str.length();