Skip to content

Commit 2b57658

Browse files
committed
Merge branch 'DBTOOLS-2115_fix_reading_dependencies_list' into 'master'
DBTOOOLS-2115 fixed reading dependencies list See merge request codekeeper/pgcodekeeper-core!283
2 parents 1b8baf3 + 4c81dcd commit 2b57658

5 files changed

Lines changed: 14 additions & 9 deletions

File tree

CHANGELOG.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
1313

1414
### Fixed
1515

16+
- Fixed errors when working with .pgcodekeeperdependencies files.
17+
1618
## [14.6.0] - 2026-06-18
1719

1820
### Changed

CHANGELOG.ru.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@
1313

1414
### Исправлено
1515

16+
- Исправлены ошибки при работе с файлами .pgcodekeeperdependencies.
17+
1618
## [14.6.0] - 2026-06-18
1719

1820
### Изменено

src/main/antlr4/org/pgcodekeeper/core/database/base/parser/generated/DependenciesList.g4

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ options {
55
}
66

77
compileUnit
8-
: deps_definition+ EOF
8+
: deps_definition* EOF
99
;
1010

1111
deps_definition

src/main/java/org/pgcodekeeper/core/database/base/loader/AbstractProjectLoader.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -279,9 +279,7 @@ public void preLoad() throws IOException {
279279

280280
// load additional dependencies
281281
Path depsPath = dirPath.resolve(ADDITIONAL_DEPENDENCIES_FILE);
282-
if (Files.isRegularFile(depsPath)) {
283-
diffSettings.addAdditionalDependencies(DependenciesReader.getDependencies(depsPath));
284-
}
282+
diffSettings.addAdditionalDependencies(DependenciesReader.getDependencies(depsPath));
285283
isPreloaded = true;
286284
}
287285

src/main/java/org/pgcodekeeper/core/dependencieslist/DependenciesReader.java

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
*******************************************************************************/
1616
package org.pgcodekeeper.core.dependencieslist;
1717

18+
import java.nio.file.Files;
1819
import java.nio.file.Path;
1920
import java.util.*;
2021
import java.util.stream.Collectors;
@@ -41,11 +42,13 @@ public final class DependenciesReader {
4142
private DependenciesReader() {}
4243

4344
public static List<Dependency> getDependencies(Path depsPath) {
44-
try {
45-
var parser = ParserUtils.createDependenciesListParser(depsPath);
46-
return new DependenciesReader().getDependencies(parser);
47-
} catch (Exception ex) {
48-
LOG.error(Messages.DependenciesReader_parser_error.formatted(depsPath), ex);
45+
if (Files.isRegularFile(depsPath)) {
46+
try {
47+
var parser = ParserUtils.createDependenciesListParser(depsPath);
48+
return new DependenciesReader().getDependencies(parser);
49+
} catch (Exception ex) {
50+
LOG.error(Messages.DependenciesReader_parser_error.formatted(depsPath), ex);
51+
}
4952
}
5053
return new ArrayList<>();
5154
}

0 commit comments

Comments
 (0)