[mqtt.homeassistant] Fix binding crash when home assistant discovery topics update with content #13518
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Fixes openhab#13517 Possibly resolves openhab#9711 and openhab#12295 as well. Signed-off-by: Sami Salonen <ssalonen@gmail.com>
ssalonen
changed the title
Signed-off-by: Sami Salonen <ssalonen@gmail.com>
|
I believe I picked this pattern of recreating thing with list of channels from some other binding. Is it ok? Or are there side effects eg to links? I have not tested this with full setup, only unit tests |
|
Tested with mqtt.generic 3.4.0-SNAPSHOT https://github.com/ssalonen/openhab2-addons/releases/tag/mqtt-homeassistant-b2e6c55 succesfully, seems to work fine |
Signed-off-by: Sami Salonen <ssalonen@gmail.com>
lolodomo
added
rebuild
lolodomo
reviewed
Nov 5, 2022
.../java/org/openhab/binding/mqtt/homeassistant/internal/handler/HomeAssistantThingHandler.java
Outdated
Show resolved
Hide resolved
|
@antroids : would you like to review that change ? |
Signed-off-by: Sami Salonen <ssalonen@gmail.com>
Yes, looks interesting, let me check. |
lolodomo
requested changes
Nov 5, 2022
.../java/org/openhab/binding/mqtt/homeassistant/internal/handler/HomeAssistantThingHandler.java
Outdated
Show resolved
Hide resolved
|
Waiting for @antroids review before merging. |
antroids
requested changes
Nov 6, 2022
...ssistant/src/main/java/org/openhab/binding/mqtt/homeassistant/internal/component/Vacuum.java
Outdated
Show resolved
Hide resolved
.../java/org/openhab/binding/mqtt/homeassistant/internal/handler/HomeAssistantThingHandler.java
Outdated
Show resolved
Hide resolved
Co-Authored-by: @antroids github handle Signed-off-by: Sami Salonen <ssalonen@gmail.com>
Signed-off-by: Sami Salonen <ssalonen@gmail.com>
antroids
approved these changes
Nov 12, 2022
andrasU
pushed a commit
to andrasU/openhab-addons
that referenced
this pull request
Dec 24, 2022
…topics update with content (openhab#13518) * [mqtt.homeassistant] Fix for discovery topics that update with content Fixes openhab#13517 Possibly resolves openhab#9711 and openhab#12295 as well. * [mqtt.homeassistant] Sort channels before changing thing * [mqtt.homeassistant] logging + removed unnecessary synchronization * Resolve bunch of warnings in homeassistant bundle * [mqtt.homeassistant] Handling null warnings and unnecessary null checks * [mqtt.homeassistant] Removing unnecessary null checks Signed-off-by: Sami Salonen <ssalonen@gmail.com> Co-Authored-by: @antroids github handle Signed-off-by: Andras Uhrin <andras.uhrin@gmail.com>
borazslo
pushed a commit
to borazslo/openhab-mideaac-addon
that referenced
this pull request
Jan 8, 2023
…topics update with content (openhab#13518) * [mqtt.homeassistant] Fix for discovery topics that update with content Fixes openhab#13517 Possibly resolves openhab#9711 and openhab#12295 as well. * [mqtt.homeassistant] Sort channels before changing thing * [mqtt.homeassistant] logging + removed unnecessary synchronization * Resolve bunch of warnings in homeassistant bundle * [mqtt.homeassistant] Handling null warnings and unnecessary null checks * [mqtt.homeassistant] Removing unnecessary null checks Signed-off-by: Sami Salonen <ssalonen@gmail.com> Co-Authored-by: @antroids github handle
psmedley
pushed a commit
to psmedley/openhab-addons
that referenced
this pull request
Feb 23, 2023
…topics update with content (openhab#13518) * [mqtt.homeassistant] Fix for discovery topics that update with content Fixes openhab#13517 Possibly resolves openhab#9711 and openhab#12295 as well. * [mqtt.homeassistant] Sort channels before changing thing * [mqtt.homeassistant] logging + removed unnecessary synchronization * Resolve bunch of warnings in homeassistant bundle * [mqtt.homeassistant] Handling null warnings and unnecessary null checks * [mqtt.homeassistant] Removing unnecessary null checks Signed-off-by: Sami Salonen <ssalonen@gmail.com> Co-Authored-by: @antroids github handle
nemerdaud
pushed a commit
to nemerdaud/openhab-addons
that referenced
this pull request
Feb 28, 2023
…topics update with content (openhab#13518) * [mqtt.homeassistant] Fix for discovery topics that update with content Fixes openhab#13517 Possibly resolves openhab#9711 and openhab#12295 as well. * [mqtt.homeassistant] Sort channels before changing thing * [mqtt.homeassistant] logging + removed unnecessary synchronization * Resolve bunch of warnings in homeassistant bundle * [mqtt.homeassistant] Handling null warnings and unnecessary null checks * [mqtt.homeassistant] Removing unnecessary null checks Signed-off-by: Sami Salonen <ssalonen@gmail.com> Co-Authored-by: @antroids github handle
andrasU
pushed a commit
to andrasU/openhab-addons
that referenced
this pull request
Jan 6, 2024
…topics update with content (openhab#13518) * [mqtt.homeassistant] Fix for discovery topics that update with content Fixes openhab#13517 Possibly resolves openhab#9711 and openhab#12295 as well. * [mqtt.homeassistant] Sort channels before changing thing * [mqtt.homeassistant] logging + removed unnecessary synchronization * Resolve bunch of warnings in homeassistant bundle * [mqtt.homeassistant] Handling null warnings and unnecessary null checks * [mqtt.homeassistant] Removing unnecessary null checks Signed-off-by: Sami Salonen <ssalonen@gmail.com> Co-Authored-by: @antroids github handle Signed-off-by: Andras Uhrin <andras.uhrin@gmail.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes #13517
Possibly resolves #9711 and #12295 as well.
The implementation does not handle updating discovery topics -- when the content is not exactly the same. Example of real life scenario documented in #13517 with OpenMQTTGateway. To be honest, I am not sure if there are other kind of situations when we might hit this error.
This fix ensures that conflicting channels are first removed, and only then we add new channels. This means that more recent discovery data always overrides older... at least when it comes to channels.
Signed-off-by: Sami Salonen ssalonen@gmail.com