Finish v0.9.0

Author: theshadowco

.gitignore

@@ -15,3 +15,4 @@ build/
 /.idea/material_theme_project_new.xml
 /.idea/inspectionProfiles/Project_Default.xml
 /.idea/sonarlint.xml
+/.idea/kotlinc.xml

README.MD

@@ -9,7 +9,6 @@
 [![Coverage](https://sonarcloud.io/api/project_badges/measure?project=1c-syntax_bsl-common-library&metric=coverage)](https://sonarcloud.io/dashboard?id=1c-syntax_bsl-common-library)
 
 [![Download](https://img.shields.io/github/release/1c-syntax/bsl-common-library.svg?label=download&style=flat)](https://github.com/1c-syntax/bsl-common-library/releases/latest)
-[![JitPack](https://jitpack.io/v/1c-syntax/bsl-common-library.svg)](https://jitpack.io/#1c-syntax/bsl-common-library)
 [![GitHub Releases](https://img.shields.io/github/downloads/1c-syntax/bsl-common-library/latest/total?style=flat-square)](https://github.com/1c-syntax/bsl-common-library/releases)
 
 ## Спасибо контрибьютерам

build.gradle.kts

@@ -1,20 +1,20 @@
-import java.util.*
 import org.jreleaser.model.Active.*
+import java.util.*
 
 plugins {
     `java-library`
     `maven-publish`
     jacoco
     id("org.cadixdev.licenser") version "0.6.1"
     id("me.qoomon.git-versioning") version "6.4.4"
-    id("io.freefair.lombok") version "8.14.2"
-    id("io.freefair.javadoc-links") version "8.14.2"
-    id("io.freefair.javadoc-utf-8") version "8.14.2"
-    id("io.freefair.maven-central.validate-poms") version "8.14.2"
-    id("com.github.ben-manes.versions") version "0.52.0"
+    id("io.freefair.lombok") version "9.0.0"
+    id("io.freefair.javadoc-links") version "9.0.0"
+    id("io.freefair.javadoc-utf-8") version "9.0.0"
+    id("io.freefair.maven-central.validate-poms") version "9.0.0"
+    id("com.github.ben-manes.versions") version "0.53.0"
     id("ru.vyarus.pom") version "3.0.0"
-    id("org.jreleaser") version "1.19.0"
-    id("org.sonarqube") version "6.2.0.5505"
+    id("org.jreleaser") version "1.20.0"
+    id("org.sonarqube") version "7.0.0.6105"
 }
 
 repositories {
@@ -57,14 +57,16 @@ dependencies {
     // stat analysis
     compileOnly("com.github.spotbugs", "spotbugs-annotations", "4.8.6")
 
+    // логирование
+    testImplementation("org.slf4j", "slf4j-reload4j", "2.0.16")
+
     // тестирование
-    testRuntimeOnly("org.junit.jupiter", "junit-jupiter-engine", "5.11.4")
-    testImplementation("org.junit.jupiter", "junit-jupiter-api", "5.11.4")
+    testImplementation(platform("org.junit:junit-bom:5.11.4"))
+    testImplementation("org.junit.jupiter", "junit-jupiter-api")
+    testImplementation("org.junit.jupiter", "junit-jupiter-params")
     testImplementation("org.assertj", "assertj-core", "3.27.0")
     testImplementation("com.ginsberg", "junit5-system-exit", "2.0.2")
-
-    // логирование
-    testImplementation("org.slf4j", "slf4j-reload4j", "2.0.16")
+    testRuntimeOnly("org.junit.jupiter", "junit-jupiter-engine")
 }
 
 java {

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

@@ -49,6 +49,17 @@ public static SupportVariant max(Collection<SupportVariant> variants) {
       .orElse(SupportVariant.NONE);
   }
 
+  /**
+   * Сравнивает два варианта поддержки и возвращает наибольший по приоритету
+   *
+   * @param first  Первый вариант
+   * @param second Второй вариант
+   * @return Наибольший вариант
+   */
+  public static SupportVariant max(SupportVariant first, SupportVariant second) {
+    return first.priority <= second.priority ? first : second;
+  }
+
   /**
    * Находит элемент по приоритету
    *

src/main/java/com/github/_1c_syntax/bsl/support/package-info.java

@@ -0,0 +1,31 @@
+/*
+ * This file is a part of BSL Common library.
+ *
+ * Copyright (c) 2021 - 2025
+ * Tymko Oleg <[email protected]>, Maximov Valery <[email protected]> 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.
+ */
+/**
+ * Пакет содержит вспомогательные структуры данных для режима поддержки
+ */
+@ParametersAreNonnullByDefault
+@ReturnValuesAreNonnullByDefault
+package com.github._1c_syntax.bsl.support;
+
+import edu.umd.cs.findbugs.annotations.ReturnValuesAreNonnullByDefault;
+
+import javax.annotation.ParametersAreNonnullByDefault;

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

@@ -0,0 +1,59 @@
+/*
+ * This file is a part of BSL Common library.
+ *
+ * Copyright (c) 2021 - 2025
+ * Tymko Oleg <[email protected]>, Maximov Valery <[email protected]> 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 lombok.ToString;
+import lombok.experimental.Accessors;
+
+import java.util.Locale;
+import java.util.Map;
+
+/**
+ * Варианты длины
+ */
+@ToString(of = "fullName")
+public enum AllowedLength implements EnumWithName {
+  FIXED("Fixed", "Фиксированная"),
+  VARIABLE("Variable", "Переменная");
+
+  private static final Map<String, AllowedLength> KEYS = EnumWithName.computeKeys(values());
+
+  @Getter
+  @Accessors(fluent = true)
+  private final MultiName fullName;
+
+
+  AllowedLength(String nameEn, String nameRu) {
+    this.fullName = MultiName.create(nameEn, nameRu);
+  }
+
+  /**
+   * Ищет элемент перечисления по именам (рус, анг)
+   *
+   * @param string Имя искомого элемента
+   * @return Найденное значение, если не найден - то VARIABLE
+   */
+  public static AllowedLength valueByName(String string) {
+    return KEYS.getOrDefault(string.toLowerCase(Locale.ROOT), VARIABLE);
+  }
+}

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

@@ -0,0 +1,60 @@
+/*
+ * This file is a part of BSL Common library.
+ *
+ * Copyright (c) 2021 - 2025
+ * Tymko Oleg <[email protected]>, Maximov Valery <[email protected]> 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 lombok.ToString;
+import lombok.experimental.Accessors;
+
+import java.util.Locale;
+import java.util.Map;
+
+/**
+ * Части даты
+ */
+@ToString(of = "fullName")
+public enum DateFractions implements EnumWithName {
+  DATE("Date", "Дата"),
+  DATE_TIME("DateTime", "ДатаВремя"),
+  TIME("Time", "Время");
+
+  private static final Map<String, DateFractions> KEYS = EnumWithName.computeKeys(values());
+
+  @Getter
+  @Accessors(fluent = true)
+  private final MultiName fullName;
+
+
+  DateFractions(String nameEn, String nameRu) {
+    this.fullName = MultiName.create(nameEn, nameRu);
+  }
+
+  /**
+   * Ищет элемент перечисления по именам (рус, анг)
+   *
+   * @param string Имя искомого элемента
+   * @return Найденное значение, если не найден - то DATE_TIME
+   */
+  public static DateFractions valueByName(String string) {
+    return KEYS.getOrDefault(string.toLowerCase(Locale.ROOT), DATE_TIME);
+  }
+}

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

@@ -0,0 +1,94 @@
+/*
+ * This file is a part of BSL Common library.
+ *
+ * Copyright (c) 2021 - 2025
+ * Tymko Oleg <[email protected]>, Maximov Valery <[email protected]> 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 java.util.Collections;
+import java.util.HashMap;
+import java.util.Locale;
+import java.util.Map;
+
+/**
+ * Расширение для перечислений, подсказывающее о наличии строкового значения, по которому его можно найти
+ */
+public interface EnumWithName {
+  /**
+   * Возвращает имена значения перечисления
+   *
+   * @return Мультиязычное имя значения перечисления
+   */
+  MultiName fullName();
+
+  /**
+   * Возвращает имя значения на русском языке
+   *
+   * @return Имя значения на русском языке
+   */
+  default String nameRu() {
+    return fullName().getRu();
+  }
+
+  /**
+   * Возвращает имя значения на английском языке
+   *
+   * @return Имя значения на английском языке
+   */
+  default String nameEn() {
+    return fullName().getEn();
+  }
+
+  /**
+   * Сервисный метод для формирования кеша ключей
+   *
+   * @param values  Список элементов класса
+   * @param exclude Исключаемый элемент
+   * @param <T>     Тип класса
+   * @return Кеш ключей
+   */
+  static <T extends EnumWithName> Map<String, T> computeKeys(T[] values, T exclude) {
+    Map<String, T> keysMap = new HashMap<>();
+    for (var element : values) {
+      if (element == exclude) {
+        continue;
+      }
+      keysMap.put(element.nameEn().toLowerCase(Locale.ROOT), element);
+      keysMap.put(element.nameRu().toLowerCase(Locale.ROOT), element);
+    }
+    return Collections.unmodifiableMap(keysMap);
+  }
+
+
+  /**
+   * Сервисный метод для формирования кеша ключей
+   *
+   * @param values Список элементов класса
+   * @param <T>    Тип класса
+   * @return Кеш ключей
+   */
+  static <T extends EnumWithName> Map<String, T> computeKeys(T[] values) {
+    Map<String, T> keysMap = new HashMap<>();
+    for (var element : values) {
+      keysMap.put(element.nameEn().toLowerCase(Locale.ROOT), element);
+      keysMap.put(element.nameRu().toLowerCase(Locale.ROOT), element);
+    }
+    return Collections.unmodifiableMap(keysMap);
+  }
+}