upgrades and refactored package

.gitattributes

@@ -1,2 +1,2 @@
 *.sh text=auto eol=lf
-gordonmu-coio/src/test/resources/testfile.txt binary
+blachris-coio/src/test/resources/testfile.txt binary

.github/workflows/gradle.yml

@@ -9,10 +9,10 @@ jobs:
 
     steps:
       - uses: actions/checkout@v2
-      - name: Set up JDK 11
+      - name: Set up JDK 17
         uses: actions/setup-java@v1
         with:
-          java-version: 11
+          java-version: 17
       - name: Grant execute permission for gradlew
         run: chmod +x gradlew
       - name: Build with Gradle
@@ -21,4 +21,4 @@ jobs:
         if: ${{ failure() }}
         with:
           name: Test Results
-          path: gordonmu-coio/build/reports/tests/
+          path: blachris-coio/build/reports/tests/

README.md

@@ -1,5 +1,5 @@
-![Java CI](https://github.com/gordonmu/coio/workflows/Java%20CI/badge.svg)
- [ ![Download](https://api.bintray.com/packages/gordonmu/jvm/coio/images/download.svg) ](https://bintray.com/gordonmu/jvm/coio/_latestVersion)
+![Java CI](https://github.com/blachris/coio/workflows/Java%20CI/badge.svg)
+ [ ![Download](https://api.bintray.com/packages/blachris/jvm/coio/images/download.svg) ](https://bintray.com/blachris/jvm/coio/_latestVersion)
 
 # CoIO
 

blachris-coio-tls/build.gradle

@@ -0,0 +1,60 @@
+dependencies {
+    implementation project(":blachris-coio")
+    implementation group: 'org.jetbrains.kotlin', name: 'kotlin-stdlib-jdk8', version: "$kotlin_version"
+    implementation group: 'org.jetbrains.kotlinx', name: 'kotlinx-coroutines-core', version: "$kotlinxcoroutine_version"
+    implementation group: 'org.jetbrains.kotlinx', name: 'kotlinx-coroutines-jdk8', version: "$kotlinxcoroutine_version"
+    implementation group: 'io.github.microutils', name: 'kotlin-logging', version: "$kotlinlogging_version"
+    implementation group: 'org.slf4j', name: 'slf4j-api', version: "$slf4j_version"
+    implementation group: 'io.netty', name: 'netty-buffer', version: '4.1.99.Final'
+    implementation group: 'io.netty', name: 'netty-handler', version: '4.1.99.Final'
+    implementation group: 'com.github.marianobarrios', name: 'tls-channel', version: '0.4.0'
+    implementation group: 'io.netty', name: 'netty-tcnative-boringssl-static', version: "$tcnative_version"
+
+    testImplementation group: 'org.assertj', name: 'assertj-core', version: "$assertj_version"
+    testImplementation group: 'org.junit.jupiter', name: 'junit-jupiter-api', version: "$junit5_version"
+    testImplementation group: 'org.junit.jupiter', name: 'junit-jupiter-engine', version: "$junit5_version"
+    testImplementation group: 'org.apache.logging.log4j', name: 'log4j-slf4j-impl', version: "$log4jslf4j_version"
+    testImplementation group: 'io.mockk', name: 'mockk', version: "$mockk_version"
+    testImplementation group: 'org.awaitility', name: 'awaitility', version: "$awaitility_version"
+    testImplementation group: 'org.awaitility', name: 'awaitility-kotlin', version: "$awaitility_version"
+}
+
+publishing {
+    publications {
+        mavenJava(MavenPublication) {
+            from components.java
+            artifact sourcesJar {
+                archiveClassifier.set("sources")
+            }
+            artifact javadocJar {
+                archiveClassifier.set("javadoc")
+            }
+            groupId project.group
+            artifactId project.name
+            version project.version
+            pom(commonPom)
+            pom {
+                name = 'CoIO TLS Extension'
+                description = 'A CoIO extension to use TLS over any CoIOStream.'
+                url = 'https://github.com/blachris/coio'
+            }
+        }
+    }
+    repositories {
+        maven {
+            url "https://s01.oss.sonatype.org/service/local/staging/deploy/maven2"
+            credentials {
+                if (project.hasProperty('ossrhUsername') && project.hasProperty('ossrhPassword')) {
+                    username = ossrhUsername
+                    password = ossrhPassword
+                }
+            }
+        }
+    }
+}
+
+if (project.hasProperty('signing.keyId') && project.hasProperty('signing.password') && project.hasProperty('signing.secretKeyRingFile')) {
+    signing {
+        sign publishing.publications.mavenJava
+    }
+}

gordonmu-coio-tls/src/main/kotlin/com/github/gordonmu/coio/tls/CoIOTls.kt → blachris-coio-tls/src/main/kotlin/com/github/gordonmu/coio/tls/CoIOTls.kt

@@ -1,6 +1,6 @@
-package com.github.gordonmu.coio.tls
+package com.github.blachris.coio.tls
 
-import com.github.gordonmu.coio.CoIOStream
+import com.github.blachris.coio.CoIOStream
 import io.netty.buffer.ByteBufAllocator
 import io.netty.handler.ssl.SslContext
 import io.netty.handler.ssl.SslContextBuilder
@@ -40,7 +40,7 @@ fun CoIOStream.wrapTlsServer(keyCertChain: List<X509Certificate>,
  * @param trustedCerts a stream over a sequence of PEM encoded certificates
  */
 fun CoIOStream.wrapTlsClient(serverName: String,
-                             trustedCerts: InputStream): CoIOStream = wrapTlsClient(serverName, com.github.gordonmu.coio.tls.loadX509Certificates(trustedCerts))
+                             trustedCerts: InputStream): CoIOStream = wrapTlsClient(serverName, com.github.blachris.coio.tls.loadX509Certificates(trustedCerts))
 
 fun CoIOStream.wrapTlsClient(serverName: String,
                              trustedCerts: List<X509Certificate>): CoIOStream {
@@ -55,5 +55,5 @@ fun CoIOStream.wrapTlsClient(serverName: String,
 }
 
 fun CoIOStream.wrapTls(sslEngine: SSLEngine): CoIOStream {
-    return com.github.gordonmu.coio.tls.TlsChannelAdapter(sslEngine, this)
+    return com.github.blachris.coio.tls.TlsChannelAdapter(sslEngine, this)
 }

gordonmu-coio-tls/src/main/kotlin/com/github/gordonmu/coio/tls/TlsChannelAdapter.kt → blachris-coio-tls/src/main/kotlin/com/github/gordonmu/coio/tls/TlsChannelAdapter.kt

@@ -1,6 +1,6 @@
-package com.github.gordonmu.coio.tls
+package com.github.blachris.coio.tls
 
-import com.github.gordonmu.coio.*
+import com.github.blachris.coio.*
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.sync.Mutex
 import kotlinx.coroutines.sync.withLock

gordonmu-coio-tls/src/main/kotlin/com/github/gordonmu/coio/tls/TlsUtils.kt → blachris-coio-tls/src/main/kotlin/com/github/gordonmu/coio/tls/TlsUtils.kt

@@ -1,4 +1,4 @@
-package com.github.gordonmu.coio.tls
+package com.github.blachris.coio.tls
 
 import java.io.ByteArrayOutputStream
 import java.io.IOException

gordonmu-coio-tls/src/test/kotlin/NettySSLEngineTests.java → blachris-coio-tls/src/test/kotlin/NettySSLEngineTests.java

@@ -19,8 +19,8 @@
 
 public class NettySSLEngineTests {
 
-    private TrustManagerFactory dummyTrustManagerFacotory = new SimpleTrustManagerFactory() {
-        private TrustManager[] trustManagers = new TrustManager[]{new DummyTrustManager()};
+    private final TrustManagerFactory dummyTrustManagerFacotory = new SimpleTrustManagerFactory() {
+        private final TrustManager[] trustManagers = new TrustManager[]{new DummyTrustManager()};
 
         @Override
         protected void engineInit(KeyStore keyStore) throws Exception {
@@ -45,12 +45,10 @@ public void nettySSLEngineInitializationTest() throws IOException {
                 .build();
         SSLEngine sslEngine = ctx.newEngine(ByteBufAllocator.DEFAULT, "test", 0);
 
-        ClientTlsChannel chan = ClientTlsChannel.newBuilder(new DummyByteChannel(), sslEngine)
+        try (ClientTlsChannel chan = ClientTlsChannel.newBuilder(new DummyByteChannel(), sslEngine)
                 .withEncryptedBufferAllocator(new HeapBufferAllocator())
-                .build();
-
-        try {
-            chan.handshake();
+                .build()) {
+                chan.handshake();
         } catch (NeedsWriteException es) {
             // test passed, expected exception
         }

gordonmu-coio-tls/src/test/kotlin/TlsStreamTests.kt → blachris-coio-tls/src/test/kotlin/TlsStreamTests.kt

@@ -1,7 +1,7 @@
-import com.github.gordonmu.coio.CoIOMemoryStream
-import com.github.gordonmu.coio.tls.wrapTlsClient
-import com.github.gordonmu.coio.tls.wrapTlsServer
-import com.github.gordonmu.coio.writeFully
+import com.github.blachris.coio.CoIOMemoryStream
+import com.github.blachris.coio.tls.wrapTlsClient
+import com.github.blachris.coio.tls.wrapTlsServer
+import com.github.blachris.coio.writeFully
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.runBlocking
 import kotlinx.coroutines.withTimeout
@@ -26,8 +26,8 @@ class TlsStreamTests {
             withTimeout(10000) {
 
                 val serverStream = memStream.front.wrapTlsServer(
-                        clz.getResourceAsStream("testserver-cert.pem"),
-                        clz.getResourceAsStream("testserver-key_pkcs8.pem"))
+                        clz.getResourceAsStream("testserver-cert.pem")!!,
+                        clz.getResourceAsStream("testserver-key_pkcs8.pem")!!)
                 val clientStream = memStream.back.wrapTlsClient("testserver",
                         SequenceInputStream(
                                 clz.getResourceAsStream("testroot-cert.pem"),

blachris-coio/build.gradle

@@ -0,0 +1,57 @@
+dependencies {
+    implementation group: 'org.jetbrains.kotlin', name: 'kotlin-stdlib-jdk8', version: "$kotlin_version"
+    implementation group: 'org.jetbrains.kotlinx', name: 'kotlinx-coroutines-core', version: "$kotlinxcoroutine_version"
+    implementation group: 'org.jetbrains.kotlinx', name: 'kotlinx-coroutines-jdk8', version: "$kotlinxcoroutine_version"
+    implementation group: 'io.github.microutils', name: 'kotlin-logging', version: "$kotlinlogging_version"
+    implementation group: 'org.slf4j', name: 'slf4j-api', version: "$slf4j_version"
+
+    testImplementation group: 'org.assertj', name: 'assertj-core', version: "$assertj_version"
+    testImplementation group: 'org.junit.jupiter', name: 'junit-jupiter-api', version: "$junit5_version"
+    testImplementation group: 'org.junit.jupiter', name: 'junit-jupiter-engine', version: "$junit5_version"
+    testImplementation group: 'org.apache.logging.log4j', name: 'log4j-slf4j-impl', version: "$log4jslf4j_version"
+    testImplementation group: 'org.jetbrains.kotlinx', name: 'kotlinx-coroutines-test', version: "$kotlinxcoroutine_version"
+    testImplementation group: 'io.mockk', name: 'mockk', version: "$mockk_version"
+    testImplementation group: 'org.awaitility', name: 'awaitility', version: "$awaitility_version"
+    testImplementation group: 'org.awaitility', name: 'awaitility-kotlin', version: "$awaitility_version"
+}
+
+publishing {
+    publications {
+        mavenJava(MavenPublication) {
+            from components.java
+            artifact sourcesJar {
+                archiveClassifier.set("sources")
+            }
+            artifact javadocJar {
+                archiveClassifier.set("javadoc")
+            }
+            groupId project.group
+            artifactId project.name
+            version project.version
+            pom(commonPom)
+            pom {
+                name = 'Kotlin Coroutine IO Library'
+                description = 'A library for a simple coroutine IO API, wrapping efficient non-blocking Java IO libs for easy use.'
+                url = 'https://github.com/blachris/coio'
+            }
+        }
+    }
+    repositories {
+        maven {
+            url "https://s01.oss.sonatype.org/service/local/staging/deploy/maven2"
+            credentials {
+                if (project.hasProperty('ossrhUsername') && project.hasProperty('ossrhPassword')) {
+                    username = ossrhUsername
+                    password = ossrhPassword
+                }
+            }
+        }
+    }
+}
+
+if (project.hasProperty('signing.keyId') && project.hasProperty('signing.password') && project.hasProperty('signing.secretKeyRingFile')) {
+    signing {
+        sign publishing.publications.mavenJava
+    }
+}
+

gordonmu-coio/src/main/kotlin/com/github/gordonmu/coio/ByteBufferUtils.kt → blachris-coio/src/main/kotlin/com/github/gordonmu/coio/ByteBufferUtils.kt

@@ -1,4 +1,4 @@
-package com.github.gordonmu.coio
+package com.github.blachris.coio
 
 import java.nio.ByteBuffer
 
@@ -27,7 +27,7 @@ inline fun <R> ByteBuffer.withRemainingAtMost(maxRemaining: Long, block: ByteBuf
 }
 
 /**
- * Same as [put] but never fails because it only puts as much bytes from [src] as possible into this.
+ * Same as [ByteBuffer.put] but never fails because it only puts as many bytes from [src] as possible into this.
  */
 fun ByteBuffer.putPossible(src: ByteBuffer) {
     src.withRemainingAtMost(src.remaining()) {

gordonmu-coio/src/main/kotlin/com/github/gordonmu/coio/CoIO.kt → blachris-coio/src/main/kotlin/com/github/gordonmu/coio/CoIO.kt

@@ -1,4 +1,4 @@
-package com.github.gordonmu.coio
+package com.github.blachris.coio
 
 import java.io.IOException
 import java.net.SocketAddress

gordonmu-coio/src/main/kotlin/com/github/gordonmu/coio/CoIOChannel.kt → blachris-coio/src/main/kotlin/com/github/gordonmu/coio/CoIOChannel.kt

@@ -1,4 +1,4 @@
-package com.github.gordonmu.coio
+package com.github.blachris.coio
 
 import kotlinx.coroutines.channels.Channel
 import java.nio.ByteBuffer

gordonmu-coio/src/main/kotlin/com/github/gordonmu/coio/CoIOFile.kt → blachris-coio/src/main/kotlin/com/github/gordonmu/coio/CoIOFile.kt

@@ -1,4 +1,4 @@
-package com.github.gordonmu.coio
+package com.github.blachris.coio
 
 import java.nio.ByteBuffer
 import java.nio.channels.AsynchronousFileChannel

gordonmu-coio/src/main/kotlin/com/github/gordonmu/coio/CoIOMemoryStream.kt → blachris-coio/src/main/kotlin/com/github/gordonmu/coio/CoIOMemoryStream.kt

@@ -1,4 +1,4 @@
-package com.github.gordonmu.coio
+package com.github.blachris.coio
 
 class CoIOMemoryStream(channelCapacity: Int = 8) : AutoCloseable {
     val frontToBackChannel = CoIOChannel(channelCapacity)

gordonmu-coio/src/main/kotlin/com/github/gordonmu/coio/CoIOSelector.kt → blachris-coio/src/main/kotlin/com/github/gordonmu/coio/CoIOSelector.kt

@@ -1,4 +1,4 @@
-package com.github.gordonmu.coio
+package com.github.blachris.coio
 
 import java.nio.channels.ClosedSelectorException
 import java.nio.channels.SelectableChannel

gordonmu-coio/src/main/kotlin/com/github/gordonmu/coio/CoIOTcp.kt → blachris-coio/src/main/kotlin/com/github/gordonmu/coio/CoIOTcp.kt

@@ -1,9 +1,9 @@
-package com.github.gordonmu.coio
+package com.github.blachris.coio
 
 import kotlinx.coroutines.CancellableContinuation
 import kotlinx.coroutines.channels.Channel
 import kotlinx.coroutines.channels.ReceiveChannel
-import kotlinx.coroutines.channels.sendBlocking
+import kotlinx.coroutines.runBlocking
 import kotlinx.coroutines.suspendCancellableCoroutine
 import mu.KotlinLogging
 import java.io.IOException
@@ -18,13 +18,13 @@ private val logger = KotlinLogging.logger {}
 
 object CoIOTcp {
     /**
-     * Opens a TCP connection client to a remote host and returns a [CoIORemoteStream].
+     * Opens a TCP connection client to a remote host and returns a [RemoteCoIOStream].
      */
     suspend fun connect(host: String, remotePort: Int): RemoteCoIOStream =
             CoIO.DEFAULT_COIOSELECTOR.connectTcp(InetSocketAddress(host, remotePort))
 
     /**
-     * Opens a TCP connection client to a remote host and returns a [CoIORemoteStream].
+     * Opens a TCP connection client to a remote host and returns a [RemoteCoIOStream].
      */
     suspend fun connect(address: InetSocketAddress): RemoteCoIOStream =
             CoIO.DEFAULT_COIOSELECTOR.connectTcp(address)
@@ -70,7 +70,9 @@ fun CoIOSelector.listenTcp(socketAddress: SocketAddress): ReceiveChannel<RemoteC
     serverHandler.onAccept = { channel ->
         val handler = NioChannelHandler(channel.remoteAddress, channel, channel)
         registerChannel(channel, SelectionKey.OP_READ or SelectionKey.OP_WRITE, handler)
-        handlerChannel.sendBlocking(handler)
+        runBlocking {
+            handlerChannel.send(handler)
+        }
     }
     registerChannel(serverChannel, SelectionKey.OP_ACCEPT, serverHandler)
     handlerChannel.invokeOnClose { serverHandler.close() }

gordonmu-coio/src/main/kotlin/com/github/gordonmu/coio/CoIOUdp.kt → blachris-coio/src/main/kotlin/com/github/gordonmu/coio/CoIOUdp.kt

@@ -1,4 +1,4 @@
-package com.github.gordonmu.coio
+package com.github.blachris.coio
 
 import kotlinx.coroutines.CancellableContinuation
 import kotlinx.coroutines.suspendCancellableCoroutine

gordonmu-coio/src/main/kotlin/com/github/gordonmu/coio/CoIStreamAdapter.kt → blachris-coio/src/main/kotlin/com/github/gordonmu/coio/CoIStreamAdapter.kt

@@ -1,4 +1,4 @@
-package com.github.gordonmu.coio
+package com.github.blachris.coio
 
 import kotlinx.coroutines.runBlocking
 import java.io.IOException

gordonmu-coio/src/main/kotlin/com/github/gordonmu/coio/FileCache.kt → blachris-coio/src/main/kotlin/com/github/gordonmu/coio/FileCache.kt

@@ -1,4 +1,4 @@
-package com.github.gordonmu.coio
+package com.github.blachris.coio
 
 import kotlinx.coroutines.sync.Mutex
 import kotlinx.coroutines.sync.withLock

gordonmu-coio/src/main/kotlin/com/github/gordonmu/coio/PathTreeMap.kt → blachris-coio/src/main/kotlin/com/github/gordonmu/coio/PathTreeMap.kt

@@ -1,4 +1,4 @@
-package com.github.gordonmu.coio
+package com.github.blachris.coio
 
 import java.util.*
 

gordonmu-coio/src/main/kotlin/com/github/gordonmu/coio/PushbackCoInputStream.kt → blachris-coio/src/main/kotlin/com/github/gordonmu/coio/PushbackCoInputStream.kt

@@ -1,4 +1,4 @@
-package com.github.gordonmu.coio
+package com.github.blachris.coio
 
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.flow
@@ -129,7 +129,7 @@ class PushbackCoIPort(private val inputPort: CoIPort) : CoIPort {
 private class ByteBufferSequenceStream(buffers: Collection<ByteBuffer>) : InputStream() {
 
     // invariant: all buffers have remaining bytes
-    private val seq = LinkedList<ByteBuffer>(buffers)
+    private val seq = LinkedList(buffers)
 
     override fun read(): Int {
         if (seq.isEmpty())
@@ -153,7 +153,7 @@ private class ByteBufferSequenceStream(buffers: Collection<ByteBuffer>) : InputS
     }
 }
 
-fun CoIPort.readSeparated(separator: Byte = '\n'.toByte()): Flow<InputStream> = flow {
+fun CoIPort.readSeparated(separator: Byte = '\n'.code.toByte()): Flow<InputStream> = flow {
     val pbport = PushbackCoIPort(this@readSeparated)
     val res = LinkedList<ByteBuffer>()
     while (true) {

gordonmu-coio/src/test/kotlin/FileTests.kt → blachris-coio/src/test/kotlin/FileTests.kt

@@ -1,4 +1,4 @@
-import com.github.gordonmu.coio.*
+import com.github.blachris.coio.*
 import kotlinx.coroutines.flow.count
 import kotlinx.coroutines.runBlocking
 import org.assertj.core.api.Assertions.assertThat
@@ -110,7 +110,7 @@ class FileTests {
             }
             assertThat(fc.filesCount).isEqualTo(1)
             assertThat(fc.bytesCount).isEqualTo(testFileSize)
-            val h1 = fc.get("xyz", 1000000) { f ->
+            val h1 = fc.get("xyz", 1000000) { _ ->
                 fail("should not regenerate cached file")
             }
             assertThat(fc.filesCount).isEqualTo(1)

gordonmu-coio/src/test/kotlin/NioTestServer.kt → blachris-coio/src/test/kotlin/NioTestServer.kt

@@ -1,4 +1,4 @@
-import com.github.gordonmu.coio.CoIOTcp
+import com.github.blachris.coio.CoIOTcp
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.runBlocking
 import java.nio.ByteBuffer