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

Remove obsolete method 'isProjectRoot' from project finder interface

Browse Source
This commit is contained in:
Kris De Volder
2017-10-17 10:41:56 -07:00
parent 023e623f02
commit 69491029b3
11 changed files with 26 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
headless-services/boot-java-language-server/src/test/java/org/springframework/ide/vscode/boot/java/autowired/test/AutowiredHoverProviderTest.java
View File

@@ -87,8 +87,8 @@ public class AutowiredHoverProviderTest {
harness.intialize(directory);
String docURI = "file://" + directory.getAbsolutePath() + "/src/main/java/org/test/MyAutowiredComponent.java";
IJavaProject project = projectFinder.find(directory);
TextDocument document = createTempTextDocument(docURI);
IJavaProject project = projectFinder.find(document);
CompilationUnit cu = parse(document, project);
@@ -113,8 +113,8 @@ public class AutowiredHoverProviderTest {
harness.intialize(directory);
String docURI = "file://" + directory.getAbsolutePath() + "/src/main/java/org/test/MyAutowiredComponent.java";
IJavaProject project = projectFinder.find(directory);
TextDocument document = createTempTextDocument(docURI);
IJavaProject project = projectFinder.find(document);
CompilationUnit cu = parse(document, project);
@@ -132,8 +132,8 @@ public class AutowiredHoverProviderTest {
harness.intialize(directory);
String docURI = "file://" + directory.getAbsolutePath() + "/src/main/java/org/test/MyAutowiredComponent.java";
IJavaProject project = projectFinder.find(directory);
TextDocument document = createTempTextDocument(docURI);
IJavaProject project = projectFinder.find(document);
CompilationUnit cu = parse(document, project);
@@ -153,8 +153,8 @@ public class AutowiredHoverProviderTest {
harness.intialize(directory);
String docURI = "file://" + directory.getAbsolutePath() + "/src/main/java/org/test/MyAutowiredComponent.java";
IJavaProject project = projectFinder.find(directory);
TextDocument document = createTempTextDocument(docURI);
IJavaProject project = projectFinder.find(document);
CompilationUnit cu = parse(document, project);

6
headless-services/boot-java-language-server/src/test/java/org/springframework/ide/vscode/boot/java/beans/test/ComponentHoverProviderTest.java
View File

@@ -87,8 +87,8 @@ public class ComponentHoverProviderTest {
harness.intialize(directory);
String docURI = "file://" + directory.getAbsolutePath() + "/src/main/java/org/test/MyAutomaticallyWiredComponent.java";
IJavaProject project = projectFinder.find(directory);
TextDocument document = createTempTextDocument(docURI);
IJavaProject project = projectFinder.find(document);
CompilationUnit cu = parse(document, project);
@@ -113,8 +113,8 @@ public class ComponentHoverProviderTest {
harness.intialize(directory);
String docURI = "file://" + directory.getAbsolutePath() + "/src/main/java/org/test/MyAutowiredComponent.java";
IJavaProject project = projectFinder.find(directory);
TextDocument document = createTempTextDocument(docURI);
IJavaProject project = projectFinder.find(document);
CompilationUnit cu = parse(document, project);
@@ -134,8 +134,8 @@ public class ComponentHoverProviderTest {
harness.intialize(directory);
String docURI = "file://" + directory.getAbsolutePath() + "/src/main/java/org/test/MyAutomaticallyWiredComponent.java";
IJavaProject project = projectFinder.find(directory);
TextDocument document = createTempTextDocument(docURI);
IJavaProject project = projectFinder.find(document);
CompilationUnit cu = parse(document, project);

14
headless-services/boot-java-language-server/src/test/java/org/springframework/ide/vscode/boot/java/scope/test/ScopeCompletionTest.java
View File

@@ -25,9 +25,9 @@ import org.junit.Before;
import org.junit.Test;
import org.springframework.ide.vscode.boot.java.BootJavaLanguageServer;
import org.springframework.ide.vscode.commons.java.IJavaProject;
import org.springframework.ide.vscode.commons.languageserver.java.AbstractJavaProjectFinder;
import org.springframework.ide.vscode.commons.languageserver.java.CompositeJavaProjectFinder;
import org.springframework.ide.vscode.commons.languageserver.java.JavaProjectFinder;
import org.springframework.ide.vscode.commons.util.text.IDocument;
import org.springframework.ide.vscode.commons.util.text.LanguageId;
import org.springframework.ide.vscode.languageserver.testharness.Editor;
import org.springframework.ide.vscode.languageserver.testharness.LanguageServerHarness;
@@ -39,17 +39,9 @@ import org.springframework.ide.vscode.project.harness.PropertyIndexHarness;
*/
public class ScopeCompletionTest {
protected final CompositeJavaProjectFinder javaProjectFinder = new CompositeJavaProjectFinder(Arrays.asList(new JavaProjectFinder() {
protected final CompositeJavaProjectFinder javaProjectFinder = new CompositeJavaProjectFinder(Arrays.asList((JavaProjectFinder)new AbstractJavaProjectFinder() {
@Override
public boolean isProjectRoot(File file) {
return false;
}
@Override
public IJavaProject find(File file) {
return null;
}
@Override
public IJavaProject find(IDocument doc) {
public IJavaProject find(File doc) {
return getTestProject();
}
}));

30
headless-services/boot-java-language-server/src/test/java/org/springframework/ide/vscode/boot/java/value/test/ValueCompletionTest.java
View File

@@ -18,7 +18,6 @@ import java.io.InputStream;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import java.util.concurrent.Callable;
import org.apache.commons.io.IOUtils;
import org.eclipse.lsp4j.CompletionItem;
@@ -29,7 +28,6 @@ import org.springframework.ide.vscode.boot.java.value.ValueCompletionProcessor;
import org.springframework.ide.vscode.commons.java.IJavaProject;
import org.springframework.ide.vscode.commons.languageserver.java.AbstractJavaProjectFinder;
import org.springframework.ide.vscode.commons.languageserver.java.CompositeJavaProjectFinder;
import org.springframework.ide.vscode.commons.util.text.IDocument;
import org.springframework.ide.vscode.commons.util.text.LanguageId;
import org.springframework.ide.vscode.languageserver.testharness.Editor;
import org.springframework.ide.vscode.languageserver.testharness.LanguageServerHarness;
@@ -53,29 +51,17 @@ public class ValueCompletionTest {
testProject = ProjectsHarness.INSTANCE.mavenProject("test-annotations");
indexHarness = new PropertyIndexHarness();
harness = new LanguageServerHarness<BootJavaLanguageServer>(new Callable<BootJavaLanguageServer>() {
@Override
public BootJavaLanguageServer call() throws Exception {
BootJavaLanguageServer server = new BootJavaLanguageServer(
new CompositeJavaProjectFinder(new ArrayList<>(Collections.singleton(new AbstractJavaProjectFinder() {
harness = new LanguageServerHarness<BootJavaLanguageServer>(() -> {
BootJavaLanguageServer server = new BootJavaLanguageServer(
new CompositeJavaProjectFinder(new ArrayList<>(Collections.singleton(new AbstractJavaProjectFinder() {
@Override
public boolean isProjectRoot(File file) {
return false;
}
@Override
public IJavaProject find(File file) {
return null;
}
@Override
public IJavaProject find(IDocument doc) {
public IJavaProject find(File doc) {
return getTestProject();
}
}))),
indexHarness.getIndexProvider());
return server;
}
}))),
indexHarness.getIndexProvider()
);
return server;
}) {
@Override
protected String getFileExtension() {