From a9e6dbb0e3803f9449a5839bf880e84c988e8683 Mon Sep 17 00:00:00 2001 From: Justin Bertram Date: Thu, 5 Mar 2020 20:44:47 -0600 Subject: [PATCH] NO-JIRA reconcile STOMP prop names b/w code & doc --- .../artemis/core/protocol/stomp/StompConnection.java | 4 ++-- docs/user-manual/en/stomp.md | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/artemis-protocols/artemis-stomp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/stomp/StompConnection.java b/artemis-protocols/artemis-stomp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/stomp/StompConnection.java index 60c2d56257..2709c16a08 100644 --- a/artemis-protocols/artemis-stomp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/stomp/StompConnection.java +++ b/artemis-protocols/artemis-stomp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/stomp/StompConnection.java @@ -181,8 +181,8 @@ public final class StompConnection implements RemotingConnection { this.acceptorUsed = acceptorUsed; - this.enableMessageID = ConfigurationHelper.getBooleanProperty(TransportConstants.STOMP_ENABLE_MESSAGE_ID, false, acceptorUsed.getConfiguration()); - this.minLargeMessageSize = ConfigurationHelper.getIntProperty(TransportConstants.STOMP_MIN_LARGE_MESSAGE_SIZE, ActiveMQClient.DEFAULT_MIN_LARGE_MESSAGE_SIZE, acceptorUsed.getConfiguration()); + this.enableMessageID = ConfigurationHelper.getBooleanProperty(TransportConstants.STOMP_ENABLE_MESSAGE_ID_DEPRECATED, false, acceptorUsed.getConfiguration()) || ConfigurationHelper.getBooleanProperty(TransportConstants.STOMP_ENABLE_MESSAGE_ID, false, acceptorUsed.getConfiguration()); + this.minLargeMessageSize = ConfigurationHelper.getIntProperty(TransportConstants.STOMP_MIN_LARGE_MESSAGE_SIZE, ConfigurationHelper.getIntProperty(TransportConstants.STOMP_MIN_LARGE_MESSAGE_SIZE_DEPRECATED, ActiveMQClient.DEFAULT_MIN_LARGE_MESSAGE_SIZE, acceptorUsed.getConfiguration()), acceptorUsed.getConfiguration()); } @Override diff --git a/docs/user-manual/en/stomp.md b/docs/user-manual/en/stomp.md index 79f413d6e3..51372a80a0 100644 --- a/docs/user-manual/en/stomp.md +++ b/docs/user-manual/en/stomp.md @@ -208,14 +208,14 @@ message. If you want each STOMP message to have a unique ID, just set the When the server starts with the above setting, each stomp message sent through this acceptor will have an extra property added. The property key is -`amq-message-id` and the value is a String representation of a long type +`amqMessageId` and the value is a String representation of a long type internal message id prefixed with `STOMP`, like: ``` -amq-message-id : STOMP12345 +amqMessageId : STOMP12345 ``` -The default `stomp-enable-message-id` value is `false`. +The default `stompEnableMessageId` value is `false`. ## Durable Subscriptions @@ -281,7 +281,7 @@ message to a normal message, before sending it to the client. If a large message is compressed, the server will uncompressed it before sending it to stomp clients. The default value of `stompMinLargeMessageSize` is the same as the default value of -[min-large-message-size](large-messages.md#configuring-parameters). +[minLargeMessageSize](large-messages.md#configuring-parameters). ## Web Sockets