From 143679d11b601021ef800383d6be043130d2067a Mon Sep 17 00:00:00 2001 From: Artem Vysochyn Date: Tue, 1 Oct 2024 13:39:14 +0300 Subject: [PATCH] Cosmetic changes to have less changes with master --- .../gateway/client/http/HttpGatewayClientCodec.java | 4 ++-- .../client/websocket/WebsocketGatewayClientCodec.java | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/services-gateway/src/main/java/io/scalecube/services/gateway/client/http/HttpGatewayClientCodec.java b/services-gateway/src/main/java/io/scalecube/services/gateway/client/http/HttpGatewayClientCodec.java index 2c253fd58..9a899a8d6 100644 --- a/services-gateway/src/main/java/io/scalecube/services/gateway/client/http/HttpGatewayClientCodec.java +++ b/services-gateway/src/main/java/io/scalecube/services/gateway/client/http/HttpGatewayClientCodec.java @@ -43,7 +43,7 @@ public ByteBuf encode(ServiceMessage message) { } @Override - public ServiceMessage decode(ByteBuf byteBuf) { - return ServiceMessage.builder().data(byteBuf).build(); + public ServiceMessage decode(ByteBuf encodedMessage) { + return ServiceMessage.builder().data(encodedMessage).build(); } } diff --git a/services-gateway/src/main/java/io/scalecube/services/gateway/client/websocket/WebsocketGatewayClientCodec.java b/services-gateway/src/main/java/io/scalecube/services/gateway/client/websocket/WebsocketGatewayClientCodec.java index dc0cd2df0..30f4df595 100644 --- a/services-gateway/src/main/java/io/scalecube/services/gateway/client/websocket/WebsocketGatewayClientCodec.java +++ b/services-gateway/src/main/java/io/scalecube/services/gateway/client/websocket/WebsocketGatewayClientCodec.java @@ -106,8 +106,8 @@ public ByteBuf encode(ServiceMessage message) { } @Override - public ServiceMessage decode(ByteBuf byteBuf) { - try (InputStream stream = new ByteBufInputStream(byteBuf, true)) { + public ServiceMessage decode(ByteBuf encodedMessage) { + try (InputStream stream = new ByteBufInputStream(encodedMessage, true)) { JsonParser jp = jsonFactory.createParser(stream); ServiceMessage.Builder result = ServiceMessage.builder(); @@ -141,7 +141,7 @@ public ServiceMessage decode(ByteBuf byteBuf) { } // data if (dataEnd > dataStart) { - result.data(byteBuf.copy((int) dataStart, (int) (dataEnd - dataStart))); + result.data(encodedMessage.copy((int) dataStart, (int) (dataEnd - dataStart))); } return result.build(); } catch (Throwable ex) {