From 0a95e71cbc26b46f38a4df56e7f1e342fc690ac7 Mon Sep 17 00:00:00 2001
From: Matteo Steccolini <stmsat@gmail.com>
Date: Wed, 3 Jan 2024 15:12:38 +0100
Subject: [PATCH] fixed integration test execution; tests are now done with
 tomcat, unless "jetty" profile is active (in which case they're done with
 jetty)

Test class JpaStarterWebsocketDispatcherConfig emptied, not sure if necessary (it's now missing jetty dependencies)
---
 pom.xml                                       | 26 +++++++----
 .../JpaStarterWebsocketDispatcherConfig.java  | 44 +++++++++----------
 2 files changed, 40 insertions(+), 30 deletions(-)

diff --git a/pom.xml b/pom.xml
index facd1d6..21e428b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -294,6 +294,24 @@
             <artifactId>hapi-fhir-test-utilities</artifactId>
             <version>${project.version}</version>
             <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.eclipse.jetty.ee10</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.eclipse.jetty.ee10.websocket</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.eclipse.jetty</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.eclipse.jetty.websocket</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
 
         <dependency>
@@ -350,14 +368,6 @@
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-test</artifactId>
-            <version>${spring_boot_version}</version>
-            <scope>test</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-jetty</artifactId>
-            <version>${spring_boot_version}</version>
             <scope>test</scope>
         </dependency>
 
diff --git a/src/test/java/ca/uhn/fhir/jpa/starter/JpaStarterWebsocketDispatcherConfig.java b/src/test/java/ca/uhn/fhir/jpa/starter/JpaStarterWebsocketDispatcherConfig.java
index 34c8949..639fda5 100644
--- a/src/test/java/ca/uhn/fhir/jpa/starter/JpaStarterWebsocketDispatcherConfig.java
+++ b/src/test/java/ca/uhn/fhir/jpa/starter/JpaStarterWebsocketDispatcherConfig.java
@@ -1,10 +1,10 @@
 package ca.uhn.fhir.jpa.starter;
 
-import org.eclipse.jetty.ee10.webapp.WebAppContext;
-import org.eclipse.jetty.ee10.websocket.jakarta.server.config.JakartaWebSocketServletContainerInitializer;
-import org.springframework.boot.web.embedded.jetty.JettyServletWebServerFactory;
-import org.springframework.boot.web.server.WebServerFactoryCustomizer;
-import org.springframework.context.annotation.Bean;
+//import org.eclipse.jetty.ee10.webapp.WebAppContext;
+//import org.eclipse.jetty.ee10.websocket.jakarta.server.config.JakartaWebSocketServletContainerInitializer;
+//import org.springframework.boot.web.embedded.jetty.JettyServletWebServerFactory;
+//import org.springframework.boot.web.server.WebServerFactoryCustomizer;
+//import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
 /**
@@ -14,21 +14,21 @@ import org.springframework.context.annotation.Configuration;
 @Configuration
 public class JpaStarterWebsocketDispatcherConfig {
 
-	@Bean
-	public Jetty12WebSocketServletWebServerCustomizer jetty10WebSocketServletWebServerCustomizer() {
-		return new Jetty12WebSocketServletWebServerCustomizer();
-	}
-
-	static class Jetty12WebSocketServletWebServerCustomizer implements WebServerFactoryCustomizer<JettyServletWebServerFactory> {
-
-		@Override
-		public void customize(JettyServletWebServerFactory factory) {
-
-			factory.addServerCustomizers(server -> {
-				WebAppContext ctx = (WebAppContext) server.getHandler();
-				JakartaWebSocketServletContainerInitializer.configure(ctx, null);
-			});
-
-		}
-	}
+//	@Bean
+//	public Jetty12WebSocketServletWebServerCustomizer jetty10WebSocketServletWebServerCustomizer() {
+//		return new Jetty12WebSocketServletWebServerCustomizer();
+//	}
+//
+//	static class Jetty12WebSocketServletWebServerCustomizer implements WebServerFactoryCustomizer<JettyServletWebServerFactory> {
+//
+//		@Override
+//		public void customize(JettyServletWebServerFactory factory) {
+//
+//			factory.addServerCustomizers(server -> {
+//				WebAppContext ctx = (WebAppContext) server.getHandler();
+//				JakartaWebSocketServletContainerInitializer.configure(ctx, null);
+//			});
+//
+//		}
+//	}
 }