This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git
The following commit(s) were added to refs/heads/main by this push:
new e584979e721 [create-pull-request] automated change (#584)
e584979e721 is described below
commit e584979e72120522059325ca88b2ccfc5cdec945
Author: github-actions[bot]
<41898282+github-actions[bot]@users.noreply.github.com>
AuthorDate: Tue Jun 28 06:23:17 2022 +0200
[create-pull-request] automated change (#584)
Co-authored-by: oscerd <osc...@users.noreply.github.com>
---
.../springboot/catalog/components/rest-api.json | 2 +-
.../camel/springboot/catalog/components/rest.json | 10 +++++-----
.../camel/springboot/catalog/components/slack.json | 2 +-
.../camel-rest-starter/src/main/docs/rest.json | 6 +++---
.../rest/springboot/RestComponentConfiguration.java | 20 ++++++++++----------
tooling/camel-spring-boot-bom/pom.xml | 5 +++++
tooling/camel-spring-boot-dependencies/pom.xml | 5 +++++
7 files changed, 30 insertions(+), 20 deletions(-)
diff --git
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/rest-api.json
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/rest-api.json
index 74ee29468f1..029d4d5c17a 100644
---
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/rest-api.json
+++
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/rest-api.json
@@ -28,7 +28,7 @@
"properties": {
"path": { "kind": "path", "displayName": "Path", "group": "consumer",
"label": "", "required": true, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "deprecationNote": "", "autowired":
false, "secret": false, "description": "The base path" },
"apiComponentName": { "kind": "parameter", "displayName": "Api Component
Name", "group": "consumer", "label": "", "required": false, "type": "string",
"javaType": "java.lang.String", "deprecated": false, "autowired": false,
"secret": false, "description": "The Camel Rest API component to use for
generating the API of the REST services, such as openapi." },
- "consumerComponentName": { "kind": "parameter", "displayName": "Consumer
Component Name", "group": "consumer", "label": "", "required": false, "type":
"string", "javaType": "java.lang.String", "deprecated": false, "autowired":
false, "secret": false, "description": "The Camel Rest component to use for
(consumer) the REST transport, such as jetty, servlet, undertow. If no
component has been explicit configured, then Camel will lookup if there is a
Camel component that integrates with [...]
+ "consumerComponentName": { "kind": "parameter", "displayName": "Consumer
Component Name", "group": "consumer", "label": "", "required": false, "type":
"string", "javaType": "java.lang.String", "deprecated": false, "autowired":
false, "secret": false, "description": "The Camel Rest component to use for the
consumer REST transport, such as jetty, servlet, undertow. If no component has
been explicitly configured, then Camel will lookup if there is a Camel
component that integrates with [...]
"bridgeErrorHandler": { "kind": "parameter", "displayName": "Bridge Error
Handler", "group": "consumer (advanced)", "label": "consumer,advanced",
"required": false, "type": "boolean", "javaType": "boolean", "deprecated":
false, "autowired": false, "secret": false, "defaultValue": false,
"description": "Allows for bridging the consumer to the Camel routing Error
Handler, which mean any exceptions occurred while the consumer is trying to
pickup incoming messages, or the likes, will now [...]
"exceptionHandler": { "kind": "parameter", "displayName": "Exception
Handler", "group": "consumer (advanced)", "label": "consumer,advanced",
"required": false, "type": "object", "javaType":
"org.apache.camel.spi.ExceptionHandler", "optionalPrefix": "consumer.",
"deprecated": false, "autowired": false, "secret": false, "description": "To
let the consumer use a custom ExceptionHandler. Notice if the option
bridgeErrorHandler is enabled then this option is not in use. By default the
con [...]
"exchangePattern": { "kind": "parameter", "displayName": "Exchange
Pattern", "group": "consumer (advanced)", "label": "consumer,advanced",
"required": false, "type": "object", "javaType":
"org.apache.camel.ExchangePattern", "enum": [ "InOnly", "InOut",
"InOptionalOut" ], "deprecated": false, "autowired": false, "secret": false,
"description": "Sets the exchange pattern when the consumer creates an
exchange." }
diff --git
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/rest.json
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/rest.json
index df6de841525..048a2b34e1b 100644
---
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/rest.json
+++
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/rest.json
@@ -24,12 +24,12 @@
},
"componentProperties": {
"bridgeErrorHandler": { "kind": "property", "displayName": "Bridge Error
Handler", "group": "consumer", "label": "consumer", "required": false, "type":
"boolean", "javaType": "boolean", "deprecated": false, "autowired": false,
"secret": false, "defaultValue": false, "description": "Allows for bridging the
consumer to the Camel routing Error Handler, which mean any exceptions occurred
while the consumer is trying to pickup incoming messages, or the likes, will
now be processed as a me [...]
- "consumerComponentName": { "kind": "property", "displayName": "Consumer
Component Name", "group": "consumer", "label": "consumer", "required": false,
"type": "string", "javaType": "java.lang.String", "deprecated": false,
"autowired": false, "secret": false, "description": "The Camel Rest component
to use for (consumer) the REST transport, such as jetty, servlet, undertow. If
no component has been explicit configured, then Camel will lookup if there is a
Camel component that integrate [...]
+ "consumerComponentName": { "kind": "property", "displayName": "Consumer
Component Name", "group": "consumer", "label": "consumer", "required": false,
"type": "string", "javaType": "java.lang.String", "deprecated": false,
"autowired": false, "secret": false, "description": "The Camel Rest component
to use for the consumer REST transport, such as jetty, servlet, undertow. If no
component has been explicitly configured, then Camel will lookup if there is a
Camel component that integrate [...]
"apiDoc": { "kind": "property", "displayName": "Api Doc", "group":
"producer", "label": "producer", "required": false, "type": "string",
"javaType": "java.lang.String", "deprecated": false, "autowired": false,
"secret": false, "description": "The swagger api doc resource to use. The
resource is loaded from classpath by default and must be in JSON format." },
- "componentName": { "kind": "property", "displayName": "Component Name",
"group": "producer", "label": "producer", "required": false, "type": "string",
"javaType": "java.lang.String", "deprecated": true, "autowired": false,
"secret": false, "description": "The Camel Rest component to use for (producer)
the REST transport, such as http, undertow. If no component has been explicit
configured, then Camel will lookup if there is a Camel component that
integrates with the Rest DSL, or if a [...]
+ "componentName": { "kind": "property", "displayName": "Component Name",
"group": "producer", "label": "producer", "required": false, "type": "string",
"javaType": "java.lang.String", "deprecated": true, "autowired": false,
"secret": false, "description": "The Camel Rest component to use for the
producer REST transport, such as http, undertow. If no component has been
explicitly configured, then Camel will lookup if there is a Camel component
that integrates with the Rest DSL, or if a [...]
"host": { "kind": "property", "displayName": "Host", "group": "producer",
"label": "producer", "required": false, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "autowired": false, "secret": false,
"description": "Host and port of HTTP service to use (override host in swagger
schema)" },
"lazyStartProducer": { "kind": "property", "displayName": "Lazy Start
Producer", "group": "producer", "label": "producer", "required": false, "type":
"boolean", "javaType": "boolean", "deprecated": false, "autowired": false,
"secret": false, "defaultValue": false, "description": "Whether the producer
should be started lazy (on the first message). By starting lazy you can use
this to allow CamelContext and routes to startup in situations where a producer
may otherwise fail during star [...]
- "producerComponentName": { "kind": "property", "displayName": "Producer
Component Name", "group": "producer", "label": "producer", "required": false,
"type": "string", "javaType": "java.lang.String", "deprecated": false,
"autowired": false, "secret": false, "description": "The Camel Rest component
to use for (producer) the REST transport, such as http, undertow. If no
component has been explicit configured, then Camel will lookup if there is a
Camel component that integrates with the [...]
+ "producerComponentName": { "kind": "property", "displayName": "Producer
Component Name", "group": "producer", "label": "producer", "required": false,
"type": "string", "javaType": "java.lang.String", "deprecated": false,
"autowired": false, "secret": false, "description": "The Camel Rest component
to use for the producer REST transport, such as http, undertow. If no component
has been explicitly configured, then Camel will lookup if there is a Camel
component that integrates with the [...]
"autowiredEnabled": { "kind": "property", "displayName": "Autowired
Enabled", "group": "advanced", "label": "advanced", "required": false, "type":
"boolean", "javaType": "boolean", "deprecated": false, "autowired": false,
"secret": false, "defaultValue": true, "description": "Whether autowiring is
enabled. This is used for automatic autowiring options (the option must be
marked as autowired) by looking up in the registry to find if there is a single
instance of matching type, which t [...]
},
"headers": {
@@ -49,7 +49,7 @@
"outType": { "kind": "parameter", "displayName": "Out Type", "group":
"common", "label": "common", "required": false, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "autowired": false, "secret": false,
"description": "To declare the outgoing POJO binding type as a FQN class name"
},
"produces": { "kind": "parameter", "displayName": "Produces", "group":
"common", "label": "common", "required": false, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "autowired": false, "secret": false,
"description": "Media type such as: 'text\/xml', or 'application\/json' this
REST service returns." },
"routeId": { "kind": "parameter", "displayName": "Route Id", "group":
"common", "label": "common", "required": false, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "autowired": false, "secret": false,
"description": "Name of the route this REST services creates" },
- "consumerComponentName": { "kind": "parameter", "displayName": "Consumer
Component Name", "group": "consumer", "label": "consumer", "required": false,
"type": "string", "javaType": "java.lang.String", "deprecated": false,
"autowired": false, "secret": false, "description": "The Camel Rest component
to use for (consumer) the REST transport, such as jetty, servlet, undertow. If
no component has been explicit configured, then Camel will lookup if there is a
Camel component that integrat [...]
+ "consumerComponentName": { "kind": "parameter", "displayName": "Consumer
Component Name", "group": "consumer", "label": "consumer", "required": false,
"type": "string", "javaType": "java.lang.String", "deprecated": false,
"autowired": false, "secret": false, "description": "The Camel Rest component
to use for the consumer REST transport, such as jetty, servlet, undertow. If no
component has been explicitly configured, then Camel will lookup if there is a
Camel component that integrat [...]
"description": { "kind": "parameter", "displayName": "Description",
"group": "consumer", "label": "consumer", "required": false, "type": "string",
"javaType": "java.lang.String", "deprecated": false, "autowired": false,
"secret": false, "description": "Human description to document this REST
service" },
"bridgeErrorHandler": { "kind": "parameter", "displayName": "Bridge Error
Handler", "group": "consumer (advanced)", "label": "consumer,advanced",
"required": false, "type": "boolean", "javaType": "boolean", "deprecated":
false, "autowired": false, "secret": false, "defaultValue": false,
"description": "Allows for bridging the consumer to the Camel routing Error
Handler, which mean any exceptions occurred while the consumer is trying to
pickup incoming messages, or the likes, will now [...]
"exceptionHandler": { "kind": "parameter", "displayName": "Exception
Handler", "group": "consumer (advanced)", "label": "consumer,advanced",
"required": false, "type": "object", "javaType":
"org.apache.camel.spi.ExceptionHandler", "optionalPrefix": "consumer.",
"deprecated": false, "autowired": false, "secret": false, "description": "To
let the consumer use a custom ExceptionHandler. Notice if the option
bridgeErrorHandler is enabled then this option is not in use. By default the
con [...]
@@ -57,7 +57,7 @@
"apiDoc": { "kind": "parameter", "displayName": "Api Doc", "group":
"producer", "label": "producer", "required": false, "type": "string",
"javaType": "java.lang.String", "deprecated": false, "autowired": false,
"secret": false, "description": "The openapi api doc resource to use. The
resource is loaded from classpath by default and must be in JSON format." },
"bindingMode": { "kind": "parameter", "displayName": "Binding Mode",
"group": "producer", "label": "producer", "required": false, "type": "object",
"javaType": "org.apache.camel.spi.RestConfiguration.RestBindingMode", "enum": [
"auto", "off", "json", "xml", "json_xml" ], "deprecated": false, "autowired":
false, "secret": false, "description": "Configures the binding mode for the
producer. If set to anything other than 'off' the producer will try to convert
the body of the incoming me [...]
"host": { "kind": "parameter", "displayName": "Host", "group": "producer",
"label": "producer", "required": false, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "autowired": false, "secret": false,
"description": "Host and port of HTTP service to use (override host in openapi
schema)" },
- "producerComponentName": { "kind": "parameter", "displayName": "Producer
Component Name", "group": "producer", "label": "producer", "required": false,
"type": "string", "javaType": "java.lang.String", "deprecated": false,
"autowired": false, "secret": false, "description": "The Camel Rest component
to use for (producer) the REST transport, such as http, undertow. If no
component has been explicit configured, then Camel will lookup if there is a
Camel component that integrates with th [...]
+ "producerComponentName": { "kind": "parameter", "displayName": "Producer
Component Name", "group": "producer", "label": "producer", "required": false,
"type": "string", "javaType": "java.lang.String", "deprecated": false,
"autowired": false, "secret": false, "description": "The Camel Rest component
to use for the producer REST transport, such as http, undertow. If no component
has been explicitly configured, then Camel will lookup if there is a Camel
component that integrates with th [...]
"queryParameters": { "kind": "parameter", "displayName": "Query
Parameters", "group": "producer", "label": "producer", "required": false,
"type": "string", "javaType": "java.lang.String", "deprecated": false,
"autowired": false, "secret": false, "description": "Query parameters for the
HTTP service to call. The query parameters can contain multiple parameters
separated by ampersand such such as foo=123&bar=456." },
"lazyStartProducer": { "kind": "parameter", "displayName": "Lazy Start
Producer", "group": "producer (advanced)", "label": "producer,advanced",
"required": false, "type": "boolean", "javaType": "boolean", "deprecated":
false, "autowired": false, "secret": false, "defaultValue": false,
"description": "Whether the producer should be started lazy (on the first
message). By starting lazy you can use this to allow CamelContext and routes to
startup in situations where a producer may other [...]
}
diff --git
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/slack.json
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/slack.json
index 5b89891fd5b..a3685217c95 100644
---
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/slack.json
+++
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/slack.json
@@ -29,7 +29,7 @@
"webhookUrl": { "kind": "property", "displayName": "Webhook Url", "group":
"webhook", "label": "webhook", "required": false, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "autowired": false, "secret": false,
"description": "The incoming webhook URL" }
},
"properties": {
- "channel": { "kind": "path", "displayName": "Channel", "group": "common",
"label": "", "required": true, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "deprecationNote": "", "autowired":
false, "secret": false, "description": "The channel name (syntax #name) or
slackuser (syntax userName) to send a message directly to an user." },
+ "channel": { "kind": "path", "displayName": "Channel", "group": "common",
"label": "", "required": true, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "deprecationNote": "", "autowired":
false, "secret": false, "description": "The channel name (syntax #name) or
slack user (syntax userName) to send a message directly to an user." },
"token": { "kind": "parameter", "displayName": "Token", "group": "common",
"label": "", "required": false, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "autowired": false, "secret": true,
"description": "The token to access Slack. This app needs to have
channels:history, groups:history, im:history, mpim:history, channels:read,
groups:read, im:read and mpim:read permissions. The User OAuth Token is the
kind of token needed." },
"conversationType": { "kind": "parameter", "displayName": "Conversation
Type", "group": "consumer", "label": "consumer", "required": false, "type":
"object", "javaType": "com.slack.api.model.ConversationType", "enum": [
"PUBLIC_CHANNEL", "PRIVATE_CHANNEL", "MPIM", "IM" ], "deprecated": false,
"autowired": false, "secret": false, "defaultValue": "PUBLIC_CHANNEL",
"description": "Type of conversation" },
"maxResults": { "kind": "parameter", "displayName": "Max Results",
"group": "consumer", "label": "consumer", "required": false, "type": "string",
"javaType": "java.lang.String", "deprecated": false, "autowired": false,
"secret": false, "defaultValue": "10", "description": "The Max Result for the
poll" },
diff --git a/components-starter/camel-rest-starter/src/main/docs/rest.json
b/components-starter/camel-rest-starter/src/main/docs/rest.json
index cdb9fb454fd..310036e1f95 100644
--- a/components-starter/camel-rest-starter/src/main/docs/rest.json
+++ b/components-starter/camel-rest-starter/src/main/docs/rest.json
@@ -72,7 +72,7 @@
{
"name": "camel.component.rest.consumer-component-name",
"type": "java.lang.String",
- "description": "The Camel Rest component to use for (consumer) the REST
transport, such as jetty, servlet, undertow. If no component has been explicit
configured, then Camel will lookup if there is a Camel component that
integrates with the Rest DSL, or if a org.apache.camel.spi.RestConsumerFactory
is registered in the registry. If either one is found, then that is being
used.",
+ "description": "The Camel Rest component to use for the consumer REST
transport, such as jetty, servlet, undertow. If no component has been
explicitly configured, then Camel will lookup if there is a Camel component
that integrates with the Rest DSL, or if a
org.apache.camel.spi.RestConsumerFactory is registered in the registry. If
either one is found, then that is being used.",
"sourceType":
"org.apache.camel.component.rest.springboot.RestComponentConfiguration"
},
{
@@ -102,13 +102,13 @@
{
"name": "camel.component.rest.producer-component-name",
"type": "java.lang.String",
- "description": "The Camel Rest component to use for (producer) the REST
transport, such as http, undertow. If no component has been explicit
configured, then Camel will lookup if there is a Camel component that
integrates with the Rest DSL, or if a org.apache.camel.spi.RestProducerFactory
is registered in the registry. If either one is found, then that is being
used.",
+ "description": "The Camel Rest component to use for the producer REST
transport, such as http, undertow. If no component has been explicitly
configured, then Camel will lookup if there is a Camel component that
integrates with the Rest DSL, or if a org.apache.camel.spi.RestProducerFactory
is registered in the registry. If either one is found, then that is being
used.",
"sourceType":
"org.apache.camel.component.rest.springboot.RestComponentConfiguration"
},
{
"name": "camel.component.rest.component-name",
"type": "java.lang.String",
- "description": "The Camel Rest component to use for (producer) the REST
transport, such as http, undertow. If no component has been explicit
configured, then Camel will lookup if there is a Camel component that
integrates with the Rest DSL, or if a org.apache.camel.spi.RestProducerFactory
is registered in the registry. If either one is found, then that is being
used.",
+ "description": "The Camel Rest component to use for the producer REST
transport, such as http, undertow. If no component has been explicitly
configured, then Camel will lookup if there is a Camel component that
integrates with the Rest DSL, or if a org.apache.camel.spi.RestProducerFactory
is registered in the registry. If either one is found, then that is being
used.",
"sourceType":
"org.apache.camel.component.rest.springboot.RestComponentConfiguration",
"deprecated": true,
"deprecation": {}
diff --git
a/components-starter/camel-rest-starter/src/main/java/org/apache/camel/component/rest/springboot/RestComponentConfiguration.java
b/components-starter/camel-rest-starter/src/main/java/org/apache/camel/component/rest/springboot/RestComponentConfiguration.java
index f8548a6e0c1..0091f64a576 100644
---
a/components-starter/camel-rest-starter/src/main/java/org/apache/camel/component/rest/springboot/RestComponentConfiguration.java
+++
b/components-starter/camel-rest-starter/src/main/java/org/apache/camel/component/rest/springboot/RestComponentConfiguration.java
@@ -47,12 +47,12 @@ public class RestComponentConfiguration
*/
private Boolean bridgeErrorHandler = false;
/**
- * The Camel Rest component to use for (consumer) the REST transport, such
- * as jetty, servlet, undertow. If no component has been explicit
- * configured, then Camel will lookup if there is a Camel component that
- * integrates with the Rest DSL, or if a
- * org.apache.camel.spi.RestConsumerFactory is registered in the registry.
- * If either one is found, then that is being used.
+ * The Camel Rest component to use for the consumer REST transport, such as
+ * jetty, servlet, undertow. If no component has been explicitly
configured,
+ * then Camel will lookup if there is a Camel component that integrates
with
+ * the Rest DSL, or if a org.apache.camel.spi.RestConsumerFactory is
+ * registered in the registry. If either one is found, then that is being
+ * used.
*/
private String consumerComponentName;
/**
@@ -61,8 +61,8 @@ public class RestComponentConfiguration
*/
private String apiDoc;
/**
- * The Camel Rest component to use for (producer) the REST transport, such
- * as http, undertow. If no component has been explicit configured, then
+ * The Camel Rest component to use for the producer REST transport, such as
+ * http, undertow. If no component has been explicitly configured, then
* Camel will lookup if there is a Camel component that integrates with the
* Rest DSL, or if a org.apache.camel.spi.RestProducerFactory is registered
* in the registry. If either one is found, then that is being used.
@@ -85,8 +85,8 @@ public class RestComponentConfiguration
*/
private Boolean lazyStartProducer = false;
/**
- * The Camel Rest component to use for (producer) the REST transport, such
- * as http, undertow. If no component has been explicit configured, then
+ * The Camel Rest component to use for the producer REST transport, such as
+ * http, undertow. If no component has been explicitly configured, then
* Camel will lookup if there is a Camel component that integrates with the
* Rest DSL, or if a org.apache.camel.spi.RestProducerFactory is registered
* in the registry. If either one is found, then that is being used.
diff --git a/tooling/camel-spring-boot-bom/pom.xml
b/tooling/camel-spring-boot-bom/pom.xml
index 605ea9934b3..f7ed58a9c6b 100644
--- a/tooling/camel-spring-boot-bom/pom.xml
+++ b/tooling/camel-spring-boot-bom/pom.xml
@@ -1443,6 +1443,11 @@
<artifactId>camel-spark-starter</artifactId>
<version>${project.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.camel.springboot</groupId>
+ <artifactId>camel-splunk-hec-starter</artifactId>
+ <version>${project.version}</version>
+ </dependency>
<dependency>
<groupId>org.apache.camel.springboot</groupId>
<artifactId>camel-splunk-starter</artifactId>
diff --git a/tooling/camel-spring-boot-dependencies/pom.xml
b/tooling/camel-spring-boot-dependencies/pom.xml
index d9d9e9544d6..531f98f9f0e 100644
--- a/tooling/camel-spring-boot-dependencies/pom.xml
+++ b/tooling/camel-spring-boot-dependencies/pom.xml
@@ -4546,6 +4546,11 @@
<artifactId>rdf4j-rio-api</artifactId>
<version>3.7.4</version>
</dependency>
+ <dependency>
+ <groupId>org.junit-pioneer</groupId>
+ <artifactId>junit-pioneer</artifactId>
+ <version>1.7.1</version>
+ </dependency>
<dependency>
<groupId>org.knowm.xchange</groupId>
<artifactId>xchange-core</artifactId>
