From 325fb5dca1e197074f2e3bb870a538b32f44c839 Mon Sep 17 00:00:00 2001 From: Laurent ARNAL Date: Mon, 20 Oct 2025 18:57:55 +0200 Subject: [PATCH 1/4] adding call to sanetizeid into normalizedescriptor to be sure that channelTypeUid are correct Signed-off-by: Laurent ARNAL --- .../binding/siemenshvac/internal/type/UidUtils.java | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/bundles/org.openhab.binding.siemenshvac/src/main/java/org/openhab/binding/siemenshvac/internal/type/UidUtils.java b/bundles/org.openhab.binding.siemenshvac/src/main/java/org/openhab/binding/siemenshvac/internal/type/UidUtils.java index 43ea9958d2e56..01c7717ef6c45 100644 --- a/bundles/org.openhab.binding.siemenshvac/src/main/java/org/openhab/binding/siemenshvac/internal/type/UidUtils.java +++ b/bundles/org.openhab.binding.siemenshvac/src/main/java/org/openhab/binding/siemenshvac/internal/type/UidUtils.java @@ -68,7 +68,7 @@ public static ThingTypeUID generateThingTypeUID(SiemensHvacMetadataDevice device * @param descriptor * @return */ - private static String normalizeDescriptor(String descriptor) { + public static String normalizeDescriptor(String descriptor) { String result = descriptor.trim(); if (result.indexOf("CC") >= 0 || result.indexOf("HC") >= 0) { @@ -133,6 +133,8 @@ private static String normalizeDescriptor(String descriptor) { result = result.replace("-setpointhc", "-setpoint-hc"); result = result.replace("setphc", "-setpoint-hc"); + result = sanetizeId(result); + return result; } @@ -142,18 +144,18 @@ private static String normalizeDescriptor(String descriptor) { public static ChannelTypeUID generateChannelTypeUID(SiemensHvacMetadataDataPoint dpt) throws SiemensHvacException { String type = dpt.getDptType(); String shortDesc = dpt.getShortDescEn(); - String result = normalizeDescriptor(shortDesc); + String channelTypeId = normalizeDescriptor(shortDesc); try { TypeConverter tp = ConverterFactory.getConverter(type); if (!tp.hasVariant()) { - result = tp.getChannelType(dpt); + channelTypeId = tp.getChannelType(dpt); } } catch (ConverterTypeException ex) { throw new SiemensHvacException(String.format("Can't find converter for type: %s", type), ex); } - return new ChannelTypeUID(SiemensHvacBindingConstants.BINDING_ID, result); + return new ChannelTypeUID(SiemensHvacBindingConstants.BINDING_ID, channelTypeId); } /** From 3804b48120ca461c440f19a2f4a40543e4864e88 Mon Sep 17 00:00:00 2001 From: Laurent ARNAL Date: Mon, 20 Oct 2025 19:46:25 +0200 Subject: [PATCH 2/4] move back method to private Signed-off-by: Laurent ARNAL --- .../org/openhab/binding/siemenshvac/internal/type/UidUtils.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bundles/org.openhab.binding.siemenshvac/src/main/java/org/openhab/binding/siemenshvac/internal/type/UidUtils.java b/bundles/org.openhab.binding.siemenshvac/src/main/java/org/openhab/binding/siemenshvac/internal/type/UidUtils.java index 01c7717ef6c45..b50af685cb1d0 100644 --- a/bundles/org.openhab.binding.siemenshvac/src/main/java/org/openhab/binding/siemenshvac/internal/type/UidUtils.java +++ b/bundles/org.openhab.binding.siemenshvac/src/main/java/org/openhab/binding/siemenshvac/internal/type/UidUtils.java @@ -40,7 +40,7 @@ public class UidUtils { * @param label * @return the label without invalid character */ - public static String sanetizeId(String label) { + private static String sanetizeId(String label) { String result = label; if (!Normalizer.isNormalized(label, Normalizer.Form.NFKD)) { From 1b93bbec290859147a88558f38143c136c9b5300 Mon Sep 17 00:00:00 2001 From: Laurent ARNAL Date: Mon, 20 Oct 2025 19:47:24 +0200 Subject: [PATCH 3/4] simplify code Signed-off-by: Laurent ARNAL --- .../openhab/binding/siemenshvac/internal/type/UidUtils.java | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/bundles/org.openhab.binding.siemenshvac/src/main/java/org/openhab/binding/siemenshvac/internal/type/UidUtils.java b/bundles/org.openhab.binding.siemenshvac/src/main/java/org/openhab/binding/siemenshvac/internal/type/UidUtils.java index b50af685cb1d0..07ce1bdf0d1da 100644 --- a/bundles/org.openhab.binding.siemenshvac/src/main/java/org/openhab/binding/siemenshvac/internal/type/UidUtils.java +++ b/bundles/org.openhab.binding.siemenshvac/src/main/java/org/openhab/binding/siemenshvac/internal/type/UidUtils.java @@ -133,9 +133,7 @@ public static String normalizeDescriptor(String descriptor) { result = result.replace("-setpointhc", "-setpoint-hc"); result = result.replace("setphc", "-setpoint-hc"); - result = sanetizeId(result); - - return result; + return sanetizeId(result); } /** From cdf223aa709dc53e2b0a390f633d46b0954ee157 Mon Sep 17 00:00:00 2001 From: Laurent ARNAL Date: Mon, 20 Oct 2025 19:50:44 +0200 Subject: [PATCH 4/4] fix bad changes Signed-off-by: Laurent ARNAL --- .../openhab/binding/siemenshvac/internal/type/UidUtils.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bundles/org.openhab.binding.siemenshvac/src/main/java/org/openhab/binding/siemenshvac/internal/type/UidUtils.java b/bundles/org.openhab.binding.siemenshvac/src/main/java/org/openhab/binding/siemenshvac/internal/type/UidUtils.java index 07ce1bdf0d1da..7825ae0c4e3ca 100644 --- a/bundles/org.openhab.binding.siemenshvac/src/main/java/org/openhab/binding/siemenshvac/internal/type/UidUtils.java +++ b/bundles/org.openhab.binding.siemenshvac/src/main/java/org/openhab/binding/siemenshvac/internal/type/UidUtils.java @@ -40,7 +40,7 @@ public class UidUtils { * @param label * @return the label without invalid character */ - private static String sanetizeId(String label) { + public static String sanetizeId(String label) { String result = label; if (!Normalizer.isNormalized(label, Normalizer.Form.NFKD)) { @@ -68,7 +68,7 @@ public static ThingTypeUID generateThingTypeUID(SiemensHvacMetadataDevice device * @param descriptor * @return */ - public static String normalizeDescriptor(String descriptor) { + private static String normalizeDescriptor(String descriptor) { String result = descriptor.trim(); if (result.indexOf("CC") >= 0 || result.indexOf("HC") >= 0) {