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.git
commit 244161aecbf4302946695f891806dda0fd49bc2b Author: Claus Ibsen <[email protected]> AuthorDate: Mon Nov 20 13:16:45 2023 +0100 CAMEL-20056: make it possible to set multiple headers at once. --- .../apache/camel/model/SetHeadersDefinition.java | 8 +++---- .../apache/camel/reifier/SetHeadersReifier.java | 8 +++---- .../camel/model/SetHeadersDefinitionTest.java | 18 +++++++------- .../java/org/apache/camel/xml/in/ModelParser.java | 2 +- .../java/org/apache/camel/xml/out/ModelWriter.java | 2 +- .../org/apache/camel/yaml/out/ModelWriter.java | 2 +- .../dsl/yaml/deserializers/ModelDeserializers.java | 10 ++++---- .../apache/camel/dsl/yaml/SetHeadersTest.groovy | 28 +++++++++++----------- 8 files changed, 39 insertions(+), 39 deletions(-) diff --git a/core/camel-core-model/src/main/java/org/apache/camel/model/SetHeadersDefinition.java b/core/camel-core-model/src/main/java/org/apache/camel/model/SetHeadersDefinition.java index 24052f791f9..08fe85ba65c 100644 --- a/core/camel-core-model/src/main/java/org/apache/camel/model/SetHeadersDefinition.java +++ b/core/camel-core-model/src/main/java/org/apache/camel/model/SetHeadersDefinition.java @@ -79,12 +79,12 @@ public class SetHeadersDefinition extends ProcessorDefinition<SetHeadersDefiniti } } - public void setSetHeaderDefinitions(List<SetHeaderDefinition> definitions) { - this.headers = definitions; + public List<SetHeaderDefinition> getHeaders() { + return headers; } - public List<SetHeaderDefinition> getSetHeaderDefinitions() { - return this.headers; + public void setHeaders(List<SetHeaderDefinition> headers) { + this.headers = headers; } @Override diff --git a/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/SetHeadersReifier.java b/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/SetHeadersReifier.java index 3f97d2bae3b..236726f536b 100644 --- a/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/SetHeadersReifier.java +++ b/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/SetHeadersReifier.java @@ -35,12 +35,12 @@ public class SetHeadersReifier extends ProcessorReifier<SetHeadersDefinition> { @Override public Processor createProcessor() throws Exception { - if (definition.getSetHeaderDefinitions().isEmpty()) { + if (definition.getHeaders().isEmpty()) { throw new IllegalArgumentException("There must be at least one header specified"); } - List<Expression> nameExprs = new java.util.ArrayList<>(definition.getSetHeaderDefinitions().size()); - List<Expression> valueExprs = new java.util.ArrayList<>(definition.getSetHeaderDefinitions().size()); - for (SetHeaderDefinition hdrDef : definition.getSetHeaderDefinitions()) { + List<Expression> nameExprs = new java.util.ArrayList<>(definition.getHeaders().size()); + List<Expression> valueExprs = new java.util.ArrayList<>(definition.getHeaders().size()); + for (SetHeaderDefinition hdrDef : definition.getHeaders()) { valueExprs.add(createExpression(hdrDef.getExpression())); Expression nameExpr; String key = parseString(hdrDef.getName()); diff --git a/core/camel-core/src/test/java/org/apache/camel/model/SetHeadersDefinitionTest.java b/core/camel-core/src/test/java/org/apache/camel/model/SetHeadersDefinitionTest.java index a9074a9f667..077dc39326a 100644 --- a/core/camel-core/src/test/java/org/apache/camel/model/SetHeadersDefinitionTest.java +++ b/core/camel-core/src/test/java/org/apache/camel/model/SetHeadersDefinitionTest.java @@ -33,9 +33,9 @@ class SetHeadersDefinitionTest extends TestSupport { headerMap.put("isCamel", ExpressionNodeHelper.toExpressionDefinition(body().contains("Camel"))); headerMap.put("isHorse", ExpressionNodeHelper.toExpressionDefinition(body().contains("Horse"))); SetHeadersDefinition setHeadersDef = new SetHeadersDefinition(headerMap); - assertNotNull(setHeadersDef.getSetHeaderDefinitions()); - assertEquals(3, setHeadersDef.getSetHeaderDefinitions().size()); - assertEquals("isCamel", setHeadersDef.getSetHeaderDefinitions().get(1).getName()); + assertNotNull(setHeadersDef.getHeaders()); + assertEquals(3, setHeadersDef.getHeaders().size()); + assertEquals("isCamel", setHeadersDef.getHeaders().get(1).getName()); } @Test @@ -44,17 +44,17 @@ class SetHeadersDefinitionTest extends TestSupport { "fromBody", body(), "isCamel", ExpressionNodeHelper.toExpressionDefinition(body().contains("Camel")), "isHorse", ExpressionNodeHelper.toExpressionDefinition(body().contains("Camel"))); - assertNotNull(setHeadersDef.getSetHeaderDefinitions()); - assertEquals(3, setHeadersDef.getSetHeaderDefinitions().size()); - assertEquals("isCamel", setHeadersDef.getSetHeaderDefinitions().get(1).getName()); + assertNotNull(setHeadersDef.getHeaders()); + assertEquals(3, setHeadersDef.getHeaders().size()); + assertEquals("isCamel", setHeadersDef.getHeaders().get(1).getName()); } @Test void testSetFromOnePair() { SetHeadersDefinition setHeadersDef = new SetHeadersDefinition("fromBody", body()); - assertNotNull(setHeadersDef.getSetHeaderDefinitions()); - assertEquals(1, setHeadersDef.getSetHeaderDefinitions().size()); - assertEquals("fromBody", setHeadersDef.getSetHeaderDefinitions().get(0).getName()); + assertNotNull(setHeadersDef.getHeaders()); + assertEquals(1, setHeadersDef.getHeaders().size()); + assertEquals("fromBody", setHeadersDef.getHeaders().get(0).getName()); } } diff --git a/core/camel-xml-io/src/generated/java/org/apache/camel/xml/in/ModelParser.java b/core/camel-xml-io/src/generated/java/org/apache/camel/xml/in/ModelParser.java index ec3756f7713..863b7371650 100644 --- a/core/camel-xml-io/src/generated/java/org/apache/camel/xml/in/ModelParser.java +++ b/core/camel-xml-io/src/generated/java/org/apache/camel/xml/in/ModelParser.java @@ -1298,7 +1298,7 @@ public class ModelParser extends BaseParser { return doParse(new SetHeadersDefinition(), processorDefinitionAttributeHandler(), (def, key) -> { if ("setHeader".equals(key)) { - doAdd(doParseSetHeaderDefinition(), def.getSetHeaderDefinitions(), def::setSetHeaderDefinitions); + doAdd(doParseSetHeaderDefinition(), def.getHeaders(), def::setHeaders); return true; } return optionalIdentifiedDefinitionElementHandler().accept(def, key); diff --git a/core/camel-xml-io/src/generated/java/org/apache/camel/xml/out/ModelWriter.java b/core/camel-xml-io/src/generated/java/org/apache/camel/xml/out/ModelWriter.java index 66f7b7f9840..c77a4b7ce63 100644 --- a/core/camel-xml-io/src/generated/java/org/apache/camel/xml/out/ModelWriter.java +++ b/core/camel-xml-io/src/generated/java/org/apache/camel/xml/out/ModelWriter.java @@ -2191,7 +2191,7 @@ public class ModelWriter extends BaseWriter { throws IOException { startElement(name); doWriteProcessorDefinitionAttributes(def); - doWriteList(null, null, def.getSetHeaderDefinitions(), this::doWriteSetHeaderDefinitionRef); + doWriteList(null, null, def.getHeaders(), this::doWriteSetHeaderDefinitionRef); endElement(name); } protected void doWriteSetPropertyDefinition( diff --git a/core/camel-yaml-io/src/generated/java/org/apache/camel/yaml/out/ModelWriter.java b/core/camel-yaml-io/src/generated/java/org/apache/camel/yaml/out/ModelWriter.java index 468876779d2..ef65f7267bd 100644 --- a/core/camel-yaml-io/src/generated/java/org/apache/camel/yaml/out/ModelWriter.java +++ b/core/camel-yaml-io/src/generated/java/org/apache/camel/yaml/out/ModelWriter.java @@ -2191,7 +2191,7 @@ public class ModelWriter extends BaseWriter { throws IOException { startElement(name); doWriteProcessorDefinitionAttributes(def); - doWriteList(null, null, def.getSetHeaderDefinitions(), this::doWriteSetHeaderDefinitionRef); + doWriteList(null, null, def.getHeaders(), this::doWriteSetHeaderDefinitionRef); endElement(name); } protected void doWriteSetPropertyDefinition( diff --git a/dsl/camel-yaml-dsl/camel-yaml-dsl-deserializers/src/generated/java/org/apache/camel/dsl/yaml/deserializers/ModelDeserializers.java b/dsl/camel-yaml-dsl/camel-yaml-dsl-deserializers/src/generated/java/org/apache/camel/dsl/yaml/deserializers/ModelDeserializers.java index fb025af0711..43a1d5b79db 100644 --- a/dsl/camel-yaml-dsl/camel-yaml-dsl-deserializers/src/generated/java/org/apache/camel/dsl/yaml/deserializers/ModelDeserializers.java +++ b/dsl/camel-yaml-dsl/camel-yaml-dsl-deserializers/src/generated/java/org/apache/camel/dsl/yaml/deserializers/ModelDeserializers.java @@ -15627,16 +15627,16 @@ public final class ModelDeserializers extends YamlDeserializerSupport { target.setDisabled(val); break; } + case "headers": { + java.util.List<org.apache.camel.model.SetHeaderDefinition> val = asFlatList(node, org.apache.camel.model.SetHeaderDefinition.class); + target.setHeaders(val); + break; + } case "inherit-error-handler": { String val = asText(node); target.setInheritErrorHandler(java.lang.Boolean.valueOf(val)); break; } - case "headers": { - java.util.List<org.apache.camel.model.SetHeaderDefinition> val = asFlatList(node, org.apache.camel.model.SetHeaderDefinition.class); - target.setSetHeaderDefinitions(val); - break; - } case "id": { String val = asText(node); target.setId(val); diff --git a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/SetHeadersTest.groovy b/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/SetHeadersTest.groovy index df1c0d2e7e3..6fed86c86af 100644 --- a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/SetHeadersTest.groovy +++ b/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/SetHeadersTest.groovy @@ -27,9 +27,9 @@ import org.junit.jupiter.api.Assertions class SetHeadersTest extends YamlTestSupport { - def "setHeaders definition" () { + def "setHeaders definition"() { when: - loadRoutes ''' + loadRoutes ''' - from: uri: "direct:start" steps: @@ -43,21 +43,21 @@ class SetHeadersTest extends YamlTestSupport { ''' then: with(context.routeDefinitions[0].outputs[0], SetHeadersDefinition) { - with(setHeaderDefinitions[0], SetHeaderDefinition) { - name == 'testbody' - with(expression, ExpressionDefinition) { - language == 'simple' - expression == '${body}' - } + with(it.headers[0], SetHeaderDefinition) { + name == 'testbody' + with(expression, ExpressionDefinition) { + language == 'simple' + expression == '${body}' } - with(setHeaderDefinitions[1], SetHeaderDefinition) { - name == 'testconstant' - with(expression, ExpressionDefinition) { - language == 'constant' - expression == "ABC" - } + } + with(it.headers[1], SetHeaderDefinition) { + name == 'testconstant' + with(expression, ExpressionDefinition) { + language == 'constant' + expression == "ABC" } } } + } }
