Skip to content

Commit e75623e

Browse files
committed
fix(fhir): make sure fields configured via _summary are...
...returned even if user explicitly specifies additional fields via `_elements`
1 parent a5fd6ec commit e75623e

File tree

2 files changed

+5
-1
lines changed

2 files changed

+5
-1
lines changed

core/com.b2international.snowowl.core/src/com/b2international/snowowl/core/request/IndexResourceRequestBuilder.java

+4
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,10 @@ public abstract class IndexResourceRequestBuilder<B extends IndexResourceRequest
3434

3535
protected IndexResourceRequestBuilder() {}
3636

37+
protected final List<String> fields() {
38+
return fields;
39+
}
40+
3741
public final B setExpand(String...expand) {
3842
if (!CompareUtils.isEmpty(expand)) {
3943
return setExpand(String.join(",", expand));

fhir/com.b2international.snowowl.fhir.core/src/com/b2international/snowowl/fhir/core/request/FhirResourceSearchRequestBuilder.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ public final B setElements(Iterable<String> elements) {
106106
if (elements == null) {
107107
return getSelf();
108108
} else {
109-
final Set<String> fields = new LinkedHashSet<>();
109+
final Set<String> fields = new LinkedHashSet<>(fields()); // always get the already configured field values
110110
// when called with a non-null value, make sure mandatory fields are implicitly included
111111
fields.addAll(getMandatoryFields());
112112
// add all other fields

0 commit comments

Comments
 (0)