* Use [^GROUP_] in the pattern for messages count

**Cherry-pick to `6.1.x`**

Author: artembilan

spring-integration-core/src/main/java/org/springframework/integration/store/AbstractKeyValueMessageStore.java

@@ -46,7 +46,7 @@ public abstract class AbstractKeyValueMessageStore extends AbstractMessageGroupS
 
 	protected static final String MESSAGE_KEY_PREFIX = "MESSAGE_";
 
-	protected static final String MESSAGE_GROUP_KEY_PREFIX = "GROUP_OF_MESSAGES_";
+	protected static final String MESSAGE_GROUP_KEY_PREFIX = "MESSAGE_GROUP_";
 
 	private final String messagePrefix;
 
@@ -77,7 +77,7 @@ protected AbstractKeyValueMessageStore(String prefix) {
 	 * @return the prefix for keys
 	 * @since 4.3.12
 	 */
-	protected String getMessagePrefix() {
+	public String getMessagePrefix() {
 		return this.messagePrefix;
 	}
 
@@ -167,11 +167,10 @@ public Message<?> removeMessage(UUID id) {
 	@Override
 	@ManagedAttribute
 	public long getMessageCount() {
-		Collection<?> messageIds = doListKeys(this.messagePrefix + '*');
+		Collection<?> messageIds = doListKeys(this.messagePrefix + "[^GROUP_]*");
 		return (messageIds != null) ? messageIds.size() : 0;
 	}
 
-
 	// MessageGroupStore methods
 
 	/**

spring-integration-hazelcast/src/main/java/org/springframework/integration/hazelcast/store/HazelcastMessageStore.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2022 the original author or authors.
+ * Copyright 2017-2023 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -76,8 +76,8 @@ protected Object doRemove(Object id) {
 	@Override
 	protected Collection<?> doListKeys(String keyPattern) {
 		Assert.hasText(keyPattern, "'keyPattern' must not be empty");
-		return this.map.keySet(Predicates.like(QueryConstants.KEY_ATTRIBUTE_NAME.value(),
-				keyPattern.replaceAll("\\*", "%")));
+		return this.map.keySet(Predicates.regex(QueryConstants.KEY_ATTRIBUTE_NAME.value(),
+				keyPattern.replaceAll("\\*", ".+")));
 	}
 
 }

spring-integration-hazelcast/src/test/java/org/springframework/integration/hazelcast/store/HazelcastMessageStoreTests.java

@@ -69,7 +69,6 @@ public void clean() {
 
 	@Test
 	public void testWithMessageHistory() {
-
 		Message<?> message = new GenericMessage<>("Hello");
 		DirectChannel fooChannel = new DirectChannel();
 		fooChannel.setBeanName("fooChannel");
@@ -107,7 +106,6 @@ public void testAddAndRemoveMessagesFromMessageGroup() {
 
 	@Test
 	public void addAndGetMessage() {
-
 		Message<?> message = MessageBuilder.withPayload("test").build();
 		store.addMessage(message);
 		Message<?> retrieved = store.getMessage(message.getHeaders().getId());

spring-integration-redis/src/test/java/org/springframework/integration/redis/store/RedisMessageGroupStoreTests.java

@@ -82,7 +82,6 @@ static void setupConnection() {
 	@AfterEach
 	void setUpTearDown() {
 		StringRedisTemplate template = RedisContainerTest.createStringRedisTemplate(redisConnectionFactory);
-		template.delete(template.keys("GROUP_OF_MESSAGES_*"));
 		template.delete(template.keys("MESSAGE_*"));
 	}