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
commit 8be1e90f56caedeec5bbe6778bbe14f6c39c3502 Author: Gary D. Gregory <garydgreg...@gmail.com> AuthorDate: Mon May 19 08:04:52 2025 -0400 Use an import instead of a FQCN --- src/main/java/org/apache/commons/codec/language/Caverphone1.java | 4 +++- src/main/java/org/apache/commons/codec/language/Caverphone2.java | 4 +++- .../java/org/apache/commons/codec/language/DoubleMetaphone.java | 4 +++- src/main/java/org/apache/commons/codec/language/Metaphone.java | 6 ++++-- src/main/java/org/apache/commons/codec/language/SoundexUtils.java | 6 ++++-- 5 files changed, 17 insertions(+), 7 deletions(-) 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 72b98b6f..77495d70 100644 --- a/src/main/java/org/apache/commons/codec/language/Caverphone1.java +++ b/src/main/java/org/apache/commons/codec/language/Caverphone1.java @@ -17,6 +17,8 @@ package org.apache.commons.codec.language; +import java.util.Locale; + /** * Encodes a string into a Caverphone 1.0 value. * @@ -55,7 +57,7 @@ public class Caverphone1 extends AbstractCaverphone { } // 1. Convert to lowercase - txt = txt.toLowerCase(java.util.Locale.ENGLISH); + txt = txt.toLowerCase(Locale.ENGLISH); // 2. Remove anything not A-Z txt = txt.replaceAll("[^a-z]", ""); 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 b4fe12c1..bcd2e3a7 100644 --- a/src/main/java/org/apache/commons/codec/language/Caverphone2.java +++ b/src/main/java/org/apache/commons/codec/language/Caverphone2.java @@ -17,6 +17,8 @@ package org.apache.commons.codec.language; +import java.util.Locale; + /** * Encodes a string into a Caverphone 2.0 value. * @@ -55,7 +57,7 @@ public class Caverphone2 extends AbstractCaverphone { } // 1. Convert to lowercase - txt = txt.toLowerCase(java.util.Locale.ENGLISH); + txt = txt.toLowerCase(Locale.ENGLISH); // 2. Remove anything not A-Z txt = txt.replaceAll("[^a-z]", ""); 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 7c87ddd6..150f8157 100644 --- a/src/main/java/org/apache/commons/codec/language/DoubleMetaphone.java +++ b/src/main/java/org/apache/commons/codec/language/DoubleMetaphone.java @@ -17,6 +17,8 @@ package org.apache.commons.codec.language; +import java.util.Locale; + import org.apache.commons.codec.EncoderException; import org.apache.commons.codec.StringEncoder; import org.apache.commons.codec.binary.StringUtils; @@ -248,7 +250,7 @@ public class DoubleMetaphone implements StringEncoder { if (input.isEmpty()) { return null; } - return input.toUpperCase(java.util.Locale.ENGLISH); + return input.toUpperCase(Locale.ENGLISH); } /** diff --git a/src/main/java/org/apache/commons/codec/language/Metaphone.java b/src/main/java/org/apache/commons/codec/language/Metaphone.java index 34664e0d..6a964fe4 100644 --- a/src/main/java/org/apache/commons/codec/language/Metaphone.java +++ b/src/main/java/org/apache/commons/codec/language/Metaphone.java @@ -17,6 +17,8 @@ package org.apache.commons.codec.language; +import java.util.Locale; + import org.apache.commons.codec.EncoderException; import org.apache.commons.codec.StringEncoder; @@ -175,10 +177,10 @@ public class Metaphone implements StringEncoder { } // single character is itself if (txtLength == 1) { - return txt.toUpperCase(java.util.Locale.ENGLISH); + return txt.toUpperCase(Locale.ENGLISH); } - final char[] inwd = txt.toUpperCase(java.util.Locale.ENGLISH).toCharArray(); + final char[] inwd = txt.toUpperCase(Locale.ENGLISH).toCharArray(); final StringBuilder local = new StringBuilder(40); // manipulate final StringBuilder code = new StringBuilder(10); // output 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 c40b7cf2..2750ffe1 100644 --- a/src/main/java/org/apache/commons/codec/language/SoundexUtils.java +++ b/src/main/java/org/apache/commons/codec/language/SoundexUtils.java @@ -17,6 +17,8 @@ package org.apache.commons.codec.language; +import java.util.Locale; + import org.apache.commons.codec.EncoderException; import org.apache.commons.codec.StringEncoder; @@ -50,9 +52,9 @@ final class SoundexUtils { } } if (count == len) { - return str.toUpperCase(java.util.Locale.ENGLISH); + return str.toUpperCase(Locale.ENGLISH); } - return new String(chars, 0, count).toUpperCase(java.util.Locale.ENGLISH); + return new String(chars, 0, count).toUpperCase(Locale.ENGLISH); } /**