Skip to content

Commit 154a5cf

Browse files
committed
prevent codespell conflict
Signed-off-by: Abhishek Kumar <[email protected]>
1 parent de3bb46 commit 154a5cf

File tree

4 files changed

+8
-8
lines changed

4 files changed

+8
-8
lines changed

client/src/main/java/org/apache/cloudstack/websocket/JettyWebSocketServlet.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,7 @@ public void onWebSocketConnect(Session jettySess) {
168168
@Override
169169
public void onWebSocketText(String message) {
170170
try {
171-
handler.onText(session, message);
171+
handler.onTextMessage(session, message);
172172
} catch (Throwable t) {
173173
handler.onError(session, t);
174174
}
@@ -177,7 +177,7 @@ public void onWebSocketText(String message) {
177177
@Override
178178
public void onWebSocketBinary(byte[] payload, int offset, int len) {
179179
try {
180-
handler.onBinary(session, java.nio.ByteBuffer.wrap(payload, offset, len));
180+
handler.onBinaryMessage(session, java.nio.ByteBuffer.wrap(payload, offset, len));
181181
} catch (Throwable t) {
182182
handler.onError(session, t);
183183
}

framework/websocket-server/src/main/java/org/apache/cloudstack/framework/websocket/server/WebSocketServerRoutingHandler.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -104,10 +104,10 @@ protected void channelRead0(ChannelHandlerContext ctx, WebSocketFrame frame) {
104104
}
105105
try {
106106
if (frame instanceof TextWebSocketFrame) {
107-
handler.onText(session, ((TextWebSocketFrame) frame).text());
107+
handler.onTextMessage(session, ((TextWebSocketFrame) frame).text());
108108
} else if (frame instanceof BinaryWebSocketFrame) {
109109
ByteBuffer buf = frame.content().nioBuffer();
110-
handler.onBinary(session, buf);
110+
handler.onBinaryMessage(session, buf);
111111
} else if (frame instanceof CloseWebSocketFrame) {
112112
CloseWebSocketFrame c = (CloseWebSocketFrame) frame.retain();
113113
handler.onClose(session, c.statusCode(), c.reasonText());

framework/websocket-server/src/main/java/org/apache/cloudstack/framework/websocket/server/common/WebSocketHandler.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@
2222
public interface WebSocketHandler {
2323
void onOpen(WebSocketSession s);
2424

25-
void onText(WebSocketSession s, String text);
25+
void onTextMessage(WebSocketSession s, String text);
2626

27-
void onBinary(WebSocketSession s, ByteBuffer bin);
27+
void onBinaryMessage(WebSocketSession s, ByteBuffer bin);
2828

2929
void onClose(WebSocketSession s, int code, String reason);
3030

plugins/logs-web-server/src/main/java/org/apache/cloudstack/logsws/server/LogsWebSocketRoutingHandler.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -201,7 +201,7 @@ public void onOpen(WebSocketSession session) {
201201
}
202202

203203
@Override
204-
public void onText(WebSocketSession session, String text) {
204+
public void onTextMessage(WebSocketSession session, String text) {
205205
if (text == null) {
206206
return;
207207
}
@@ -213,7 +213,7 @@ public void onText(WebSocketSession session, String text) {
213213
}
214214

215215
@Override
216-
public void onBinary(WebSocketSession session, ByteBuffer bin) {
216+
public void onBinaryMessage(WebSocketSession session, ByteBuffer bin) {
217217
// Usually unused for logs; consume or ignore.
218218
if (bin != null) {
219219
LOGGER.debug("Ignoring client binary message on logs route: {} bytes", bin.remaining());

0 commit comments

Comments
 (0)