Skip to content

Throw exception when failing to build coordinate #912

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

Merged
merged 1 commit into from
Oct 17, 2023
Merged

Throw exception when failing to build coordinate #912

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 7 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,13 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

## [Unreleased/Snapshot]

### Added

### Fixed

### Changed
- `SqlIdCoordinateSource.createCooridinateValue` now throws an exception when the coordinate can not be built [#911](https://github.com/ie3-institute/PowerSystemDataModel/issues/911)

## [4.0.0] - 2023-08-01

### Added
Expand Down
17 changes: 4 additions & 13 deletions src/main/java/edu/ie3/datamodel/io/source/sql/SqlIdCoordinateSource.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,27 +173,18 @@ public List<CoordinateDistance> getClosestCoordinates(

// -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-

private Optional<CoordinateValue> createCoordinateValue(Map<String, String> fieldToValues) {
private CoordinateValue createCoordinateValue(Map<String, String> fieldToValues) {
fieldToValues.remove("distance");

SimpleFactoryData simpleFactoryData = new SimpleFactoryData(fieldToValues, Pair.class);
Optional<Pair<Integer, Point>> pair = factory.get(simpleFactoryData).getData();

if (pair.isEmpty()) {
return Optional.empty();
} else {
Pair<Integer, Point> data = pair.get();
return Optional.of(new CoordinateValue(data.getKey(), data.getValue()));
}
Pair<Integer, Point> pair = factory.get(simpleFactoryData).getOrThrow();
return new CoordinateValue(pair.getKey(), pair.getValue());
}

private List<CoordinateValue> executeQueryToList(
String query, SqlDataSource.AddParams addParams) {
return dataSource
.executeQuery(query, addParams)
.map(this::createCoordinateValue)
.flatMap(Optional::stream)
.toList();
return dataSource.executeQuery(query, addParams).map(this::createCoordinateValue).toList();
}

/**
Expand Down