This is an automated email from the ASF dual-hosted git repository.
heneveld pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/brooklyn-server.git
from c2320ebe81 fix test case for more forgiving let parse
add 95271552c3 add an expresson parser which understands interpolated
strings etc
add 0c6b44172a update shorthand processor to use expression processor
add 68597ff34b refactor how map sensors are updated, consistent between
let and set-sensor
new 6d428e7ae7 Merge pull request #1415 from ahgittin/expression-parsing
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../brooklyn/core/workflow/ShorthandProcessor.java | 319 +-------------
...ocessor.java => ShorthandProcessorEpToQst.java} | 225 ++++++++--
.../workflow/ShorthandProcessorExprParser.java | 463 +++++++++++++++++++++
...ndProcessor.java => ShorthandProcessorQst.java} | 33 +-
.../core/workflow/WorkflowStepDefinition.java | 7 +-
.../steps/appmodel/ClearSensorWorkflowStep.java | 36 +-
.../steps/appmodel/SetConfigWorkflowStep.java | 22 +-
.../steps/appmodel/SetSensorWorkflowStep.java | 238 ++++-------
.../steps/appmodel/UpdateChildrenWorkflowStep.java | 6 +-
.../steps/variables/SetVariableWorkflowStep.java | 59 +--
.../workflow/steps/variables/TransformReplace.java | 3 -
.../variables/TransformSetWorkflowVariable.java | 2 +-
.../workflow/steps/variables/TransformSplit.java | 9 -
.../variables/TransformVariableWorkflowStep.java | 29 +-
.../core/workflow/utils/ExpressionParser.java | 230 ++++++++++
.../core/workflow/utils/ExpressionParserImpl.java | 444 ++++++++++++++++++++
.../workflow/utils/WorkflowSettingItemsUtils.java | 312 ++++++++++++++
.../core/workflow/ExpressionParserTest.java | 97 +++++
...est.java => ShorthandProcessorEpToQstTest.java} | 50 ++-
...sorTest.java => ShorthandProcessorQstTest.java} | 26 +-
.../core/workflow/WorkflowMapAndListTest.java | 243 +++++++++--
.../WorkflowNestedAndCustomExtensionTest.java | 3 +-
.../java/org/apache/brooklyn/test/Asserts.java | 7 +
.../java/org/apache/brooklyn/util/guava/Maybe.java | 6 +
24 files changed, 2182 insertions(+), 687 deletions(-)
copy
core/src/main/java/org/apache/brooklyn/core/workflow/{ShorthandProcessor.java
=> ShorthandProcessorEpToQst.java} (62%)
create mode 100644
core/src/main/java/org/apache/brooklyn/core/workflow/ShorthandProcessorExprParser.java
copy
core/src/main/java/org/apache/brooklyn/core/workflow/{ShorthandProcessor.java
=> ShorthandProcessorQst.java} (96%)
create mode 100644
core/src/main/java/org/apache/brooklyn/core/workflow/utils/ExpressionParser.java
create mode 100644
core/src/main/java/org/apache/brooklyn/core/workflow/utils/ExpressionParserImpl.java
create mode 100644
core/src/main/java/org/apache/brooklyn/core/workflow/utils/WorkflowSettingItemsUtils.java
create mode 100644
core/src/test/java/org/apache/brooklyn/core/workflow/ExpressionParserTest.java
copy
core/src/test/java/org/apache/brooklyn/core/workflow/{ShorthandProcessorTest.java
=> ShorthandProcessorEpToQstTest.java} (80%)
rename
core/src/test/java/org/apache/brooklyn/core/workflow/{ShorthandProcessorTest.java
=> ShorthandProcessorQstTest.java} (91%)