This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch df2 in repository https://gitbox.apache.org/repos/asf/camel.git
commit 969e64392fbc6d0936d0979aaa9e7187fe9757fd Author: Claus Ibsen <[email protected]> AuthorDate: Tue Aug 19 08:01:33 2025 +0200 CAMEL-22354: dataformats - Align all data formats getter setters to model --- .../dataformat/XMLSecurityDataFormatReifier.java | 3 ++- .../java/org/apache/camel/model/XmlParseTest.java | 14 ---------- .../camel/model/routeWithTidyMarkupDataFormat.xml | 30 ---------------------- ...uteWithTidyMarkupDataFormatAndAllowNullBody.xml | 28 -------------------- .../resources/routeWithTidyMarkupDataFormat.xml | 30 ---------------------- 5 files changed, 2 insertions(+), 103 deletions(-) diff --git a/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/dataformat/XMLSecurityDataFormatReifier.java b/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/dataformat/XMLSecurityDataFormatReifier.java index 2fc35dccd94..0f5237ad5ba 100644 --- a/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/dataformat/XMLSecurityDataFormatReifier.java +++ b/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/dataformat/XMLSecurityDataFormatReifier.java @@ -36,7 +36,8 @@ public class XMLSecurityDataFormatReifier extends DataFormatReifier<XMLSecurityD properties.put("xmlCipherAlgorithm", definition.getXmlCipherAlgorithm()); properties.put("keyCipherAlgorithm", definition.getKeyCipherAlgorithm()); properties.put("recipientKeyAlias", definition.getRecipientKeyAlias()); - properties.put("keyOrTrustStoreParameters", or(definition.getKeyStoreParameters(), asRef(definition.getKeyOrTrustStoreParameters()))); + properties.put("keyOrTrustStoreParameters", + or(definition.getKeyStoreParameters(), asRef(definition.getKeyOrTrustStoreParameters()))); properties.put("namespaces", or(definition.getNamespaces(), asRef(definition.getNamespaceRef()))); properties.put("keyPassword", definition.getKeyPassword()); properties.put("digestAlgorithm", definition.getDigestAlgorithm()); diff --git a/core/camel-core/src/test/java/org/apache/camel/model/XmlParseTest.java b/core/camel-core/src/test/java/org/apache/camel/model/XmlParseTest.java index 923da2b2791..f90858f1b48 100644 --- a/core/camel-core/src/test/java/org/apache/camel/model/XmlParseTest.java +++ b/core/camel-core/src/test/java/org/apache/camel/model/XmlParseTest.java @@ -294,20 +294,6 @@ public class XmlParseTest extends XmlTestSupport { assertFrom(route, "seda:a"); } - @Test - public void testParseTidyMarkupDataFormat() throws Exception { - RouteDefinition route = assertOneRoute("routeWithTidyMarkupDataFormat.xml"); - assertFrom(route, "seda:a"); - } - - @Test - public void testParseTidyMarkupDataFormatAndAllowNullBody() throws Exception { - RouteDefinition route = assertOneRoute("routeWithTidyMarkupDataFormatAndAllowNullBody.xml"); - assertFrom(route, "seda:a"); - UnmarshalDefinition unmarshal = assertNthProcessorInstanceOf(UnmarshalDefinition.class, route, 0); - assertEquals("true", unmarshal.getAllowNullBody(), "The unmarshaller should allow null body"); - } - @Test public void testParseRSSDataFormat() throws Exception { RouteDefinition route = assertOneRoute("routeWithRSSDataFormat.xml"); diff --git a/core/camel-core/src/test/resources/org/apache/camel/model/routeWithTidyMarkupDataFormat.xml b/core/camel-core/src/test/resources/org/apache/camel/model/routeWithTidyMarkupDataFormat.xml deleted file mode 100644 index f3939e5ecf1..00000000000 --- a/core/camel-core/src/test/resources/org/apache/camel/model/routeWithTidyMarkupDataFormat.xml +++ /dev/null @@ -1,30 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - - 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. - ---> -<routes id="camel" xmlns="http://camel.apache.org/schema/spring";> - <route> - <from uri="seda:a"/> - <pipeline> - <unmarshal> - <tidyMarkup/> - </unmarshal> - <to uri="seda:b"/> - </pipeline> - </route> -</routes> diff --git a/core/camel-core/src/test/resources/org/apache/camel/model/routeWithTidyMarkupDataFormatAndAllowNullBody.xml b/core/camel-core/src/test/resources/org/apache/camel/model/routeWithTidyMarkupDataFormatAndAllowNullBody.xml deleted file mode 100644 index ebc42aa3f03..00000000000 --- a/core/camel-core/src/test/resources/org/apache/camel/model/routeWithTidyMarkupDataFormatAndAllowNullBody.xml +++ /dev/null @@ -1,28 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - - 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. - ---> -<routes id="camel" xmlns="http://camel.apache.org/schema/spring";> - <route> - <from uri="seda:a"/> - <unmarshal allowNullBody="true"> - <tidyMarkup/> - </unmarshal> - <to uri="seda:b"/> - </route> -</routes> diff --git a/core/camel-xml-io/src/test/resources/routeWithTidyMarkupDataFormat.xml b/core/camel-xml-io/src/test/resources/routeWithTidyMarkupDataFormat.xml deleted file mode 100644 index cfae2c51d9b..00000000000 --- a/core/camel-xml-io/src/test/resources/routeWithTidyMarkupDataFormat.xml +++ /dev/null @@ -1,30 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - - 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. - ---> -<routes id="camel" xmlns="http://camel.apache.org/schema/xml-io";> - <route> - <from uri="seda:a"/> - <pipeline> - <unmarshal> - <tidyMarkup/> - </unmarshal> - <to uri="seda:b"/> - </pipeline> - </route> -</routes>
