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 195cc5216c04d8a8d7c882f3ca4701a2cf0a2710 Author: Claus Ibsen <[email protected]> AuthorDate: Mon Aug 18 15:46:53 2025 +0200 CAMEL-22354: dataformats - Align all data formats getter setters to model --- .../org/apache/camel/component/grok/GrokDataFormat.java | 5 ++--- .../apache/camel/component/hl7/HL7DataFormatConfigurer.java | 4 ++++ .../META-INF/org/apache/camel/component/hl7/hl7.json | 3 ++- .../org/apache/camel/component/hl7/HL7ValidateTest.java | 4 ++-- .../META-INF/org/apache/camel/model/dataformat/hl7.json | 3 ++- .../java/org/apache/camel/builder/DataFormatClause.java | 2 +- .../org/apache/camel/model/dataformat/HL7DataFormat.java | 13 ++++++------- .../camel/reifier/dataformat/GrokDataFormatReifier.java | 6 +----- .../camel/reifier/dataformat/HL7DataFormatReifier.java | 2 +- .../generated/java/org/apache/camel/xml/in/ModelParser.java | 1 + .../java/org/apache/camel/xml/out/ModelWriter.java | 1 + .../java/org/apache/camel/yaml/out/ModelWriter.java | 1 + 12 files changed, 24 insertions(+), 21 deletions(-) diff --git a/components/camel-grok/src/main/java/org/apache/camel/component/grok/GrokDataFormat.java b/components/camel-grok/src/main/java/org/apache/camel/component/grok/GrokDataFormat.java index d5b2a45cc99..5c9ec85b9f4 100644 --- a/components/camel-grok/src/main/java/org/apache/camel/component/grok/GrokDataFormat.java +++ b/components/camel-grok/src/main/java/org/apache/camel/component/grok/GrokDataFormat.java @@ -41,12 +41,11 @@ import org.apache.camel.util.ObjectHelper; @Dataformat("grok") public class GrokDataFormat extends ServiceSupport implements DataFormat, DataFormatName, CamelContextAware { - private CamelContext camelContext; + private CamelContext camelContext; private Grok grok; - + private final Set<GrokPattern> customPatterns = new HashSet<>(); private boolean allowMultipleMatchesPerLine = true; - private Set<GrokPattern> customPatterns = new HashSet<>(); private boolean flattened; private boolean namedOnly; private String pattern; diff --git a/components/camel-hl7/src/generated/java/org/apache/camel/component/hl7/HL7DataFormatConfigurer.java b/components/camel-hl7/src/generated/java/org/apache/camel/component/hl7/HL7DataFormatConfigurer.java index 7914809b278..b8db8ebe1c9 100644 --- a/components/camel-hl7/src/generated/java/org/apache/camel/component/hl7/HL7DataFormatConfigurer.java +++ b/components/camel-hl7/src/generated/java/org/apache/camel/component/hl7/HL7DataFormatConfigurer.java @@ -22,6 +22,7 @@ public class HL7DataFormatConfigurer extends org.apache.camel.support.component. private static final Map<String, Object> ALL_OPTIONS; static { Map<String, Object> map = new CaseInsensitiveMap(); + map.put("Parser", ca.uhn.hl7v2.parser.Parser.class); map.put("Validate", boolean.class); ALL_OPTIONS = map; } @@ -30,6 +31,7 @@ public class HL7DataFormatConfigurer extends org.apache.camel.support.component. public boolean configure(CamelContext camelContext, Object obj, String name, Object value, boolean ignoreCase) { HL7DataFormat target = (HL7DataFormat) obj; switch (ignoreCase ? name.toLowerCase() : name) { + case "parser": target.setParser(property(camelContext, ca.uhn.hl7v2.parser.Parser.class, value)); return true; case "validate": target.setValidate(property(camelContext, boolean.class, value)); return true; default: return false; } @@ -43,6 +45,7 @@ public class HL7DataFormatConfigurer extends org.apache.camel.support.component. @Override public Class<?> getOptionType(String name, boolean ignoreCase) { switch (ignoreCase ? name.toLowerCase() : name) { + case "parser": return ca.uhn.hl7v2.parser.Parser.class; case "validate": return boolean.class; default: return null; } @@ -52,6 +55,7 @@ public class HL7DataFormatConfigurer extends org.apache.camel.support.component. public Object getOptionValue(Object obj, String name, boolean ignoreCase) { HL7DataFormat target = (HL7DataFormat) obj; switch (ignoreCase ? name.toLowerCase() : name) { + case "parser": return target.getParser(); case "validate": return target.isValidate(); default: return null; } diff --git a/components/camel-hl7/src/generated/resources/META-INF/org/apache/camel/component/hl7/hl7.json b/components/camel-hl7/src/generated/resources/META-INF/org/apache/camel/component/hl7/hl7.json index 5f1a14a7edb..c062656e493 100644 --- a/components/camel-hl7/src/generated/resources/META-INF/org/apache/camel/component/hl7/hl7.json +++ b/components/camel-hl7/src/generated/resources/META-INF/org/apache/camel/component/hl7/hl7.json @@ -17,6 +17,7 @@ }, "properties": { "id": { "index": 0, "kind": "attribute", "displayName": "Id", "group": "common", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "The id of this node" }, - "validate": { "index": 1, "kind": "attribute", "displayName": "Validate", "group": "common", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Whether to validate the HL7 message Is by default true." } + "parser": { "index": 1, "kind": "attribute", "displayName": "Parser", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "ca.uhn.hl7v2.parser.Parser", "deprecated": false, "autowired": false, "secret": false, "description": "To use a custom HL7 parser" }, + "validate": { "index": 2, "kind": "attribute", "displayName": "Validate", "group": "common", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Whether to validate the HL7 message Is by default true." } } } diff --git a/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7ValidateTest.java b/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7ValidateTest.java index 6a8b3c0108f..f8c195cb122 100644 --- a/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7ValidateTest.java +++ b/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7ValidateTest.java @@ -142,14 +142,14 @@ public class HL7ValidateTest extends CamelTestSupport { ValidationContext customValidationContext = ValidationContextFactory.fromBuilder(builder); HapiContext customContext = new DefaultHapiContext(customValidationContext); - final Parser customParser = new GenericParser(customContext); + context.getRegistry().bind("myParser", new GenericParser(customContext)); return new RouteBuilder() { public void configure() { from("direct:unmarshalFailed").unmarshal().hl7().to("mock:unmarshal"); from("direct:unmarshalOk").unmarshal().hl7(false).to("mock:unmarshal"); from("direct:unmarshalOkCustom").unmarshal(hl7).to("mock:unmarshal"); - from("direct:start1").marshal().hl7(customParser).to("mock:end"); + from("direct:start1").marshal().hl7("myParser").to("mock:end"); from("direct:start2").marshal().hl7(true).to("mock:end"); } diff --git a/core/camel-core-model/src/generated/resources/META-INF/org/apache/camel/model/dataformat/hl7.json b/core/camel-core-model/src/generated/resources/META-INF/org/apache/camel/model/dataformat/hl7.json index 61e6e8ad894..0276a225212 100644 --- a/core/camel-core-model/src/generated/resources/META-INF/org/apache/camel/model/dataformat/hl7.json +++ b/core/camel-core-model/src/generated/resources/META-INF/org/apache/camel/model/dataformat/hl7.json @@ -14,6 +14,7 @@ }, "properties": { "id": { "index": 0, "kind": "attribute", "displayName": "Id", "group": "common", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "The id of this node" }, - "validate": { "index": 1, "kind": "attribute", "displayName": "Validate", "group": "common", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Whether to validate the HL7 message Is by default true." } + "parser": { "index": 1, "kind": "attribute", "displayName": "Parser", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "ca.uhn.hl7v2.parser.Parser", "deprecated": false, "autowired": false, "secret": false, "description": "To use a custom HL7 parser" }, + "validate": { "index": 2, "kind": "attribute", "displayName": "Validate", "group": "common", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Whether to validate the HL7 message Is by default true." } } } diff --git a/core/camel-core-model/src/main/java/org/apache/camel/builder/DataFormatClause.java b/core/camel-core-model/src/main/java/org/apache/camel/builder/DataFormatClause.java index 5abf7bbd9e5..cebeed45c00 100644 --- a/core/camel-core-model/src/main/java/org/apache/camel/builder/DataFormatClause.java +++ b/core/camel-core-model/src/main/java/org/apache/camel/builder/DataFormatClause.java @@ -368,7 +368,7 @@ public class DataFormatClause<T extends ProcessorDefinition<?>> { /** * Uses the HL7 data format */ - public T hl7(Object parser) { + public T hl7(String parser) { HL7DataFormat hl7 = new HL7DataFormat(); hl7.setParser(parser); return dataFormat(hl7); diff --git a/core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/HL7DataFormat.java b/core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/HL7DataFormat.java index 0b0deb2272d..968024157c9 100644 --- a/core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/HL7DataFormat.java +++ b/core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/HL7DataFormat.java @@ -34,10 +34,9 @@ import org.apache.camel.spi.Metadata; @XmlAccessorType(XmlAccessType.FIELD) public class HL7DataFormat extends DataFormatDefinition { - @XmlTransient + @XmlAttribute @Metadata(label = "advanced", javaType = "ca.uhn.hl7v2.parser.Parser") - private Object parser; - + private String parser; @XmlAttribute @Metadata(defaultValue = "true", javaType = "java.lang.Boolean") private String validate; @@ -76,14 +75,14 @@ public class HL7DataFormat extends DataFormatDefinition { this.validate = validate; } - public Object getParser() { + public String getParser() { return parser; } /** * To use a custom HL7 parser */ - public void setParser(Object parser) { + public void setParser(String parser) { this.parser = parser; } @@ -93,7 +92,7 @@ public class HL7DataFormat extends DataFormatDefinition { @XmlTransient public static class Builder implements DataFormatBuilder<HL7DataFormat> { - private Object parser; + private String parser; private String validate; /** @@ -119,7 +118,7 @@ public class HL7DataFormat extends DataFormatDefinition { /** * To use a custom HL7 parser */ - public Builder parser(Object parser) { + public Builder parser(String parser) { this.parser = parser; return this; } diff --git a/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/dataformat/GrokDataFormatReifier.java b/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/dataformat/GrokDataFormatReifier.java index 485f1a52977..2bec0ff59a7 100644 --- a/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/dataformat/GrokDataFormatReifier.java +++ b/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/dataformat/GrokDataFormatReifier.java @@ -32,11 +32,7 @@ public class GrokDataFormatReifier extends DataFormatReifier<GrokDataFormat> { protected void prepareDataFormatConfig(Map<String, Object> properties) { properties.put("pattern", definition.getPattern()); properties.put("flattened", definition.getFlattened()); - if (definition.getAllowMultipleMatchesPerLine() == null) { - properties.put("allowMultipleMatchesPerLine", "true"); - } else { - properties.put("allowMultipleMatchesPerLine", definition.getAllowMultipleMatchesPerLine()); - } + properties.put("allowMultipleMatchesPerLine", definition.getAllowMultipleMatchesPerLine()); properties.put("namedOnly", definition.getNamedOnly()); } } diff --git a/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/dataformat/HL7DataFormatReifier.java b/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/dataformat/HL7DataFormatReifier.java index 4f4c6588dfe..7683a18005b 100644 --- a/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/dataformat/HL7DataFormatReifier.java +++ b/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/dataformat/HL7DataFormatReifier.java @@ -30,7 +30,7 @@ public class HL7DataFormatReifier extends DataFormatReifier<HL7DataFormat> { @Override protected void prepareDataFormatConfig(Map<String, Object> properties) { - properties.put("parser", definition.getParser()); + properties.put("parser", asRef(definition.getParser())); properties.put("validate", definition.getValidate()); } 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 b74e9e85929..f976c83417c 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 @@ -1955,6 +1955,7 @@ public class ModelParser extends BaseParser { } protected HL7DataFormat doParseHL7DataFormat() throws IOException, XmlPullParserException { return doParse(new HL7DataFormat(), (def, key, val) -> switch (key) { + case "parser": def.setParser(val); yield true; case "validate": def.setValidate(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 0b488a04fa3..fb99ea0a39e 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 @@ -2659,6 +2659,7 @@ public class ModelWriter extends BaseWriter { protected void doWriteHL7DataFormat(String name, HL7DataFormat def) throws IOException { startElement(name); doWriteIdentifiedTypeAttributes(def); + doWriteAttribute("parser", def.getParser(), null); doWriteAttribute("validate", def.getValidate(), "true"); 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 0f9518a6a9b..054f90cffc3 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 @@ -2659,6 +2659,7 @@ public class ModelWriter extends BaseWriter { protected void doWriteHL7DataFormat(String name, HL7DataFormat def) throws IOException { startElement(name); doWriteIdentifiedTypeAttributes(def); + doWriteAttribute("parser", def.getParser(), null); doWriteAttribute("validate", def.getValidate(), "true"); endElement(name); }
