Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bug fix: When looking for boundaries, all files inside the boundary location directory are considered #2045

Merged
merged 3 commits into from
Mar 29, 2022
Merged

Bug fix: When looking for boundaries, all files inside the boundary location directory are considered #2045

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4996d36
Bug fix: When looking for boundaries, all files inside the boundary l…
miovd Mar 29, 2022
969659e
Merge branch 'main' into fix_boundary_cgmes
miovd Mar 29, 2022
e8ff139
Merge branch 'main' into fix_boundary_cgmes
miovd Mar 29, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions cgmes/cgmes-conversion/src/main/java/com/powsybl/cgmes/conversion/CgmesImport.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
import com.powsybl.cgmes.model.CgmesOnDataSource;
import com.powsybl.commons.config.PlatformConfig;
import com.powsybl.commons.datasource.DataSource;
import com.powsybl.commons.datasource.DataSourceUtil;
import com.powsybl.commons.datasource.GenericReadOnlyDataSource;
import com.powsybl.commons.datasource.ReadOnlyDataSource;
import com.powsybl.commons.util.ServiceLoaderCache;
Expand Down Expand Up @@ -129,7 +128,7 @@ private ReadOnlyDataSource boundary(Properties p) {
boundaryLocationParameter,
defaultValueConfig));
// Check that the Data Source has valid CGMES names
ReadOnlyDataSource ds = new GenericReadOnlyDataSource(loc, DataSourceUtil.getBaseName(loc));
ReadOnlyDataSource ds = new GenericReadOnlyDataSource(loc);
if ((new CgmesOnDataSource(ds)).names().isEmpty()) {
return null;
}
Expand Down
7 changes: 7 additions & 0 deletions commons/src/main/java/com/powsybl/commons/datasource/GenericReadOnlyDataSource.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,13 @@ public GenericReadOnlyDataSource(Path directory, String baseName, DataSourceObse
};
}

/**
* The data source contains all files inside the given directory.
*/
public GenericReadOnlyDataSource(Path directory) {
this(directory, "");
}

public GenericReadOnlyDataSource(Path directory, String baseName) {
this(directory, baseName, null);
}
Expand Down