This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git
commit 84fede6c02b9c2f9a94fe65cf4f9763ad891dd9e
Author: Claus Ibsen <claus.ib...@gmail.com>
AuthorDate: Sat Feb 15 14:12:21 2020 +0100
CAMEL-14565: Add docs for missing option
---
.../apache/camel/springboot/catalog/components/webhook.json | 12 ++++++------
.../camel-webhook-starter/src/main/docs/webhook-starter.adoc | 4 +---
.../webhook/springboot/WebhookComponentConfiguration.java | 10 ----------
3 files changed, 7 insertions(+), 19 deletions(-)
diff --git
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/webhook.json
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/webhook.json
index fbe97a2..172c17c 100644
---
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/webhook.json
+++
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/webhook.json
@@ -24,13 +24,13 @@
"configuration": { "kind": "property", "displayName": "Configuration",
"group": "advanced", "label": "advanced", "required": false, "type": "object",
"javaType": "org.apache.camel.component.webhook.WebhookConfiguration",
"deprecated": false, "secret": false, "description": "Set the default
configuration for the webhook meta-component." }
},
"properties": {
- "endpointUri": { "kind": "path", "displayName": "Endpoint Uri", "group":
"consumer", "label": "", "required": false, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "secret": false, "configurationClass":
"org.apache.camel.component.webhook.WebhookConfiguration",
"configurationField": "configuration", "description": "The delegate uri. Must
belong to a component that supports webhooks." },
- "webhookAutoRegister": { "kind": "parameter", "displayName": "Webhook Auto
Register", "group": "common", "label": "common", "required": false, "type":
"boolean", "javaType": "boolean", "deprecated": false, "secret": false,
"defaultValue": "true", "configurationClass":
"org.apache.camel.component.webhook.WebhookConfiguration",
"configurationField": "configuration", "description": "Automatically register
the webhook at startup and unregister it on shutdown." },
- "webhookBasePath": { "kind": "parameter", "displayName": "Webhook Base
Path", "group": "common", "label": "common", "required": false, "type":
"string", "javaType": "java.lang.String", "deprecated": false, "secret": false,
"configurationClass":
"org.apache.camel.component.webhook.WebhookConfiguration",
"configurationField": "configuration", "description": "The first (base) path
element where the webhook will be exposed. It's a good practice to set it to a
random string, so that it ca [...]
- "webhookComponentName": { "kind": "parameter", "displayName": "Webhook
Component Name", "group": "common", "label": "common", "required": false,
"type": "string", "javaType": "java.lang.String", "deprecated": false,
"secret": false, "configurationClass":
"org.apache.camel.component.webhook.WebhookConfiguration",
"configurationField": "configuration", "description": "The Camel Rest component
to use for the REST transport, such as netty-http." },
- "webhookExternalUrl": { "kind": "parameter", "displayName": "Webhook
External Url", "group": "common", "label": "common", "required": false, "type":
"string", "javaType": "java.lang.String", "deprecated": false, "secret": false,
"configurationClass":
"org.apache.camel.component.webhook.WebhookConfiguration",
"configurationField": "configuration", "description": "The URL of the current
service as seen by the webhook provider" },
- "webhookPath": { "kind": "parameter", "displayName": "Webhook Path",
"group": "common", "label": "common", "required": false, "type": "string",
"javaType": "java.lang.String", "deprecated": false, "secret": false,
"configurationClass":
"org.apache.camel.component.webhook.WebhookConfiguration",
"configurationField": "configuration", "description": "The path where the
webhook endpoint will be exposed (relative to basePath, if any)" },
+ "endpointUri": { "kind": "path", "displayName": "Endpoint Uri", "group":
"consumer", "label": "", "required": true, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "deprecationNote": "", "secret":
false, "configurationClass":
"org.apache.camel.component.webhook.WebhookConfiguration",
"configurationField": "configuration", "description": "The delegate uri. Must
belong to a component that supports webhooks." },
"bridgeErrorHandler": { "kind": "parameter", "displayName": "Bridge Error
Handler", "group": "consumer", "label": "consumer", "required": false, "type":
"boolean", "javaType": "boolean", "deprecated": 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 message and handled b [...]
+ "webhookAutoRegister": { "kind": "parameter", "displayName": "Webhook Auto
Register", "group": "consumer", "label": "", "required": false, "type":
"boolean", "javaType": "boolean", "deprecated": false, "secret": false,
"defaultValue": "true", "configurationClass":
"org.apache.camel.component.webhook.WebhookConfiguration",
"configurationField": "configuration", "description": "Automatically register
the webhook at startup and unregister it on shutdown." },
+ "webhookBasePath": { "kind": "parameter", "displayName": "Webhook Base
Path", "group": "consumer", "label": "", "required": false, "type": "string",
"javaType": "java.lang.String", "deprecated": false, "secret": false,
"configurationClass":
"org.apache.camel.component.webhook.WebhookConfiguration",
"configurationField": "configuration", "description": "The first (base) path
element where the webhook will be exposed. It's a good practice to set it to a
random string, so that it cannot [...]
+ "webhookComponentName": { "kind": "parameter", "displayName": "Webhook
Component Name", "group": "consumer", "label": "", "required": false, "type":
"string", "javaType": "java.lang.String", "deprecated": false, "secret": false,
"configurationClass":
"org.apache.camel.component.webhook.WebhookConfiguration",
"configurationField": "configuration", "description": "The Camel Rest component
to use for the REST transport, such as netty-http." },
+ "webhookExternalUrl": { "kind": "parameter", "displayName": "Webhook
External Url", "group": "consumer", "label": "", "required": false, "type":
"string", "javaType": "java.lang.String", "deprecated": false, "secret": false,
"configurationClass":
"org.apache.camel.component.webhook.WebhookConfiguration",
"configurationField": "configuration", "description": "The URL of the current
service as seen by the webhook provider" },
+ "webhookPath": { "kind": "parameter", "displayName": "Webhook Path",
"group": "consumer", "label": "", "required": false, "type": "string",
"javaType": "java.lang.String", "deprecated": false, "secret": false,
"configurationClass":
"org.apache.camel.component.webhook.WebhookConfiguration",
"configurationField": "configuration", "description": "The path where the
webhook endpoint will be exposed (relative to basePath, if any)" },
"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, "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 consumer will deal with [...]
"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, "secret": false, "description": "Sets
the exchange pattern when the consumer creates an exchange." },
"basicPropertyBinding": { "kind": "parameter", "displayName": "Basic
Property Binding", "group": "advanced", "label": "advanced", "required": false,
"type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false,
"defaultValue": false, "description": "Whether the endpoint should use basic
property binding (Camel 2.x) or the newer property binding with additional
capabilities" },
diff --git
a/components-starter/camel-webhook-starter/src/main/docs/webhook-starter.adoc
b/components-starter/camel-webhook-starter/src/main/docs/webhook-starter.adoc
index baed0b1..dbdf3db 100644
---
a/components-starter/camel-webhook-starter/src/main/docs/webhook-starter.adoc
+++
b/components-starter/camel-webhook-starter/src/main/docs/webhook-starter.adoc
@@ -17,7 +17,7 @@ When using webhook with Spring Boot make sure to use the
following Maven depende
----
-The component supports 10 options, which are listed below.
+The component supports 9 options, which are listed below.
@@ -27,7 +27,6 @@ The component supports 10 options, which are listed below.
| *camel.component.webhook.basic-property-binding* | Whether the component
should use basic property binding (Camel 2.x) or the newer property binding
with additional capabilities | false | Boolean
| *camel.component.webhook.bridge-error-handler* | 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 message and handled by the routing Error Handler. By
default the consumer will use the org.apache.camel.spi.ExceptionHandler to deal
with exceptions, that will be logged at WARN or ERROR level and ignored. |
false | Boolean
| *camel.component.webhook.configuration.endpoint-uri* | The delegate uri.
Must belong to a component that supports webhooks. | | String
-| *camel.component.webhook.configuration.rest-configuration* | | |
RestConfiguration
| *camel.component.webhook.configuration.webhook-auto-register* |
Automatically register the webhook at startup and unregister it on shutdown. |
true | Boolean
| *camel.component.webhook.configuration.webhook-base-path* | The first (base)
path element where the webhook will be exposed. It's a good practice to set it
to a random string, so that it cannot be guessed by unauthorized parties. | |
String
| *camel.component.webhook.configuration.webhook-component-name* | The Camel
Rest component to use for the REST transport, such as netty-http. | | String
@@ -35,5 +34,4 @@ The component supports 10 options, which are listed below.
| *camel.component.webhook.configuration.webhook-path* | The path where the
webhook endpoint will be exposed (relative to basePath, if any) | | String
| *camel.component.webhook.enabled* | Whether to enable auto configuration of
the webhook component. This is enabled by default. | | Boolean
|===
-
// spring-boot-auto-configure options: END
diff --git
a/components-starter/camel-webhook-starter/src/main/java/org/apache/camel/component/webhook/springboot/WebhookComponentConfiguration.java
b/components-starter/camel-webhook-starter/src/main/java/org/apache/camel/component/webhook/springboot/WebhookComponentConfiguration.java
index 31fa7eb..4f8736d 100644
---
a/components-starter/camel-webhook-starter/src/main/java/org/apache/camel/component/webhook/springboot/WebhookComponentConfiguration.java
+++
b/components-starter/camel-webhook-starter/src/main/java/org/apache/camel/component/webhook/springboot/WebhookComponentConfiguration.java
@@ -17,7 +17,6 @@
package org.apache.camel.component.webhook.springboot;
import javax.annotation.Generated;
-import org.apache.camel.spi.RestConfiguration;
import org.apache.camel.spring.boot.ComponentConfigurationPropertiesCommon;
import org.springframework.boot.context.properties.ConfigurationProperties;
@@ -89,7 +88,6 @@ public class WebhookComponentConfiguration
* The delegate uri. Must belong to a component that supports webhooks.
*/
private String endpointUri;
- private RestConfiguration restConfiguration;
/**
* Automatically register the webhook at startup and unregister it on
* shutdown.
@@ -124,14 +122,6 @@ public class WebhookComponentConfiguration
this.endpointUri = endpointUri;
}
- public RestConfiguration getRestConfiguration() {
- return restConfiguration;
- }
-
- public void setRestConfiguration(RestConfiguration restConfiguration) {
- this.restConfiguration = restConfiguration;
- }
-
public Boolean getWebhookAutoRegister() {
return webhookAutoRegister;
}
