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
The following commit(s) were added to refs/heads/master by this push:
new 96a0c5e3 Fix formatting
96a0c5e3 is described below
commit 96a0c5e3758e48c4f8654a6d14d668c5443da6c1
Author: Gary Gregory <garydgreg...@gmail.com>
AuthorDate: Sat Jul 8 09:14:18 2023 -0400
Fix formatting
---
.../commons/codec/binary/Base64OutputStream.java | 2 +-
.../apache/commons/codec/language/Metaphone.java | 78 ++++++++--------------
.../apache/commons/codec/binary/Base32Test.java | 6 +-
.../codec/digest/MessageDigestAlgorithmsTest.java | 10 +--
4 files changed, 38 insertions(+), 58 deletions(-)
diff --git
a/src/main/java/org/apache/commons/codec/binary/Base64OutputStream.java
b/src/main/java/org/apache/commons/codec/binary/Base64OutputStream.java
index c28e5900..492610da 100644
--- a/src/main/java/org/apache/commons/codec/binary/Base64OutputStream.java
+++ b/src/main/java/org/apache/commons/codec/binary/Base64OutputStream.java
@@ -82,7 +82,7 @@ public class Base64OutputStream extends
BaseNCodecOutputStream {
* true if we should encode all data written to us, false if we
should decode.
*/
public Base64OutputStream(final OutputStream outputStream, final boolean
doEncode) {
- super(outputStream,new Base64(false), doEncode);
+ super(outputStream, new Base64(false), doEncode);
}
/**
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 b3c6d5cc..5d89f0f3 100644
--- a/src/main/java/org/apache/commons/codec/language/Metaphone.java
+++ b/src/main/java/org/apache/commons/codec/language/Metaphone.java
@@ -98,12 +98,12 @@ public class Metaphone implements StringEncoder {
final char[] inwd =
txt.toUpperCase(java.util.Locale.ENGLISH).toCharArray();
final StringBuilder local = new StringBuilder(40); // manipulate
- final StringBuilder code = new StringBuilder(10); // output
+ final StringBuilder code = new StringBuilder(10); // output
// handle initial 2 characters exceptions
- switch(inwd[0]) {
+ switch (inwd[0]) {
case 'K':
case 'G':
- case 'P': /* looking for KN, etc*/
+ case 'P': /* looking for KN, etc */
if (inwd[1] == 'N') {
local.append(inwd, 1, inwd.length - 1);
} else {
@@ -118,7 +118,7 @@ public class Metaphone implements StringEncoder {
}
break;
case 'W': /* looking for WR or WH */
- if (inwd[1] == 'R') { // WR -> R
+ if (inwd[1] == 'R') { // WR -> R
local.append(inwd, 1, inwd.length - 1);
break;
}
@@ -140,14 +140,13 @@ public class Metaphone implements StringEncoder {
final int wdsz = local.length();
int n = 0;
- while (code.length() < this.getMaxCodeLen() &&
- n < wdsz ) { // max code size of 4 works well
+ while (code.length() < this.getMaxCodeLen() && n < wdsz) { // max code
size of 4 works well
final char symb = local.charAt(n);
// remove duplicate letters except C
- if (symb != 'C' && isPreviousChar( local, n, symb ) ) {
+ if (symb != 'C' && isPreviousChar(local, n, symb)) {
n++;
} else { // not dup
- switch(symb) {
+ switch (symb) {
case 'A':
case 'E':
case 'I':
@@ -158,37 +157,30 @@ public class Metaphone implements StringEncoder {
}
break; // only use vowel if leading char
case 'B':
- if ( isPreviousChar(local, n, 'M') &&
- isLastChar(wdsz, n) ) { // B is silent if word ends
in MB
+ if (isPreviousChar(local, n, 'M') && isLastChar(wdsz, n))
{ // B is silent if word ends in MB
break;
}
code.append(symb);
break;
case 'C': // lots of C special cases
/* discard if SCI, SCE or SCY */
- if ( isPreviousChar(local, n, 'S') &&
- !isLastChar(wdsz, n) &&
- FRONTV.indexOf(local.charAt(n + 1)) >= 0 ) {
+ if (isPreviousChar(local, n, 'S') && !isLastChar(wdsz, n)
&& FRONTV.indexOf(local.charAt(n + 1)) >= 0) {
break;
}
if (regionMatch(local, n, "CIA")) { // "CIA" -> X
code.append('X');
break;
}
- if (!isLastChar(wdsz, n) &&
- FRONTV.indexOf(local.charAt(n + 1)) >= 0) {
+ if (!isLastChar(wdsz, n) && FRONTV.indexOf(local.charAt(n
+ 1)) >= 0) {
code.append('S');
break; // CI,CE,CY -> S
}
- if (isPreviousChar(local, n, 'S') &&
- isNextChar(local, n, 'H') ) { // SCH->sk
+ if (isPreviousChar(local, n, 'S') && isNextChar(local, n,
'H')) { // SCH->sk
code.append('K');
break;
}
if (isNextChar(local, n, 'H')) { // detect CH
- if (n == 0 &&
- wdsz >= 3 &&
- isVowel(local,2) ) { // CH consonant -> K consonant
+ if (n == 0 && wdsz >= 3 && isVowel(local, 2)) { // CH
consonant -> K consonant
code.append('K');
} else {
code.append('X'); // CHvowel -> X
@@ -198,34 +190,26 @@ public class Metaphone implements StringEncoder {
}
break;
case 'D':
- if (!isLastChar(wdsz, n + 1) &&
- isNextChar(local, n, 'G') &&
- FRONTV.indexOf(local.charAt(n + 2)) >= 0) { // DGE DGI
DGY -> J
- code.append('J'); n += 2;
+ if (!isLastChar(wdsz, n + 1) && isNextChar(local, n, 'G')
&& FRONTV.indexOf(local.charAt(n + 2)) >= 0) { // DGE DGI DGY -> J
+ code.append('J');
+ n += 2;
} else {
code.append('T');
}
break;
case 'G': // GH silent at end or before consonant
- if (isLastChar(wdsz, n + 1) &&
- isNextChar(local, n, 'H')) {
+ if (isLastChar(wdsz, n + 1) && isNextChar(local, n, 'H')) {
break;
}
- if (!isLastChar(wdsz, n + 1) &&
- isNextChar(local,n,'H') &&
- !isVowel(local,n+2)) {
+ if (!isLastChar(wdsz, n + 1) && isNextChar(local, n, 'H')
&& !isVowel(local, n + 2)) {
break;
}
- if (n > 0 &&
- ( regionMatch(local, n, "GN") ||
- regionMatch(local, n, "GNED") ) ) {
+ if (n > 0 && (regionMatch(local, n, "GN") ||
regionMatch(local, n, "GNED"))) {
break; // silent G
}
// NOTE: Given that duplicated chars are removed, I don't
see how this can ever be true
hard = isPreviousChar(local, n, 'G');
- if (!isLastChar(wdsz, n) &&
- FRONTV.indexOf(local.charAt(n + 1)) >= 0 &&
- !hard) {
+ if (!isLastChar(wdsz, n) && FRONTV.indexOf(local.charAt(n
+ 1)) >= 0 && !hard) {
code.append('J');
} else {
code.append('K');
@@ -235,11 +219,10 @@ public class Metaphone implements StringEncoder {
if (isLastChar(wdsz, n)) {
break; // terminal H
}
- if (n > 0 &&
- VARSON.indexOf(local.charAt(n - 1)) >= 0) {
+ if (n > 0 && VARSON.indexOf(local.charAt(n - 1)) >= 0) {
break;
}
- if (isVowel(local,n+1)) {
+ if (isVowel(local, n + 1)) {
code.append('H'); // Hvowel
}
break;
@@ -261,7 +244,7 @@ public class Metaphone implements StringEncoder {
}
break;
case 'P':
- if (isNextChar(local,n,'H')) {
+ if (isNextChar(local, n, 'H')) {
// PH -> F
code.append('F');
} else {
@@ -272,37 +255,34 @@ public class Metaphone implements StringEncoder {
code.append('K');
break;
case 'S':
- if (regionMatch(local,n,"SH") ||
- regionMatch(local,n,"SIO") ||
- regionMatch(local,n,"SIA")) {
+ if (regionMatch(local, n, "SH") || regionMatch(local, n,
"SIO") || regionMatch(local, n, "SIA")) {
code.append('X');
} else {
code.append('S');
}
break;
case 'T':
- if (regionMatch(local,n,"TIA") ||
- regionMatch(local,n,"TIO")) {
+ if (regionMatch(local, n, "TIA") || regionMatch(local, n,
"TIO")) {
code.append('X');
break;
}
- if (regionMatch(local,n,"TCH")) {
+ if (regionMatch(local, n, "TCH")) {
// Silent if in "TCH"
break;
}
// substitute numeral 0 for TH (resembles theta after all)
- if (regionMatch(local,n,"TH")) {
+ if (regionMatch(local, n, "TH")) {
code.append('0');
} else {
code.append('T');
}
break;
case 'V':
- code.append('F'); break;
+ code.append('F');
+ break;
case 'W':
case 'Y': // silent if not followed by vowel
- if (!isLastChar(wdsz,n) &&
- isVowel(local,n+1)) {
+ if (!isLastChar(wdsz, n) && isVowel(local, n + 1)) {
code.append(symb);
}
break;
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 9751c2ef..2e1fb672 100644
--- a/src/test/java/org/apache/commons/codec/binary/Base32Test.java
+++ b/src/test/java/org/apache/commons/codec/binary/Base32Test.java
@@ -336,7 +336,7 @@ public class Base32Test {
final Base32 codec = new Base32();
final byte[][] b = BaseNTestData.randomData(codec, i);
assertEquals(b[1].length, codec.getEncodedLength(b[0]), i + " " +
codec.lineLength);
- //assertEquals(b[0],codec.decode(b[1]));
+ //assertEquals(b[0], codec.decode(b[1]));
}
}
@@ -346,7 +346,7 @@ public class Base32Test {
final Base32 codec = new Base32(10);
final byte[][] b = BaseNTestData.randomData(codec, i);
assertEquals(b[1].length, codec.getEncodedLength(b[0]), i + " " +
codec.lineLength);
- //assertEquals(b[0],codec.decode(b[1]));
+ //assertEquals(b[0], codec.decode(b[1]));
}
}
@@ -356,7 +356,7 @@ public class Base32Test {
final Base32 codec = new Base32(true);
final byte[][] b = BaseNTestData.randomData(codec, i);
assertEquals(b[1].length, codec.getEncodedLength(b[0]), i + " " +
codec.lineLength);
- //assertEquals(b[0],codec.decode(b[1]));
+ //assertEquals(b[0], codec.decode(b[1]));
}
}
diff --git
a/src/test/java/org/apache/commons/codec/digest/MessageDigestAlgorithmsTest.java
b/src/test/java/org/apache/commons/codec/digest/MessageDigestAlgorithmsTest.java
index 14e03782..bcce78c8 100644
---
a/src/test/java/org/apache/commons/codec/digest/MessageDigestAlgorithmsTest.java
+++
b/src/test/java/org/apache/commons/codec/digest/MessageDigestAlgorithmsTest.java
@@ -94,7 +94,7 @@ public class MessageDigestAlgorithmsTest {
private DigestUtilsTest digestUtilsTest;
private byte[] digestTestData(final String messageDigestAlgorithm) {
- return
DigestUtils.digest(DigestUtils.getDigest(messageDigestAlgorithm),getTestData());
+ return
DigestUtils.digest(DigestUtils.getDigest(messageDigestAlgorithm),
getTestData());
}
private byte[] getTestData() {
@@ -139,9 +139,8 @@ public class MessageDigestAlgorithmsTest {
@MethodSource("data")
public void testDigestByteArray(final String messageDigestAlgorithm) {
assumeTrue(DigestUtils.isAvailable(messageDigestAlgorithm));
- assertArrayEquals(digestTestData(messageDigestAlgorithm),
-
DigestUtils.digest(DigestUtils.getDigest(messageDigestAlgorithm),
getTestData()));
- assertArrayEquals(digestTestData(messageDigestAlgorithm),
DigestUtils.digest(DigestUtils.getDigest(messageDigestAlgorithm),getTestData()));
+ assertArrayEquals(digestTestData(messageDigestAlgorithm),
DigestUtils.digest(DigestUtils.getDigest(messageDigestAlgorithm),
getTestData()));
+ assertArrayEquals(digestTestData(messageDigestAlgorithm),
DigestUtils.digest(DigestUtils.getDigest(messageDigestAlgorithm),
getTestData()));
}
@ParameterizedTest
@@ -169,7 +168,8 @@ public class MessageDigestAlgorithmsTest {
assumeTrue(DigestUtils.isAvailable(messageDigestAlgorithm));
assertArrayEquals(digestTestData(messageDigestAlgorithm),
DigestUtils.digest(DigestUtils.getDigest(messageDigestAlgorithm), new
ByteArrayInputStream(getTestData())));
- assertArrayEquals(digestTestData(messageDigestAlgorithm),
DigestUtils.digest(DigestUtils.getDigest(messageDigestAlgorithm),new
ByteArrayInputStream(getTestData())));
+ assertArrayEquals(digestTestData(messageDigestAlgorithm),
+
DigestUtils.digest(DigestUtils.getDigest(messageDigestAlgorithm), new
ByteArrayInputStream(getTestData())));
}
@ParameterizedTest
