From b7df65b14064c351c4b9c54bc01e13dd22197906 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 22 Dec 2023 09:45:46 +0000 Subject: [PATCH 1/3] build(deps): bump org.springframework.boot from 3.1.5 to 3.2.1 Bumps [org.springframework.boot](https://github.com/spring-projects/spring-boot) from 3.1.5 to 3.2.1. - [Release notes](https://github.com/spring-projects/spring-boot/releases) - [Commits](https://github.com/spring-projects/spring-boot/compare/v3.1.5...v3.2.1) --- updated-dependencies: - dependency-name: org.springframework.boot dependency-type: direct:production update-type: version-update:semver-minor ... 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 c6dc7ec1c61..21edd9f3556 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -16,7 +16,7 @@ plugins { id("io.freefair.maven-central.validate-poms") version "8.4" id("me.qoomon.git-versioning") version "6.4.3" id("com.github.ben-manes.versions") version "0.50.0" - id("org.springframework.boot") version "3.1.5" + id("org.springframework.boot") version "3.2.1" id("io.spring.dependency-management") version "1.1.4" id("io.github.1c-syntax.bslls-dev-tools") version "0.7.3" id("ru.vyarus.pom") version "2.2.2" From 1e5ca45c63a390c2ea42a7499b2d6ab3aeaef943 Mon Sep 17 00:00:00 2001 From: Nikita Fedkin Date: Tue, 26 Dec 2023 21:41:31 +0100 Subject: [PATCH 2/3] =?UTF-8?q?=D0=A3=D0=BA=D0=B0=D0=B7=D0=B0=D0=BB,=20?= =?UTF-8?q?=D1=87=D1=82=D0=BE=20=D0=B1=D0=B8=D0=BD=D1=8B=20=D0=B8=D0=BD?= =?UTF-8?q?=D1=84=D1=80=D0=B0=D1=81=D1=82=D1=80=D1=83=D0=BA=D1=82=D1=83?= =?UTF-8?q?=D1=80=D0=BD=D1=8B=D0=B5.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit stringInterner инжектится внутрь DiagnosticBeanPostProcessor, поэтому во избежание ругани он должен быть инфраструктурным бином --- .../bsl/languageserver/infrastructure/UtilsConfiguration.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/infrastructure/UtilsConfiguration.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/infrastructure/UtilsConfiguration.java index 55480c69a23..bf9314fc585 100644 --- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/infrastructure/UtilsConfiguration.java +++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/infrastructure/UtilsConfiguration.java @@ -22,19 +22,23 @@ package com.github._1c_syntax.bsl.languageserver.infrastructure; import com.github._1c_syntax.utils.StringInterner; +import org.springframework.beans.factory.config.BeanDefinition; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; +import org.springframework.context.annotation.Role; /** * Конфигурация бинов из 1c-syntax/utils. */ @Configuration +@Role(BeanDefinition.ROLE_INFRASTRUCTURE) public class UtilsConfiguration { /** * @return Настроенный объект интернирователя строк. */ @Bean + @Role(BeanDefinition.ROLE_INFRASTRUCTURE) public StringInterner stringInterner() { return new StringInterner(); } From 5c35d4d588a0be36e5e80cc9039b61e0bbfae9ca Mon Sep 17 00:00:00 2001 From: Nikita Fedkin Date: Tue, 26 Dec 2023 21:53:07 +0100 Subject: [PATCH 3/3] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB?= =?UTF-8?q?=D0=B5=D0=BD=20spy=20=D0=BE=D1=82=20spy?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DenyIncompleteValuesDiagnosticTest.java | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/DenyIncompleteValuesDiagnosticTest.java b/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/DenyIncompleteValuesDiagnosticTest.java index 4e56232c7d8..c2c2384ca84 100644 --- a/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/DenyIncompleteValuesDiagnosticTest.java +++ b/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/DenyIncompleteValuesDiagnosticTest.java @@ -86,17 +86,16 @@ private void checkMockHandler(ModuleType type, boolean noneModules) { var documentContext = spy(getDocumentContext()); when(documentContext.getModuleType()).thenReturn(type); - final var infoReg = spy(context.getConfiguration().findChild(MdoReference.create(MDOType.INFORMATION_REGISTER, - "РегистрСведений1")).get() + final var infoReg = spy((InformationRegister) context.getConfiguration().findChild(MdoReference.create(MDOType.INFORMATION_REGISTER, + "РегистрСведений1")).orElseThrow() ); - var spyMdo = spy((InformationRegister) infoReg); - when(documentContext.getMdObject()).thenReturn(Optional.of(spyMdo)); + when(documentContext.getMdObject()).thenReturn(Optional.of(infoReg)); if (noneModules) { - when(spyMdo.getModules()).thenReturn(Collections.emptyList()); + when(infoReg.getModules()).thenReturn(Collections.emptyList()); - List children = List.of(spyMdo); + List children = List.of(infoReg); var configuration = spy(context.getConfiguration()); when(configuration.getChildren()).thenReturn(children);