wip

Signed-off-by: Oleh Dokuka <[email protected]>
Signed-off-by: Oleh Dokuka <[email protected]>

Author: OlegDokuka

rsocket-core/src/main/java/io/rsocket/RSocket.java

@@ -86,10 +86,12 @@ default double availability() {
 
   @Override
   default void dispose() {
-    dispose(true);
+
   }
 
-  default void dispose(boolean force) {}
+  default void disposeGracefully() {
+
+  }
 
   @Override
   default boolean isDisposed() {

rsocket-core/src/main/java/io/rsocket/core/RSocketConnector.java

@@ -45,8 +45,6 @@
 import java.util.function.BiConsumer;
 import java.util.function.Consumer;
 import java.util.function.Supplier;
-
-import org.reactivestreams.Publisher;
 import reactor.core.Disposable;
 import reactor.core.publisher.Mono;
 import reactor.util.annotation.Nullable;
@@ -179,11 +177,6 @@ public RSocketConnector dataMimeType(String dataMimeType) {
     return this;
   }
 
-
-  public RSocketConnector gracefullShutdownTimeout(Supplier<? extends Publisher<?>> decider) {
-    decider.get().subscribe(() -> );
-  }
-
   /**
    * Set the MIME type to use for formatting payload metadata on the established connection. This is
    * set in the initial {@code SETUP} frame sent to the server.

rsocket-core/src/main/java/io/rsocket/core/RSocketRequester.java

@@ -191,6 +191,12 @@ public void dispose() {
     tryShutdown();
   }
 
+  @Override
+  public void disposeGracefully() {
+    super.terminate();
+    super.onAllStreamsTerminated()
+  }
+
   @Override
   public boolean isDisposed() {
     return terminationError != null;

rsocket-core/src/main/java/io/rsocket/core/RequestResponseRequesterMono.java

@@ -27,16 +27,13 @@
 import io.netty.util.IllegalReferenceCountException;
 import io.rsocket.DuplexConnection;
 import io.rsocket.Payload;
-import io.rsocket.exceptions.CanceledException;
 import io.rsocket.frame.CancelFrameCodec;
 import io.rsocket.frame.FrameType;
 import io.rsocket.frame.decoder.PayloadDecoder;
 import io.rsocket.plugins.RequestInterceptor;
 import java.util.concurrent.atomic.AtomicLongFieldUpdater;
 import org.reactivestreams.Subscription;
 import reactor.core.CoreSubscriber;
-import reactor.core.Disposable;
-import reactor.core.Disposables;
 import reactor.core.Exceptions;
 import reactor.core.Scannable;
 import reactor.core.publisher.Mono;
@@ -45,7 +42,7 @@
 import reactor.util.annotation.Nullable;
 
 final class RequestResponseRequesterMono extends Mono<Payload>
-    implements RequesterFrameHandler, LeasePermitHandler, Subscription, Scannable, Disposable {
+    implements RequesterFrameHandler, LeasePermitHandler, Subscription, Scannable {
 
   final ByteBufAllocator allocator;
   final Payload payload;
@@ -258,32 +255,6 @@ public final void cancel() {
     }
   }
 
-  @Override
-  public void dispose() {
-    long previousState = markTerminated(STATE, this);
-    if (isTerminated(previousState)) {
-      return;
-    }
-
-    if (isFirstFrameSent(previousState)) {
-      final int streamId = this.streamId;
-      this.requesterResponderSupport.remove(streamId, this);
-
-      ReassemblyUtils.synchronizedRelease(this, previousState);
-
-      this.connection.sendFrame(streamId, CancelFrameCodec.encode(this.allocator, streamId));
-
-      final RequestInterceptor requestInterceptor = this.requestInterceptor;
-      if (requestInterceptor != null) {
-        requestInterceptor.onCancel(streamId, FrameType.REQUEST_RESPONSE);
-      }
-    } else if (!isReadyToSendFirstFrame(previousState)) {
-      this.payload.release();
-    }
-
-    this.actual.onError(new CanceledException("Forcefully disposed"));
-  }
-
   @Override
   public final void handlePayload(Payload value) {
     if (this.done) {

rsocket-core/src/main/java/io/rsocket/core/RequestResponseResponderSubscriber.java

@@ -38,14 +38,13 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import reactor.core.CoreSubscriber;
-import reactor.core.Disposable;
 import reactor.core.publisher.Mono;
 import reactor.core.publisher.Operators;
 import reactor.util.annotation.Nullable;
 import reactor.util.context.Context;
 
 final class RequestResponseResponderSubscriber
-    implements ResponderFrameHandler, CoreSubscriber<Payload>, Disposable {
+    implements ResponderFrameHandler, CoreSubscriber<Payload> {
 
   static final Logger logger = LoggerFactory.getLogger(RequestResponseResponderSubscriber.class);
 

rsocket-core/src/main/java/io/rsocket/core/RequesterResponderSupport.java

@@ -5,6 +5,7 @@
 import io.netty.util.collection.IntObjectMap;
 import io.rsocket.DuplexConnection;
 import io.rsocket.RSocket;
+import io.rsocket.exceptions.CanceledException;
 import io.rsocket.frame.decoder.PayloadDecoder;
 import io.rsocket.plugins.RequestInterceptor;
 import java.util.Objects;
@@ -96,7 +97,9 @@ public int getNextStreamId() {
     final StreamIdSupplier streamIdSupplier = this.streamIdSupplier;
     if (streamIdSupplier != null) {
       synchronized (this) {
-        if
+        if (this.terminating) {
+          throw new CanceledException("Disposed");
+        }
         return streamIdSupplier.nextStreamId(this.activeStreams);
       }
     } else {
@@ -116,6 +119,10 @@ public int addAndGetNextStreamId(FrameHandler frameHandler) {
     if (streamIdSupplier != null) {
       final IntObjectMap<FrameHandler> activeStreams = this.activeStreams;
       synchronized (this) {
+        if (this.terminating) {
+          throw new CanceledException("Disposed");
+        }
+
         final int streamId = streamIdSupplier.nextStreamId(activeStreams);
 
         activeStreams.put(streamId, frameHandler);
@@ -128,9 +135,10 @@ public int addAndGetNextStreamId(FrameHandler frameHandler) {
   }
 
   public synchronized boolean add(int streamId, FrameHandler frameHandler) {
-    if (this.terminated) {
-         throwing
+    if (this.terminating) {
+      throw new CanceledException("Disposed");
     }
+
     final IntObjectMap<FrameHandler> activeStreams = this.activeStreams;
     // copy of Map.putIfAbsent(key, value) without `streamId` boxing
     final FrameHandler previousHandler = activeStreams.get(streamId);
@@ -160,14 +168,27 @@ public synchronized FrameHandler get(int streamId) {
    * @return {@code true} if there is {@link FrameHandler} for the given {@code streamId} and the
    *     instance equals to the passed one
    */
-  public synchronized boolean remove(int streamId, FrameHandler frameHandler) {
-    final IntObjectMap<FrameHandler> activeStreams = this.activeStreams;
-    // copy of Map.remove(key, value) without `streamId` boxing
-    final FrameHandler curValue = activeStreams.get(streamId);
-    if (!Objects.equals(curValue, frameHandler)) {
-      return false;
+  public boolean remove(int streamId, FrameHandler frameHandler) {
+    final boolean terminated;
+    synchronized (this) {
+      final IntObjectMap<FrameHandler> activeStreams = this.activeStreams;
+      // copy of Map.remove(key, value) without `streamId` boxing
+      final FrameHandler curValue = activeStreams.get(streamId);
+      if (!Objects.equals(curValue, frameHandler)) {
+        return false;
+      }
+      activeStreams.remove(streamId);
+      if (activeStreams.size() == 0) {
+        terminated = true;
+        this.terminated = true;
+      } else {
+        terminated = false;
+      }
+    }
+
+    if (terminated) {
+      onAllStreamsTerminatedSink.tryEmitEmpty();
     }
-    activeStreams.remove(streamId);
     return true;
   }
 
@@ -186,8 +207,6 @@ public void terminate() {
 
     if (terminated) {
       onAllStreamsTerminatedSink.tryEmitEmpty();
-    } else {
-      
     }
   }
 

rsocket-transport-local/src/test/java/io/rsocket/transport/local/LocalResumableTransportTest.java

@@ -16,28 +16,12 @@
 
 package io.rsocket.transport.local;
 
-import io.netty.buffer.ByteBufUtil;
-import io.netty.buffer.Unpooled;
-import io.rsocket.frame.FrameHeaderCodec;
-import io.rsocket.frame.FrameType;
 import io.rsocket.test.TransportTest;
 import java.time.Duration;
 import java.util.UUID;
 
 final class LocalResumableTransportTest implements TransportTest {
 
-  public static void main(String[] args) {
-
-    System.out.println(
-        FrameHeaderCodec.frameType(
-            Unpooled.copiedBuffer(
-                ByteBufUtil.decodeHexDump("000000003800000000000007ef4a"))));
-    System.out.println(
-        FrameHeaderCodec.frameType(
-            Unpooled.copiedBuffer(
-                ByteBufUtil.decodeHexDump("000000002c0000000004"))));
-  }
-
   private final TransportPair transportPair =
       new TransportPair<>(
           () -> "test-" + UUID.randomUUID(),