This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch camel-2.25.x
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/camel-2.25.x by this push:
new 763d689 CAMEL-15420 camel-http dynamic aware removes
Exchange.HTTP_QUERY head… (#4129)
763d689 is described below
commit 763d689c9574320df2b7b78adcd8af19474c22ac
Author: artemse <artemofic...@gmail.com>
AuthorDate: Wed Aug 26 09:49:38 2020 +0300
CAMEL-15420 camel-http dynamic aware removes Exchange.HTTP_QUERY head…
(#4129)
* CAMEL-15420 camel-http dynamic aware removes Exchange.HTTP_QUERY header
if Exchange.HTTP_PATH header not specified (backport to 2.5.x)
* CAMEL-15420 camel-http dynamic aware removes Exchange.HTTP_QUERY header
if Exchange.HTTP_PATH header not specified (backport to 2.5.x).
Expected query check added
---
.../camel/http/common/HttpSendDynamicAware.java | 5 ++
.../http4/HttpSendDynamicAwareHeadersTest.java | 76 ++++++++++++++++++++++
2 files changed, 81 insertions(+)
diff --git
a/components/camel-http-common/src/main/java/org/apache/camel/http/common/HttpSendDynamicAware.java
b/components/camel-http-common/src/main/java/org/apache/camel/http/common/HttpSendDynamicAware.java
index 86fb192..4b86008 100644
---
a/components/camel-http-common/src/main/java/org/apache/camel/http/common/HttpSendDynamicAware.java
+++
b/components/camel-http-common/src/main/java/org/apache/camel/http/common/HttpSendDynamicAware.java
@@ -25,6 +25,7 @@ import org.apache.camel.Exchange;
import org.apache.camel.Processor;
import org.apache.camel.runtimecatalog.RuntimeCamelCatalog;
import org.apache.camel.spi.SendDynamicAware;
+import org.apache.camel.util.ObjectHelper;
import org.apache.camel.util.StringHelper;
import org.apache.camel.util.URISupport;
@@ -100,6 +101,10 @@ public class HttpSendDynamicAware implements
SendDynamicAware {
query = URISupport.createQueryString(new
LinkedHashMap<>(entry.getLenientProperties()));
}
+ if (query == null &&
ObjectHelper.isNotEmpty(exchange.getIn().getHeader(Exchange.HTTP_QUERY))) {
+ query = (String) exchange.getIn().getHeader(Exchange.HTTP_QUERY);
+ }
+
if (path != null || query != null) {
return new HttpSendDynamicPreProcessor(path, query);
} else {
diff --git
a/components/camel-http4/src/test/java/org/apache/camel/component/http4/HttpSendDynamicAwareHeadersTest.java
b/components/camel-http4/src/test/java/org/apache/camel/component/http4/HttpSendDynamicAwareHeadersTest.java
new file mode 100644
index 0000000..9496e8a
--- /dev/null
+++
b/components/camel-http4/src/test/java/org/apache/camel/component/http4/HttpSendDynamicAwareHeadersTest.java
@@ -0,0 +1,76 @@
+/*
+ * 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.http4;
+
+import org.apache.camel.Exchange;
+import org.apache.camel.RoutesBuilder;
+import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.http4.handler.BasicValidationHandler;
+import org.apache.http.impl.bootstrap.HttpServer;
+import org.apache.http.impl.bootstrap.ServerBootstrap;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+
+public class HttpSendDynamicAwareHeadersTest extends BaseHttpTest {
+
+ private HttpServer localServer;
+
+ @Before
+ @Override
+ public void setUp() throws Exception {
+ localServer = ServerBootstrap.bootstrap()
+ .setHttpProcessor(getBasicHttpProcessor())
+ .setConnectionReuseStrategy(getConnectionReuseStrategy())
+ .setResponseFactory(getHttpResponseFactory())
+ .setExpectationVerifier(getHttpExpectationVerifier())
+ .setSslContext(getSSLContext())
+ .registerHandler("/dynamicAware", new
BasicValidationHandler("GET", "par1=val1&par2=val2", null, null)).create();
+ localServer.start();
+
+ super.setUp();
+ }
+
+ @After
+ @Override
+ public void tearDown() throws Exception {
+ super.tearDown();
+
+ if (localServer != null) {
+ localServer.stop();
+ }
+ }
+
+ @Override
+ protected RoutesBuilder createRouteBuilder() throws Exception {
+ return new RouteBuilder() {
+ @Override
+ public void configure() throws Exception {
+ from("direct:dynamicAwareWithoutPathHeader")
+ .setHeader(Exchange.HTTP_QUERY,
constant("par1=val1&par2=val2"))
+ .toD("http4://localhost:" + localServer.getLocalPort()
+ "/dynamicAware");
+ }
+ };
+ }
+
+ @Test
+ public void testDynamicAwareHeadersQuery() throws Exception {
+ Exchange e =
fluentTemplate.to("direct:dynamicAwareWithoutPathHeader").send();
+ assertEquals("/dynamicAware", e.getIn().getHeader(Exchange.HTTP_PATH));
+ assertEquals("par1=val1&par2=val2",
e.getIn().getHeader(Exchange.HTTP_QUERY));
+ }
+}
\ No newline at end of file
