Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Extend connectivity payload mapping capabilities #539

Merged
merged 66 commits into from
Nov 4, 2019
Merged

Extend connectivity payload mapping capabilities #539

merged 66 commits into from
Nov 4, 2019

Conversation

dguggemos
Copy link
Contributor

This PR adds

  • configuring multiple payload mappings per connection
  • configuring payload mappings per source/target separately (mapping was defined globally per connection so far)
  • producing multiple output messages from one input message in a payload mapping
  • a ConnectionStatus mapper (fixes Map Hono device connection status to Thing feature #492)

VadimGue and others added 30 commits September 18, 2019 10:13
@VadimGue
Implement basic functionalities to ConnectionStatusMapper
0905d71 
Signed-off-by: Vadim Guenther <vadim.guenther@bosch-si.com>
@dguggemos
introduce new 'mappings' field to connection model and allow sources …
55517e4 
…and targets to reference one more more mappings by ID, legacy mapping contexts are migrated to new model on the fly

Signed-off-by: Dominik Guggemos <dominik.guggemos@bosch-si.com>
@dguggemos
allow logging of raw http headers if header 'ditto-trace-headers' is …
559be5c 
…provided

Signed-off-by: Dominik Guggemos <dominik.guggemos@bosch-si.com>
@VadimGue
Implement "Connection event" and mappingOption to ConnectionStatusMap…
7334fe9 
…per. Implement unit test

Signed-off-by: Vadim Guenther <vadim.guenther@bosch-si.com>
@VadimGue
Implement mapping context options evaluation. Add validation for mapp…
2327a1b 
…ing context options

Signed-off-by: Vadim Guenther <vadim.guenther@bosch-si.com>
@dguggemos
- allow multiple mappings for sources and targets that each produce …
67fe89f 
…independent messages

 - allow MessageMapper to produce multiple messages from a single input message (wip)

Signed-off-by: Dominik Guggemos <dominik.guggemos@bosch-si.com>
@dguggemos
Merge branch 'master' into feature/connection-status
e96775d
@dguggemos
fix license headers
d3ebf65 
Signed-off-by: Dominik Guggemos <dominik.guggemos@bosch-si.com>
@dguggemos
Merge branch 'master' into feature/connection-status
431e403
@dguggemos
change MessageMapper API to support multiple messages as result
03befca 
Signed-off-by: Dominik Guggemos <dominik.guggemos@bosch-si.com>
@dguggemos
fix unit tests
086bdf4 
Signed-off-by: Dominik Guggemos <dominik.guggemos@bosch-si.com>
@dguggemos
add some more mapping tests
f5f2e5f 
Signed-off-by: Dominik Guggemos <dominik.guggemos@bosch-si.com>
@dguggemos
set mapper id from connection config
26d5af2 
Signed-off-by: Dominik Guggemos <dominik.guggemos@bosch-si.com>
@dguggemos
add mapper used to process inbound messages to internal headers and u…
d5a8c28 
…se it to map responses with same mapper

Signed-off-by: Dominik Guggemos <dominik.guggemos@bosch-si.com>
@dguggemos
add methods to get and set mapper value from ditto headers and use them
4da27e1 
Signed-off-by: Dominik Guggemos <dominik.guggemos@bosch-si.com>
@dguggemos
introduce types PayloadMappingDefinition and PayloadMapping in connec…
06c36ca 
…tivity model

Signed-off-by: Dominik Guggemos <dominik.guggemos@bosch-si.com>
@dguggemos
fix test
bab4d83 
Signed-off-by: Dominik Guggemos <dominik.guggemos@bosch-si.com>
@dguggemos
add javadoc, fix handling of null PayloadMapping in ExternalMessage
244a108 
Signed-off-by: Dominik Guggemos <dominik.guggemos@bosch-si.com>
@dguggemos
fix javadoc errors
202e8bf 
Signed-off-by: Dominik Guggemos <dominik.guggemos@bosch-si.com>
@dguggemos
review ConnectionStatusMessageMapper
3252c64 
Signed-off-by: Dominik Guggemos <dominik.guggemos@bosch-si.com>
@dguggemos
replace loading of MessageMappers via its fully qualified class name …
1ef008a 
…by an alias-based approach using the @PayloadMapper annotation

Signed-off-by: Dominik Guggemos <dominik.guggemos@bosch-si.com>
@dguggemos
fix loading of fallback mappers + add tests
854006d 
Signed-off-by: Dominik Guggemos <dominik.guggemos@bosch-si.com>
@VadimGue
Special treatment of ttd = 0 header
604800d 
Signed-off-by: Vadim Guenther <vadim.guenther@bosch-si.com>
@VadimGue
Fix unit test. Add unit test for context validating
4e492f2 
Signed-off-by: Vadim Guenther <vadim.guenther@bosch-si.com>
@dguggemos
Merge branch 'master' into feature/connection-status
ca16154
@dguggemos
adapt NormalizedMessageMapper to changes
e7db1e4 
Signed-off-by: Dominik Guggemos <dominik.guggemos@bosch-si.com>
@dguggemos
fix mapping config validation
d182db9 
Signed-off-by: Dominik Guggemos <dominik.guggemos@bosch-si.com>
@dguggemos
disable validation of mappings in model, change unit of creation-time…
34ac349 
… to milliseconds

Signed-off-by: Dominik Guggemos <dominik.guggemos@bosch-si.com>
@dguggemos
fix connection test
156bfc2 
Signed-off-by: Dominik Guggemos <dominik.guggemos@bosch-si.com>
@dguggemos
ignore test temp.
55340a9 
Signed-off-by: Dominik Guggemos <dominik.guggemos@bosch-si.com>
dguggemos and others added 26 commits October 29, 2019 10:58
@dguggemos
validate configured mapper references
aa59d52 
Signed-off-by: Dominik Guggemos <dominik.guggemos@bosch-si.com>
@thjaeckle
review:
4ef6d93 
* made placeholders also usable for configured featureId
* changed definition to ditto namespace
* added description to thrown mapping exceptions
* log with correlation-id

Signed-off-by: Thomas Jaeckle <thomas.jaeckle@bosch-si.com>
@dguggemos
fix compile error
43957b7 
Signed-off-by: Dominik Guggemos <dominik.guggemos@bosch-si.com>
@VadimGue
Add unit test for limitation of messages per mappings.
f356209 
Signed-off-by: Vadim Guenther <vadim.guenther@bosch-si.com>
@thjaeckle
made it possible to configure a "content-type-blacklist"
8b75b5c 
* for all MessageMappers
* this is applied in MessageMappingProcessor prior to invoking the mapper
* added default blacklist for well known Hono "notification" types for the default DittoMessageMapper
* removed no longer used "contentType" configuration for mappers

Signed-off-by: Thomas Jaeckle <thomas.jaeckle@bosch-si.com>
@thjaeckle
added one more unit test for overwriting the content-type-blacklist
cd575aa 
Signed-off-by: Thomas Jaeckle <thomas.jaeckle@bosch-si.com>
@thjaeckle
fixed log statement - was no "failure"
4d1ea3f 
Signed-off-by: Thomas Jaeckle <thomas.jaeckle@bosch-si.com>
@thjaeckle
review: enhanced thrown ConnectionConfigurationInvalidException with …
0035949 
…a custom description listing which mappers may be used

Signed-off-by: Thomas Jaeckle <thomas.jaeckle@bosch-si.com>
@dguggemos
document changes to payload mapping
72ef14c 
Signed-off-by: Dominik Guggemos <dominik.guggemos@bosch-si.com>
@dguggemos
try to stabilize AmqpClientActorTest
2b00774 
Signed-off-by: Dominik Guggemos <dominik.guggemos@bosch-si.com>
@dguggemos
Merge branch 'master' into feature/connection-status
dce1cfb
@dguggemos
feature id can also be resolved from headers
171cbb9 
Signed-off-by: Dominik Guggemos <dominik.guggemos@bosch-si.com>
@VadimGue
Add mapper limits to config
d283055 
Signed-off-by: Vadim Guenther <vadim.guenther@bosch-si.com>
@thjaeckle
fixed that "status" json object was missing in ConnectionStatusMessag…
1e41897 
…eMapper

* + enhanced unit tests to additionally check for value of the modified feature

Signed-off-by: Thomas Jaeckle <thomas.jaeckle@bosch-si.com>
@thjaeckle
review:
501dfdd 
* restructured connectivity-mapping.md in order to first list all available headers and afterwards descripe the JavaScript engine in more detail
* fixed json schema
* enhanced jsdoc of internal .js files for JavaScript engine (mentioning the Array return type correctly)

Signed-off-by: Thomas Jaeckle <thomas.jaeckle@bosch-si.com>
@VadimGue
Use mapper limits from connectivity config
ca6796a 
Signed-off-by: Vadim Guenther <vadim.guenther@bosch-si.com>
@dguggemos
prefix internal mapper header (ditto-mapper), move injection of heade…
1ecdd53 
…r to MessageMappingProcessor in order to set readFromExternal to false

Signed-off-by: Dominik Guggemos <dominik.guggemos@bosch-si.com>
@dguggemos
fix mapping config tests
52a9ba3 
Signed-off-by: Dominik Guggemos <dominik.guggemos@bosch-si.com>
@thjaeckle
changed mapper of of "migrated" to "javascript" as this is currently …
20395e8 
…the only one

Signed-off-by: Thomas Jaeckle <thomas.jaeckle@bosch-si.com>
@dguggemos
fix long-running ditto build
6ea3675 
Signed-off-by: Dominik Guggemos <dominik.guggemos@bosch-si.com>
@dguggemos
Merge branch 'master' into feature/connection-status
8788ab6
@dguggemos
- review of mapper limits, moved initialization of limits to construc…
db3a3a8 
…tor, avoid code duplication, polish some wording

- unignore amqp tests

Signed-off-by: Dominik Guggemos <dominik.guggemos@bosch-si.com>
@thjaeckle
review: renamed newly introduced DittHeader "mapper" to "incoming-pay…
d0a5ee0 
…load-mapper" in order to be more specific

Signed-off-by: Thomas Jaeckle <thomas.jaeckle@bosch-si.com>
@thjaeckle
added release notes and blogpost about 1.0.0-M2
41b3b65 
Signed-off-by: Thomas Jaeckle <thomas.jaeckle@bosch-si.com>
@thjaeckle
removed "to be removed CQs" from cqs.md list
af282f0 
Signed-off-by: Thomas Jaeckle <thomas.jaeckle@bosch-si.com>
@dguggemos
reset some log levels, dev config settings
8e3f846 
Signed-off-by: Dominik Guggemos <dominik.guggemos@bosch-si.com>
@thjaeckle thjaeckle added this to the 1.0.0-M2 milestone Nov 4, 2019
thjaeckle
thjaeckle approved these changes Nov 4, 2019
View reviewed changes
Copy link
Member

@thjaeckle thjaeckle left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM 👍

@dguggemos dguggemos merged commit a51ae55 into eclipse-ditto:master Nov 4, 2019
@dguggemos dguggemos deleted the feature/connection-status branch November 4, 2019 14:59
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@thjaeckle thjaeckle thjaeckle approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
1.0.0-M2
Development

Successfully merging this pull request may close these issues.

Map Hono device connection status to Thing feature
3 participants
@dguggemos @thjaeckle @VadimGue