From a2223c4029fb317767699ac08fc22ead7a576238 Mon Sep 17 00:00:00 2001 From: streamnativebot Date: Sat, 12 Sep 2026 05:47:49 +0000 Subject: [PATCH 1/2] "Created by snbot" From 1e8d82b87f0701b3c803718fb4afc8d90a40b604 Mon Sep 17 00:00:00 2001 From: Jiwei Guo Date: Mon, 14 Sep 2026 10:16:00 +0800 Subject: [PATCH 2/2] Fix qpid jms auth test Jetty API --- .../extensions/sasl/AuthenticationTest.java | 30 ++++++++----------- 1 file changed, 13 insertions(+), 17 deletions(-) diff --git a/tests-qpid-jms-client/src/test/java/io/streamnative/pulsar/handlers/amqp/qpid/jms_1_1/extensions/sasl/AuthenticationTest.java b/tests-qpid-jms-client/src/test/java/io/streamnative/pulsar/handlers/amqp/qpid/jms_1_1/extensions/sasl/AuthenticationTest.java index 76760df8a..25fcb549c 100644 --- a/tests-qpid-jms-client/src/test/java/io/streamnative/pulsar/handlers/amqp/qpid/jms_1_1/extensions/sasl/AuthenticationTest.java +++ b/tests-qpid-jms-client/src/test/java/io/streamnative/pulsar/handlers/amqp/qpid/jms_1_1/extensions/sasl/AuthenticationTest.java @@ -28,7 +28,7 @@ import io.streamnative.pulsar.handlers.amqp.qpid.core.JmsTestBase; import io.streamnative.pulsar.handlers.amqp.qpid.jms_1_1.extensions.BrokerManagementHelper; import java.io.IOException; -import java.io.OutputStream; +import java.nio.ByteBuffer; import java.nio.file.Files; import java.nio.file.Path; import java.nio.file.StandardCopyOption; @@ -43,9 +43,6 @@ import javax.jms.Session; import javax.jms.TemporaryQueue; import javax.naming.NamingException; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; import org.apache.qpid.server.model.Port; import org.apache.qpid.server.model.Protocol; import org.apache.qpid.server.security.FileTrustStore; @@ -60,11 +57,14 @@ import org.apache.qpid.test.utils.tls.PrivateKeyEntry; import org.apache.qpid.test.utils.tls.TlsResource; import org.apache.qpid.test.utils.tls.TlsResourceBuilder; -import org.eclipse.jetty.ee8.nested.AbstractHandler; -import org.eclipse.jetty.ee8.nested.ContextHandler; -import org.eclipse.jetty.ee8.nested.HandlerCollection; +import org.eclipse.jetty.http.HttpStatus; +import org.eclipse.jetty.server.Handler; +import org.eclipse.jetty.server.Request; +import org.eclipse.jetty.server.Response; import org.eclipse.jetty.server.Server; import org.eclipse.jetty.server.ServerConnector; +import org.eclipse.jetty.server.handler.ContextHandler; +import org.eclipse.jetty.util.Callback; import org.hamcrest.Matchers; import org.junit.AfterClass; import org.junit.BeforeClass; @@ -109,7 +109,7 @@ public class AuthenticationTest extends JmsTestBase private static final String USER_PASSWORD = "user"; private static final Server CRL_SERVER = new Server(); - private static final HandlerCollection HANDLERS = new HandlerCollection(); + private static final Handler.Sequence HANDLERS = new Handler.Sequence(); private static final String CRL_TEMPLATE = "http://localhost:%d/%s"; @@ -832,7 +832,7 @@ public static String createDataUrlForFile(Path file) throws IOException return DataUrlUtils.getDataUrlForBytes(Files.readAllBytes(file)); } - private static class CrlServerHandler extends AbstractHandler + private static class CrlServerHandler extends Handler.Abstract { final Path crlPath; @@ -842,15 +842,11 @@ private static class CrlServerHandler extends AbstractHandler } @Override - public void handle(String s, org.eclipse.jetty.ee8.nested.Request request, - HttpServletRequest httpServletRequest, - HttpServletResponse response) throws IOException, ServletException { + public boolean handle(Request request, Response response, Callback callback) throws IOException { final byte[] crlBytes = Files.readAllBytes(crlPath); - response.setStatus(HttpServletResponse.SC_OK); - try (final OutputStream responseBody = response.getOutputStream()) - { - responseBody.write(crlBytes); - } + response.setStatus(HttpStatus.OK_200); + response.write(true, ByteBuffer.wrap(crlBytes), callback); + return true; } } }