Enhanced StaticAddressRouter

Author: artem-v

services-api/src/main/java/io/scalecube/services/routing/StaticAddressRouter.java

@@ -24,6 +24,7 @@ public class StaticAddressRouter implements Router {
 
   private StaticAddressRouter(Builder builder) {
     Objects.requireNonNull(builder.address, "builder.address");
+    Objects.requireNonNull(builder.serviceName, "builder.serviceName");
     serviceReference =
         new ServiceReference(
             ServiceMethodDefinition.builder()
@@ -40,8 +41,15 @@ private StaticAddressRouter(Builder builder) {
                 .build());
   }
 
-  public static Builder from(Address address) {
-    return new Builder().address(address);
+  /**
+   * Creates {@link Builder} with service address and service name.
+   *
+   * @param address service address
+   * @param name logical service name
+   * @return builder instance
+   */
+  public static Builder forService(Address address, String name) {
+    return new Builder().address(address).serviceName(name);
   }
 
   @Override

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

@@ -196,8 +196,7 @@ private static ServiceReference matchFileRequest(List<ServiceReference> list) {
   private Mono<Void> handleFileRequest(
       ServiceReference service, ServiceMessage message, HttpServerResponse response) {
     return serviceCall
-        .router(
-            StaticAddressRouter.from(service.address()).serviceName(service.endpointName()).build())
+        .router(StaticAddressRouter.forService(service.address(), service.endpointName()).build())
         .requestMany(message)
         .switchOnFirst(
             (signal, flux) -> {

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

@@ -106,7 +106,7 @@ static void afterAll() {
   void beforeEach() {
     serviceCall =
         new ServiceCall()
-            .router(StaticAddressRouter.from(wsAddress).serviceName("app-service").build())
+            .router(StaticAddressRouter.forService(wsAddress, "app-service").build())
             .transport(WebsocketGatewayClientTransport.builder().address(wsAddress).build());
   }
 

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

@@ -102,7 +102,7 @@ private static ServiceCall serviceCall(Address address) {
     return new ServiceCall()
         .logger("serviceCall")
         .transport(HttpGatewayClientTransport.builder().address(address).build())
-        .router(StaticAddressRouter.from(address).serviceName("app-service").build());
+        .router(StaticAddressRouter.forService(address, "app-service").build());
   }
 
   @Service

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

@@ -60,7 +60,7 @@ static void beforeAll() {
                 .gateway(() -> HttpGateway.builder().id("HTTP").errorMapper(ERROR_MAPPER).build()));
 
     gatewayAddress = gateway.gateway("HTTP").address();
-    router = StaticAddressRouter.from(gatewayAddress).serviceName("app-service").build();
+    router = StaticAddressRouter.forService(gatewayAddress, "app-service").build();
 
     microservices =
         Microservices.start(

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

@@ -55,7 +55,7 @@ static void beforeAll() {
                         .errorMapper(ERROR_MAPPER)
                         .build()));
     gatewayAddress = gateway.gateway("HTTP").address();
-    router = StaticAddressRouter.from(gatewayAddress).serviceName("app-service").build();
+    router = StaticAddressRouter.forService(gatewayAddress, "app-service").build();
   }
 
   @BeforeEach

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

@@ -298,8 +298,7 @@ void testNoMatchByRestMethod() throws Exception {
     @Test
     void testNoMatchWithoutRestMethod() {
       final var gatewayAddress = gateway.gateway("WS").address();
-      final var router =
-          StaticAddressRouter.from(gatewayAddress).serviceName("app-service").build();
+      final var router = StaticAddressRouter.forService(gatewayAddress, "app-service").build();
       final var clientTransport =
           WebsocketGatewayClientTransport.builder().address(gatewayAddress).build();
 

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

@@ -142,7 +142,7 @@ void testClientHeaders() {
                     .address(gatewayAddress)
                     .headers(Collections.singletonMap(headerKey, headerValue))
                     .build())
-            .router(StaticAddressRouter.from(gatewayAddress).serviceName("app-service").build())) {
+            .router(StaticAddressRouter.forService(gatewayAddress, "app-service").build())) {
       StepVerifier.create(
               serviceCall
                   .api(TestService.class)
@@ -157,6 +157,6 @@ void testClientHeaders() {
   private static ServiceCall serviceCall(Address address) {
     return new ServiceCall()
         .transport(WebsocketGatewayClientTransport.builder().address(address).build())
-        .router(StaticAddressRouter.from(address).serviceName("app-service").build());
+        .router(StaticAddressRouter.forService(address, "app-service").build());
   }
 }

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

@@ -112,7 +112,7 @@ void shouldReturnSomeExceptionOnMono() {
   private static ServiceCall serviceCall(final Address address) {
     return new ServiceCall()
         .transport(WebsocketGatewayClientTransport.builder().address(address).build())
-        .router(StaticAddressRouter.from(address).serviceName("app-service").build());
+        .router(StaticAddressRouter.forService(address, "app-service").build());
   }
 
   @Service

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

@@ -58,7 +58,7 @@ void beforeEach() {
 
     serviceCall =
         new ServiceCall()
-            .router(StaticAddressRouter.from(gatewayAddress).serviceName("app-service").build())
+            .router(StaticAddressRouter.forService(gatewayAddress, "app-service").build())
             .transport(WebsocketGatewayClientTransport.builder().address(gatewayAddress).build());
 
     securedService = serviceCall.api(SecuredService.class);