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/04/07 12:49:44 UTC
[camel] branch CAMEL-17924/public-headers-only updated (27a33d485a7 -> e665d6c0c80)
This is an automated email from the ASF dual-hosted git repository.
nfilotto pushed a change to branch CAMEL-17924/public-headers-only
in repository https://gitbox.apache.org/repos/asf/camel.git
discard 27a33d485a7 CAMEL-17924: Only expose public headers in the documentation
omit 429d41d1946 CAMEL-17918: Define the header name provider in case the headers class is an enum
add 92138ec1b47 Datasonnet libraries autodiscovery (#7374)
add e657c37d515 CAMEL-17897: camel-exec - add exitValues parameter (#7376)
add 6ea23fb25e4 CAMEL-17792: Add documentation about the message headers (T-Z) (#7379)
add e59eca5f7a5 Regen for commit 6ea23fb25e434356dc4210b651bab769591660ce (#7380)
add 1e8a56795c5 Upgrade AWS SDK v2 to version 2.17.165
add 99c53dafe65 Regen and sync deps
add 393d338dfb5 CAMEL-17917 Add missing sample code to camel-mail docs and update attachments sample to use new Attachments API.
add 9497ade3360 Azure Key Vault Component: Docs
add 4781c0d75ad Azure Key Vault Component: Docs
add 8afd5f6ee1c Azure Key Vault: Security docs
add 8a641f51524 Azure Key Vault Component: Docs
add ce6f67f254b Upgrade Kubernetes Client and model to version 5.12.2
add 57a7c72a0d0 Sync deps
add ec4700704cb CAMEL-17918: Define the header name provider in case the headers class is an enum (#7382)
add ae3478a2a1a CAMEL-17792: Add doc about the message headers of camel-gora (#7383)
add 0b6a02ac7da CAMEL-17922: Fix default value supplier for header MIX_DIGEST (#7385)
new e665d6c0c80 CAMEL-17924: Only expose public headers in the documentation
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 (27a33d485a7)
\
N -- N -- N refs/heads/CAMEL-17924/public-headers-only (e665d6c0c80)
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.
The 1 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:
camel-dependencies/pom.xml | 6 +-
.../org/apache/camel/catalog/components/exec.json | 2 +
.../apache/camel/catalog/components/telegram.json | 8 ++
.../apache/camel/catalog/components/thrift.json | 3 +
.../org/apache/camel/catalog/components/timer.json | 4 +
.../catalog/components/twitter-directmessage.json | 4 +
.../camel/catalog/components/twitter-search.json | 9 ++
.../camel/catalog/components/twitter-timeline.json | 3 +
.../apache/camel/catalog/components/undertow.json | 17 ++++
.../apache/camel/catalog/components/velocity.json | 6 ++
.../camel/catalog/components/vertx-http.json | 10 +++
.../camel/catalog/components/vertx-kafka.json | 11 +++
.../camel/catalog/components/vertx-websocket.json | 5 ++
.../apache/camel/catalog/components/weather.json | 4 +
.../org/apache/camel/catalog/components/web3j.json | 39 ++++++++
.../camel/catalog/components/websocket-jsr356.json | 4 +
.../apache/camel/catalog/components/websocket.json | 7 ++
.../apache/camel/catalog/components/workday.json | 3 +
.../apache/camel/catalog/components/xchange.json | 4 +
.../org/apache/camel/catalog/components/xj.json | 5 +-
.../camel/catalog/components/xmlsecurity-sign.json | 17 ++++
.../catalog/components/xmlsecurity-verify.json | 12 +++
.../org/apache/camel/catalog/components/xmpp.json | 3 +
.../camel/catalog/components/xslt-saxon.json | 2 +-
.../org/apache/camel/catalog/components/xslt.json | 5 +-
.../apache/camel/catalog/components/zookeeper.json | 9 ++
.../src/main/docs/azure-key-vault-component.adoc | 100 ++++++++++++++++++++-
.../language/datasonnet/DatasonnetExpression.java | 21 +++--
.../src/test/java/library/TestLib.java | 72 +++++++++++++++
.../datasonnet/CamelDatasonnetJavaDslTest.java | 20 +++++
.../language/datasonnet/CamelDatasonnetTest.java | 7 ++
.../camel/language.datasonnet/camel-context.xml | 16 ++++
.../component/exec/ExecEndpointConfigurer.java | 6 ++
.../component/exec/ExecEndpointUriFactory.java | 3 +-
.../org/apache/camel/component/exec/exec.json | 2 +
.../apache/camel/component/exec/ExecBinding.java | 10 +++
.../apache/camel/component/exec/ExecCommand.java | 19 +++-
.../apache/camel/component/exec/ExecEndpoint.java | 15 ++++
.../component/exec/impl/DefaultExecBinding.java | 15 +++-
.../exec/impl/DefaultExecCommandExecutor.java | 6 ++
.../camel/component/exec/impl/ExecParseUtils.java | 9 ++
.../camel/component/exec/ExecEndpointTest.java | 14 +++
.../camel/component/exec/ExecProducerTest.java | 28 ++++++
.../org/apache/camel/component/gora/gora.json | 4 +
.../camel-gora/src/main/docs/gora-component.adoc | 18 ++--
.../apache/camel/component/gora/GoraAttribute.java | 5 ++
.../apache/camel/component/gora/GoraEndpoint.java | 5 +-
.../camel-mail/src/main/docs/mail-component.adoc | 39 ++++++++
.../apache/camel/component/telegram/telegram.json | 8 ++
.../src/main/docs/telegram-component.adoc | 26 +-----
.../component/telegram/TelegramConstants.java | 28 +++++-
.../camel/component/telegram/TelegramEndpoint.java | 2 +-
.../telegram/util/TelegramMessageHelper.java | 4 +-
.../org/apache/camel/component/thrift/thrift.json | 3 +
.../src/main/docs/thrift-component.adoc | 14 +--
.../camel/component/thrift/ThriftConstants.java | 5 +-
.../camel/component/thrift/ThriftEndpoint.java | 2 +-
.../org/apache/camel/component/timer/timer.json | 4 +
.../camel-timer/src/main/docs/timer-component.adoc | 6 +-
.../camel/component/timer/TimerConstants.java} | 10 ++-
.../camel/component/timer/TimerConsumer.java | 4 +-
.../camel/component/timer/TimerEndpoint.java | 2 +-
.../directmessage/twitter-directmessage.json | 4 +
.../component/twitter/search/twitter-search.json | 9 ++
.../twitter/timeline/twitter-timeline.json | 3 +
.../main/docs/twitter-directmessage-component.adoc | 4 +-
.../src/main/docs/twitter-search-component.adoc | 4 +-
.../src/main/docs/twitter-timeline-component.adoc | 4 +-
.../camel/component/twitter/TwitterConstants.java | 25 ++++++
.../TwitterDirectMessageEndpoint.java | 7 +-
.../twitter/search/TwitterSearchEndpoint.java | 8 +-
.../twitter/timeline/TwitterTimelineEndpoint.java | 6 +-
.../apache/camel/component/undertow/undertow.json | 17 ++++
.../src/main/docs/undertow-component.adoc | 4 +-
.../undertow/DefaultUndertowHttpBinding.java | 18 ++--
.../component/undertow/UndertowConstants.java | 41 +++++++++
.../camel/component/undertow/UndertowConsumer.java | 4 +-
.../camel/component/undertow/UndertowEndpoint.java | 2 +-
.../camel/component/undertow/UndertowHelper.java | 10 +--
.../camel/component/undertow/UndertowProducer.java | 2 +-
.../apache/camel/component/velocity/velocity.json | 6 ++
.../src/main/docs/velocity-component.adoc | 22 +----
.../component/velocity/VelocityConstants.java | 14 ++-
.../camel/component/velocity/VelocityEndpoint.java | 2 +-
.../camel/component/vertx/http/vertx-http.json | 10 +++
.../src/main/docs/vertx-http-component.adoc | 31 +------
.../vertx/http/DefaultVertxHttpBinding.java | 12 +--
.../component/vertx/http/VertxHttpConstants.java | 32 +++++++
.../component/vertx/http/VertxHttpEndpoint.java | 3 +-
.../component/vertx/http/VertxHttpHelper.java | 10 +--
.../camel/component/vertx/kafka/vertx-kafka.json | 11 +++
.../src/main/docs/vertx-kafka-component.adoc | 44 +--------
.../component/vertx/kafka/VertxKafkaConstants.java | 24 +++++
.../component/vertx/kafka/VertxKafkaEndpoint.java | 2 +-
.../component/vertx/websocket/vertx-websocket.json | 5 ++
.../src/main/docs/vertx-websocket-component.adoc | 20 +----
.../vertx/websocket/VertxWebsocketConstants.java | 8 ++
.../vertx/websocket/VertxWebsocketEndpoint.java | 3 +-
.../apache/camel/component/weather/weather.json | 4 +
.../src/main/docs/weather-component.adoc | 17 +---
.../camel/component/weather/WeatherConstants.java | 6 ++
.../camel/component/weather/WeatherEndpoint.java | 2 +-
.../org/apache/camel/component/web3j/web3j.json | 39 ++++++++
.../camel-web3j/src/main/docs/web3j-component.adoc | 13 +--
.../camel/component/web3j/Web3jConstants.java | 72 +++++++++++++++
.../camel/component/web3j/Web3jConsumer.java | 4 +-
.../camel/component/web3j/Web3jEndpoint.java | 2 +-
.../camel/component/web3j/Web3jProducer.java | 2 +-
.../camel/websocket/jsr356/websocket-jsr356.json | 4 +
.../src/main/docs/websocket-jsr356-component.adoc | 5 +-
.../camel/websocket/jsr356/JSR356Constants.java | 4 +
.../camel/websocket/jsr356/JSR356Endpoint.java | 2 +-
.../camel/component/websocket/websocket.json | 7 ++
.../src/main/docs/websocket-component.adoc | 36 +-------
.../component/websocket/WebsocketConstants.java | 28 ++++++
.../component/websocket/WebsocketEndpoint.java | 3 +-
.../apache/camel/component/workday/workday.json | 3 +
.../src/main/docs/workday-component.adoc | 4 +-
.../camel/component/workday/WorkdayEndpoint.java | 3 +-
.../workday/producer/WorkdayDefaultProducer.java | 2 +
.../apache/camel/component/xchange/xchange.json | 4 +
.../src/main/docs/xchange-component.adoc | 4 +-
.../component/xchange/XChangeConfiguration.java | 2 +
.../camel/component/xchange/XChangeEndpoint.java | 2 +-
.../org/apache/camel/component/xj/xj.json | 5 +-
.../camel-xj/src/main/docs/xj-component.adoc | 4 +-
.../component/xj/JsonFileResultHandlerFactory.java | 2 +-
.../org/apache/camel/component/xj/XJConstants.java | 4 +
.../org/apache/camel/component/xj/XJEndpoint.java | 2 +-
.../component/xmlsecurity/xmlsecurity-sign.json | 17 ++++
.../component/xmlsecurity/xmlsecurity-verify.json | 12 +++
.../src/main/docs/xmlsecurity-sign-component.adoc | 27 +-----
.../main/docs/xmlsecurity-verify-component.adoc | 27 +-----
.../component/xmlsecurity/XmlSignerEndpoint.java | 8 +-
.../component/xmlsecurity/XmlVerifierEndpoint.java | 8 +-
.../api/DefaultXmlSignature2Message.java | 3 +-
.../xmlsecurity/api/XmlSignatureConstants.java | 27 ++++--
.../xmlsecurity/processor/XmlSignerProcessor.java | 2 +-
.../org/apache/camel/component/xmpp/xmpp.json | 3 +
.../camel-xmpp/src/main/docs/xmpp-component.adoc | 4 +-
.../apache/camel/component/xmpp/XmppConstants.java | 3 +
.../apache/camel/component/xmpp/XmppEndpoint.java | 2 +-
.../camel/component/xslt/saxon/xslt-saxon.json | 2 +-
.../org/apache/camel/component/xslt/xslt.json | 5 +-
.../camel-xslt/src/main/docs/xslt-component.adoc | 4 +-
.../component/xslt/FileResultHandlerFactory.java | 2 +-
.../apache/camel/component/xslt/XsltBuilder.java | 2 +-
...esultHandlerFactory.java => XsltConstants.java} | 14 +--
.../apache/camel/component/xslt/XsltEndpoint.java | 4 +-
.../camel/component/zookeeper/zookeeper.json | 9 ++
.../src/main/docs/zookeeper-component.adoc | 4 +-
.../component/zookeeper/ZooKeeperEndpoint.java | 2 +-
.../component/zookeeper/ZooKeeperMessage.java | 14 +--
docs/user-manual/modules/ROOT/pages/security.adoc | 97 ++++++++++++++++++++
.../endpoint/dsl/ExecEndpointBuilderFactory.java | 17 ++++
.../endpoint/dsl/XJEndpointBuilderFactory.java | 12 +--
.../endpoint/dsl/XsltEndpointBuilderFactory.java | 12 +--
.../dsl/XsltSaxonEndpointBuilderFactory.java | 12 +--
parent/pom.xml | 6 +-
159 files changed, 1426 insertions(+), 411 deletions(-)
create mode 100644 components/camel-datasonnet/src/test/java/library/TestLib.java
copy components/{camel-scheduler/src/main/java/org/apache/camel/component/scheduler/SchedulerConstants.java => camel-timer/src/main/java/org/apache/camel/component/timer/TimerConstants.java} (74%)
copy components/camel-xslt/src/main/java/org/apache/camel/component/xslt/{DomResultHandlerFactory.java => XsltConstants.java} (78%)
[camel] 01/01: CAMEL-17924: Only expose public headers in the documentation
Posted by nf...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
nfilotto pushed a commit to branch CAMEL-17924/public-headers-only
in repository https://gitbox.apache.org/repos/asf/camel.git
commit e665d6c0c80155a6fdf31068257f0f513c7da3f7
Author: Nicolas Filotto <nf...@talend.com>
AuthorDate: Thu Apr 7 14:48:31 2022 +0200
CAMEL-17924: Only expose public headers in the documentation
---
.../maven/packaging/EndpointSchemaGeneratorMojo.java | 20 ++------------------
.../packaging/endpoint/SomeCommonConstants.java | 2 +-
.../maven/packaging/endpoint/SomeConstants.java | 4 ++--
.../packaging/endpoint/SomeEndpointWithFilter.java | 6 +++---
.../SomeEndpointWithJavadocAsDescription.java | 2 +-
.../packaging/endpoint/SomeSpecificConstants.java | 5 ++++-
6 files changed, 13 insertions(+), 26 deletions(-)
diff --git a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/EndpointSchemaGeneratorMojo.java b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/EndpointSchemaGeneratorMojo.java
index 116a48fdb9d..d0890ce1dc2 100644
--- a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/EndpointSchemaGeneratorMojo.java
+++ b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/EndpointSchemaGeneratorMojo.java
@@ -32,13 +32,11 @@ import java.net.URL;
import java.nio.file.Files;
import java.nio.file.Path;
import java.nio.file.Paths;
-import java.util.ArrayDeque;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
import java.util.Collections;
import java.util.Date;
-import java.util.Deque;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
@@ -319,20 +317,7 @@ public class EndpointSchemaGeneratorMojo extends AbstractGeneratorMojo {
getLog().debug(String.format("The endpoint %s has not defined any headers class", uriEndpoint.scheme()));
return;
}
- // A header class has been defined
- boolean foundHeader = false;
- final Deque<Class<?>> classes = new ArrayDeque<>();
- classes.add(headersClass);
- Class<?> currentHeadersClass;
- while ((currentHeadersClass = classes.poll()) != null) {
- foundHeader |= addEndpointHeaders(componentModel, scheme, currentHeadersClass, uriEndpoint.headersNameProvider());
- final Class<?> superclass = currentHeadersClass.getSuperclass();
- if (superclass != null && !superclass.equals(Object.class)) {
- classes.add(superclass);
- }
- classes.addAll(Arrays.asList(currentHeadersClass.getInterfaces()));
- }
- if (!foundHeader) {
+ if (!addEndpointHeaders(componentModel, scheme, headersClass, uriEndpoint.headersNameProvider())) {
getLog().debug(String.format("No headers have been detected in the headers class %s", headersClass.getName()));
}
}
@@ -355,7 +340,7 @@ public class EndpointSchemaGeneratorMojo extends AbstractGeneratorMojo {
ComponentModel componentModel, String scheme, Class<?> headersClass, String headersNameProvider) {
final boolean isEnum = headersClass.isEnum();
boolean foundHeader = false;
- for (Field field : headersClass.getDeclaredFields()) {
+ for (Field field : headersClass.getFields()) {
if ((isEnum || isStatic(field.getModifiers()) && field.getType() == String.class)
&& field.isAnnotationPresent(Metadata.class)) {
getLog().debug(
@@ -487,7 +472,6 @@ public class EndpointSchemaGeneratorMojo extends AbstractGeneratorMojo {
}
return field.getName();
}
- field.trySetAccessible();
return (String) field.get(null);
}
diff --git a/tooling/maven/camel-package-maven-plugin/src/test/java/org/apache/camel/maven/packaging/endpoint/SomeCommonConstants.java b/tooling/maven/camel-package-maven-plugin/src/test/java/org/apache/camel/maven/packaging/endpoint/SomeCommonConstants.java
index 577acff011e..2a0213f7d5f 100644
--- a/tooling/maven/camel-package-maven-plugin/src/test/java/org/apache/camel/maven/packaging/endpoint/SomeCommonConstants.java
+++ b/tooling/maven/camel-package-maven-plugin/src/test/java/org/apache/camel/maven/packaging/endpoint/SomeCommonConstants.java
@@ -21,7 +21,7 @@ import org.apache.camel.spi.Metadata;
public class SomeCommonConstants {
@Metadata
- static final String KEY_FROM_COMMON = "KEY_FROM_COMMON";
+ public static final String KEY_FROM_COMMON = "KEY_FROM_COMMON";
protected SomeCommonConstants() {
}
diff --git a/tooling/maven/camel-package-maven-plugin/src/test/java/org/apache/camel/maven/packaging/endpoint/SomeConstants.java b/tooling/maven/camel-package-maven-plugin/src/test/java/org/apache/camel/maven/packaging/endpoint/SomeConstants.java
index 407bec9e123..1152334ca6e 100644
--- a/tooling/maven/camel-package-maven-plugin/src/test/java/org/apache/camel/maven/packaging/endpoint/SomeConstants.java
+++ b/tooling/maven/camel-package-maven-plugin/src/test/java/org/apache/camel/maven/packaging/endpoint/SomeConstants.java
@@ -25,12 +25,12 @@ public final class SomeConstants {
defaultValue = "VAL1", deprecationNote = "my deprecated note", secret = true)
public static final String KEY_FULL = "KEY_FULL";
@Metadata
- static final String KEY_EMPTY = "KEY_EMPTY";
+ public static final String KEY_EMPTY = "KEY_EMPTY";
/**
* Some description
*/
@Metadata
- static final String KEY_EMPTY_WITH_JAVA_DOC = "KEY_EMPTY_WITH_JAVA_DOC";
+ public static final String KEY_EMPTY_WITH_JAVA_DOC = "KEY_EMPTY_WITH_JAVA_DOC";
private SomeConstants() {
}
diff --git a/tooling/maven/camel-package-maven-plugin/src/test/java/org/apache/camel/maven/packaging/endpoint/SomeEndpointWithFilter.java b/tooling/maven/camel-package-maven-plugin/src/test/java/org/apache/camel/maven/packaging/endpoint/SomeEndpointWithFilter.java
index e406eb37a61..c9ddf5fa0e0 100644
--- a/tooling/maven/camel-package-maven-plugin/src/test/java/org/apache/camel/maven/packaging/endpoint/SomeEndpointWithFilter.java
+++ b/tooling/maven/camel-package-maven-plugin/src/test/java/org/apache/camel/maven/packaging/endpoint/SomeEndpointWithFilter.java
@@ -23,11 +23,11 @@ import org.apache.camel.spi.UriEndpoint;
public final class SomeEndpointWithFilter {
@Metadata(description = "some description")
- static final String KEEP_1 = "keep-1";
+ public static final String KEEP_1 = "keep-1";
@Metadata(description = "some description", applicableFor = "some")
- static final String KEEP_2 = "keep-2";
+ public static final String KEEP_2 = "keep-2";
@Metadata(description = "some description", applicableFor = "other")
- static final String IGNORE = "ignore";
+ public static final String IGNORE = "ignore";
private SomeEndpointWithFilter() {
}
diff --git a/tooling/maven/camel-package-maven-plugin/src/test/java/org/apache/camel/maven/packaging/endpoint/SomeEndpointWithJavadocAsDescription.java b/tooling/maven/camel-package-maven-plugin/src/test/java/org/apache/camel/maven/packaging/endpoint/SomeEndpointWithJavadocAsDescription.java
index 24ed6baadde..6f1f50f95a4 100644
--- a/tooling/maven/camel-package-maven-plugin/src/test/java/org/apache/camel/maven/packaging/endpoint/SomeEndpointWithJavadocAsDescription.java
+++ b/tooling/maven/camel-package-maven-plugin/src/test/java/org/apache/camel/maven/packaging/endpoint/SomeEndpointWithJavadocAsDescription.java
@@ -26,7 +26,7 @@ public final class SomeEndpointWithJavadocAsDescription {
* Some description about {@link #NO_DESCRIPTION}.
*/
@Metadata
- static final String NO_DESCRIPTION = "no-description";
+ public static final String NO_DESCRIPTION = "no-description";
private SomeEndpointWithJavadocAsDescription() {
diff --git a/tooling/maven/camel-package-maven-plugin/src/test/java/org/apache/camel/maven/packaging/endpoint/SomeSpecificConstants.java b/tooling/maven/camel-package-maven-plugin/src/test/java/org/apache/camel/maven/packaging/endpoint/SomeSpecificConstants.java
index 132de652ec9..58174396d23 100644
--- a/tooling/maven/camel-package-maven-plugin/src/test/java/org/apache/camel/maven/packaging/endpoint/SomeSpecificConstants.java
+++ b/tooling/maven/camel-package-maven-plugin/src/test/java/org/apache/camel/maven/packaging/endpoint/SomeSpecificConstants.java
@@ -21,7 +21,10 @@ import org.apache.camel.spi.Metadata;
public final class SomeSpecificConstants extends SomeCommonConstants {
@Metadata
- static final String KEY_FROM_SPECIFIC = "KEY_FROM_SPECIFIC";
+ public static final String KEY_FROM_SPECIFIC = "KEY_FROM_SPECIFIC";
+
+ @Metadata
+ static final String INTERNAL_KEY_FROM_SPECIFIC = "INTERNAL_KEY_FROM_SPECIFIC";
private SomeSpecificConstants() {
}