This repository has been archived by the owner on May 7, 2020. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 782
Feature/triggers #1936
Merged
Merged
Feature/triggers #1936
Changes from all commits
Commits
Show all changes
26 commits
Select commit
Hold shift + click to select a range
a12c392
Implemented trigger channels.
phxql 818be92
Using channel id instead of thing id for event.
phxql 5c8202b
Smaller fixes.
phxql bf76bb8
Ran mvn:licenseformat
phxql eac79ba
Renamed ThingTriggerEvent to ChannelTriggeredEvent
phxql 3583fcb
Added tests to ThingEventFactoryTest.
phxql 5e283cd
Changed StateOption in EventDescription to new class EventOption.
phxql b375f09
Removed unused constant
phxql 261dc5d
ChannelTriggeredEvent now includes the channel which triggered the ev…
phxql 8f2f99e
Code cleanuo
phxql 106a715
Run formatter on RulesJvmModelInferrer.xtend
phxql affe3b0
Refactored XML. A channel now has a kind, which can be (atm) STATE or…
phxql 961058e
Fix XML parsing.
phxql ff09f31
Ensure that channel kind is never null.
phxql e12a223
Removed trigger event types. Every trigger event is now of type string.
phxql 100cc02
Fixed a bug where channel kind hasn't been applied.
phxql dadb9cb
Added JavaDoc.
phxql dc7c5fe
Reset targetplatform launch script.
phxql cc981d2
Improved null checks for kind fields.
phxql 37cf37a
Fixed a bug where the item types of custom channels was null.
phxql 6a736e4
Added system trigger types.
phxql 691cb1d
Added missing license header.
phxql 8d871d8
Merge remote-tracking branch 'upstream/master' into feature/triggers
phxql 2207d95
Fixed line break.
phxql e85dd53
Fixed useless line breaks.
phxql 32c8048
Fixed logger declaration.
phxql File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
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
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
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
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
9 changes: 9 additions & 0 deletions
9
bundles/core/org.eclipse.smarthome.core.persistence/OSGI-INF/persistenceserviceregistry.xml
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
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
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
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
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Again, I see that this is done in the existing modules this way, too, but it is something I already wanted to have changed since a long time.
I would very much prefer if the output of this trigger would be a "Type", so exactly what the handler emits (e.g. "TRIGGERED"). This would make it much nicer for following rule actions to use it. WDYT?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yes, thought of that too. But you'll lose the other information of the event, like topic etc.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I'd be fine with that, because the topic etc. is "raw" information that is not really the level of this module anymore.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
And the channel which was triggered?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Not needed, because the whole module only exists for one channel (which is in its configuration).
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
What about this discussion?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I prefer to not make that change in the scope of this PR, as this also affects the other rules.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Ok for me