This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
from 85b55f42859 Cleanup based on static analysis (#18042)
add 881068ec506 CAMEL-22064: camel-xml-io - Generate XSD schema (#18065)
No new revisions were added by this update.
Summary of changes:
.../org/apache/camel/catalog/models.properties | 7 +
.../camel/catalog/models/customTransformer.json | 22 +
.../camel/catalog/models/customValidator.json | 19 +
.../catalog/models/dataFormatTransformer.json | 21 +
.../camel/catalog/models/endpointTransformer.json | 22 +
.../camel/catalog/models/endpointValidator.json | 19 +
.../camel/catalog/models/loadTransformer.json | 22 +
.../org/apache/camel/catalog/models/openApi.json | 7 +-
.../camel/catalog/models/predicateValidator.json | 18 +
.../org/apache/camel/catalog/models/resumable.json | 2 +-
.../camel/catalog/models/securityDefinitions.json | 2 +-
.../apache/camel/catalog/schemas/camel-spring.xsd | 300 +-
.../schemas/{camel-spring.xsd => camel-xml-io.xsd} | 18320 +++++++++----------
.../org/apache/camel/catalog/CamelCatalog.java | 7 +
.../apache/camel/catalog/DefaultCamelCatalog.java | 5 +
.../org/apache/camel/catalog/CamelCatalogTest.java | 5 +-
.../org/apache/camel/model/rest/openApi.json | 7 +-
.../camel/model/rest/securityDefinitions.json | 2 +-
.../META-INF/org/apache/camel/model/resumable.json | 2 +-
.../camel/model/transformer/customTransformer.json | 22 +
.../model/transformer/dataFormatTransformer.json | 21 +
.../model/transformer/endpointTransformer.json | 22 +
.../camel/model/transformer/loadTransformer.json | 22 +
.../camel/model/validator/customValidator.json | 19 +
.../camel/model/validator/endpointValidator.json | 19 +
.../camel/model/validator/predicateValidator.json | 18 +
.../services/org/apache/camel/model.properties | 7 +
.../apache/camel/model/ResumableDefinition.java | 16 +
.../apache/camel/model/TokenizerDefinition.java | 4 +-
.../apache/camel/model/app/BeansDefinition.java | 2 +
.../apache/camel/model/rest/OpenApiDefinition.java | 10 +-
.../camel/model/rest/RestSecuritiesDefinition.java | 2 +-
.../transformer/CustomTransformerDefinition.java | 7 +-
.../DataFormatTransformerDefinition.java | 4 +-
.../transformer/EndpointTransformerDefinition.java | 10 +-
.../transformer/LoadTransformerDefinition.java | 7 +-
.../model/transformer/TransformerDefinition.java | 10 +-
.../model/validator/CustomValidatorDefinition.java | 7 +-
.../validator/EndpointValidatorDefinition.java | 12 +-
.../validator/PredicateValidatorDefinition.java | 10 +-
.../camel/model/validator/ValidatorDefinition.java | 14 +-
.../camel/util/DumpModelAsXmlPlaceholdersTest.java | 2 +-
.../NestedChoiceWithEndChoiceIssueTest.xml | 2 +-
.../resources/org/apache/camel/util/transform3.xml | 2 +-
core/camel-xml-io/pom.xml | 183 +
.../java/org/apache/camel/xml/in/ModelParser.java | 10 +-
.../java/org/apache/camel/xml/out/ModelWriter.java | 27 +-
.../org/apache/camel/xml/LwModelToXMLDumper.java | 5 +-
.../java/org/apache/camel/xml/in/BaseParser.java | 18 +-
.../java/org/apache/camel/xml/out/BaseWriter.java | 2 +-
.../org/apache/camel/xml/in/ModelParserTest.java | 2 +-
.../apache/camel/xml/in/SpringModelParserTest.java | 70 +
.../org/apache/camel/xml/out/ModelWriterTest.java | 2 +-
.../src/test/resources/barInterceptorRoute.xml | 2 +-
.../src/test/resources/barOnExceptionRoute.xml | 2 +-
.../src/test/resources/barPolicyRoute.xml | 2 +-
core/camel-xml-io/src/test/resources/barRest.xml | 2 +-
.../src/test/resources/barRestConfiguration.xml | 2 +-
core/camel-xml-io/src/test/resources/barRoute.xml | 2 +-
.../src/test/resources/barTemplate.xml | 2 +-
.../src/test/resources/barTemplatedRoute.xml | 2 +-
.../src/test/resources/barUpdatedRoute.xml | 2 +-
.../camel-xml-io/src/test/resources/beansEmpty.xml | 2 +-
.../src/test/resources/beansWithConstructors.xml | 2 +-
.../src/test/resources/beansWithFactoryMethod.xml | 2 +-
.../src/test/resources/beansWithProperties.xml | 2 +-
.../src/test/resources/beansWithSpringNS.xml | 2 +-
.../src/test/resources/convertBody.xml | 2 +-
.../src/test/resources/dynamicRecipientList.xml | 2 +-
.../test/resources/errorHandlerConfiguration.xml | 2 +-
...rrorHandlerConfigurationRedeliveryPolicyRef.xml | 2 +-
.../resources/invalid/convertBodyParseError.xml | 2 +-
core/camel-xml-io/src/test/resources/loop.xml | 2 +-
core/camel-xml-io/src/test/resources/multiline.xml | 2 +-
core/camel-xml-io/src/test/resources/processor.xml | 2 +-
.../src/test/resources/processorWithFilter.xml | 2 +-
.../test/resources/processorWithGroovyFilter.xml | 2 +-
.../test/resources/processorWithHeaderFilter.xml | 2 +-
.../test/resources/processorWithSimpleFilter.xml | 2 +-
.../src/test/resources/resequencerBatch.xml | 2 +-
.../src/test/resources/resequencerStream.xml | 2 +-
.../src/test/resources/restAllowedValues.xml | 2 +-
.../camel-xml-io/src/test/resources/routeGroup.xml | 2 +-
.../test/resources/routeInlinedErrorHandler.xml | 2 +-
.../src/test/resources/routeProperties.xml | 2 +-
.../src/test/resources/routeProperty.xml | 2 +-
.../test/resources/routeWithBindyDataFormat.xml | 2 +-
.../src/test/resources/routeWithChoice.xml | 2 +-
.../src/test/resources/routeWithCircuitBreaker.xml | 2 +-
.../src/test/resources/routeWithCvsDataFormat.xml | 2 +-
.../resources/routeWithFailoverLoadBalance.xml | 2 +-
.../test/resources/routeWithFlatpackDataFormat.xml | 2 +-
.../src/test/resources/routeWithHL7DataFormat.xml | 2 +-
.../src/test/resources/routeWithJSonDataFormat.xml | 2 +-
.../src/test/resources/routeWithJaxbDataFormat.xml | 2 +-
.../src/test/resources/routeWithLoadBalance.xml | 2 +-
.../src/test/resources/routeWithNamespace.xml | 2 +-
.../src/test/resources/routeWithRSSDataFormat.xml | 2 +-
.../test/resources/routeWithRandomLoadBalance.xml | 2 +-
.../src/test/resources/routeWithSetHeaders.xml | 2 +-
.../src/test/resources/routeWithSetVariables.xml | 2 +-
.../test/resources/routeWithStickyLoadBalance.xml | 2 +-
.../resources/routeWithTidyMarkupDataFormat.xml | 2 +-
.../test/resources/routeWithTopicLoadBalance.xml | 2 +-
.../resources/routeWithXMLSecurityDataFormat.xml | 2 +-
.../test/resources/routeWithZipFileDataFormat.xml | 2 +-
.../test/resources/routeXPathAndXmlNamespaces.xml | 2 +-
.../src/test/resources/routingSlip.xml | 2 +-
.../resources/routingSlipHeaderAndDelimiterSet.xml | 2 +-
.../src/test/resources/routingSlipHeaderSet.xml | 2 +-
core/camel-xml-io/src/test/resources/saga.xml | 2 +-
.../camel-xml-io/src/test/resources/scan-route.xml | 2 +-
core/camel-xml-io/src/test/resources/script.xml | 2 +-
core/camel-xml-io/src/test/resources/setBody.xml | 2 +-
core/camel-xml-io/src/test/resources/setHeader.xml | 2 +-
.../src/test/resources/setHeaderToConstant.xml | 2 +-
.../camel-xml-io/src/test/resources/simpleRest.xml | 2 +-
.../src/test/resources/simpleRoute.xml | 2 +-
core/camel-xml-io/src/test/resources/splitter.xml | 2 +-
.../test/resources/spring/spring-convertBody.xml} | 0
.../src/test/resources/staticRecipientList.xml | 2 +-
core/camel-xml-io/src/test/resources/transform.xml | 2 +-
.../org/apache/camel/yaml/out/ModelWriter.java | 27 +-
.../ROOT/pages/camel-4x-upgrade-guide-4_12.adoc | 10 +
.../src/main/resources/templates/xml.tmpl | 6 +-
.../src/test/resources/hi.camel.xml | 6 +-
.../camel-jbang-core/src/test/resources/hi.xml | 6 +-
.../src/test/resources/jbang/it/helloName.xml | 6 +-
.../src/main/docs/java-xml-io-dsl.adoc | 4 +-
.../apache/camel/dsl/xml/io/XmlModelParser.java | 2 +-
.../dsl/xml/io/XmlRoutesBuilderLoaderTest.java | 8 +-
.../org/apache/camel/dsl/xml/io/barRest.xml | 2 +-
.../org/apache/camel/dsl/xml/io/barRoute.xml | 2 +-
.../org/apache/camel/dsl/xml/io/camel-app1.xml | 2 +-
.../org/apache/camel/dsl/xml/io/camel-app10.xml | 2 +-
.../org/apache/camel/dsl/xml/io/camel-app12.xml | 2 +-
.../org/apache/camel/dsl/xml/io/camel-app3.xml | 2 +-
.../org/apache/camel/dsl/xml/io/camel-app4.xml | 2 +-
.../org/apache/camel/dsl/xml/io/camel-app5.xml | 2 +-
.../org/apache/camel/dsl/xml/io/camel-app6.xml | 2 +-
.../org/apache/camel/dsl/xml/io/camel-app7.xml | 2 +-
.../org/apache/camel/dsl/xml/io/camel-app8.xml | 2 +-
.../org/apache/camel/dsl/xml/io/camel-app9.xml | 2 +-
.../camel/dsl/xml/io/messageHistoryFactory.xml | 2 +-
.../org/apache/camel/kamelet/camel-kamelet.xml | 2 +-
.../org/apache/camel/main/xml/camel-dummy.xml | 2 +-
.../camel/main/xml/camel-my-route-template.xml | 2 +-
.../camel/main/xml/camel-my-templated-route.xml | 2 +-
.../org/apache/camel/main/xml/camel-rests.xml | 2 +-
.../org/apache/camel/main/xml/camel-scan.xml | 2 +-
.../org/apache/camel/main/xml/camel-template.xml | 2 +-
.../resources/org/apache/camel/reload/barRoute.xml | 2 +-
.../org/apache/camel/reload/barUpdatedRoute.xml | 2 +-
.../dsl/yaml/deserializers/ModelDeserializers.java | 125 +-
.../deserializers/ModelDeserializersResolver.java | 14 +
.../generated/resources/schema/camelYamlDsl.json | 141 +-
.../pom.xml | 8 +-
.../apache/camel/maven/DocumentationEnricher.java | 7 +-
.../camel/maven/packaging/PrepareCatalogMojo.java | 17 +-
.../camel/maven/packaging/SchemaGeneratorMojo.java | 4 -
160 files changed, 9588 insertions(+), 10382 deletions(-)
create mode 100644
catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/customTransformer.json
create mode 100644
catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/customValidator.json
create mode 100644
catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/dataFormatTransformer.json
create mode 100644
catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/endpointTransformer.json
create mode 100644
catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/endpointValidator.json
create mode 100644
catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/loadTransformer.json
create mode 100644
catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/predicateValidator.json
copy
catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/schemas/{camel-spring.xsd
=> camel-xml-io.xsd} (89%)
create mode 100644
core/camel-core-model/src/generated/resources/META-INF/org/apache/camel/model/transformer/customTransformer.json
create mode 100644
core/camel-core-model/src/generated/resources/META-INF/org/apache/camel/model/transformer/dataFormatTransformer.json
create mode 100644
core/camel-core-model/src/generated/resources/META-INF/org/apache/camel/model/transformer/endpointTransformer.json
create mode 100644
core/camel-core-model/src/generated/resources/META-INF/org/apache/camel/model/transformer/loadTransformer.json
create mode 100644
core/camel-core-model/src/generated/resources/META-INF/org/apache/camel/model/validator/customValidator.json
create mode 100644
core/camel-core-model/src/generated/resources/META-INF/org/apache/camel/model/validator/endpointValidator.json
create mode 100644
core/camel-core-model/src/generated/resources/META-INF/org/apache/camel/model/validator/predicateValidator.json
create mode 100644
core/camel-xml-io/src/test/java/org/apache/camel/xml/in/SpringModelParserTest.java
copy
core/{camel-core/src/test/resources/org/apache/camel/model/convertBody.xml =>
camel-xml-io/src/test/resources/spring/spring-convertBody.xml} (100%)