diff --git a/headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/properties/BootLanguageServer.java b/headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/BootLanguageServer.java similarity index 83% rename from headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/properties/BootLanguageServer.java rename to headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/BootLanguageServer.java index 83e104dbd..ba5996ce9 100644 --- a/headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/properties/BootLanguageServer.java +++ b/headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/BootLanguageServer.java @@ -8,8 +8,9 @@ * Contributors: * Pivotal, Inc. - initial API and implementation *******************************************************************************/ -package org.springframework.ide.vscode.boot.properties; +package org.springframework.ide.vscode.boot; +import org.springframework.ide.vscode.boot.properties.BootPropertiesLanguageServerComponents; import org.springframework.ide.vscode.commons.languageserver.composable.ComposableLanguageServer; import org.springframework.ide.vscode.commons.languageserver.composable.LanguageServerComponents; import org.springframework.ide.vscode.commons.languageserver.util.LSFactory; @@ -20,11 +21,11 @@ public class BootLanguageServer extends Comp super(extensionId, _components); } - public static ComposableLanguageServer create(LSFactory params) { + public static ComposableLanguageServer create(LSFactory params) { return new ComposableLanguageServer<>("vscode-boot", s -> new BootPropertiesLanguageServerComponents(s, params)); } - public static ComposableLanguageServer createProperties(LSFactory params) { + public static ComposableLanguageServer createProperties(LSFactory params) { return new ComposableLanguageServer<>("vscode-boot", s -> new BootPropertiesLanguageServerComponents(s, params)); } diff --git a/headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/properties/BootPropertiesLanguageServerParams.java b/headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/BootLanguageServerParams.java similarity index 90% rename from headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/properties/BootPropertiesLanguageServerParams.java rename to headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/BootLanguageServerParams.java index bfa5b7511..b88c3437e 100644 --- a/headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/properties/BootPropertiesLanguageServerParams.java +++ b/headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/BootLanguageServerParams.java @@ -8,7 +8,7 @@ * Contributors: * Pivotal, Inc. - initial API and implementation *******************************************************************************/ -package org.springframework.ide.vscode.boot.properties; +package org.springframework.ide.vscode.boot; import java.nio.file.Paths; import java.util.Arrays; @@ -40,14 +40,14 @@ import org.springframework.ide.vscode.commons.util.text.IDocument; * @author Alex Boyko * */ -public class BootPropertiesLanguageServerParams { +public class BootLanguageServerParams { public final JavaProjectFinder projectFinder; public final ProjectObserver projectObserver; public final SpringPropertyIndexProvider indexProvider; public final TypeUtilProvider typeUtilProvider; - public BootPropertiesLanguageServerParams( + public BootLanguageServerParams( JavaProjectFinder projectFinder, ProjectObserver projectObserver, SpringPropertyIndexProvider indexProvider, @@ -60,7 +60,7 @@ public class BootPropertiesLanguageServerParams { this.typeUtilProvider = typeUtilProvider; } - public static LSFactory createDefault() { + public static LSFactory createDefault() { return (SimpleLanguageServer server) -> { // Initialize project finders, project caches and project observers CompositeJavaProjectFinder javaProjectFinder = new CompositeJavaProjectFinder(); @@ -75,7 +75,7 @@ public class BootPropertiesLanguageServerParams { DefaultSpringPropertyIndexProvider indexProvider = new DefaultSpringPropertyIndexProvider(javaProjectFinder, projectObserver); indexProvider.setProgressService(server.getProgressService()); - return new BootPropertiesLanguageServerParams( + return new BootLanguageServerParams( javaProjectFinder.filter(BootProjectUtil::isBootProject), projectObserver, indexProvider, @@ -84,7 +84,7 @@ public class BootPropertiesLanguageServerParams { }; } - public static LSFactory createTestDefault(SpringPropertyIndexProvider indexProvider, TypeUtilProvider typeUtilProvider) { + public static LSFactory createTestDefault(SpringPropertyIndexProvider indexProvider, TypeUtilProvider typeUtilProvider) { return (SimpleLanguageServer server) -> { // Initialize project finders, project caches and project observers CompositeJavaProjectFinder javaProjectFinder = new CompositeJavaProjectFinder(); @@ -98,7 +98,7 @@ public class BootPropertiesLanguageServerParams { CompositeProjectOvserver projectObserver = new CompositeProjectOvserver(Arrays.asList(mavenProjectCache, gradleProjectCache)); - return new BootPropertiesLanguageServerParams( + return new BootLanguageServerParams( javaProjectFinder.filter(BootProjectUtil::isBootProject), projectObserver, indexProvider, @@ -107,7 +107,7 @@ public class BootPropertiesLanguageServerParams { }; } - public static LSFactory createTestDefault() { + public static LSFactory createTestDefault() { return (SimpleLanguageServer server) -> { // Initialize project finders, project caches and project observers CompositeJavaProjectFinder javaProjectFinder = new CompositeJavaProjectFinder(); @@ -124,7 +124,7 @@ public class BootPropertiesLanguageServerParams { DefaultSpringPropertyIndexProvider indexProvider = new DefaultSpringPropertyIndexProvider(javaProjectFinder, projectObserver); indexProvider.setProgressService(server.getProgressService()); - return new BootPropertiesLanguageServerParams( + return new BootLanguageServerParams( javaProjectFinder.filter(BootProjectUtil::isBootProject), projectObserver, indexProvider, diff --git a/headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/properties/BootPropertiesLanguageServerComponents.java b/headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/properties/BootPropertiesLanguageServerComponents.java index 6c0c38bc1..4d3d38ff5 100644 --- a/headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/properties/BootPropertiesLanguageServerComponents.java +++ b/headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/properties/BootPropertiesLanguageServerComponents.java @@ -10,6 +10,7 @@ *******************************************************************************/ package org.springframework.ide.vscode.boot.properties; +import org.springframework.ide.vscode.boot.BootLanguageServerParams; import org.springframework.ide.vscode.boot.common.PropertyCompletionFactory; import org.springframework.ide.vscode.boot.common.RelaxedNameConfig; import org.springframework.ide.vscode.boot.metadata.PropertyInfo; @@ -75,9 +76,9 @@ public class BootPropertiesLanguageServerComponents implements LanguageServerCom private YamlAssistContextProvider yamlAssistContextProvider; private final SimpleLanguageServer server; - public BootPropertiesLanguageServerComponents(SimpleLanguageServer server, LSFactory _params) { + public BootPropertiesLanguageServerComponents(SimpleLanguageServer server, LSFactory _params) { this.server = server; - BootPropertiesLanguageServerParams serverParams = _params.create(server); + BootLanguageServerParams serverParams = _params.create(server); this.indexProvider = serverParams.indexProvider; this.typeUtilProvider = serverParams.typeUtilProvider; diff --git a/headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/properties/Main.java b/headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/properties/Main.java index 7fea2bb8e..1d6c901a0 100644 --- a/headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/properties/Main.java +++ b/headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/properties/Main.java @@ -12,6 +12,8 @@ package org.springframework.ide.vscode.boot.properties; import java.io.IOException; +import org.springframework.ide.vscode.boot.BootLanguageServer; +import org.springframework.ide.vscode.boot.BootLanguageServerParams; import org.springframework.ide.vscode.commons.languageserver.LaunguageServerApp; import org.springframework.ide.vscode.commons.util.LogRedirect; @@ -28,7 +30,7 @@ public class Main { String serverName = "boot-properties-language-server"; LogRedirect.redirectToFile(serverName); LaunguageServerApp.start(serverName, - () -> BootLanguageServer.createProperties(BootPropertiesLanguageServerParams.createDefault()).getServer() + () -> BootLanguageServer.createProperties(BootLanguageServerParams.createDefault()).getServer() ); } diff --git a/headless-services/commons/commons-boot/src/test/java/org/springframework/ide/vscode/boot/test/ApplicationPropertiesEditorTest.java b/headless-services/commons/commons-boot/src/test/java/org/springframework/ide/vscode/boot/test/ApplicationPropertiesEditorTest.java index 6fd114c1f..b536aeac3 100644 --- a/headless-services/commons/commons-boot/src/test/java/org/springframework/ide/vscode/boot/test/ApplicationPropertiesEditorTest.java +++ b/headless-services/commons/commons-boot/src/test/java/org/springframework/ide/vscode/boot/test/ApplicationPropertiesEditorTest.java @@ -24,12 +24,12 @@ import org.eclipse.lsp4j.CompletionItem; import org.eclipse.lsp4j.Diagnostic; import org.junit.Ignore; import org.junit.Test; +import org.springframework.ide.vscode.boot.BootLanguageServer; +import org.springframework.ide.vscode.boot.BootLanguageServerParams; import org.springframework.ide.vscode.boot.editor.harness.AbstractPropsEditorTest; import org.springframework.ide.vscode.boot.editor.harness.StyledStringMatcher; import org.springframework.ide.vscode.boot.metadata.CachingValueProvider; import org.springframework.ide.vscode.boot.metadata.PropertiesLoader; -import org.springframework.ide.vscode.boot.properties.BootLanguageServer; -import org.springframework.ide.vscode.boot.properties.BootPropertiesLanguageServerParams; import org.springframework.ide.vscode.commons.java.IJavaProject; import org.springframework.ide.vscode.commons.java.IType; import org.springframework.ide.vscode.commons.languageserver.composable.ComposableLanguageServer; @@ -1588,7 +1588,7 @@ public class ApplicationPropertiesEditorTest extends AbstractPropsEditorTest { @Override protected SimpleLanguageServer newLanguageServer() { ComposableLanguageServer server = BootLanguageServer.create( - s -> new BootPropertiesLanguageServerParams(javaProjectFinder, null, md.getIndexProvider(), + s -> new BootLanguageServerParams(javaProjectFinder, null, md.getIndexProvider(), typeUtilProvider)); server.setMaxCompletionsNumber(-1); return server.getServer(); diff --git a/headless-services/commons/commons-boot/src/test/java/org/springframework/ide/vscode/boot/test/ApplicationYamlEditorTest.java b/headless-services/commons/commons-boot/src/test/java/org/springframework/ide/vscode/boot/test/ApplicationYamlEditorTest.java index 6d9e8b0b0..238623f42 100644 --- a/headless-services/commons/commons-boot/src/test/java/org/springframework/ide/vscode/boot/test/ApplicationYamlEditorTest.java +++ b/headless-services/commons/commons-boot/src/test/java/org/springframework/ide/vscode/boot/test/ApplicationYamlEditorTest.java @@ -21,12 +21,12 @@ import org.eclipse.lsp4j.CompletionItem; import org.eclipse.lsp4j.Diagnostic; import org.junit.Ignore; import org.junit.Test; +import org.springframework.ide.vscode.boot.BootLanguageServer; +import org.springframework.ide.vscode.boot.BootLanguageServerParams; import org.springframework.ide.vscode.boot.editor.harness.AbstractPropsEditorTest; import org.springframework.ide.vscode.boot.editor.harness.StyledStringMatcher; import org.springframework.ide.vscode.boot.metadata.CachingValueProvider; import org.springframework.ide.vscode.boot.metadata.PropertyInfo; -import org.springframework.ide.vscode.boot.properties.BootLanguageServer; -import org.springframework.ide.vscode.boot.properties.BootPropertiesLanguageServerParams; import org.springframework.ide.vscode.commons.java.IJavaProject; import org.springframework.ide.vscode.commons.languageserver.composable.ComposableLanguageServer; import org.springframework.ide.vscode.commons.languageserver.util.SimpleLanguageServer; @@ -3707,7 +3707,7 @@ public class ApplicationYamlEditorTest extends AbstractPropsEditorTest { @Override protected SimpleLanguageServer newLanguageServer() { ComposableLanguageServer server = BootLanguageServer.create( - s -> new BootPropertiesLanguageServerParams(javaProjectFinder, null, md.getIndexProvider(), + s -> new BootLanguageServerParams(javaProjectFinder, null, md.getIndexProvider(), typeUtilProvider)); server.setMaxCompletionsNumber(-1); return server.getServer(); diff --git a/headless-services/commons/commons-boot/src/test/java/org/springframework/ide/vscode/boot/test/SpringPropertiesIndexTest.java b/headless-services/commons/commons-boot/src/test/java/org/springframework/ide/vscode/boot/test/SpringPropertiesIndexTest.java index 387972e89..e61963ccb 100644 --- a/headless-services/commons/commons-boot/src/test/java/org/springframework/ide/vscode/boot/test/SpringPropertiesIndexTest.java +++ b/headless-services/commons/commons-boot/src/test/java/org/springframework/ide/vscode/boot/test/SpringPropertiesIndexTest.java @@ -20,10 +20,10 @@ import java.io.File; import org.junit.Before; import org.junit.Test; +import org.springframework.ide.vscode.boot.BootLanguageServer; +import org.springframework.ide.vscode.boot.BootLanguageServerParams; import org.springframework.ide.vscode.boot.metadata.DefaultSpringPropertyIndexProvider; -import org.springframework.ide.vscode.boot.properties.BootLanguageServer; import org.springframework.ide.vscode.boot.properties.BootPropertiesLanguageServerComponents; -import org.springframework.ide.vscode.boot.properties.BootPropertiesLanguageServerParams; import org.springframework.ide.vscode.commons.languageserver.ProgressService; import org.springframework.ide.vscode.commons.languageserver.composable.ComposableLanguageServer; import org.springframework.ide.vscode.commons.maven.MavenCore; @@ -46,7 +46,7 @@ public class SpringPropertiesIndexTest { @Before public void setup() throws Exception { - harness = new LanguageServerHarness<>(() -> BootLanguageServer.create(BootPropertiesLanguageServerParams.createTestDefault())); + harness = new LanguageServerHarness<>(() -> BootLanguageServer.create(BootLanguageServerParams.createTestDefault())); } @Test diff --git a/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/Main.java b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/Main.java index e78cf3c02..c0b05e351 100644 --- a/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/Main.java +++ b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/Main.java @@ -13,7 +13,7 @@ package org.springframework.ide.vscode.boot; import java.io.IOException; import org.springframework.ide.vscode.boot.properties.BootLanguageServer; -import org.springframework.ide.vscode.boot.properties.BootPropertiesLanguageServerParams; +import org.springframework.ide.vscode.boot.properties.BootLanguageServerParams; import org.springframework.ide.vscode.commons.languageserver.LaunguageServerApp; import org.springframework.ide.vscode.commons.util.LogRedirect; @@ -31,7 +31,7 @@ public class Main { LogRedirect.redirectToFile(serverName); //TODO: wrap both BootProperties and BootJavaLanguageServers into a composite of some kind. LaunguageServerApp.start(serverName, - () -> BootLanguageServer.create(BootPropertiesLanguageServerParams.createDefault()).getServer() + () -> BootLanguageServer.create(BootLanguageServerParams.createDefault()).getServer() ); }