Merge branch 'release/0.3'

Author: theshadowco

.gitignore

@@ -2,3 +2,5 @@ build/
 .gradle/
 
 /.idea/sonarlint/
+*.orig
+/.idea/jarRepositories.xml

build.gradle.kts

@@ -29,6 +29,7 @@ dependencies {
     // прочее
     implementation("commons-io", "commons-io", "2.6")
     implementation("org.apache.commons", "commons-lang3", "3.9")
+    implementation("com.github.1c-syntax", "utils", "0.2.0")
     // генерики
     compileOnly("org.projectlombok", "lombok", lombok.version)
     // тестирование
@@ -85,4 +86,4 @@ sonarqube {
 lombok {
     version = "1.18.8"
     sha256 = "0396952823579b316a0fe85cbd871bbb3508143c2bcbd985dd7800e806cb24fc"
-}
+}

src/main/java/com/github/_1c_syntax/mdclasses/metadata/utils/Common.java

@@ -9,7 +9,6 @@
 
 import java.io.File;
 import java.net.URI;
-import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.util.Collections;
 import java.util.HashMap;
@@ -87,12 +86,4 @@ private static Map<URI, Map<SupportConfiguration, SupportVariant>> getMDObjectSu
     return modulesBySupport;
   }
 
-  public static Path getAbsolutePath(File file) {
-    return file.toPath().toAbsolutePath();
-  }
-
-  public static URI getAbsoluteUri(File file) {
-    return getAbsolutePath(file).toUri();
-  }
-
 }

src/test/java/com/github/_1c_syntax/mdclasses/ConfigurationEDTTest.java

@@ -8,7 +8,7 @@
 import com.github._1c_syntax.mdclasses.metadata.additional.ModuleType;
 import com.github._1c_syntax.mdclasses.metadata.additional.ScriptVariant;
 import com.github._1c_syntax.mdclasses.metadata.additional.UseMode;
-import com.github._1c_syntax.mdclasses.metadata.utils.Common;
+import com.github._1c_syntax.utils.Absolute;
 import org.junit.jupiter.api.Test;
 
 import java.io.File;
@@ -33,16 +33,16 @@ void testBuilder() {
     assertThat(configuration.getModulesByType()).hasSize(34);
 
     File file = new File("src/test/resources/metadata/edt/src/Constants/Константа1/ValueManagerModule.bsl");
-    assertThat(configuration.getModuleType(Common.getAbsoluteUri(file))).isEqualTo(ModuleType.ValueManagerModule);
+    assertThat(configuration.getModuleType(Absolute.uri(file))).isEqualTo(ModuleType.ValueManagerModule);
 
     file = new File("src/test/resources/metadata/edt/src/CommonModules/ПростойОбщийМодуль/Module.bsl");
-    assertThat(configuration.getModuleType(Common.getAbsoluteUri(file))).isEqualTo(ModuleType.CommonModule);
+    assertThat(configuration.getModuleType(Absolute.uri(file))).isEqualTo(ModuleType.CommonModule);
 
     file = new File("src/test/resources/metadata/edt/src/Catalogs/Справочник1/Forms/ФормаЭлемента/Module.bsl");
-    assertThat(configuration.getModuleType(Common.getAbsoluteUri(file))).isEqualTo(ModuleType.FormModule);
+    assertThat(configuration.getModuleType(Absolute.uri(file))).isEqualTo(ModuleType.FormModule);
 
     file = new File("src/test/resources/metadata/edt/src/CommonForms/Форма/Module.bsl");
-    assertThat(configuration.getModuleType(Common.getAbsoluteUri(file))).isEqualTo(ModuleType.FormModule);
+    assertThat(configuration.getModuleType(Absolute.uri(file))).isEqualTo(ModuleType.FormModule);
 
     CommonModule commonModule = (CommonModule) configuration.getChild(MDOType.COMMON_MODULE, "ПростойОбщийМодуль");
     assertThat(commonModule).isNotNull();
@@ -61,7 +61,7 @@ void testErrorBuild() {
     assertThat(configuration).isNotNull();
 
     File file = new File("src/test/resources/metadata/Module.os");
-    assertThat(configuration.getModuleType(Common.getAbsoluteUri(file))).isEqualTo(ModuleType.Unknown);
+    assertThat(configuration.getModuleType(Absolute.uri(file))).isEqualTo(ModuleType.Unknown);
   }
 
   @Test
@@ -79,7 +79,7 @@ void testBuilderEn() {
     assertThat(configuration.getModulesByType()).hasSize(2);
 
     File file = new File("src/test/resources/metadata/edt_en/src/CommonModules/CommonModule/Module.bsl");
-    assertThat(configuration.getModuleType(Common.getAbsoluteUri(file))).isEqualTo(ModuleType.CommonModule);
+    assertThat(configuration.getModuleType(Absolute.uri(file))).isEqualTo(ModuleType.CommonModule);
 
   }
 }

src/test/java/com/github/_1c_syntax/mdclasses/ConfigurationEMPTYTest.java

@@ -4,7 +4,7 @@
 import com.github._1c_syntax.mdclasses.metadata.additional.ConfigurationSource;
 import com.github._1c_syntax.mdclasses.metadata.additional.MDOType;
 import com.github._1c_syntax.mdclasses.metadata.additional.ModuleType;
-import com.github._1c_syntax.mdclasses.metadata.utils.Common;
+import com.github._1c_syntax.utils.Absolute;
 import org.junit.jupiter.api.Test;
 
 import java.io.File;
@@ -21,7 +21,7 @@ void testBuilder() {
     assertThat(configuration.getConfigurationSource()).isEqualTo(ConfigurationSource.EMPTY);
 
     File file = new File("src/test/resources/metadata/edt/src/Constants/Константа1/ManagerModule.bsl");
-    assertThat(configuration.getModuleType(Common.getAbsoluteUri(file))).isEqualTo(ModuleType.Unknown);
+    assertThat(configuration.getModuleType(Absolute.uri(file))).isEqualTo(ModuleType.Unknown);
 
     Configuration configuration2 = Configuration.create();
 

src/test/java/com/github/_1c_syntax/mdclasses/ConfigurationOriginTest.java

@@ -8,7 +8,7 @@
 import com.github._1c_syntax.mdclasses.metadata.additional.ModuleType;
 import com.github._1c_syntax.mdclasses.metadata.additional.ScriptVariant;
 import com.github._1c_syntax.mdclasses.metadata.additional.UseMode;
-import com.github._1c_syntax.mdclasses.metadata.utils.Common;
+import com.github._1c_syntax.utils.Absolute;
 import org.junit.jupiter.api.Test;
 
 import java.io.File;
@@ -36,13 +36,13 @@ void testBuilder() {
     assertThat(configuration.getModulesByType()).hasSize(22);
 
     File file = new File("src/test/resources/metadata/original/Documents/ПоступлениеТоваровУслуг/Ext/ManagerModule.bsl");
-    assertThat(configuration.getModuleType(Common.getAbsoluteUri(file))).isEqualTo(ModuleType.ManagerModule);
+    assertThat(configuration.getModuleType(Absolute.uri(file))).isEqualTo(ModuleType.ManagerModule);
 
     file = new File("src/test/resources/metadata/original/CommonModules/ПростойОбщийМодуль/Ext/Module.bsl");
-    assertThat(configuration.getModuleType(Common.getAbsoluteUri(file))).isEqualTo(ModuleType.CommonModule);
+    assertThat(configuration.getModuleType(Absolute.uri(file))).isEqualTo(ModuleType.CommonModule);
 
     file = new File("src/test/resources/metadata/original/CommonForms/Форма/Ext/Form/Module.bsl");
-    assertThat(configuration.getModuleType(Common.getAbsoluteUri(file))).isEqualTo(ModuleType.FormModule);
+    assertThat(configuration.getModuleType(Absolute.uri(file))).isEqualTo(ModuleType.FormModule);
 
     CommonModule commonModule = (CommonModule) configuration.getChild(MDOType.COMMON_MODULE, "ПростойОбщийМодуль");
     assertThat(commonModule).isNotNull();