This is an automated email from the ASF dual-hosted git repository. Croway pushed a commit to branch camel-4.18.x in repository https://gitbox.apache.org/repos/asf/camel.git
commit 8d74cdca9befc74b49d9c52ac6a145be1d413e7d Author: Croway <[email protected]> AuthorDate: Thu May 14 17:47:04 2026 +0200 chore: camel-couchbase - align Exchange header constant values with Camel naming convention Rename the values of CouchbaseConstants headers (CCB_KEY, CCB_ID, CCB_TTL, CCB_DDN, CCB_VN) to follow the standard CamelCouchbase* naming convention so that HttpHeaderFilterStrategy blocks them on inbound HTTP requests. The constant field names are unchanged, so routes referencing the constants continue to work as-is. --- .../apache/camel/catalog/components/couchbase.json | 10 ++++---- .../camel/component/couchbase/couchbase.json | 10 ++++---- .../component/couchbase/CouchbaseConstants.java | 10 ++++---- .../component/couchbase/CouchbaseProducerTest.java | 2 +- .../dsl/CouchbaseEndpointBuilderFactory.java | 30 +++++++++++----------- 5 files changed, 31 insertions(+), 31 deletions(-) diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/couchbase.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/couchbase.json index 72f5cbfa6faa..71d1a989e174 100644 --- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/couchbase.json +++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/couchbase.json @@ -31,11 +31,11 @@ "healthCheckProducerEnabled": { "index": 4, "kind": "property", "displayName": "Health Check Producer Enabled", "group": "health", "label": "health", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Used for enabling or disabling all producer based health checks from this component. Notice: Camel has by default disabled all producer based health-checks. You can turn on producer [...] }, "headers": { - "CCB_KEY": { "index": 0, "kind": "header", "displayName": "", "group": "consumer", "label": "consumer", "required": false, "javaType": "String", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "The key", "constantName": "org.apache.camel.component.couchbase.CouchbaseConstants#HEADER_KEY" }, - "CCB_ID": { "index": 1, "kind": "header", "displayName": "", "group": "common", "label": "", "required": false, "javaType": "String", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "The document id", "constantName": "org.apache.camel.component.couchbase.CouchbaseConstants#HEADER_ID" }, - "CCB_TTL": { "index": 2, "kind": "header", "displayName": "", "group": "producer", "label": "producer", "required": false, "javaType": "String", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "The expiry for the document in seconds", "constantName": "org.apache.camel.component.couchbase.CouchbaseConstants#HEADER_TTL" }, - "CCB_DDN": { "index": 3, "kind": "header", "displayName": "", "group": "consumer", "label": "consumer", "required": false, "javaType": "String", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "The design document name", "constantName": "org.apache.camel.component.couchbase.CouchbaseConstants#HEADER_DESIGN_DOCUMENT_NAME" }, - "CCB_VN": { "index": 4, "kind": "header", "displayName": "", "group": "consumer", "label": "consumer", "required": false, "javaType": "String", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "The view name", "constantName": "org.apache.camel.component.couchbase.CouchbaseConstants#HEADER_VIEWNAME" }, + "CamelCouchbaseKey": { "index": 0, "kind": "header", "displayName": "", "group": "consumer", "label": "consumer", "required": false, "javaType": "String", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "The key", "constantName": "org.apache.camel.component.couchbase.CouchbaseConstants#HEADER_KEY" }, + "CamelCouchbaseId": { "index": 1, "kind": "header", "displayName": "", "group": "common", "label": "", "required": false, "javaType": "String", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "The document id", "constantName": "org.apache.camel.component.couchbase.CouchbaseConstants#HEADER_ID" }, + "CamelCouchbaseTtl": { "index": 2, "kind": "header", "displayName": "", "group": "producer", "label": "producer", "required": false, "javaType": "String", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "The expiry for the document in seconds", "constantName": "org.apache.camel.component.couchbase.CouchbaseConstants#HEADER_TTL" }, + "CamelCouchbaseDesignDocumentName": { "index": 3, "kind": "header", "displayName": "", "group": "consumer", "label": "consumer", "required": false, "javaType": "String", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "The design document name", "constantName": "org.apache.camel.component.couchbase.CouchbaseConstants#HEADER_DESIGN_DOCUMENT_NAME" }, + "CamelCouchbaseViewName": { "index": 4, "kind": "header", "displayName": "", "group": "consumer", "label": "consumer", "required": false, "javaType": "String", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "The view name", "constantName": "org.apache.camel.component.couchbase.CouchbaseConstants#HEADER_VIEWNAME" }, "CamelCqlResumeQuery": { "index": 5, "kind": "header", "displayName": "", "group": "consumer", "label": "consumer", "required": false, "javaType": "String", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "The resume action to execute when resuming.", "constantName": "org.apache.camel.component.couchbase.CouchbaseConstants#COUCHBASE_RESUME_ACTION" } }, "properties": { diff --git a/components/camel-couchbase/src/generated/resources/META-INF/org/apache/camel/component/couchbase/couchbase.json b/components/camel-couchbase/src/generated/resources/META-INF/org/apache/camel/component/couchbase/couchbase.json index 72f5cbfa6faa..71d1a989e174 100644 --- a/components/camel-couchbase/src/generated/resources/META-INF/org/apache/camel/component/couchbase/couchbase.json +++ b/components/camel-couchbase/src/generated/resources/META-INF/org/apache/camel/component/couchbase/couchbase.json @@ -31,11 +31,11 @@ "healthCheckProducerEnabled": { "index": 4, "kind": "property", "displayName": "Health Check Producer Enabled", "group": "health", "label": "health", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Used for enabling or disabling all producer based health checks from this component. Notice: Camel has by default disabled all producer based health-checks. You can turn on producer [...] }, "headers": { - "CCB_KEY": { "index": 0, "kind": "header", "displayName": "", "group": "consumer", "label": "consumer", "required": false, "javaType": "String", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "The key", "constantName": "org.apache.camel.component.couchbase.CouchbaseConstants#HEADER_KEY" }, - "CCB_ID": { "index": 1, "kind": "header", "displayName": "", "group": "common", "label": "", "required": false, "javaType": "String", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "The document id", "constantName": "org.apache.camel.component.couchbase.CouchbaseConstants#HEADER_ID" }, - "CCB_TTL": { "index": 2, "kind": "header", "displayName": "", "group": "producer", "label": "producer", "required": false, "javaType": "String", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "The expiry for the document in seconds", "constantName": "org.apache.camel.component.couchbase.CouchbaseConstants#HEADER_TTL" }, - "CCB_DDN": { "index": 3, "kind": "header", "displayName": "", "group": "consumer", "label": "consumer", "required": false, "javaType": "String", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "The design document name", "constantName": "org.apache.camel.component.couchbase.CouchbaseConstants#HEADER_DESIGN_DOCUMENT_NAME" }, - "CCB_VN": { "index": 4, "kind": "header", "displayName": "", "group": "consumer", "label": "consumer", "required": false, "javaType": "String", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "The view name", "constantName": "org.apache.camel.component.couchbase.CouchbaseConstants#HEADER_VIEWNAME" }, + "CamelCouchbaseKey": { "index": 0, "kind": "header", "displayName": "", "group": "consumer", "label": "consumer", "required": false, "javaType": "String", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "The key", "constantName": "org.apache.camel.component.couchbase.CouchbaseConstants#HEADER_KEY" }, + "CamelCouchbaseId": { "index": 1, "kind": "header", "displayName": "", "group": "common", "label": "", "required": false, "javaType": "String", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "The document id", "constantName": "org.apache.camel.component.couchbase.CouchbaseConstants#HEADER_ID" }, + "CamelCouchbaseTtl": { "index": 2, "kind": "header", "displayName": "", "group": "producer", "label": "producer", "required": false, "javaType": "String", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "The expiry for the document in seconds", "constantName": "org.apache.camel.component.couchbase.CouchbaseConstants#HEADER_TTL" }, + "CamelCouchbaseDesignDocumentName": { "index": 3, "kind": "header", "displayName": "", "group": "consumer", "label": "consumer", "required": false, "javaType": "String", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "The design document name", "constantName": "org.apache.camel.component.couchbase.CouchbaseConstants#HEADER_DESIGN_DOCUMENT_NAME" }, + "CamelCouchbaseViewName": { "index": 4, "kind": "header", "displayName": "", "group": "consumer", "label": "consumer", "required": false, "javaType": "String", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "The view name", "constantName": "org.apache.camel.component.couchbase.CouchbaseConstants#HEADER_VIEWNAME" }, "CamelCqlResumeQuery": { "index": 5, "kind": "header", "displayName": "", "group": "consumer", "label": "consumer", "required": false, "javaType": "String", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "The resume action to execute when resuming.", "constantName": "org.apache.camel.component.couchbase.CouchbaseConstants#COUCHBASE_RESUME_ACTION" } }, "properties": { diff --git a/components/camel-couchbase/src/main/java/org/apache/camel/component/couchbase/CouchbaseConstants.java b/components/camel-couchbase/src/main/java/org/apache/camel/component/couchbase/CouchbaseConstants.java index ad1ec3ad3f14..366ba4cd0233 100644 --- a/components/camel-couchbase/src/main/java/org/apache/camel/component/couchbase/CouchbaseConstants.java +++ b/components/camel-couchbase/src/main/java/org/apache/camel/component/couchbase/CouchbaseConstants.java @@ -32,15 +32,15 @@ public interface CouchbaseConstants { String DEFAULT_DESIGN_DOCUMENT_NAME = "beer"; String DEFAULT_VIEWNAME = "brewery_beers"; @Metadata(label = "consumer", description = "The key", javaType = "String") - String HEADER_KEY = "CCB_KEY"; + String HEADER_KEY = "CamelCouchbaseKey"; @Metadata(description = "The document id", javaType = "String") - String HEADER_ID = "CCB_ID"; + String HEADER_ID = "CamelCouchbaseId"; @Metadata(label = "producer", description = "The expiry for the document in seconds", javaType = "String") - String HEADER_TTL = "CCB_TTL"; + String HEADER_TTL = "CamelCouchbaseTtl"; @Metadata(label = "consumer", description = "The design document name", javaType = "String") - String HEADER_DESIGN_DOCUMENT_NAME = "CCB_DDN"; + String HEADER_DESIGN_DOCUMENT_NAME = "CamelCouchbaseDesignDocumentName"; @Metadata(label = "consumer", description = "The view name", javaType = "String") - String HEADER_VIEWNAME = "CCB_VN"; + String HEADER_VIEWNAME = "CamelCouchbaseViewName"; @Metadata(label = "consumer", description = "The resume action to execute when resuming.", javaType = "String") String COUCHBASE_RESUME_ACTION = "CamelCqlResumeQuery"; diff --git a/components/camel-couchbase/src/test/java/org/apache/camel/component/couchbase/CouchbaseProducerTest.java b/components/camel-couchbase/src/test/java/org/apache/camel/component/couchbase/CouchbaseProducerTest.java index bbb7ea1f1f73..10c36953751b 100644 --- a/components/camel-couchbase/src/test/java/org/apache/camel/component/couchbase/CouchbaseProducerTest.java +++ b/components/camel-couchbase/src/test/java/org/apache/camel/component/couchbase/CouchbaseProducerTest.java @@ -126,7 +126,7 @@ public class CouchbaseProducerTest { // Mock out some headers so we can set an expiry int expiry = 5000; Map<String, Object> testHeaders = new HashMap<>(); - testHeaders.put("CCB_TTL", Integer.toString(expiry)); + testHeaders.put(HEADER_TTL, Integer.toString(expiry)); when(msg.getHeaders()).thenReturn(testHeaders); when(collection.upsert(anyString(), any(), any())).thenReturn(response); when(msg.getHeader(HEADER_TTL, String.class)).thenReturn(Integer.toString(expiry)); diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/CouchbaseEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/CouchbaseEndpointBuilderFactory.java index 33fb59d6ccb8..b3d48d619e1a 100644 --- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/CouchbaseEndpointBuilderFactory.java +++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/CouchbaseEndpointBuilderFactory.java @@ -1780,10 +1780,10 @@ public interface CouchbaseEndpointBuilderFactory { * * Group: consumer * - * @return the name of the header {@code CCB_KEY}. + * @return the name of the header {@code CouchbaseKey}. */ - public String ccbKey() { - return "CCB_KEY"; + public String couchbaseKey() { + return "CamelCouchbaseKey"; } /** * The document id. @@ -1792,10 +1792,10 @@ public interface CouchbaseEndpointBuilderFactory { * * Group: common * - * @return the name of the header {@code CCB_ID}. + * @return the name of the header {@code CouchbaseId}. */ - public String ccbId() { - return "CCB_ID"; + public String couchbaseId() { + return "CamelCouchbaseId"; } /** * The expiry for the document in seconds. @@ -1804,10 +1804,10 @@ public interface CouchbaseEndpointBuilderFactory { * * Group: producer * - * @return the name of the header {@code CCB_TTL}. + * @return the name of the header {@code CouchbaseTtl}. */ - public String ccbTtl() { - return "CCB_TTL"; + public String couchbaseTtl() { + return "CamelCouchbaseTtl"; } /** * The design document name. @@ -1816,10 +1816,10 @@ public interface CouchbaseEndpointBuilderFactory { * * Group: consumer * - * @return the name of the header {@code CCB_DDN}. + * @return the name of the header {@code CouchbaseDesignDocumentName}. */ - public String ccbDdn() { - return "CCB_DDN"; + public String couchbaseDesignDocumentName() { + return "CamelCouchbaseDesignDocumentName"; } /** * The view name. @@ -1828,10 +1828,10 @@ public interface CouchbaseEndpointBuilderFactory { * * Group: consumer * - * @return the name of the header {@code CCB_VN}. + * @return the name of the header {@code CouchbaseViewName}. */ - public String ccbVn() { - return "CCB_VN"; + public String couchbaseViewName() { + return "CamelCouchbaseViewName"; } /** * The resume action to execute when resuming.
