интернирование атрибутов формы

Author: theshadowco

src/main/java/com/github/_1c_syntax/mdclasses/mdo/children/form/FormAttribute.java

@@ -22,6 +22,7 @@
 package com.github._1c_syntax.mdclasses.mdo.children.form;
 
 import com.github._1c_syntax.mdclasses.unmarshal.converters.ExtInfoConverter;
+import com.github._1c_syntax.mdclasses.unmarshal.converters.StringConverterIntern;
 import com.github._1c_syntax.mdclasses.unmarshal.converters.ValueTypeConverter;
 import com.github._1c_syntax.mdclasses.unmarshal.wrapper.form.DesignerAttribute;
 import com.github._1c_syntax.mdclasses.unmarshal.wrapper.form.DesignerColumn;
@@ -44,6 +45,7 @@ public class FormAttribute {
   /**
    * Имя реквизита
    */
+  @XStreamConverter(StringConverterIntern.class)
   private String name;
   /**
    * Идентификатор реквизита, в конфигураторе не отображается.
@@ -90,6 +92,7 @@ public FormAttribute(DesignerAttribute designerAttribute) {
     if (designerAttribute.getType() != null) {
       var list = designerAttribute.getType().getTypes().stream()
         .map(value -> value.replace("cfg:", "")) // TODO: чтение типов реквизитов
+        .map(String::intern)
         .collect(Collectors.toList());
       setValueTypes(list);
     }

src/main/java/com/github/_1c_syntax/mdclasses/mdo/children/form/FormHandlerItem.java

@@ -47,6 +47,6 @@ public class FormHandlerItem {
    */
   public FormHandlerItem(DesignerEvent designerEvent) {
     setName(designerEvent.getValue());
-    setEvent(designerEvent.getName());
+    setEvent(designerEvent.getName().intern());
   }
 }

src/main/java/com/github/_1c_syntax/mdclasses/mdo/children/form/FormItem.java

@@ -22,6 +22,8 @@
 package com.github._1c_syntax.mdclasses.mdo.children.form;
 
 import com.github._1c_syntax.mdclasses.mdo.support.DataPath;
+import com.github._1c_syntax.mdclasses.unmarshal.converters.StringConverterIntern;
+import com.thoughtworks.xstream.annotations.XStreamConverter;
 import com.thoughtworks.xstream.annotations.XStreamImplicit;
 import lombok.Data;
 import lombok.NoArgsConstructor;
@@ -49,6 +51,7 @@ public class FormItem {
   /**
    * Тип элемента. Например Label или InputField. На текущий момент в виде строки
    */
+  @XStreamConverter(StringConverterIntern.class)
   private String type = "";
   /**
    * Признак видимости элемента

src/main/java/com/github/_1c_syntax/mdclasses/unmarshal/converters/ValueTypeConverter.java

@@ -29,6 +29,8 @@
 import com.thoughtworks.xstream.io.HierarchicalStreamReader;
 import com.thoughtworks.xstream.io.HierarchicalStreamWriter;
 
+import java.util.stream.Collectors;
+
 public class ValueTypeConverter implements Converter {
   @Override
   public void marshal(Object source, HierarchicalStreamWriter writer, MarshallingContext context) {
@@ -39,7 +41,7 @@ public void marshal(Object source, HierarchicalStreamWriter writer, MarshallingC
   public Object unmarshal(HierarchicalStreamReader reader, UnmarshallingContext context) {
     var valueType = (ValueType) context.convertAnother(reader, ValueType.class,
       XStreamFactory.getReflectionConverter());
-    return valueType.getTypes();
+    return valueType.getTypes().stream().map(String::intern).collect(Collectors.toList());
   }
 
   @Override