This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/main by this push:
new bb14bcaa598 Use 'per' and not 'pr.' (#14959)
bb14bcaa598 is described below
commit bb14bcaa598edfed971423c039db2727a5cda1e0
Author: Guillaume Nodet <[email protected]>
AuthorDate: Mon Jul 29 10:13:13 2024 +0200
Use 'per' and not 'pr.' (#14959)
---
.../resources/org/apache/camel/catalog/components/ironmq.json | 4 ++--
.../camel/component/file/remote/FromFtpToBinarySampleTest.java | 2 +-
.../META-INF/org/apache/camel/component/ironmq/ironmq.json | 4 ++--
.../org/apache/camel/component/ironmq/IronMQConfiguration.java | 4 ++--
.../ironmq/integrationtest/ConcurrentConsumerLoadManualTest.java | 4 ++--
.../camel/builder/endpoint/dsl/IronMQEndpointBuilderFactory.java | 8 ++++----
.../kotlin/org/apache/camel/kotlin/components/IronmqUriDsl.kt | 8 ++++----
7 files changed, 17 insertions(+), 17 deletions(-)
diff --git
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/ironmq.json
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/ironmq.json
index 6e804288211..a0e33cdc287 100644
---
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/ironmq.json
+++
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/ironmq.json
@@ -40,9 +40,9 @@
"ironMQCloud": { "index": 1, "kind": "parameter", "displayName": "Iron
MQCloud", "group": "common", "label": "", "required": false, "type": "string",
"javaType": "java.lang.String", "deprecated": false, "autowired": false,
"secret": false, "defaultValue": "https:\/\/mq-aws-us-east-1-1.iron.io",
"configurationClass": "org.apache.camel.component.ironmq.IronMQConfiguration",
"configurationField": "configuration", "description": "IronMq Cloud url. Urls
for public clusters: https:\/\/mq-a [...]
"preserveHeaders": { "index": 2, "kind": "parameter", "displayName":
"Preserve Headers", "group": "common", "label": "", "required": false, "type":
"boolean", "javaType": "boolean", "deprecated": false, "autowired": false,
"secret": false, "defaultValue": false, "configurationClass":
"org.apache.camel.component.ironmq.IronMQConfiguration", "configurationField":
"configuration", "description": "Should message headers be preserved when
publishing messages. This will add the Camel heade [...]
"projectId": { "index": 3, "kind": "parameter", "displayName": "Project
Id", "group": "common", "label": "", "required": false, "type": "string",
"javaType": "java.lang.String", "deprecated": false, "autowired": false,
"secret": false, "configurationClass":
"org.apache.camel.component.ironmq.IronMQConfiguration", "configurationField":
"configuration", "description": "IronMQ projectId" },
- "batchDelete": { "index": 4, "kind": "parameter", "displayName": "Batch
Delete", "group": "consumer", "label": "consumer", "required": false, "type":
"boolean", "javaType": "boolean", "deprecated": false, "autowired": false,
"secret": false, "defaultValue": false, "configurationClass":
"org.apache.camel.component.ironmq.IronMQConfiguration", "configurationField":
"configuration", "description": "Should messages be deleted in one batch. This
will limit the number of api requests since [...]
+ "batchDelete": { "index": 4, "kind": "parameter", "displayName": "Batch
Delete", "group": "consumer", "label": "consumer", "required": false, "type":
"boolean", "javaType": "boolean", "deprecated": false, "autowired": false,
"secret": false, "defaultValue": false, "configurationClass":
"org.apache.camel.component.ironmq.IronMQConfiguration", "configurationField":
"configuration", "description": "Should messages be deleted in one batch. This
will limit the number of api requests since [...]
"concurrentConsumers": { "index": 5, "kind": "parameter", "displayName":
"Concurrent Consumers", "group": "consumer", "label": "consumer", "required":
false, "type": "integer", "javaType": "int", "deprecated": false, "autowired":
false, "secret": false, "defaultValue": 1, "configurationClass":
"org.apache.camel.component.ironmq.IronMQConfiguration", "configurationField":
"configuration", "description": "The number of concurrent consumers." },
- "maxMessagesPerPoll": { "index": 6, "kind": "parameter", "displayName":
"Max Messages Per Poll", "group": "consumer", "label": "consumer", "required":
false, "type": "integer", "javaType": "int", "deprecated": false, "autowired":
false, "secret": false, "defaultValue": 1, "configurationClass":
"org.apache.camel.component.ironmq.IronMQConfiguration", "configurationField":
"configuration", "description": "Number of messages to poll pr. call. Maximum
is 100." },
+ "maxMessagesPerPoll": { "index": 6, "kind": "parameter", "displayName":
"Max Messages Per Poll", "group": "consumer", "label": "consumer", "required":
false, "type": "integer", "javaType": "int", "deprecated": false, "autowired":
false, "secret": false, "defaultValue": 1, "configurationClass":
"org.apache.camel.component.ironmq.IronMQConfiguration", "configurationField":
"configuration", "description": "Number of messages to poll per call. Maximum
is 100." },
"sendEmptyMessageWhenIdle": { "index": 7, "kind": "parameter",
"displayName": "Send Empty Message When Idle", "group": "consumer", "label":
"consumer", "required": false, "type": "boolean", "javaType": "boolean",
"deprecated": false, "autowired": false, "secret": false, "defaultValue":
false, "description": "If the polling consumer did not poll any files, you can
enable this option to send an empty message (no body) instead." },
"timeout": { "index": 8, "kind": "parameter", "displayName": "Timeout",
"group": "consumer", "label": "consumer", "required": false, "type": "integer",
"javaType": "int", "deprecated": false, "autowired": false, "secret": false,
"defaultValue": 60, "configurationClass":
"org.apache.camel.component.ironmq.IronMQConfiguration", "configurationField":
"configuration", "description": "After timeout (in seconds), item will be
placed back onto the queue." },
"wait": { "index": 9, "kind": "parameter", "displayName": "Wait", "group":
"consumer", "label": "consumer", "required": false, "type": "integer",
"javaType": "int", "deprecated": false, "autowired": false, "secret": false,
"configurationClass": "org.apache.camel.component.ironmq.IronMQConfiguration",
"configurationField": "configuration", "description": "Time in seconds to wait
for a message to become available. This enables long polling. Default is 0
(does not wait), maximum is 30." },
diff --git
a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpToBinarySampleTest.java
b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpToBinarySampleTest.java
index c62ac18e20d..572b68cd943 100644
---
a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpToBinarySampleTest.java
+++
b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpToBinarySampleTest.java
@@ -35,7 +35,7 @@ public class FromFtpToBinarySampleTest extends
CamelTestSupport {
protected RouteBuilder createRouteBuilder() {
return new RouteBuilder() {
public void configure() {
- // we use a delay of 60 minutes (eg. once pr. hour we poll the
+ // we use a delay of 60 minutes (eg. once per hour we poll the
// FTP server
long delay = 3600000;
diff --git
a/components/camel-ironmq/src/generated/resources/META-INF/org/apache/camel/component/ironmq/ironmq.json
b/components/camel-ironmq/src/generated/resources/META-INF/org/apache/camel/component/ironmq/ironmq.json
index 6e804288211..a0e33cdc287 100644
---
a/components/camel-ironmq/src/generated/resources/META-INF/org/apache/camel/component/ironmq/ironmq.json
+++
b/components/camel-ironmq/src/generated/resources/META-INF/org/apache/camel/component/ironmq/ironmq.json
@@ -40,9 +40,9 @@
"ironMQCloud": { "index": 1, "kind": "parameter", "displayName": "Iron
MQCloud", "group": "common", "label": "", "required": false, "type": "string",
"javaType": "java.lang.String", "deprecated": false, "autowired": false,
"secret": false, "defaultValue": "https:\/\/mq-aws-us-east-1-1.iron.io",
"configurationClass": "org.apache.camel.component.ironmq.IronMQConfiguration",
"configurationField": "configuration", "description": "IronMq Cloud url. Urls
for public clusters: https:\/\/mq-a [...]
"preserveHeaders": { "index": 2, "kind": "parameter", "displayName":
"Preserve Headers", "group": "common", "label": "", "required": false, "type":
"boolean", "javaType": "boolean", "deprecated": false, "autowired": false,
"secret": false, "defaultValue": false, "configurationClass":
"org.apache.camel.component.ironmq.IronMQConfiguration", "configurationField":
"configuration", "description": "Should message headers be preserved when
publishing messages. This will add the Camel heade [...]
"projectId": { "index": 3, "kind": "parameter", "displayName": "Project
Id", "group": "common", "label": "", "required": false, "type": "string",
"javaType": "java.lang.String", "deprecated": false, "autowired": false,
"secret": false, "configurationClass":
"org.apache.camel.component.ironmq.IronMQConfiguration", "configurationField":
"configuration", "description": "IronMQ projectId" },
- "batchDelete": { "index": 4, "kind": "parameter", "displayName": "Batch
Delete", "group": "consumer", "label": "consumer", "required": false, "type":
"boolean", "javaType": "boolean", "deprecated": false, "autowired": false,
"secret": false, "defaultValue": false, "configurationClass":
"org.apache.camel.component.ironmq.IronMQConfiguration", "configurationField":
"configuration", "description": "Should messages be deleted in one batch. This
will limit the number of api requests since [...]
+ "batchDelete": { "index": 4, "kind": "parameter", "displayName": "Batch
Delete", "group": "consumer", "label": "consumer", "required": false, "type":
"boolean", "javaType": "boolean", "deprecated": false, "autowired": false,
"secret": false, "defaultValue": false, "configurationClass":
"org.apache.camel.component.ironmq.IronMQConfiguration", "configurationField":
"configuration", "description": "Should messages be deleted in one batch. This
will limit the number of api requests since [...]
"concurrentConsumers": { "index": 5, "kind": "parameter", "displayName":
"Concurrent Consumers", "group": "consumer", "label": "consumer", "required":
false, "type": "integer", "javaType": "int", "deprecated": false, "autowired":
false, "secret": false, "defaultValue": 1, "configurationClass":
"org.apache.camel.component.ironmq.IronMQConfiguration", "configurationField":
"configuration", "description": "The number of concurrent consumers." },
- "maxMessagesPerPoll": { "index": 6, "kind": "parameter", "displayName":
"Max Messages Per Poll", "group": "consumer", "label": "consumer", "required":
false, "type": "integer", "javaType": "int", "deprecated": false, "autowired":
false, "secret": false, "defaultValue": 1, "configurationClass":
"org.apache.camel.component.ironmq.IronMQConfiguration", "configurationField":
"configuration", "description": "Number of messages to poll pr. call. Maximum
is 100." },
+ "maxMessagesPerPoll": { "index": 6, "kind": "parameter", "displayName":
"Max Messages Per Poll", "group": "consumer", "label": "consumer", "required":
false, "type": "integer", "javaType": "int", "deprecated": false, "autowired":
false, "secret": false, "defaultValue": 1, "configurationClass":
"org.apache.camel.component.ironmq.IronMQConfiguration", "configurationField":
"configuration", "description": "Number of messages to poll per call. Maximum
is 100." },
"sendEmptyMessageWhenIdle": { "index": 7, "kind": "parameter",
"displayName": "Send Empty Message When Idle", "group": "consumer", "label":
"consumer", "required": false, "type": "boolean", "javaType": "boolean",
"deprecated": false, "autowired": false, "secret": false, "defaultValue":
false, "description": "If the polling consumer did not poll any files, you can
enable this option to send an empty message (no body) instead." },
"timeout": { "index": 8, "kind": "parameter", "displayName": "Timeout",
"group": "consumer", "label": "consumer", "required": false, "type": "integer",
"javaType": "int", "deprecated": false, "autowired": false, "secret": false,
"defaultValue": 60, "configurationClass":
"org.apache.camel.component.ironmq.IronMQConfiguration", "configurationField":
"configuration", "description": "After timeout (in seconds), item will be
placed back onto the queue." },
"wait": { "index": 9, "kind": "parameter", "displayName": "Wait", "group":
"consumer", "label": "consumer", "required": false, "type": "integer",
"javaType": "int", "deprecated": false, "autowired": false, "secret": false,
"configurationClass": "org.apache.camel.component.ironmq.IronMQConfiguration",
"configurationField": "configuration", "description": "Time in seconds to wait
for a message to become available. This enables long polling. Default is 0
(does not wait), maximum is 30." },
diff --git
a/components/camel-ironmq/src/main/java/org/apache/camel/component/ironmq/IronMQConfiguration.java
b/components/camel-ironmq/src/main/java/org/apache/camel/component/ironmq/IronMQConfiguration.java
index 003f3f90a40..4a2fd2da0e2 100644
---
a/components/camel-ironmq/src/main/java/org/apache/camel/component/ironmq/IronMQConfiguration.java
+++
b/components/camel-ironmq/src/main/java/org/apache/camel/component/ironmq/IronMQConfiguration.java
@@ -149,7 +149,7 @@ public class IronMQConfiguration {
}
/**
- * Number of messages to poll pr. call. Maximum is 100.
+ * Number of messages to poll per call. Maximum is 100.
*/
public void setMaxMessagesPerPoll(int maxMessagesPerPoll) {
this.maxMessagesPerPoll = maxMessagesPerPoll;
@@ -185,7 +185,7 @@ public class IronMQConfiguration {
/**
* Should messages be deleted in one batch. This will limit the number of
api requests since messages are deleted in
- * one request, instead of one pr. exchange. If enabled care should be
taken that the consumer is idempotent when
+ * one request, instead of one per exchange. If enabled care should be
taken that the consumer is idempotent when
* processing exchanges.
*/
public void setBatchDelete(boolean batchDelete) {
diff --git
a/components/camel-ironmq/src/test/java/org/apache/camel/component/ironmq/integrationtest/ConcurrentConsumerLoadManualTest.java
b/components/camel-ironmq/src/test/java/org/apache/camel/component/ironmq/integrationtest/ConcurrentConsumerLoadManualTest.java
index 75a62a73104..01506561301 100644
---
a/components/camel-ironmq/src/test/java/org/apache/camel/component/ironmq/integrationtest/ConcurrentConsumerLoadManualTest.java
+++
b/components/camel-ironmq/src/test/java/org/apache/camel/component/ironmq/integrationtest/ConcurrentConsumerLoadManualTest.java
@@ -76,7 +76,7 @@ public class ConcurrentConsumerLoadManualTest extends
CamelTestSupport {
int seconds = (int) watch.taken() / 1000;
int msgPrSec = NO_OF_MESSAGES / seconds;
LOGGER.info("IronMQPerformanceTest: Took: " + seconds + " seconds to
produce " + NO_OF_MESSAGES + " messages. Which is "
- + msgPrSec + " messages pr. second");
+ + msgPrSec + " messages per second");
}
@Test
@@ -89,7 +89,7 @@ public class ConcurrentConsumerLoadManualTest extends
CamelTestSupport {
int seconds = (int) watch.taken() / 1000;
int msgPrSec = NO_OF_MESSAGES / seconds;
LOGGER.info("IronmqPerformanceTest: Took: " + seconds + " seconds to
consume " + NO_OF_MESSAGES + " messages. Which is "
- + msgPrSec + " messages pr. second");
+ + msgPrSec + " messages per second");
}
@Override
diff --git
a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/IronMQEndpointBuilderFactory.java
b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/IronMQEndpointBuilderFactory.java
index 81dc886e7c2..af44c51b66d 100644
---
a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/IronMQEndpointBuilderFactory.java
+++
b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/IronMQEndpointBuilderFactory.java
@@ -114,7 +114,7 @@ public interface IronMQEndpointBuilderFactory {
/**
* Should messages be deleted in one batch. This will limit the number
* of api requests since messages are deleted in one request, instead
of
- * one pr. exchange. If enabled care should be taken that the consumer
+ * one per exchange. If enabled care should be taken that the consumer
* is idempotent when processing exchanges.
*
* The option is a: <code>boolean</code> type.
@@ -132,7 +132,7 @@ public interface IronMQEndpointBuilderFactory {
/**
* Should messages be deleted in one batch. This will limit the number
* of api requests since messages are deleted in one request, instead
of
- * one pr. exchange. If enabled care should be taken that the consumer
+ * one per exchange. If enabled care should be taken that the consumer
* is idempotent when processing exchanges.
*
* The option will be converted to a <code>boolean</code> type.
@@ -178,7 +178,7 @@ public interface IronMQEndpointBuilderFactory {
return this;
}
/**
- * Number of messages to poll pr. call. Maximum is 100.
+ * Number of messages to poll per call. Maximum is 100.
*
* The option is a: <code>int</code> type.
*
@@ -193,7 +193,7 @@ public interface IronMQEndpointBuilderFactory {
return this;
}
/**
- * Number of messages to poll pr. call. Maximum is 100.
+ * Number of messages to poll per call. Maximum is 100.
*
* The option will be converted to a <code>int</code> type.
*
diff --git
a/dsl/camel-kotlin-api/src/generated/kotlin/org/apache/camel/kotlin/components/IronmqUriDsl.kt
b/dsl/camel-kotlin-api/src/generated/kotlin/org/apache/camel/kotlin/components/IronmqUriDsl.kt
index cccb5b9b66a..d17fed3c9c0 100644
---
a/dsl/camel-kotlin-api/src/generated/kotlin/org/apache/camel/kotlin/components/IronmqUriDsl.kt
+++
b/dsl/camel-kotlin-api/src/generated/kotlin/org/apache/camel/kotlin/components/IronmqUriDsl.kt
@@ -87,7 +87,7 @@ public class IronmqUriDsl(
/**
* Should messages be deleted in one batch. This will limit the number of
api requests since
- * messages are deleted in one request, instead of one pr. exchange. If
enabled care should be taken
+ * messages are deleted in one request, instead of one per exchange. If
enabled care should be taken
* that the consumer is idempotent when processing exchanges.
*/
public fun batchDelete(batchDelete: String) {
@@ -96,7 +96,7 @@ public class IronmqUriDsl(
/**
* Should messages be deleted in one batch. This will limit the number of
api requests since
- * messages are deleted in one request, instead of one pr. exchange. If
enabled care should be taken
+ * messages are deleted in one request, instead of one per exchange. If
enabled care should be taken
* that the consumer is idempotent when processing exchanges.
*/
public fun batchDelete(batchDelete: Boolean) {
@@ -118,14 +118,14 @@ public class IronmqUriDsl(
}
/**
- * Number of messages to poll pr. call. Maximum is 100.
+ * Number of messages to poll per call. Maximum is 100.
*/
public fun maxMessagesPerPoll(maxMessagesPerPoll: String) {
it.property("maxMessagesPerPoll", maxMessagesPerPoll)
}
/**
- * Number of messages to poll pr. call. Maximum is 100.
+ * Number of messages to poll per call. Maximum is 100.
*/
public fun maxMessagesPerPoll(maxMessagesPerPoll: Int) {
it.property("maxMessagesPerPoll", maxMessagesPerPoll.toString())
