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 b0c7a4401e4edac010329386b570d3ba4e096be6 Author: Claus Ibsen <claus.ib...@gmail.com> AuthorDate: Mon Mar 16 07:08:58 2020 +0100 CAMEL-14575: camel-core - TypeConverter from String to Long - drop time pattern --- .../src/generated/resources/org/apache/camel/component/nsq/nsq.json | 2 +- components/camel-nsq/src/main/docs/nsq-component.adoc | 2 +- .../src/main/java/org/apache/camel/component/nsq/NsqConfiguration.java | 2 +- .../src/test/java/org/apache/camel/component/nsq/NsqConsumerTest.java | 2 +- docs/components/modules/ROOT/pages/nsq-component.adoc | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) 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 a05967d..d8c6d2e 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 @@ -27,7 +27,7 @@ }, "properties": { "topic": { "kind": "path", "displayName": "Topic", "group": "common", "label": "", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "deprecationNote": "", "secret": false, "configurationClass": "org.apache.camel.component.nsq.NsqConfiguration", "configurationField": "configuration", "description": "The NSQ topic" }, - "servers": { "kind": "parameter", "displayName": "Servers", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.nsq.NsqConfiguration", "configurationField": "configuration", "description": "The hostnames of one or more nsqlookupd servers (consumer) or nsqd servers (producer)." }, + "servers": { "kind": "parameter", "displayName": "Servers", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.nsq.NsqConfiguration", "configurationField": "configuration", "description": "The hostnames of one or more nsqlookupd servers (consumer) or nsqd servers (producer)" }, "userAgent": { "kind": "parameter", "displayName": "User Agent", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.nsq.NsqConfiguration", "configurationField": "configuration", "description": "A String to identify the kind of client" }, "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 [...] diff --git a/components/camel-nsq/src/main/docs/nsq-component.adoc b/components/camel-nsq/src/main/docs/nsq-component.adoc index c53ee56..7e9e186 100644 --- a/components/camel-nsq/src/main/docs/nsq-component.adoc +++ b/components/camel-nsq/src/main/docs/nsq-component.adoc @@ -79,7 +79,7 @@ with the following path and query parameters: [width="100%",cols="2,5,^1,2",options="header"] |=== | Name | Description | Default | Type -| *servers* (common) | The hostnames of one or more nsqlookupd servers (consumer) or nsqd servers (producer). | | String +| *servers* (common) | The hostnames of one or more nsqlookupd servers (consumer) or nsqd servers (producer) | | String | *userAgent* (common) | A String to identify the kind of client | | String | *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 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 c9e1e92..43723b6 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 @@ -35,7 +35,7 @@ public class NsqConfiguration { @UriPath(description = "The NSQ topic") @Metadata(required = true) private String topic; - @UriParam(description = "The hostnames of one or more nsqlookupd servers (consumer) or nsqd servers (producer).") + @UriParam(description = "The hostnames of one or more nsqlookupd servers (consumer) or nsqd servers (producer)") private String servers; @UriParam(label = "consumer", description = "The NSQ channel") private String channel; diff --git a/components/camel-nsq/src/test/java/org/apache/camel/component/nsq/NsqConsumerTest.java b/components/camel-nsq/src/test/java/org/apache/camel/component/nsq/NsqConsumerTest.java index 48197bb..583b274 100644 --- a/components/camel-nsq/src/test/java/org/apache/camel/component/nsq/NsqConsumerTest.java +++ b/components/camel-nsq/src/test/java/org/apache/camel/component/nsq/NsqConsumerTest.java @@ -86,7 +86,7 @@ public class NsqConsumerTest extends NsqTestSupport { return new RouteBuilder() { @Override public void configure() throws Exception { - fromF("nsq://%s?servers=%s&lookupInterval=2s&autoFinish=false&requeueInterval=1s", TOPIC, getNsqConsumerUrl()).process(new Processor() { + fromF("nsq://%s?servers=%s&lookupInterval=2000&autoFinish=false&requeueInterval=1000", TOPIC, getNsqConsumerUrl()).process(new Processor() { @Override public void process(Exchange exchange) throws Exception { String messageText = exchange.getIn().getBody(String.class); diff --git a/docs/components/modules/ROOT/pages/nsq-component.adoc b/docs/components/modules/ROOT/pages/nsq-component.adoc index d74f29d..7a11fb0 100644 --- a/docs/components/modules/ROOT/pages/nsq-component.adoc +++ b/docs/components/modules/ROOT/pages/nsq-component.adoc @@ -80,7 +80,7 @@ with the following path and query parameters: [width="100%",cols="2,5,^1,2",options="header"] |=== | Name | Description | Default | Type -| *servers* (common) | The hostnames of one or more nsqlookupd servers (consumer) or nsqd servers (producer). | | String +| *servers* (common) | The hostnames of one or more nsqlookupd servers (consumer) or nsqd servers (producer) | | String | *userAgent* (common) | A String to identify the kind of client | | String | *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