Trying Copilot's suggestion

Author: rjrudin

Jenkinsfile

@@ -175,12 +175,48 @@ pipeline {
           export PATH=$GRADLE_USER_HOME:$JAVA_HOME/bin:$PATH
           cd java-client-api
           // Ensure all modules can be built first.
-          ./gradlew clean build -x test
+//          ./gradlew clean build -x test
 
           // Run a sufficient number of tests to verify the PR.
           // Temporarily running a single test to debug the reverse proxy server
           //./gradlew cleanTest marklogic-client-api:test || true
-          ./gradlew -PtestUseReverseProxyServer=true runReverseProxyServer marklogic-client-api:test --tests ReadDocumentPageTest || true
+
+          // Use a random port to avoid conflicts from previous builds
+          PROXY_PORT=$((8020 + RANDOM % 1000))
+          echo "Using reverse proxy port: $PROXY_PORT"
+          
+          // Check if anything is already using this port
+          echo "Checking what's using port $PROXY_PORT before starting proxy..."
+          netstat -tuln | grep $PROXY_PORT || echo "Port $PROXY_PORT is free"
+
+          // Start reverse proxy server in background and capture its PID
+          ./gradlew -PtestUseReverseProxyServer=true -PrpsHttpPort=$PROXY_PORT test-app:runBlockingReverseProxyServer --stacktrace > reverse-proxy.log 2>&1 &
+          PROXY_PID=$!
+          echo "Started reverse proxy server with PID: $PROXY_PID"
+
+          // Wait for proxy server to be ready
+          sleep 5
+
+          // Check if proxy server is actually listening on the port
+          echo "Checking if reverse proxy is listening on port $PROXY_PORT..."
+          netstat -tuln | grep $PROXY_PORT || echo "WARNING: No process listening on port $PROXY_PORT!"
+
+          // Show the last few lines of the proxy log
+          echo "Reverse proxy log (last 20 lines):"
+          tail -20 reverse-proxy.log || echo "No log file found"
+
+          // Run tests
+          ./gradlew -PtestUseReverseProxyServer=true -DTEST_REVERSE_PROXY_PORT=$PROXY_PORT marklogic-client-api:test --tests ReadDocumentPageTest || true
+
+          // Show the reverse proxy log after tests complete
+          echo "Reverse proxy log after tests (last 50 lines):"
+          tail -50 reverse-proxy.log || echo "No log file found"
+
+          // Kill the reverse proxy server
+          echo "Stopping reverse proxy server (PID: $PROXY_PID)"
+          kill $PROXY_PID 2>/dev/null || true
+          sleep 2
+          kill -9 $PROXY_PID 2>/dev/null || true
         '''
 				// Omitting this until MLE-24523 can be addressed
 				// ./gradlew -PtestUseReverseProxyServer=true test-app:runReverseProxyServer marklogic-client-api-functionaltests:runFastFunctionalTests || true

marklogic-client-api/src/test/java/com/marklogic/client/test/Common.java

@@ -48,7 +48,7 @@ public class Common {
 	final public static String HOST = System.getProperty("TEST_HOST", "localhost");
 
 	final public static boolean USE_REVERSE_PROXY_SERVER = Boolean.parseBoolean(System.getProperty("TEST_USE_REVERSE_PROXY_SERVER", "false"));
-	final public static int PORT = USE_REVERSE_PROXY_SERVER ? 8020 : Integer.parseInt(System.getProperty("TEST_PORT", "8012"));
+	final public static int PORT = USE_REVERSE_PROXY_SERVER ? Integer.parseInt(System.getProperty("TEST_REVERSE_PROXY_PORT", "8020")) : Integer.parseInt(System.getProperty("TEST_PORT", "8012"));
 	final public static String AUTH_TYPE = USE_REVERSE_PROXY_SERVER ? "basic" : System.getProperty("TEST_AUTH_TYPE", "digest");
 	final public static String BASE_PATH = USE_REVERSE_PROXY_SERVER ? "test/marklogic/unit" : System.getProperty("TEST_BASE_PATH", null);
 	final public static boolean WITH_WAIT = Boolean.parseBoolean(System.getProperty("TEST_WAIT", "false"));

test-app/src/main/java/com/marklogic/client/test/ReverseProxyServer.java

@@ -143,13 +143,18 @@ public ReverseProxyServer(String markLogicHost, String serverHost, int serverPor
 
 		Undertow.Builder undertowBuilder = Undertow.builder()
 			.addHttpListener(serverPort, serverHost)
-			.addHttpListener(8022, serverHost, new BlockingHandler(exchange -> handleMarkLogicCloudTokenRequest(exchange)))
+			// Only add the token endpoint listener if secure server port is configured (indicating Data Cloud emulation is needed)
+			// This avoids port conflicts when the /token endpoint isn't needed
 			.setIoThreads(4)
 			.setHandler(ProxyHandler.builder()
 				.setProxyClient(new ReverseProxyClient(mapping))
 				.setMaxRequestTime(30000)
 				.build()
 			);
+		
+		if (secureServerPort > 0) {
+			undertowBuilder.addHttpListener(8022, serverHost, new BlockingHandler(exchange -> handleMarkLogicCloudTokenRequest(exchange)));
+		}
 
 		if (secureServerPort > 0) {
 			logger.info("Adding an HTTPS listener on port: " + secureServerPort + "; note that if this port 443 " +