Finish v0.8.0

Author: bia-tech

.github/workflows/check.yml

@@ -8,7 +8,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        java_version: [ '17', '20', '21' ]
+        java_version: [ '17', '21' ]
         os: [ ubuntu-latest, windows-latest, macOS-latest ]
     steps:
       - uses: actions/checkout@v4

build.gradle.kts

@@ -8,12 +8,12 @@ plugins {
     signing
     id("org.cadixdev.licenser") version "0.6.1"
     id("me.qoomon.git-versioning") version "6.4.4"
-    id("io.freefair.lombok") version "8.11"
-    id("io.freefair.javadoc-links") version "8.11"
-    id("io.freefair.javadoc-utf-8") version "8.11"
+    id("io.freefair.lombok") version "8.12.1"
+    id("io.freefair.javadoc-links") version "8.12.1"
+    id("io.freefair.javadoc-utf-8") version "8.12.1"
     id("org.sonarqube") version "6.0.1.5171"
-    id("io.freefair.maven-central.validate-poms") version "8.11"
-    id("com.github.ben-manes.versions") version "0.51.0"
+    id("io.freefair.maven-central.validate-poms") version "8.12.1"
+    id("com.github.ben-manes.versions") version "0.52.0"
     id("ru.vyarus.pom") version "3.0.0"
     id("io.codearte.nexus-staging") version "0.30.0"
 }
@@ -88,7 +88,7 @@ tasks.check {
 tasks.jacocoTestReport {
     reports {
         xml.required.set(true)
-        xml.outputLocation.set(layout.buildDirectory.file("reports/jacoco/test/jacoco.xml"))
+        xml.outputLocation.set(File("${layout.buildDirectory.get()}/reports/jacoco/test/jacoco.xml"))
     }
 }
 
@@ -105,7 +105,10 @@ sonarqube {
         property("sonar.organization", "1c-syntax")
         property("sonar.projectKey", "1c-syntax_bsl-common-library")
         property("sonar.projectName", "BSL Common library")
-        property("sonar.coverage.jacoco.xmlReportPaths", layout.buildDirectory.file("reports/jacoco/test/jacoco.xml"))
+        property(
+            "sonar.coverage.jacoco.xmlReportPaths",
+            "${layout.buildDirectory.get()}/reports/jacoco/test/jacoco.xml"
+        )
     }
 }
 
@@ -206,7 +209,7 @@ tasks.register("precommit") {
 
 tasks.withType<Javadoc> {
     (options as StandardJavadocDocletOptions)
-            .addStringOption("Xdoclint:none", "-quiet")
+        .addStringOption("Xdoclint:none", "-quiet")
 }
 
 nexusStaging {

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.12.1-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

src/main/java/com/github/_1c_syntax/bsl/support/CompatibilityMode.java

@@ -36,6 +36,8 @@ public class CompatibilityMode {
   private static final String DONT_USE = "DontUse";
   private static final int MAX_VERSION = 99;
   private static final int THIRD_VERSION = 3;
+  private static final int SECOND_VERSION = 2;
+  private static final int FIFTH_VERSION = 5;
   private static final int VERSION_POSITION = 2;
   private static final Pattern VERSION_SPLITTER = Pattern.compile("([_.])");
 
@@ -74,6 +76,34 @@ public CompatibilityMode(int minor, int version) {
     setVersionComponents(minor, version);
   }
 
+  /**
+   * Возвращает признак отношения к семейству версий 8.1
+   */
+  public boolean its81() {
+    return minor == 1;
+  }
+
+  /**
+   * Возвращает признак отношения к семейству версий 8.2
+   */
+  public boolean its82() {
+    return minor == SECOND_VERSION;
+  }
+
+  /**
+   * Возвращает признак отношения к семейству версий 8.3
+   */
+  public boolean its83() {
+    return minor == THIRD_VERSION;
+  }
+
+  /**
+   * Возвращает признак отношения к семейству версий 8.5
+   */
+  public boolean its85() {
+    return minor == FIFTH_VERSION;
+  }
+
   /**
    * Выполняет сравнение двух режимов совместимости
    *

src/main/java/com/github/_1c_syntax/bsl/types/MDOType.java

@@ -1,25 +1,25 @@
-/*
- * This file is a part of BSL Common library.
- *
- * Copyright (c) 2021 - 2025
- * Tymko Oleg <olegtymko@yandex.ru>, Maximov Valery <maximovvalery@gmail.com> and contributors
- *
- * SPDX-License-Identifier: LGPL-3.0-or-later
- *
- * BSL Common library 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 Common library 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 Common library.
- */
-package com.github._1c_syntax.bsl.types;
+/*
+ * This file is a part of BSL Common library.
+ *
+ * Copyright (c) 2021 - 2025
+ * Tymko Oleg <olegtymko@yandex.ru>, Maximov Valery <maximovvalery@gmail.com> and contributors
+ *
+ * SPDX-License-Identifier: LGPL-3.0-or-later
+ *
+ * BSL Common library 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 Common library 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 Common library.
+ */
+package com.github._1c_syntax.bsl.types;
 
 import lombok.Getter;
 import org.apache.commons.collections4.map.CaseInsensitiveMap;
@@ -36,13 +36,17 @@
  */
 @Getter
 public enum MDOType {
+  ACCOUNTING_FLAG("AccountingFlag", "AccountingFlags", "ПризнакУчета", "ПризнакиУчета"),
   ACCOUNTING_REGISTER("AccountingRegister", "AccountingRegisters",
     "РегистрБухгалтерии", "РегистрыБухгалтерии"),
   ACCUMULATION_REGISTER("AccumulationRegister", "AccumulationRegisters",
     "РегистрНакопления", "РегистрыНакопления"),
+  ATTRIBUTE("Attribute", "Attributes", "Реквизит", "Реквизиты"),
+
   BOT("Bot", "Bots", "Бот", "Боты"),
   BUSINESS_PROCESS("BusinessProcess", "BusinessProcesses",
     "БизнесПроцесс", "БизнесПроцессы"),
+
   CALCULATION_REGISTER("CalculationRegister", "CalculationRegisters",
     "РегистрРасчета", "РегистрыРасчета"),
   CATALOG("Catalog", "Catalogs", "Справочник", "Справочники"),
@@ -52,6 +56,8 @@ public enum MDOType {
     "ПланВидовРасчета", "ПланыВидовРасчета"),
   CHART_OF_CHARACTERISTIC_TYPES("ChartOfCharacteristicTypes", "ChartsOfCharacteristicTypes",
     "ПланВидовХарактеристик", "ПланыВидовХарактеристик"),
+  COLUMN("Column", "Columns", "Колонка", "Колонки"),
+  COMMAND("Command", "Commands", "Команда", "Команды"),
   COMMAND_GROUP("CommandGroup", "CommandGroups", "ГруппаКоманд", "ГруппыКоманд"),
   COMMON_ATTRIBUTE("CommonAttribute", "CommonAttributes",
     "ОбщийРеквизит", "ОбщиеРеквизиты"),
@@ -63,81 +69,91 @@ public enum MDOType {
   COMMON_TEMPLATE("CommonTemplate", "CommonTemplates", "ОбщийМакет", "ОбщиеМакеты"),
   CONFIGURATION("Configuration", "", "Конфигурация", ""),
   CONSTANT("Constant", "Constants", "Константа", "Константы"),
+
   DATA_PROCESSOR("DataProcessor", "DataProcessors", "Обработка", "Обработки"),
   DEFINED_TYPE("DefinedType", "DefinedTypes", "ОпределяемыйТип", "ОпределяемыеТипы"),
+  DIMENSION("Dimension", "Dimensions", "Измерение", "Измерения"),
+  DOCUMENT("Document", "Documents", "Документ", "Документы"),
   DOCUMENT_JOURNAL("DocumentJournal", "DocumentJournals",
     "ЖурналДокументов", "ЖурналыДокументов"),
   DOCUMENT_NUMERATOR("DocumentNumerator", "DocumentNumerators",
     "НумераторДокументов", "НумераторыДокументов"),
-  DOCUMENT("Document", "Documents", "Документ", "Документы"),
+
   ENUM("Enum", "Enums", "Перечисление", "Перечисления"),
+  ENUM_VALUE("EnumValue", "EnumValues", "ЗначениеПеречисления", "ЗначенияПеречисления"),
   EVENT_SUBSCRIPTION("EventSubscription", "EventSubscriptions",
     "ПодпискаНаСобытие", "ПодпискиНаСобытия"),
   EXCHANGE_PLAN("ExchangePlan", "ExchangePlans", "ПланОбмена", "ПланыОбмена"),
+  EXTERNAL_DATA_PROCESSOR("ExternalDataProcessor", "ExternalDataProcessors",
+    "ВнешняяОбработка", "ВнешниеОбработки"),
   EXTERNAL_DATA_SOURCE("ExternalDataSource", "ExternalDataSources",
     "ВнешнийИсточникДанных", "ВнешниеИсточникиДанных"),
+  EXTERNAL_DATA_SOURCE_TABLE("Table", "Tables", "Таблица", "Таблицы"),
+  EXTERNAL_DATA_SOURCE_TABLE_FILED("Field", "Fields", "Поле", "Поля"),
+  EXTERNAL_REPORT("ExternalReport", "ExternalReports",
+    "ВнешнийОтчет", "ВнешниеОтчеты"),
+  EXT_DIMENSION_ACCOUNTING_FLAG("ExtDimensionAccountingFlag", "ExtDimensionAccountingFlags",
+    "ПризнакУчетаСубконто", "ПризнакиУчетаСубконто"),
+
   FILTER_CRITERION("FilterCriterion", "FilterCriteria",
     "КритерийОтбора", "КритерииОтбора"),
+  FORM("Form", "Forms", "Форма", "Формы"),
   FUNCTIONAL_OPTION("FunctionalOption", "FunctionalOptions",
     "ФункциональнаяОпция", "ФункциональныеОпции"),
   FUNCTIONAL_OPTIONS_PARAMETER("FunctionalOptionsParameter", "FunctionalOptionsParameters",
     "ПараметрФункциональныхОпций", "ПараметрыФункциональныхОпций"),
+
   HTTP_SERVICE("HTTPService", "HTTPServices", "HTTPСервис", "HTTPСервисы"),
+  HTTP_SERVICE_METHOD("Method", "Methods", "Метод", "Методы"),
+  HTTP_SERVICE_URL_TEMPLATE("URLTemplate", "URLTemplates", "ШаблонURL", "ШаблоныURL"),
+
   INFORMATION_REGISTER("InformationRegister", "InformationRegisters",
     "РегистрСведений", "РегистрыСведений"),
   INTEGRATION_SERVICE("IntegrationService", "IntegrationServices",
     "СервисИнтеграции", "СервисыИнтеграции"),
+  INTEGRATION_SERVICE_CHANNEL("IntegrationServiceChannel", "IntegrationServiceChannels",
+    "КаналСервисаИнтеграции", "Каналы"),
+
   INTERFACE("Interface", "Interfaces", "Интерфейс", "Интерфейсы"),
+
   LANGUAGE("Language", "Languages", "Язык", "Языки"),
+
+  PALETTE_COLOR("PaletteColor", "PaletteColors",
+    "ЦветПалитры", "ЦветаПалитры"),
+
+  RECALCULATION("Recalculation", "Recalculations", "Перерасчет", "Перерасчеты"),
   REPORT("Report", "Reports", "Отчет", "Отчеты"),
+  RESOURCE("Resource", "Resources", "Ресурс", "Ресурсы"),
   ROLE("Role", "Roles", "Роль", "Роли"),
+
   SCHEDULED_JOB("ScheduledJob", "ScheduledJobs",
     "РегламентноеЗадание", "РегламентныеЗадания"),
   SEQUENCE("Sequence", "Sequences", "Последовательность", "Последовательности"),
   SESSION_PARAMETER("SessionParameter", "SessionParameters",
     "ПараметрСеанса", "ПараметрыСеанса"),
   SETTINGS_STORAGE("SettingsStorage", "SettingsStorages",
     "ХранилищеНастроек", "ХранилищаНастроек"),
-  STYLE_ITEM("StyleItem", "StyleItems", "ЭлементСтиля", "ЭлементыСтиля"),
-  STYLE("Style", "Styles", "Стиль", "Стили"),
-  SUBSYSTEM("Subsystem", "Subsystems", "Подсистема", "Подсистемы"),
-  TASK("Task", "Tasks", "Задача", "Задачи"),
-  WEB_SERVICE("WebService", "WebServices", "WebСервис", "WebСервисы"),
-  WS_REFERENCE("WSReference", "WSReferences", "WSСсылка", "WSСсылки"),
-  XDTO_PACKAGE("XDTOPackage", "XDTOPackages", "ПакетXDTO", "ПакетыXDTO"),
-
-  FORM("Form", "Forms", "Форма", "Формы"),
-  COMMAND("Command", "Commands", "Команда", "Команды"),
-  TEMPLATE("Template", "Templates", "Макет", "Макеты"),
-  ATTRIBUTE("Attribute", "Attributes", "Реквизит", "Реквизиты"),
   STANDARD_ATTRIBUTE("StandardAttribute", "StandardAttributes",
     "СтандартныйРеквизит", "СтандартныеРеквизиты"),
-  TABULAR_SECTION("TabularSection", "TabularSections", "ТабличнаяЧасть", "ТабличныеЧасти"),
   STANDARD_TABULAR_SECTION("StandardTabularSection", "StandardTabularSections",
     "СтандартнаяТабличнаяЧасть", "СтандартныеТабличныеЧасти"),
-  RECALCULATION("Recalculation", "Recalculations", "Перерасчет", "Перерасчеты"),
-  WS_OPERATION("Operation", "Operations", "Операция", "Операции"),
-  WS_OPERATION_PARAMETER("Parameter", "Parameters", "Параметр", "Параметры"),
-  HTTP_SERVICE_URL_TEMPLATE("URLTemplate", "URLTemplates", "ШаблонURL", "ШаблоныURL"),
-  HTTP_SERVICE_METHOD("Method", "Methods", "Метод", "Методы"),
-  INTEGRATION_SERVICE_CHANNEL("IntegrationServiceChannel", "IntegrationServiceChannels",
-    "КаналСервисаИнтеграции", "Каналы"),
+  STYLE("Style", "Styles", "Стиль", "Стили"),
+  STYLE_ITEM("StyleItem", "StyleItems", "ЭлементСтиля", "ЭлементыСтиля"),
+  SUBSYSTEM("Subsystem", "Subsystems", "Подсистема", "Подсистемы"),
+
+  TABULAR_SECTION("TabularSection", "TabularSections", "ТабличнаяЧасть", "ТабличныеЧасти"),
+  TASK("Task", "Tasks", "Задача", "Задачи"),
   TASK_ADDRESSING_ATTRIBUTE("AddressingAttribute", "AddressingAttributes",
     "РеквизитАдресации", "Реквизиты адресации"),
-  DIMENSION("Dimension", "Dimensions", "Измерение", "Измерения"),
-  RESOURCE("Resource", "Resources", "Ресурс", "Ресурсы"),
-  ENUM_VALUE("EnumValue", "EnumValues", "ЗначениеПеречисления", "ЗначенияПеречисления"),
-  COLUMN("Column", "Columns", "Колонка", "Колонки"),
-  ACCOUNTING_FLAG("AccountingFlag", "AccountingFlags", "ПризнакУчета", "ПризнакиУчета"),
-  EXT_DIMENSION_ACCOUNTING_FLAG("ExtDimensionAccountingFlag", "ExtDimensionAccountingFlags",
-    "ПризнакУчетаСубконто", "ПризнакиУчетаСубконто"),
+  TEMPLATE("Template", "Templates", "Макет", "Макеты"),
+
+  WEB_SERVICE("WebService", "WebServices", "WebСервис", "WebСервисы"),
+  WS_OPERATION("Operation", "Operations", "Операция", "Операции"),
+  WS_OPERATION_PARAMETER("Parameter", "Parameters", "Параметр", "Параметры"),
+  WS_REFERENCE("WSReference", "WSReferences", "WSСсылка", "WSСсылки"),
+
+  XDTO_PACKAGE("XDTOPackage", "XDTOPackages", "ПакетXDTO", "ПакетыXDTO"),
 
-  EXTERNAL_DATA_SOURCE_TABLE("Table", "Tables", "Таблица", "Таблицы"),
-  EXTERNAL_DATA_SOURCE_TABLE_FILED("Field", "Fields", "Поле", "Поля"),
-  EXTERNAL_REPORT("ExternalReport", "ExternalReports",
-    "ВнешнийОтчет", "ВнешниеОтчеты"),
-  EXTERNAL_DATA_PROCESSOR("ExternalDataProcessor", "ExternalDataProcessors",
-    "ВнешняяОбработка", "ВнешниеОбработки"),
   UNKNOWN("", "", "", "");
 
   private static final Map<String, MDOType> MAP_TYPES = computeMapTypes();

src/test/java/com/github/_1c_syntax/bsl/support/CompatibilityModeTest.java

@@ -76,4 +76,26 @@ void testCompareTo() {
 
   }
 
+  @Test
+  void its8x() {
+    var versionA = new CompatibilityMode(3, 10);
+    var versionB = new CompatibilityMode(3, 11);
+    var versionC = new CompatibilityMode(2, 19);
+    var versionD = new CompatibilityMode(1, 18);
+    var versionE = new CompatibilityMode(5, 2);
+    var versionF = new CompatibilityMode(9, 2);
+    var versionUNK = new CompatibilityMode();
+
+    assertThat(versionA.its83()).isTrue();
+    assertThat(versionB.its83()).isTrue();
+    assertThat(versionC.its82()).isTrue();
+    assertThat(versionD.its81()).isTrue();
+    assertThat(versionE.its85()).isTrue();
+    assertThat(versionF.its81()).isFalse();
+    assertThat(versionF.its82()).isFalse();
+    assertThat(versionF.its83()).isFalse();
+    assertThat(versionF.its85()).isFalse();
+    assertThat(versionUNK.its83()).isTrue();
+  }
+
 }

src/test/java/com/github/_1c_syntax/bsl/types/MDOTypeTest.java

@@ -30,7 +30,7 @@ class MDOTypeTest {
   @Test
   void valuesWithoutChildren() {
     var values = MDOType.valuesWithoutChildren();
-    assertThat(values).hasSize(50)
+    assertThat(values).hasSize(51)
       .doesNotContain(MDOType.FORM)
       .doesNotContain(MDOType.COMMAND)
       .doesNotContain(MDOType.TEMPLATE)