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 28cded8ecb5 Regen
28cded8ecb5 is described below
commit 28cded8ecb510dd7a849f688778f184d830c2e14
Author: Claus Ibsen <[email protected]>
AuthorDate: Thu Jul 2 12:43:57 2026 +0200
Regen
---
.../camel/springboot/catalog/dataformats/pqc.json | 7 +++----
.../camel/springboot/catalog/dev-consoles.properties | 1 +
.../springboot/catalog/dev-consoles/heap-histogram.json | 15 +++++++++++++++
.../camel-pqc-starter/src/main/docs/pqc.json | 9 +--------
.../springboot/PQCDataFormatConfiguration.java | 17 ++++-------------
docs/spring-boot/modules/ROOT/pages/starters/pqc.adoc | 5 ++---
6 files changed, 26 insertions(+), 28 deletions(-)
diff --git
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/dataformats/pqc.json
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/dataformats/pqc.json
index 3b40f791fad..ef43becd955 100644
---
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/dataformats/pqc.json
+++
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/dataformats/pqc.json
@@ -18,11 +18,10 @@
"properties": {
"id": { "index": 0, "kind": "attribute", "displayName": "Id", "group":
"common", "required": false, "type": "string", "javaType": "java.lang.String",
"deprecated": false, "autowired": false, "secret": false, "description": "The
id of this node" },
"keyEncapsulationAlgorithm": { "index": 1, "kind": "attribute",
"displayName": "Key Encapsulation Algorithm", "group": "common", "required":
false, "type": "enum", "javaType": "java.lang.String", "enum": [ "MLKEM",
"BIKE", "HQC", "CMCE", "SABER", "FRODO", "NTRU", "NTRULPRime", "SNTRUPrime",
"KYBER" ], "deprecated": false, "autowired": false, "secret": false,
"defaultValue": "MLKEM", "description": "The Post-Quantum KEM algorithm to use
for key encapsulation." },
- "symmetricKeyAlgorithm": { "index": 2, "kind": "attribute", "displayName":
"Symmetric Key Algorithm", "group": "common", "required": false, "type":
"enum", "javaType": "java.lang.String", "enum": [ "AES", "ARIA", "RC2", "RC5",
"CAMELLIA", "CAST5", "CAST6", "CHACHA7539", "DSTU7624", "GOST28147",
"GOST3412_2015", "GRAIN128", "HC128", "HC256", "SALSA20", "SEED", "SM4",
"DESEDE" ], "deprecated": false, "autowired": false, "secret": false,
"defaultValue": "AES", "description": "The symmet [...]
+ "symmetricKeyAlgorithm": { "index": 2, "kind": "attribute", "displayName":
"Symmetric Key Algorithm", "group": "common", "required": false, "type":
"enum", "javaType": "java.lang.String", "enum": [ "AES", "ARIA", "CAMELLIA",
"CAST6", "DSTU7624", "GOST3412_2015", "SEED", "SM4", "CHACHA7539" ],
"deprecated": false, "autowired": false, "secret": false, "defaultValue":
"AES", "description": "The symmetric encryption algorithm to use with the
shared secret. Only algorithms that support au [...]
"symmetricKeyLength": { "index": 3, "kind": "attribute", "displayName":
"Symmetric Key Length", "group": "common", "required": false, "type":
"integer", "javaType": "java.lang.Integer", "deprecated": false, "autowired":
false, "secret": false, "defaultValue": 128, "description": "The length (in
bits) of the symmetric key." },
"keyPair": { "index": 4, "kind": "attribute", "displayName": "Key Pair",
"group": "common", "required": false, "type": "object", "javaType":
"java.security.KeyPair", "deprecated": false, "autowired": false, "secret":
false, "description": "Refers to the KeyPair to lookup from the registry to use
for KEM operations." },
- "bufferSize": { "index": 5, "kind": "attribute", "displayName": "Buffer
Size", "group": "advanced", "label": "advanced", "required": false, "type":
"integer", "javaType": "java.lang.Integer", "deprecated": false, "autowired":
false, "secret": false, "defaultValue": 4096, "description": "The size of the
buffer used for streaming encryption\/decryption." },
- "provider": { "index": 6, "kind": "attribute", "displayName": "Provider",
"group": "advanced", "label": "advanced", "required": false, "type": "string",
"javaType": "java.lang.String", "deprecated": false, "autowired": false,
"secret": false, "description": "The JCE security provider to use." },
- "keyGenerator": { "index": 7, "kind": "attribute", "displayName": "Key
Generator", "group": "advanced", "label": "advanced", "required": false,
"type": "object", "javaType": "javax.crypto.KeyGenerator", "deprecated": false,
"autowired": false, "secret": false, "description": "Refers to a custom
KeyGenerator to lookup from the registry for KEM operations." }
+ "provider": { "index": 5, "kind": "attribute", "displayName": "Provider",
"group": "advanced", "label": "advanced", "required": false, "type": "string",
"javaType": "java.lang.String", "deprecated": false, "autowired": false,
"secret": false, "description": "The JCE security provider to use." },
+ "keyGenerator": { "index": 6, "kind": "attribute", "displayName": "Key
Generator", "group": "advanced", "label": "advanced", "required": false,
"type": "object", "javaType": "javax.crypto.KeyGenerator", "deprecated": false,
"autowired": false, "secret": false, "description": "Refers to a custom
KeyGenerator to lookup from the registry for KEM operations." }
}
}
diff --git
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/dev-consoles.properties
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/dev-consoles.properties
index c15b6f1c4d1..b5143c854f9 100644
---
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/dev-consoles.properties
+++
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/dev-consoles.properties
@@ -18,6 +18,7 @@ gcp-secrets
groovy
hashicorp-secrets
health
+heap-histogram
inflight
internal-tasks
java-security
diff --git
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/dev-consoles/heap-histogram.json
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/dev-consoles/heap-histogram.json
new file mode 100644
index 00000000000..8e782605f61
--- /dev/null
+++
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/dev-consoles/heap-histogram.json
@@ -0,0 +1,15 @@
+{
+ "console": {
+ "kind": "console",
+ "group": "camel",
+ "name": "heap-histogram",
+ "title": "Heap Histogram",
+ "description": "Displays class-level heap memory usage",
+ "deprecated": false,
+ "javaType": "org.apache.camel.impl.console.HeapHistogramDevConsole",
+ "groupId": "org.apache.camel.springboot",
+ "artifactId": "camel-console-starter",
+ "version": "4.21.0-SNAPSHOT"
+ }
+}
+
diff --git a/components-starter/camel-pqc-starter/src/main/docs/pqc.json
b/components-starter/camel-pqc-starter/src/main/docs/pqc.json
index e547f31e856..2011c270788 100644
--- a/components-starter/camel-pqc-starter/src/main/docs/pqc.json
+++ b/components-starter/camel-pqc-starter/src/main/docs/pqc.json
@@ -199,13 +199,6 @@
"sourceType":
"org.apache.camel.component.pqc.springboot.PQCComponentConfiguration",
"defaultValue": 128
},
- {
- "name": "camel.dataformat.pqc.buffer-size",
- "type": "java.lang.Integer",
- "description": "The size of the buffer used for streaming
encryption\/decryption.",
- "sourceType":
"org.apache.camel.component.pqc.dataformat.springboot.PQCDataFormatConfiguration",
- "defaultValue": 4096
- },
{
"name": "camel.dataformat.pqc.customizer.enabled",
"type": "java.lang.Boolean",
@@ -245,7 +238,7 @@
{
"name": "camel.dataformat.pqc.symmetric-key-algorithm",
"type": "java.lang.String",
- "description": "The symmetric encryption algorithm to use with the
shared secret.",
+ "description": "The symmetric encryption algorithm to use with the
shared secret. Only algorithms that support authenticated encryption (AEAD) are
allowed: AES, ARIA, CAMELLIA, CAST6, DSTU7624, GOST3412_2015, SEED and SM4 are
encrypted with GCM, and CHACHA7539 with ChaCha20-Poly1305.",
"sourceType":
"org.apache.camel.component.pqc.dataformat.springboot.PQCDataFormatConfiguration",
"defaultValue": "AES"
},
diff --git
a/components-starter/camel-pqc-starter/src/main/java/org/apache/camel/component/pqc/dataformat/springboot/PQCDataFormatConfiguration.java
b/components-starter/camel-pqc-starter/src/main/java/org/apache/camel/component/pqc/dataformat/springboot/PQCDataFormatConfiguration.java
index 149d82ad27b..9c4475eaf4d 100644
---
a/components-starter/camel-pqc-starter/src/main/java/org/apache/camel/component/pqc/dataformat/springboot/PQCDataFormatConfiguration.java
+++
b/components-starter/camel-pqc-starter/src/main/java/org/apache/camel/component/pqc/dataformat/springboot/PQCDataFormatConfiguration.java
@@ -40,7 +40,10 @@ public class PQCDataFormatConfiguration
*/
private String keyEncapsulationAlgorithm = "MLKEM";
/**
- * The symmetric encryption algorithm to use with the shared secret.
+ * The symmetric encryption algorithm to use with the shared secret. Only
+ * algorithms that support authenticated encryption (AEAD) are allowed:
AES,
+ * ARIA, CAMELLIA, CAST6, DSTU7624, GOST3412_2015, SEED and SM4 are
+ * encrypted with GCM, and CHACHA7539 with ChaCha20-Poly1305.
*/
private String symmetricKeyAlgorithm = "AES";
/**
@@ -52,10 +55,6 @@ public class PQCDataFormatConfiguration
* operations. The option is a java.security.KeyPair type.
*/
private String keyPair;
- /**
- * The size of the buffer used for streaming encryption/decryption.
- */
- private Integer bufferSize = 4096;
/**
* The JCE security provider to use.
*/
@@ -98,14 +97,6 @@ public class PQCDataFormatConfiguration
this.keyPair = keyPair;
}
- public Integer getBufferSize() {
- return bufferSize;
- }
-
- public void setBufferSize(Integer bufferSize) {
- this.bufferSize = bufferSize;
- }
-
public String getProvider() {
return provider;
}
diff --git a/docs/spring-boot/modules/ROOT/pages/starters/pqc.adoc
b/docs/spring-boot/modules/ROOT/pages/starters/pqc.adoc
index 1be9ad636ba..7f4b55c7645 100644
--- a/docs/spring-boot/modules/ROOT/pages/starters/pqc.adoc
+++ b/docs/spring-boot/modules/ROOT/pages/starters/pqc.adoc
@@ -24,7 +24,7 @@ Please refer to the above links for usage and configuration
details.
== Spring Boot Auto-Configuration
-The starter supports 35 options, which are listed below.
+The starter supports 34 options, which are listed below.
[width="100%",cols="2,5,^1,2",options="header"]
|===
@@ -56,12 +56,11 @@ The starter supports 35 options, which are listed below.
| camel.component.pqc.strict-key-lifecycle | Whether to enforce key status
checks before cryptographic operations. When enabled, REVOKED keys are rejected
for all operations, EXPIRED keys are rejected for signing/encapsulation but
allowed for verification/extraction, and DEPRECATED keys produce a warning but
still function. Requires a KeyLifecycleManager and a CamelPQCKeyId header to be
set. | true | Boolean
| camel.component.pqc.symmetric-key-algorithm | In case we are using KEM
operations, we need a Symmetric algorithm to be defined for the flow to work. |
| String
| camel.component.pqc.symmetric-key-length | The required length of the
symmetric key used | 128 | Integer
-| camel.dataformat.pqc.buffer-size | The size of the buffer used for streaming
encryption/decryption. | 4096 | Integer
| camel.dataformat.pqc.enabled | Whether to enable auto configuration of the
pqc data format. This is enabled by default. | | Boolean
| camel.dataformat.pqc.key-encapsulation-algorithm | The Post-Quantum KEM
algorithm to use for key encapsulation. | MLKEM | String
| camel.dataformat.pqc.key-generator | Refers to a custom KeyGenerator to
lookup from the registry for KEM operations. The option is a
javax.crypto.KeyGenerator type. | | String
| camel.dataformat.pqc.key-pair | Refers to the KeyPair to lookup from the
registry to use for KEM operations. The option is a java.security.KeyPair type.
| | String
| camel.dataformat.pqc.provider | The JCE security provider to use. | | String
-| camel.dataformat.pqc.symmetric-key-algorithm | The symmetric encryption
algorithm to use with the shared secret. | AES | String
+| camel.dataformat.pqc.symmetric-key-algorithm | The symmetric encryption
algorithm to use with the shared secret. Only algorithms that support
authenticated encryption (AEAD) are allowed: AES, ARIA, CAMELLIA, CAST6,
DSTU7624, GOST3412_2015, SEED and SM4 are encrypted with GCM, and CHACHA7539
with ChaCha20-Poly1305. | AES | String
| camel.dataformat.pqc.symmetric-key-length | The length (in bits) of the
symmetric key. | 128 | Integer
|===
