[camel] branch master updated: CAMEL-13893: disable configurations

classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
|

[camel] branch master updated: CAMEL-13893: disable configurations

zregvart
This is an automated email from the ASF dual-hosted git repository.

zregvart pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git


The following commit(s) were added to refs/heads/master by this push:
     new 516ea5b  CAMEL-13893: disable configurations
516ea5b is described below

commit 516ea5bb61b74ac1cd3f4a9be6686e0f86627495
Author: Zoran Regvart <[hidden email]>
AuthorDate: Thu Aug 22 17:48:53 2019 +0200

    CAMEL-13893: disable configurations
   
    We need to disable `configurations` in Any23 as a quick solution on
    getting the build working.
---
 .../camel-any23/src/main/docs/any23-dataformat.adoc      |  6 ++----
 .../any23/spring/SpringAny23DataFormatTest.xml           |  8 +-------
 .../apache/camel/model/dataformat/Any23DataFormat.java   |  4 +++-
 docs/components/modules/ROOT/pages/any23-dataformat.adoc |  8 +++-----
 .../any23/springboot/Any23DataFormatConfiguration.java   | 16 ----------------
 5 files changed, 9 insertions(+), 33 deletions(-)

diff --git a/components/camel-any23/src/main/docs/any23-dataformat.adoc b/components/camel-any23/src/main/docs/any23-dataformat.adoc
index 74b917a..17f6364 100644
--- a/components/camel-any23/src/main/docs/any23-dataformat.adoc
+++ b/components/camel-any23/src/main/docs/any23-dataformat.adoc
@@ -13,7 +13,7 @@ Any23 is a Data Format that is intended to convert HTML from a site (or file) in
 ### Any23 Options
 
 // dataformat options: START
-The Any23 dataformat supports 5 options, which are listed below.
+The Any23 dataformat supports 4 options, which are listed below.
 
 
 
@@ -21,7 +21,6 @@ The Any23 dataformat supports 5 options, which are listed below.
 |===
 | Name | Default | Java Type | Description
 | outputFormat | RDF4JMODEL | Any23Type | What RDF syntax to unmarshal as, can be: NTRIPLES, TURTLE, NQUADS, RDFXML, JSONLD, RDFJSON, RDF4JMODEL. It is by default: RDF4JMODEL.
-| configurations |  | Map | Configurations for Apache Any23 as key-value pairs in order to customize the extraction process. The list of supported parameters can be found a href= \https://github.com/apache/any23/blob/master/api/src/main/resources/default-configuration.propertieshere. If not provided, a default configuration is used.
 | extractors |  | List | 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 |  | String | The URI to use as base for building RDF entities if only relative paths are provided.
 | contentTypeHeader | false | Boolean | Whether the data format should set the Content-Type header with the type from the data format if the data format is capable of doing so. For example application/xml for data formats marshalling to XML, or application/json for data formats marshalling to JSon etc.
@@ -43,7 +42,7 @@ When using Spring Boot make sure to use the following Maven dependency to have s
 ----
 
 
-The component supports 5 options, which are listed below.
+The component supports 4 options, which are listed below.
 
 
 
@@ -51,7 +50,6 @@ The component supports 5 options, which are listed below.
 |===
 | Name | Description | Default | Type
 | *camel.dataformat.any23.base-u-r-i* | The URI to use as base for building RDF entities if only relative paths are provided. |  | String
-| *camel.dataformat.any23.configurations* | 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. |  | Map
 | *camel.dataformat.any23.content-type-header* | Whether the data format should set the Content-Type header with the type from the data format if the data format is capable of doing so. For example application/xml for data formats marshalling to XML, or application/json for data formats marshalling to JSon etc. | false | Boolean
 | *camel.dataformat.any23.enabled* | Whether to enable auto configuration of the any23 data format. This is enabled by default. |  | Boolean
 | *camel.dataformat.any23.extractors* | 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. |  | List
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 40f9b92..213f5ff 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
@@ -29,12 +29,6 @@
 
     <dataFormats>
       <any23 id="any23" baseURI ="http://mock.foo/bar" outputFormat="TURTLE" >
-        <configurations>
-          <entry>
-            <key>any23.extraction.metadata.nesting</key>
-            <value>off</value>
-          </entry>
-        </configurations>
         <extractors>html-head-title</extractors>
       </any23>
     </dataFormats>
@@ -51,4 +45,4 @@
   </camelContext>
   <!-- END SNIPPET: e1 -->
 
-</beans>
\ No newline at end of file
+</beans>
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/dataformat/Any23DataFormat.java b/core/camel-core/src/main/java/org/apache/camel/model/dataformat/Any23DataFormat.java
index 0d0f561..ec795dd 100644
--- a/core/camel-core/src/main/java/org/apache/camel/model/dataformat/Any23DataFormat.java
+++ b/core/camel-core/src/main/java/org/apache/camel/model/dataformat/Any23DataFormat.java
@@ -23,6 +23,8 @@ import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlAttribute;
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlTransient;
+
 import org.apache.camel.model.DataFormatDefinition;
 import org.apache.camel.spi.Metadata;
 
@@ -37,7 +39,7 @@ public class Any23DataFormat extends DataFormatDefinition {
     @XmlAttribute
     @Metadata(defaultValue = "RDF4JMODEL")
     private Any23Type outputFormat;
-    @XmlElement
+    @XmlTransient
     private Map<String, String> configurations;
     @XmlElement
     private List<String> extractors;
diff --git a/docs/components/modules/ROOT/pages/any23-dataformat.adoc b/docs/components/modules/ROOT/pages/any23-dataformat.adoc
index 36d2a84..17f6364 100644
--- a/docs/components/modules/ROOT/pages/any23-dataformat.adoc
+++ b/docs/components/modules/ROOT/pages/any23-dataformat.adoc
@@ -13,7 +13,7 @@ Any23 is a Data Format that is intended to convert HTML from a site (or file) in
 ### Any23 Options
 
 // dataformat options: START
-The Any23 dataformat supports 5 options, which are listed below.
+The Any23 dataformat supports 4 options, which are listed below.
 
 
 
@@ -21,7 +21,6 @@ The Any23 dataformat supports 5 options, which are listed below.
 |===
 | Name | Default | Java Type | Description
 | outputFormat | RDF4JMODEL | Any23Type | What RDF syntax to unmarshal as, can be: NTRIPLES, TURTLE, NQUADS, RDFXML, JSONLD, RDFJSON, RDF4JMODEL. It is by default: RDF4JMODEL.
-| configurations |  | Map | 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 |  | List | 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 |  | String | The URI to use as base for building RDF entities if only relative paths are provided.
 | contentTypeHeader | false | Boolean | Whether the data format should set the Content-Type header with the type from the data format if the data format is capable of doing so. For example application/xml for data formats marshalling to XML, or application/json for data formats marshalling to JSon etc.
@@ -43,7 +42,7 @@ When using Spring Boot make sure to use the following Maven dependency to have s
 ----
 
 
-The component supports 5 options, which are listed below.
+The component supports 4 options, which are listed below.
 
 
 
@@ -51,7 +50,6 @@ The component supports 5 options, which are listed below.
 |===
 | Name | Description | Default | Type
 | *camel.dataformat.any23.base-u-r-i* | The URI to use as base for building RDF entities if only relative paths are provided. |  | String
-| *camel.dataformat.any23.configurations* | 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. |  | Map
 | *camel.dataformat.any23.content-type-header* | Whether the data format should set the Content-Type header with the type from the data format if the data format is capable of doing so. For example application/xml for data formats marshalling to XML, or application/json for data formats marshalling to JSon etc. | false | Boolean
 | *camel.dataformat.any23.enabled* | Whether to enable auto configuration of the any23 data format. This is enabled by default. |  | Boolean
 | *camel.dataformat.any23.extractors* | 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. |  | List
@@ -116,4 +114,4 @@ the download page for the latest versions).
   <artifactId>camel-any23</artifactId>
   <version>x.x.x</version>
 </dependency>
-----------------------------------------
\ No newline at end of file
+----------------------------------------
diff --git a/platforms/spring-boot/components-starter/camel-any23-starter/src/main/java/org/apache/camel/dataformat/any23/springboot/Any23DataFormatConfiguration.java b/platforms/spring-boot/components-starter/camel-any23-starter/src/main/java/org/apache/camel/dataformat/any23/springboot/Any23DataFormatConfiguration.java
index 9188822..54bf4b2 100644
--- a/platforms/spring-boot/components-starter/camel-any23-starter/src/main/java/org/apache/camel/dataformat/any23/springboot/Any23DataFormatConfiguration.java
+++ b/platforms/spring-boot/components-starter/camel-any23-starter/src/main/java/org/apache/camel/dataformat/any23/springboot/Any23DataFormatConfiguration.java
@@ -17,7 +17,6 @@
 package org.apache.camel.dataformat.any23.springboot;
 
 import java.util.List;
-import java.util.Map;
 import javax.annotation.Generated;
 import org.apache.camel.spring.boot.DataFormatConfigurationPropertiesCommon;
 import org.springframework.boot.context.properties.ConfigurationProperties;
@@ -39,13 +38,6 @@ public class Any23DataFormatConfiguration
      */
     private Boolean enabled;
     /**
-     * Configurations for Apache Any23 as key-value pairs in order to customize
-     * the extraction process. The list of supported parameters can be found a
-     * href=
-     * https://github.com/apache/any23/blob/master/api/src/main/resources/default-configuration.propertieshere. If not provided, a default configuration is used.
-     */
-    private Map<String, String> configurations;
-    /**
      * 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.
@@ -64,14 +56,6 @@ public class Any23DataFormatConfiguration
      */
     private Boolean contentTypeHeader = false;
 
-    public Map<String, String> getConfigurations() {
-        return configurations;
-    }
-
-    public void setConfigurations(Map<String, String> configurations) {
-        this.configurations = configurations;
-    }
-
     public List<String> getExtractors() {
         return extractors;
     }