From 5b74513e9d20aec2004b576d05fa2ba963c2510e Mon Sep 17 00:00:00 2001 From: aboyko Date: Tue, 9 Apr 2024 00:36:56 -0400 Subject: [PATCH] STS API set the process type to `local` for local process JMX conn --- .../vscode/boot/app/BootLanguageServerBootApp.java | 3 ++- .../livehover/v2/SpringProcessConnectorRemote.java | 11 +++++++++-- vscode-extensions/vscode-spring-boot/package.json | 2 +- 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/app/BootLanguageServerBootApp.java b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/app/BootLanguageServerBootApp.java index b9dd50474..545755de3 100644 --- a/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/app/BootLanguageServerBootApp.java +++ b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/app/BootLanguageServerBootApp.java @@ -56,6 +56,7 @@ import org.springframework.ide.vscode.boot.java.links.JavaServerElementLocationP import org.springframework.ide.vscode.boot.java.links.JdtJavaDocumentUriProvider; import org.springframework.ide.vscode.boot.java.links.SourceLinkFactory; import org.springframework.ide.vscode.boot.java.links.SourceLinks; +import org.springframework.ide.vscode.boot.java.livehover.v2.ProcessType; import org.springframework.ide.vscode.boot.java.livehover.v2.SpringProcessConnectorRemote; import org.springframework.ide.vscode.boot.java.livehover.v2.SpringProcessConnectorRemote.RemoteBootAppData; import org.springframework.ide.vscode.boot.java.livehover.v2.SpringProcessConnectorService; @@ -203,7 +204,7 @@ public class BootLanguageServerBootApp { @Bean SpringProcessConnectorRemote localAppsFromCommandsConnector(SimpleLanguageServer server, SpringProcessConnectorService liveDataService) { - SpringProcessConnectorRemote bean = new SpringProcessConnectorRemote(server, liveDataService); + SpringProcessConnectorRemote bean = new SpringProcessConnectorRemote(server, liveDataService, ProcessType.LOCAL); final Map localApps = new HashMap<>(); final Gson gson = new Gson(); server.onCommand("sts/livedata/localAdd", params -> { diff --git a/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/livehover/v2/SpringProcessConnectorRemote.java b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/livehover/v2/SpringProcessConnectorRemote.java index 3c2560d2b..3559f2d10 100644 --- a/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/livehover/v2/SpringProcessConnectorRemote.java +++ b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/livehover/v2/SpringProcessConnectorRemote.java @@ -153,10 +153,17 @@ public class SpringProcessConnectorRemote { private final Map remoteAppInstances; private final SpringProcessConnectorService processConnectorService; + + private final ProcessType processType; public SpringProcessConnectorRemote(SimpleLanguageServer server, SpringProcessConnectorService processConnector) { + this(server, processConnector, ProcessType.REMOTE); + } + + public SpringProcessConnectorRemote(SimpleLanguageServer server, SpringProcessConnectorService processConnector, ProcessType processType) { this.processConnectorService = processConnector; this.remoteAppInstances = new HashMap<>(); + this.processType = processType; } /** @@ -227,10 +234,10 @@ public class SpringProcessConnectorRemote { // boolean keepChecking = _appData.isKeepChecking(); if (jmxURL.startsWith("http")) { - SpringProcessConnectorOverHttp connector = new SpringProcessConnectorOverHttp(ProcessType.REMOTE, processKey, jmxURL, urlScheme, processID, processName, projectName, host, port); + SpringProcessConnectorOverHttp connector = new SpringProcessConnectorOverHttp(processType, processKey, jmxURL, urlScheme, processID, processName, projectName, host, port); return processConnectorService.connectProcess(processKey, connector); } else { - SpringProcessConnectorOverJMX connector = new SpringProcessConnectorOverJMX(ProcessType.REMOTE, processKey, jmxURL, urlScheme, processID, processName, projectName, host, port); + SpringProcessConnectorOverJMX connector = new SpringProcessConnectorOverJMX(processType, processKey, jmxURL, urlScheme, processID, processName, projectName, host, port); return processConnectorService.connectProcess(processKey, connector); } } diff --git a/vscode-extensions/vscode-spring-boot/package.json b/vscode-extensions/vscode-spring-boot/package.json index bc164aa14..5c3226984 100644 --- a/vscode-extensions/vscode-spring-boot/package.json +++ b/vscode-extensions/vscode-spring-boot/package.json @@ -1154,8 +1154,8 @@ "vsce-pre-release-package": "vsce package --pre-release" }, "dependencies": { - "portfinder": "1.0.32", "@pivotal-tools/commons-vscode": "file:../commons-vscode/pivotal-tools-commons-vscode-0.2.4.tgz", + "portfinder": "1.0.32", "ps-list": "^7.2.0", "vscode-languageclient": "^9.0.1" },