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

Remove duplicate constant

This commit is contained in:
Tadgh 2021-03-01 14:00:20 -05:00
parent 27cac16de6
commit 9dd42fa605
7 changed files with 16 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/api/Constants.java
View File

@ -60,11 +60,7 @@ public class Constants {
public static final String CT_FHIR_JSON_NEW = "application/fhir+json"; public static final String CT_FHIR_JSON_NEW = "application/fhir+json";
public static final String CT_FHIR_XML = "application/xml+fhir"; public static final String CT_FHIR_XML = "application/xml+fhir";
/**
* Special Conformance Formats that don't follow normal mediatype rules
*/
public static final String CT_JSON_RAW = "json";
public static final String CT_XML_RAW = "xml";
/** /**
* The FHIR MimeType for XML encoding in FHIR DSTU3+ * The FHIR MimeType for XML encoding in FHIR DSTU3+
*/ */

4
hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/hapi/rest/server/ServerCapabilityStatementProvider.java
View File

@ -224,8 +224,8 @@ public class ServerCapabilityStatementProvider extends BaseServerCapabilityState
retVal.getSoftware().setVersion(serverConfiguration.getServerVersion()); retVal.getSoftware().setVersion(serverConfiguration.getServerVersion());
retVal.addFormat(Constants.CT_FHIR_XML_NEW); retVal.addFormat(Constants.CT_FHIR_XML_NEW);
retVal.addFormat(Constants.CT_FHIR_JSON_NEW); retVal.addFormat(Constants.CT_FHIR_JSON_NEW);
retVal.addFormat(Constants.CT_JSON_RAW); retVal.addFormat(Constants.FORMAT_JSON);
retVal.addFormat(Constants.CT_XML_RAW); retVal.addFormat(Constants.FORMAT_XML);
retVal.setStatus(PublicationStatus.ACTIVE); retVal.setStatus(PublicationStatus.ACTIVE);
CapabilityStatementRestComponent rest = retVal.addRest(); CapabilityStatementRestComponent rest = retVal.addRest();

6
hapi-fhir-structures-dstu3/src/test/java/org/hl7/fhir/dstu3/hapi/rest/server/ServerCapabilityStatementProviderDstu3Test.java
View File

@ -189,9 +189,9 @@ public class ServerCapabilityStatementProviderDstu3Test {
List<String> formatCodes = serverConformance.getFormat().stream().map(c -> c.asStringValue()).collect(Collectors.toList());; List<String> formatCodes = serverConformance.getFormat().stream().map(c -> c.asStringValue()).collect(Collectors.toList());;
assertThat(formatCodes, hasItem(ca.uhn.fhir.rest.api.Constants.CT_JSON_RAW)); assertThat(formatCodes, hasItem(Constants.FORMAT_XML));
assertThat(formatCodes, hasItem(ca.uhn.fhir.rest.api.Constants.CT_XML_RAW)); assertThat(formatCodes, hasItem(Constants.FORMAT_JSON));
assertThat(formatCodes, hasItem(ca.uhn.fhir.rest.api.Constants.CT_FHIR_JSON_NEW)); assertThat(formatCodes, hasItem(Constants.CT_FHIR_JSON_NEW));
assertThat(formatCodes, hasItem(Constants.CT_FHIR_XML_NEW)); assertThat(formatCodes, hasItem(Constants.CT_FHIR_XML_NEW));
} }

4
hapi-fhir-structures-r4/src/main/java/org/hl7/fhir/r4/hapi/rest/server/ServerCapabilityStatementProvider.java
View File

@ -172,8 +172,8 @@ public class ServerCapabilityStatementProvider extends BaseServerCapabilityState
retVal.getSoftware().setVersion(configuration.getServerVersion()); retVal.getSoftware().setVersion(configuration.getServerVersion());
retVal.addFormat(Constants.CT_FHIR_XML_NEW); retVal.addFormat(Constants.CT_FHIR_XML_NEW);
retVal.addFormat(Constants.CT_FHIR_JSON_NEW); retVal.addFormat(Constants.CT_FHIR_JSON_NEW);
retVal.addFormat(Constants.CT_JSON_RAW); retVal.addFormat(Constants.FORMAT_JSON);
retVal.addFormat(Constants.CT_XML_RAW); retVal.addFormat(Constants.FORMAT_XML);
retVal.setStatus(PublicationStatus.ACTIVE); retVal.setStatus(PublicationStatus.ACTIVE);
CapabilityStatementRestComponent rest = retVal.addRest(); CapabilityStatementRestComponent rest = retVal.addRest();

6
hapi-fhir-structures-r4/src/test/java/ca/uhn/fhir/rest/server/ServerCapabilityStatementProviderR4Test.java
View File

@ -541,10 +541,10 @@ public class ServerCapabilityStatementProviderR4Test {
rs.init(createServletConfig()); rs.init(createServletConfig());
CapabilityStatement serverConformance = sc.getServerConformance(createHttpServletRequest(), createRequestDetails(rs)); CapabilityStatement serverConformance = sc.getServerConformance(createHttpServletRequest(), createRequestDetails(rs));
List<String> formatCodes = serverConformance.getFormat().stream().map(c -> c.getCode()).collect(Collectors.toList());; List<String> formatCodes = serverConformance.getFormat().stream().map(c -> c.getCode()).collect(Collectors.toList());
assertThat(formatCodes, hasItem(Constants.CT_JSON_RAW)); assertThat(formatCodes, hasItem(Constants.FORMAT_XML));
assertThat(formatCodes, hasItem(Constants.CT_XML_RAW)); assertThat(formatCodes, hasItem(Constants.FORMAT_JSON));
assertThat(formatCodes, hasItem(Constants.CT_FHIR_JSON_NEW)); assertThat(formatCodes, hasItem(Constants.CT_FHIR_JSON_NEW));
assertThat(formatCodes, hasItem(Constants.CT_FHIR_XML_NEW)); assertThat(formatCodes, hasItem(Constants.CT_FHIR_XML_NEW));
} }

4
hapi-fhir-structures-r5/src/main/java/org/hl7/fhir/r5/hapi/rest/server/ServerCapabilityStatementProvider.java
View File

@ -184,8 +184,8 @@ public class ServerCapabilityStatementProvider extends BaseServerCapabilityState
retVal.getSoftware().setVersion(configuration.getServerVersion()); retVal.getSoftware().setVersion(configuration.getServerVersion());
retVal.addFormat(Constants.CT_FHIR_XML_NEW); retVal.addFormat(Constants.CT_FHIR_XML_NEW);
retVal.addFormat(Constants.CT_FHIR_JSON_NEW); retVal.addFormat(Constants.CT_FHIR_JSON_NEW);
retVal.addFormat(Constants.CT_JSON_RAW); retVal.addFormat(Constants.FORMAT_JSON);
retVal.addFormat(Constants.CT_XML_RAW); retVal.addFormat(Constants.FORMAT_XML);
retVal.setStatus(PublicationStatus.ACTIVE); retVal.setStatus(PublicationStatus.ACTIVE);
CapabilityStatementRestComponent rest = retVal.addRest(); CapabilityStatementRestComponent rest = retVal.addRest();

6
hapi-fhir-structures-r5/src/test/java/ca/uhn/fhir/rest/server/ServerCapabilityStatementProviderR5Test.java
View File

@ -214,9 +214,9 @@ public class ServerCapabilityStatementProviderR5Test {
List<String> formatCodes = serverConformance.getFormat().stream().map(c -> c.getCode()).collect(Collectors.toList());; List<String> formatCodes = serverConformance.getFormat().stream().map(c -> c.getCode()).collect(Collectors.toList());;
assertThat(formatCodes, hasItem(ca.uhn.fhir.rest.api.Constants.CT_JSON_RAW)); assertThat(formatCodes, hasItem(Constants.FORMAT_XML));
assertThat(formatCodes, hasItem(ca.uhn.fhir.rest.api.Constants.CT_XML_RAW)); assertThat(formatCodes, hasItem(Constants.FORMAT_JSON));
assertThat(formatCodes, hasItem(ca.uhn.fhir.rest.api.Constants.CT_FHIR_JSON_NEW)); assertThat(formatCodes, hasItem(Constants.CT_FHIR_JSON_NEW));
assertThat(formatCodes, hasItem(Constants.CT_FHIR_XML_NEW)); assertThat(formatCodes, hasItem(Constants.CT_FHIR_XML_NEW));
} }