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 ab6cc105e98af2b88c550af9d858c68b58529d91 Author: Claus Ibsen <[email protected]> AuthorDate: Mon Aug 18 15:37:48 2025 +0200 CAMEL-22354: dataformats - Align all data formats getter setters to model --- .../flatpack/FlatpackDataFormatConfigurer.java | 7 +++++++ .../apache/camel/dataformat/flatpack/flatpack.json | 2 +- .../apache/camel/model/dataformat/flatpack.json | 2 +- .../camel/model/dataformat/FlatpackDataFormat.java | 22 +++++++++++----------- .../dataformat/FlatpackDataFormatReifier.java | 2 +- .../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 +- .../ROOT/pages/camel-4x-upgrade-guide-4_15.adoc | 1 + 9 files changed, 25 insertions(+), 17 deletions(-) diff --git a/components/camel-flatpack/src/generated/java/org/apache/camel/dataformat/flatpack/FlatpackDataFormatConfigurer.java b/components/camel-flatpack/src/generated/java/org/apache/camel/dataformat/flatpack/FlatpackDataFormatConfigurer.java index f62a9b9885f..a42c354adc3 100644 --- a/components/camel-flatpack/src/generated/java/org/apache/camel/dataformat/flatpack/FlatpackDataFormatConfigurer.java +++ b/components/camel-flatpack/src/generated/java/org/apache/camel/dataformat/flatpack/FlatpackDataFormatConfigurer.java @@ -28,6 +28,7 @@ public class FlatpackDataFormatConfigurer extends org.apache.camel.support.compo map.put("Fixed", boolean.class); map.put("IgnoreExtraColumns", boolean.class); map.put("IgnoreFirstRecord", boolean.class); + map.put("ParserFactory", net.sf.flatpack.ParserFactory.class); map.put("TextQualifier", char.class); ALL_OPTIONS = map; } @@ -45,6 +46,8 @@ public class FlatpackDataFormatConfigurer extends org.apache.camel.support.compo case "ignoreExtraColumns": target.setIgnoreExtraColumns(property(camelContext, boolean.class, value)); return true; case "ignorefirstrecord": case "ignoreFirstRecord": target.setIgnoreFirstRecord(property(camelContext, boolean.class, value)); return true; + case "parserfactory": + case "parserFactory": target.setParserFactory(property(camelContext, net.sf.flatpack.ParserFactory.class, value)); return true; case "textqualifier": case "textQualifier": target.setTextQualifier(property(camelContext, char.class, value)); return true; default: return false; @@ -68,6 +71,8 @@ public class FlatpackDataFormatConfigurer extends org.apache.camel.support.compo case "ignoreExtraColumns": return boolean.class; case "ignorefirstrecord": case "ignoreFirstRecord": return boolean.class; + case "parserfactory": + case "parserFactory": return net.sf.flatpack.ParserFactory.class; case "textqualifier": case "textQualifier": return char.class; default: return null; @@ -87,6 +92,8 @@ public class FlatpackDataFormatConfigurer extends org.apache.camel.support.compo case "ignoreExtraColumns": return target.isIgnoreExtraColumns(); case "ignorefirstrecord": case "ignoreFirstRecord": return target.isIgnoreFirstRecord(); + case "parserfactory": + case "parserFactory": return target.getParserFactory(); case "textqualifier": case "textQualifier": return target.getTextQualifier(); default: return null; diff --git a/components/camel-flatpack/src/generated/resources/META-INF/org/apache/camel/dataformat/flatpack/flatpack.json b/components/camel-flatpack/src/generated/resources/META-INF/org/apache/camel/dataformat/flatpack/flatpack.json index 89d2b11e607..4bfb04c115c 100644 --- a/components/camel-flatpack/src/generated/resources/META-INF/org/apache/camel/dataformat/flatpack/flatpack.json +++ b/components/camel-flatpack/src/generated/resources/META-INF/org/apache/camel/dataformat/flatpack/flatpack.json @@ -24,6 +24,6 @@ "allowShortLines": { "index": 5, "kind": "attribute", "displayName": "Allow Short Lines", "group": "common", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Allows for lines to be shorter than expected and ignores the extra characters" }, "ignoreExtraColumns": { "index": 6, "kind": "attribute", "displayName": "Ignore Extra Columns", "group": "common", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Allows for lines to be longer than expected and ignores the extra characters." }, "textQualifier": { "index": 7, "kind": "attribute", "displayName": "Text Qualifier", "group": "advanced", "label": "advanced", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "If the text is qualified with a character. Uses quote character by default." }, - "parserFactoryRef": { "index": 8, "kind": "attribute", "displayName": "Parser Factory Ref", "group": "advanced", "label": "advanced", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "References to a custom parser factory to lookup in the registry" } + "parserFactory": { "index": 8, "kind": "attribute", "displayName": "Parser Factory", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "net.sf.flatpack.ParserFactory", "deprecated": false, "autowired": false, "secret": false, "description": "References to a custom parser factory to lookup in the registry" } } } diff --git a/core/camel-core-model/src/generated/resources/META-INF/org/apache/camel/model/dataformat/flatpack.json b/core/camel-core-model/src/generated/resources/META-INF/org/apache/camel/model/dataformat/flatpack.json index e50aced2627..217792c0895 100644 --- a/core/camel-core-model/src/generated/resources/META-INF/org/apache/camel/model/dataformat/flatpack.json +++ b/core/camel-core-model/src/generated/resources/META-INF/org/apache/camel/model/dataformat/flatpack.json @@ -21,6 +21,6 @@ "allowShortLines": { "index": 5, "kind": "attribute", "displayName": "Allow Short Lines", "group": "common", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Allows for lines to be shorter than expected and ignores the extra characters" }, "ignoreExtraColumns": { "index": 6, "kind": "attribute", "displayName": "Ignore Extra Columns", "group": "common", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Allows for lines to be longer than expected and ignores the extra characters." }, "textQualifier": { "index": 7, "kind": "attribute", "displayName": "Text Qualifier", "group": "advanced", "label": "advanced", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "If the text is qualified with a character. Uses quote character by default." }, - "parserFactoryRef": { "index": 8, "kind": "attribute", "displayName": "Parser Factory Ref", "group": "advanced", "label": "advanced", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "References to a custom parser factory to lookup in the registry" } + "parserFactory": { "index": 8, "kind": "attribute", "displayName": "Parser Factory", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "net.sf.flatpack.ParserFactory", "deprecated": false, "autowired": false, "secret": false, "description": "References to a custom parser factory to lookup in the registry" } } } diff --git a/core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/FlatpackDataFormat.java b/core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/FlatpackDataFormat.java index 9ce79bb95e2..27919237461 100644 --- a/core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/FlatpackDataFormat.java +++ b/core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/FlatpackDataFormat.java @@ -56,8 +56,8 @@ public class FlatpackDataFormat extends DataFormatDefinition { @Metadata(label = "advanced") private String textQualifier; @XmlAttribute - @Metadata(label = "advanced") - private String parserFactoryRef; + @Metadata(label = "advanced", javaType = "net.sf.flatpack.ParserFactory") + private String parserFactory; public FlatpackDataFormat() { super("flatpack"); @@ -72,7 +72,7 @@ public class FlatpackDataFormat extends DataFormatDefinition { this.allowShortLines = source.allowShortLines; this.ignoreExtraColumns = source.ignoreExtraColumns; this.textQualifier = source.textQualifier; - this.parserFactoryRef = source.parserFactoryRef; + this.parserFactory = source.parserFactory; } private FlatpackDataFormat(Builder builder) { @@ -84,7 +84,7 @@ public class FlatpackDataFormat extends DataFormatDefinition { this.allowShortLines = builder.allowShortLines; this.ignoreExtraColumns = builder.ignoreExtraColumns; this.textQualifier = builder.textQualifier; - this.parserFactoryRef = builder.parserFactoryRef; + this.parserFactory = builder.parserFactory; } @Override @@ -173,15 +173,15 @@ public class FlatpackDataFormat extends DataFormatDefinition { this.ignoreExtraColumns = ignoreExtraColumns; } - public String getParserFactoryRef() { - return parserFactoryRef; + public String getParserFactory() { + return parserFactory; } /** * References to a custom parser factory to lookup in the registry */ - public void setParserFactoryRef(String parserFactoryRef) { - this.parserFactoryRef = parserFactoryRef; + public void setParserFactory(String parserFactory) { + this.parserFactory = parserFactory; } /** @@ -197,7 +197,7 @@ public class FlatpackDataFormat extends DataFormatDefinition { private String allowShortLines; private String ignoreExtraColumns; private String textQualifier; - private String parserFactoryRef; + private String parserFactory; /** * The flatpack pzmap configuration file. Can be omitted in simpler situations, but its preferred to use the @@ -297,8 +297,8 @@ public class FlatpackDataFormat extends DataFormatDefinition { /** * References to a custom parser factory to lookup in the registry */ - public Builder parserFactoryRef(String parserFactoryRef) { - this.parserFactoryRef = parserFactoryRef; + public Builder parserFactory(String parserFactory) { + this.parserFactory = parserFactory; return this; } diff --git a/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/dataformat/FlatpackDataFormatReifier.java b/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/dataformat/FlatpackDataFormatReifier.java index a5576291b9a..ceb39a1261b 100644 --- a/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/dataformat/FlatpackDataFormatReifier.java +++ b/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/dataformat/FlatpackDataFormatReifier.java @@ -30,7 +30,7 @@ public class FlatpackDataFormatReifier extends DataFormatReifier<FlatpackDataFor @Override protected void prepareDataFormatConfig(Map<String, Object> properties) { - properties.put("parserFactory", asRef(definition.getParserFactoryRef())); + properties.put("parserFactory", asRef(definition.getParserFactory())); properties.put("definition", definition.getDefinition()); properties.put("fixed", definition.getFixed()); properties.put("ignoreFirstRecord", definition.getIgnoreFirstRecord()); 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 40106fe2816..b74e9e85929 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 @@ -1927,7 +1927,7 @@ public class ModelParser extends BaseParser { case "fixed": def.setFixed(val); yield true; case "ignoreExtraColumns": def.setIgnoreExtraColumns(val); yield true; case "ignoreFirstRecord": def.setIgnoreFirstRecord(val); yield true; - case "parserFactoryRef": def.setParserFactoryRef(val); yield true; + case "parserFactory": def.setParserFactory(val); yield true; case "textQualifier": def.setTextQualifier(val); yield true; default: yield identifiedTypeAttributeHandler().accept(def, key, val); }, noElementHandler(), noValueHandler()); 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 db14a623965..0b488a04fa3 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 @@ -2625,10 +2625,10 @@ public class ModelWriter extends BaseWriter { doWriteIdentifiedTypeAttributes(def); doWriteAttribute("allowShortLines", def.getAllowShortLines(), null); doWriteAttribute("delimiter", def.getDelimiter(), ","); + doWriteAttribute("parserFactory", def.getParserFactory(), null); doWriteAttribute("fixed", def.getFixed(), null); doWriteAttribute("definition", def.getDefinition(), null); doWriteAttribute("ignoreFirstRecord", def.getIgnoreFirstRecord(), "true"); - doWriteAttribute("parserFactoryRef", def.getParserFactoryRef(), null); doWriteAttribute("textQualifier", def.getTextQualifier(), null); doWriteAttribute("ignoreExtraColumns", def.getIgnoreExtraColumns(), null); endElement(name); 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 489e4d94c36..0f9518a6a9b 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 @@ -2625,10 +2625,10 @@ public class ModelWriter extends BaseWriter { doWriteIdentifiedTypeAttributes(def); doWriteAttribute("allowShortLines", def.getAllowShortLines(), null); doWriteAttribute("delimiter", def.getDelimiter(), ","); + doWriteAttribute("parserFactory", def.getParserFactory(), null); doWriteAttribute("fixed", def.getFixed(), null); doWriteAttribute("definition", def.getDefinition(), null); doWriteAttribute("ignoreFirstRecord", def.getIgnoreFirstRecord(), "true"); - doWriteAttribute("parserFactoryRef", def.getParserFactoryRef(), null); doWriteAttribute("textQualifier", def.getTextQualifier(), null); doWriteAttribute("ignoreExtraColumns", def.getIgnoreExtraColumns(), null); endElement(name); diff --git a/docs/user-manual/modules/ROOT/pages/camel-4x-upgrade-guide-4_15.adoc b/docs/user-manual/modules/ROOT/pages/camel-4x-upgrade-guide-4_15.adoc index 7778dc2a650..f18d41664bf 100644 --- a/docs/user-manual/modules/ROOT/pages/camel-4x-upgrade-guide-4_15.adoc +++ b/docs/user-manual/modules/ROOT/pages/camel-4x-upgrade-guide-4_15.adoc @@ -18,6 +18,7 @@ to their implementation using reflection-free configurers. A few data formats ha |crypto|initVectorRef|initVector |csv|formatRef|format |csv|formatName|format +|flatpack|parserFactoryRef|parserFactory |=== And in XML DSL the csv dataformat have changed `header` from a `List<String>` to be a single `String`
