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 4d53e45b Sort imports and enforce through Checkstyle 4d53e45b is described below commit 4d53e45bfe2e4ce363c345615aacb3515f82853e Author: Gary Gregory <garydgreg...@gmail.com> AuthorDate: Mon Oct 9 08:10:55 2023 -0400 Sort imports and enforce through Checkstyle --- src/conf/checkstyle.xml | 6 ++++++ .../java/org/apache/commons/codec/language/Caverphone1Test.java | 2 +- .../java/org/apache/commons/codec/language/Caverphone2Test.java | 2 +- .../java/org/apache/commons/codec/language/ColognePhoneticTest.java | 2 +- .../apache/commons/codec/language/DaitchMokotoffSoundexTest.java | 2 +- .../java/org/apache/commons/codec/language/DoubleMetaphoneTest.java | 2 +- src/test/java/org/apache/commons/codec/language/NysiisTest.java | 2 +- .../java/org/apache/commons/codec/language/RefinedSoundexTest.java | 2 +- src/test/java/org/apache/commons/codec/language/SoundexTest.java | 2 +- .../apache/commons/codec/language/bm/BeiderMorseEncoderTest.java | 2 +- 10 files changed, 15 insertions(+), 9 deletions(-) diff --git a/src/conf/checkstyle.xml b/src/conf/checkstyle.xml index 0d729001..0245a7e1 100644 --- a/src/conf/checkstyle.xml +++ b/src/conf/checkstyle.xml @@ -63,6 +63,12 @@ limitations under the License. <module name="OperatorWrap"> <property name="option" value="eol" /> </module> + <module name="ImportOrder"> + <property name="option" value="top"/> + <property name="groups" value="java,javax,org"/> + <property name="ordered" value="true"/> + <property name="separated" value="true"/> + </module> </module> <module name="LineLength"> 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 f48caa26..fcf1a157 100644 --- a/src/test/java/org/apache/commons/codec/language/Caverphone1Test.java +++ b/src/test/java/org/apache/commons/codec/language/Caverphone1Test.java @@ -20,8 +20,8 @@ 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.AbstractStringEncoderTest; +import org.apache.commons.codec.EncoderException; import org.junit.jupiter.api.Test; /** 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 f045b7ac..bb1525b3 100644 --- a/src/test/java/org/apache/commons/codec/language/Caverphone2Test.java +++ b/src/test/java/org/apache/commons/codec/language/Caverphone2Test.java @@ -20,8 +20,8 @@ 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.AbstractStringEncoderTest; +import org.apache.commons.codec.EncoderException; import org.junit.jupiter.api.Test; /** 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 e8657498..9a811b3d 100644 --- a/src/test/java/org/apache/commons/codec/language/ColognePhoneticTest.java +++ b/src/test/java/org/apache/commons/codec/language/ColognePhoneticTest.java @@ -25,8 +25,8 @@ import java.util.HashSet; import java.util.Locale; import java.util.Set; -import org.apache.commons.codec.EncoderException; import org.apache.commons.codec.AbstractStringEncoderTest; +import org.apache.commons.codec.EncoderException; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.Test; import org.opentest4j.AssertionFailedError; 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 5e07b4c4..3fcfda44 100644 --- a/src/test/java/org/apache/commons/codec/language/DaitchMokotoffSoundexTest.java +++ b/src/test/java/org/apache/commons/codec/language/DaitchMokotoffSoundexTest.java @@ -18,8 +18,8 @@ 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.AbstractStringEncoderTest; +import org.apache.commons.codec.EncoderException; import org.junit.jupiter.api.Test; /** 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 2abefe13..6aafad6d 100644 --- a/src/test/java/org/apache/commons/codec/language/DoubleMetaphoneTest.java +++ b/src/test/java/org/apache/commons/codec/language/DoubleMetaphoneTest.java @@ -23,8 +23,8 @@ 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.AbstractStringEncoderTest; +import org.apache.commons.codec.EncoderException; import org.junit.jupiter.api.Test; /** 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 d547ea58..01316d9f 100644 --- a/src/test/java/org/apache/commons/codec/language/NysiisTest.java +++ b/src/test/java/org/apache/commons/codec/language/NysiisTest.java @@ -20,8 +20,8 @@ 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.AbstractStringEncoderTest; +import org.apache.commons.codec.EncoderException; import org.junit.jupiter.api.Test; /** 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 86b27c38..0494f405 100644 --- a/src/test/java/org/apache/commons/codec/language/RefinedSoundexTest.java +++ b/src/test/java/org/apache/commons/codec/language/RefinedSoundexTest.java @@ -19,8 +19,8 @@ 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.AbstractStringEncoderTest; +import org.apache.commons.codec.EncoderException; import org.junit.jupiter.api.Test; /** 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 68701b5e..da48d7a2 100644 --- a/src/test/java/org/apache/commons/codec/language/SoundexTest.java +++ b/src/test/java/org/apache/commons/codec/language/SoundexTest.java @@ -23,8 +23,8 @@ 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.AbstractStringEncoderTest; +import org.apache.commons.codec.EncoderException; import org.junit.jupiter.api.Test; /** 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 83cd64c9..08d30aad 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 @@ -26,9 +26,9 @@ import static org.junit.jupiter.api.Assertions.assertTrue; import java.time.Duration; +import org.apache.commons.codec.AbstractStringEncoderTest; import org.apache.commons.codec.EncoderException; import org.apache.commons.codec.StringEncoder; -import org.apache.commons.codec.AbstractStringEncoderTest; import org.junit.jupiter.api.Test; /**