From 5133b31a63f8aec36986c953de72678da65dbfcf Mon Sep 17 00:00:00 2001 From: Artem Vysochyn Date: Sun, 29 Sep 2024 18:50:19 +0300 Subject: [PATCH] Compactede ws/hjttp gateways --- .../services/gateway/http/HttpGateway.java | 5 ----- .../{exceptions => }/ErrorService.java | 2 +- .../{exceptions => }/ErrorServiceImpl.java | 2 +- .../GatewayErrorMapperImpl.java | 2 +- .../{exceptions => }/SomeException.java | 2 +- .../services/gateway/http/CorsTest.java | 19 ++++++++---------- .../http/HttpClientConnectionTest.java | 2 +- .../http/HttpClientErrorMapperTest.java | 8 ++++---- .../gateway/http/HttpGatewayExtension.java | 2 +- .../http/HttpLocalGatewayErrorMapperTest.java | 17 ++++++++-------- .../http/HttpLocalGatewayExtension.java | 2 +- .../CancelledSubscriber.java | 2 +- .../{websocket => ws}/ReactiveAdapter.java | 2 +- .../{websocket => ws}/ReactiveOperator.java | 2 +- .../WebsocketClientConnectionTest.java | 10 +++++----- .../WebsocketClientErrorMapperTest.java | 10 +++++----- .../WebsocketClientTest.java | 12 +++++------ .../WebsocketGatewayExtension.java | 5 ++--- .../WebsocketGatewayTest.java | 2 +- .../WebsocketLocalGatewayAuthTest.java | 2 +- .../WebsocketLocalGatewayErrorMapperTest.java | 20 +++++++++---------- .../WebsocketLocalGatewayExtension.java | 5 ++--- .../WebsocketLocalGatewayTest.java | 2 +- .../WebsocketLocalWithAuthExtension.java | 12 +++++------ .../WebsocketServerTest.java | 12 +++++------ 25 files changed, 71 insertions(+), 90 deletions(-) rename services-gateway/src/test/java/io/scalecube/services/gateway/{exceptions => }/ErrorService.java (86%) rename services-gateway/src/test/java/io/scalecube/services/gateway/{exceptions => }/ErrorServiceImpl.java (86%) rename services-gateway/src/test/java/io/scalecube/services/gateway/{exceptions => }/GatewayErrorMapperImpl.java (96%) rename services-gateway/src/test/java/io/scalecube/services/gateway/{exceptions => }/SomeException.java (87%) rename services-gateway/src/test/java/io/scalecube/services/gateway/{websocket => ws}/CancelledSubscriber.java (93%) rename services-gateway/src/test/java/io/scalecube/services/gateway/{websocket => ws}/ReactiveAdapter.java (98%) rename services-gateway/src/test/java/io/scalecube/services/gateway/{websocket => ws}/ReactiveOperator.java (87%) rename services-gateway/src/test/java/io/scalecube/services/gateway/{websocket => ws}/WebsocketClientConnectionTest.java (96%) rename services-gateway/src/test/java/io/scalecube/services/gateway/{websocket => ws}/WebsocketClientErrorMapperTest.java (76%) rename services-gateway/src/test/java/io/scalecube/services/gateway/{websocket => ws}/WebsocketClientTest.java (94%) rename services-gateway/src/test/java/io/scalecube/services/gateway/{websocket => ws}/WebsocketGatewayExtension.java (74%) rename services-gateway/src/test/java/io/scalecube/services/gateway/{websocket => ws}/WebsocketGatewayTest.java (99%) rename services-gateway/src/test/java/io/scalecube/services/gateway/{websocket => ws}/WebsocketLocalGatewayAuthTest.java (98%) rename services-gateway/src/test/java/io/scalecube/services/gateway/{websocket => ws}/WebsocketLocalGatewayErrorMapperTest.java (63%) rename services-gateway/src/test/java/io/scalecube/services/gateway/{websocket => ws}/WebsocketLocalGatewayExtension.java (82%) rename services-gateway/src/test/java/io/scalecube/services/gateway/{websocket => ws}/WebsocketLocalGatewayTest.java (99%) rename services-gateway/src/test/java/io/scalecube/services/gateway/{websocket => ws}/WebsocketLocalWithAuthExtension.java (70%) rename services-gateway/src/test/java/io/scalecube/services/gateway/{websocket => ws}/WebsocketServerTest.java (94%) diff --git a/services-gateway/src/main/java/io/scalecube/services/gateway/http/HttpGateway.java b/services-gateway/src/main/java/io/scalecube/services/gateway/http/HttpGateway.java index 04c120f65..272232b5c 100644 --- a/services-gateway/src/main/java/io/scalecube/services/gateway/http/HttpGateway.java +++ b/services-gateway/src/main/java/io/scalecube/services/gateway/http/HttpGateway.java @@ -11,7 +11,6 @@ import java.net.InetSocketAddress; import java.util.StringJoiner; import java.util.function.Consumer; -import java.util.function.UnaryOperator; import reactor.core.publisher.Flux; import reactor.core.publisher.Mono; import reactor.netty.DisposableServer; @@ -35,10 +34,6 @@ private HttpGateway(Builder builder) { this.corsConfigBuilder = builder.corsConfigBuilder; } - public HttpGateway(UnaryOperator operator) { - this(operator.apply(new Builder())); - } - @Override public String id() { return options.id(); diff --git a/services-gateway/src/test/java/io/scalecube/services/gateway/exceptions/ErrorService.java b/services-gateway/src/test/java/io/scalecube/services/gateway/ErrorService.java similarity index 86% rename from services-gateway/src/test/java/io/scalecube/services/gateway/exceptions/ErrorService.java rename to services-gateway/src/test/java/io/scalecube/services/gateway/ErrorService.java index 2ad2d183c..f00a269aa 100644 --- a/services-gateway/src/test/java/io/scalecube/services/gateway/exceptions/ErrorService.java +++ b/services-gateway/src/test/java/io/scalecube/services/gateway/ErrorService.java @@ -1,4 +1,4 @@ -package io.scalecube.services.gateway.exceptions; +package io.scalecube.services.gateway; import io.scalecube.services.annotations.Service; import io.scalecube.services.annotations.ServiceMethod; diff --git a/services-gateway/src/test/java/io/scalecube/services/gateway/exceptions/ErrorServiceImpl.java b/services-gateway/src/test/java/io/scalecube/services/gateway/ErrorServiceImpl.java similarity index 86% rename from services-gateway/src/test/java/io/scalecube/services/gateway/exceptions/ErrorServiceImpl.java rename to services-gateway/src/test/java/io/scalecube/services/gateway/ErrorServiceImpl.java index ba5042ea5..c50927d51 100644 --- a/services-gateway/src/test/java/io/scalecube/services/gateway/exceptions/ErrorServiceImpl.java +++ b/services-gateway/src/test/java/io/scalecube/services/gateway/ErrorServiceImpl.java @@ -1,4 +1,4 @@ -package io.scalecube.services.gateway.exceptions; +package io.scalecube.services.gateway; import reactor.core.publisher.Flux; import reactor.core.publisher.Mono; diff --git a/services-gateway/src/test/java/io/scalecube/services/gateway/exceptions/GatewayErrorMapperImpl.java b/services-gateway/src/test/java/io/scalecube/services/gateway/GatewayErrorMapperImpl.java similarity index 96% rename from services-gateway/src/test/java/io/scalecube/services/gateway/exceptions/GatewayErrorMapperImpl.java rename to services-gateway/src/test/java/io/scalecube/services/gateway/GatewayErrorMapperImpl.java index 792a1e457..317f00707 100644 --- a/services-gateway/src/test/java/io/scalecube/services/gateway/exceptions/GatewayErrorMapperImpl.java +++ b/services-gateway/src/test/java/io/scalecube/services/gateway/GatewayErrorMapperImpl.java @@ -1,4 +1,4 @@ -package io.scalecube.services.gateway.exceptions; +package io.scalecube.services.gateway; import io.scalecube.services.api.ErrorData; import io.scalecube.services.api.ServiceMessage; diff --git a/services-gateway/src/test/java/io/scalecube/services/gateway/exceptions/SomeException.java b/services-gateway/src/test/java/io/scalecube/services/gateway/SomeException.java similarity index 87% rename from services-gateway/src/test/java/io/scalecube/services/gateway/exceptions/SomeException.java rename to services-gateway/src/test/java/io/scalecube/services/gateway/SomeException.java index 49bc79431..0f2af4a96 100644 --- a/services-gateway/src/test/java/io/scalecube/services/gateway/exceptions/SomeException.java +++ b/services-gateway/src/test/java/io/scalecube/services/gateway/SomeException.java @@ -1,4 +1,4 @@ -package io.scalecube.services.gateway.exceptions; +package io.scalecube.services.gateway; import io.scalecube.services.exceptions.ServiceException; diff --git a/services-gateway/src/test/java/io/scalecube/services/gateway/http/CorsTest.java b/services-gateway/src/test/java/io/scalecube/services/gateway/http/CorsTest.java index e65464ecf..0f007543f 100644 --- a/services-gateway/src/test/java/io/scalecube/services/gateway/http/CorsTest.java +++ b/services-gateway/src/test/java/io/scalecube/services/gateway/http/CorsTest.java @@ -60,15 +60,13 @@ void testCrossOriginRequest() { gatewayBuilder .gateway( opts -> - new HttpGateway( - builder -> - builder - .options(opts.id("http").port(HTTP_PORT)) - .corsEnabled(true) - .corsConfigBuilder( - corsConfigBuilder -> - corsConfigBuilder.allowedRequestHeaders( - "Content-Type", "X-Correlation-ID")))) + new HttpGateway.Builder() + .options(opts.id("http").port(HTTP_PORT)) + .corsEnabled(true) + .corsConfigBuilder( + builder -> + builder.allowedRequestHeaders("Content-Type", "X-Correlation-ID")) + .build()) .start() .block(TIMEOUT); @@ -118,8 +116,7 @@ void testOptionRequestCorsDisabled() { gateway = gatewayBuilder .gateway( - opts -> - new HttpGateway(builder -> builder.options(opts.id("http").port(HTTP_PORT)))) + opts -> new HttpGateway.Builder().options(opts.id("http").port(HTTP_PORT)).build()) .start() .block(TIMEOUT); diff --git a/services-gateway/src/test/java/io/scalecube/services/gateway/http/HttpClientConnectionTest.java b/services-gateway/src/test/java/io/scalecube/services/gateway/http/HttpClientConnectionTest.java index 266ac97a5..185d97355 100644 --- a/services-gateway/src/test/java/io/scalecube/services/gateway/http/HttpClientConnectionTest.java +++ b/services-gateway/src/test/java/io/scalecube/services/gateway/http/HttpClientConnectionTest.java @@ -49,7 +49,7 @@ void beforEach() { .transport(cfg -> cfg.transportFactory(new WebsocketTransportFactory())) .options(opts -> opts.metadata(serviceEndpoint))) .transport(RSocketServiceTransport::new) - .gateway(options -> new HttpGateway(builder -> builder.options(options.id("HTTP")))) + .gateway(options -> new HttpGateway.Builder().options(options.id("HTTP")).build()) .startAwait(); gatewayAddress = gateway.gateway("HTTP").address(); diff --git a/services-gateway/src/test/java/io/scalecube/services/gateway/http/HttpClientErrorMapperTest.java b/services-gateway/src/test/java/io/scalecube/services/gateway/http/HttpClientErrorMapperTest.java index 88299caf9..bae09f4b2 100644 --- a/services-gateway/src/test/java/io/scalecube/services/gateway/http/HttpClientErrorMapperTest.java +++ b/services-gateway/src/test/java/io/scalecube/services/gateway/http/HttpClientErrorMapperTest.java @@ -1,13 +1,13 @@ package io.scalecube.services.gateway.http; +import static io.scalecube.services.gateway.GatewayErrorMapperImpl.ERROR_MAPPER; import static io.scalecube.services.gateway.TestUtils.TIMEOUT; -import static io.scalecube.services.gateway.exceptions.GatewayErrorMapperImpl.ERROR_MAPPER; import io.scalecube.services.ServiceInfo; import io.scalecube.services.gateway.BaseTest; -import io.scalecube.services.gateway.exceptions.ErrorService; -import io.scalecube.services.gateway.exceptions.ErrorServiceImpl; -import io.scalecube.services.gateway.exceptions.SomeException; +import io.scalecube.services.gateway.ErrorService; +import io.scalecube.services.gateway.ErrorServiceImpl; +import io.scalecube.services.gateway.SomeException; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; diff --git a/services-gateway/src/test/java/io/scalecube/services/gateway/http/HttpGatewayExtension.java b/services-gateway/src/test/java/io/scalecube/services/gateway/http/HttpGatewayExtension.java index e18e05e63..ecbb744f9 100644 --- a/services-gateway/src/test/java/io/scalecube/services/gateway/http/HttpGatewayExtension.java +++ b/services-gateway/src/test/java/io/scalecube/services/gateway/http/HttpGatewayExtension.java @@ -15,7 +15,7 @@ class HttpGatewayExtension extends AbstractGatewayExtension { HttpGatewayExtension(ServiceInfo serviceInfo) { super( serviceInfo, - opts -> new HttpGateway(builder -> builder.options(opts.id(GATEWAY_ALIAS_NAME))), + opts -> new HttpGateway.Builder().options(opts.id(GATEWAY_ALIAS_NAME)).build(), GatewayClientTransports::httpGatewayClientTransport); } } diff --git a/services-gateway/src/test/java/io/scalecube/services/gateway/http/HttpLocalGatewayErrorMapperTest.java b/services-gateway/src/test/java/io/scalecube/services/gateway/http/HttpLocalGatewayErrorMapperTest.java index be142db07..614b78719 100644 --- a/services-gateway/src/test/java/io/scalecube/services/gateway/http/HttpLocalGatewayErrorMapperTest.java +++ b/services-gateway/src/test/java/io/scalecube/services/gateway/http/HttpLocalGatewayErrorMapperTest.java @@ -1,13 +1,13 @@ package io.scalecube.services.gateway.http; +import static io.scalecube.services.gateway.GatewayErrorMapperImpl.ERROR_MAPPER; import static io.scalecube.services.gateway.TestUtils.TIMEOUT; -import static io.scalecube.services.gateway.exceptions.GatewayErrorMapperImpl.ERROR_MAPPER; import io.scalecube.services.ServiceInfo; import io.scalecube.services.gateway.BaseTest; -import io.scalecube.services.gateway.exceptions.ErrorService; -import io.scalecube.services.gateway.exceptions.ErrorServiceImpl; -import io.scalecube.services.gateway.exceptions.SomeException; +import io.scalecube.services.gateway.ErrorService; +import io.scalecube.services.gateway.ErrorServiceImpl; +import io.scalecube.services.gateway.SomeException; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; @@ -22,11 +22,10 @@ class HttpLocalGatewayErrorMapperTest extends BaseTest { new HttpLocalGatewayExtension( ServiceInfo.fromServiceInstance(new ErrorServiceImpl()).errorMapper(ERROR_MAPPER).build(), opts -> - new HttpGateway( - builder -> - builder - .options(opts.call(opts.call().errorMapper(ERROR_MAPPER))) - .errorMapper(ERROR_MAPPER))); + new HttpGateway.Builder() + .options(opts.call(opts.call().errorMapper(ERROR_MAPPER))) + .errorMapper(ERROR_MAPPER) + .build()); private ErrorService service; diff --git a/services-gateway/src/test/java/io/scalecube/services/gateway/http/HttpLocalGatewayExtension.java b/services-gateway/src/test/java/io/scalecube/services/gateway/http/HttpLocalGatewayExtension.java index bf57d041e..f181d0d15 100644 --- a/services-gateway/src/test/java/io/scalecube/services/gateway/http/HttpLocalGatewayExtension.java +++ b/services-gateway/src/test/java/io/scalecube/services/gateway/http/HttpLocalGatewayExtension.java @@ -15,7 +15,7 @@ class HttpLocalGatewayExtension extends AbstractLocalGatewayExtension { } HttpLocalGatewayExtension(ServiceInfo serviceInfo) { - this(serviceInfo, opts -> new HttpGateway(builder -> builder.options(opts))); + this(serviceInfo, opts -> new HttpGateway.Builder().options(opts).build()); } HttpLocalGatewayExtension( diff --git a/services-gateway/src/test/java/io/scalecube/services/gateway/websocket/CancelledSubscriber.java b/services-gateway/src/test/java/io/scalecube/services/gateway/ws/CancelledSubscriber.java similarity index 93% rename from services-gateway/src/test/java/io/scalecube/services/gateway/websocket/CancelledSubscriber.java rename to services-gateway/src/test/java/io/scalecube/services/gateway/ws/CancelledSubscriber.java index 2e7cc6b5f..b6f700720 100644 --- a/services-gateway/src/test/java/io/scalecube/services/gateway/websocket/CancelledSubscriber.java +++ b/services-gateway/src/test/java/io/scalecube/services/gateway/ws/CancelledSubscriber.java @@ -1,4 +1,4 @@ -package io.scalecube.services.gateway.websocket; +package io.scalecube.services.gateway.ws; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/services-gateway/src/test/java/io/scalecube/services/gateway/websocket/ReactiveAdapter.java b/services-gateway/src/test/java/io/scalecube/services/gateway/ws/ReactiveAdapter.java similarity index 98% rename from services-gateway/src/test/java/io/scalecube/services/gateway/websocket/ReactiveAdapter.java rename to services-gateway/src/test/java/io/scalecube/services/gateway/ws/ReactiveAdapter.java index 738a81a7d..af3f89546 100644 --- a/services-gateway/src/test/java/io/scalecube/services/gateway/websocket/ReactiveAdapter.java +++ b/services-gateway/src/test/java/io/scalecube/services/gateway/ws/ReactiveAdapter.java @@ -1,4 +1,4 @@ -package io.scalecube.services.gateway.websocket; +package io.scalecube.services.gateway.ws; import java.util.concurrent.atomic.AtomicLongFieldUpdater; import java.util.concurrent.atomic.AtomicReferenceFieldUpdater; diff --git a/services-gateway/src/test/java/io/scalecube/services/gateway/websocket/ReactiveOperator.java b/services-gateway/src/test/java/io/scalecube/services/gateway/ws/ReactiveOperator.java similarity index 87% rename from services-gateway/src/test/java/io/scalecube/services/gateway/websocket/ReactiveOperator.java rename to services-gateway/src/test/java/io/scalecube/services/gateway/ws/ReactiveOperator.java index 5007a539b..7e4cab189 100644 --- a/services-gateway/src/test/java/io/scalecube/services/gateway/websocket/ReactiveOperator.java +++ b/services-gateway/src/test/java/io/scalecube/services/gateway/ws/ReactiveOperator.java @@ -1,4 +1,4 @@ -package io.scalecube.services.gateway.websocket; +package io.scalecube.services.gateway.ws; import reactor.core.Disposable; diff --git a/services-gateway/src/test/java/io/scalecube/services/gateway/websocket/WebsocketClientConnectionTest.java b/services-gateway/src/test/java/io/scalecube/services/gateway/ws/WebsocketClientConnectionTest.java similarity index 96% rename from services-gateway/src/test/java/io/scalecube/services/gateway/websocket/WebsocketClientConnectionTest.java rename to services-gateway/src/test/java/io/scalecube/services/gateway/ws/WebsocketClientConnectionTest.java index 61458e667..3ffa02806 100644 --- a/services-gateway/src/test/java/io/scalecube/services/gateway/websocket/WebsocketClientConnectionTest.java +++ b/services-gateway/src/test/java/io/scalecube/services/gateway/ws/WebsocketClientConnectionTest.java @@ -1,4 +1,4 @@ -package io.scalecube.services.gateway.websocket; +package io.scalecube.services.gateway.ws; import static io.scalecube.services.gateway.TestUtils.TIMEOUT; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -24,7 +24,6 @@ import io.scalecube.services.gateway.client.StaticAddressRouter; import io.scalecube.services.gateway.client.websocket.WebsocketGatewayClient; import io.scalecube.services.gateway.client.websocket.WebsocketGatewayClientSession; -import io.scalecube.services.gateway.ws.WebsocketGateway; import io.scalecube.services.transport.rsocket.RSocketServiceTransport; import io.scalecube.transport.netty.websocket.WebsocketTransportFactory; import java.io.IOException; @@ -70,9 +69,10 @@ void beforEach() { .transport(RSocketServiceTransport::new) .gateway( options -> - new WebsocketGateway( - builder -> - builder.options(options.id("WS")).gatewayHandler(sessionEventHandler))) + new WebsocketGateway.Builder() + .options(options.id("WS")) + .gatewayHandler(sessionEventHandler) + .build()) .startAwait(); gatewayAddress = gateway.gateway("WS").address(); diff --git a/services-gateway/src/test/java/io/scalecube/services/gateway/websocket/WebsocketClientErrorMapperTest.java b/services-gateway/src/test/java/io/scalecube/services/gateway/ws/WebsocketClientErrorMapperTest.java similarity index 76% rename from services-gateway/src/test/java/io/scalecube/services/gateway/websocket/WebsocketClientErrorMapperTest.java rename to services-gateway/src/test/java/io/scalecube/services/gateway/ws/WebsocketClientErrorMapperTest.java index 6121f8d42..dec796a37 100644 --- a/services-gateway/src/test/java/io/scalecube/services/gateway/websocket/WebsocketClientErrorMapperTest.java +++ b/services-gateway/src/test/java/io/scalecube/services/gateway/ws/WebsocketClientErrorMapperTest.java @@ -1,13 +1,13 @@ -package io.scalecube.services.gateway.websocket; +package io.scalecube.services.gateway.ws; +import static io.scalecube.services.gateway.GatewayErrorMapperImpl.ERROR_MAPPER; import static io.scalecube.services.gateway.TestUtils.TIMEOUT; -import static io.scalecube.services.gateway.exceptions.GatewayErrorMapperImpl.ERROR_MAPPER; import io.scalecube.services.ServiceInfo; import io.scalecube.services.gateway.BaseTest; -import io.scalecube.services.gateway.exceptions.ErrorService; -import io.scalecube.services.gateway.exceptions.ErrorServiceImpl; -import io.scalecube.services.gateway.exceptions.SomeException; +import io.scalecube.services.gateway.ErrorService; +import io.scalecube.services.gateway.ErrorServiceImpl; +import io.scalecube.services.gateway.SomeException; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/services-gateway/src/test/java/io/scalecube/services/gateway/websocket/WebsocketClientTest.java b/services-gateway/src/test/java/io/scalecube/services/gateway/ws/WebsocketClientTest.java similarity index 94% rename from services-gateway/src/test/java/io/scalecube/services/gateway/websocket/WebsocketClientTest.java rename to services-gateway/src/test/java/io/scalecube/services/gateway/ws/WebsocketClientTest.java index 87252a807..2327f9939 100644 --- a/services-gateway/src/test/java/io/scalecube/services/gateway/websocket/WebsocketClientTest.java +++ b/services-gateway/src/test/java/io/scalecube/services/gateway/ws/WebsocketClientTest.java @@ -1,4 +1,4 @@ -package io.scalecube.services.gateway.websocket; +package io.scalecube.services.gateway.ws; import io.netty.buffer.ByteBuf; import io.scalecube.services.Address; @@ -16,7 +16,6 @@ import io.scalecube.services.gateway.client.GatewayClientTransports; import io.scalecube.services.gateway.client.StaticAddressRouter; import io.scalecube.services.gateway.client.websocket.WebsocketGatewayClient; -import io.scalecube.services.gateway.ws.WebsocketGateway; import io.scalecube.services.transport.rsocket.RSocketServiceTransport; import io.scalecube.transport.netty.websocket.WebsocketTransportFactory; import java.time.Duration; @@ -56,11 +55,10 @@ static void beforeAll() { .transport(RSocketServiceTransport::new) .gateway( options -> - new WebsocketGateway( - builder -> - builder - .options(options.id("WS")) - .gatewayHandler(new TestGatewaySessionHandler()))) + new WebsocketGateway.Builder() + .options(options.id("WS")) + .gatewayHandler(new TestGatewaySessionHandler()) + .build()) .startAwait(); gatewayAddress = gateway.gateway("WS").address(); diff --git a/services-gateway/src/test/java/io/scalecube/services/gateway/websocket/WebsocketGatewayExtension.java b/services-gateway/src/test/java/io/scalecube/services/gateway/ws/WebsocketGatewayExtension.java similarity index 74% rename from services-gateway/src/test/java/io/scalecube/services/gateway/websocket/WebsocketGatewayExtension.java rename to services-gateway/src/test/java/io/scalecube/services/gateway/ws/WebsocketGatewayExtension.java index 19b01588b..145f0f0f6 100644 --- a/services-gateway/src/test/java/io/scalecube/services/gateway/websocket/WebsocketGatewayExtension.java +++ b/services-gateway/src/test/java/io/scalecube/services/gateway/ws/WebsocketGatewayExtension.java @@ -1,9 +1,8 @@ -package io.scalecube.services.gateway.websocket; +package io.scalecube.services.gateway.ws; import io.scalecube.services.ServiceInfo; import io.scalecube.services.gateway.AbstractGatewayExtension; import io.scalecube.services.gateway.client.GatewayClientTransports; -import io.scalecube.services.gateway.ws.WebsocketGateway; class WebsocketGatewayExtension extends AbstractGatewayExtension { @@ -16,7 +15,7 @@ class WebsocketGatewayExtension extends AbstractGatewayExtension { WebsocketGatewayExtension(ServiceInfo serviceInfo) { super( serviceInfo, - opts -> new WebsocketGateway(builder -> builder.options(opts.id(GATEWAY_ALIAS_NAME))), + opts -> new WebsocketGateway.Builder().options(opts.id(GATEWAY_ALIAS_NAME)).build(), GatewayClientTransports::websocketGatewayClientTransport); } } diff --git a/services-gateway/src/test/java/io/scalecube/services/gateway/websocket/WebsocketGatewayTest.java b/services-gateway/src/test/java/io/scalecube/services/gateway/ws/WebsocketGatewayTest.java similarity index 99% rename from services-gateway/src/test/java/io/scalecube/services/gateway/websocket/WebsocketGatewayTest.java rename to services-gateway/src/test/java/io/scalecube/services/gateway/ws/WebsocketGatewayTest.java index acf5b2a76..67fd830a6 100644 --- a/services-gateway/src/test/java/io/scalecube/services/gateway/websocket/WebsocketGatewayTest.java +++ b/services-gateway/src/test/java/io/scalecube/services/gateway/ws/WebsocketGatewayTest.java @@ -1,4 +1,4 @@ -package io.scalecube.services.gateway.websocket; +package io.scalecube.services.gateway.ws; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/services-gateway/src/test/java/io/scalecube/services/gateway/websocket/WebsocketLocalGatewayAuthTest.java b/services-gateway/src/test/java/io/scalecube/services/gateway/ws/WebsocketLocalGatewayAuthTest.java similarity index 98% rename from services-gateway/src/test/java/io/scalecube/services/gateway/websocket/WebsocketLocalGatewayAuthTest.java rename to services-gateway/src/test/java/io/scalecube/services/gateway/ws/WebsocketLocalGatewayAuthTest.java index a7b61a5b2..62d7a27af 100644 --- a/services-gateway/src/test/java/io/scalecube/services/gateway/websocket/WebsocketLocalGatewayAuthTest.java +++ b/services-gateway/src/test/java/io/scalecube/services/gateway/ws/WebsocketLocalGatewayAuthTest.java @@ -1,4 +1,4 @@ -package io.scalecube.services.gateway.websocket; +package io.scalecube.services.gateway.ws; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; diff --git a/services-gateway/src/test/java/io/scalecube/services/gateway/websocket/WebsocketLocalGatewayErrorMapperTest.java b/services-gateway/src/test/java/io/scalecube/services/gateway/ws/WebsocketLocalGatewayErrorMapperTest.java similarity index 63% rename from services-gateway/src/test/java/io/scalecube/services/gateway/websocket/WebsocketLocalGatewayErrorMapperTest.java rename to services-gateway/src/test/java/io/scalecube/services/gateway/ws/WebsocketLocalGatewayErrorMapperTest.java index c698caacc..71fc5c801 100644 --- a/services-gateway/src/test/java/io/scalecube/services/gateway/websocket/WebsocketLocalGatewayErrorMapperTest.java +++ b/services-gateway/src/test/java/io/scalecube/services/gateway/ws/WebsocketLocalGatewayErrorMapperTest.java @@ -1,14 +1,13 @@ -package io.scalecube.services.gateway.websocket; +package io.scalecube.services.gateway.ws; +import static io.scalecube.services.gateway.GatewayErrorMapperImpl.ERROR_MAPPER; import static io.scalecube.services.gateway.TestUtils.TIMEOUT; -import static io.scalecube.services.gateway.exceptions.GatewayErrorMapperImpl.ERROR_MAPPER; import io.scalecube.services.ServiceInfo; import io.scalecube.services.gateway.BaseTest; -import io.scalecube.services.gateway.exceptions.ErrorService; -import io.scalecube.services.gateway.exceptions.ErrorServiceImpl; -import io.scalecube.services.gateway.exceptions.SomeException; -import io.scalecube.services.gateway.ws.WebsocketGateway; +import io.scalecube.services.gateway.ErrorService; +import io.scalecube.services.gateway.ErrorServiceImpl; +import io.scalecube.services.gateway.SomeException; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -21,11 +20,10 @@ class WebsocketLocalGatewayErrorMapperTest extends BaseTest { new WebsocketLocalGatewayExtension( ServiceInfo.fromServiceInstance(new ErrorServiceImpl()).errorMapper(ERROR_MAPPER).build(), opts -> - new WebsocketGateway( - builder -> - builder - .options(opts.call(opts.call().errorMapper(ERROR_MAPPER))) - .errorMapper(ERROR_MAPPER))); + new WebsocketGateway.Builder() + .options(opts.call(opts.call().errorMapper(ERROR_MAPPER))) + .errorMapper(ERROR_MAPPER) + .build()); private ErrorService service; diff --git a/services-gateway/src/test/java/io/scalecube/services/gateway/websocket/WebsocketLocalGatewayExtension.java b/services-gateway/src/test/java/io/scalecube/services/gateway/ws/WebsocketLocalGatewayExtension.java similarity index 82% rename from services-gateway/src/test/java/io/scalecube/services/gateway/websocket/WebsocketLocalGatewayExtension.java rename to services-gateway/src/test/java/io/scalecube/services/gateway/ws/WebsocketLocalGatewayExtension.java index ce213fe40..35bc08a0d 100644 --- a/services-gateway/src/test/java/io/scalecube/services/gateway/websocket/WebsocketLocalGatewayExtension.java +++ b/services-gateway/src/test/java/io/scalecube/services/gateway/ws/WebsocketLocalGatewayExtension.java @@ -1,10 +1,9 @@ -package io.scalecube.services.gateway.websocket; +package io.scalecube.services.gateway.ws; import io.scalecube.services.ServiceInfo; import io.scalecube.services.gateway.AbstractLocalGatewayExtension; import io.scalecube.services.gateway.GatewayOptions; import io.scalecube.services.gateway.client.GatewayClientTransports; -import io.scalecube.services.gateway.ws.WebsocketGateway; import java.util.function.Function; class WebsocketLocalGatewayExtension extends AbstractLocalGatewayExtension { @@ -16,7 +15,7 @@ class WebsocketLocalGatewayExtension extends AbstractLocalGatewayExtension { } WebsocketLocalGatewayExtension(ServiceInfo serviceInfo) { - this(serviceInfo, opts -> new WebsocketGateway(builder -> builder.options(opts))); + this(serviceInfo, opts -> new WebsocketGateway.Builder().options(opts).build()); } WebsocketLocalGatewayExtension( diff --git a/services-gateway/src/test/java/io/scalecube/services/gateway/websocket/WebsocketLocalGatewayTest.java b/services-gateway/src/test/java/io/scalecube/services/gateway/ws/WebsocketLocalGatewayTest.java similarity index 99% rename from services-gateway/src/test/java/io/scalecube/services/gateway/websocket/WebsocketLocalGatewayTest.java rename to services-gateway/src/test/java/io/scalecube/services/gateway/ws/WebsocketLocalGatewayTest.java index 12955cf7e..5bc967411 100644 --- a/services-gateway/src/test/java/io/scalecube/services/gateway/websocket/WebsocketLocalGatewayTest.java +++ b/services-gateway/src/test/java/io/scalecube/services/gateway/ws/WebsocketLocalGatewayTest.java @@ -1,4 +1,4 @@ -package io.scalecube.services.gateway.websocket; +package io.scalecube.services.gateway.ws; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/services-gateway/src/test/java/io/scalecube/services/gateway/websocket/WebsocketLocalWithAuthExtension.java b/services-gateway/src/test/java/io/scalecube/services/gateway/ws/WebsocketLocalWithAuthExtension.java similarity index 70% rename from services-gateway/src/test/java/io/scalecube/services/gateway/websocket/WebsocketLocalWithAuthExtension.java rename to services-gateway/src/test/java/io/scalecube/services/gateway/ws/WebsocketLocalWithAuthExtension.java index 15a703449..6ba3fab3f 100644 --- a/services-gateway/src/test/java/io/scalecube/services/gateway/websocket/WebsocketLocalWithAuthExtension.java +++ b/services-gateway/src/test/java/io/scalecube/services/gateway/ws/WebsocketLocalWithAuthExtension.java @@ -1,11 +1,10 @@ -package io.scalecube.services.gateway.websocket; +package io.scalecube.services.gateway.ws; import io.scalecube.services.ServiceInfo; import io.scalecube.services.gateway.AbstractLocalGatewayExtension; import io.scalecube.services.gateway.AuthRegistry; import io.scalecube.services.gateway.GatewaySessionHandlerImpl; import io.scalecube.services.gateway.client.GatewayClientTransports; -import io.scalecube.services.gateway.ws.WebsocketGateway; public class WebsocketLocalWithAuthExtension extends AbstractLocalGatewayExtension { @@ -19,11 +18,10 @@ public class WebsocketLocalWithAuthExtension extends AbstractLocalGatewayExtensi super( serviceInfo, opts -> - new WebsocketGateway( - builder -> - builder - .options(opts.id(GATEWAY_ALIAS_NAME)) - .gatewayHandler(new GatewaySessionHandlerImpl(authReg))), + new WebsocketGateway.Builder() + .options(opts.id(GATEWAY_ALIAS_NAME)) + .gatewayHandler(new GatewaySessionHandlerImpl(authReg)) + .build(), GatewayClientTransports::websocketGatewayClientTransport); } } diff --git a/services-gateway/src/test/java/io/scalecube/services/gateway/websocket/WebsocketServerTest.java b/services-gateway/src/test/java/io/scalecube/services/gateway/ws/WebsocketServerTest.java similarity index 94% rename from services-gateway/src/test/java/io/scalecube/services/gateway/websocket/WebsocketServerTest.java rename to services-gateway/src/test/java/io/scalecube/services/gateway/ws/WebsocketServerTest.java index 02273bdea..02e14b54b 100644 --- a/services-gateway/src/test/java/io/scalecube/services/gateway/websocket/WebsocketServerTest.java +++ b/services-gateway/src/test/java/io/scalecube/services/gateway/ws/WebsocketServerTest.java @@ -1,4 +1,4 @@ -package io.scalecube.services.gateway.websocket; +package io.scalecube.services.gateway.ws; import io.netty.buffer.ByteBuf; import io.scalecube.services.Address; @@ -16,7 +16,6 @@ import io.scalecube.services.gateway.client.GatewayClientTransports; import io.scalecube.services.gateway.client.StaticAddressRouter; import io.scalecube.services.gateway.client.websocket.WebsocketGatewayClient; -import io.scalecube.services.gateway.ws.WebsocketGateway; import io.scalecube.services.transport.rsocket.RSocketServiceTransport; import io.scalecube.transport.netty.websocket.WebsocketTransportFactory; import java.time.Duration; @@ -55,11 +54,10 @@ static void beforeAll() { .transport(RSocketServiceTransport::new) .gateway( options -> - new WebsocketGateway( - builder -> - builder - .options(options.id("WS")) - .gatewayHandler(new TestGatewaySessionHandler()))) + new WebsocketGateway.Builder() + .options(options.id("WS")) + .gatewayHandler(new TestGatewaySessionHandler()) + .build()) .transport(RSocketServiceTransport::new) .services(new TestServiceImpl()) .startAwait();