Skip to content

Commit 9e66c22

Browse files
garydgregorygarydgregory
committed
Merge some string literals
1 parent 0253534 commit 9e66c22

File tree

4 files changed

+35
-33
lines changed

4 files changed

+35
-33
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -274,7 +274,7 @@ private static void parseRules(final Scanner scanner, final String location, fin
274274
final String rightCharacter = parts[1];
275275
if (leftCharacter.length() != 1 || rightCharacter.length() != 1) {
276276
throw new IllegalArgumentException(
277-
"Malformed folding statement - " + "patterns are not single characters: " + rawLine + " in " + location);
277+
"Malformed folding statement - patterns are not single characters: " + rawLine + " in " + location);
278278
}
279279
asciiFoldings.put(leftCharacter.charAt(0), rightCharacter.charAt(0));
280280
} else {

‎src/main/java/org/apache/commons/codec/language/MatchRatingApproachEncoder.java‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -53,11 +53,12 @@ public class MatchRatingApproachEncoder implements StringEncoder {
5353
*/
5454
private static final String UNICODE = "\u00C0\u00E0\u00C8\u00E8\u00CC\u00EC\u00D2\u00F2\u00D9\u00F9" +
5555
"\u00C1\u00E1\u00C9\u00E9\u00CD\u00ED\u00D3\u00F3\u00DA\u00FA\u00DD\u00FD" +
56-
"\u00C2\u00E2\u00CA\u00EA\u00CE\u00EE\u00D4\u00F4\u00DB\u00FB\u0176\u0177" +
57-
"\u00C3\u00E3\u00D5\u00F5\u00D1\u00F1" +
58-
"\u00C4\u00E4\u00CB\u00EB\u00CF\u00EF\u00D6\u00F6\u00DC\u00FC\u0178\u00FF" +
59-
"\u00C5\u00E5" + "\u00C7\u00E7" + "\u0150\u0151\u0170\u0171";
56+
"\u00C2\u00E2\u00CA\u00EA\u00CE\u00EE\u00D4\u00F4\u00DB\u00FB\u0176\u0177\u00C3\u00E3\u00D5\u00F5\u00D1\u00F1" +
57+
"\u00C4\u00E4\u00CB\u00EB\u00CF\u00EF\u00D6\u00F6\u00DC\u00FC\u0178\u00FF\u00C5\u00E5\u00C7\u00E7\u0150\u0151\u0170\u0171";
6058

59+
/**
60+
* Double consonants.
61+
*/
6162
private static final String[] DOUBLE_CONSONANT =
6263
{ "BB", "CC", "DD", "FF", "GG", "HH", "JJ", "KK", "LL", "MM", "NN", "PP", "QQ", "RR", "SS",
6364
"TT", "VV", "WW", "XX", "YY", "ZZ" };

‎src/test/java/org/apache/commons/codec/StringEncoderComparatorTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ void testComparatorWithDoubleMetaphoneAndInvalidInput() throws Exception {
5656
final StringEncoderComparator sCompare = new StringEncoderComparator(new DoubleMetaphone());
5757

5858
final int compare = sCompare.compare(Double.valueOf(3.0d), Long.valueOf(3));
59-
assertEquals(0, compare, "Trying to compare objects that make no sense to the underlying encoder" + " should return a zero compare code");
59+
assertEquals(0, compare, "Trying to compare objects that make no sense to the underlying encoder should return a zero compare code");
6060
}
6161

6262
@Test

‎src/test/java/org/apache/commons/codec/digest/DigestUtilsTest.java‎

Lines changed: 28 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -145,20 +145,20 @@ void testIsAvailable() {
145145
void testMd2Hex() throws IOException {
146146
// Examples from RFC 1319
147147
assertEquals("8350e5a3e24c153df2275c9f80692773", DigestUtils.md2Hex(EMPTY_STRING));
148-
149148
assertEquals("32ec01ec4a6dac72c0ab96fb34c0b5d1", DigestUtils.md2Hex("a"));
150-
151149
assertEquals("da853b0d3f88d99b30283a69e6ded6bb", DigestUtils.md2Hex("abc"));
152-
153150
assertEquals("ab4f496bfb2a530b219ff33031fe06b0", DigestUtils.md2Hex("message digest"));
154-
155151
assertEquals("4e8ddff3650292ab5a4108c3aa47940b", DigestUtils.md2Hex("abcdefghijklmnopqrstuvwxyz"));
156-
157-
assertEquals("da33def2a42df13975352846c30338cd", DigestUtils.md2Hex("ABCDEFGHIJKLMNOPQRSTUVWXYZ" + "abcdefghijklmnopqrstuvwxyz" + "0123456789"));
158-
152+
// @formatter:off
153+
assertEquals("da33def2a42df13975352846c30338cd", DigestUtils.md2Hex(
154+
"ABCDEFGHIJKLMNOPQRSTUVWXYZ" +
155+
"abcdefghijklmnopqrstuvwxyz" +
156+
"0123456789"));
159157
assertEquals("d5976f79d83d3a0dc9806c3c66f3efd8",
160-
DigestUtils.md2Hex("1234567890123456789012345678901234567890" + "1234567890123456789012345678901234567890"));
161-
158+
DigestUtils.md2Hex(
159+
"1234567890123456789012345678901234567890" +
160+
"1234567890123456789012345678901234567890"));
161+
// @formatter:on
162162
assertEquals(DigestUtils.md2Hex(testData), DigestUtils.md2Hex(new ByteArrayInputStream(testData)));
163163
}
164164

@@ -194,20 +194,21 @@ void testMd2Length() {
194194
void testMd5Hex() throws IOException {
195195
// Examples from RFC 1321
196196
assertEquals("d41d8cd98f00b204e9800998ecf8427e", DigestUtils.md5Hex(EMPTY_STRING));
197-
198197
assertEquals("0cc175b9c0f1b6a831c399e269772661", DigestUtils.md5Hex("a"));
199-
200198
assertEquals("900150983cd24fb0d6963f7d28e17f72", DigestUtils.md5Hex("abc"));
201-
202199
assertEquals("f96b697d7cb7938d525a2f31aaf161d0", DigestUtils.md5Hex("message digest"));
203-
204200
assertEquals("c3fcd3d76192e4007dfb496cca67e13b", DigestUtils.md5Hex("abcdefghijklmnopqrstuvwxyz"));
205-
206-
assertEquals("d174ab98d277d9f5a5611c2c9f419d9f", DigestUtils.md5Hex("ABCDEFGHIJKLMNOPQRSTUVWXYZ" + "abcdefghijklmnopqrstuvwxyz" + "0123456789"));
201+
// @formatter:off
202+
assertEquals("d174ab98d277d9f5a5611c2c9f419d9f", DigestUtils.md5Hex(
203+
"ABCDEFGHIJKLMNOPQRSTUVWXYZ" +
204+
"abcdefghijklmnopqrstuvwxyz" +
205+
"0123456789"));
207206

208207
assertEquals("57edf4a22be3c955ac49da2e2107b67a",
209-
DigestUtils.md5Hex("1234567890123456789012345678901234567890" + "1234567890123456789012345678901234567890"));
210-
208+
DigestUtils.md5Hex(
209+
"1234567890123456789012345678901234567890" +
210+
"1234567890123456789012345678901234567890"));
211+
// @formatter:on
211212
assertEquals(DigestUtils.md5Hex(testData), DigestUtils.md5Hex(new ByteArrayInputStream(testData)));
212213
}
213214

@@ -246,7 +247,7 @@ void testSha1Hex() throws IOException {
246247

247248
assertEquals("a9993e364706816aba3e25717850c26c9cd0d89d", DigestUtils.sha1Hex(getBytesUtf8("abc")));
248249

249-
assertEquals("84983e441c3bd26ebaae4aa1f95129e5e54670f1", DigestUtils.sha1Hex("abcdbcdecdefdefgefghfghighij" + "hijkijkljklmklmnlmnomnopnopq"));
250+
assertEquals("84983e441c3bd26ebaae4aa1f95129e5e54670f1", DigestUtils.sha1Hex("abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq"));
250251
assertEquals(DigestUtils.sha1Hex(testData), DigestUtils.sha1Hex(new ByteArrayInputStream(testData)));
251252
}
252253

@@ -418,11 +419,11 @@ void testSha3_512HexInputStream() throws IOException {
418419
@Test
419420
void testSha384() throws IOException {
420421
// Examples from FIPS 180-2
421-
assertEquals("cb00753f45a35e8bb5a03d699ac65007272c32ab0eded1631a8b605a43ff5bed" + "8086072ba1e7cc2358baeca134c825a7", DigestUtils.sha384Hex("abc"));
422-
assertEquals("cb00753f45a35e8bb5a03d699ac65007272c32ab0eded1631a8b605a43ff5bed" + "8086072ba1e7cc2358baeca134c825a7",
422+
assertEquals("cb00753f45a35e8bb5a03d699ac65007272c32ab0eded1631a8b605a43ff5bed8086072ba1e7cc2358baeca134c825a7", DigestUtils.sha384Hex("abc"));
423+
assertEquals("cb00753f45a35e8bb5a03d699ac65007272c32ab0eded1631a8b605a43ff5bed8086072ba1e7cc2358baeca134c825a7",
423424
DigestUtils.sha384Hex(getBytesUtf8("abc")));
424-
assertEquals("09330c33f71147e83d192fc782cd1b4753111b173b3b05d22fa08086e3b0f712" + "fcc7c71a557e2db966c3e9fa91746039",
425-
DigestUtils.sha384Hex("abcdefghbcdefghicdefghijdefghijkefghijklfghijklmghijklmn" + "hijklmnoijklmnopjklmnopqklmnopqrlmnopqrsmnopqrstnopqrstu"));
425+
assertEquals("09330c33f71147e83d192fc782cd1b4753111b173b3b05d22fa08086e3b0f712fcc7c71a557e2db966c3e9fa91746039",
426+
DigestUtils.sha384Hex("abcdefghbcdefghicdefghijdefghijkefghijklfghijklmghijklmnhijklmnoijklmnopjklmnopqklmnopqrlmnopqrsmnopqrstnopqrstu"));
426427
assertEquals(DigestUtils.sha384Hex(testData), DigestUtils.sha384Hex(new ByteArrayInputStream(testData)));
427428
}
428429

@@ -434,12 +435,12 @@ void testSha384HexInputStream() throws IOException {
434435
@Test
435436
void testSha512() {
436437
// Examples from FIPS 180-2
437-
assertEquals("ddaf35a193617abacc417349ae20413112e6fa4e89a97ea20a9eeee64b55d39a" + "2192992a274fc1a836ba3c23a3feebbd454d4423643ce80e2a9ac94fa54ca49f",
438+
assertEquals("ddaf35a193617abacc417349ae20413112e6fa4e89a97ea20a9eeee64b55d39a2192992a274fc1a836ba3c23a3feebbd454d4423643ce80e2a9ac94fa54ca49f",
438439
DigestUtils.sha512Hex("abc"));
439-
assertEquals("ddaf35a193617abacc417349ae20413112e6fa4e89a97ea20a9eeee64b55d39a" + "2192992a274fc1a836ba3c23a3feebbd454d4423643ce80e2a9ac94fa54ca49f",
440+
assertEquals("ddaf35a193617abacc417349ae20413112e6fa4e89a97ea20a9eeee64b55d39a2192992a274fc1a836ba3c23a3feebbd454d4423643ce80e2a9ac94fa54ca49f",
440441
DigestUtils.sha512Hex(getBytesUtf8("abc")));
441-
assertEquals("8e959b75dae313da8cf4f72814fc143f8f7779c6eb9f7fa17299aeadb6889018" + "501d289e4900f7e4331b99dec4b5433ac7d329eeb6dd26545e96e55b874be909",
442-
DigestUtils.sha512Hex("abcdefghbcdefghicdefghijdefghijkefghijklfghijklmghijklmn" + "hijklmnoijklmnopjklmnopqklmnopqrlmnopqrsmnopqrstnopqrstu"));
442+
assertEquals("8e959b75dae313da8cf4f72814fc143f8f7779c6eb9f7fa17299aeadb6889018501d289e4900f7e4331b99dec4b5433ac7d329eeb6dd26545e96e55b874be909",
443+
DigestUtils.sha512Hex("abcdefghbcdefghicdefghijdefghijkefghijklfghijklmghijklmnhijklmnoijklmnopjklmnopqklmnopqrlmnopqrsmnopqrstnopqrstu"));
443444
}
444445

445446
@Test
@@ -499,7 +500,7 @@ void testShaHex() throws IOException {
499500

500501
assertEquals("a9993e364706816aba3e25717850c26c9cd0d89d", DigestUtils.shaHex(getBytesUtf8("abc")));
501502

502-
assertEquals("84983e441c3bd26ebaae4aa1f95129e5e54670f1", DigestUtils.shaHex("abcdbcdecdefdefgefghfghighij" + "hijkijkljklmklmnlmnomnopnopq"));
503+
assertEquals("84983e441c3bd26ebaae4aa1f95129e5e54670f1", DigestUtils.shaHex("abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq"));
503504
assertEquals(DigestUtils.shaHex(testData), DigestUtils.shaHex(new ByteArrayInputStream(testData)));
504505
}
505506

0 commit comments

Comments
 (0)