This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git
The following commit(s) were added to refs/heads/main by this push:
new c45c03a3ebf Regen
c45c03a3ebf is described below
commit c45c03a3ebfd6e003ff0cce3999134bc7274e7e4
Author: Claus Ibsen <claus.ib...@gmail.com>
AuthorDate: Fri Mar 29 13:43:21 2024 +0100
Regen
---
.../catalog/components/google-pubsub-lite.json | 4 ++--
.../catalog/components/platform-http.json | 3 ++-
.../src/main/docs/google-pubsub-lite.json | 2 +-
.../GooglePubsubLiteComponentConfiguration.java | 26 +++++++++++-----------
.../src/main/docs/platform-http.json | 6 +++++
.../PlatformHttpComponentConfiguration.java | 16 +++++++++++++
.../springboot/PlatformHttpComponentConverter.java | 2 ++
7 files changed, 42 insertions(+), 17 deletions(-)
diff --git
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/google-pubsub-lite.json
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/google-pubsub-lite.json
index 6968dea8ca7..371d64ee105 100644
---
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/google-pubsub-lite.json
+++
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/google-pubsub-lite.json
@@ -24,8 +24,8 @@
},
"componentProperties": {
"bridgeErrorHandler": { "index": 0, "kind": "property", "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 (if possible) occurred while the Camel consumer is trying
to pickup incoming messages, or the like [...]
- "consumerMessagesOutstanding": { "index": 1, "kind": "property",
"displayName": "Consumer Messages Outstanding", "group": "consumer", "label":
"consumer", "required": false, "type": "integer", "javaType": "long",
"deprecated": false, "autowired": false, "secret": false, "defaultValue": 1000,
"description": "The number of messages that may be outstanding to the client.
Must be 0." },
- "consumerBytesOutstanding": { "index": 2, "kind": "property",
"displayName": "Consumer Bytes Outstanding", "group": "consumer (advanced)",
"label": "consumer,advanced", "required": false, "type": "integer", "javaType":
"long", "deprecated": false, "autowired": false, "secret": false,
"defaultValue": 10485760, "description": "How many milliseconds should each
producer stay alive in the cache. Must be greater than the allowed size of the
largest message (1 MiB)." },
+ "consumerBytesOutstanding": { "index": 1, "kind": "property",
"displayName": "Consumer Bytes Outstanding", "group": "consumer (advanced)",
"label": "consumer,advanced", "required": false, "type": "integer", "javaType":
"long", "deprecated": false, "autowired": false, "secret": false,
"defaultValue": 10485760, "description": "The number of quota bytes that may be
outstanding to the client. Must be greater than the allowed size of the largest
message (1 MiB)." },
+ "consumerMessagesOutstanding": { "index": 2, "kind": "property",
"displayName": "Consumer Messages Outstanding", "group": "consumer (advanced)",
"label": "consumer,advanced", "required": false, "type": "integer", "javaType":
"long", "deprecated": false, "autowired": false, "secret": false,
"defaultValue": 1000, "description": "The number of messages that may be
outstanding to the client. Must be 0." },
"lazyStartProducer": { "index": 3, "kind": "property", "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 [...]
"publisherCacheSize": { "index": 4, "kind": "property", "displayName":
"Publisher Cache Size", "group": "producer (advanced)", "label":
"producer,advanced", "required": false, "type": "integer", "javaType": "int",
"deprecated": false, "autowired": false, "secret": false, "defaultValue": 100,
"description": "Maximum number of producers to cache. This could be increased
if you have producers for lots of different topics." },
"publisherCacheTimeout": { "index": 5, "kind": "property", "displayName":
"Publisher Cache Timeout", "group": "producer (advanced)", "label":
"producer,advanced", "required": false, "type": "integer", "javaType": "int",
"deprecated": false, "autowired": false, "secret": false, "defaultValue":
180000, "description": "How many milliseconds should each producer stay alive
in the cache." },
diff --git
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/platform-http.json
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/platform-http.json
index ea6c4fbe378..7d7a5452248 100644
---
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/platform-http.json
+++
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/platform-http.json
@@ -26,7 +26,8 @@
"componentProperties": {
"bridgeErrorHandler": { "index": 0, "kind": "property", "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 (if possible) occurred while the Camel consumer is trying
to pickup incoming messages, or the like [...]
"autowiredEnabled": { "index": 1, "kind": "property", "displayName":
"Autowired Enabled", "group": "advanced", "label": "advanced", "required":
false, "type": "boolean", "javaType": "boolean", "deprecated": false,
"autowired": false, "secret": false, "defaultValue": true, "description":
"Whether autowiring is enabled. This is used for automatic autowiring options
(the option must be marked as autowired) by looking up in the registry to find
if there is a single instance of matching t [...]
- "engine": { "index": 2, "kind": "property", "displayName": "Engine",
"group": "advanced", "label": "advanced", "required": false, "type": "object",
"javaType": "org.apache.camel.component.platform.http.spi.PlatformHttpEngine",
"deprecated": false, "autowired": false, "secret": false, "description": "An
HTTP Server engine implementation to serve the requests" }
+ "engine": { "index": 2, "kind": "property", "displayName": "Engine",
"group": "advanced", "label": "advanced", "required": false, "type": "object",
"javaType": "org.apache.camel.component.platform.http.spi.PlatformHttpEngine",
"deprecated": false, "autowired": false, "secret": false, "description": "An
HTTP Server engine implementation to serve the requests" },
+ "headerFilterStrategy": { "index": 3, "kind": "property", "displayName":
"Header Filter Strategy", "group": "filter", "label": "filter", "required":
false, "type": "object", "javaType":
"org.apache.camel.spi.HeaderFilterStrategy", "deprecated": false, "autowired":
false, "secret": false, "description": "To use a custom
org.apache.camel.spi.HeaderFilterStrategy to filter header to and from Camel
message." }
},
"properties": {
"path": { "index": 0, "kind": "path", "displayName": "Path", "group":
"consumer", "label": "", "required": true, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "deprecationNote": "", "autowired":
false, "secret": false, "description": "The path under which this endpoint
serves the HTTP requests, for proxy use 'proxy'" },
diff --git
a/components-starter/camel-google-pubsub-lite-starter/src/main/docs/google-pubsub-lite.json
b/components-starter/camel-google-pubsub-lite-starter/src/main/docs/google-pubsub-lite.json
index fc1df9b09eb..67eb1d8b716 100644
---
a/components-starter/camel-google-pubsub-lite-starter/src/main/docs/google-pubsub-lite.json
+++
b/components-starter/camel-google-pubsub-lite-starter/src/main/docs/google-pubsub-lite.json
@@ -30,7 +30,7 @@
{
"name": "camel.component.google-pubsub-lite.consumer-bytes-outstanding",
"type": "java.lang.Long",
- "description": "How many milliseconds should each producer stay alive in
the cache. Must be greater than the allowed size of the largest message (1
MiB).",
+ "description": "The number of quota bytes that may be outstanding to the
client. Must be greater than the allowed size of the largest message (1 MiB).",
"sourceType":
"org.apache.camel.component.google.pubsublite.springboot.GooglePubsubLiteComponentConfiguration",
"defaultValue": 10485760
},
diff --git
a/components-starter/camel-google-pubsub-lite-starter/src/main/java/org/apache/camel/component/google/pubsublite/springboot/GooglePubsubLiteComponentConfiguration.java
b/components-starter/camel-google-pubsub-lite-starter/src/main/java/org/apache/camel/component/google/pubsublite/springboot/GooglePubsubLiteComponentConfiguration.java
index 4c307c00871..4a66225c1f5 100644
---
a/components-starter/camel-google-pubsub-lite-starter/src/main/java/org/apache/camel/component/google/pubsublite/springboot/GooglePubsubLiteComponentConfiguration.java
+++
b/components-starter/camel-google-pubsub-lite-starter/src/main/java/org/apache/camel/component/google/pubsublite/springboot/GooglePubsubLiteComponentConfiguration.java
@@ -49,14 +49,14 @@ public class GooglePubsubLiteComponentConfiguration
*/
private Boolean bridgeErrorHandler = false;
/**
- * The number of messages that may be outstanding to the client. Must be 0.
+ * The number of quota bytes that may be outstanding to the client. Must be
+ * greater than the allowed size of the largest message (1 MiB).
*/
- private Long consumerMessagesOutstanding = 1000L;
+ private Long consumerBytesOutstanding = 10485760L;
/**
- * How many milliseconds should each producer stay alive in the cache. Must
- * be greater than the allowed size of the largest message (1 MiB).
+ * The number of messages that may be outstanding to the client. Must be 0.
*/
- private Long consumerBytesOutstanding = 10485760L;
+ private Long consumerMessagesOutstanding = 1000L;
/**
* Whether the producer should be started lazy (on the first message). By
* starting lazy you can use this to allow CamelContext and routes to
@@ -106,14 +106,6 @@ public class GooglePubsubLiteComponentConfiguration
this.bridgeErrorHandler = bridgeErrorHandler;
}
- public Long getConsumerMessagesOutstanding() {
- return consumerMessagesOutstanding;
- }
-
- public void setConsumerMessagesOutstanding(Long
consumerMessagesOutstanding) {
- this.consumerMessagesOutstanding = consumerMessagesOutstanding;
- }
-
public Long getConsumerBytesOutstanding() {
return consumerBytesOutstanding;
}
@@ -122,6 +114,14 @@ public class GooglePubsubLiteComponentConfiguration
this.consumerBytesOutstanding = consumerBytesOutstanding;
}
+ public Long getConsumerMessagesOutstanding() {
+ return consumerMessagesOutstanding;
+ }
+
+ public void setConsumerMessagesOutstanding(Long
consumerMessagesOutstanding) {
+ this.consumerMessagesOutstanding = consumerMessagesOutstanding;
+ }
+
public Boolean getLazyStartProducer() {
return lazyStartProducer;
}
diff --git
a/components-starter/camel-platform-http-starter/src/main/docs/platform-http.json
b/components-starter/camel-platform-http-starter/src/main/docs/platform-http.json
index c98c9e05d23..bc30752131a 100644
---
a/components-starter/camel-platform-http-starter/src/main/docs/platform-http.json
+++
b/components-starter/camel-platform-http-starter/src/main/docs/platform-http.json
@@ -43,6 +43,12 @@
"type":
"org.apache.camel.component.platform.http.spi.PlatformHttpEngine",
"description": "An HTTP Server engine implementation to serve the
requests. The option is a
org.apache.camel.component.platform.http.spi.PlatformHttpEngine type.",
"sourceType":
"org.apache.camel.component.platform.http.springboot.PlatformHttpComponentConfiguration"
+ },
+ {
+ "name": "camel.component.platform-http.header-filter-strategy",
+ "type": "org.apache.camel.spi.HeaderFilterStrategy",
+ "description": "To use a custom
org.apache.camel.spi.HeaderFilterStrategy to filter header to and from Camel
message. The option is a org.apache.camel.spi.HeaderFilterStrategy type.",
+ "sourceType":
"org.apache.camel.component.platform.http.springboot.PlatformHttpComponentConfiguration"
}
],
"hints": []
diff --git
a/components-starter/camel-platform-http-starter/src/main/java/org/apache/camel/component/platform/http/springboot/PlatformHttpComponentConfiguration.java
b/components-starter/camel-platform-http-starter/src/main/java/org/apache/camel/component/platform/http/springboot/PlatformHttpComponentConfiguration.java
index 0567b8936b1..ad12d9a12ec 100644
---
a/components-starter/camel-platform-http-starter/src/main/java/org/apache/camel/component/platform/http/springboot/PlatformHttpComponentConfiguration.java
+++
b/components-starter/camel-platform-http-starter/src/main/java/org/apache/camel/component/platform/http/springboot/PlatformHttpComponentConfiguration.java
@@ -17,6 +17,7 @@
package org.apache.camel.component.platform.http.springboot;
import org.apache.camel.component.platform.http.spi.PlatformHttpEngine;
+import org.apache.camel.spi.HeaderFilterStrategy;
import org.apache.camel.spring.boot.ComponentConfigurationPropertiesCommon;
import org.springframework.boot.context.properties.ConfigurationProperties;
@@ -64,6 +65,12 @@ public class PlatformHttpComponentConfiguration
* a org.apache.camel.component.platform.http.spi.PlatformHttpEngine type.
*/
private PlatformHttpEngine engine;
+ /**
+ * To use a custom org.apache.camel.spi.HeaderFilterStrategy to filter
+ * header to and from Camel message. The option is a
+ * org.apache.camel.spi.HeaderFilterStrategy type.
+ */
+ private HeaderFilterStrategy headerFilterStrategy;
public Boolean getBridgeErrorHandler() {
return bridgeErrorHandler;
@@ -88,4 +95,13 @@ public class PlatformHttpComponentConfiguration
public void setEngine(PlatformHttpEngine engine) {
this.engine = engine;
}
+
+ public HeaderFilterStrategy getHeaderFilterStrategy() {
+ return headerFilterStrategy;
+ }
+
+ public void setHeaderFilterStrategy(
+ HeaderFilterStrategy headerFilterStrategy) {
+ this.headerFilterStrategy = headerFilterStrategy;
+ }
}
\ No newline at end of file
diff --git
a/components-starter/camel-platform-http-starter/src/main/java/org/apache/camel/component/platform/http/springboot/PlatformHttpComponentConverter.java
b/components-starter/camel-platform-http-starter/src/main/java/org/apache/camel/component/platform/http/springboot/PlatformHttpComponentConverter.java
index 49634cfe444..ca33b19f698 100644
---
a/components-starter/camel-platform-http-starter/src/main/java/org/apache/camel/component/platform/http/springboot/PlatformHttpComponentConverter.java
+++
b/components-starter/camel-platform-http-starter/src/main/java/org/apache/camel/component/platform/http/springboot/PlatformHttpComponentConverter.java
@@ -40,6 +40,7 @@ public class PlatformHttpComponentConverter implements
GenericConverter {
public Set<ConvertiblePair> getConvertibleTypes() {
Set<ConvertiblePair> answer = new LinkedHashSet<>();
answer.add(new ConvertiblePair(String.class,
org.apache.camel.component.platform.http.spi.PlatformHttpEngine.class));
+ answer.add(new ConvertiblePair(String.class,
org.apache.camel.spi.HeaderFilterStrategy.class));
return answer;
}
@@ -57,6 +58,7 @@ public class PlatformHttpComponentConverter implements
GenericConverter {
ref = ref.startsWith("#bean:") ? ref.substring(6) : ref.substring(1);
switch (targetType.getName()) {
case
"org.apache.camel.component.platform.http.spi.PlatformHttpEngine": return
applicationContext.getBean(ref,
org.apache.camel.component.platform.http.spi.PlatformHttpEngine.class);
+ case "org.apache.camel.spi.HeaderFilterStrategy": return
applicationContext.getBean(ref,
org.apache.camel.spi.HeaderFilterStrategy.class);
}
return null;
}
