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/08/06 16:09:44 UTC
[commons-codec] branch master updated (b1f6f2e -> b98cd31)
This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/commons-codec.git.
from b1f6f2e Bump animal-sniffer-maven-plugin from 1.19 to 1.20.
new 6b634ed Combine else if.
new ee33dfe Bump maven-surefire-plugin from 2.22.2 to 3.0.0-M5.
new b98cd31 Simpler array creation.
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
pom.xml | 1 +
.../apache/commons/codec/binary/BinaryCodec.java | 4 +-
.../apache/commons/codec/digest/PureJavaCrc32.java | 2 +-
.../commons/codec/digest/PureJavaCrc32C.java | 2 +-
.../commons/codec/language/ColognePhonetic.java | 26 +++--
.../commons/codec/language/DoubleMetaphone.java | 50 ++++-----
.../codec/language/MatchRatingApproachEncoder.java | 4 +-
.../org/apache/commons/codec/language/Nysiis.java | 18 ++--
.../org/apache/commons/codec/language/bm/Lang.java | 56 +++++-----
.../commons/codec/language/bm/Languages.java | 10 +-
.../org/apache/commons/codec/language/bm/Rule.java | 120 ++++++++++-----------
.../org/apache/commons/codec/net/PercentCodec.java | 16 ++-
.../codec/binary/Base16InputStreamTest.java | 4 +-
.../codec/binary/Base16OutputStreamTest.java | 4 +-
.../apache/commons/codec/binary/Base16Test.java | 6 +-
.../codec/binary/Base32InputStreamTest.java | 4 +-
.../codec/binary/Base32OutputStreamTest.java | 4 +-
.../apache/commons/codec/binary/Base32Test.java | 2 +-
.../codec/binary/Base64InputStreamTest.java | 4 +-
.../codec/binary/Base64OutputStreamTest.java | 4 +-
.../apache/commons/codec/binary/Base64Test.java | 8 +-
.../apache/commons/codec/digest/Apr1CryptTest.java | 4 +-
.../org/apache/commons/codec/digest/CryptTest.java | 2 +-
.../commons/codec/digest/HmacAlgorithmsTest.java | 14 +--
.../codec/language/DoubleMetaphone2Test.java | 2 +-
.../codec/language/DoubleMetaphoneTest.java | 4 +-
.../codec/language/bm/BeiderMorseEncoderTest.java | 2 +-
27 files changed, 181 insertions(+), 196 deletions(-)
[commons-codec] 03/03: Simpler array creation.
Posted by gg...@apache.org.
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 b98cd31a38dc4133ffdc046febe9f6582fc9dc35
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Fri Aug 6 12:09:17 2021 -0400
Simpler array creation.
---
.../org/apache/commons/codec/binary/BinaryCodec.java | 4 ++--
.../org/apache/commons/codec/digest/PureJavaCrc32.java | 2 +-
.../apache/commons/codec/digest/PureJavaCrc32C.java | 2 +-
.../apache/commons/codec/language/ColognePhonetic.java | 18 +++++++++---------
.../codec/language/MatchRatingApproachEncoder.java | 4 ++--
.../java/org/apache/commons/codec/language/Nysiis.java | 18 +++++++++---------
.../commons/codec/binary/Base16InputStreamTest.java | 4 ++--
.../commons/codec/binary/Base16OutputStreamTest.java | 4 ++--
.../org/apache/commons/codec/binary/Base16Test.java | 6 +++---
.../commons/codec/binary/Base32InputStreamTest.java | 4 ++--
.../commons/codec/binary/Base32OutputStreamTest.java | 4 ++--
.../org/apache/commons/codec/binary/Base32Test.java | 2 +-
.../commons/codec/binary/Base64InputStreamTest.java | 4 ++--
.../commons/codec/binary/Base64OutputStreamTest.java | 4 ++--
.../org/apache/commons/codec/binary/Base64Test.java | 8 ++++----
.../org/apache/commons/codec/digest/Apr1CryptTest.java | 4 ++--
.../org/apache/commons/codec/digest/CryptTest.java | 2 +-
.../commons/codec/digest/HmacAlgorithmsTest.java | 14 +++++++-------
.../commons/codec/language/DoubleMetaphone2Test.java | 2 +-
.../commons/codec/language/DoubleMetaphoneTest.java | 4 ++--
.../codec/language/bm/BeiderMorseEncoderTest.java | 2 +-
21 files changed, 58 insertions(+), 58 deletions(-)
diff --git a/src/main/java/org/apache/commons/codec/binary/BinaryCodec.java b/src/main/java/org/apache/commons/codec/binary/BinaryCodec.java
index c7f383e..b67ad4b 100644
--- a/src/main/java/org/apache/commons/codec/binary/BinaryCodec.java
+++ b/src/main/java/org/apache/commons/codec/binary/BinaryCodec.java
@@ -38,10 +38,10 @@ public class BinaryCodec implements BinaryDecoder, BinaryEncoder {
* it.
*/
/** Empty char array. */
- private static final char[] EMPTY_CHAR_ARRAY = new char[0];
+ private static final char[] EMPTY_CHAR_ARRAY = {};
/** Empty byte array. */
- private static final byte[] EMPTY_BYTE_ARRAY = new byte[0];
+ private static final byte[] EMPTY_BYTE_ARRAY = {};
/** Mask for bit 0 of a byte. */
private static final int BIT_0 = 1;
diff --git a/src/main/java/org/apache/commons/codec/digest/PureJavaCrc32.java b/src/main/java/org/apache/commons/codec/digest/PureJavaCrc32.java
index 5c2d97e..aa93c82 100644
--- a/src/main/java/org/apache/commons/codec/digest/PureJavaCrc32.java
+++ b/src/main/java/org/apache/commons/codec/digest/PureJavaCrc32.java
@@ -107,7 +107,7 @@ public class PureJavaCrc32 implements Checksum {
* CRC-32 lookup tables generated by the polynomial 0xEDB88320.
* See also TestPureJavaCrc32.Table.
*/
- private static final int[] T = new int[] {
+ private static final int[] T = {
/* T8_0 */
0x00000000, 0x77073096, 0xEE0E612C, 0x990951BA,
0x076DC419, 0x706AF48F, 0xE963A535, 0x9E6495A3,
diff --git a/src/main/java/org/apache/commons/codec/digest/PureJavaCrc32C.java b/src/main/java/org/apache/commons/codec/digest/PureJavaCrc32C.java
index 3c8812e..ad9a6c0 100644
--- a/src/main/java/org/apache/commons/codec/digest/PureJavaCrc32C.java
+++ b/src/main/java/org/apache/commons/codec/digest/PureJavaCrc32C.java
@@ -115,7 +115,7 @@ public class PureJavaCrc32C implements Checksum {
private static final int T8_6_start = 6*256;
private static final int T8_7_start = 7*256;
- private static final int[] T = new int[] {
+ private static final int[] T = {
/* T8_0 */
0x00000000, 0xF26B8303, 0xE13B70F7, 0x1350F3F4,
0xC79A971F, 0x35F1141C, 0x26A1E7E8, 0xD4CA64EB,
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 cb206a6..73d77bd 100644
--- a/src/main/java/org/apache/commons/codec/language/ColognePhonetic.java
+++ b/src/main/java/org/apache/commons/codec/language/ColognePhonetic.java
@@ -182,15 +182,15 @@ import org.apache.commons.codec.StringEncoder;
public class ColognePhonetic implements StringEncoder {
// Predefined char arrays for better performance and less GC load
- private static final char[] AEIJOUY = new char[] { 'A', 'E', 'I', 'J', 'O', 'U', 'Y' };
- private static final char[] CSZ = new char[] { 'C', 'S', 'Z' };
- private static final char[] FPVW = new char[] { 'F', 'P', 'V', 'W' };
- private static final char[] GKQ = new char[] { 'G', 'K', 'Q' };
- private static final char[] CKQ = new char[] { 'C', 'K', 'Q' };
- private static final char[] AHKLOQRUX = new char[] { 'A', 'H', 'K', 'L', 'O', 'Q', 'R', 'U', 'X' };
- private static final char[] SZ = new char[] { 'S', 'Z' };
- private static final char[] AHKOQUX = new char[] { 'A', 'H', 'K', 'O', 'Q', 'U', 'X' };
- private static final char[] DTX = new char[] { 'D', 'T', 'X' };
+ private static final char[] AEIJOUY = { 'A', 'E', 'I', 'J', 'O', 'U', 'Y' };
+ private static final char[] CSZ = { 'C', 'S', 'Z' };
+ private static final char[] FPVW = { 'F', 'P', 'V', 'W' };
+ private static final char[] GKQ = { 'G', 'K', 'Q' };
+ private static final char[] CKQ = { 'C', 'K', 'Q' };
+ private static final char[] AHKLOQRUX = { 'A', 'H', 'K', 'L', 'O', 'Q', 'R', 'U', 'X' };
+ private static final char[] SZ = { 'S', 'Z' };
+ private static final char[] AHKOQUX = { 'A', 'H', 'K', 'O', 'Q', 'U', 'X' };
+ private static final char[] DTX = { 'D', 'T', 'X' };
private static final char CHAR_IGNORE = '-'; // is this character to be ignored?
diff --git a/src/main/java/org/apache/commons/codec/language/MatchRatingApproachEncoder.java b/src/main/java/org/apache/commons/codec/language/MatchRatingApproachEncoder.java
index cf22674..38a90f7 100644
--- a/src/main/java/org/apache/commons/codec/language/MatchRatingApproachEncoder.java
+++ b/src/main/java/org/apache/commons/codec/language/MatchRatingApproachEncoder.java
@@ -58,8 +58,8 @@ public class MatchRatingApproachEncoder implements StringEncoder {
"\u00C5\u00E5" + "\u00C7\u00E7" + "\u0150\u0151\u0170\u0171";
private static final String[] DOUBLE_CONSONANT =
- new String[] { "BB", "CC", "DD", "FF", "GG", "HH", "JJ", "KK", "LL", "MM", "NN", "PP", "QQ", "RR", "SS",
- "TT", "VV", "WW", "XX", "YY", "ZZ" };
+ { "BB", "CC", "DD", "FF", "GG", "HH", "JJ", "KK", "LL", "MM", "NN", "PP", "QQ", "RR", "SS",
+ "TT", "VV", "WW", "XX", "YY", "ZZ" };
/**
* Cleans up a name: 1. Upper-cases everything 2. Removes some common punctuation 3. Removes accents 4. Removes any
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 597e785..fe11880 100644
--- a/src/main/java/org/apache/commons/codec/language/Nysiis.java
+++ b/src/main/java/org/apache/commons/codec/language/Nysiis.java
@@ -68,15 +68,15 @@ import org.apache.commons.codec.StringEncoder;
*/
public class Nysiis implements StringEncoder {
- private static final char[] CHARS_A = new char[] { 'A' };
- private static final char[] CHARS_AF = new char[] { 'A', 'F' };
- private static final char[] CHARS_C = new char[] { 'C' };
- private static final char[] CHARS_FF = new char[] { 'F', 'F' };
- private static final char[] CHARS_G = new char[] { 'G' };
- private static final char[] CHARS_N = new char[] { 'N' };
- private static final char[] CHARS_NN = new char[] { 'N', 'N' };
- private static final char[] CHARS_S = new char[] { 'S' };
- private static final char[] CHARS_SSS = new char[] { 'S', 'S', 'S' };
+ private static final char[] CHARS_A = { 'A' };
+ private static final char[] CHARS_AF = { 'A', 'F' };
+ private static final char[] CHARS_C = { 'C' };
+ private static final char[] CHARS_FF = { 'F', 'F' };
+ private static final char[] CHARS_G = { 'G' };
+ private static final char[] CHARS_N = { 'N' };
+ private static final char[] CHARS_NN = { 'N', 'N' };
+ private static final char[] CHARS_S = { 'S' };
+ private static final char[] CHARS_SSS = { 'S', 'S', 'S' };
private static final Pattern PAT_MAC = Pattern.compile("^MAC");
private static final Pattern PAT_KN = Pattern.compile("^KN");
diff --git a/src/test/java/org/apache/commons/codec/binary/Base16InputStreamTest.java b/src/test/java/org/apache/commons/codec/binary/Base16InputStreamTest.java
index ef123b5..e360fe0 100644
--- a/src/test/java/org/apache/commons/codec/binary/Base16InputStreamTest.java
+++ b/src/test/java/org/apache/commons/codec/binary/Base16InputStreamTest.java
@@ -66,8 +66,8 @@ public class Base16InputStreamTest {
*/
@Test
public void testBase16EmptyInputStream() throws IOException {
- final byte[] emptyEncoded = new byte[0];
- final byte[] emptyDecoded = new byte[0];
+ final byte[] emptyEncoded = {};
+ final byte[] emptyDecoded = {};
testByteByByte(emptyEncoded, emptyDecoded);
testByChunk(emptyEncoded, emptyDecoded);
}
diff --git a/src/test/java/org/apache/commons/codec/binary/Base16OutputStreamTest.java b/src/test/java/org/apache/commons/codec/binary/Base16OutputStreamTest.java
index fd7b27a..57237d6 100644
--- a/src/test/java/org/apache/commons/codec/binary/Base16OutputStreamTest.java
+++ b/src/test/java/org/apache/commons/codec/binary/Base16OutputStreamTest.java
@@ -40,8 +40,8 @@ public class Base16OutputStreamTest {
*/
@Test
public void testBase16EmptyOutputStream() throws IOException {
- final byte[] emptyEncoded = new byte[0];
- final byte[] emptyDecoded = new byte[0];
+ final byte[] emptyEncoded = {};
+ final byte[] emptyDecoded = {};
testByteByByte(emptyEncoded, emptyDecoded);
testByChunk(emptyEncoded, emptyDecoded);
}
diff --git a/src/test/java/org/apache/commons/codec/binary/Base16Test.java b/src/test/java/org/apache/commons/codec/binary/Base16Test.java
index baae38f..15878dc 100644
--- a/src/test/java/org/apache/commons/codec/binary/Base16Test.java
+++ b/src/test/java/org/apache/commons/codec/binary/Base16Test.java
@@ -100,7 +100,7 @@ public class Base16Test {
*/
@Test(expected=RuntimeException.class)
public void testCodec68() {
- final byte[] x = new byte[] { 'n', 'H', '=', '=', (byte) 0x9c };
+ final byte[] x = { 'n', 'H', '=', '=', (byte) 0x9c };
final Base16 b16 = new Base16();
b16.decode(x);
}
@@ -137,7 +137,7 @@ public class Base16Test {
*/
@Test
public void testEmptyBase16() {
- byte[] empty = new byte[0];
+ byte[] empty = {};
byte[] result = new Base16().encode(empty);
assertEquals("empty Base16 encode", 0, result.length);
assertEquals("empty Base16 encode", null, new Base16().encode(null));
@@ -440,7 +440,7 @@ public class Base16Test {
public void testByteToStringVariations() throws DecoderException {
final Base16 base16 = new Base16();
final byte[] b1 = StringUtils.getBytesUtf8("Hello World");
- final byte[] b2 = new byte[0];
+ final byte[] b2 = {};
final byte[] b3 = null;
assertEquals("byteToString Hello World", "48656C6C6F20576F726C64", base16.encodeToString(b1));
diff --git a/src/test/java/org/apache/commons/codec/binary/Base32InputStreamTest.java b/src/test/java/org/apache/commons/codec/binary/Base32InputStreamTest.java
index 03670ae..7ea986b 100644
--- a/src/test/java/org/apache/commons/codec/binary/Base32InputStreamTest.java
+++ b/src/test/java/org/apache/commons/codec/binary/Base32InputStreamTest.java
@@ -183,8 +183,8 @@ public class Base32InputStreamTest {
}
private void testBase32EmptyInputStream(final int chuckSize) throws Exception {
- final byte[] emptyEncoded = new byte[0];
- final byte[] emptyDecoded = new byte[0];
+ final byte[] emptyEncoded = {};
+ final byte[] emptyDecoded = {};
testByteByByte(emptyEncoded, emptyDecoded, chuckSize, CRLF);
testByChunk(emptyEncoded, emptyDecoded, chuckSize, CRLF);
}
diff --git a/src/test/java/org/apache/commons/codec/binary/Base32OutputStreamTest.java b/src/test/java/org/apache/commons/codec/binary/Base32OutputStreamTest.java
index ad4c4af..ae928d3 100644
--- a/src/test/java/org/apache/commons/codec/binary/Base32OutputStreamTest.java
+++ b/src/test/java/org/apache/commons/codec/binary/Base32OutputStreamTest.java
@@ -83,8 +83,8 @@ public class Base32OutputStreamTest {
}
private void testBase32EmptyOutputStream(final int chunkSize) throws Exception {
- final byte[] emptyEncoded = new byte[0];
- final byte[] emptyDecoded = new byte[0];
+ final byte[] emptyEncoded = {};
+ final byte[] emptyDecoded = {};
testByteByByte(emptyEncoded, emptyDecoded, chunkSize, CR_LF);
testByChunk(emptyEncoded, emptyDecoded, chunkSize, CR_LF);
}
diff --git a/src/test/java/org/apache/commons/codec/binary/Base32Test.java b/src/test/java/org/apache/commons/codec/binary/Base32Test.java
index d84dd25..291a611 100644
--- a/src/test/java/org/apache/commons/codec/binary/Base32Test.java
+++ b/src/test/java/org/apache/commons/codec/binary/Base32Test.java
@@ -295,7 +295,7 @@ public class Base32Test {
*/
@Test
public void testEmptyBase32() {
- byte[] empty = new byte[0];
+ byte[] empty = {};
byte[] result = new Base32().encode(empty);
assertEquals("empty Base32 encode", 0, result.length);
assertEquals("empty Base32 encode", null, new Base32().encode(null));
diff --git a/src/test/java/org/apache/commons/codec/binary/Base64InputStreamTest.java b/src/test/java/org/apache/commons/codec/binary/Base64InputStreamTest.java
index 64e208f..0dd033d 100644
--- a/src/test/java/org/apache/commons/codec/binary/Base64InputStreamTest.java
+++ b/src/test/java/org/apache/commons/codec/binary/Base64InputStreamTest.java
@@ -192,8 +192,8 @@ public class Base64InputStreamTest {
}
private void testBase64EmptyInputStream(final int chuckSize) throws Exception {
- final byte[] emptyEncoded = new byte[0];
- final byte[] emptyDecoded = new byte[0];
+ final byte[] emptyEncoded = {};
+ final byte[] emptyDecoded = {};
testByteByByte(emptyEncoded, emptyDecoded, chuckSize, CRLF);
testByChunk(emptyEncoded, emptyDecoded, chuckSize, CRLF);
}
diff --git a/src/test/java/org/apache/commons/codec/binary/Base64OutputStreamTest.java b/src/test/java/org/apache/commons/codec/binary/Base64OutputStreamTest.java
index be35db3..08929a5 100644
--- a/src/test/java/org/apache/commons/codec/binary/Base64OutputStreamTest.java
+++ b/src/test/java/org/apache/commons/codec/binary/Base64OutputStreamTest.java
@@ -85,8 +85,8 @@ public class Base64OutputStreamTest {
}
private void testBase64EmptyOutputStream(final int chunkSize) throws Exception {
- final byte[] emptyEncoded = new byte[0];
- final byte[] emptyDecoded = new byte[0];
+ final byte[] emptyEncoded = {};
+ final byte[] emptyDecoded = {};
testByteByByte(emptyEncoded, emptyDecoded, chunkSize, CR_LF);
testByChunk(emptyEncoded, emptyDecoded, chunkSize, CR_LF);
}
diff --git a/src/test/java/org/apache/commons/codec/binary/Base64Test.java b/src/test/java/org/apache/commons/codec/binary/Base64Test.java
index 8b80a55..b89a85f 100644
--- a/src/test/java/org/apache/commons/codec/binary/Base64Test.java
+++ b/src/test/java/org/apache/commons/codec/binary/Base64Test.java
@@ -201,7 +201,7 @@ public class Base64Test {
*/
@Test
public void testCodec68() {
- final byte[] x = new byte[] { 'n', 'A', '=', '=', (byte) 0x9c };
+ final byte[] x = { 'n', 'A', '=', '=', (byte) 0x9c };
Base64.decodeBase64(x);
}
@@ -398,7 +398,7 @@ public class Base64Test {
*/
@Test
public void testEmptyBase64() {
- byte[] empty = new byte[0];
+ byte[] empty = {};
byte[] result = Base64.encodeBase64(empty);
assertEquals("empty base64 encode", 0, result.length);
assertEquals("empty base64 encode", null, Base64.encodeBase64(null));
@@ -448,7 +448,7 @@ public class Base64Test {
@Test
public void testCodec112() { // size calculation assumes always chunked
- final byte[] in = new byte[] { 0 };
+ final byte[] in = { 0 };
final byte[] out = Base64.encodeBase64(in);
Base64.encodeBase64(in, false, false, out.length);
}
@@ -1257,7 +1257,7 @@ public class Base64Test {
public void testByteToStringVariations() throws DecoderException {
final Base64 base64 = new Base64(0);
final byte[] b1 = StringUtils.getBytesUtf8("Hello World");
- final byte[] b2 = new byte[0];
+ final byte[] b2 = {};
final byte[] b3 = null;
final byte[] b4 = Hex.decodeHex("2bf7cc2701fe4397b49ebeed5acc7090"); // for
// url-safe
diff --git a/src/test/java/org/apache/commons/codec/digest/Apr1CryptTest.java b/src/test/java/org/apache/commons/codec/digest/Apr1CryptTest.java
index cdeb7dd..5571476 100644
--- a/src/test/java/org/apache/commons/codec/digest/Apr1CryptTest.java
+++ b/src/test/java/org/apache/commons/codec/digest/Apr1CryptTest.java
@@ -45,7 +45,7 @@ public class Apr1CryptTest {
@Test
public void testApr1CryptBytes() {
// random salt
- final byte[] keyBytes = new byte[] { '!', 'b', 'c', '.' };
+ final byte[] keyBytes = { '!', 'b', 'c', '.' };
final String hash = Md5Crypt.apr1Crypt(keyBytes);
assertEquals(hash, Md5Crypt.apr1Crypt("!bc.", hash));
@@ -60,7 +60,7 @@ public class Apr1CryptTest {
@Test
public void testApr1CryptBytesWithThreadLocalRandom() {
// random salt
- final byte[] keyBytes = new byte[] { '!', 'b', 'c', '.' };
+ final byte[] keyBytes = { '!', 'b', 'c', '.' };
final ThreadLocalRandom threadLocalRandom = ThreadLocalRandom.current();
final String hash = Md5Crypt.apr1Crypt(keyBytes, threadLocalRandom);
assertEquals(hash, Md5Crypt.apr1Crypt("!bc.", hash));
diff --git a/src/test/java/org/apache/commons/codec/digest/CryptTest.java b/src/test/java/org/apache/commons/codec/digest/CryptTest.java
index 2a8f804..a896649 100644
--- a/src/test/java/org/apache/commons/codec/digest/CryptTest.java
+++ b/src/test/java/org/apache/commons/codec/digest/CryptTest.java
@@ -38,7 +38,7 @@ public class CryptTest {
@Test
public void testCryptWithBytes() {
- final byte[] keyBytes = new byte[] { 'b', 'y', 't', 'e' };
+ final byte[] keyBytes = { 'b', 'y', 't', 'e' };
final String hash = Crypt.crypt(keyBytes);
assertEquals(hash, Crypt.crypt("byte", hash));
}
diff --git a/src/test/java/org/apache/commons/codec/digest/HmacAlgorithmsTest.java b/src/test/java/org/apache/commons/codec/digest/HmacAlgorithmsTest.java
index 58fe888..fecb7c5 100644
--- a/src/test/java/org/apache/commons/codec/digest/HmacAlgorithmsTest.java
+++ b/src/test/java/org/apache/commons/codec/digest/HmacAlgorithmsTest.java
@@ -49,7 +49,7 @@ public class HmacAlgorithmsTest {
static final byte[] STANDARD_KEY_BYTES = STANDARD_KEY_STRING.getBytes();
- static final byte[] STANDARD_MD5_RESULT_BYTES = new byte[] { -128, 7, 7, 19, 70, 62, 119, 73, -71, 12, 45, -62, 73,
+ static final byte[] STANDARD_MD5_RESULT_BYTES = { -128, 7, 7, 19, 70, 62, 119, 73, -71, 12, 45, -62, 73,
17, -30, 117 };
static final String STANDARD_MD5_RESULT_STRING = "80070713463e7749b90c2dc24911e275";
@@ -58,29 +58,29 @@ public class HmacAlgorithmsTest {
static final byte[] STANDARD_PHRASE_BYTES = STANDARD_PHRASE_STRING.getBytes();
- static final byte[] STANDARD_SHA1_RESULT_BYTES = new byte[] { -34, 124, -101, -123, -72, -73, -118, -90, -68, -118,
+ static final byte[] STANDARD_SHA1_RESULT_BYTES = { -34, 124, -101, -123, -72, -73, -118, -90, -68, -118,
122, 54, -9, 10, -112, 112, 28, -99, -76, -39 };
static final String STANDARD_SHA1_RESULT_STRING = "de7c9b85b8b78aa6bc8a7a36f70a90701c9db4d9";
- static final byte[] STANDARD_SHA224_RESULT_BYTES = new byte[] { -120, -1, -117, 84, 103, 93, 57, -72, -9, 35, 34,
+ static final byte[] STANDARD_SHA224_RESULT_BYTES = { -120, -1, -117, 84, 103, 93, 57, -72, -9, 35, 34,
-26, 95, -7, 69, -59, 45, -106, 55, -103, -120, -83, -94, 86, 57, 116, 126, 105 };
static final String STANDARD_SHA224_RESULT_STRING = "88ff8b54675d39b8f72322e65ff945c52d96379988ada25639747e69";
- static final byte[] STANDARD_SHA256_RESULT_BYTES = new byte[] { -9, -68, -125, -12, 48, 83, -124, 36, -79, 50, -104,
+ static final byte[] STANDARD_SHA256_RESULT_BYTES = { -9, -68, -125, -12, 48, 83, -124, 36, -79, 50, -104,
-26, -86, 111, -79, 67, -17, 77, 89, -95, 73, 70, 23, 89, -105, 71, -99, -68, 45, 26, 60, -40 };
static final String STANDARD_SHA256_RESULT_STRING = "f7bc83f430538424b13298e6aa6fb143ef4d59a14946175997479dbc2d1a3cd8";
- static final byte[] STANDARD_SHA384_RESULT_BYTES = new byte[] { -41, -12, 114, 126, 44, 11, 57, -82, 15, 30, 64,
+ static final byte[] STANDARD_SHA384_RESULT_BYTES = { -41, -12, 114, 126, 44, 11, 57, -82, 15, 30, 64,
-52, -106, -10, 2, 66, -43, -73, -128, 24, 65, -50, -90, -4, 89, 44, 93, 62, 26, -27, 7, 0, 88, 42, -106,
-49, 53, -31, -27, 84, -103, 95, -28, -32, 51, -127, -62, 55 };
static final String STANDARD_SHA384_RESULT_STRING = "D7F4727E2C0B39AE0F1E40CC96F60242D5B7801841CEA6FC592C5D3E1AE50700582A96CF35E1E554995FE4E03381C237"
.toLowerCase();
- static final byte[] STANDARD_SHA512_RESULT_BYTES = new byte[] { -76, 42, -16, -112, 87, -70, -63, -30, -44, 23, 8,
+ static final byte[] STANDARD_SHA512_RESULT_BYTES = { -76, 42, -16, -112, 87, -70, -63, -30, -44, 23, 8,
-28, -118, -112, 46, 9, -75, -1, 127, 18, -85, 66, -118, 79, -24, 102, 83, -57, 61, -46, 72, -5, -126, -7,
72, -91, 73, -9, -73, -111, -91, -76, 25, 21, -18, 77, 30, -61, -109, 83, 87, -28, -30, 49, 114, 80, -48,
55, 42, -6, 46, -66, -21, 58 };
@@ -88,7 +88,7 @@ public class HmacAlgorithmsTest {
static final String STANDARD_SHA512_RESULT_STRING = "B42AF09057BAC1E2D41708E48A902E09B5FF7F12AB428A4FE86653C73DD248FB82F948A549F7B791A5B41915EE4D1EC3935357E4E2317250D0372AFA2EBEEB3A"
.toLowerCase();
- private static final byte[] EMPTY_BYTE_ARRAY = new byte[] {};
+ private static final byte[] EMPTY_BYTE_ARRAY = {};
// TODO HMAC_SHA_224
@Parameters(name = "{0}")
diff --git a/src/test/java/org/apache/commons/codec/language/DoubleMetaphone2Test.java b/src/test/java/org/apache/commons/codec/language/DoubleMetaphone2Test.java
index d088ec5..5f8435a 100644
--- a/src/test/java/org/apache/commons/codec/language/DoubleMetaphone2Test.java
+++ b/src/test/java/org/apache/commons/codec/language/DoubleMetaphone2Test.java
@@ -37,7 +37,7 @@ public class DoubleMetaphone2Test extends StringEncoderAbstractTest<DoubleMetaph
private static final int PRIMARY_INDEX = 1;
/** Test values and their expected primary & alternate Double Metaphone encodings */
- private static final String[][] TEST_DATA = new String[][]{
+ private static final String[][] TEST_DATA = {
{"ALLERTON", "ALRT", "ALRT"},
{"Acton", "AKTN", "AKTN"},
{"Adams", "ATMS", "ATMS"},
diff --git a/src/test/java/org/apache/commons/codec/language/DoubleMetaphoneTest.java b/src/test/java/org/apache/commons/codec/language/DoubleMetaphoneTest.java
index 5dc8a3c..aff88ec 100644
--- a/src/test/java/org/apache/commons/codec/language/DoubleMetaphoneTest.java
+++ b/src/test/java/org/apache/commons/codec/language/DoubleMetaphoneTest.java
@@ -1120,7 +1120,7 @@ public class DoubleMetaphoneTest extends StringEncoderAbstractTest<DoubleMetapho
@Test
public void testIsDoubleMetaphoneEqualBasic() {
- final String[][] testFixture = new String[][] { {
+ final String[][] testFixture = { {
"", "" }, {
"Case", "case" }, {
"CASE", "Case" }, {
@@ -1149,7 +1149,7 @@ public class DoubleMetaphoneTest extends StringEncoderAbstractTest<DoubleMetapho
@Test
public void testIsDoubleMetaphoneEqualExtended2() {
- final String[][] testFixture = new String[][] { { "Jablonski", "Yablonsky" }
+ final String[][] testFixture = { { "Jablonski", "Yablonsky" }
};
//doubleMetaphoneEqualTest(testFixture, false);
doubleMetaphoneEqualTest(testFixture, true);
diff --git a/src/test/java/org/apache/commons/codec/language/bm/BeiderMorseEncoderTest.java b/src/test/java/org/apache/commons/codec/language/bm/BeiderMorseEncoderTest.java
index 629c9ce..bd958de 100644
--- a/src/test/java/org/apache/commons/codec/language/bm/BeiderMorseEncoderTest.java
+++ b/src/test/java/org/apache/commons/codec/language/bm/BeiderMorseEncoderTest.java
@@ -33,7 +33,7 @@ import org.junit.Test;
* @since 1.6
*/
public class BeiderMorseEncoderTest extends StringEncoderAbstractTest<StringEncoder> {
- private static final char[] TEST_CHARS = new char[] { 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'o', 'u' };
+ private static final char[] TEST_CHARS = { 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'o', 'u' };
private void assertNotEmpty(final BeiderMorseEncoder bmpm, final String value) throws EncoderException {
Assert.assertFalse(value, bmpm.encode(value).equals(""));
[commons-codec] 01/03: Combine else if.
Posted by gg...@apache.org.
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 6b634edb22eac5c85446681de27671df44798491
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Fri Aug 6 11:59:16 2021 -0400
Combine else if.
---
.../commons/codec/language/ColognePhonetic.java | 8 +-
.../commons/codec/language/DoubleMetaphone.java | 50 ++++-----
.../org/apache/commons/codec/language/bm/Lang.java | 56 +++++-----
.../commons/codec/language/bm/Languages.java | 10 +-
.../org/apache/commons/codec/language/bm/Rule.java | 120 ++++++++++-----------
.../org/apache/commons/codec/net/PercentCodec.java | 16 ++-
6 files changed, 122 insertions(+), 138 deletions(-)
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 049de1f..cb206a6 100644
--- a/src/main/java/org/apache/commons/codec/language/ColognePhonetic.java
+++ b/src/main/java/org/apache/commons/codec/language/ColognePhonetic.java
@@ -363,12 +363,10 @@ public class ColognePhonetic implements StringEncoder {
} else {
output.put('8');
}
+ } else if (arrayContains(SZ, lastChar) || !arrayContains(AHKOQUX, nextChar)) {
+ output.put('8');
} else {
- if (arrayContains(SZ, lastChar) || !arrayContains(AHKOQUX, nextChar)) {
- output.put('8');
- } else {
- output.put('4');
- }
+ output.put('4');
}
} else if (arrayContains(DTX, chr)) {
output.put('8');
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 ec2a2e0..85e9156 100644
--- a/src/main/java/org/apache/commons/codec/language/DoubleMetaphone.java
+++ b/src/main/java/org/apache/commons/codec/language/DoubleMetaphone.java
@@ -654,12 +654,10 @@ public class DoubleMetaphone implements StringEncoder {
} else {
result.append("SK");
}
+ } else if (index == 0 && !isVowel(charAt(value, 3)) && charAt(value, 3) != 'W') {
+ result.append('X', 'S');
} else {
- if (index == 0 && !isVowel(charAt(value, 3)) && charAt(value, 3) != 'W') {
- result.append('X', 'S');
- } else {
- result.append('X');
- }
+ result.append('X');
}
} else if (contains(value, index + 2, 1, "I", "E", "Y")) {
result.append('S');
@@ -704,30 +702,28 @@ public class DoubleMetaphone implements StringEncoder {
//-- can also be in middle of word --//
result.append('R');
index += 2;
- } else {
- if (index == 0 && (isVowel(charAt(value, index + 1)) ||
- contains(value, index, 2, "WH"))) {
- if (isVowel(charAt(value, index + 1))) {
- //-- Wasserman should match Vasserman --//
- result.append('A', 'F');
- } else {
- //-- need Uomo to match Womo --//
- result.append('A');
- }
- index++;
- } else if ((index == value.length() - 1 && isVowel(charAt(value, index - 1))) ||
- contains(value, index - 1, 5, "EWSKI", "EWSKY", "OWSKI", "OWSKY") ||
- contains(value, 0, 3, "SCH")) {
- //-- Arnow should match Arnoff --//
- result.appendAlternate('F');
- index++;
- } else if (contains(value, index, 4, "WICZ", "WITZ")) {
- //-- Polish e.g. "filipowicz" --//
- result.append("TS", "FX");
- index += 4;
+ } else if (index == 0 && (isVowel(charAt(value, index + 1)) ||
+ contains(value, index, 2, "WH"))) {
+ if (isVowel(charAt(value, index + 1))) {
+ //-- Wasserman should match Vasserman --//
+ result.append('A', 'F');
} else {
- index++;
+ //-- need Uomo to match Womo --//
+ result.append('A');
}
+ index++;
+ } else if ((index == value.length() - 1 && isVowel(charAt(value, index - 1))) ||
+ contains(value, index - 1, 5, "EWSKI", "EWSKY", "OWSKI", "OWSKY") ||
+ contains(value, 0, 3, "SCH")) {
+ //-- Arnow should match Arnoff --//
+ result.appendAlternate('F');
+ index++;
+ } else if (contains(value, index, 4, "WICZ", "WITZ")) {
+ //-- Polish e.g. "filipowicz" --//
+ result.append("TS", "FX");
+ index += 4;
+ } else {
+ index++;
}
return index;
}
diff --git a/src/main/java/org/apache/commons/codec/language/bm/Lang.java b/src/main/java/org/apache/commons/codec/language/bm/Lang.java
index a6b1f5b..186f833 100644
--- a/src/main/java/org/apache/commons/codec/language/bm/Lang.java
+++ b/src/main/java/org/apache/commons/codec/language/bm/Lang.java
@@ -139,37 +139,35 @@ public class Lang {
if (line.endsWith(ResourceConstants.EXT_CMT_END)) {
inExtendedComment = false;
}
+ } else if (line.startsWith(ResourceConstants.EXT_CMT_START)) {
+ inExtendedComment = true;
} else {
- if (line.startsWith(ResourceConstants.EXT_CMT_START)) {
- inExtendedComment = true;
- } else {
- // discard comments
- final int cmtI = line.indexOf(ResourceConstants.CMT);
- if (cmtI >= 0) {
- line = line.substring(0, cmtI);
- }
-
- // trim leading-trailing whitespace
- line = line.trim();
-
- if (line.isEmpty()) {
- continue; // empty lines can be safely skipped
- }
-
- // split it up
- final String[] parts = line.split("\\s+");
-
- if (parts.length != 3) {
- throw new IllegalArgumentException("Malformed line '" + rawLine +
- "' in language resource '" + languageRulesResourceName + "'");
- }
-
- final Pattern pattern = Pattern.compile(parts[0]);
- final String[] langs = parts[1].split("\\+");
- final boolean accept = parts[2].equals("true");
-
- rules.add(new LangRule(pattern, new HashSet<>(Arrays.asList(langs)), accept));
+ // discard comments
+ final int cmtI = line.indexOf(ResourceConstants.CMT);
+ if (cmtI >= 0) {
+ line = line.substring(0, cmtI);
}
+
+ // trim leading-trailing whitespace
+ line = line.trim();
+
+ if (line.isEmpty()) {
+ continue; // empty lines can be safely skipped
+ }
+
+ // split it up
+ final String[] parts = line.split("\\s+");
+
+ if (parts.length != 3) {
+ throw new IllegalArgumentException("Malformed line '" + rawLine +
+ "' in language resource '" + languageRulesResourceName + "'");
+ }
+
+ final Pattern pattern = Pattern.compile(parts[0]);
+ final String[] langs = parts[1].split("\\+");
+ final boolean accept = parts[2].equals("true");
+
+ rules.add(new LangRule(pattern, new HashSet<>(Arrays.asList(langs)), accept));
}
}
}
diff --git a/src/main/java/org/apache/commons/codec/language/bm/Languages.java b/src/main/java/org/apache/commons/codec/language/bm/Languages.java
index 4e058ed..53669df 100644
--- a/src/main/java/org/apache/commons/codec/language/bm/Languages.java
+++ b/src/main/java/org/apache/commons/codec/language/bm/Languages.java
@@ -181,12 +181,10 @@ public class Languages {
if (line.endsWith(ResourceConstants.EXT_CMT_END)) {
inExtendedComment = false;
}
- } else {
- if (line.startsWith(ResourceConstants.EXT_CMT_START)) {
- inExtendedComment = true;
- } else if (!line.isEmpty()) {
- ls.add(line);
- }
+ } else if (line.startsWith(ResourceConstants.EXT_CMT_START)) {
+ inExtendedComment = true;
+ } else if (!line.isEmpty()) {
+ ls.add(line);
}
}
return new Languages(Collections.unmodifiableSet(ls));
diff --git a/src/main/java/org/apache/commons/codec/language/bm/Rule.java b/src/main/java/org/apache/commons/codec/language/bm/Rule.java
index f46f544..8b528ba 100644
--- a/src/main/java/org/apache/commons/codec/language/bm/Rule.java
+++ b/src/main/java/org/apache/commons/codec/language/bm/Rule.java
@@ -408,74 +408,72 @@ public class Rule {
if (line.endsWith(ResourceConstants.EXT_CMT_END)) {
inMultilineComment = false;
}
+ } else if (line.startsWith(ResourceConstants.EXT_CMT_START)) {
+ inMultilineComment = true;
} else {
- if (line.startsWith(ResourceConstants.EXT_CMT_START)) {
- inMultilineComment = true;
- } else {
- // discard comments
- final int cmtI = line.indexOf(ResourceConstants.CMT);
- if (cmtI >= 0) {
- line = line.substring(0, cmtI);
- }
+ // discard comments
+ final int cmtI = line.indexOf(ResourceConstants.CMT);
+ if (cmtI >= 0) {
+ line = line.substring(0, cmtI);
+ }
- // trim leading-trailing whitespace
- line = line.trim();
+ // trim leading-trailing whitespace
+ line = line.trim();
- if (line.isEmpty()) {
- continue; // empty lines can be safely skipped
+ if (line.isEmpty()) {
+ continue; // empty lines can be safely skipped
+ }
+
+ if (line.startsWith(HASH_INCLUDE)) {
+ // include statement
+ final String incl = line.substring(HASH_INCLUDE_LENGTH).trim();
+ if (incl.contains(" ")) {
+ throw new IllegalArgumentException("Malformed import statement '" + rawLine + "' in " +
+ location);
+ }
+ try (final Scanner hashIncludeScanner = createScanner(incl)) {
+ lines.putAll(parseRules(hashIncludeScanner, location + "->" + incl));
}
+ } else {
+ // rule
+ final String[] parts = line.split("\\s+");
+ if (parts.length != 4) {
+ throw new IllegalArgumentException("Malformed rule statement split into " + parts.length +
+ " parts: " + rawLine + " in " + location);
+ }
+ try {
+ final String pat = stripQuotes(parts[0]);
+ final String lCon = stripQuotes(parts[1]);
+ final String rCon = stripQuotes(parts[2]);
+ final PhonemeExpr ph = parsePhonemeExpr(stripQuotes(parts[3]));
+ final int cLine = currentLine;
+ final Rule r = new Rule(pat, lCon, rCon, ph) {
+ private final int myLine = cLine;
+ private final String loc = location;
- if (line.startsWith(HASH_INCLUDE)) {
- // include statement
- final String incl = line.substring(HASH_INCLUDE_LENGTH).trim();
- if (incl.contains(" ")) {
- throw new IllegalArgumentException("Malformed import statement '" + rawLine + "' in " +
- location);
- }
- try (final Scanner hashIncludeScanner = createScanner(incl)) {
- lines.putAll(parseRules(hashIncludeScanner, location + "->" + incl));
- }
- } else {
- // rule
- final String[] parts = line.split("\\s+");
- if (parts.length != 4) {
- throw new IllegalArgumentException("Malformed rule statement split into " + parts.length +
- " parts: " + rawLine + " in " + location);
- }
- try {
- final String pat = stripQuotes(parts[0]);
- final String lCon = stripQuotes(parts[1]);
- final String rCon = stripQuotes(parts[2]);
- final PhonemeExpr ph = parsePhonemeExpr(stripQuotes(parts[3]));
- final int cLine = currentLine;
- final Rule r = new Rule(pat, lCon, rCon, ph) {
- private final int myLine = cLine;
- private final String loc = location;
-
- @Override
- public String toString() {
- final StringBuilder sb = new StringBuilder();
- sb.append("Rule");
- sb.append("{line=").append(myLine);
- sb.append(", loc='").append(loc).append('\'');
- sb.append(", pat='").append(pat).append('\'');
- sb.append(", lcon='").append(lCon).append('\'');
- sb.append(", rcon='").append(rCon).append('\'');
- sb.append('}');
- return sb.toString();
- }
- };
- final String patternKey = r.pattern.substring(0,1);
- List<Rule> rules = lines.get(patternKey);
- if (rules == null) {
- rules = new ArrayList<>();
- lines.put(patternKey, rules);
+ @Override
+ public String toString() {
+ final StringBuilder sb = new StringBuilder();
+ sb.append("Rule");
+ sb.append("{line=").append(myLine);
+ sb.append(", loc='").append(loc).append('\'');
+ sb.append(", pat='").append(pat).append('\'');
+ sb.append(", lcon='").append(lCon).append('\'');
+ sb.append(", rcon='").append(rCon).append('\'');
+ sb.append('}');
+ return sb.toString();
}
- rules.add(r);
- } catch (final IllegalArgumentException e) {
- throw new IllegalStateException("Problem parsing line '" + currentLine + "' in " +
- location, e);
+ };
+ final String patternKey = r.pattern.substring(0,1);
+ List<Rule> rules = lines.get(patternKey);
+ if (rules == null) {
+ rules = new ArrayList<>();
+ lines.put(patternKey, rules);
}
+ rules.add(r);
+ } catch (final IllegalArgumentException e) {
+ throw new IllegalStateException("Problem parsing line '" + currentLine + "' in " +
+ location, e);
}
}
}
diff --git a/src/main/java/org/apache/commons/codec/net/PercentCodec.java b/src/main/java/org/apache/commons/codec/net/PercentCodec.java
index 16e3320..24fd2ff 100644
--- a/src/main/java/org/apache/commons/codec/net/PercentCodec.java
+++ b/src/main/java/org/apache/commons/codec/net/PercentCodec.java
@@ -143,12 +143,10 @@ public class PercentCodec implements BinaryEncoder, BinaryDecoder {
buffer.put(ESCAPE_CHAR);
buffer.put((byte) hex1);
buffer.put((byte) hex2);
+ } else if (plusForSpace && b == ' ') {
+ buffer.put((byte) '+');
} else {
- if (plusForSpace && b == ' ') {
- buffer.put((byte) '+');
- } else {
- buffer.put(b);
- }
+ buffer.put(b);
}
}
return buffer.array();
@@ -204,12 +202,10 @@ public class PercentCodec implements BinaryEncoder, BinaryDecoder {
} catch (final ArrayIndexOutOfBoundsException e) {
throw new DecoderException("Invalid percent decoding: ", e);
}
+ } else if (plusForSpace && b == '+') {
+ buffer.put((byte) ' ');
} else {
- if (plusForSpace && b == '+') {
- buffer.put((byte) ' ');
- } else {
- buffer.put(b);
- }
+ buffer.put(b);
}
}
return buffer.array();
[commons-codec] 02/03: Bump maven-surefire-plugin from 2.22.2 to
3.0.0-M5.
Posted by gg...@apache.org.
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 ee33dfea84c7e0b94c12b60be39bf2438d1e9889
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Fri Aug 6 11:59:33 2021 -0400
Bump maven-surefire-plugin from 2.22.2 to 3.0.0-M5.
---
pom.xml | 1 +
1 file changed, 1 insertion(+)
diff --git a/pom.xml b/pom.xml
index d781936..155dd01 100644
--- a/pom.xml
+++ b/pom.xml
@@ -319,6 +319,7 @@ limitations under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
+ <version>${commons.surefire-report.version}</version>
<configuration>
<excludes>
<exclude>**/*AbstractTest.java</exclude>