This is an automated email from the ASF dual-hosted git repository.
vavrtom pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/qpid-broker-j.git
The following commit(s) were added to refs/heads/main by this push:
new 4e98986cc1 QPID-8707: [Broker-J] Replace deprecated APIs (#312)
4e98986cc1 is described below
commit 4e98986cc1223710bfb3805d73147f726b7830cf
Author: Daniil Kirilyuk <daniel.kiril...@gmail.com>
AuthorDate: Thu Jul 31 15:02:55 2025 +0200
QPID-8707: [Broker-J] Replace deprecated APIs (#312)
---
.../qpid/server/security/AbstractKeyStore.java | 2 +-
.../qpid/server/security/AbstractTrustStore.java | 2 +-
.../security/SiteSpecificTrustStoreImpl.java | 2 +-
.../TrustAnchorValidatingTrustManager.java | 4 ++--
.../LogbackLoggingSystemLauncherListener.java | 2 +-
.../logging/logback/QpidLoggerTurboFilter.java | 2 +-
.../auth/OAuth2InteractiveAuthenticatorTest.java | 7 +++---
.../management/plugin/servlet/RootServletTest.java | 25 +++++++++++++++----
.../transport/websocket/WebSocketProvider.java | 2 +-
.../qpid/joramtests/admin/JavaBrokerAdmin.java | 2 +-
.../qpid/disttest/jms/QpidRestAPIQueueCreator.java | 2 +-
.../qpid/disttest/json/ObjectMapperFactory.java | 28 +++++++++-------------
.../qpid/test/utils/EmbeddedKdcExtension.java | 2 +-
.../apache/qpid/test/utils/tls/TlsResource.java | 3 +--
.../EndToEndConversionTestBase.java | 14 +++++++----
.../tests/protocol/AbstractFrameTransport.java | 21 ++++++++--------
.../apache/qpid/tck/ManageQpidJMSResources.java | 2 +-
17 files changed, 68 insertions(+), 54 deletions(-)
diff --git
a/broker-core/src/main/java/org/apache/qpid/server/security/AbstractKeyStore.java
b/broker-core/src/main/java/org/apache/qpid/server/security/AbstractKeyStore.java
index fb91bf8fac..c256c452bc 100644
---
a/broker-core/src/main/java/org/apache/qpid/server/security/AbstractKeyStore.java
+++
b/broker-core/src/main/java/org/apache/qpid/server/security/AbstractKeyStore.java
@@ -146,7 +146,7 @@ public abstract class AbstractKeyStore<X extends
AbstractKeyStore<X>>
long timeToExpiry = cert.getNotAfter().getTime() -
currentTime;
int days = Math.max(0,(int)(timeToExpiry / (ONE_DAY)));
-
getEventLogger().message(KeyStoreMessages.EXPIRING(getName(),
String.valueOf(days), cert.getSubjectDN().toString()));
+
getEventLogger().message(KeyStoreMessages.EXPIRING(getName(),
String.valueOf(days), cert.getSubjectX500Principal().getName()));
}
catch(CertificateNotYetValidException e)
{
diff --git
a/broker-core/src/main/java/org/apache/qpid/server/security/AbstractTrustStore.java
b/broker-core/src/main/java/org/apache/qpid/server/security/AbstractTrustStore.java
index 54c6dcf34f..d7b96ad88b 100644
---
a/broker-core/src/main/java/org/apache/qpid/server/security/AbstractTrustStore.java
+++
b/broker-core/src/main/java/org/apache/qpid/server/security/AbstractTrustStore.java
@@ -286,7 +286,7 @@ public abstract class AbstractTrustStore<X extends
AbstractTrustStore<X>>
long timeToExpiry = cert.getNotAfter().getTime() - currentTime;
int days = Math.max(0,(int)(timeToExpiry / (ONE_DAY)));
- getEventLogger().message(TrustStoreMessages.EXPIRING(getName(),
String.valueOf(days), cert.getSubjectDN().toString()));
+ getEventLogger().message(TrustStoreMessages.EXPIRING(getName(),
String.valueOf(days), cert.getSubjectX500Principal().getName()));
}
catch(CertificateNotYetValidException e)
{
diff --git
a/broker-core/src/main/java/org/apache/qpid/server/security/SiteSpecificTrustStoreImpl.java
b/broker-core/src/main/java/org/apache/qpid/server/security/SiteSpecificTrustStoreImpl.java
index a440666f8e..9d7b6cac75 100644
---
a/broker-core/src/main/java/org/apache/qpid/server/security/SiteSpecificTrustStoreImpl.java
+++
b/broker-core/src/main/java/org/apache/qpid/server/security/SiteSpecificTrustStoreImpl.java
@@ -244,7 +244,7 @@ public class SiteSpecificTrustStoreImpl
{
final X509Certificate x509Certificate =
(X509Certificate) certificateChain[0];
LOGGER.debug("Successfully downloaded
X509Certificate with DN {} certificate from {}",
- x509Certificate.getSubjectDN(), url);
+
x509Certificate.getSubjectX500Principal().getName(), url);
return x509Certificate;
}
else
diff --git
a/broker-core/src/main/java/org/apache/qpid/server/security/TrustAnchorValidatingTrustManager.java
b/broker-core/src/main/java/org/apache/qpid/server/security/TrustAnchorValidatingTrustManager.java
index 81483c16b2..a8a1f5af11 100644
---
a/broker-core/src/main/java/org/apache/qpid/server/security/TrustAnchorValidatingTrustManager.java
+++
b/broker-core/src/main/java/org/apache/qpid/server/security/TrustAnchorValidatingTrustManager.java
@@ -90,8 +90,8 @@ class TrustAnchorValidatingTrustManager implements
X509TrustManager
LOGGER.warn("Authentication failed for peer bearing certificate
(subject DN '{}') "
+ "as the trust anchor (subject DN '{}') within
truststore '{}' "
+ "is either expired or not yet valid. Validity range
{} - {}",
- peerCertificate.getSubjectDN(),
- trustAnchorCert.getSubjectDN(),
+ peerCertificate.getSubjectX500Principal().getName(),
+ trustAnchorCert.getSubjectX500Principal().getName(),
_trustStoreName,
trustAnchorCert.getNotBefore(),
trustAnchorCert.getNotAfter());
diff --git
a/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/LogbackLoggingSystemLauncherListener.java
b/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/LogbackLoggingSystemLauncherListener.java
index fbbf3e5953..a56e2702e1 100644
---
a/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/LogbackLoggingSystemLauncherListener.java
+++
b/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/LogbackLoggingSystemLauncherListener.java
@@ -40,7 +40,7 @@ public class LogbackLoggingSystemLauncherListener implements
SystemLauncherListe
_logger = (ch.qos.logback.classic.Logger)
LoggerFactory.getLogger(Logger.ROOT_LOGGER_NAME);
if (!_logger.iteratorForAppenders().hasNext())
{
- _logger.setLevel(Level.ALL);
+ _logger.setLevel(Level.TRACE);
_logger.setAdditive(true);
}
diff --git
a/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/QpidLoggerTurboFilter.java
b/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/QpidLoggerTurboFilter.java
index d8c2462841..57ac9e3b04 100644
---
a/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/QpidLoggerTurboFilter.java
+++
b/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/QpidLoggerTurboFilter.java
@@ -107,7 +107,7 @@ public final class QpidLoggerTurboFilter extends TurboFilter
private void resetCacheAndSetMinimumLevel()
{
// Disable the 'decide' optimisation until the new minimum is
established
- _minimumFilterLevel = Level.ALL.levelInt;
+ _minimumFilterLevel = Level.TRACE.levelInt;
_effectiveLevels.set(new ConcurrentHashMap<>());
synchronized (_minimumFilterLevelUpdateLock)
{
diff --git
a/broker-plugins/management-http/src/test/java/org/apache/qpid/server/management/plugin/auth/OAuth2InteractiveAuthenticatorTest.java
b/broker-plugins/management-http/src/test/java/org/apache/qpid/server/management/plugin/auth/OAuth2InteractiveAuthenticatorTest.java
index 15012b36be..60745286cd 100644
---
a/broker-plugins/management-http/src/test/java/org/apache/qpid/server/management/plugin/auth/OAuth2InteractiveAuthenticatorTest.java
+++
b/broker-plugins/management-http/src/test/java/org/apache/qpid/server/management/plugin/auth/OAuth2InteractiveAuthenticatorTest.java
@@ -53,6 +53,7 @@ import jakarta.servlet.http.HttpServletResponse;
import jakarta.servlet.http.HttpSession;
import org.eclipse.jetty.http.HttpURI;
+import org.eclipse.jetty.util.Fields;
import org.eclipse.jetty.util.MultiMap;
import org.eclipse.jetty.util.UrlEncoded;
import org.junit.jupiter.api.BeforeEach;
@@ -288,10 +289,10 @@ public class OAuth2InteractiveAuthenticatorTest extends
UnitTestBase
private Map<String, String> getRedirectParameters(final String
redirectLocation)
{
- final MultiMap<String> parameterMap = new MultiMap<>();
+ final Fields parameterMap = new Fields();
UrlEncoded.decodeUtf8To(HttpURI.from(redirectLocation).getQuery(),
parameterMap);
- Map<String,String> parameters = new HashMap<>(parameterMap.size());
- for (Map.Entry<String, List<String>> paramEntry :
parameterMap.entrySet())
+ Map<String,String> parameters = new HashMap<>(parameterMap.getSize());
+ for (Map.Entry<String, List<String>> paramEntry :
parameterMap.toMultiMap().entrySet())
{
assertEquals(1, (long) paramEntry.getValue().size(),
String.format("param '%s' specified more than once",
paramEntry.getKey()));
diff --git
a/broker-plugins/management-http/src/test/java/org/apache/qpid/server/management/plugin/servlet/RootServletTest.java
b/broker-plugins/management-http/src/test/java/org/apache/qpid/server/management/plugin/servlet/RootServletTest.java
index c2e15f6ed2..de1bf76c8c 100644
---
a/broker-plugins/management-http/src/test/java/org/apache/qpid/server/management/plugin/servlet/RootServletTest.java
+++
b/broker-plugins/management-http/src/test/java/org/apache/qpid/server/management/plugin/servlet/RootServletTest.java
@@ -63,7 +63,10 @@ class RootServletTest
when(request.getServletPath()).thenReturn("expectedPath");
try (final StringWriter stringWriter = new StringWriter();
- final OutputStream outputStream = new
WriterOutputStream(stringWriter, StandardCharsets.UTF_8))
+ final OutputStream outputStream = WriterOutputStream.builder()
+ .setWriter(stringWriter)
+ .setCharset(StandardCharsets.UTF_8)
+ .get())
{
final ServletOutputStream servletOutputStream =
mock(ServletOutputStream.class);
doAnswer(invocationOnMock ->
@@ -93,7 +96,10 @@ class RootServletTest
when(request.getServletPath()).thenReturn("expectedPath");
try (final StringWriter stringWriter = new StringWriter();
- final OutputStream outputStream = new
WriterOutputStream(stringWriter, StandardCharsets.UTF_8))
+ final OutputStream outputStream = WriterOutputStream.builder()
+ .setWriter(stringWriter)
+ .setCharset(StandardCharsets.UTF_8)
+ .get())
{
final ServletOutputStream servletOutputStream =
mock(ServletOutputStream.class);
doAnswer(invocationOnMock ->
@@ -116,7 +122,10 @@ class RootServletTest
when(request.getServletPath()).thenReturn("unknown");
try (final StringWriter stringWriter = new StringWriter();
- final OutputStream outputStream = new
WriterOutputStream(stringWriter, StandardCharsets.UTF_8))
+ final OutputStream outputStream = WriterOutputStream.builder()
+ .setWriter(stringWriter)
+ .setCharset(StandardCharsets.UTF_8)
+ .get())
{
final ServletOutputStream servletOutputStream =
mock(ServletOutputStream.class);
doAnswer(invocationOnMock ->
@@ -140,7 +149,10 @@ class RootServletTest
when(request.getServletPath()).thenReturn("<unknown> & \"test\" 'test'
");
try (final StringWriter stringWriter = new StringWriter();
- final OutputStream outputStream = new
WriterOutputStream(stringWriter, StandardCharsets.UTF_8))
+ final OutputStream outputStream = WriterOutputStream.builder()
+ .setWriter(stringWriter)
+ .setCharset(StandardCharsets.UTF_8)
+ .get())
{
final ServletOutputStream servletOutputStream =
mock(ServletOutputStream.class);
doAnswer(invocationOnMock ->
@@ -164,7 +176,10 @@ class RootServletTest
when(request.getServletPath()).thenReturn("expectedPath");
try (final StringWriter stringWriter = new StringWriter();
- final OutputStream outputStream = new
WriterOutputStream(stringWriter, StandardCharsets.UTF_8))
+ final OutputStream outputStream = WriterOutputStream.builder()
+ .setWriter(stringWriter)
+ .setCharset(StandardCharsets.UTF_8)
+ .get())
{
final ServletOutputStream servletOutputStream =
mock(ServletOutputStream.class);
doAnswer(invocationOnMock ->
diff --git
a/broker-plugins/websocket/src/main/java/org/apache/qpid/server/transport/websocket/WebSocketProvider.java
b/broker-plugins/websocket/src/main/java/org/apache/qpid/server/transport/websocket/WebSocketProvider.java
index 72fd6c2f66..c82c383cc6 100644
---
a/broker-plugins/websocket/src/main/java/org/apache/qpid/server/transport/websocket/WebSocketProvider.java
+++
b/broker-plugins/websocket/src/main/java/org/apache/qpid/server/transport/websocket/WebSocketProvider.java
@@ -585,7 +585,7 @@ class WebSocketProvider implements AcceptingTransport
@Override
public Principal getPeerPrincipal()
{
- return _certificate instanceof X509Certificate ?
((X509Certificate)_certificate).getSubjectDN() : null;
+ return _certificate instanceof X509Certificate ?
((X509Certificate)_certificate).getSubjectX500Principal() : null;
}
@Override
diff --git
a/joramtests/src/main/java/org/apache/qpid/joramtests/admin/JavaBrokerAdmin.java
b/joramtests/src/main/java/org/apache/qpid/joramtests/admin/JavaBrokerAdmin.java
index 167d6d8175..8c7059b9ef 100644
---
a/joramtests/src/main/java/org/apache/qpid/joramtests/admin/JavaBrokerAdmin.java
+++
b/joramtests/src/main/java/org/apache/qpid/joramtests/admin/JavaBrokerAdmin.java
@@ -236,7 +236,7 @@ public class JavaBrokerAdmin implements Admin
private void executeManagement(final ClassicHttpRequest httpRequest)
{
try (final CloseableHttpClient httpClient =
HttpClients.custom().setDefaultCredentialsProvider(_credentialsProvider).build();
- final CloseableHttpResponse response =
httpClient.execute(_management, httpRequest, _httpClientContext))
+ final CloseableHttpResponse response =
httpClient.execute(_management, httpRequest, _httpClientContext, reply ->
(CloseableHttpResponse) reply))
{
final int status = response.getCode();
final ProtocolVersion version = response.getVersion();
diff --git
a/perftests/src/main/java/org/apache/qpid/disttest/jms/QpidRestAPIQueueCreator.java
b/perftests/src/main/java/org/apache/qpid/disttest/jms/QpidRestAPIQueueCreator.java
index cbb5f2e790..618230b517 100644
---
a/perftests/src/main/java/org/apache/qpid/disttest/jms/QpidRestAPIQueueCreator.java
+++
b/perftests/src/main/java/org/apache/qpid/disttest/jms/QpidRestAPIQueueCreator.java
@@ -291,7 +291,7 @@ public class QpidRestAPIQueueCreator implements QueueCreator
try (final CloseableHttpClient httpClient = HttpClients.custom()
.setDefaultCredentialsProvider(_credentialsProvider)
.build();
- final CloseableHttpResponse response =
httpClient.execute(_management, httpRequest, context))
+ final CloseableHttpResponse response =
httpClient.execute(_management, httpRequest, context, reply ->
(CloseableHttpResponse) reply))
{
final int status = response.getCode();
final ProtocolVersion version = response.getVersion();
diff --git
a/perftests/src/main/java/org/apache/qpid/disttest/json/ObjectMapperFactory.java
b/perftests/src/main/java/org/apache/qpid/disttest/json/ObjectMapperFactory.java
index 6f3ece5018..63e02381a2 100644
---
a/perftests/src/main/java/org/apache/qpid/disttest/json/ObjectMapperFactory.java
+++
b/perftests/src/main/java/org/apache/qpid/disttest/json/ObjectMapperFactory.java
@@ -41,6 +41,7 @@ import com.fasterxml.jackson.databind.MapperFeature;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.SerializationFeature;
import com.fasterxml.jackson.databind.SerializerProvider;
+import com.fasterxml.jackson.databind.json.JsonMapper;
import com.fasterxml.jackson.databind.module.SimpleModule;
import com.fasterxml.jackson.databind.node.ObjectNode;
import com.fasterxml.jackson.databind.node.ValueNode;
@@ -58,22 +59,15 @@ public class ObjectMapperFactory
module.addDeserializer(PropertyValue.class, new
PropertyValueDeserializer());
module.addSerializer(SimplePropertyValue.class, new
SimplePropertyValueSerializer());
- ObjectMapper objectMapper = new ObjectMapper();
-
- objectMapper.setVisibility(PropertyAccessor.FIELD,
JsonAutoDetect.Visibility.ANY);
-
-
objectMapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES,
false);
- objectMapper.configure(SerializationFeature.INDENT_OUTPUT, true);
-
- objectMapper.configure(JsonParser.Feature.ALLOW_SINGLE_QUOTES, true);
- objectMapper.configure(JsonParser.Feature.ALLOW_COMMENTS, true);
-
- objectMapper.configure(MapperFeature.AUTO_DETECT_GETTERS, false);
- objectMapper.registerModule(module);
-
- objectMapper.registerModule(module);
-
- return objectMapper;
+ return JsonMapper.builder()
+ .visibility(PropertyAccessor.FIELD,
JsonAutoDetect.Visibility.ANY)
+ .configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES,
false)
+ .configure(SerializationFeature.INDENT_OUTPUT, true)
+ .configure(JsonParser.Feature.ALLOW_SINGLE_QUOTES, true)
+ .configure(JsonParser.Feature.ALLOW_COMMENTS, true)
+ .configure(MapperFeature.AUTO_DETECT_GETTERS, false)
+ .addModule(module)
+ .build();
}
private static class SimplePropertyValueSerializer extends
JsonSerializer<SimplePropertyValue>
@@ -175,7 +169,7 @@ public class ObjectMapperFactory
else
{
ObjectNode objectNode = (ObjectNode) root;
- Iterator<Map.Entry<String, JsonNode>> fieldIterator =
objectNode.fields();
+ Iterator<Map.Entry<String, JsonNode>> fieldIterator =
objectNode.properties().iterator();
String definition = null;
Map<String, Object> result = new HashMap<>();
while (fieldIterator.hasNext())
diff --git
a/qpid-test-utils/src/main/java/org/apache/qpid/test/utils/EmbeddedKdcExtension.java
b/qpid-test-utils/src/main/java/org/apache/qpid/test/utils/EmbeddedKdcExtension.java
index 4d5aaa8f5b..e960520401 100644
---
a/qpid-test-utils/src/main/java/org/apache/qpid/test/utils/EmbeddedKdcExtension.java
+++
b/qpid-test-utils/src/main/java/org/apache/qpid/test/utils/EmbeddedKdcExtension.java
@@ -49,7 +49,7 @@ import org.slf4j.LoggerFactory;
* lifecycle. After it will fully migrate to JUnit 5 and expose functionality
needed this class can be replaced
* with the Apache DS one.
*/
-public class EmbeddedKdcExtension implements BeforeAllCallback,
ExtensionContext.Store.CloseableResource
+public class EmbeddedKdcExtension implements BeforeAllCallback, AutoCloseable
{
/**
* Logger
diff --git
a/qpid-test-utils/src/main/java/org/apache/qpid/test/utils/tls/TlsResource.java
b/qpid-test-utils/src/main/java/org/apache/qpid/test/utils/tls/TlsResource.java
index 060d4b1044..8cf674a958 100644
---
a/qpid-test-utils/src/main/java/org/apache/qpid/test/utils/tls/TlsResource.java
+++
b/qpid-test-utils/src/main/java/org/apache/qpid/test/utils/tls/TlsResource.java
@@ -41,13 +41,12 @@ import java.util.stream.Stream;
import org.junit.jupiter.api.extension.AfterEachCallback;
import org.junit.jupiter.api.extension.BeforeAllCallback;
import org.junit.jupiter.api.extension.BeforeEachCallback;
-import org.junit.jupiter.api.extension.Extension;
import org.junit.jupiter.api.extension.ExtensionContext;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-public class TlsResource implements Extension, AfterEachCallback,
BeforeEachCallback, BeforeAllCallback, ExtensionContext.Store.CloseableResource
+public class TlsResource implements AfterEachCallback, BeforeEachCallback,
BeforeAllCallback, AutoCloseable
{
private static final String PRIVATE_KEY_ALIAS = "private-key-alias";
private static final String CERTIFICATE_ALIAS = "certificate-alias";
diff --git
a/systests/end-to-end-conversion-tests/src/main/java/org/apache/qpid/systests/end_to_end_conversion/EndToEndConversionTestBase.java
b/systests/end-to-end-conversion-tests/src/main/java/org/apache/qpid/systests/end_to_end_conversion/EndToEndConversionTestBase.java
index 70731ffb27..f6baf6740e 100644
---
a/systests/end-to-end-conversion-tests/src/main/java/org/apache/qpid/systests/end_to_end_conversion/EndToEndConversionTestBase.java
+++
b/systests/end-to-end-conversion-tests/src/main/java/org/apache/qpid/systests/end_to_end_conversion/EndToEndConversionTestBase.java
@@ -138,7 +138,7 @@ public class EndToEndConversionTestBase extends
BrokerAdminUsingTestBase
LOGGER.warn(String.format("first client instructions should be
a 'ConfigureDestination' but is '%s'!",
clientInstructions.get(0).getClass().getSimpleName()));
}
- if (clientInstructions.stream().filter(item -> item instanceof
ConfigureJndiContext).count() != 0)
+ if (clientInstructions.stream().anyMatch(item -> item instanceof
ConfigureJndiContext))
{
LOGGER.warn("Test should not set a 'ConfigureContext' client
instruction!"
+ " This is set by the base class.");
@@ -235,12 +235,17 @@ public class EndToEndConversionTestBase extends
BrokerAdminUsingTestBase
serverSocket.setSoTimeout(SERVER_SOCKET_TIMEOUT);
String classPath = classpathQuery.getClasspath();
final List<String> arguments = new ArrayList<>(List.of("java",
"-showversion", "-cp", classPath));
+ if
(System.getProperty("os.name").toLowerCase().contains("windows"))
+ {
+ arguments.add("-Djavax.net.ssl.trustStoreType=WINDOWS-ROOT");
+ }
arguments.addAll(additionalJavaArguments);
arguments.add(classpathQuery.getClientClass().getName());
arguments.add(String.valueOf(serverSocket.getLocalPort()));
LOGGER.debug("starting client process with arguments: {}",
arguments);
ProcessBuilder processBuilder = new ProcessBuilder(arguments);
+ processBuilder.redirectErrorStream(true);
processBuilder.environment().put("PN_TRACE_FRM", "true");
Process p = processBuilder.start();
try (final InputStream pInputStream = p.getInputStream();
@@ -258,9 +263,8 @@ public class EndToEndConversionTestBase extends
BrokerAdminUsingTestBase
clientSocket.setSoTimeout(CLIENT_SOCKET_TIMEOUT);
outputStream.writeObject(clientInstructions);
final Object result = inputStream.readObject();
- if (result instanceof ClientResult)
+ if (result instanceof ClientResult clientResult)
{
- final ClientResult clientResult = (ClientResult)
result;
if (clientResult.getException() != null)
{
throw clientResult.getException();
@@ -284,12 +288,12 @@ public class EndToEndConversionTestBase extends
BrokerAdminUsingTestBase
}
catch (RuntimeException e)
{
- LOGGER.debug("client process finished with exception: {}", e);
+ LOGGER.debug("client process finished with exception:", e);
throw e;
}
catch (Exception e)
{
- LOGGER.error("client process finished with exception: {}", e);
+ LOGGER.error("client process finished with exception:", e);
throw new RuntimeException(e);
}
finally
diff --git
a/systests/protocol-tests-core/src/main/java/org/apache/qpid/tests/protocol/AbstractFrameTransport.java
b/systests/protocol-tests-core/src/main/java/org/apache/qpid/tests/protocol/AbstractFrameTransport.java
index 543206502b..5c47338be4 100644
---
a/systests/protocol-tests-core/src/main/java/org/apache/qpid/tests/protocol/AbstractFrameTransport.java
+++
b/systests/protocol-tests-core/src/main/java/org/apache/qpid/tests/protocol/AbstractFrameTransport.java
@@ -19,20 +19,12 @@
package org.apache.qpid.tests.protocol;
-import io.netty.util.concurrent.Future;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.anyOf;
import static org.hamcrest.Matchers.instanceOf;
import static org.hamcrest.Matchers.is;
import static org.hamcrest.Matchers.nullValue;
-import java.net.InetSocketAddress;
-import java.util.Objects;
-import java.util.concurrent.ArrayBlockingQueue;
-import java.util.concurrent.BlockingQueue;
-import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.TimeUnit;
-
import io.netty.bootstrap.Bootstrap;
import io.netty.buffer.ByteBuf;
import io.netty.buffer.ByteBufAllocator;
@@ -42,9 +34,18 @@ import io.netty.channel.ChannelOption;
import io.netty.channel.ChannelPipeline;
import io.netty.channel.ChannelPromise;
import io.netty.channel.EventLoopGroup;
-import io.netty.channel.nio.NioEventLoopGroup;
+import io.netty.channel.MultiThreadIoEventLoopGroup;
+import io.netty.channel.nio.NioIoHandler;
import io.netty.channel.socket.SocketChannel;
import io.netty.channel.socket.nio.NioSocketChannel;
+import io.netty.util.concurrent.Future;
+
+import java.net.InetSocketAddress;
+import java.util.Objects;
+import java.util.concurrent.ArrayBlockingQueue;
+import java.util.concurrent.BlockingQueue;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.TimeUnit;
public abstract class AbstractFrameTransport<I extends AbstractInteraction<I>>
implements AutoCloseable
{
@@ -68,7 +69,7 @@ public abstract class AbstractFrameTransport<I extends
AbstractInteraction<I>> i
_brokerAddress = brokerAddress;
_inputHandler = new InputHandler(_queue, inputDecoder);
_outputHandler = new OutputHandler(outputEncoder);
- _workerGroup = new NioEventLoopGroup();
+ _workerGroup = new
MultiThreadIoEventLoopGroup(NioIoHandler.newFactory());
}
public InetSocketAddress getBrokerAddress()
diff --git a/tck/src/main/java/org/apache/qpid/tck/ManageQpidJMSResources.java
b/tck/src/main/java/org/apache/qpid/tck/ManageQpidJMSResources.java
index c96885ad1f..8d7134b304 100644
--- a/tck/src/main/java/org/apache/qpid/tck/ManageQpidJMSResources.java
+++ b/tck/src/main/java/org/apache/qpid/tck/ManageQpidJMSResources.java
@@ -232,7 +232,7 @@ public class ManageQpidJMSResources
.setDefaultCredentialsProvider(_credentialsProvider)
.build())
{
- try (CloseableHttpResponse response =
httpClient.execute(_management, httpRequest, _httpClientContext))
+ try (CloseableHttpResponse response =
httpClient.execute(_management, httpRequest, _httpClientContext, reply ->
(CloseableHttpResponse) reply))
{
return response.getCode();
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org
For additional commands, e-mail: commits-h...@qpid.apache.org
