MurmurHash is a non-cryptographic hash function suitable for general * hash-based lookup. The name comes from two basic operations, multiply (MU) diff --git a/src/main/java/org/apache/commons/codec/digest/MurmurHash3.java b/src/main/java/org/apache/commons/codec/digest/MurmurHash3.java index 197c70537e..10ce3b8a2e 100644 --- a/src/main/java/org/apache/commons/codec/digest/MurmurHash3.java +++ b/src/main/java/org/apache/commons/codec/digest/MurmurHash3.java @@ -20,7 +20,7 @@ import org.apache.commons.codec.binary.StringUtils; /** - * Implementation of the MurmurHash3 32-bit and 128-bit hash functions. + * Implements the MurmurHash3 32-bit and 128-bit hash functions. * *

* MurmurHash is a non-cryptographic hash function suitable for general hash-based lookup. The name comes from two basic diff --git a/src/main/java/org/apache/commons/codec/digest/XXHash32.java b/src/main/java/org/apache/commons/codec/digest/XXHash32.java index fd46fc0c3c..16f59b8be3 100644 --- a/src/main/java/org/apache/commons/codec/digest/XXHash32.java +++ b/src/main/java/org/apache/commons/codec/digest/XXHash32.java @@ -22,7 +22,7 @@ import java.util.zip.Checksum; /** - * Implementation of the xxHash32 hash algorithm. + * Implements the xxHash32 hash algorithm. * *

* Copied from Commons Compress 1.14 < this.getMaxCodeLen() && n < wdsz) { // max code size of 4 works well + while (code.length() < 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)) { - n++; } else { // not dup switch (symb) { case 'A': @@ -252,14 +251,10 @@ public String metaphone(final String txt) { code.append('K'); break; } - if (isNextChar(local, n, 'H')) { // detect CH - if (n == 0 && wdsz >= 3 && isVowel(local, 2)) { // CH consonant -> K consonant - code.append('K'); - } else { - code.append('X'); // CHvowel -> X - } - } else { + if (!isNextChar(local, n, 'H') || (n == 0 && wdsz >= 3 && isVowel(local, 2))) { // CH consonant -> K consonant code.append('K'); + } else { + code.append('X'); // CHvowel -> X } break; case 'D': @@ -370,10 +365,10 @@ public String metaphone(final String txt) { // do nothing break; } // end switch - n++; } // end else from symb != 'C' - if (code.length() > this.getMaxCodeLen()) { - code.setLength(this.getMaxCodeLen()); + n++; + if (code.length() > getMaxCodeLen()) { + code.setLength(getMaxCodeLen()); } } return code.toString(); 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 10b4a8f08c..f33b7ce156 100644 --- a/src/main/java/org/apache/commons/codec/language/Nysiis.java +++ b/src/main/java/org/apache/commons/codec/language/Nysiis.java @@ -214,7 +214,7 @@ public Object encode(final Object obj) throws EncoderException { if (!(obj instanceof String)) { throw new EncoderException("Parameter supplied to Nysiis encode is not of type java.lang.String"); } - return this.nysiis((String) obj); + return nysiis((String) obj); } /** @@ -228,7 +228,7 @@ public Object encode(final Object obj) throws EncoderException { */ @Override public String encode(final String str) { - return this.nysiis(str); + return nysiis(str); } /** @@ -316,7 +316,7 @@ public String nysiis(String str) { } final String string = key.toString(); - return this.isStrict() ? string.substring(0, Math.min(TRUE_LENGTH, string.length())) : string; + return isStrict() ? string.substring(0, Math.min(TRUE_LENGTH, string.length())) : string; } } diff --git a/src/main/java/org/apache/commons/codec/net/QuotedPrintableCodec.java b/src/main/java/org/apache/commons/codec/net/QuotedPrintableCodec.java index 6dd8007723..86d2e89501 100644 --- a/src/main/java/org/apache/commons/codec/net/QuotedPrintableCodec.java +++ b/src/main/java/org/apache/commons/codec/net/QuotedPrintableCodec.java @@ -448,7 +448,7 @@ public Object decode(final Object obj) throws DecoderException { */ @Override public String decode(final String sourceStr) throws DecoderException { - return this.decode(sourceStr, this.getCharset()); + return this.decode(sourceStr, getCharset()); } /** diff --git a/src/main/java/org/apache/commons/codec/net/RFC1522Codec.java b/src/main/java/org/apache/commons/codec/net/RFC1522Codec.java index 39064c52a6..a77548d983 100644 --- a/src/main/java/org/apache/commons/codec/net/RFC1522Codec.java +++ b/src/main/java/org/apache/commons/codec/net/RFC1522Codec.java @@ -155,9 +155,9 @@ protected String encodeText(final String text, final Charset charset) throws Enc buffer.append(PREFIX); buffer.append(charset); buffer.append(SEP); - buffer.append(this.getEncoding()); + buffer.append(getEncoding()); buffer.append(SEP); - buffer.append(StringUtils.newStringUsAscii(this.doEncoding(text.getBytes(charset)))); + buffer.append(StringUtils.newStringUsAscii(doEncoding(text.getBytes(charset)))); buffer.append(POSTFIX); return buffer.toString(); } diff --git a/src/site/xdoc/download_codec.xml b/src/site/xdoc/download_codec.xml index 21317e594b..ad48414247 100644 --- a/src/site/xdoc/download_codec.xml +++ b/src/site/xdoc/download_codec.xml @@ -113,32 +113,32 @@ limitations under the License.