external package renamed to tools

core/src/main/java/jayo/internal/BaseByteString.java

@@ -40,10 +40,10 @@
 import java.util.Arrays;
 import java.util.Objects;
 
-import static jayo.external.JayoUtils.checkOffsetAndCount;
 import static jayo.internal.UnsafeUtils.*;
 import static jayo.internal.Utils.HEX_DIGIT_CHARS;
 import static jayo.internal.Utils.arrayRangeEquals;
+import static jayo.tools.JayoUtils.checkOffsetAndCount;
 
 public sealed class BaseByteString implements ByteString permits RealUtf8, SegmentedByteString {
     @Serial

core/src/main/java/jayo/internal/DeflaterRawWriter.java

@@ -31,8 +31,8 @@
 import java.util.Objects;
 import java.util.zip.Deflater;
 
-import static jayo.external.JayoUtils.checkOffsetAndCount;
 import static jayo.internal.WriterSegmentQueue.newWriterSegmentQueue;
+import static jayo.tools.JayoUtils.checkOffsetAndCount;
 
 public final class DeflaterRawWriter implements RawWriter {
     private final @NonNull WriterSegmentQueue segmentQueue;

core/src/main/java/jayo/internal/GatheringByteChannelRawWriter.java

@@ -9,7 +9,7 @@
 import jayo.JayoClosedResourceException;
 import jayo.JayoException;
 import jayo.RawWriter;
-import jayo.external.CancelToken;
+import jayo.tools.CancelToken;
 import org.jspecify.annotations.NonNull;
 import org.jspecify.annotations.Nullable;
 
@@ -20,8 +20,8 @@
 import java.util.Objects;
 
 import static java.lang.System.Logger.Level.TRACE;
-import static jayo.external.JayoUtils.checkOffsetAndCount;
 import static jayo.internal.RealAsyncTimeout.TIMEOUT_WRITE_SIZE;
+import static jayo.tools.JayoUtils.checkOffsetAndCount;
 
 public final class GatheringByteChannelRawWriter implements RawWriter {
     private static final System.Logger LOGGER = System.getLogger("jayo.ScatteringByteChannelRawWriter");

core/src/main/java/jayo/internal/InputStreamRawReader.java

@@ -24,7 +24,7 @@
 import jayo.Buffer;
 import jayo.JayoException;
 import jayo.RawReader;
-import jayo.external.CancelToken;
+import jayo.tools.CancelToken;
 import org.jspecify.annotations.NonNull;
 
 import java.io.IOException;

core/src/main/java/jayo/internal/OutputStreamRawWriter.java

@@ -24,7 +24,7 @@
 import jayo.Buffer;
 import jayo.JayoException;
 import jayo.RawWriter;
-import jayo.external.CancelToken;
+import jayo.tools.CancelToken;
 import org.jspecify.annotations.NonNull;
 
 import java.io.FileOutputStream;
@@ -33,7 +33,7 @@
 import java.util.Objects;
 
 import static java.lang.System.Logger.Level.TRACE;
-import static jayo.external.JayoUtils.checkOffsetAndCount;
+import static jayo.tools.JayoUtils.checkOffsetAndCount;
 
 public final class OutputStreamRawWriter implements RawWriter {
     private static final System.Logger LOGGER = System.getLogger("jayo.OutputStreamRawWriter");

core/src/main/java/jayo/internal/ReadableByteChannelRawReader.java

@@ -8,7 +8,7 @@
 import jayo.Buffer;
 import jayo.JayoException;
 import jayo.RawReader;
-import jayo.external.CancelToken;
+import jayo.tools.CancelToken;
 import org.jspecify.annotations.NonNull;
 
 import java.io.IOException;

core/src/main/java/jayo/internal/RealAsyncTimeout.java

@@ -22,7 +22,7 @@
 package jayo.internal;
 
 import jayo.*;
-import jayo.external.AsyncTimeout;
+import jayo.tools.AsyncTimeout;
 import org.jspecify.annotations.NonNull;
 import org.jspecify.annotations.Nullable;
 
@@ -34,7 +34,7 @@
 import java.util.concurrent.locks.ReentrantLock;
 import java.util.function.Supplier;
 
-import static jayo.external.JayoUtils.checkOffsetAndCount;
+import static jayo.tools.JayoUtils.checkOffsetAndCount;
 
 /**
  * This timeout uses a background watchdog thread to take action exactly when the timeout occurs. Use this to implement

core/src/main/java/jayo/internal/RealBuffer.java

@@ -46,12 +46,12 @@
 import java.util.function.BiFunction;
 
 import static java.lang.System.Logger.Level.TRACE;
-import static jayo.external.JayoUtils.checkOffsetAndCount;
 import static jayo.internal.Segment.TRANSFERRING;
 import static jayo.internal.Segment.WRITING;
 import static jayo.internal.UnsafeUtils.*;
 import static jayo.internal.Utf8Utils.UTF8_REPLACEMENT_CODE_POINT;
 import static jayo.internal.Utils.*;
+import static jayo.tools.JayoUtils.checkOffsetAndCount;
 
 
 public final class RealBuffer implements Buffer {

core/src/main/java/jayo/internal/RealByteString.java

@@ -36,10 +36,10 @@
 import java.util.Arrays;
 import java.util.Objects;
 
-import static jayo.external.JayoUtils.checkOffsetAndCount;
 import static jayo.internal.BaseByteString.*;
 import static jayo.internal.UnsafeUtils.noCopyStringFromLatin1Bytes;
 import static jayo.internal.Utils.HEX_DIGIT_CHARS;
+import static jayo.tools.JayoUtils.checkOffsetAndCount;
 
 public final /*Valhalla 'primitive class' or at least 'value class'*/ class RealByteString implements ByteString {
     @Serial

core/src/main/java/jayo/internal/RealCancelToken.java

@@ -24,7 +24,7 @@
 import jayo.CancelScope;
 import jayo.JayoInterruptedIOException;
 import jayo.JayoTimeoutException;
-import jayo.external.CancelToken;
+import jayo.tools.CancelToken;
 import org.jspecify.annotations.NonNull;
 
 import java.util.Objects;

core/src/main/java/jayo/internal/RealInflaterRawReader.java

@@ -23,7 +23,7 @@
 package jayo.internal;
 
 import jayo.*;
-import jayo.external.CancelToken;
+import jayo.tools.CancelToken;
 import org.jspecify.annotations.NonNull;
 import org.jspecify.annotations.Nullable;
 

core/src/main/java/jayo/internal/RealReader.java

@@ -34,9 +34,9 @@
 import java.nio.charset.Charset;
 import java.util.Objects;
 
-import static jayo.external.JayoUtils.checkOffsetAndCount;
 import static jayo.internal.ReaderSegmentQueue.newReaderSegmentQueue;
 import static jayo.internal.ReaderSegmentQueue.newSyncReaderSegmentQueue;
+import static jayo.tools.JayoUtils.checkOffsetAndCount;
 
 public final class RealReader implements Reader {
     private static final long INTEGER_MAX_PLUS_1 = (long) Integer.MAX_VALUE + 1;

core/src/main/java/jayo/internal/RealTlsEndpoint.java

@@ -34,8 +34,8 @@
 
 import static java.lang.System.Logger.Level.DEBUG;
 import static java.lang.System.Logger.Level.TRACE;
-import static jayo.external.JayoUtils.checkOffsetAndCount;
 import static jayo.internal.WriterSegmentQueue.newWriterSegmentQueue;
+import static jayo.tools.JayoUtils.checkOffsetAndCount;
 
 public final class RealTlsEndpoint {
     private static final System.Logger LOGGER = System.getLogger("jayo.tls.TlsEndpoint");

core/src/main/java/jayo/internal/SegmentedByteString.java

@@ -34,8 +34,8 @@
 import java.util.Arrays;
 import java.util.Objects;
 
-import static jayo.external.JayoUtils.checkOffsetAndCount;
 import static jayo.internal.Utils.arrayRangeEquals;
+import static jayo.tools.JayoUtils.checkOffsetAndCount;
 
 /**
  * An immutable byte string composed of segments. This class exists to implement

core/src/main/java/jayo/internal/SinglyLinkedBasicFifoQueue.java

@@ -5,7 +5,7 @@
 
 package jayo.internal;
 
-import jayo.external.BasicFifoQueue;
+import jayo.tools.BasicFifoQueue;
 import org.jspecify.annotations.NonNull;
 import org.jspecify.annotations.Nullable;
 

core/src/main/java/jayo/internal/WritableByteChannelRawWriter.java

@@ -8,7 +8,7 @@
 import jayo.Buffer;
 import jayo.JayoException;
 import jayo.RawWriter;
-import jayo.external.CancelToken;
+import jayo.tools.CancelToken;
 import org.jspecify.annotations.NonNull;
 
 import java.io.IOException;
@@ -17,7 +17,7 @@
 import java.util.Objects;
 
 import static java.lang.System.Logger.Level.TRACE;
-import static jayo.external.JayoUtils.checkOffsetAndCount;
+import static jayo.tools.JayoUtils.checkOffsetAndCount;
 
 public final class WritableByteChannelRawWriter implements RawWriter {
     private static final System.Logger LOGGER = System.getLogger("jayo.WritableByteChannelRawWriter");

core/src/main/java/jayo/internal/scheduling/RealTaskQueue.java

@@ -22,9 +22,9 @@
 package jayo.internal.scheduling;
 
 import jayo.Jayo;
-import jayo.external.BasicFifoQueue;
 import jayo.scheduling.ScheduledTaskQueue;
 import jayo.scheduling.TaskQueue;
+import jayo.tools.BasicFifoQueue;
 import org.jspecify.annotations.NonNull;
 import org.jspecify.annotations.Nullable;
 
@@ -35,8 +35,8 @@
 import java.util.concurrent.RejectedExecutionException;
 import java.util.function.LongSupplier;
 
-import static jayo.external.JayoUtils.removePrefix;
 import static jayo.internal.scheduling.TaskLogger.formatDuration;
+import static jayo.tools.JayoUtils.removePrefix;
 
 public sealed abstract class RealTaskQueue<T extends Task<T>> implements TaskQueue {
     /**

core/src/main/java/jayo/internal/scheduling/RealTaskRunner.java

@@ -21,8 +21,8 @@
 
 package jayo.internal.scheduling;
 
-import jayo.external.BasicFifoQueue;
 import jayo.scheduling.TaskRunner;
+import jayo.tools.BasicFifoQueue;
 import org.jspecify.annotations.NonNull;
 
 import java.util.PriorityQueue;

core/src/main/java/jayo/internal/tls/InsecureExtendedTrustManager.java

@@ -21,7 +21,7 @@
 
 package jayo.internal.tls;
 
-import jayo.external.JayoUtils;
+import jayo.tools.JayoUtils;
 import org.jspecify.annotations.NonNull;
 
 import javax.net.ssl.SSLEngine;

core/src/main/java/jayo/external/AsyncTimeout.java → core/src/main/java/jayo/tools/AsyncTimeout.java

@@ -19,7 +19,7 @@
  * limitations under the License.
  */
 
-package jayo.external;
+package jayo.tools;
 
 import jayo.CancelScope;
 import jayo.JayoInterruptedIOException;
@@ -74,15 +74,15 @@ public sealed interface AsyncTimeout permits RealAsyncTimeout {
     <T> T withTimeout(final @NonNull CancelScope cancelScope, final @NonNull Supplier<T> block);
 
     /**
-     * @param writer              the delegate writer.
+     * @param writer the delegate writer.
      * @return a new writer that delegates to {@code writer}, using this to implement timeouts. If a timeout occurs, the
      * {@code onTimeout} code block declared in {@link #create(Runnable)} will execute.
      */
     @NonNull
     RawWriter writer(final @NonNull RawWriter writer);
 
     /**
-     * @param reader              the delegate reader.
+     * @param reader the delegate reader.
      * @return a new reader that delegates to {@code reader}, using this to implement timeouts. If a timeout occurs, the
      * {@code onTimeout} code block declared in {@link #create(Runnable)} will execute.
      */

core/src/main/java/jayo/external/BasicFifoQueue.java → core/src/main/java/jayo/tools/BasicFifoQueue.java

@@ -3,7 +3,7 @@
  * Use of this source code is governed by the Apache 2.0 license.
  */
 
-package jayo.external;
+package jayo.tools;
 
 import jayo.internal.SinglyLinkedBasicFifoQueue;
 import org.jspecify.annotations.NonNull;

core/src/main/java/jayo/external/CancelToken.java → core/src/main/java/jayo/tools/CancelToken.java

@@ -3,7 +3,7 @@
  * Use of this source code is governed by the Apache 2.0 license.
  */
 
-package jayo.external;
+package jayo.tools;
 
 import jayo.JayoInterruptedIOException;
 import jayo.internal.CancellableUtils;

core/src/main/java/jayo/external/JayoUtils.java → core/src/main/java/jayo/tools/JayoUtils.java

@@ -19,7 +19,7 @@
  * limitations under the License.
  */
 
-package jayo.external;
+package jayo.tools;
 
 import org.jspecify.annotations.NonNull;
 

core/src/main/java/module-info.java

@@ -13,8 +13,8 @@
 
     exports jayo;
     exports jayo.crypto;
-    exports jayo.external;
     exports jayo.network;
     exports jayo.scheduling;
     exports jayo.tls;
+    exports jayo.tools;
 }

core/src/test/java/jayo/internal/AsyncTimeoutTest.java

@@ -22,7 +22,7 @@
 package jayo.internal;
 
 import jayo.Cancellable;
-import jayo.external.AsyncTimeout;
+import jayo.tools.AsyncTimeout;
 import org.junit.jupiter.api.Tag;
 import org.junit.jupiter.api.Test;
 
@@ -134,12 +134,12 @@ public void instancesAddedAtEnd() {
             Cancellable.run(Duration.ofMillis(75), cancelScope2 ->
                     Cancellable.run(Duration.ofMillis(50), cancelScope3 ->
                             Cancellable.run(Duration.ofMillis(25), cancelScope4 -> {
-                        try {
-                            Thread.sleep(125);
-                        } catch (InterruptedException e) {
-                            throw new RuntimeException(e);
-                        }
-                    })));
+                                try {
+                                    Thread.sleep(125);
+                                } catch (InterruptedException e) {
+                                    throw new RuntimeException(e);
+                                }
+                            })));
         });
         assertTrue(a.exit());
         assertTrue(b.exit());

core/src/test/kotlin/jayo/internal/AwaitMonitorTest.kt

@@ -21,11 +21,11 @@
 
 package jayo.internal
 
-import jayo.cancelScope
 import jayo.JayoInterruptedIOException
 import jayo.JayoTimeoutException
-import jayo.external.CancelToken
+import jayo.cancelScope
 import jayo.internal.TestUtil.assumeNotWindows
+import jayo.tools.CancelToken
 import org.assertj.core.api.Assertions.*
 import org.junit.jupiter.api.Tag
 import org.junit.jupiter.api.Test

core/src/test/kotlin/jayo/internal/AwaitSignalTest.kt

@@ -21,11 +21,11 @@
 
 package jayo.internal
 
-import jayo.cancelScope
 import jayo.JayoInterruptedIOException
 import jayo.JayoTimeoutException
-import jayo.external.CancelToken
+import jayo.cancelScope
 import jayo.internal.TestUtil.assumeNotWindows
+import jayo.tools.CancelToken
 import org.assertj.core.api.Assertions.*
 import org.junit.jupiter.api.Tag
 import org.junit.jupiter.api.Test

core/src/test/kotlin/jayo/internal/BasicFifoQueueTest.kt

@@ -1,8 +1,8 @@
 package jayo.internal
 
-import jayo.external.BasicFifoQueue
-import org.junit.jupiter.api.Test
+import jayo.tools.BasicFifoQueue
 import org.assertj.core.api.Assertions.assertThat
+import org.junit.jupiter.api.Test
 
 class BasicFifoQueueTest {
     @Test
@@ -12,7 +12,7 @@ class BasicFifoQueueTest {
         assertThat(queue.offer(2)).isFalse
         assertThat(queue.offer(3)).isFalse
     }
-    
+
     @Test
     fun testIterator() {
         val queue = BasicFifoQueue.create<Int>()

samples/src/main/java/jayo/samples/ByteChannelRawReader.java

@@ -25,7 +25,7 @@
 import jayo.JayoClosedResourceException;
 import jayo.JayoException;
 import jayo.RawReader;
-import jayo.external.CancelToken;
+import jayo.tools.CancelToken;
 import org.jspecify.annotations.NonNull;
 
 import java.io.IOException;

samples/src/main/java/jayo/samples/ByteChannelRawWriter.java

@@ -23,9 +23,9 @@
 
 import jayo.Buffer;
 import jayo.JayoClosedResourceException;
-import jayo.RawWriter;
 import jayo.JayoException;
-import jayo.external.CancelToken;
+import jayo.RawWriter;
+import jayo.tools.CancelToken;
 import org.jspecify.annotations.NonNull;
 
 import java.io.IOException;