Рефакторинг тестов и фиксы

build.gradle.kts

@@ -10,7 +10,6 @@ plugins {
     id("io.freefair.lombok") version "9.5.0"
     id("io.freefair.javadoc-links") version "9.5.0"
     id("io.freefair.javadoc-utf-8") version "9.5.0"
-//    id("io.freefair.maven-central.validate-poms") version "9.5.0" // не работает на Gradle 9.5: ValidateMavenPom тянет удалённый из classpath plexus XmlPullParserException
     id("com.github.ben-manes.versions") version "0.54.0"
     id("ru.vyarus.pom") version "3.0.0"
     id("org.jreleaser") version "1.25.0"

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

@@ -141,7 +141,7 @@ public class Configuration implements CF {
   @Default
   ScriptVariant scriptVariant = ScriptVariant.ENGLISH;
   @Default
-  InterfaceCompatibilityMode interfaceCompatibilityMode = InterfaceCompatibilityMode.VERSION_8_2;
+  InterfaceCompatibilityMode interfaceCompatibilityMode = InterfaceCompatibilityMode.TAXI;
   @Default
   CompatibilityMode compatibilityMode = new CompatibilityMode();
   @Default

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

@@ -134,7 +134,7 @@ public class ConfigurationExtension implements CF {
   @Default
   ScriptVariant scriptVariant = ScriptVariant.ENGLISH;
   @Default
-  InterfaceCompatibilityMode interfaceCompatibilityMode = InterfaceCompatibilityMode.VERSION_8_2;
+  InterfaceCompatibilityMode interfaceCompatibilityMode = InterfaceCompatibilityMode.TAXI;
   @Default
   CompatibilityMode compatibilityMode = new CompatibilityMode();
   @Default

src/main/java/com/github/_1c_syntax/bsl/mdo/children/DocumentJournalColumn.java

@@ -26,6 +26,7 @@
 import com.github._1c_syntax.bsl.mdo.support.IndexingType;
 import com.github._1c_syntax.bsl.mdo.support.ObjectBelonging;
 import com.github._1c_syntax.bsl.support.SupportVariant;
+import com.github._1c_syntax.bsl.types.MDOType;
 import com.github._1c_syntax.bsl.types.MdoReference;
 import com.github._1c_syntax.bsl.types.MultiLanguageString;
 import com.github._1c_syntax.bsl.types.ValueTypeDescription;
@@ -90,4 +91,9 @@ public boolean isPasswordMode() {
   public ValueTypeDescription getValueType() {
     return ValueTypeDescription.EMPTY;
   }
+
+  @Override
+  public MDOType getMdoType() {
+    return MDOType.COLUMN;
+  }
 }

src/main/java/com/github/_1c_syntax/bsl/mdo/children/ExternalDataSourceCube.java

@@ -37,6 +37,7 @@
 import com.github._1c_syntax.bsl.mdo.support.RoleRight;
 import com.github._1c_syntax.bsl.mdo.utils.LazyLoader;
 import com.github._1c_syntax.bsl.support.SupportVariant;
+import com.github._1c_syntax.bsl.types.MDOType;
 import com.github._1c_syntax.bsl.types.MdoReference;
 import com.github._1c_syntax.bsl.types.MultiLanguageString;
 import lombok.Builder;
@@ -175,6 +176,11 @@ public static List<RoleRight> possibleRights() {
     return POSSIBLE_RIGHTS;
   }
 
+  @Override
+  public MDOType getMdoType() {
+    return MDOType.EXTERNAL_DATA_SOURCE_CUBE;
+  }
+
   private static List<RoleRight> computePossibleRights() {
     return List.of(
       RoleRight.READ,

src/main/java/com/github/_1c_syntax/bsl/mdo/children/ExternalDataSourceCubeDimensionTable.java

@@ -37,6 +37,7 @@
 import com.github._1c_syntax.bsl.mdo.support.RoleRight;
 import com.github._1c_syntax.bsl.mdo.utils.LazyLoader;
 import com.github._1c_syntax.bsl.support.SupportVariant;
+import com.github._1c_syntax.bsl.types.MDOType;
 import com.github._1c_syntax.bsl.types.MdoReference;
 import com.github._1c_syntax.bsl.types.MultiLanguageString;
 import lombok.Builder;
@@ -170,6 +171,11 @@ public static List<RoleRight> possibleRights() {
     return POSSIBLE_RIGHTS;
   }
 
+  @Override
+  public MDOType getMdoType() {
+    return MDOType.EXTERNAL_DATA_SOURCE_CUBE_DIMENSION_TABLE;
+  }
+
   private static List<RoleRight> computePossibleRights() {
     return List.of(
       RoleRight.INSERT,

src/main/java/com/github/_1c_syntax/bsl/mdo/children/ExternalDataSourceFunction.java

@@ -27,6 +27,7 @@
 import com.github._1c_syntax.bsl.mdo.support.ObjectBelonging;
 import com.github._1c_syntax.bsl.mdo.support.RoleRight;
 import com.github._1c_syntax.bsl.support.SupportVariant;
+import com.github._1c_syntax.bsl.types.MDOType;
 import com.github._1c_syntax.bsl.types.MdoReference;
 import com.github._1c_syntax.bsl.types.MultiLanguageString;
 import com.github._1c_syntax.bsl.types.ValueTypeDescription;
@@ -97,6 +98,11 @@ public static List<RoleRight> possibleRights() {
     return POSSIBLE_RIGHTS;
   }
 
+  @Override
+  public MDOType getMdoType() {
+    return MDOType.EXTERNAL_DATA_SOURCE_FUNCTION;
+  }
+
   private static List<RoleRight> computePossibleRights() {
     return List.of(
       RoleRight.VIEW,

src/main/java/com/github/_1c_syntax/bsl/mdo/children/ExternalDataSourceTable.java

@@ -37,6 +37,7 @@
 import com.github._1c_syntax.bsl.mdo.support.RoleRight;
 import com.github._1c_syntax.bsl.mdo.utils.LazyLoader;
 import com.github._1c_syntax.bsl.support.SupportVariant;
+import com.github._1c_syntax.bsl.types.MDOType;
 import com.github._1c_syntax.bsl.types.MdoReference;
 import com.github._1c_syntax.bsl.types.MultiLanguageString;
 import lombok.Builder;
@@ -176,6 +177,11 @@ public static List<RoleRight> possibleRights() {
     return POSSIBLE_RIGHTS;
   }
 
+  @Override
+  public MDOType getMdoType() {
+    return MDOType.EXTERNAL_DATA_SOURCE_TABLE;
+  }
+
   private static List<RoleRight> computePossibleRights() {
     return List.of(
       RoleRight.INSERT,

src/main/java/com/github/_1c_syntax/bsl/mdo/children/ExternalDataSourceTableField.java

@@ -28,6 +28,7 @@
 import com.github._1c_syntax.bsl.mdo.support.ObjectBelonging;
 import com.github._1c_syntax.bsl.mdo.support.RoleRight;
 import com.github._1c_syntax.bsl.support.SupportVariant;
+import com.github._1c_syntax.bsl.types.MDOType;
 import com.github._1c_syntax.bsl.types.MdoReference;
 import com.github._1c_syntax.bsl.types.MultiLanguageString;
 import com.github._1c_syntax.bsl.types.ValueTypeDescription;
@@ -89,4 +90,9 @@ public static List<RoleRight> possibleRights() {
   public ValueTypeDescription getValueType() {
     return type;
   }
+
+  @Override
+  public MDOType getMdoType() {
+    return MDOType.EXTERNAL_DATA_SOURCE_TABLE_FIELD;
+  }
 }

src/main/java/com/github/_1c_syntax/bsl/mdo/children/HTTPServiceMethod.java

@@ -26,6 +26,7 @@
 import com.github._1c_syntax.bsl.mdo.support.ObjectBelonging;
 import com.github._1c_syntax.bsl.mdo.support.RoleRight;
 import com.github._1c_syntax.bsl.support.SupportVariant;
+import com.github._1c_syntax.bsl.types.MDOType;
 import com.github._1c_syntax.bsl.types.MdoReference;
 import com.github._1c_syntax.bsl.types.MultiLanguageString;
 import lombok.Builder;
@@ -83,4 +84,9 @@ public class HTTPServiceMethod implements MDChild, AccessRightsOwner {
   public static List<RoleRight> possibleRights() {
     return POSSIBLE_RIGHTS;
   }
+
+  @Override
+  public MDOType getMdoType() {
+    return MDOType.HTTP_SERVICE_METHOD;
+  }
 }

src/main/java/com/github/_1c_syntax/bsl/mdo/children/HTTPServiceURLTemplate.java

@@ -26,6 +26,7 @@
 import com.github._1c_syntax.bsl.mdo.MDChild;
 import com.github._1c_syntax.bsl.mdo.support.ObjectBelonging;
 import com.github._1c_syntax.bsl.support.SupportVariant;
+import com.github._1c_syntax.bsl.types.MDOType;
 import com.github._1c_syntax.bsl.types.MdoReference;
 import com.github._1c_syntax.bsl.types.MultiLanguageString;
 import lombok.Builder;
@@ -85,4 +86,9 @@ public class HTTPServiceURLTemplate implements MDChild, ChildrenOwner {
   public List<MD> getChildren() {
     return Collections.unmodifiableList(methods);
   }
+
+  @Override
+  public MDOType getMdoType() {
+    return MDOType.HTTP_SERVICE_URL_TEMPLATE;
+  }
 }

src/main/java/com/github/_1c_syntax/bsl/mdo/children/ObjectAttribute.java

@@ -28,6 +28,7 @@
 import com.github._1c_syntax.bsl.mdo.support.ObjectBelonging;
 import com.github._1c_syntax.bsl.mdo.support.RoleRight;
 import com.github._1c_syntax.bsl.support.SupportVariant;
+import com.github._1c_syntax.bsl.types.MDOType;
 import com.github._1c_syntax.bsl.types.MdoReference;
 import com.github._1c_syntax.bsl.types.MultiLanguageString;
 import com.github._1c_syntax.bsl.types.ValueTypeDescription;
@@ -131,4 +132,9 @@ public static List<RoleRight> possibleRights() {
   public ValueTypeDescription getValueType() {
     return type;
   }
+
+  @Override
+  public MDOType getMdoType() {
+    return MDOType.ATTRIBUTE;
+  }
 }

src/main/java/com/github/_1c_syntax/bsl/mdo/children/ObjectCommand.java

@@ -27,6 +27,7 @@
 import com.github._1c_syntax.bsl.mdo.support.ObjectBelonging;
 import com.github._1c_syntax.bsl.mdo.support.RoleRight;
 import com.github._1c_syntax.bsl.support.SupportVariant;
+import com.github._1c_syntax.bsl.types.MDOType;
 import com.github._1c_syntax.bsl.types.MdoReference;
 import com.github._1c_syntax.bsl.types.MultiLanguageString;
 import lombok.Builder;
@@ -80,4 +81,9 @@ public class ObjectCommand implements Command, MDChild {
   public static List<RoleRight> possibleRights() {
     return POSSIBLE_RIGHTS;
   }
+
+  @Override
+  public MDOType getMdoType() {
+    return MDOType.COMMAND;
+  }
 }

src/main/java/com/github/_1c_syntax/bsl/mdo/children/ObjectForm.java

@@ -30,6 +30,7 @@
 import com.github._1c_syntax.bsl.mdo.support.ObjectBelonging;
 import com.github._1c_syntax.bsl.mdo.support.UsePurposes;
 import com.github._1c_syntax.bsl.support.SupportVariant;
+import com.github._1c_syntax.bsl.types.MDOType;
 import com.github._1c_syntax.bsl.types.MdoReference;
 import com.github._1c_syntax.bsl.types.MultiLanguageString;
 import lombok.Builder;
@@ -91,4 +92,9 @@ public class ObjectForm implements Form, MDChild {
    */
   @Singular("addUsePurposes")
   List<UsePurposes> usePurposes;
+
+  @Override
+  public MDOType getMdoType() {
+    return MDOType.FORM;
+  }
 }

src/main/java/com/github/_1c_syntax/bsl/mdo/children/ObjectTabularSection.java

@@ -27,6 +27,7 @@
 import com.github._1c_syntax.bsl.mdo.support.ObjectBelonging;
 import com.github._1c_syntax.bsl.mdo.support.RoleRight;
 import com.github._1c_syntax.bsl.support.SupportVariant;
+import com.github._1c_syntax.bsl.types.MDOType;
 import com.github._1c_syntax.bsl.types.MdoReference;
 import com.github._1c_syntax.bsl.types.MultiLanguageString;
 import lombok.Builder;
@@ -76,4 +77,9 @@ public class ObjectTabularSection implements TabularSection, AccessRightsOwner {
   public static List<RoleRight> possibleRights() {
     return POSSIBLE_RIGHTS;
   }
+
+  @Override
+  public MDOType getMdoType() {
+    return MDOType.TABULAR_SECTION;
+  }
 }

src/main/java/com/github/_1c_syntax/bsl/mdo/children/ObjectTemplate.java

@@ -22,13 +22,13 @@
 package com.github._1c_syntax.bsl.mdo.children;
 
 import com.github._1c_syntax.bsl.mdo.MDChild;
-import com.github._1c_syntax.bsl.mdo.Module;
 import com.github._1c_syntax.bsl.mdo.Template;
 import com.github._1c_syntax.bsl.mdo.storage.EmptyTemplateData;
 import com.github._1c_syntax.bsl.mdo.storage.TemplateData;
 import com.github._1c_syntax.bsl.mdo.support.ObjectBelonging;
 import com.github._1c_syntax.bsl.mdo.support.TemplateType;
 import com.github._1c_syntax.bsl.support.SupportVariant;
+import com.github._1c_syntax.bsl.types.MDOType;
 import com.github._1c_syntax.bsl.types.MdoReference;
 import com.github._1c_syntax.bsl.types.MultiLanguageString;
 import lombok.Builder;
@@ -37,9 +37,6 @@
 import lombok.ToString;
 import lombok.Value;
 
-import java.util.Collections;
-import java.util.List;
-
 @Value
 @Builder
 @ToString(of = {"name", "uuid"})
@@ -64,8 +61,6 @@ public class ObjectTemplate implements Template, MDChild {
   MultiLanguageString synonym = MultiLanguageString.EMPTY;
   @Default
   SupportVariant supportVariant = SupportVariant.NONE;
-  @Default
-  List<Module> modules = Collections.emptyList();
 
   @Default
   TemplateType templateType = TemplateType.SPREADSHEET_DOCUMENT;
@@ -79,4 +74,9 @@ public class ObjectTemplate implements Template, MDChild {
 
   @Default
   MdoReference owner = MdoReference.EMPTY;
+
+  @Override
+  public MDOType getMdoType() {
+    return MDOType.TEMPLATE;
+  }
 }

src/main/java/com/github/_1c_syntax/bsl/mdo/children/PredefinedValue.java

@@ -27,6 +27,7 @@
 import com.github._1c_syntax.bsl.mdo.support.ObjectBelonging;
 import com.github._1c_syntax.bsl.mdo.utils.LazyLoader;
 import com.github._1c_syntax.bsl.support.SupportVariant;
+import com.github._1c_syntax.bsl.types.MDOType;
 import com.github._1c_syntax.bsl.types.MdoReference;
 import com.github._1c_syntax.bsl.types.MultiLanguageString;
 import lombok.Builder;
@@ -113,4 +114,9 @@ public class PredefinedValue implements MDChild, ChildrenOwner {
   public List<MD> getChildren() {
     return Collections.unmodifiableList(childItems);
   }
+
+  @Override
+  public MDOType getMdoType() {
+    return MDOType.PREDEFINED_VALUE;
+  }
 }

src/main/java/com/github/_1c_syntax/bsl/mdo/children/RecalculationDimension.java

@@ -23,7 +23,6 @@
 
 import com.github._1c_syntax.bsl.mdo.AccessRightsOwner;
 import com.github._1c_syntax.bsl.mdo.Attribute;
-import com.github._1c_syntax.bsl.mdo.children.ObjectAttribute;
 import com.github._1c_syntax.bsl.mdo.support.AttributeKind;
 import com.github._1c_syntax.bsl.mdo.support.IndexingType;
 import com.github._1c_syntax.bsl.mdo.support.ObjectBelonging;
@@ -32,8 +31,6 @@
 import com.github._1c_syntax.bsl.types.MdoReference;
 import com.github._1c_syntax.bsl.types.MultiLanguageString;
 import com.github._1c_syntax.bsl.types.ValueTypeDescription;
-
-import java.util.List;
 import lombok.AccessLevel;
 import lombok.Builder;
 import lombok.Builder.Default;
@@ -42,6 +39,8 @@
 import lombok.ToString;
 import lombok.Value;
 
+import java.util.List;
+
 @Value
 @Builder(toBuilder = true)
 @ToString(of = {"name", "uuid"})

src/main/java/com/github/_1c_syntax/bsl/mdo/children/StandardAttribute.java

@@ -28,6 +28,7 @@
 import com.github._1c_syntax.bsl.mdo.support.ObjectBelonging;
 import com.github._1c_syntax.bsl.mdo.support.RoleRight;
 import com.github._1c_syntax.bsl.support.SupportVariant;
+import com.github._1c_syntax.bsl.types.MDOType;
 import com.github._1c_syntax.bsl.types.MdoReference;
 import com.github._1c_syntax.bsl.types.MultiLanguageString;
 import com.github._1c_syntax.bsl.types.MultiName;
@@ -180,4 +181,9 @@ public String getDescription(String code) {
 
     return description;
   }
+
+  @Override
+  public MDOType getMdoType() {
+    return MDOType.ATTRIBUTE;
+  }
 }

src/main/java/com/github/_1c_syntax/bsl/mdo/children/TaskAddressingAttribute.java

@@ -28,6 +28,7 @@
 import com.github._1c_syntax.bsl.mdo.support.ObjectBelonging;
 import com.github._1c_syntax.bsl.mdo.support.RoleRight;
 import com.github._1c_syntax.bsl.support.SupportVariant;
+import com.github._1c_syntax.bsl.types.MDOType;
 import com.github._1c_syntax.bsl.types.MdoReference;
 import com.github._1c_syntax.bsl.types.MultiLanguageString;
 import com.github._1c_syntax.bsl.types.ValueTypeDescription;
@@ -141,4 +142,9 @@ public static List<RoleRight> possibleRights() {
   public ValueTypeDescription getValueType() {
     return type;
   }
+
+  @Override
+  public MDOType getMdoType() {
+    return MDOType.TASK_ADDRESSING_ATTRIBUTE;
+  }
 }

src/main/java/com/github/_1c_syntax/bsl/mdo/children/WebServiceOperation.java

@@ -29,6 +29,7 @@
 import com.github._1c_syntax.bsl.mdo.support.ObjectBelonging;
 import com.github._1c_syntax.bsl.mdo.support.RoleRight;
 import com.github._1c_syntax.bsl.support.SupportVariant;
+import com.github._1c_syntax.bsl.types.MDOType;
 import com.github._1c_syntax.bsl.types.MdoReference;
 import com.github._1c_syntax.bsl.types.MultiLanguageString;
 import lombok.Builder;
@@ -111,6 +112,11 @@ public List<MD> getChildren() {
     return Collections.unmodifiableList(parameters);
   }
 
+  @Override
+  public MDOType getMdoType() {
+    return MDOType.WS_OPERATION;
+  }
+
   /**
    * Возвращает перечень возможных прав доступа
    */