This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel.git
commit 4d9d3fb0d4dba5cb8a89b418b423292cd8bfd449 Author: Claus Ibsen <[email protected]> AuthorDate: Tue Mar 1 09:36:10 2022 +0100 CAMEL-17701: camel-core-model - Add labels to EIP options --- .../apache/camel/model/dataformat/FlatpackDataFormat.java | 12 +++++++----- .../org/apache/camel/model/dataformat/GrokDataFormat.java | 14 ++++++-------- .../org/apache/camel/model/dataformat/HL7DataFormat.java | 7 +++++-- .../org/apache/camel/model/dataformat/IcalDataFormat.java | 3 ++- .../camel/model/dataformat/JacksonXMLDataFormat.java | 2 +- .../camel/reifier/dataformat/GrokDataFormatReifier.java | 6 +++++- 6 files changed, 26 insertions(+), 18 deletions(-) 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 5919316..9436353 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 @@ -32,20 +32,19 @@ import org.apache.camel.spi.Metadata; @XmlRootElement(name = "flatpack") @XmlAccessorType(XmlAccessType.FIELD) public class FlatpackDataFormat extends DataFormatDefinition { + @XmlAttribute private String definition; @XmlAttribute @Metadata(javaType = "java.lang.Boolean") private String fixed; @XmlAttribute - @Metadata(defaultValue = "true", javaType = "java.lang.Boolean") - private String ignoreFirstRecord; - @XmlAttribute - private String textQualifier; - @XmlAttribute @Metadata(defaultValue = ",") private String delimiter; @XmlAttribute + @Metadata(defaultValue = "true", javaType = "java.lang.Boolean") + private String ignoreFirstRecord; + @XmlAttribute @Metadata(javaType = "java.lang.Boolean") private String allowShortLines; @XmlAttribute @@ -53,6 +52,9 @@ public class FlatpackDataFormat extends DataFormatDefinition { private String ignoreExtraColumns; @XmlAttribute @Metadata(label = "advanced") + private String textQualifier; + @XmlAttribute + @Metadata(label = "advanced") private String parserFactoryRef; public FlatpackDataFormat() { diff --git a/core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/GrokDataFormat.java b/core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/GrokDataFormat.java index 62eeaa9..3c17645 100644 --- a/core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/GrokDataFormat.java +++ b/core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/GrokDataFormat.java @@ -31,21 +31,19 @@ import org.apache.camel.spi.Metadata; @XmlRootElement(name = "grok") @XmlAccessorType(XmlAccessType.FIELD) public class GrokDataFormat extends DataFormatDefinition { + @XmlAttribute(required = true) @Metadata private String pattern; - @XmlAttribute - @Metadata(defaultValue = "false", javaType = "java.lang.Boolean") - private String flattened = Boolean.toString(false); - + @Metadata(javaType = "java.lang.Boolean") + private String flattened; @XmlAttribute @Metadata(defaultValue = "true", javaType = "java.lang.Boolean") - private String allowMultipleMatchesPerLine = Boolean.toString(true); - + private String allowMultipleMatchesPerLine; @XmlAttribute - @Metadata(defaultValue = "false", javaType = "java.lang.Boolean") - private String namedOnly = Boolean.toString(false); + @Metadata(javaType = "java.lang.Boolean") + private String namedOnly; public GrokDataFormat() { super("grok"); 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 d3ed8c3..04d58e1 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 @@ -32,11 +32,14 @@ import org.apache.camel.spi.Metadata; @XmlRootElement(name = "hl7") @XmlAccessorType(XmlAccessType.FIELD) public class HL7DataFormat extends DataFormatDefinition { + + @XmlTransient + @Metadata(label = "advanced", javaType = "ca.uhn.hl7v2.parser.Parser") + private Object parser; + @XmlAttribute @Metadata(defaultValue = "true", javaType = "java.lang.Boolean") private String validate; - @XmlTransient - private Object parser; public HL7DataFormat() { super("hl7"); diff --git a/core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/IcalDataFormat.java b/core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/IcalDataFormat.java index 98b0947..29fd9b0 100644 --- a/core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/IcalDataFormat.java +++ b/core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/IcalDataFormat.java @@ -25,12 +25,13 @@ import org.apache.camel.model.DataFormatDefinition; import org.apache.camel.spi.Metadata; /** - * Marshal and unmarshal iCal (*.ics) documents to/from model objects provided by the iCal4j library. + * Marshal and unmarshal iCal (*.ics) documents to/from model objects. */ @Metadata(firstVersion = "2.12.0", label = "dataformat,transformation", title = "iCal") @XmlRootElement(name = "ical") @XmlAccessorType(XmlAccessType.FIELD) public class IcalDataFormat extends DataFormatDefinition { + @XmlAttribute @Metadata(javaType = "java.lang.Boolean") private String validating; diff --git a/core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/JacksonXMLDataFormat.java b/core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/JacksonXMLDataFormat.java index c5cb1a9..bb715e6 100644 --- a/core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/JacksonXMLDataFormat.java +++ b/core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/JacksonXMLDataFormat.java @@ -26,7 +26,7 @@ import org.apache.camel.model.DataFormatDefinition; import org.apache.camel.spi.Metadata; /** - * Unmarshal a XML payloads to POJOs and back using XMLMapper extension of Jackson. + * Unmarshal an XML payloads to POJOs and back using XMLMapper extension of Jackson. */ @Metadata(firstVersion = "2.16.0", label = "dataformat,transformation,xml", title = "Jackson XML") @XmlRootElement(name = "jacksonXml") 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 2bec0ff..485f1a5 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,7 +32,11 @@ public class GrokDataFormatReifier extends DataFormatReifier<GrokDataFormat> { protected void prepareDataFormatConfig(Map<String, Object> properties) { properties.put("pattern", definition.getPattern()); properties.put("flattened", definition.getFlattened()); - properties.put("allowMultipleMatchesPerLine", definition.getAllowMultipleMatchesPerLine()); + if (definition.getAllowMultipleMatchesPerLine() == null) { + properties.put("allowMultipleMatchesPerLine", "true"); + } else { + properties.put("allowMultipleMatchesPerLine", definition.getAllowMultipleMatchesPerLine()); + } properties.put("namedOnly", definition.getNamedOnly()); } }
