OpenHAB
/
openhab-core
mirror of https://github.com/openhab/openhab-core.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Use TypeParser in ProfileCallbackImpl#sendUpdate for StringType state (#1603) 

* Use TypeParser in ProfileCallbackImpl#sendUpdate for StringType state

Signed-off-by: Anders Alfredsson <andersb86@gmail.com>
pull/1611/head
pacive 2020-08-24 23:49:19 +02:00 committed by GitHub
parent f095b9a017
commit 184366a1a5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/internal/profiles/ProfileCallbackImpl.java
View File

@ -19,6 +19,8 @@ import org.openhab.core.events.EventPublisher;
import org.openhab.core.items.Item; import org.openhab.core.items.Item;
import org.openhab.core.items.ItemStateConverter; import org.openhab.core.items.ItemStateConverter;
import org.openhab.core.items.events.ItemEventFactory; import org.openhab.core.items.events.ItemEventFactory;
import org.openhab.core.library.items.StringItem;
import org.openhab.core.library.types.StringType;
import org.openhab.core.thing.Thing; import org.openhab.core.thing.Thing;
import org.openhab.core.thing.ThingUID; import org.openhab.core.thing.ThingUID;
import org.openhab.core.thing.binding.ThingHandler; import org.openhab.core.thing.binding.ThingHandler;
@ -28,6 +30,7 @@ import org.openhab.core.thing.profiles.ProfileCallback;
import org.openhab.core.thing.util.ThingHandlerHelper; import org.openhab.core.thing.util.ThingHandlerHelper;
import org.openhab.core.types.Command; import org.openhab.core.types.Command;
import org.openhab.core.types.State; import org.openhab.core.types.State;
import org.openhab.core.types.TypeParser;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
@ -131,7 +134,15 @@ public class ProfileCallbackImpl implements ProfileCallback {
@Override @Override
public void sendUpdate(State state) { public void sendUpdate(State state) {
Item item = itemProvider.apply(link.getItemName()); Item item = itemProvider.apply(link.getItemName());
State acceptedState = itemStateConverter.convertToAcceptedState(state, item); State acceptedState;
if (state instanceof StringType && !(item instanceof StringItem)) {
acceptedState = TypeParser.parseState(item.getAcceptedDataTypes(), state.toString());
if (acceptedState == null) {
acceptedState = state;
}
} else {
acceptedState = itemStateConverter.convertToAcceptedState(state, item);
}
eventPublisher.post( eventPublisher.post(
ItemEventFactory.createStateEvent(link.getItemName(), acceptedState, link.getLinkedUID().toString())); ItemEventFactory.createStateEvent(link.getItemName(), acceptedState, link.getLinkedUID().toString()));
} }