Mailing-List: contact dev-help@camel.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@camel.apache.org
Date: Wed, 14 Dec 2016 20:15:55 +0000 (UTC)
From: Andrea Cosentino <ancosen1985@yahoo.com.INVALID>
Reply-To: "ancosen1985@yahoo.com" <ancosen1985@yahoo.com>
To: "dev@camel.apache.org" <dev@camel.apache.org>,
	"dkulp@apache.org" <dkulp@apache.org>,
	"commits@camel.apache.org" <commits@camel.apache.org>
Message-ID: <95453379.3196015.1481746555746@mail.yahoo.com>
In-Reply-To: <f6a0cda86b444e0981c111c67cd48aed@git.apache.org>
References: <f6a0cda86b444e0981c111c67cd48aed@git.apache.org>
Subject: R: [1/3] camel git commit: CAMEL-10567: Camel-Jackson: Add an
 option to allow the UnmarshallType header use
MIME-Version: 1.0
Content-Type: multipart/alternative;
	boundary="----=_Part_3196014_1139510993.1481746555744"
archived-at: Wed, 14 Dec 2016 20:24:55 -0000

------=_Part_3196014_1139510993.1481746555744
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: quoted-printable

Thanks Daniel.
I forget to fix on 2.16.x
Thanks for tour backport :-) can you upgrade the JIRA too?
Thanks=20
=20
  Il mer, 14 dic, 2016 alle 21:11, dkulp@apache.org<dkulp@apache.org> ha sc=
ritto:   Repository: camel
Updated Branches:
=C2=A0 refs/heads/camel-2.16.x 2f204b742 -> b093ebdb9


CAMEL-10567: Camel-Jackson: Add an option to allow the UnmarshallType heade=
r use


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/235036d2
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/235036d2
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/235036d2

Branch: refs/heads/camel-2.16.x
Commit: 235036d2396ae45b6809b72a1983dee33b5ba326
Parents: 2f204b7
Author: Andrea Cosentino <ancosen@gmail.com>
Authored: Wed Dec 7 18:18:45 2016 +0100
Committer: Daniel Kulp <dkulp@apache.org>
Committed: Wed Dec 14 14:35:03 2016 -0500

----------------------------------------------------------------------
 .../component/jackson/JacksonDataFormat.java=C2=A0 =C2=A0 | 19 ++++++-
 ...arshalUnmarshalTypeHeaderNotAllowedTest.java | 54 ++++++++++++++++++++
 .../JacksonMarshalUnmarshalTypeHeaderTest.java=C2=A0 |=C2=A0 1 +
 3 files changed, 73 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/235036d2/components/camel=
-jackson/src/main/java/org/apache/camel/component/jackson/JacksonDataFormat=
.java
----------------------------------------------------------------------
diff --git a/components/camel-jackson/src/main/java/org/apache/camel/compon=
ent/jackson/JacksonDataFormat.java b/components/camel-jackson/src/main/java=
/org/apache/camel/component/jackson/JacksonDataFormat.java
index 381b81a..553387c 100644
--- a/components/camel-jackson/src/main/java/org/apache/camel/component/jac=
kson/JacksonDataFormat.java
+++ b/components/camel-jackson/src/main/java/org/apache/camel/component/jac=
kson/JacksonDataFormat.java
@@ -68,6 +68,7 @@ public class JacksonDataFormat extends ServiceSupport imp=
lements DataFormat, Dat
=C2=A0 =C2=A0 private String enableFeatures;
=C2=A0 =C2=A0 private String disableFeatures;
=C2=A0 =C2=A0 private boolean enableJacksonTypeConverter;
+=C2=A0 =C2=A0 private boolean allowJacksonUnmarshallType;
=20
=C2=A0 =C2=A0 /**
=C2=A0 =C2=A0 =C2=A0 * Use the default Jackson {@link ObjectMapper} and {@l=
ink Map}
@@ -159,7 +160,10 @@ public class JacksonDataFormat extends ServiceSupport =
implements DataFormat, Dat
=20
=C2=A0 =C2=A0 =C2=A0 =C2=A0 // is there a header with the unmarshal type?
=C2=A0 =C2=A0 =C2=A0 =C2=A0 Class<?> clazz =3D unmarshalType;
-=C2=A0 =C2=A0 =C2=A0 =C2=A0 String type =3D exchange.getIn().getHeader(Jac=
ksonConstants.UNMARSHAL_TYPE, String.class);
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 String type =3D null;
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 if (allowJacksonUnmarshallType) {
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 type =3D exchange.getIn().getHea=
der(JacksonConstants.UNMARSHAL_TYPE, String.class);
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 }
=C2=A0 =C2=A0 =C2=A0 =C2=A0 if (type =3D=3D null && isAllowJmsType()) {
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 type =3D exchange.getIn().getHead=
er("JMSType", String.class);
=C2=A0 =C2=A0 =C2=A0 =C2=A0 }
@@ -323,6 +327,19 @@ public class JacksonDataFormat extends ServiceSupport =
implements DataFormat, Dat
=C2=A0 =C2=A0 public void setEnableJacksonTypeConverter(boolean enableJacks=
onTypeConverter) {
=C2=A0 =C2=A0 =C2=A0 =C2=A0 this.enableJacksonTypeConverter =3D enableJacks=
onTypeConverter;
=C2=A0 =C2=A0 }
+=C2=A0 =C2=A0=20
+=C2=A0 =C2=A0 public boolean isAllowJacksonUnmarshallType() {
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 return allowJacksonUnmarshallType;
+=C2=A0 =C2=A0 }
+
+=C2=A0 =C2=A0 /**
+=C2=A0 =C2=A0 * If enabled then Jackson is allowed to attempt to use the C=
amelJacksonUnmarshalType header during the unmarshalling.
+=C2=A0 =C2=A0 * <p/>
+=C2=A0 =C2=A0 * This should only be enabled when desired to be used.
+=C2=A0 =C2=A0 */
+=C2=A0 =C2=A0 public void setAllowJacksonUnmarshallType(boolean allowJacks=
onUnmarshallType) {
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 this.allowJacksonUnmarshallType =3D allowJacks=
onUnmarshallType;
+=C2=A0 =C2=A0 }
=20
=C2=A0 =C2=A0 public String getEnableFeatures() {
=C2=A0 =C2=A0 =C2=A0 =C2=A0 return enableFeatures;

http://git-wip-us.apache.org/repos/asf/camel/blob/235036d2/components/camel=
-jackson/src/test/java/org/apache/camel/component/jackson/JacksonMarshalUnm=
arshalTypeHeaderNotAllowedTest.java
----------------------------------------------------------------------
diff --git a/components/camel-jackson/src/test/java/org/apache/camel/compon=
ent/jackson/JacksonMarshalUnmarshalTypeHeaderNotAllowedTest.java b/componen=
ts/camel-jackson/src/test/java/org/apache/camel/component/jackson/JacksonMa=
rshalUnmarshalTypeHeaderNotAllowedTest.java
new file mode 100644
index 0000000..ffabeeb
--- /dev/null
+++ b/components/camel-jackson/src/test/java/org/apache/camel/component/jac=
kson/JacksonMarshalUnmarshalTypeHeaderNotAllowedTest.java
@@ -0,0 +1,54 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.=C2=A0 See the NOTICE file distributed w=
ith
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.=C2=A0 You may obtain a copy of the License at
+ *
+ *=C2=A0 =C2=A0 =C2=A0 http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied=
.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.component.jackson;
+
+import java.util.LinkedHashMap;
+
+import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.mock.MockEndpoint;
+import org.apache.camel.test.junit4.CamelTestSupport;
+import org.junit.Test;
+
+public class JacksonMarshalUnmarshalTypeHeaderNotAllowedTest extends Camel=
TestSupport {
+
+=C2=A0 =C2=A0 @Test
+=C2=A0 =C2=A0 public void testUnmarshalPojo() throws Exception {
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 MockEndpoint mock =3D getMockEndpoint("mock:re=
versePojo");
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 mock.expectedMessageCount(1);
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 mock.message(0).body().isInstanceOf(LinkedHash=
Map.class);
+
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 String json =3D "{\"name\":\"Camel\"}";
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 template.sendBodyAndHeader("direct:backPojo", =
json, JacksonConstants.UNMARSHAL_TYPE, TestPojo.class.getName());
+
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 assertMockEndpointsSatisfied();
+=C2=A0 =C2=A0 }
+
+=C2=A0 =C2=A0 @Override
+=C2=A0 =C2=A0 protected RouteBuilder createRouteBuilder() throws Exception=
 {
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 return new RouteBuilder() {
+
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 @Override
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 public void configure() throws E=
xception {
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 JacksonDataFormat =
format =3D new JacksonDataFormat();
+
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 from("direct:backP=
ojo").unmarshal(format).to("mock:reversePojo");
+
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 }
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 };
+=C2=A0 =C2=A0 }
+
+}

http://git-wip-us.apache.org/repos/asf/camel/blob/235036d2/components/camel=
-jackson/src/test/java/org/apache/camel/component/jackson/JacksonMarshalUnm=
arshalTypeHeaderTest.java
----------------------------------------------------------------------
diff --git a/components/camel-jackson/src/test/java/org/apache/camel/compon=
ent/jackson/JacksonMarshalUnmarshalTypeHeaderTest.java b/components/camel-j=
ackson/src/test/java/org/apache/camel/component/jackson/JacksonMarshalUnmar=
shalTypeHeaderTest.java
index 9cb5b59..623b32e 100644
--- a/components/camel-jackson/src/test/java/org/apache/camel/component/jac=
kson/JacksonMarshalUnmarshalTypeHeaderTest.java
+++ b/components/camel-jackson/src/test/java/org/apache/camel/component/jac=
kson/JacksonMarshalUnmarshalTypeHeaderTest.java
@@ -46,6 +46,7 @@ public class JacksonMarshalUnmarshalTypeHeaderTest extend=
s CamelTestSupport {
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 @Override
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 public void configure() throws Ex=
ception {
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 JacksonDataFormat f=
ormat =3D new JacksonDataFormat();
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 format.setAllowJac=
ksonUnmarshallType(true);
=20
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 from("direct:backPo=
jo").unmarshal(format).to("mock:reversePojo");
=20

 =20

------=_Part_3196014_1139510993.1481746555744--