This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit c2c49f0bc523b86b7a7437936ad9c2d7b7050596
Author: Andrea Cosentino <anco...@gmail.com>
AuthorDate: Tue Sep 8 18:06:12 2020 +0200
CAMEL-15508 - Camel-NSQ: Support custom NSQLookup implementation, regen docs
---
.../camel/component/nsq/NsqEndpointConfigurer.java | 5 +++++
.../org/apache/camel/component/nsq/nsq.json | 1 +
.../camel-nsq/src/main/docs/nsq-component.adoc | 3 ++-
.../camel/component/nsq/NsqConfiguration.java | 12 +++++-----
.../apache/camel/component/nsq/NsqConsumer.java | 4 ++--
.../endpoint/dsl/NsqEndpointBuilderFactory.java | 26 ++++++++++++++++++++++
6 files changed, 42 insertions(+), 9 deletions(-)
diff --git
a/components/camel-nsq/src/generated/java/org/apache/camel/component/nsq/NsqEndpointConfigurer.java
b/components/camel-nsq/src/generated/java/org/apache/camel/component/nsq/NsqEndpointConfigurer.java
index 9fb8b7d..0a6e13b 100644
---
a/components/camel-nsq/src/generated/java/org/apache/camel/component/nsq/NsqEndpointConfigurer.java
+++
b/components/camel-nsq/src/generated/java/org/apache/camel/component/nsq/NsqEndpointConfigurer.java
@@ -26,6 +26,8 @@ public class NsqEndpointConfigurer extends
PropertyConfigurerSupport implements
case "bridgeerrorhandler":
case "bridgeErrorHandler":
target.setBridgeErrorHandler(property(camelContext, boolean.class, value));
return true;
case "channel":
target.getConfiguration().setChannel(property(camelContext,
java.lang.String.class, value)); return true;
+ case "customnsqlookup":
+ case "customNSQLookup":
target.getConfiguration().setCustomNSQLookup(property(camelContext,
com.github.brainlag.nsq.lookup.NSQLookup.class, value)); return true;
case "exceptionhandler":
case "exceptionHandler":
target.setExceptionHandler(property(camelContext,
org.apache.camel.spi.ExceptionHandler.class, value)); return true;
case "exchangepattern":
@@ -61,6 +63,7 @@ public class NsqEndpointConfigurer extends
PropertyConfigurerSupport implements
answer.put("basicPropertyBinding", boolean.class);
answer.put("bridgeErrorHandler", boolean.class);
answer.put("channel", java.lang.String.class);
+ answer.put("customNSQLookup",
com.github.brainlag.nsq.lookup.NSQLookup.class);
answer.put("exceptionHandler",
org.apache.camel.spi.ExceptionHandler.class);
answer.put("exchangePattern", org.apache.camel.ExchangePattern.class);
answer.put("lazyStartProducer", boolean.class);
@@ -89,6 +92,8 @@ public class NsqEndpointConfigurer extends
PropertyConfigurerSupport implements
case "bridgeerrorhandler":
case "bridgeErrorHandler": return target.isBridgeErrorHandler();
case "channel": return target.getConfiguration().getChannel();
+ case "customnsqlookup":
+ case "customNSQLookup": return
target.getConfiguration().getCustomNSQLookup();
case "exceptionhandler":
case "exceptionHandler": return target.getExceptionHandler();
case "exchangepattern":
diff --git
a/components/camel-nsq/src/generated/resources/org/apache/camel/component/nsq/nsq.json
b/components/camel-nsq/src/generated/resources/org/apache/camel/component/nsq/nsq.json
index 4ee8d8c..26fe1f4 100644
---
a/components/camel-nsq/src/generated/resources/org/apache/camel/component/nsq/nsq.json
+++
b/components/camel-nsq/src/generated/resources/org/apache/camel/component/nsq/nsq.json
@@ -36,6 +36,7 @@
"autoFinish": { "kind": "parameter", "displayName": "Auto Finish",
"group": "consumer", "label": "consumer", "required": false, "type": "boolean",
"javaType": "java.lang.Boolean", "deprecated": false, "secret": false,
"defaultValue": "true", "configurationClass":
"org.apache.camel.component.nsq.NsqConfiguration", "configurationField":
"configuration", "description": "Automatically finish the NSQ Message when it
is retrieved from the queue and before the Exchange is processed" },
"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 [...]
"channel": { "kind": "parameter", "displayName": "Channel", "group":
"consumer", "label": "consumer", "required": false, "type": "string",
"javaType": "java.lang.String", "deprecated": false, "secret": false,
"configurationClass": "org.apache.camel.component.nsq.NsqConfiguration",
"configurationField": "configuration", "description": "The NSQ channel" },
+ "customNSQLookup": { "kind": "parameter", "displayName": "Custom
NSQLookup", "group": "consumer", "label": "consumer", "required": false,
"type": "object", "javaType": "com.github.brainlag.nsq.lookup.NSQLookup",
"deprecated": false, "secret": false, "configurationClass":
"org.apache.camel.component.nsq.NsqConfiguration", "configurationField":
"configuration", "description": "A Custom NSQ lookup implementation" },
"lookupInterval": { "kind": "parameter", "displayName": "Lookup Interval",
"group": "consumer", "label": "consumer", "required": false, "type":
"duration", "javaType": "long", "deprecated": false, "secret": false,
"defaultValue": "5000", "configurationClass":
"org.apache.camel.component.nsq.NsqConfiguration", "configurationField":
"configuration", "description": "The lookup interval" },
"lookupServerPort": { "kind": "parameter", "displayName": "Lookup Server
Port", "group": "consumer", "label": "consumer", "required": false, "type":
"integer", "javaType": "int", "deprecated": false, "secret": false,
"defaultValue": "4161", "configurationClass":
"org.apache.camel.component.nsq.NsqConfiguration", "configurationField":
"configuration", "description": "The NSQ lookup server port" },
"messageTimeout": { "kind": "parameter", "displayName": "Message Timeout",
"group": "consumer", "label": "consumer", "required": false, "type":
"duration", "javaType": "long", "deprecated": false, "secret": false,
"defaultValue": "-1", "configurationClass":
"org.apache.camel.component.nsq.NsqConfiguration", "configurationField":
"configuration", "description": "The NSQ consumer timeout period for messages
retrieved from the queue. A value of -1 is the server default" },
diff --git a/components/camel-nsq/src/main/docs/nsq-component.adoc
b/components/camel-nsq/src/main/docs/nsq-component.adoc
index f1c5e7e..05f5eb9 100644
--- a/components/camel-nsq/src/main/docs/nsq-component.adoc
+++ b/components/camel-nsq/src/main/docs/nsq-component.adoc
@@ -77,7 +77,7 @@ with the following path and query parameters:
|===
-=== Query Parameters (18 parameters):
+=== Query Parameters (19 parameters):
[width="100%",cols="2,5,^1,2",options="header"]
@@ -88,6 +88,7 @@ with the following path and query parameters:
| *autoFinish* (consumer) | Automatically finish the NSQ Message when it is
retrieved from the queue and before the Exchange is processed | true | Boolean
| *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
| *channel* (consumer) | The NSQ channel | | String
+| *customNSQLookup* (consumer) | A Custom NSQ lookup implementation | |
NSQLookup
| *lookupInterval* (consumer) | The lookup interval | 5000 | long
| *lookupServerPort* (consumer) | The NSQ lookup server port | 4161 | int
| *messageTimeout* (consumer) | The NSQ consumer timeout period for messages
retrieved from the queue. A value of -1 is the server default | -1 | long
diff --git
a/components/camel-nsq/src/main/java/org/apache/camel/component/nsq/NsqConfiguration.java
b/components/camel-nsq/src/main/java/org/apache/camel/component/nsq/NsqConfiguration.java
index 24c6cf7..d1eea95 100644
---
a/components/camel-nsq/src/main/java/org/apache/camel/component/nsq/NsqConfiguration.java
+++
b/components/camel-nsq/src/main/java/org/apache/camel/component/nsq/NsqConfiguration.java
@@ -228,15 +228,15 @@ public class NsqConfiguration {
this.sslContextParameters = sslContextParameters;
}
- public NSQLookup getCustomNSQLookup() {
- return customNSQLookup;
- }
+ public NSQLookup getCustomNSQLookup() {
+ return customNSQLookup;
+ }
/**
* Set a custom NSQLookup implementation
*/
- public void setCustomNSQLookup(NSQLookup customNSQLookup) {
- this.customNSQLookup = customNSQLookup;
- }
+ public void setCustomNSQLookup(NSQLookup customNSQLookup) {
+ this.customNSQLookup = customNSQLookup;
+ }
}
diff --git
a/components/camel-nsq/src/main/java/org/apache/camel/component/nsq/NsqConsumer.java
b/components/camel-nsq/src/main/java/org/apache/camel/component/nsq/NsqConsumer.java
index 7fb4979..10c44fb 100644
---
a/components/camel-nsq/src/main/java/org/apache/camel/component/nsq/NsqConsumer.java
+++
b/components/camel-nsq/src/main/java/org/apache/camel/component/nsq/NsqConsumer.java
@@ -63,14 +63,14 @@ public class NsqConsumer extends DefaultConsumer {
super.doStart();
LOG.debug("Starting NSQ Consumer");
executor = getEndpoint().createExecutor();
-
+
NSQLookup lookup;
LOG.debug("Getting NSQ Connection");
if (ObjectHelper.isEmpty(configuration.getCustomNSQLookup())) {
lookup = new DefaultNSQLookup();
} else {
- lookup = configuration.getCustomNSQLookup();
+ lookup = configuration.getCustomNSQLookup();
}
for (ServerAddress server : configuration.getServerAddresses()) {
diff --git
a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/NsqEndpointBuilderFactory.java
b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/NsqEndpointBuilderFactory.java
index bb0eafc..52d6b2d 100644
---
a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/NsqEndpointBuilderFactory.java
+++
b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/NsqEndpointBuilderFactory.java
@@ -141,6 +141,32 @@ public interface NsqEndpointBuilderFactory {
return this;
}
/**
+ * A Custom NSQ lookup implementation.
+ *
+ * The option is a:
+ * <code>com.github.brainlag.nsq.lookup.NSQLookup</code> type.
+ *
+ * Group: consumer
+ */
+ default NsqEndpointConsumerBuilder customNSQLookup(
+ Object customNSQLookup) {
+ doSetProperty("customNSQLookup", customNSQLookup);
+ return this;
+ }
+ /**
+ * A Custom NSQ lookup implementation.
+ *
+ * The option will be converted to a
+ * <code>com.github.brainlag.nsq.lookup.NSQLookup</code> type.
+ *
+ * Group: consumer
+ */
+ default NsqEndpointConsumerBuilder customNSQLookup(
+ String customNSQLookup) {
+ doSetProperty("customNSQLookup", customNSQLookup);
+ return this;
+ }
+ /**
* The lookup interval.
*
* The option is a: <code>long</code> type.
