This is an automated email from the ASF dual-hosted git repository. zbendhiba pushed a commit to branch camel-main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
The following commit(s) were added to refs/heads/camel-main by this push: new 1cb4ff0 camel 3.12 : dataformat fix attributes names 1cb4ff0 is described below commit 1cb4ff0d0549c03578a274ce8ac01fb8cae9191a Author: Zineb Bendhiba <bendhiba.zi...@gmail.com> AuthorDate: Tue Jul 6 17:35:09 2021 +0200 camel 3.12 : dataformat fix attributes names --- .../src/main/resources/routes/gson-routes.xml | 2 +- .../src/main/resources/routes/jackson-routes.xml | 18 +++++++++--------- .../src/main/resources/routes/johnzon-routes.xml | 2 +- .../src/main/resources/routes/jsonb-routes.xml | 2 +- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/integration-tests/dataformats-json/src/main/resources/routes/gson-routes.xml b/integration-tests/dataformats-json/src/main/resources/routes/gson-routes.xml index edcb2f3..e9cd7ab 100644 --- a/integration-tests/dataformats-json/src/main/resources/routes/gson-routes.xml +++ b/integration-tests/dataformats-json/src/main/resources/routes/gson-routes.xml @@ -26,7 +26,7 @@ <route> <from uri="direct:Gson-type-as-attribute"/> <unmarshal> - <json library="Gson" unmarshalTypeName="org.apache.camel.quarkus.component.dataformats.json.model.AnotherObject"/> + <json library="Gson" unmarshalType="org.apache.camel.quarkus.component.dataformats.json.model.AnotherObject"/> </unmarshal> </route> diff --git a/integration-tests/dataformats-json/src/main/resources/routes/jackson-routes.xml b/integration-tests/dataformats-json/src/main/resources/routes/jackson-routes.xml index bfee9c4..d0a240a 100644 --- a/integration-tests/dataformats-json/src/main/resources/routes/jackson-routes.xml +++ b/integration-tests/dataformats-json/src/main/resources/routes/jackson-routes.xml @@ -26,7 +26,7 @@ <route> <from uri="direct:Jackson-type-as-attribute"/> <unmarshal> - <json library="Jackson" unmarshalTypeName="org.apache.camel.quarkus.component.dataformats.json.model.AnotherObject"/> + <json library="Jackson" unmarshalType="org.apache.camel.quarkus.component.dataformats.json.model.AnotherObject"/> </unmarshal> </route> @@ -42,14 +42,14 @@ <route> <from uri="direct:jacksonxml-unmarshal-spring-list-backPojo"/> - <unmarshal><jacksonxml useList="true" unmarshalTypeName="org.apache.camel.quarkus.component.dataformats.json.model.TestPojo"/></unmarshal> + <unmarshal><jacksonxml useList="true" unmarshalType="org.apache.camel.quarkus.component.dataformats.json.model.TestPojo"/></unmarshal> <to uri="mock:jacksonxml-unmarshal-spring-list-reversePojo"/> </route> <route> <from uri="direct:jacksonxml-marshal-spring-enablefeature"/> <marshal> - <jacksonxml unmarshalTypeName="org.apache.camel.quarkus.component.dataformats.json.model.TestPojo" + <jacksonxml unmarshalType="org.apache.camel.quarkus.component.dataformats.json.model.TestPojo" enableFeatures="WRAP_ROOT_VALUE"/> </marshal> </route> @@ -72,35 +72,35 @@ <route> <from uri="direct:jacksonxml-xml-inPojo"/> - <marshal><jacksonxml unmarshalTypeName="org.apache.camel.quarkus.component.dataformats.json.model.TestPojo"/></marshal> + <marshal><jacksonxml unmarshalType="org.apache.camel.quarkus.component.dataformats.json.model.TestPojo"/></marshal> </route> <route> <from uri="direct:jacksonxml-xml-backPojo"/> - <unmarshal><jacksonxml unmarshalTypeName="org.apache.camel.quarkus.component.dataformats.json.model.TestPojo"/></unmarshal> + <unmarshal><jacksonxml unmarshalType="org.apache.camel.quarkus.component.dataformats.json.model.TestPojo"/></unmarshal> <to uri="mock:jacksonxml-xml-reversePojo"/> </route> <route> <from uri="direct:jacksonxml-xml-inAgeView"/> - <marshal><jacksonxml unmarshalTypeName="org.apache.camel.quarkus.component.dataformats.json.model.TestPojoView" jsonViewTypeName="org.apache.camel.quarkus.component.dataformats.json.model.Views$Age"/></marshal> + <marshal><jacksonxml unmarshalType="org.apache.camel.quarkus.component.dataformats.json.model.TestPojoView" jsonView="org.apache.camel.quarkus.component.dataformats.json.model.Views$Age"/></marshal> </route> <route> <from uri="direct:jacksonxml-xml-backAgeView"/> - <unmarshal><jacksonxml unmarshalTypeName="org.apache.camel.quarkus.component.dataformats.json.model.TestPojoView" jsonViewTypeName="org.apache.camel.quarkus.component.dataformats.json.model.Views$Age"/></unmarshal> + <unmarshal><jacksonxml unmarshalType="org.apache.camel.quarkus.component.dataformats.json.model.TestPojoView" jsonView="org.apache.camel.quarkus.component.dataformats.json.model.Views$Age"/></unmarshal> <to uri="mock:jacksonxml-xml-reverseAgeView"/> </route> <route> <from uri="direct:jackson-xml-unmarshal-list-backPojo"/> - <unmarshal><json library="Jackson" useList="true" unmarshalTypeName="org.apache.camel.quarkus.component.dataformats.json.model.TestPojo"/></unmarshal> + <unmarshal><json library="Jackson" useList="true" unmarshalType="org.apache.camel.quarkus.component.dataformats.json.model.TestPojo"/></unmarshal> <to uri="mock:jackson-xml-unmarshal-list-reversePojo"/> </route> <route> <from uri="direct:jackson-enablefeature-in"/> - <marshal><json library="Jackson" unmarshalTypeName="org.apache.camel.quarkus.component.dataformats.json.model.TestPojo" + <marshal><json library="Jackson" unmarshalType="org.apache.camel.quarkus.component.dataformats.json.model.TestPojo" enableFeatures="WRAP_ROOT_VALUE"/></marshal> </route> </routes> diff --git a/integration-tests/dataformats-json/src/main/resources/routes/johnzon-routes.xml b/integration-tests/dataformats-json/src/main/resources/routes/johnzon-routes.xml index 539ff1f..191ff7d 100644 --- a/integration-tests/dataformats-json/src/main/resources/routes/johnzon-routes.xml +++ b/integration-tests/dataformats-json/src/main/resources/routes/johnzon-routes.xml @@ -26,7 +26,7 @@ <route> <from uri="direct:Johnzon-type-as-attribute"/> <unmarshal> - <json library="Johnzon" unmarshalTypeName="org.apache.camel.quarkus.component.dataformats.json.model.AnotherObject"/> + <json library="Johnzon" unmarshalType="org.apache.camel.quarkus.component.dataformats.json.model.AnotherObject"/> </unmarshal> </route> diff --git a/integration-tests/dataformats-json/src/main/resources/routes/jsonb-routes.xml b/integration-tests/dataformats-json/src/main/resources/routes/jsonb-routes.xml index 261e88f..c48b9b6 100644 --- a/integration-tests/dataformats-json/src/main/resources/routes/jsonb-routes.xml +++ b/integration-tests/dataformats-json/src/main/resources/routes/jsonb-routes.xml @@ -26,7 +26,7 @@ <route> <from uri="direct:Jsonb-type-as-attribute"/> <unmarshal> - <json library="Jsonb" unmarshalTypeName="org.apache.camel.quarkus.component.dataformats.json.model.AnotherObject"/> + <json library="Jsonb" unmarshalType="org.apache.camel.quarkus.component.dataformats.json.model.AnotherObject"/> </unmarshal> </route>