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 2023/06/04 16:31:30 UTC
[commons-codec] branch master updated (36b08445 -> 7d0018ae)
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 36b08445 Fix PMD violations
new 110e8035 Better Javadoc @see
new d3877a3f Better Javadoc @see
new 7d0018ae Static imports first in unit tests
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:
.../java/org/apache/commons/codec/CharEncoding.java | 16 +++++++++-------
.../commons/codec/binary/Base16InputStream.java | 4 ++--
.../commons/codec/binary/Base16OutputStream.java | 4 ++--
.../org/apache/commons/codec/binary/StringUtils.java | 20 ++++++++++----------
.../java/org/apache/commons/codec/net/BCodec.java | 6 +++---
.../org/apache/commons/codec/net/PercentCodec.java | 1 +
.../java/org/apache/commons/codec/net/QCodec.java | 4 ++--
.../org/apache/commons/codec/net/RFC1522Codec.java | 5 ++---
.../commons/codec/BinaryEncoderAbstractTest.java | 4 ++--
.../org/apache/commons/codec/CharEncodingTest.java | 4 ++--
.../java/org/apache/commons/codec/CharsetsTest.java | 4 ++--
.../apache/commons/codec/DecoderExceptionTest.java | 4 ++--
.../apache/commons/codec/EncoderExceptionTest.java | 4 ++--
.../commons/codec/StringEncoderAbstractTest.java | 6 ++++--
.../commons/codec/StringEncoderComparatorTest.java | 4 ++--
.../commons/codec/binary/Base16InputStreamTest.java | 9 ++++++---
.../commons/codec/binary/Base16OutputStreamTest.java | 6 +++---
.../org/apache/commons/codec/binary/Base16Test.java | 17 +++++++++++------
.../commons/codec/binary/Base32InputStreamTest.java | 8 ++++++--
.../commons/codec/binary/Base32OutputStreamTest.java | 7 +++++--
.../org/apache/commons/codec/binary/Base32Test.java | 12 ++++++++++--
.../commons/codec/binary/Base64Codec13Test.java | 4 ++--
.../commons/codec/binary/Base64InputStreamTest.java | 9 +++++++--
.../commons/codec/binary/Base64OutputStreamTest.java | 8 ++++++--
.../org/apache/commons/codec/binary/Base64Test.java | 11 +++++++++--
.../apache/commons/codec/binary/BaseNCodecTest.java | 11 ++++++++---
.../commons/codec/binary/CharSequenceUtilsTest.java | 6 ++++--
.../org/apache/commons/codec/binary/HexTest.java | 9 +++++++--
.../apache/commons/codec/binary/StringUtilsTest.java | 9 +++++++--
.../org/apache/commons/codec/cli/DigestTest.java | 4 ++--
.../apache/commons/codec/digest/Apr1CryptTest.java | 7 +++++--
.../org/apache/commons/codec/digest/B64Test.java | 4 ++--
.../org/apache/commons/codec/digest/Blake3Test.java | 4 ++--
.../commons/codec/digest/Blake3TestVectorsTest.java | 12 ++++++------
.../org/apache/commons/codec/digest/CryptTest.java | 7 +++++--
.../commons/codec/digest/HmacAlgorithmsTest.java | 12 +++++++-----
.../apache/commons/codec/digest/HmacUtilsTest.java | 6 ++++--
.../apache/commons/codec/digest/Md5CryptTest.java | 7 +++++--
.../codec/digest/MessageDigestAlgorithmsTest.java | 18 +++++++++++-------
.../apache/commons/codec/digest/MurmurHash2Test.java | 4 ++--
.../apache/commons/codec/digest/MurmurHash3Test.java | 9 ++++++---
.../commons/codec/digest/PureJavaCrc32CTest.java | 4 ++--
.../commons/codec/digest/PureJavaCrc32Test.java | 4 ++--
.../apache/commons/codec/digest/Sha256CryptTest.java | 6 ++++--
.../apache/commons/codec/digest/Sha2CryptTest.java | 4 ++--
.../apache/commons/codec/digest/Sha512CryptTest.java | 8 +++++---
.../apache/commons/codec/digest/UnixCryptTest.java | 8 ++++++--
.../commons/codec/digest/XXHash32OverflowTest.java | 4 ++--
.../apache/commons/codec/digest/XXHash32Test.java | 8 ++++----
.../commons/codec/language/Caverphone1Test.java | 6 +++---
.../commons/codec/language/Caverphone2Test.java | 6 +++---
.../commons/codec/language/ColognePhoneticTest.java | 8 ++++----
.../codec/language/DaitchMokotoffSoundexTest.java | 4 ++--
.../commons/codec/language/DoubleMetaphone2Test.java | 4 ++--
.../commons/codec/language/DoubleMetaphoneTest.java | 8 ++++++--
.../language/MatchRatingApproachEncoderTest.java | 7 +++++--
.../apache/commons/codec/language/MetaphoneTest.java | 6 ++++--
.../apache/commons/codec/language/NysiisTest.java | 6 +++---
.../commons/codec/language/RefinedSoundexTest.java | 4 ++--
.../apache/commons/codec/language/SoundexTest.java | 6 ++++--
.../codec/language/bm/BeiderMorseEncoderTest.java | 13 +++++++++----
.../codec/language/bm/LanguageGuessingTest.java | 8 ++++----
.../language/bm/PhoneticEngineRegressionTest.java | 4 ++--
.../codec/language/bm/PhoneticEngineTest.java | 10 +++++-----
.../apache/commons/codec/language/bm/RuleTest.java | 4 ++--
.../org/apache/commons/codec/net/BCodecTest.java | 8 ++++++--
.../apache/commons/codec/net/PercentCodecTest.java | 8 ++++++--
.../org/apache/commons/codec/net/QCodecTest.java | 8 ++++++--
.../commons/codec/net/QuotedPrintableCodecTest.java | 6 ++++--
.../apache/commons/codec/net/RFC1522CodecTest.java | 6 +++---
70 files changed, 307 insertions(+), 189 deletions(-)
[commons-codec] 01/03: Better Javadoc @see
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 110e8035499cbf014d5267db39369a327fd80cdd
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Sun Jun 4 12:26:54 2023 -0400
Better Javadoc @see
---
src/main/java/org/apache/commons/codec/net/RFC1522Codec.java | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
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 f5051865..a607ce65 100644
--- a/src/main/java/org/apache/commons/codec/net/RFC1522Codec.java
+++ b/src/main/java/org/apache/commons/codec/net/RFC1522Codec.java
@@ -98,8 +98,7 @@ abstract class RFC1522Codec {
* thrown if there is an error condition during the Encoding process.
* @throws UnsupportedEncodingException
* if charset is not available
- *
- * @see <a href="http://download.oracle.com/javase/7/docs/api/java/nio/charset/Charset.html">Standard charsets</a>
+ * @see Charset
*/
protected String encodeText(final String text, final String charsetName)
throws EncoderException, UnsupportedEncodingException {
[commons-codec] 03/03: Static imports first in unit tests
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 7d0018ae03fc3de1279dd16d79b94232c2146933
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Sun Jun 4 12:31:18 2023 -0400
Static imports first in unit tests
Organize imports
---
.../java/org/apache/commons/codec/CharEncoding.java | 2 ++
.../apache/commons/codec/binary/Base16InputStream.java | 4 ++--
.../commons/codec/binary/Base16OutputStream.java | 4 ++--
.../org/apache/commons/codec/net/PercentCodec.java | 1 +
.../commons/codec/BinaryEncoderAbstractTest.java | 4 ++--
.../org/apache/commons/codec/CharEncodingTest.java | 4 ++--
.../java/org/apache/commons/codec/CharsetsTest.java | 4 ++--
.../org/apache/commons/codec/DecoderExceptionTest.java | 4 ++--
.../org/apache/commons/codec/EncoderExceptionTest.java | 4 ++--
.../commons/codec/StringEncoderAbstractTest.java | 6 ++++--
.../commons/codec/StringEncoderComparatorTest.java | 4 ++--
.../commons/codec/binary/Base16InputStreamTest.java | 9 ++++++---
.../commons/codec/binary/Base16OutputStreamTest.java | 6 +++---
.../org/apache/commons/codec/binary/Base16Test.java | 17 +++++++++++------
.../commons/codec/binary/Base32InputStreamTest.java | 8 ++++++--
.../commons/codec/binary/Base32OutputStreamTest.java | 7 +++++--
.../org/apache/commons/codec/binary/Base32Test.java | 12 ++++++++++--
.../apache/commons/codec/binary/Base64Codec13Test.java | 4 ++--
.../commons/codec/binary/Base64InputStreamTest.java | 9 +++++++--
.../commons/codec/binary/Base64OutputStreamTest.java | 8 ++++++--
.../org/apache/commons/codec/binary/Base64Test.java | 11 +++++++++--
.../apache/commons/codec/binary/BaseNCodecTest.java | 11 ++++++++---
.../commons/codec/binary/CharSequenceUtilsTest.java | 6 ++++--
.../java/org/apache/commons/codec/binary/HexTest.java | 9 +++++++--
.../apache/commons/codec/binary/StringUtilsTest.java | 9 +++++++--
.../java/org/apache/commons/codec/cli/DigestTest.java | 4 ++--
.../org/apache/commons/codec/digest/Apr1CryptTest.java | 7 +++++--
.../java/org/apache/commons/codec/digest/B64Test.java | 4 ++--
.../org/apache/commons/codec/digest/Blake3Test.java | 4 ++--
.../commons/codec/digest/Blake3TestVectorsTest.java | 12 ++++++------
.../org/apache/commons/codec/digest/CryptTest.java | 7 +++++--
.../commons/codec/digest/HmacAlgorithmsTest.java | 12 +++++++-----
.../org/apache/commons/codec/digest/HmacUtilsTest.java | 6 ++++--
.../org/apache/commons/codec/digest/Md5CryptTest.java | 7 +++++--
.../codec/digest/MessageDigestAlgorithmsTest.java | 18 +++++++++++-------
.../apache/commons/codec/digest/MurmurHash2Test.java | 4 ++--
.../apache/commons/codec/digest/MurmurHash3Test.java | 9 ++++++---
.../commons/codec/digest/PureJavaCrc32CTest.java | 4 ++--
.../apache/commons/codec/digest/PureJavaCrc32Test.java | 4 ++--
.../apache/commons/codec/digest/Sha256CryptTest.java | 6 ++++--
.../org/apache/commons/codec/digest/Sha2CryptTest.java | 4 ++--
.../apache/commons/codec/digest/Sha512CryptTest.java | 8 +++++---
.../org/apache/commons/codec/digest/UnixCryptTest.java | 8 ++++++--
.../commons/codec/digest/XXHash32OverflowTest.java | 4 ++--
.../org/apache/commons/codec/digest/XXHash32Test.java | 8 ++++----
.../apache/commons/codec/language/Caverphone1Test.java | 6 +++---
.../apache/commons/codec/language/Caverphone2Test.java | 6 +++---
.../commons/codec/language/ColognePhoneticTest.java | 8 ++++----
.../codec/language/DaitchMokotoffSoundexTest.java | 4 ++--
.../commons/codec/language/DoubleMetaphone2Test.java | 4 ++--
.../commons/codec/language/DoubleMetaphoneTest.java | 8 ++++++--
.../codec/language/MatchRatingApproachEncoderTest.java | 7 +++++--
.../apache/commons/codec/language/MetaphoneTest.java | 6 ++++--
.../org/apache/commons/codec/language/NysiisTest.java | 6 +++---
.../commons/codec/language/RefinedSoundexTest.java | 4 ++--
.../org/apache/commons/codec/language/SoundexTest.java | 6 ++++--
.../codec/language/bm/BeiderMorseEncoderTest.java | 13 +++++++++----
.../codec/language/bm/LanguageGuessingTest.java | 8 ++++----
.../language/bm/PhoneticEngineRegressionTest.java | 4 ++--
.../commons/codec/language/bm/PhoneticEngineTest.java | 10 +++++-----
.../org/apache/commons/codec/language/bm/RuleTest.java | 4 ++--
.../java/org/apache/commons/codec/net/BCodecTest.java | 8 ++++++--
.../org/apache/commons/codec/net/PercentCodecTest.java | 8 ++++++--
.../java/org/apache/commons/codec/net/QCodecTest.java | 8 ++++++--
.../commons/codec/net/QuotedPrintableCodecTest.java | 6 ++++--
.../org/apache/commons/codec/net/RFC1522CodecTest.java | 6 +++---
66 files changed, 283 insertions(+), 164 deletions(-)
diff --git a/src/main/java/org/apache/commons/codec/CharEncoding.java b/src/main/java/org/apache/commons/codec/CharEncoding.java
index 62e147fe..9d938cdb 100644
--- a/src/main/java/org/apache/commons/codec/CharEncoding.java
+++ b/src/main/java/org/apache/commons/codec/CharEncoding.java
@@ -17,6 +17,8 @@
package org.apache.commons.codec;
+import java.nio.charset.Charset;
+
/**
* Character encoding names required of every implementation of the Java platform.
*
diff --git a/src/main/java/org/apache/commons/codec/binary/Base16InputStream.java b/src/main/java/org/apache/commons/codec/binary/Base16InputStream.java
index bfa0c0a2..de580a15 100644
--- a/src/main/java/org/apache/commons/codec/binary/Base16InputStream.java
+++ b/src/main/java/org/apache/commons/codec/binary/Base16InputStream.java
@@ -17,10 +17,10 @@
package org.apache.commons.codec.binary;
-import org.apache.commons.codec.CodecPolicy;
-
import java.io.InputStream;
+import org.apache.commons.codec.CodecPolicy;
+
/**
* Provides Base16 encoding and decoding in a streaming fashion (unlimited size).
* <p>
diff --git a/src/main/java/org/apache/commons/codec/binary/Base16OutputStream.java b/src/main/java/org/apache/commons/codec/binary/Base16OutputStream.java
index 06133dc9..18e28764 100644
--- a/src/main/java/org/apache/commons/codec/binary/Base16OutputStream.java
+++ b/src/main/java/org/apache/commons/codec/binary/Base16OutputStream.java
@@ -17,10 +17,10 @@
package org.apache.commons.codec.binary;
-import org.apache.commons.codec.CodecPolicy;
-
import java.io.OutputStream;
+import org.apache.commons.codec.CodecPolicy;
+
/**
* Provides Hex encoding and decoding in a streaming fashion (unlimited size).
* <p>
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 24fd2ff1..b33dddd8 100644
--- a/src/main/java/org/apache/commons/codec/net/PercentCodec.java
+++ b/src/main/java/org/apache/commons/codec/net/PercentCodec.java
@@ -19,6 +19,7 @@ package org.apache.commons.codec.net;
import java.nio.ByteBuffer;
import java.util.BitSet;
+
import org.apache.commons.codec.BinaryDecoder;
import org.apache.commons.codec.BinaryEncoder;
import org.apache.commons.codec.DecoderException;
diff --git a/src/test/java/org/apache/commons/codec/BinaryEncoderAbstractTest.java b/src/test/java/org/apache/commons/codec/BinaryEncoderAbstractTest.java
index 27bca3ca..34373f09 100644
--- a/src/test/java/org/apache/commons/codec/BinaryEncoderAbstractTest.java
+++ b/src/test/java/org/apache/commons/codec/BinaryEncoderAbstractTest.java
@@ -17,10 +17,10 @@
package org.apache.commons.codec;
-import org.junit.jupiter.api.Test;
-
import static org.junit.jupiter.api.Assertions.assertThrows;
+import org.junit.jupiter.api.Test;
+
/**
*/
public abstract class BinaryEncoderAbstractTest {
diff --git a/src/test/java/org/apache/commons/codec/CharEncodingTest.java b/src/test/java/org/apache/commons/codec/CharEncodingTest.java
index 1ebb7669..0e8f74a3 100644
--- a/src/test/java/org/apache/commons/codec/CharEncodingTest.java
+++ b/src/test/java/org/apache/commons/codec/CharEncodingTest.java
@@ -17,10 +17,10 @@
package org.apache.commons.codec;
-import org.junit.jupiter.api.Test;
-
import static org.junit.jupiter.api.Assertions.assertEquals;
+import org.junit.jupiter.api.Test;
+
/**
* Sanity checks for {@link CharEncoding}.
*/
diff --git a/src/test/java/org/apache/commons/codec/CharsetsTest.java b/src/test/java/org/apache/commons/codec/CharsetsTest.java
index ce388a88..c2aa9edc 100644
--- a/src/test/java/org/apache/commons/codec/CharsetsTest.java
+++ b/src/test/java/org/apache/commons/codec/CharsetsTest.java
@@ -17,12 +17,12 @@
package org.apache.commons.codec;
-import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
import java.nio.charset.Charset;
import java.nio.charset.StandardCharsets;
-import static org.junit.jupiter.api.Assertions.assertEquals;
+import org.junit.jupiter.api.Test;
/**
* Sanity checks for {@link Charsets}.
diff --git a/src/test/java/org/apache/commons/codec/DecoderExceptionTest.java b/src/test/java/org/apache/commons/codec/DecoderExceptionTest.java
index d585b41a..7e30c6f5 100644
--- a/src/test/java/org/apache/commons/codec/DecoderExceptionTest.java
+++ b/src/test/java/org/apache/commons/codec/DecoderExceptionTest.java
@@ -17,11 +17,11 @@
package org.apache.commons.codec;
-import org.junit.jupiter.api.Test;
-
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNull;
+import org.junit.jupiter.api.Test;
+
/**
* Tests {@link DecoderException}.
*/
diff --git a/src/test/java/org/apache/commons/codec/EncoderExceptionTest.java b/src/test/java/org/apache/commons/codec/EncoderExceptionTest.java
index 4cdb007f..534a4f4f 100644
--- a/src/test/java/org/apache/commons/codec/EncoderExceptionTest.java
+++ b/src/test/java/org/apache/commons/codec/EncoderExceptionTest.java
@@ -17,11 +17,11 @@
package org.apache.commons.codec;
-import org.junit.jupiter.api.Test;
-
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNull;
+import org.junit.jupiter.api.Test;
+
/**
* Tests {@link EncoderException}.
*/
diff --git a/src/test/java/org/apache/commons/codec/StringEncoderAbstractTest.java b/src/test/java/org/apache/commons/codec/StringEncoderAbstractTest.java
index 83f34bd7..5c5a9cb5 100644
--- a/src/test/java/org/apache/commons/codec/StringEncoderAbstractTest.java
+++ b/src/test/java/org/apache/commons/codec/StringEncoderAbstractTest.java
@@ -17,11 +17,13 @@
package org.apache.commons.codec;
-import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.fail;
import java.util.Locale;
-import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
/**
*/
diff --git a/src/test/java/org/apache/commons/codec/StringEncoderComparatorTest.java b/src/test/java/org/apache/commons/codec/StringEncoderComparatorTest.java
index cda27c5a..b8495090 100644
--- a/src/test/java/org/apache/commons/codec/StringEncoderComparatorTest.java
+++ b/src/test/java/org/apache/commons/codec/StringEncoderComparatorTest.java
@@ -17,6 +17,8 @@
package org.apache.commons.codec;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
import java.util.Arrays;
import java.util.List;
@@ -25,8 +27,6 @@ import org.apache.commons.codec.language.Soundex;
import org.apache.commons.lang3.ArrayUtils;
import org.junit.jupiter.api.Test;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-
/**
* Test cases for the StingEncoderComparator.
*/
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 ba7a4358..526dc46a 100644
--- a/src/test/java/org/apache/commons/codec/binary/Base16InputStreamTest.java
+++ b/src/test/java/org/apache/commons/codec/binary/Base16InputStreamTest.java
@@ -17,13 +17,16 @@
package org.apache.commons.codec.binary;
-import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertThrows;
import java.io.ByteArrayInputStream;
-import java.io.InputStream;
import java.io.IOException;
+import java.io.InputStream;
-import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
/**
* @since 1.15
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 7e34415f..324e3abd 100644
--- a/src/test/java/org/apache/commons/codec/binary/Base16OutputStreamTest.java
+++ b/src/test/java/org/apache/commons/codec/binary/Base16OutputStreamTest.java
@@ -17,14 +17,14 @@
package org.apache.commons.codec.binary;
-import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.io.OutputStream;
-import static org.junit.jupiter.api.Assertions.assertArrayEquals;
-import static org.junit.jupiter.api.Assertions.assertThrows;
+import org.junit.jupiter.api.Test;
/**
* @since 1.15
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 07bc8c86..46049e5b 100644
--- a/src/test/java/org/apache/commons/codec/binary/Base16Test.java
+++ b/src/test/java/org/apache/commons/codec/binary/Base16Test.java
@@ -17,17 +17,22 @@
package org.apache.commons.codec.binary;
-import org.apache.commons.codec.CodecPolicy;
-import org.apache.commons.codec.DecoderException;
-import org.apache.commons.codec.EncoderException;
-import org.apache.commons.lang3.ArrayUtils;
-import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import java.nio.charset.Charset;
import java.nio.charset.StandardCharsets;
import java.util.Random;
-import static org.junit.jupiter.api.Assertions.*;
+import org.apache.commons.codec.CodecPolicy;
+import org.apache.commons.codec.DecoderException;
+import org.apache.commons.codec.EncoderException;
+import org.apache.commons.lang3.ArrayUtils;
+import org.junit.jupiter.api.Test;
/**
* Test cases for Base16 class.
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 50d6b226..06248f61 100644
--- a/src/test/java/org/apache/commons/codec/binary/Base32InputStreamTest.java
+++ b/src/test/java/org/apache/commons/codec/binary/Base32InputStreamTest.java
@@ -17,6 +17,12 @@
package org.apache.commons.codec.binary;
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
@@ -25,8 +31,6 @@ import java.io.InputStream;
import org.apache.commons.codec.CodecPolicy;
import org.junit.jupiter.api.Test;
-import static org.junit.jupiter.api.Assertions.*;
-
public class Base32InputStreamTest {
private static final String ENCODED_FOO = "MZXW6===";
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 3bf29dda..6a561160 100644
--- a/src/test/java/org/apache/commons/codec/binary/Base32OutputStreamTest.java
+++ b/src/test/java/org/apache/commons/codec/binary/Base32OutputStreamTest.java
@@ -17,14 +17,17 @@
package org.apache.commons.codec.binary;
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
import java.io.ByteArrayOutputStream;
import java.io.OutputStream;
import org.apache.commons.codec.CodecPolicy;
import org.junit.jupiter.api.Test;
-import static org.junit.jupiter.api.Assertions.*;
-
public class Base32OutputStreamTest {
private final static byte[] CR_LF = {(byte) '\r', (byte) '\n'};
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 3b04b3ef..9751c2ef 100644
--- a/src/test/java/org/apache/commons/codec/binary/Base32Test.java
+++ b/src/test/java/org/apache/commons/codec/binary/Base32Test.java
@@ -17,16 +17,24 @@
package org.apache.commons.codec.binary;
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
+
import java.nio.charset.Charset;
import java.nio.charset.StandardCharsets;
import java.util.Arrays;
+
import org.apache.commons.codec.CodecPolicy;
import org.apache.commons.codec.DecoderException;
import org.apache.commons.lang3.ArrayUtils;
import org.junit.jupiter.api.Test;
-import static org.junit.jupiter.api.Assertions.*;
-
public class Base32Test {
private static final Charset CHARSET_UTF8 = StandardCharsets.UTF_8;
diff --git a/src/test/java/org/apache/commons/codec/binary/Base64Codec13Test.java b/src/test/java/org/apache/commons/codec/binary/Base64Codec13Test.java
index 725a8cb1..c0ee5b14 100644
--- a/src/test/java/org/apache/commons/codec/binary/Base64Codec13Test.java
+++ b/src/test/java/org/apache/commons/codec/binary/Base64Codec13Test.java
@@ -17,6 +17,8 @@
package org.apache.commons.codec.binary;
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
+
import java.nio.charset.StandardCharsets;
import org.apache.commons.codec.BinaryDecoder;
@@ -27,8 +29,6 @@ import org.apache.commons.codec.Encoder;
import org.apache.commons.codec.EncoderException;
import org.junit.jupiter.api.Test;
-import static org.junit.jupiter.api.Assertions.assertArrayEquals;
-
/**
* Tests to make sure future versions of commons-codec.jar have identical Base64
* behavior as commons-codec-1.3.jar.
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 e3ce3917..30bd668a 100644
--- a/src/test/java/org/apache/commons/codec/binary/Base64InputStreamTest.java
+++ b/src/test/java/org/apache/commons/codec/binary/Base64InputStreamTest.java
@@ -17,6 +17,13 @@
package org.apache.commons.codec.binary;
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
import java.io.BufferedReader;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
@@ -27,8 +34,6 @@ import java.io.InputStreamReader;
import org.apache.commons.codec.CodecPolicy;
import org.junit.jupiter.api.Test;
-import static org.junit.jupiter.api.Assertions.*;
-
/**
* @since 1.4
*/
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 838e24d2..1448a14b 100644
--- a/src/test/java/org/apache/commons/codec/binary/Base64OutputStreamTest.java
+++ b/src/test/java/org/apache/commons/codec/binary/Base64OutputStreamTest.java
@@ -17,14 +17,18 @@
package org.apache.commons.codec.binary;
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
import java.io.ByteArrayOutputStream;
import java.io.OutputStream;
import org.apache.commons.codec.CodecPolicy;
import org.junit.jupiter.api.Test;
-import static org.junit.jupiter.api.Assertions.*;
-
/**
* @since 1.4
*/
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 0a7707dc..e207b7de 100644
--- a/src/test/java/org/apache/commons/codec/binary/Base64Test.java
+++ b/src/test/java/org/apache/commons/codec/binary/Base64Test.java
@@ -17,6 +17,15 @@
package org.apache.commons.codec.binary;
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
+
import java.math.BigInteger;
import java.nio.charset.Charset;
import java.nio.charset.StandardCharsets;
@@ -30,8 +39,6 @@ import org.apache.commons.lang3.ArrayUtils;
import org.junit.jupiter.api.Assumptions;
import org.junit.jupiter.api.Test;
-import static org.junit.jupiter.api.Assertions.*;
-
/**
* Test cases for Base64 class.
*
diff --git a/src/test/java/org/apache/commons/codec/binary/BaseNCodecTest.java b/src/test/java/org/apache/commons/codec/binary/BaseNCodecTest.java
index 8b581207..00cd10c7 100644
--- a/src/test/java/org/apache/commons/codec/binary/BaseNCodecTest.java
+++ b/src/test/java/org/apache/commons/codec/binary/BaseNCodecTest.java
@@ -17,13 +17,18 @@
package org.apache.commons.codec.binary;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assumptions.assumeTrue;
+
import org.apache.commons.codec.binary.BaseNCodec.Context;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
-import static org.junit.jupiter.api.Assertions.*;
-import static org.junit.jupiter.api.Assumptions.assumeTrue;
-
public class BaseNCodecTest {
BaseNCodec codec;
diff --git a/src/test/java/org/apache/commons/codec/binary/CharSequenceUtilsTest.java b/src/test/java/org/apache/commons/codec/binary/CharSequenceUtilsTest.java
index a53f987c..1cc82068 100644
--- a/src/test/java/org/apache/commons/codec/binary/CharSequenceUtilsTest.java
+++ b/src/test/java/org/apache/commons/codec/binary/CharSequenceUtilsTest.java
@@ -17,9 +17,11 @@
package org.apache.commons.codec.binary;
-import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
-import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
/**
* Tests {@link org.apache.commons.codec.binary.CharSequenceUtils}.
diff --git a/src/test/java/org/apache/commons/codec/binary/HexTest.java b/src/test/java/org/apache/commons/codec/binary/HexTest.java
index 2c449ec1..9aa32807 100644
--- a/src/test/java/org/apache/commons/codec/binary/HexTest.java
+++ b/src/test/java/org/apache/commons/codec/binary/HexTest.java
@@ -17,6 +17,12 @@
package org.apache.commons.codec.binary;
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
import java.io.UnsupportedEncodingException;
import java.nio.ByteBuffer;
import java.nio.charset.Charset;
@@ -24,12 +30,11 @@ import java.nio.charset.StandardCharsets;
import java.nio.charset.UnsupportedCharsetException;
import java.util.Arrays;
import java.util.concurrent.ThreadLocalRandom;
+
import org.apache.commons.codec.DecoderException;
import org.apache.commons.codec.EncoderException;
import org.junit.jupiter.api.Test;
-import static org.junit.jupiter.api.Assertions.*;
-
/**
* Tests {@link org.apache.commons.codec.binary.Hex}.
*/
diff --git a/src/test/java/org/apache/commons/codec/binary/StringUtilsTest.java b/src/test/java/org/apache/commons/codec/binary/StringUtilsTest.java
index 68e4204c..2140c5b5 100644
--- a/src/test/java/org/apache/commons/codec/binary/StringUtilsTest.java
+++ b/src/test/java/org/apache/commons/codec/binary/StringUtilsTest.java
@@ -17,13 +17,18 @@
package org.apache.commons.codec.binary;
-import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import java.io.UnsupportedEncodingException;
import java.nio.ByteBuffer;
import java.nio.charset.StandardCharsets;
-import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
/**
* Tests {@link StringUtils}
diff --git a/src/test/java/org/apache/commons/codec/cli/DigestTest.java b/src/test/java/org/apache/commons/codec/cli/DigestTest.java
index 702bec40..41e98050 100644
--- a/src/test/java/org/apache/commons/codec/cli/DigestTest.java
+++ b/src/test/java/org/apache/commons/codec/cli/DigestTest.java
@@ -17,10 +17,10 @@
package org.apache.commons.codec.cli;
-import org.junit.jupiter.api.Test;
-
import static org.junit.jupiter.api.Assertions.assertThrows;
+import org.junit.jupiter.api.Test;
+
/**
* Tests {@link Digest}.
*
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 9af12d66..f908b0dc 100644
--- a/src/test/java/org/apache/commons/codec/digest/Apr1CryptTest.java
+++ b/src/test/java/org/apache/commons/codec/digest/Apr1CryptTest.java
@@ -16,12 +16,15 @@
*/
package org.apache.commons.codec.digest;
-import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotSame;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import java.nio.charset.StandardCharsets;
import java.util.concurrent.ThreadLocalRandom;
-import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
public class Apr1CryptTest {
diff --git a/src/test/java/org/apache/commons/codec/digest/B64Test.java b/src/test/java/org/apache/commons/codec/digest/B64Test.java
index 0ac694e4..7f506a5a 100644
--- a/src/test/java/org/apache/commons/codec/digest/B64Test.java
+++ b/src/test/java/org/apache/commons/codec/digest/B64Test.java
@@ -16,11 +16,11 @@
*/
package org.apache.commons.codec.digest;
-import org.junit.jupiter.api.Test;
-
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
+import org.junit.jupiter.api.Test;
+
public class B64Test {
@Test
diff --git a/src/test/java/org/apache/commons/codec/digest/Blake3Test.java b/src/test/java/org/apache/commons/codec/digest/Blake3Test.java
index 40832c8d..013c15e1 100644
--- a/src/test/java/org/apache/commons/codec/digest/Blake3Test.java
+++ b/src/test/java/org/apache/commons/codec/digest/Blake3Test.java
@@ -16,9 +16,9 @@
*/
package org.apache.commons.codec.digest;
-import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
-import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
public class Blake3Test {
@Test
diff --git a/src/test/java/org/apache/commons/codec/digest/Blake3TestVectorsTest.java b/src/test/java/org/apache/commons/codec/digest/Blake3TestVectorsTest.java
index 7b23a401..1e5eeb10 100644
--- a/src/test/java/org/apache/commons/codec/digest/Blake3TestVectorsTest.java
+++ b/src/test/java/org/apache/commons/codec/digest/Blake3TestVectorsTest.java
@@ -16,17 +16,17 @@
*/
package org.apache.commons.codec.digest;
-import org.apache.commons.codec.DecoderException;
-import org.apache.commons.codec.binary.Hex;
-import org.junit.jupiter.params.ParameterizedTest;
-import org.junit.jupiter.params.provider.Arguments;
-import org.junit.jupiter.params.provider.MethodSource;
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
import java.nio.charset.StandardCharsets;
import java.util.Arrays;
import java.util.stream.Stream;
-import static org.junit.jupiter.api.Assertions.assertArrayEquals;
+import org.apache.commons.codec.DecoderException;
+import org.apache.commons.codec.binary.Hex;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
/**
* Tests the standard test vectors provided by the reference Blake3 implementation. Each test uses as input data the
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 df0c8339..ef5784fd 100644
--- a/src/test/java/org/apache/commons/codec/digest/CryptTest.java
+++ b/src/test/java/org/apache/commons/codec/digest/CryptTest.java
@@ -16,9 +16,12 @@
*/
package org.apache.commons.codec.digest;
-import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
-import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
public class CryptTest {
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 8dc64790..71491ab8 100644
--- a/src/test/java/org/apache/commons/codec/digest/HmacAlgorithmsTest.java
+++ b/src/test/java/org/apache/commons/codec/digest/HmacAlgorithmsTest.java
@@ -16,6 +16,13 @@
*/
package org.apache.commons.codec.digest;
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assumptions.assumeTrue;
+
import java.io.ByteArrayInputStream;
import java.io.IOException;
import java.security.NoSuchAlgorithmException;
@@ -34,11 +41,6 @@ import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.Arguments;
import org.junit.jupiter.params.provider.MethodSource;
-import static org.junit.jupiter.api.Assertions.*;
-import static org.junit.jupiter.api.Assumptions.assumeTrue;
-
-import static org.junit.jupiter.api.Assertions.assertThrows;
-
/**
* Tests {@link HmacAlgorithms}.
*
diff --git a/src/test/java/org/apache/commons/codec/digest/HmacUtilsTest.java b/src/test/java/org/apache/commons/codec/digest/HmacUtilsTest.java
index b1e99ab4..b0e4ad1c 100644
--- a/src/test/java/org/apache/commons/codec/digest/HmacUtilsTest.java
+++ b/src/test/java/org/apache/commons/codec/digest/HmacUtilsTest.java
@@ -16,6 +16,10 @@
*/
package org.apache.commons.codec.digest;
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
import java.io.ByteArrayInputStream;
import java.io.IOException;
@@ -26,8 +30,6 @@ import org.apache.commons.codec.binary.Hex;
import org.apache.commons.codec.binary.StringUtils;
import org.junit.jupiter.api.Test;
-import static org.junit.jupiter.api.Assertions.*;
-
/**
* Tests HmacUtils methods.
*/
diff --git a/src/test/java/org/apache/commons/codec/digest/Md5CryptTest.java b/src/test/java/org/apache/commons/codec/digest/Md5CryptTest.java
index 63ac164c..05f0471d 100644
--- a/src/test/java/org/apache/commons/codec/digest/Md5CryptTest.java
+++ b/src/test/java/org/apache/commons/codec/digest/Md5CryptTest.java
@@ -16,12 +16,15 @@
*/
package org.apache.commons.codec.digest;
-import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import java.nio.charset.StandardCharsets;
import java.util.concurrent.ThreadLocalRandom;
-import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
public class Md5CryptTest {
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 f8033229..14e03782 100644
--- a/src/test/java/org/apache/commons/codec/digest/MessageDigestAlgorithmsTest.java
+++ b/src/test/java/org/apache/commons/codec/digest/MessageDigestAlgorithmsTest.java
@@ -16,11 +16,12 @@
*/
package org.apache.commons.codec.digest;
-import org.junit.jupiter.api.AfterEach;
-import org.junit.jupiter.api.BeforeAll;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.params.ParameterizedTest;
-import org.junit.jupiter.params.provider.MethodSource;
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.fail;
+import static org.junit.jupiter.api.Assumptions.assumeTrue;
import java.io.ByteArrayInputStream;
import java.io.File;
@@ -35,8 +36,11 @@ import java.nio.file.StandardOpenOption;
import java.security.MessageDigest;
import java.security.NoSuchAlgorithmException;
-import static org.junit.jupiter.api.Assertions.*;
-import static org.junit.jupiter.api.Assumptions.assumeTrue;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
/**
* Tests {@link MessageDigestAlgorithms}.
diff --git a/src/test/java/org/apache/commons/codec/digest/MurmurHash2Test.java b/src/test/java/org/apache/commons/codec/digest/MurmurHash2Test.java
index ff6079a3..df1b5bf2 100644
--- a/src/test/java/org/apache/commons/codec/digest/MurmurHash2Test.java
+++ b/src/test/java/org/apache/commons/codec/digest/MurmurHash2Test.java
@@ -18,11 +18,11 @@
package org.apache.commons.codec.digest;
-import org.junit.jupiter.api.Test;
-
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.fail;
+import org.junit.jupiter.api.Test;
+
public class MurmurHash2Test {
/** Random input data with various length. */
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 83e31a66..ad3f25e2 100644
--- a/src/test/java/org/apache/commons/codec/digest/MurmurHash3Test.java
+++ b/src/test/java/org/apache/commons/codec/digest/MurmurHash3Test.java
@@ -17,6 +17,12 @@
package org.apache.commons.codec.digest;
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assumptions.assumeTrue;
+
import java.nio.ByteBuffer;
import java.util.Arrays;
import java.util.concurrent.ThreadLocalRandom;
@@ -26,9 +32,6 @@ import org.apache.commons.codec.digest.MurmurHash3.IncrementalHash32;
import org.apache.commons.codec.digest.MurmurHash3.IncrementalHash32x86;
import org.junit.jupiter.api.Test;
-import static org.junit.jupiter.api.Assertions.*;
-import static org.junit.jupiter.api.Assumptions.assumeTrue;
-
/**
* Test for {@link MurmurHash3}.
*/
diff --git a/src/test/java/org/apache/commons/codec/digest/PureJavaCrc32CTest.java b/src/test/java/org/apache/commons/codec/digest/PureJavaCrc32CTest.java
index c088a0e5..142be097 100644
--- a/src/test/java/org/apache/commons/codec/digest/PureJavaCrc32CTest.java
+++ b/src/test/java/org/apache/commons/codec/digest/PureJavaCrc32CTest.java
@@ -16,11 +16,11 @@
*/
package org.apache.commons.codec.digest;
-import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
import java.util.Arrays;
-import static org.junit.jupiter.api.Assertions.assertEquals;
+import org.junit.jupiter.api.Test;
/**
* Test class for PureJavaCrc32C.
diff --git a/src/test/java/org/apache/commons/codec/digest/PureJavaCrc32Test.java b/src/test/java/org/apache/commons/codec/digest/PureJavaCrc32Test.java
index 451c1543..d709b9b7 100644
--- a/src/test/java/org/apache/commons/codec/digest/PureJavaCrc32Test.java
+++ b/src/test/java/org/apache/commons/codec/digest/PureJavaCrc32Test.java
@@ -16,7 +16,7 @@
*/
package org.apache.commons.codec.digest;
-import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
import java.io.FileNotFoundException;
import java.io.FileOutputStream;
@@ -30,7 +30,7 @@ import java.util.Random;
import java.util.zip.CRC32;
import java.util.zip.Checksum;
-import static org.junit.jupiter.api.Assertions.assertEquals;
+import org.junit.jupiter.api.Test;
/**
diff --git a/src/test/java/org/apache/commons/codec/digest/Sha256CryptTest.java b/src/test/java/org/apache/commons/codec/digest/Sha256CryptTest.java
index b31fd0d0..f8ceb571 100644
--- a/src/test/java/org/apache/commons/codec/digest/Sha256CryptTest.java
+++ b/src/test/java/org/apache/commons/codec/digest/Sha256CryptTest.java
@@ -16,13 +16,15 @@
*/
package org.apache.commons.codec.digest;
-import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import java.nio.charset.StandardCharsets;
import java.util.Arrays;
import java.util.concurrent.ThreadLocalRandom;
-import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
public class Sha256CryptTest {
diff --git a/src/test/java/org/apache/commons/codec/digest/Sha2CryptTest.java b/src/test/java/org/apache/commons/codec/digest/Sha2CryptTest.java
index 6e6ab7ad..e557647e 100644
--- a/src/test/java/org/apache/commons/codec/digest/Sha2CryptTest.java
+++ b/src/test/java/org/apache/commons/codec/digest/Sha2CryptTest.java
@@ -17,10 +17,10 @@
package org.apache.commons.codec.digest;
-import org.junit.jupiter.api.Test;
-
import static org.junit.jupiter.api.Assertions.assertNotNull;
+import org.junit.jupiter.api.Test;
+
public class Sha2CryptTest {
@Test
diff --git a/src/test/java/org/apache/commons/codec/digest/Sha512CryptTest.java b/src/test/java/org/apache/commons/codec/digest/Sha512CryptTest.java
index 7ecb3ae3..e1a5067a 100644
--- a/src/test/java/org/apache/commons/codec/digest/Sha512CryptTest.java
+++ b/src/test/java/org/apache/commons/codec/digest/Sha512CryptTest.java
@@ -16,14 +16,16 @@
*/
package org.apache.commons.codec.digest;
-import org.junit.jupiter.api.Disabled;
-import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import java.nio.charset.StandardCharsets;
import java.util.Arrays;
import java.util.concurrent.ThreadLocalRandom;
-import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
public class Sha512CryptTest {
diff --git a/src/test/java/org/apache/commons/codec/digest/UnixCryptTest.java b/src/test/java/org/apache/commons/codec/digest/UnixCryptTest.java
index ab2bbede..6b4c2fef 100644
--- a/src/test/java/org/apache/commons/codec/digest/UnixCryptTest.java
+++ b/src/test/java/org/apache/commons/codec/digest/UnixCryptTest.java
@@ -16,11 +16,15 @@
*/
package org.apache.commons.codec.digest;
-import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNotSame;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import java.nio.charset.StandardCharsets;
-import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
public class UnixCryptTest {
diff --git a/src/test/java/org/apache/commons/codec/digest/XXHash32OverflowTest.java b/src/test/java/org/apache/commons/codec/digest/XXHash32OverflowTest.java
index bc016c37..5a2f6e6e 100644
--- a/src/test/java/org/apache/commons/codec/digest/XXHash32OverflowTest.java
+++ b/src/test/java/org/apache/commons/codec/digest/XXHash32OverflowTest.java
@@ -17,11 +17,11 @@
package org.apache.commons.codec.digest;
-import org.junit.jupiter.api.Test;
-
import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.junit.jupiter.api.Assumptions.assumeTrue;
+import org.junit.jupiter.api.Test;
+
public class XXHash32OverflowTest {
/**
diff --git a/src/test/java/org/apache/commons/codec/digest/XXHash32Test.java b/src/test/java/org/apache/commons/codec/digest/XXHash32Test.java
index 01edfa6e..c28a2a2b 100644
--- a/src/test/java/org/apache/commons/codec/digest/XXHash32Test.java
+++ b/src/test/java/org/apache/commons/codec/digest/XXHash32Test.java
@@ -16,9 +16,7 @@
*/
package org.apache.commons.codec.digest;
-import org.junit.jupiter.params.ParameterizedTest;
-import org.junit.jupiter.params.provider.Arguments;
-import org.junit.jupiter.params.provider.MethodSource;
+import static org.junit.jupiter.api.Assertions.assertEquals;
import java.io.ByteArrayOutputStream;
import java.io.File;
@@ -31,7 +29,9 @@ import java.net.URI;
import java.net.URL;
import java.util.stream.Stream;
-import static org.junit.jupiter.api.Assertions.assertEquals;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
public class XXHash32Test {
diff --git a/src/test/java/org/apache/commons/codec/language/Caverphone1Test.java b/src/test/java/org/apache/commons/codec/language/Caverphone1Test.java
index d4f120ab..c436edfd 100644
--- a/src/test/java/org/apache/commons/codec/language/Caverphone1Test.java
+++ b/src/test/java/org/apache/commons/codec/language/Caverphone1Test.java
@@ -17,13 +17,13 @@
package org.apache.commons.codec.language;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
import org.apache.commons.codec.EncoderException;
import org.apache.commons.codec.StringEncoderAbstractTest;
import org.junit.jupiter.api.Test;
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-
/**
* Tests Caverphone1.
*
diff --git a/src/test/java/org/apache/commons/codec/language/Caverphone2Test.java b/src/test/java/org/apache/commons/codec/language/Caverphone2Test.java
index 8803061b..0fab490e 100644
--- a/src/test/java/org/apache/commons/codec/language/Caverphone2Test.java
+++ b/src/test/java/org/apache/commons/codec/language/Caverphone2Test.java
@@ -17,13 +17,13 @@
package org.apache.commons.codec.language;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
import org.apache.commons.codec.EncoderException;
import org.apache.commons.codec.StringEncoderAbstractTest;
import org.junit.jupiter.api.Test;
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-
/**
* Tests Caverphone2.
*
diff --git a/src/test/java/org/apache/commons/codec/language/ColognePhoneticTest.java b/src/test/java/org/apache/commons/codec/language/ColognePhoneticTest.java
index 9bb563a0..dda71ec6 100644
--- a/src/test/java/org/apache/commons/codec/language/ColognePhoneticTest.java
+++ b/src/test/java/org/apache/commons/codec/language/ColognePhoneticTest.java
@@ -17,6 +17,10 @@
package org.apache.commons.codec.language;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
import java.util.HashSet;
import java.util.Locale;
import java.util.Set;
@@ -27,10 +31,6 @@ import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.Test;
import org.opentest4j.AssertionFailedError;
-import static org.junit.jupiter.api.Assertions.*;
-
-import static org.junit.jupiter.api.Assertions.assertThrows;
-
/**
* Tests the {@code ColognePhonetic} class.
*
diff --git a/src/test/java/org/apache/commons/codec/language/DaitchMokotoffSoundexTest.java b/src/test/java/org/apache/commons/codec/language/DaitchMokotoffSoundexTest.java
index 7f348188..6eeaf9aa 100644
--- a/src/test/java/org/apache/commons/codec/language/DaitchMokotoffSoundexTest.java
+++ b/src/test/java/org/apache/commons/codec/language/DaitchMokotoffSoundexTest.java
@@ -16,12 +16,12 @@
*/
package org.apache.commons.codec.language;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
import org.apache.commons.codec.EncoderException;
import org.apache.commons.codec.StringEncoderAbstractTest;
import org.junit.jupiter.api.Test;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-
/**
* Tests {@link DaitchMokotoffSoundex}.
* <p>
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 af0334c3..984edb8e 100644
--- a/src/test/java/org/apache/commons/codec/language/DoubleMetaphone2Test.java
+++ b/src/test/java/org/apache/commons/codec/language/DoubleMetaphone2Test.java
@@ -17,11 +17,11 @@
package org.apache.commons.codec.language;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
import org.apache.commons.codec.StringEncoderAbstractTest;
import org.junit.jupiter.api.Test;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-
/**
* Tests {@link DoubleMetaphone}.
* <p>
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 ae1e9403..af4fe6a1 100644
--- a/src/test/java/org/apache/commons/codec/language/DoubleMetaphoneTest.java
+++ b/src/test/java/org/apache/commons/codec/language/DoubleMetaphoneTest.java
@@ -17,12 +17,16 @@
package org.apache.commons.codec.language;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
+
import org.apache.commons.codec.EncoderException;
import org.apache.commons.codec.StringEncoderAbstractTest;
import org.junit.jupiter.api.Test;
-import static org.junit.jupiter.api.Assertions.*;
-
/**
* Tests {@link DoubleMetaphone}.
*
diff --git a/src/test/java/org/apache/commons/codec/language/MatchRatingApproachEncoderTest.java b/src/test/java/org/apache/commons/codec/language/MatchRatingApproachEncoderTest.java
index 020a3021..a841caab 100644
--- a/src/test/java/org/apache/commons/codec/language/MatchRatingApproachEncoderTest.java
+++ b/src/test/java/org/apache/commons/codec/language/MatchRatingApproachEncoderTest.java
@@ -17,11 +17,14 @@
package org.apache.commons.codec.language;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
import org.apache.commons.codec.StringEncoderAbstractTest;
import org.junit.jupiter.api.Test;
-import static org.junit.jupiter.api.Assertions.*;
-
/**
* Series of tests for the Match Rating Approach algorithm.
*
diff --git a/src/test/java/org/apache/commons/codec/language/MetaphoneTest.java b/src/test/java/org/apache/commons/codec/language/MetaphoneTest.java
index 7754b4ad..89f3176b 100644
--- a/src/test/java/org/apache/commons/codec/language/MetaphoneTest.java
+++ b/src/test/java/org/apache/commons/codec/language/MetaphoneTest.java
@@ -17,11 +17,13 @@
package org.apache.commons.codec.language;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
+
import org.apache.commons.codec.StringEncoderAbstractTest;
import org.junit.jupiter.api.Test;
-import static org.junit.jupiter.api.Assertions.*;
-
/**
*/
public class MetaphoneTest extends StringEncoderAbstractTest<Metaphone> {
diff --git a/src/test/java/org/apache/commons/codec/language/NysiisTest.java b/src/test/java/org/apache/commons/codec/language/NysiisTest.java
index 4405cd8f..d13525a8 100644
--- a/src/test/java/org/apache/commons/codec/language/NysiisTest.java
+++ b/src/test/java/org/apache/commons/codec/language/NysiisTest.java
@@ -17,13 +17,13 @@
package org.apache.commons.codec.language;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
import org.apache.commons.codec.EncoderException;
import org.apache.commons.codec.StringEncoderAbstractTest;
import org.junit.jupiter.api.Test;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-
/**
* Tests {@link Nysiis}
*
diff --git a/src/test/java/org/apache/commons/codec/language/RefinedSoundexTest.java b/src/test/java/org/apache/commons/codec/language/RefinedSoundexTest.java
index 42016693..af493dd8 100644
--- a/src/test/java/org/apache/commons/codec/language/RefinedSoundexTest.java
+++ b/src/test/java/org/apache/commons/codec/language/RefinedSoundexTest.java
@@ -17,12 +17,12 @@
package org.apache.commons.codec.language;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
import org.apache.commons.codec.EncoderException;
import org.apache.commons.codec.StringEncoderAbstractTest;
import org.junit.jupiter.api.Test;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-
/**
* Tests RefinedSoundex.
*/
diff --git a/src/test/java/org/apache/commons/codec/language/SoundexTest.java b/src/test/java/org/apache/commons/codec/language/SoundexTest.java
index fbe3ee9a..b782a928 100644
--- a/src/test/java/org/apache/commons/codec/language/SoundexTest.java
+++ b/src/test/java/org/apache/commons/codec/language/SoundexTest.java
@@ -19,12 +19,14 @@
package org.apache.commons.codec.language;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
import org.apache.commons.codec.EncoderException;
import org.apache.commons.codec.StringEncoderAbstractTest;
import org.junit.jupiter.api.Test;
-import static org.junit.jupiter.api.Assertions.*;
-
/**
* Tests {@link Soundex}.
*
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 19140c6e..98734bf0 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
@@ -17,15 +17,20 @@
package org.apache.commons.codec.language.bm;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTimeout;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import java.time.Duration;
+
import org.apache.commons.codec.EncoderException;
import org.apache.commons.codec.StringEncoder;
import org.apache.commons.codec.StringEncoderAbstractTest;
import org.junit.jupiter.api.Test;
-import java.time.Duration;
-
-import static org.junit.jupiter.api.Assertions.*;
-
/**
* Tests BeiderMorseEncoder.
*
diff --git a/src/test/java/org/apache/commons/codec/language/bm/LanguageGuessingTest.java b/src/test/java/org/apache/commons/codec/language/bm/LanguageGuessingTest.java
index b8f40d2a..ad291cfb 100644
--- a/src/test/java/org/apache/commons/codec/language/bm/LanguageGuessingTest.java
+++ b/src/test/java/org/apache/commons/codec/language/bm/LanguageGuessingTest.java
@@ -17,13 +17,13 @@
package org.apache.commons.codec.language.bm;
-import org.junit.jupiter.params.ParameterizedTest;
-import org.junit.jupiter.params.provider.Arguments;
-import org.junit.jupiter.params.provider.MethodSource;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import java.util.stream.Stream;
-import static org.junit.jupiter.api.Assertions.assertTrue;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
/**
* Tests guessLanguages API.
diff --git a/src/test/java/org/apache/commons/codec/language/bm/PhoneticEngineRegressionTest.java b/src/test/java/org/apache/commons/codec/language/bm/PhoneticEngineRegressionTest.java
index f3c90f1a..802def7f 100644
--- a/src/test/java/org/apache/commons/codec/language/bm/PhoneticEngineRegressionTest.java
+++ b/src/test/java/org/apache/commons/codec/language/bm/PhoneticEngineRegressionTest.java
@@ -17,14 +17,14 @@
package org.apache.commons.codec.language.bm;
-import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
import java.util.Arrays;
import java.util.HashSet;
import java.util.Map;
import java.util.TreeMap;
-import static org.junit.jupiter.api.Assertions.assertEquals;
+import org.junit.jupiter.api.Test;
/**
* Tests PhoneticEngine and Languages.LanguageSet in ways very similar to code found in solr-3.6.0.
diff --git a/src/test/java/org/apache/commons/codec/language/bm/PhoneticEngineTest.java b/src/test/java/org/apache/commons/codec/language/bm/PhoneticEngineTest.java
index 1adae285..6725c492 100644
--- a/src/test/java/org/apache/commons/codec/language/bm/PhoneticEngineTest.java
+++ b/src/test/java/org/apache/commons/codec/language/bm/PhoneticEngineTest.java
@@ -17,14 +17,14 @@
package org.apache.commons.codec.language.bm;
-import org.junit.jupiter.params.ParameterizedTest;
-import org.junit.jupiter.params.provider.Arguments;
-import org.junit.jupiter.params.provider.MethodSource;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import java.util.stream.Stream;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertTrue;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
/**
* Tests PhoneticEngine.
diff --git a/src/test/java/org/apache/commons/codec/language/bm/RuleTest.java b/src/test/java/org/apache/commons/codec/language/bm/RuleTest.java
index d25cf4b8..48b7a492 100644
--- a/src/test/java/org/apache/commons/codec/language/bm/RuleTest.java
+++ b/src/test/java/org/apache/commons/codec/language/bm/RuleTest.java
@@ -17,11 +17,11 @@
package org.apache.commons.codec.language.bm;
-import org.junit.jupiter.api.Test;
-
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertTrue;
+import org.junit.jupiter.api.Test;
+
/**
* Tests Rule.
*
diff --git a/src/test/java/org/apache/commons/codec/net/BCodecTest.java b/src/test/java/org/apache/commons/codec/net/BCodecTest.java
index 77ca87a9..bce9106e 100644
--- a/src/test/java/org/apache/commons/codec/net/BCodecTest.java
+++ b/src/test/java/org/apache/commons/codec/net/BCodecTest.java
@@ -17,6 +17,12 @@
package org.apache.commons.codec.net;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
import java.nio.charset.StandardCharsets;
import java.nio.charset.UnsupportedCharsetException;
@@ -26,8 +32,6 @@ import org.apache.commons.codec.DecoderException;
import org.apache.commons.codec.EncoderException;
import org.junit.jupiter.api.Test;
-import static org.junit.jupiter.api.Assertions.*;
-
/**
* Quoted-printable codec test cases
*/
diff --git a/src/test/java/org/apache/commons/codec/net/PercentCodecTest.java b/src/test/java/org/apache/commons/codec/net/PercentCodecTest.java
index 415ab32b..34f8ecb8 100644
--- a/src/test/java/org/apache/commons/codec/net/PercentCodecTest.java
+++ b/src/test/java/org/apache/commons/codec/net/PercentCodecTest.java
@@ -17,6 +17,12 @@
package org.apache.commons.codec.net;
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
import java.nio.charset.StandardCharsets;
import java.util.Arrays;
@@ -25,8 +31,6 @@ import org.apache.commons.codec.EncoderException;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
-import static org.junit.jupiter.api.Assertions.*;
-
/**
* Percent codec test cases.
*/
diff --git a/src/test/java/org/apache/commons/codec/net/QCodecTest.java b/src/test/java/org/apache/commons/codec/net/QCodecTest.java
index b367f319..194803ce 100644
--- a/src/test/java/org/apache/commons/codec/net/QCodecTest.java
+++ b/src/test/java/org/apache/commons/codec/net/QCodecTest.java
@@ -18,6 +18,12 @@
package org.apache.commons.codec.net;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
import java.nio.charset.UnsupportedCharsetException;
import org.apache.commons.codec.CharEncoding;
@@ -25,8 +31,6 @@ import org.apache.commons.codec.DecoderException;
import org.apache.commons.codec.EncoderException;
import org.junit.jupiter.api.Test;
-import static org.junit.jupiter.api.Assertions.*;
-
/**
* Quoted-printable codec test cases
*/
diff --git a/src/test/java/org/apache/commons/codec/net/QuotedPrintableCodecTest.java b/src/test/java/org/apache/commons/codec/net/QuotedPrintableCodecTest.java
index ebeb850d..fd7f4403 100644
--- a/src/test/java/org/apache/commons/codec/net/QuotedPrintableCodecTest.java
+++ b/src/test/java/org/apache/commons/codec/net/QuotedPrintableCodecTest.java
@@ -17,6 +17,10 @@
package org.apache.commons.codec.net;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
import java.nio.charset.StandardCharsets;
import java.nio.charset.UnsupportedCharsetException;
@@ -25,8 +29,6 @@ import org.apache.commons.codec.DecoderException;
import org.apache.commons.codec.EncoderException;
import org.junit.jupiter.api.Test;
-import static org.junit.jupiter.api.Assertions.*;
-
/**
* Quoted-printable codec test cases
*/
diff --git a/src/test/java/org/apache/commons/codec/net/RFC1522CodecTest.java b/src/test/java/org/apache/commons/codec/net/RFC1522CodecTest.java
index 2690c05f..28b80bb0 100644
--- a/src/test/java/org/apache/commons/codec/net/RFC1522CodecTest.java
+++ b/src/test/java/org/apache/commons/codec/net/RFC1522CodecTest.java
@@ -17,13 +17,13 @@
package org.apache.commons.codec.net;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
import org.apache.commons.codec.CharEncoding;
import org.apache.commons.codec.DecoderException;
import org.junit.jupiter.api.Test;
-import static org.junit.jupiter.api.Assertions.assertNull;
-import static org.junit.jupiter.api.Assertions.assertThrows;
-
/**
* RFC 1522 compliant codec test cases
*/
[commons-codec] 02/03: Better Javadoc @see
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 d3877a3f0f017af6d64dabd26fc38ec1bf185531
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Sun Jun 4 12:29:47 2023 -0400
Better Javadoc @see
---
.../java/org/apache/commons/codec/CharEncoding.java | 14 +++++++-------
.../org/apache/commons/codec/binary/StringUtils.java | 20 ++++++++++----------
.../java/org/apache/commons/codec/net/BCodec.java | 6 +++---
.../java/org/apache/commons/codec/net/QCodec.java | 4 ++--
.../org/apache/commons/codec/net/RFC1522Codec.java | 2 +-
5 files changed, 23 insertions(+), 23 deletions(-)
diff --git a/src/main/java/org/apache/commons/codec/CharEncoding.java b/src/main/java/org/apache/commons/codec/CharEncoding.java
index f82a7282..62e147fe 100644
--- a/src/main/java/org/apache/commons/codec/CharEncoding.java
+++ b/src/main/java/org/apache/commons/codec/CharEncoding.java
@@ -51,7 +51,7 @@ package org.apache.commons.codec;
* This class is immutable and thread-safe.
* </p>
*
- * @see <a href="http://download.oracle.com/javase/7/docs/api/java/nio/charset/Charset.html">Standard charsets</a>
+ * @see Charset
* @since 1.4
*/
public class CharEncoding {
@@ -62,7 +62,7 @@ public class CharEncoding {
* Every implementation of the Java platform is required to support this character encoding.
* </p>
*
- * @see <a href="http://download.oracle.com/javase/7/docs/api/java/nio/charset/Charset.html">Standard charsets</a>
+ * @see Charset
*/
public static final String ISO_8859_1 = "ISO-8859-1";
@@ -72,7 +72,7 @@ public class CharEncoding {
* Every implementation of the Java platform is required to support this character encoding.
* </p>
*
- * @see <a href="http://download.oracle.com/javase/7/docs/api/java/nio/charset/Charset.html">Standard charsets</a>
+ * @see Charset
*/
public static final String US_ASCII = "US-ASCII";
@@ -83,7 +83,7 @@ public class CharEncoding {
* Every implementation of the Java platform is required to support this character encoding.
* </p>
*
- * @see <a href="http://download.oracle.com/javase/7/docs/api/java/nio/charset/Charset.html">Standard charsets</a>
+ * @see Charset
*/
public static final String UTF_16 = "UTF-16";
@@ -93,7 +93,7 @@ public class CharEncoding {
* Every implementation of the Java platform is required to support this character encoding.
* </p>
*
- * @see <a href="http://download.oracle.com/javase/7/docs/api/java/nio/charset/Charset.html">Standard charsets</a>
+ * @see Charset
*/
public static final String UTF_16BE = "UTF-16BE";
@@ -103,7 +103,7 @@ public class CharEncoding {
* Every implementation of the Java platform is required to support this character encoding.
* </p>
*
- * @see <a href="http://download.oracle.com/javase/7/docs/api/java/nio/charset/Charset.html">Standard charsets</a>
+ * @see Charset
*/
public static final String UTF_16LE = "UTF-16LE";
@@ -113,7 +113,7 @@ public class CharEncoding {
* Every implementation of the Java platform is required to support this character encoding.
* </p>
*
- * @see <a href="http://download.oracle.com/javase/7/docs/api/java/nio/charset/Charset.html">Standard charsets</a>
+ * @see Charset
*/
public static final String UTF_8 = "UTF-8";
}
diff --git a/src/main/java/org/apache/commons/codec/binary/StringUtils.java b/src/main/java/org/apache/commons/codec/binary/StringUtils.java
index c0e017f4..5ca7eb5d 100644
--- a/src/main/java/org/apache/commons/codec/binary/StringUtils.java
+++ b/src/main/java/org/apache/commons/codec/binary/StringUtils.java
@@ -26,13 +26,13 @@ import org.apache.commons.codec.CharEncoding;
/**
* Converts String to and from bytes using the encodings required by the Java specification. These encodings are
- * specified in <a href="http://download.oracle.com/javase/7/docs/api/java/nio/charset/Charset.html">
- * Standard charsets</a>.
+ * specified in standard {@link Charset}.
*
* <p>This class is immutable and thread-safe.</p>
*
* @see CharEncoding
- * @see <a href="http://download.oracle.com/javase/7/docs/api/java/nio/charset/Charset.html">Standard charsets</a>
+ * @see Charset
+ * @see StandardCharsets
* @since 1.4
*/
public class StringUtils {
@@ -106,7 +106,7 @@ public class StringUtils {
* @throws NullPointerException
* Thrown if {@link StandardCharsets#UTF_8} is not initialized, which should never happen since it is
* required by the Java platform specification.
- * @see <a href="http://download.oracle.com/javase/7/docs/api/java/nio/charset/Charset.html">Standard charsets</a>
+ * @see Charset
* @see #getBytesUnchecked(String, String)
* @since 1.11
*/
@@ -138,7 +138,7 @@ public class StringUtils {
* Thrown if {@link StandardCharsets#ISO_8859_1} is not initialized, which should never happen
* since it is required by the Java platform specification.
* @since As of 1.7, throws {@link NullPointerException} instead of UnsupportedEncodingException
- * @see <a href="http://download.oracle.com/javase/7/docs/api/java/nio/charset/Charset.html">Standard charsets</a>
+ * @see Charset
* @see #getBytesUnchecked(String, String)
*/
public static byte[] getBytesIso8859_1(final String string) {
@@ -187,7 +187,7 @@ public class StringUtils {
* Thrown if {@link StandardCharsets#US_ASCII} is not initialized, which should never happen since it is
* required by the Java platform specification.
* @since As of 1.7, throws {@link NullPointerException} instead of UnsupportedEncodingException
- * @see <a href="http://download.oracle.com/javase/7/docs/api/java/nio/charset/Charset.html">Standard charsets</a>
+ * @see Charset
* @see #getBytesUnchecked(String, String)
*/
public static byte[] getBytesUsAscii(final String string) {
@@ -205,7 +205,7 @@ public class StringUtils {
* Thrown if {@link StandardCharsets#UTF_16} is not initialized, which should never happen since it is
* required by the Java platform specification.
* @since As of 1.7, throws {@link NullPointerException} instead of UnsupportedEncodingException
- * @see <a href="http://download.oracle.com/javase/7/docs/api/java/nio/charset/Charset.html">Standard charsets</a>
+ * @see Charset
* @see #getBytesUnchecked(String, String)
*/
public static byte[] getBytesUtf16(final String string) {
@@ -223,7 +223,7 @@ public class StringUtils {
* Thrown if {@link StandardCharsets#UTF_16BE} is not initialized, which should never happen since it is
* required by the Java platform specification.
* @since As of 1.7, throws {@link NullPointerException} instead of UnsupportedEncodingException
- * @see <a href="http://download.oracle.com/javase/7/docs/api/java/nio/charset/Charset.html">Standard charsets</a>
+ * @see Charset
* @see #getBytesUnchecked(String, String)
*/
public static byte[] getBytesUtf16Be(final String string) {
@@ -241,7 +241,7 @@ public class StringUtils {
* Thrown if {@link StandardCharsets#UTF_16LE} is not initialized, which should never happen since it is
* required by the Java platform specification.
* @since As of 1.7, throws {@link NullPointerException} instead of UnsupportedEncodingException
- * @see <a href="http://download.oracle.com/javase/7/docs/api/java/nio/charset/Charset.html">Standard charsets</a>
+ * @see Charset
* @see #getBytesUnchecked(String, String)
*/
public static byte[] getBytesUtf16Le(final String string) {
@@ -259,7 +259,7 @@ public class StringUtils {
* Thrown if {@link StandardCharsets#UTF_8} is not initialized, which should never happen since it is
* required by the Java platform specification.
* @since As of 1.7, throws {@link NullPointerException} instead of UnsupportedEncodingException
- * @see <a href="http://download.oracle.com/javase/7/docs/api/java/nio/charset/Charset.html">Standard charsets</a>
+ * @see Charset
* @see #getBytesUnchecked(String, String)
*/
public static byte[] getBytesUtf8(final String string) {
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 6da4600b..943f2ea8 100644
--- a/src/main/java/org/apache/commons/codec/net/BCodec.java
+++ b/src/main/java/org/apache/commons/codec/net/BCodec.java
@@ -77,7 +77,7 @@ public class BCodec extends RFC1522Codec implements StringEncoder, StringDecoder
* @param charset
* the default string Charset to use.
*
- * @see <a href="http://download.oracle.com/javase/7/docs/api/java/nio/charset/Charset.html">Standard charsets</a>
+ * @see Charset
* @since 1.7
*/
public BCodec(final Charset charset) {
@@ -91,7 +91,7 @@ public class BCodec extends RFC1522Codec implements StringEncoder, StringDecoder
* the default string Charset to use.
* @param decodingPolicy The decoding policy.
*
- * @see <a href="http://download.oracle.com/javase/7/docs/api/java/nio/charset/Charset.html">Standard charsets</a>
+ * @see Charset
* @since 1.15
*/
public BCodec(final Charset charset, final CodecPolicy decodingPolicy) {
@@ -107,7 +107,7 @@ public class BCodec extends RFC1522Codec implements StringEncoder, StringDecoder
* @throws java.nio.charset.UnsupportedCharsetException
* If the named Charset is unavailable
* @since 1.7 throws UnsupportedCharsetException if the named Charset is unavailable
- * @see <a href="http://download.oracle.com/javase/7/docs/api/java/nio/charset/Charset.html">Standard charsets</a>
+ * @see Charset
*/
public BCodec(final String charsetName) {
this(Charset.forName(charsetName));
diff --git a/src/main/java/org/apache/commons/codec/net/QCodec.java b/src/main/java/org/apache/commons/codec/net/QCodec.java
index 5a6745f2..6717cf78 100644
--- a/src/main/java/org/apache/commons/codec/net/QCodec.java
+++ b/src/main/java/org/apache/commons/codec/net/QCodec.java
@@ -123,7 +123,7 @@ public class QCodec extends RFC1522Codec implements StringEncoder, StringDecoder
* @param charset
* the default string Charset to use.
*
- * @see <a href="http://download.oracle.com/javase/7/docs/api/java/nio/charset/Charset.html">Standard charsets</a>
+ * @see Charset
* @since 1.7
*/
public QCodec(final Charset charset) {
@@ -138,7 +138,7 @@ public class QCodec extends RFC1522Codec implements StringEncoder, StringDecoder
* @throws java.nio.charset.UnsupportedCharsetException
* If the named Charset is unavailable
* @since 1.7 throws UnsupportedCharsetException if the named Charset is unavailable
- * @see <a href="http://download.oracle.com/javase/7/docs/api/java/nio/charset/Charset.html">Standard charsets</a>
+ * @see Charset
*/
public QCodec(final String charsetName) {
this(Charset.forName(charsetName));
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 a607ce65..2a16aa38 100644
--- a/src/main/java/org/apache/commons/codec/net/RFC1522Codec.java
+++ b/src/main/java/org/apache/commons/codec/net/RFC1522Codec.java
@@ -65,7 +65,7 @@ abstract class RFC1522Codec {
* @return RFC 1522 compliant "encoded-word"
* @throws EncoderException
* thrown if there is an error condition during the Encoding process.
- * @see <a href="http://download.oracle.com/javase/7/docs/api/java/nio/charset/Charset.html">Standard charsets</a>
+ * @see Charset
*/
protected String encodeText(final String text, final Charset charset) throws EncoderException {
if (text == null) {