Added rule rest endpoint and backend operation for rule execution simulation #2125

soenkekueper · 2021-01-17T13:30:00Z

Fixes #2044
Fixes #2266

soenkekueper · 2021-01-20T19:42:57Z

Hey,

i need your help here :(

The jenkins build fails with the following error messages:

[INFO] ------------------------------------------------------------------------
[INFO] BUILD FAILURE
[INFO] ------------------------------------------------------------------------
[INFO] Total time:  02:58 min (Wall Clock)
[INFO] Finished at: 2021-01-19T01:41:36Z
[INFO] ------------------------------------------------------------------------
[ERROR] Failed to execute goal org.apache.maven.plugins:maven-compiler-plugin:3.8.1:compile (default-compile) on project org.openhab.core.automation.integration.tests: Compilation failure: Compilation failure: 
[ERROR] /home/jenkins/jenkins-agent1/workspace/PR-openHAB-Core/itests/org.openhab.core.automation.integration.tests/src/main/java/org/openhab/core/automation/integration/test/RuleSimulationTest.java:[41,8] The import org.openhab.core.automation.RuleExecution cannot be resolved
[ERROR] /home/jenkins/jenkins-agent1/workspace/PR-openHAB-Core/itests/org.openhab.core.automation.integration.tests/src/main/java/org/openhab/core/automation/integration/test/RuleSimulationTest.java:[135,14] RuleExecution cannot be resolved to a type
[ERROR] /home/jenkins/jenkins-agent1/workspace/PR-openHAB-Core/itests/org.openhab.core.automation.integration.tests/src/main/java/org/openhab/core/automation/integration/test/RuleSimulationTest.java:[135,53] The method simulateRuleExecutions(java.time.ZonedDateTime, java.time.ZonedDateTime) is undefined for the type org.openhab.core.automation.RuleManager
[ERROR] /home/jenkins/jenkins-agent1/workspace/PR-openHAB-Core/itests/org.openhab.core.automation.integration.tests/src/main/java/org/openhab/core/automation/integration/test/RuleSimulationTest.java:[141,18] RuleExecution cannot be resolved to a type
[ERROR] /home/jenkins/jenkins-agent1/workspace/PR-openHAB-Core/itests/org.openhab.core.automation.integration.tests/src/main/java/org/openhab/core/automation/integration/test/RuleSimulationTest.java:[162,40] RuleExecution cannot be resolved to a type
[ERROR] /home/jenkins/jenkins-agent1/workspace/PR-openHAB-Core/itests/org.openhab.core.automation.integration.tests/src/main/java/org/openhab/core/automation/integration/test/RuleSimulationTest.java:[191,47] CFG_START_TIME cannot be resolved or is not a field
[ERROR] /home/jenkins/jenkins-agent1/workspace/PR-openHAB-Core/itests/org.openhab.core.automation.integration.tests/src/main/java/org/openhab/core/automation/integration/test/RuleSimulationTest.java:[192,47] CFG_END_TIME cannot be resolved or is not a field
[ERROR] -> [Help 1]
[ERROR] 
[ERROR] To see the full stack trace of the errors, re-run Maven with the -e switch.
[ERROR] Re-run Maven using the -X switch to enable full debug logging.
[ERROR] 
[ERROR] For more information about the errors and possible solutions, please read the following articles:
[ERROR] [Help 1] http://cwiki.apache.org/confluence/display/MAVEN/MojoFailureException
[ERROR] 
[ERROR] After correcting the problems, you can resume the build with the command
[ERROR]   mvn <args> -rf :org.openhab.core.automation.integration.tests
Build step 'Execute shell' marked build as failure
[htmlpublisher] Archiving HTML reports...
[htmlpublisher] Archiving at BUILD level /home/jenkins/jenkins-agent1/workspace/PR-openHAB-Core/target to /var/jenkins_home/jobs/PR-openHAB-Core/builds/3049/htmlreports/Static_20Code_20Analysis_20Report
Finished: FAILURE

So this seems that my changes within the bundle org.openhab.core.automation are not available when building the org.openhab.core.automation.integration.tests bundle. It seems to me if an wrong version of the previous build bundle has been resolved?!

Confusing is also that the jenkins status page https://ci.openhab.org/job/PR-openHAB-Core/3049/ shows up green for all the given modules but the build is failed...

What can i do?

Of course this compiles and runs on my machine :D

Thanks!

…e based and thus can be used to simulate execution times. Signed-off-by: Sönke Küper <soenkekueper@gmx.de>

…time based and thus can be checked during rule execution for a certain time. Signed-off-by: Sönke Küper <soenkekueper@gmx.de>

Signed-off-by: Sönke Küper <soenkekueper@gmx.de>

…xpression. This better hides the internals of the TriggerHandler (i.e. the cron expression) and is more clear and flexible for other handlers to implement Signed-off-by: Sönke Küper <soenkekueper@gmx.de>

Signed-off-by: Sönke Küper <soenkekueper@gmx.de>

ghys · 2021-04-03T12:58:53Z

@openhab/core-maintainers maybe you'd want to have a look at this PR?
Overall it looks good, and despite being API breaking, along with openhab/openhab-webui#815, I think it would be a good addition to have a more accurate "Schedule" page in the UI (it would take Ephemeris into account etc.)

cweitkamp

Thanks for your work. I looked into your PR and left some thoughts.

bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/RuleManager.java

...re.automation/src/main/java/org/openhab/core/automation/internal/RuleExecutionSimulator.java

...main/java/org/openhab/core/automation/internal/module/handler/GenericCronTriggerHandler.java

...re.automation/src/main/java/org/openhab/core/automation/handler/TimeBasedTriggerHandler.java

...c/main/java/org/openhab/core/automation/internal/module/handler/TimeOfDayTriggerHandler.java

bundles/org.openhab.core/src/main/java/org/openhab/core/common/CronAdjuster.java

...re.automation/src/main/java/org/openhab/core/automation/internal/RuleExecutionSimulator.java

...re.automation.rest/src/main/java/org/openhab/core/automation/rest/internal/RuleResource.java

Signed-off-by: Sönke Küper <soenkekueper@gmx.de>

openhab-bot · 2021-04-09T18:23:13Z

This pull request has been mentioned on openHAB Community. There might be relevant details there:

https://community.openhab.org/t/solved-oh3-schedule-rules/120518/8

cweitkamp

LGTM. Thank you.

…execution simulation (openhab#2125) * Added marker interface for TriggerHandler to indicate if they are time based and thus can be used to simulate execution times. * Added marker interface for ConditionHandler to indicate, if they are time based and thus can be checked during rule execution for a certain time. * Moved CronAdjuster to common, so it can be used for the rule simulation * Created RuleExecutionSimulator that allows simulation of rules * Added method in RuleManger to create simulation * Added rest endpoint for rule simulation. * Changed marker interface to return TemporalAdjuster instead of cron expression. This better hides the internals of the TriggerHandler (i.e. the cron expression) and is more clear and flexible for other handlers to implement Fixes openhab#2044 Fixes openhab#2266 Signed-off-by: Sönke Küper <soenkekueper@gmx.de>

openhab-bot · 2021-06-02T16:45:47Z

This pull request has been mentioned on openHAB Community. There might be relevant details there:

https://community.openhab.org/t/ephemeris-condition-with-offset-not-working-in-rules-in-oh-3-1-0m5/123088/4

…execution simulation (openhab#2125) * Added marker interface for TriggerHandler to indicate if they are time based and thus can be used to simulate execution times. * Added marker interface for ConditionHandler to indicate, if they are time based and thus can be checked during rule execution for a certain time. * Moved CronAdjuster to common, so it can be used for the rule simulation * Created RuleExecutionSimulator that allows simulation of rules * Added method in RuleManger to create simulation * Added rest endpoint for rule simulation. * Changed marker interface to return TemporalAdjuster instead of cron expression. This better hides the internals of the TriggerHandler (i.e. the cron expression) and is more clear and flexible for other handlers to implement Fixes openhab#2044 Fixes openhab#2266 Signed-off-by: Sönke Küper <soenkekueper@gmx.de> GitOrigin-RevId: db488d8

soenkekueper requested a review from a team as a code owner January 17, 2021 13:30

soenkekueper changed the title ~~2044 schedule with conditions~~ 2044 Added rule rest endpoint and backend operation for rule execution simulation Jan 17, 2021

soenkekueper changed the title ~~2044 Added rule rest endpoint and backend operation for rule execution simulation~~ Added rule rest endpoint and backend operation for rule execution simulation Jan 17, 2021

soenkekueper mentioned this pull request Jan 17, 2021

Adjusted schedule ui to use the new rest service for rule preview openhab/openhab-webui#815

Merged

Base automatically changed from master to main January 18, 2021 20:04

wborn added rebuild Triggers the Jenkins PR build and removed rebuild Triggers the Jenkins PR build labels Jan 18, 2021

cweitkamp added rebuild Triggers the Jenkins PR build automation REST/SSE and removed rebuild Triggers the Jenkins PR build labels Jan 21, 2021

soenkekueper force-pushed the 2044-ScheduleWithConditions branch from ee94c04 to 3ba1dc3 Compare February 6, 2021 16:09

ghys mentioned this pull request Feb 10, 2021

[mainui] CronBuilder puts monday as day 1 openhab/openhab-webui#902

Closed

soenkekueper added 13 commits April 2, 2021 17:04

Added marker interface for TriggerHandler to indicate if they are tim…

165207d

…e based and thus can be used to simulate execution times. Signed-off-by: Sönke Küper <soenkekueper@gmx.de>

Added marker interface for ConditionHandler to indicate, if they are …

f010a1c

…time based and thus can be checked during rule execution for a certain time. Signed-off-by: Sönke Küper <soenkekueper@gmx.de>

Moved CronAdjuster to common, so it can be used for the rule simulation

35d8f70

Signed-off-by: Sönke Küper <soenkekueper@gmx.de>

Changed visibility to package, so it can be used by simulation

20c9667

Signed-off-by: Sönke Küper <soenkekueper@gmx.de>

Created RuleExecutionSimulator that allows simulation of rules

9429573

Signed-off-by: Sönke Küper <soenkekueper@gmx.de>

Added method in RuleManger to create simulation

28dab44

Signed-off-by: Sönke Küper <soenkekueper@gmx.de>

Added integration test

ffb30bb

Signed-off-by: Sönke Küper <soenkekueper@gmx.de>

Spotless fix

b574fc0

Signed-off-by: Sönke Küper <soenkekueper@gmx.de>

Added rest endpoint for rule simulation.

870b393

Signed-off-by: Sönke Küper <soenkekueper@gmx.de>

Added javadoc

8bc2b8d

Signed-off-by: Sönke Küper <soenkekueper@gmx.de>

Corrected parameter

ac11316

Signed-off-by: Sönke Küper <soenkekueper@gmx.de>

Changed marker interface to return TemporalAdjuster instead of cron e…

777be80

…xpression. This better hides the internals of the TriggerHandler (i.e. the cron expression) and is more clear and flexible for other handlers to implement Signed-off-by: Sönke Küper <soenkekueper@gmx.de>

Only simulate rules that are enabled.

aabee1d

Signed-off-by: Sönke Küper <soenkekueper@gmx.de>

soenkekueper force-pushed the 2044-ScheduleWithConditions branch from 3da3d6b to aabee1d Compare April 2, 2021 15:05

cweitkamp reviewed Apr 4, 2021

View reviewed changes

soenkekueper added 5 commits April 7, 2021 17:35

openhab#2044: Moved CronAdjuster to package org.openhab.core.scheduler

9cd0ebc

Signed-off-by: Sönke Küper <soenkekueper@gmx.de>

openhab#2044: Removed not needed @nullable annotation.

d620024

Signed-off-by: Sönke Küper <soenkekueper@gmx.de>

openhab#2044: Adjusted javadoc and parameter names.

0dbf78d

Signed-off-by: Sönke Küper <soenkekueper@gmx.de>

openhab#2044: Renamed rest method

d20836c

Signed-off-by: Sönke Küper <soenkekueper@gmx.de>

openhab#2044: Fixed javadoc checkstyle

bfd340e

Signed-off-by: Sönke Küper <soenkekueper@gmx.de>

cweitkamp approved these changes Apr 11, 2021

View reviewed changes

cweitkamp merged commit db488d8 into openhab:main Apr 11, 2021

cweitkamp added this to the 3.1 milestone Apr 11, 2021

soenkekueper mentioned this pull request Apr 18, 2021

2285: Added default values for rule simulation start and end dates an… #2296

Merged

cweitkamp added the enhancement An enhancement or new feature of the Core label May 2, 2021

ghys mentioned this pull request Jun 24, 2021

Consider Ephemeris conditions in schedule openhab/openhab-webui#754

Closed

This was referenced Apr 27, 2022

Schedule calendar display is off by one day openhab/openhab-webui#1373

Closed

Ephemeris support in UIs #1577

Open

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Added rule rest endpoint and backend operation for rule execution simulation #2125

Added rule rest endpoint and backend operation for rule execution simulation #2125

soenkekueper commented Jan 17, 2021 •

edited

Loading

soenkekueper commented Jan 20, 2021 •

edited by kaikreuzer

Loading

ghys commented Apr 3, 2021

cweitkamp left a comment •

edited

Loading

openhab-bot commented Apr 9, 2021

cweitkamp left a comment

openhab-bot commented Jun 2, 2021

Added rule rest endpoint and backend operation for rule execution simulation #2125

Added rule rest endpoint and backend operation for rule execution simulation #2125

Conversation

soenkekueper commented Jan 17, 2021 • edited Loading

soenkekueper commented Jan 20, 2021 • edited by kaikreuzer Loading

ghys commented Apr 3, 2021

cweitkamp left a comment • edited Loading

Choose a reason for hiding this comment

openhab-bot commented Apr 9, 2021

cweitkamp left a comment

Choose a reason for hiding this comment

openhab-bot commented Jun 2, 2021

soenkekueper commented Jan 17, 2021 •

edited

Loading

soenkekueper commented Jan 20, 2021 •

edited by kaikreuzer

Loading

cweitkamp left a comment •

edited

Loading