Skip to content

Commit dbf6339

Browse files
authored
Fixed unstable tests, moved routers, updated version (#899)
1 parent 82833ee commit dbf6339

File tree

29 files changed

+307
-355
lines changed

29 files changed

+307
-355
lines changed

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
</parent>
1010

1111
<artifactId>scalecube-services-parent</artifactId>
12-
<version>2.12.4-SNAPSHOT</version>
12+
<version>2.12.5-SNAPSHOT</version>
1313
<packaging>pom</packaging>
1414
<name>ScaleCube-Services</name>
1515

services-api/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<groupId>io.scalecube</groupId>
88
<artifactId>scalecube-services-parent</artifactId>
9-
<version>2.12.4-SNAPSHOT</version>
9+
<version>2.12.5-SNAPSHOT</version>
1010
</parent>
1111

1212
<artifactId>scalecube-services-api</artifactId>
Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package io.scalecube.services.gateway.client;
1+
package io.scalecube.services.routing;
22

33
import io.scalecube.services.Address;
44
import io.scalecube.services.ServiceEndpoint;
@@ -7,7 +7,6 @@
77
import io.scalecube.services.ServiceRegistration;
88
import io.scalecube.services.api.ServiceMessage;
99
import io.scalecube.services.registry.api.ServiceRegistry;
10-
import io.scalecube.services.routing.Router;
1110
import java.util.Collections;
1211
import java.util.Optional;
1312
import java.util.UUID;
@@ -16,7 +15,7 @@
1615
* Syntethic router for returning pre-constructed {@link ServiceReference} instance with given
1716
* address.
1817
*/
19-
public final class StaticAddressRouter implements Router {
18+
public class StaticAddressRouter implements Router {
2019

2120
private final ServiceReference serviceReference;
2221

services-discovery/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<parent>
55
<groupId>io.scalecube</groupId>
66
<artifactId>scalecube-services-parent</artifactId>
7-
<version>2.12.4-SNAPSHOT</version>
7+
<version>2.12.5-SNAPSHOT</version>
88
</parent>
99

1010
<artifactId>scalecube-services-discovery</artifactId>

services-examples/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<groupId>io.scalecube</groupId>
77
<artifactId>scalecube-services-parent</artifactId>
8-
<version>2.12.4-SNAPSHOT</version>
8+
<version>2.12.5-SNAPSHOT</version>
99
</parent>
1010

1111
<artifactId>scalecube-services-examples</artifactId>

services-gateway/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<groupId>io.scalecube</groupId>
77
<artifactId>scalecube-services-parent</artifactId>
8-
<version>2.12.4-SNAPSHOT</version>
8+
<version>2.12.5-SNAPSHOT</version>
99
</parent>
1010

1111
<artifactId>scalecube-services-gateway</artifactId>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@
2121
import io.scalecube.services.exceptions.ServiceException;
2222
import io.scalecube.services.exceptions.ServiceProviderErrorMapper;
2323
import io.scalecube.services.gateway.ReferenceCountUtil;
24-
import io.scalecube.services.gateway.client.StaticAddressRouter;
2524
import io.scalecube.services.registry.api.ServiceRegistry;
25+
import io.scalecube.services.routing.StaticAddressRouter;
2626
import io.scalecube.services.transport.api.DataCodec;
2727
import java.util.List;
2828
import java.util.function.BiFunction;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,10 @@
2020
import io.scalecube.services.exceptions.InternalServiceException;
2121
import io.scalecube.services.exceptions.ServiceUnavailableException;
2222
import io.scalecube.services.files.FileServiceImpl;
23-
import io.scalecube.services.gateway.client.StaticAddressRouter;
2423
import io.scalecube.services.gateway.client.websocket.WebsocketGatewayClientTransport;
2524
import io.scalecube.services.gateway.http.HttpGateway;
2625
import io.scalecube.services.gateway.websocket.WebsocketGateway;
26+
import io.scalecube.services.routing.StaticAddressRouter;
2727
import io.scalecube.services.transport.api.ServiceTransport.CredentialsSupplier;
2828
import io.scalecube.services.transport.rsocket.RSocketServiceTransport;
2929
import io.scalecube.transport.netty.websocket.WebsocketTransportFactory;

0 commit comments

Comments
 (0)