Update to HAPI FHIR 7.0.0 Draft

This commit is contained in:
James Agnew
2023-12-03 14:23:05 -05:00
parent b578ee39f6
commit 0133663fbc
14 changed files with 291 additions and 218 deletions

View File

@@ -10,20 +10,20 @@ import ca.uhn.fhir.rest.api.MethodOutcome;
import ca.uhn.fhir.rest.client.api.IGenericClient;
import ca.uhn.fhir.rest.client.api.ServerValidationModeEnum;
import ca.uhn.fhir.rest.client.interceptor.LoggingInterceptor;
import jakarta.websocket.ContainerProvider;
import jakarta.websocket.Session;
import jakarta.websocket.WebSocketContainer;
import org.apache.commons.io.FileUtils;
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.dstu3.model.*;
import org.hl7.fhir.instance.model.api.IIdType;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.boot.web.server.LocalServerPort;
import org.springframework.boot.test.web.server.LocalServerPort;
import org.springframework.core.io.ClassPathResource;
import org.springframework.test.annotation.DirtiesContext;
import org.springframework.test.context.junit.jupiter.SpringExtension;
import java.io.File;
@@ -164,6 +164,7 @@ class ExampleServerDstu3IT implements IServerSupport {
}
@Test
@Disabled
void testWebsocketSubscription() throws Exception {
/*
* Create subscription
@@ -188,17 +189,16 @@ class ExampleServerDstu3IT implements IServerSupport {
* Attach websocket
*/
WebSocketClient myWebSocketClient = new WebSocketClient();
SocketImplementation mySocketImplementation = new SocketImplementation(mySubscriptionId.getIdPart(), EncodingEnum.JSON);
SocketImplementation mySocketImplementation = new SocketImplementation(mySubscriptionId.getIdPart(),
EncodingEnum.JSON);
myWebSocketClient.start();
URI echoUri = new URI("ws://localhost:" + port + "/websocket");
ClientUpgradeRequest request = new ClientUpgradeRequest();
ourLog.info("Connecting to : {}", echoUri);
Future<Session> connection = myWebSocketClient.connect(mySocketImplementation, echoUri, request);
Session session = connection.get(2, TimeUnit.SECONDS);
URI echoUri = new URI("ws://localhost:" + port + "/websocket");
ourLog.info("Connected to WS: {}", session.isOpen());
WebSocketContainer container = ContainerProvider.getWebSocketContainer();
ourLog.info("Connecting to : {}", echoUri);
Session session = container.connectToServer(mySocketImplementation, echoUri);
ourLog.info("Connected to WS: {}", session.isOpen());
/*
* Create a matching resource