You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by gn...@apache.org on 2020/02/12 02:45:28 UTC

[camel] 18/18: Merge branch 'CAMEL-14445'

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

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

commit ac8c86d53080517dd2622dfed845f4cbf655160c
Merge: a989d6b aab471a
Author: Guillaume Nodet <gn...@gmail.com>
AuthorDate: Wed Feb 12 03:38:09 2020 +0100

    Merge branch 'CAMEL-14445'

 .../apache/camel/language/bean/BeanLanguage.java   |  20 +-
 .../cdi/transaction/JtaTransactionPolicy.java      |   2 +-
 .../hystrix/processor/HystrixProcessorFactory.java |   2 +-
 .../hystrix/processor/HystrixReifier.java          |  18 +-
 .../processor/HystrixHierarchicalConfigTest.java   |  17 +-
 .../SpringHystrixRouteHierarchicalConfigTest.java  |   9 +-
 .../apache/camel/component/jpa/JpaEndpoint.java    |   2 +-
 .../apache/camel/jsonpath/JsonPathExpression.java  |  29 +-
 .../resilience4j/ResilienceProcessorFactory.java   |   2 +-
 .../component/resilience4j/ResilienceReifier.java  |  49 +--
 .../apache/camel/component/rest/RestComponent.java |  78 ++--
 .../camel/component/xquery/XQueryBuilder.java      |  19 +-
 components/camel-spring/pom.xml                    |  19 -
 .../camel/component/cron/SpringCronEndpoint.java   |   2 +-
 .../camel/spring/spi/SpringTransactionPolicy.java  |   2 +-
 .../spring/spi/TransactionErrorHandlerReifier.java |   7 +-
 .../properties/SpringOptionalPropertiesDslTest.xml |   2 +-
 .../SpringOptionalPropertiesDslTokenizeTest.xml    |   2 +-
 ...RecipientListParallelOptionalPropertiesTest.xml |   4 +-
 .../BlueprintOptionalPropertiesDslTest.xml         |   4 +-
 .../apache/camel/language/xpath/XPathBuilder.java  |  31 +-
 .../camel/spi/GeneratedPropertyConfigurer.java     |  14 -
 .../org/apache/camel/spi/PropertyConfigurer.java   |  14 +
 .../camel/spi/PropertyPlaceholderConfigurer.java   |  47 --
 .../camel/impl/engine/AbstractCamelContext.java    |  13 +
 .../camel/language/tokenizer/TokenizeLanguage.java |  33 +-
 .../ASN1DataFormatPropertyPlaceholderProvider.java |  41 --
 ...egateDefinitionPropertyPlaceholderProvider.java |  51 ---
 ...Any23DataFormatPropertyPlaceholderProvider.java |  41 --
 .../AvroDataFormatPropertyPlaceholderProvider.java |  41 --
 ...rcodeDataFormatPropertyPlaceholderProvider.java |  43 --
 ...ase64DataFormatPropertyPlaceholderProvider.java |  41 --
 .../BeanDefinitionPropertyPlaceholderProvider.java |  47 --
 ...eanioDataFormatPropertyPlaceholderProvider.java |  47 --
 ...BindyDataFormatPropertyPlaceholderProvider.java |  43 --
 .../CBORDataFormatPropertyPlaceholderProvider.java |  49 ---
 ...CatchDefinitionPropertyPlaceholderProvider.java |  39 --
 ...hoiceDefinitionPropertyPlaceholderProvider.java |  39 --
 ...eakerDefinitionPropertyPlaceholderProvider.java |  41 --
 ...CheckDefinitionPropertyPlaceholderProvider.java |  47 --
 ...stantExpressionPropertyPlaceholderProvider.java |  41 --
 ...tBodyDefinitionPropertyPlaceholderProvider.java |  43 --
 ...ryptoDataFormatPropertyPlaceholderProvider.java |  51 ---
 .../CsvDataFormatPropertyPlaceholderProvider.java  |  63 ---
 ...ustomDataFormatPropertyPlaceholderProvider.java |  41 --
 ...initionPropertiesPlaceholderProviderHelper.java | 322 --------------
 ...DelayDefinitionPropertyPlaceholderProvider.java |  45 --
 ...eVerbDefinitionPropertyPlaceholderProvider.java |  63 ---
 ...outerDefinitionPropertyPlaceholderProvider.java |  45 --
 ...nrichDefinitionPropertyPlaceholderProvider.java |  53 ---
 ...pertyExpressionPropertyPlaceholderProvider.java |  41 --
 ...ssionDefinitionPropertyPlaceholderProvider.java |  41 --
 ...rJsonDataFormatPropertyPlaceholderProvider.java |  43 --
 ...irXmlDataFormatPropertyPlaceholderProvider.java |  43 --
 ...ilterDefinitionPropertyPlaceholderProvider.java |  39 --
 ...nallyDefinitionPropertyPlaceholderProvider.java |  39 --
 ...tpackDataFormatPropertyPlaceholderProvider.java |  47 --
 .../FromDefinitionPropertyPlaceholderProvider.java |  41 --
 ...tVerbDefinitionPropertyPlaceholderProvider.java |  63 ---
 .../GrokDataFormatPropertyPlaceholderProvider.java |  41 --
 ...roovyExpressionPropertyPlaceholderProvider.java |  41 --
 .../GzipDataFormatPropertyPlaceholderProvider.java |  39 --
 .../HL7DataFormatPropertyPlaceholderProvider.java  |  39 --
 ...dVerbDefinitionPropertyPlaceholderProvider.java |  63 ---
 ...eaderExpressionPropertyPlaceholderProvider.java |  41 --
 ...erserExpressionPropertyPlaceholderProvider.java |  41 --
 .../IcalDataFormatPropertyPlaceholderProvider.java |  39 --
 ...sumerDefinitionPropertyPlaceholderProvider.java |  49 ---
 ...nOnlyDefinitionPropertyPlaceholderProvider.java |  41 --
 ...InOutDefinitionPropertyPlaceholderProvider.java |  41 --
 ...rceptDefinitionPropertyPlaceholderProvider.java |  39 --
 ...tFromDefinitionPropertyPlaceholderProvider.java |  41 --
 ...pointDefinitionPropertyPlaceholderProvider.java |  45 --
 ...onXMLDataFormatPropertyPlaceholderProvider.java |  55 ---
 .../JaxbDataFormatPropertyPlaceholderProvider.java |  59 ---
 ...onApiDataFormatPropertyPlaceholderProvider.java |  39 --
 .../JsonDataFormatPropertyPlaceholderProvider.java |  59 ---
 ...nPathExpressionPropertyPlaceholderProvider.java |  45 --
 .../LZFDataFormatPropertyPlaceholderProvider.java  |  39 --
 ...guageExpressionPropertyPlaceholderProvider.java |  43 --
 ...lanceDefinitionPropertyPlaceholderProvider.java |  39 --
 .../LogDefinitionPropertyPlaceholderProvider.java  |  49 ---
 .../LoopDefinitionPropertyPlaceholderProvider.java |  43 --
 ...rshalDefinitionPropertyPlaceholderProvider.java |  39 --
 ...dCallExpressionPropertyPlaceholderProvider.java |  45 --
 ...ipartDataFormatPropertyPlaceholderProvider.java |  43 --
 ...icastDefinitionPropertyPlaceholderProvider.java |  63 ---
 .../MvelExpressionPropertyPlaceholderProvider.java |  41 --
 .../OgnlExpressionPropertyPlaceholderProvider.java |  41 --
 ...etionDefinitionPropertyPlaceholderProvider.java |  49 ---
 ...ptionDefinitionPropertyPlaceholderProvider.java |  49 ---
 ...lbackDefinitionPropertyPlaceholderProvider.java |  41 --
 ...rwiseDefinitionPropertyPlaceholderProvider.java |  39 --
 .../PGPDataFormatPropertyPlaceholderProvider.java  |  57 ---
 ...hVerbDefinitionPropertyPlaceholderProvider.java |  63 ---
 ...elineDefinitionPropertyPlaceholderProvider.java |  39 --
 ...olicyDefinitionPropertyPlaceholderProvider.java |  41 --
 ...nrichDefinitionPropertyPlaceholderProvider.java |  53 ---
 ...tVerbDefinitionPropertyPlaceholderProvider.java |  63 ---
 ...ocessDefinitionPropertyPlaceholderProvider.java |  41 --
 ...tobufDataFormatPropertyPlaceholderProvider.java |  43 --
 ...tVerbDefinitionPropertyPlaceholderProvider.java |  63 ---
 ...tListDefinitionPropertyPlaceholderProvider.java |  69 ---
 .../RefExpressionPropertyPlaceholderProvider.java  |  41 --
 ...eaderDefinitionPropertyPlaceholderProvider.java |  41 --
 ...adersDefinitionPropertyPlaceholderProvider.java |  43 --
 ...rtiesDefinitionPropertyPlaceholderProvider.java |  43 --
 ...pertyDefinitionPropertyPlaceholderProvider.java |  41 --
 ...uenceDefinitionPropertyPlaceholderProvider.java |  39 --
 ...ndingDefinitionPropertyPlaceholderProvider.java |  57 ---
 ...ationDefinitionPropertyPlaceholderProvider.java |  65 ---
 .../RestDefinitionPropertyPlaceholderProvider.java |  57 ---
 ...ParamDefinitionPropertyPlaceholderProvider.java |  49 ---
 ...eaderDefinitionPropertyPlaceholderProvider.java |  49 ---
 ...seMsgDefinitionPropertyPlaceholderProvider.java |  43 --
 ...pertyDefinitionPropertyPlaceholderProvider.java |  41 --
 ...itiesDefinitionPropertyPlaceholderProvider.java |  38 --
 ...tSecurityApiKeyPropertyPlaceholderProvider.java |  43 --
 ...curityBasicAuthPropertyPlaceholderProvider.java |  41 --
 ...tSecurityOAuth2PropertyPlaceholderProvider.java |  47 --
 ...RestsDefinitionPropertyPlaceholderProvider.java |  39 --
 ...lbackDefinitionPropertyPlaceholderProvider.java |  45 --
 ...RouteDefinitionPropertyPlaceholderProvider.java |  57 ---
 ...gSlipDefinitionPropertyPlaceholderProvider.java |  45 --
 .../RssDataFormatPropertyPlaceholderProvider.java  |  39 --
 .../SagaDefinitionPropertyPlaceholderProvider.java |  41 --
 ...plingDefinitionPropertyPlaceholderProvider.java |  39 --
 ...criptDefinitionPropertyPlaceholderProvider.java |  39 --
 ...urityDefinitionPropertyPlaceholderProvider.java |  41 --
 ...eCallDefinitionPropertyPlaceholderProvider.java |  57 ---
 ...tBodyDefinitionPropertyPlaceholderProvider.java |  39 --
 ...tternDefinitionPropertyPlaceholderProvider.java |  39 --
 ...eaderDefinitionPropertyPlaceholderProvider.java |  41 --
 ...pertyDefinitionPropertyPlaceholderProvider.java |  41 --
 ...impleExpressionPropertyPlaceholderProvider.java |  43 --
 ...pJaxbDataFormatPropertyPlaceholderProvider.java |  51 ---
 .../SortDefinitionPropertyPlaceholderProvider.java |  41 --
 .../SpELExpressionPropertyPlaceholderProvider.java |  41 --
 ...SplitDefinitionPropertyPlaceholderProvider.java |  47 --
 .../StepDefinitionPropertyPlaceholderProvider.java |  39 --
 .../StopDefinitionPropertyPlaceholderProvider.java |  39 --
 ...yslogDataFormatPropertyPlaceholderProvider.java |  39 --
 ...rFileDataFormatPropertyPlaceholderProvider.java |  39 --
 ...readsDefinitionPropertyPlaceholderProvider.java |  57 ---
 ...hriftDataFormatPropertyPlaceholderProvider.java |  43 --
 ...ottleDefinitionPropertyPlaceholderProvider.java |  41 --
 ...ptionDefinitionPropertyPlaceholderProvider.java |  45 --
 ...arkupDataFormatPropertyPlaceholderProvider.java |  41 --
 .../ToDefinitionPropertyPlaceholderProvider.java   |  43 --
 ...namicDefinitionPropertyPlaceholderProvider.java |  49 ---
 ...nizerExpressionPropertyPlaceholderProvider.java |  51 ---
 ...actedDefinitionPropertyPlaceholderProvider.java |  41 --
 ...sformDefinitionPropertyPlaceholderProvider.java |  39 --
 .../TryDefinitionPropertyPlaceholderProvider.java  |  39 --
 ...tyCsvDataFormatPropertyPlaceholderProvider.java |  55 ---
 ...WidthDataFormatPropertyPlaceholderProvider.java |  51 ---
 ...tyTsvDataFormatPropertyPlaceholderProvider.java |  51 ---
 ...rshalDefinitionPropertyPlaceholderProvider.java |  39 --
 ...idateDefinitionPropertyPlaceholderProvider.java |  39 --
 .../VerbDefinitionPropertyPlaceholderProvider.java |  63 ---
 .../WhenDefinitionPropertyPlaceholderProvider.java |  39 --
 ...pointDefinitionPropertyPlaceholderProvider.java |  39 --
 ...reTapDefinitionPropertyPlaceholderProvider.java |  59 ---
 ...urityDataFormatPropertyPlaceholderProvider.java |  57 ---
 ...nizerExpressionPropertyPlaceholderProvider.java |  43 --
 ...XPathExpressionPropertyPlaceholderProvider.java |  51 ---
 ...QueryExpressionPropertyPlaceholderProvider.java |  45 --
 ...treamDataFormatPropertyPlaceholderProvider.java |  49 ---
 ...mlRpcDataFormatPropertyPlaceholderProvider.java |  39 --
 .../YAMLDataFormatPropertyPlaceholderProvider.java |  49 ---
 ...laterDataFormatPropertyPlaceholderProvider.java |  39 --
 ...pFileDataFormatPropertyPlaceholderProvider.java |  39 --
 .../resources/org/apache/camel/model/saga.json     |   4 +-
 .../camel/builder/ErrorHandlerBuilderRef.java      |   2 +-
 .../camel/builder/ErrorHandlerBuilderSupport.java  |   2 +-
 .../org/apache/camel/builder/RouteBuilder.java     |   4 +-
 .../org/apache/camel/builder/SimpleBuilder.java    |  17 +-
 .../camel/impl/AbstractModelCamelContext.java      |   2 +-
 .../java/org/apache/camel/impl/DefaultModel.java   |   2 +-
 .../apache/camel/model/DataFormatDefinition.java   |  22 +-
 .../DefinitionPropertyPlaceholderConfigurer.java   |  53 ---
 .../model/ExpressionSubElementDefinition.java      |  48 +-
 .../model/InterceptSendToEndpointDefinition.java   |   1 -
 .../apache/camel/model/LoadBalancerDefinition.java |  19 +-
 .../apache/camel/model/MulticastDefinition.java    |  42 +-
 .../apache/camel/model/OnExceptionDefinition.java  |   6 +-
 .../camel/model/OptionalIdentifiedDefinition.java  |   2 +-
 .../apache/camel/model/OtherAttributesAware.java   |  42 --
 .../apache/camel/model/ProcessorDefinition.java    |  45 +-
 .../camel/model/ProcessorDefinitionHelper.java     | 485 ---------------------
 .../model/Resilience4jConfigurationCommon.java     | 120 ++---
 .../model/Resilience4jConfigurationDefinition.java |  30 +-
 .../apache/camel/model/RouteDefinitionHelper.java  |  44 +-
 .../org/apache/camel/model/SagaDefinition.java     |  29 +-
 .../org/apache/camel/model/SamplingDefinition.java |  45 +-
 .../org/apache/camel/model/SplitDefinition.java    |  79 ++--
 .../org/apache/camel/model/ThrottleDefinition.java |  38 +-
 .../camel/model/config/ResequencerConfig.java      |  22 +-
 .../camel/model/language/ExpressionDefinition.java | 181 ++------
 .../camel/model/language/JsonPathExpression.java   |  62 ---
 .../camel/model/language/MethodCallExpression.java |  48 --
 .../model/language/NamespaceAwareExpression.java   |  18 -
 .../camel/model/language/SimpleExpression.java     |  31 --
 .../camel/model/language/TokenizerExpression.java  |  43 --
 .../model/language/XMLTokenizerExpression.java     |  31 +-
 .../camel/model/language/XPathExpression.java      | 112 +----
 .../camel/model/language/XQueryExpression.java     |  40 +-
 .../apache/camel/model/rest/RestDefinition.java    |  10 -
 .../org/apache/camel/reifier/AbstractReifier.java  |  95 +++-
 .../org/apache/camel/reifier/AggregateReifier.java | 129 +++---
 .../java/org/apache/camel/reifier/BeanReifier.java |  16 +-
 .../org/apache/camel/reifier/CatchReifier.java     |  12 +-
 .../org/apache/camel/reifier/ChoiceReifier.java    |  22 +-
 .../camel/reifier/CircuitBreakerReifier.java       |   6 +-
 .../apache/camel/reifier/ClaimCheckReifier.java    |  23 +-
 .../apache/camel/reifier/ConvertBodyReifier.java   |  28 +-
 .../org/apache/camel/reifier/DelayReifier.java     |  31 +-
 .../apache/camel/reifier/DynamicRouterReifier.java |  16 +-
 .../org/apache/camel/reifier/EnrichReifier.java    |  24 +-
 .../apache/camel/reifier/ExpressionReifier.java    |  16 +-
 .../org/apache/camel/reifier/FilterReifier.java    |  14 +-
 .../org/apache/camel/reifier/FinallyReifier.java   |   8 +-
 .../camel/reifier/IdempotentConsumerReifier.java   |  20 +-
 .../apache/camel/reifier/InterceptFromReifier.java |   8 +-
 .../org/apache/camel/reifier/InterceptReifier.java |   8 +-
 .../reifier/InterceptSendToEndpointReifier.java    |  24 +-
 .../apache/camel/reifier/LoadBalanceReifier.java   |  14 +-
 .../java/org/apache/camel/reifier/LogReifier.java  |  18 +-
 .../java/org/apache/camel/reifier/LoopReifier.java |  18 +-
 .../org/apache/camel/reifier/MarshalReifier.java   |   8 +-
 .../org/apache/camel/reifier/MulticastReifier.java |  51 ++-
 .../apache/camel/reifier/OnCompletionReifier.java  |  29 +-
 .../apache/camel/reifier/OnExceptionReifier.java   |  66 +--
 .../apache/camel/reifier/OnFallbackReifier.java    |   8 +-
 .../org/apache/camel/reifier/OtherwiseReifier.java |   8 +-
 .../org/apache/camel/reifier/PipelineReifier.java  |   8 +-
 .../org/apache/camel/reifier/PolicyReifier.java    |   8 +-
 .../apache/camel/reifier/PollEnrichReifier.java    |  30 +-
 .../org/apache/camel/reifier/ProcessReifier.java   |   6 +-
 .../org/apache/camel/reifier/ProcessorReifier.java | 446 ++++++++++++++-----
 .../apache/camel/reifier/RecipientListReifier.java |  55 ++-
 .../apache/camel/reifier/RemoveHeaderReifier.java  |   8 +-
 .../apache/camel/reifier/RemoveHeadersReifier.java |  18 +-
 .../camel/reifier/RemovePropertiesReifier.java     |  18 +-
 .../camel/reifier/RemovePropertyReifier.java       |   8 +-
 .../apache/camel/reifier/ResequenceReifier.java    |  77 ++--
 .../org/apache/camel/reifier/RollbackReifier.java  |  10 +-
 .../org/apache/camel/reifier/RouteReifier.java     |  39 +-
 .../apache/camel/reifier/RoutingSlipReifier.java   |  21 +-
 .../java/org/apache/camel/reifier/SagaReifier.java |  36 +-
 .../org/apache/camel/reifier/SamplingReifier.java  |  12 +-
 .../org/apache/camel/reifier/ScriptReifier.java    |   8 +-
 .../java/org/apache/camel/reifier/SendReifier.java |   8 +-
 .../apache/camel/reifier/ServiceCallReifier.java   |   6 +-
 .../org/apache/camel/reifier/SetBodyReifier.java   |   8 +-
 .../camel/reifier/SetExchangePatternReifier.java   |   6 +-
 .../org/apache/camel/reifier/SetHeaderReifier.java |  10 +-
 .../apache/camel/reifier/SetPropertyReifier.java   |  10 +-
 .../java/org/apache/camel/reifier/SortReifier.java |  10 +-
 .../org/apache/camel/reifier/SplitReifier.java     |  46 +-
 .../java/org/apache/camel/reifier/StepReifier.java |  12 +-
 .../java/org/apache/camel/reifier/StopReifier.java |   6 +-
 .../org/apache/camel/reifier/ThreadsReifier.java   |  33 +-
 .../org/apache/camel/reifier/ThrottleReifier.java  |  40 +-
 .../camel/reifier/ThrowExceptionReifier.java       |  26 +-
 .../org/apache/camel/reifier/ToDynamicReifier.java |  20 +-
 .../apache/camel/reifier/TransactedReifier.java    |   8 +-
 .../org/apache/camel/reifier/TransformReifier.java |   8 +-
 .../java/org/apache/camel/reifier/TryReifier.java  |  14 +-
 .../org/apache/camel/reifier/UnmarshalReifier.java |   8 +-
 .../org/apache/camel/reifier/ValidateReifier.java  |   8 +-
 .../java/org/apache/camel/reifier/WhenReifier.java |   8 +-
 .../reifier/WhenSkipSendToEndpointReifier.java     |  12 +-
 .../org/apache/camel/reifier/WireTapReifier.java   |  45 +-
 .../reifier/dataformat/ASN1DataFormatReifier.java  |   5 +-
 .../reifier/dataformat/Any23DataFormatReifier.java |   5 +-
 .../reifier/dataformat/AvroDataFormatReifier.java  |   5 +-
 .../dataformat/BarcodeDataFormatReifier.java       |   5 +-
 .../dataformat/Base64DataFormatReifier.java        |   5 +-
 .../dataformat/BeanioDataFormatReifier.java        |   5 +-
 .../reifier/dataformat/BindyDataFormatReifier.java |   8 +-
 .../reifier/dataformat/CBORDataFormatReifier.java  |   5 +-
 .../dataformat/CryptoDataFormatReifier.java        |   5 +-
 .../reifier/dataformat/CsvDataFormatReifier.java   |   5 +-
 .../dataformat/CustomDataFormatReifier.java        |   6 +-
 .../reifier/dataformat/DataFormatReifier.java      |  41 +-
 .../reifier/dataformat/FhirDataFormatReifier.java  |   5 +-
 .../dataformat/FhirJsonDataFormatReifier.java      |   5 +-
 .../dataformat/FhirXmlDataFormatReifier.java       |   5 +-
 .../dataformat/FlatpackDataFormatReifier.java      |   5 +-
 .../reifier/dataformat/GrokDataFormatReifier.java  |   5 +-
 .../reifier/dataformat/GzipDataFormatReifier.java  |   5 +-
 .../reifier/dataformat/HL7DataFormatReifier.java   |   5 +-
 .../reifier/dataformat/IcalDataFormatReifier.java  |   5 +-
 .../dataformat/JacksonXMLDataFormatReifier.java    |   5 +-
 .../reifier/dataformat/JaxbDataFormatReifier.java  |   5 +-
 .../dataformat/JsonApiDataFormatReifier.java       |   5 +-
 .../reifier/dataformat/JsonDataFormatReifier.java  |   5 +-
 .../reifier/dataformat/LZFDataFormatReifier.java   |   5 +-
 .../dataformat/MimeMultipartDataFormatReifier.java |   5 +-
 .../reifier/dataformat/PGPDataFormatReifier.java   |   5 +-
 .../dataformat/ProtobufDataFormatReifier.java      |   5 +-
 .../reifier/dataformat/RssDataFormatReifier.java   |   5 +-
 .../dataformat/SoapJaxbDataFormatReifier.java      |   5 +-
 .../dataformat/SyslogDataFormatReifier.java        |   5 +-
 .../dataformat/TarFileDataFormatReifier.java       |   5 +-
 .../dataformat/ThriftDataFormatReifier.java        |   5 +-
 .../dataformat/TidyMarkupDataFormatReifier.java    |   5 +-
 .../UniVocityAbstractDataFormatReifier.java        |   5 +-
 .../dataformat/UniVocityCsvDataFormatReifier.java  |   5 +-
 .../UniVocityFixedWidthDataFormatReifier.java      |   5 +-
 .../dataformat/UniVocityTsvDataFormatReifier.java  |   5 +-
 .../dataformat/XMLSecurityDataFormatReifier.java   |   5 +-
 .../dataformat/XStreamDataFormatReifier.java       |   5 +-
 .../dataformat/XmlRpcDataFormatReifier.java        |   5 +-
 .../reifier/dataformat/YAMLDataFormatReifier.java  |   5 +-
 .../reifier/dataformat/ZipDataFormatReifier.java   |   5 +-
 .../dataformat/ZipFileDataFormatReifier.java       |   5 +-
 .../errorhandler/DeadLetterChannelReifier.java     |  18 +-
 .../errorhandler/DefaultErrorHandlerReifier.java   |  10 +-
 .../errorhandler/ErrorHandlerRefReifier.java       |   6 +-
 .../reifier/errorhandler/ErrorHandlerReifier.java  |  60 ++-
 .../errorhandler/NoErrorHandlerReifier.java        |   6 +-
 .../camel/reifier/language/ExpressionReifier.java  | 206 +++++++++
 .../language/JsonPathExpressionReifier.java        |  58 +++
 .../language/MethodCallExpressionReifier.java      |  50 +++
 .../reifier/language/SimpleExpressionReifier.java  |  57 +++
 .../language/TokenizerExpressionReifier.java       |  65 +++
 .../language/XMLTokenizerExpressionReifier.java    |  65 +++
 .../reifier/language/XPathExpressionReifier.java   |  69 +++
 .../reifier/language/XQueryExpressionReifier.java  |  63 +++
 .../loadbalancer/CustomLoadBalancerReifier.java    |   8 +-
 .../loadbalancer/FailoverLoadBalancerReifier.java  |  14 +-
 .../reifier/loadbalancer/LoadBalancerReifier.java  |  20 +-
 .../loadbalancer/RandomLoadBalancerReifier.java    |   6 +-
 .../RoundRobinLoadBalancerReifier.java             |   6 +-
 .../loadbalancer/StickyLoadBalancerReifier.java    |   8 +-
 .../loadbalancer/TopicLoadBalancerReifier.java     |   6 +-
 .../loadbalancer/WeightedLoadBalancerReifier.java  |  10 +-
 .../camel/reifier/rest/RestBindingReifier.java     |  84 ++--
 .../transformer/CustomTransformeReifier.java       |  14 +-
 .../transformer/DataFormatTransformeReifier.java   |  10 +-
 .../transformer/EndpointTransformeReifier.java     |  14 +-
 .../reifier/transformer/TransformerReifier.java    |  24 +-
 .../reifier/validator/CustomValidatorReifier.java  |  14 +-
 .../validator/EndpointValidatorReifier.java        |  10 +-
 .../validator/PredicateValidatorReifier.java       |  10 +-
 .../camel/reifier/validator/ValidatorReifier.java  |  26 +-
 .../core/xml/AbstractCamelContextFactoryBean.java  |   4 +-
 .../OptionalPropertiesDslInvalidSyntaxTest.java    |  21 +-
 .../properties/OptionalPropertiesDslTest.java      |   3 +-
 .../properties/PropertiesRouteIdTest.java          |   2 +-
 .../validator/CustomSchemaFactoryFeatureTest.java  |   1 +
 .../ValidatorEndpointClearCachedSchemaTest.java    |  19 +-
 ...RouteWithConstantFieldFromExchangeFailTest.java |   1 +
 .../camel/reifier/DataFormatReifierTest.java       |   4 +-
 .../apache/camel/reifier/ProcessorReifierTest.java |   7 +-
 .../apache/camel/support/CamelContextHelper.java   |  26 +-
 .../org/apache/camel/support/DefaultComponent.java |   9 +-
 .../support/ExpressionToPredicateAdapter.java      |  15 +-
 .../camel/support/PropertyBindingSupport.java      |   9 +-
 .../camel/support/ScheduledPollEndpoint.java       |   2 +-
 .../java/org/apache/camel/xml/in/ModelParser.java  |  66 +--
 .../java/org/apache/camel/xml/in/BaseParser.java   |  14 +-
 .../xtokenizer/XMLTokenExpressionIterator.java     |  33 +-
 .../language/xtokenizer/XMLTokenizeLanguage.java   |   2 +-
 .../packaging/EndpointSchemaGeneratorMojo.java     |  80 ----
 .../apache/camel/maven/packaging/GenerateMojo.java |   2 +
 .../packaging/ModelXmlParserGeneratorMojo.java     |  11 +
 .../maven/packaging/PackageDataFormatMojo.java     |   3 -
 .../packaging/PropertyPlaceholderGenerator.java    | 176 --------
 .../camel/maven/packaging/SchemaGeneratorMojo.java |  73 +---
 372 files changed, 2773 insertions(+), 10109 deletions(-)