Merge pull request #456 from 1c-syntax/feature/optimize

Оптимизация многопоточной работы

Author: theshadowco

.gitignore

@@ -13,3 +13,6 @@ build/
 
 /.idea/misc.xml
 Gradle_*.xml
+/.idea/material_theme_project_new.xml
+*.hprof
+*.hprof.idom

build.gradle.kts

@@ -51,12 +51,12 @@ dependencies {
     implementation("com.thoughtworks.xstream", "xstream", "1.4.20")
 
     // логирование
-    implementation("org.slf4j", "slf4j-api", "1.7.30")
+    implementation("org.slf4j", "slf4j-api", "2.1.0-alpha1")
 
     // прочее
     implementation("commons-io", "commons-io", "2.8.0")
-    implementation("io.github.1c-syntax", "utils", "0.6.0")
-    implementation("io.github.1c-syntax", "bsl-common-library", "0.5.1")
+    implementation("io.github.1c-syntax", "utils", "0.6.1")
+    implementation("io.github.1c-syntax", "bsl-common-library", "0.6.0")
     implementation("io.github.1c-syntax", "supportconf", "0.14.0") {
         exclude("io.github.1c-syntax", "bsl-common-library")
     }
@@ -75,7 +75,7 @@ dependencies {
 
     // логирование
     // https://mvnrepository.com/artifact/org.slf4j/slf4j-log4j12
-    testImplementation("org.slf4j", "slf4j-log4j12", "1.7.30")
+    testImplementation("org.slf4j", "slf4j-log4j12", "2.1.0-alpha1")
 }
 
 java {

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

@@ -61,7 +61,7 @@ public MDClass createConfiguration() {
    *
    * @return Пустой внешний отчет
    */
-  public MDClass createExternalReport() {
+  public ExternalSource createExternalReport() {
     return ExternalReport.EMPTY;
   }
 

src/main/java/com/github/_1c_syntax/bsl/mdo/storage/RoleData.java

@@ -22,18 +22,15 @@
 package com.github._1c_syntax.bsl.mdo.storage;
 
 import com.github._1c_syntax.bsl.mdo.support.RoleRight;
-import com.github._1c_syntax.bsl.reader.MDOReader;
 import com.github._1c_syntax.utils.GenericInterner;
 import lombok.Builder;
 import lombok.Builder.Default;
 import lombok.EqualsAndHashCode;
-import lombok.NonNull;
 import lombok.Singular;
 import lombok.ToString;
 import lombok.Value;
 import lombok.extern.slf4j.Slf4j;
 
-import java.nio.file.Path;
 import java.util.List;
 
 /**
@@ -67,19 +64,6 @@ public class RoleData {
   @Singular
   List<ObjectRight> objectRights;
 
-  // todo переделать на конвертер
-  public static RoleData create(@NonNull Path path) {
-    var data = MDOReader.read(path);
-    if (data instanceof RoleData roleData) {
-      return roleData;
-    } else if (data == null) {
-      LOGGER.warn("Missing file " + path);
-      return null;
-    } else {
-      throw new IllegalArgumentException("Wrong Role data file " + path);
-    }
-  }
-
   @Value
   @ToString(of = {"name"})
   @EqualsAndHashCode(of = {"name"})

src/main/java/com/github/_1c_syntax/bsl/mdo/storage/XdtoPackageData.java

@@ -1,37 +1,34 @@
-/*
- * This file is a part of MDClasses.
- *
- * Copyright (c) 2019 - 2024
- * Tymko Oleg <[email protected]>, Maximov Valery <[email protected]> and contributors
- *
- * SPDX-License-Identifier: LGPL-3.0-or-later
- *
- * MDClasses is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 3.0 of the License, or (at your option) any later version.
- *
- * MDClasses is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with MDClasses.
- */
-package com.github._1c_syntax.bsl.mdo.storage;
-
-import com.github._1c_syntax.bsl.reader.MDOReader;
+/*
+ * This file is a part of MDClasses.
+ *
+ * Copyright (c) 2019 - 2024
+ * Tymko Oleg <[email protected]>, Maximov Valery <[email protected]> and contributors
+ *
+ * SPDX-License-Identifier: LGPL-3.0-or-later
+ *
+ * MDClasses is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 3.0 of the License, or (at your option) any later version.
+ *
+ * MDClasses is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with MDClasses.
+ */
+package com.github._1c_syntax.bsl.mdo.storage;
+
 import lombok.Builder;
 import lombok.Builder.Default;
 import lombok.EqualsAndHashCode;
-import lombok.NonNull;
 import lombok.Singular;
 import lombok.ToString;
 import lombok.Value;
 import lombok.extern.slf4j.Slf4j;
 
-import java.nio.file.Path;
 import java.util.List;
 
 /**
@@ -76,19 +73,6 @@ public class XdtoPackageData {
   @Singular
   List<Property> properties;
 
-  // todo переделать на конвертер
-  public static XdtoPackageData create(@NonNull Path path) {
-    var data = MDOReader.read(path);
-    if (data instanceof XdtoPackageData xdtoPackageData) {
-      return xdtoPackageData;
-    } else if (data == null) {
-      LOGGER.warn("Missing file " + path);
-      return null;
-    } else {
-      throw new IllegalArgumentException("Wrong XDTO package data file " + path);
-    }
-  }
-
   @Value
   @ToString(of = {"name"})
   @EqualsAndHashCode(of = {"name"})

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

@@ -34,6 +34,7 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
+import java.util.stream.Collectors;
 
 /**
  * Используется для хранения текстовой строки на разных языках
@@ -176,6 +177,16 @@ public int compareTo(@Nullable MultiLanguageString multiLanguageString) {
     }
   }
 
+  public String toString() {
+    if (isEmpty()) {
+      return "empty";
+    } else {
+      return content.stream()
+        .map(entry -> entry.langKey + ": " + entry.value)
+        .collect(Collectors.joining(", "));
+    }
+  }
+
   private MultiLanguageString intern() {
     return interner.intern(this);
   }

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

@@ -1,32 +1,32 @@
-/*
- * This file is a part of MDClasses.
- *
- * Copyright (c) 2019 - 2024
- * Tymko Oleg <[email protected]>, Maximov Valery <[email protected]> and contributors
- *
- * SPDX-License-Identifier: LGPL-3.0-or-later
- *
- * MDClasses is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 3.0 of the License, or (at your option) any later version.
- *
- * MDClasses is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with MDClasses.
- */
-package com.github._1c_syntax.bsl.mdo.support;
+/*
+ * This file is a part of MDClasses.
+ *
+ * Copyright (c) 2019 - 2024
+ * Tymko Oleg <[email protected]>, Maximov Valery <[email protected]> and contributors
+ *
+ * SPDX-License-Identifier: LGPL-3.0-or-later
+ *
+ * MDClasses is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 3.0 of the License, or (at your option) any later version.
+ *
+ * MDClasses is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with MDClasses.
+ */
+package com.github._1c_syntax.bsl.mdo.support;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 import lombok.experimental.Accessors;
-import org.apache.commons.collections4.map.CaseInsensitiveMap;
 
 import java.util.Map;
+import java.util.concurrent.ConcurrentSkipListMap;
 
 /**
  * Возможные варианты языков, на которых разрабатывается код
@@ -68,7 +68,7 @@ public static ScriptVariant valueByString(String string) {
   }
 
   private static Map<String, ScriptVariant> computeKeys() {
-    Map<String, ScriptVariant> keysMap = new CaseInsensitiveMap<>();
+    Map<String, ScriptVariant> keysMap = new ConcurrentSkipListMap<>(String.CASE_INSENSITIVE_ORDER);
     for (var element : values()) {
       keysMap.put(element.value(), element);
       keysMap.put(element.valueRu(), element);

src/main/java/com/github/_1c_syntax/bsl/reader/FakeReader.java

@@ -21,15 +21,23 @@
  */
 package com.github._1c_syntax.bsl.reader;
 
+import com.github._1c_syntax.bsl.mdclasses.Configuration;
+import com.github._1c_syntax.bsl.mdclasses.ExternalReport;
+import com.github._1c_syntax.bsl.mdclasses.ExternalSource;
 import com.github._1c_syntax.bsl.mdclasses.MDClass;
-import com.github._1c_syntax.bsl.mdclasses.MDClasses;
 import com.github._1c_syntax.bsl.mdo.MDObject;
+import com.github._1c_syntax.bsl.mdo.storage.EmptyFormData;
+import com.github._1c_syntax.bsl.mdo.storage.FormData;
+import com.github._1c_syntax.bsl.reader.common.context.AbstractReaderContext;
 import com.github._1c_syntax.bsl.reader.common.xstream.ExtendXStream;
 import com.github._1c_syntax.bsl.types.ConfigurationSource;
-import com.thoughtworks.xstream.converters.Converter;
+import com.github._1c_syntax.bsl.types.MDOType;
+import com.github._1c_syntax.bsl.types.ModuleType;
+import com.thoughtworks.xstream.converters.UnmarshallingContext;
+import com.thoughtworks.xstream.io.HierarchicalStreamReader;
+import lombok.NonNull;
 
 import javax.annotation.Nullable;
-import java.io.File;
 import java.nio.file.Path;
 
 /**
@@ -38,53 +46,87 @@
 public class FakeReader implements MDReader {
 
   @Override
+  @NonNull
   public ConfigurationSource getConfigurationSource() {
     return ConfigurationSource.EMPTY;
   }
 
-  @Nullable
   @Override
-  public MDObject read(String fullName) {
-    return null;
+  @NonNull
+  public MDClass readConfiguration() {
+    return Configuration.EMPTY;
+  }
+
+  @Override
+  @NonNull
+  public ExternalSource readExternalSource() {
+    return ExternalReport.EMPTY;
   }
 
+  @Override
+  @NonNull
+  public Path getRootPath() {
+    return Path.of("fake-path");
+  }
+
+  @Override
   @Nullable
+  public MDObject read(Path path) {
+    return null;
+  }
+
   @Override
+  @Nullable
   public MDObject read(Path folder, String fullName) {
     return null;
   }
 
-  @Nullable
   @Override
-  public MDObject read(Path fullMdoName) {
+  @Nullable
+  public ExtendXStream getXstream() {
     return null;
   }
 
-  @Nullable
   @Override
-  public Object fromXml(File file) {
-    return null;
+  @NonNull
+  public FormData readFormData(Path currentPath, String name, MDOType mdoType) {
+    return EmptyFormData.getEmpty();
   }
 
-  @Nullable
   @Override
-  public Converter getReflectionConverter() {
-    return null;
+  @NonNull
+  public Path moduleFolder(Path mdoPath, MDOType mdoType) {
+    return getRootPath();
   }
 
-  @Nullable
   @Override
-  public ExtendXStream getEXStream() {
-    return null;
+  @NonNull
+  public Path modulePath(Path folder, String name, ModuleType moduleType) {
+    return getRootPath();
   }
 
   @Override
-  public MDClass readConfiguration() {
-    return MDClasses.createConfiguration();
+  @NonNull
+  public Path mdoTypeFolderPath(Path mdoPath) {
+    return getRootPath();
   }
 
   @Override
-  public MDClass readExternalSource() {
-    return null;
+  @NonNull
+  public String subsystemsNodeName() {
+    return "";
+  }
+
+  @Override
+  @NonNull
+  public String configurationExtensionFilter() {
+    return "";
+  }
+
+  @Override
+  public void unmarshal(HierarchicalStreamReader reader,
+                        UnmarshallingContext context,
+                        AbstractReaderContext readerContext) {
+    // no-op
   }
 }