Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

#

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

SO-4916: Add language to suggest API parameters #882

Merged
merged 5 commits into from
Aug 25, 2021
Merged

SO-4916: Add language to suggest API parameters #882

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
6e54d9a
SO-4916: add language parameter
Aug 24, 2021
d5d3b0c
SO-4916: remove invalid modifiers
Aug 24, 2021
2c0a5e6
Merge remote-tracking branch 'origin/8.x' into issue/SO-4916-add-lang…
Aug 25, 2021
9459583
SO-4916: add acceptLanguage fallback to header params
Aug 25, 2021
7dbffaf
SO-4916: remove default value of acceptLanguage
Aug 25, 2021
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
10 changes: 10 additions & 0 deletions ...wl.core.rest/src/com/b2international/snowowl/core/rest/suggest/SuggestRestParameters.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,9 @@ public class SuggestRestParameters {

@Parameter(description = "The preferred term display in case of SNOMED CT", example = "PT", schema = @Schema(allowableValues = {"FSN", "PT", "ID_ONLY"}, defaultValue = "PT"))
private String preferredDisplay = "PT";

@Parameter(description = "Accepted language tags, in order of preference", example = "en-US;q=0.8,en-GB;q=0.6")
private String acceptLanguage = "en-US;q=0.8,en-GB;q=0.6";

public String getCodeSystemPath() {
return codeSystemPath;
Expand Down Expand Up @@ -67,4 +70,11 @@ public void setPreferredDisplay(String preferredDisplay) {
this.preferredDisplay = preferredDisplay;
}

public String getAcceptLanguage() {
return acceptLanguage;
}

public void setAcceptLanguage(String acceptLanguage) {
this.acceptLanguage = acceptLanguage;
}
}
3 changes: 3 additions & 0 deletions ...owowl.core.rest/src/com/b2international/snowowl/core/rest/suggest/SuggestRestService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@ public class SuggestRestService extends AbstractRestService {
public Promise<Suggestions> getSuggest(@ParameterObject final SuggestRestParameters params) {
return CodeSystemRequests.prepareSuggestConcepts()
.setLimit(params.getLimit())
.setLocales(params.getAcceptLanguage())
.setPreferredDisplay(params.getPreferredDisplay())
.filterByTerm(params.getTerm())
.sortBy(SORT_BY)
Expand All @@ -72,6 +73,7 @@ public Promise<Suggestions> getSuggest(@ParameterObject final SuggestRestParamet
public Promise<Suggestions> postSuggest(@RequestBody final SuggestRestParameters body) {
return CodeSystemRequests.prepareSuggestConcepts()
.setLimit(body.getLimit())
.setLocales(body.getAcceptLanguage())
.setPreferredDisplay(body.getPreferredDisplay())
.filterByTerm(body.getTerm())
.sortBy(SORT_BY)
Expand All @@ -91,6 +93,7 @@ public Promise<List<Object>> postBulkSuggest(@RequestBody final List<SuggestRest
final List<Promise<Suggestions>> promises = body.stream().map(params -> {
return CodeSystemRequests.prepareSuggestConcepts()
.setLimit(params.getLimit())
.setLocales(params.getAcceptLanguage())
.setPreferredDisplay(params.getPreferredDisplay())
.filterByTerm(params.getTerm())
.sortBy(SORT_BY)
Expand Down