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

re-enable live request mapping symbols on new live hovers v2 mechanism

Browse Source
This commit is contained in:
Martin Lippert
2019-09-27 14:01:50 +02:00
parent 70551c3130
commit 0a80f1f181
1 changed files with 37 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

68
headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/requestmapping/LiveAppURLSymbolProvider.java
View File

@@ -1,5 +1,5 @@
/*******************************************************************************
* Copyright (c) 2017, 2018 Pivotal, Inc.
* Copyright (c) 2017, 2019 Pivotal, Inc.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -13,9 +13,15 @@ package org.springframework.ide.vscode.boot.java.requestmapping;
import java.util.ArrayList;
import java.util.List;
import org.eclipse.lsp4j.Location;
import org.eclipse.lsp4j.Position;
import org.eclipse.lsp4j.Range;
import org.eclipse.lsp4j.SymbolInformation;
import org.eclipse.lsp4j.SymbolKind;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.ide.vscode.boot.java.livehover.v2.LiveRequestMapping;
import org.springframework.ide.vscode.boot.java.livehover.v2.SpringProcessLiveData;
import org.springframework.ide.vscode.boot.java.livehover.v2.SpringProcessLiveDataProvider;
/**
@@ -34,36 +40,36 @@ public class LiveAppURLSymbolProvider {
public List<? extends SymbolInformation> getSymbols(String query) {
List<SymbolInformation> result = new ArrayList<>();
// try {
// SpringBootApp[] runningApps = runningAppProvider.getAllRunningSpringApps().toArray(new SpringBootApp[0]);
// for (SpringBootApp app : runningApps) {
// try {
// String urlScheme = app.getUrlScheme();
// String host = app.getHost();
// String port = app.getPort();
// String contextPath = app.getContextPath();
// for (LiveRequestMapping rm : app.getRequestMappings()) {
// String[] paths = rm.getSplitPath();
// if (paths==null || paths.length==0) {
// //Technically, this means the path 'predicate' is unconstrained, meaning any path matches.
// //So this is not quite the same as the case where path=""... but...
// //It is better for us to show one link where any path is allowed, versus showing no links where any link is allowed.
// //So we'll pretend this is the same as path="" as that gives a working link.
// paths = new String[] {""};
// }
// for (String path : paths) {
// String url = UrlUtil.createUrl(urlScheme, host, port, path, contextPath);
// result.add(new SymbolInformation(url, SymbolKind.Method, new Location(url, new Range(new Position(0, 0), new Position(0, 1)))));
// }
// }
// }
// catch (Exception e) {
// log.error("", e);
// }
// }
// } catch (Exception e) {
// log.error("", e);
// }
try {
SpringProcessLiveData[] liveData = liveDataProvider.getLatestLiveData();
for (SpringProcessLiveData live : liveData) {
try {
String urlScheme = live.getUrlScheme();
String host = live.getHost();
String port = live.getPort();
String contextPath = live.getContextPath();
for (LiveRequestMapping rm : live.getRequestMappings()) {
String[] paths = rm.getSplitPath();
if (paths==null || paths.length==0) {
//Technically, this means the path 'predicate' is unconstrained, meaning any path matches.
//So this is not quite the same as the case where path=""... but...
//It is better for us to show one link where any path is allowed, versus showing no links where any link is allowed.
//So we'll pretend this is the same as path="" as that gives a working link.
paths = new String[] {""};
}
for (String path : paths) {
String url = UrlUtil.createUrl(urlScheme, host, port, path, contextPath);
result.add(new SymbolInformation(url, SymbolKind.Method, new Location(url, new Range(new Position(0, 0), new Position(0, 1)))));
}
}
}
catch (Exception e) {
log.error("", e);
}
}
} catch (Exception e) {
log.error("", e);
}
return result;
}