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
The following commit(s) were added to refs/heads/main by this push:
new cb60124 CAMEL-17576: camel-any23 - Rename baseURI to baseUri and also
fix configurations not mapped correctly.
cb60124 is described below
commit cb6012449402ee9d270177d0e97eee81f202a2ba
Author: Claus Ibsen <[email protected]>
AuthorDate: Wed Feb 2 12:40:36 2022 +0100
CAMEL-17576: camel-any23 - Rename baseURI to baseUri and also fix
configurations not mapped correctly.
---
components/camel-any23/pom.xml | 1 -
.../any23/Any23DataFormatConfigurer.java | 3 +-
.../org/apache/camel/dataformat/any23/any23.json | 2 +-
.../camel/dataformat/any23/Any23DataFormat.java | 56 ++++++++++------------
.../any23/Any23DataFormatMarshalTest.java | 5 +-
.../any23/spring/SpringAny23DataFormatTest.xml | 2 +-
.../org/apache/camel/model/dataformat/any23.json | 2 +-
.../camel/model/dataformat/Any23DataFormat.java | 12 ++---
.../reifier/dataformat/Any23DataFormatReifier.java | 4 +-
.../java/org/apache/camel/xml/in/ModelParser.java | 2 +-
.../ROOT/pages/camel-3x-upgrade-guide-3_16.adoc | 5 ++
.../dsl/yaml/deserializers/ModelDeserializers.java | 2 +-
12 files changed, 48 insertions(+), 48 deletions(-)
diff --git a/components/camel-any23/pom.xml b/components/camel-any23/pom.xml
index 6403350..8659dda 100644
--- a/components/camel-any23/pom.xml
+++ b/components/camel-any23/pom.xml
@@ -41,7 +41,6 @@
<artifactId>camel-support</artifactId>
</dependency>
-
<dependency>
<groupId>org.apache.any23</groupId>
<artifactId>apache-any23-core</artifactId>
diff --git
a/components/camel-any23/src/generated/java/org/apache/camel/dataformat/any23/Any23DataFormatConfigurer.java
b/components/camel-any23/src/generated/java/org/apache/camel/dataformat/any23/Any23DataFormatConfigurer.java
index fb353c4..d638b57 100644
---
a/components/camel-any23/src/generated/java/org/apache/camel/dataformat/any23/Any23DataFormatConfigurer.java
+++
b/components/camel-any23/src/generated/java/org/apache/camel/dataformat/any23/Any23DataFormatConfigurer.java
@@ -18,11 +18,12 @@ public class Any23DataFormatConfigurer extends
PropertyConfigurerSupport impleme
public boolean configure(CamelContext camelContext, Object target, String
name, Object value, boolean ignoreCase) {
Any23DataFormat dataformat = (Any23DataFormat) target;
switch (ignoreCase ? name.toLowerCase() : name) {
+ case "configuration":
dataformat.setConfiguration(property(camelContext, java.util.Map.class,
value)); return true;
case "extractors": dataformat.setExtractors(property(camelContext,
java.util.List.class, value)); return true;
case "outputformat":
case "outputFormat": dataformat.setOutputFormat(property(camelContext,
org.apache.camel.dataformat.any23.Any23OutputFormat.class, value)); return true;
case "baseuri":
- case "baseURI": dataformat.setBaseURI(property(camelContext,
java.lang.String.class, value)); return true;
+ case "baseUri": dataformat.setBaseUri(property(camelContext,
java.lang.String.class, value)); return true;
default: return false;
}
}
diff --git
a/components/camel-any23/src/generated/resources/org/apache/camel/dataformat/any23/any23.json
b/components/camel-any23/src/generated/resources/org/apache/camel/dataformat/any23/any23.json
index bd96b29..647db69 100644
---
a/components/camel-any23/src/generated/resources/org/apache/camel/dataformat/any23/any23.json
+++
b/components/camel-any23/src/generated/resources/org/apache/camel/dataformat/any23/any23.json
@@ -19,7 +19,7 @@
"outputFormat": { "kind": "attribute", "displayName": "Output Format",
"required": false, "type": "enum", "javaType":
"org.apache.camel.dataformat.any23.Any23OutputFormat", "enum": [ "NTRIPLES",
"TURTLE", "NQUADS", "RDFXML", "JSONLD", "RDFJSON", "RDF4JMODEL" ],
"deprecated": false, "autowired": false, "secret": false, "defaultValue":
"RDF4JMODEL", "description": "What RDF syntax to unmarshal as, can be:
NTRIPLES, TURTLE, NQUADS, RDFXML, JSONLD, RDFJSON, RDF4JMODEL. It is by
default: [...]
"configuration": { "kind": "element", "displayName": "Configuration",
"required": false, "type": "array", "javaType":
"java.util.List<org.apache.camel.model.PropertyDefinition>", "deprecated":
false, "autowired": false, "secret": false, "description": "Configurations for
Apache Any23 as key-value pairs in order to customize the extraction process.
The list of supported parameters can be found here. If not provided, a default
configuration is used." },
"extractors": { "kind": "element", "displayName": "Extractors",
"required": false, "type": "array", "javaType":
"java.util.List<java.lang.String>", "deprecated": false, "autowired": false,
"secret": false, "description": "List of Any23 extractors to be used in the
unmarshal operation. A list of the available extractors can be found here here.
If not provided, all the available extractors are used." },
- "baseURI": { "kind": "attribute", "displayName": "Base URI", "required":
false, "type": "string", "javaType": "java.lang.String", "deprecated": false,
"autowired": false, "secret": false, "description": "The URI to use as base for
building RDF entities if only relative paths are provided." },
+ "baseUri": { "kind": "attribute", "displayName": "Base Uri", "required":
false, "type": "string", "javaType": "java.lang.String", "deprecated": false,
"autowired": false, "secret": false, "description": "The URI to use as base for
building RDF entities if only relative paths are provided." },
"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/components/camel-any23/src/main/java/org/apache/camel/dataformat/any23/Any23DataFormat.java
b/components/camel-any23/src/main/java/org/apache/camel/dataformat/any23/Any23DataFormat.java
index 6a38aea..42744d3 100644
---
a/components/camel-any23/src/main/java/org/apache/camel/dataformat/any23/Any23DataFormat.java
+++
b/components/camel-any23/src/main/java/org/apache/camel/dataformat/any23/Any23DataFormat.java
@@ -40,43 +40,40 @@ import org.eclipse.rdf4j.model.Model;
import org.eclipse.rdf4j.rio.RDFFormat;
import org.eclipse.rdf4j.rio.Rio;
-/**
- * Dataformat for any23 .. This dataformat is intended to convert HTML from a
site (or file) into rdf.
- */
@Dataformat("any23")
public class Any23DataFormat extends ServiceSupport implements DataFormat,
DataFormatName {
private Any23 any23;
- private Map<String, String> configurations;
+ private Map<String, String> configuration;
private List<String> extractors;
private Any23OutputFormat outputFormat;
- private String baseURI;
+ private String baseUri;
public Any23DataFormat() {
}
public Any23DataFormat(String baseURI) {
- this.baseURI = baseURI;
+ this.baseUri = baseURI;
}
public Any23DataFormat(Any23OutputFormat outputFormat, String baseURI) {
this.outputFormat = outputFormat;
- this.baseURI = baseURI;
+ this.baseUri = baseURI;
}
- public Any23DataFormat(Map<String, String> configurations,
Any23OutputFormat outputFormat, String baseURI) {
- this.configurations = configurations;
+ public Any23DataFormat(Map<String, String> configuration,
Any23OutputFormat outputFormat, String baseURI) {
+ this.configuration = configuration;
this.outputFormat = outputFormat;
- this.baseURI = baseURI;
+ this.baseUri = baseURI;
}
- public Any23DataFormat(Map<String, String> configurations, List<String>
extractors, Any23OutputFormat outputFormat,
+ public Any23DataFormat(Map<String, String> configuration, List<String>
extractors, Any23OutputFormat outputFormat,
String baseURI) {
- this.configurations = configurations;
+ this.configuration = configuration;
this.extractors = extractors;
this.outputFormat = outputFormat;
- this.baseURI = baseURI;
+ this.baseUri = baseURI;
}
@Override
@@ -103,7 +100,7 @@ public class Any23DataFormat extends ServiceSupport
implements DataFormat, DataF
* Unmarshal the data
*/
public Object unmarshal(Exchange exchange, InputStream inputStream) throws
Exception {
- ByteArrayDocumentSource source = new
ByteArrayDocumentSource(inputStream, this.baseURI, null);
+ ByteArrayDocumentSource source = new
ByteArrayDocumentSource(inputStream, this.baseUri, null);
ByteArrayOutputStream out = new ByteArrayOutputStream();
TripleHandler handler = Any23Utils.obtainHandler(outputFormat, out);
any23.extract(source, handler);
@@ -128,9 +125,9 @@ public class Any23DataFormat extends ServiceSupport
implements DataFormat, DataF
extrArray = new String[extractors.size()];
extrArray = extractors.toArray(extrArray);
}
- if (configurations != null && !configurations.isEmpty()) {
+ if (configuration != null && !configuration.isEmpty()) {
conf = DefaultConfiguration.copy();
- for (Entry<String, String> entry : configurations.entrySet()) {
+ for (Entry<String, String> entry : configuration.entrySet()) {
conf.setProperty(entry.getKey(), entry.getValue());
}
}
@@ -158,45 +155,40 @@ public class Any23DataFormat extends ServiceSupport
implements DataFormat, DataF
return any23;
}
- public Any23DataFormat setAny23(Any23 any23) {
+ public void setAny23(Any23 any23) {
this.any23 = any23;
- return this;
}
- public Map<String, String> getConfigurations() {
- return configurations;
+ public Map<String, String> getConfiguration() {
+ return configuration;
}
- public Any23DataFormat setConfigurations(Map<String, String>
configurations) {
- this.configurations = configurations;
- return this;
+ public void setConfiguration(Map<String, String> configuration) {
+ this.configuration = configuration;
}
public List<String> getExtractors() {
return extractors;
}
- public Any23DataFormat setExtractors(List<String> extractors) {
+ public void setExtractors(List<String> extractors) {
this.extractors = extractors;
- return this;
}
public Any23OutputFormat getOutputFormat() {
return outputFormat;
}
- public Any23DataFormat setOutputFormat(Any23OutputFormat outputFormat) {
+ public void setOutputFormat(Any23OutputFormat outputFormat) {
this.outputFormat = outputFormat;
- return this;
}
- public String getBaseURI() {
- return baseURI;
+ public String getBaseUri() {
+ return baseUri;
}
- public Any23DataFormat setBaseURI(String baseURI) {
- this.baseURI = baseURI;
- return this;
+ public void setBaseUri(String baseUri) {
+ this.baseUri = baseUri;
}
}
diff --git
a/components/camel-any23/src/test/java/org/apache/camel/dataformat/any23/Any23DataFormatMarshalTest.java
b/components/camel-any23/src/test/java/org/apache/camel/dataformat/any23/Any23DataFormatMarshalTest.java
index bd8e732..749e89a 100644
---
a/components/camel-any23/src/test/java/org/apache/camel/dataformat/any23/Any23DataFormatMarshalTest.java
+++
b/components/camel-any23/src/test/java/org/apache/camel/dataformat/any23/Any23DataFormatMarshalTest.java
@@ -51,7 +51,10 @@ public class Any23DataFormatMarshalTest extends
CamelTestSupport {
protected RouteBuilder createRouteBuilder() {
return new RouteBuilder() {
public void configure() {
- Any23DataFormat df = new
Any23DataFormat().setBaseURI(baseURI).setOutputFormat(Any23OutputFormat.RDF4JMODEL);
+ Any23DataFormat df = new Any23DataFormat();
+ df.setBaseUri(baseURI);
+ df.setOutputFormat(Any23OutputFormat.RDF4JMODEL);
+
from("direct:start").unmarshal(df).to("direct:r1");
from("direct:r1").marshal(df).to("direct:r2");
from("direct:r2").unmarshal(df).to("mock:result");
diff --git
a/components/camel-any23/src/test/resources/org/apache/camel/dataformat/any23/spring/SpringAny23DataFormatTest.xml
b/components/camel-any23/src/test/resources/org/apache/camel/dataformat/any23/spring/SpringAny23DataFormatTest.xml
index 93c89a9..5891157 100644
---
a/components/camel-any23/src/test/resources/org/apache/camel/dataformat/any23/spring/SpringAny23DataFormatTest.xml
+++
b/components/camel-any23/src/test/resources/org/apache/camel/dataformat/any23/spring/SpringAny23DataFormatTest.xml
@@ -28,7 +28,7 @@
<camelContext id="camel" xmlns="http://camel.apache.org/schema/spring">
<dataFormats>
- <any23 id="any23" baseURI ="http://mock.foo/bar" outputFormat="TURTLE" >
+ <any23 id="any23" baseUri="http://mock.foo/bar" outputFormat="TURTLE" >
<configuration key="any23.extraction.metadata.nesting" value="off"/>
<extractors>html-head-title</extractors>
</any23>
diff --git
a/core/camel-core-model/src/generated/resources/org/apache/camel/model/dataformat/any23.json
b/core/camel-core-model/src/generated/resources/org/apache/camel/model/dataformat/any23.json
index 63b9206..80cc0f4 100644
---
a/core/camel-core-model/src/generated/resources/org/apache/camel/model/dataformat/any23.json
+++
b/core/camel-core-model/src/generated/resources/org/apache/camel/model/dataformat/any23.json
@@ -16,7 +16,7 @@
"outputFormat": { "kind": "attribute", "displayName": "Output Format",
"required": false, "type": "enum", "javaType":
"org.apache.camel.dataformat.any23.Any23OutputFormat", "enum": [ "NTRIPLES",
"TURTLE", "NQUADS", "RDFXML", "JSONLD", "RDFJSON", "RDF4JMODEL" ],
"deprecated": false, "autowired": false, "secret": false, "defaultValue":
"RDF4JMODEL", "description": "What RDF syntax to unmarshal as, can be:
NTRIPLES, TURTLE, NQUADS, RDFXML, JSONLD, RDFJSON, RDF4JMODEL. It is by
default: [...]
"configuration": { "kind": "element", "displayName": "Configuration",
"required": false, "type": "array", "javaType":
"java.util.List<org.apache.camel.model.PropertyDefinition>", "deprecated":
false, "autowired": false, "secret": false, "description": "Configurations for
Apache Any23 as key-value pairs in order to customize the extraction process.
The list of supported parameters can be found here. If not provided, a default
configuration is used." },
"extractors": { "kind": "element", "displayName": "Extractors",
"required": false, "type": "array", "javaType":
"java.util.List<java.lang.String>", "deprecated": false, "autowired": false,
"secret": false, "description": "List of Any23 extractors to be used in the
unmarshal operation. A list of the available extractors can be found here here.
If not provided, all the available extractors are used." },
- "baseURI": { "kind": "attribute", "displayName": "Base URI", "required":
false, "type": "string", "javaType": "java.lang.String", "deprecated": false,
"autowired": false, "secret": false, "description": "The URI to use as base for
building RDF entities if only relative paths are provided." },
+ "baseUri": { "kind": "attribute", "displayName": "Base Uri", "required":
false, "type": "string", "javaType": "java.lang.String", "deprecated": false,
"autowired": false, "secret": false, "description": "The URI to use as base for
building RDF entities if only relative paths are provided." },
"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/main/java/org/apache/camel/model/dataformat/Any23DataFormat.java
b/core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/Any23DataFormat.java
index 603c997..ea08436 100644
---
a/core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/Any23DataFormat.java
+++
b/core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/Any23DataFormat.java
@@ -51,7 +51,7 @@ public class Any23DataFormat extends DataFormatDefinition {
@XmlElement
private List<String> extractors;
@XmlAttribute
- private String baseURI;
+ private String baseUri;
public Any23DataFormat() {
super("any23");
@@ -59,7 +59,7 @@ public class Any23DataFormat extends DataFormatDefinition {
public Any23DataFormat(String baseuri) {
this();
- this.baseURI = baseuri;
+ this.baseUri = baseuri;
}
public Any23DataFormat(String baseuri, Any23Type outputFormat) {
@@ -143,15 +143,15 @@ public class Any23DataFormat extends DataFormatDefinition
{
this.extractors = extractors;
}
- public String getBaseURI() {
- return baseURI;
+ public String getBaseUri() {
+ return baseUri;
}
/**
* The URI to use as base for building RDF entities if only relative paths
are provided.
*/
- public void setBaseURI(String baseURI) {
- this.baseURI = baseURI;
+ public void setBaseUri(String baseUri) {
+ this.baseUri = baseUri;
}
}
diff --git
a/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/dataformat/Any23DataFormatReifier.java
b/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/dataformat/Any23DataFormatReifier.java
index 8d1fa4d..33682ef 100644
---
a/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/dataformat/Any23DataFormatReifier.java
+++
b/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/dataformat/Any23DataFormatReifier.java
@@ -31,9 +31,9 @@ public class Any23DataFormatReifier extends
DataFormatReifier<Any23DataFormat> {
@Override
protected void prepareDataFormatConfig(Map<String, Object> properties) {
properties.put("outputFormat", definition.getOutputFormat());
- properties.put("configurations", definition.getConfigurationAsMap());
+ properties.put("configuration", definition.getConfigurationAsMap());
properties.put("extractors", definition.getExtractors());
- properties.put("baseURI", definition.getBaseURI());
+ properties.put("baseURI", definition.getBaseUri());
}
}
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 a4b0ff4..592da53 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
@@ -1845,7 +1845,7 @@ public class ModelParser extends BaseParser {
protected Any23DataFormat doParseAny23DataFormat() throws IOException,
XmlPullParserException {
return doParse(new Any23DataFormat(), (def, key, val) -> {
switch (key) {
- case "baseURI": def.setBaseURI(val); break;
+ case "baseUri": def.setBaseUri(val); break;
case "outputFormat": def.setOutputFormat(val); break;
default: return identifiedTypeAttributeHandler().accept(def,
key, val);
}
diff --git
a/docs/user-manual/modules/ROOT/pages/camel-3x-upgrade-guide-3_16.adoc
b/docs/user-manual/modules/ROOT/pages/camel-3x-upgrade-guide-3_16.adoc
index 2199e5d..ddea207 100644
--- a/docs/user-manual/modules/ROOT/pages/camel-3x-upgrade-guide-3_16.adoc
+++ b/docs/user-manual/modules/ROOT/pages/camel-3x-upgrade-guide-3_16.adoc
@@ -57,3 +57,8 @@ To:
</sagaOption>
</saga>
----
+
+=== camel-any23
+
+The option `baseURI` is renamed to `baseUri`.
+
diff --git
a/dsl/camel-yaml-dsl/camel-yaml-dsl-deserializers/src/generated/java/org/apache/camel/dsl/yaml/deserializers/ModelDeserializers.java
b/dsl/camel-yaml-dsl/camel-yaml-dsl-deserializers/src/generated/java/org/apache/camel/dsl/yaml/deserializers/ModelDeserializers.java
index 8663c73..cf7d612 100644
---
a/dsl/camel-yaml-dsl/camel-yaml-dsl-deserializers/src/generated/java/org/apache/camel/dsl/yaml/deserializers/ModelDeserializers.java
+++
b/dsl/camel-yaml-dsl/camel-yaml-dsl-deserializers/src/generated/java/org/apache/camel/dsl/yaml/deserializers/ModelDeserializers.java
@@ -541,7 +541,7 @@ public final class ModelDeserializers extends
YamlDeserializerSupport {
switch(propertyKey) {
case "base-uri": {
String val = asText(node);
- target.setBaseURI(val);
+ target.setBaseUri(val);
break;
}
case "configuration": {