Merge branch 'master' into rel_4_2_0

This commit is contained in:
jamesagnew
2020-02-16 09:27:05 -05:00
7 changed files with 268 additions and 640 deletions

View File

@@ -14,7 +14,6 @@ import org.eclipse.jetty.websocket.api.Session;
import org.eclipse.jetty.websocket.client.ClientUpgradeRequest;
import org.eclipse.jetty.websocket.client.WebSocketClient;
import org.hl7.fhir.instance.model.api.IIdType;
import org.hl7.fhir.r4.model.codesystems.SubscriptionChannelType;
import org.hl7.fhir.r5.model.*;
import org.junit.AfterClass;
import org.junit.BeforeClass;
@@ -76,8 +75,8 @@ public class ExampleServerR5IT {
Subscription.SubscriptionChannelComponent channel = new Subscription.SubscriptionChannelComponent();
channel.getType().addCoding()
.setSystem(SubscriptionChannelType.WEBSOCKET.getSystem())
.setCode(SubscriptionChannelType.WEBSOCKET.toCode());
.setSystem("http://terminology.hl7.org/CodeSystem/subscription-channel-type")
.setCode("websocket");
channel.getPayload().setContentType("application/json");
subscription.setChannel(channel);