Merge pull request #457 from 1c-syntax/feature/fix240531

Фиксы многопоточной работы

src/main/java/com/github/_1c_syntax/bsl/reader/common/TransformationUtils.java

@@ -147,34 +147,10 @@ public Class<?> computeType(@NonNull ParameterizedType fieldClass) {
 
   @Nullable
   private Method getMethod(@NonNull Class<?> clazz, @NonNull String methodName) {
-    var classMethods = methods.get(clazz.getName());
-    if (classMethods == null) {
-      classMethods = new ConcurrentSkipListMap<>(String.CASE_INSENSITIVE_ORDER);
-    }
-
-    var method = classMethods.get(methodName);
-    // ключ метода в кэше есть, но метода нет
-    if (method == null) {
-      // ключ метода в кэше есть, но метода нет
-      if (classMethods.containsKey(methodName)) {
-        return null;
-      }
-      method = Arrays.stream(clazz.getDeclaredMethods())
-        .filter(classMethod -> methodName.equalsIgnoreCase(classMethod.getName()))
+    return methods.computeIfAbsent(clazz.getName(), k -> new ConcurrentSkipListMap<>(String.CASE_INSENSITIVE_ORDER))
+      .computeIfAbsent(methodName, k -> Arrays.stream(clazz.getDeclaredMethods())
+        .filter(m -> methodName.equalsIgnoreCase(m.getName()))
         .findFirst()
-        .orElse(null);
-      if (method != null) {
-        saveMethod(clazz, classMethods, method, methodName);
-      }
-    }
-    return method;
-  }
-
-  private static void saveMethod(@NonNull Class<?> builderClass,
-                                 @NonNull Map<String, Method> classMethods,
-                                 @NonNull Method method,
-                                 @NonNull String builderMethodName) {
-    classMethods.put(builderMethodName, method);
-    methods.put(builderClass.getName(), classMethods);
+        .orElse(null));
   }
 }

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

@@ -107,46 +107,35 @@ public final void setValue(String methodName, Object value) {
 
   @Override
   public Object build() {
-    try {
-      mdoReference = MdoReference.create(owner, mdoType, name);
-      setValue(MDO_REFERENCE_FIELD_NAME, mdoReference);
+    mdoReference = MdoReference.create(owner, mdoType, name);
+    setValue(MDO_REFERENCE_FIELD_NAME, mdoReference);
 
-      if (MDChild.class.isAssignableFrom(realClass)) {
-        setValue(OWNER_FIELD_NAME, owner);
-      }
-
-      if (Subsystem.class.isAssignableFrom(realClass)) {
-        setValue(PARENT_SUBSYSTEM_FIELD_NAME, owner);
-      }
+    if (MDChild.class.isAssignableFrom(realClass)) {
+      setValue(OWNER_FIELD_NAME, owner);
+    }
 
-      if (Form.class.isAssignableFrom(realClass)) {
-        setValue(DATA_FIELD_NAME, mdReader.readFormData(currentPath, name, mdoType));
-      }
+    if (Subsystem.class.isAssignableFrom(realClass)) {
+      setValue(PARENT_SUBSYSTEM_FIELD_NAME, owner);
+    }
 
-      if (ChildrenOwner.class.isAssignableFrom(realClass)) {
-        setValueChildren();
-      }
+    if (Form.class.isAssignableFrom(realClass)) {
+      setValue(DATA_FIELD_NAME, mdReader.readFormData(currentPath, name, mdoType));
+    }
 
-      if (ModuleOwner.class.isAssignableFrom(realClass)) {
-        setValueModules();
-      }
+    if (ChildrenOwner.class.isAssignableFrom(realClass)) {
+      setValueChildren();
+    }
 
-      return super.build();
-    } catch (Exception e) {
-      LOGGER.warn("Can't read file '{}' - it's broken (object skipped) \n: ", currentPath, e);
-      LOGGER.warn("Reader context\n: '{}'", this);
-      LOGGER.warn("Builder content\n: '{}'", builder);
+    if (ModuleOwner.class.isAssignableFrom(realClass)) {
+      setValueModules();
     }
-    return null;
+
+    return super.build();
   }
 
   private void saveChildName(String collectionName, MDReaderContext child) {
-    var collection = childrenContexts.get(collectionName);
-    if (collection == null) {
-      collection = Collections.synchronizedList(new ArrayList<>());
-    }
-    collection.add(child);
-    childrenContexts.put(collectionName, collection);
+    childrenContexts.computeIfAbsent(collectionName, k -> Collections.synchronizedList(new ArrayList<>()))
+      .add(child);
   }
 
   private void setValueChildren() {