This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch ra
in repository https://gitbox.apache.org/repos/asf/camel.git
commit c80d31a0b93d66b94b13187a446d16064627adf4
Author: Claus Ibsen <claus.ib...@gmail.com>
AuthorDate: Mon May 27 19:06:05 2024 +0200
CAMEL-20798: Add RemoteAddress to endpoints so they can tell the
url/hostname etc for the system it connects. This is needed for better
monitoring, tracing and management. Add this information into camel-tracer as
tags.
---
.../apache/camel/catalog/components/pgevent.json | 10 +-
.../camel/catalog/components/robotframework.json | 2 +-
.../dsl/PgEventEndpointBuilderFactory.java | 128 ++++++++++-----------
.../camel/kotlin/components/PgeventUriDsl.kt | 14 +--
4 files changed, 77 insertions(+), 77 deletions(-)
diff --git
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/pgevent.json
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/pgevent.json
index 4dd34d78c61..8889685d0fd 100644
---
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/pgevent.json
+++
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/pgevent.json
@@ -35,11 +35,11 @@
"port": { "index": 1, "kind": "path", "displayName": "Port", "group":
"common", "label": "", "required": false, "type": "integer", "javaType":
"java.lang.Integer", "deprecated": false, "autowired": false, "secret": false,
"defaultValue": "5432", "description": "To connect using hostname and port to
the database." },
"database": { "index": 2, "kind": "path", "displayName": "Database",
"group": "common", "label": "", "required": true, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "deprecationNote": "", "autowired":
false, "secret": false, "description": "The database name. The database name
can take any characters because it is sent as a quoted identifier. It is part
of the endpoint URI, so diacritical marks and non-Latin letters have to be URL
encoded." },
"channel": { "index": 3, "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" },
- "datasource": { "index": 4, "kind": "parameter", "displayName":
"Datasource", "group": "common", "label": "", "required": false, "type":
"object", "javaType": "javax.sql.DataSource", "deprecated": false, "autowired":
false, "secret": false, "description": "To connect using the given
javax.sql.DataSource instead of using hostname and port." },
- "bridgeErrorHandler": { "index": 5, "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 (if possible) occurred
while the Camel consumer is trying to pickup incoming [...]
- "exceptionHandler": { "index": 6, "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 def [...]
- "exchangePattern": { "index": 7, "kind": "parameter", "displayName":
"Exchange Pattern", "group": "consumer (advanced)", "label":
"consumer,advanced", "required": false, "type": "object", "javaType":
"org.apache.camel.ExchangePattern", "enum": [ "InOnly", "InOut" ],
"deprecated": false, "autowired": false, "secret": false, "description": "Sets
the exchange pattern when the consumer creates an exchange." },
- "lazyStartProducer": { "index": 8, "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 produc [...]
+ "bridgeErrorHandler": { "index": 4, "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 (if possible) occurred
while the Camel consumer is trying to pickup incoming [...]
+ "exceptionHandler": { "index": 5, "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 def [...]
+ "exchangePattern": { "index": 6, "kind": "parameter", "displayName":
"Exchange Pattern", "group": "consumer (advanced)", "label":
"consumer,advanced", "required": false, "type": "object", "javaType":
"org.apache.camel.ExchangePattern", "enum": [ "InOnly", "InOut" ],
"deprecated": false, "autowired": false, "secret": false, "description": "Sets
the exchange pattern when the consumer creates an exchange." },
+ "lazyStartProducer": { "index": 7, "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 produc [...]
+ "datasource": { "index": 8, "kind": "parameter", "displayName":
"Datasource", "group": "advanced", "label": "advanced", "required": false,
"type": "object", "javaType": "javax.sql.DataSource", "deprecated": false,
"autowired": false, "secret": false, "description": "To connect using the given
javax.sql.DataSource instead of using hostname and port." },
"pass": { "index": 9, "kind": "parameter", "displayName": "Pass", "group":
"security", "label": "security", "required": false, "type": "string",
"javaType": "java.lang.String", "deprecated": false, "autowired": false,
"secret": true, "description": "Password for login" },
"user": { "index": 10, "kind": "parameter", "displayName": "User",
"group": "security", "label": "security", "required": false, "type": "string",
"javaType": "java.lang.String", "deprecated": false, "autowired": false,
"secret": true, "defaultValue": "postgres", "description": "Username for login"
}
}
diff --git
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/robotframework.json
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/robotframework.json
index e3a0e00934f..4996f3361b8 100644
---
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/robotframework.json
+++
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/robotframework.json
@@ -20,7 +20,7 @@
"consumerOnly": false,
"producerOnly": false,
"lenientProperties": false,
- "remote": true
+ "remote": false
},
"componentProperties": {
"allowContextMapAll": { "index": 0, "kind": "property", "displayName":
"Allow Context Map All", "group": "common", "label": "", "required": false,
"type": "boolean", "javaType": "boolean", "deprecated": false, "autowired":
false, "secret": false, "defaultValue": false, "configurationClass":
"org.apache.camel.component.robotframework.RobotFrameworkCamelConfiguration",
"configurationField": "configuration", "description": "Sets whether the context
map should allow access to all details [...]
diff --git
a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/PgEventEndpointBuilderFactory.java
b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/PgEventEndpointBuilderFactory.java
index 4402563a8dd..878f1ea7127 100644
---
a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/PgEventEndpointBuilderFactory.java
+++
b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/PgEventEndpointBuilderFactory.java
@@ -43,37 +43,6 @@ public interface PgEventEndpointBuilderFactory {
default AdvancedPgEventEndpointConsumerBuilder advanced() {
return (AdvancedPgEventEndpointConsumerBuilder) this;
}
- /**
- * To connect using the given javax.sql.DataSource instead of using
- * hostname and port.
- *
- * The option is a: <code>javax.sql.DataSource</code> type.
- *
- * Group: common
- *
- * @param datasource the value to set
- * @return the dsl builder
- */
- default PgEventEndpointConsumerBuilder datasource(javax.sql.DataSource
datasource) {
- doSetProperty("datasource", datasource);
- return this;
- }
- /**
- * To connect using the given javax.sql.DataSource instead of using
- * hostname and port.
- *
- * The option will be converted to a <code>javax.sql.DataSource</code>
- * type.
- *
- * Group: common
- *
- * @param datasource the value to set
- * @return the dsl builder
- */
- default PgEventEndpointConsumerBuilder datasource(String datasource) {
- doSetProperty("datasource", datasource);
- return this;
- }
/**
* Password for login.
*
@@ -231,30 +200,18 @@ public interface PgEventEndpointBuilderFactory {
doSetProperty("exchangePattern", exchangePattern);
return this;
}
- }
-
- /**
- * Builder for endpoint producers for the PostgresSQL Event component.
- */
- public interface PgEventEndpointProducerBuilder
- extends
- EndpointProducerBuilder {
- default AdvancedPgEventEndpointProducerBuilder advanced() {
- return (AdvancedPgEventEndpointProducerBuilder) this;
- }
-
/**
* To connect using the given javax.sql.DataSource instead of using
* hostname and port.
*
* The option is a: <code>javax.sql.DataSource</code> type.
*
- * Group: common
+ * Group: advanced
*
* @param datasource the value to set
* @return the dsl builder
*/
- default PgEventEndpointProducerBuilder datasource(javax.sql.DataSource
datasource) {
+ default AdvancedPgEventEndpointConsumerBuilder
datasource(javax.sql.DataSource datasource) {
doSetProperty("datasource", datasource);
return this;
}
@@ -265,15 +222,27 @@ public interface PgEventEndpointBuilderFactory {
* The option will be converted to a <code>javax.sql.DataSource</code>
* type.
*
- * Group: common
+ * Group: advanced
*
* @param datasource the value to set
* @return the dsl builder
*/
- default PgEventEndpointProducerBuilder datasource(String datasource) {
+ default AdvancedPgEventEndpointConsumerBuilder datasource(String
datasource) {
doSetProperty("datasource", datasource);
return this;
}
+ }
+
+ /**
+ * Builder for endpoint producers for the PostgresSQL Event component.
+ */
+ public interface PgEventEndpointProducerBuilder
+ extends
+ EndpointProducerBuilder {
+ default AdvancedPgEventEndpointProducerBuilder advanced() {
+ return (AdvancedPgEventEndpointProducerBuilder) this;
+ }
+
/**
* Password for login.
*
@@ -359,31 +328,18 @@ public interface PgEventEndpointBuilderFactory {
doSetProperty("lazyStartProducer", lazyStartProducer);
return this;
}
- }
-
- /**
- * Builder for endpoint for the PostgresSQL Event component.
- */
- public interface PgEventEndpointBuilder
- extends
- PgEventEndpointConsumerBuilder,
- PgEventEndpointProducerBuilder {
- default AdvancedPgEventEndpointBuilder advanced() {
- return (AdvancedPgEventEndpointBuilder) this;
- }
-
/**
* To connect using the given javax.sql.DataSource instead of using
* hostname and port.
*
* The option is a: <code>javax.sql.DataSource</code> type.
*
- * Group: common
+ * Group: advanced
*
* @param datasource the value to set
* @return the dsl builder
*/
- default PgEventEndpointBuilder datasource(javax.sql.DataSource
datasource) {
+ default AdvancedPgEventEndpointProducerBuilder
datasource(javax.sql.DataSource datasource) {
doSetProperty("datasource", datasource);
return this;
}
@@ -394,15 +350,28 @@ public interface PgEventEndpointBuilderFactory {
* The option will be converted to a <code>javax.sql.DataSource</code>
* type.
*
- * Group: common
+ * Group: advanced
*
* @param datasource the value to set
* @return the dsl builder
*/
- default PgEventEndpointBuilder datasource(String datasource) {
+ default AdvancedPgEventEndpointProducerBuilder datasource(String
datasource) {
doSetProperty("datasource", datasource);
return this;
}
+ }
+
+ /**
+ * Builder for endpoint for the PostgresSQL Event component.
+ */
+ public interface PgEventEndpointBuilder
+ extends
+ PgEventEndpointConsumerBuilder,
+ PgEventEndpointProducerBuilder {
+ default AdvancedPgEventEndpointBuilder advanced() {
+ return (AdvancedPgEventEndpointBuilder) this;
+ }
+
/**
* Password for login.
*
@@ -445,6 +414,37 @@ public interface PgEventEndpointBuilderFactory {
return (PgEventEndpointBuilder) this;
}
+ /**
+ * To connect using the given javax.sql.DataSource instead of using
+ * hostname and port.
+ *
+ * The option is a: <code>javax.sql.DataSource</code> type.
+ *
+ * Group: advanced
+ *
+ * @param datasource the value to set
+ * @return the dsl builder
+ */
+ default AdvancedPgEventEndpointBuilder datasource(javax.sql.DataSource
datasource) {
+ doSetProperty("datasource", datasource);
+ return this;
+ }
+ /**
+ * To connect using the given javax.sql.DataSource instead of using
+ * hostname and port.
+ *
+ * The option will be converted to a <code>javax.sql.DataSource</code>
+ * type.
+ *
+ * Group: advanced
+ *
+ * @param datasource the value to set
+ * @return the dsl builder
+ */
+ default AdvancedPgEventEndpointBuilder datasource(String datasource) {
+ doSetProperty("datasource", datasource);
+ return this;
+ }
}
public interface PgEventBuilders {
diff --git
a/dsl/camel-kotlin-api/src/generated/kotlin/org/apache/camel/kotlin/components/PgeventUriDsl.kt
b/dsl/camel-kotlin-api/src/generated/kotlin/org/apache/camel/kotlin/components/PgeventUriDsl.kt
index ed63af1a6c7..9ea8e62264d 100644
---
a/dsl/camel-kotlin-api/src/generated/kotlin/org/apache/camel/kotlin/components/PgeventUriDsl.kt
+++
b/dsl/camel-kotlin-api/src/generated/kotlin/org/apache/camel/kotlin/components/PgeventUriDsl.kt
@@ -91,13 +91,6 @@ public class PgeventUriDsl(
it.url("$host:$port/$database/$channel")
}
- /**
- * To connect using the given javax.sql.DataSource instead of using hostname
and port.
- */
- public fun datasource(datasource: String) {
- it.property("datasource", datasource)
- }
-
/**
* Allows for bridging the consumer to the Camel routing Error Handler,
which mean any exceptions
* (if possible) occurred while the Camel consumer is trying to pickup
incoming messages, or the
@@ -168,6 +161,13 @@ public class PgeventUriDsl(
it.property("lazyStartProducer", lazyStartProducer.toString())
}
+ /**
+ * To connect using the given javax.sql.DataSource instead of using hostname
and port.
+ */
+ public fun datasource(datasource: String) {
+ it.property("datasource", datasource)
+ }
+
/**
* Password for login
*/
