Новые типы MDO и тесты для 25-27

.coderabbit.yaml

@@ -0,0 +1,3 @@
+reviews:
+  path_filters:
+    - "!src/test/resources/**"

build.gradle.kts

@@ -59,7 +59,7 @@ dependencies {
 
     // прочее
     implementation("commons-io", "commons-io", "2.18.0")
-    implementation("io.github.1c-syntax", "bsl-common-library", "0.9.0.18-SNAPSHOT")
+    implementation("io.github.1c-syntax", "bsl-common-library", "0.9.0.21-SNAPSHOT")
     implementation("io.github.1c-syntax", "utils", "0.6.3")
     implementation("io.github.1c-syntax", "supportconf", "0.15.0.7-SNAPSHOT") {
         exclude("io.github.1c-syntax", "bsl-common-library")

src/main/java/com/github/_1c_syntax/bsl/mdclasses/Configuration.java

@@ -70,6 +70,7 @@
 import com.github._1c_syntax.bsl.mdo.Task;
 import com.github._1c_syntax.bsl.mdo.WSReference;
 import com.github._1c_syntax.bsl.mdo.WebService;
+import com.github._1c_syntax.bsl.mdo.WebSocketClient;
 import com.github._1c_syntax.bsl.mdo.XDTOPackage;
 import com.github._1c_syntax.bsl.mdo.support.ApplicationRunMode;
 import com.github._1c_syntax.bsl.mdo.support.DataLockControlMode;
@@ -202,6 +203,8 @@ public class Configuration implements CF {
   @Singular
   List<WebService> webServices;
   @Singular
+  List<WebSocketClient> webSocketClients;
+  @Singular
   List<HTTPService> httpServices;
   @Singular
   List<WSReference> wsReferences;

src/main/java/com/github/_1c_syntax/bsl/mdclasses/ConfigurationExtension.java

@@ -70,6 +70,7 @@
 import com.github._1c_syntax.bsl.mdo.Task;
 import com.github._1c_syntax.bsl.mdo.WSReference;
 import com.github._1c_syntax.bsl.mdo.WebService;
+import com.github._1c_syntax.bsl.mdo.WebSocketClient;
 import com.github._1c_syntax.bsl.mdo.XDTOPackage;
 import com.github._1c_syntax.bsl.mdo.support.ApplicationRunMode;
 import com.github._1c_syntax.bsl.mdo.support.ConfigurationExtensionPurpose;
@@ -195,6 +196,8 @@ public class ConfigurationExtension implements CF {
   @Singular
   List<WebService> webServices;
   @Singular
+  List<WebSocketClient> webSocketClients;
+  @Singular
   List<HTTPService> httpServices;
   @Singular
   List<WSReference> wsReferences;

src/main/java/com/github/_1c_syntax/bsl/mdclasses/ConfigurationTree.java

@@ -68,6 +68,7 @@
 import com.github._1c_syntax.bsl.mdo.Task;
 import com.github._1c_syntax.bsl.mdo.WSReference;
 import com.github._1c_syntax.bsl.mdo.WebService;
+import com.github._1c_syntax.bsl.mdo.WebSocketClient;
 import com.github._1c_syntax.bsl.mdo.XDTOPackage;
 
 import java.util.List;
@@ -666,4 +667,16 @@ default Optional<Task> findTask(Predicate<? super Task> predicate) {
   default Optional<ExternalDataSource> findExternalDataSource(Predicate<? super ExternalDataSource> predicate) {
     return getExternalDataSources().stream().filter(predicate).findFirst();
   }
+
+  /**
+   * WebSocket-клиенты
+   */
+  List<WebSocketClient> getWebSocketClients();
+
+  /**
+   * Поиск WebSocket-клиента по условию
+   */
+  default Optional<WebSocketClient> findWebSocketClient(Predicate<? super WebSocketClient> predicate) {
+    return getWebSocketClients().stream().filter(predicate).findFirst();
+  }
 }

src/main/java/com/github/_1c_syntax/bsl/mdo/ExternalDataSource.java

@@ -21,6 +21,8 @@
  */
 package com.github._1c_syntax.bsl.mdo;
 
+import com.github._1c_syntax.bsl.mdo.children.ExternalDataSourceCube;
+import com.github._1c_syntax.bsl.mdo.children.ExternalDataSourceFunction;
 import com.github._1c_syntax.bsl.mdo.children.ExternalDataSourceTable;
 import com.github._1c_syntax.bsl.mdo.support.ObjectBelonging;
 import com.github._1c_syntax.bsl.mdo.support.RoleRight;
@@ -66,6 +68,7 @@ public class ExternalDataSource implements MDObject, ChildrenOwner, AccessRights
   @Default
   SupportVariant supportVariant = SupportVariant.NONE;
 
+  Lazy<List<MD>> children = new Lazy<>(this::computeChildren);
   Lazy<List<MD>> plainChildren = new Lazy<>(this::computePlainChildren);
 
   /*
@@ -78,17 +81,27 @@ public class ExternalDataSource implements MDObject, ChildrenOwner, AccessRights
   @Singular
   List<ExternalDataSourceTable> tables;
 
+  /**
+   * Функции
+   */
+  @Singular
+  List<ExternalDataSourceFunction> functions;
+
+  /**
+   * Кубы
+   */
+  @Singular
+  List<ExternalDataSourceCube> cubes;
+
   /**
    * Пояснение
    */
   @Default
   MultiLanguageString explanation = MultiLanguageString.EMPTY;
 
-  // todo сделать функции и кубы
-
   @Override
   public List<MD> getChildren() {
-    return Collections.unmodifiableList(tables);
+    return children.getOrCompute();
   }
 
   @Override
@@ -103,6 +116,10 @@ public static List<RoleRight> possibleRights() {
     return POSSIBLE_RIGHTS;
   }
 
+  private List<MD> computeChildren() {
+    return LazyLoader.computeChildren(this);
+  }
+
   private List<MD> computePlainChildren() {
     return LazyLoader.computePlainChildren(this);
   }

src/main/java/com/github/_1c_syntax/bsl/mdo/WebSocketClient.java

@@ -0,0 +1,93 @@
+/*
+ * This file is a part of MDClasses.
+ *
+ * Copyright (c) 2019 - 2025
+ * Tymko Oleg <[email protected]>, Maximov Valery <[email protected]> and contributors
+ *
+ * SPDX-License-Identifier: LGPL-3.0-or-later
+ *
+ * MDClasses 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.
+ *
+ * MDClasses 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 MDClasses.
+ */
+package com.github._1c_syntax.bsl.mdo;
+
+import com.github._1c_syntax.bsl.mdo.support.ObjectBelonging;
+import com.github._1c_syntax.bsl.support.SupportVariant;
+import com.github._1c_syntax.bsl.types.MdoReference;
+import com.github._1c_syntax.bsl.types.MultiLanguageString;
+import lombok.Builder;
+import lombok.Builder.Default;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
+import lombok.Value;
+
+import java.util.Collections;
+import java.util.List;
+
+@Value
+@Builder
+@ToString(of = {"name", "uuid"})
+@EqualsAndHashCode(of = {"name", "uuid"})
+public class WebSocketClient implements MDObject, ModuleOwner {
+  /*
+   * MDObject
+   */
+
+  @Default
+  String uuid = "";
+  @Default
+  String name = "";
+  @Default
+  MdoReference mdoReference = MdoReference.EMPTY;
+  @Default
+  ObjectBelonging objectBelonging = ObjectBelonging.OWN;
+  @Default
+  String comment = "";
+  @Default
+  MultiLanguageString synonym = MultiLanguageString.EMPTY;
+  @Default
+  SupportVariant supportVariant = SupportVariant.NONE;
+
+  /*
+   * ModuleOwner
+   */
+
+  @Default
+  List<Module> modules = Collections.emptyList();
+
+  /*
+   * Свое
+   */
+
+  /**
+   * Предопределенный
+   */
+  boolean predefined;
+
+  /**
+   * Подключать автоматически
+   */
+  boolean autoConnect;
+
+  /**
+   * URI сервера
+   */
+  @Default
+  String serverURL = "";
+
+  /**
+   * Таймаут
+   */
+  int timeout;
+
+}