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 9efd4f2 Standardize on American English spelling of 'behavior'.
9efd4f2 is described below
commit 9efd4f252443a6b7efe8b2a06b29b0bb8710330d
Author: Gary Gregory <garydgreg...@gmail.com>
AuthorDate: Mon Mar 30 10:35:38 2020 -0400
Standardize on American English spelling of 'behavior'.
---
src/changes/changes.xml | 2 +-
src/main/java/org/apache/commons/codec/binary/Base32InputStream.java | 4 ++--
src/main/java/org/apache/commons/codec/binary/Base32OutputStream.java | 4 ++--
src/main/java/org/apache/commons/codec/binary/Base64.java | 2 +-
src/main/java/org/apache/commons/codec/binary/Base64InputStream.java | 4 ++--
src/main/java/org/apache/commons/codec/binary/Base64OutputStream.java | 4 ++--
src/main/java/org/apache/commons/codec/binary/BaseNCodec.java | 4 ++--
src/main/java/org/apache/commons/codec/digest/DigestUtils.java | 2 +-
src/main/java/org/apache/commons/codec/digest/HmacUtils.java | 2 +-
src/main/java/org/apache/commons/codec/digest/MurmurHash3.java | 2 +-
src/main/java/org/apache/commons/codec/net/BCodec.java | 4 ++--
src/test/java/org/apache/commons/codec/digest/MurmurHash3Test.java | 2 +-
12 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index 2ddd2b2..f5996a3 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -251,7 +251,7 @@ The <action> type attribute can be add,update,fix,remove.
Add test(s) to check that encodeBase64() does not chunk output.
</action>
<action dev="sebb" type="fix" issue="CODEC-97" due-to="mjryall">
- Base64 default constructor behaviour changed to enable chunking in 1.4.
+ Base64 default constructor behavior changed to enable chunking in 1.4.
</action>
<action dev="ggregory" type="fix" issue="CODEC-99" due-to="julius">
Base64.encodeBase64String() shouldn't chunk.
diff --git
a/src/main/java/org/apache/commons/codec/binary/Base32InputStream.java
b/src/main/java/org/apache/commons/codec/binary/Base32InputStream.java
index 90be691..0be8860 100644
--- a/src/main/java/org/apache/commons/codec/binary/Base32InputStream.java
+++ b/src/main/java/org/apache/commons/codec/binary/Base32InputStream.java
@@ -24,8 +24,8 @@ import java.io.InputStream;
* is 76 characters and the default lineEnding is CRLF, but these can be
overridden by using the appropriate
* constructor.
* <p>
- * The default behaviour of the Base32InputStream is to DECODE, whereas the
default behaviour of the Base32OutputStream
- * is to ENCODE, but this behaviour can be overridden by using a different
constructor.
+ * The default behavior of the Base32InputStream is to DECODE, whereas the
default behavior of the Base32OutputStream
+ * is to ENCODE, but this behavior can be overridden by using a different
constructor.
* </p>
* <p>
* Since this class operates directly on byte streams, and not character
streams, it is hard-coded to only encode/decode
diff --git
a/src/main/java/org/apache/commons/codec/binary/Base32OutputStream.java
b/src/main/java/org/apache/commons/codec/binary/Base32OutputStream.java
index d66f92a..be0a7a4 100644
--- a/src/main/java/org/apache/commons/codec/binary/Base32OutputStream.java
+++ b/src/main/java/org/apache/commons/codec/binary/Base32OutputStream.java
@@ -24,8 +24,8 @@ import java.io.OutputStream;
* is 76 characters and the default lineEnding is CRLF, but these can be
overridden by using the appropriate
* constructor.
* <p>
- * The default behaviour of the Base32OutputStream is to ENCODE, whereas the
default behaviour of the Base32InputStream
- * is to DECODE. But this behaviour can be overridden by using a different
constructor.
+ * The default behavior of the Base32OutputStream is to ENCODE, whereas the
default behavior of the Base32InputStream
+ * is to DECODE. But this behavior can be overridden by using a different
constructor.
* </p>
* <p>
* Since this class operates directly on byte streams, and not character
streams, it is hard-coded to only encode/decode
diff --git a/src/main/java/org/apache/commons/codec/binary/Base64.java
b/src/main/java/org/apache/commons/codec/binary/Base64.java
index 9ef000f..5311207 100644
--- a/src/main/java/org/apache/commons/codec/binary/Base64.java
+++ b/src/main/java/org/apache/commons/codec/binary/Base64.java
@@ -564,7 +564,7 @@ public class Base64 extends BaseNCodec {
/**
* Encodes binary data using the base64 algorithm but does not chunk the
output.
*
- * NOTE: We changed the behaviour of this method from multi-line chunking
(commons-codec-1.4) to
+ * NOTE: We changed the behavior of this method from multi-line chunking
(commons-codec-1.4) to
* single-line non-chunking (commons-codec-1.5).
*
* @param binaryData
diff --git
a/src/main/java/org/apache/commons/codec/binary/Base64InputStream.java
b/src/main/java/org/apache/commons/codec/binary/Base64InputStream.java
index 675e42a..0a09bd8 100644
--- a/src/main/java/org/apache/commons/codec/binary/Base64InputStream.java
+++ b/src/main/java/org/apache/commons/codec/binary/Base64InputStream.java
@@ -24,8 +24,8 @@ import java.io.InputStream;
* is 76 characters and the default lineEnding is CRLF, but these can be
overridden by using the appropriate
* constructor.
* <p>
- * The default behaviour of the Base64InputStream is to DECODE, whereas the
default behaviour of the Base64OutputStream
- * is to ENCODE, but this behaviour can be overridden by using a different
constructor.
+ * The default behavior of the Base64InputStream is to DECODE, whereas the
default behavior of the Base64OutputStream
+ * is to ENCODE, but this behavior can be overridden by using a different
constructor.
* </p>
* <p>
* This class implements section <cite>6.8. Base64
Content-Transfer-Encoding</cite> from RFC 2045 <cite>Multipurpose
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 edc4093..07d6b5c 100644
--- a/src/main/java/org/apache/commons/codec/binary/Base64OutputStream.java
+++ b/src/main/java/org/apache/commons/codec/binary/Base64OutputStream.java
@@ -24,8 +24,8 @@ import java.io.OutputStream;
* is 76 characters and the default lineEnding is CRLF, but these can be
overridden by using the appropriate
* constructor.
* <p>
- * The default behaviour of the Base64OutputStream is to ENCODE, whereas the
default behaviour of the Base64InputStream
- * is to DECODE. But this behaviour can be overridden by using a different
constructor.
+ * The default behavior of the Base64OutputStream is to ENCODE, whereas the
default behavior of the Base64InputStream
+ * is to DECODE. But this behavior can be overridden by using a different
constructor.
* </p>
* <p>
* This class implements section <cite>6.8. Base64
Content-Transfer-Encoding</cite> from RFC 2045 <cite>Multipurpose
diff --git a/src/main/java/org/apache/commons/codec/binary/BaseNCodec.java
b/src/main/java/org/apache/commons/codec/binary/BaseNCodec.java
index dae3aab..4c983c6 100644
--- a/src/main/java/org/apache/commons/codec/binary/BaseNCodec.java
+++ b/src/main/java/org/apache/commons/codec/binary/BaseNCodec.java
@@ -230,7 +230,7 @@ public abstract class BaseNCodec implements BinaryEncoder,
BinaryDecoder {
}
/**
- * Sets the decoding behaviour when the input bytes contain leftover
trailing bits that
+ * Sets the decoding behavior when the input bytes contain leftover
trailing bits that
* cannot be created by a valid encoding. These can be bits that are
unused from the final
* character or entire characters. The default mode is lenient decoding.
Set this to
* {@code true} to enable strict decoding.
@@ -256,7 +256,7 @@ public abstract class BaseNCodec implements BinaryEncoder,
BinaryDecoder {
}
/**
- * Returns true if decoding behaviour is strict. Decoding will raise an
+ * Returns true if decoding behavior is strict. Decoding will raise an
* {@link IllegalArgumentException} if trailing bits are not part of a
valid encoding.
*
* <p>The default is false for lenient encoding. Decoding will compose
trailing bits
diff --git a/src/main/java/org/apache/commons/codec/digest/DigestUtils.java
b/src/main/java/org/apache/commons/codec/digest/DigestUtils.java
index dda533d..aaa212d 100644
--- a/src/main/java/org/apache/commons/codec/digest/DigestUtils.java
+++ b/src/main/java/org/apache/commons/codec/digest/DigestUtils.java
@@ -1526,7 +1526,7 @@ public class DigestUtils {
/**
* Preserves binary compatibility only.
- * As for previous versions does not provide useful behaviour
+ * As for previous versions does not provide useful behavior
* @deprecated since 1.11; only useful to preserve binary compatibility
*/
@Deprecated
diff --git a/src/main/java/org/apache/commons/codec/digest/HmacUtils.java
b/src/main/java/org/apache/commons/codec/digest/HmacUtils.java
index 6d626fc..1e2563b 100644
--- a/src/main/java/org/apache/commons/codec/digest/HmacUtils.java
+++ b/src/main/java/org/apache/commons/codec/digest/HmacUtils.java
@@ -880,7 +880,7 @@ public final class HmacUtils {
/**
* Preserves binary compatibility only.
- * As for previous versions does not provide useful behaviour
+ * As for previous versions does not provide useful behavior
* @deprecated since 1.11; only useful to preserve binary compatibility
*/
@Deprecated
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 9d0fc35..6305dd0 100644
--- a/src/main/java/org/apache/commons/codec/digest/MurmurHash3.java
+++ b/src/main/java/org/apache/commons/codec/digest/MurmurHash3.java
@@ -798,7 +798,7 @@ public final class MurmurHash3 {
public static long[] hash128(final byte[] data, final int offset, final
int length, final int seed) {
// ************
// Note: This deliberately fails to apply masking using 0xffffffffL to
the seed
- // to maintain behavioural compatibility with the original version.
+ // to maintain behavioral compatibility with the original version.
// The implicit conversion to a long will extend a negative sign
// bit through the upper 32-bits of the long seed. These should be
zero.
// ************
diff --git a/src/main/java/org/apache/commons/codec/net/BCodec.java
b/src/main/java/org/apache/commons/codec/net/BCodec.java
index b00a40b..b054e3b 100644
--- a/src/main/java/org/apache/commons/codec/net/BCodec.java
+++ b/src/main/java/org/apache/commons/codec/net/BCodec.java
@@ -89,7 +89,7 @@ public class BCodec extends RFC1522Codec implements
StringEncoder, StringDecoder
}
/**
- * Sets the decoding behaviour when the input bytes contain leftover
trailing bits that
+ * Sets the decoding behavior when the input bytes contain leftover
trailing bits that
* cannot be created by a valid Base64 encoding. This setting is
transferred to the instance
* of {@link Base64} used to perform decoding.
*
@@ -108,7 +108,7 @@ public class BCodec extends RFC1522Codec implements
StringEncoder, StringDecoder
}
/**
- * Returns true if decoding behaviour is strict. Decoding will raise a
+ * Returns true if decoding behavior is strict. Decoding will raise a
* {@link DecoderException} if trailing bits are not part of a valid
Base64 encoding.
*
* <p>The default is false for lenient encoding. Decoding will compose
trailing bits
diff --git a/src/test/java/org/apache/commons/codec/digest/MurmurHash3Test.java
b/src/test/java/org/apache/commons/codec/digest/MurmurHash3Test.java
index 45a0eab..fb55505 100644
--- a/src/test/java/org/apache/commons/codec/digest/MurmurHash3Test.java
+++ b/src/test/java/org/apache/commons/codec/digest/MurmurHash3Test.java
@@ -609,7 +609,7 @@ public class MurmurHash3Test {
* Test the {@link MurmurHash3#hash128(byte[], int, int, int)} algorithm.
*
* <p>Explicit test for a negative seed. The original implementation has a
sign extension error
- * for negative seeds. This test is here to maintain behavioural
compatibility of the
+ * for negative seeds. This test is here to maintain behavioral
compatibility of the
* broken deprecated method.
*/
@Test
