Add Checkstyle ModifierOrder

Author: garydgregory

src/conf/checkstyle.xml

@@ -56,6 +56,7 @@ limitations under the License.
     <module name="JavadocMethod" />
     <module name="LeftCurly" />
     <module name="MissingOverride" />
+    <module name="ModifierOrder" />
     <module name="NeedBraces" />
     <module name="ParenPad" />
     <module name="RedundantImport" />

src/main/java/org/apache/commons/io/build/AbstractOrigin.java

@@ -75,7 +75,7 @@ public abstract class AbstractOrigin<T, B extends AbstractOrigin<T, B>> extends
      * @param <T> the type of instances to build.
      * @param <B> the type of builder subclass.
      */
-    public static abstract class AbstractRandomAccessFileOrigin<T extends RandomAccessFile, B extends AbstractRandomAccessFileOrigin<T, B>>
+    public abstract static class AbstractRandomAccessFileOrigin<T extends RandomAccessFile, B extends AbstractRandomAccessFileOrigin<T, B>>
             extends AbstractOrigin<T, B> {
 
         /**

src/main/java/org/apache/commons/io/file/Counters.java

@@ -167,7 +167,7 @@ public String toString() {
     /**
      * Counts files, directories, and sizes, as a visit proceeds, using BigInteger numbers.
      */
-    private final static class BigIntegerPathCounters extends AbstractPathCounters {
+    private static final class BigIntegerPathCounters extends AbstractPathCounters {
 
         /**
          * Constructs a new initialized instance.
@@ -228,7 +228,7 @@ default void reset() {
     /**
      * Counts using a {@code long} number.
      */
-    private final static class LongCounter implements Counter {
+    private static final class LongCounter implements Counter {
 
         private long value;
 
@@ -289,7 +289,7 @@ public String toString() {
     /**
      * Counts files, directories, and sizes, as a visit proceeds, using long numbers.
      */
-    private final static class LongPathCounters extends AbstractPathCounters {
+    private static final class LongPathCounters extends AbstractPathCounters {
 
         /**
          * Constructs a new initialized instance.
@@ -303,7 +303,7 @@ protected LongPathCounters() {
     /**
      * Counts nothing.
      */
-    private final static class NoopCounter implements Counter {
+    private static final class NoopCounter implements Counter {
 
         static final NoopCounter INSTANCE = new NoopCounter();
 

src/main/java/org/apache/commons/io/filefilter/DelegateFileFilter.java

@@ -38,9 +38,9 @@ public class DelegateFileFilter extends AbstractFileFilter implements Serializab
     private static final long serialVersionUID = -8723373124984771318L;
 
     /** The File filter */
-    private transient final FileFilter fileFilter;
+    private final transient FileFilter fileFilter;
     /** The Filename filter */
-    private transient final FilenameFilter fileNameFilter;
+    private final transient FilenameFilter fileNameFilter;
 
     /**
      * Constructs a delegate file filter around an existing FileFilter.

src/main/java/org/apache/commons/io/filefilter/RegexFileFilter.java

@@ -102,7 +102,7 @@ private static int toFlags(final IOCase ioCase) {
     private final Pattern pattern;
 
     /** How convert a path to a string. */
-    private transient final Function<Path, String> pathToString;
+    private final transient Function<Path, String> pathToString;
 
     /**
      * Constructs a new regular expression filter for a compiled regular expression

src/main/java/org/apache/commons/io/input/BoundedInputStream.java

@@ -93,7 +93,7 @@ public class BoundedInputStream extends ProxyInputStream {
      *
      * @param <T> The subclass.
      */
-    static abstract class AbstractBuilder<T extends AbstractBuilder<T>> extends ProxyInputStream.AbstractBuilder<BoundedInputStream, T> {
+    abstract static class AbstractBuilder<T extends AbstractBuilder<T>> extends ProxyInputStream.AbstractBuilder<BoundedInputStream, T> {
 
         /** The current count of bytes counted. */
         private long count;

src/main/java/org/apache/commons/io/input/ObservableInputStream.java

@@ -49,7 +49,7 @@ public class ObservableInputStream extends ProxyInputStream {
      * @param <T> The subclass.
      * @since 2.18.0
      */
-    public static abstract class AbstractBuilder<T extends AbstractBuilder<T>> extends ProxyInputStream.AbstractBuilder<ObservableInputStream, T> {
+    public abstract static class AbstractBuilder<T extends AbstractBuilder<T>> extends ProxyInputStream.AbstractBuilder<ObservableInputStream, T> {
 
         private List<Observer> observers;
 
@@ -95,7 +95,7 @@ public ObservableInputStream get() throws IOException {
     /**
      * Abstracts observer callback for {@link ObservableInputStream}s.
      */
-    public static abstract class Observer {
+    public abstract static class Observer {
 
         /**
          * Constructs a new instance for subclasses.

src/main/java/org/apache/commons/io/input/ProxyInputStream.java

@@ -53,7 +53,7 @@ public abstract class ProxyInputStream extends FilterInputStream {
      * @param <B> The builder type.
      * @since 2.18.0
      */
-    protected static abstract class AbstractBuilder<T, B extends AbstractStreamBuilder<T, B>> extends AbstractStreamBuilder<T, B> {
+    protected abstract static class AbstractBuilder<T, B extends AbstractStreamBuilder<T, B>> extends AbstractStreamBuilder<T, B> {
 
         private IOIntConsumer afterRead;
 

src/main/java/org/apache/commons/io/monitor/FileAlterationObserver.java

@@ -210,7 +210,7 @@ private static Comparator<File> toComparator(final IOCase ioCase) {
     /**
      * List of listeners.
      */
-    private transient final List<FileAlterationListener> listeners = new CopyOnWriteArrayList<>();
+    private final transient List<FileAlterationListener> listeners = new CopyOnWriteArrayList<>();
 
     /**
      * The root directory to observe.
@@ -220,7 +220,7 @@ private static Comparator<File> toComparator(final IOCase ioCase) {
     /**
      * The file filter or null if none.
      */
-    private transient final FileFilter fileFilter;
+    private final transient FileFilter fileFilter;
 
     /**
      * Compares file names.

src/main/java/org/apache/commons/io/output/RandomAccessFileOutputStream.java

@@ -51,7 +51,7 @@ public final class RandomAccessFileOutputStream extends OutputStream {
      * @see #get()
      */
     // @formatter:on
-    public final static class Builder extends AbstractStreamBuilder<RandomAccessFileOutputStream, Builder> {
+    public static final class Builder extends AbstractStreamBuilder<RandomAccessFileOutputStream, Builder> {
 
         /**
          * Use {@link RandomAccessFileOutputStream#builder()}.