You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2020/12/14 17:58:21 UTC

[camel] 01/06: CAMEL-15946: Fix javadoc build error about & sign

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.git

commit f0d8755bbe1c14aef99f77e65b5fd569867e7427
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Mon Dec 14 16:43:39 2020 +0100

    CAMEL-15946: Fix javadoc build error about & sign
---
 .../resources/org/apache/camel/catalog/docs/sip-component.adoc        | 2 +-
 .../src/generated/resources/org/apache/camel/component/sip/sip.json   | 2 +-
 .../src/generated/resources/org/apache/camel/component/sip/sips.json  | 2 +-
 components/camel-sip/src/main/docs/sip-component.adoc                 | 2 +-
 .../main/java/org/apache/camel/component/sip/SipConfiguration.java    | 2 +-
 .../apache/camel/builder/endpoint/dsl/SipEndpointBuilderFactory.java  | 4 ++--
 .../java/org/apache/camel/builder/endpoint/EndpointRouteBuilder.java  | 2 +-
 docs/components/modules/ROOT/pages/sip-component.adoc                 | 2 +-
 8 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/sip-component.adoc b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/sip-component.adoc
index 25f3268..74d6a5e 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/sip-component.adoc
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/sip-component.adoc
@@ -136,7 +136,7 @@ with the following path and query parameters:
 | *transport* (common) | Setting for choice of transport protocol. Valid choices are tcp or udp. There are 2 enums and the value can be one of: tcp, udp | tcp | String
 | *bridgeErrorHandler* (consumer) | 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
 | *consumer* (consumer) | This setting is used to determine whether the kind of header (FromHeader,ToHeader etc) that needs to be created for this endpoint | false | boolean
-| *presenceAgent* (consumer) | This setting is used to distinguish between a Presence Agent & a consumer. This is due to the fact that the SIP Camel component ships with a basic Presence Agent (for testing purposes only). Consumers have to set this flag to true. | false | boolean
+| *presenceAgent* (consumer) | This setting is used to distinguish between a Presence Agent and a consumer. This is due to the fact that the SIP Camel component ships with a basic Presence Agent (for testing purposes only). Consumers have to set this flag to true. | false | boolean
 | *exceptionHandler* (consumer) | 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 exceptions, that will be logged at WARN or ERROR level and ignored. |  | ExceptionHandler
 | *exchangePattern* (consumer) | Sets the exchange pattern when the consumer creates an exchange. There are 3 enums and the value can be one of: InOnly, InOut, InOptionalOut |  | ExchangePattern
 | *lazyStartProducer* (producer) | 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 starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when the first message is processed then creating and [...]
diff --git a/components/camel-sip/src/generated/resources/org/apache/camel/component/sip/sip.json b/components/camel-sip/src/generated/resources/org/apache/camel/component/sip/sip.json
index 1f896cd..1a7a05e 100644
--- a/components/camel-sip/src/generated/resources/org/apache/camel/component/sip/sip.json
+++ b/components/camel-sip/src/generated/resources/org/apache/camel/component/sip/sip.json
@@ -46,7 +46,7 @@
     "transport": { "kind": "parameter", "displayName": "Transport", "group": "common", "label": "common", "required": false, "type": "string", "javaType": "java.lang.String", "enum": [ "tcp", "udp" ], "deprecated": false, "autowired": false, "secret": false, "defaultValue": "tcp", "configurationClass": "org.apache.camel.component.sip.SipConfiguration", "configurationField": "configuration", "description": "Setting for choice of transport protocol. Valid choices are tcp or udp." },
     "bridgeErrorHandler": { "kind": "parameter", "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 m [...]
     "consumer": { "kind": "parameter", "displayName": "Consumer", "group": "consumer", "label": "consumer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.sip.SipConfiguration", "configurationField": "configuration", "description": "This setting is used to determine whether the kind of header (FromHeader,ToHeader etc) that needs to be created fo [...]
-    "presenceAgent": { "kind": "parameter", "displayName": "Presence Agent", "group": "consumer", "label": "consumer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.sip.SipConfiguration", "configurationField": "configuration", "description": "This setting is used to distinguish between a Presence Agent & a consumer. This is due to the fact that [...]
+    "presenceAgent": { "kind": "parameter", "displayName": "Presence Agent", "group": "consumer", "label": "consumer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.sip.SipConfiguration", "configurationField": "configuration", "description": "This setting is used to distinguish between a Presence Agent and a consumer. This is due to the fact th [...]
     "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." },
     "lazyStartProducer": { "kind": "parameter", "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 sta [...]
diff --git a/components/camel-sip/src/generated/resources/org/apache/camel/component/sip/sips.json b/components/camel-sip/src/generated/resources/org/apache/camel/component/sip/sips.json
index baa114c..0aceb7c 100644
--- a/components/camel-sip/src/generated/resources/org/apache/camel/component/sip/sips.json
+++ b/components/camel-sip/src/generated/resources/org/apache/camel/component/sip/sips.json
@@ -46,7 +46,7 @@
     "transport": { "kind": "parameter", "displayName": "Transport", "group": "common", "label": "common", "required": false, "type": "string", "javaType": "java.lang.String", "enum": [ "tcp", "udp" ], "deprecated": false, "autowired": false, "secret": false, "defaultValue": "tcp", "configurationClass": "org.apache.camel.component.sip.SipConfiguration", "configurationField": "configuration", "description": "Setting for choice of transport protocol. Valid choices are tcp or udp." },
     "bridgeErrorHandler": { "kind": "parameter", "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 m [...]
     "consumer": { "kind": "parameter", "displayName": "Consumer", "group": "consumer", "label": "consumer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.sip.SipConfiguration", "configurationField": "configuration", "description": "This setting is used to determine whether the kind of header (FromHeader,ToHeader etc) that needs to be created fo [...]
-    "presenceAgent": { "kind": "parameter", "displayName": "Presence Agent", "group": "consumer", "label": "consumer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.sip.SipConfiguration", "configurationField": "configuration", "description": "This setting is used to distinguish between a Presence Agent & a consumer. This is due to the fact that [...]
+    "presenceAgent": { "kind": "parameter", "displayName": "Presence Agent", "group": "consumer", "label": "consumer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.sip.SipConfiguration", "configurationField": "configuration", "description": "This setting is used to distinguish between a Presence Agent and a consumer. This is due to the fact th [...]
     "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." },
     "lazyStartProducer": { "kind": "parameter", "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 sta [...]
diff --git a/components/camel-sip/src/main/docs/sip-component.adoc b/components/camel-sip/src/main/docs/sip-component.adoc
index 25f3268..74d6a5e 100644
--- a/components/camel-sip/src/main/docs/sip-component.adoc
+++ b/components/camel-sip/src/main/docs/sip-component.adoc
@@ -136,7 +136,7 @@ with the following path and query parameters:
 | *transport* (common) | Setting for choice of transport protocol. Valid choices are tcp or udp. There are 2 enums and the value can be one of: tcp, udp | tcp | String
 | *bridgeErrorHandler* (consumer) | 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
 | *consumer* (consumer) | This setting is used to determine whether the kind of header (FromHeader,ToHeader etc) that needs to be created for this endpoint | false | boolean
-| *presenceAgent* (consumer) | This setting is used to distinguish between a Presence Agent & a consumer. This is due to the fact that the SIP Camel component ships with a basic Presence Agent (for testing purposes only). Consumers have to set this flag to true. | false | boolean
+| *presenceAgent* (consumer) | This setting is used to distinguish between a Presence Agent and a consumer. This is due to the fact that the SIP Camel component ships with a basic Presence Agent (for testing purposes only). Consumers have to set this flag to true. | false | boolean
 | *exceptionHandler* (consumer) | 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 exceptions, that will be logged at WARN or ERROR level and ignored. |  | ExceptionHandler
 | *exchangePattern* (consumer) | Sets the exchange pattern when the consumer creates an exchange. There are 3 enums and the value can be one of: InOnly, InOut, InOptionalOut |  | ExchangePattern
 | *lazyStartProducer* (producer) | 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 starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when the first message is processed then creating and [...]
diff --git a/components/camel-sip/src/main/java/org/apache/camel/component/sip/SipConfiguration.java b/components/camel-sip/src/main/java/org/apache/camel/component/sip/SipConfiguration.java
index 426a66d..59d8480 100644
--- a/components/camel-sip/src/main/java/org/apache/camel/component/sip/SipConfiguration.java
+++ b/components/camel-sip/src/main/java/org/apache/camel/component/sip/SipConfiguration.java
@@ -889,7 +889,7 @@ public class SipConfiguration {
     }
 
     /**
-     * This setting is used to distinguish between a Presence Agent & a consumer. This is due to the fact that the SIP
+     * This setting is used to distinguish between a Presence Agent and a consumer. This is due to the fact that the SIP
      * Camel component ships with a basic Presence Agent (for testing purposes only). Consumers have to set this flag to
      * true.
      */
diff --git a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/SipEndpointBuilderFactory.java b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/SipEndpointBuilderFactory.java
index bd80aac..b886641 100644
--- a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/SipEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/SipEndpointBuilderFactory.java
@@ -361,7 +361,7 @@ public interface SipEndpointBuilderFactory {
             return this;
         }
         /**
-         * This setting is used to distinguish between a Presence Agent & a
+         * This setting is used to distinguish between a Presence Agent and a
          * consumer. This is due to the fact that the SIP Camel component ships
          * with a basic Presence Agent (for testing purposes only). Consumers
          * have to set this flag to true.
@@ -376,7 +376,7 @@ public interface SipEndpointBuilderFactory {
             return this;
         }
         /**
-         * This setting is used to distinguish between a Presence Agent & a
+         * This setting is used to distinguish between a Presence Agent and a
          * consumer. This is due to the fact that the SIP Camel component ships
          * with a basic Presence Agent (for testing purposes only). Consumers
          * have to set this flag to true.
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/EndpointRouteBuilder.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/EndpointRouteBuilder.java
index 1449d95..b8f3434 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/EndpointRouteBuilder.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/EndpointRouteBuilder.java
@@ -36,7 +36,7 @@ public abstract class EndpointRouteBuilder extends RouteBuilder implements Endpo
      * Add routes to a context using a lambda expression. It can be used as following:
      * 
      * <pre>
-     * RouteBuilder.addRoutes(context, rb ->
+     * RouteBuilder.addRoutes(context, rb -&gt;
      *     rb.from("direct:inbound").bean(ProduceTemplateBean.class)));
      * </pre>
      *
diff --git a/docs/components/modules/ROOT/pages/sip-component.adoc b/docs/components/modules/ROOT/pages/sip-component.adoc
index f241927..1180280 100644
--- a/docs/components/modules/ROOT/pages/sip-component.adoc
+++ b/docs/components/modules/ROOT/pages/sip-component.adoc
@@ -138,7 +138,7 @@ with the following path and query parameters:
 | *transport* (common) | Setting for choice of transport protocol. Valid choices are tcp or udp. There are 2 enums and the value can be one of: tcp, udp | tcp | String
 | *bridgeErrorHandler* (consumer) | 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
 | *consumer* (consumer) | This setting is used to determine whether the kind of header (FromHeader,ToHeader etc) that needs to be created for this endpoint | false | boolean
-| *presenceAgent* (consumer) | This setting is used to distinguish between a Presence Agent & a consumer. This is due to the fact that the SIP Camel component ships with a basic Presence Agent (for testing purposes only). Consumers have to set this flag to true. | false | boolean
+| *presenceAgent* (consumer) | This setting is used to distinguish between a Presence Agent and a consumer. This is due to the fact that the SIP Camel component ships with a basic Presence Agent (for testing purposes only). Consumers have to set this flag to true. | false | boolean
 | *exceptionHandler* (consumer) | 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 exceptions, that will be logged at WARN or ERROR level and ignored. |  | ExceptionHandler
 | *exchangePattern* (consumer) | Sets the exchange pattern when the consumer creates an exchange. There are 3 enums and the value can be one of: InOnly, InOut, InOptionalOut |  | ExchangePattern
 | *lazyStartProducer* (producer) | 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 starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when the first message is processed then creating and [...]