From f7ec7590a94d41c18f837292a7dcf609b74b0f62 Mon Sep 17 00:00:00 2001 From: Yan Zhang Date: Wed, 6 Apr 2022 21:39:25 +0800 Subject: [PATCH] sts-vscode: fix extension api implementation Signed-off-by: Yan Zhang --- .../boot/java/livehover/v2/SpringProcessCommandHandler.java | 4 ++-- vscode-extensions/vscode-spring-boot/lib/apiManager.ts | 5 ++--- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/livehover/v2/SpringProcessCommandHandler.java b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/livehover/v2/SpringProcessCommandHandler.java index f56521b4c..9918c48ad 100644 --- a/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/livehover/v2/SpringProcessCommandHandler.java +++ b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/livehover/v2/SpringProcessCommandHandler.java @@ -205,10 +205,10 @@ public class SpringProcessCommandHandler { private CompletableFuture get(ExecuteCommandParams params) { String processKey = getProcessKey(params); - String dataKey = getArgumentByKey(params, "dataKey"); + String endpoint = getArgumentByKey(params, "endpoint"); if (processKey != null) { SpringProcessLiveData data = connectorService.getLiveData(processKey); - switch(dataKey) { + switch(endpoint) { case "properties": { return CompletableFuture.completedFuture(data.getLiveProperties()); } diff --git a/vscode-extensions/vscode-spring-boot/lib/apiManager.ts b/vscode-extensions/vscode-spring-boot/lib/apiManager.ts index 132afb413..4dc3029fe 100644 --- a/vscode-extensions/vscode-spring-boot/lib/apiManager.ts +++ b/vscode-extensions/vscode-spring-boot/lib/apiManager.ts @@ -9,17 +9,16 @@ export class ApiManager { private onDidLiveProcessDisconnectEmitter: Emitter = new Emitter(); private onDidLiveProcessUpdateEmitter: Emitter = new Emitter(); - public constructor(private client: LanguageClient) { + public constructor(client: LanguageClient) { const onDidLiveProcessConnect = this.onDidLiveProcessConnectEmitter.event; const onDidLiveProcessDisconnect = this.onDidLiveProcessDisconnectEmitter.event; const onDidLiveProcessUpdate = this.onDidLiveProcessUpdateEmitter.event; const COMMAND_LIVEDATA_GET = "sts/livedata/get"; const getLiveProcessData = async (query) => { - await commands.executeCommand(COMMAND_LIVEDATA_GET, query); + return await commands.executeCommand(COMMAND_LIVEDATA_GET, query); } - // TODO: STS server should send corresponding notification back. client.onNotification(LiveProcessConnectedNotification.type, (processKey: string) => this.onDidLiveProcessConnectEmitter.fire(processKey)); client.onNotification(LiveProcessDisconnectedNotification.type, (processKey: string) => this.onDidLiveProcessDisconnectEmitter.fire(processKey)); client.onNotification(LiveProcessUpdatedNotification.type, (processKey: string) => this.onDidLiveProcessUpdateEmitter.fire(processKey));