Fixed unstable tests, moved routers, updated version (#899)

Author: artem-v

pom.xml

@@ -9,7 +9,7 @@
   </parent>
 
   <artifactId>scalecube-services-parent</artifactId>
-  <version>2.12.4-SNAPSHOT</version>
+  <version>2.12.5-SNAPSHOT</version>
   <packaging>pom</packaging>
   <name>ScaleCube-Services</name>
 

services-api/pom.xml

@@ -6,7 +6,7 @@
   <parent>
     <groupId>io.scalecube</groupId>
     <artifactId>scalecube-services-parent</artifactId>
-    <version>2.12.4-SNAPSHOT</version>
+    <version>2.12.5-SNAPSHOT</version>
   </parent>
 
   <artifactId>scalecube-services-api</artifactId>

services/src/main/java/io/scalecube/services/routing/RandomServiceRouter.java renamed to services-api/src/main/java/io/scalecube/services/routing/RandomServiceRouter.java

@@ -1,4 +1,4 @@
-package io.scalecube.services.gateway.client;
+package io.scalecube.services.routing;
 
 import io.scalecube.services.Address;
 import io.scalecube.services.ServiceEndpoint;
@@ -7,7 +7,6 @@
 import io.scalecube.services.ServiceRegistration;
 import io.scalecube.services.api.ServiceMessage;
 import io.scalecube.services.registry.api.ServiceRegistry;
-import io.scalecube.services.routing.Router;
 import java.util.Collections;
 import java.util.Optional;
 import java.util.UUID;
@@ -16,7 +15,7 @@
  * Syntethic router for returning pre-constructed {@link ServiceReference} instance with given
  * address.
  */
-public final class StaticAddressRouter implements Router {
+public class StaticAddressRouter implements Router {
 
   private final ServiceReference serviceReference;
 

services/src/main/java/io/scalecube/services/routing/RoundRobinServiceRouter.java renamed to services-api/src/main/java/io/scalecube/services/routing/RoundRobinServiceRouter.java

@@ -4,7 +4,7 @@
   <parent>
     <groupId>io.scalecube</groupId>
     <artifactId>scalecube-services-parent</artifactId>
-    <version>2.12.4-SNAPSHOT</version>
+    <version>2.12.5-SNAPSHOT</version>
   </parent>
 
   <artifactId>scalecube-services-discovery</artifactId>

services-gateway/src/main/java/io/scalecube/services/gateway/client/StaticAddressRouter.java renamed to services-api/src/main/java/io/scalecube/services/routing/StaticAddressRouter.java

@@ -5,7 +5,7 @@
   <parent>
     <groupId>io.scalecube</groupId>
     <artifactId>scalecube-services-parent</artifactId>
-    <version>2.12.4-SNAPSHOT</version>
+    <version>2.12.5-SNAPSHOT</version>
   </parent>
 
   <artifactId>scalecube-services-examples</artifactId>

services-discovery/pom.xml

@@ -5,7 +5,7 @@
   <parent>
     <groupId>io.scalecube</groupId>
     <artifactId>scalecube-services-parent</artifactId>
-    <version>2.12.4-SNAPSHOT</version>
+    <version>2.12.5-SNAPSHOT</version>
   </parent>
 
   <artifactId>scalecube-services-gateway</artifactId>

services-examples/pom.xml

@@ -21,8 +21,8 @@
 import io.scalecube.services.exceptions.ServiceException;
 import io.scalecube.services.exceptions.ServiceProviderErrorMapper;
 import io.scalecube.services.gateway.ReferenceCountUtil;
-import io.scalecube.services.gateway.client.StaticAddressRouter;
 import io.scalecube.services.registry.api.ServiceRegistry;
+import io.scalecube.services.routing.StaticAddressRouter;
 import io.scalecube.services.transport.api.DataCodec;
 import java.util.List;
 import java.util.function.BiFunction;

services-gateway/pom.xml

@@ -20,10 +20,10 @@
 import io.scalecube.services.exceptions.InternalServiceException;
 import io.scalecube.services.exceptions.ServiceUnavailableException;
 import io.scalecube.services.files.FileServiceImpl;
-import io.scalecube.services.gateway.client.StaticAddressRouter;
 import io.scalecube.services.gateway.client.websocket.WebsocketGatewayClientTransport;
 import io.scalecube.services.gateway.http.HttpGateway;
 import io.scalecube.services.gateway.websocket.WebsocketGateway;
+import io.scalecube.services.routing.StaticAddressRouter;
 import io.scalecube.services.transport.api.ServiceTransport.CredentialsSupplier;
 import io.scalecube.services.transport.rsocket.RSocketServiceTransport;
 import io.scalecube.transport.netty.websocket.WebsocketTransportFactory;

services-gateway/src/main/java/io/scalecube/services/gateway/http/HttpGatewayAcceptor.java

@@ -9,8 +9,8 @@
 import io.scalecube.services.annotations.Service;
 import io.scalecube.services.annotations.ServiceMethod;
 import io.scalecube.services.discovery.ScalecubeServiceDiscovery;
-import io.scalecube.services.gateway.client.StaticAddressRouter;
 import io.scalecube.services.gateway.client.http.HttpGatewayClientTransport;
+import io.scalecube.services.routing.StaticAddressRouter;
 import io.scalecube.services.transport.rsocket.RSocketServiceTransport;
 import io.scalecube.transport.netty.websocket.WebsocketTransportFactory;
 import java.io.IOException;

services-gateway/src/test/java/io/scalecube/services/gateway/files/FileDownloadTest.java

@@ -20,8 +20,8 @@
 import io.scalecube.services.gateway.ErrorService;
 import io.scalecube.services.gateway.ErrorServiceImpl;
 import io.scalecube.services.gateway.SomeException;
-import io.scalecube.services.gateway.client.StaticAddressRouter;
 import io.scalecube.services.gateway.client.http.HttpGatewayClientTransport;
+import io.scalecube.services.routing.StaticAddressRouter;
 import io.scalecube.services.transport.rsocket.RSocketServiceTransport;
 import io.scalecube.transport.netty.websocket.WebsocketTransportFactory;
 import java.time.Duration;

services-gateway/src/test/java/io/scalecube/services/gateway/http/HttpClientConnectionTest.java

@@ -19,8 +19,8 @@
 import io.scalecube.services.gateway.ErrorService;
 import io.scalecube.services.gateway.ErrorServiceImpl;
 import io.scalecube.services.gateway.SomeException;
-import io.scalecube.services.gateway.client.StaticAddressRouter;
 import io.scalecube.services.gateway.client.http.HttpGatewayClientTransport;
+import io.scalecube.services.routing.StaticAddressRouter;
 import java.time.Duration;
 import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.AfterEach;

services-gateway/src/test/java/io/scalecube/services/gateway/http/HttpGatewayTest.java

@@ -19,10 +19,10 @@
 import io.scalecube.services.discovery.ScalecubeServiceDiscovery;
 import io.scalecube.services.examples.GreetingServiceImpl;
 import io.scalecube.services.exceptions.ServiceUnavailableException;
-import io.scalecube.services.gateway.client.StaticAddressRouter;
 import io.scalecube.services.gateway.client.websocket.WebsocketGatewayClientTransport.Builder;
 import io.scalecube.services.gateway.http.HttpGateway;
 import io.scalecube.services.gateway.websocket.WebsocketGateway;
+import io.scalecube.services.routing.StaticAddressRouter;
 import io.scalecube.services.transport.rsocket.RSocketServiceTransport;
 import io.scalecube.transport.netty.websocket.WebsocketTransportFactory;
 import java.net.URI;

services-gateway/src/test/java/io/scalecube/services/gateway/http/HttpLocalGatewayTest.java

@@ -10,8 +10,8 @@
 import io.scalecube.services.Microservices.Context;
 import io.scalecube.services.ServiceCall;
 import io.scalecube.services.discovery.ScalecubeServiceDiscovery;
-import io.scalecube.services.gateway.client.StaticAddressRouter;
 import io.scalecube.services.gateway.client.websocket.WebsocketGatewayClientTransport;
+import io.scalecube.services.routing.StaticAddressRouter;
 import io.scalecube.services.transport.rsocket.RSocketServiceTransport;
 import io.scalecube.transport.netty.websocket.WebsocketTransportFactory;
 import java.io.IOException;

services-gateway/src/test/java/io/scalecube/services/gateway/rest/RestGatewayTest.java

@@ -13,8 +13,8 @@
 import io.scalecube.services.gateway.ErrorService;
 import io.scalecube.services.gateway.ErrorServiceImpl;
 import io.scalecube.services.gateway.SomeException;
-import io.scalecube.services.gateway.client.StaticAddressRouter;
 import io.scalecube.services.gateway.client.websocket.WebsocketGatewayClientTransport;
+import io.scalecube.services.routing.StaticAddressRouter;
 import io.scalecube.services.transport.rsocket.RSocketServiceTransport;
 import io.scalecube.transport.netty.websocket.WebsocketTransportFactory;
 import java.time.Duration;

services-gateway/src/test/java/io/scalecube/services/gateway/websocket/WebsocketClientConnectionTest.java

@@ -14,8 +14,8 @@
 import io.scalecube.services.gateway.AuthRegistry;
 import io.scalecube.services.gateway.SecuredService;
 import io.scalecube.services.gateway.SecuredServiceImpl;
-import io.scalecube.services.gateway.client.StaticAddressRouter;
 import io.scalecube.services.gateway.client.websocket.WebsocketGatewayClientTransport;
+import io.scalecube.services.routing.StaticAddressRouter;
 import java.time.Duration;
 import java.util.Collections;
 import java.util.HashSet;

services-gateway/src/test/java/io/scalecube/services/gateway/websocket/WebsocketClientTest.java

@@ -21,8 +21,8 @@
 import io.scalecube.services.gateway.ErrorService;
 import io.scalecube.services.gateway.ErrorServiceImpl;
 import io.scalecube.services.gateway.SomeException;
-import io.scalecube.services.gateway.client.StaticAddressRouter;
 import io.scalecube.services.gateway.client.websocket.WebsocketGatewayClientTransport;
+import io.scalecube.services.routing.StaticAddressRouter;
 import io.scalecube.services.transport.rsocket.RSocketServiceTransport;
 import io.scalecube.transport.netty.websocket.WebsocketTransportFactory;
 import java.time.Duration;

services-gateway/src/test/java/io/scalecube/services/gateway/websocket/WebsocketGatewayAuthTest.java

@@ -20,8 +20,8 @@
 import io.scalecube.services.gateway.ErrorService;
 import io.scalecube.services.gateway.ErrorServiceImpl;
 import io.scalecube.services.gateway.SomeException;
-import io.scalecube.services.gateway.client.StaticAddressRouter;
 import io.scalecube.services.gateway.client.websocket.WebsocketGatewayClientTransport;
+import io.scalecube.services.routing.StaticAddressRouter;
 import java.time.Duration;
 import java.util.List;
 import java.util.stream.Collectors;

services-gateway/src/test/java/io/scalecube/services/gateway/websocket/WebsocketGatewayTest.java

@@ -6,8 +6,8 @@
 import io.scalecube.services.ServiceCall;
 import io.scalecube.services.annotations.Service;
 import io.scalecube.services.annotations.ServiceMethod;
-import io.scalecube.services.gateway.client.StaticAddressRouter;
 import io.scalecube.services.gateway.client.websocket.WebsocketGatewayClientTransport;
+import io.scalecube.services.routing.StaticAddressRouter;
 import java.time.Duration;
 import java.util.stream.Collectors;
 import java.util.stream.IntStream;

services-gateway/src/test/java/io/scalecube/services/gateway/websocket/WebsocketLocalGatewayTest.java

@@ -5,7 +5,7 @@
   <parent>
     <groupId>io.scalecube</groupId>
     <artifactId>scalecube-services-parent</artifactId>
-    <version>2.12.4-SNAPSHOT</version>
+    <version>2.12.5-SNAPSHOT</version>
   </parent>
 
   <artifactId>scalecube-services-security</artifactId>

services-gateway/src/test/java/io/scalecube/services/gateway/websocket/WebsocketServerTest.java

@@ -5,7 +5,7 @@
   <parent>
     <groupId>io.scalecube</groupId>
     <artifactId>scalecube-services-parent</artifactId>
-    <version>2.12.4-SNAPSHOT</version>
+    <version>2.12.5-SNAPSHOT</version>
   </parent>
 
   <artifactId>services-testlib</artifactId>

services-security/pom.xml

@@ -5,7 +5,7 @@
   <parent>
     <groupId>io.scalecube</groupId>
     <artifactId>scalecube-services-parent</artifactId>
-    <version>2.12.4-SNAPSHOT</version>
+    <version>2.12.5-SNAPSHOT</version>
   </parent>
 
   <artifactId>scalecube-services-transport-parent</artifactId>

services-testlib/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>io.scalecube</groupId>
     <artifactId>scalecube-services-transport-parent</artifactId>
-    <version>2.12.4-SNAPSHOT</version>
+    <version>2.12.5-SNAPSHOT</version>
   </parent>
 
   <artifactId>scalecube-services-transport-jackson</artifactId>

services-transport-parent/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>io.scalecube</groupId>
     <artifactId>scalecube-services-transport-parent</artifactId>
-    <version>2.12.4-SNAPSHOT</version>
+    <version>2.12.5-SNAPSHOT</version>
   </parent>
 
   <artifactId>scalecube-services-transport-rsocket</artifactId>

services-transport-parent/services-transport-jackson/pom.xml

@@ -5,7 +5,7 @@
   <parent>
     <artifactId>scalecube-services-parent</artifactId>
     <groupId>io.scalecube</groupId>
-    <version>2.12.4-SNAPSHOT</version>
+    <version>2.12.5-SNAPSHOT</version>
   </parent>
 
   <artifactId>scalecube-services</artifactId>