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 2017/11/01 16:10:42 UTC
[camel] branch master updated: Deprecate camel-xmljson as the json
library it uses is dead (from 2010)
This is an automated email from the ASF dual-hosted git repository.
davsclaus 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 fdc008e Deprecate camel-xmljson as the json library it uses is dead (from 2010)
fdc008e is described below
commit fdc008e86a1557bf7e00e5f2ee244656c4c5c5da
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Wed Nov 1 17:10:16 2017 +0100
Deprecate camel-xmljson as the json library it uses is dead (from 2010)
---
.../src/main/java/org/apache/camel/builder/DataFormatClause.java | 2 ++
.../src/main/java/org/apache/camel/model/MarshalDefinition.java | 2 ++
.../src/main/java/org/apache/camel/model/UnmarshalDefinition.java | 6 ++++--
.../java/org/apache/camel/model/dataformat/XmlJsonDataFormat.java | 1 +
components/camel-xmljson/pom.xml | 2 +-
components/camel-xmljson/src/main/docs/xmljson-dataformat.adoc | 4 ++--
6 files changed, 12 insertions(+), 5 deletions(-)
diff --git a/camel-core/src/main/java/org/apache/camel/builder/DataFormatClause.java b/camel-core/src/main/java/org/apache/camel/builder/DataFormatClause.java
index 23a70c4..0f03f86 100644
--- a/camel-core/src/main/java/org/apache/camel/builder/DataFormatClause.java
+++ b/camel-core/src/main/java/org/apache/camel/builder/DataFormatClause.java
@@ -1130,6 +1130,7 @@ public class DataFormatClause<T extends ProcessorDefinition<?>> {
/**
* Uses the xmljson dataformat, based on json-lib
*/
+ @Deprecated
public T xmljson() {
return dataFormat(new XmlJsonDataFormat());
}
@@ -1137,6 +1138,7 @@ public class DataFormatClause<T extends ProcessorDefinition<?>> {
/**
* Uses the xmljson dataformat, based on json-lib, initializing custom options with a Map
*/
+ @Deprecated
public T xmljson(Map<String, String> options) {
return dataFormat(new XmlJsonDataFormat(options));
}
diff --git a/camel-core/src/main/java/org/apache/camel/model/MarshalDefinition.java b/camel-core/src/main/java/org/apache/camel/model/MarshalDefinition.java
index 2b832e0..e83f1c9 100644
--- a/camel-core/src/main/java/org/apache/camel/model/MarshalDefinition.java
+++ b/camel-core/src/main/java/org/apache/camel/model/MarshalDefinition.java
@@ -37,6 +37,7 @@ import org.apache.camel.model.dataformat.CustomDataFormat;
import org.apache.camel.model.dataformat.FlatpackDataFormat;
import org.apache.camel.model.dataformat.GzipDataFormat;
import org.apache.camel.model.dataformat.HL7DataFormat;
+import org.apache.camel.model.dataformat.HessianDataFormat;
import org.apache.camel.model.dataformat.IcalDataFormat;
import org.apache.camel.model.dataformat.JacksonXMLDataFormat;
import org.apache.camel.model.dataformat.JaxbDataFormat;
@@ -94,6 +95,7 @@ public class MarshalDefinition extends NoOutputDefinition<MarshalDefinition> {
@XmlElement(required = false, name = "custom", type = CustomDataFormat.class),
@XmlElement(required = false, name = "flatpack", type = FlatpackDataFormat.class),
@XmlElement(required = false, name = "gzip", type = GzipDataFormat.class),
+ @XmlElement(required = false, name = "hessian", type = HessianDataFormat.class),
@XmlElement(required = false, name = "hl7", type = HL7DataFormat.class),
@XmlElement(required = false, name = "ical", type = IcalDataFormat.class),
@XmlElement(required = false, name = "jacksonxml", type = JacksonXMLDataFormat.class),
diff --git a/camel-core/src/main/java/org/apache/camel/model/UnmarshalDefinition.java b/camel-core/src/main/java/org/apache/camel/model/UnmarshalDefinition.java
index 462c954..b69dd38 100644
--- a/camel-core/src/main/java/org/apache/camel/model/UnmarshalDefinition.java
+++ b/camel-core/src/main/java/org/apache/camel/model/UnmarshalDefinition.java
@@ -37,6 +37,7 @@ import org.apache.camel.model.dataformat.CustomDataFormat;
import org.apache.camel.model.dataformat.FlatpackDataFormat;
import org.apache.camel.model.dataformat.GzipDataFormat;
import org.apache.camel.model.dataformat.HL7DataFormat;
+import org.apache.camel.model.dataformat.HessianDataFormat;
import org.apache.camel.model.dataformat.IcalDataFormat;
import org.apache.camel.model.dataformat.JacksonXMLDataFormat;
import org.apache.camel.model.dataformat.JaxbDataFormat;
@@ -80,7 +81,6 @@ public class UnmarshalDefinition extends NoOutputDefinition<UnmarshalDefinition>
// TODO: Camel 3.0, ref attribute should be removed as UnmarshalDataFormat is to be used instead
- // cannot use @XmlElementRef as it doesn't allow optional properties
@XmlElements({
@XmlElement(required = false, name = "asn1", type = ASN1DataFormat.class),
@XmlElement(required = false, name = "avro", type = AvroDataFormat.class),
@@ -94,6 +94,7 @@ public class UnmarshalDefinition extends NoOutputDefinition<UnmarshalDefinition>
@XmlElement(required = false, name = "custom", type = CustomDataFormat.class),
@XmlElement(required = false, name = "flatpack", type = FlatpackDataFormat.class),
@XmlElement(required = false, name = "gzip", type = GzipDataFormat.class),
+ @XmlElement(required = false, name = "hessian", type = HessianDataFormat.class),
@XmlElement(required = false, name = "hl7", type = HL7DataFormat.class),
@XmlElement(required = false, name = "ical", type = IcalDataFormat.class),
@XmlElement(required = false, name = "jacksonxml", type = JacksonXMLDataFormat.class),
@@ -121,8 +122,9 @@ public class UnmarshalDefinition extends NoOutputDefinition<UnmarshalDefinition>
@XmlElement(required = false, name = "yaml", type = YAMLDataFormat.class),
@XmlElement(required = false, name = "zip", type = ZipDataFormat.class),
@XmlElement(required = false, name = "zipFile", type = ZipFileDataFormat.class)}
- )
+ )
private DataFormatDefinition dataFormatType;
+ // cannot use @XmlElementRef as it doesn't allow optional properties
@XmlAttribute
@Deprecated
diff --git a/camel-core/src/main/java/org/apache/camel/model/dataformat/XmlJsonDataFormat.java b/camel-core/src/main/java/org/apache/camel/model/dataformat/XmlJsonDataFormat.java
index 2144a24..9c8b7ee 100644
--- a/camel-core/src/main/java/org/apache/camel/model/dataformat/XmlJsonDataFormat.java
+++ b/camel-core/src/main/java/org/apache/camel/model/dataformat/XmlJsonDataFormat.java
@@ -38,6 +38,7 @@ import org.apache.camel.spi.Metadata;
@Metadata(firstVersion = "2.10.0", label = "dataformat,transformation,xml,json", title = "XML JSon")
@XmlRootElement(name = "xmljson")
@XmlAccessorType(XmlAccessType.FIELD)
+@Deprecated
public class XmlJsonDataFormat extends DataFormatDefinition {
public static final String TYPE_HINTS = "typeHints";
diff --git a/components/camel-xmljson/pom.xml b/components/camel-xmljson/pom.xml
index 198caab..4f39076 100644
--- a/components/camel-xmljson/pom.xml
+++ b/components/camel-xmljson/pom.xml
@@ -29,7 +29,7 @@
<artifactId>camel-xmljson</artifactId>
<packaging>jar</packaging>
- <name>Camel :: XML JSON</name>
+ <name>Camel :: XML JSON (deprecated)</name>
<description>Camel XML JSON Data Format</description>
<properties>
diff --git a/components/camel-xmljson/src/main/docs/xmljson-dataformat.adoc b/components/camel-xmljson/src/main/docs/xmljson-dataformat.adoc
index c8cf4c7..cd7def4 100644
--- a/components/camel-xmljson/src/main/docs/xmljson-dataformat.adoc
+++ b/components/camel-xmljson/src/main/docs/xmljson-dataformat.adoc
@@ -1,4 +1,4 @@
-== XML JSon DataFormat
+== XML JSon DataFormat (deprecated)
*Available as of Camel version 2.10*
@@ -275,4 +275,4 @@ license with ASF; so add this manually -->
### See Also
* link:data-format.html[Data Format]
-* http://json-lib.sourceforge.net/[json-lib]
+* http://json-lib.sourceforge.net/[json-lib]
\ No newline at end of file
--
To stop receiving notification emails like this one, please contact
['"commits@camel.apache.org" <co...@camel.apache.org>'].