From b5d2d8328e1b6660be8453fda72327e501f82c5b Mon Sep 17 00:00:00 2001
From: Bertrand Martin <bertrand@sentrysoftware.com>
Date: Fri, 9 Oct 2026 21:36:47 +0200
Subject: [PATCH] Drop the trailing separator from WMI array values

WmiStringConverter rendered an array as "a|b|" (and "|" for an empty array).
winrm-java renders the same WMI arrays as "a|b", and cannot do otherwise:
WinRM's XML does not tell a one-element array from a scalar. Both libraries
run the same connector queries, so they must produce the same string: arrays
are now "a|b", "a" for a single element, and an empty string when empty.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
---
 .../metricshub/wmi/WmiStringConverter.java    |  5 +++--
 .../wmi/WmiStringConverterTest.java           | 20 +++++++++++++++++++
 2 files changed, 23 insertions(+), 2 deletions(-)
 create mode 100644 src/test/java/org/metricshub/wmi/WmiStringConverterTest.java

diff --git a/src/main/java/org/metricshub/wmi/WmiStringConverter.java b/src/main/java/org/metricshub/wmi/WmiStringConverter.java
index 34e072d..8c033fb 100644
--- a/src/main/java/org/metricshub/wmi/WmiStringConverter.java
+++ b/src/main/java/org/metricshub/wmi/WmiStringConverter.java
@@ -78,7 +78,8 @@ public WmiStringConverter() {
 	 * Convert the specified value/object to a string:
 	 * <ul>
 	 * <li>OffsetDateTime: to number of seconds since Epoch, or standard English date/time
-	 * <li>Array: items separated with specified <em>arraySeparator</em>
+	 * <li>Array: items joined with the specified <em>arraySeparator</em>, which is removed from
+	 * each item (<code>a|b</code>, <code>a</code> for a single item, an empty string for an empty array)
 	 * <li>null: empty string
 	 * <li>Boolean: True or False
 	 * <li>Anything else: using <code>String.valueOf()</code>
@@ -96,7 +97,7 @@ public String convert(Object value) {
 				.of((Object[]) value)
 				.map(this::convert)
 				.map(item -> item.replace(arraySeparator, Utils.EMPTY))
-				.collect(Collectors.joining(arraySeparator, Utils.EMPTY, arraySeparator));
+				.collect(Collectors.joining(arraySeparator));
 		}
 
 		if (value instanceof String) {
diff --git a/src/test/java/org/metricshub/wmi/WmiStringConverterTest.java b/src/test/java/org/metricshub/wmi/WmiStringConverterTest.java
new file mode 100644
index 0000000..fbd986a
--- /dev/null
+++ b/src/test/java/org/metricshub/wmi/WmiStringConverterTest.java
@@ -0,0 +1,20 @@
+package org.metricshub.wmi;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import org.junit.jupiter.api.Test;
+
+class WmiStringConverterTest {
+
+	@Test
+	void testConvertArray() {
+		final WmiStringConverter converter = new WmiStringConverter();
+		assertEquals("192.0.2.10|fe80::1", converter.convert(new String[] { "192.0.2.10", "fe80::1" }));
+		assertEquals("fr-FR", converter.convert(new String[] { "fr-FR" }));
+		assertEquals("", converter.convert(new String[0]));
+		assertEquals("", converter.convert(null));
+		assertEquals("ab|c", converter.convert(new String[] { "a|b", "c" }));
+		assertEquals("2|True", converter.convert(new Object[] { 2, Boolean.TRUE }));
+		assertEquals("a, b", new WmiStringConverter(", ", true).convert(new String[] { "a", "b" }));
+	}
+}