Skip to content

Commit 898267e

Browse files
committed
Имя файла в параметр, полный путь к глобальному файлу
1 parent 215acda commit 898267e

File tree

4 files changed

+12
-6
lines changed

4 files changed

+12
-6
lines changed

src/main/java/com/github/_1c_syntax/bsl/languageserver/configuration/LanguageServerConfiguration.java

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -100,19 +100,24 @@ public class LanguageServerConfiguration {
100100

101101
@JsonIgnore
102102
@Setter(value = AccessLevel.NONE)
103-
private File configurationFile = new File(".bsl-language-server.json");
103+
private File configurationFile;
104104

105-
@Value(("${app.globalConfig.path}"))
105+
@Value("${app.configuration.path}")
106+
@JsonIgnore
107+
private String configurationFilePath;
108+
109+
@Value(("${app.globalConfiguration.path}"))
106110
@JsonIgnore
107111
private String globalConfigPath;
108112

109113
@PostConstruct
110114
private void init() {
115+
configurationFile = new File(configurationFilePath);
111116
if (configurationFile.exists()) {
112117
loadConfigurationFile(configurationFile);
113118
return;
114119
}
115-
var configuration = new File(globalConfigPath, ".bsl-language-server.json");
120+
var configuration = new File(globalConfigPath);
116121
if (configuration.exists()) {
117122
loadConfigurationFile(configuration);
118123
}

src/main/resources/application.properties

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,5 @@ spring.main.log-startup-info=false
44
logging.level.org.springframework.boot.autoconfigure.logging=INFO
55
logging.level.org.springframework.scheduling.concurrent.ThreadPoolTaskScheduler=warn
66
spring.application.name=BSL Language Server
7-
app.globalConfig.path=${user.home}
7+
app.globalConfiguration.path=${user.home}/.bsl-language-server.json
8+
app.configuration.path=.bsl-language-server.json

src/test/resources/application-measures.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,4 @@ logging.level.org.springframework.test.context.support.AnnotationConfigContextLo
99
logging.level.org.springframework.test.context.support.AbstractContextLoader=warn
1010
logging.level.org.springframework.boot.test.context.SpringBootTestContextBootstrapper=warn
1111
app.measures.enabled=true
12-
app.globalConfig.path=.
12+
app.globalConfiguration.path=.

src/test/resources/application.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,4 @@ spring.application.name=BSL Language Server
88
logging.level.org.springframework.test.context.support.AnnotationConfigContextLoaderUtils=warn
99
logging.level.org.springframework.test.context.support.AbstractContextLoader=warn
1010
logging.level.org.springframework.boot.test.context.SpringBootTestContextBootstrapper=warn
11-
app.globalConfig.path=.
11+
app.globalConfiguration.path=.

0 commit comments

Comments
 (0)