From 1626ad451a705219d6a706c6fa2ac178ef26ae79 Mon Sep 17 00:00:00 2001 From: ParkGyeongTae Date: Sat, 11 Jul 2026 08:22:28 +0900 Subject: [PATCH] [ZEPPELIN-6512] Fix typos in variable names and log messages in terminal classes --- .../zeppelin/shell/terminal/TerminalManager.java | 14 +++++++------- .../zeppelin/shell/terminal/TerminalThread.java | 8 ++++---- .../shell/terminal/websocket/TerminalSocket.java | 2 +- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/shell/src/main/java/org/apache/zeppelin/shell/terminal/TerminalManager.java b/shell/src/main/java/org/apache/zeppelin/shell/terminal/TerminalManager.java index 114f0f1c77e..089ab26dcff 100644 --- a/shell/src/main/java/org/apache/zeppelin/shell/terminal/TerminalManager.java +++ b/shell/src/main/java/org/apache/zeppelin/shell/terminal/TerminalManager.java @@ -71,16 +71,16 @@ public void removeTerminalService(TerminalSocket terminalSocket) { if (terminalSocket2Service.containsKey(terminalSocketHashcode)) { terminalSocket2Service.remove(terminalSocketHashcode); } else { - LOGGER.error("Cann't find TerminalSocket: " + terminalSocketHashcode); + LOGGER.error("Can't find TerminalSocket: " + terminalSocketHashcode); LOGGER.error(terminalSocket2Service.toString()); } } - public void cleanIntpContext(String nodeId) { - String keyPrex = nodeId + "@"; + public void cleanIntpContext(String noteId) { + String keyPrefix = noteId + "@"; for (Map.Entry entity : noteParagraphId2IntpContext.entrySet()) { String key = entity.getKey(); - if (key.contains(keyPrex)) { + if (key.contains(keyPrefix)) { LOGGER.info("cleanIntpContext : " + key); noteParagraphId2IntpContext.remove(key); } @@ -109,7 +109,7 @@ public void onWebSocketConnect(String noteId, String paragraphId) { intpContext.getAngularObjectRegistry().add(TERMINAL_SOCKET_STATUS, TERMINAL_SOCKET_CONNECT, intpContext.getNoteId(), intpContext.getParagraphId()); } else { - LOGGER.error("Cann't find InterpreterContext from : " + id); + LOGGER.error("Can't find InterpreterContext from : " + id); LOGGER.error(noteParagraphId2IntpContext.toString()); } } @@ -121,7 +121,7 @@ public void onWebSocketClose(TerminalSocket terminalSocket, String noteId, Strin intpContext.getAngularObjectRegistry().add(TERMINAL_SOCKET_STATUS, TERMINAL_SOCKET_CLOSE, intpContext.getNoteId(), intpContext.getParagraphId()); } else { - LOGGER.error("Cann't find InterpreterContext from : " + id); + LOGGER.error("Can't find InterpreterContext from : " + id); LOGGER.error(noteParagraphId2IntpContext.toString()); } @@ -136,7 +136,7 @@ public void onWebSocketError(TerminalSocket terminalSocket, String noteId, Strin intpContext.getAngularObjectRegistry().add(TERMINAL_SOCKET_STATUS, TERMINAL_SOCKET_ERROR, intpContext.getNoteId(), intpContext.getParagraphId()); } else { - LOGGER.error("Cann't find InterpreterContext from : " + id); + LOGGER.error("Can't find InterpreterContext from : " + id); LOGGER.error(noteParagraphId2IntpContext.toString()); } } diff --git a/shell/src/main/java/org/apache/zeppelin/shell/terminal/TerminalThread.java b/shell/src/main/java/org/apache/zeppelin/shell/terminal/TerminalThread.java index a4501af8477..a2a10866773 100644 --- a/shell/src/main/java/org/apache/zeppelin/shell/terminal/TerminalThread.java +++ b/shell/src/main/java/org/apache/zeppelin/shell/terminal/TerminalThread.java @@ -40,11 +40,11 @@ public class TerminalThread extends Thread { private Server jettyServer = new Server(); private int port = 0; - private String allwedOrigin; + private String allowedOrigin; - public TerminalThread(int port, String allwedOrigin) { + public TerminalThread(int port, String allowedOrigin) { this.port = port; - this.allwedOrigin = allwedOrigin; + this.allowedOrigin = allowedOrigin; } @Override @@ -80,7 +80,7 @@ public void run() { (servletContext, container) -> container.addEndpoint( ServerEndpointConfig.Builder.create(TerminalSocket.class, "/") - .configurator(new TerminalSessionConfigurator(allwedOrigin)) + .configurator(new TerminalSessionConfigurator(allowedOrigin)) .build())); jettyServer.start(); jettyServer.join(); diff --git a/shell/src/main/java/org/apache/zeppelin/shell/terminal/websocket/TerminalSocket.java b/shell/src/main/java/org/apache/zeppelin/shell/terminal/websocket/TerminalSocket.java index 32f8421eed0..16af219d7af 100644 --- a/shell/src/main/java/org/apache/zeppelin/shell/terminal/websocket/TerminalSocket.java +++ b/shell/src/main/java/org/apache/zeppelin/shell/terminal/websocket/TerminalSocket.java @@ -78,7 +78,7 @@ public void onWebSocketText(String message) { terminalService.onTerminalResize(messageMap.get("columns"), messageMap.get("rows")); break; default: - LOGGER.error("Unrecodnized action: {}", message); + LOGGER.error("Unrecognized action: {}", message); } } }