From 9f65ebad5acbfb1d78838bd126b476c579112191 Mon Sep 17 00:00:00 2001 From: Martin Lippert Date: Wed, 8 May 2019 13:54:23 +0200 Subject: [PATCH] performance - specify exact auto config locations and use specific annotations instead of generic @SpringBootApplication --- .../vscode/boot/app/BootLanguagServerBootApp.java | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/app/BootLanguagServerBootApp.java b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/app/BootLanguagServerBootApp.java index f247727d9..cfccb6fd9 100644 --- a/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/app/BootLanguagServerBootApp.java +++ b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/app/BootLanguagServerBootApp.java @@ -13,9 +13,14 @@ package org.springframework.ide.vscode.boot.app; import org.springframework.beans.factory.InitializingBean; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.boot.SpringApplication; -import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.boot.SpringBootConfiguration; +import org.springframework.boot.autoconfigure.ImportAutoConfiguration; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingClass; +import org.springframework.boot.autoconfigure.context.ConfigurationPropertiesAutoConfiguration; +import org.springframework.boot.autoconfigure.context.PropertyPlaceholderAutoConfiguration; +import org.springframework.boot.context.properties.EnableConfigurationProperties; import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.ComponentScan; import org.springframework.ide.vscode.boot.common.PropertyCompletionFactory; import org.springframework.ide.vscode.boot.common.RelaxedNameConfig; import org.springframework.ide.vscode.boot.java.handlers.RunningAppProvider; @@ -53,9 +58,15 @@ import org.springframework.ide.vscode.commons.yaml.completion.YamlAssistContext; import org.springframework.ide.vscode.commons.yaml.completion.YamlAssistContextProvider; import org.springframework.ide.vscode.commons.yaml.structure.YamlDocument; import org.springframework.ide.vscode.commons.yaml.structure.YamlStructureProvider; +import org.springframework.ide.vscode.languageserver.starter.LanguageServerAutoConf; +import org.springframework.ide.vscode.languageserver.starter.LanguageServerRunnerAutoConf; import org.yaml.snakeyaml.Yaml; -@SpringBootApplication(proxyBeanMethods = false) +@SpringBootConfiguration(proxyBeanMethods = false) +@ImportAutoConfiguration({ LanguageServerAutoConf.class, LanguageServerRunnerAutoConf.class, + ConfigurationPropertiesAutoConfiguration.class, PropertyPlaceholderAutoConfiguration.class }) +@EnableConfigurationProperties(BootLsConfigProperties.class) +@ComponentScan public class BootLanguagServerBootApp { private static final String SERVER_NAME = "boot-language-server";