завершение

theshadowco · theshadowco · commit 75f304e9644c · 2025-12-29T16:00:25.000+03:00
diff --git a/src/jmh/java/com/github/_1c_syntax/bsl/mdclasses/benchmark/MemoryProfiler.java b/src/jmh/java/com/github/_1c_syntax/bsl/mdclasses/benchmark/MemoryProfiler.java
@@ -63,12 +63,12 @@ public void beforeIteration(BenchmarkParams benchmarkParams, IterationParams ite
   }
 
   @Override
-  public Collection<Result> afterIteration(
+  public Collection<? extends Result> afterIteration(
     BenchmarkParams benchmarkParams,
     IterationParams iterationParams,
     IterationResult result
   ) {
-    List<Result> results = new ArrayList<>();
+    List<ScalarResult> results = new ArrayList<>();
 
     // Память
     var heapUsage = memoryMXBean.getHeapMemoryUsage();
diff --git a/src/main/java/com/github/_1c_syntax/bsl/reader/MDMerger.java b/src/main/java/com/github/_1c_syntax/bsl/reader/MDMerger.java
@@ -242,7 +242,9 @@ private static <T extends MD> T copyModuleOwner(T srcMD, T modMD) {
           throw new IllegalStateException("toBuilder() is not available for " + srcMD.getClass());
         }
         TransformationUtils.setValue(builder, "modules", merge);
-        return (T) TransformationUtils.build(builder);
+        var computeResult = TransformationUtils.build(builder);
+        assert computeResult != null; // там и не будет null
+        return (T) computeResult;
       }
     }
     return srcMD;
@@ -280,12 +282,15 @@ private static <T extends MD> T copyChildrenOwner(T srcMD, T modMD) {
       if (builder != null) {
         TransformationUtils.invoke(builder, "clearChildren");
         TransformationUtils.setValue(builder, "children", newChildren);
-        result = (T) TransformationUtils.build(builder);
+        var computeResult = TransformationUtils.build(builder);
+        assert computeResult != null; // там и не будет null
+        result = (T) computeResult;
       }
     }
     return result;
   }
 
+  @Nullable
   private static <K, T extends MD> Object copyChildrenList(K srcMD,
                                                            K modMD,
                                                            @Nullable Object builder,
@@ -304,23 +309,27 @@ private static <K, T extends MD> Object copyChildrenList(K srcMD,
       TransformationUtils.invoke(builder, "clear" + methodName);
       TransformationUtils.setValue(builder, methodName, merge);
     }
+    // возвращается либо полученный билдер, либо null, который и был изначально.
     return builder;
   }
 
+  @Nullable
   private static Object copyFormOwner(FormOwner srcMD,
                                       FormOwner modMD,
                                       @Nullable Object builder,
                                       ArrayList<MD> newChildren) {
     return copyChildrenList(srcMD, modMD, builder, FormOwner::getForms, "Forms", newChildren);
   }
 
+  @Nullable
   private static Object copyTemplateOwner(TemplateOwner srcMD,
                                           TemplateOwner modMD,
                                           @Nullable Object builder,
                                           ArrayList<MD> newChildren) {
     return copyChildrenList(srcMD, modMD, builder, TemplateOwner::getTemplates, "Templates", newChildren);
   }
 
+  @Nullable
   private static Object copyCommandOwner(CommandOwner srcMD,
                                          CommandOwner modMD,
                                          @Nullable Object builder,
diff --git a/src/main/java/com/github/_1c_syntax/bsl/reader/common/TransformationUtils.java b/src/main/java/com/github/_1c_syntax/bsl/reader/common/TransformationUtils.java
@@ -60,7 +60,7 @@ public class TransformationUtils {
    * @param methodName Метод\свойство билдера
    * @param value      Устанавливаемое значение
    */
-  public void setValue(Object source, String methodName, Object value) {
+  public void setValue(Object source, String methodName, @Nullable Object value) {
     var method = getMethod(source.getClass(), methodName);
     if (method != null && value != null) {
       try {
@@ -118,7 +118,7 @@ public Object builder(Class<?> clazz) {
         LOGGER.error(LOGGER_MESSAGE_PREF, clazz, BUILDER_METHOD_NAME, e);
       }
     }
-    return null;
+    throw new IllegalArgumentException("Incorrect class " + clazz);
   }
 
   /**
diff --git a/src/main/java/com/github/_1c_syntax/bsl/reader/common/context/AbstractReaderContext.java b/src/main/java/com/github/_1c_syntax/bsl/reader/common/context/AbstractReaderContext.java
@@ -114,6 +114,7 @@ public abstract class AbstractReaderContext {
    */
   @Setter
   @Getter
+  @Nullable
   private Object lastValue;
 
   /**
diff --git a/src/main/java/com/github/_1c_syntax/bsl/reader/common/converter/CommonAttributeUseContentConverter.java b/src/main/java/com/github/_1c_syntax/bsl/reader/common/converter/CommonAttributeUseContentConverter.java
@@ -29,6 +29,7 @@
 import com.github._1c_syntax.bsl.types.MdoReference;
 import com.thoughtworks.xstream.converters.UnmarshallingContext;
 import com.thoughtworks.xstream.io.HierarchicalStreamReader;
+import org.jspecify.annotations.Nullable;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -43,12 +44,16 @@ public class CommonAttributeUseContentConverter implements ReadConverter {
   private static final String USE_NODE_NAME = "Use";
 
   @Override
+  @Nullable
   public Object unmarshal(HierarchicalStreamReader reader, UnmarshallingContext context) {
     if (ExtendXStream.getCurrentMDReader(reader).getConfigurationSource() == ConfigurationSource.DESIGNER) {
       List<CommonAttribute.UseContent> contents = new ArrayList<>();
       while (reader.hasMoreChildren()) {
         reader.moveDown();
-        contents.add(commonAttributeUseContent(reader, context));
+        var data = commonAttributeUseContent(reader, context);
+        if (data != null) {
+          contents.add(data);
+        }
         reader.moveUp();
       }
       return contents;
@@ -62,8 +67,8 @@ public boolean canConvert(Class type) {
     return CommonAttribute.UseContent.class.isAssignableFrom(type);
   }
 
-  private static CommonAttribute.UseContent commonAttributeUseContent(HierarchicalStreamReader reader,
-                                                                      UnmarshallingContext context) {
+  private static CommonAttribute.@Nullable UseContent commonAttributeUseContent(HierarchicalStreamReader reader,
+                                                                                UnmarshallingContext context) {
     if (!reader.hasMoreChildren()) {
       return null;
     }
diff --git a/src/main/java/com/github/_1c_syntax/bsl/reader/common/converter/EnumConverter.java b/src/main/java/com/github/_1c_syntax/bsl/reader/common/converter/EnumConverter.java
@@ -24,6 +24,7 @@
 import com.github._1c_syntax.bsl.types.EnumWithName;
 import com.thoughtworks.xstream.converters.basic.AbstractSingleValueConverter;
 import lombok.extern.slf4j.Slf4j;
+import org.jspecify.annotations.Nullable;
 
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
@@ -58,7 +59,8 @@ public EnumConverter(Class<T> clazz) {
   }
 
   @Override
-  public Object fromString(String sourceString) {
+  @Nullable
+  public Object fromString(@Nullable String sourceString) {
     if (sourceString == null) {
       return null;
     }
diff --git a/src/main/java/com/github/_1c_syntax/bsl/reader/common/converter/ExchangePlanAutoRecordConverter.java b/src/main/java/com/github/_1c_syntax/bsl/reader/common/converter/ExchangePlanAutoRecordConverter.java
@@ -29,6 +29,7 @@
 import com.github._1c_syntax.bsl.types.MdoReference;
 import com.thoughtworks.xstream.converters.UnmarshallingContext;
 import com.thoughtworks.xstream.io.HierarchicalStreamReader;
+import org.jspecify.annotations.Nullable;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -40,6 +41,7 @@
 public class ExchangePlanAutoRecordConverter implements ReadConverter {
 
   @Override
+  @Nullable
   public Object unmarshal(HierarchicalStreamReader reader, UnmarshallingContext context) {
     if (!reader.hasMoreChildren()) {
       return null;
@@ -48,9 +50,10 @@ public Object unmarshal(HierarchicalStreamReader reader, UnmarshallingContext co
       List<ExchangePlan.RecordContent> content = new ArrayList<>();
       while (reader.hasMoreChildren()) { // root
         reader.moveDown();
-        content.add(
-          exchangePlanAutoRecord(reader, context, "Metadata", "AutoRecord")
-        );
+        var data = exchangePlanAutoRecord(reader, context, "Metadata", "AutoRecord");
+        if (data != null) {
+          content.add(data);
+        }
         reader.moveUp();
       }
       return content;
@@ -64,10 +67,10 @@ public boolean canConvert(Class type) {
     return ExchangePlan.RecordContent.class.isAssignableFrom(type);
   }
 
-  private static ExchangePlan.RecordContent exchangePlanAutoRecord(HierarchicalStreamReader reader,
-                                                                   UnmarshallingContext context,
-                                                                   String mdoNodeName,
-                                                                   String autoRecordNodeName) {
+  private static ExchangePlan.@Nullable RecordContent exchangePlanAutoRecord(HierarchicalStreamReader reader,
+                                                                             UnmarshallingContext context,
+                                                                             String mdoNodeName,
+                                                                             String autoRecordNodeName) {
     if (!reader.hasMoreChildren()) {
       return null;
     }
diff --git a/src/main/java/com/github/_1c_syntax/bsl/reader/common/converter/RoleDataConverter.java b/src/main/java/com/github/_1c_syntax/bsl/reader/common/converter/RoleDataConverter.java
@@ -53,6 +53,7 @@ public Object unmarshal(HierarchicalStreamReader reader, UnmarshallingContext co
         builder.objectRight(objectRight);
       } else {
         var fieldClass = (Class<?>) TransformationUtils.fieldType(builder, name);
+        assert fieldClass != null;
         var value = ExtendXStream.readValue(context, fieldClass);
         TransformationUtils.setValue(builder, name, value);
       }
@@ -73,6 +74,7 @@ private static RoleData.ObjectRight readObjectRight(HierarchicalStreamReader rea
         builder.right(right);
       } else {
         var fieldClass = (Class<?>) TransformationUtils.fieldType(builder, name);
+        assert fieldClass != null;
         var value = ExtendXStream.readValue(context, fieldClass);
         TransformationUtils.setValue(builder, name, value);
       }
@@ -89,6 +91,7 @@ private static RoleData.Right readRight(HierarchicalStreamReader reader, Unmarsh
       reader.moveDown();
       var name = reader.getNodeName();
       var fieldClass = (Class<?>) TransformationUtils.fieldType(builder, name);
+      assert fieldClass != null;
       var value = ExtendXStream.readValue(context, fieldClass);
       TransformationUtils.setValue(builder, name, value);
       reader.moveUp();
diff --git a/src/main/java/com/github/_1c_syntax/bsl/reader/common/converter/SubsystemConverter.java b/src/main/java/com/github/_1c_syntax/bsl/reader/common/converter/SubsystemConverter.java
@@ -31,6 +31,7 @@
 import com.thoughtworks.xstream.converters.UnmarshallingContext;
 import com.thoughtworks.xstream.io.HierarchicalStreamReader;
 import org.apache.commons.io.FilenameUtils;
+import org.jspecify.annotations.Nullable;
 
 import java.nio.file.Path;
 import java.nio.file.Paths;
@@ -50,6 +51,7 @@ public class SubsystemConverter implements ReadConverter {
     + MDOType.SUBSYSTEM.groupName() + "[\\\\/]");
 
   @Override
+  @Nullable
   public Object unmarshal(HierarchicalStreamReader reader, UnmarshallingContext context) {
     var name = reader.getNodeName();
     var currentPath = ExtendXStream.getCurrentPath(reader);
diff --git a/src/main/java/com/github/_1c_syntax/bsl/reader/common/converter/ValueTypeConverter.java b/src/main/java/com/github/_1c_syntax/bsl/reader/common/converter/ValueTypeConverter.java
@@ -30,6 +30,7 @@
 import com.github._1c_syntax.bsl.types.value.V8ValueType;
 import com.thoughtworks.xstream.converters.basic.AbstractSingleValueConverter;
 import lombok.extern.slf4j.Slf4j;
+import org.jspecify.annotations.Nullable;
 
 import java.util.Arrays;
 import java.util.Locale;
@@ -116,6 +117,7 @@ private static void putType(String key, ValueType type) {
     ALL_TYPES.put(key.toLowerCase(Locale.ROOT), type);
   }
 
+  @Nullable
   private static ValueType getType(String key) {
     return ALL_TYPES.get(key.toLowerCase(Locale.ROOT));
   }
diff --git a/src/main/java/com/github/_1c_syntax/bsl/reader/designer/converter/FormElementConverter.java b/src/main/java/com/github/_1c_syntax/bsl/reader/designer/converter/FormElementConverter.java
@@ -48,7 +48,7 @@ public Object unmarshal(HierarchicalStreamReader reader, UnmarshallingContext co
     try {
       readerContext.setValue("id", Integer.parseInt(reader.getAttribute("id")));
     } catch (NumberFormatException e) {
-      LOGGER.debug("Unknown type {} in file {}", reader.getNodeName(), ExtendXStream.getCurrentPath(reader).toString());
+      LOGGER.debug("Unknown type {} in file {}", reader.getNodeName(), ExtendXStream.getCurrentPath(reader));
       return null;
     }
     readerContext.setValue("type", FormElementType.valueByName(reader.getNodeName()));
diff --git a/src/main/java/com/github/_1c_syntax/bsl/reader/designer/converter/MDChildConverter.java b/src/main/java/com/github/_1c_syntax/bsl/reader/designer/converter/MDChildConverter.java
@@ -35,6 +35,7 @@
 import com.thoughtworks.xstream.converters.UnmarshallingContext;
 import com.thoughtworks.xstream.io.HierarchicalStreamReader;
 import org.apache.commons.io.FilenameUtils;
+import org.jspecify.annotations.Nullable;
 
 import java.nio.file.Path;
 import java.nio.file.Paths;
@@ -50,10 +51,12 @@ public class MDChildConverter extends AbstractReadConverter {
   private static final Map<String, MDOType> TYPES_BY_CLASSES = computeTypes();
 
   @Override
+  @Nullable
   public Object unmarshal(HierarchicalStreamReader reader, UnmarshallingContext context) {
     var currentPath = ExtendXStream.getCurrentPath(reader);
     var realClassName = reader.getNodeName();
     var realClass = ExtendXStream.getRealClass(reader, realClassName);
+    assert realClass != null;
 
     if (TYPES_BY_CLASSES.containsKey(realClass.getName()) && reader.getAttributeCount() == 0) {
       var mdoType = TYPES_BY_CLASSES.get(realClass.getName());
diff --git a/src/main/java/com/github/_1c_syntax/bsl/reader/designer/converter/Unmarshaller.java b/src/main/java/com/github/_1c_syntax/bsl/reader/designer/converter/Unmarshaller.java
@@ -136,6 +136,9 @@ private void readItemNode(HierarchicalStreamReader reader,
                             AbstractReaderContext readerContext,
                             String nodeName) {
     var fieldClass = readerContext.fieldType(nodeName);
+    if(fieldClass == null) {
+      return;
+    }
     while (reader.hasMoreChildren()) {
       reader.moveDown();
       readerContext.setValue(nodeName, ExtendXStream.readValue(context, fieldClass));
diff --git a/src/main/java/com/github/_1c_syntax/bsl/reader/edt/converter/ExternalDataSourceConverter.java b/src/main/java/com/github/_1c_syntax/bsl/reader/edt/converter/ExternalDataSourceConverter.java
@@ -29,6 +29,7 @@
 import com.github._1c_syntax.bsl.types.MDOType;
 import com.thoughtworks.xstream.converters.UnmarshallingContext;
 import com.thoughtworks.xstream.io.HierarchicalStreamReader;
+import org.jspecify.annotations.Nullable;
 
 import java.nio.file.Path;
 import java.nio.file.Paths;
@@ -49,9 +50,11 @@ public class ExternalDataSourceConverter extends AbstractReadConverter {
   private static final Map<String, MDOType> TYPES_BY_CLASSES_5 = computeTypes5();
 
   @Override
+  @Nullable
   public Object unmarshal(HierarchicalStreamReader reader, UnmarshallingContext context) {
     if (reader.getAttributeCount() == 0) {
       var realClass = ExtendXStream.getRealClass(reader, reader.getNodeName());
+      assert realClass != null;
       int position;
       MDOType mdoType;
       var realClassName = realClass.getName();

Original file line number	Diff line number	Diff line change
`@@ -242,7 +242,9 @@ private static <T extends MD> T copyModuleOwner(T srcMD, T modMD) {`
`242`	`242`	`throw new IllegalStateException("toBuilder() is not available for " + srcMD.getClass());`
`243`	`243`	`}`
`244`	`244`	`TransformationUtils.setValue(builder, "modules", merge);`
`245`		`- return (T) TransformationUtils.build(builder);`
	`245`	`+ var computeResult = TransformationUtils.build(builder);`
	`246`	`+ assert computeResult != null; // там и не будет null`
	`247`	`+ return (T) computeResult;`
`246`	`248`	`}`
`247`	`249`	`}`
`248`	`250`	`return srcMD;`
`@@ -280,12 +282,15 @@ private static <T extends MD> T copyChildrenOwner(T srcMD, T modMD) {`
`280`	`282`	`if (builder != null) {`
`281`	`283`	`TransformationUtils.invoke(builder, "clearChildren");`
`282`	`284`	`TransformationUtils.setValue(builder, "children", newChildren);`
`283`		`- result = (T) TransformationUtils.build(builder);`
	`285`	`+ var computeResult = TransformationUtils.build(builder);`
	`286`	`+ assert computeResult != null; // там и не будет null`
	`287`	`+ result = (T) computeResult;`
`284`	`288`	`}`
`285`	`289`	`}`
`286`	`290`	`return result;`
`287`	`291`	`}`
`288`	`292`
	`293`	`+ @Nullable`
`289`	`294`	`private static <K, T extends MD> Object copyChildrenList(K srcMD,`
`290`	`295`	`K modMD,`
`291`	`296`	`@Nullable Object builder,`
`@@ -304,23 +309,27 @@ private static <K, T extends MD> Object copyChildrenList(K srcMD,`
`304`	`309`	`TransformationUtils.invoke(builder, "clear" + methodName);`
`305`	`310`	`TransformationUtils.setValue(builder, methodName, merge);`
`306`	`311`	`}`
	`312`	`+ // возвращается либо полученный билдер, либо null, который и был изначально.`
`307`	`313`	`return builder;`
`308`	`314`	`}`
`309`	`315`
	`316`	`+ @Nullable`
`310`	`317`	`private static Object copyFormOwner(FormOwner srcMD,`
`311`	`318`	`FormOwner modMD,`
`312`	`319`	`@Nullable Object builder,`
`313`	`320`	`ArrayList<MD> newChildren) {`
`314`	`321`	`return copyChildrenList(srcMD, modMD, builder, FormOwner::getForms, "Forms", newChildren);`
`315`	`322`	`}`
`316`	`323`
	`324`	`+ @Nullable`
`317`	`325`	`private static Object copyTemplateOwner(TemplateOwner srcMD,`
`318`	`326`	`TemplateOwner modMD,`
`319`	`327`	`@Nullable Object builder,`
`320`	`328`	`ArrayList<MD> newChildren) {`
`321`	`329`	`return copyChildrenList(srcMD, modMD, builder, TemplateOwner::getTemplates, "Templates", newChildren);`
`322`	`330`	`}`
`323`	`331`
	`332`	`+ @Nullable`
`324`	`333`	`private static Object copyCommandOwner(CommandOwner srcMD,`
`325`	`334`	`CommandOwner modMD,`
`326`	`335`	`@Nullable Object builder,`
Original file line number	Diff line number	Diff line change
`@@ -60,7 +60,7 @@ public class TransformationUtils {`
`60`	`60`	`* @param methodName Метод\свойство билдера`
`61`	`61`	`* @param value Устанавливаемое значение`
`62`	`62`	`*/`
`63`		`- public void setValue(Object source, String methodName, Object value) {`
	`63`	`+ public void setValue(Object source, String methodName, @Nullable Object value) {`
`64`	`64`	`var method = getMethod(source.getClass(), methodName);`
`65`	`65`	`if (method != null && value != null) {`
`66`	`66`	`try {`
`@@ -118,7 +118,7 @@ public Object builder(Class<?> clazz) {`
`118`	`118`	`LOGGER.error(LOGGER_MESSAGE_PREF, clazz, BUILDER_METHOD_NAME, e);`
`119`	`119`	`}`
`120`	`120`	`}`
`121`		`- return null;`
	`121`	`+ throw new IllegalArgumentException("Incorrect class " + clazz);`
`122`	`122`	`}`
`123`	`123`
`124`	`124`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -30,6 +30,7 @@`
`30`	`30`	`import com.github._1c_syntax.bsl.types.value.V8ValueType;`
`31`	`31`	`import com.thoughtworks.xstream.converters.basic.AbstractSingleValueConverter;`
`32`	`32`	`import lombok.extern.slf4j.Slf4j;`
	`33`	`+import org.jspecify.annotations.Nullable;`
`33`	`34`
`34`	`35`	`import java.util.Arrays;`
`35`	`36`	`import java.util.Locale;`
`@@ -116,6 +117,7 @@ private static void putType(String key, ValueType type) {`
`116`	`117`	`ALL_TYPES.put(key.toLowerCase(Locale.ROOT), type);`
`117`	`118`	`}`
`118`	`119`
	`120`	`+ @Nullable`
`119`	`121`	`private static ValueType getType(String key) {`
`120`	`122`	`return ALL_TYPES.get(key.toLowerCase(Locale.ROOT));`
`121`	`123`	`}`