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

theshadowco · web-flow · commit e69b6285b658 · 2024-01-23T15:23:08.000+03:00
Feature/optimize
diff --git a/.gitignore b/.gitignore
@@ -12,3 +12,4 @@ build/
 /.idea/sonar*
 
 /.idea/misc.xml
+Gradle_*.xml
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -56,8 +56,8 @@ dependencies {
     // прочее
     implementation("commons-io", "commons-io", "2.8.0")
     implementation("com.github.1c-syntax", "utils", "0.5.1")
-    implementation("io.github.1c-syntax", "bsl-common-library", "0.5.0")
-    implementation("io.github.1c-syntax", "supportconf", "0.12.1") {
+    implementation("io.github.1c-syntax", "bsl-common-library", "0.5.1")
+    implementation("io.github.1c-syntax", "supportconf", "0.13.1") {
         exclude("io.github.1c-syntax", "bsl-common-library")
     }
 
diff --git a/src/main/java/com/github/_1c_syntax/bsl/mdo/storage/RoleData.java b/src/main/java/com/github/_1c_syntax/bsl/mdo/storage/RoleData.java
@@ -1,28 +1,29 @@
-/*
- * This file is a part of MDClasses.
- *
- * Copyright (c) 2019 - 2024
- * Tymko Oleg <olegtymko@yandex.ru>, Maximov Valery <maximovvalery@gmail.com> 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;
+/*
+ * This file is a part of MDClasses.
+ *
+ * Copyright (c) 2019 - 2024
+ * Tymko Oleg <olegtymko@yandex.ru>, Maximov Valery <maximovvalery@gmail.com> 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.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;
@@ -46,6 +47,7 @@
 public class RoleData {
 
   public static final RoleData EMPTY = RoleData.builder().build();
+  public static final GenericInterner<Right> RIGHT_INTERNER = new GenericInterner<>();
 
   /**
    * Устанавливать права для новых объектов
@@ -97,8 +99,8 @@ public static class ObjectRight {
   }
 
   @Value
-  @ToString(of = {"name"})
-  @EqualsAndHashCode(of = {"name"})
+  @ToString(of = {"name", "value"})
+  @EqualsAndHashCode(of = {"name", "value"})
   @Builder
   public static class Right {
     /**
diff --git a/src/main/java/com/github/_1c_syntax/bsl/mdo/support/MultiLanguageString.java b/src/main/java/com/github/_1c_syntax/bsl/mdo/support/MultiLanguageString.java
@@ -1,27 +1,27 @@
-/*
- * This file is a part of MDClasses.
- *
- * Copyright (c) 2019 - 2024
- * Tymko Oleg <olegtymko@yandex.ru>, Maximov Valery <maximovvalery@gmail.com> 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 <olegtymko@yandex.ru>, Maximov Valery <maximovvalery@gmail.com> 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 com.github._1c_syntax.utils.StringInterner;
 import lombok.NonNull;
 import lombok.Value;
 
@@ -34,22 +34,30 @@
  * Используется для хранения текстовой строки на разных языках
  */
 @Value
-@AllArgsConstructor
 public class MultiLanguageString {
 
   /**
    * Ссылка на пустой элемент
    */
   public static final MultiLanguageString EMPTY = new MultiLanguageString(Collections.emptyMap());
 
+  private static final StringInterner stringInterner = new StringInterner();
+
   /**
    * Содержимое описания для каждого языка
    */
   Map<String, String> content;
 
+  public MultiLanguageString(Map<String, String> source) {
+    Map<String, String> newContent = new HashMap<>();
+    source.forEach(
+      (langKey, text) -> newContent.put(stringInterner.intern(langKey), text));
+    content = newContent;
+  }
+
   public MultiLanguageString(@NonNull MultiLanguageString first, @NonNull MultiLanguageString second) {
     var fullContent = new HashMap<>(first.getContent());
-    fullContent.putAll(second.getContent());
+    putContent(fullContent, second);
     content = fullContent;
   }
 
@@ -68,7 +76,7 @@ public static MultiLanguageString of(@NonNull List<MultiLanguageString> strings)
       return strings.get(0);
     } else {
       Map<String, String> content = new HashMap<>();
-      strings.forEach(string -> content.putAll(string.getContent()));
+      strings.forEach(string -> putContent(content, string));
       return new MultiLanguageString(content);
     }
   }
@@ -103,4 +111,9 @@ public static MultiLanguageString of(@NonNull List<MultiLanguageString> strings)
   public boolean isEmpty() {
     return this == EMPTY;
   }
+
+  private static void putContent(Map<String, String> destination, MultiLanguageString source) {
+    source.getContent().forEach(
+      (langKey, text) -> destination.put(stringInterner.intern(langKey), text));
+  }
 }
diff --git a/src/main/java/com/github/_1c_syntax/bsl/mdo/support/RoleRight.java b/src/main/java/com/github/_1c_syntax/bsl/mdo/support/RoleRight.java
@@ -1,25 +1,25 @@
-/*
- * This file is a part of MDClasses.
- *
- * Copyright (c) 2019 - 2024
- * Tymko Oleg <olegtymko@yandex.ru>, Maximov Valery <maximovvalery@gmail.com> 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 <olegtymko@yandex.ru>, Maximov Valery <maximovvalery@gmail.com> 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;
@@ -96,7 +96,11 @@ public enum RoleRight implements EnumWithValue {
   INTERACTIVE_EXECUTE("InteractiveExecute"),
   TECHNICAL_SPECIALIST_MODE("TechnicalSpecialistMode"),
   INTERACTIVE_START("InteractiveStart"),
-  START("Start");
+  START("Start"),
+  STANDARD_AUTHENTICATION_CHANGE("StandardAuthenticationChange"),
+  SESSION_STANDARD_AUTHENTICATION_CHANGE("SessionStandardAuthenticationChange"),
+  SESSION_OS_AUTHENTICATION_CHANGE("SessionOSAuthenticationChange")
+  ;
 
   @Accessors(fluent = true)
   private final String value;
diff --git a/src/main/java/com/github/_1c_syntax/bsl/reader/FakeReader.java b/src/main/java/com/github/_1c_syntax/bsl/reader/FakeReader.java
@@ -1,25 +1,25 @@
-/*
- * This file is a part of MDClasses.
- *
- * Copyright (c) 2019 - 2024
- * Tymko Oleg <olegtymko@yandex.ru>, Maximov Valery <maximovvalery@gmail.com> 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.reader;
+/*
+ * This file is a part of MDClasses.
+ *
+ * Copyright (c) 2019 - 2024
+ * Tymko Oleg <olegtymko@yandex.ru>, Maximov Valery <maximovvalery@gmail.com> 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.reader;
 
 import com.github._1c_syntax.bsl.mdclasses.MDClass;
 import com.github._1c_syntax.bsl.mdclasses.MDClasses;
diff --git a/src/main/java/com/github/_1c_syntax/bsl/reader/MDReader.java b/src/main/java/com/github/_1c_syntax/bsl/reader/MDReader.java
@@ -1,25 +1,25 @@
-/*
- * This file is a part of MDClasses.
- *
- * Copyright (c) 2019 - 2024
- * Tymko Oleg <olegtymko@yandex.ru>, Maximov Valery <maximovvalery@gmail.com> 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.reader;
+/*
+ * This file is a part of MDClasses.
+ *
+ * Copyright (c) 2019 - 2024
+ * Tymko Oleg <olegtymko@yandex.ru>, Maximov Valery <maximovvalery@gmail.com> 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.reader;
 
 import com.github._1c_syntax.bsl.mdclasses.MDClass;
 import com.github._1c_syntax.bsl.reader.common.xstream.ExtendXStream;
@@ -65,5 +65,4 @@ default Converter getReflectionConverter() {
   MDClass readConfiguration();
 
   MDClass readExternalSource();
-
 }
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
@@ -49,7 +49,7 @@ private static <T extends Enum<T> & EnumWithValue> T fromValue(Class<T> clazz, S
         return item;
       }
     }
-    throw new IllegalArgumentException(value);
+    throw new IllegalArgumentException(clazz.getName() + " " + value);
   }
 
   @Override
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
@@ -24,6 +24,7 @@
 import com.github._1c_syntax.bsl.mdo.storage.RoleData;
 import com.github._1c_syntax.bsl.reader.common.TransformationUtils;
 import com.github._1c_syntax.bsl.reader.common.xstream.ReadConverter;
+import com.github._1c_syntax.utils.GenericInterner;
 import com.thoughtworks.xstream.converters.UnmarshallingContext;
 import com.thoughtworks.xstream.io.HierarchicalStreamReader;
 
@@ -89,7 +90,8 @@ private static RoleData.Right readRight(HierarchicalStreamReader reader, Unmarsh
       TransformationUtils.setValue(builder, name, value);
       reader.moveUp();
     }
-    return builder.build();
+
+    return RoleData.RIGHT_INTERNER.intern(builder.build());
   }
 
   @Override
diff --git a/src/main/java/com/github/_1c_syntax/bsl/reader/common/xstream/ExtendXStream.java b/src/main/java/com/github/_1c_syntax/bsl/reader/common/xstream/ExtendXStream.java
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
diff --git a/src/test/resources/fixtures/mdclasses/Roles.Роль1.json b/src/test/resources/fixtures/mdclasses/Roles.Роль1.json
diff --git a/src/test/resources/fixtures/ssl_3_1/Roles.БазовыеПраваБСП.json b/src/test/resources/fixtures/ssl_3_1/Roles.БазовыеПраваБСП.json

Original file line number	Diff line number	Diff line change
`@@ -12,3 +12,4 @@ build/`
`12`	`12`	`/.idea/sonar*`
`13`	`13`
`14`	`14`	`/.idea/misc.xml`
	`15`	`+Gradle_*.xml`
Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,7 @@ private static <T extends Enum<T> & EnumWithValue> T fromValue(Class<T> clazz, S`
`49`	`49`	`return item;`
`50`	`50`	`}`
`51`	`51`	`}`
`52`		`- throw new IllegalArgumentException(value);`
	`52`	`+ throw new IllegalArgumentException(clazz.getName() + " " + value);`
`53`	`53`	`}`
`54`	`54`
`55`	`55`	`@Override`