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

Fix up comnpile issue

This commit is contained in:
James Agnew 2016-10-12 15:29:40 -04:00
parent f47597d2ec
commit deae820ebe
3 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/server/RestulfulServerConfiguration.java
View File

@ -38,6 +38,13 @@ public class RestulfulServerConfiguration {
private IServerAddressStrategy serverAddressStrategy; private IServerAddressStrategy serverAddressStrategy;
private String conformanceDate; private String conformanceDate;
/**
* Constructor
*/
public RestulfulServerConfiguration() {
super();
}
/** /**
* Get the resourceBindings * Get the resourceBindings
* @return the resourceBindings * @return the resourceBindings

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

@ -72,7 +72,6 @@ public class ServerConformanceProvider implements IServerConformanceProvider<Con
private IdentityHashMap<OperationMethodBinding, String> myOperationBindingToName; private IdentityHashMap<OperationMethodBinding, String> myOperationBindingToName;
private HashMap<String, List<OperationMethodBinding>> myOperationNameToBindings; private HashMap<String, List<OperationMethodBinding>> myOperationNameToBindings;
private String myPublisher = "Not provided"; private String myPublisher = "Not provided";
private RestulfulServerConfiguration myServerConfiguration; private RestulfulServerConfiguration myServerConfiguration;
/* /*
@ -595,10 +594,15 @@ public class ServerConformanceProvider implements IServerConformanceProvider<Con
myPublisher = thePublisher; myPublisher = thePublisher;
} }
@Override
public void setRestfulServer(RestfulServer theRestfulServer) { public void setRestfulServer(RestfulServer theRestfulServer) {
myServerConfiguration = theRestfulServer.createConfiguration(); myServerConfiguration = theRestfulServer.createConfiguration();
} }
RestulfulServerConfiguration getServerConfiguration() {
return myServerConfiguration;
}
private void sortRuntimeSearchParameters(List<RuntimeSearchParam> searchParameters) { private void sortRuntimeSearchParameters(List<RuntimeSearchParam> searchParameters) {
Collections.sort(searchParameters, new Comparator<RuntimeSearchParam>() { Collections.sort(searchParameters, new Comparator<RuntimeSearchParam>() {
@Override @Override

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

@ -568,11 +568,12 @@ public class ServerConformanceProviderDstu3Test {
RestfulServer rsNoType = new RestfulServer(ourCtx); RestfulServer rsNoType = new RestfulServer(ourCtx);
rsNoType.registerProvider(new SearchProviderWithListNoType()); rsNoType.registerProvider(new SearchProviderWithListNoType());
ServerConformanceProvider sc = new ServerConformanceProvider(rsNoType); ServerConformanceProvider scNoType = new ServerConformanceProvider(rsNoType);
rsNoType.setServerConformanceProvider(sc); rsNoType.setServerConformanceProvider(scNoType);
rsNoType.init(createServletConfig()); rsNoType.init(createServletConfig());
scNoType.getServerConfiguration().setConformanceDate("2011-02-22T11:22:33Z");
Conformance conformance = sc.getServerConformance(createHttpServletRequest()); Conformance conformance = scNoType.getServerConformance(createHttpServletRequest());
String confNoType = ourCtx.newXmlParser().setPrettyPrint(true).encodeResourceToString(conformance); String confNoType = ourCtx.newXmlParser().setPrettyPrint(true).encodeResourceToString(conformance);
ourLog.info(confNoType); ourLog.info(confNoType);
@ -581,6 +582,7 @@ public class ServerConformanceProviderDstu3Test {
ServerConformanceProvider scWithType = new ServerConformanceProvider(rsWithType); ServerConformanceProvider scWithType = new ServerConformanceProvider(rsWithType);
rsWithType.setServerConformanceProvider(scWithType); rsWithType.setServerConformanceProvider(scWithType);
rsWithType.init(createServletConfig()); rsWithType.init(createServletConfig());
scWithType.getServerConfiguration().setConformanceDate("2011-02-22T11:22:33Z");
Conformance conformanceWithType = scWithType.getServerConformance(createHttpServletRequest()); Conformance conformanceWithType = scWithType.getServerConformance(createHttpServletRequest());
String confWithType = ourCtx.newXmlParser().setPrettyPrint(true).encodeResourceToString(conformanceWithType); String confWithType = ourCtx.newXmlParser().setPrettyPrint(true).encodeResourceToString(conformanceWithType);