You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2022/03/01 08:50:01 UTC
[camel] branch main updated (b0a76e6 -> d0d073e)
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git.
from b0a76e6 Regen for commit 883f8f2e02184405bc93b8a0fad601d3683498a7
new 4d9d3fb CAMEL-17701: camel-core-model - Add labels to EIP options
new 041b3cf Added unit test based on user forum issue
new d0d073e CAMEL-17701: camel-core-model - Add labels to EIP options
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../org/apache/camel/catalog/models/flatpack.json | 4 +-
.../org/apache/camel/catalog/models/ical.json | 2 +-
.../apache/camel/catalog/models/jacksonXml.json | 2 +-
.../apache/camel/catalog/schemas/camel-spring.xsd | 30 ++++++-------
...paratorTest.java => SqlAggregateBatchTest.java} | 51 ++++++++++++++++------
.../apache/camel/model/dataformat/flatpack.json | 4 +-
.../org/apache/camel/model/dataformat/ical.json | 2 +-
.../apache/camel/model/dataformat/jacksonXml.json | 2 +-
.../camel/model/dataformat/FlatpackDataFormat.java | 12 ++---
.../camel/model/dataformat/GrokDataFormat.java | 14 +++---
.../camel/model/dataformat/HL7DataFormat.java | 7 ++-
.../camel/model/dataformat/IcalDataFormat.java | 3 +-
.../model/dataformat/JacksonXMLDataFormat.java | 2 +-
.../reifier/dataformat/GrokDataFormatReifier.java | 6 ++-
14 files changed, 86 insertions(+), 55 deletions(-)
copy components/camel-sql/src/test/java/org/apache/camel/component/sql/{SqlProducerSeparatorTest.java => SqlAggregateBatchTest.java} (59%)
[camel] 02/03: Added unit test based on user forum issue
Posted by da...@apache.org.
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 041b3cf8877f96990d37c11dfc21da97239a89ff
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Tue Mar 1 09:45:31 2022 +0100
Added unit test based on user forum issue
---
.../camel/component/sql/SqlAggregateBatchTest.java | 105 +++++++++++++++++++++
1 file changed, 105 insertions(+)
diff --git a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlAggregateBatchTest.java b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlAggregateBatchTest.java
new file mode 100644
index 0000000..72d69a6
--- /dev/null
+++ b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlAggregateBatchTest.java
@@ -0,0 +1,105 @@
+/*
+ * 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.
+ */
+package org.apache.camel.component.sql;
+
+import java.util.Arrays;
+
+import org.apache.camel.builder.AggregationStrategies;
+import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.mock.MockEndpoint;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.springframework.jdbc.core.JdbcTemplate;
+import org.springframework.jdbc.datasource.embedded.EmbeddedDatabase;
+import org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseBuilder;
+import org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseType;
+
+import static org.apache.camel.test.junit5.TestSupport.assertIsInstanceOf;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+public class SqlAggregateBatchTest extends CamelTestSupport {
+
+ private EmbeddedDatabase db;
+ private JdbcTemplate jdbcTemplate;
+
+ @Test
+ public void testBatch() throws Exception {
+ MockEndpoint mock = getMockEndpoint("mock:result");
+ mock.expectedMessageCount(1);
+
+ template.sendBody("direct:start", Arrays.asList(6, "abc", "def"));
+ template.sendBody("direct:start", Arrays.asList(7, "ghi", "jkl"));
+ template.sendBody("direct:start", Arrays.asList(8, "mno", "pqr"));
+
+ mock.assertIsSatisfied();
+
+ Number received = assertIsInstanceOf(Number.class,
+ mock.getReceivedExchanges().get(0).getIn().getHeader(SqlConstants.SQL_UPDATE_COUNT));
+
+ assertEquals(3, received.intValue());
+
+ assertEquals("abc", jdbcTemplate.queryForObject("select project from projects where id = 6", String.class));
+ assertEquals("def", jdbcTemplate.queryForObject("select license from projects where id = 6", String.class));
+ assertEquals("ghi", jdbcTemplate.queryForObject("select project from projects where id = 7", String.class));
+ assertEquals("jkl", jdbcTemplate.queryForObject("select license from projects where id = 7", String.class));
+ assertEquals("mno", jdbcTemplate.queryForObject("select project from projects where id = 8", String.class));
+ assertEquals("pqr", jdbcTemplate.queryForObject("select license from projects where id = 8", String.class));
+ }
+
+ @Override
+ @BeforeEach
+ public void setUp() throws Exception {
+ db = new EmbeddedDatabaseBuilder()
+ .setName(getClass().getSimpleName())
+ .setType(EmbeddedDatabaseType.DERBY)
+ .addScript("sql/createAndPopulateDatabase.sql").build();
+
+ jdbcTemplate = new JdbcTemplate(db);
+
+ super.setUp();
+ }
+
+ @Override
+ @AfterEach
+ public void tearDown() throws Exception {
+ super.tearDown();
+
+ db.shutdown();
+ }
+
+ @Override
+ protected RouteBuilder createRouteBuilder() throws Exception {
+ return new RouteBuilder() {
+ public void configure() {
+ getContext().getComponent("sql", SqlComponent.class).setDataSource(db);
+
+ errorHandler(noErrorHandler());
+
+ from("direct:start")
+ .aggregate(constant(true)).completionSize(3).aggregationStrategy(AggregationStrategies.groupedBody())
+ .to("direct:batch");
+
+ from("direct:batch")
+ .to("sql:insert into projects values (#, #, #)?batch=true")
+ .to("mock:result");
+ }
+ };
+ }
+
+}
[camel] 01/03: CAMEL-17701: camel-core-model - Add labels to EIP options
Posted by da...@apache.org.
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 <cl...@gmail.com>
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());
}
}
[camel] 03/03: CAMEL-17701: camel-core-model - Add labels to EIP options
Posted by da...@apache.org.
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 d0d073e77d875b62c81b6d701c935d971b392614
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Tue Mar 1 09:49:20 2022 +0100
CAMEL-17701: camel-core-model - Add labels to EIP options
---
.../org/apache/camel/catalog/models/flatpack.json | 4 +--
.../org/apache/camel/catalog/models/ical.json | 2 +-
.../apache/camel/catalog/models/jacksonXml.json | 2 +-
.../apache/camel/catalog/schemas/camel-spring.xsd | 30 +++++++++++-----------
.../apache/camel/model/dataformat/flatpack.json | 4 +--
.../org/apache/camel/model/dataformat/ical.json | 2 +-
.../apache/camel/model/dataformat/jacksonXml.json | 2 +-
7 files changed, 23 insertions(+), 23 deletions(-)
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/flatpack.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/flatpack.json
index d086e14..ed18f19 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/flatpack.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/flatpack.json
@@ -15,11 +15,11 @@
"properties": {
"definition": { "kind": "attribute", "displayName": "Definition", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "The flatpack pzmap configuration file. Can be omitted in simpler situations, but its preferred to use the pzmap." },
"fixed": { "kind": "attribute", "displayName": "Fixed", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Delimited or fixed. Is by default false = delimited" },
- "ignoreFirstRecord": { "kind": "attribute", "displayName": "Ignore First Record", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Whether the first line is ignored for delimited files (for the column headers). Is by default true." },
- "textQualifier": { "kind": "attribute", "displayName": "Text Qualifier", "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." },
"delimiter": { "kind": "attribute", "displayName": "Delimiter", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "defaultValue": ",", "description": "The delimiter char (could be ; , or similar)" },
+ "ignoreFirstRecord": { "kind": "attribute", "displayName": "Ignore First Record", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Whether the first line is ignored for delimited files (for the column headers). Is by default true." },
"allowShortLines": { "kind": "attribute", "displayName": "Allow Short Lines", "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": { "kind": "attribute", "displayName": "Ignore Extra Columns", "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": { "kind": "attribute", "displayName": "Text Qualifier", "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": { "kind": "attribute", "displayName": "Parser Factory Ref", "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" },
"id": { "kind": "attribute", "displayName": "Id", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "The id of this node" }
}
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/ical.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/ical.json
index e2d3898..ae306a9 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/ical.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/ical.json
@@ -3,7 +3,7 @@
"kind": "model",
"name": "ical",
"title": "iCal",
- "description": "Marshal and unmarshal iCal (.ics) documents to\/from model objects provided by the iCal4j library.",
+ "description": "Marshal and unmarshal iCal (.ics) documents to\/from model objects.",
"deprecated": false,
"firstVersion": "2.12.0",
"label": "dataformat,transformation",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/jacksonXml.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/jacksonXml.json
index d474260..90fc017 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/jacksonXml.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/jacksonXml.json
@@ -3,7 +3,7 @@
"kind": "model",
"name": "jacksonXml",
"title": "Jackson XML",
- "description": "Unmarshal a XML payloads to POJOs and back using XMLMapper extension of Jackson.",
+ "description": "Unmarshal an XML payloads to POJOs and back using XMLMapper extension of Jackson.",
"deprecated": false,
"firstVersion": "2.16.0",
"label": "dataformat,transformation,xml",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/schemas/camel-spring.xsd b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/schemas/camel-spring.xsd
index 480ba21..f3cb070 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/schemas/camel-spring.xsd
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/schemas/camel-spring.xsd
@@ -592,8 +592,7 @@ Deprecated: Hystrix Circuit Breaker EIP configuration
<xs:element name="ical" type="tns:icalDataFormat">
<xs:annotation>
<xs:documentation xml:lang="en"><![CDATA[
-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.
]]></xs:documentation>
</xs:annotation>
</xs:element>
@@ -665,7 +664,8 @@ Intercepts messages being sent to an endpoint
<xs:element name="jacksonXml" type="tns:jacksonXMLDataFormat">
<xs:annotation>
<xs:documentation xml:lang="en"><![CDATA[
-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.
]]></xs:documentation>
</xs:annotation>
</xs:element>
@@ -6981,25 +6981,18 @@ Delimited or fixed. Is by default false = delimited. Default value: false
]]></xs:documentation>
</xs:annotation>
</xs:attribute>
- <xs:attribute name="ignoreFirstRecord" type="xs:string">
- <xs:annotation>
- <xs:documentation xml:lang="en"><![CDATA[
-Whether the first line is ignored for delimited files (for the column headers).
-Is by default true. Default value: true
- ]]></xs:documentation>
- </xs:annotation>
- </xs:attribute>
- <xs:attribute name="textQualifier" type="xs:string">
+ <xs:attribute name="delimiter" type="xs:string">
<xs:annotation>
<xs:documentation xml:lang="en"><![CDATA[
-If the text is qualified with a character. Uses quote character by default.
+The delimiter char (could be ; , or similar). Default value: ,
]]></xs:documentation>
</xs:annotation>
</xs:attribute>
- <xs:attribute name="delimiter" type="xs:string">
+ <xs:attribute name="ignoreFirstRecord" type="xs:string">
<xs:annotation>
<xs:documentation xml:lang="en"><![CDATA[
-The delimiter char (could be ; , or similar). Default value: ,
+Whether the first line is ignored for delimited files (for the column headers).
+Is by default true. Default value: true
]]></xs:documentation>
</xs:annotation>
</xs:attribute>
@@ -7019,6 +7012,13 @@ Default value: false
]]></xs:documentation>
</xs:annotation>
</xs:attribute>
+ <xs:attribute name="textQualifier" type="xs:string">
+ <xs:annotation>
+ <xs:documentation xml:lang="en"><![CDATA[
+If the text is qualified with a character. Uses quote character by default.
+ ]]></xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
<xs:attribute name="parserFactoryRef" type="xs:string">
<xs:annotation>
<xs:documentation xml:lang="en"><![CDATA[
diff --git a/core/camel-core-model/src/generated/resources/org/apache/camel/model/dataformat/flatpack.json b/core/camel-core-model/src/generated/resources/org/apache/camel/model/dataformat/flatpack.json
index d086e14..ed18f19 100644
--- a/core/camel-core-model/src/generated/resources/org/apache/camel/model/dataformat/flatpack.json
+++ b/core/camel-core-model/src/generated/resources/org/apache/camel/model/dataformat/flatpack.json
@@ -15,11 +15,11 @@
"properties": {
"definition": { "kind": "attribute", "displayName": "Definition", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "The flatpack pzmap configuration file. Can be omitted in simpler situations, but its preferred to use the pzmap." },
"fixed": { "kind": "attribute", "displayName": "Fixed", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Delimited or fixed. Is by default false = delimited" },
- "ignoreFirstRecord": { "kind": "attribute", "displayName": "Ignore First Record", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Whether the first line is ignored for delimited files (for the column headers). Is by default true." },
- "textQualifier": { "kind": "attribute", "displayName": "Text Qualifier", "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." },
"delimiter": { "kind": "attribute", "displayName": "Delimiter", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "defaultValue": ",", "description": "The delimiter char (could be ; , or similar)" },
+ "ignoreFirstRecord": { "kind": "attribute", "displayName": "Ignore First Record", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Whether the first line is ignored for delimited files (for the column headers). Is by default true." },
"allowShortLines": { "kind": "attribute", "displayName": "Allow Short Lines", "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": { "kind": "attribute", "displayName": "Ignore Extra Columns", "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": { "kind": "attribute", "displayName": "Text Qualifier", "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": { "kind": "attribute", "displayName": "Parser Factory Ref", "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" },
"id": { "kind": "attribute", "displayName": "Id", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "The id of this node" }
}
diff --git a/core/camel-core-model/src/generated/resources/org/apache/camel/model/dataformat/ical.json b/core/camel-core-model/src/generated/resources/org/apache/camel/model/dataformat/ical.json
index e2d3898..ae306a9 100644
--- a/core/camel-core-model/src/generated/resources/org/apache/camel/model/dataformat/ical.json
+++ b/core/camel-core-model/src/generated/resources/org/apache/camel/model/dataformat/ical.json
@@ -3,7 +3,7 @@
"kind": "model",
"name": "ical",
"title": "iCal",
- "description": "Marshal and unmarshal iCal (.ics) documents to\/from model objects provided by the iCal4j library.",
+ "description": "Marshal and unmarshal iCal (.ics) documents to\/from model objects.",
"deprecated": false,
"firstVersion": "2.12.0",
"label": "dataformat,transformation",
diff --git a/core/camel-core-model/src/generated/resources/org/apache/camel/model/dataformat/jacksonXml.json b/core/camel-core-model/src/generated/resources/org/apache/camel/model/dataformat/jacksonXml.json
index d474260..90fc017 100644
--- a/core/camel-core-model/src/generated/resources/org/apache/camel/model/dataformat/jacksonXml.json
+++ b/core/camel-core-model/src/generated/resources/org/apache/camel/model/dataformat/jacksonXml.json
@@ -3,7 +3,7 @@
"kind": "model",
"name": "jacksonXml",
"title": "Jackson XML",
- "description": "Unmarshal a XML payloads to POJOs and back using XMLMapper extension of Jackson.",
+ "description": "Unmarshal an XML payloads to POJOs and back using XMLMapper extension of Jackson.",
"deprecated": false,
"firstVersion": "2.16.0",
"label": "dataformat,transformation,xml",