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
commit 11606879ecea875afd325367a1fab9f4d0cc7721 Author: Gary Gregory <[email protected]> AuthorDate: Sun May 15 18:53:51 2022 -0400 Use compact array notation Refactor duplication out of if/else --- checkstyle.xml | 2 -- src/main/java/org/apache/commons/text/WordUtils.java | 9 +++++---- .../apache/commons/text/translate/CharSequenceTranslator.java | 5 +---- .../java/org/apache/commons/text/translate/CsvTranslators.java | 3 +-- 4 files changed, 7 insertions(+), 12 deletions(-) diff --git a/checkstyle.xml b/checkstyle.xml index 4cb3262a..4ef4ccd8 100644 --- a/checkstyle.xml +++ b/checkstyle.xml @@ -140,8 +140,6 @@ <!-- See http://checkstyle.sf.net/config_whitespace.html --> <module name="EmptyForIteratorPad"/> <module name="MethodParamPad"/> - <module name="NoWhitespaceAfter"/> - <module name="NoWhitespaceBefore"/> <module name="OperatorWrap"/> <module name="ParenPad"/> <module name="TypecastParenPad"/> diff --git a/src/main/java/org/apache/commons/text/WordUtils.java b/src/main/java/org/apache/commons/text/WordUtils.java index fb848b8a..ea83eb2c 100644 --- a/src/main/java/org/apache/commons/text/WordUtils.java +++ b/src/main/java/org/apache/commons/text/WordUtils.java @@ -103,11 +103,12 @@ public class WordUtils { if (upper != str.length()) { result.append(StringUtils.defaultString(appendToEnd)); } - } else if (index > upper) { - result.append(str, 0, upper); - result.append(StringUtils.defaultString(appendToEnd)); } else { - result.append(str, 0, index); + if (index > upper) { + result.append(str, 0, upper); + } else { + result.append(str, 0, index); + } result.append(StringUtils.defaultString(appendToEnd)); } diff --git a/src/main/java/org/apache/commons/text/translate/CharSequenceTranslator.java b/src/main/java/org/apache/commons/text/translate/CharSequenceTranslator.java index b1b56f4b..526d00c4 100644 --- a/src/main/java/org/apache/commons/text/translate/CharSequenceTranslator.java +++ b/src/main/java/org/apache/commons/text/translate/CharSequenceTranslator.java @@ -36,10 +36,7 @@ public abstract class CharSequenceTranslator { /** * Array containing the hexadecimal alphabet. */ - static final char[] HEX_DIGITS = new char[] {'0', '1', '2', '3', - '4', '5', '6', '7', - '8', '9', 'A', 'B', - 'C', 'D', 'E', 'F'}; + static final char[] HEX_DIGITS = { '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B', 'C', 'D', 'E', 'F' }; /** * Returns an upper case hexadecimal {@code String} for the given diff --git a/src/main/java/org/apache/commons/text/translate/CsvTranslators.java b/src/main/java/org/apache/commons/text/translate/CsvTranslators.java index 84f786b2..d6bb8bef 100644 --- a/src/main/java/org/apache/commons/text/translate/CsvTranslators.java +++ b/src/main/java/org/apache/commons/text/translate/CsvTranslators.java @@ -86,8 +86,7 @@ public final class CsvTranslators { private static final String CSV_ESCAPED_QUOTE_STR = CSV_QUOTE_STR + CSV_QUOTE_STR; /** CSV key characters in an array. */ - private static final char[] CSV_SEARCH_CHARS = - new char[] {CSV_DELIMITER, CSV_QUOTE, CharUtils.CR, CharUtils.LF}; + private static final char[] CSV_SEARCH_CHARS = { CSV_DELIMITER, CSV_QUOTE, CharUtils.CR, CharUtils.LF }; /** Hidden constructor. */ private CsvTranslators() { }
