Skip to content

Commit 7b3e0ca

Browse files
committed
Use isEmpty().
Prefix internal class name with Abstract. Fix Checkstyle XML.
1 parent 2e9785b commit 7b3e0ca

10 files changed

Lines changed: 15 additions & 11 deletions

File tree

checkstyle-suppressions.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ limitations under the License.
1818
-->
1919

2020
<!DOCTYPE suppressions PUBLIC
21-
-//Checkstyle//DTD SuppressionFilter Configuration 1.0//EN
21+
"-//Checkstyle//DTD SuppressionFilter Configuration 1.0//EN"
2222
"https://checkstyle.org/dtds/suppressions_1_0.dtd">
2323

2424
<suppressions>

src/main/java/org/apache/commons/codec/language/Caverphone1.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ public class Caverphone1 extends AbstractCaverphone {
4343
@Override
4444
public String encode(final String source) {
4545
String txt = source;
46-
if (txt == null || txt.length() == 0) {
46+
if (txt == null || txt.isEmpty()) {
4747
return SIX_1;
4848
}
4949

src/main/java/org/apache/commons/codec/language/Caverphone2.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ public class Caverphone2 extends AbstractCaverphone {
4343
@Override
4444
public String encode(final String source) {
4545
String txt = source;
46-
if (txt == null || txt.length() == 0) {
46+
if (txt == null || txt.isEmpty()) {
4747
return TEN_1;
4848
}
4949

src/main/java/org/apache/commons/codec/language/ColognePhonetic.java

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -199,7 +199,7 @@ public class ColognePhonetic implements StringEncoder {
199199
* However, it is not shared between threads, as it is constructed on demand
200200
* by the method {@link ColognePhonetic#colognePhonetic(String)}
201201
*/
202-
private abstract class CologneBuffer {
202+
abstract class CologneBuffer {
203203

204204
protected final char[] data;
205205

@@ -225,6 +225,10 @@ public int length() {
225225
public String toString() {
226226
return new String(copyData(0, length));
227227
}
228+
229+
public boolean isEmpty() {
230+
return length() == 0;
231+
}
228232
}
229233

230234
private class CologneOutputBuffer extends CologneBuffer {
@@ -353,7 +357,7 @@ public String colognePhonetic(final String text) {
353357
} else if (chr == 'S' || chr == 'Z') {
354358
output.put('8');
355359
} else if (chr == 'C') {
356-
if (output.length() == 0) {
360+
if (output.isEmpty()) {
357361
if (arrayContains(AHKLOQRUX, nextChar)) {
358362
output.put('4');
359363
} else {

src/main/java/org/apache/commons/codec/language/DaitchMokotoffSoundex.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -270,7 +270,7 @@ private static void parseRules(final Scanner scanner, final String location,
270270
// trim leading-trailing whitespace
271271
line = line.trim();
272272

273-
if (line.length() == 0) {
273+
if (line.isEmpty()) {
274274
continue; // empty lines can be safely skipped
275275
}
276276

src/main/java/org/apache/commons/codec/language/DoubleMetaphone.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -888,7 +888,7 @@ private String cleanInput(String input) {
888888
return null;
889889
}
890890
input = input.trim();
891-
if (input.length() == 0) {
891+
if (input.isEmpty()) {
892892
return null;
893893
}
894894
return input.toUpperCase(java.util.Locale.ENGLISH);

src/main/java/org/apache/commons/codec/language/Nysiis.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -253,7 +253,7 @@ public String nysiis(String str) {
253253
// Use the same clean rules as Soundex
254254
str = SoundexUtils.clean(str);
255255

256-
if (str.length() == 0) {
256+
if (str.isEmpty()) {
257257
return str;
258258
}
259259

src/main/java/org/apache/commons/codec/language/RefinedSoundex.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -189,7 +189,7 @@ public String soundex(String str) {
189189
return null;
190190
}
191191
str = SoundexUtils.clean(str);
192-
if (str.length() == 0) {
192+
if (str.isEmpty()) {
193193
return str;
194194
}
195195

src/main/java/org/apache/commons/codec/language/Soundex.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -304,7 +304,7 @@ public String soundex(String str) {
304304
return null;
305305
}
306306
str = SoundexUtils.clean(str);
307-
if (str.length() == 0) {
307+
if (str.isEmpty()) {
308308
return str;
309309
}
310310
final char out[] = {'0', '0', '0', '0'};

src/main/java/org/apache/commons/codec/language/SoundexUtils.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ final class SoundexUtils {
3838
* @return A clean String.
3939
*/
4040
static String clean(final String str) {
41-
if (str == null || str.length() == 0) {
41+
if (str == null || str.isEmpty()) {
4242
return str;
4343
}
4444
final int len = str.length();

0 commit comments

Comments
 (0)