1, добавлена обработка чтения квалификатора двоичных данных в измененном формате edt (#569)

2. обновлены зависимости

Author: theshadowco

build.gradle.kts

@@ -59,8 +59,9 @@ dependencies {
 
     // прочее
     implementation("commons-io", "commons-io", "2.18.0")
-    implementation("io.github.1c-syntax", "bsl-common-library", "0.9.1")
-    implementation("io.github.1c-syntax", "utils", "0.6.4")
+
+    implementation("io.github.1c-syntax", "bsl-common-library", "0.9.2")
+    implementation("io.github.1c-syntax", "utils", "0.6.8")
     implementation("io.github.1c-syntax", "supportconf", "0.15.0") {
         exclude("io.github.1c-syntax", "bsl-common-library")
     }

src/main/java/com/github/_1c_syntax/bsl/reader/common/converter/ValueTypeQualifierConverter.java

@@ -43,8 +43,10 @@ public class ValueTypeQualifierConverter implements ReadConverter {
   private static final String DATE_QUALIFIERS_NODE_NAME = "DateQualifiers";
   private static final String NUMBER_QUALIFIERS_NODE_NAME = "NumberQualifiers";
   private static final String BINARY_DATA_QUALIFIERS_NODE_NAME = "BinaryDataQualifiers";
+  private static final String BINARY_QUALIFIERS_NODE_NAME = "BinaryQualifiers";
   private static final String LENGTH_NODE_NAME = "length";
   private static final String ALLOWED_LENGTH_NODE_NAME = "allowedLength";
+  private static final String FIXED_NODE_NAME = "fixed";
   private static final String DATE_FRACTIONS_NODE_NAME = "dateFractions";
   private static final String SCALE_NODE_NAME = "scale";
   private static final String PRECISION_NODE_NAME = "precision";
@@ -71,6 +73,9 @@ public Object unmarshal(HierarchicalStreamReader reader, UnmarshallingContext co
         length = Integer.parseInt(reader.getValue());
       } else if (ALLOWED_LENGTH_NODE_NAME.equalsIgnoreCase(reader.getNodeName())) {
         allowedLength = AllowedLength.valueByName(reader.getValue());
+      } else if (FIXED_NODE_NAME.equalsIgnoreCase(reader.getNodeName())) {
+        var value = Boolean.parseBoolean(reader.getValue());
+        allowedLength = value ? AllowedLength.FIXED : AllowedLength.VARIABLE;
       } else if (DATE_FRACTIONS_NODE_NAME.equalsIgnoreCase(reader.getNodeName())) {
         dateFractions = DateFractions.valueByName(reader.getValue());
       } else if (SCALE_NODE_NAME.equalsIgnoreCase(reader.getNodeName())
@@ -93,7 +98,8 @@ public Object unmarshal(HierarchicalStreamReader reader, UnmarshallingContext co
       return DateQualifiers.create(dateFractions);
     } else if (NUMBER_QUALIFIERS_NODE_NAME.equalsIgnoreCase(nodeName)) {
       return NumberQualifiers.create(precision, scale, nonNegative);
-    } else if (BINARY_DATA_QUALIFIERS_NODE_NAME.equalsIgnoreCase(nodeName)) {
+    } else if (BINARY_DATA_QUALIFIERS_NODE_NAME.equalsIgnoreCase(nodeName)
+      || BINARY_QUALIFIERS_NODE_NAME.equalsIgnoreCase(nodeName)) {
       return BinaryDataQualifiers.create(length, allowedLength);
     } else { // квалификаторы пока не обрабатываются
       LOGGER.warn("Unknown qualifiers {}", nodeName);

src/test/resources/ext/edt/mdclasses/configuration/src/Documents/Документ1/Документ1.mdo

@@ -32,9 +32,14 @@
     <name>Реквизит1</name>
     <type>
       <types>String</types>
+      <types>BinaryData</types>
       <stringQualifiers>
         <length>10</length>
       </stringQualifiers>
+      <binaryQualifiers>
+        <length>16</length>
+        <fixed>true</fixed>
+      </binaryQualifiers>
     </type>
     <minValue xsi:type="core:UndefinedValue"/>
     <maxValue xsi:type="core:UndefinedValue"/>

src/test/resources/fixtures/mdclasses/Documents.Документ1_edt.json

@@ -29,17 +29,26 @@
               "default": {
                 "tag": 4
               },
-              "int": 1,
+              "int": 2,
+              "com.github._1c_syntax.bsl.types.value.V8ValueType": "BINARY_DATA",
               "com.github._1c_syntax.bsl.types.value.PrimitiveValueType": "STRING"
             }
           ],
-          "composite": false,
+          "composite": true,
           "qualifiers": [
             {
               "default": {
                 "tag": 4
               },
-              "int": 1,
+              "int": 2,
+              "com.github._1c_syntax.bsl.types.qualifiers.BinaryDataQualifiers": {
+                "length": 16,
+                "allowedLength": "FIXED",
+                "description": {
+                  "nameRu": "КвалификаторыДвоичныхДанных (16, Фиксированная)",
+                  "nameEn": "BinaryDataQualifiers (16, Fixed)"
+                }
+              },
               "com.github._1c_syntax.bsl.types.qualifiers.StringQualifiers": {
                 "length": 10,
                 "allowedLength": "VARIABLE",
@@ -1110,15 +1119,15 @@
   "mdoType": "DOCUMENT",
   "moduleTypes": [
     [
-      "ObjectModule",
+      "ManagerModule",
       [
-        "src/test/resources/ext/edt/mdclasses/configuration/src/Documents/Документ1/ObjectModule.bsl"
+        "src/test/resources/ext/edt/mdclasses/configuration/src/Documents/Документ1/ManagerModule.bsl"
       ]
     ],
     [
-      "ManagerModule",
+      "ObjectModule",
       [
-        "src/test/resources/ext/edt/mdclasses/configuration/src/Documents/Документ1/ManagerModule.bsl"
+        "src/test/resources/ext/edt/mdclasses/configuration/src/Documents/Документ1/ObjectModule.bsl"
       ]
     ]
   ],