diff --git a/logstash-core/src/main/java/org/logstash/ackedqueue/FileSettings.java b/logstash-core/src/main/java/org/logstash/ackedqueue/FileSettings.java index c627e3f61..10ccd963a 100644 --- a/logstash-core/src/main/java/org/logstash/ackedqueue/FileSettings.java +++ b/logstash-core/src/main/java/org/logstash/ackedqueue/FileSettings.java @@ -1,7 +1,7 @@ package org.logstash.ackedqueue; -import org.logstash.common.io.CheckpointIOFactory; -import org.logstash.common.io.PageIOFactory; +import org.logstash.ackedqueue.io.CheckpointIOFactory; +import org.logstash.ackedqueue.io.PageIOFactory; public class FileSettings implements Settings { private String dirForFiles; diff --git a/logstash-core/src/main/java/org/logstash/ackedqueue/HeadPage.java b/logstash-core/src/main/java/org/logstash/ackedqueue/HeadPage.java index 1b725c894..9e0eff0d4 100644 --- a/logstash-core/src/main/java/org/logstash/ackedqueue/HeadPage.java +++ b/logstash-core/src/main/java/org/logstash/ackedqueue/HeadPage.java @@ -1,7 +1,7 @@ package org.logstash.ackedqueue; -import org.logstash.common.io.CheckpointIO; -import org.logstash.common.io.PageIO; +import org.logstash.ackedqueue.io.CheckpointIO; +import org.logstash.ackedqueue.io.PageIO; import java.io.IOException; import java.util.BitSet; diff --git a/logstash-core/src/main/java/org/logstash/ackedqueue/MemorySettings.java b/logstash-core/src/main/java/org/logstash/ackedqueue/MemorySettings.java index 3d9ea6672..d0b5503c6 100644 --- a/logstash-core/src/main/java/org/logstash/ackedqueue/MemorySettings.java +++ b/logstash-core/src/main/java/org/logstash/ackedqueue/MemorySettings.java @@ -1,7 +1,7 @@ package org.logstash.ackedqueue; -import org.logstash.common.io.CheckpointIOFactory; -import org.logstash.common.io.PageIOFactory; +import org.logstash.ackedqueue.io.CheckpointIOFactory; +import org.logstash.ackedqueue.io.PageIOFactory; public class MemorySettings implements Settings { private CheckpointIOFactory checkpointIOFactory; diff --git a/logstash-core/src/main/java/org/logstash/ackedqueue/Page.java b/logstash-core/src/main/java/org/logstash/ackedqueue/Page.java index a7b7d7d47..1560e78e3 100644 --- a/logstash-core/src/main/java/org/logstash/ackedqueue/Page.java +++ b/logstash-core/src/main/java/org/logstash/ackedqueue/Page.java @@ -1,6 +1,6 @@ package org.logstash.ackedqueue; -import org.logstash.common.io.PageIO; +import org.logstash.ackedqueue.io.PageIO; import java.io.Closeable; import java.io.IOException; diff --git a/logstash-core/src/main/java/org/logstash/ackedqueue/Queue.java b/logstash-core/src/main/java/org/logstash/ackedqueue/Queue.java index 060bfbb7d..38751cbd2 100644 --- a/logstash-core/src/main/java/org/logstash/ackedqueue/Queue.java +++ b/logstash-core/src/main/java/org/logstash/ackedqueue/Queue.java @@ -4,9 +4,9 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.logstash.FileLockFactory; import org.logstash.LockException; -import org.logstash.common.io.CheckpointIO; -import org.logstash.common.io.PageIO; -import org.logstash.common.io.PageIOFactory; +import org.logstash.ackedqueue.io.CheckpointIO; +import org.logstash.ackedqueue.io.PageIO; +import org.logstash.ackedqueue.io.PageIOFactory; import java.io.Closeable; import java.io.IOException; @@ -17,7 +17,6 @@ import java.nio.file.NoSuchFileException; import java.util.ArrayList; import java.util.HashSet; import java.util.List; -import java.util.Map; import java.util.Set; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicBoolean; diff --git a/logstash-core/src/main/java/org/logstash/ackedqueue/Settings.java b/logstash-core/src/main/java/org/logstash/ackedqueue/Settings.java index c64e33117..386358459 100644 --- a/logstash-core/src/main/java/org/logstash/ackedqueue/Settings.java +++ b/logstash-core/src/main/java/org/logstash/ackedqueue/Settings.java @@ -1,7 +1,7 @@ package org.logstash.ackedqueue; -import org.logstash.common.io.CheckpointIOFactory; -import org.logstash.common.io.PageIOFactory; +import org.logstash.ackedqueue.io.CheckpointIOFactory; +import org.logstash.ackedqueue.io.PageIOFactory; public interface Settings { Settings setCheckpointIOFactory(CheckpointIOFactory factory); diff --git a/logstash-core/src/main/java/org/logstash/ackedqueue/TailPage.java b/logstash-core/src/main/java/org/logstash/ackedqueue/TailPage.java index 41afe05ad..29e62ba60 100644 --- a/logstash-core/src/main/java/org/logstash/ackedqueue/TailPage.java +++ b/logstash-core/src/main/java/org/logstash/ackedqueue/TailPage.java @@ -1,7 +1,7 @@ package org.logstash.ackedqueue; -import org.logstash.common.io.CheckpointIO; -import org.logstash.common.io.PageIO; +import org.logstash.ackedqueue.io.CheckpointIO; +import org.logstash.ackedqueue.io.PageIO; import java.io.IOException; import java.util.BitSet; diff --git a/logstash-core/src/main/java/org/logstash/ackedqueue/ext/JrubyAckedQueueExtLibrary.java b/logstash-core/src/main/java/org/logstash/ackedqueue/ext/JrubyAckedQueueExtLibrary.java index 839876bc2..dbf7c8e22 100644 --- a/logstash-core/src/main/java/org/logstash/ackedqueue/ext/JrubyAckedQueueExtLibrary.java +++ b/logstash-core/src/main/java/org/logstash/ackedqueue/ext/JrubyAckedQueueExtLibrary.java @@ -19,10 +19,10 @@ import org.logstash.ackedqueue.Batch; import org.logstash.ackedqueue.FileSettings; import org.logstash.ackedqueue.Queue; import org.logstash.ackedqueue.Settings; -import org.logstash.common.io.CheckpointIOFactory; -import org.logstash.common.io.FileCheckpointIO; -import org.logstash.common.io.MmapPageIO; -import org.logstash.common.io.PageIOFactory; +import org.logstash.ackedqueue.io.CheckpointIOFactory; +import org.logstash.ackedqueue.io.FileCheckpointIO; +import org.logstash.ackedqueue.io.MmapPageIO; +import org.logstash.ackedqueue.io.PageIOFactory; import java.io.IOException; diff --git a/logstash-core/src/main/java/org/logstash/ackedqueue/ext/JrubyAckedQueueMemoryExtLibrary.java b/logstash-core/src/main/java/org/logstash/ackedqueue/ext/JrubyAckedQueueMemoryExtLibrary.java index cd53cb0e8..25fb10aca 100644 --- a/logstash-core/src/main/java/org/logstash/ackedqueue/ext/JrubyAckedQueueMemoryExtLibrary.java +++ b/logstash-core/src/main/java/org/logstash/ackedqueue/ext/JrubyAckedQueueMemoryExtLibrary.java @@ -19,10 +19,10 @@ import org.logstash.ackedqueue.Batch; import org.logstash.ackedqueue.MemorySettings; import org.logstash.ackedqueue.Queue; import org.logstash.ackedqueue.Settings; -import org.logstash.common.io.ByteBufferPageIO; -import org.logstash.common.io.CheckpointIOFactory; -import org.logstash.common.io.MemoryCheckpointIO; -import org.logstash.common.io.PageIOFactory; +import org.logstash.ackedqueue.io.ByteBufferPageIO; +import org.logstash.ackedqueue.io.CheckpointIOFactory; +import org.logstash.ackedqueue.io.MemoryCheckpointIO; +import org.logstash.ackedqueue.io.PageIOFactory; import java.io.IOException; diff --git a/logstash-core/src/main/java/org/logstash/common/io/AbstractByteBufferPageIO.java b/logstash-core/src/main/java/org/logstash/ackedqueue/io/AbstractByteBufferPageIO.java similarity index 99% rename from logstash-core/src/main/java/org/logstash/common/io/AbstractByteBufferPageIO.java rename to logstash-core/src/main/java/org/logstash/ackedqueue/io/AbstractByteBufferPageIO.java index 9c927b4e6..811522c8d 100644 --- a/logstash-core/src/main/java/org/logstash/common/io/AbstractByteBufferPageIO.java +++ b/logstash-core/src/main/java/org/logstash/ackedqueue/io/AbstractByteBufferPageIO.java @@ -1,4 +1,4 @@ -package org.logstash.common.io; +package org.logstash.ackedqueue.io; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/logstash-core/src/main/java/org/logstash/common/io/ByteBufferPageIO.java b/logstash-core/src/main/java/org/logstash/ackedqueue/io/ByteBufferPageIO.java similarity index 97% rename from logstash-core/src/main/java/org/logstash/common/io/ByteBufferPageIO.java rename to logstash-core/src/main/java/org/logstash/ackedqueue/io/ByteBufferPageIO.java index 28b17f34e..374810222 100644 --- a/logstash-core/src/main/java/org/logstash/common/io/ByteBufferPageIO.java +++ b/logstash-core/src/main/java/org/logstash/ackedqueue/io/ByteBufferPageIO.java @@ -1,4 +1,4 @@ -package org.logstash.common.io; +package org.logstash.ackedqueue.io; import java.io.IOException; import java.nio.ByteBuffer; diff --git a/logstash-core/src/main/java/org/logstash/common/io/CheckpointIO.java b/logstash-core/src/main/java/org/logstash/ackedqueue/io/CheckpointIO.java similarity index 95% rename from logstash-core/src/main/java/org/logstash/common/io/CheckpointIO.java rename to logstash-core/src/main/java/org/logstash/ackedqueue/io/CheckpointIO.java index 8b9abc102..e60f91273 100644 --- a/logstash-core/src/main/java/org/logstash/common/io/CheckpointIO.java +++ b/logstash-core/src/main/java/org/logstash/ackedqueue/io/CheckpointIO.java @@ -1,4 +1,4 @@ -package org.logstash.common.io; +package org.logstash.ackedqueue.io; import org.logstash.ackedqueue.Checkpoint; import java.io.IOException; diff --git a/logstash-core/src/main/java/org/logstash/common/io/CheckpointIOFactory.java b/logstash-core/src/main/java/org/logstash/ackedqueue/io/CheckpointIOFactory.java similarity index 74% rename from logstash-core/src/main/java/org/logstash/common/io/CheckpointIOFactory.java rename to logstash-core/src/main/java/org/logstash/ackedqueue/io/CheckpointIOFactory.java index 574ca42d3..b3e43aaf8 100644 --- a/logstash-core/src/main/java/org/logstash/common/io/CheckpointIOFactory.java +++ b/logstash-core/src/main/java/org/logstash/ackedqueue/io/CheckpointIOFactory.java @@ -1,4 +1,4 @@ -package org.logstash.common.io; +package org.logstash.ackedqueue.io; @FunctionalInterface public interface CheckpointIOFactory { diff --git a/logstash-core/src/main/java/org/logstash/common/io/FileCheckpointIO.java b/logstash-core/src/main/java/org/logstash/ackedqueue/io/FileCheckpointIO.java similarity index 94% rename from logstash-core/src/main/java/org/logstash/common/io/FileCheckpointIO.java rename to logstash-core/src/main/java/org/logstash/ackedqueue/io/FileCheckpointIO.java index ef32c4aa8..d51cefe6a 100644 --- a/logstash-core/src/main/java/org/logstash/common/io/FileCheckpointIO.java +++ b/logstash-core/src/main/java/org/logstash/ackedqueue/io/FileCheckpointIO.java @@ -1,6 +1,10 @@ -package org.logstash.common.io; +package org.logstash.ackedqueue.io; import org.logstash.ackedqueue.Checkpoint; +import org.logstash.common.io.BufferedChecksumStreamInput; +import org.logstash.common.io.BufferedChecksumStreamOutput; +import org.logstash.common.io.ByteArrayStreamOutput; +import org.logstash.common.io.InputStreamStreamInput; import java.io.IOException; import java.io.InputStream; diff --git a/logstash-core/src/main/java/org/logstash/common/io/MemoryCheckpointIO.java b/logstash-core/src/main/java/org/logstash/ackedqueue/io/MemoryCheckpointIO.java similarity index 98% rename from logstash-core/src/main/java/org/logstash/common/io/MemoryCheckpointIO.java rename to logstash-core/src/main/java/org/logstash/ackedqueue/io/MemoryCheckpointIO.java index 3b67ada89..681ec9a75 100644 --- a/logstash-core/src/main/java/org/logstash/common/io/MemoryCheckpointIO.java +++ b/logstash-core/src/main/java/org/logstash/ackedqueue/io/MemoryCheckpointIO.java @@ -1,4 +1,4 @@ -package org.logstash.common.io; +package org.logstash.ackedqueue.io; import org.logstash.ackedqueue.Checkpoint; diff --git a/logstash-core/src/main/java/org/logstash/common/io/MmapPageIO.java b/logstash-core/src/main/java/org/logstash/ackedqueue/io/MmapPageIO.java similarity index 99% rename from logstash-core/src/main/java/org/logstash/common/io/MmapPageIO.java rename to logstash-core/src/main/java/org/logstash/ackedqueue/io/MmapPageIO.java index 7287f9e1d..931d642c2 100644 --- a/logstash-core/src/main/java/org/logstash/common/io/MmapPageIO.java +++ b/logstash-core/src/main/java/org/logstash/ackedqueue/io/MmapPageIO.java @@ -1,4 +1,4 @@ -package org.logstash.common.io; +package org.logstash.ackedqueue.io; import sun.misc.Cleaner; import sun.nio.ch.DirectBuffer; diff --git a/logstash-core/src/main/java/org/logstash/common/io/PageIO.java b/logstash-core/src/main/java/org/logstash/ackedqueue/io/PageIO.java similarity index 98% rename from logstash-core/src/main/java/org/logstash/common/io/PageIO.java rename to logstash-core/src/main/java/org/logstash/ackedqueue/io/PageIO.java index 129bc433c..f76341e5d 100644 --- a/logstash-core/src/main/java/org/logstash/common/io/PageIO.java +++ b/logstash-core/src/main/java/org/logstash/ackedqueue/io/PageIO.java @@ -1,4 +1,4 @@ -package org.logstash.common.io; +package org.logstash.ackedqueue.io; import org.logstash.ackedqueue.SequencedList; diff --git a/logstash-core/src/main/java/org/logstash/common/io/PageIOFactory.java b/logstash-core/src/main/java/org/logstash/ackedqueue/io/PageIOFactory.java similarity index 82% rename from logstash-core/src/main/java/org/logstash/common/io/PageIOFactory.java rename to logstash-core/src/main/java/org/logstash/ackedqueue/io/PageIOFactory.java index ca9d7fa20..dffe219b9 100644 --- a/logstash-core/src/main/java/org/logstash/common/io/PageIOFactory.java +++ b/logstash-core/src/main/java/org/logstash/ackedqueue/io/PageIOFactory.java @@ -1,4 +1,4 @@ -package org.logstash.common.io; +package org.logstash.ackedqueue.io; import java.io.IOException; diff --git a/logstash-core/src/main/java/org/logstash/common/io/wip/MemoryPageIOStream.java b/logstash-core/src/main/java/org/logstash/ackedqueue/io/wip/MemoryPageIOStream.java similarity index 99% rename from logstash-core/src/main/java/org/logstash/common/io/wip/MemoryPageIOStream.java rename to logstash-core/src/main/java/org/logstash/ackedqueue/io/wip/MemoryPageIOStream.java index 57ef1388b..62221c3b2 100644 --- a/logstash-core/src/main/java/org/logstash/common/io/wip/MemoryPageIOStream.java +++ b/logstash-core/src/main/java/org/logstash/ackedqueue/io/wip/MemoryPageIOStream.java @@ -1,4 +1,4 @@ -package org.logstash.common.io.wip; +package org.logstash.ackedqueue.io.wip; import org.logstash.ackedqueue.Checkpoint; import org.logstash.ackedqueue.SequencedList; @@ -6,7 +6,7 @@ import org.logstash.common.io.BufferedChecksumStreamInput; import org.logstash.common.io.BufferedChecksumStreamOutput; import org.logstash.common.io.ByteArrayStreamOutput; import org.logstash.common.io.ByteBufferStreamInput; -import org.logstash.common.io.PageIO; +import org.logstash.ackedqueue.io.PageIO; import java.io.IOException; import java.nio.ByteBuffer; diff --git a/logstash-core/src/test/java/org/logstash/ackedqueue/HeadPageTest.java b/logstash-core/src/test/java/org/logstash/ackedqueue/HeadPageTest.java index 270664fab..9fca039f1 100644 --- a/logstash-core/src/test/java/org/logstash/ackedqueue/HeadPageTest.java +++ b/logstash-core/src/test/java/org/logstash/ackedqueue/HeadPageTest.java @@ -1,8 +1,8 @@ package org.logstash.ackedqueue; import org.junit.Test; -import org.logstash.common.io.ByteBufferPageIO; -import org.logstash.common.io.PageIO; +import org.logstash.ackedqueue.io.ByteBufferPageIO; +import org.logstash.ackedqueue.io.PageIO; import java.io.IOException; diff --git a/logstash-core/src/test/java/org/logstash/ackedqueue/QueueTest.java b/logstash-core/src/test/java/org/logstash/ackedqueue/QueueTest.java index 42b40758b..c34464e12 100644 --- a/logstash-core/src/test/java/org/logstash/ackedqueue/QueueTest.java +++ b/logstash-core/src/test/java/org/logstash/ackedqueue/QueueTest.java @@ -5,7 +5,7 @@ import org.junit.Rule; import org.junit.Test; import static org.junit.Assert.fail; import org.junit.rules.TemporaryFolder; -import org.logstash.common.io.ByteBufferPageIO; +import org.logstash.ackedqueue.io.ByteBufferPageIO; import java.io.IOException; import java.nio.file.NoSuchFileException; diff --git a/logstash-core/src/test/java/org/logstash/ackedqueue/TestSettings.java b/logstash-core/src/test/java/org/logstash/ackedqueue/TestSettings.java index ccc7066ab..ada4c80c6 100644 --- a/logstash-core/src/test/java/org/logstash/ackedqueue/TestSettings.java +++ b/logstash-core/src/test/java/org/logstash/ackedqueue/TestSettings.java @@ -1,11 +1,11 @@ package org.logstash.ackedqueue; -import org.logstash.common.io.ByteBufferPageIO; -import org.logstash.common.io.CheckpointIOFactory; -import org.logstash.common.io.FileCheckpointIO; -import org.logstash.common.io.MemoryCheckpointIO; -import org.logstash.common.io.MmapPageIO; -import org.logstash.common.io.PageIOFactory; +import org.logstash.ackedqueue.io.ByteBufferPageIO; +import org.logstash.ackedqueue.io.CheckpointIOFactory; +import org.logstash.ackedqueue.io.FileCheckpointIO; +import org.logstash.ackedqueue.io.MemoryCheckpointIO; +import org.logstash.ackedqueue.io.MmapPageIO; +import org.logstash.ackedqueue.io.PageIOFactory; public class TestSettings { diff --git a/logstash-core/src/test/java/org/logstash/common/io/ByteBufferPageIOTest.java b/logstash-core/src/test/java/org/logstash/ackedqueue/io/ByteBufferPageIOTest.java similarity index 98% rename from logstash-core/src/test/java/org/logstash/common/io/ByteBufferPageIOTest.java rename to logstash-core/src/test/java/org/logstash/ackedqueue/io/ByteBufferPageIOTest.java index 4c14edbe2..0a356cb7c 100644 --- a/logstash-core/src/test/java/org/logstash/common/io/ByteBufferPageIOTest.java +++ b/logstash-core/src/test/java/org/logstash/ackedqueue/io/ByteBufferPageIOTest.java @@ -1,4 +1,4 @@ -package org.logstash.common.io; +package org.logstash.ackedqueue.io; import org.junit.Test; import org.junit.runner.RunWith; @@ -8,10 +8,10 @@ import org.junit.runners.Parameterized.Parameters; import org.logstash.ackedqueue.Queueable; import org.logstash.ackedqueue.SequencedList; import org.logstash.ackedqueue.StringElement; +import org.logstash.ackedqueue.io.AbstractByteBufferPageIO; +import org.logstash.ackedqueue.io.ByteBufferPageIO; import java.io.IOException; -import java.io.UncheckedIOException; -import java.util.ArrayList; import java.util.Arrays; import java.util.Collection; import java.util.List; diff --git a/logstash-core/src/test/java/org/logstash/common/io/FileCheckpointIOTest.java b/logstash-core/src/test/java/org/logstash/ackedqueue/io/FileCheckpointIOTest.java similarity index 92% rename from logstash-core/src/test/java/org/logstash/common/io/FileCheckpointIOTest.java rename to logstash-core/src/test/java/org/logstash/ackedqueue/io/FileCheckpointIOTest.java index d962bcfa4..a6a6455a7 100644 --- a/logstash-core/src/test/java/org/logstash/common/io/FileCheckpointIOTest.java +++ b/logstash-core/src/test/java/org/logstash/ackedqueue/io/FileCheckpointIOTest.java @@ -1,10 +1,12 @@ -package org.logstash.common.io; +package org.logstash.ackedqueue.io; import org.junit.Before; import org.junit.Rule; import org.junit.Test; import org.junit.rules.TemporaryFolder; import org.logstash.ackedqueue.Checkpoint; +import org.logstash.ackedqueue.io.CheckpointIO; +import org.logstash.ackedqueue.io.FileCheckpointIO; import java.net.URL; import java.nio.file.Files; diff --git a/logstash-core/src/test/java/org/logstash/common/io/FileMmapIOTest.java b/logstash-core/src/test/java/org/logstash/ackedqueue/io/FileMmapIOTest.java similarity index 95% rename from logstash-core/src/test/java/org/logstash/common/io/FileMmapIOTest.java rename to logstash-core/src/test/java/org/logstash/ackedqueue/io/FileMmapIOTest.java index 01bcfe6a4..fbc7db370 100644 --- a/logstash-core/src/test/java/org/logstash/common/io/FileMmapIOTest.java +++ b/logstash-core/src/test/java/org/logstash/ackedqueue/io/FileMmapIOTest.java @@ -1,4 +1,4 @@ -package org.logstash.common.io; +package org.logstash.ackedqueue.io; import org.junit.Before; import org.junit.Rule; @@ -6,6 +6,7 @@ import org.junit.Test; import org.junit.rules.TemporaryFolder; import org.logstash.ackedqueue.SequencedList; import org.logstash.ackedqueue.StringElement; +import org.logstash.ackedqueue.io.MmapPageIO; import java.util.ArrayList; import java.util.List; diff --git a/logstash-core/src/test/java/org/logstash/common/io/MemoryCheckpointTest.java b/logstash-core/src/test/java/org/logstash/ackedqueue/io/MemoryCheckpointTest.java similarity index 93% rename from logstash-core/src/test/java/org/logstash/common/io/MemoryCheckpointTest.java rename to logstash-core/src/test/java/org/logstash/ackedqueue/io/MemoryCheckpointTest.java index 8961b47c9..a2bcd9b41 100644 --- a/logstash-core/src/test/java/org/logstash/common/io/MemoryCheckpointTest.java +++ b/logstash-core/src/test/java/org/logstash/ackedqueue/io/MemoryCheckpointTest.java @@ -1,4 +1,4 @@ -package org.logstash.common.io; +package org.logstash.ackedqueue.io; import org.junit.Before; import org.junit.Test; @@ -6,6 +6,9 @@ import static org.junit.Assert.fail; import org.logstash.ackedqueue.Checkpoint; import org.logstash.ackedqueue.MemorySettings; import org.logstash.ackedqueue.Settings; +import org.logstash.ackedqueue.io.CheckpointIO; +import org.logstash.ackedqueue.io.CheckpointIOFactory; +import org.logstash.ackedqueue.io.MemoryCheckpointIO; import java.io.IOException; import java.nio.file.NoSuchFileException; diff --git a/logstash-core/src/test/java/org/logstash/common/io/wip/MemoryPageIOStreamTest.java b/logstash-core/src/test/java/org/logstash/ackedqueue/io/wip/MemoryPageIOStreamTest.java similarity index 98% rename from logstash-core/src/test/java/org/logstash/common/io/wip/MemoryPageIOStreamTest.java rename to logstash-core/src/test/java/org/logstash/ackedqueue/io/wip/MemoryPageIOStreamTest.java index 363de4149..7b3a63b6a 100644 --- a/logstash-core/src/test/java/org/logstash/common/io/wip/MemoryPageIOStreamTest.java +++ b/logstash-core/src/test/java/org/logstash/ackedqueue/io/wip/MemoryPageIOStreamTest.java @@ -1,10 +1,10 @@ -package org.logstash.common.io.wip; +package org.logstash.ackedqueue.io.wip; import org.junit.Test; import org.logstash.ackedqueue.Queueable; import org.logstash.ackedqueue.SequencedList; import org.logstash.ackedqueue.StringElement; -import org.logstash.common.io.wip.MemoryPageIOStream; +import org.logstash.ackedqueue.io.wip.MemoryPageIOStream; import java.io.IOException; import java.nio.ByteBuffer; diff --git a/logstash-core/src/test/java/org/logstash/stress/Concurrent.java b/logstash-core/src/test/java/org/logstash/stress/Concurrent.java index aa8c01897..68c0d5168 100644 --- a/logstash-core/src/test/java/org/logstash/stress/Concurrent.java +++ b/logstash-core/src/test/java/org/logstash/stress/Concurrent.java @@ -1,7 +1,12 @@ package org.logstash.stress; import org.logstash.ackedqueue.*; -import org.logstash.common.io.*; +import org.logstash.ackedqueue.io.ByteBufferPageIO; +import org.logstash.ackedqueue.io.CheckpointIOFactory; +import org.logstash.ackedqueue.io.FileCheckpointIO; +import org.logstash.ackedqueue.io.MemoryCheckpointIO; +import org.logstash.ackedqueue.io.MmapPageIO; +import org.logstash.ackedqueue.io.PageIOFactory; import java.io.IOException; import java.time.Duration; diff --git a/logstash-core/src/test/resources/org/logstash/common/io/checkpoint.head b/logstash-core/src/test/resources/org/logstash/ackedqueue/io/checkpoint.head similarity index 100% rename from logstash-core/src/test/resources/org/logstash/common/io/checkpoint.head rename to logstash-core/src/test/resources/org/logstash/ackedqueue/io/checkpoint.head