Fix ClassCastException in MagicNumberDiagnostic with soft error handling

build.gradle.kts

@@ -117,6 +117,9 @@ dependencies {
     // (de)serialization
     implementation("com.fasterxml.jackson.datatype:jackson-datatype-jsr310")
     implementation("com.fasterxml.jackson.dataformat:jackson-dataformat-xml")
+
+    // JSON schema validation
+    implementation("com.networknt:json-schema-validator:1.5.4")
 
     // graphs
     implementation("org.jgrapht", "jgrapht-core", "1.5.2")

src/main/java/com/github/_1c_syntax/bsl/languageserver/codelenses/CognitiveComplexityCodeLensSupplier.java

@@ -25,6 +25,8 @@
 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.context.symbol.MethodSymbol;
+import org.springframework.beans.factory.config.BeanDefinition;
+import org.springframework.context.annotation.Role;
 import org.springframework.stereotype.Component;
 
 import java.util.Map;
@@ -33,6 +35,7 @@
  * Сапплаер линз, показывающий когнитивную сложность методов.
  */
 @Component
+@Role(BeanDefinition.ROLE_INFRASTRUCTURE)
 public class CognitiveComplexityCodeLensSupplier extends AbstractMethodComplexityCodeLensSupplier {
 
   public CognitiveComplexityCodeLensSupplier(

src/main/java/com/github/_1c_syntax/bsl/languageserver/codelenses/CyclomaticComplexityCodeLensSupplier.java

@@ -25,6 +25,8 @@
 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.context.symbol.MethodSymbol;
+import org.springframework.beans.factory.config.BeanDefinition;
+import org.springframework.context.annotation.Role;
 import org.springframework.stereotype.Component;
 
 import java.util.Map;
@@ -33,6 +35,7 @@
  * Сапплаер линз, показывающий когнитивную сложность методов.
  */
 @Component
+@Role(BeanDefinition.ROLE_INFRASTRUCTURE)
 public class CyclomaticComplexityCodeLensSupplier extends AbstractMethodComplexityCodeLensSupplier {
 
   public CyclomaticComplexityCodeLensSupplier(

src/main/java/com/github/_1c_syntax/bsl/languageserver/codelenses/RunAllTestsCodeLensSupplier.java

@@ -32,6 +32,8 @@
 import org.eclipse.lsp4j.Command;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Lazy;
+import org.springframework.beans.factory.config.BeanDefinition;
+import org.springframework.context.annotation.Role;
 import org.springframework.stereotype.Component;
 
 import java.nio.file.Paths;
@@ -43,6 +45,7 @@
  * Поставщик линзы для запуска всех тестов в текущем файле.
  */
 @Component
+@Role(BeanDefinition.ROLE_INFRASTRUCTURE)
 @Slf4j
 public class RunAllTestsCodeLensSupplier
   extends AbstractRunTestsCodeLensSupplier<DefaultCodeLensData> {

src/main/java/com/github/_1c_syntax/bsl/languageserver/codelenses/RunTestCodeLensSupplier.java

@@ -36,6 +36,8 @@
 import org.eclipse.lsp4j.Command;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Lazy;
+import org.springframework.beans.factory.config.BeanDefinition;
+import org.springframework.context.annotation.Role;
 import org.springframework.stereotype.Component;
 
 import java.beans.ConstructorProperties;
@@ -50,6 +52,7 @@
  * Поставщик линз для запуска теста по конкретному тестовому методу.
  */
 @Component
+@Role(BeanDefinition.ROLE_INFRASTRUCTURE)
 @Slf4j
 public class RunTestCodeLensSupplier
   extends AbstractRunTestsCodeLensSupplier<RunTestCodeLensSupplier.RunTestCodeLensData> {

src/main/java/com/github/_1c_syntax/bsl/languageserver/codelenses/testrunner/TestRunnerAdapter.java

@@ -39,6 +39,8 @@
 import org.springframework.cache.annotation.CacheEvict;
 import org.springframework.cache.annotation.Cacheable;
 import org.springframework.context.event.EventListener;
+import org.springframework.beans.factory.config.BeanDefinition;
+import org.springframework.context.annotation.Role;
 import org.springframework.stereotype.Component;
 
 import java.io.IOException;
@@ -56,6 +58,7 @@
  * Физически выполняет команды по получению идентификаторов тестов на основании конфигурации.
  */
 @Component
+@Role(BeanDefinition.ROLE_INFRASTRUCTURE)
 @RequiredArgsConstructor
 @Slf4j
 @CacheConfig(cacheNames = "testIds")

src/main/java/com/github/_1c_syntax/bsl/languageserver/commands/ToggleCognitiveComplexityInlayHintsCommandSupplier.java

@@ -23,12 +23,15 @@
 
 import com.github._1c_syntax.bsl.languageserver.commands.complexity.AbstractToggleComplexityInlayHintsCommandSupplier;
 import com.github._1c_syntax.bsl.languageserver.inlayhints.CognitiveComplexityInlayHintSupplier;
+import org.springframework.beans.factory.config.BeanDefinition;
+import org.springframework.context.annotation.Role;
 import org.springframework.stereotype.Component;
 
 /**
  * Поставщик команды переключения подсказок когнитивной сложности.
  */
 @Component
+@Role(BeanDefinition.ROLE_INFRASTRUCTURE)
 public class ToggleCognitiveComplexityInlayHintsCommandSupplier
   extends AbstractToggleComplexityInlayHintsCommandSupplier {
 

src/main/java/com/github/_1c_syntax/bsl/languageserver/commands/ToggleCyclomaticComplexityInlayHintsCommandSupplier.java

@@ -23,12 +23,15 @@
 
 import com.github._1c_syntax.bsl.languageserver.commands.complexity.AbstractToggleComplexityInlayHintsCommandSupplier;
 import com.github._1c_syntax.bsl.languageserver.inlayhints.CyclomaticComplexityInlayHintSupplier;
+import org.springframework.beans.factory.config.BeanDefinition;
+import org.springframework.context.annotation.Role;
 import org.springframework.stereotype.Component;
 
 /**
  * Поставщик команды переключения подсказок цикломатической сложности.
  */
 @Component
+@Role(BeanDefinition.ROLE_INFRASTRUCTURE)
 public class ToggleCyclomaticComplexityInlayHintsCommandSupplier
   extends AbstractToggleComplexityInlayHintsCommandSupplier {
 

src/main/java/com/github/_1c_syntax/bsl/languageserver/databind/ObjectMapperConfiguration.java

@@ -28,17 +28,23 @@
 import com.github._1c_syntax.bsl.languageserver.codelenses.CodeLensSupplier;
 import com.github._1c_syntax.bsl.languageserver.commands.CommandArguments;
 import com.github._1c_syntax.bsl.languageserver.commands.CommandSupplier;
+import org.springframework.beans.factory.config.BeanDefinition;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Lazy;
+import org.springframework.context.annotation.Role;
 
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.stream.Collectors;
 
 @Configuration
+@Role(BeanDefinition.ROLE_INFRASTRUCTURE)
 public class ObjectMapperConfiguration  {
 
   @Bean
+  @Role(BeanDefinition.ROLE_INFRASTRUCTURE)
+  @Lazy
   public ObjectMapper objectMapper(
     Collection<CodeLensSupplier<? extends CodeLensData>> codeLensResolvers,
     Collection<CommandSupplier<? extends CommandArguments>> commandSuppliers

src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/infrastructure/DiagnosticBeanPostProcessor.java

@@ -24,19 +24,30 @@
 import com.github._1c_syntax.bsl.languageserver.configuration.LanguageServerConfiguration;
 import com.github._1c_syntax.bsl.languageserver.diagnostics.BSLDiagnostic;
 import com.github._1c_syntax.bsl.languageserver.diagnostics.metadata.DiagnosticInfo;
+import com.github._1c_syntax.bsl.languageserver.utils.Resources;
 import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
 import org.eclipse.lsp4j.jsonrpc.messages.Either;
+import org.springframework.beans.factory.config.BeanDefinition;
 import org.springframework.beans.factory.config.BeanPostProcessor;
+import org.springframework.context.annotation.Lazy;
+import org.springframework.context.annotation.Role;
 import org.springframework.stereotype.Component;
 
 import java.util.Map;
 
 @RequiredArgsConstructor
 @Component
+@Role(BeanDefinition.ROLE_INFRASTRUCTURE)
+@Slf4j
 public class DiagnosticBeanPostProcessor implements BeanPostProcessor {
 
   private final LanguageServerConfiguration configuration;
   private final Map<Class<? extends BSLDiagnostic>, DiagnosticInfo> diagnosticInfos;
+  @Lazy
+  private final Resources resources;
+  @Lazy
+  private final DiagnosticParameterValidator diagnosticParameterValidator;
 
   @Override
   public Object postProcessBeforeInitialization(Object bean, String beanName) {
@@ -65,7 +76,17 @@ public Object postProcessAfterInitialization(Object bean, String beanName) {
       configuration.getDiagnosticsOptions().getParameters().get(diagnostic.getInfo().getCode().getStringValue());
 
     if (diagnosticConfiguration != null && diagnosticConfiguration.isRight()) {
-      diagnostic.configure(diagnosticConfiguration.getRight());
+      try {
+        // Validate configuration against JSON schema if available
+        var diagnosticCode = diagnostic.getInfo().getCode().getStringValue();
+        diagnosticParameterValidator.validateDiagnosticConfiguration(diagnosticCode, diagnosticConfiguration.getRight());
+
+        diagnostic.configure(diagnosticConfiguration.getRight());
+      } catch (Exception e) {
+        var errorMessage = resources.getResourceString(getClass(), "diagnosticConfigurationError", 
+                                                     diagnostic.getInfo().getCode().getStringValue(), e.getMessage());
+        LOGGER.warn(errorMessage, e);
+      }
     }
 
     return diagnostic;

src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/infrastructure/DiagnosticParameterValidator.java

@@ -0,0 +1,159 @@
+/*
+ * This file is a part of BSL Language Server.
+ *
+ * Copyright (c) 2018-2025
+ * Alexey Sosnoviy <[email protected]>, Nikita Fedkin <[email protected]> and contributors
+ *
+ * SPDX-License-Identifier: LGPL-3.0-or-later
+ *
+ * BSL Language Server is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 3.0 of the License, or (at your option) any later version.
+ *
+ * BSL Language Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with BSL Language Server.
+ */
+package com.github._1c_syntax.bsl.languageserver.diagnostics.infrastructure;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.github._1c_syntax.bsl.languageserver.configuration.events.LanguageServerConfigurationChangedEvent;
+import com.github._1c_syntax.bsl.languageserver.utils.Resources;
+import com.networknt.schema.JsonSchema;
+import com.networknt.schema.JsonSchemaFactory;
+import com.networknt.schema.SpecVersion;
+import com.networknt.schema.ValidationMessage;
+import lombok.Getter;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.config.BeanDefinition;
+import org.springframework.cache.annotation.CacheConfig;
+import org.springframework.cache.annotation.CacheEvict;
+import org.springframework.cache.annotation.Cacheable;
+import org.springframework.context.annotation.Lazy;
+import org.springframework.context.annotation.Role;
+import org.springframework.context.event.EventListener;
+import org.springframework.core.io.ClassPathResource;
+import org.springframework.lang.Nullable;
+import org.springframework.stereotype.Component;
+
+import java.io.IOException;
+import java.util.Map;
+import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
+
+/**
+ * Валидатор параметров диагностик с кешированием результатов проверки.
+ * <p>
+ * Выполняет валидацию конфигурации диагностик против JSON-схемы для обеспечения
+ * корректности параметров. Результаты валидации кешируются по классу диагностики
+ * и конфигурации для повышения производительности при работе с prototype-бинами.
+ * <p>
+ * Кеш автоматически сбрасывается при получении события {@link LanguageServerConfigurationChangedEvent}.
+ * Ошибки валидации логируются как предупреждения, но не препятствуют созданию диагностик.
+ * 
+ * @see LanguageServerConfigurationChangedEvent
+ * @see DiagnosticBeanPostProcessor
+ */
+@RequiredArgsConstructor
+@Component
+@Role(BeanDefinition.ROLE_INFRASTRUCTURE)
+@Slf4j
+@CacheConfig(cacheNames = "diagnosticSchemaValidation")
+public class DiagnosticParameterValidator {
+
+  private final Resources resources;
+  @Lazy
+  private final ObjectMapper objectMapper;
+
+  @Getter(lazy = true)
+  @Nullable
+  private final JsonSchema parametersSchema = loadParametersSchema();
+  private final Map<String, JsonSchema> diagnosticSchemas = new ConcurrentHashMap<>();
+
+  /**
+   * Обработчик события {@link LanguageServerConfigurationChangedEvent}.
+   * <p>
+   * Сбрасывает кеш валидации схем при изменении конфигурации.
+   *
+   * @param event Событие
+   */
+  @EventListener
+  @CacheEvict(allEntries = true)
+  public void handleLanguageServerConfigurationChange(LanguageServerConfigurationChangedEvent event) {
+    // No-op. Служит для сброса кеша при изменении конфигурации
+  }
+
+  /**
+   * Cached validation of diagnostic configuration against JSON schema.
+   * Results are cached per diagnostic class and configuration to improve performance for prototype beans.
+   * 
+   * @param diagnosticCode Diagnostic code
+   * @param configuration Configuration map to validate
+   */
+  @Cacheable
+  public void validateDiagnosticConfiguration(String diagnosticCode, Map<String, Object> configuration) {
+    try {
+      var schema = getDiagnosticSchema(diagnosticCode);
+      if (schema != null) {
+        var configNode = objectMapper.valueToTree(configuration);
+        Set<ValidationMessage> errors = schema.validate(configNode);
+
+        if (!errors.isEmpty()) {
+          var errorMessages = errors.stream()
+            .map(ValidationMessage::getMessage)
+            .reduce((msg1, msg2) -> msg1 + "; " + msg2)
+            .orElse("Unknown validation error");
+
+          var localizedMessage = resources.getResourceString(DiagnosticBeanPostProcessor.class, "diagnosticSchemaValidationError", 
+                                                           diagnosticCode, errorMessages);
+          LOGGER.warn(localizedMessage);
+        }
+      }
+    } catch (Exception e) {
+      // Schema validation failed, but don't prevent diagnostic configuration
+      LOGGER.debug("Schema validation failed for diagnostic '{}': {}", diagnosticCode, e.getMessage());
+    }
+  }
+
+  private JsonSchema getDiagnosticSchema(String diagnosticCode) {
+    return diagnosticSchemas.computeIfAbsent(diagnosticCode, this::loadDiagnosticSchema);
+  }
+
+  private JsonSchema loadDiagnosticSchema(String diagnosticCode) {
+    try {
+      var schema = getParametersSchema();
+      if (schema != null) {
+        // Extract the specific diagnostic schema from the main schema
+        var schemaNode = schema.getSchemaNode();
+        var definitionsNode = schemaNode.get("definitions");
+        if (definitionsNode != null && definitionsNode.has(diagnosticCode)) {
+          var diagnosticSchemaNode = definitionsNode.get(diagnosticCode);
+          var factory = JsonSchemaFactory.getInstance(SpecVersion.VersionFlag.V7);
+          return factory.getSchema(diagnosticSchemaNode);
+        }
+      }
+    } catch (Exception e) {
+      LOGGER.debug("Failed to load schema for diagnostic '{}': {}", diagnosticCode, e.getMessage());
+    }
+    return null;
+  }
+
+  private JsonSchema loadParametersSchema() {
+    try {
+      var schemaResource = new ClassPathResource("com/github/_1c_syntax/bsl/languageserver/configuration/parameters-schema.json");
+      if (schemaResource.exists()) {
+        var factory = JsonSchemaFactory.getInstance(SpecVersion.VersionFlag.V7);
+        return factory.getSchema(schemaResource.getInputStream());
+      }
+    } catch (IOException e) {
+      LOGGER.warn("Failed to load parameters schema: {}", e.getMessage());
+    }
+    return null;
+  }
+}

src/main/java/com/github/_1c_syntax/bsl/languageserver/inlayhints/CognitiveComplexityInlayHintSupplier.java

@@ -25,6 +25,8 @@
 import com.github._1c_syntax.bsl.languageserver.context.computer.ComplexitySecondaryLocation;
 import com.github._1c_syntax.bsl.languageserver.context.symbol.MethodSymbol;
 import lombok.RequiredArgsConstructor;
+import org.springframework.beans.factory.config.BeanDefinition;
+import org.springframework.context.annotation.Role;
 import org.springframework.stereotype.Component;
 
 import java.util.List;
@@ -34,6 +36,7 @@
  * Поставщик подсказок о когнитивной сложности методов.
  */
 @Component
+@Role(BeanDefinition.ROLE_INFRASTRUCTURE)
 @RequiredArgsConstructor
 public class CognitiveComplexityInlayHintSupplier extends AbstractComplexityInlayHintSupplier {
 

src/main/java/com/github/_1c_syntax/bsl/languageserver/inlayhints/CyclomaticComplexityInlayHintSupplier.java

@@ -25,6 +25,8 @@
 import com.github._1c_syntax.bsl.languageserver.context.computer.ComplexitySecondaryLocation;
 import com.github._1c_syntax.bsl.languageserver.context.symbol.MethodSymbol;
 import lombok.RequiredArgsConstructor;
+import org.springframework.beans.factory.config.BeanDefinition;
+import org.springframework.context.annotation.Role;
 import org.springframework.stereotype.Component;
 
 import java.util.List;
@@ -34,6 +36,7 @@
  * Поставщик подсказок о цикломатической сложности методов.
  */
 @Component
+@Role(BeanDefinition.ROLE_INFRASTRUCTURE)
 @RequiredArgsConstructor
 public class CyclomaticComplexityInlayHintSupplier extends AbstractComplexityInlayHintSupplier {