This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel.git
commit e1f777d2da5f4c20739f603949a38807931b746b Author: Claus Ibsen <[email protected]> AuthorDate: Mon Apr 26 19:19:05 2021 +0200 CAMEL-16551: Fixed property placeholder not working in marshal/unmarshal (ref). --- .../dataformat/CustomDataFormatReifier.java | 3 +- .../impl/DataFormatPropertyPlaceholderTest.java | 78 ++++++++++++++++++++++ 2 files changed, 80 insertions(+), 1 deletion(-) diff --git a/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/dataformat/CustomDataFormatReifier.java b/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/dataformat/CustomDataFormatReifier.java index 32776e1..0c51e5e 100644 --- a/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/dataformat/CustomDataFormatReifier.java +++ b/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/dataformat/CustomDataFormatReifier.java @@ -31,7 +31,8 @@ public class CustomDataFormatReifier extends DataFormatReifier<CustomDataFormat> @Override protected DataFormat doCreateDataFormat() { - return DataFormatReifier.getDataFormat(camelContext, definition.getRef()); + String ref = parseString(definition.getRef()); + return DataFormatReifier.getDataFormat(camelContext, ref); } @Override diff --git a/core/camel-core/src/test/java/org/apache/camel/impl/DataFormatPropertyPlaceholderTest.java b/core/camel-core/src/test/java/org/apache/camel/impl/DataFormatPropertyPlaceholderTest.java new file mode 100644 index 0000000..a8363fc --- /dev/null +++ b/core/camel-core/src/test/java/org/apache/camel/impl/DataFormatPropertyPlaceholderTest.java @@ -0,0 +1,78 @@ +/* + * 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.impl; + +import java.util.Properties; + +import org.apache.camel.CamelContext; +import org.apache.camel.ContextTestSupport; +import org.apache.camel.builder.RouteBuilder; +import org.apache.camel.spi.Registry; +import org.junit.jupiter.api.Test; + +/** + * Unit test of the string data format. + */ +public class DataFormatPropertyPlaceholderTest extends ContextTestSupport { + + @Override + protected CamelContext createCamelContext() throws Exception { + CamelContext context = super.createCamelContext(); + Properties prop = new Properties(); + prop.put("myDataformat", "reverse"); + context.getPropertiesComponent().setInitialProperties(prop); + return context; + } + + @Override + protected Registry createRegistry() throws Exception { + Registry registry = super.createRegistry(); + registry.bind("reverse", new RefDataFormatTest.MyReverseDataFormat()); + return registry; + } + + @Test + public void testMarshalRef() throws Exception { + getMockEndpoint("mock:a").expectedBodiesReceived("CBA"); + + template.sendBody("direct:a", "ABC"); + + assertMockEndpointsSatisfied(); + } + + @Test + public void testUnmarshalRef() throws Exception { + getMockEndpoint("mock:b").expectedBodiesReceived("ABC"); + + template.sendBody("direct:b", "CBA"); + + assertMockEndpointsSatisfied(); + } + + @Override + protected RouteBuilder createRouteBuilder() throws Exception { + return new RouteBuilder() { + @Override + public void configure() throws Exception { + from("direct:a").marshal("{{myDataformat}}").to("mock:a"); + + from("direct:b").unmarshal("{{myDataformat}}").to("mock:b"); + } + }; + } + +}
