* This setting changes the default behaviour if no Prefer header is supplied by the client. - * The default is {@link PreferHeader.PreferReturnEnum#REPRESENTATION} + * The default is {@link PreferReturnEnum#REPRESENTATION} *
* * @see HL7 FHIR Specification section on the Prefer header */ @Override - public PreferHeader.PreferReturnEnum getDefaultPreferReturn() { + public PreferReturnEnum getDefaultPreferReturn() { return myDefaultPreferReturn; } @@ -1786,12 +1786,12 @@ public class RestfulServer extends HttpServlet implements IRestfulServer* This setting changes the default behaviour if no Prefer header is supplied by the client. - * The default is {@link PreferHeader.PreferReturnEnum#REPRESENTATION} + * The default is {@link PreferReturnEnum#REPRESENTATION} *
* * @see HL7 FHIR Specification section on the Prefer header */ - public void setDefaultPreferReturn(PreferHeader.PreferReturnEnum theDefaultPreferReturn) { + public void setDefaultPreferReturn(PreferReturnEnum theDefaultPreferReturn) { Validate.notNull(theDefaultPreferReturn, "theDefaultPreferReturn must not be null"); myDefaultPreferReturn = theDefaultPreferReturn; } diff --git a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/RestfulServerUtils.java b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/RestfulServerUtils.java index e27ad31748e..5246f524173 100644 --- a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/RestfulServerUtils.java +++ b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/RestfulServerUtils.java @@ -704,7 +704,7 @@ public class RestfulServerUtils { value = value.substring(1, value.length() - 1); } - retVal.setReturn(PreferHeader.PreferReturnEnum.fromHeaderValue(value)); + retVal.setReturn(PreferReturnEnum.fromHeaderValue(value)); } else if (key.equals(Constants.HEADER_PREFER_RESPOND_ASYNC)) { diff --git a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/method/BaseOutcomeReturningMethodBinding.java b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/method/BaseOutcomeReturningMethodBinding.java index f66e1699936..5a4e95c5543 100644 --- a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/method/BaseOutcomeReturningMethodBinding.java +++ b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/method/BaseOutcomeReturningMethodBinding.java @@ -184,8 +184,8 @@ abstract class BaseOutcomeReturningMethodBinding extends BaseMethodBinding