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 6e136b0 Regen
6e136b0 is described below
commit 6e136b063ff600fa966937e92b4a8adcdaace1b6
Author: Claus Ibsen <[email protected]>
AuthorDate: Sat Oct 9 09:24:18 2021 +0200
Regen
---
.../camel/springboot/catalog/components/nats.json | 2 +
.../src/main/docs/nats-starter.adoc | 3 +-
.../springboot/NatsComponentAutoConfiguration.java | 2 +-
.../springboot/NatsComponentConfiguration.java | 16 ++++++
.../nats/springboot/NatsComponentConverter.java | 65 ++++++++++++++++++++++
.../src/main/resources/META-INF/spring.factories | 4 +-
.../modules/spring-boot/partials/nats-starter.adoc | 3 +-
7 files changed, 91 insertions(+), 4 deletions(-)
diff --git
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/nats.json
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/nats.json
index e3cfa20..998c704 100644
---
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/nats.json
+++
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/nats.json
@@ -27,6 +27,7 @@
"bridgeErrorHandler": { "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 occurred
while the consumer is trying to pickup incoming messages, or the likes, will
now be processed as a me [...]
"lazyStartProducer": { "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 during star [...]
"autowiredEnabled": { "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 type, which t [...]
+ "headerFilterStrategy": { "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." },
"useGlobalSslContextParameters": { "kind": "property", "displayName": "Use
Global Ssl Context Parameters", "group": "security", "label": "security",
"required": false, "type": "boolean", "javaType": "boolean", "deprecated":
false, "autowired": false, "secret": false, "defaultValue": false,
"description": "Enable usage of global SSL context parameters." }
},
"properties": {
@@ -56,6 +57,7 @@
"replySubject": { "kind": "parameter", "displayName": "Reply Subject",
"group": "producer", "label": "producer", "required": false, "type": "string",
"javaType": "java.lang.String", "deprecated": false, "autowired": false,
"secret": false, "configurationClass":
"org.apache.camel.component.nats.NatsConfiguration", "configurationField":
"configuration", "description": "the subject to which subscribers should send
response" },
"requestTimeout": { "kind": "parameter", "displayName": "Request Timeout",
"group": "producer", "label": "producer", "required": false, "type": "integer",
"javaType": "long", "deprecated": false, "autowired": false, "secret": false,
"defaultValue": 20000, "configurationClass":
"org.apache.camel.component.nats.NatsConfiguration", "configurationField":
"configuration", "description": "Request timeout in milliseconds" },
"connection": { "kind": "parameter", "displayName": "Connection", "group":
"advanced", "label": "advanced", "required": false, "type": "object",
"javaType": "io.nats.client.Connection", "deprecated": false, "autowired":
false, "secret": false, "configurationClass":
"org.apache.camel.component.nats.NatsConfiguration", "configurationField":
"configuration", "description": "Reference an already instantiated connection
to Nats server" },
+ "headerFilterStrategy": { "kind": "parameter", "displayName": "Header
Filter Strategy", "group": "advanced", "label": "advanced", "required": false,
"type": "object", "javaType": "org.apache.camel.spi.HeaderFilterStrategy",
"deprecated": false, "autowired": false, "secret": false, "configurationClass":
"org.apache.camel.component.nats.NatsConfiguration", "configurationField":
"configuration", "description": "Define the header filtering strategy" },
"traceConnection": { "kind": "parameter", "displayName": "Trace
Connection", "group": "advanced", "label": "advanced", "required": false,
"type": "boolean", "javaType": "boolean", "deprecated": false, "autowired":
false, "secret": false, "defaultValue": false, "configurationClass":
"org.apache.camel.component.nats.NatsConfiguration", "configurationField":
"configuration", "description": "Whether or not connection trace messages
should be printed to standard out for fine grained debug [...]
"secure": { "kind": "parameter", "displayName": "Secure", "group":
"security", "label": "security", "required": false, "type": "boolean",
"javaType": "boolean", "deprecated": false, "autowired": false, "secret":
false, "defaultValue": false, "configurationClass":
"org.apache.camel.component.nats.NatsConfiguration", "configurationField":
"configuration", "description": "Set secure option indicating TLS is required"
},
"sslContextParameters": { "kind": "parameter", "displayName": "Ssl Context
Parameters", "group": "security", "label": "security", "required": false,
"type": "object", "javaType":
"org.apache.camel.support.jsse.SSLContextParameters", "deprecated": false,
"autowired": false, "secret": false, "configurationClass":
"org.apache.camel.component.nats.NatsConfiguration", "configurationField":
"configuration", "description": "To configure security using
SSLContextParameters" }
diff --git
a/components-starter/camel-nats-starter/src/main/docs/nats-starter.adoc
b/components-starter/camel-nats-starter/src/main/docs/nats-starter.adoc
index 15d29c5..cead5ec 100644
--- a/components-starter/camel-nats-starter/src/main/docs/nats-starter.adoc
+++ b/components-starter/camel-nats-starter/src/main/docs/nats-starter.adoc
@@ -17,7 +17,7 @@ When using nats with Spring Boot make sure to use the
following Maven dependency
----
-The component supports 7 options, which are listed below.
+The component supports 8 options, which are listed below.
@@ -27,6 +27,7 @@ The component supports 7 options, which are listed below.
| *camel.component.nats.autowired-enabled* | 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 type, which then gets configured on the component. This can be used
for automatic configuring JDBC data sources, JMS connection factories, AWS
Clients, etc. | true | Boolean
| *camel.component.nats.bridge-error-handler* | 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
| *camel.component.nats.enabled* | Whether to enable auto configuration of the
nats component. This is enabled by default. | | Boolean
+| *camel.component.nats.header-filter-strategy* | 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. | |
HeaderFilterStrategy
| *camel.component.nats.lazy-start-producer* | 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 during starting and cause the route to fail being started. By deferring
this startup to be lazy then the startup failure can be handled during routing
messages via Camel's routing error handlers. Beware that when the first message
is processed then [...]
| *camel.component.nats.servers* | URLs to one or more NAT servers. Use comma
to separate URLs when specifying multiple servers. | | String
| *camel.component.nats.use-global-ssl-context-parameters* | Enable usage of
global SSL context parameters. | false | Boolean
diff --git
a/components-starter/camel-nats-starter/src/main/java/org/apache/camel/component/nats/springboot/NatsComponentAutoConfiguration.java
b/components-starter/camel-nats-starter/src/main/java/org/apache/camel/component/nats/springboot/NatsComponentAutoConfiguration.java
index 797dd5f..9404e80 100644
---
a/components-starter/camel-nats-starter/src/main/java/org/apache/camel/component/nats/springboot/NatsComponentAutoConfiguration.java
+++
b/components-starter/camel-nats-starter/src/main/java/org/apache/camel/component/nats/springboot/NatsComponentAutoConfiguration.java
@@ -44,7 +44,7 @@ import org.springframework.context.annotation.Lazy;
@Conditional(ConditionalOnCamelContextAndAutoConfigurationBeans.class)
@EnableConfigurationProperties({ComponentConfigurationProperties.class,NatsComponentConfiguration.class})
@ConditionalOnHierarchicalProperties({"camel.component",
"camel.component.nats"})
-@AutoConfigureAfter(CamelAutoConfiguration.class)
+@AutoConfigureAfter({CamelAutoConfiguration.class,
NatsComponentConverter.class})
public class NatsComponentAutoConfiguration {
@Autowired
diff --git
a/components-starter/camel-nats-starter/src/main/java/org/apache/camel/component/nats/springboot/NatsComponentConfiguration.java
b/components-starter/camel-nats-starter/src/main/java/org/apache/camel/component/nats/springboot/NatsComponentConfiguration.java
index 4ec646c..5dd3cdc 100644
---
a/components-starter/camel-nats-starter/src/main/java/org/apache/camel/component/nats/springboot/NatsComponentConfiguration.java
+++
b/components-starter/camel-nats-starter/src/main/java/org/apache/camel/component/nats/springboot/NatsComponentConfiguration.java
@@ -17,6 +17,7 @@
package org.apache.camel.component.nats.springboot;
import javax.annotation.Generated;
+import org.apache.camel.spi.HeaderFilterStrategy;
import org.apache.camel.spring.boot.ComponentConfigurationPropertiesCommon;
import org.springframework.boot.context.properties.ConfigurationProperties;
@@ -75,6 +76,12 @@ public class NatsComponentConfiguration
*/
private Boolean autowiredEnabled = true;
/**
+ * 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;
+ /**
* Enable usage of global SSL context parameters.
*/
private Boolean useGlobalSslContextParameters = false;
@@ -119,6 +126,15 @@ public class NatsComponentConfiguration
this.autowiredEnabled = autowiredEnabled;
}
+ public HeaderFilterStrategy getHeaderFilterStrategy() {
+ return headerFilterStrategy;
+ }
+
+ public void setHeaderFilterStrategy(
+ HeaderFilterStrategy headerFilterStrategy) {
+ this.headerFilterStrategy = headerFilterStrategy;
+ }
+
public Boolean getUseGlobalSslContextParameters() {
return useGlobalSslContextParameters;
}
diff --git
a/components-starter/camel-nats-starter/src/main/java/org/apache/camel/component/nats/springboot/NatsComponentConverter.java
b/components-starter/camel-nats-starter/src/main/java/org/apache/camel/component/nats/springboot/NatsComponentConverter.java
new file mode 100644
index 0000000..fcc1925
--- /dev/null
+++
b/components-starter/camel-nats-starter/src/main/java/org/apache/camel/component/nats/springboot/NatsComponentConverter.java
@@ -0,0 +1,65 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.component.nats.springboot;
+
+import java.util.LinkedHashSet;
+import java.util.Set;
+import javax.annotation.Generated;
+import org.springframework.beans.factory.annotation.Autowired;
+import
org.springframework.boot.context.properties.ConfigurationPropertiesBinding;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.core.convert.TypeDescriptor;
+import org.springframework.core.convert.converter.GenericConverter;
+import org.springframework.stereotype.Component;
+
+/**
+ * Generated by camel-package-maven-plugin - do not edit this file!
+ */
+@Generated("org.apache.camel.springboot.maven.SpringBootAutoConfigurationMojo")
+@Configuration(proxyBeanMethods = false)
+@ConfigurationPropertiesBinding
+@Component
+public class NatsComponentConverter implements GenericConverter {
+
+ @Autowired
+ private ApplicationContext applicationContext;
+
+ public Set<ConvertiblePair> getConvertibleTypes() {
+ Set<ConvertiblePair> answer = new LinkedHashSet<>();
+ answer.add(new ConvertiblePair(String.class,
org.apache.camel.spi.HeaderFilterStrategy.class));
+ return answer;
+ }
+
+ public Object convert(
+ Object source,
+ TypeDescriptor sourceType,
+ TypeDescriptor targetType) {
+ if (source == null) {
+ return null;
+ }
+ String ref = source.toString();
+ if (!ref.startsWith("#")) {
+ return null;
+ }
+ ref = ref.startsWith("#bean:") ? ref.substring(6) : ref.substring(1);
+ switch (targetType.getName()) {
+ case "org.apache.camel.spi.HeaderFilterStrategy": return
applicationContext.getBean(ref,
org.apache.camel.spi.HeaderFilterStrategy.class);
+ }
+ return null;
+ }
+}
\ No newline at end of file
diff --git
a/components-starter/camel-nats-starter/src/main/resources/META-INF/spring.factories
b/components-starter/camel-nats-starter/src/main/resources/META-INF/spring.factories
index 5ede7df..0ed0873 100644
---
a/components-starter/camel-nats-starter/src/main/resources/META-INF/spring.factories
+++
b/components-starter/camel-nats-starter/src/main/resources/META-INF/spring.factories
@@ -15,4 +15,6 @@
## limitations under the License.
## ---------------------------------------------------------------------------
org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
-org.apache.camel.component.nats.springboot.NatsComponentAutoConfiguration
+org.apache.camel.component.nats.springboot.NatsComponentAutoConfiguration,\
+org.apache.camel.component.nats.springboot.NatsComponentConverter
+
diff --git a/docs/components/modules/spring-boot/partials/nats-starter.adoc
b/docs/components/modules/spring-boot/partials/nats-starter.adoc
index 15d29c5..cead5ec 100644
--- a/docs/components/modules/spring-boot/partials/nats-starter.adoc
+++ b/docs/components/modules/spring-boot/partials/nats-starter.adoc
@@ -17,7 +17,7 @@ When using nats with Spring Boot make sure to use the
following Maven dependency
----
-The component supports 7 options, which are listed below.
+The component supports 8 options, which are listed below.
@@ -27,6 +27,7 @@ The component supports 7 options, which are listed below.
| *camel.component.nats.autowired-enabled* | 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 type, which then gets configured on the component. This can be used
for automatic configuring JDBC data sources, JMS connection factories, AWS
Clients, etc. | true | Boolean
| *camel.component.nats.bridge-error-handler* | 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
| *camel.component.nats.enabled* | Whether to enable auto configuration of the
nats component. This is enabled by default. | | Boolean
+| *camel.component.nats.header-filter-strategy* | 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. | |
HeaderFilterStrategy
| *camel.component.nats.lazy-start-producer* | 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 during starting and cause the route to fail being started. By deferring
this startup to be lazy then the startup failure can be handled during routing
messages via Camel's routing error handlers. Beware that when the first message
is processed then [...]
| *camel.component.nats.servers* | URLs to one or more NAT servers. Use comma
to separate URLs when specifying multiple servers. | | String
| *camel.component.nats.use-global-ssl-context-parameters* | Enable usage of
global SSL context parameters. | false | Boolean
