HSEARCH-4748 Remove leading "#" from agent references

hibernate · Jan 3, 2023 · 61a14a8 · 61a14a8
1 parent c19ec86
commit 61a14a8
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/...aticindexing/OutboxPollingAutomaticIndexingStaticShardingIncompatibleConfigurationIT.java b/...aticindexing/OutboxPollingAutomaticIndexingStaticShardingIncompatibleConfigurationIT.java
@@ -73,7 +73,7 @@ public void conflictingTotalShardCount() throws InterruptedException {
 
 		String[] expectedContent = new String[] {
 				"is statically assigned to shard ",
-				"this conflicts with agent '#",
+				"this conflicts with agent '",
 				"' which expects ", " shards.",
 				"This can be a temporary situation caused by some application instances being forcibly stopped and replacements being spun up",
 				"consider adjusting the configuration or switching to dynamic sharding.",
@@ -112,7 +112,7 @@ public void conflictingAssignedShardIndex() throws InterruptedException {
 
 		String[] expectedContent = new String[] {
 				"is statically assigned to shard ",
-				"this conflicts with agent '#",
+				"this conflicts with agent '",
 				"' which is also assigned to that shard.",
 				"This can be a temporary situation caused by some application instances being forcibly stopped and replacements being spun up",
 				"consider adjusting the configuration or switching to dynamic sharding.",

diff --git a/...g/hibernate/search/mapper/orm/coordination/outboxpolling/cluster/impl/AgentReference.java b/...g/hibernate/search/mapper/orm/coordination/outboxpolling/cluster/impl/AgentReference.java
@@ -23,6 +23,6 @@ private AgentReference(UUID id, String name) {
 
 	@Override
 	public String toString() {
-		return "#" + id + " - " + name;
+		return id + " - " + name;
 	}
 }
diff --git a/...nation/outboxpolling/event/impl/EventProcessorClusterLinkStaticShardingEdgeCasesTest.java b/...nation/outboxpolling/event/impl/EventProcessorClusterLinkStaticShardingEdgeCasesTest.java
@@ -116,9 +116,9 @@ public void staticSharding_conflictingAssignedShardIds() {
 				.hasMessageContainingAll(
 						"Agent '" + SELF_REF + "': failed to infer a target cluster from the list of registered agents.",
 						"The agent will try again in the next pulse.",
-						"Agent '#" + OTHER_2_ID + " - ",
+						"Agent '" + OTHER_2_ID + " - ",
 						"is statically assigned to shard 0 (total " + totalShardCount + ")",
-						"this conflicts with agent '#" + OTHER_1_ID + " - ",
+						"this conflicts with agent '" + OTHER_1_ID + " - ",
 						"' which is also assigned to that shard.",
 						"This can be a temporary situation caused by some application instances being forcibly stopped and replacements being spun up",
 						"consider adjusting the configuration or switching to dynamic sharding.",
@@ -156,7 +156,7 @@ public void staticSharding_conflictingTotalShardCount() {
 				.hasMessageContainingAll(
 						"Agent '" + SELF_REF + "': failed to infer a target cluster from the list of registered agents.",
 						"The agent will try again in the next pulse.",
-						"Agent '#" + OTHER_2_ID + " - ",
+						"Agent '" + OTHER_2_ID + " - ",
 						"is statically assigned to shard 2 (total 4)",
 						"this conflicts with agent '" + SELF_REF + "'",
 						"which expects 3 shards.",