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 2021/05/14 15:15:04 UTC
[camel] branch main updated: Polished, fixed CS, regen etc.
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 d4a55ce Polished, fixed CS, regen etc.
d4a55ce is described below
commit d4a55ced749ca1c7c5d8b0529b11205a627d458d
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Fri May 14 17:14:20 2021 +0200
Polished, fixed CS, regen etc.
---
.../catalog/docs/avro-jackson-dataformat.adoc | 11 +++---
.../catalog/docs/protobuf-jackson-dataformat.adoc | 9 ++---
components/camel-jackson-avro/pom.xml | 1 +
.../camel/component/jackson/avro/avro-jackson.json | 2 +-
.../src/main/docs/avro-jackson-dataformat.adoc | 11 +++---
.../jackson/avro/JacksonAvroDataFormat.java | 4 +--
.../avro/JacksonAvroLookupResolverTest.java | 18 +++++-----
.../JacksonAvroMarshalUnmarshalJsonNodeTest.java | 42 +++++++++++-----------
.../JacksonAvroMarshalUnmarshalPojoListTest.java | 26 +++++++-------
.../avro/JacksonAvroMarshalUnmarshalPojoTest.java | 18 +++++-----
components/camel-jackson-protobuf/pom.xml | 1 +
.../jackson/protobuf/protobuf-jackson.json | 2 +-
.../src/main/docs/protobuf-jackson-dataformat.adoc | 9 ++---
.../protobuf/JacksonProtobufDataFormat.java | 5 +--
.../JacksonProtobufLookupResolverTest.java | 12 +++----
...acksonProtobufMarshalUnmarshalJsonNodeTest.java | 12 +++----
.../JacksonProtobufMarshalUnmarshalPojoTest.java | 12 +++----
docs/components/modules/dataformats/nav.adoc | 4 +--
.../dataformats/pages/avro-jackson-dataformat.adoc | 11 +++---
.../pages/protobuf-jackson-dataformat.adoc | 9 ++---
20 files changed, 114 insertions(+), 105 deletions(-)
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/avro-jackson-dataformat.adoc b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/avro-jackson-dataformat.adoc
index ec9f568..95a9514 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/avro-jackson-dataformat.adoc
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/avro-jackson-dataformat.adoc
@@ -1,10 +1,11 @@
[[avro-jackson-dataformat]]
-= Avro Jackson DataFormat
-:docTitle: Avro Jackson
+= Avro DataFormat
+:docTitle: Avro
:artifactId: camel-jackson-avro
-:description: Marshal POJOs to Avro and back using Jackson
-:since: 3.10
+:description: Marshal POJOs to Avro and back using Jackson.
+:since: 2.14
:supportLevel: Stable
+include::{cq-version}@camel-quarkus:ROOT:partial$reference/dataformats/avro-jackson.adoc[opts=optional]
*Since Camel {since}*
@@ -45,7 +46,6 @@ The Avro dataformat supports 18 options, which are listed below.
[width="100%",cols="2s,1m,1m,6",options="header"]
|===
| Name | Default | Java Type | Description
-| contentTypeHeader | true | Boolean | Whether the data format should set the Content-Type header with the type from the data format. For example application/xml for data formats marshalling to XML, or application/json for data formats marshalling to JSON
| objectMapper | | String | Lookup and use the existing ObjectMapper with the given id when using Jackson.
| useDefaultObjectMapper | true | Boolean | Whether to lookup and use default Jackson ObjectMapper from the registry.
| unmarshalTypeName | | String | Class name of the java type to use when unmarshalling
@@ -61,6 +61,7 @@ The Avro dataformat supports 18 options, which are listed below.
| allowUnmarshallType | false | Boolean | If enabled then Jackson is allowed to attempt to use the CamelJacksonUnmarshalType header during the unmarshalling. This should only be enabled when desired to be used.
| timezone | | String | If set then Jackson will use the Timezone when marshalling/unmarshalling.
| autoDiscoverObjectMapper | false | Boolean | If set to true then Jackson will lookup for an objectMapper into the registry
+| contentTypeHeader | true | Boolean | Whether the data format should set the Content-Type header with the type from the data format. For example application/xml for data formats marshalling to XML, or application/json for data formats marshalling to JSON
| schemaResolver | | String | Optional schema resolver used to lookup schemas for the data in transit.
| autoDiscoverSchemaResolver | true | Boolean | When not disabled, the SchemaResolver will be looked up into the registry
|===
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/protobuf-jackson-dataformat.adoc b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/protobuf-jackson-dataformat.adoc
index 7f6136f..d536741 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/protobuf-jackson-dataformat.adoc
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/protobuf-jackson-dataformat.adoc
@@ -1,10 +1,11 @@
[[protobuf-jackson-dataformat]]
-= Protobuf Jackson DataFormat
-:docTitle: Protobuf Jackson
+= Protobuf DataFormat
+:docTitle: Protobuf
:artifactId: camel-jackson-protobuf
-:description: Marshal POJOs to Protobuf and back using Jackson
-:since: 3.10
+:description: Marshal POJOs to Protobuf and back using Jackson.
+:since: 2.2
:supportLevel: Stable
+include::{cq-version}@camel-quarkus:ROOT:partial$reference/dataformats/protobuf-jackson.adoc[opts=optional]
*Since Camel {since}*
diff --git a/components/camel-jackson-avro/pom.xml b/components/camel-jackson-avro/pom.xml
index dfe499c..d24c862 100644
--- a/components/camel-jackson-avro/pom.xml
+++ b/components/camel-jackson-avro/pom.xml
@@ -32,6 +32,7 @@
<description>Camel Jackson Avro support</description>
<properties>
+ <firstVersion>3.10.0</firstVersion>
<camel.osgi.import.before.defaults>
com.fasterxml.jackson.*;version="[2.11,3)"
</camel.osgi.import.before.defaults>
diff --git a/components/camel-jackson-avro/src/generated/resources/org/apache/camel/component/jackson/avro/avro-jackson.json b/components/camel-jackson-avro/src/generated/resources/org/apache/camel/component/jackson/avro/avro-jackson.json
index e2588ea..5edff28 100644
--- a/components/camel-jackson-avro/src/generated/resources/org/apache/camel/component/jackson/avro/avro-jackson.json
+++ b/components/camel-jackson-avro/src/generated/resources/org/apache/camel/component/jackson/avro/avro-jackson.json
@@ -3,7 +3,7 @@
"kind": "dataformat",
"name": "avro-jackson",
"title": "Avro",
- "description": "Marshal POJOs to Avro and back using Jackson",
+ "description": "Marshal POJOs to Avro and back using Jackson.",
"deprecated": false,
"firstVersion": "2.14.0",
"label": "dataformat,transformation",
diff --git a/components/camel-jackson-avro/src/main/docs/avro-jackson-dataformat.adoc b/components/camel-jackson-avro/src/main/docs/avro-jackson-dataformat.adoc
index ec9f568..95a9514 100644
--- a/components/camel-jackson-avro/src/main/docs/avro-jackson-dataformat.adoc
+++ b/components/camel-jackson-avro/src/main/docs/avro-jackson-dataformat.adoc
@@ -1,10 +1,11 @@
[[avro-jackson-dataformat]]
-= Avro Jackson DataFormat
-:docTitle: Avro Jackson
+= Avro DataFormat
+:docTitle: Avro
:artifactId: camel-jackson-avro
-:description: Marshal POJOs to Avro and back using Jackson
-:since: 3.10
+:description: Marshal POJOs to Avro and back using Jackson.
+:since: 2.14
:supportLevel: Stable
+include::{cq-version}@camel-quarkus:ROOT:partial$reference/dataformats/avro-jackson.adoc[opts=optional]
*Since Camel {since}*
@@ -45,7 +46,6 @@ The Avro dataformat supports 18 options, which are listed below.
[width="100%",cols="2s,1m,1m,6",options="header"]
|===
| Name | Default | Java Type | Description
-| contentTypeHeader | true | Boolean | Whether the data format should set the Content-Type header with the type from the data format. For example application/xml for data formats marshalling to XML, or application/json for data formats marshalling to JSON
| objectMapper | | String | Lookup and use the existing ObjectMapper with the given id when using Jackson.
| useDefaultObjectMapper | true | Boolean | Whether to lookup and use default Jackson ObjectMapper from the registry.
| unmarshalTypeName | | String | Class name of the java type to use when unmarshalling
@@ -61,6 +61,7 @@ The Avro dataformat supports 18 options, which are listed below.
| allowUnmarshallType | false | Boolean | If enabled then Jackson is allowed to attempt to use the CamelJacksonUnmarshalType header during the unmarshalling. This should only be enabled when desired to be used.
| timezone | | String | If set then Jackson will use the Timezone when marshalling/unmarshalling.
| autoDiscoverObjectMapper | false | Boolean | If set to true then Jackson will lookup for an objectMapper into the registry
+| contentTypeHeader | true | Boolean | Whether the data format should set the Content-Type header with the type from the data format. For example application/xml for data formats marshalling to XML, or application/json for data formats marshalling to JSON
| schemaResolver | | String | Optional schema resolver used to lookup schemas for the data in transit.
| autoDiscoverSchemaResolver | true | Boolean | When not disabled, the SchemaResolver will be looked up into the registry
|===
diff --git a/components/camel-jackson-avro/src/main/java/org/apache/camel/component/jackson/avro/JacksonAvroDataFormat.java b/components/camel-jackson-avro/src/main/java/org/apache/camel/component/jackson/avro/JacksonAvroDataFormat.java
index a12323e..6e86b81 100644
--- a/components/camel-jackson-avro/src/main/java/org/apache/camel/component/jackson/avro/JacksonAvroDataFormat.java
+++ b/components/camel-jackson-avro/src/main/java/org/apache/camel/component/jackson/avro/JacksonAvroDataFormat.java
@@ -23,10 +23,10 @@ import org.apache.camel.spi.Metadata;
import org.apache.camel.spi.annotations.Dataformat;
/**
- * Marshal POJOs to Avro and back using <a href="http://jackson.codehaus.org/">Jackson</a>
+ * Marshal POJOs to Avro and back using Jackson.
*/
@Dataformat("avro-jackson")
-@Metadata(firstVersion = "3.10.0", excludeProperties = "library,instanceClassName,schema")
+@Metadata(firstVersion = "3.10.0", title = "Avro Jackson", excludeProperties = "library,instanceClassName,schema")
public class JacksonAvroDataFormat extends AbstractJacksonDataFormat {
/**
diff --git a/components/camel-jackson-avro/src/test/java/org/apache/camel/component/jackson/avro/JacksonAvroLookupResolverTest.java b/components/camel-jackson-avro/src/test/java/org/apache/camel/component/jackson/avro/JacksonAvroLookupResolverTest.java
index 2b9aba0..ebc3325 100644
--- a/components/camel-jackson-avro/src/test/java/org/apache/camel/component/jackson/avro/JacksonAvroLookupResolverTest.java
+++ b/components/camel-jackson-avro/src/test/java/org/apache/camel/component/jackson/avro/JacksonAvroLookupResolverTest.java
@@ -61,13 +61,13 @@ public class JacksonAvroLookupResolverTest extends CamelTestSupport {
@Override
protected void bindToRegistry(Registry registry) throws Exception {
- String SCHEMA_JSON = "{\n"
- + "\"type\": \"record\",\n"
- + "\"name\": \"Pojo\",\n"
- + "\"fields\": [\n"
- + " {\"name\": \"text\", \"type\": \"string\"}\n"
- + "]}";
- Schema raw = new Schema.Parser().setValidate(true).parse(SCHEMA_JSON);
+ String schemaJson = "{\n"
+ + "\"type\": \"record\",\n"
+ + "\"name\": \"Pojo\",\n"
+ + "\"fields\": [\n"
+ + " {\"name\": \"text\", \"type\": \"string\"}\n"
+ + "]}";
+ Schema raw = new Schema.Parser().setValidate(true).parse(schemaJson);
AvroSchema schema = new AvroSchema(raw);
SchemaResolver resolver = ex -> schema;
registry.bind("schema-resolver-1", SchemaResolver.class, resolver);
@@ -92,6 +92,8 @@ public class JacksonAvroLookupResolverTest extends CamelTestSupport {
public static class Pojo {
+ private String text;
+
public Pojo() {
}
@@ -99,8 +101,6 @@ public class JacksonAvroLookupResolverTest extends CamelTestSupport {
this.text = text;
}
- private String text;
-
public String getText() {
return text;
}
diff --git a/components/camel-jackson-avro/src/test/java/org/apache/camel/component/jackson/avro/JacksonAvroMarshalUnmarshalJsonNodeTest.java b/components/camel-jackson-avro/src/test/java/org/apache/camel/component/jackson/avro/JacksonAvroMarshalUnmarshalJsonNodeTest.java
index e372a2b..206987a 100644
--- a/components/camel-jackson-avro/src/test/java/org/apache/camel/component/jackson/avro/JacksonAvroMarshalUnmarshalJsonNodeTest.java
+++ b/components/camel-jackson-avro/src/test/java/org/apache/camel/component/jackson/avro/JacksonAvroMarshalUnmarshalJsonNodeTest.java
@@ -98,27 +98,27 @@ public class JacksonAvroMarshalUnmarshalJsonNodeTest extends CamelTestSupport {
@Override
protected void bindToRegistry(Registry registry) throws Exception {
- String SCHEMA_JSON = "{\n"
- + "\"type\": \"record\",\n"
- + "\"name\": \"Pojo\",\n"
- + "\"fields\": [\n"
- + " {\"name\": \"text\", \"type\": \"string\"}\n"
- + "]}";
- String LIST_SCHEMA_JSON = "{\n" +
- " \"type\": \"array\", \n" +
- " \"items\":{\n" +
- " \"name\":\"Pojo\",\n" +
- " \"type\":\"record\",\n" +
- " \"fields\":[\n" +
- " {\"name\":\"text\", \"type\":\"string\"}\n" +
- " ]\n" +
- " }\n" +
- "}";
-
- Schema raw = new Schema.Parser().setValidate(true).parse(SCHEMA_JSON);
+ String schemaJson = "{\n"
+ + "\"type\": \"record\",\n"
+ + "\"name\": \"Pojo\",\n"
+ + "\"fields\": [\n"
+ + " {\"name\": \"text\", \"type\": \"string\"}\n"
+ + "]}";
+ String listSchemaJson = "{\n" +
+ " \"type\": \"array\", \n" +
+ " \"items\":{\n" +
+ " \"name\":\"Pojo\",\n" +
+ " \"type\":\"record\",\n" +
+ " \"fields\":[\n" +
+ " {\"name\":\"text\", \"type\":\"string\"}\n" +
+ " ]\n" +
+ " }\n" +
+ "}";
+
+ Schema raw = new Schema.Parser().setValidate(true).parse(schemaJson);
AvroSchema schema = new AvroSchema(raw);
- Schema rawList = new Schema.Parser().setValidate(true).parse(LIST_SCHEMA_JSON);
+ Schema rawList = new Schema.Parser().setValidate(true).parse(listSchemaJson);
AvroSchema schemaList = new AvroSchema(rawList);
SchemaResolver resolver = ex -> {
@@ -144,6 +144,8 @@ public class JacksonAvroMarshalUnmarshalJsonNodeTest extends CamelTestSupport {
public static class Pojo {
+ private String text;
+
public Pojo() {
}
@@ -151,8 +153,6 @@ public class JacksonAvroMarshalUnmarshalJsonNodeTest extends CamelTestSupport {
this.text = text;
}
- private String text;
-
public String getText() {
return text;
}
diff --git a/components/camel-jackson-avro/src/test/java/org/apache/camel/component/jackson/avro/JacksonAvroMarshalUnmarshalPojoListTest.java b/components/camel-jackson-avro/src/test/java/org/apache/camel/component/jackson/avro/JacksonAvroMarshalUnmarshalPojoListTest.java
index c643cca..9185939 100644
--- a/components/camel-jackson-avro/src/test/java/org/apache/camel/component/jackson/avro/JacksonAvroMarshalUnmarshalPojoListTest.java
+++ b/components/camel-jackson-avro/src/test/java/org/apache/camel/component/jackson/avro/JacksonAvroMarshalUnmarshalPojoListTest.java
@@ -69,17 +69,17 @@ public class JacksonAvroMarshalUnmarshalPojoListTest extends CamelTestSupport {
@Override
protected void bindToRegistry(Registry registry) throws Exception {
- String SCHEMA_JSON = "{\n" +
- " \"type\": \"array\", \n" +
- " \"items\":{\n" +
- " \"name\":\"Pojo\",\n" +
- " \"type\":\"record\",\n" +
- " \"fields\":[\n" +
- " {\"name\":\"text\", \"type\":\"string\"}\n" +
- " ]\n" +
- " }\n" +
- "}";
- Schema raw = new Schema.Parser().setValidate(true).parse(SCHEMA_JSON);
+ String schemaJson = "{\n" +
+ " \"type\": \"array\", \n" +
+ " \"items\":{\n" +
+ " \"name\":\"Pojo\",\n" +
+ " \"type\":\"record\",\n" +
+ " \"fields\":[\n" +
+ " {\"name\":\"text\", \"type\":\"string\"}\n" +
+ " ]\n" +
+ " }\n" +
+ "}";
+ Schema raw = new Schema.Parser().setValidate(true).parse(schemaJson);
AvroSchema schema = new AvroSchema(raw);
SchemaResolver resolver = ex -> schema;
registry.bind("schema-resolver", SchemaResolver.class, resolver);
@@ -103,6 +103,8 @@ public class JacksonAvroMarshalUnmarshalPojoListTest extends CamelTestSupport {
public static class Pojo {
+ private String text;
+
public Pojo() {
}
@@ -110,8 +112,6 @@ public class JacksonAvroMarshalUnmarshalPojoListTest extends CamelTestSupport {
this.text = text;
}
- private String text;
-
public String getText() {
return text;
}
diff --git a/components/camel-jackson-avro/src/test/java/org/apache/camel/component/jackson/avro/JacksonAvroMarshalUnmarshalPojoTest.java b/components/camel-jackson-avro/src/test/java/org/apache/camel/component/jackson/avro/JacksonAvroMarshalUnmarshalPojoTest.java
index a9b2891..15cd681 100644
--- a/components/camel-jackson-avro/src/test/java/org/apache/camel/component/jackson/avro/JacksonAvroMarshalUnmarshalPojoTest.java
+++ b/components/camel-jackson-avro/src/test/java/org/apache/camel/component/jackson/avro/JacksonAvroMarshalUnmarshalPojoTest.java
@@ -60,13 +60,13 @@ public class JacksonAvroMarshalUnmarshalPojoTest extends CamelTestSupport {
@Override
protected void bindToRegistry(Registry registry) throws Exception {
- String SCHEMA_JSON = "{\n"
- + "\"type\": \"record\",\n"
- + "\"name\": \"Pojo\",\n"
- + "\"fields\": [\n"
- + " {\"name\": \"text\", \"type\": \"string\"}\n"
- + "]}";
- Schema raw = new Schema.Parser().setValidate(true).parse(SCHEMA_JSON);
+ String schemaJson = "{\n"
+ + "\"type\": \"record\",\n"
+ + "\"name\": \"Pojo\",\n"
+ + "\"fields\": [\n"
+ + " {\"name\": \"text\", \"type\": \"string\"}\n"
+ + "]}";
+ Schema raw = new Schema.Parser().setValidate(true).parse(schemaJson);
AvroSchema schema = new AvroSchema(raw);
SchemaResolver resolver = ex -> schema;
registry.bind("schema-resolver", SchemaResolver.class, resolver);
@@ -85,6 +85,8 @@ public class JacksonAvroMarshalUnmarshalPojoTest extends CamelTestSupport {
public static class Pojo {
+ private String text;
+
public Pojo() {
}
@@ -92,8 +94,6 @@ public class JacksonAvroMarshalUnmarshalPojoTest extends CamelTestSupport {
this.text = text;
}
- private String text;
-
public String getText() {
return text;
}
diff --git a/components/camel-jackson-protobuf/pom.xml b/components/camel-jackson-protobuf/pom.xml
index a261eff..6d7f381 100644
--- a/components/camel-jackson-protobuf/pom.xml
+++ b/components/camel-jackson-protobuf/pom.xml
@@ -32,6 +32,7 @@
<description>Camel Jackson Protobuf support</description>
<properties>
+ <firstVersion>3.10.0</firstVersion>
<camel.osgi.import.before.defaults>
com.fasterxml.jackson.*;version="[2.11,3)"
</camel.osgi.import.before.defaults>
diff --git a/components/camel-jackson-protobuf/src/generated/resources/org/apache/camel/component/jackson/protobuf/protobuf-jackson.json b/components/camel-jackson-protobuf/src/generated/resources/org/apache/camel/component/jackson/protobuf/protobuf-jackson.json
index a4d1e2e..61396d1 100644
--- a/components/camel-jackson-protobuf/src/generated/resources/org/apache/camel/component/jackson/protobuf/protobuf-jackson.json
+++ b/components/camel-jackson-protobuf/src/generated/resources/org/apache/camel/component/jackson/protobuf/protobuf-jackson.json
@@ -3,7 +3,7 @@
"kind": "dataformat",
"name": "protobuf-jackson",
"title": "Protobuf",
- "description": "Marshal POJOs to Protobuf and back using Jackson",
+ "description": "Marshal POJOs to Protobuf and back using Jackson.",
"deprecated": false,
"firstVersion": "2.2.0",
"label": "dataformat,transformation",
diff --git a/components/camel-jackson-protobuf/src/main/docs/protobuf-jackson-dataformat.adoc b/components/camel-jackson-protobuf/src/main/docs/protobuf-jackson-dataformat.adoc
index 7f6136f..d536741 100644
--- a/components/camel-jackson-protobuf/src/main/docs/protobuf-jackson-dataformat.adoc
+++ b/components/camel-jackson-protobuf/src/main/docs/protobuf-jackson-dataformat.adoc
@@ -1,10 +1,11 @@
[[protobuf-jackson-dataformat]]
-= Protobuf Jackson DataFormat
-:docTitle: Protobuf Jackson
+= Protobuf DataFormat
+:docTitle: Protobuf
:artifactId: camel-jackson-protobuf
-:description: Marshal POJOs to Protobuf and back using Jackson
-:since: 3.10
+:description: Marshal POJOs to Protobuf and back using Jackson.
+:since: 2.2
:supportLevel: Stable
+include::{cq-version}@camel-quarkus:ROOT:partial$reference/dataformats/protobuf-jackson.adoc[opts=optional]
*Since Camel {since}*
diff --git a/components/camel-jackson-protobuf/src/main/java/org/apache/camel/component/jackson/protobuf/JacksonProtobufDataFormat.java b/components/camel-jackson-protobuf/src/main/java/org/apache/camel/component/jackson/protobuf/JacksonProtobufDataFormat.java
index 7c8b046..47b54ab 100644
--- a/components/camel-jackson-protobuf/src/main/java/org/apache/camel/component/jackson/protobuf/JacksonProtobufDataFormat.java
+++ b/components/camel-jackson-protobuf/src/main/java/org/apache/camel/component/jackson/protobuf/JacksonProtobufDataFormat.java
@@ -23,10 +23,11 @@ import org.apache.camel.spi.Metadata;
import org.apache.camel.spi.annotations.Dataformat;
/**
- * Marshal POJOs to Protobuf and back using <a href="http://jackson.codehaus.org/">Jackson</a>
+ * Marshal POJOs to Protobuf and back using Jackson.
*/
@Dataformat("protobuf-jackson")
-@Metadata(firstVersion = "3.10.0", excludeProperties = "library,instanceClass,contentTypeFormat,defaultInstance")
+@Metadata(firstVersion = "3.10.0", title = "Protobuf Jackson",
+ excludeProperties = "library,instanceClass,contentTypeFormat,defaultInstance")
public class JacksonProtobufDataFormat extends AbstractJacksonDataFormat {
/**
diff --git a/components/camel-jackson-protobuf/src/test/java/org/apache/camel/component/jackson/protobuf/JacksonProtobufLookupResolverTest.java b/components/camel-jackson-protobuf/src/test/java/org/apache/camel/component/jackson/protobuf/JacksonProtobufLookupResolverTest.java
index 9bf57af..1da6916 100644
--- a/components/camel-jackson-protobuf/src/test/java/org/apache/camel/component/jackson/protobuf/JacksonProtobufLookupResolverTest.java
+++ b/components/camel-jackson-protobuf/src/test/java/org/apache/camel/component/jackson/protobuf/JacksonProtobufLookupResolverTest.java
@@ -61,10 +61,10 @@ public class JacksonProtobufLookupResolverTest extends CamelTestSupport {
@Override
protected void bindToRegistry(Registry registry) throws Exception {
- String protobuf_str = "message Pojo {\n"
- + " required string text = 1;\n"
- + "}\n";
- ProtobufSchema schema = ProtobufSchemaLoader.std.parse(protobuf_str);
+ String protobufStr = "message Pojo {\n"
+ + " required string text = 1;\n"
+ + "}\n";
+ ProtobufSchema schema = ProtobufSchemaLoader.std.parse(protobufStr);
SchemaResolver resolver = ex -> schema;
registry.bind("schema-resolver-1", SchemaResolver.class, resolver);
@@ -89,6 +89,8 @@ public class JacksonProtobufLookupResolverTest extends CamelTestSupport {
public static class Pojo {
+ private String text;
+
public Pojo() {
}
@@ -96,8 +98,6 @@ public class JacksonProtobufLookupResolverTest extends CamelTestSupport {
this.text = text;
}
- private String text;
-
public String getText() {
return text;
}
diff --git a/components/camel-jackson-protobuf/src/test/java/org/apache/camel/component/jackson/protobuf/JacksonProtobufMarshalUnmarshalJsonNodeTest.java b/components/camel-jackson-protobuf/src/test/java/org/apache/camel/component/jackson/protobuf/JacksonProtobufMarshalUnmarshalJsonNodeTest.java
index 6c7ab62..562d5eb 100644
--- a/components/camel-jackson-protobuf/src/test/java/org/apache/camel/component/jackson/protobuf/JacksonProtobufMarshalUnmarshalJsonNodeTest.java
+++ b/components/camel-jackson-protobuf/src/test/java/org/apache/camel/component/jackson/protobuf/JacksonProtobufMarshalUnmarshalJsonNodeTest.java
@@ -61,10 +61,10 @@ public class JacksonProtobufMarshalUnmarshalJsonNodeTest extends CamelTestSuppor
@Override
protected void bindToRegistry(Registry registry) throws Exception {
- String protobuf_str = "message Pojo {\n"
- + " required string text = 1;\n"
- + "}\n";
- ProtobufSchema schema = ProtobufSchemaLoader.std.parse(protobuf_str);
+ String protobufStr = "message Pojo {\n"
+ + " required string text = 1;\n"
+ + "}\n";
+ ProtobufSchema schema = ProtobufSchemaLoader.std.parse(protobufStr);
SchemaResolver resolver = ex -> schema;
registry.bind("schema-resolver", SchemaResolver.class, resolver);
}
@@ -82,6 +82,8 @@ public class JacksonProtobufMarshalUnmarshalJsonNodeTest extends CamelTestSuppor
public static class Pojo {
+ private String text;
+
public Pojo() {
}
@@ -89,8 +91,6 @@ public class JacksonProtobufMarshalUnmarshalJsonNodeTest extends CamelTestSuppor
this.text = text;
}
- private String text;
-
public String getText() {
return text;
}
diff --git a/components/camel-jackson-protobuf/src/test/java/org/apache/camel/component/jackson/protobuf/JacksonProtobufMarshalUnmarshalPojoTest.java b/components/camel-jackson-protobuf/src/test/java/org/apache/camel/component/jackson/protobuf/JacksonProtobufMarshalUnmarshalPojoTest.java
index 40f387b..38f4dd5 100644
--- a/components/camel-jackson-protobuf/src/test/java/org/apache/camel/component/jackson/protobuf/JacksonProtobufMarshalUnmarshalPojoTest.java
+++ b/components/camel-jackson-protobuf/src/test/java/org/apache/camel/component/jackson/protobuf/JacksonProtobufMarshalUnmarshalPojoTest.java
@@ -60,10 +60,10 @@ public class JacksonProtobufMarshalUnmarshalPojoTest extends CamelTestSupport {
@Override
protected void bindToRegistry(Registry registry) throws Exception {
- String protobuf_str = "message Pojo {\n"
- + " required string text = 1;\n"
- + "}\n";
- ProtobufSchema schema = ProtobufSchemaLoader.std.parse(protobuf_str);
+ String protobufStr = "message Pojo {\n"
+ + " required string text = 1;\n"
+ + "}\n";
+ ProtobufSchema schema = ProtobufSchemaLoader.std.parse(protobufStr);
SchemaResolver resolver = ex -> schema;
registry.bind("schema-resolver", SchemaResolver.class, resolver);
}
@@ -81,6 +81,8 @@ public class JacksonProtobufMarshalUnmarshalPojoTest extends CamelTestSupport {
public static class Pojo {
+ private String text;
+
public Pojo() {
}
@@ -88,8 +90,6 @@ public class JacksonProtobufMarshalUnmarshalPojoTest extends CamelTestSupport {
this.text = text;
}
- private String text;
-
public String getText() {
return text;
}
diff --git a/docs/components/modules/dataformats/nav.adoc b/docs/components/modules/dataformats/nav.adoc
index 6075ac5..135f439 100644
--- a/docs/components/modules/dataformats/nav.adoc
+++ b/docs/components/modules/dataformats/nav.adoc
@@ -5,7 +5,7 @@
** xref:dataformats:any23-dataformat.adoc[Any23]
** xref:dataformats:asn1-dataformat.adoc[ASN.1 File]
** xref:dataformats:avro-dataformat.adoc[Avro]
-** xref:dataformats:avro-jackson-dataformat.adoc[Avro Jackson]
+** xref:dataformats:avro-jackson-dataformat.adoc[Avro]
** xref:dataformats:barcode-dataformat.adoc[Barcode]
** xref:dataformats:base64-dataformat.adoc[Base64]
** xref:dataformats:beanio-dataformat.adoc[BeanIO]
@@ -33,7 +33,7 @@
** xref:dataformats:mime-multipart-dataformat.adoc[MIME Multipart]
** xref:dataformats:pgp-dataformat.adoc[PGP]
** xref:dataformats:protobuf-dataformat.adoc[Protobuf]
-** xref:dataformats:protobuf-jackson-dataformat.adoc[Protobuf Jackson]
+** xref:dataformats:protobuf-jackson-dataformat.adoc[Protobuf]
** xref:dataformats:rss-dataformat.adoc[RSS]
** xref:dataformats:soapjaxb-dataformat.adoc[SOAP]
** xref:dataformats:syslog-dataformat.adoc[Syslog]
diff --git a/docs/components/modules/dataformats/pages/avro-jackson-dataformat.adoc b/docs/components/modules/dataformats/pages/avro-jackson-dataformat.adoc
index ba51c0f..c1cafae 100644
--- a/docs/components/modules/dataformats/pages/avro-jackson-dataformat.adoc
+++ b/docs/components/modules/dataformats/pages/avro-jackson-dataformat.adoc
@@ -1,12 +1,13 @@
[[avro-jackson-dataformat]]
-= Avro Jackson DataFormat
+= Avro DataFormat
//THIS FILE IS COPIED: EDIT THE SOURCE FILE:
:page-source: components/camel-jackson-avro/src/main/docs/avro-jackson-dataformat.adoc
-:docTitle: Avro Jackson
+:docTitle: Avro
:artifactId: camel-jackson-avro
-:description: Marshal POJOs to Avro and back using Jackson
-:since: 3.10
+:description: Marshal POJOs to Avro and back using Jackson.
+:since: 2.14
:supportLevel: Stable
+include::{cq-version}@camel-quarkus:ROOT:partial$reference/dataformats/avro-jackson.adoc[opts=optional]
*Since Camel {since}*
@@ -47,7 +48,6 @@ The Avro dataformat supports 18 options, which are listed below.
[width="100%",cols="2s,1m,1m,6",options="header"]
|===
| Name | Default | Java Type | Description
-| contentTypeHeader | true | Boolean | Whether the data format should set the Content-Type header with the type from the data format. For example application/xml for data formats marshalling to XML, or application/json for data formats marshalling to JSON
| objectMapper | | String | Lookup and use the existing ObjectMapper with the given id when using Jackson.
| useDefaultObjectMapper | true | Boolean | Whether to lookup and use default Jackson ObjectMapper from the registry.
| unmarshalTypeName | | String | Class name of the java type to use when unmarshalling
@@ -63,6 +63,7 @@ The Avro dataformat supports 18 options, which are listed below.
| allowUnmarshallType | false | Boolean | If enabled then Jackson is allowed to attempt to use the CamelJacksonUnmarshalType header during the unmarshalling. This should only be enabled when desired to be used.
| timezone | | String | If set then Jackson will use the Timezone when marshalling/unmarshalling.
| autoDiscoverObjectMapper | false | Boolean | If set to true then Jackson will lookup for an objectMapper into the registry
+| contentTypeHeader | true | Boolean | Whether the data format should set the Content-Type header with the type from the data format. For example application/xml for data formats marshalling to XML, or application/json for data formats marshalling to JSON
| schemaResolver | | String | Optional schema resolver used to lookup schemas for the data in transit.
| autoDiscoverSchemaResolver | true | Boolean | When not disabled, the SchemaResolver will be looked up into the registry
|===
diff --git a/docs/components/modules/dataformats/pages/protobuf-jackson-dataformat.adoc b/docs/components/modules/dataformats/pages/protobuf-jackson-dataformat.adoc
index 01101cb..d3dc6c8 100644
--- a/docs/components/modules/dataformats/pages/protobuf-jackson-dataformat.adoc
+++ b/docs/components/modules/dataformats/pages/protobuf-jackson-dataformat.adoc
@@ -1,12 +1,13 @@
[[protobuf-jackson-dataformat]]
-= Protobuf Jackson DataFormat
+= Protobuf DataFormat
//THIS FILE IS COPIED: EDIT THE SOURCE FILE:
:page-source: components/camel-jackson-protobuf/src/main/docs/protobuf-jackson-dataformat.adoc
-:docTitle: Protobuf Jackson
+:docTitle: Protobuf
:artifactId: camel-jackson-protobuf
-:description: Marshal POJOs to Protobuf and back using Jackson
-:since: 3.10
+:description: Marshal POJOs to Protobuf and back using Jackson.
+:since: 2.2
:supportLevel: Stable
+include::{cq-version}@camel-quarkus:ROOT:partial$reference/dataformats/protobuf-jackson.adoc[opts=optional]
*Since Camel {since}*