fixes interface naming

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

Author: OlegDokuka

rsocket-core/src/main/java/io/rsocket/Invalidate.java renamed to rsocket-core/src/main/java/io/rsocket/Invalidatable.java

@@ -15,7 +15,7 @@
  */
 package io.rsocket;
 
-interface Invalidate {
+interface Invalidatable {
 
-  void expire();
+  void invalidate();
 }

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

@@ -44,6 +44,7 @@
 import io.rsocket.util.MultiSubscriberRSocket;
 import java.time.Duration;
 import java.util.Objects;
+import java.util.function.BiConsumer;
 import java.util.function.Consumer;
 import java.util.function.Function;
 import java.util.function.Supplier;
@@ -98,6 +99,8 @@ default <T extends Closeable> Start<T> transport(ServerTransport<T> transport) {
   public static class ClientRSocketFactory implements ClientTransportAcceptor {
     private static final String CLIENT_TAG = "client";
 
+    private static final BiConsumer<RSocket, Invalidatable> INVALIDATE_FUNCTION =
+        (r, i) -> r.onClose().subscribe(null, null, i::invalidate);
     private static final Function<Flux<Throwable>, ? extends Publisher<?>> FAIL_WHEN_FACTORY =
         f -> f.concatMap(Mono::error);
 
@@ -528,9 +531,7 @@ public Mono<RSocket> start() {
                 source -> {
                   if (reconnectEnabled) {
                     return new ReconnectMono<>(
-                        source.retryWhen(whenFactory),
-                        Disposable::dispose,
-                        (r, i) -> r.onClose().subscribe(null, null, i::expire));
+                        source.retryWhen(whenFactory), Disposable::dispose, INVALIDATE_FUNCTION);
                   } else {
                     return source;
                   }

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

@@ -33,10 +33,10 @@
 import reactor.util.annotation.Nullable;
 import reactor.util.context.Context;
 
-final class ReconnectMono<T> extends Mono<T> implements Invalidate, Disposable, Scannable {
+final class ReconnectMono<T> extends Mono<T> implements Invalidatable, Disposable, Scannable {
 
   final Mono<T> source;
-  final BiConsumer<? super T, Invalidate> onValueReceived;
+  final BiConsumer<? super T, Invalidatable> onValueReceived;
   final Consumer<? super T> onValueExpired;
   final ReconnectMainSubscriber<? super T> mainSubscriber;
 
@@ -75,7 +75,7 @@ final class ReconnectMono<T> extends Mono<T> implements Invalidate, Disposable,
   ReconnectMono(
       Mono<T> source,
       Consumer<? super T> onValueExpired,
-      BiConsumer<? super T, Invalidate> onValueReceived) {
+      BiConsumer<? super T, Invalidatable> onValueReceived) {
     this.source = source;
     this.onValueExpired = onValueExpired;
     this.onValueReceived = onValueReceived;
@@ -275,7 +275,7 @@ void doFinally() {
 
   // Check RSocket is not good
   @Override
-  public void expire() {
+  public void invalidate() {
     if (this.subscribers == TERMINATED) {
       return;
     }

rsocket-core/src/test/java/io/rsocket/ReconnectMonoTests.java

@@ -53,7 +53,7 @@
 public class ReconnectMonoTests {
 
   private Queue<RetryContext<?>> retries = new ConcurrentLinkedQueue<>();
-  private Queue<Tuple2<Object, Invalidate>> received = new ConcurrentLinkedQueue<>();
+  private Queue<Tuple2<Object, Invalidatable>> received = new ConcurrentLinkedQueue<>();
   private Queue<Object> expired = new ConcurrentLinkedQueue<>();
 
   @Test
@@ -542,7 +542,7 @@ public void shouldNotExpiredIfNotCompleted() {
     Assertions.assertThat(received).isEmpty();
     Assertions.assertThat(processor.isTerminated()).isFalse();
 
-    reconnectMono.expire();
+    reconnectMono.invalidate();
 
     Assertions.assertThat(expired).isEmpty();
     Assertions.assertThat(received).isEmpty();
@@ -736,7 +736,7 @@ public void shouldExpireValueExactlyOnce() {
 
       Assertions.assertThat(expired).isEmpty();
       Assertions.assertThat(received).hasSize(1).containsOnly(Tuples.of("value", reconnectMono));
-      RaceTestUtils.race(reconnectMono::expire, reconnectMono::expire);
+      RaceTestUtils.race(reconnectMono::invalidate, reconnectMono::invalidate);
 
       Assertions.assertThat(expired).hasSize(1).containsOnly("value");
       Assertions.assertThat(received).hasSize(1).containsOnly(Tuples.of("value", reconnectMono));
@@ -906,7 +906,7 @@ Consumer<? super RetryContext<?>> onRetry() {
     return context -> retries.add(context);
   }
 
-  <T> BiConsumer<T, Invalidate> onValue() {
+  <T> BiConsumer<T, Invalidatable> onValue() {
     return (v, __) -> received.add(Tuples.of(v, __));
   }