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

Fix inconsistent payload field name for ItemStateUpdatedEvent lastUpdate -> lastStateUpdate (#4752) 

Signed-off-by: Jimmy Tanagra <jcode@tanagra.id.au>
pull/4807/head^2
jimtng 2025-05-19 03:19:23 +10:00 committed by GitHub
parent 825def252d
commit 6ecd6c3891
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
bundles/org.openhab.core/src/main/java/org/openhab/core/items/events/ItemEventFactory.java
View File

@ -117,7 +117,7 @@ public class ItemEventFactory extends AbstractEventFactory {
String memberName = getMemberName(topic); String memberName = getMemberName(topic);
ItemStateUpdatedEventPayloadBean bean = deserializePayload(payload, ItemStateUpdatedEventPayloadBean.class); ItemStateUpdatedEventPayloadBean bean = deserializePayload(payload, ItemStateUpdatedEventPayloadBean.class);
State state = getState(bean.getType(), bean.getValue()); State state = getState(bean.getType(), bean.getValue());
ZonedDateTime lastStateUpdate = bean.getLastUpdate(); ZonedDateTime lastStateUpdate = bean.getLastStateUpdate();
return new GroupStateUpdatedEvent(topic, payload, itemName, memberName, state, lastStateUpdate, null); return new GroupStateUpdatedEvent(topic, payload, itemName, memberName, state, lastStateUpdate, null);
} }
@ -158,7 +158,7 @@ public class ItemEventFactory extends AbstractEventFactory {
String itemName = getItemName(topic); String itemName = getItemName(topic);
ItemStateUpdatedEventPayloadBean bean = deserializePayload(payload, ItemStateUpdatedEventPayloadBean.class); ItemStateUpdatedEventPayloadBean bean = deserializePayload(payload, ItemStateUpdatedEventPayloadBean.class);
State state = getState(bean.getType(), bean.getValue()); State state = getState(bean.getType(), bean.getValue());
ZonedDateTime lastStateUpdate = bean.getLastUpdate(); ZonedDateTime lastStateUpdate = bean.getLastStateUpdate();
return new ItemStateUpdatedEvent(topic, payload, itemName, state, lastStateUpdate, null); return new ItemStateUpdatedEvent(topic, payload, itemName, state, lastStateUpdate, null);
} }
@ -581,7 +581,7 @@ public class ItemEventFactory extends AbstractEventFactory {
private static class ItemStateUpdatedEventPayloadBean { private static class ItemStateUpdatedEventPayloadBean {
private @NonNullByDefault({}) String type; private @NonNullByDefault({}) String type;
private @NonNullByDefault({}) String value; private @NonNullByDefault({}) String value;
private @Nullable ZonedDateTime lastUpdate; private @Nullable ZonedDateTime lastStateUpdate;
/** /**
* Default constructor for deserialization e.g. by Gson. * Default constructor for deserialization e.g. by Gson.
@ -590,10 +590,10 @@ public class ItemEventFactory extends AbstractEventFactory {
protected ItemStateUpdatedEventPayloadBean() { protected ItemStateUpdatedEventPayloadBean() {
} }
public ItemStateUpdatedEventPayloadBean(String type, String value, @Nullable ZonedDateTime lastUpdate) { public ItemStateUpdatedEventPayloadBean(String type, String value, @Nullable ZonedDateTime lastStateUpdate) {
this.type = type; this.type = type;
this.value = value; this.value = value;
this.lastUpdate = lastUpdate; this.lastStateUpdate = lastStateUpdate;
} }
public String getType() { public String getType() {
@ -604,8 +604,8 @@ public class ItemEventFactory extends AbstractEventFactory {
return value; return value;
} }
public @Nullable ZonedDateTime getLastUpdate() { public @Nullable ZonedDateTime getLastStateUpdate() {
return lastUpdate; return lastStateUpdate;
} }
} }