public/openhab-addons
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[ihc] Fix special character issue on item descriptions (#15183)

Browse Source 
* [ihc] fix special character issue on item descriptions
* [ihc] Changed thing status to UNKNOWN when initializing

Signed-off-by: Pauli Anttila <pauli.anttila@gmail.com>
This commit is contained in:
pali 2023-07-07 10:32:37 +03:00 committed by GitHub
parent 06abd44a7d
commit 1ce6e8775f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
bundles/org.openhab.binding.ihc/src/main/java/org/openhab/binding/ihc/internal/ChannelUtils.java
View File

@ -14,10 +14,13 @@ package org.openhab.binding.ihc.internal;
import static org.openhab.binding.ihc.internal.IhcBindingConstants.*; import static org.openhab.binding.ihc.internal.IhcBindingConstants.*;
import java.nio.charset.StandardCharsets;
import java.util.HashSet; import java.util.HashSet;
import java.util.List; import java.util.List;
import java.util.Set; import java.util.Set;
import java.util.function.Predicate; import java.util.function.Predicate;
import java.util.stream.Collectors;
import java.util.stream.Stream;
import org.openhab.binding.ihc.internal.config.ChannelParams; import org.openhab.binding.ihc.internal.config.ChannelParams;
import org.openhab.binding.ihc.internal.ws.exeptions.ConversionException; import org.openhab.binding.ihc.internal.ws.exeptions.ConversionException;
@ -212,20 +215,10 @@ public class ChannelUtils {
} }
private static String createDescription(String name1, String name2, String name3, String name4) { private static String createDescription(String name1, String name2, String name3, String name4) {
String description = ""; String description = Stream.of(name1, name2, name3, name4).filter(s -> s != null && !s.isEmpty())
if (name1 != null && !name1.isEmpty()) { .collect(Collectors.joining(" - "));
description = name1;
} return new String(description.getBytes(StandardCharsets.ISO_8859_1), StandardCharsets.UTF_8);
if (name2 != null && !name2.isEmpty()) {
description += String.format(" - %s", name2);
}
if (name3 != null && !name3.isEmpty()) {
description += String.format(" - %s", name3);
}
if (name4 != null && !name4.isEmpty()) {
description += String.format(" - %s", name4);
}
return description;
} }
private static void addOrUpdateChannel(Channel newChannel, List<Channel> thingChannels) { private static void addOrUpdateChannel(Channel newChannel, List<Channel> thingChannels) {

5
bundles/org.openhab.binding.ihc/src/main/java/org/openhab/binding/ihc/internal/handler/IhcHandler.java
View File

@ -181,6 +181,9 @@ public class IhcHandler extends BaseThingHandler implements IhcEventListener {
linkedResourceIds.addAll(getAllLinkedChannelsResourceIds()); linkedResourceIds.addAll(getAllLinkedChannelsResourceIds());
logger.debug("Linked resources {}: {}", linkedResourceIds.size(), linkedResourceIds); logger.debug("Linked resources {}: {}", linkedResourceIds.size(), linkedResourceIds);
updateStatus(ThingStatus.UNKNOWN, ThingStatusDetail.NONE,
"Initializing communication to the IHC / ELKO controller");
if (controlJob == null || controlJob.isCancelled()) { if (controlJob == null || controlJob.isCancelled()) {
logger.debug("Start control task, interval={}sec", 1); logger.debug("Start control task, interval={}sec", 1);
controlJob = scheduler.scheduleWithFixedDelay(this::reconnectCheck, 0, 1, TimeUnit.SECONDS); controlJob = scheduler.scheduleWithFixedDelay(this::reconnectCheck, 0, 1, TimeUnit.SECONDS);
@ -542,8 +545,6 @@ public class IhcHandler extends BaseThingHandler implements IhcEventListener {
conf.username); conf.username);
ihc = new IhcClient(conf.hostname, conf.username, conf.password, conf.timeout, conf.tlsVersion); ihc = new IhcClient(conf.hostname, conf.username, conf.password, conf.timeout, conf.tlsVersion);
ihc.openConnection(); ihc.openConnection();
updateStatus(ThingStatus.OFFLINE, ThingStatusDetail.NONE,
"Initializing communication to the IHC / ELKO controller");
loadProject(); loadProject();
createChannels(); createChannels();
updateControllerProperties(); updateControllerProperties();