Compactede ws/hjttp gateways

scalecube · Sep 29, 2024 · 5133b31 · 5133b31
1 parent 83c783b
commit 5133b31
Show file tree

Hide file tree

Showing 25 changed files with 71 additions and 90 deletions.
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
@@ -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<Builder> operator) {
- this(operator.apply(new Builder()));
- }
-
  @Override
  public String id() {
  return options.id();

diff --git a/...ices/gateway/exceptions/ErrorService.java → ...lecube/services/gateway/ErrorService.java b/...ices/gateway/exceptions/ErrorService.java → ...lecube/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/.../gateway/exceptions/ErrorServiceImpl.java → ...be/services/gateway/ErrorServiceImpl.java b/.../gateway/exceptions/ErrorServiceImpl.java → ...be/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/...ay/exceptions/GatewayErrorMapperImpl.java → ...vices/gateway/GatewayErrorMapperImpl.java b/...ay/exceptions/GatewayErrorMapperImpl.java → ...vices/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/...ces/gateway/exceptions/SomeException.java → ...ecube/services/gateway/SomeException.java b/...ces/gateway/exceptions/SomeException.java → ...ecube/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
@@ -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/...es-gateway/src/test/java/io/scalecube/services/gateway/http/HttpClientConnectionTest.java b/...es-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/...s-gateway/src/test/java/io/scalecube/services/gateway/http/HttpClientErrorMapperTest.java b/...s-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
@@ -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/...way/src/test/java/io/scalecube/services/gateway/http/HttpLocalGatewayErrorMapperTest.java b/...way/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/...s-gateway/src/test/java/io/scalecube/services/gateway/http/HttpLocalGatewayExtension.java b/...s-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/...ateway/websocket/CancelledSubscriber.java → ...vices/gateway/ws/CancelledSubscriber.java b/...ateway/websocket/CancelledSubscriber.java → ...vices/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/...es/gateway/websocket/ReactiveAdapter.java → .../services/gateway/ws/ReactiveAdapter.java b/...es/gateway/websocket/ReactiveAdapter.java → .../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/...s/gateway/websocket/ReactiveOperator.java → ...services/gateway/ws/ReactiveOperator.java b/...s/gateway/websocket/ReactiveOperator.java → ...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/...socket/WebsocketClientConnectionTest.java → ...way/ws/WebsocketClientConnectionTest.java b/...socket/WebsocketClientConnectionTest.java → ...way/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/...ocket/WebsocketClientErrorMapperTest.java → ...ay/ws/WebsocketClientErrorMapperTest.java b/...ocket/WebsocketClientErrorMapperTest.java → ...ay/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/...ateway/websocket/WebsocketClientTest.java → ...vices/gateway/ws/WebsocketClientTest.java b/...ateway/websocket/WebsocketClientTest.java → ...vices/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/.../websocket/WebsocketGatewayExtension.java → ...gateway/ws/WebsocketGatewayExtension.java b/.../websocket/WebsocketGatewayExtension.java → ...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/...teway/websocket/WebsocketGatewayTest.java → ...ices/gateway/ws/WebsocketGatewayTest.java b/...teway/websocket/WebsocketGatewayTest.java → ...ices/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/...socket/WebsocketLocalGatewayAuthTest.java → ...way/ws/WebsocketLocalGatewayAuthTest.java b/...socket/WebsocketLocalGatewayAuthTest.java → ...way/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/...WebsocketLocalGatewayErrorMapperTest.java → ...WebsocketLocalGatewayErrorMapperTest.java b/...WebsocketLocalGatewayErrorMapperTest.java → ...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/...ocket/WebsocketLocalGatewayExtension.java → ...ay/ws/WebsocketLocalGatewayExtension.java b/...ocket/WebsocketLocalGatewayExtension.java → ...ay/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/.../websocket/WebsocketLocalGatewayTest.java → ...gateway/ws/WebsocketLocalGatewayTest.java b/.../websocket/WebsocketLocalGatewayTest.java → ...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/...cket/WebsocketLocalWithAuthExtension.java → ...y/ws/WebsocketLocalWithAuthExtension.java b/...cket/WebsocketLocalWithAuthExtension.java → ...y/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);
  }
 }