Skip to content

Commit faa0f57

Browse files
chrisknollgreshje
andauthored
Fix for compile error seen for Eclipse (issue 2390) (#2395) (#2396)
* Fix for compile error seen for Eclipse (issue 2390) (#2395) --------- Co-authored-by: greshje <[email protected]>
1 parent b9feca7 commit faa0f57

File tree

2 files changed

+51
-4
lines changed

2 files changed

+51
-4
lines changed

src/main/java/org/ohdsi/webapi/check/builder/AbstractForEachValidatorBuilder.java

+27-2
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,34 @@ public final AbstractForEachValidatorBuilder<T, V> groups(ValidatorGroupBuilder<
4141
}
4242

4343
protected List<ValidatorGroup<T, ?>> initGroups() {
44-
return initAndBuildList(this.validatorGroupBuilders);
44+
return initAndBuildGroupList(this.validatorGroupBuilders);
4545
}
4646

47+
// Note: exact same functionality as initAndBuildList, just needed a different call signature.
48+
// This method was added to enable development using Eclipse
49+
private List<ValidatorGroup<T, ?>> initAndBuildGroupList(List<ValidatorGroupBuilder<T, ?>> builders) {
50+
51+
builders.forEach(builder -> {
52+
if (Objects.isNull(builder.getBasePath())) {
53+
builder.basePath(createChildPath());
54+
}
55+
if (Objects.isNull(builder.getErrorMessage())) {
56+
builder.errorMessage(this.errorMessage);
57+
}
58+
if (Objects.isNull(builder.getSeverity())) {
59+
builder.severity(this.severity);
60+
}
61+
if (Objects.isNull(builder.getAttrName())) {
62+
builder.attrName(this.attrName);
63+
}
64+
});
65+
return builders.stream()
66+
.map(ValidatorBaseBuilder::build)
67+
.collect(Collectors.toList());
68+
69+
70+
}
71+
4772
protected List<Validator<T>> initValidators() {
4873
return initAndBuildList(this.validatorBuilders);
4974
}
@@ -70,4 +95,4 @@ private <U> List<U> initAndBuildList(List<? extends ValidatorBaseBuilder<T, U, ?
7095

7196

7297
}
73-
}
98+
}

src/main/java/org/ohdsi/webapi/check/builder/ValidatorGroupBuilder.java

+24-2
Original file line numberDiff line numberDiff line change
@@ -63,12 +63,34 @@ protected Path createChildPath() {
6363

6464
public ValidatorGroup<T, V> build() {
6565

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

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

72+
// Note: exact same functionality as initAndBuildList, just needed a different call signature.
73+
// This method was added to enable development using Eclipse
74+
private List<ValidatorGroup<V, ?>> initAndBuildGroupList(List<ValidatorGroupBuilder<V, ?>> builders) {
75+
76+
builders.forEach(builder -> {
77+
if (Objects.nonNull(this.errorMessage)) {
78+
builder.errorMessage(this.errorMessage);
79+
}
80+
if (Objects.isNull(builder.getBasePath())) {
81+
builder.basePath(createChildPath());
82+
}
83+
if (Objects.isNull(builder.severity)) {
84+
builder.severity(this.severity);
85+
}
86+
});
87+
return builders.stream()
88+
.map(ValidatorBaseBuilder::build)
89+
.collect(Collectors.toList());
90+
91+
92+
}
93+
7294
private <U> List<U> initAndBuildList(List<? extends ValidatorBaseBuilder<V, U, ?>> builders) {
7395

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

90112
}
91113

92-
}
114+
}

0 commit comments

Comments
 (0)