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

Merge pull request #520 from aehrc/feature/legacyContentTypeFHIR140 

Ensure that older DSTU3 versions use the legacy mime types
This commit is contained in:
James Agnew 2016-12-10 14:18:15 -05:00 committed by GitHub
parent ee63bbea74 8846477b7b
commit 47ea6c3426
1 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/server/RestfulServerUtils.java
View File

@ -77,6 +77,15 @@ public class RestfulServerUtils {
private static final HashSet<String> TEXT_ENCODE_ELEMENTS = new HashSet<String>(Arrays.asList("Bundle", "*.text", "*.(mandatory)")); private static final HashSet<String> TEXT_ENCODE_ELEMENTS = new HashSet<String>(Arrays.asList("Bundle", "*.text", "*.(mandatory)"));
private static String actualDstu3FhirVersion = FhirVersionEnum.DSTU3.getFhirVersionString();
static {
try {
Class c = Class.forName("org.hl7.fhir.dstu3.model.Constants");
actualDstu3FhirVersion = (String) c.getDeclaredField("VERSION").get(null);
} catch (Exception e) {
}
}
public static void configureResponseParser(RequestDetails theRequestDetails, IParser parser) { public static void configureResponseParser(RequestDetails theRequestDetails, IParser parser) {
// Pretty print // Pretty print
boolean prettyPrint = RestfulServerUtils.prettyPrintResponse(theRequestDetails.getServer(), theRequestDetails); boolean prettyPrint = RestfulServerUtils.prettyPrintResponse(theRequestDetails.getServer(), theRequestDetails);
@ -757,12 +766,16 @@ public class RestfulServerUtils {
myEncoding = theEncoding; myEncoding = theEncoding;
if (theContentType != null) { if (theContentType != null) {
if (theContentType.equals(EncodingEnum.JSON_PLAIN_STRING) || theContentType.equals(EncodingEnum.XML_PLAIN_STRING)) { if (theContentType.equals(EncodingEnum.JSON_PLAIN_STRING) || theContentType.equals(EncodingEnum.XML_PLAIN_STRING)) {
myNonLegacy = !theCtx.getVersion().getVersion().isOlderThan(FhirVersionEnum.DSTU3); FhirVersionEnum ctxtEnum = theCtx.getVersion().getVersion();
myNonLegacy = ctxtEnum.isNewerThan(FhirVersionEnum.DSTU3)
|| (ctxtEnum.isEquivalentTo(FhirVersionEnum.DSTU3) && !"1.4.0".equals(actualDstu3FhirVersion));
} else { } else {
myNonLegacy = EncodingEnum.isNonLegacy(theContentType); myNonLegacy = EncodingEnum.isNonLegacy(theContentType);
} }
} else { } else {
if (theCtx.getVersion().getVersion().isOlderThan(FhirVersionEnum.DSTU3)) { FhirVersionEnum ctxtEnum = theCtx.getVersion().getVersion();
if (ctxtEnum.isOlderThan(FhirVersionEnum.DSTU3)
|| (ctxtEnum.isEquivalentTo(FhirVersionEnum.DSTU3) && "1.4.0".equals(actualDstu3FhirVersion))) {
myNonLegacy = null; myNonLegacy = null;
} else { } else {
myNonLegacy = Boolean.TRUE; myNonLegacy = Boolean.TRUE;