Fix properties #251
Merged
Fix properties #251
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
gchickma
approved these changes
Nov 14, 2022
tlawrie
reviewed
Nov 15, 2022
| @@ -199,7 +204,7 @@ private EventResponse processEvent(CloudEvent<AttributesImpl, JsonNode> event, S | |||
| property.setKey("eventId"); | |||
| property.setValue(event.getAttributes().getId()); | |||
| cloudEventLabels.add(property); | |||
| executionRequest.setLabels(cloudEventLabels); | |||
| // executionRequest.setLabels(cloudEventLabels); | |||
There was a problem hiding this comment.
@amhudson how does not setting the labels on a CloudEvent (listener triggered) execution affect the webhook?
tlawrie
reviewed
Nov 15, 2022
Comment on lines
281
to
300
| ObjectMapper mapper = new ObjectMapper(); | ||
| Map<String, String> payloadProperties = | ||
| mapper.convertValue(eventData.get("properties"), new TypeReference<Map<String, String>>() {}); | ||
| properties.putAll(payloadProperties); | ||
|
|
||
| // properties.put("eventPayload", eventData.toString()); | ||
|
|
||
| WorkflowEntity workflow = workflowService.getWorkflow(workflowId); | ||
|
|
||
| List<KeyValuePair> propertyList = ParameterMapper.mapToKeyValuePairList(properties); | ||
| Map<String, WorkflowProperty> workflowPropMap = workflow.getProperties().stream() | ||
| .collect(Collectors.toMap(WorkflowProperty::getKey, WorkflowProperty -> WorkflowProperty)); | ||
| // Use default value for password-type parameter when user input value is null when executing | ||
| // workflow. | ||
| propertyList.stream().forEach(p -> { | ||
| if (workflowPropMap.get(p.getKey()) != null | ||
| && FieldType.PASSWORD.value().equals(workflowPropMap.get(p.getKey()).getType()) | ||
| && p.getValue() == null) { | ||
| p.setValue(workflowPropMap.get(p.getKey()).getDefaultValue()); | ||
| } |
There was a problem hiding this comment.
Should the parameter resoluton around defaults be resolved in the Workflow Execution Service and not the EventProcessor
gchickma
approved these changes
Nov 17, 2022
tlawrie
approved these changes
Dec 6, 2022
florentinvintila
pushed a commit
that referenced
this pull request
Jan 20, 2023
* fix properties * remove CE labels * fix workflow password parameters * fix conversion * fix conversion * fix conversion * refactor * fix conversion * fix npe * update property processing * upgrade jacoco version
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.
Closes #
#250
Changelog
New
Changed
Removed
Testing / Reviewing
Tested and verified with
flow.service.workflow 3.4.83