fix

Author: theshadowco

src/main/java/com/github/_1c_syntax/bsl/mdo/storage/form/FormAttributeValueType.java

@@ -28,7 +28,7 @@
 
 import java.util.List;
 
-public class FormAttributeValueType implements ValueType {
+public final class FormAttributeValueType implements ValueType {
   public static final FormAttributeValueType VALUE_TABLE = new FormAttributeValueType("ValueTable", "ТаблицаЗначений");
   public static final FormAttributeValueType VALUE_TREE = new FormAttributeValueType("ValueTree", "ДеревоЗначений");
   public static final FormAttributeValueType VALUE_LIST = new FormAttributeValueType("ValueList", "СписокЗначений");
@@ -115,7 +115,7 @@ public ValueTypeVariant getVariant() {
    *
    * @return Список встроенных типов
    */
-  public static List<ValueType> builtinTypes() {
+  public static List<? extends ValueType> builtinTypes() {
     return BUILTIN_TYPES;
   }
 }

src/main/java/com/github/_1c_syntax/bsl/mdo/support/MetadataValueType.java

@@ -36,7 +36,7 @@
 /**
  * Типы данных, построенные на метаданных
  */
-public class MetadataValueType implements ValueType {
+public final class MetadataValueType implements ValueType {
   public static final MetadataValueType ACCOUNTING_REGISTER_MANAGER = createManager(MDOType.ACCOUNTING_REGISTER);
   public static final MetadataValueType ACCOUNTING_REGISTER_REC_SET = createRecSet(MDOType.ACCOUNTING_REGISTER);
   public static final MetadataValueType ACCUMULATION_REGISTER_MANAGER = createManager(MDOType.ACCUMULATION_REGISTER);
@@ -204,7 +204,7 @@ public ValueTypeVariant getVariant() {
    *
    * @return Список встроенных типов
    */
-  public static List<ValueType> builtinTypes() {
+  public static List<? extends ValueType> builtinTypes() {
     return BUILTIN_TYPES;
   }
 

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

@@ -99,7 +99,7 @@ private static Map<String, ValueType> builtinTypes() {
 
     PrimitiveValueType.builtinTypes().forEach(valueType ->
       types.put(valueType.getName().toLowerCase(Locale.ROOT), valueType));
-    types.put("xs:decimal", PrimitiveValueType.NUMBER);
+    types.put("xs:decimal".toLowerCase(Locale.ROOT), PrimitiveValueType.NUMBER);
     types.put("xs:dateTime".toLowerCase(Locale.ROOT), PrimitiveValueType.DATE);
 
     V8ValueType.builtinTypes().forEach(valueType ->

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

@@ -65,7 +65,7 @@ public Object unmarshal(HierarchicalStreamReader reader, UnmarshallingContext co
       } else if (nodeName.endsWith("Qualifiers")) {
         qualifiers.add(ExtendXStream.readValue(context, Qualifier.class));
       } else { // что-то еще
-        LOGGER.info("Unknown type description field {}", nodeName);
+        LOGGER.warn("Unknown type description field {}", nodeName);
       }
       reader.moveUp();
     }

src/test/java/com/github/_1c_syntax/bsl/examples/ValueTypeTest.java

@@ -55,22 +55,7 @@ public class ValueTypeTest {
     }
   )
   void testCatalog(ArgumentsAccessor argumentsAccessor) {
-    var isEDT = argumentsAccessor.getBoolean(0);
-    var examplePackName = argumentsAccessor.getString(1);
-
-    Path configurationPath;
-    if (isEDT) {
-      configurationPath = Path.of(EXAMPLES_PATH, EDT_PATH, examplePackName, EDT_CF_PATH);
-    } else {
-      configurationPath = Path.of(EXAMPLES_PATH, DESIGNER_PATH, examplePackName, DESIGNER_CF_PATH);
-    }
-
-    var mdc = MDClasses.createConfiguration(configurationPath, true);
-    assertThat(mdc).isNotNull();
-    assertThat(mdc).isInstanceOf(MDClass.class);
-    assertThat(mdc).isInstanceOf(Configuration.class);
-
-    var configuration = (Configuration) mdc;
+    var configuration = readConfiguration(argumentsAccessor);
 
     var childMDO = configuration.findChild("Catalog.Справочник1");
     if (childMDO.isPresent() && childMDO.get() instanceof Catalog catalog) {
@@ -102,22 +87,7 @@ void testCatalog(ArgumentsAccessor argumentsAccessor) {
     }
   )
   void testDefinedType(ArgumentsAccessor argumentsAccessor) {
-    var isEDT = argumentsAccessor.getBoolean(0);
-    var examplePackName = argumentsAccessor.getString(1);
-
-    Path configurationPath;
-    if (isEDT) {
-      configurationPath = Path.of(EXAMPLES_PATH, EDT_PATH, examplePackName, EDT_CF_PATH);
-    } else {
-      configurationPath = Path.of(EXAMPLES_PATH, DESIGNER_PATH, examplePackName, DESIGNER_CF_PATH);
-    }
-
-    var mdc = MDClasses.createConfiguration(configurationPath, true);
-    assertThat(mdc).isNotNull();
-    assertThat(mdc).isInstanceOf(MDClass.class);
-    assertThat(mdc).isInstanceOf(Configuration.class);
-
-    var configuration = (Configuration) mdc;
+    var configuration = readConfiguration(argumentsAccessor);
 
     var childMDO = configuration.findChild("DefinedType.ЗначениеДоступа");
     if (childMDO.isPresent() && childMDO.get() instanceof DefinedType definedType) {
@@ -140,4 +110,23 @@ void testDefinedType(ArgumentsAccessor argumentsAccessor) {
       assertThat(typeContains.getNameRu()).isEqualTo("ПеречислениеСсылка.ДополнительныеЗначенияДоступа");
     }
   }
+
+  private static Configuration readConfiguration(ArgumentsAccessor argumentsAccessor) {
+    var isEDT = argumentsAccessor.getBoolean(0);
+    var examplePackName = argumentsAccessor.getString(1);
+
+    Path configurationPath;
+    if (isEDT) {
+      configurationPath = Path.of(EXAMPLES_PATH, EDT_PATH, examplePackName, EDT_CF_PATH);
+    } else {
+      configurationPath = Path.of(EXAMPLES_PATH, DESIGNER_PATH, examplePackName, DESIGNER_CF_PATH);
+    }
+
+    var mdc = MDClasses.createConfiguration(configurationPath, true);
+    assertThat(mdc).isNotNull();
+    assertThat(mdc).isInstanceOf(MDClass.class);
+    assertThat(mdc).isInstanceOf(Configuration.class);
+
+    return (Configuration) mdc;
+  }
 }