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 6f188b3fb4cd1a69d7fac512668062c7ada819d5 Author: Claus Ibsen <[email protected]> AuthorDate: Mon Aug 18 15:58:56 2025 +0200 CAMEL-22354: dataformats - Align all data formats getter setters to model --- .../iso8583/Iso8583DataFormatConfigurer.java | 7 ++++++ .../dataformat/iso8583/Iso8583DataFormat.java | 8 +++++++ .../reifier/dataformat/JaxbDataFormatReifier.java | 27 +++------------------- 3 files changed, 18 insertions(+), 24 deletions(-) diff --git a/components/camel-iso8583/src/generated/java/org/apache/camel/dataformat/iso8583/Iso8583DataFormatConfigurer.java b/components/camel-iso8583/src/generated/java/org/apache/camel/dataformat/iso8583/Iso8583DataFormatConfigurer.java index dce61a6af4b..8ae2b02ee9c 100644 --- a/components/camel-iso8583/src/generated/java/org/apache/camel/dataformat/iso8583/Iso8583DataFormatConfigurer.java +++ b/components/camel-iso8583/src/generated/java/org/apache/camel/dataformat/iso8583/Iso8583DataFormatConfigurer.java @@ -22,6 +22,7 @@ public class Iso8583DataFormatConfigurer extends org.apache.camel.support.compon private static final Map<String, Object> ALL_OPTIONS; static { Map<String, Object> map = new CaseInsensitiveMap(); + map.put("AllowAutoWiredMessageFormat", boolean.class); map.put("ConfigFile", java.lang.String.class); map.put("IsoType", java.lang.String.class); ALL_OPTIONS = map; @@ -31,6 +32,8 @@ public class Iso8583DataFormatConfigurer extends org.apache.camel.support.compon public boolean configure(CamelContext camelContext, Object obj, String name, Object value, boolean ignoreCase) { Iso8583DataFormat target = (Iso8583DataFormat) obj; switch (ignoreCase ? name.toLowerCase() : name) { + case "allowautowiredmessageformat": + case "allowAutoWiredMessageFormat": target.setAllowAutoWiredMessageFormat(property(camelContext, boolean.class, value)); return true; case "configfile": case "configFile": target.setConfigFile(property(camelContext, java.lang.String.class, value)); return true; case "isotype": @@ -47,6 +50,8 @@ public class Iso8583DataFormatConfigurer extends org.apache.camel.support.compon @Override public Class<?> getOptionType(String name, boolean ignoreCase) { switch (ignoreCase ? name.toLowerCase() : name) { + case "allowautowiredmessageformat": + case "allowAutoWiredMessageFormat": return boolean.class; case "configfile": case "configFile": return java.lang.String.class; case "isotype": @@ -59,6 +64,8 @@ public class Iso8583DataFormatConfigurer extends org.apache.camel.support.compon public Object getOptionValue(Object obj, String name, boolean ignoreCase) { Iso8583DataFormat target = (Iso8583DataFormat) obj; switch (ignoreCase ? name.toLowerCase() : name) { + case "allowautowiredmessageformat": + case "allowAutoWiredMessageFormat": return target.isAllowAutoWiredMessageFormat(); case "configfile": case "configFile": return target.getConfigFile(); case "isotype": diff --git a/components/camel-iso8583/src/main/java/org/apache/camel/dataformat/iso8583/Iso8583DataFormat.java b/components/camel-iso8583/src/main/java/org/apache/camel/dataformat/iso8583/Iso8583DataFormat.java index 8267fbe8284..e06e7196da3 100644 --- a/components/camel-iso8583/src/main/java/org/apache/camel/dataformat/iso8583/Iso8583DataFormat.java +++ b/components/camel-iso8583/src/main/java/org/apache/camel/dataformat/iso8583/Iso8583DataFormat.java @@ -110,6 +110,14 @@ public class Iso8583DataFormat extends ServiceSupport implements DataFormat, Dat this.isoType = isoType; } + public boolean isAllowAutoWiredMessageFormat() { + return allowAutoWiredMessageFormat; + } + + public void setAllowAutoWiredMessageFormat(boolean allowAutoWiredMessageFormat) { + this.allowAutoWiredMessageFormat = allowAutoWiredMessageFormat; + } + @Override protected void doInit() throws Exception { super.doInit(); diff --git a/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/dataformat/JaxbDataFormatReifier.java b/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/dataformat/JaxbDataFormatReifier.java index aa6325b97e1..7ac3561b279 100644 --- a/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/dataformat/JaxbDataFormatReifier.java +++ b/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/dataformat/JaxbDataFormatReifier.java @@ -30,24 +30,9 @@ public class JaxbDataFormatReifier extends DataFormatReifier<JaxbDataFormat> { @Override protected void prepareDataFormatConfig(Map<String, Object> properties) { - if (definition.getPrettyPrint() != null) { - properties.put("prettyPrint", definition.getPrettyPrint()); - } else { - // is default true - properties.put("prettyPrint", "true"); - } - if (definition.getObjectFactory() != null) { - properties.put("objectFactory", definition.getObjectFactory()); - } else { - // is default true - properties.put("objectFactory", "true"); - } - if (definition.getIgnoreJAXBElement() != null) { - properties.put("ignoreJAXBElement", definition.getIgnoreJAXBElement()); - } else { - // is default true - properties.put("ignoreJAXBElement", "true"); - } + properties.put("prettyPrint", definition.getPrettyPrint()); + properties.put("objectFactory", definition.getObjectFactory()); + properties.put("ignoreJAXBElement", definition.getIgnoreJAXBElement()); properties.put("mustBeJAXBElement", definition.getMustBeJAXBElement()); properties.put("filterNonXmlChars", definition.getFilterNonXmlChars()); properties.put("fragment", definition.getFragment()); @@ -63,12 +48,6 @@ public class JaxbDataFormatReifier extends DataFormatReifier<JaxbDataFormat> { properties.put("schemaLocation", definition.getSchemaLocation()); properties.put("noNamespaceSchemaLocation", definition.getNoNamespaceSchemaLocation()); properties.put("jaxbProviderProperties", definition.getJaxbProviderProperties()); - if (definition.getContentTypeHeader() != null) { - properties.put("contentTypeHeader", definition.getContentTypeHeader()); - } else { - // is default true - properties.put("contentTypeHeader", "true"); - } properties.put("accessExternalSchemaProtocols", definition.getAccessExternalSchemaProtocols()); }
