Sort members

Author: garydgregory

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

@@ -718,6 +718,24 @@ public static Tailer create(final File file, final TailerListener tailerListener
      */
     private final boolean ignoreTouch;
 
+    /**
+     * Creates a Tailer for the given file, with a specified buffer size.
+     *
+     * @param builder holds construction data.
+     */
+    private Tailer(final Builder builder) {
+        this.tailable = Objects.requireNonNull(builder.tailable, "tailable");
+        this.listener = Objects.requireNonNull(builder.tailerListener, "listener");
+        this.delayDuration = builder.delayDuration;
+        this.tailFromEnd = builder.tailFromEnd;
+        this.inbuf = IOUtils.byteArray(builder.getBufferSize());
+        // Save and prepare the listener
+        listener.init(this);
+        this.reOpen = builder.reOpen;
+        this.charset = builder.getCharset();
+        this.ignoreTouch = builder.ignoreTouch;
+    }
+
     /**
      * Creates a Tailer for the given file, with a specified buffer size.
      *
@@ -847,24 +865,6 @@ private Tailer(final Tailable tailable, final Charset charset, final TailerListe
         this.ignoreTouch = ignoreTouch;
     }
 
-    /**
-     * Creates a Tailer for the given file, with a specified buffer size.
-     *
-     * @param builder holds construction data.
-     */
-    private Tailer(final Builder builder) {
-        this.tailable = Objects.requireNonNull(builder.tailable, "tailable");
-        this.listener = Objects.requireNonNull(builder.tailerListener, "listener");
-        this.delayDuration = builder.delayDuration;
-        this.tailFromEnd = builder.tailFromEnd;
-        this.inbuf = IOUtils.byteArray(builder.getBufferSize());
-        // Save and prepare the listener
-        listener.init(this);
-        this.reOpen = builder.reOpen;
-        this.charset = builder.getCharset();
-        this.ignoreTouch = builder.ignoreTouch;
-    }
-
     /**
      * Requests the tailer to complete its current loop and return.
      */

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

@@ -254,6 +254,21 @@ private static Path toPath(final Path file, final Supplier<Path> defaultPathSupp
      */
     private boolean closed;
 
+    /**
+     * Constructs an instance of this class which will trigger an event at the specified threshold, and save data either to a file beyond that point.
+     *
+     * @param builder         The construction data source.
+     */
+    private DeferredFileOutputStream(final Builder builder) {
+        super(builder.threshold);
+        this.outputPath = toPath(builder.outputFile, null);
+        this.prefix = builder.prefix;
+        this.suffix = builder.suffix;
+        this.directory = toPath(builder.directory, PathUtils::getTempDirectory);
+        this.memoryOutputStream = new ByteArrayOutputStream(checkBufferSize(builder.getBufferSize()));
+        this.currentOutputStream = memoryOutputStream;
+    }
+
     /**
      * Constructs an instance of this class which will trigger an event at the specified threshold, and save data to a file beyond that point. The initial
      * buffer size will default to {@value AbstractByteArrayOutputStream#DEFAULT_SIZE} bytes which is ByteArrayOutputStream's default buffer size.
@@ -319,21 +334,6 @@ public DeferredFileOutputStream(final int threshold, final int initialBufferSize
         this(threshold, null, Objects.requireNonNull(prefix, "prefix"), suffix, directory, initialBufferSize);
     }
 
-    /**
-     * Constructs an instance of this class which will trigger an event at the specified threshold, and save data either to a file beyond that point.
-     *
-     * @param builder         The construction data source.
-     */
-    private DeferredFileOutputStream(final Builder builder) {
-        super(builder.threshold);
-        this.outputPath = toPath(builder.outputFile, null);
-        this.prefix = builder.prefix;
-        this.suffix = builder.suffix;
-        this.directory = toPath(builder.directory, PathUtils::getTempDirectory);
-        this.memoryOutputStream = new ByteArrayOutputStream(checkBufferSize(builder.getBufferSize()));
-        this.currentOutputStream = memoryOutputStream;
-    }
-
     /**
      * Constructs an instance of this class which will trigger an event at the specified threshold, and save data to a temporary file beyond that point. The
      * initial buffer size will default to 32 bytes which is ByteArrayOutputStream's default buffer size.

src/test/java/org/apache/commons/io/input/TailerTest.java

@@ -219,6 +219,17 @@ protected void createFile(final File file, final long size) throws IOException {
         assertEquals(size, file.length());
     }
 
+    private List<String> expectLinesWithLongTimeout(final TestTailerListener listener, final long minDelay, int count) throws Exception {
+        for (int i = 0; i < count ; i++) {
+            TestUtils.sleep(minDelay);
+            final List<String> lines = listener.getLines();
+            if (lines.size() > 0) {
+                return lines;
+            }
+        }
+        throw new RuntimeException("waiting for TestTailerListener.getLines() timed out after " + (count * minDelay) + " ms");
+    }
+
     @Test
     @SuppressWarnings("squid:S2699") // Suppress "Add at least one assertion to this test case"
     void testBufferBreak() throws Exception {
@@ -738,17 +749,6 @@ void testTailerIgnoreTouch() throws Exception {
         }
     }
 
-    private List<String> expectLinesWithLongTimeout(final TestTailerListener listener, final long minDelay, int count) throws Exception {
-        for (int i = 0; i < count ; i++) {
-            TestUtils.sleep(minDelay);
-            final List<String> lines = listener.getLines();
-            if (lines.size() > 0) {
-                return lines;
-            }
-        }
-        throw new RuntimeException("waiting for TestTailerListener.getLines() timed out after " + (count * minDelay) + " ms");
-    }
-
     @Test
     void testTailerReissueOnTouch() throws Exception {
         // Create & start the Tailer

src/test/java/org/apache/commons/io/test/TestUtils.java

@@ -251,19 +251,6 @@ public static void sleep(final long millis) throws InterruptedException {
         ThreadUtils.sleep(Duration.ofMillis(millis));
     }
 
-    /**
-     * Sleeps till the next full second.
-     *
-     * This method is useful when you want to set a guaranteed newer file system timestamp.
-     * Posix file systems only guarantee one second resolution, and e.g.
-     * some mac os x filesystems only offer that.
-     *
-     * @throws InterruptedException if interrupted.
-     */
-    public static void sleepTillNextFullSecond() throws InterruptedException {
-        sleep(1001 - (System.currentTimeMillis() % 1000));
-    }
-
     /**
      * Sleeps and swallows InterruptedException.
      *
@@ -277,6 +264,19 @@ public static void sleepQuietly(final long millis) {
         }
     }
 
+    /**
+     * Sleeps till the next full second.
+     *
+     * This method is useful when you want to set a guaranteed newer file system timestamp.
+     * Posix file systems only guarantee one second resolution, and e.g.
+     * some mac os x filesystems only offer that.
+     *
+     * @throws InterruptedException if interrupted.
+     */
+    public static void sleepTillNextFullSecond() throws InterruptedException {
+        sleep(1001 - (System.currentTimeMillis() % 1000));
+    }
+
     private TestUtils() {
 
     }