You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by gi...@apache.org on 2021/08/03 16:55:33 UTC
[camel] branch regen_bot updated (a85575e -> e764281)
This is an automated email from the ASF dual-hosted git repository.
github-bot pushed a change to branch regen_bot
in repository https://gitbox.apache.org/repos/asf/camel.git.
omit a85575e Regen for commit 8efcef6d08d96c02ffe81bc185121c35e8d92d53
add 64c4fd6 Regen for commit 8efcef6d08d96c02ffe81bc185121c35e8d92d53 (#5916)
add 6d32fd1 Upgrade Localstack to version 0.12.16
add 657e5c5 CAMEL-16832: camel-kafka - file descriptor leak (#5915)
add 9755c60 CAMEL-16841: prevent an NPE when stopping camel-kubernetes config map (#5918)
add 148ce23 CAMEL-16757: Route configuration for separated, reusable and shareable configuration across all DSLs (#5917)
add 4154405 Regen
add 49ee546 CAMEL-16840: generate configurer should support @Metadata(skip = true) to skip the option
add 0c72525 CAMEL-16840: skip option in camel-zookeeper that should not be in configurer
add e764281 Fixed CS
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 (a85575e)
\
N -- N -- N refs/heads/regen_bot (e764281)
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:
.../org/apache/camel/catalog/models.properties | 3 +-
.../apache/camel/catalog/models/camelContext.json | 1 +
.../camel/catalog/models/routeConfiguration.json | 22 +
.../camel/catalog/models/routeConfigurations.json | 16 +
.../camel/catalog/models/templateBeanFactory.json | 17 -
.../apache/camel/catalog/schemas/camel-spring.xsd | 38 +
.../camel/cdi/xml/CamelContextFactoryBean.java | 14 +
.../camel/cdi/test/XmlRouteConfigurationTest.java | 77 ++
.../resources/camel-context-routeConfiguration.xml | 49 +
.../camel/component/kafka/KafkaConsumer.java | 4 +-
.../config_maps/KubernetesConfigMapsConsumer.java | 4 +-
.../org/apache/camel/spring/xml/camelContext.json | 1 +
.../camel/spring/xml/CamelContextFactoryBean.java | 18 +
.../spring/xml/handler/CamelNamespaceHandler.java | 1 +
...gRoutesConfigurationBuilderIdOrPatternTest.java | 48 +
...ngRoutesConfigurationBuilderIdOrPatternTest.xml | 52 +
.../sql/stored/template/generated/SSPTParser.java | 833 ++++++-------
.../template/generated/SSPTParserConstants.java | 110 +-
.../template/generated/SSPTParserTokenManager.java | 1222 ++++++++++----------
.../apache/camel/test/junit5/CamelTestSupport.java | 8 +
.../apache/camel/test/junit4/CamelTestSupport.java | 10 +-
...ZooKeeperServiceDiscoveryFactoryConfigurer.java | 6 +-
.../cloud/ZooKeeperServiceDiscoveryFactory.java | 2 +
.../main/java/org/apache/camel/CamelContext.java | 8 +
.../java/org/apache/camel/CamelContextAware.java | 2 +-
.../src/main/java/org/apache/camel/Route.java | 11 +
...yLevel.java => RouteConfigurationsBuilder.java} | 20 +-
.../java/org/apache/camel/StartupSummaryLevel.java | 1 +
.../java/org/apache/camel/spi/RoutesLoader.java | 19 +-
.../camel/impl/engine/AbstractCamelContext.java | 39 +-
.../org/apache/camel/impl/engine/DefaultRoute.java | 6 +
.../engine/DefaultSupervisingRouteController.java | 25 +-
.../org/apache/camel/impl/DefaultCamelContext.java | 22 +
.../java/org/apache/camel/impl/DefaultModel.java | 40 +
.../camel/impl/lw/LightweightCamelContext.java | 22 +
.../impl/lw/LightweightRuntimeCamelContext.java | 6 +
.../services/org/apache/camel/model.properties | 3 +-
.../resources/org/apache/camel/model/jaxb.index | 2 +
.../org/apache/camel/model/routeConfiguration.json | 22 +
.../apache/camel/model/routeConfigurations.json | 16 +
.../apache/camel/model/templateBeanFactory.json | 17 -
.../java/org/apache/camel/builder/AdviceWith.java | 4 +
.../org/apache/camel/builder/BuilderSupport.java | 33 +-
.../apache/camel/builder/LambdaRouteBuilder.java | 2 +-
.../org/apache/camel/builder/RouteBuilder.java | 35 +-
.../camel/builder/RouteConfigurationBuilder.java | 91 ++
.../main/java/org/apache/camel/model/Model.java | 21 +
...ainer.java => RouteConfigurationContainer.java} | 16 +-
.../camel/model/RouteConfigurationDefinition.java | 198 ++++
...ion.java => RouteConfigurationsDefinition.java} | 87 +-
.../org/apache/camel/model/RouteContainer.java | 2 +-
.../org/apache/camel/model/RouteDefinition.java | 30 +
.../apache/camel/model/RouteTemplateContainer.java | 2 +-
.../camel/model/RouteTemplatesDefinition.java | 3 +-
.../org/apache/camel/model/RoutesDefinition.java | 52 +-
.../apache/camel/model/rest/RestsDefinition.java | 3 +-
.../org/apache/camel/reifier/RouteReifier.java | 5 +-
.../core/xml/AbstractCamelContextFactoryBean.java | 45 +-
.../java/org/apache/camel/ContextTestSupport.java | 13 +-
.../RoutesConfigurationBuilderIdOrPatternTest.java | 243 ++++
.../model/RoutesConfigurationBuilderTest.java | 310 +++++
...outesConfigurationMultipleRouteBuilderTest.java | 65 ++
.../camel/model/RoutesConfigurationTest.java | 59 +
.../builder/endpoint/EndpointRouteBuilder.java | 6 +-
.../EndpointRouteConfigurationBuilder.java | 91 ++
.../endpoint/LambdaEndpointRouteBuilder.java} | 10 +-
.../endpoint/EndpointRoutesConfigurationTest.java | 57 +
.../endpoint/LambdaEndpointRouteBuilderTest.java | 86 ++
.../org/apache/camel/main/RoutesConfigurer.java | 39 +-
.../api/management/mbean/ManagedRouteMBean.java | 3 +
.../camel/management/mbean/ManagedRoute.java | 15 +-
.../java/org/apache/camel/xml/in/ModelParser.java | 48 +
docs/user-manual/modules/ROOT/nav.adoc | 1 +
docs/user-manual/modules/ROOT/pages/index.adoc | 1 +
.../modules/ROOT/pages/route-configuration.adoc | 294 +++++
.../dsl/support/RouteBuilderLoaderSupport.java | 2 +
.../camel/dsl/xml/io/XmlRoutesBuilderLoader.java | 34 +-
.../dsl/xml/jaxb/JaxbXmlRoutesBuilderLoader.java | 13 +-
.../camel-yaml-dsl-deserializers/pom.xml | 2 +
.../dsl/yaml/deserializers/CustomResolver.java | 3 +
.../RouteConfigurationDefinitionDeserializer.java | 112 ++
.../deserializers/RouteDefinitionDeserializer.java | 4 +
.../src/generated/resources/camel-yaml-dsl.json | 45 +
.../camel/dsl/yaml/YamlRoutesBuilderLoader.java | 22 +-
.../camel/dsl/yaml/RouteConfigurationTest.groovy | 169 +++
.../test/infra/aws2/services/AWSContainer.java | 2 +-
.../packaging/AbstractGenerateConfigurerMojo.java | 6 +
.../packaging/ModelXmlParserGeneratorMojo.java | 4 +-
88 files changed, 3961 insertions(+), 1264 deletions(-)
create mode 100644 catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/routeConfiguration.json
create mode 100644 catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/routeConfigurations.json
delete mode 100644 catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/templateBeanFactory.json
create mode 100644 components/camel-cdi/src/test/java/org/apache/camel/cdi/test/XmlRouteConfigurationTest.java
create mode 100644 components/camel-cdi/src/test/resources/camel-context-routeConfiguration.xml
create mode 100644 components/camel-spring-xml/src/test/java/org/apache/camel/spring/SpringRoutesConfigurationBuilderIdOrPatternTest.java
create mode 100644 components/camel-spring-xml/src/test/resources/org/apache/camel/spring/SpringRoutesConfigurationBuilderIdOrPatternTest.xml
copy core/camel-api/src/main/java/org/apache/camel/{StartupSummaryLevel.java => RouteConfigurationsBuilder.java} (64%)
create mode 100644 core/camel-core-model/src/generated/resources/org/apache/camel/model/routeConfiguration.json
create mode 100644 core/camel-core-model/src/generated/resources/org/apache/camel/model/routeConfigurations.json
delete mode 100644 core/camel-core-model/src/generated/resources/org/apache/camel/model/templateBeanFactory.json
create mode 100644 core/camel-core-model/src/main/java/org/apache/camel/builder/RouteConfigurationBuilder.java
copy core/camel-core-model/src/main/java/org/apache/camel/model/{RouteTemplateContainer.java => RouteConfigurationContainer.java} (69%)
create mode 100644 core/camel-core-model/src/main/java/org/apache/camel/model/RouteConfigurationDefinition.java
copy core/camel-core-model/src/main/java/org/apache/camel/model/{rest/RestsDefinition.java => RouteConfigurationsDefinition.java} (51%)
create mode 100644 core/camel-core/src/test/java/org/apache/camel/model/RoutesConfigurationBuilderIdOrPatternTest.java
create mode 100644 core/camel-core/src/test/java/org/apache/camel/model/RoutesConfigurationBuilderTest.java
create mode 100644 core/camel-core/src/test/java/org/apache/camel/model/RoutesConfigurationMultipleRouteBuilderTest.java
create mode 100644 core/camel-core/src/test/java/org/apache/camel/model/RoutesConfigurationTest.java
create mode 100644 core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/EndpointRouteConfigurationBuilder.java
copy core/{camel-core-model/src/main/java/org/apache/camel/builder/LambdaRouteBuilder.java => camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/LambdaEndpointRouteBuilder.java} (75%)
create mode 100644 core/camel-endpointdsl/src/test/java/org/apache/camel/builder/endpoint/EndpointRoutesConfigurationTest.java
create mode 100644 core/camel-endpointdsl/src/test/java/org/apache/camel/builder/endpoint/LambdaEndpointRouteBuilderTest.java
create mode 100644 docs/user-manual/modules/ROOT/pages/route-configuration.adoc
create mode 100644 dsl/camel-yaml-dsl/camel-yaml-dsl-deserializers/src/main/java/org/apache/camel/dsl/yaml/deserializers/RouteConfigurationDefinitionDeserializer.java
create mode 100644 dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/RouteConfigurationTest.groovy