Merge pull request #782 from scalecube/cleanup

Cleanup (removed ConnectionClosedException and jackson-smile)
scalecube · Jul 3, 2020 · c44986d · c44986d
2 parents c14dbed + 7ebfc04
commit c44986d
Show file tree

Hide file tree

Showing 8 changed files with 11 additions and 72 deletions.
diff --git a/pom.xml b/pom.xml
@@ -71,11 +71,6 @@
         <artifactId>scalecube-codec-jackson</artifactId>
         <version>${scalecube-cluster.version}</version>
       </dependency>
-      <dependency>
-        <groupId>io.scalecube</groupId>
-        <artifactId>scalecube-codec-jackson-smile</artifactId>
-        <version>${scalecube-cluster.version}</version>
-      </dependency>
 
       <!-- Scalecube Config -->
       <dependency>

diff --git a/services-api/src/main/java/io/scalecube/services/exceptions/ConnectionClosedException.java b/services-api/src/main/java/io/scalecube/services/exceptions/ConnectionClosedException.java
diff --git a/services-discovery/pom.xml b/services-discovery/pom.xml
@@ -38,11 +38,6 @@
       <artifactId>scalecube-codec-jackson</artifactId>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>io.scalecube</groupId>
-      <artifactId>scalecube-codec-jackson-smile</artifactId>
-      <scope>test</scope>
-    </dependency>
   </dependencies>
 
 </project>
diff --git a/...iscovery/src/test/java/io/scalecube/services/discovery/ScalecubeServiceDiscoveryTest.java b/...iscovery/src/test/java/io/scalecube/services/discovery/ScalecubeServiceDiscoveryTest.java
@@ -7,7 +7,6 @@
 
 import io.scalecube.cluster.ClusterMath;
 import io.scalecube.cluster.codec.jackson.JacksonMetadataCodec;
-import io.scalecube.cluster.codec.jackson.smile.JacksonSmileMetadataCodec;
 import io.scalecube.cluster.fdetector.FailureDetectorConfig;
 import io.scalecube.cluster.gossip.GossipConfig;
 import io.scalecube.cluster.membership.MembershipConfig;
@@ -56,9 +55,7 @@ public static void setUp() {
 
   private static Stream<Arguments> metadataCodecSource() {
     return Stream.of(
-        Arguments.of(new JdkMetadataCodec()),
-        Arguments.of(new JacksonMetadataCodec()),
-        Arguments.of(new JacksonSmileMetadataCodec()));
+        Arguments.of(new JdkMetadataCodec()), Arguments.of(new JacksonMetadataCodec()));
   }
 
   @ParameterizedTest

diff --git a/...t-rsocket/src/main/java/io/scalecube/services/transport/rsocket/RSocketClientChannel.java b/...t-rsocket/src/main/java/io/scalecube/services/transport/rsocket/RSocketClientChannel.java
@@ -4,19 +4,17 @@
 import io.rsocket.RSocket;
 import io.rsocket.util.ByteBufPayload;
 import io.scalecube.services.api.ServiceMessage;
-import io.scalecube.services.exceptions.ConnectionClosedException;
 import io.scalecube.services.transport.api.ClientChannel;
 import io.scalecube.services.transport.api.ServiceMessageCodec;
 import java.lang.reflect.Type;
-import java.nio.channels.ClosedChannelException;
 import org.reactivestreams.Publisher;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
 
 public class RSocketClientChannel implements ClientChannel {
 
-  private Mono<RSocket> rsocket;
-  private ServiceMessageCodec messageCodec;
+  private final Mono<RSocket> rsocket;
+  private final ServiceMessageCodec messageCodec;
 
   public RSocketClientChannel(Mono<RSocket> rsocket, ServiceMessageCodec codec) {
     this.rsocket = rsocket;
@@ -26,27 +24,15 @@ public RSocketClientChannel(Mono<RSocket> rsocket, ServiceMessageCodec codec) {
   @Override
   public Mono<ServiceMessage> requestResponse(ServiceMessage message, Type responseType) {
     return rsocket
-        .flatMap(
-            rsocket ->
-                rsocket
-                    .requestResponse(toPayload(message))
-                    .onErrorMap(
-                        ClosedChannelException.class,
-                        e -> new ConnectionClosedException("Connection closed")))
+        .flatMap(rsocket -> rsocket.requestResponse(toPayload(message)))
         .map(this::toMessage)
         .map(msg -> ServiceMessageCodec.decodeData(msg, responseType));
   }
 
   @Override
   public Flux<ServiceMessage> requestStream(ServiceMessage message, Type responseType) {
     return rsocket
-        .flatMapMany(
-            rsocket ->
-                rsocket
-                    .requestStream(toPayload(message))
-                    .onErrorMap(
-                        ClosedChannelException.class,
-                        e -> new ConnectionClosedException("Connection closed")))
+        .flatMapMany(rsocket -> rsocket.requestStream(toPayload(message)))
         .map(this::toMessage)
         .map(msg -> ServiceMessageCodec.decodeData(msg, responseType));
   }
@@ -55,13 +41,7 @@ public Flux<ServiceMessage> requestStream(ServiceMessage message, Type responseT
   public Flux<ServiceMessage> requestChannel(
       Publisher<ServiceMessage> publisher, Type responseType) {
     return rsocket
-        .flatMapMany(
-            rsocket ->
-                rsocket
-                    .requestChannel(Flux.from(publisher).map(this::toPayload))
-                    .onErrorMap(
-                        ClosedChannelException.class,
-                        e -> new ConnectionClosedException("Connection closed")))
+        .flatMapMany(rsocket -> rsocket.requestChannel(Flux.from(publisher).map(this::toPayload)))
         .map(this::toMessage)
         .map(msg -> ServiceMessageCodec.decodeData(msg, responseType));
   }

diff --git a/services/pom.xml b/services/pom.xml
@@ -78,11 +78,6 @@
       <artifactId>scalecube-codec-jackson</artifactId>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>io.scalecube</groupId>
-      <artifactId>scalecube-codec-jackson-smile</artifactId>
-      <scope>test</scope>
-    </dependency>
   </dependencies>
 
 </project>
diff --git a/services/src/test/java/io/scalecube/services/ServiceRegistryTest.java b/services/src/test/java/io/scalecube/services/ServiceRegistryTest.java
@@ -6,7 +6,6 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import io.scalecube.cluster.codec.jackson.JacksonMetadataCodec;
-import io.scalecube.cluster.codec.jackson.smile.JacksonSmileMetadataCodec;
 import io.scalecube.cluster.metadata.JdkMetadataCodec;
 import io.scalecube.cluster.metadata.MetadataCodec;
 import io.scalecube.net.Address;
@@ -34,9 +33,7 @@ public class ServiceRegistryTest extends BaseTest {
 
   private static Stream<Arguments> metadataCodecSource() {
     return Stream.of(
-        Arguments.of(new JdkMetadataCodec()),
-        Arguments.of(new JacksonMetadataCodec()),
-        Arguments.of(new JacksonSmileMetadataCodec()));
+        Arguments.of(new JdkMetadataCodec()), Arguments.of(new JacksonMetadataCodec()));
   }
 
   @ParameterizedTest

diff --git a/...es/src/test/java/io/scalecube/services/transport/rsocket/RSocketServiceTransportTest.java b/...es/src/test/java/io/scalecube/services/transport/rsocket/RSocketServiceTransportTest.java
@@ -10,9 +10,9 @@
 import io.scalecube.services.api.ServiceMessage;
 import io.scalecube.services.discovery.ScalecubeServiceDiscovery;
 import io.scalecube.services.discovery.api.ServiceDiscoveryEvent;
-import io.scalecube.services.exceptions.ConnectionClosedException;
 import io.scalecube.services.sut.QuoteService;
 import io.scalecube.services.sut.SimpleQuoteService;
+import java.nio.channels.ClosedChannelException;
 import java.time.Duration;
 import java.util.Optional;
 import java.util.concurrent.CountDownLatch;
@@ -94,7 +94,7 @@ public void test_remote_node_died_mono_never() throws Exception {
     TimeUnit.MILLISECONDS.sleep(100);
 
     assertEquals(0, latch1.getCount());
-    assertEquals(ConnectionClosedException.class, exceptionHolder.get().getClass());
+    assertEquals(ClosedChannelException.class, exceptionHolder.get().getClass());
     assertTrue(sub1.get().isDisposed());
   }
 
@@ -122,7 +122,7 @@ public void test_remote_node_died_many_never() throws Exception {
     TimeUnit.MILLISECONDS.sleep(100);
 
     assertEquals(0, latch1.getCount());
-    assertEquals(ConnectionClosedException.class, exceptionHolder.get().getClass());
+    assertEquals(ClosedChannelException.class, exceptionHolder.get().getClass());
     assertTrue(sub1.get().isDisposed());
   }
 
@@ -154,7 +154,7 @@ public void test_remote_node_died_many_then_never() throws Exception {
     TimeUnit.MILLISECONDS.sleep(100);
 
     assertEquals(0, latch1.getCount());
-    assertEquals(ConnectionClosedException.class, exceptionHolder.get().getClass());
+    assertEquals(ClosedChannelException.class, exceptionHolder.get().getClass());
     assertTrue(sub1.get().isDisposed());
   }
 }