Merge branch 'release/1.5.2'

Author: mostroverkhov

.github/workflows/ci-build.yml

@@ -16,7 +16,7 @@ jobs:
     strategy:
       matrix:
         os: [ ubuntu-20.04, macos-11, windows-2019 ]
-        jdk: [ 11, 17 ]
+        jdk: [ 11, 17, 21 ]
       fail-fast: false
 
     steps:
@@ -25,7 +25,7 @@ jobs:
         uses: actions/setup-java@v3
         with:
           java-version: ${{ matrix.jdk }}
-          distribution: 'temurin'
+          distribution: 'zulu'
       - name: Cache Gradle packages
         uses: actions/cache@v3
         with:

README.md

@@ -46,16 +46,18 @@ Project supports 3 kinds of APIs:
 **GRPC compatible**. All implementations are directly compatible with GRPC via MessageStreams-RPC & GRPC transport.
 GRPC clients can access such services without separate "gateway" binaries and IDL sharing schemes.
 
-**Non-intrusive**. [MessageStreams](https://github.com/jauntsdn/rsocket-jvm/blob/1.5.0/rsocket-reactor/src/main/java/com/jauntsdn/rsocket/MessageStreams.java) API & [RSocket-JVM](https://github.com/jauntsdn/rsocket-jvm/blob/1.5.0/rsocket-reactor/src/main/java/com/jauntsdn/rsocket/RSocket.java) runtime are clearly split so from end-user perspective there is 
+**Non-intrusive**. [MessageStreams](https://github.com/jauntsdn/rsocket-jvm/blob/1.5.1/rsocket-reactor/src/main/java/com/jauntsdn/rsocket/MessageStreams.java) API & [RSocket-JVM](https://github.com/jauntsdn/rsocket-jvm/blob/1.5.1/rsocket-reactor/src/main/java/com/jauntsdn/rsocket/RSocket.java) runtime are clearly split so from end-user perspective there is 
 only set of streaming & non-streaming interactions on buffers/messages:
 
+**traditional streaming**
 ```groovy
   void requestResponse(Message message, StreamObserver<Message> responseObserver);
   void requestStream(Message message, StreamObserver<Message> responseObserver);
   StreamObserver<Message> requestChannel(StreamObserver<Message> responseObserver);
   void fireAndForget(Message message, StreamObserver<Message> responseObserver);
 ```
 
+**reactive streams**
 ```groovy
   Publisher<Message> requestResponse(Message message);
   Publisher<Message> requestStream(Message message);
@@ -91,12 +93,14 @@ and Http2 streams based transports for interop:
 
 [messagestreams-grpc-examples](https://github.com/jauntsdn/messagestreams-grpc-examples) demonstrate GRPC-stub StreamObserver based services.
 
+[messagestreams-virtualthreads-examples](https://github.com/jauntsdn/messagestreams-virtualthreads-examples) demonstrate jdk virtual threads based services.
+
 [messagestreams-futures-examples](https://github.com/jauntsdn/messagestreams-futures-examples) demonstrate jdk CompletableFuture based services.
 
 ## Build
 
-Building `jauntsdn/RSocket-jvm` requires java20 for virtual threads API, java11+ for smallrye-mutiny; 
-futures / grpc-stubs / rxjava / reactor are java8+. 
+Building `jauntsdn/RSocket-jvm` requires java20 if virtual threads modules are included (-Pvirtualthreads -Ptoolchains), java11 otherwise.
+
 ```
 ./gradlew
 ```
@@ -108,7 +112,7 @@ Building & installing artifacts into local maven repository
 
 ## Binaries
 
-Binary releases are published on Maven Central for virtual threads, futures (CompletableFuture), grpc stubs, reactor, rxjava & mutiny libraries.
+Binary releases are published on Maven Central for virtualthreads, futures (CompletableFuture), grpc (stubs), reactor, rxjava & mutiny libraries.
 
 ```groovy
 
@@ -117,10 +121,10 @@ repositories {
 }
 
 dependencies {
-    implementation "com.jauntsdn.rsocket:rsocket-messages:1.5.0"
-    implementation "com.jauntsdn.rsocket:rsocket-rpc-idl:1.5.0"
-    implementation "com.jauntsdn.rsocket:rsocket-<VENDOR>:1.5.0"
-    implementation "com.jauntsdn.rsocket:rsocket-rpc-<VENDOR>:1.5.0"
+    implementation "com.jauntsdn.rsocket:rsocket-messages:1.5.1"
+    implementation "com.jauntsdn.rsocket:rsocket-rpc-idl:1.5.1"
+    implementation "com.jauntsdn.rsocket:rsocket-<VENDOR>:1.5.1"
+    implementation "com.jauntsdn.rsocket:rsocket-rpc-<VENDOR>:1.5.1"
 }
 ```
 
@@ -129,7 +133,7 @@ MessageStreams-RPC compiler binaries are linux, windows(x86) only
 protobuf {
      plugins {
           rsocketRpc {
-              artifact = "com.jauntsdn.rsocket:rsocket-rpc-<VENDOR>-compiler:1.5.0"
+              artifact = "com.jauntsdn.rsocket:rsocket-rpc-<VENDOR>-compiler:1.5.1"
           }
      }
 }

gradle.properties

@@ -1,30 +1,30 @@
 group=com.jauntsdn.rsocket
-version=1.5.1
+version=1.5.2
 
 dependencyManagementPluginVersion=1.1.0
 protobufPluginVersion=0.8.19
 googleJavaFormatPluginVersion=0.9
 gitPluginVersion=0.13.0
 versionsPluginVersion=0.45.0
 
-nettyBomVersion=4.1.97.Final
-grpcStubVersion=1.57.2
-reactorBomVersion=2022.0.10
-rxjavaVersion=3.1.7
+nettyBomVersion=4.1.101.Final
+grpcStubVersion=1.59.0
+reactorBomVersion=2022.0.12
+rxjavaVersion=3.1.8
 helidonCommonReactiveVersion=2.5.6
-mutinyVersion=2.3.1
+mutinyVersion=2.5.1
 jsr305Version=3.0.2
 javaxInjectVersion=1
 javaxAnnotationVersion=1.3.2
 jakartaInjectVersion=2.0.1
 jakartaAnnotationVersion=2.1.1
-protobufVersion=3.24.2
+protobufVersion=3.25.0
 
-junitVersion=5.10.0
+junitVersion=5.10.1
 assertjVersion=3.24.2
 
 release=false
-virtualthreads=true
-toolchains=true
+virtualthreads=false
+toolchains=false
 org.gradle.parallel=true
 org.gradle.configureondemand=true

rsocket-bom/gradle.lockfile

@@ -1,6 +1,6 @@
 # This is a Gradle generated file for dependency locking.
 # Manual edits can break the build and are not advised.
 # This file is expected to be part of source control.
-io.netty:netty-bom:4.1.97.Final=classpath
-io.projectreactor:reactor-bom:2022.0.10=classpath
+io.netty:netty-bom:4.1.101.Final=classpath
+io.projectreactor:reactor-bom:2022.0.12=classpath
 empty=

rsocket-futures/gradle.lockfile

@@ -7,7 +7,7 @@ com.google.errorprone:javac-shaded:9+181-r4173-1=googleJavaFormat1.6
 com.google.googlejavaformat:google-java-format:1.6=googleJavaFormat1.6
 com.google.guava:guava:22.0=googleJavaFormat1.6
 com.google.j2objc:j2objc-annotations:1.1=googleJavaFormat1.6
-io.netty:netty-buffer:4.1.97.Final=compileClasspath,runtimeClasspath
-io.netty:netty-common:4.1.97.Final=compileClasspath,runtimeClasspath
+io.netty:netty-buffer:4.1.101.Final=compileClasspath,runtimeClasspath
+io.netty:netty-common:4.1.101.Final=compileClasspath,runtimeClasspath
 org.codehaus.mojo:animal-sniffer-annotations:1.14=googleJavaFormat1.6
 empty=annotationProcessor

rsocket-futures/src/main/java/com/jauntsdn/rsocket/MessageStreams.java

@@ -21,20 +21,42 @@
 import java.util.concurrent.CompletionStage;
 import java.util.concurrent.ScheduledExecutorService;
 
+/**
+ * Channel interactions for async exchange of binary messages using jdk's {@link
+ * java.util.concurrent.CompletableFuture} API.
+ */
 public interface MessageStreams extends Closeable {
 
+  /**
+   * Unreliable and unordered 1 to 0 messages exchange interaction.
+   *
+   * @return {@link CompletionStage} completed successfully as soon as message is scheduled for
+   *     write if channel is connected, or completed with error if channel is disconnected. {@link
+   *     CompletionStage} completion does not imply that message was written on wire; messages
+   *     ordering between several fire-and-forget interactions, or fire-and-forget and other
+   *     interactions is not guaranteed.
+   */
   CompletionStage<Void> fireAndForget(Message message);
 
+  /**
+   * 1 to strictly 1 messages exchange interaction.
+   *
+   * @return {@link CompletionStage} completed successfully with exactly 1 response message,
+   *     otherwise completed with error.
+   */
   CompletionStage<Message> requestResponse(Message message);
 
+  /** @return factory to create messages from byte buffer data & metadata */
   default Optional<Message.Factory> messageFactory() {
     return Optional.empty();
   }
 
+  /** @return ExecutorService to schedule actions on channel's event loop */
   default Optional<ScheduledExecutorService> scheduler() {
     return Optional.empty();
   }
 
+  /** @return channel's ByteBufAllocator */
   default Optional<ByteBufAllocator> allocator() {
     return Optional.empty();
   }

rsocket-futures/src/main/java/com/jauntsdn/rsocket/RSocket.java

@@ -21,10 +21,23 @@
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.function.Function;
 
+/**
+ * Models RSocket interactions as described in
+ * https://github.com/rsocket/rsocket/blob/master/Protocol.md#stream-sequences-and-lifetimes
+ */
 public interface RSocket extends MessageStreams, Availability {
 
+  /**
+   * Enables metadata exchange between connection endpoints.
+   *
+   * @param message containing connection metadata.
+   */
   CompletionStage<Void> metadataPush(Message message);
 
+  /**
+   * @return lightweight {@link ScheduledExecutorService} intended for non-fine-grained tasks
+   *     scheduling (e.g. timeouts).
+   */
   default Optional<ScheduledExecutorService> coarseScheduler() {
     return Optional.empty();
   }

rsocket-grpc/gradle.lockfile

@@ -7,8 +7,8 @@ com.google.errorprone:javac-shaded:9+181-r4173-1=googleJavaFormat1.6
 com.google.googlejavaformat:google-java-format:1.6=googleJavaFormat1.6
 com.google.guava:guava:22.0=googleJavaFormat1.6
 com.google.j2objc:j2objc-annotations:1.1=googleJavaFormat1.6
-io.grpc:grpc-stub:1.57.2=compileClasspath,runtimeClasspath
-io.netty:netty-buffer:4.1.97.Final=compileClasspath,runtimeClasspath
-io.netty:netty-common:4.1.97.Final=compileClasspath,runtimeClasspath
+io.grpc:grpc-stub:1.59.0=compileClasspath,runtimeClasspath
+io.netty:netty-buffer:4.1.101.Final=compileClasspath,runtimeClasspath
+io.netty:netty-common:4.1.101.Final=compileClasspath,runtimeClasspath
 org.codehaus.mojo:animal-sniffer-annotations:1.14=googleJavaFormat1.6
 empty=annotationProcessor

rsocket-grpc/src/main/java/com/jauntsdn/rsocket/MessageStreams.java

@@ -22,24 +22,48 @@
 import java.util.Optional;
 import java.util.concurrent.ScheduledExecutorService;
 
+/**
+ * Channel interactions for async exchange of binary messages using GRPC-stub {@link StreamObserver}
+ * API.
+ */
 public interface MessageStreams extends Closeable {
 
+  /**
+   * Unreliable and unordered 1 to 0 messages exchange interaction.
+   *
+   * @param responseObserver completed successfully as soon as message is scheduled for write if
+   *     channel is connected, or completed with error if channel is disconnected. {@link
+   *     StreamObserver} completion does not imply that message was written on wire; messages
+   *     ordering between several fire-and-forget interactions, or fire-and-forget and other
+   *     interactions is not guaranteed.
+   */
   void fireAndForget(Message message, StreamObserver<Message> responseObserver);
 
+  /**
+   * 1 to strictly 1 messages exchange interaction.
+   *
+   * @param responseObserver completed successfully with exactly 1 response message, otherwise
+   *     completed with error.
+   */
   void requestResponse(Message message, StreamObserver<Message> responseObserver);
 
+  /** 1 to N messages flow-controlled exchange interaction. */
   void requestStream(Message message, StreamObserver<Message> responseObserver);
 
+  /** N to N messages flow-controlled exchange interaction. */
   StreamObserver<Message> requestChannel(StreamObserver<Message> responseObserver);
 
+  /** @return factory to create messages from byte buffer data & metadata */
   default Optional<Message.Factory> messageFactory() {
     return Optional.empty();
   }
 
+  /** @return ExecutorService to schedule actions on channel's event loop */
   default Optional<ScheduledExecutorService> scheduler() {
     return Optional.empty();
   }
 
+  /** @return channel's ByteBufAllocator */
   default Optional<ByteBufAllocator> allocator() {
     return Optional.empty();
   }

rsocket-grpc/src/main/java/com/jauntsdn/rsocket/RSocket.java

@@ -21,10 +21,23 @@
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.function.Function;
 
+/**
+ * Models RSocket interactions as described in
+ * https://github.com/rsocket/rsocket/blob/master/Protocol.md#stream-sequences-and-lifetimes
+ */
 public interface RSocket extends MessageStreams, Availability {
 
+  /**
+   * Enables metadata exchange between connection endpoints.
+   *
+   * @param message containing connection metadata.
+   */
   void metadataPush(Message message, StreamObserver<Message> responseObserver);
 
+  /**
+   * @return lightweight {@link ScheduledExecutorService} intended for non-fine-grained tasks
+   *     scheduling (e.g. timeouts).
+   */
   default Optional<ScheduledExecutorService> coarseScheduler() {
     return Optional.empty();
   }