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.

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

Added a method to check for static parameters inside of an ActivityType #1492

Merged
merged 1 commit into from
Jul 19, 2024
Merged
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -386,6 +386,10 @@ private ActivityTypeRecord parseActivityType(final PackageElement missionModelEl
final var validations = this.getExportValidations(activityTypeElement, parameters);
final var effectModel = this.getActivityEffectModel(activityTypeElement);

if (!parameters.isEmpty()) {
checkForStaticParameters(name, parameters);
}

final var durationParameterName = effectModel.flatMap(EffectModelRecord::durationParameter);
if (durationParameterName.isPresent()) {
validateControllableDurationParameter(name, parameters, durationParameterName.get());
Expand All @@ -409,6 +413,17 @@ class (old-style) or as a record (new-style) by determining
effectModel);
}

private void checkForStaticParameters(String activityName, List<ParameterRecord> parameters) throws InvalidMissionModelException {
for (final var parameter: parameters) {
if (parameter.element.getModifiers().contains(Modifier.STATIC)) {
throw new InvalidMissionModelException(
mattdailis marked this conversation as resolved.
Show resolved Hide resolved
"In activity " + activityName +
", parameter \"" + parameter.name +"\"" +
" is declared as static, but this is not valid for activity parameters");
}
}
}

private void validateControllableDurationParameter(
final String activityName,
final List<ParameterRecord> parameters,
Expand Down
Loading