использование новых версий библиотек supportconf и common library (#529)

Author: theshadowco

build.gradle.kts

@@ -59,9 +59,9 @@ dependencies {
 
     // прочее
     implementation("commons-io", "commons-io", "2.18.0")
-    implementation("io.github.1c-syntax", "bsl-common-library", "0.9.0.16-SNAPSHOT")
+    implementation("io.github.1c-syntax", "bsl-common-library", "0.9.0.18-SNAPSHOT")
     implementation("io.github.1c-syntax", "utils", "0.6.3")
-    implementation("io.github.1c-syntax", "supportconf", "0.14.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/reader/common/context/MDCReaderContext.java

@@ -77,7 +77,7 @@ public MDCReaderContext(@NonNull Class<?> clazz, @NonNull HierarchicalStreamRead
     builder = TransformationUtils.builder(realClass);
 
     var uuid = reader.getAttribute(UUID_FIELD_NAME);
-    supportVariant = ParseSupportData.getSupportVariantByMDO(uuid, currentPath);
+    supportVariant = ParseSupportData.get(uuid, currentPath);
     mdoType = MDOType.CONFIGURATION;
 
     super.setValue(UUID_FIELD_NAME, uuid);

src/main/java/com/github/_1c_syntax/bsl/reader/common/context/MDReaderContext.java

@@ -33,6 +33,7 @@
 import com.github._1c_syntax.bsl.reader.common.TransformationUtils;
 import com.github._1c_syntax.bsl.reader.common.context.std_attributes.StdAttributeFiller;
 import com.github._1c_syntax.bsl.supconf.ParseSupportData;
+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.thoughtworks.xstream.io.HierarchicalStreamReader;
@@ -93,7 +94,12 @@ public MDReaderContext(@NonNull HierarchicalStreamReader reader) {
     builder = TransformationUtils.builder(realClass);
 
     var uuid = reader.getAttribute(UUID_FIELD_NAME);
-    supportVariant = ParseSupportData.getSupportVariantByMDO(uuid, currentPath);
+    if (uuid != null) {
+      supportVariant = ParseSupportData.get(uuid, currentPath);
+    } else {
+      supportVariant = SupportVariant.NONE;
+    }
+
     mdoType = MDOType.fromValue(realClassName).orElse(MDOType.UNKNOWN);
 
     super.setValue(UUID_FIELD_NAME, uuid);

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

@@ -20,19 +20,19 @@
  * License along with MDClasses.
  */
 package com.github._1c_syntax.bsl.reader.common.converter;
-
-import com.github._1c_syntax.bsl.reader.common.context.MDReaderContext;
-import com.github._1c_syntax.bsl.reader.common.xstream.ReadConverter;
-import com.thoughtworks.xstream.converters.UnmarshallingContext;
-import com.thoughtworks.xstream.io.HierarchicalStreamReader;
-
-/**
- * Базовый класс-конвертер объектов при чтении из файла
- */
-public abstract class AbstractReadConverter implements ReadConverter {
-  protected MDReaderContext read(HierarchicalStreamReader reader, UnmarshallingContext context) {
-    var readerContext = new MDReaderContext(reader);
-    readerContext.getMdReader().unmarshal(reader, context, readerContext);
-    return readerContext;
-  }
-}
+
+import com.github._1c_syntax.bsl.reader.common.context.MDReaderContext;
+import com.github._1c_syntax.bsl.reader.common.xstream.ReadConverter;
+import com.thoughtworks.xstream.converters.UnmarshallingContext;
+import com.thoughtworks.xstream.io.HierarchicalStreamReader;
+
+/**
+ * Базовый класс-конвертер объектов при чтении из файла
+ */
+public abstract class AbstractReadConverter implements ReadConverter {
+  protected MDReaderContext read(HierarchicalStreamReader reader, UnmarshallingContext context) {
+    var readerContext = new MDReaderContext(reader);
+    readerContext.getMdReader().unmarshal(reader, context, readerContext);
+    return readerContext;
+  }
+}

src/main/java/com/github/_1c_syntax/bsl/reader/designer/DesignerReader.java

@@ -110,7 +110,10 @@ public DesignerReader(Path path, boolean skipSupport) {
       rootPath = path;
     }
     if (!skipSupport) {
-      ParseSupportData.readSimple(parentConfigurationsPath());
+      var pcbin = parentConfigurationsPath();
+      if (pcbin.toFile().exists()) {
+        ParseSupportData.read(pcbin);
+      }
     }
   }
 

src/main/java/com/github/_1c_syntax/bsl/reader/edt/EDTReader.java

@@ -114,7 +114,10 @@ public EDTReader(Path path, boolean skipSupport) {
       rootPath = path;
     }
     if (!skipSupport) {
-      ParseSupportData.readSimple(parentConfigurationsPath());
+      var pcbin = parentConfigurationsPath();
+      if (pcbin.toFile().exists()) {
+        ParseSupportData.read(pcbin);
+      }
     }
   }