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

Fix for compile error seen for Eclipse (issue 2390) (#2395) #2396

Merged
merged 2 commits into from
Nov 4, 2024
Merged

Fix for compile error seen for Eclipse (issue 2390) (#2395) #2396

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7b5fa5c
Fix for compile error seen for Eclipse (issue 2390) (#2395)
greshje Sep 16, 2024
fee2d31
Removed empty mvn file.
chrisknoll Nov 4, 2024
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
29 changes: 27 additions & 2 deletions src/main/java/org/ohdsi/webapi/check/builder/AbstractForEachValidatorBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,9 +41,34 @@ public final AbstractForEachValidatorBuilder<T, V> groups(ValidatorGroupBuilder<
}

protected List<ValidatorGroup<T, ?>> initGroups() {
return initAndBuildList(this.validatorGroupBuilders);
return initAndBuildGroupList(this.validatorGroupBuilders);
}

// Note: exact same functionality as initAndBuildList, just needed a different call signature.
// This method was added to enable development using Eclipse
private List<ValidatorGroup<T, ?>> initAndBuildGroupList(List<ValidatorGroupBuilder<T, ?>> builders) {

builders.forEach(builder -> {
if (Objects.isNull(builder.getBasePath())) {
builder.basePath(createChildPath());
}
if (Objects.isNull(builder.getErrorMessage())) {
builder.errorMessage(this.errorMessage);
}
if (Objects.isNull(builder.getSeverity())) {
builder.severity(this.severity);
}
if (Objects.isNull(builder.getAttrName())) {
builder.attrName(this.attrName);
}
});
return builders.stream()
.map(ValidatorBaseBuilder::build)
.collect(Collectors.toList());


}

protected List<Validator<T>> initValidators() {
return initAndBuildList(this.validatorBuilders);
}
Expand All @@ -70,4 +95,4 @@ private <U> List<U> initAndBuildList(List<? extends ValidatorBaseBuilder<T, U, ?


}
}
}
26 changes: 24 additions & 2 deletions src/main/java/org/ohdsi/webapi/check/builder/ValidatorGroupBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,12 +63,34 @@ protected Path createChildPath() {

public ValidatorGroup<T, V> build() {

List<ValidatorGroup<V, ?>> groups = initAndBuildList(this.validatorGroupBuilders);
List<ValidatorGroup<V, ?>> groups = initAndBuildGroupList(this.validatorGroupBuilders);
List<Validator<V>> validators = initAndBuildList(this.validatorBuilders);

return new ValidatorGroup<>(validators, groups, valueGetter, conditionGetter);
}

// Note: exact same functionality as initAndBuildList, just needed a different call signature.
// This method was added to enable development using Eclipse
private List<ValidatorGroup<V, ?>> initAndBuildGroupList(List<ValidatorGroupBuilder<V, ?>> builders) {

builders.forEach(builder -> {
if (Objects.nonNull(this.errorMessage)) {
builder.errorMessage(this.errorMessage);
}
if (Objects.isNull(builder.getBasePath())) {
builder.basePath(createChildPath());
}
if (Objects.isNull(builder.severity)) {
builder.severity(this.severity);
}
});
return builders.stream()
.map(ValidatorBaseBuilder::build)
.collect(Collectors.toList());


}

private <U> List<U> initAndBuildList(List<? extends ValidatorBaseBuilder<V, U, ?>> builders) {

builders.forEach(builder -> {
Expand All @@ -89,4 +111,4 @@ private <U> List<U> initAndBuildList(List<? extends ValidatorBaseBuilder<V, U, ?

}

}
}
Loading