убрал дублированное хранение

1c-syntax · Mar 12, 2024 · 206b748 · 206b748
1 parent 54f6dc2
commit 206b748
Showing 1 changed file with 12 additions and 10 deletions.
diff --git a/src/main/java/com/github/_1c_syntax/bsl/supconf/ParseSupportData.java b/src/main/java/com/github/_1c_syntax/bsl/supconf/ParseSupportData.java
@@ -76,7 +76,7 @@ public static Map<String, SupportVariant> readSimple(Path path) {
     var rootPath = getRootPathByParentConfigurations(path);
     var supportMap = SUPPORT_SIMPLE_MAPS.get(rootPath);
     if (supportMap == null && path.toFile().exists()) {
-      readFile(path, rootPath);
+      readFile(path, rootPath, false);
       supportMap = SUPPORT_SIMPLE_MAPS.get(rootPath);
     }
 
@@ -97,7 +97,7 @@ public static Map<String, Map<SupportConfiguration, SupportVariant>> readFull(Pa
     var rootPath = getRootPathByParentConfigurations(path);
     var supportMap = SUPPORT_MAPS.get(rootPath);
     if (supportMap == null && path.toFile().exists()) {
-      readFile(path, rootPath);
+      readFile(path, rootPath, true);
       supportMap = SUPPORT_MAPS.get(rootPath);
     }
 
@@ -125,17 +125,19 @@ public static SupportVariant getSupportVariantByMDO(String uuid, Path path) {
     return SupportVariant.NONE;
   }
 
-  private void readFile(Path pathToBinFile, Path rootPath) {
-    LOGGER.debug("Чтения файла поставки ParentConfigurations.bin");
+  private void readFile(Path pathToBinFile, Path rootPath, boolean fullRead) {
+    LOGGER.debug("Чтения файла поставки ParentConfigurations.bin, полное чтение = " + fullRead);
 
     try {
       var supportMap = read(pathToBinFile);
-      SUPPORT_MAPS.put(rootPath, supportMap);
-
-      Map<String, SupportVariant> result = new HashMap<>();
-      supportMap.forEach((String uuid, Map<SupportConfiguration, SupportVariant> supportVariantMap)
-        -> result.put(uuid, SupportVariant.max(supportVariantMap.values())));
-      SUPPORT_SIMPLE_MAPS.put(rootPath, result);
+      if(fullRead) {
+        SUPPORT_MAPS.put(rootPath, supportMap);
+      } else {
+        Map<String, SupportVariant> result = new HashMap<>();
+        supportMap.forEach((String uuid, Map<SupportConfiguration, SupportVariant> supportVariantMap)
+          -> result.put(uuid, SupportVariant.max(supportVariantMap.values())));
+        SUPPORT_SIMPLE_MAPS.put(rootPath, result);
+      }
     } catch (FileNotFoundException | NumberFormatException exception) {
       LOGGER.error(
         String.format("Ошибка чтения файла %s", pathToBinFile.toFile()));