This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch camel-3.7.x
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/camel-3.7.x by this push:
new d60c8a0 CAMEL-16112: Fix camel-rest should create new instance of
data formats. Thanks to Krzysztof Jamroz for reporting and unit test.
d60c8a0 is described below
commit d60c8a0ab705b33c90b93b9dc5dd45640c4497e8
Author: Claus Ibsen <claus.ib...@gmail.com>
AuthorDate: Sat Jan 30 09:59:19 2021 +0100
CAMEL-16112: Fix camel-rest should create new instance of data formats.
Thanks to Krzysztof Jamroz for reporting and unit test.
---
.../http/rest/RestProducerOutTypeBindingTest.java | 123 +++++++++++++++++++++
.../apache/camel/component/rest/RestProducer.java | 8 +-
2 files changed, 127 insertions(+), 4 deletions(-)
diff --git
a/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/rest/RestProducerOutTypeBindingTest.java
b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/rest/RestProducerOutTypeBindingTest.java
new file mode 100644
index 0000000..ea967fb
--- /dev/null
+++
b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/rest/RestProducerOutTypeBindingTest.java
@@ -0,0 +1,123 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * 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. You may obtain a copy of the License at
+ *
+ * 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.netty.http.rest;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import org.apache.camel.RoutesBuilder;
+import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.netty.http.BaseNettyTest;
+import org.apache.camel.model.rest.RestBindingMode;
+import org.junit.jupiter.api.Test;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class RestProducerOutTypeBindingTest extends BaseNettyTest {
+
+ @JsonIgnoreProperties(ignoreUnknown = true)
+ public static class Resp1 {
+ private String value1;
+
+ public Resp1() {
+ }
+
+ public Resp1(String value1) {
+ this.value1 = value1;
+ }
+
+ public String getValue1() {
+ return value1;
+ }
+
+ public void setValue1(String value1) {
+ this.value1 = value1;
+ }
+
+ }
+
+ @JsonIgnoreProperties(ignoreUnknown = true)
+ public static class Resp2 {
+ private String value1;
+ private String value2;
+
+ public Resp2() {
+ }
+
+ public Resp2(String value1, String value2) {
+ this.value1 = value1;
+ this.value2 = value2;
+ }
+
+ public String getValue1() {
+ return value1;
+ }
+
+ public void setValue1(String value1) {
+ this.value1 = value1;
+ }
+
+ public String getValue2() {
+ return value2;
+ }
+
+ public void setValue2(String value2) {
+ this.value2 = value2;
+ }
+ }
+
+ @Override
+ protected RoutesBuilder createRouteBuilder() throws Exception {
+ return new RouteBuilder() {
+
+ @Override
+ public void configure() throws Exception {
+ // mock server
+
restConfiguration().component("netty-http").host("localhost").port(getPort()).bindingMode(RestBindingMode.auto);
+
+ rest()
+ .get("/req1").route()
+ .log("Got req1")
+ .setBody(constant(new Resp1("1")))
+ .endRest()
+ .get("/req2").route()
+ .log("Got req2")
+ .setBody(constant(new Resp2(null, "2")))
+ .end();
+
+ // faulty client
+ from("direct:req1")
+ .toF("rest:get:/req1?host=localhost:%d&outType=%s",
getPort(), Resp1.class.getName());
+ from("direct:req2")
+ .toF("rest:get:/req2?host=localhost:%d&outType=%s",
getPort(), Resp2.class.getName());
+ }
+ };
+ }
+
+ @Test
+ public void type1Test() {
+ assertThat(template.requestBody("direct:req1", ""))
+ .isInstanceOfSatisfying(Resp1.class, resp ->
assertThat(resp.getValue1()).isEqualTo("1"));
+ }
+
+ @Test
+ public void type2Test() {
+ assertThat(template.requestBody("direct:req2", ""))
+ .isInstanceOfSatisfying(Resp2.class, resp -> {
+ assertThat(resp.getValue1()).isNull();
+ assertThat(resp.getValue2()).isEqualTo("2");
+ });
+ }
+}
diff --git
a/components/camel-rest/src/main/java/org/apache/camel/component/rest/RestProducer.java
b/components/camel-rest/src/main/java/org/apache/camel/component/rest/RestProducer.java
index 833eaa5..df2e2e6 100644
---
a/components/camel-rest/src/main/java/org/apache/camel/component/rest/RestProducer.java
+++
b/components/camel-rest/src/main/java/org/apache/camel/component/rest/RestProducer.java
@@ -296,8 +296,8 @@ public class RestProducer extends DefaultAsyncProducer {
name = "json-jackson";
}
// this will create a new instance as the name was not already
pre-created
- DataFormat json = camelContext.resolveDataFormat(name);
- DataFormat outJson = camelContext.resolveDataFormat(name);
+ DataFormat json = camelContext.createDataFormat(name);
+ DataFormat outJson = camelContext.createDataFormat(name);
// is json binding required?
if (mode.contains("json") && json == null) {
@@ -350,8 +350,8 @@ public class RestProducer extends DefaultAsyncProducer {
name = "jaxb";
}
// this will create a new instance as the name was not already
pre-created
- DataFormat jaxb = camelContext.resolveDataFormat(name);
- DataFormat outJaxb = camelContext.resolveDataFormat(name);
+ DataFormat jaxb = camelContext.createDataFormat(name);
+ DataFormat outJaxb = camelContext.createDataFormat(name);
// is xml binding required?
if (mode.contains("xml") && jaxb == null) {
