This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git.
from 04008ee Regen
new ff10246 [CAMEL-14437] Refactor a bit PackageHelper.findJsonFiles
new ff4afa7 [CAMEL-14437] Improve json pretty printing
new b3a0329 [CAMEL-14437] Switch to junit 5
new 51f15e7 [CAMEL-14437] Merge the Strings class tests
new f63d6fb [CAMEL-14437] Use a single model / json representation for
all internal tooling generators
new 6f7f520 [CAMEL-14437] Move a few helper methods from JSonSchemaHelper
to AnnotationProcessorHelper
new b46b88b [CAMEL-14437] Move all json mapping to a single class
new 41ed1d4 [CAMEL-14437] Remove usage of JSonSchemaHelper in the tooling
new 54f092d [CAMEL-14437] Fix unit tests
new b1473e2 [CAMEL-14437] Regen json
The 10 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:
bom/camel-bom/pom.xml | 5 +
components/camel-as2/camel-as2-component/pom.xml | 23 -
components/camel-salesforce/pom.xml | 26 -
components/camel-servicenow/pom.xml | 26 -
.../src/main/schema/constant.json | 2 +-
.../src/main/schema/exchangeProperty.json | 2 +-
.../src/main/schema/expression.json | 2 +-
core/camel-core-engine/src/main/schema/groovy.json | 2 +-
core/camel-core-engine/src/main/schema/header.json | 2 +-
.../src/main/schema/hl7terser.json | 2 +-
.../src/main/schema/jsonpath.json | 4 +-
.../src/main/schema/language.json | 2 +-
core/camel-core-engine/src/main/schema/method.json | 2 +-
core/camel-core-engine/src/main/schema/mvel.json | 2 +-
core/camel-core-engine/src/main/schema/ognl.json | 2 +-
core/camel-core-engine/src/main/schema/ref.json | 2 +-
core/camel-core-engine/src/main/schema/simple.json | 2 +-
core/camel-core-engine/src/main/schema/spel.json | 2 +-
.../src/main/schema/tokenize.json | 6 +-
core/camel-core-engine/src/main/schema/xpath.json | 4 +-
core/camel-core-engine/src/main/schema/xquery.json | 2 +-
.../src/main/schema/xtokenize.json | 2 +-
.../file/FileProducerChmodOptionTest.java | 2 +-
.../runtimecatalog/impl/JSonSchemaHelperTest.java | 21 +-
.../camel-main-configuration-metadata.json | 1234 ++++++++--------
.../org/apache/camel/support/JSonSchemaHelper.java | 7 +-
parent/pom.xml | 5 +
tooling/apt/pom.xml | 21 +-
.../camel/tools/apt/AnnotationProcessorHelper.java | 166 +++
.../apt/CoreEipAnnotationProcessorHelper.java | 612 +++-----
.../camel/tools/apt/DocumentationHelper.java | 131 --
.../tools/apt/EndpointAnnotationProcessor.java | 771 +++++-----
.../camel/tools/apt/ModelAnnotationProcessor.java | 18 +-
.../tools/apt/PropertyConfigurerGenerator.java | 168 +--
.../tools/apt/PropertyPlaceholderGenerator.java | 212 ++-
.../tools/apt/SpringAnnotationProcessorHelper.java | 327 +----
.../camel/tools/apt/helper/EndpointHelper.java | 64 +-
.../camel/tools/apt/model/ComponentOption.java | 160 ---
.../camel/tools/apt/model/EndpointOption.java | 178 ---
.../apache/camel/tools/apt/model/EndpointPath.java | 129 --
.../camel/tools/apt/model/PropertyOption.java | 27 -
.../tools/apt/AnnotationProcessorHelperTest.java} | 20 +-
.../tools/apt/EndpointOptionComparatorTest.java | 62 +-
.../pom.xml | 33 +-
.../org/apache/camel/tooling/model/BaseModel.java} | 90 +-
.../camel/tooling/model/BaseOptionModel.java} | 183 ++-
.../camel/tooling}/model/ComponentModel.java | 184 +--
.../camel/tooling/model/DataFormatModel.java} | 53 +-
.../org/apache/camel/tooling/model/EipModel.java | 62 +
.../apache/camel/tooling}/model/ExampleModel.java | 14 +-
.../org/apache/camel/tooling/model/JsonMapper.java | 419 ++++++
.../apache/camel/tooling/model/LanguageModel.java} | 53 +-
.../apache/camel/tooling/model/OtherModel.java} | 28 +-
.../tooling}/model/ComponentOptionModelTest.java | 7 +-
tooling/camel-tooling-util/pom.xml | 23 +-
.../camel/tooling/util/JSonSchemaHelper.java | 521 -------
.../apache/camel/tooling/util/PackageHelper.java | 109 +-
.../camel/tooling/util/PackageHelperTest.java | 35 +-
.../org/apache/camel/tooling/util/StringsTest.java | 24 +-
.../java/org/apache/camel/util/json/Jsoner.java | 45 +-
.../apache/camel/maven/DocumentationEnricher.java | 6 +-
.../camel/maven/EipDocumentationEnricherMojo.java | 17 +-
tooling/maven/camel-package-maven-plugin/pom.xml | 4 +
.../camel/maven/packaging/EndpointDslMojo.java | 131 +-
.../packaging/PackageArchetypeCatalogMojo.java | 15 +-
.../maven/packaging/PackageComponentMojo.java | 7 +-
.../maven/packaging/PackageDataFormatMojo.java | 428 ++----
.../camel/maven/packaging/PackageLanguageMojo.java | 274 +---
.../camel/maven/packaging/PackageModelMojo.java | 24 +-
.../camel/maven/packaging/PackageOtherMojo.java | 144 +-
.../maven/packaging/PrepareCatalogKarafMojo.java | 42 +-
.../camel/maven/packaging/PrepareCatalogMojo.java | 1482 ++++++++------------
.../maven/packaging/PrepareComponentMojo.java | 19 +-
.../camel/maven/packaging/PrepareExampleMojo.java | 12 +-
.../maven/packaging/PrepareParentPomMojo.java | 18 +-
.../maven/packaging/PrepareReleasePomMojo.java | 16 +-
.../maven/packaging/PrepareUserGuideMojo.java | 232 +--
.../packaging/UpdateDocComponentListMojo.java | 222 +--
.../camel/maven/packaging/UpdateReadmeMojo.java | 472 ++-----
.../maven/packaging/ValidateComponentMojo.java | 49 +-
.../camel/maven/packaging/ValidateHelper.java | 114 +-
.../maven/packaging/model/ComponentModel.java | 220 ---
.../packaging/model/ComponentOptionModel.java | 197 ---
.../maven/packaging/model/DataFormatModel.java | 163 ---
.../packaging/model/DataFormatOptionModel.java | 118 --
.../camel/maven/packaging/model/EipModel.java | 128 --
.../maven/packaging/model/EipOptionModel.java | 187 ---
.../camel/maven/packaging/model/LanguageModel.java | 163 ---
.../maven/packaging/model/LanguageOptionModel.java | 118 --
.../maven/packaging/model/OtherOptionModel.java | 197 ---
.../model/SpringBootAutoConfigureOptionModel.java | 93 --
.../src/main/resources/dataformat-options.mvel | 8 +-
.../src/main/resources/eip-options.mvel | 6 +-
.../src/main/resources/endpoint-options.mvel | 6 +-
.../src/main/resources/language-options.mvel | 8 +-
.../src/main/resources/readme-examples.mvel | 2 +-
.../main/resources/website-components-list.mvel | 2 +-
.../main/resources/website-dataformats-list.mvel | 2 +-
.../src/main/resources/website-languages-list.mvel | 2 +-
.../src/main/resources/website-others-list.mvel | 2 +-
.../maven/packaging/model/StringHelperTest.java | 44 -
tooling/pom.xml | 1 +
102 files changed, 3884 insertions(+), 7853 deletions(-)
delete mode 100644
tooling/apt/src/main/java/org/apache/camel/tools/apt/DocumentationHelper.java
delete mode 100644
tooling/apt/src/main/java/org/apache/camel/tools/apt/model/ComponentOption.java
delete mode 100644
tooling/apt/src/main/java/org/apache/camel/tools/apt/model/EndpointOption.java
delete mode 100644
tooling/apt/src/main/java/org/apache/camel/tools/apt/model/EndpointPath.java
delete mode 100644
tooling/apt/src/main/java/org/apache/camel/tools/apt/model/PropertyOption.java
rename
tooling/{camel-tooling-util/src/test/java/org/apache/camel/tooling/util/JSonSchemaHelperTest.java
=>
apt/src/test/java/org/apache/camel/tools/apt/AnnotationProcessorHelperTest.java}
(88%)
copy tooling/{camel-tooling-util => camel-tooling-model}/pom.xml (58%)
rename
tooling/{maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/model/OtherModel.java
=>
camel-tooling-model/src/main/java/org/apache/camel/tooling/model/BaseModel.java}
(62%)
rename
tooling/{maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/model/EndpointOptionModel.java
=>
camel-tooling-model/src/main/java/org/apache/camel/tooling/model/BaseOptionModel.java}
(58%)
rename tooling/{apt/src/main/java/org/apache/camel/tools/apt =>
camel-tooling-model/src/main/java/org/apache/camel/tooling}/model/ComponentModel.java
(54%)
copy
tooling/{maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/model/SpringBootModel.java
=>
camel-tooling-model/src/main/java/org/apache/camel/tooling/model/DataFormatModel.java}
(58%)
create mode 100644
tooling/camel-tooling-model/src/main/java/org/apache/camel/tooling/model/EipModel.java
rename
tooling/{maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging
=>
camel-tooling-model/src/main/java/org/apache/camel/tooling}/model/ExampleModel.java
(88%)
create mode 100644
tooling/camel-tooling-model/src/main/java/org/apache/camel/tooling/model/JsonMapper.java
copy
tooling/{maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/model/SpringBootModel.java
=>
camel-tooling-model/src/main/java/org/apache/camel/tooling/model/LanguageModel.java}
(58%)
rename
tooling/{maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/model/SpringBootModel.java
=>
camel-tooling-model/src/main/java/org/apache/camel/tooling/model/OtherModel.java}
(73%)
rename
tooling/{maven/camel-package-maven-plugin/src/test/java/org/apache/camel/maven/packaging
=>
camel-tooling-model/src/test/java/org/apache/camel/tooling}/model/ComponentOptionModelTest.java
(83%)
delete mode 100644
tooling/camel-tooling-util/src/main/java/org/apache/camel/tooling/util/JSonSchemaHelper.java
delete mode 100644
tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/model/ComponentModel.java
delete mode 100644
tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/model/ComponentOptionModel.java
delete mode 100644
tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/model/DataFormatModel.java
delete mode 100644
tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/model/DataFormatOptionModel.java
delete mode 100644
tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/model/EipModel.java
delete mode 100644
tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/model/EipOptionModel.java
delete mode 100644
tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/model/LanguageModel.java
delete mode 100644
tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/model/LanguageOptionModel.java
delete mode 100644
tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/model/OtherOptionModel.java
delete mode 100644
tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/model/SpringBootAutoConfigureOptionModel.java
delete mode 100644
tooling/maven/camel-package-maven-plugin/src/test/java/org/apache/camel/maven/packaging/model/StringHelperTest.java
