Skip to content

Commit 9d80497

Browse files
nixel2007nixel2007
committed
Перевод на 1c-syntax.utils для расчета uri
1 parent 8f0a641 commit 9d80497

5 files changed

Lines changed: 17 additions & 20 deletions

File tree

‎build.gradle.kts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ dependencies {
2929
// прочее
3030
implementation("commons-io", "commons-io", "2.6")
3131
implementation("org.apache.commons", "commons-lang3", "3.9")
32+
implementation("com.github.1c-syntax", "utils", "947feabd6c5d774fc547ad0c2e386803de844d83")
3233
// генерики
3334
compileOnly("org.projectlombok", "lombok", lombok.version)
3435
// тестирование

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

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
import com.github._1c_syntax.mdclasses.metadata.additional.ConfigurationSource;
66
import com.github._1c_syntax.mdclasses.metadata.additional.ModuleType;
77
import com.github._1c_syntax.mdclasses.metadata.additional.SupportVariant;
8+
import com.github._1c_syntax.utils.Absolute;
89
import lombok.extern.slf4j.Slf4j;
910
import org.apache.commons.io.FileUtils;
1011
import org.apache.commons.io.FilenameUtils;
@@ -98,7 +99,7 @@ public static Map<URI, ModuleType> getModuleTypesByPath(Path rootPath) {
9899
};
99100

100101
ModuleType moduleType = getModuleTypeByFileName(partsFileName);
101-
modulesByType.put(getAbsoluteUri(file), moduleType);
102+
modulesByType.put(Absolute.uri(file), moduleType);
102103
});
103104

104105
return modulesByType;
@@ -130,7 +131,7 @@ public static Map<URI, Map<SupportConfiguration, SupportVariant>> getModuleSuppo
130131
files.stream().forEach(file -> {
131132

132133
// FIXME: неправильное поведение, считается от каталога внутри scr
133-
URI uri = getAbsoluteUri(file);
134+
URI uri = Absolute.uri(file);
134135
String[] elementsPath = file.toPath().toString().replace(rootPathString, "").split(FILE_SEPARATOR);
135136

136137
Map<SupportConfiguration, SupportVariant> moduleSupport = null;
@@ -274,12 +275,4 @@ private static String[] getPartsByPath(Path path) {
274275
return array;
275276
}
276277

277-
public static Path getAbsolutePath(File file) {
278-
return file.toPath().toAbsolutePath();
279-
}
280-
281-
public static URI getAbsoluteUri(File file) {
282-
return getAbsolutePath(file).toUri();
283-
}
284-
285278
}

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

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
import com.github._1c_syntax.mdclasses.metadata.additional.ModuleType;
99
import com.github._1c_syntax.mdclasses.metadata.additional.ScriptVariant;
1010
import com.github._1c_syntax.mdclasses.metadata.utils.Common;
11+
import com.github._1c_syntax.utils.Absolute;
1112
import org.junit.jupiter.api.Test;
1213

1314
import java.io.File;
@@ -29,17 +30,17 @@ void testBuilder() {
2930
assertThat(configuration.getModulesByType().size() > 0).isTrue();
3031

3132
File file = new File("src/test/resources/metadata/edt/src/Constants/Константа1/ManagerModule.bsl");
32-
assertThat(configuration.getModuleType(Common.getAbsoluteUri(file))).isEqualTo(ModuleType.ManagerModule);
33+
assertThat(configuration.getModuleType(Absolute.uri(file))).isEqualTo(ModuleType.ManagerModule);
3334

3435
file = new File("src/test/resources/metadata/edt/src/CommonModules/ПростойОбщийМодуль/Module.bsl");
35-
assertThat(configuration.getModuleType(Common.getAbsoluteUri(file))).isEqualTo(ModuleType.CommonModule);
36+
assertThat(configuration.getModuleType(Absolute.uri(file))).isEqualTo(ModuleType.CommonModule);
3637

3738

3839
file = new File("src/test/resources/metadata/edt/src/Catalogs/Справочник1/Forms/ФормаЭлемента/Module.bsl");
39-
assertThat(configuration.getModuleType(Common.getAbsoluteUri(file))).isEqualTo(ModuleType.FormModule);
40+
assertThat(configuration.getModuleType(Absolute.uri(file))).isEqualTo(ModuleType.FormModule);
4041

4142
file = new File("src/test/resources/metadata/edt/src/CommonForms/Форма/Module.bsl");
42-
assertThat(configuration.getModuleType(Common.getAbsoluteUri(file))).isEqualTo(ModuleType.FormModule);
43+
assertThat(configuration.getModuleType(Absolute.uri(file))).isEqualTo(ModuleType.FormModule);
4344

4445
CommonModule commonModule = (CommonModule) configuration.getChild(MDOType.COMMON_MODULE, "ПростойОбщийМодуль");
4546
assertThat(commonModule).isNotNull();
@@ -58,7 +59,7 @@ void testErrorBuild() {
5859
assertThat(configuration).isNotNull();
5960

6061
File file = new File("src/test/resources/metadata/Module.os");
61-
assertThat(configuration.getModuleType(Common.getAbsoluteUri(file))).isEqualTo(ModuleType.Unknown);
62+
assertThat(configuration.getModuleType(Absolute.uri(file))).isEqualTo(ModuleType.Unknown);
6263
}
6364

6465
@Test
@@ -73,7 +74,7 @@ void testBuilderEn() {
7374
assertThat(configuration.getModulesByType().size() > 0).isTrue();
7475

7576
File file = new File("src/test/resources/metadata/edt_en/src/CommonModules/CommonModule/Module.bsl");
76-
assertThat(configuration.getModuleType(Common.getAbsoluteUri(file))).isEqualTo(ModuleType.CommonModule);
77+
assertThat(configuration.getModuleType(Absolute.uri(file))).isEqualTo(ModuleType.CommonModule);
7778

7879
}
7980

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
import com.github._1c_syntax.mdclasses.metadata.additional.MDOType;
66
import com.github._1c_syntax.mdclasses.metadata.additional.ModuleType;
77
import com.github._1c_syntax.mdclasses.metadata.utils.Common;
8+
import com.github._1c_syntax.utils.Absolute;
89
import org.junit.jupiter.api.Test;
910

1011
import java.io.File;
@@ -21,7 +22,7 @@ void testBuilder() {
2122
assertThat(configuration.getConfigurationSource()).isEqualTo(ConfigurationSource.EMPTY);
2223

2324
File file = new File("src/test/resources/metadata/edt/src/Constants/Константа1/ManagerModule.bsl");
24-
assertThat(configuration.getModuleType(Common.getAbsoluteUri(file))).isEqualTo(ModuleType.Unknown);
25+
assertThat(configuration.getModuleType(Absolute.uri(file))).isEqualTo(ModuleType.Unknown);
2526

2627
Configuration configuration2 = Configuration.newBuilder().build();
2728

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

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
import com.github._1c_syntax.mdclasses.metadata.additional.ModuleType;
99
import com.github._1c_syntax.mdclasses.metadata.additional.ScriptVariant;
1010
import com.github._1c_syntax.mdclasses.metadata.utils.Common;
11+
import com.github._1c_syntax.utils.Absolute;
1112
import org.junit.jupiter.api.Test;
1213

1314
import java.io.File;
@@ -32,13 +33,13 @@ void testBuilder() {
3233
assertThat(configuration.getModulesByType().size() > 0).isTrue();
3334

3435
File file = new File("src/test/resources/metadata/original/Documents/ПоступлениеТоваровУслуг/Ext/ManagerModule.bsl");
35-
assertThat(configuration.getModuleType(Common.getAbsoluteUri(file))).isEqualTo(ModuleType.ManagerModule);
36+
assertThat(configuration.getModuleType(Absolute.uri(file))).isEqualTo(ModuleType.ManagerModule);
3637

3738
file = new File("src/test/resources/metadata/original/CommonModules/ПростойОбщийМодуль/Ext/Module.bsl");
38-
assertThat(configuration.getModuleType(Common.getAbsoluteUri(file))).isEqualTo(ModuleType.CommonModule);
39+
assertThat(configuration.getModuleType(Absolute.uri(file))).isEqualTo(ModuleType.CommonModule);
3940

4041
file = new File("src/test/resources/metadata/original/CommonForms/Форма/Ext/Form/Module.bsl");
41-
assertThat(configuration.getModuleType(Common.getAbsoluteUri(file))).isEqualTo(ModuleType.FormModule);
42+
assertThat(configuration.getModuleType(Absolute.uri(file))).isEqualTo(ModuleType.FormModule);
4243

4344
CommonModule commonModule = (CommonModule) configuration.getChild(MDOType.COMMON_MODULE, "ПростойОбщийМодуль");
4445
assertThat(commonModule).isNotNull();

0 commit comments

Comments
 (0)