Cleanup gateway (#852)

* Made ServiceCall and ClientTransport extend AutoCloseable.

* Updated RSocketClientTransport to properly close rsocket channels - removed  ThreadLocal map. 

* Changed approach with "gateway client transport " - compacted to have less classes as possible. 

* Added HttpGatewayClientTransport which implements ClientChannel, ClientTransport.

* Added WebsocketGatewayClientTransportwhich  implements ClientChannel, ClientTransport.

* Re-packaged gateway client classes.

services-api/src/main/java/io/scalecube/services/ServiceCall.java

@@ -26,7 +26,7 @@
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
 
-public class ServiceCall {
+public class ServiceCall implements AutoCloseable {
 
   private ClientTransport transport;
   private ServiceRegistry serviceRegistry;
@@ -400,4 +400,15 @@ private ServiceMessage throwIfError(ServiceMessage message) {
     }
     return message;
   }
+
+  @Override
+  public void close() {
+    if (transport != null) {
+      try {
+        transport.close();
+      } catch (Exception e) {
+        throw new RuntimeException(e);
+      }
+    }
+  }
 }

services-api/src/main/java/io/scalecube/services/transport/api/ClientTransport.java

@@ -2,10 +2,10 @@
 
 import io.scalecube.services.ServiceReference;
 
-public interface ClientTransport {
+public interface ClientTransport extends AutoCloseable {
 
   /**
-   * Creates {@link ClientChannel} ready for communication with remote service endpoint.
+   * Creates {@link ClientChannel} for communication with remote service endpoint.
    *
    * @param serviceReference target serviceReference
    * @return {@code ClientChannel} instance

services-gateway/pom.xml

@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
@@ -14,7 +16,7 @@
   <dependencies>
     <dependency>
       <groupId>io.scalecube</groupId>
-      <artifactId>scalecube-services</artifactId>
+      <artifactId>scalecube-services-api</artifactId>
       <version>${project.parent.version}</version>
     </dependency>
 

services-gateway/src/main/java/io/scalecube/services/gateway/client/GatewayClientCodec.java

@@ -0,0 +1,38 @@
+package io.scalecube.services.gateway.client;
+
+import io.netty.buffer.ByteBuf;
+import io.scalecube.services.api.ServiceMessage;
+import io.scalecube.services.exceptions.MessageCodecException;
+import java.lang.reflect.Type;
+
+public interface GatewayClientCodec {
+
+  /**
+   * Data decoder function.
+   *
+   * @param message client message.
+   * @param dataType data type class.
+   * @return client message object.
+   * @throws MessageCodecException in case if data decoding fails.
+   */
+  default ServiceMessage decodeData(ServiceMessage message, Type dataType)
+      throws MessageCodecException {
+    return ServiceMessageCodec.decodeData(message, dataType);
+  }
+
+  /**
+   * Encodes {@link ServiceMessage}.
+   *
+   * @param message message to encode
+   * @return encoded message
+   */
+  ByteBuf encode(ServiceMessage message);
+
+  /**
+   * Decodes {@link ServiceMessage} object from {@link ByteBuf}.
+   *
+   * @param byteBuf message to decode
+   * @return decoded message represented by {@link ServiceMessage}
+   */
+  ServiceMessage decode(ByteBuf byteBuf);
+}

services-gateway/src/main/java/io/scalecube/services/gateway/transport/ServiceMessageCodec.java → services-gateway/src/main/java/io/scalecube/services/gateway/client/ServiceMessageCodec.java

@@ -1,4 +1,4 @@
-package io.scalecube.services.gateway.transport;
+package io.scalecube.services.gateway.client;
 
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.ByteBufInputStream;

services-gateway/src/main/java/io/scalecube/services/gateway/transport/StaticAddressRouter.java → services-gateway/src/main/java/io/scalecube/services/gateway/client/StaticAddressRouter.java

@@ -1,4 +1,4 @@
-package io.scalecube.services.gateway.transport;
+package io.scalecube.services.gateway.client;
 
 import io.scalecube.services.Address;
 import io.scalecube.services.ServiceEndpoint;
@@ -12,18 +12,21 @@
 import java.util.Optional;
 import java.util.UUID;
 
-/** Syntethic router for returning preconstructed static service reference with given address. */
-public class StaticAddressRouter implements Router {
+/**
+ * Syntethic router for returning pre-constructed {@link ServiceReference} instance with given
+ * address.
+ */
+public final class StaticAddressRouter implements Router {
 
-  private final ServiceReference staticServiceReference;
+  private final ServiceReference serviceReference;
 
   /**
    * Constructor.
    *
    * @param address address
    */
   public StaticAddressRouter(Address address) {
-    this.staticServiceReference =
+    serviceReference =
         new ServiceReference(
             new ServiceMethodDefinition(UUID.randomUUID().toString()),
             new ServiceRegistration(
@@ -33,6 +36,6 @@ public StaticAddressRouter(Address address) {
 
   @Override
   public Optional<ServiceReference> route(ServiceRegistry serviceRegistry, ServiceMessage request) {
-    return Optional.of(staticServiceReference);
+    return Optional.of(serviceReference);
   }
 }

services-gateway/src/main/java/io/scalecube/services/gateway/transport/http/HttpGatewayClientCodec.java → services-gateway/src/main/java/io/scalecube/services/gateway/client/http/HttpGatewayClientCodec.java

@@ -1,19 +1,15 @@
-package io.scalecube.services.gateway.transport.http;
+package io.scalecube.services.gateway.client.http;
 
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.ByteBufAllocator;
 import io.netty.buffer.ByteBufOutputStream;
 import io.scalecube.services.api.ServiceMessage;
 import io.scalecube.services.exceptions.MessageCodecException;
 import io.scalecube.services.gateway.ReferenceCountUtil;
-import io.scalecube.services.gateway.transport.GatewayClientCodec;
+import io.scalecube.services.gateway.client.GatewayClientCodec;
 import io.scalecube.services.transport.api.DataCodec;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
-public final class HttpGatewayClientCodec implements GatewayClientCodec<ByteBuf> {
-
-  private static final Logger LOGGER = LoggerFactory.getLogger(HttpGatewayClientCodec.class);
+public final class HttpGatewayClientCodec implements GatewayClientCodec {
 
   private final DataCodec dataCodec;
 
@@ -38,7 +34,6 @@ public ByteBuf encode(ServiceMessage message) {
         dataCodec.encode(new ByteBufOutputStream(content), message.data());
       } catch (Throwable t) {
         ReferenceCountUtil.safestRelease(content);
-        LOGGER.error("Failed to encode data on: {}, cause: {}", message, t);
         throw new MessageCodecException(
             "Failed to encode data on message q=" + message.qualifier(), t);
       }