honeymoose
/
hapi-fhir
mirror of https://github.com/hapifhir/hapi-fhir.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge 66b347508d into 96e1c2a5db

This commit is contained in:
Primož Delopst 2024-11-07 11:04:18 -05:00 committed by GitHub
parent 96e1c2a5db 66b347508d
commit ce7ee0cf3e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 58 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
hapi-fhir-server-openapi/src/main/java/ca/uhn/fhir/rest/openapi/OpenApiInterceptor.java
View File

@ -110,6 +110,7 @@ import java.io.InputStream;
import java.math.BigDecimal;
import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
import java.util.Iterator;
import java.util.LinkedHashMap;
@ -619,13 +620,22 @@ public class OpenApiInterceptor {
getPathItem(paths, "/" + resourceType, PathItem.HttpMethod.GET),
ctx,
resourceType,
nextResource);
nextResource,
PathItem.HttpMethod.GET);
addSearchOperation(
openApi,
getPathItem(paths, "/" + resourceType + "/_search", PathItem.HttpMethod.GET),
ctx,
resourceType,
nextResource);
nextResource,
PathItem.HttpMethod.GET);
addSearchOperation(
openApi,
getPathItem(paths, "/" + resourceType + "/_search", PathItem.HttpMethod.POST),
ctx,
resourceType,
nextResource,
PathItem.HttpMethod.POST);
}
// Resource-level Operations
@ -674,22 +684,42 @@ public class OpenApiInterceptor {
final Operation operation,
final FhirContext ctx,
final String resourceType,
final CapabilityStatement.CapabilityStatementRestResourceComponent nextResource) {
final CapabilityStatement.CapabilityStatementRestResourceComponent nextResource,
final PathItem.HttpMethod httpMethod) {
operation.addTagsItem(resourceType);
operation.setDescription("This is a search type");
operation.setSummary("search-type: Search for " + resourceType + " instances");
addFhirResourceResponse(ctx, openApi, operation, null);
for (final CapabilityStatement.CapabilityStatementRestResourceSearchParamComponent nextSearchParam :
if (httpMethod == PathItem.HttpMethod.GET) {
for (final CapabilityStatement.CapabilityStatementRestResourceSearchParamComponent nextSearchParam :
nextResource.getSearchParam()) {
final Parameter parametersItem = new Parameter();
operation.addParametersItem(parametersItem);
final Parameter parametersItem = new Parameter();
operation.addParametersItem(parametersItem);
parametersItem.setName(nextSearchParam.getName());
parametersItem.setRequired(false);
parametersItem.setIn("query");
parametersItem.setDescription(nextSearchParam.getDocumentation());
parametersItem.setSchema(toSchema(nextSearchParam.getType()));
parametersItem.setName(nextSearchParam.getName());
parametersItem.setRequired(false);
parametersItem.setIn("query");
parametersItem.setDescription(nextSearchParam.getDocumentation());
parametersItem.setSchema(toSchema(nextSearchParam.getType()));
}
} else {
Schema<?> objectSchema = new Schema<>().type("object");
for (final CapabilityStatement.CapabilityStatementRestResourceSearchParamComponent nextSearchParam :
nextResource.getSearchParam()) {
objectSchema.addProperty(
nextSearchParam.getName(),
toSchema(nextSearchParam.getType())
.required(Collections.emptyList())
.nullable(true)
.description(nextSearchParam.getDocumentation()));
}
RequestBody requestBody = new RequestBody()
.content(new Content()
.addMediaType(Constants.CT_X_FORM_URLENCODED, new MediaType().schema(objectSchema)))
.required(false);
operation.setRequestBody(requestBody);
}
}

17
hapi-fhir-server-openapi/src/main/resources/ca/uhn/fhir/rest/openapi/index.html
View File

@ -43,6 +43,22 @@
<script src="./swagger-ui-standalone-preset.js" charset="UTF-8"> </script>
<script>
window.onload = function() {
//Uncheck send empty value by default
const UncheckSendEmptyValuePlugin = function() {
return {
wrapComponents: {
ParameterIncludeEmpty: (Original, { React }) => (props) => {
props.isIncludedOptions.defaultValue = false;
return React.createElement(Original, props)
},
TryItOutButton: (Original, { React }) => (props) => {
if (props.isOAS3 && props.hasUserEditedBody) { props.hasUserEditedBody = false; }
return React.createElement(Original, props)
}
}
}
};
// Begin Swagger UI call region
const ui = SwaggerUIBundle({
url: "[[${OPENAPI_DOCS} + '?page=' + ${PAGE}]]",
@ -53,6 +69,7 @@
SwaggerUIStandalonePreset
],
plugins: [
UncheckSendEmptyValuePlugin
// SwaggerUIBundle.plugins.DownloadUrl
],
// layout: "StandaloneLayout",