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 2016/08/16 11:20:21 UTC
camel git commit: Fixed typo and added missing option to data format
Repository: camel
Updated Branches:
refs/heads/master 9ecd5635d -> 813d17c81
Fixed typo and added missing option to data format
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/813d17c8
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/813d17c8
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/813d17c8
Branch: refs/heads/master
Commit: 813d17c8186e668b54e40f11d92017b633b28a0d
Parents: 9ecd563
Author: Claus Ibsen <da...@apache.org>
Authored: Tue Aug 16 13:20:12 2016 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Tue Aug 16 13:20:12 2016 +0200
----------------------------------------------------------------------
.../model/dataformat/TidyMarkupDataFormat.java | 18 ++++++++++++-
.../TidyMarkupDataFormatConfiguration.java | 12 +++++++++
.../src/main/docs/tidyMarkup-dataformat.adoc | 7 +++--
.../tagsoup/TidyMarkupDataFormat.java | 28 +++++++++++++-------
4 files changed, 52 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/813d17c8/camel-core/src/main/java/org/apache/camel/model/dataformat/TidyMarkupDataFormat.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/model/dataformat/TidyMarkupDataFormat.java b/camel-core/src/main/java/org/apache/camel/model/dataformat/TidyMarkupDataFormat.java
index 1fee0fc..6db243b 100644
--- a/camel-core/src/main/java/org/apache/camel/model/dataformat/TidyMarkupDataFormat.java
+++ b/camel-core/src/main/java/org/apache/camel/model/dataformat/TidyMarkupDataFormat.java
@@ -38,8 +38,10 @@ import org.apache.camel.util.ObjectHelper;
@XmlRootElement(name = "tidyMarkup")
@XmlAccessorType(XmlAccessType.FIELD)
public class TidyMarkupDataFormat extends DataFormatDefinition {
- @XmlAttribute(name = "dataObjectType")
+ @XmlAttribute(name = "dataObjectType") @Metadata(defaultValue = "org.w3c.dom.Node")
private String dataObjectTypeName;
+ @XmlAttribute
+ private Boolean omitXmlDeclaration;
@XmlTransient
private Class<?> dataObjectType;
@@ -82,6 +84,17 @@ public class TidyMarkupDataFormat extends DataFormatDefinition {
this.dataObjectTypeName = dataObjectTypeName;
}
+ public Boolean getOmitXmlDeclaration() {
+ return omitXmlDeclaration;
+ }
+
+ /**
+ * When returning a String, do we omit the XML declaration in the top.
+ */
+ public void setOmitXmlDeclaration(Boolean omitXmlDeclaration) {
+ this.omitXmlDeclaration = omitXmlDeclaration;
+ }
+
@Override
protected DataFormat createDataFormat(RouteContext routeContext) {
if (dataObjectType == null && dataObjectTypeName != null) {
@@ -100,6 +113,9 @@ public class TidyMarkupDataFormat extends DataFormatDefinition {
if (dataObjectType != null) {
setProperty(camelContext, dataFormat, "dataObjectType", dataObjectType);
}
+ if (omitXmlDeclaration != null) {
+ setProperty(camelContext, dataFormat, "omitXmlDeclaration", omitXmlDeclaration);
+ }
}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/camel/blob/813d17c8/components-starter/camel-tagsoup-starter/src/main/java/org/apache/camel/dataformat/tagsoup/springboot/TidyMarkupDataFormatConfiguration.java
----------------------------------------------------------------------
diff --git a/components-starter/camel-tagsoup-starter/src/main/java/org/apache/camel/dataformat/tagsoup/springboot/TidyMarkupDataFormatConfiguration.java b/components-starter/camel-tagsoup-starter/src/main/java/org/apache/camel/dataformat/tagsoup/springboot/TidyMarkupDataFormatConfiguration.java
index 478b70d..40b4da7 100644
--- a/components-starter/camel-tagsoup-starter/src/main/java/org/apache/camel/dataformat/tagsoup/springboot/TidyMarkupDataFormatConfiguration.java
+++ b/components-starter/camel-tagsoup-starter/src/main/java/org/apache/camel/dataformat/tagsoup/springboot/TidyMarkupDataFormatConfiguration.java
@@ -31,6 +31,10 @@ public class TidyMarkupDataFormatConfiguration {
* java.lang.String. Is by default org.w3c.dom.Node
*/
private String dataObjectType;
+ /**
+ * When returning a String do we omit the XML declaration in the top.
+ */
+ private Boolean omitXmlDeclaration = false;
public String getDataObjectType() {
return dataObjectType;
@@ -39,4 +43,12 @@ public class TidyMarkupDataFormatConfiguration {
public void setDataObjectType(String dataObjectType) {
this.dataObjectType = dataObjectType;
}
+
+ public Boolean getOmitXmlDeclaration() {
+ return omitXmlDeclaration;
+ }
+
+ public void setOmitXmlDeclaration(Boolean omitXmlDeclaration) {
+ this.omitXmlDeclaration = omitXmlDeclaration;
+ }
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/camel/blob/813d17c8/components/camel-tagsoup/src/main/docs/tidyMarkup-dataformat.adoc
----------------------------------------------------------------------
diff --git a/components/camel-tagsoup/src/main/docs/tidyMarkup-dataformat.adoc b/components/camel-tagsoup/src/main/docs/tidyMarkup-dataformat.adoc
index 2f0fe64..53970c01 100644
--- a/components/camel-tagsoup/src/main/docs/tidyMarkup-dataformat.adoc
+++ b/components/camel-tagsoup/src/main/docs/tidyMarkup-dataformat.adoc
@@ -22,8 +22,9 @@ TidyMarkup Options
^^^^^^^^^^^^^^^
+
// dataformat options: START
-The TidyMarkup dataformat supports 1 options which are listed below.
+The TidyMarkup dataformat supports 2 options which are listed below.
@@ -31,13 +32,15 @@ The TidyMarkup dataformat supports 1 options which are listed below.
[width="100%",cols="2s,1m,1m,6",options="header"]
|=======================================================================
| Name | Default | Java Type | Description
-| dataObjectType | | String | What data type to unmarshal as can either be org.w3c.dom.Node or java.lang.String. Is by default org.w3c.dom.Node
+| dataObjectType | org.w3c.dom.Node | String | What data type to unmarshal as can either be org.w3c.dom.Node or java.lang.String. Is by default org.w3c.dom.Node
+| omitXmlDeclaration | false | Boolean | When returning a String do we omit the XML declaration in the top.
|=======================================================================
{% endraw %}
// dataformat options: END
+
[[TidyMarkup-JavaDSLExample]]
Java DSL Example
^^^^^^^^^^^^^^^^
http://git-wip-us.apache.org/repos/asf/camel/blob/813d17c8/components/camel-tagsoup/src/main/java/org/apache/camel/dataformat/tagsoup/TidyMarkupDataFormat.java
----------------------------------------------------------------------
diff --git a/components/camel-tagsoup/src/main/java/org/apache/camel/dataformat/tagsoup/TidyMarkupDataFormat.java b/components/camel-tagsoup/src/main/java/org/apache/camel/dataformat/tagsoup/TidyMarkupDataFormat.java
index 69eeb7d..cfad01c 100644
--- a/components/camel-tagsoup/src/main/java/org/apache/camel/dataformat/tagsoup/TidyMarkupDataFormat.java
+++ b/components/camel-tagsoup/src/main/java/org/apache/camel/dataformat/tagsoup/TidyMarkupDataFormat.java
@@ -68,9 +68,9 @@ public class TidyMarkupDataFormat extends ServiceSupport implements DataFormat,
private static final String XML = "xml";
/**
- * When returning a String, do we omit the XML ?
+ * When returning a String, do we omit the XML declaration in the top.
*/
- private boolean isOmitXmlDeclaration;
+ private boolean omitXmlDeclaration;
/**
* String or Node to return
@@ -103,7 +103,7 @@ public class TidyMarkupDataFormat extends ServiceSupport implements DataFormat,
* {@link http://www.saxproject.org/apidoc/org/xml/sax/package-summary.html}
* </p>
*/
- private Map<String, Object> parserPropeties;
+ private Map<String, Object> parserProperties;
@Override
public String getDataFormatName() {
@@ -212,8 +212,8 @@ public class TidyMarkupDataFormat extends ServiceSupport implements DataFormat,
* http://home.ccil.org/~cowan/XML/tagsoup/#properties}
*/
- if (getParserPropeties() != null) {
- for (Entry<String, Object> e : getParserPropeties().entrySet()) {
+ if (getParserProperties() != null) {
+ for (Entry<String, Object> e : getParserProperties().entrySet()) {
reader.setProperty(e.getKey(), e.getValue());
}
}
@@ -242,7 +242,7 @@ public class TidyMarkupDataFormat extends ServiceSupport implements DataFormat,
xmlWriter.setOutputProperty(XMLWriter.METHOD, XML);
}
- if (isOmitXmlDeclaration) {
+ if (omitXmlDeclaration) {
xmlWriter.setOutputProperty(XMLWriter.OMIT_XML_DECLARATION, YES);
} else {
xmlWriter.setOutputProperty(XMLWriter.OMIT_XML_DECLARATION, NO);
@@ -262,6 +262,14 @@ public class TidyMarkupDataFormat extends ServiceSupport implements DataFormat,
return parsingSchema;
}
+ public boolean isOmitXmlDeclaration() {
+ return omitXmlDeclaration;
+ }
+
+ public void setOmitXmlDeclaration(boolean omitXmlDeclaration) {
+ this.omitXmlDeclaration = omitXmlDeclaration;
+ }
+
public void setParserFeatures(Map<String, Boolean> parserFeatures) {
this.parserFeatures = parserFeatures;
}
@@ -270,12 +278,12 @@ public class TidyMarkupDataFormat extends ServiceSupport implements DataFormat,
return parserFeatures;
}
- public void setParserPropeties(Map<String, Object> parserPropeties) {
- this.parserPropeties = parserPropeties;
+ public void setParserProperties(Map<String, Object> parserProperties) {
+ this.parserProperties = parserProperties;
}
- public Map<String, Object> getParserPropeties() {
- return parserPropeties;
+ public Map<String, Object> getParserProperties() {
+ return parserProperties;
}
public void setMethod(String method) {