Skip to content

Reduce duplication by having only 1 complex builder. #400

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
Hilbrand merged 1 commit into from
Sep 21, 2026
+24 −23
Merged

Reduce duplication by having only 1 complex builder. #400

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
6 changes: 5 additions & 1 deletion source/imaer-gml/src/main/java/nl/overheid/aerius/gml/GMLScenario.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,12 +64,16 @@ public static Builder create(final String name, final SituationType situationTyp
}

public static Builder create(final ImportParcel importParcel, final ScenarioSituation situation) {
return create(situation, importParcel.getCalculationPointsList());
}

public static Builder create(final ScenarioSituation situation, final List<CalculationPointFeature> receptorPoints) {
return new Builder(situation.getName(), situation.getType())
.nettingFactor(situation.getNettingFactor())
.definitions(situation.getDefinitions())
.sources(situation.getEmissionSourcesList())
.buildings(situation.getBuildingsList())
.calculationPoints(importParcel.getCalculationPointsList())
.calculationPoints(receptorPoints)
.cimlkDispersionLines(situation.getCimlkDispersionLinesList())
.cimlkMeasures(situation.getCimlkMeasuresList())
.cimlkCorrections(situation.getCimlkCorrections());
Expand Down
41 changes: 19 additions & 22 deletions source/imaer-gml/src/main/java/nl/overheid/aerius/gml/GMLScenarioHelper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@

import nl.overheid.aerius.gml.base.MetaDataInput;
import nl.overheid.aerius.gml.base.OtherSituationMetaData;
import nl.overheid.aerius.shared.domain.Theme;
import nl.overheid.aerius.shared.domain.calculation.CalculationSetOptions;
import nl.overheid.aerius.shared.domain.scenario.IsScenario;
import nl.overheid.aerius.shared.domain.v2.archive.ArchiveMetaData;
import nl.overheid.aerius.shared.domain.v2.point.CalculationPointFeature;
Expand All @@ -43,13 +45,9 @@ private GMLScenarioHelper() {
*/
public static MetaDataInput constructMetaData(final Scenario scenario, final ScenarioSituation situation, final BooleanSupplier resultsIncluded,
final String aeriusVersion, final String databaseVersion) {
final MetaDataInput metaData = new MetaDataInput();
metaData.setTheme(scenario.getTheme());
final MetaDataInput metaData = constructMetaData(scenario.getTheme(), situation.getYear(), aeriusVersion, databaseVersion, scenario.getOptions());

metaData.setScenarioMetaData(scenario.getMetaData());
metaData.setYear(situation.getYear());
metaData.setVersion(aeriusVersion);
metaData.setDatabaseVersion(databaseVersion);
metaData.setOptions(scenario.getOptions());
metaData.setResultsIncluded(resultsIncluded.getAsBoolean());
metaData.setReference(situation.getReference());
scenario.getSituations().stream()
Expand All @@ -64,21 +62,29 @@ public static MetaDataInput constructMetaData(final Scenario scenario, final Sce
*/
public static MetaDataInput constructArchiveMetaData(final Scenario scenario, final int year, final ArchiveMetaData archiveMetaData,
final String aeriusVersion, final String databaseVersion) {
final MetaDataInput metaData = new MetaDataInput();
metaData.setTheme(scenario.getTheme());
final MetaDataInput metaData = constructMetaData(scenario.getTheme(), year, aeriusVersion, databaseVersion, scenario.getOptions());

metaData.setScenarioMetaData(new ScenarioMetaData());
metaData.setArchiveMetaData(archiveMetaData);
metaData.setYear(year);
metaData.setVersion(aeriusVersion);
metaData.setDatabaseVersion(databaseVersion);
metaData.setOptions(scenario.getOptions());
metaData.setResultsIncluded(true);
scenario.getSituations().stream()
.map(GMLScenarioHelper::otherSituation)
.forEach(metaData::addOtherSituation);
return metaData;
}

public static MetaDataInput constructMetaData(final Theme theme, final int year, final String aeriusVersion, final String databaseVersion,
final CalculationSetOptions options) {
final MetaDataInput metaData = new MetaDataInput();

metaData.setTheme(theme);
metaData.setYear(year);
metaData.setVersion(aeriusVersion);
metaData.setDatabaseVersion(databaseVersion);
metaData.setOptions(options);
return metaData;
}

private static OtherSituationMetaData otherSituation(final ScenarioSituation situation) {
return OtherSituationMetaData.Builder
// Reference and name might be null at this point, in that case, use empty string as a fallback as they are required fields in IMAER.
Expand All @@ -94,16 +100,7 @@ private static OtherSituationMetaData otherSituation(final ScenarioSituation sit
* Receptor points can be either with or without results. The custom calculation points in the situation will not be used.
*/
public static IsScenario constructScenario(final ScenarioSituation situation, final List<CalculationPointFeature> receptorPoints) {
return GMLScenario.Builder.create(situation.getName(), situation.getType())
.nettingFactor(situation.getNettingFactor())
.sources(situation.getSources().getFeatures())
.buildings(situation.getBuildingsList())
.calculationPoints(receptorPoints)
.cimlkDispersionLines(situation.getCimlkDispersionLinesList())
.cimlkCorrections(situation.getCimlkCorrections())
.cimlkMeasures(situation.getCimlkMeasuresList())
.definitions(situation.getDefinitions())
.build();
return GMLScenario.Builder.create(situation, receptorPoints).build();
}

}
Loading