Spring/spring-tools
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

STS API set the process type to local for local process JMX conn

Browse Source
This commit is contained in:
aboyko
2024-04-09 00:36:56 -04:00
parent ea3853fc05
commit 5b74513e9d
3 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/app/BootLanguageServerBootApp.java
View File

@@ -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<String, RemoteBootAppData> localApps = new HashMap<>();
final Gson gson = new Gson();
server.onCommand("sts/livedata/localAdd", params -> {

11
headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/livehover/v2/SpringProcessConnectorRemote.java
View File

@@ -153,10 +153,17 @@ public class SpringProcessConnectorRemote {
private final Map<RemoteBootAppData, String> 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);
}
}

2
vscode-extensions/vscode-spring-boot/package.json
View File

@@ -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"
},