From a60f9665af974307da87a79a66f5c09f09fd2ab3 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 6 Dec 2022 09:31:34 +0000 Subject: [PATCH 1/7] build(deps): bump org.springframework.boot from 2.7.5 to 3.0.0 Bumps [org.springframework.boot](https://github.com/spring-projects/spring-boot) from 2.7.5 to 3.0.0. - [Release notes](https://github.com/spring-projects/spring-boot/releases) - [Commits](https://github.com/spring-projects/spring-boot/compare/v2.7.5...v3.0.0) --- updated-dependencies: - dependency-name: org.springframework.boot dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle.kts b/build.gradle.kts index bf9711d89e7..738fb224312 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -16,7 +16,7 @@ plugins { id("io.freefair.maven-central.validate-poms") version "6.6" id("me.qoomon.git-versioning") version "6.3.7" id("com.github.ben-manes.versions") version "0.44.0" - id("org.springframework.boot") version "2.7.5" + id("org.springframework.boot") version "3.0.0" id("io.spring.dependency-management") version "1.1.0" id("io.github.1c-syntax.bslls-dev-tools") version "0.7.2" id("ru.vyarus.pom") version "2.2.2" From c406f31bc7668fcbbebc4f2d5288a608f6c19394 Mon Sep 17 00:00:00 2001 From: Nikita Fedkin Date: Fri, 16 Dec 2022 00:11:41 +0300 Subject: [PATCH 2/7] migrate to java17 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit javax -> jakarta/spotbugs jdk17 fix compile error import reordering fix guava exclusion Выключена ругань на неверную компиляцию picocli See https://docs.spring.io/spring-framework/docs/current/javadoc-api/org/springframework/core/LocalVariableTableParameterNameDiscoverer.html Война с Nullable Update build.gradle.kts Обновление перехвата System.exit под jdk17+ Update qodana.yaml --- .github/workflows/gradle.yml | 2 +- build.gradle.kts | 10 ++++++---- docs/contributing/EnvironmentSetting.md | 4 ++-- docs/en/contributing/EnvironmentSetting.md | 4 ++-- docs/en/systemRequirements.md | 2 +- docs/systemRequirements.md | 2 +- qodana.yaml | 1 + .../bsl/languageserver/AutoServerInfo.java | 2 +- .../languageserver/aop/EventPublisherAspect.java | 2 +- .../bsl/languageserver/aop/MeasuresAspect.java | 2 +- .../bsl/languageserver/aop/SentryAspect.java | 4 ++-- .../aop/sentry/SentryScopeConfigurer.java | 2 +- .../configuration/LanguageServerConfiguration.java | 6 +++++- .../watcher/ConfigurationFileSystemWatcher.java | 4 ++-- .../languageserver/context/DocumentContext.java | 2 +- .../computer/CognitiveComplexityComputer.java | 2 +- .../computer/CyclomaticComplexityComputer.java | 2 +- .../IfElseDuplicatedCodeBlockDiagnostic.java | 2 +- .../IfElseDuplicatedConditionDiagnostic.java | 2 +- .../InvalidCharacterInFileDiagnostic.java | 2 +- ...nstructorsInStructureDeclarationDiagnostic.java | 2 +- .../diagnostics/NestedStatementsDiagnostic.java | 2 +- .../languageserver/providers/CodeLensProvider.java | 2 +- .../websocket/LSPWebSocketEndpoint.java | 2 +- .../websocket/WebSocketConfiguration.java | 5 ++--- src/main/resources/application.properties | 1 + .../DisableDiagnosticTriggeringSupplierTest.java | 2 +- .../diagnostics/AbstractDiagnosticTest.java | 2 +- ...uctorsInStructureDeclarationDiagnosticTest.java | 2 +- ...gnosticDescriptionDocumentLinkSupplierTest.java | 1 - .../MethodSymbolMarkupContentBuilderTest.java | 2 +- .../VariableSymbolMarkupContentBuilderTest.java | 2 +- .../providers/DefinitionProviderTest.java | 2 +- .../providers/ReferencesProviderTest.java | 2 +- .../providers/RenameProviderTest.java | 2 +- .../ReferenceIndexReferenceFinderTest.java | 2 +- .../references/ReferenceIndexTest.java | 2 +- .../bsl/languageserver/util/Assertions.java | 2 ++ .../websocket/WebsocketLauncherTest.java | 14 ++++++++------ src/test/resources/application-measures.properties | 1 + .../resources/application-websocket.properties | 1 + src/test/resources/application.properties | 1 + 42 files changed, 63 insertions(+), 50 deletions(-) diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index d791c53625b..266ce15841e 100644 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/gradle.yml @@ -18,7 +18,7 @@ jobs: strategy: fail-fast: false matrix: - java_version: ['11', '17'] + java_version: ['17', '19'] os: [ubuntu-latest, windows-latest, macOS-latest] steps: - uses: actions/checkout@v3 diff --git a/build.gradle.kts b/build.gradle.kts index 738fb224312..18bac881e3f 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -69,8 +69,10 @@ dependencies { api("info.picocli:picocli-spring-boot-starter:4.7.0") // lsp4j core - api("org.eclipse.lsp4j", "org.eclipse.lsp4j", "0.19.0") - api("org.eclipse.lsp4j", "org.eclipse.lsp4j.websocket", "0.19.0") + api("org.eclipse.lsp4j", "org.eclipse.lsp4j", "0.19.0") { + exclude(group = "com.google.guava", module = "guava") + } + api("org.eclipse.lsp4j", "org.eclipse.lsp4j.websocket.jakarta", "0.19.0") // 1c-syntax api("com.github.1c-syntax", "bsl-parser", "167aaad827322e09ccde4658a71152dad234de4b") { @@ -133,8 +135,8 @@ dependencies { } java { - sourceCompatibility = JavaVersion.VERSION_11 - targetCompatibility = JavaVersion.VERSION_11 + sourceCompatibility = JavaVersion.VERSION_17 + targetCompatibility = JavaVersion.VERSION_17 withSourcesJar() withJavadocJar() } diff --git a/docs/contributing/EnvironmentSetting.md b/docs/contributing/EnvironmentSetting.md index 9830b52b862..f2ce34b531e 100644 --- a/docs/contributing/EnvironmentSetting.md +++ b/docs/contributing/EnvironmentSetting.md @@ -4,7 +4,7 @@ ## Необходимое ПО -* Java Development Kit 11 +* Java Development Kit 17 * [IntelliJ IDEA Community Edition](https://www.jetbrains.com/idea/download/) * Плагины IntelliJ IDEA * Lombok Plugin @@ -14,7 +14,7 @@ ### Настройки IntelliJ IDEA -* Настроить [Java SDK на JDK11](https://www.jetbrains.com/help/idea/sdk.html#manage_sdks) +* Настроить [Java SDK на JDK17](https://www.jetbrains.com/help/idea/sdk.html#manage_sdks) * Включить обработку аннотаций: `File -> Settings -> Build, Execution, Deployment -> Compiler -> Annotation Processors -> Enable annotation processing` * Выполнить настройки автоимпорта, подробно описано в [статье](https://www.jetbrains.com/help/idea/creating-and-optimizing-imports.html). Отдельно стоит обратить внимание на оптимизацию импорта. * Не надо запускать оптимизацию импортов всего проекта, за этим следят мейнтейнеры. Если после оптимизации импортов появились измененные файлы, которые не менялись в процессе разработки, стоит уведомить мейнтейнеров и откатить эти изменения. diff --git a/docs/en/contributing/EnvironmentSetting.md b/docs/en/contributing/EnvironmentSetting.md index ee86d2feb8a..94799ee9bdb 100644 --- a/docs/en/contributing/EnvironmentSetting.md +++ b/docs/en/contributing/EnvironmentSetting.md @@ -4,7 +4,7 @@ Development is underway using [IntelliJ IDEA Community Edition](https://www.jetb ## Required Software -* Java Development Kit 11 +* Java Development Kit 17 * [IntelliJ IDEA Community Edition](https://www.jetbrains.com/idea/download/) * Plugins IntelliJ IDEA * Lombok Plugin @@ -14,7 +14,7 @@ Please note that plugins do not have to be installed - if you have Internet acce ### IntelliJ IDEA Settings -* Configure [Java SDK на JDK11](https://www.jetbrains.com/help/idea/sdk.html#manage_sdks) +* Configure [Java SDK на JDK17](https://www.jetbrains.com/help/idea/sdk.html#manage_sdks) * Enable annotation processing: `File -> Settings -> Build, Execution, Deployment -> Compiler -> Annotation Processors -> Enable annotation processing` * Configure auto import settings, details in the [article](https://www.jetbrains.com/help/idea/creating-and-optimizing-imports.html). Pay special attention to import optimization. * There is no need to start optimization of imports of the entire project, this is followed by maintainers. If, after optimizing imports, changed files appeared that did not change during the development process, you should notify the maintainers and roll back these changes. diff --git a/docs/en/systemRequirements.md b/docs/en/systemRequirements.md index 0bba7dd7804..cbff3d96733 100644 --- a/docs/en/systemRequirements.md +++ b/docs/en/systemRequirements.md @@ -6,7 +6,7 @@ Using `BSL Language Server` has some limitations, listed bellow `BSL Language Server` is a console Java application and requires the presence of a Java virtual machine on the computer. -The minimum supported version is Java 11, but as part of the build pipelines, a health check is performed when using more recent versions. Java versions 11 and 17 are currently supported. +The minimum supported version is Java 17, but as part of the build pipelines, a health check is performed when using more recent versions. Java versions 17 and 19 are currently supported. JDK vendor is also interesting. Due to the changed licensing policy of Oracle, it is recommended to use open implementations of the `OpenJDK` virtual machine: AdoptOpenJDK, Liberica JDK. diff --git a/docs/systemRequirements.md b/docs/systemRequirements.md index 750751402fa..f3749508a29 100644 --- a/docs/systemRequirements.md +++ b/docs/systemRequirements.md @@ -6,7 +6,7 @@ `BSL Language Server` представляет собой консольное Java приложение, соответственно, для его функционирования необходимо наличие виртуальной машины Java на компьютере. -На данный момент минимальной поддерживаемой версией является Java 11, но в рамках сборочных конвейеров происходит проверка работоспособности при использовании более свежих версий. На данный момент поддерживаются Java версий 11 и 17. +На данный момент минимальной поддерживаемой версией является Java 17, но в рамках сборочных конвейеров происходит проверка работоспособности при использовании более свежих версий. На данный момент поддерживаются Java версий 17 и 19. Кроме версии Java интересен и вендор JDK. В связи с изменившейся политикой лицензирования Oracle, рекомендуется использование открытых реализаций виртуальной машины `OpenJDK`: AdoptOpenJDK, Liberica JDK. diff --git a/qodana.yaml b/qodana.yaml index 2e36017fbd0..bbd99905474 100644 --- a/qodana.yaml +++ b/qodana.yaml @@ -1,5 +1,6 @@ version: "1.0" linter: jetbrains/qodana-jvm-community:2022.3 +projectJDK: 17 profile: name: qodana.starter include: diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/AutoServerInfo.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/AutoServerInfo.java index a004af00003..6ee170129d2 100644 --- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/AutoServerInfo.java +++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/AutoServerInfo.java @@ -21,12 +21,12 @@ */ package com.github._1c_syntax.bsl.languageserver; +import jakarta.annotation.PostConstruct; import lombok.EqualsAndHashCode; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Component; -import javax.annotation.PostConstruct; import java.io.IOException; import java.io.InputStream; import java.io.Serializable; diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/aop/EventPublisherAspect.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/aop/EventPublisherAspect.java index 88dfaf7dd87..d55321eda97 100644 --- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/aop/EventPublisherAspect.java +++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/aop/EventPublisherAspect.java @@ -28,6 +28,7 @@ import com.github._1c_syntax.bsl.languageserver.context.events.DocumentContextContentChangedEvent; import com.github._1c_syntax.bsl.languageserver.context.events.ServerContextPopulatedEvent; import com.github._1c_syntax.bsl.languageserver.events.LanguageServerInitializeRequestReceivedEvent; +import jakarta.annotation.PreDestroy; import lombok.NoArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.aspectj.lang.JoinPoint; @@ -39,7 +40,6 @@ import org.springframework.context.ApplicationEventPublisher; import org.springframework.context.ApplicationEventPublisherAware; -import javax.annotation.PreDestroy; import java.io.File; import java.util.Collection; diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/aop/MeasuresAspect.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/aop/MeasuresAspect.java index f348cfc273f..a18d72c9815 100644 --- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/aop/MeasuresAspect.java +++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/aop/MeasuresAspect.java @@ -25,6 +25,7 @@ import com.github._1c_syntax.bsl.languageserver.context.DocumentContext; import com.github._1c_syntax.bsl.languageserver.context.ServerContext; import com.github._1c_syntax.bsl.languageserver.diagnostics.BSLDiagnostic; +import jakarta.annotation.PreDestroy; import lombok.NoArgsConstructor; import lombok.Setter; import lombok.extern.slf4j.Slf4j; @@ -36,7 +37,6 @@ import org.aspectj.lang.annotation.Before; import org.springframework.beans.factory.annotation.Autowired; -import javax.annotation.PreDestroy; import java.io.File; import java.util.Collection; diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/aop/SentryAspect.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/aop/SentryAspect.java index 3785c1a35a9..f76b30ceaa0 100644 --- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/aop/SentryAspect.java +++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/aop/SentryAspect.java @@ -22,12 +22,12 @@ package com.github._1c_syntax.bsl.languageserver.aop; import io.sentry.Sentry; +import jakarta.annotation.PostConstruct; +import jakarta.annotation.PreDestroy; import lombok.NoArgsConstructor; import org.aspectj.lang.annotation.AfterThrowing; import org.aspectj.lang.annotation.Aspect; -import javax.annotation.PostConstruct; -import javax.annotation.PreDestroy; import java.util.concurrent.CompletableFuture; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/aop/sentry/SentryScopeConfigurer.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/aop/sentry/SentryScopeConfigurer.java index 2f865fba563..4d90f75e4bc 100644 --- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/aop/sentry/SentryScopeConfigurer.java +++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/aop/sentry/SentryScopeConfigurer.java @@ -24,13 +24,13 @@ import io.sentry.Scope; import io.sentry.Sentry; import io.sentry.protocol.User; +import jakarta.annotation.PostConstruct; import lombok.RequiredArgsConstructor; import org.eclipse.lsp4j.ServerInfo; import org.springframework.boot.autoconfigure.condition.ConditionalOnBean; import org.springframework.context.annotation.DependsOn; import org.springframework.stereotype.Component; -import javax.annotation.PostConstruct; import java.util.UUID; /** diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/configuration/LanguageServerConfiguration.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/configuration/LanguageServerConfiguration.java index 0b5ea2db9ac..feb756aa40a 100644 --- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/configuration/LanguageServerConfiguration.java +++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/configuration/LanguageServerConfiguration.java @@ -32,6 +32,7 @@ import com.github._1c_syntax.bsl.languageserver.configuration.formating.FormattingOptions; import com.github._1c_syntax.utils.Absolute; import edu.umd.cs.findbugs.annotations.Nullable; +import jakarta.annotation.PostConstruct; import lombok.AccessLevel; import lombok.AllArgsConstructor; import lombok.Data; @@ -45,7 +46,6 @@ import org.springframework.context.annotation.Role; import org.springframework.stereotype.Component; -import javax.annotation.PostConstruct; import java.io.File; import java.io.IOException; import java.nio.file.Files; @@ -175,6 +175,10 @@ public static Path getCustomConfigurationRoot(LanguageServerConfiguration config } + @SuppressFBWarnings( + value = "RCN_REDUNDANT_NULLCHECK_WOULD_HAVE_BEEN_A_NPE", + justification = "False positive" + ) private static File getConfigurationFile(Path rootPath) { File configurationFile = null; List listPath = new ArrayList<>(); diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/configuration/watcher/ConfigurationFileSystemWatcher.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/configuration/watcher/ConfigurationFileSystemWatcher.java index 820e346ec72..5d2bc3ea1a7 100644 --- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/configuration/watcher/ConfigurationFileSystemWatcher.java +++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/configuration/watcher/ConfigurationFileSystemWatcher.java @@ -25,6 +25,8 @@ import com.github._1c_syntax.bsl.languageserver.configuration.events.LanguageServerConfigurationChangedEvent; import com.github._1c_syntax.utils.Absolute; import com.sun.nio.file.SensitivityWatchEventModifier; +import jakarta.annotation.PostConstruct; +import jakarta.annotation.PreDestroy; import lombok.RequiredArgsConstructor; import lombok.SneakyThrows; import lombok.Synchronized; @@ -33,8 +35,6 @@ import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Component; -import javax.annotation.PostConstruct; -import javax.annotation.PreDestroy; import java.io.File; import java.io.IOException; import java.nio.file.FileSystems; diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/context/DocumentContext.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/context/DocumentContext.java index a186b925d52..08fded4cb0f 100644 --- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/context/DocumentContext.java +++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/context/DocumentContext.java @@ -45,6 +45,7 @@ import com.github._1c_syntax.mdclasses.mdo.AbstractMDObjectBase; import com.github._1c_syntax.utils.Lazy; import edu.umd.cs.findbugs.annotations.Nullable; +import jakarta.annotation.PostConstruct; import lombok.Getter; import lombok.RequiredArgsConstructor; import lombok.Setter; @@ -60,7 +61,6 @@ import org.springframework.context.annotation.Scope; import org.springframework.stereotype.Component; -import javax.annotation.PostConstruct; import java.io.File; import java.io.IOException; import java.net.URI; diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/context/computer/CognitiveComplexityComputer.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/context/computer/CognitiveComplexityComputer.java index f4f1ef52ec8..96b18a2f416 100644 --- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/context/computer/CognitiveComplexityComputer.java +++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/context/computer/CognitiveComplexityComputer.java @@ -29,6 +29,7 @@ import com.github._1c_syntax.bsl.parser.BSLParserBaseListener; import com.github._1c_syntax.bsl.parser.BSLParserRuleContext; import com.github._1c_syntax.utils.StringInterner; +import jakarta.annotation.PostConstruct; import lombok.AccessLevel; import lombok.RequiredArgsConstructor; import lombok.Setter; @@ -40,7 +41,6 @@ import org.springframework.context.annotation.Scope; import org.springframework.stereotype.Component; -import javax.annotation.PostConstruct; import java.util.ArrayList; import java.util.HashMap; import java.util.HashSet; diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/context/computer/CyclomaticComplexityComputer.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/context/computer/CyclomaticComplexityComputer.java index ae93698686f..81e831094f4 100644 --- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/context/computer/CyclomaticComplexityComputer.java +++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/context/computer/CyclomaticComplexityComputer.java @@ -29,6 +29,7 @@ import com.github._1c_syntax.bsl.parser.BSLParserBaseListener; import com.github._1c_syntax.bsl.parser.BSLParserRuleContext; import com.github._1c_syntax.utils.StringInterner; +import jakarta.annotation.PostConstruct; import lombok.AccessLevel; import lombok.RequiredArgsConstructor; import lombok.Setter; @@ -41,7 +42,6 @@ import org.springframework.context.annotation.Scope; import org.springframework.stereotype.Component; -import javax.annotation.PostConstruct; import java.util.ArrayList; import java.util.HashMap; import java.util.List; diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/IfElseDuplicatedCodeBlockDiagnostic.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/IfElseDuplicatedCodeBlockDiagnostic.java index 5639e1b8358..b22ca418450 100644 --- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/IfElseDuplicatedCodeBlockDiagnostic.java +++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/IfElseDuplicatedCodeBlockDiagnostic.java @@ -29,10 +29,10 @@ import com.github._1c_syntax.bsl.languageserver.utils.Ranges; import com.github._1c_syntax.bsl.languageserver.utils.RelatedInformation; import com.github._1c_syntax.bsl.parser.BSLParser; +import jakarta.annotation.PostConstruct; import org.antlr.v4.runtime.tree.ParseTree; import org.eclipse.lsp4j.DiagnosticRelatedInformation; -import javax.annotation.PostConstruct; import java.util.ArrayList; import java.util.HashSet; import java.util.List; diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/IfElseDuplicatedConditionDiagnostic.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/IfElseDuplicatedConditionDiagnostic.java index 26363650c40..becc7ca8b94 100644 --- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/IfElseDuplicatedConditionDiagnostic.java +++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/IfElseDuplicatedConditionDiagnostic.java @@ -29,10 +29,10 @@ import com.github._1c_syntax.bsl.languageserver.utils.Ranges; import com.github._1c_syntax.bsl.languageserver.utils.RelatedInformation; import com.github._1c_syntax.bsl.parser.BSLParser; +import jakarta.annotation.PostConstruct; import org.antlr.v4.runtime.tree.ParseTree; import org.eclipse.lsp4j.DiagnosticRelatedInformation; -import javax.annotation.PostConstruct; import java.util.ArrayList; import java.util.HashSet; import java.util.List; diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/InvalidCharacterInFileDiagnostic.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/InvalidCharacterInFileDiagnostic.java index 5ed149a3038..dca3bb45dce 100644 --- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/InvalidCharacterInFileDiagnostic.java +++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/InvalidCharacterInFileDiagnostic.java @@ -28,6 +28,7 @@ import com.github._1c_syntax.bsl.languageserver.diagnostics.metadata.DiagnosticType; import com.github._1c_syntax.bsl.languageserver.providers.CodeActionProvider; import com.github._1c_syntax.bsl.parser.BSLLexer; +import jakarta.annotation.PostConstruct; import org.antlr.v4.runtime.Lexer; import org.antlr.v4.runtime.Token; import org.eclipse.lsp4j.CodeAction; @@ -35,7 +36,6 @@ import org.eclipse.lsp4j.Diagnostic; import org.eclipse.lsp4j.TextEdit; -import javax.annotation.PostConstruct; import java.util.ArrayList; import java.util.List; import java.util.Set; diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/NestedConstructorsInStructureDeclarationDiagnostic.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/NestedConstructorsInStructureDeclarationDiagnostic.java index 3424f14be25..6230eb54ec2 100644 --- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/NestedConstructorsInStructureDeclarationDiagnostic.java +++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/NestedConstructorsInStructureDeclarationDiagnostic.java @@ -32,10 +32,10 @@ import com.github._1c_syntax.bsl.languageserver.utils.Trees; import com.github._1c_syntax.bsl.parser.BSLParser; import com.github._1c_syntax.bsl.parser.BSLParser.NewExpressionContext; +import jakarta.annotation.PostConstruct; import org.antlr.v4.runtime.tree.ParseTree; import org.eclipse.lsp4j.DiagnosticRelatedInformation; -import javax.annotation.PostConstruct; import java.util.ArrayList; import java.util.List; import java.util.stream.Collectors; diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/NestedStatementsDiagnostic.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/NestedStatementsDiagnostic.java index c9117f4081a..20e91257662 100644 --- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/NestedStatementsDiagnostic.java +++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/NestedStatementsDiagnostic.java @@ -31,10 +31,10 @@ import com.github._1c_syntax.bsl.languageserver.utils.RelatedInformation; import com.github._1c_syntax.bsl.parser.BSLParser; import com.github._1c_syntax.bsl.parser.BSLParserRuleContext; +import jakarta.annotation.PostConstruct; import org.antlr.v4.runtime.tree.ParseTree; import org.eclipse.lsp4j.DiagnosticRelatedInformation; -import javax.annotation.PostConstruct; import java.util.ArrayDeque; import java.util.ArrayList; import java.util.Deque; diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/providers/CodeLensProvider.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/providers/CodeLensProvider.java index b264896b973..77a0fe9ef66 100644 --- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/providers/CodeLensProvider.java +++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/providers/CodeLensProvider.java @@ -28,6 +28,7 @@ import com.github._1c_syntax.bsl.languageserver.codelenses.databind.CodeLensDataObjectMapper; import com.github._1c_syntax.bsl.languageserver.configuration.events.LanguageServerConfigurationChangedEvent; import com.github._1c_syntax.bsl.languageserver.context.DocumentContext; +import jakarta.annotation.PostConstruct; import lombok.RequiredArgsConstructor; import lombok.SneakyThrows; import org.eclipse.lsp4j.ClientCapabilities; @@ -40,7 +41,6 @@ import org.springframework.context.event.EventListener; import org.springframework.stereotype.Component; -import javax.annotation.PostConstruct; import java.util.Collection; import java.util.List; import java.util.Map; diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/websocket/LSPWebSocketEndpoint.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/websocket/LSPWebSocketEndpoint.java index 62f8bdd8e66..b587c6af83b 100644 --- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/websocket/LSPWebSocketEndpoint.java +++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/websocket/LSPWebSocketEndpoint.java @@ -26,7 +26,7 @@ import org.eclipse.lsp4j.services.LanguageClient; import org.eclipse.lsp4j.services.LanguageClientAware; import org.eclipse.lsp4j.services.LanguageServer; -import org.eclipse.lsp4j.websocket.WebSocketEndpoint; +import org.eclipse.lsp4j.websocket.jakarta.WebSocketEndpoint; import org.springframework.stereotype.Component; import java.util.Collection; diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/websocket/WebSocketConfiguration.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/websocket/WebSocketConfiguration.java index aa60bc989a5..019d7f0c7c7 100644 --- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/websocket/WebSocketConfiguration.java +++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/websocket/WebSocketConfiguration.java @@ -21,8 +21,9 @@ */ package com.github._1c_syntax.bsl.languageserver.websocket; +import jakarta.websocket.server.ServerEndpointConfig; import org.eclipse.lsp4j.services.LanguageClient; -import org.eclipse.lsp4j.websocket.WebSocketEndpoint; +import org.eclipse.lsp4j.websocket.jakarta.WebSocketEndpoint; import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication; import org.springframework.context.annotation.Bean; @@ -31,8 +32,6 @@ import org.springframework.web.socket.server.standard.ServerEndpointExporter; import org.springframework.web.socket.server.standard.ServerEndpointRegistration; -import javax.websocket.server.ServerEndpointConfig; - /** * Конфигурация модуля веб-сокетов. */ diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index b8fb1c1f81a..3e7a1bdfba1 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -9,6 +9,7 @@ logging.level.org.hibernate.engine.jdbc.spi.SqlExceptionHelper=fatal logging.level.org.springframework.data.repository.config.RepositoryConfigurationDelegate=warn logging.level.org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean=warn logging.level.org.springframework.context.support.PostProcessorRegistrationDelegate=warn +logging.level.org.springframework.core.LocalVariableTableParameterNameDiscoverer=error spring.application.name=BSL Language Server app.globalConfiguration.path=${user.home}/.bsl-language-server.json app.configuration.path=.bsl-language-server.json diff --git a/src/test/java/com/github/_1c_syntax/bsl/languageserver/codeactions/DisableDiagnosticTriggeringSupplierTest.java b/src/test/java/com/github/_1c_syntax/bsl/languageserver/codeactions/DisableDiagnosticTriggeringSupplierTest.java index 9a827b48809..2725bdf9441 100644 --- a/src/test/java/com/github/_1c_syntax/bsl/languageserver/codeactions/DisableDiagnosticTriggeringSupplierTest.java +++ b/src/test/java/com/github/_1c_syntax/bsl/languageserver/codeactions/DisableDiagnosticTriggeringSupplierTest.java @@ -25,6 +25,7 @@ import com.github._1c_syntax.bsl.languageserver.configuration.LanguageServerConfiguration; import com.github._1c_syntax.bsl.languageserver.util.TestUtils; import com.github._1c_syntax.bsl.languageserver.utils.Ranges; +import jakarta.annotation.PostConstruct; import org.eclipse.lsp4j.CodeAction; import org.eclipse.lsp4j.CodeActionContext; import org.eclipse.lsp4j.CodeActionParams; @@ -36,7 +37,6 @@ import org.springframework.boot.test.context.SpringBootTest; import org.springframework.test.annotation.DirtiesContext; -import javax.annotation.PostConstruct; import java.util.List; import java.util.stream.Collectors; diff --git a/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/AbstractDiagnosticTest.java b/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/AbstractDiagnosticTest.java index a17e31847c7..78cc94e2ca1 100644 --- a/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/AbstractDiagnosticTest.java +++ b/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/AbstractDiagnosticTest.java @@ -27,6 +27,7 @@ import com.github._1c_syntax.bsl.languageserver.diagnostics.infrastructure.DiagnosticObjectProvider; import com.github._1c_syntax.bsl.languageserver.util.TestUtils; import com.github._1c_syntax.utils.Absolute; +import jakarta.annotation.PostConstruct; import lombok.SneakyThrows; import org.apache.commons.io.IOUtils; import org.eclipse.lsp4j.CodeAction; @@ -39,7 +40,6 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; -import javax.annotation.PostConstruct; import java.nio.charset.StandardCharsets; import java.nio.file.Path; import java.util.Collections; diff --git a/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/NestedConstructorsInStructureDeclarationDiagnosticTest.java b/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/NestedConstructorsInStructureDeclarationDiagnosticTest.java index b01d5846813..ae91a20a1cc 100644 --- a/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/NestedConstructorsInStructureDeclarationDiagnosticTest.java +++ b/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/NestedConstructorsInStructureDeclarationDiagnosticTest.java @@ -22,12 +22,12 @@ package com.github._1c_syntax.bsl.languageserver.diagnostics; import com.github._1c_syntax.bsl.languageserver.utils.Ranges; +import jakarta.annotation.PostConstruct; import org.eclipse.lsp4j.Diagnostic; import org.eclipse.lsp4j.DiagnosticRelatedInformation; import org.eclipse.lsp4j.Range; import org.junit.jupiter.api.Test; -import javax.annotation.PostConstruct; import java.util.ArrayList; import java.util.List; diff --git a/src/test/java/com/github/_1c_syntax/bsl/languageserver/documentlink/DiagnosticDescriptionDocumentLinkSupplierTest.java b/src/test/java/com/github/_1c_syntax/bsl/languageserver/documentlink/DiagnosticDescriptionDocumentLinkSupplierTest.java index 7f055f3a20c..4c4b2fa7be9 100644 --- a/src/test/java/com/github/_1c_syntax/bsl/languageserver/documentlink/DiagnosticDescriptionDocumentLinkSupplierTest.java +++ b/src/test/java/com/github/_1c_syntax/bsl/languageserver/documentlink/DiagnosticDescriptionDocumentLinkSupplierTest.java @@ -30,7 +30,6 @@ import org.springframework.boot.test.context.SpringBootTest; import org.springframework.test.annotation.DirtiesContext; -import javax.annotation.PostConstruct; import java.io.File; import static org.assertj.core.api.Assertions.assertThat; diff --git a/src/test/java/com/github/_1c_syntax/bsl/languageserver/hover/MethodSymbolMarkupContentBuilderTest.java b/src/test/java/com/github/_1c_syntax/bsl/languageserver/hover/MethodSymbolMarkupContentBuilderTest.java index b1ae194b7f3..ad3feb49090 100644 --- a/src/test/java/com/github/_1c_syntax/bsl/languageserver/hover/MethodSymbolMarkupContentBuilderTest.java +++ b/src/test/java/com/github/_1c_syntax/bsl/languageserver/hover/MethodSymbolMarkupContentBuilderTest.java @@ -25,11 +25,11 @@ import com.github._1c_syntax.bsl.languageserver.util.CleanupContextBeforeClassAndAfterClass; import com.github._1c_syntax.bsl.languageserver.util.TestUtils; import com.github._1c_syntax.bsl.types.ModuleType; +import jakarta.annotation.PostConstruct; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; -import javax.annotation.PostConstruct; import java.nio.file.Paths; import java.util.Arrays; diff --git a/src/test/java/com/github/_1c_syntax/bsl/languageserver/hover/VariableSymbolMarkupContentBuilderTest.java b/src/test/java/com/github/_1c_syntax/bsl/languageserver/hover/VariableSymbolMarkupContentBuilderTest.java index f1d70479a97..e284ffefe91 100644 --- a/src/test/java/com/github/_1c_syntax/bsl/languageserver/hover/VariableSymbolMarkupContentBuilderTest.java +++ b/src/test/java/com/github/_1c_syntax/bsl/languageserver/hover/VariableSymbolMarkupContentBuilderTest.java @@ -25,11 +25,11 @@ import com.github._1c_syntax.bsl.languageserver.util.CleanupContextBeforeClassAndAfterClass; import com.github._1c_syntax.bsl.languageserver.util.TestUtils; import com.github._1c_syntax.bsl.types.ModuleType; +import jakarta.annotation.PostConstruct; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; -import javax.annotation.PostConstruct; import java.nio.file.Paths; import java.util.Arrays; diff --git a/src/test/java/com/github/_1c_syntax/bsl/languageserver/providers/DefinitionProviderTest.java b/src/test/java/com/github/_1c_syntax/bsl/languageserver/providers/DefinitionProviderTest.java index 78acc9ffac9..4cdc4fd850a 100644 --- a/src/test/java/com/github/_1c_syntax/bsl/languageserver/providers/DefinitionProviderTest.java +++ b/src/test/java/com/github/_1c_syntax/bsl/languageserver/providers/DefinitionProviderTest.java @@ -26,13 +26,13 @@ import com.github._1c_syntax.bsl.languageserver.util.TestUtils; import com.github._1c_syntax.bsl.languageserver.utils.Ranges; import com.github._1c_syntax.bsl.types.ModuleType; +import jakarta.annotation.PostConstruct; import org.eclipse.lsp4j.DefinitionParams; import org.eclipse.lsp4j.Position; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; -import javax.annotation.PostConstruct; import java.nio.file.Paths; import static com.github._1c_syntax.bsl.languageserver.util.TestUtils.PATH_TO_METADATA; diff --git a/src/test/java/com/github/_1c_syntax/bsl/languageserver/providers/ReferencesProviderTest.java b/src/test/java/com/github/_1c_syntax/bsl/languageserver/providers/ReferencesProviderTest.java index 008203f974d..1468c8af96f 100644 --- a/src/test/java/com/github/_1c_syntax/bsl/languageserver/providers/ReferencesProviderTest.java +++ b/src/test/java/com/github/_1c_syntax/bsl/languageserver/providers/ReferencesProviderTest.java @@ -26,6 +26,7 @@ import com.github._1c_syntax.bsl.languageserver.util.TestUtils; import com.github._1c_syntax.bsl.languageserver.utils.Ranges; import com.github._1c_syntax.bsl.types.ModuleType; +import jakarta.annotation.PostConstruct; import org.eclipse.lsp4j.Location; import org.eclipse.lsp4j.Position; import org.eclipse.lsp4j.ReferenceParams; @@ -33,7 +34,6 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; -import javax.annotation.PostConstruct; import java.nio.file.Paths; import static com.github._1c_syntax.bsl.languageserver.util.TestUtils.PATH_TO_METADATA; diff --git a/src/test/java/com/github/_1c_syntax/bsl/languageserver/providers/RenameProviderTest.java b/src/test/java/com/github/_1c_syntax/bsl/languageserver/providers/RenameProviderTest.java index 94b7258a48f..d616b59d8f9 100644 --- a/src/test/java/com/github/_1c_syntax/bsl/languageserver/providers/RenameProviderTest.java +++ b/src/test/java/com/github/_1c_syntax/bsl/languageserver/providers/RenameProviderTest.java @@ -25,6 +25,7 @@ import com.github._1c_syntax.bsl.languageserver.util.CleanupContextBeforeClassAndAfterClass; import com.github._1c_syntax.bsl.languageserver.util.TestUtils; import com.github._1c_syntax.bsl.languageserver.utils.Ranges; +import jakarta.annotation.PostConstruct; import org.eclipse.lsp4j.Position; import org.eclipse.lsp4j.PrepareRenameParams; import org.eclipse.lsp4j.RenameParams; @@ -33,7 +34,6 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; -import javax.annotation.PostConstruct; import java.nio.file.Paths; import static com.github._1c_syntax.bsl.languageserver.util.TestUtils.PATH_TO_METADATA; diff --git a/src/test/java/com/github/_1c_syntax/bsl/languageserver/references/ReferenceIndexReferenceFinderTest.java b/src/test/java/com/github/_1c_syntax/bsl/languageserver/references/ReferenceIndexReferenceFinderTest.java index cb082fc7c7e..07edb1a94f3 100644 --- a/src/test/java/com/github/_1c_syntax/bsl/languageserver/references/ReferenceIndexReferenceFinderTest.java +++ b/src/test/java/com/github/_1c_syntax/bsl/languageserver/references/ReferenceIndexReferenceFinderTest.java @@ -28,6 +28,7 @@ import com.github._1c_syntax.bsl.languageserver.util.TestUtils; import com.github._1c_syntax.bsl.languageserver.utils.Ranges; import com.github._1c_syntax.bsl.types.ModuleType; +import jakarta.annotation.PostConstruct; import org.eclipse.lsp4j.Location; import org.eclipse.lsp4j.Position; import org.junit.jupiter.api.Test; @@ -35,7 +36,6 @@ import org.springframework.boot.test.context.SpringBootTest; import org.springframework.boot.test.mock.mockito.SpyBean; -import javax.annotation.PostConstruct; import java.nio.file.Paths; import java.util.Optional; diff --git a/src/test/java/com/github/_1c_syntax/bsl/languageserver/references/ReferenceIndexTest.java b/src/test/java/com/github/_1c_syntax/bsl/languageserver/references/ReferenceIndexTest.java index ef2880eb1ab..048b0ca8349 100644 --- a/src/test/java/com/github/_1c_syntax/bsl/languageserver/references/ReferenceIndexTest.java +++ b/src/test/java/com/github/_1c_syntax/bsl/languageserver/references/ReferenceIndexTest.java @@ -27,6 +27,7 @@ import com.github._1c_syntax.bsl.languageserver.util.TestUtils; import com.github._1c_syntax.bsl.languageserver.utils.Ranges; import com.github._1c_syntax.bsl.types.ModuleType; +import jakarta.annotation.PostConstruct; import org.eclipse.lsp4j.Location; import org.eclipse.lsp4j.Position; import org.eclipse.lsp4j.SymbolKind; @@ -35,7 +36,6 @@ import org.springframework.boot.test.context.SpringBootTest; import org.springframework.test.annotation.DirtiesContext; -import javax.annotation.PostConstruct; import java.nio.file.Paths; import java.util.stream.Collectors; diff --git a/src/test/java/com/github/_1c_syntax/bsl/languageserver/util/Assertions.java b/src/test/java/com/github/_1c_syntax/bsl/languageserver/util/Assertions.java index 2ddf9227221..d508128f88f 100644 --- a/src/test/java/com/github/_1c_syntax/bsl/languageserver/util/Assertions.java +++ b/src/test/java/com/github/_1c_syntax/bsl/languageserver/util/Assertions.java @@ -29,6 +29,7 @@ import com.github._1c_syntax.bsl.languageserver.util.assertions.FoldingRangeAssert; import com.github._1c_syntax.bsl.languageserver.util.assertions.FoldingRangesAssert; import com.github._1c_syntax.bsl.languageserver.util.assertions.SelectionRangesAssert; +import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import org.eclipse.lsp4j.CodeAction; import org.eclipse.lsp4j.ColorInformation; import org.eclipse.lsp4j.ColorPresentation; @@ -38,6 +39,7 @@ import java.util.List; +@SuppressFBWarnings("NM_SAME_SIMPLE_NAME_AS_SUPERCLASS") public class Assertions extends org.assertj.core.api.Assertions { public static DiagnosticAssert assertThat(Diagnostic actual) { diff --git a/src/test/java/com/github/_1c_syntax/bsl/languageserver/websocket/WebsocketLauncherTest.java b/src/test/java/com/github/_1c_syntax/bsl/languageserver/websocket/WebsocketLauncherTest.java index a0f5159bf33..5204aca0263 100644 --- a/src/test/java/com/github/_1c_syntax/bsl/languageserver/websocket/WebsocketLauncherTest.java +++ b/src/test/java/com/github/_1c_syntax/bsl/languageserver/websocket/WebsocketLauncherTest.java @@ -22,6 +22,13 @@ package com.github._1c_syntax.bsl.languageserver.websocket; import com.github._1c_syntax.bsl.languageserver.util.CleanupContextBeforeClassAndAfterEachTestMethod; +import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; +import jakarta.websocket.ClientEndpoint; +import jakarta.websocket.ContainerProvider; +import jakarta.websocket.DeploymentException; +import jakarta.websocket.OnOpen; +import jakarta.websocket.Session; +import jakarta.websocket.WebSocketContainer; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -30,12 +37,6 @@ import org.springframework.boot.test.web.server.LocalServerPort; import org.springframework.test.context.ActiveProfiles; -import javax.websocket.ClientEndpoint; -import javax.websocket.ContainerProvider; -import javax.websocket.DeploymentException; -import javax.websocket.OnOpen; -import javax.websocket.Session; -import javax.websocket.WebSocketContainer; import java.io.ByteArrayOutputStream; import java.io.FileDescriptor; import java.io.FileOutputStream; @@ -101,6 +102,7 @@ void connectClientToServer(int websocketPort) throws URISyntaxException, Deploym session = webSocketContainer.connectToServer(client, new URI("ws://localhost:" + websocketPort + endpointPath)); } + @SuppressFBWarnings("RV_RETURN_VALUE_IGNORED") void testWebsocketServer(int websocketPort) { try { latch.await(1, TimeUnit.SECONDS); diff --git a/src/test/resources/application-measures.properties b/src/test/resources/application-measures.properties index acf3564038e..a9692f5e26e 100644 --- a/src/test/resources/application-measures.properties +++ b/src/test/resources/application-measures.properties @@ -10,6 +10,7 @@ logging.level.org.hibernate.engine.jdbc.spi.SqlExceptionHelper=fatal logging.level.org.springframework.data.repository.config.RepositoryConfigurationDelegate=warn logging.level.org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean=warn logging.level.org.springframework.context.support.PostProcessorRegistrationDelegate=warn +logging.level.org.springframework.core.LocalVariableTableParameterNameDiscoverer=error spring.application.name=BSL Language Server logging.level.org.springframework.test.context.support.AnnotationConfigContextLoaderUtils=warn diff --git a/src/test/resources/application-websocket.properties b/src/test/resources/application-websocket.properties index d3c156204d6..843f7ada7da 100644 --- a/src/test/resources/application-websocket.properties +++ b/src/test/resources/application-websocket.properties @@ -10,6 +10,7 @@ logging.level.org.hibernate.engine.jdbc.spi.SqlExceptionHelper=fatal logging.level.org.springframework.data.repository.config.RepositoryConfigurationDelegate=warn logging.level.org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean=warn logging.level.org.springframework.context.support.PostProcessorRegistrationDelegate=warn +logging.level.org.springframework.core.LocalVariableTableParameterNameDiscoverer=error spring.application.name=BSL Language Server logging.level.org.springframework.test.context.support.AnnotationConfigContextLoaderUtils=warn diff --git a/src/test/resources/application.properties b/src/test/resources/application.properties index 70a567bad3c..bddcb834f30 100644 --- a/src/test/resources/application.properties +++ b/src/test/resources/application.properties @@ -10,6 +10,7 @@ logging.level.org.hibernate.engine.jdbc.spi.SqlExceptionHelper=fatal logging.level.org.springframework.data.repository.config.RepositoryConfigurationDelegate=warn logging.level.org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean=warn logging.level.org.springframework.context.support.PostProcessorRegistrationDelegate=warn +logging.level.org.springframework.core.LocalVariableTableParameterNameDiscoverer=error spring.application.name=BSL Language Server logging.level.org.springframework.test.context.support.AnnotationConfigContextLoaderUtils=warn From 7f56a02380e953720014d220262e1ba197729da3 Mon Sep 17 00:00:00 2001 From: Nikita Fedkin Date: Thu, 19 Jan 2023 16:44:23 +0400 Subject: [PATCH 3/7] Spring boot 3.0.1 --- build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle.kts b/build.gradle.kts index 18bac881e3f..12d0ff0d152 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -16,7 +16,7 @@ plugins { id("io.freefair.maven-central.validate-poms") version "6.6" id("me.qoomon.git-versioning") version "6.3.7" id("com.github.ben-manes.versions") version "0.44.0" - id("org.springframework.boot") version "3.0.0" + id("org.springframework.boot") version "3.0.1" id("io.spring.dependency-management") version "1.1.0" id("io.github.1c-syntax.bslls-dev-tools") version "0.7.2" id("ru.vyarus.pom") version "2.2.2" From efc25b6ba0b27cb1d363100abac92a6ec3c388f7 Mon Sep 17 00:00:00 2001 From: Nikita Fedkin Date: Thu, 19 Jan 2023 22:10:34 +0400 Subject: [PATCH 4/7] Fix compile error --- .../configuration/LanguageServerConfiguration.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/configuration/LanguageServerConfiguration.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/configuration/LanguageServerConfiguration.java index 3d2abebaf86..cd3e83465ee 100644 --- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/configuration/LanguageServerConfiguration.java +++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/configuration/LanguageServerConfiguration.java @@ -32,6 +32,7 @@ import com.github._1c_syntax.bsl.languageserver.configuration.formating.FormattingOptions; import com.github._1c_syntax.utils.Absolute; import edu.umd.cs.findbugs.annotations.Nullable; +import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import jakarta.annotation.PostConstruct; import lombok.AccessLevel; import lombok.AllArgsConstructor; From 392c43d6bf644eb780df70e2bbfc44fea2ee7b85 Mon Sep 17 00:00:00 2001 From: Nikita Fedkin Date: Wed, 21 Jun 2023 08:42:19 +0200 Subject: [PATCH 5/7] Update systemRequirements.md --- docs/en/systemRequirements.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/en/systemRequirements.md b/docs/en/systemRequirements.md index cbff3d96733..64b79c356af 100644 --- a/docs/en/systemRequirements.md +++ b/docs/en/systemRequirements.md @@ -6,7 +6,7 @@ Using `BSL Language Server` has some limitations, listed bellow `BSL Language Server` is a console Java application and requires the presence of a Java virtual machine on the computer. -The minimum supported version is Java 17, but as part of the build pipelines, a health check is performed when using more recent versions. Java versions 17 and 19 are currently supported. +The minimum supported version is Java 17, but as part of the build pipelines, a health check is performed when using more recent versions. Java versions 17 and 20 are currently supported. JDK vendor is also interesting. Due to the changed licensing policy of Oracle, it is recommended to use open implementations of the `OpenJDK` virtual machine: AdoptOpenJDK, Liberica JDK. From 30a2ea459d32080b6641bf6578ec5115a3400cf7 Mon Sep 17 00:00:00 2001 From: Nikita Fedkin Date: Wed, 21 Jun 2023 08:42:49 +0200 Subject: [PATCH 6/7] Update systemRequirements.md --- docs/systemRequirements.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/systemRequirements.md b/docs/systemRequirements.md index f3749508a29..6d6bc14fad1 100644 --- a/docs/systemRequirements.md +++ b/docs/systemRequirements.md @@ -6,7 +6,7 @@ `BSL Language Server` представляет собой консольное Java приложение, соответственно, для его функционирования необходимо наличие виртуальной машины Java на компьютере. -На данный момент минимальной поддерживаемой версией является Java 17, но в рамках сборочных конвейеров происходит проверка работоспособности при использовании более свежих версий. На данный момент поддерживаются Java версий 17 и 19. +На данный момент минимальной поддерживаемой версией является Java 17, но в рамках сборочных конвейеров происходит проверка работоспособности при использовании более свежих версий. На данный момент поддерживаются Java версий 17 и 20. Кроме версии Java интересен и вендор JDK. В связи с изменившейся политикой лицензирования Oracle, рекомендуется использование открытых реализаций виртуальной машины `OpenJDK`: AdoptOpenJDK, Liberica JDK. From 204e8056646f1a3742ef9f3d791e35b914be2563 Mon Sep 17 00:00:00 2001 From: Nikita Fedkin Date: Wed, 21 Jun 2023 08:53:07 +0200 Subject: [PATCH 7/7] Update DiagnosticDescriptionDocumentLinkSupplierTest.java --- .../DiagnosticDescriptionDocumentLinkSupplierTest.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/test/java/com/github/_1c_syntax/bsl/languageserver/documentlink/DiagnosticDescriptionDocumentLinkSupplierTest.java b/src/test/java/com/github/_1c_syntax/bsl/languageserver/documentlink/DiagnosticDescriptionDocumentLinkSupplierTest.java index 5db435aa255..d5bd0c672ad 100644 --- a/src/test/java/com/github/_1c_syntax/bsl/languageserver/documentlink/DiagnosticDescriptionDocumentLinkSupplierTest.java +++ b/src/test/java/com/github/_1c_syntax/bsl/languageserver/documentlink/DiagnosticDescriptionDocumentLinkSupplierTest.java @@ -25,6 +25,7 @@ import com.github._1c_syntax.bsl.languageserver.configuration.LanguageServerConfiguration; import com.github._1c_syntax.bsl.languageserver.context.DocumentContext; import com.github._1c_syntax.bsl.languageserver.util.TestUtils; +import jakarta.annotation.PostConstruct; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; @@ -199,4 +200,4 @@ private DocumentContext getDocumentContext() { documentContext.getDiagnostics(); return documentContext; } -} \ No newline at end of file +}