From 4d1e36f99c6b093b64c940936ae985b696dc54f5 Mon Sep 17 00:00:00 2001 From: Julien Giovaresco Date: Tue, 26 Mar 2024 10:53:48 +0100 Subject: [PATCH] style: apply prettier format --- .../channel/AbstractWebSocketChannel.java | 8 ++++---- .../AbstractWebSocketConnectorTest.java | 9 +++++---- .../embedded/channel/EmbeddedChannel.java | 3 ++- .../websocket/WebSocketRequestHandler.java | 18 ++++++------------ 4 files changed, 17 insertions(+), 21 deletions(-) diff --git a/gravitee-exchange-api/src/main/java/io/gravitee/exchange/api/websocket/channel/AbstractWebSocketChannel.java b/gravitee-exchange-api/src/main/java/io/gravitee/exchange/api/websocket/channel/AbstractWebSocketChannel.java index 3187002..a1bc6f6 100644 --- a/gravitee-exchange-api/src/main/java/io/gravitee/exchange/api/websocket/channel/AbstractWebSocketChannel.java +++ b/gravitee-exchange-api/src/main/java/io/gravitee/exchange/api/websocket/channel/AbstractWebSocketChannel.java @@ -68,7 +68,8 @@ public abstract class AbstractWebSocketChannel implements Channel { private static final int PING_DELAY = 5_000; protected final String id = UUID.randomUUID().toString(); protected final Map, ? extends Reply>> commandHandlers = new ConcurrentHashMap<>(); - protected final Map, ? extends Command, ? extends Reply>> commandAdapters = new ConcurrentHashMap<>(); + protected final Map, ? extends Command, ? extends Reply>> commandAdapters = + new ConcurrentHashMap<>(); protected final Map, ? extends Reply>> replyAdapters = new ConcurrentHashMap<>(); protected final Vertx vertx; protected final WebSocketBase webSocket; @@ -169,9 +170,8 @@ private > void receiveCommand(final CompletableEmitter emit } Single> commandObs; - CommandAdapter, Command, Reply> commandAdapter = (CommandAdapter, Command, Reply>) commandAdapters.get( - command.getType() - ); + CommandAdapter, Command, Reply> commandAdapter = + (CommandAdapter, Command, Reply>) commandAdapters.get(command.getType()); if (commandAdapter != null) { commandObs = commandAdapter.adapt(command); } else { diff --git a/gravitee-exchange-connector/gravitee-exchange-connector-websocket/src/test/java/io/gravitee/exchange/connector/websocket/AbstractWebSocketConnectorTest.java b/gravitee-exchange-connector/gravitee-exchange-connector-websocket/src/test/java/io/gravitee/exchange/connector/websocket/AbstractWebSocketConnectorTest.java index f4012aa..1b25809 100644 --- a/gravitee-exchange-connector/gravitee-exchange-connector-websocket/src/test/java/io/gravitee/exchange/connector/websocket/AbstractWebSocketConnectorTest.java +++ b/gravitee-exchange-connector/gravitee-exchange-connector-websocket/src/test/java/io/gravitee/exchange/connector/websocket/AbstractWebSocketConnectorTest.java @@ -62,10 +62,11 @@ protected void replyHello( ) .subscribe(); } else if (command.getType().equals(io.gravitee.exchange.api.websocket.protocol.legacy.hello.HelloCommand.COMMAND_TYPE)) { - io.gravitee.exchange.api.websocket.protocol.legacy.hello.HelloReply helloReply = new io.gravitee.exchange.api.websocket.protocol.legacy.hello.HelloReply( - command.getId(), - new io.gravitee.exchange.api.websocket.protocol.legacy.hello.HelloReplyPayload("targetId") - ); + io.gravitee.exchange.api.websocket.protocol.legacy.hello.HelloReply helloReply = + new io.gravitee.exchange.api.websocket.protocol.legacy.hello.HelloReply( + command.getId(), + new io.gravitee.exchange.api.websocket.protocol.legacy.hello.HelloReplyPayload("targetId") + ); serverWebSocket .writeBinaryMessage( protocolAdapter.write( diff --git a/gravitee-exchange-controller/gravitee-exchange-controller-embedded/src/main/java/io/gravitee/exchange/controller/embedded/channel/EmbeddedChannel.java b/gravitee-exchange-controller/gravitee-exchange-controller-embedded/src/main/java/io/gravitee/exchange/controller/embedded/channel/EmbeddedChannel.java index 4fbd4db..dd12d5d 100644 --- a/gravitee-exchange-controller/gravitee-exchange-controller-embedded/src/main/java/io/gravitee/exchange/controller/embedded/channel/EmbeddedChannel.java +++ b/gravitee-exchange-controller/gravitee-exchange-controller-embedded/src/main/java/io/gravitee/exchange/controller/embedded/channel/EmbeddedChannel.java @@ -45,7 +45,8 @@ public class EmbeddedChannel implements ControllerChannel, ConnectorChannel { private final String id = UUID.randomUUID().toString(); private final String targetId; private final Map, ? extends Reply>> commandHandlers = new ConcurrentHashMap<>(); - protected final Map, ? extends Command, ? extends Reply>> commandAdapters = new ConcurrentHashMap<>(); + protected final Map, ? extends Command, ? extends Reply>> commandAdapters = + new ConcurrentHashMap<>(); protected final Map, ? extends Reply>> replyAdapters = new ConcurrentHashMap<>(); private boolean active = false; diff --git a/gravitee-exchange-controller/gravitee-exchange-controller-websocket/src/main/java/io/gravitee/exchange/controller/websocket/WebSocketRequestHandler.java b/gravitee-exchange-controller/gravitee-exchange-controller-websocket/src/main/java/io/gravitee/exchange/controller/websocket/WebSocketRequestHandler.java index d103662..4b5ea1c 100644 --- a/gravitee-exchange-controller/gravitee-exchange-controller-websocket/src/main/java/io/gravitee/exchange/controller/websocket/WebSocketRequestHandler.java +++ b/gravitee-exchange-controller/gravitee-exchange-controller-websocket/src/main/java/io/gravitee/exchange/controller/websocket/WebSocketRequestHandler.java @@ -29,7 +29,6 @@ import io.gravitee.exchange.api.controller.ExchangeController; import io.gravitee.exchange.api.websocket.command.ExchangeSerDe; import io.gravitee.exchange.api.websocket.protocol.ProtocolVersion; -import io.gravitee.exchange.controller.core.channel.primary.PrimaryChannelManager; import io.gravitee.exchange.controller.websocket.auth.WebSocketControllerAuthentication; import io.gravitee.exchange.controller.websocket.channel.WebSocketControllerChannel; import io.vertx.rxjava3.core.Vertx; @@ -66,17 +65,12 @@ public void handle(final RoutingContext routingContext) { request .toWebSocket() .flatMapCompletable(webSocket -> { - List, ? extends Reply>> commandHandlers = controllerCommandHandlersFactory.buildCommandHandlers( - controllerContext - ); - List, ? extends Command, ? extends Reply>> commandAdapters = controllerCommandHandlersFactory.buildCommandAdapters( - controllerContext, - protocolVersion - ); - List, ? extends Reply>> replyAdapters = controllerCommandHandlersFactory.buildReplyAdapters( - controllerContext, - protocolVersion - ); + List, ? extends Reply>> commandHandlers = + controllerCommandHandlersFactory.buildCommandHandlers(controllerContext); + List, ? extends Command, ? extends Reply>> commandAdapters = + controllerCommandHandlersFactory.buildCommandAdapters(controllerContext, protocolVersion); + List, ? extends Reply>> replyAdapters = + controllerCommandHandlersFactory.buildReplyAdapters(controllerContext, protocolVersion); ControllerChannel websocketControllerChannel = new WebSocketControllerChannel( commandHandlers,