From d6f8ed8d70d9dc8d3e7760ca8234d1ff87f38150 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ville=20Skytt=C3=A4?= Date: Wed, 22 Jul 2015 10:21:25 +0300 Subject: [PATCH] Deprecate PROTOCOL_PROP_NAME, avoid deprecation warning on STOMP tests --- .../artemis/core/remoting/impl/netty/TransportConstants.java | 2 ++ .../artemis/tests/integration/stomp/v11/StompV11TestBase.java | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/remoting/impl/netty/TransportConstants.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/remoting/impl/netty/TransportConstants.java index 091fba565e..941533992a 100644 --- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/remoting/impl/netty/TransportConstants.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/remoting/impl/netty/TransportConstants.java @@ -53,6 +53,8 @@ public class TransportConstants public static final String USE_INVM_PROP_NAME = "useInvm"; + /** @deprecated use PROTOCOLS_PROP_NAME */ + @Deprecated public static final String PROTOCOL_PROP_NAME = "protocol"; public static final String PROTOCOLS_PROP_NAME = "protocols"; diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/stomp/v11/StompV11TestBase.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/stomp/v11/StompV11TestBase.java index 9965475128..8fee859476 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/stomp/v11/StompV11TestBase.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/stomp/v11/StompV11TestBase.java @@ -100,7 +100,7 @@ public abstract class StompV11TestBase extends ActiveMQTestBase protected JMSServerManager createServer() throws Exception { Map params = new HashMap(); - params.put(TransportConstants.PROTOCOL_PROP_NAME, StompProtocolManagerFactory.STOMP_PROTOCOL_NAME); + params.put(TransportConstants.PROTOCOLS_PROP_NAME, StompProtocolManagerFactory.STOMP_PROTOCOL_NAME); params.put(TransportConstants.PORT_PROP_NAME, TransportConstants.DEFAULT_STOMP_PORT); params.put(TransportConstants.STOMP_CONSUMERS_CREDIT, "-1"); TransportConfiguration stompTransport = new TransportConfiguration(NettyAcceptorFactory.class.getName(), params);