This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch CAMEL-27269 in repository https://gitbox.apache.org/repos/asf/camel.git
commit 14fb47972cba5fb703ee80c4345b93ce3a943b70 Author: Claus Ibsen <[email protected]> AuthorDate: Fri Nov 20 07:45:55 2026 +0100 CAMEL-27269: camel-core - add the application-x-unchanged data type, which leaves the message as it is A Kamelet that leaves the body as it is, or does not read it (a filter, an action that sets headers, log-sink, an AWS sink that ignores the body), could not declare data types, as no data type transformer does nothing. Add the core data type application-x-unchanged: it leaves the body, its type and the headers as they are and sets no Content-Type. Its @BodyTypes say any in and unchanged out, which the YAML body type validator already reads as the body after the Kamelet being the body before it. It is one of the default transformers, is in the catalog, and the body types page mentions it with the Kamelets. Co-Authored-By: Claude Opus 5.5 <[email protected]> Signed-off-by: Claus Ibsen <[email protected]> --- .../apache/camel/catalog/transformers.properties | 1 + .../transformers/application-x-unchanged.json | 28 ++++++ .../org/apache/camel/transformer.properties | 2 +- .../camel/transformer/application-x-unchanged | 2 + .../camel/transformer/application-x-unchanged.json | 28 ++++++ .../transformer/DefaultTransformerLoader.java | 3 +- ...ader.java => UnchangedDataTypeTransformer.java} | 33 +++---- .../UnchangedDataTypeTransformerTest.java | 110 +++++++++++++++++++++ .../user-manual/modules/ROOT/pages/body-types.adoc | 4 + .../camel/dsl/yaml/validator/TextBodyFlowTest.java | 33 +++++++ 10 files changed, 222 insertions(+), 22 deletions(-) diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/transformers.properties b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/transformers.properties index 27f80f83f418..1be4ffd5ff4a 100644 --- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/transformers.properties +++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/transformers.properties @@ -3,6 +3,7 @@ application-json application-octet-stream application-x-java-object application-x-struct +application-x-unchanged avro-binary avro-x-java-object avro-x-struct diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/transformers/application-x-unchanged.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/transformers/application-x-unchanged.json new file mode 100644 index 000000000000..eeaf66ea86c9 --- /dev/null +++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/transformers/application-x-unchanged.json @@ -0,0 +1,28 @@ +{ + "transformer": { + "kind": "transformer", + "name": "application-x-unchanged", + "title": "Application X Unchanged", + "description": "Leaves the body and the headers as they are", + "deprecated": false, + "javaType": "org.apache.camel.processor.transformer.UnchangedDataTypeTransformer", + "groupId": "org.apache.camel", + "artifactId": "camel-core-processor", + "version": "4.24.0-SNAPSHOT" + }, + "bodyTypes": { + "transformerIn": { + "carriers": [ + "any" + ], + "description": "Any body, which is not read" + }, + "transformerOut": { + "carriers": [ + "unchanged" + ], + "description": "The body as it was" + } + } +} + diff --git a/core/camel-core-processor/src/generated/resources/META-INF/services/org/apache/camel/transformer.properties b/core/camel-core-processor/src/generated/resources/META-INF/services/org/apache/camel/transformer.properties index b2f1cb387df9..ea92a2aefe2d 100644 --- a/core/camel-core-processor/src/generated/resources/META-INF/services/org/apache/camel/transformer.properties +++ b/core/camel-core-processor/src/generated/resources/META-INF/services/org/apache/camel/transformer.properties @@ -1,5 +1,5 @@ # Generated by camel build tools - do NOT edit this file! -transformers=application-octet-stream text-plain +transformers=application-octet-stream application-x-unchanged text-plain groupId=org.apache.camel artifactId=camel-core-processor version=4.24.0-SNAPSHOT diff --git a/core/camel-core-processor/src/generated/resources/META-INF/services/org/apache/camel/transformer/application-x-unchanged b/core/camel-core-processor/src/generated/resources/META-INF/services/org/apache/camel/transformer/application-x-unchanged new file mode 100644 index 000000000000..8a7dea076f5c --- /dev/null +++ b/core/camel-core-processor/src/generated/resources/META-INF/services/org/apache/camel/transformer/application-x-unchanged @@ -0,0 +1,2 @@ +# Generated by camel build tools - do NOT edit this file! +class=org.apache.camel.processor.transformer.UnchangedDataTypeTransformer diff --git a/core/camel-core-processor/src/generated/resources/META-INF/services/org/apache/camel/transformer/application-x-unchanged.json b/core/camel-core-processor/src/generated/resources/META-INF/services/org/apache/camel/transformer/application-x-unchanged.json new file mode 100644 index 000000000000..eeaf66ea86c9 --- /dev/null +++ b/core/camel-core-processor/src/generated/resources/META-INF/services/org/apache/camel/transformer/application-x-unchanged.json @@ -0,0 +1,28 @@ +{ + "transformer": { + "kind": "transformer", + "name": "application-x-unchanged", + "title": "Application X Unchanged", + "description": "Leaves the body and the headers as they are", + "deprecated": false, + "javaType": "org.apache.camel.processor.transformer.UnchangedDataTypeTransformer", + "groupId": "org.apache.camel", + "artifactId": "camel-core-processor", + "version": "4.24.0-SNAPSHOT" + }, + "bodyTypes": { + "transformerIn": { + "carriers": [ + "any" + ], + "description": "Any body, which is not read" + }, + "transformerOut": { + "carriers": [ + "unchanged" + ], + "description": "The body as it was" + } + } +} + diff --git a/core/camel-core-processor/src/main/java/org/apache/camel/processor/transformer/DefaultTransformerLoader.java b/core/camel-core-processor/src/main/java/org/apache/camel/processor/transformer/DefaultTransformerLoader.java index 0b2cac86c5f2..0c4150fc6229 100644 --- a/core/camel-core-processor/src/main/java/org/apache/camel/processor/transformer/DefaultTransformerLoader.java +++ b/core/camel-core-processor/src/main/java/org/apache/camel/processor/transformer/DefaultTransformerLoader.java @@ -34,7 +34,8 @@ public class DefaultTransformerLoader extends Transformer implements Transformer public void load(TransformerRegistry registry) { Transformer[] defaultTransformers = new Transformer[] { new ByteArrayDataTypeTransformer(), - new StringDataTypeTransformer() + new StringDataTypeTransformer(), + new UnchangedDataTypeTransformer() }; for (Transformer defaultTransformer : defaultTransformers) { diff --git a/core/camel-core-processor/src/main/java/org/apache/camel/processor/transformer/DefaultTransformerLoader.java b/core/camel-core-processor/src/main/java/org/apache/camel/processor/transformer/UnchangedDataTypeTransformer.java similarity index 53% copy from core/camel-core-processor/src/main/java/org/apache/camel/processor/transformer/DefaultTransformerLoader.java copy to core/camel-core-processor/src/main/java/org/apache/camel/processor/transformer/UnchangedDataTypeTransformer.java index 0b2cac86c5f2..bd7e654cb73e 100644 --- a/core/camel-core-processor/src/main/java/org/apache/camel/processor/transformer/DefaultTransformerLoader.java +++ b/core/camel-core-processor/src/main/java/org/apache/camel/processor/transformer/UnchangedDataTypeTransformer.java @@ -14,36 +14,29 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.camel.processor.transformer; import org.apache.camel.Message; +import org.apache.camel.spi.BodyType; +import org.apache.camel.spi.BodyType.Carrier; +import org.apache.camel.spi.BodyTypes; import org.apache.camel.spi.DataType; +import org.apache.camel.spi.DataTypeTransformer; import org.apache.camel.spi.Transformer; -import org.apache.camel.spi.TransformerKey; -import org.apache.camel.spi.TransformerLoader; -import org.apache.camel.spi.TransformerRegistry; /** - * Transformer loader loads known default {@link Transformer} implementations. + * A data type that leaves the message as it is: the body, its type and the headers, with no Content-Type set. It is for + * a Kamelet that leaves the body as it is or does not read it, such as a filter or an action that sets headers, so it + * can declare its in and out data types, which tooling such as the YAML validator reads. */ -public class DefaultTransformerLoader extends Transformer implements TransformerLoader { - - @SuppressWarnings("resource") - @Override - public void load(TransformerRegistry registry) { - Transformer[] defaultTransformers = new Transformer[] { - new ByteArrayDataTypeTransformer(), - new StringDataTypeTransformer() - }; - - for (Transformer defaultTransformer : defaultTransformers) { - registry.put(TransformerKey.createFrom(defaultTransformer), defaultTransformer); - } - } +@DataTypeTransformer(name = "application-x-unchanged", + description = "Leaves the body and the headers as they are") +@BodyTypes(transformerIn = @BodyType(value = Carrier.ANY, description = "Any body, which is not read"), + transformerOut = @BodyType(value = Carrier.UNCHANGED, description = "The body as it was")) +public class UnchangedDataTypeTransformer extends Transformer { @Override public void transform(Message message, DataType from, DataType to) throws Exception { - // noop + // the message is left as it is } } diff --git a/core/camel-core/src/test/java/org/apache/camel/processor/transformer/UnchangedDataTypeTransformerTest.java b/core/camel-core/src/test/java/org/apache/camel/processor/transformer/UnchangedDataTypeTransformerTest.java new file mode 100644 index 000000000000..0ea09e870b3c --- /dev/null +++ b/core/camel-core/src/test/java/org/apache/camel/processor/transformer/UnchangedDataTypeTransformerTest.java @@ -0,0 +1,110 @@ +/* + * 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.processor.transformer; + +import java.util.List; +import java.util.Map; + +import org.apache.camel.ContextTestSupport; +import org.apache.camel.Exchange; +import org.apache.camel.builder.RouteBuilder; +import org.apache.camel.impl.engine.DefaultTransformerRegistry; +import org.apache.camel.spi.BodyType.Carrier; +import org.apache.camel.spi.BodyTypes; +import org.apache.camel.spi.DataType; +import org.apache.camel.spi.Transformer; +import org.apache.camel.spi.TransformerKey; +import org.apache.camel.support.DefaultExchange; +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertInstanceOf; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertSame; + +public class UnchangedDataTypeTransformerTest extends ContextTestSupport { + + private final UnchangedDataTypeTransformer transformer = new UnchangedDataTypeTransformer(); + + @Test + public void shouldLeaveTheMessageAsItIs() throws Exception { + Map<String, Object> body = Map.of("status", "ok"); + Exchange exchange = new DefaultExchange(context); + exchange.getMessage().setBody(body); + exchange.getMessage().setHeader("file", "test.txt"); + + transformer.transform(exchange.getMessage(), DataType.ANY, DataType.ANY); + + assertSame(body, exchange.getMessage().getBody()); + assertEquals("test.txt", exchange.getMessage().getHeader("file")); + assertNull(exchange.getMessage().getHeader(Exchange.CONTENT_TYPE)); + assertEquals(1, exchange.getMessage().getHeaders().size()); + } + + @Test + public void shouldKeepAnExistingContentType() throws Exception { + Exchange exchange = new DefaultExchange(context); + exchange.getMessage().setBody("{\"status\":\"ok\"}"); + exchange.getMessage().setHeader(Exchange.CONTENT_TYPE, "application/json"); + + transformer.transform(exchange.getMessage(), DataType.ANY, DataType.ANY); + + assertEquals("application/json", exchange.getMessage().getHeader(Exchange.CONTENT_TYPE)); + } + + @Test + public void shouldResolveTransformer() { + DefaultTransformerRegistry transformerRegistry = new DefaultTransformerRegistry(context); + for (String name : List.of("application-x-unchanged", "camel:application-x-unchanged")) { + Transformer resolved = transformerRegistry.resolveTransformer(new TransformerKey(name)); + assertNotNull(resolved, name); + assertInstanceOf(UnchangedDataTypeTransformer.class, resolved, name); + } + } + + @Test + public void theBodyTypesSayTheBody() { + // CAMEL-25928: any body in, and the body as it was out + BodyTypes bodyTypes = UnchangedDataTypeTransformer.class.getAnnotation(BodyTypes.class); + assertEquals(List.of(Carrier.ANY), List.of(bodyTypes.transformerIn().value())); + assertEquals(List.of(Carrier.UNCHANGED), List.of(bodyTypes.transformerOut().value())); + } + + @Test + public void shouldLeaveTheBodyInARoute() throws Exception { + getMockEndpoint("mock:result").expectedBodiesReceived(42); + getMockEndpoint("mock:result").message(0).body().isInstanceOf(Integer.class); + getMockEndpoint("mock:result").message(0).header(Exchange.CONTENT_TYPE).isNull(); + + template.sendBody("direct:start", 42); + + assertMockEndpointsSatisfied(); + } + + @Override + protected RouteBuilder createRouteBuilder() { + return new RouteBuilder() { + @Override + public void configure() { + from("direct:start") + .transformDataType("application-x-unchanged") + .to("mock:result"); + } + }; + } +} diff --git a/docs/user-manual/modules/ROOT/pages/body-types.adoc b/docs/user-manual/modules/ROOT/pages/body-types.adoc index 291bef09072b..abf010c61be5 100644 --- a/docs/user-manual/modules/ROOT/pages/body-types.adoc +++ b/docs/user-manual/modules/ROOT/pages/body-types.adoc @@ -257,6 +257,10 @@ spec: format: application-octet-stream ---- +A Kamelet that leaves the body as it is, or does not read it, such as a filter or an action that sets headers, can +declare the `application-x-unchanged` data type. Its transformer changes nothing and sets no `Content-Type`: it takes +any body, and the body after the Kamelet is the body before it. + The Camel CLI reads the data types of the Kamelets of the Kamelet catalog and of the project's own `.kamelet.yaml` files. The YAML validator walks a route that starts with `from: kamelet:aws-s3-source` with bytes. It reports a body that a Kamelet sink cannot take before a `to: kamelet:...`. `camel_catalog_kamelet_doc` lists the data types of a diff --git a/dsl/camel-yaml-dsl/camel-yaml-dsl-validator/src/test/java/org/apache/camel/dsl/yaml/validator/TextBodyFlowTest.java b/dsl/camel-yaml-dsl/camel-yaml-dsl-validator/src/test/java/org/apache/camel/dsl/yaml/validator/TextBodyFlowTest.java index b6b3e5ce0f54..f4584447f597 100644 --- a/dsl/camel-yaml-dsl/camel-yaml-dsl-validator/src/test/java/org/apache/camel/dsl/yaml/validator/TextBodyFlowTest.java +++ b/dsl/camel-yaml-dsl/camel-yaml-dsl-validator/src/test/java/org/apache/camel/dsl/yaml/validator/TextBodyFlowTest.java @@ -3081,6 +3081,7 @@ public class TextBodyFlowTest { Set.of(), Map.of(), null, Map.of(), Map.of(), Map.of("my-source", new ProjectFacts.KameletDataTypes(null, "application-octet-stream"), "my-sink", new ProjectFacts.KameletDataTypes("application-octet-stream", null), + "my-filter", new ProjectFacts.KameletDataTypes("application-x-unchanged", "application-x-unchanged"), "my-action", new ProjectFacts.KameletDataTypes("application-x-struct", "text-plain"), "my-events", new ProjectFacts.KameletDataTypes(null, "aws2-s3:application-cloudevents"))); @@ -3120,6 +3121,38 @@ public class TextBodyFlowTest { + " application-octet-stream)")); } + @Test + public void testAKameletThatLeavesTheBodyKeepsIt() { + // application-x-unchanged takes any body and leaves it: after the Kamelet the body is still parsed data + String fields = """ + - route: + from: + uri: file:inbox + steps: + - unmarshal: + json: {} + - kamelet: + name: my-filter + - setHeader: + name: status + simple: "${body[status]}" + """; + assertThat(lines(fields, KAMELETS)).isEmpty(); + String file = """ + - route: + from: + uri: file:inbox + steps: + - unmarshal: + json: {} + - kamelet: + name: my-filter + - to: file:outbox + """; + assertThat(lines(file, KAMELETS)).singleElement() + .satisfies(m -> assertThat(m).contains("to: file needs the body as text")); + } + @Test public void testAKameletStepLeavesItsOutDataType() { // text-plain makes the parsed data text again
