[camel] branch master updated (e90f6f6 -> 942a163)

[oa...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

oalsafi pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git.


    from e90f6f6  CAMEL-14106 - Regen docs
     new 6c2fceb  CAMEL-14192: Add toMap in the protobuf data format
     new 51a31aa  CAMEL-14192: Fix checkstyle and avoid infinite loop in the type converter
     new 942a163  Merge pull request #3349 from omarsmak/CAMEL-14192

The 40509 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:
 .../src/main/docs/protobuf-dataformat.adoc         |  4 ++
 .../dataformat/protobuf/ProtobufConverter.java     | 72 +++++++++++++++++-----
 .../dataformat/protobuf/ProtobufDataFormat.java    | 10 +--
 .../protobuf/ProtobufTypeConverter.java}           | 14 +++--
 .../dataformat/protobuf/ProtobufConverterTest.java | 41 ++++++++++--
 .../ProtobufMarshalAndUnmarshalMapTest.java        |  5 +-
 6 files changed, 114 insertions(+), 32 deletions(-)
 copy components/{camel-atomix/src/main/java/org/apache/camel/component/atomix/AtomixTypeConverter.java => camel-protobuf/src/main/java/org/apache/camel/dataformat/protobuf/ProtobufTypeConverter.java} (74%)