This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch camel-3.14.x
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/camel-3.14.x by this push:
new 8b7ad5f CAMEL-17454: camel-undertow - Fix duplicate content-type
header when using with rest component as producer to call external rest
services.
8b7ad5f is described below
commit 8b7ad5f85322b459aeae8bf9c5799b6b691323d3
Author: Claus Ibsen <claus.ib...@gmail.com>
AuthorDate: Thu Jan 13 11:14:13 2022 +0100
CAMEL-17454: camel-undertow - Fix duplicate content-type header when using
with rest component as producer to call external rest services.
---
.../undertow/UndertowRestHeaderFilterStrategy.java | 2 +-
.../undertow/UndertowProducerContentTypeTest.java | 61 ++++++++++++++++++++++
2 files changed, 62 insertions(+), 1 deletion(-)
diff --git
a/components/camel-undertow/src/main/java/org/apache/camel/component/undertow/UndertowRestHeaderFilterStrategy.java
b/components/camel-undertow/src/main/java/org/apache/camel/component/undertow/UndertowRestHeaderFilterStrategy.java
index 6fba766..fef97da 100644
---
a/components/camel-undertow/src/main/java/org/apache/camel/component/undertow/UndertowRestHeaderFilterStrategy.java
+++
b/components/camel-undertow/src/main/java/org/apache/camel/component/undertow/UndertowRestHeaderFilterStrategy.java
@@ -30,7 +30,7 @@ public class UndertowRestHeaderFilterStrategy extends
UndertowHeaderFilterStrate
@Override
public boolean applyFilterToCamelHeaders(String headerName, Object
headerValue, Exchange exchange) {
- boolean answer = super.applyFilterToExternalHeaders(headerName,
headerValue, exchange);
+ boolean answer = super.applyFilterToCamelHeaders(headerName,
headerValue, exchange);
// using rest producer then headers are mapping to uri and query
parameters using {key} syntax
// if there is a match to an existing Camel Message header, then we
should filter (=true) this
// header as its already been mapped by the RestProducer from
camel-core, and we do not want
diff --git
a/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/UndertowProducerContentTypeTest.java
b/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/UndertowProducerContentTypeTest.java
new file mode 100644
index 0000000..33eee29
--- /dev/null
+++
b/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/UndertowProducerContentTypeTest.java
@@ -0,0 +1,61 @@
+/*
+ * 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.undertow;
+
+import org.apache.camel.Exchange;
+import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.model.rest.RestBindingMode;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+public class UndertowProducerContentTypeTest extends BaseUndertowTest {
+
+ @Test
+ public void testHttpContentTypeNotDuplicated() throws Exception {
+
getMockEndpoint("mock:input").expectedHeaderReceived(Exchange.HTTP_METHOD,
"POST");
+
getMockEndpoint("mock:input").expectedHeaderReceived(Exchange.CONTENT_TYPE,
"application/json");
+
+ String out = template.requestBodyAndHeader("direct:start", "{ name:
\"Donald\" }", Exchange.CONTENT_TYPE,
+ "application/json", String.class);
+ assertEquals("{ status: \"ok\" }", out);
+
+ assertMockEndpointsSatisfied();
+ }
+
+ @Override
+ protected RouteBuilder createRouteBuilder() throws Exception {
+ return new RouteBuilder() {
+ @Override
+ public void configure() throws Exception {
+ restConfiguration()
+ .producerComponent("undertow").component("undertow")
+ .host("localhost").port("{{port}}")
+ .bindingMode(RestBindingMode.json);
+
+ from("direct:start")
+ .to("rest:post:foo")
+ .to("mock:result");
+
+ from("undertow:http://localhost:{{port}}/foo";)
+ .to("log:input")
+ .to("mock:input")
+ .transform().constant("{ status: \"ok\" }");
+ }
+ };
+ }
+}
