diff --git a/headless-services/boot-java-language-server/src/main/java/org/springframework/ide/vscode/boot/java/handlers/BootJavaWorkspaceSymbolHandler.java b/headless-services/boot-java-language-server/src/main/java/org/springframework/ide/vscode/boot/java/handlers/BootJavaWorkspaceSymbolHandler.java index 57fe8fd34..9bec1ad08 100644 --- a/headless-services/boot-java-language-server/src/main/java/org/springframework/ide/vscode/boot/java/handlers/BootJavaWorkspaceSymbolHandler.java +++ b/headless-services/boot-java-language-server/src/main/java/org/springframework/ide/vscode/boot/java/handlers/BootJavaWorkspaceSymbolHandler.java @@ -10,35 +10,16 @@ *******************************************************************************/ package org.springframework.ide.vscode.boot.java.handlers; -import java.io.File; -import java.nio.file.Files; import java.nio.file.Path; -import java.util.ArrayList; import java.util.List; import java.util.Map; -import java.util.stream.Stream; -import org.eclipse.jdt.core.JavaCore; -import org.eclipse.jdt.core.dom.AST; -import org.eclipse.jdt.core.dom.ASTParser; -import org.eclipse.jdt.core.dom.ASTVisitor; -import org.eclipse.jdt.core.dom.Annotation; -import org.eclipse.jdt.core.dom.CompilationUnit; -import org.eclipse.jdt.core.dom.ITypeBinding; -import org.eclipse.jdt.core.dom.MarkerAnnotation; -import org.eclipse.jdt.core.dom.NormalAnnotation; -import org.eclipse.jdt.core.dom.SingleMemberAnnotation; -import org.eclipse.lsp4j.Location; import org.eclipse.lsp4j.SymbolInformation; -import org.eclipse.lsp4j.SymbolKind; import org.eclipse.lsp4j.WorkspaceSymbolParams; -import org.springframework.ide.vscode.commons.java.IClasspath; -import org.springframework.ide.vscode.commons.java.IJavaProject; +import org.springframework.ide.vscode.boot.java.utils.AnnotationIndexer; import org.springframework.ide.vscode.commons.languageserver.java.JavaProjectFinder; import org.springframework.ide.vscode.commons.languageserver.util.SimpleLanguageServer; import org.springframework.ide.vscode.commons.languageserver.util.WorkspaceSymbolHandler; -import org.springframework.ide.vscode.commons.util.text.LanguageId; -import org.springframework.ide.vscode.commons.util.text.TextDocument; /** * @author Martin Lippert @@ -46,192 +27,21 @@ import org.springframework.ide.vscode.commons.util.text.TextDocument; public class BootJavaWorkspaceSymbolHandler implements WorkspaceSymbolHandler { private SimpleLanguageServer server; - private JavaProjectFinder projectFinder; - private Map symbolProviders; - - private List symbols; + private AnnotationIndexer indexer; public BootJavaWorkspaceSymbolHandler(SimpleLanguageServer server, JavaProjectFinder projectFinder, Map specificProviders) { this.server = server; - this.projectFinder = projectFinder; - this.symbols = new ArrayList<>(); - this.symbolProviders = specificProviders; + this.indexer = new AnnotationIndexer(projectFinder, specificProviders); } @Override public List handle(WorkspaceSymbolParams params) { Path root = this.server.getWorkspaceRoot(); - symbols.clear(); - scanFiles(root.toFile()); + indexer.reset(); + indexer.scanFiles(root.toFile()); - return collectSymbols(); - } - - private List collectSymbols() { - return symbols; - } - - private void scanFiles(File directory) { - if (this.projectFinder.isProjectRoot(directory)) { - IJavaProject project = this.projectFinder.find(directory); - if (project != null) { - scanProject(project, directory); - } - } - else if (directory.isDirectory() && directory.exists()) { - File[] files = directory.listFiles(); - for (File file : files) { - scanFiles(file); - } - } - } - - private void scanProject(IJavaProject project, File directory) { - try { - ASTParser parser = ASTParser.newParser(AST.JLS8); - String[] classpathEntries = getClasspathEntries(project); - scanFiles(parser, directory, classpathEntries); - } - catch (Exception e) { - e.printStackTrace(); - } - } - - private void scanFiles(ASTParser parser, File directory, String[] classpathEntries) throws Exception { - File[] javaFiles = directory.listFiles((file) -> file.getName().endsWith(".java")); - for (File javaFile : javaFiles) { - if (javaFile.isFile() && javaFile.exists()) { - scanFile(parser, javaFile, classpathEntries); - } - } - - File[] directories = directory.listFiles((file) -> file.isDirectory() && file.exists()); - for (File dir : directories) { - scanFiles(parser, dir, classpathEntries); - } - } - - private void scanFile(ASTParser parser, File javaFile, String[] classpathEntries) throws Exception { - Path path = javaFile.toPath(); - - String unitName = "/" + path.getFileName().toString(); - parser.setUnitName(unitName); - - String content = new String(Files.readAllBytes(path)); - parser.setSource(content.toCharArray()); - - Map options = JavaCore.getOptions(); - JavaCore.setComplianceOptions(JavaCore.VERSION_1_8, options); - parser.setCompilerOptions(options); - parser.setKind(ASTParser.K_COMPILATION_UNIT); - parser.setStatementsRecovery(true); - parser.setBindingsRecovery(true); - parser.setResolveBindings(true); - - String[] sourceEntries = new String[] {}; - parser.setEnvironment(classpathEntries, sourceEntries, null, true); - - CompilationUnit cu = (CompilationUnit) parser.createAST(null); - if (cu != null) { - System.out.println("AST node found: " + cu.getClass().getName()); - - String docURI = "file://" + javaFile.getAbsolutePath(); - TextDocument doc = new TextDocument(docURI, LanguageId.PLAINTEXT, 0, content); - - scanAST(cu, doc); - } - } - - private void scanAST(final CompilationUnit cu, final TextDocument doc) { - cu.accept(new ASTVisitor() { - - @Override - public boolean visit(SingleMemberAnnotation node) { - try { - extractSymbolInformation(node, doc); - } - catch (Exception e) { - e.printStackTrace(); - } - - return super.visit(node); - } - - @Override - public boolean visit(NormalAnnotation node) { - try { - extractSymbolInformation(node, doc); - } - catch (Exception e) { - e.printStackTrace(); - } - - return super.visit(node); - } - - @Override - public boolean visit(MarkerAnnotation node) { - try { - extractSymbolInformation(node, doc); - } - catch (Exception e) { - e.printStackTrace(); - } - - return super.visit(node); - } - }); - } - - private void extractSymbolInformation(Annotation node, TextDocument doc) { - System.out.println("annotation found: " + node.toString()); - ITypeBinding typeBinding = node.resolveTypeBinding(); - - if (typeBinding != null) { - String qualifiedTypeName = typeBinding.getQualifiedName(); - - SymbolProvider provider = symbolProviders.get(qualifiedTypeName); - if (provider != null) { - SymbolInformation symbol = provider.getSymbol(node, doc); - if (symbol != null) { - symbols.add(symbol); - } - } - else { - SymbolInformation symbol = provideDefaultSymbol(node, doc); - if (symbol != null) { - symbols.add(symbol); - } - } - } - } - - private SymbolInformation provideDefaultSymbol(Annotation node, TextDocument doc) { - try { - ITypeBinding type = node.resolveTypeBinding(); - if (type != null) { - String qualifiedName = type.getQualifiedName(); - if (qualifiedName != null && qualifiedName.startsWith("org.springframework")) { - SymbolInformation symbol = new SymbolInformation(node.toString(), SymbolKind.Interface, - new Location(doc.getUri(), doc.toRange(node.getStartPosition(), node.getLength()))); - return symbol; - } - } - } - catch (Exception e) { - e.printStackTrace(); - } - - return null; - } - - private String[] getClasspathEntries(IJavaProject project) throws Exception { - IClasspath classpath = project.getClasspath(); - Stream classpathEntries = classpath.getClasspathEntries(); - return classpathEntries - .filter(path -> path.toFile().exists()) - .map(path -> path.toAbsolutePath().toString()).toArray(String[]::new); + return indexer.getAllSymbols(); } } diff --git a/headless-services/boot-java-language-server/src/main/java/org/springframework/ide/vscode/boot/java/utils/AnnotationIndexer.java b/headless-services/boot-java-language-server/src/main/java/org/springframework/ide/vscode/boot/java/utils/AnnotationIndexer.java new file mode 100644 index 000000000..0abe057d5 --- /dev/null +++ b/headless-services/boot-java-language-server/src/main/java/org/springframework/ide/vscode/boot/java/utils/AnnotationIndexer.java @@ -0,0 +1,232 @@ +/******************************************************************************* + * Copyright (c) 2017 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 + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Pivotal, Inc. - initial API and implementation + *******************************************************************************/ +package org.springframework.ide.vscode.boot.java.utils; + +import java.io.File; +import java.net.URI; +import java.nio.file.Files; +import java.nio.file.Path; +import java.nio.file.Paths; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.stream.Stream; + +import org.eclipse.jdt.core.JavaCore; +import org.eclipse.jdt.core.dom.AST; +import org.eclipse.jdt.core.dom.ASTParser; +import org.eclipse.jdt.core.dom.ASTVisitor; +import org.eclipse.jdt.core.dom.Annotation; +import org.eclipse.jdt.core.dom.CompilationUnit; +import org.eclipse.jdt.core.dom.FileASTRequestor; +import org.eclipse.jdt.core.dom.ITypeBinding; +import org.eclipse.jdt.core.dom.MarkerAnnotation; +import org.eclipse.jdt.core.dom.NormalAnnotation; +import org.eclipse.jdt.core.dom.SingleMemberAnnotation; +import org.eclipse.lsp4j.Location; +import org.eclipse.lsp4j.SymbolInformation; +import org.eclipse.lsp4j.SymbolKind; +import org.springframework.ide.vscode.boot.java.handlers.SymbolProvider; +import org.springframework.ide.vscode.commons.java.IClasspath; +import org.springframework.ide.vscode.commons.java.IJavaProject; +import org.springframework.ide.vscode.commons.languageserver.java.JavaProjectFinder; +import org.springframework.ide.vscode.commons.util.text.LanguageId; +import org.springframework.ide.vscode.commons.util.text.TextDocument; + +/** + * @author Martin Lippert + */ +public class AnnotationIndexer { + + private JavaProjectFinder projectFinder; + private Map symbolProviders; + + private List symbols; + + public AnnotationIndexer(JavaProjectFinder projectFinder, Map specificProviders) { + this.projectFinder = projectFinder; + this.symbolProviders = specificProviders; + + this.symbols = new ArrayList<>(); + } + + public void reset() { + this.symbols.clear(); + } + + public List getAllSymbols() { + return symbols; + } + + public void scanFiles(File directory) { + try { + Path[] javaFiles = Files.walk(directory.toPath()) + .filter(Files::isRegularFile) + .filter(path -> path.getFileName().toString().endsWith(".java")) + .toArray(Path[]::new); + + Map> projects = new HashMap<>(); + for (Path javaFile : javaFiles) { + IJavaProject project = projectFinder.find(javaFile.toFile()); + if (project != null) { + if (!projects.containsKey(project)) { + projects.put(project, new ArrayList<>()); + } + + projects.get(project).add(javaFile.toAbsolutePath().toString()); + } + } + + projects.forEach((project, files) -> scanProject(project, files.toArray(new String[0]))); + + } + catch (Exception e) { + e.printStackTrace(); + } + } + + private void scanProject(IJavaProject project, String[] files) { + try { + ASTParser parser = ASTParser.newParser(AST.JLS8); + String[] classpathEntries = getClasspathEntries(project); + scanFiles(parser, files, classpathEntries); + } + catch (Exception e) { + e.printStackTrace(); + } + } + + private void scanFiles(ASTParser parser, String[] javaFiles, String[] classpathEntries) throws Exception { + Map options = JavaCore.getOptions(); + JavaCore.setComplianceOptions(JavaCore.VERSION_1_8, options); + parser.setCompilerOptions(options); + parser.setKind(ASTParser.K_COMPILATION_UNIT); + parser.setStatementsRecovery(true); + parser.setBindingsRecovery(true); + parser.setResolveBindings(true); + + String[] sourceEntries = new String[] {}; + parser.setEnvironment(classpathEntries, sourceEntries, null, true); + + FileASTRequestor requestor = new FileASTRequestor() { + @Override + public void acceptAST(String sourceFilePath, CompilationUnit cu) { + String docURI = "file://" + sourceFilePath; + scanAST(cu, docURI); + } + }; + + parser.createASTs(javaFiles, null, new String[0], requestor, null); + } + + private void scanAST(final CompilationUnit cu, final String docURI) { + cu.accept(new ASTVisitor() { + + @Override + public boolean visit(SingleMemberAnnotation node) { + try { + extractSymbolInformation(node, docURI); + } + catch (Exception e) { + e.printStackTrace(); + } + + return super.visit(node); + } + + @Override + public boolean visit(NormalAnnotation node) { + try { + extractSymbolInformation(node, docURI); + } + catch (Exception e) { + e.printStackTrace(); + } + + return super.visit(node); + } + + @Override + public boolean visit(MarkerAnnotation node) { + try { + extractSymbolInformation(node, docURI); + } + catch (Exception e) { + e.printStackTrace(); + } + + return super.visit(node); + } + }); + } + + private void extractSymbolInformation(Annotation node, String docURI) throws Exception { + System.out.println("annotation found: " + node.toString()); + ITypeBinding typeBinding = node.resolveTypeBinding(); + + if (typeBinding != null) { + String qualifiedTypeName = typeBinding.getQualifiedName(); + + TextDocument doc = createTempTextDocument(docURI); + + SymbolProvider provider = symbolProviders.get(qualifiedTypeName); + if (provider != null) { + SymbolInformation symbol = provider.getSymbol(node, doc); + if (symbol != null) { + symbols.add(symbol); + } + } + else { + SymbolInformation symbol = provideDefaultSymbol(node, doc); + if (symbol != null) { + symbols.add(symbol); + } + } + } + } + + private TextDocument createTempTextDocument(String docURI) throws Exception { + Path path = Paths.get(new URI(docURI)); + String content = new String(Files.readAllBytes(path)); + + TextDocument doc = new TextDocument(docURI, LanguageId.PLAINTEXT, 0, content); + return doc; + } + + private SymbolInformation provideDefaultSymbol(Annotation node, TextDocument doc) { + try { + ITypeBinding type = node.resolveTypeBinding(); + if (type != null) { + String qualifiedName = type.getQualifiedName(); + if (qualifiedName != null && qualifiedName.startsWith("org.springframework")) { + SymbolInformation symbol = new SymbolInformation(node.toString(), SymbolKind.Interface, + new Location(doc.getUri(), doc.toRange(node.getStartPosition(), node.getLength()))); + return symbol; + } + } + } + catch (Exception e) { + e.printStackTrace(); + } + + return null; + } + + private String[] getClasspathEntries(IJavaProject project) throws Exception { + IClasspath classpath = project.getClasspath(); + Stream classpathEntries = classpath.getClasspathEntries(); + return classpathEntries + .filter(path -> path.toFile().exists()) + .map(path -> path.toAbsolutePath().toString()).toArray(String[]::new); + } + +} diff --git a/headless-services/boot-java-language-server/src/test/java/org/springframework/ide/vscode/boot/java/utils/test/AnnotationIndexerTest.java b/headless-services/boot-java-language-server/src/test/java/org/springframework/ide/vscode/boot/java/utils/test/AnnotationIndexerTest.java new file mode 100644 index 000000000..7f5edada0 --- /dev/null +++ b/headless-services/boot-java-language-server/src/test/java/org/springframework/ide/vscode/boot/java/utils/test/AnnotationIndexerTest.java @@ -0,0 +1,107 @@ +/******************************************************************************* + * Copyright (c) 2017 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 + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Pivotal, Inc. - initial API and implementation + *******************************************************************************/ +package org.springframework.ide.vscode.boot.java.utils.test; + +import static org.junit.Assert.assertEquals; + +import java.io.File; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +import org.eclipse.lsp4j.Location; +import org.eclipse.lsp4j.SymbolInformation; +import org.junit.Before; +import org.junit.Test; +import org.springframework.ide.vscode.boot.java.handlers.SymbolProvider; +import org.springframework.ide.vscode.boot.java.requestmapping.Constants; +import org.springframework.ide.vscode.boot.java.requestmapping.RequestMappingSymbolProvider; +import org.springframework.ide.vscode.boot.java.utils.AnnotationIndexer; +import org.springframework.ide.vscode.commons.languageserver.java.DefaultJavaProjectFinder; +import org.springframework.ide.vscode.commons.languageserver.java.IJavaProjectFinderStrategy; +import org.springframework.ide.vscode.commons.languageserver.java.JavaProjectFinder; +import org.springframework.ide.vscode.commons.maven.MavenCore; +import org.springframework.ide.vscode.commons.maven.MavenProjectFinderStrategy; +import org.springframework.ide.vscode.project.harness.ProjectsHarness; + +/** + * @author Martin Lippert + */ +public class AnnotationIndexerTest { + + private Map symbolProviders; + private JavaProjectFinder projectFinder; + + @Before + public void setup() throws Exception { + symbolProviders = new HashMap<>(); + symbolProviders.put(Constants.SPRING_REQUEST_MAPPING, new RequestMappingSymbolProvider()); + + projectFinder = new DefaultJavaProjectFinder(new IJavaProjectFinderStrategy[] {new MavenProjectFinderStrategy(MavenCore.getDefault())}); + } + + @Test + public void testScanningAllAnnotationsSimpleProjectUpfront() throws Exception { + AnnotationIndexer indexer = new AnnotationIndexer(projectFinder, symbolProviders); + File directory = new File(ProjectsHarness.class.getResource("/test-projects/test-annotation-indexing-parent/test-annotation-indexing/").toURI()); + indexer.scanFiles(directory); + + List allSymbols = indexer.getAllSymbols(); + + assertEquals(8, allSymbols.size()); + + String uriPrefix = "file://" + directory.getAbsolutePath(); + + assertSymbol(allSymbols.get(0), "@SpringBootApplication", uriPrefix + "/src/main/java/org/test/MainClass.java", 6, 0, 6, 22); + assertSymbol(allSymbols.get(1), "@/embedded-foo-mapping -- (no method defined)", uriPrefix + "/src/main/java/org/test/MainClass.java", 17, 1, 17, 41); + assertSymbol(allSymbols.get(2), "@/foo-root-mapping -- (no method defined)", uriPrefix + "/src/main/java/org/test/MainClass.java", 24, 0, 24, 36); + assertSymbol(allSymbols.get(3), "@/embedded-foo-mapping -- (no method defined)", uriPrefix + "/src/main/java/org/test/MainClass.java", 27, 1, 27, 41); + assertSymbol(allSymbols.get(4), "@/mapping1 -- (no method defined)", uriPrefix + "/src/main/java/org/test/SimpleMappingClass.java", 6, 1, 6, 28); + assertSymbol(allSymbols.get(5), "@/mapping2 -- (no method defined)", uriPrefix + "/src/main/java/org/test/SimpleMappingClass.java", 11, 1, 11, 28); + assertSymbol(allSymbols.get(6), "@/classlevel -- (no method defined)", uriPrefix + "/src/main/java/org/test/sub/MappingClassSubpackage.java", 4, 0, 4, 30); + assertSymbol(allSymbols.get(7), "@/mapping-subpackage -- (no method defined)", uriPrefix + "/src/main/java/org/test/sub/MappingClassSubpackage.java", 7, 1, 7, 38); + } + + @Test + public void testScanningAllAnnotationsMultiModuleProjectUpfront() throws Exception { + AnnotationIndexer indexer = new AnnotationIndexer(projectFinder, symbolProviders); + File directory = new File(ProjectsHarness.class.getResource("/test-projects/test-annotation-indexing-parent/").toURI()); + indexer.scanFiles(directory); + + List allSymbols = indexer.getAllSymbols(); + + assertEquals(8, allSymbols.size()); + + String uriPrefix = "file://" + directory.getAbsolutePath() + "/test-annotation-indexing"; + + assertSymbol(allSymbols.get(0), "@SpringBootApplication", uriPrefix + "/src/main/java/org/test/MainClass.java", 6, 0, 6, 22); + assertSymbol(allSymbols.get(1), "@/embedded-foo-mapping -- (no method defined)", uriPrefix + "/src/main/java/org/test/MainClass.java", 17, 1, 17, 41); + assertSymbol(allSymbols.get(2), "@/foo-root-mapping -- (no method defined)", uriPrefix + "/src/main/java/org/test/MainClass.java", 24, 0, 24, 36); + assertSymbol(allSymbols.get(3), "@/embedded-foo-mapping -- (no method defined)", uriPrefix + "/src/main/java/org/test/MainClass.java", 27, 1, 27, 41); + assertSymbol(allSymbols.get(4), "@/mapping1 -- (no method defined)", uriPrefix + "/src/main/java/org/test/SimpleMappingClass.java", 6, 1, 6, 28); + assertSymbol(allSymbols.get(5), "@/mapping2 -- (no method defined)", uriPrefix + "/src/main/java/org/test/SimpleMappingClass.java", 11, 1, 11, 28); + assertSymbol(allSymbols.get(6), "@/classlevel -- (no method defined)", uriPrefix + "/src/main/java/org/test/sub/MappingClassSubpackage.java", 4, 0, 4, 30); + assertSymbol(allSymbols.get(7), "@/mapping-subpackage -- (no method defined)", uriPrefix + "/src/main/java/org/test/sub/MappingClassSubpackage.java", 7, 1, 7, 38); + } + + private void assertSymbol(SymbolInformation symbol, String name, String uri, int startLine, int startCHaracter, int endLine, int endCharacter) { + assertEquals(name, symbol.getName()); + + Location location = symbol.getLocation(); + assertEquals("symbol: " + symbol.getName(), uri, location.getUri()); + assertEquals("symbol: " + symbol.getName(), startLine, location.getRange().getStart().getLine()); + assertEquals("symbol: " + symbol.getName(), startCHaracter, location.getRange().getStart().getCharacter()); + assertEquals("symbol: " + symbol.getName(), endLine, location.getRange().getEnd().getLine()); + assertEquals("symbol: " + symbol.getName(), endCharacter, location.getRange().getEnd().getCharacter()); + + } + +} diff --git a/headless-services/boot-java-language-server/src/test/resources/test-projects/test-annotation-indexing-parent/pom.xml b/headless-services/boot-java-language-server/src/test/resources/test-projects/test-annotation-indexing-parent/pom.xml new file mode 100644 index 000000000..7f30a08b6 --- /dev/null +++ b/headless-services/boot-java-language-server/src/test/resources/test-projects/test-annotation-indexing-parent/pom.xml @@ -0,0 +1,37 @@ + + + 4.0.0 + + com.example + test-annotation-indexing-parent + 0.0.1-SNAPSHOT + pom + + + test-annotation-indexing + + + + org.springframework.boot + spring-boot-starter-parent + 1.4.3.RELEASE + + + + + UTF-8 + UTF-8 + 1.8 + + + + + + org.springframework.boot + spring-boot-maven-plugin + + + + + diff --git a/headless-services/boot-java-language-server/src/test/resources/test-projects/test-annotation-indexing-parent/test-annotation-indexing/.gitignore b/headless-services/boot-java-language-server/src/test/resources/test-projects/test-annotation-indexing-parent/test-annotation-indexing/.gitignore new file mode 100644 index 000000000..2af7cefb0 --- /dev/null +++ b/headless-services/boot-java-language-server/src/test/resources/test-projects/test-annotation-indexing-parent/test-annotation-indexing/.gitignore @@ -0,0 +1,24 @@ +target/ +!.mvn/wrapper/maven-wrapper.jar + +### STS ### +.apt_generated +.classpath +.factorypath +.project +.settings +.springBeans + +### IntelliJ IDEA ### +.idea +*.iws +*.iml +*.ipr + +### NetBeans ### +nbproject/private/ +build/ +nbbuild/ +dist/ +nbdist/ +.nb-gradle/ \ No newline at end of file diff --git a/headless-services/boot-java-language-server/src/test/resources/test-projects/test-annotation-indexing-parent/test-annotation-indexing/.mvn/wrapper/maven-wrapper.jar b/headless-services/boot-java-language-server/src/test/resources/test-projects/test-annotation-indexing-parent/test-annotation-indexing/.mvn/wrapper/maven-wrapper.jar new file mode 100644 index 000000000..5fd4d5023 Binary files /dev/null and b/headless-services/boot-java-language-server/src/test/resources/test-projects/test-annotation-indexing-parent/test-annotation-indexing/.mvn/wrapper/maven-wrapper.jar differ diff --git a/headless-services/boot-java-language-server/src/test/resources/test-projects/test-annotation-indexing-parent/test-annotation-indexing/.mvn/wrapper/maven-wrapper.properties b/headless-services/boot-java-language-server/src/test/resources/test-projects/test-annotation-indexing-parent/test-annotation-indexing/.mvn/wrapper/maven-wrapper.properties new file mode 100644 index 000000000..c954cec91 --- /dev/null +++ b/headless-services/boot-java-language-server/src/test/resources/test-projects/test-annotation-indexing-parent/test-annotation-indexing/.mvn/wrapper/maven-wrapper.properties @@ -0,0 +1 @@ +distributionUrl=https://repo1.maven.org/maven2/org/apache/maven/apache-maven/3.3.9/apache-maven-3.3.9-bin.zip diff --git a/headless-services/boot-java-language-server/src/test/resources/test-projects/test-annotation-indexing-parent/test-annotation-indexing/mvnw b/headless-services/boot-java-language-server/src/test/resources/test-projects/test-annotation-indexing-parent/test-annotation-indexing/mvnw new file mode 100755 index 000000000..a1ba1bf55 --- /dev/null +++ b/headless-services/boot-java-language-server/src/test/resources/test-projects/test-annotation-indexing-parent/test-annotation-indexing/mvnw @@ -0,0 +1,233 @@ +#!/bin/sh +# ---------------------------------------------------------------------------- +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# ---------------------------------------------------------------------------- + +# ---------------------------------------------------------------------------- +# Maven2 Start Up Batch script +# +# Required ENV vars: +# ------------------ +# JAVA_HOME - location of a JDK home dir +# +# Optional ENV vars +# ----------------- +# M2_HOME - location of maven2's installed home dir +# MAVEN_OPTS - parameters passed to the Java VM when running Maven +# e.g. to debug Maven itself, use +# set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000 +# MAVEN_SKIP_RC - flag to disable loading of mavenrc files +# ---------------------------------------------------------------------------- + +if [ -z "$MAVEN_SKIP_RC" ] ; then + + if [ -f /etc/mavenrc ] ; then + . /etc/mavenrc + fi + + if [ -f "$HOME/.mavenrc" ] ; then + . "$HOME/.mavenrc" + fi + +fi + +# OS specific support. $var _must_ be set to either true or false. +cygwin=false; +darwin=false; +mingw=false +case "`uname`" in + CYGWIN*) cygwin=true ;; + MINGW*) mingw=true;; + Darwin*) darwin=true + # + # Look for the Apple JDKs first to preserve the existing behaviour, and then look + # for the new JDKs provided by Oracle. + # + if [ -z "$JAVA_HOME" ] && [ -L /System/Library/Frameworks/JavaVM.framework/Versions/CurrentJDK ] ; then + # + # Apple JDKs + # + export JAVA_HOME=/System/Library/Frameworks/JavaVM.framework/Versions/CurrentJDK/Home + fi + + if [ -z "$JAVA_HOME" ] && [ -L /System/Library/Java/JavaVirtualMachines/CurrentJDK ] ; then + # + # Apple JDKs + # + export JAVA_HOME=/System/Library/Java/JavaVirtualMachines/CurrentJDK/Contents/Home + fi + + if [ -z "$JAVA_HOME" ] && [ -L "/Library/Java/JavaVirtualMachines/CurrentJDK" ] ; then + # + # Oracle JDKs + # + export JAVA_HOME=/Library/Java/JavaVirtualMachines/CurrentJDK/Contents/Home + fi + + if [ -z "$JAVA_HOME" ] && [ -x "/usr/libexec/java_home" ]; then + # + # Apple JDKs + # + export JAVA_HOME=`/usr/libexec/java_home` + fi + ;; +esac + +if [ -z "$JAVA_HOME" ] ; then + if [ -r /etc/gentoo-release ] ; then + JAVA_HOME=`java-config --jre-home` + fi +fi + +if [ -z "$M2_HOME" ] ; then + ## resolve links - $0 may be a link to maven's home + PRG="$0" + + # need this for relative symlinks + while [ -h "$PRG" ] ; do + ls=`ls -ld "$PRG"` + link=`expr "$ls" : '.*-> \(.*\)$'` + if expr "$link" : '/.*' > /dev/null; then + PRG="$link" + else + PRG="`dirname "$PRG"`/$link" + fi + done + + saveddir=`pwd` + + M2_HOME=`dirname "$PRG"`/.. + + # make it fully qualified + M2_HOME=`cd "$M2_HOME" && pwd` + + cd "$saveddir" + # echo Using m2 at $M2_HOME +fi + +# For Cygwin, ensure paths are in UNIX format before anything is touched +if $cygwin ; then + [ -n "$M2_HOME" ] && + M2_HOME=`cygpath --unix "$M2_HOME"` + [ -n "$JAVA_HOME" ] && + JAVA_HOME=`cygpath --unix "$JAVA_HOME"` + [ -n "$CLASSPATH" ] && + CLASSPATH=`cygpath --path --unix "$CLASSPATH"` +fi + +# For Migwn, ensure paths are in UNIX format before anything is touched +if $mingw ; then + [ -n "$M2_HOME" ] && + M2_HOME="`(cd "$M2_HOME"; pwd)`" + [ -n "$JAVA_HOME" ] && + JAVA_HOME="`(cd "$JAVA_HOME"; pwd)`" + # TODO classpath? +fi + +if [ -z "$JAVA_HOME" ]; then + javaExecutable="`which javac`" + if [ -n "$javaExecutable" ] && ! [ "`expr \"$javaExecutable\" : '\([^ ]*\)'`" = "no" ]; then + # readlink(1) is not available as standard on Solaris 10. + readLink=`which readlink` + if [ ! `expr "$readLink" : '\([^ ]*\)'` = "no" ]; then + if $darwin ; then + javaHome="`dirname \"$javaExecutable\"`" + javaExecutable="`cd \"$javaHome\" && pwd -P`/javac" + else + javaExecutable="`readlink -f \"$javaExecutable\"`" + fi + javaHome="`dirname \"$javaExecutable\"`" + javaHome=`expr "$javaHome" : '\(.*\)/bin'` + JAVA_HOME="$javaHome" + export JAVA_HOME + fi + fi +fi + +if [ -z "$JAVACMD" ] ; then + if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD="$JAVA_HOME/jre/sh/java" + else + JAVACMD="$JAVA_HOME/bin/java" + fi + else + JAVACMD="`which java`" + fi +fi + +if [ ! -x "$JAVACMD" ] ; then + echo "Error: JAVA_HOME is not defined correctly." >&2 + echo " We cannot execute $JAVACMD" >&2 + exit 1 +fi + +if [ -z "$JAVA_HOME" ] ; then + echo "Warning: JAVA_HOME environment variable is not set." +fi + +CLASSWORLDS_LAUNCHER=org.codehaus.plexus.classworlds.launcher.Launcher + +# For Cygwin, switch paths to Windows format before running java +if $cygwin; then + [ -n "$M2_HOME" ] && + M2_HOME=`cygpath --path --windows "$M2_HOME"` + [ -n "$JAVA_HOME" ] && + JAVA_HOME=`cygpath --path --windows "$JAVA_HOME"` + [ -n "$CLASSPATH" ] && + CLASSPATH=`cygpath --path --windows "$CLASSPATH"` +fi + +# traverses directory structure from process work directory to filesystem root +# first directory with .mvn subdirectory is considered project base directory +find_maven_basedir() { + local basedir=$(pwd) + local wdir=$(pwd) + while [ "$wdir" != '/' ] ; do + if [ -d "$wdir"/.mvn ] ; then + basedir=$wdir + break + fi + wdir=$(cd "$wdir/.."; pwd) + done + echo "${basedir}" +} + +# concatenates all lines of a file +concat_lines() { + if [ -f "$1" ]; then + echo "$(tr -s '\n' ' ' < "$1")" + fi +} + +export MAVEN_PROJECTBASEDIR=${MAVEN_BASEDIR:-$(find_maven_basedir)} +MAVEN_OPTS="$(concat_lines "$MAVEN_PROJECTBASEDIR/.mvn/jvm.config") $MAVEN_OPTS" + +# Provide a "standardized" way to retrieve the CLI args that will +# work with both Windows and non-Windows executions. +MAVEN_CMD_LINE_ARGS="$MAVEN_CONFIG $@" +export MAVEN_CMD_LINE_ARGS + +WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain + +exec "$JAVACMD" \ + $MAVEN_OPTS \ + -classpath "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.jar" \ + "-Dmaven.home=${M2_HOME}" "-Dmaven.multiModuleProjectDirectory=${MAVEN_PROJECTBASEDIR}" \ + ${WRAPPER_LAUNCHER} "$@" diff --git a/headless-services/boot-java-language-server/src/test/resources/test-projects/test-annotation-indexing-parent/test-annotation-indexing/mvnw.cmd b/headless-services/boot-java-language-server/src/test/resources/test-projects/test-annotation-indexing-parent/test-annotation-indexing/mvnw.cmd new file mode 100644 index 000000000..2b934e89d --- /dev/null +++ b/headless-services/boot-java-language-server/src/test/resources/test-projects/test-annotation-indexing-parent/test-annotation-indexing/mvnw.cmd @@ -0,0 +1,145 @@ +@REM ---------------------------------------------------------------------------- +@REM Licensed to the Apache Software Foundation (ASF) under one +@REM or more contributor license agreements. See the NOTICE file +@REM distributed with this work for additional information +@REM regarding copyright ownership. The ASF licenses this file +@REM to you under the Apache License, Version 2.0 (the +@REM "License"); you may not use this file except in compliance +@REM with the License. You may obtain a copy of the License at +@REM +@REM http://www.apache.org/licenses/LICENSE-2.0 +@REM +@REM Unless required by applicable law or agreed to in writing, +@REM software distributed under the License is distributed on an +@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +@REM KIND, either express or implied. See the License for the +@REM specific language governing permissions and limitations +@REM under the License. +@REM ---------------------------------------------------------------------------- + +@REM ---------------------------------------------------------------------------- +@REM Maven2 Start Up Batch script +@REM +@REM Required ENV vars: +@REM JAVA_HOME - location of a JDK home dir +@REM +@REM Optional ENV vars +@REM M2_HOME - location of maven2's installed home dir +@REM MAVEN_BATCH_ECHO - set to 'on' to enable the echoing of the batch commands +@REM MAVEN_BATCH_PAUSE - set to 'on' to wait for a key stroke before ending +@REM MAVEN_OPTS - parameters passed to the Java VM when running Maven +@REM e.g. to debug Maven itself, use +@REM set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000 +@REM MAVEN_SKIP_RC - flag to disable loading of mavenrc files +@REM ---------------------------------------------------------------------------- + +@REM Begin all REM lines with '@' in case MAVEN_BATCH_ECHO is 'on' +@echo off +@REM enable echoing my setting MAVEN_BATCH_ECHO to 'on' +@if "%MAVEN_BATCH_ECHO%" == "on" echo %MAVEN_BATCH_ECHO% + +@REM set %HOME% to equivalent of $HOME +if "%HOME%" == "" (set "HOME=%HOMEDRIVE%%HOMEPATH%") + +@REM Execute a user defined script before this one +if not "%MAVEN_SKIP_RC%" == "" goto skipRcPre +@REM check for pre script, once with legacy .bat ending and once with .cmd ending +if exist "%HOME%\mavenrc_pre.bat" call "%HOME%\mavenrc_pre.bat" +if exist "%HOME%\mavenrc_pre.cmd" call "%HOME%\mavenrc_pre.cmd" +:skipRcPre + +@setlocal + +set ERROR_CODE=0 + +@REM To isolate internal variables from possible post scripts, we use another setlocal +@setlocal + +@REM ==== START VALIDATION ==== +if not "%JAVA_HOME%" == "" goto OkJHome + +echo. +echo Error: JAVA_HOME not found in your environment. >&2 +echo Please set the JAVA_HOME variable in your environment to match the >&2 +echo location of your Java installation. >&2 +echo. +goto error + +:OkJHome +if exist "%JAVA_HOME%\bin\java.exe" goto init + +echo. +echo Error: JAVA_HOME is set to an invalid directory. >&2 +echo JAVA_HOME = "%JAVA_HOME%" >&2 +echo Please set the JAVA_HOME variable in your environment to match the >&2 +echo location of your Java installation. >&2 +echo. +goto error + +@REM ==== END VALIDATION ==== + +:init + +set MAVEN_CMD_LINE_ARGS=%* + +@REM Find the project base dir, i.e. the directory that contains the folder ".mvn". +@REM Fallback to current working directory if not found. + +set MAVEN_PROJECTBASEDIR=%MAVEN_BASEDIR% +IF NOT "%MAVEN_PROJECTBASEDIR%"=="" goto endDetectBaseDir + +set EXEC_DIR=%CD% +set WDIR=%EXEC_DIR% +:findBaseDir +IF EXIST "%WDIR%"\.mvn goto baseDirFound +cd .. +IF "%WDIR%"=="%CD%" goto baseDirNotFound +set WDIR=%CD% +goto findBaseDir + +:baseDirFound +set MAVEN_PROJECTBASEDIR=%WDIR% +cd "%EXEC_DIR%" +goto endDetectBaseDir + +:baseDirNotFound +set MAVEN_PROJECTBASEDIR=%EXEC_DIR% +cd "%EXEC_DIR%" + +:endDetectBaseDir + +IF NOT EXIST "%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config" goto endReadAdditionalConfig + +@setlocal EnableExtensions EnableDelayedExpansion +for /F "usebackq delims=" %%a in ("%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config") do set JVM_CONFIG_MAVEN_PROPS=!JVM_CONFIG_MAVEN_PROPS! %%a +@endlocal & set JVM_CONFIG_MAVEN_PROPS=%JVM_CONFIG_MAVEN_PROPS% + +:endReadAdditionalConfig + +SET MAVEN_JAVA_EXE="%JAVA_HOME%\bin\java.exe" + +set WRAPPER_JAR="".\.mvn\wrapper\maven-wrapper.jar"" +set WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain + +%MAVEN_JAVA_EXE% %JVM_CONFIG_MAVEN_PROPS% %MAVEN_OPTS% %MAVEN_DEBUG_OPTS% -classpath %WRAPPER_JAR% "-Dmaven.multiModuleProjectDirectory=%MAVEN_PROJECTBASEDIR%" %WRAPPER_LAUNCHER% %MAVEN_CMD_LINE_ARGS% +if ERRORLEVEL 1 goto error +goto end + +:error +set ERROR_CODE=1 + +:end +@endlocal & set ERROR_CODE=%ERROR_CODE% + +if not "%MAVEN_SKIP_RC%" == "" goto skipRcPost +@REM check for post script, once with legacy .bat ending and once with .cmd ending +if exist "%HOME%\mavenrc_post.bat" call "%HOME%\mavenrc_post.bat" +if exist "%HOME%\mavenrc_post.cmd" call "%HOME%\mavenrc_post.cmd" +:skipRcPost + +@REM pause the script if MAVEN_BATCH_PAUSE is set to 'on' +if "%MAVEN_BATCH_PAUSE%" == "on" pause + +if "%MAVEN_TERMINATE_CMD%" == "on" exit %ERROR_CODE% + +exit /B %ERROR_CODE% \ No newline at end of file diff --git a/headless-services/boot-java-language-server/src/test/resources/test-projects/test-annotation-indexing-parent/test-annotation-indexing/pom.xml b/headless-services/boot-java-language-server/src/test/resources/test-projects/test-annotation-indexing-parent/test-annotation-indexing/pom.xml new file mode 100644 index 000000000..2a9b30937 --- /dev/null +++ b/headless-services/boot-java-language-server/src/test/resources/test-projects/test-annotation-indexing-parent/test-annotation-indexing/pom.xml @@ -0,0 +1,30 @@ + + + 4.0.0 + + test-annotation-indexing + jar + + test-annotation-indexing + Test projects for spring boot java language server - annotation indexing + + + com.example + test-annotation-indexing-parent + 0.0.1-SNAPSHOT + ../pom.xml + + + + + org.springframework.boot + spring-boot-starter + + + org.springframework.boot + spring-boot-starter-web + + + + diff --git a/headless-services/boot-java-language-server/src/test/resources/test-projects/test-annotation-indexing-parent/test-annotation-indexing/src/main/java/org/test/MainClass.java b/headless-services/boot-java-language-server/src/test/resources/test-projects/test-annotation-indexing-parent/test-annotation-indexing/src/main/java/org/test/MainClass.java new file mode 100644 index 000000000..d41a8ebaf --- /dev/null +++ b/headless-services/boot-java-language-server/src/test/resources/test-projects/test-annotation-indexing-parent/test-annotation-indexing/src/main/java/org/test/MainClass.java @@ -0,0 +1,33 @@ +package org.test; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.web.bind.annotation.RequestMapping; + +@SpringBootApplication +public class MainClass { + + public static void main(String[] args) throws Exception { + SpringApplication.run(MainClass.class, args); + } + +} + +class EmbeddedMappingClass { + + @RequestMapping("/embedded-foo-mapping") + public String foo() { + return "foo"; + } + +} + +@RequestMapping("/foo-root-mapping") +class EmbeddedMappingClassWithRootMapping { + + @RequestMapping("/embedded-foo-mapping") + public String foo() { + return "foo"; + } + +} diff --git a/headless-services/boot-java-language-server/src/test/resources/test-projects/test-annotation-indexing-parent/test-annotation-indexing/src/main/java/org/test/SimpleMappingClass.java b/headless-services/boot-java-language-server/src/test/resources/test-projects/test-annotation-indexing-parent/test-annotation-indexing/src/main/java/org/test/SimpleMappingClass.java new file mode 100644 index 000000000..58c597800 --- /dev/null +++ b/headless-services/boot-java-language-server/src/test/resources/test-projects/test-annotation-indexing-parent/test-annotation-indexing/src/main/java/org/test/SimpleMappingClass.java @@ -0,0 +1,17 @@ +package org.test; + +import org.springframework.web.bind.annotation.RequestMapping; + +public class SimpleMappingClass { + + @RequestMapping("mapping1") + public String hello1() { + return "hello1"; + } + + @RequestMapping("mapping2") + public String hello2() { + return "hello2"; + } + +} diff --git a/headless-services/boot-java-language-server/src/test/resources/test-projects/test-annotation-indexing-parent/test-annotation-indexing/src/main/java/org/test/sub/MappingClassSubpackage.java b/headless-services/boot-java-language-server/src/test/resources/test-projects/test-annotation-indexing-parent/test-annotation-indexing/src/main/java/org/test/sub/MappingClassSubpackage.java new file mode 100644 index 000000000..b24c794f6 --- /dev/null +++ b/headless-services/boot-java-language-server/src/test/resources/test-projects/test-annotation-indexing-parent/test-annotation-indexing/src/main/java/org/test/sub/MappingClassSubpackage.java @@ -0,0 +1,13 @@ +package org.test.sub; + +import org.springframework.web.bind.annotation.RequestMapping; + +@RequestMapping("/classlevel") +public class MappingClassSubpackage { + + @RequestMapping("mapping-subpackage") + public String hello1() { + return "hello1"; + } + +}