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 b1601145c69 Regen
b1601145c69 is described below
commit b1601145c698b9ae1b1b7c5a3242b11ab79a9b5e
Author: Claus Ibsen <[email protected]>
AuthorDate: Wed Sep 30 21:10:28 2026 +0200
Regen
---
.../springboot/catalog/components/spiffe.json | 8 ++++---
.../springboot/catalog/dataformats/jackson.json | 4 ++--
.../springboot/catalog/dev-consoles/send.json | 27 ++++++++++++++++++----
.../src/main/docs/jackson.json | 4 ++--
.../springboot/JacksonDataFormatConfiguration.java | 8 +++++--
.../src/main/docs/jackson3.json | 4 ++--
.../springboot/JacksonDataFormatConfiguration.java | 8 +++++--
.../camel-spiffe-starter/src/main/docs/spiffe.json | 7 ++++++
.../springboot/SpiffeComponentConfiguration.java | 19 +++++++++++++++
.../modules/ROOT/pages/starters/jackson.adoc | 4 ++--
.../modules/ROOT/pages/starters/jackson3.adoc | 4 ++--
.../modules/ROOT/pages/starters/spiffe.adoc | 3 ++-
12 files changed, 77 insertions(+), 23 deletions(-)
diff --git
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/spiffe.json
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/spiffe.json
index 54576aadd8e..a08aac5c1c6 100644
---
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/spiffe.json
+++
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/spiffe.json
@@ -31,14 +31,15 @@
"autowiredEnabled": { "index": 4, "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 [...]
"workloadApiClient": { "index": 5, "kind": "property", "displayName":
"Workload Api Client", "group": "advanced", "label": "advanced", "required":
false, "type": "object", "javaType": "io.spiffe.workloadapi.WorkloadApiClient",
"deprecated": false, "deprecationNote": "", "autowired": true, "secret": false,
"configurationClass": "org.apache.camel.component.spiffe.SpiffeConfiguration",
"configurationField": "configuration", "description": "An existing
WorkloadApiClient to use. When set, [...]
"allowOperationHeader": { "index": 6, "kind": "property", "displayName":
"Allow Operation Header", "group": "security", "label": "security", "required":
false, "type": "boolean", "javaType": "boolean", "deprecated": false,
"autowired": false, "secret": false, "security": "insecure:dev",
"defaultValue": false, "configurationClass":
"org.apache.camel.component.spiffe.SpiffeConfiguration", "configurationField":
"configuration", "description": "Whether the CamelSpiffeOperation header may
[...]
- "spiffeSocketPath": { "index": 7, "kind": "property", "displayName":
"Spiffe Socket Path", "group": "security", "label": "security", "required":
false, "type": "string", "javaType": "java.lang.String", "deprecated": false,
"autowired": false, "secret": false, "configurationClass":
"org.apache.camel.component.spiffe.SpiffeConfiguration", "configurationField":
"configuration", "description": "The address of the SPIFFE Workload API
endpoint (for example {code unix:\/\/\/tmp\/agent.sock} [...]
+ "spiffeSocketPath": { "index": 7, "kind": "property", "displayName":
"Spiffe Socket Path", "group": "security", "label": "security", "required":
false, "type": "string", "javaType": "java.lang.String", "deprecated": false,
"autowired": false, "secret": false, "configurationClass":
"org.apache.camel.component.spiffe.SpiffeConfiguration", "configurationField":
"configuration", "description": "The address of the SPIFFE Workload API
endpoint (for example {code unix:\/\/\/tmp\/agent.sock} [...]
+ "x509Response": { "index": 8, "kind": "property", "displayName": "X509
Response", "group": "security", "label": "producer,security", "required":
false, "type": "enum", "javaType":
"org.apache.camel.component.spiffe.SpiffeX509Response", "enum": [ "svid",
"chain", "id" ], "deprecated": false, "autowired": false, "secret": false,
"defaultValue": "chain", "configurationClass":
"org.apache.camel.component.spiffe.SpiffeConfiguration", "configurationField":
"configuration", "description": " [...]
},
"headers": {
"CamelSpiffeOperation": { "index": 0, "kind": "header", "displayName": "",
"group": "producer", "label": "producer", "required": false, "javaType":
"org.apache.camel.component.spiffe.SpiffeOperation or String", "deprecated":
false, "deprecationNote": "", "autowired": false, "secret": false,
"description": "Overrides the operation to be used by the producer. Ignored
unless the endpoint sets allowOperationHeader=true, because the operation
decides whether the endpoint validates a token [...]
"CamelSpiffeAudience": { "index": 1, "kind": "header", "displayName": "",
"group": "producer", "label": "producer", "required": false, "javaType":
"String", "deprecated": false, "deprecationNote": "", "autowired": false,
"secret": false, "description": "The comma-separated audience(s) for the
fetchJwtSvid operation. Ignored by validateJwtSvid, which always validates
against the configured audience: there the audience is the check that binds the
token to this workload, not a parameter [...]
"CamelSpiffeToken": { "index": 2, "kind": "header", "displayName": "",
"group": "producer", "label": "producer", "required": false, "javaType":
"String", "deprecated": false, "deprecationNote": "", "autowired": false,
"secret": false, "description": "The JWT-SVID token to validate, for the
validateJwtSvid operation.", "constantName":
"org.apache.camel.component.spiffe.SpiffeConstants#TOKEN" },
"CamelSpiffeSpiffeId": { "index": 3, "kind": "header", "displayName": "",
"group": "producer", "label": "producer", "required": false, "javaType":
"String", "deprecated": false, "deprecationNote": "", "autowired": false,
"secret": false, "description": "The SPIFFE ID of the returned SVID.",
"constantName": "org.apache.camel.component.spiffe.SpiffeConstants#SPIFFE_ID" },
- "CamelSpiffeExpiry": { "index": 4, "kind": "header", "displayName": "",
"group": "producer", "label": "producer", "required": false, "javaType":
"java.util.Date", "deprecated": false, "deprecationNote": "", "autowired":
false, "secret": false, "description": "The expiry of the returned JWT-SVID.",
"constantName": "org.apache.camel.component.spiffe.SpiffeConstants#EXPIRY" }
+ "CamelSpiffeExpiry": { "index": 4, "kind": "header", "displayName": "",
"group": "producer", "label": "producer", "required": false, "javaType":
"java.util.Date", "deprecated": false, "deprecationNote": "", "autowired":
false, "secret": false, "description": "The expiry of the returned SVID: the
token expiry for fetchJwtSvid, or the leaf certificate's notAfter for
fetchX509Svid.", "constantName":
"org.apache.camel.component.spiffe.SpiffeConstants#EXPIRY" }
},
"properties": {
"label": { "index": 0, "kind": "path", "displayName": "Label", "group":
"producer", "label": "", "required": false, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "deprecationNote": "", "autowired":
false, "secret": false, "description": "Logical name of the endpoint" },
@@ -47,6 +48,7 @@
"lazyStartProducer": { "index": 3, "kind": "parameter", "displayName":
"Lazy Start Producer", "group": "producer (advanced)", "label":
"producer,advanced", "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 produc [...]
"workloadApiClient": { "index": 4, "kind": "parameter", "displayName":
"Workload Api Client", "group": "advanced", "label": "advanced", "required":
false, "type": "object", "javaType": "io.spiffe.workloadapi.WorkloadApiClient",
"deprecated": false, "deprecationNote": "", "autowired": true, "secret": false,
"configurationClass": "org.apache.camel.component.spiffe.SpiffeConfiguration",
"configurationField": "configuration", "description": "An existing
WorkloadApiClient to use. When set [...]
"allowOperationHeader": { "index": 5, "kind": "parameter", "displayName":
"Allow Operation Header", "group": "security", "label": "security", "required":
false, "type": "boolean", "javaType": "boolean", "deprecated": false,
"autowired": false, "secret": false, "security": "insecure:dev",
"defaultValue": false, "configurationClass":
"org.apache.camel.component.spiffe.SpiffeConfiguration", "configurationField":
"configuration", "description": "Whether the CamelSpiffeOperation header ma
[...]
- "spiffeSocketPath": { "index": 6, "kind": "parameter", "displayName":
"Spiffe Socket Path", "group": "security", "label": "security", "required":
false, "type": "string", "javaType": "java.lang.String", "deprecated": false,
"autowired": false, "secret": false, "configurationClass":
"org.apache.camel.component.spiffe.SpiffeConfiguration", "configurationField":
"configuration", "description": "The address of the SPIFFE Workload API
endpoint (for example {code unix:\/\/\/tmp\/agent.sock [...]
+ "spiffeSocketPath": { "index": 6, "kind": "parameter", "displayName":
"Spiffe Socket Path", "group": "security", "label": "security", "required":
false, "type": "string", "javaType": "java.lang.String", "deprecated": false,
"autowired": false, "secret": false, "configurationClass":
"org.apache.camel.component.spiffe.SpiffeConfiguration", "configurationField":
"configuration", "description": "The address of the SPIFFE Workload API
endpoint (for example {code unix:\/\/\/tmp\/agent.sock [...]
+ "x509Response": { "index": 7, "kind": "parameter", "displayName": "X509
Response", "group": "security", "label": "producer,security", "required":
false, "type": "enum", "javaType":
"org.apache.camel.component.spiffe.SpiffeX509Response", "enum": [ "svid",
"chain", "id" ], "deprecated": false, "autowired": false, "secret": false,
"defaultValue": "chain", "configurationClass":
"org.apache.camel.component.spiffe.SpiffeConfiguration", "configurationField":
"configuration", "description": [...]
}
}
diff --git
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/dataformats/jackson.json
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/dataformats/jackson.json
index 2a49d543078..8cbb0abae1f 100644
---
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/dataformats/jackson.json
+++
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/dataformats/jackson.json
@@ -30,8 +30,8 @@
"useList": { "index": 11, "kind": "attribute", "displayName": "Use List",
"group": "common", "required": false, "type": "boolean", "javaType":
"java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false,
"defaultValue": false, "description": "To unmarshal to a List of Map or a List
of Pojo." },
"moduleClassNames": { "index": 12, "kind": "attribute", "displayName":
"Module Class Names", "group": "advanced", "label": "advanced", "required":
false, "type": "string", "javaType": "java.lang.String", "deprecated": false,
"autowired": false, "secret": false, "description": "To use custom Jackson
modules com.fasterxml.jackson.databind.Module specified as a String with FQN
class names. Multiple classes can be separated by comma." },
"moduleRefs": { "index": 13, "kind": "attribute", "displayName": "Module
Refs", "group": "advanced", "label": "advanced", "required": false, "type":
"string", "javaType": "java.lang.String", "deprecated": false, "autowired":
false, "secret": false, "description": "To use custom Jackson modules referred
from the Camel registry. Multiple modules can be separated by comma." },
- "enableFeatures": { "index": 14, "kind": "attribute", "displayName":
"Enable Features", "group": "advanced", "label": "advanced", "required": false,
"type": "string", "javaType": "java.lang.String", "deprecated": false,
"autowired": false, "secret": false, "description": "Set of features to enable
on the Jackson com.fasterxml.jackson.databind.ObjectMapper. Multiple features
can be separated by comma." },
- "disableFeatures": { "index": 15, "kind": "attribute", "displayName":
"Disable Features", "group": "advanced", "label": "advanced", "required":
false, "type": "string", "javaType": "java.lang.String", "deprecated": false,
"autowired": false, "secret": false, "description": "Set of features to disable
on the Jackson com.fasterxml.jackson.databind.ObjectMapper. Multiple features
can be separated by comma." },
+ "enableFeatures": { "index": 14, "kind": "attribute", "displayName":
"Enable Features", "group": "advanced", "label": "advanced", "required": false,
"type": "string", "javaType": "java.lang.String", "deprecated": false,
"autowired": false, "secret": false, "description": "Set of features to enable
on the Jackson com.fasterxml.jackson.databind.ObjectMapper. Multiple features
can be separated by comma. When using Jackson 3, a feature can be qualified
with its enum class name (e.g. Seri [...]
+ "disableFeatures": { "index": 15, "kind": "attribute", "displayName":
"Disable Features", "group": "advanced", "label": "advanced", "required":
false, "type": "string", "javaType": "java.lang.String", "deprecated": false,
"autowired": false, "secret": false, "description": "Set of features to disable
on the Jackson com.fasterxml.jackson.databind.ObjectMapper. Multiple features
can be separated by comma. When using Jackson 3, a feature can be qualified
with its enum class name (e.g. S [...]
"allowUnmarshallType": { "index": 16, "kind": "attribute", "displayName":
"Allow Unmarshall Type", "group": "common", "required": false, "type":
"boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired":
false, "secret": false, "defaultValue": false, "description": "If enabled then
Jackson is allowed to attempt to use the CamelJacksonUnmarshalType header
during the unmarshalling. This should only be enabled when desired to be used."
},
"timezone": { "index": 17, "kind": "attribute", "displayName": "Timezone",
"group": "advanced", "label": "advanced", "required": false, "type": "string",
"javaType": "java.lang.String", "deprecated": false, "autowired": false,
"secret": false, "description": "If set then Jackson will use the Timezone when
marshalling\/unmarshalling." },
"schemaResolver": { "index": 18, "kind": "attribute", "displayName":
"Schema Resolver", "group": "advanced", "label": "advanced", "required": false,
"type": "object", "javaType":
"org.apache.camel.component.jackson.SchemaResolver", "deprecated": false,
"autowired": false, "secret": false, "description": "Optional schema resolver
used to lookup schemas for the data in transit." },
diff --git
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/dev-consoles/send.json
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/dev-consoles/send.json
index f02c1ef1b57..fd5395428e5 100644
---
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/dev-consoles/send.json
+++
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/dev-consoles/send.json
@@ -27,9 +27,26 @@
"secret": false,
"description": "The message body to send. Can refer to files using file:
prefix"
},
- "bodyMaxChars": {
+ "bodyEncoding": {
"index": 1,
"kind": "option",
+ "displayName": "Body Encoding",
+ "group": "query",
+ "label": "query",
+ "required": false,
+ "type": "string",
+ "javaType": "java.lang.String",
+ "enum": [
+ "base64"
+ ],
+ "deprecated": false,
+ "autowired": false,
+ "secret": false,
+ "description": "Encoding of the body option. Use base64 to send binary
content, which is decoded and sent as byte[]."
+ },
+ "bodyMaxChars": {
+ "index": 2,
+ "kind": "option",
"displayName": "Body Max Chars",
"group": "query",
"label": "query",
@@ -43,7 +60,7 @@
"description": "Maximum size of the message body to include in the dump"
},
"endpoint": {
- "index": 2,
+ "index": 3,
"kind": "option",
"displayName": "Endpoint",
"group": "query",
@@ -57,7 +74,7 @@
"description": "Endpoint for where to send messages (can also refer to a
route id, endpoint pattern)"
},
"exchangePattern": {
- "index": 3,
+ "index": 4,
"kind": "option",
"displayName": "Exchange Pattern",
"group": "query",
@@ -75,7 +92,7 @@
"description": "Exchange pattern when sending"
},
"poll": {
- "index": 4,
+ "index": 5,
"kind": "option",
"displayName": "Poll",
"group": "query",
@@ -89,7 +106,7 @@
"description": "Whether to poll message from the endpoint instead of
sending"
},
"pollTimeout": {
- "index": 5,
+ "index": 6,
"kind": "option",
"displayName": "Poll Timeout",
"group": "query",
diff --git
a/components-starter/camel-jackson-starter/src/main/docs/jackson.json
b/components-starter/camel-jackson-starter/src/main/docs/jackson.json
index 5c1d1564922..2d6468aeec4 100644
--- a/components-starter/camel-jackson-starter/src/main/docs/jackson.json
+++ b/components-starter/camel-jackson-starter/src/main/docs/jackson.json
@@ -69,13 +69,13 @@
{
"name": "camel.dataformat.jackson.disable-features",
"type": "java.lang.String",
- "description": "Set of features to disable on the Jackson
com.fasterxml.jackson.databind.ObjectMapper. Multiple features can be separated
by comma.",
+ "description": "Set of features to disable on the Jackson
com.fasterxml.jackson.databind.ObjectMapper. Multiple features can be separated
by comma. When using Jackson 3, a feature can be qualified with its enum class
name (e.g. SerializationFeature.WRAP_ROOT_VALUE) to tell apart features with
the same name.",
"sourceType":
"org.apache.camel.component.jackson.springboot.JacksonDataFormatConfiguration"
},
{
"name": "camel.dataformat.jackson.enable-features",
"type": "java.lang.String",
- "description": "Set of features to enable on the Jackson
com.fasterxml.jackson.databind.ObjectMapper. Multiple features can be separated
by comma.",
+ "description": "Set of features to enable on the Jackson
com.fasterxml.jackson.databind.ObjectMapper. Multiple features can be separated
by comma. When using Jackson 3, a feature can be qualified with its enum class
name (e.g. SerializationFeature.WRAP_ROOT_VALUE) to tell apart features with
the same name.",
"sourceType":
"org.apache.camel.component.jackson.springboot.JacksonDataFormatConfiguration"
},
{
diff --git
a/components-starter/camel-jackson-starter/src/main/java/org/apache/camel/component/jackson/springboot/JacksonDataFormatConfiguration.java
b/components-starter/camel-jackson-starter/src/main/java/org/apache/camel/component/jackson/springboot/JacksonDataFormatConfiguration.java
index 1ac7c39e7cc..b3bfdb80c46 100644
---
a/components-starter/camel-jackson-starter/src/main/java/org/apache/camel/component/jackson/springboot/JacksonDataFormatConfiguration.java
+++
b/components-starter/camel-jackson-starter/src/main/java/org/apache/camel/component/jackson/springboot/JacksonDataFormatConfiguration.java
@@ -104,13 +104,17 @@ public class JacksonDataFormatConfiguration
/**
* Set of features to enable on the Jackson
* com.fasterxml.jackson.databind.ObjectMapper. Multiple features can be
- * separated by comma.
+ * separated by comma. When using Jackson 3, a feature can be qualified
with
+ * its enum class name (e.g. SerializationFeature.WRAP_ROOT_VALUE) to tell
+ * apart features with the same name.
*/
private String enableFeatures;
/**
* Set of features to disable on the Jackson
* com.fasterxml.jackson.databind.ObjectMapper. Multiple features can be
- * separated by comma.
+ * separated by comma. When using Jackson 3, a feature can be qualified
with
+ * its enum class name (e.g. SerializationFeature.WRAP_ROOT_VALUE) to tell
+ * apart features with the same name.
*/
private String disableFeatures;
/**
diff --git
a/components-starter/camel-jackson3-starter/src/main/docs/jackson3.json
b/components-starter/camel-jackson3-starter/src/main/docs/jackson3.json
index 1ad7a6209f5..dbb365f5649 100644
--- a/components-starter/camel-jackson3-starter/src/main/docs/jackson3.json
+++ b/components-starter/camel-jackson3-starter/src/main/docs/jackson3.json
@@ -69,13 +69,13 @@
{
"name": "camel.dataformat.jackson.disable-features",
"type": "java.lang.String",
- "description": "Set of features to disable on the Jackson
com.fasterxml.jackson.databind.ObjectMapper. Multiple features can be separated
by comma.",
+ "description": "Set of features to disable on the Jackson
com.fasterxml.jackson.databind.ObjectMapper. Multiple features can be separated
by comma. When using Jackson 3, a feature can be qualified with its enum class
name (e.g. SerializationFeature.WRAP_ROOT_VALUE) to tell apart features with
the same name.",
"sourceType":
"org.apache.camel.component.jackson3.springboot.JacksonDataFormatConfiguration"
},
{
"name": "camel.dataformat.jackson.enable-features",
"type": "java.lang.String",
- "description": "Set of features to enable on the Jackson
com.fasterxml.jackson.databind.ObjectMapper. Multiple features can be separated
by comma.",
+ "description": "Set of features to enable on the Jackson
com.fasterxml.jackson.databind.ObjectMapper. Multiple features can be separated
by comma. When using Jackson 3, a feature can be qualified with its enum class
name (e.g. SerializationFeature.WRAP_ROOT_VALUE) to tell apart features with
the same name.",
"sourceType":
"org.apache.camel.component.jackson3.springboot.JacksonDataFormatConfiguration"
},
{
diff --git
a/components-starter/camel-jackson3-starter/src/main/java/org/apache/camel/component/jackson3/springboot/JacksonDataFormatConfiguration.java
b/components-starter/camel-jackson3-starter/src/main/java/org/apache/camel/component/jackson3/springboot/JacksonDataFormatConfiguration.java
index e1b26a67c6f..8545934e282 100644
---
a/components-starter/camel-jackson3-starter/src/main/java/org/apache/camel/component/jackson3/springboot/JacksonDataFormatConfiguration.java
+++
b/components-starter/camel-jackson3-starter/src/main/java/org/apache/camel/component/jackson3/springboot/JacksonDataFormatConfiguration.java
@@ -104,13 +104,17 @@ public class JacksonDataFormatConfiguration
/**
* Set of features to enable on the Jackson
* com.fasterxml.jackson.databind.ObjectMapper. Multiple features can be
- * separated by comma.
+ * separated by comma. When using Jackson 3, a feature can be qualified
with
+ * its enum class name (e.g. SerializationFeature.WRAP_ROOT_VALUE) to tell
+ * apart features with the same name.
*/
private String enableFeatures;
/**
* Set of features to disable on the Jackson
* com.fasterxml.jackson.databind.ObjectMapper. Multiple features can be
- * separated by comma.
+ * separated by comma. When using Jackson 3, a feature can be qualified
with
+ * its enum class name (e.g. SerializationFeature.WRAP_ROOT_VALUE) to tell
+ * apart features with the same name.
*/
private String disableFeatures;
/**
diff --git a/components-starter/camel-spiffe-starter/src/main/docs/spiffe.json
b/components-starter/camel-spiffe-starter/src/main/docs/spiffe.json
index 53f60e90607..235bfcf63c5 100644
--- a/components-starter/camel-spiffe-starter/src/main/docs/spiffe.json
+++ b/components-starter/camel-spiffe-starter/src/main/docs/spiffe.json
@@ -75,6 +75,13 @@
"type": "io.spiffe.workloadapi.WorkloadApiClient",
"description": "An existing WorkloadApiClient to use. When set, the
component does not create or close its own client and spiffeSocketPath is
ignored. The option is a io.spiffe.workloadapi.WorkloadApiClient type.",
"sourceType":
"org.apache.camel.component.spiffe.springboot.SpiffeComponentConfiguration"
+ },
+ {
+ "name": "camel.component.spiffe.x509-response",
+ "type": "org.apache.camel.component.spiffe.SpiffeX509Response",
+ "description": "What the fetchX509Svid operation returns in the message
body. Defaults to chain: the X.509 certificate chain without the private key,
so a route never handles key material unless it asks for it. Choose svid to get
the whole X509Svid including the private key (needed for programmatic mTLS), or
id to leave the body untouched. The SPIFFE ID and expiry are exposed through
the CamelSpiffeSpiffeId and CamelSpiffeExpiry headers in every case.",
+ "sourceType":
"org.apache.camel.component.spiffe.springboot.SpiffeComponentConfiguration",
+ "defaultValue": "chain"
}
],
"hints": [],
diff --git
a/components-starter/camel-spiffe-starter/src/main/java/org/apache/camel/component/spiffe/springboot/SpiffeComponentConfiguration.java
b/components-starter/camel-spiffe-starter/src/main/java/org/apache/camel/component/spiffe/springboot/SpiffeComponentConfiguration.java
index 2f379f95756..39391cf75df 100644
---
a/components-starter/camel-spiffe-starter/src/main/java/org/apache/camel/component/spiffe/springboot/SpiffeComponentConfiguration.java
+++
b/components-starter/camel-spiffe-starter/src/main/java/org/apache/camel/component/spiffe/springboot/SpiffeComponentConfiguration.java
@@ -20,6 +20,7 @@ import io.spiffe.workloadapi.WorkloadApiClient;
import org.apache.camel.component.spiffe.SpiffeComponent;
import org.apache.camel.component.spiffe.SpiffeConfiguration;
import org.apache.camel.component.spiffe.SpiffeOperation;
+import org.apache.camel.component.spiffe.SpiffeX509Response;
import org.apache.camel.spring.boot.ComponentConfigurationPropertiesCommon;
import org.springframework.boot.context.properties.ConfigurationProperties;
@@ -97,6 +98,16 @@ public class SpiffeComponentConfiguration
* the SPIFFE_ENDPOINT_SOCKET environment variable is used.
*/
private String spiffeSocketPath;
+ /**
+ * What the fetchX509Svid operation returns in the message body. Defaults
to
+ * chain: the X.509 certificate chain without the private key, so a route
+ * never handles key material unless it asks for it. Choose svid to get the
+ * whole X509Svid including the private key (needed for programmatic mTLS),
+ * or id to leave the body untouched. The SPIFFE ID and expiry are exposed
+ * through the CamelSpiffeSpiffeId and CamelSpiffeExpiry headers in every
+ * case.
+ */
+ private SpiffeX509Response x509Response = SpiffeX509Response.chain;
public String getAudience() {
return audience;
@@ -161,4 +172,12 @@ public class SpiffeComponentConfiguration
public void setSpiffeSocketPath(String spiffeSocketPath) {
this.spiffeSocketPath = spiffeSocketPath;
}
+
+ public SpiffeX509Response getX509Response() {
+ return x509Response;
+ }
+
+ public void setX509Response(SpiffeX509Response x509Response) {
+ this.x509Response = x509Response;
+ }
}
\ No newline at end of file
diff --git a/docs/spring-boot/modules/ROOT/pages/starters/jackson.adoc
b/docs/spring-boot/modules/ROOT/pages/starters/jackson.adoc
index 608798dc9d8..1137d27b004 100644
--- a/docs/spring-boot/modules/ROOT/pages/starters/jackson.adoc
+++ b/docs/spring-boot/modules/ROOT/pages/starters/jackson.adoc
@@ -35,8 +35,8 @@ The starter supports 23 options, which are listed below.
| camel.dataformat.jackson.collection-type | Refers to a custom collection
type to lookup in the registry to use. This option should rarely be used, but
allows using different collection types than java.util.Collection based as
default. | | String
| camel.dataformat.jackson.combine-unicode-surrogates | Force generator that
outputs JSON content to combine surrogate pairs (if any) into 4-byte
characters. This should be preferred when using 4-byte characters such as
Japanese. | false | Boolean
| camel.dataformat.jackson.content-type-header | Whether the data format
should set the Content-Type header with the type from the data format. For
example application/xml for data formats marshalling to XML, or
application/json for data formats marshalling to JSON | true | Boolean
-| camel.dataformat.jackson.disable-features | Set of features to disable on
the Jackson com.fasterxml.jackson.databind.ObjectMapper. Multiple features can
be separated by comma. | | String
-| camel.dataformat.jackson.enable-features | Set of features to enable on the
Jackson com.fasterxml.jackson.databind.ObjectMapper. Multiple features can be
separated by comma. | | String
+| camel.dataformat.jackson.disable-features | Set of features to disable on
the Jackson com.fasterxml.jackson.databind.ObjectMapper. Multiple features can
be separated by comma. When using Jackson 3, a feature can be qualified with
its enum class name (e.g. SerializationFeature.WRAP_ROOT_VALUE) to tell apart
features with the same name. | | String
+| camel.dataformat.jackson.enable-features | Set of features to enable on the
Jackson com.fasterxml.jackson.databind.ObjectMapper. Multiple features can be
separated by comma. When using Jackson 3, a feature can be qualified with its
enum class name (e.g. SerializationFeature.WRAP_ROOT_VALUE) to tell apart
features with the same name. | | String
| camel.dataformat.jackson.enabled | Whether to enable auto configuration of
the jackson data format. This is enabled by default. | | Boolean
| camel.dataformat.jackson.include | If you want to marshal a POJO to JSON,
and the POJO has some fields with null values. And you want to skip these null
values, you can set this option to NON_NULL. | | String
| camel.dataformat.jackson.json-view | When marshalling a POJO to JSON you
might want to exclude certain fields from the JSON output. With Jackson you can
use JSON views to accomplish this. This option is to refer to the class which
has JsonView annotations. | | String
diff --git a/docs/spring-boot/modules/ROOT/pages/starters/jackson3.adoc
b/docs/spring-boot/modules/ROOT/pages/starters/jackson3.adoc
index fa55fd782a4..dedfe826f96 100644
--- a/docs/spring-boot/modules/ROOT/pages/starters/jackson3.adoc
+++ b/docs/spring-boot/modules/ROOT/pages/starters/jackson3.adoc
@@ -35,8 +35,8 @@ The starter supports 23 options, which are listed below.
| camel.dataformat.jackson.collection-type | Refers to a custom collection
type to lookup in the registry to use. This option should rarely be used, but
allows using different collection types than java.util.Collection based as
default. | | String
| camel.dataformat.jackson.combine-unicode-surrogates | Force generator that
outputs JSON content to combine surrogate pairs (if any) into 4-byte
characters. This should be preferred when using 4-byte characters such as
Japanese. | false | Boolean
| camel.dataformat.jackson.content-type-header | Whether the data format
should set the Content-Type header with the type from the data format. For
example application/xml for data formats marshalling to XML, or
application/json for data formats marshalling to JSON | true | Boolean
-| camel.dataformat.jackson.disable-features | Set of features to disable on
the Jackson com.fasterxml.jackson.databind.ObjectMapper. Multiple features can
be separated by comma. | | String
-| camel.dataformat.jackson.enable-features | Set of features to enable on the
Jackson com.fasterxml.jackson.databind.ObjectMapper. Multiple features can be
separated by comma. | | String
+| camel.dataformat.jackson.disable-features | Set of features to disable on
the Jackson com.fasterxml.jackson.databind.ObjectMapper. Multiple features can
be separated by comma. When using Jackson 3, a feature can be qualified with
its enum class name (e.g. SerializationFeature.WRAP_ROOT_VALUE) to tell apart
features with the same name. | | String
+| camel.dataformat.jackson.enable-features | Set of features to enable on the
Jackson com.fasterxml.jackson.databind.ObjectMapper. Multiple features can be
separated by comma. When using Jackson 3, a feature can be qualified with its
enum class name (e.g. SerializationFeature.WRAP_ROOT_VALUE) to tell apart
features with the same name. | | String
| camel.dataformat.jackson.enabled | Whether to enable auto configuration of
the jackson data format. This is enabled by default. | | Boolean
| camel.dataformat.jackson.include | If you want to marshal a POJO to JSON,
and the POJO has some fields with null values. And you want to skip these null
values, you can set this option to NON_NULL. | | String
| camel.dataformat.jackson.json-view | When marshalling a POJO to JSON you
might want to exclude certain fields from the JSON output. With Jackson you can
use JSON views to accomplish this. This option is to refer to the class which
has JsonView annotations. | | String
diff --git a/docs/spring-boot/modules/ROOT/pages/starters/spiffe.adoc
b/docs/spring-boot/modules/ROOT/pages/starters/spiffe.adoc
index 5aafbfb10bf..7cd787f14ec 100644
--- a/docs/spring-boot/modules/ROOT/pages/starters/spiffe.adoc
+++ b/docs/spring-boot/modules/ROOT/pages/starters/spiffe.adoc
@@ -23,7 +23,7 @@ Please refer to the above links for usage and configuration
details.
== Spring Boot Auto-Configuration
-The starter supports 9 options, which are listed below.
+The starter supports 10 options, which are listed below.
[width="100%",cols="2,5,^1,2",options="header"]
|===
@@ -37,4 +37,5 @@ The starter supports 9 options, which are listed below.
| camel.component.spiffe.operation | The operation to perform on the SPIFFE
Workload API. | fetchx509svid | SpiffeOperation
| camel.component.spiffe.spiffe-socket-path | The address of the SPIFFE
Workload API endpoint (for example \{code unix:///tmp/agent.sock} or \{code
tcp://127.0.0.1:8082}). When not set, the SPIFFE_ENDPOINT_SOCKET environment
variable is used. | | String
| camel.component.spiffe.workload-api-client | An existing WorkloadApiClient
to use. When set, the component does not create or close its own client and
spiffeSocketPath is ignored. The option is a
io.spiffe.workloadapi.WorkloadApiClient type. | | WorkloadApiClient
+| camel.component.spiffe.x509-response | What the fetchX509Svid operation
returns in the message body. Defaults to chain: the X.509 certificate chain
without the private key, so a route never handles key material unless it asks
for it. Choose svid to get the whole X509Svid including the private key (needed
for programmatic mTLS), or id to leave the body untouched. The SPIFFE ID and
expiry are exposed through the CamelSpiffeSpiffeId and CamelSpiffeExpiry
headers in every case. | chain | S [...]
|===
