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

Gradle classpath fix for request mappings hovers for Sagan

Browse Source
This commit is contained in:
BoykoAlex
2017-10-27 18:43:50 -04:00
parent 8140cec74a
commit 26e1551e4a
1 changed files with 25 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
headless-services/commons/commons-gradle/src/main/java/org/springframework/ide/vscode/commons/gradle/GradleProjectClasspath.java
View File

@@ -17,6 +17,7 @@ import java.net.URL;
import java.nio.file.Files;
import java.nio.file.Path;
import java.util.Arrays;
import java.util.List;
import java.util.Optional;
import java.util.stream.Collectors;
import java.util.stream.Stream;
@@ -82,13 +83,34 @@ public class GradleProjectClasspath extends JandexClasspath {
}
}) };
}
public EclipseProject getRootProject() {
EclipseProject root = this.gradleProject;
while(root.getParent() != null) {
root = root.getParent();
}
return root;
}
@Override
public Stream<Path> getClasspathEntries() throws Exception {
return Stream.concat(gradleProject.getClasspath().stream().map(dep -> dep.getFile().toPath()),
gradleProject.getProjectDependencies().stream().map(project -> new File(project.getPath()).toPath()));
EclipseProject root = getRootProject();
List<Path> classpathList = Stream.concat(gradleProject.getClasspath().stream().map(dep -> dep.getFile().toPath()),
gradleProject.getProjectDependencies().stream()
.map(d -> findPeer(root, d.getTargetProject().getName()))
.filter(o -> o.isPresent())
.map(o -> o.get())
.map(p -> p.getProjectDirectory().toPath().resolve(p.getOutputLocation().getPath()))
)
.collect(Collectors.toList());
return classpathList.stream();
}
private Optional<? extends EclipseProject> findPeer(EclipseProject root, String name) {
return root.getChildren().stream().filter(p -> p.getName().equals(name)).findFirst();
}
@Override
public Stream<String> getClasspathResources() {
return gradleProject.getSourceDirectories().stream().map(sourceDirectory -> sourceDirectory.getDirectory()).flatMap(folder -> {