Add Checkstyle ModifierOrder

garydgregory · garydgregory · commit da3f28e30215 · 2024-12-28T07:48:36.000-05:00
diff --git a/src/conf/checkstyle.xml b/src/conf/checkstyle.xml
@@ -65,6 +65,7 @@ limitations under the License.
     </module>
     <module name="LeftCurly" />
     <module name="MissingOverride" />
+    <module name="ModifierOrder" />
     <module name="OperatorWrap">
       <property name="option" value="eol" />
     </module>
diff --git a/src/main/java/org/apache/commons/codec/digest/PureJavaCrc32.java b/src/main/java/org/apache/commons/codec/digest/PureJavaCrc32.java
@@ -577,7 +577,7 @@ public class PureJavaCrc32 implements Checksum {
     /** The current CRC value, bit-flipped */
     private int crc;
 
-    /** Create a new PureJavaCrc32 object. */
+    /** Constructs a new PureJavaCrc32 object. */
     public PureJavaCrc32() {
         resetCrc();
     }
@@ -639,7 +639,7 @@ public void update(final byte[] b, final int offset, final int len) {
     }
 
     @Override
-    final public void update(final int b) {
+    public final void update(final int b) {
         crc = crc >>> 8 ^ T[(crc ^ b) << 24 >>> 24];
     }
 
diff --git a/src/main/java/org/apache/commons/codec/digest/PureJavaCrc32C.java b/src/main/java/org/apache/commons/codec/digest/PureJavaCrc32C.java
@@ -642,7 +642,7 @@ public void update(final byte[] b, int off, int len) {
     }
 
     @Override
-    final public void update(final int b) {
+    public final void update(final int b) {
         crc = crc >>> 8 ^ T[T8_0_START + ((crc ^ b) & 0xff)];
     }
 
diff --git a/src/main/java/org/apache/commons/codec/language/Caverphone.java b/src/main/java/org/apache/commons/codec/language/Caverphone.java
@@ -37,7 +37,7 @@ public class Caverphone implements StringEncoder {
     /**
      * Delegate to a {@link Caverphone2} instance to avoid code duplication.
      */
-    final private Caverphone2 encoder = new Caverphone2();
+    private final Caverphone2 encoder = new Caverphone2();
 
     /**
      * Encodes the given String into a Caverphone value.
diff --git a/src/main/java/org/apache/commons/codec/language/bm/Languages.java b/src/main/java/org/apache/commons/codec/language/bm/Languages.java
@@ -68,7 +68,7 @@ public class Languages {
     /**
      * A set of languages.
      */
-    public static abstract class LanguageSet {
+    public abstract static class LanguageSet {
 
         public static LanguageSet from(final Set<String> langs) {
             return langs.isEmpty() ? NO_LANGUAGES : new SomeLanguages(langs);
diff --git a/src/test/java/org/apache/commons/codec/binary/Base16TestData.java b/src/test/java/org/apache/commons/codec/binary/Base16TestData.java
@@ -23,9 +23,9 @@
  */
 public class Base16TestData {
 
-    final static String ENCODED_UTF8_LOWERCASE
+    static final String ENCODED_UTF8_LOWERCASE
             = "f483cd2b052f74b888029e9cb73d764a2426386b2d5b262f48f79ebee7c386bcdac2ceb9be8ca42a36c88f7dd85936bdc40edcfc51f2a56725ad9850ee89df737244f77049e5f4f847dcc011d8db8f2d61bf8658367113e1625e5cc2c9ff9a7ea81a53b0fa5ea56f03355632d5cd36ff5c320be92003a0af45477d712aff96df3c00476c4d5e063029f5f84c2e02261d8afc6ece7f9c2ccf2ada37b0aa5239dad3fd27b0acf2fa86ef5b3af960042cabe6fd4a2fbf268e8be39d3147e343424b88b907bbaa7d3b0520bd0aa20cacc4bff02e828d1d4cf67360613208fe4656b95edd041d81c8881e7a5d7785544cf19151b5de29b87ef94ddf6c922783fb105ccdc8601c8c67bc6df47592d4b51c45d43b3ebc27fc89505b138c7aaf8a6494a802f896b5db1ead7c876c811afff866af8a7f8fcd24d20f6adf986ad5ac8633df7ce002d349a67c59ec856d9c750b10bf428a9ff76507ff2941467489367e2c4b4a1adee51b36f3a7a640780fd57b52df5ab629c226bc3ec2225c325fbd929db9d48531046038714c61d1e6b19373835a7c08f79124b6658e2b00923f4c635b020cc438f2830006e51f1f93d1fd6d58b5b6131abe6e270dce2f68da1213546764d6306e25159553ccf44725bc959359dea2816780d0cc47000f2238ce559e6aa9fd618ced40eae7dac121d3500a879325a02412d02e2cbe73a2039ae5ef8ccd58ef0793184253a569a4ed42b440a576b967855f11a9eef542b67e2d53f2324f142d8f99779bc69d1b9cef955be6e0c8474822421009a66ad4c2960b72ae88e4bd049d6deced00d892892afa04e1436e9735764c6082f8a0279a346a401a979499a08c7400a0735928e99afee2103acbdf0e7aa271874399fc8262e57cf478c0d47f2d88327ce557ecac51dd71b3c0a0d0a98bae5ac094877dd3ced4d0ce34e2bef92ed8d155d4828618ac157863b61b0bcc20fe7a9c8a6af7966ded472a7e42c80acdd4446df3519341793cbc8b7ec50495ea63b3541d5777c45752c9b62cb0037b9b54d40947185b6316bf0bf5f2daac699babef74bf76977ab571c7afdf921c68e892c7b226fbf1b157695529d68ebd85460c3d730517ba6360b041bf69d3cf25dfff77a86479e7ddcd0a2b8f3d672c0d6c144a13351325b414d5f517c6e7cc79d88a3a3213f8dfe2cfe5f5b05def225d456442ca287659cca902238812406c1fe7424e06a5bbcb110e8321e1920105d8077e8654c9c2ea45e4052d96784a5e334a6cede6f43140584429bf7e7dfff8adbd4a028eb089f7a783155f22c6b66f99635f302a5ecec990fbe60ba7daed7e19667751a246b1625bb7720f0e57eb86ffa6001d98a5a3c6add0ea6490d74d16e870b8696406aad928d523fe04a2618734ea017faffcfa896023a572515b5aaadc22d95dd64567f56ba977958ed380bb60";
 
-    final static String ENCODED_UTF8_UPPERCASE
+    static final String ENCODED_UTF8_UPPERCASE
             = "F483CD2B052F74B888029E9CB73D764A2426386B2D5B262F48F79EBEE7C386BCDAC2CEB9BE8CA42A36C88F7DD85936BDC40EDCFC51F2A56725AD9850EE89DF737244F77049E5F4F847DCC011D8DB8F2D61BF8658367113E1625E5CC2C9FF9A7EA81A53B0FA5EA56F03355632D5CD36FF5C320BE92003A0AF45477D712AFF96DF3C00476C4D5E063029F5F84C2E02261D8AFC6ECE7F9C2CCF2ADA37B0AA5239DAD3FD27B0ACF2FA86EF5B3AF960042CABE6FD4A2FBF268E8BE39D3147E343424B88B907BBAA7D3B0520BD0AA20CACC4BFF02E828D1D4CF67360613208FE4656B95EDD041D81C8881E7A5D7785544CF19151B5DE29B87EF94DDF6C922783FB105CCDC8601C8C67BC6DF47592D4B51C45D43B3EBC27FC89505B138C7AAF8A6494A802F896B5DB1EAD7C876C811AFFF866AF8A7F8FCD24D20F6ADF986AD5AC8633DF7CE002D349A67C59EC856D9C750B10BF428A9FF76507FF2941467489367E2C4B4A1ADEE51B36F3A7A640780FD57B52DF5AB629C226BC3EC2225C325FBD929DB9D48531046038714C61D1E6B19373835A7C08F79124B6658E2B00923F4C635B020CC438F2830006E51F1F93D1FD6D58B5B6131ABE6E270DCE2F68DA1213546764D6306E25159553CCF44725BC959359DEA2816780D0CC47000F2238CE559E6AA9FD618CED40EAE7DAC121D3500A879325A02412D02E2CBE73A2039AE5EF8CCD58EF0793184253A569A4ED42B440A576B967855F11A9EEF542B67E2D53F2324F142D8F99779BC69D1B9CEF955BE6E0C8474822421009A66AD4C2960B72AE88E4BD049D6DECED00D892892AFA04E1436E9735764C6082F8A0279A346A401A979499A08C7400A0735928E99AFEE2103ACBDF0E7AA271874399FC8262E57CF478C0D47F2D88327CE557ECAC51DD71B3C0A0D0A98BAE5AC094877DD3CED4D0CE34E2BEF92ED8D155D4828618AC157863B61B0BCC20FE7A9C8A6AF7966DED472A7E42C80ACDD4446DF3519341793CBC8B7EC50495EA63B3541D5777C45752C9B62CB0037B9B54D40947185B6316BF0BF5F2DAAC699BABEF74BF76977AB571C7AFDF921C68E892C7B226FBF1B157695529D68EBD85460C3D730517BA6360B041BF69D3CF25DFFF77A86479E7DDCD0A2B8F3D672C0D6C144A13351325B414D5F517C6E7CC79D88A3A3213F8DFE2CFE5F5B05DEF225D456442CA287659CCA902238812406C1FE7424E06A5BBCB110E8321E1920105D8077E8654C9C2EA45E4052D96784A5E334A6CEDE6F43140584429BF7E7DFFF8ADBD4A028EB089F7A783155F22C6B66F99635F302A5ECEC990FBE60BA7DAED7E19667751A246B1625BB7720F0E57EB86FFA6001D98A5A3C6ADD0EA6490D74D16E870B8696406AAD928D523FE04A2618734EA017FAFFCFA896023A572515B5AAADC22D95DD64567F56BA977958ED380BB60";
 }
diff --git a/src/test/java/org/apache/commons/codec/binary/Base32InputStreamTest.java b/src/test/java/org/apache/commons/codec/binary/Base32InputStreamTest.java
@@ -35,9 +35,9 @@ public class Base32InputStreamTest {
 
     private static final String ENCODED_FOO = "MZXW6===";
 
-    private final static byte[] CRLF = { (byte) '\r', (byte) '\n' };
+    private static final byte[] CRLF = { (byte) '\r', (byte) '\n' };
 
-    private final static byte[] LF = { (byte) '\n' };
+    private static final byte[] LF = { (byte) '\n' };
 
     private static final String STRING_FIXTURE = "Hello World";
 
diff --git a/src/test/java/org/apache/commons/codec/binary/Base32OutputStreamTest.java b/src/test/java/org/apache/commons/codec/binary/Base32OutputStreamTest.java
@@ -30,9 +30,9 @@
 
 public class Base32OutputStreamTest {
 
-    private final static byte[] CR_LF = {(byte) '\r', (byte) '\n'};
+    private static final byte[] CR_LF = {(byte) '\r', (byte) '\n'};
 
-    private final static byte[] LF = {(byte) '\n'};
+    private static final byte[] LF = {(byte) '\n'};
 
 //    /**
 //     * Test the Base32OutputStream implementation against the special NPE inducing input
diff --git a/src/test/java/org/apache/commons/codec/binary/Base64Codec13Test.java b/src/test/java/org/apache/commons/codec/binary/Base64Codec13Test.java
@@ -35,9 +35,9 @@
  */
 public class Base64Codec13Test {
 
-    private final static String[] STRINGS = new String[181];
-    private final static String[] CHUNKED_STRINGS = new String[STRINGS.length];
-    private final static byte[][] BYTES = new byte[STRINGS.length][];
+    private static final String[] STRINGS = new String[181];
+    private static final String[] CHUNKED_STRINGS = new String[STRINGS.length];
+    private static final byte[][] BYTES = new byte[STRINGS.length][];
 
     static {
         initSTRINGS();
diff --git a/src/test/java/org/apache/commons/codec/binary/Base64InputStreamTest.java b/src/test/java/org/apache/commons/codec/binary/Base64InputStreamTest.java
@@ -43,9 +43,9 @@ public class Base64InputStreamTest {
      */
     private static final String ENCODED_B64 = "AAAA////";
 
-    private final static byte[] CRLF = { (byte) '\r', (byte) '\n' };
+    private static final byte[] CRLF = { (byte) '\r', (byte) '\n' };
 
-    private final static byte[] LF = { (byte) '\n' };
+    private static final byte[] LF = { (byte) '\n' };
 
     private static final String STRING_FIXTURE = "Hello World";
 
diff --git a/src/test/java/org/apache/commons/codec/binary/Base64OutputStreamTest.java b/src/test/java/org/apache/commons/codec/binary/Base64OutputStreamTest.java
@@ -33,9 +33,9 @@
  */
 public class Base64OutputStreamTest {
 
-    private final static byte[] CR_LF = {(byte) '\r', (byte) '\n'};
+    private static final byte[] CR_LF = {(byte) '\r', (byte) '\n'};
 
-    private final static byte[] LF = {(byte) '\n'};
+    private static final byte[] LF = {(byte) '\n'};
 
     private static final String STRING_FIXTURE = "Hello World";
 
diff --git a/src/test/java/org/apache/commons/codec/binary/Base64TestData.java b/src/test/java/org/apache/commons/codec/binary/Base64TestData.java
@@ -39,7 +39,7 @@ public class Base64TestData {
 
     // OpenSSL doesn't include the final \n, but it would be annoying beyond belief
     // to further parameterize commons-codec to support this pointless variation.
-    final static String ENCODED_64_CHARS_PER_LINE =
+    static final String ENCODED_64_CHARS_PER_LINE =
         "9IPNKwUvdLiIAp6ctz12SiQmOGstWyYvSPeevufDhrzaws65voykKjbIj33YWTa9\n" +
         "xA7c/FHypWclrZhQ7onfc3JE93BJ5fT4R9zAEdjbjy1hv4ZYNnET4WJeXMLJ/5p+\n" +
         "qBpTsPpepW8DNVYy1c02/1wyC+kgA6CvRUd9cSr/lt88AEdsTV4GMCn1+EwuAiYd\n" +
@@ -63,7 +63,7 @@ public class Base64TestData {
         "/6YAHZilo8at0OpkkNdNFuhwuGlkBqrZKNUj/gSiYYc06gF/r/z6iWAjpXJRW1qq\n" +
         "3CLZXdZFZ/VrqXeVjtOAu2A=\n";
 
-    final static String ENCODED_76_CHARS_PER_LINE =
+    static final String ENCODED_76_CHARS_PER_LINE =
         "9IPNKwUvdLiIAp6ctz12SiQmOGstWyYvSPeevufDhrzaws65voykKjbIj33YWTa9xA7c/FHypWcl\n" +
         "rZhQ7onfc3JE93BJ5fT4R9zAEdjbjy1hv4ZYNnET4WJeXMLJ/5p+qBpTsPpepW8DNVYy1c02/1wy\n" +
         "C+kgA6CvRUd9cSr/lt88AEdsTV4GMCn1+EwuAiYdivxuzn+cLM8q2jewqlI52tP9J7Cs8vqG71s6\n" +
diff --git a/src/test/java/org/apache/commons/codec/binary/BaseNTestData.java b/src/test/java/org/apache/commons/codec/binary/BaseNTestData.java
@@ -27,7 +27,7 @@
  */
 public class BaseNTestData {
 
-    final static byte[] DECODED
+    static final byte[] DECODED
             = {-12, -125, -51, 43, 5, 47, 116, -72, -120, 2, -98, -100, -73, 61, 118, 74, 36, 38, 56, 107, 45, 91, 38,
             47, 72, -9, -98, -66, -25, -61, -122, -68, -38, -62, -50, -71, -66, -116, -92, 42, 54, -56, -113, 125,
             -40, 89, 54, -67, -60, 14, -36, -4, 81, -14, -91, 103, 37, -83, -104, 80, -18, -119, -33, 115, 114, 68,
@@ -75,9 +75,9 @@ public class BaseNTestData {
             -22, 1, 127, -81, -4, -6, -119, 96, 35, -91, 114, 81, 91, 90, -86, -36, 34, -39, 93, -42, 69, 103, -11,
             107, -87, 119, -107, -114, -45, -128, -69, 96};
 
-    private final static int SIZE_KEY = 0;
+    private static final int SIZE_KEY = 0;
 
-    private final static int LAST_READ_KEY = 1;
+    private static final int LAST_READ_KEY = 1;
 
     /**
      * Tests the supplied byte[] array to see if it contains the specified byte c.
diff --git a/src/test/java/org/apache/commons/codec/binary/HexTest.java b/src/test/java/org/apache/commons/codec/binary/HexTest.java
@@ -44,7 +44,7 @@ public class HexTest {
 
     private static final String BAD_ENCODING_NAME = "UNKNOWN";
 
-    private final static boolean LOG = false;
+    private static final boolean LOG = false;
 
     /**
      * Allocate a ByteBuffer.

Original file line number	Diff line number	Diff line change
`@@ -577,7 +577,7 @@ public class PureJavaCrc32 implements Checksum {`
`577`	`577`	`/** The current CRC value, bit-flipped */`
`578`	`578`	`private int crc;`
`579`	`579`
`580`		`- /** Create a new PureJavaCrc32 object. */`
	`580`	`+ /** Constructs a new PureJavaCrc32 object. */`
`581`	`581`	`public PureJavaCrc32() {`
`582`	`582`	`resetCrc();`
`583`	`583`	`}`
`@@ -639,7 +639,7 @@ public void update(final byte[] b, final int offset, final int len) {`
`639`	`639`	`}`
`640`	`640`
`641`	`641`	`@Override`
`642`		`- final public void update(final int b) {`
	`642`	`+ public final void update(final int b) {`
`643`	`643`	`crc = crc >>> 8 ^ T[(crc ^ b) << 24 >>> 24];`
`644`	`644`	`}`
`645`	`645`
Original file line number	Diff line number	Diff line change
`@@ -642,7 +642,7 @@ public void update(final byte[] b, int off, int len) {`
`642`	`642`	`}`
`643`	`643`
`644`	`644`	`@Override`
`645`		`- final public void update(final int b) {`
	`645`	`+ public final void update(final int b) {`
`646`	`646`	`crc = crc >>> 8 ^ T[T8_0_START + ((crc ^ b) & 0xff)];`
`647`	`647`	`}`
`648`	`648`