QPID-8231: [Broker-J] Do not allow setting empty string as value of queue attributes 'messageGroupKeyOverride' and 'messageGroupDefaultGroup'
diff --git a/broker-core/src/main/java/org/apache/qpid/server/model/Queue.java b/broker-core/src/main/java/org/apache/qpid/server/model/Queue.java
index 7b37382..9f04343 100644
--- a/broker-core/src/main/java/org/apache/qpid/server/model/Queue.java
+++ b/broker-core/src/main/java/org/apache/qpid/server/model/Queue.java
@@ -148,7 +148,8 @@
@ManagedAttribute(description = "Specifies the name of the message header that provides the value for message "
+ "grouping purposes. If not set, for AMQP 1.0 the value of the group-id field "
+ "within the message properties is used. For AMQP 0-8..0-10, the value of the "
- + "message header JMSXGroupId is used.")
+ + "message header JMSXGroupId is used.",
+ validValuePattern = "^(?!\\s*$).+")
String getMessageGroupKeyOverride();
@SuppressWarnings("unused")
@@ -156,7 +157,8 @@
String DEFAULT_SHARED_MESSAGE_GROUP = "qpid.no-group";
@ManagedAttribute( defaultValue = "${qpid.broker_default-shared-message-group}",
- description = "Fallback group used for messages without a group identifier. Used by SHARED_GROUPS only.")
+ description = "Fallback group used for messages without a group identifier. Used by SHARED_GROUPS only.",
+ validValuePattern = "^(?!\\s*$).+")
String getMessageGroupDefaultGroup();
@SuppressWarnings("unused")
