You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by nf...@apache.org on 2022/03/02 10:26:29 UTC
[camel] branch CAMEL-17720/support-null-body-unmarshaller updated (fc313a3 -> f00aeb5)
This is an automated email from the ASF dual-hosted git repository.
nfilotto pushed a change to branch CAMEL-17720/support-null-body-unmarshaller
in repository https://gitbox.apache.org/repos/asf/camel.git.
discard fc313a3 CAMEL-17720: camel-jackson - Add option to allow jackson to support null body
add 8955b58 Regen for commit daad5b767dfd9e8224088006ec6f2555e8240381
add 2161f15 Regen for commit 1672476dd0266a3e8182bad75df0fdbdd3514307
add fd60b0d CAMEL-17728: camel-quartz - Remove outdated doc
add 31d7044 CAMEL-17728: camel-quarz - Remove option that was no longer in use.
add f88b1b3 CAMEL-17684 - Support ability to load properties from Vault/Secrets cloud services - GCP Secrets Manager
add a118f6e CAMEL-17684 - Support ability to load properties from Vault/Secrets cloud services - GCP Secrets Manager
add 83d3697 CAMEL-15562: added a reusable kafka strategy
add 9aab52d CAMEL-15562: preliminary implementation of the user-facing resume API
add 0992cbc CAMEL-15562: cleanup the creation of the strategy factories
add 5547505 CAMEL-15562: removed the resume strategy option from components
add 4e1bd78 CAMEL-15562: fixed not starting strategies instances
add 63fc1e0 CAMEL-15562: further simplification of the API
add 6a55b31 CAMEL-15562: abstract the underlying cache so it's configurable
add e08ec3b CAMEL-15562: offset should skip when converting to InputStream
add ece9df5 CAMEL-17117: preliminary documentation for the resume strategy
add 3a56bea CAMEL-15562: fixed resumables availability check
add 616b50d CAMEL-15562: minor cleanups for the Kafka strategy
add de8389c CAMEL-155623: implement getters on the ResumeAware
add 1e76dd6 CAMEL-15562: use the service interface to avoid overlap in life cycle management
add bbd4a84 CAMEL-15562: simplify defining and setting the resume strategy
add 519f6ab CAMEL-15562: minor adjustments to the resume API log messages
add cfe69f6 CAMEL-15562: simplify the resumable processor lifecycle
add 8188f29 CAMEL-17558: Rename test
add a1dc4b7 Regen for commit cfe69f612a76f6ae9222209c045eed940fd276c1
add 44a4a68 Regen for commit 8188f29045af8f916d429d9f896d2118161f4a75
add 9f61c5e Regen for commit 8188f29045af8f916d429d9f896d2118161f4a75 (#7078)
add 2af78d3 Upgrade AWS SDK v2 to version 2.17.140
add fdc36a2 Sync deps and regen
add 65feb73 CAMEL-17730 - Camel-AWS Secret Manager Properties Source: if the subkey contains a default value the actual won't substitute correctly the secret
add 2ce6563 CAMEL-17730 - Camel-AWS Secret Manager Properties Source: if the subkey contains a default value the actual won't substitute correctly the secret
add be8a62d CAMEL-17730 - Camel-AWS Secret Manager Properties Source: if the subkey contains a default value the actual won't substitute correctly the secret
add 3a38268 CAMEL-17732 - Secrets Manager Properties Sources: if default value is provided, we should not fail with wrong credentials - AWS Secrets Manager
add 0286b9a Regen for commit be8a62dbe5ade380caa57038364b2a346eff52cb
add 2ecddd1 CAMEL-17701: camel-core-model - Add labels to EIP options
add f00aeb5 CAMEL-17720: Add option to allow unmarshalling null body
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (fc313a3)
\
N -- N -- N refs/heads/CAMEL-17720/support-null-body-unmarshaller (f00aeb5)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
No new revisions were added by this update.
Summary of changes:
camel-dependencies/pom.xml | 2 +-
.../camel/catalog/components/aws2-kinesis.json | 2 -
.../apache/camel/catalog/components/couchdb.json | 1 -
.../org/apache/camel/catalog/components/file.json | 1 -
.../org/apache/camel/catalog/components/kafka.json | 2 -
.../camel/catalog/components/netty-http.json | 8 +-
.../org/apache/camel/catalog/components/netty.json | 8 +-
.../apache/camel/catalog/components/quartz.json | 1 -
.../org/apache/camel/catalog/models/unmarshal.json | 1 +
.../org/apache/camel/catalog/others.properties | 1 +
.../apache/camel/catalog/schemas/camel-spring.xsd | 17 ++
.../SecretsManagerPropertiesFunction.java | 7 +-
.../SecretsManagerNoEnvPropertiesSourceTestIT.java | 42 +++
.../SecretsManagerPropertiesSourceTestIT.java | 42 +++
.../aws2/kinesis/Kinesis2ComponentConfigurer.java | 6 -
.../aws2/kinesis/Kinesis2EndpointConfigurer.java | 6 -
.../aws2/kinesis/Kinesis2EndpointUriFactory.java | 3 +-
.../camel/component/aws2/kinesis/aws2-kinesis.json | 2 -
.../aws2/kinesis/Kinesis2Configuration.java | 14 -
.../component/aws2/kinesis/Kinesis2Consumer.java | 7 +-
.../kinesis/consumer/KinesisResumeStrategy.java | 12 +-
.../couchdb/CouchDbEndpointConfigurer.java | 6 -
.../couchdb/CouchDbEndpointUriFactory.java | 3 +-
.../apache/camel/component/couchdb/couchdb.json | 1 -
.../component/couchdb/CouchDbChangesetTracker.java | 4 +-
.../camel/component/couchdb/CouchDbConsumer.java | 15 +-
.../camel/component/couchdb/CouchDbEndpoint.java | 15 -
.../couchdb/consumer/CouchDbResumeStrategy.java | 12 +-
...tory.java => CouchDbResumeStrategyFactory.java} | 10 +-
.../FhirJsonDataFormatErrorHandlerSpringTest.xml | 7 +-
.../FhirXmlDataFormatErrorHandlerSpringTest.xml | 4 +-
.../component/file/FileEndpointConfigurer.java | 6 -
.../component/file/FileEndpointUriFactory.java | 3 +-
.../org/apache/camel/component/file/file.json | 1 -
.../apache/camel/component/file/FileConsumer.java | 24 +-
.../apache/camel/component/file/FileEndpoint.java | 20 --
.../camel/component/file/GenericFileConverter.java | 5 +-
.../component/file/consumer/FileResumeSet.java | 8 +-
.../main/docs/google-secret-manager-component.adoc | 92 ++++++
.../jackson/JacksonDataFormatConfigurer.java | 2 -
.../apache/camel/component/jackson/jackson.json | 1 -
.../src/main/docs/jackson-dataformat.adoc | 4 +-
.../jackson/AbstractJacksonDataFormat.java | 14 -
.../jackson/JacksonJsonDataFormatTest.java | 2 +-
.../component/jackson/JacksonMarshalTest.java | 3 +-
.../component/jackson/JacksonObjectMapperTest.java | 3 +-
.../jackson/SpringJacksonAllowNullBodyTest.java | 4 +-
.../jackson/SpringJacksonAllowNullBodyTest.xml | 26 +-
.../component/kafka/KafkaComponentConfigurer.java | 6 -
.../component/kafka/KafkaEndpointConfigurer.java | 6 -
.../component/kafka/KafkaEndpointUriFactory.java | 3 +-
.../org/apache/camel/component/kafka/kafka.json | 2 -
.../camel/component/kafka/KafkaConfiguration.java | 24 --
.../camel/component/kafka/KafkaConsumer.java | 15 +-
.../camel/component/kafka/KafkaFetchRecords.java | 10 +-
.../support/KafkaConsumerResumeStrategy.java | 12 +-
.../support/PartitionAssignmentListener.java | 13 +-
.../consumer/support/ResumeStrategyFactory.java | 13 +-
.../resume/kafka/AbstractKafkaResumeStrategy.java | 320 +++++++++++++++++++++
.../KafkaConsumerWithResumeRouteStrategyIT.java | 233 +++++++++++++++
.../KafkaConsumerWithResumeStrategyIT.java | 118 --------
.../src/test/resources/log4j2.properties | 5 +-
.../component/quartz/QuartzEndpointConfigurer.java | 6 -
.../component/quartz/QuartzEndpointUriFactory.java | 3 +-
.../org/apache/camel/component/quartz/quartz.json | 1 -
.../src/main/docs/quartz-component.adoc | 14 -
.../camel/component/quartz/QuartzEndpoint.java | 13 -
...oginTest.java => LazyLoginIntegrationTest.java} | 2 +-
.../org/apache/camel/ExchangeConstantProvider.java | 3 +-
.../src/main/java/org/apache/camel/Exchange.java | 1 +
.../{ResumeStrategy.java => ResumeAware.java} | 18 +-
.../{ResumeStrategy.java => ResumeCache.java} | 34 ++-
.../main/java/org/apache/camel/ResumeStrategy.java | 2 +-
.../src/main/java/org/apache/camel/Route.java | 5 +
.../main/java/org/apache/camel/spi/DataFormat.java | 9 -
.../org/apache/camel/impl/engine/DefaultRoute.java | 11 +
.../docs/modules/eips/pages/resume-strategies.adoc | 179 ++++++++++++
.../docs/modules/eips/pages/unmarshal-eip.adoc | 19 ++
.../org/apache/camel/model/dataformat/json.json | 3 +-
.../org/apache/camel/model/unmarshal.json | 1 +
.../org/apache/camel/builder/DataFormatClause.java | 59 ++--
.../apache/camel/model/ProcessorDefinition.java | 67 ++++-
.../apache/camel/model/ResumableDefinition.java | 66 +++++
.../apache/camel/model/UnmarshalDefinition.java | 29 ++
.../camel/model/dataformat/JsonDataFormat.java | 27 +-
.../camel/processor/resume/NoOffsetException.java} | 25 +-
.../processor/resume/ResumableCompletion.java | 61 ++++
.../camel/processor/resume/ResumableProcessor.java | 155 ++++++++++
.../org/apache/camel/reifier/ProcessorReifier.java | 3 +
.../org/apache/camel/reifier/ResumableReifier.java | 54 ++++
.../org/apache/camel/reifier/UnmarshalReifier.java | 2 +-
.../reifier/dataformat/JsonDataFormatReifier.java | 1 -
.../FileConsumerResumeFromOffsetStrategyTest.java | 48 +++-
.../file/FileConsumerResumeStrategyTest.java | 45 ++-
.../java/org/apache/camel/model/XmlParseTest.java | 8 +
.../camel/processor/UnmarshalProcessorTest.java | 11 +
...uteWithTidyMarkupDataFormatAndAllowNullBody.xml | 27 +-
.../support/processor/UnmarshalProcessor.java | 16 +-
.../java/org/apache/camel/xml/in/ModelParser.java | 9 +-
docs/user-manual/modules/ROOT/pages/security.adoc | 94 ++++++
.../dsl/Aws2KinesisComponentBuilderFactory.java | 19 --
.../dsl/KafkaComponentBuilderFactory.java | 25 --
.../dsl/NettyComponentBuilderFactory.java | 16 +-
.../dsl/NettyHttpComponentBuilderFactory.java | 16 +-
.../dsl/CouchDbEndpointBuilderFactory.java | 36 ---
.../endpoint/dsl/FileEndpointBuilderFactory.java | 38 ---
.../endpoint/dsl/KafkaEndpointBuilderFactory.java | 48 ----
.../dsl/Kinesis2EndpointBuilderFactory.java | 36 ---
.../endpoint/dsl/NettyEndpointBuilderFactory.java | 132 +--------
.../dsl/NettyHttpEndpointBuilderFactory.java | 132 +--------
.../endpoint/dsl/QuartzEndpointBuilderFactory.java | 30 --
.../dsl/yaml/deserializers/ModelDeserializers.java | 12 +-
.../src/generated/resources/camel-yaml-dsl.json | 6 +-
.../src/generated/resources/camelYamlDsl.json | 6 +-
parent/pom.xml | 2 +-
115 files changed, 1907 insertions(+), 1038 deletions(-)
rename components/camel-couchdb/src/main/java/org/apache/camel/component/couchdb/consumer/{CouchDdResumeStrategyFactory.java => CouchDbResumeStrategyFactory.java} (82%)
create mode 100644 components/camel-kafka/src/main/java/org/apache/camel/processor/resume/kafka/AbstractKafkaResumeStrategy.java
create mode 100644 components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/KafkaConsumerWithResumeRouteStrategyIT.java
delete mode 100644 components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/KafkaConsumerWithResumeStrategyIT.java
rename components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/{LazyLoginTest.java => LazyLoginIntegrationTest.java} (97%)
copy core/camel-api/src/main/java/org/apache/camel/{ResumeStrategy.java => ResumeAware.java} (64%)
copy core/camel-api/src/main/java/org/apache/camel/{ResumeStrategy.java => ResumeCache.java} (56%)
create mode 100644 core/camel-core-engine/src/main/docs/modules/eips/pages/resume-strategies.adoc
create mode 100644 core/camel-core-model/src/main/java/org/apache/camel/model/ResumableDefinition.java
copy core/{camel-api/src/main/java/org/apache/camel/ResumeStrategy.java => camel-core-processor/src/main/java/org/apache/camel/processor/resume/NoOffsetException.java} (57%)
create mode 100644 core/camel-core-processor/src/main/java/org/apache/camel/processor/resume/ResumableCompletion.java
create mode 100644 core/camel-core-processor/src/main/java/org/apache/camel/processor/resume/ResumableProcessor.java
create mode 100644 core/camel-core-reifier/src/main/java/org/apache/camel/reifier/ResumableReifier.java
copy components/camel-jackson/src/test/resources/org/apache/camel/component/jackson/SpringJacksonAllowNullBodyTest.xml => core/camel-core/src/test/resources/org/apache/camel/model/routeWithTidyMarkupDataFormatAndAllowNullBody.xml (56%)