This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/main by this push:
new 089cccc do not append slash to an empty path
089cccc is described below
commit 089cccc4b884c9daf8a2b0da16d76ae12220254f
Author: Жемжицкий Сергей Владимирович <[email protected]>
AuthorDate: Tue Sep 14 15:01:11 2021 +0300
do not append slash to an empty path
---
.../component/netty/http/NettyHttpHelper.java | 2 +-
.../netty/http/NettyHttpProducerHttpPathTest.java | 103 +++++++++++++++++++++
2 files changed, 104 insertions(+), 1 deletion(-)
diff --git
a/components/camel-netty-http/src/main/java/org/apache/camel/component/netty/http/NettyHttpHelper.java
b/components/camel-netty-http/src/main/java/org/apache/camel/component/netty/http/NettyHttpHelper.java
index 7889208..cefb123 100644
---
a/components/camel-netty-http/src/main/java/org/apache/camel/component/netty/http/NettyHttpHelper.java
+++
b/components/camel-netty-http/src/main/java/org/apache/camel/component/netty/http/NettyHttpHelper.java
@@ -203,7 +203,7 @@ public final class NettyHttpHelper {
// append HTTP_PATH to HTTP_URI if it is provided in the header
String path = exchange.getIn().getHeader(Exchange.HTTP_PATH,
String.class);
// NOW the HTTP_PATH is just related path, we don't need to trim it
- if (path != null) {
+ if (path != null && !path.isEmpty()) {
if (path.startsWith("/")) {
path = path.substring(1);
}
diff --git
a/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyHttpProducerHttpPathTest.java
b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyHttpProducerHttpPathTest.java
new file mode 100644
index 0000000..46f8aa1
--- /dev/null
+++
b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyHttpProducerHttpPathTest.java
@@ -0,0 +1,103 @@
+/*
+ * 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;
+
+import org.apache.camel.Exchange;
+import org.apache.camel.Message;
+import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.mock.MockEndpoint;
+import org.junit.jupiter.api.Test;
+
+public class NettyHttpProducerHttpPathTest extends BaseNettyTest {
+
+ @Test
+ public void testEmptyPathDoesNotEndsWithSlash() throws Exception {
+ MockEndpoint input = getMockEndpoint("mock:input");
+ input.expectedBodiesReceived("Hello World");
+ input.expectedHeaderReceived(Exchange.HTTP_PATH, "");
+ input.expectedHeaderReceived(Exchange.HTTP_URI, "/foo");
+
+ template.request("netty-http:http://localhost:{{port}}/foo";, exchange
-> {
+ Message in = exchange.getIn();
+ in.setBody("Hello World");
+ in.setHeader(Exchange.HTTP_PATH, "");
+ });
+
+ assertMockEndpointsSatisfied();
+ }
+
+ @Test
+ public void testNonEmptyPathDoesNotEndsWithSlash() throws Exception {
+ MockEndpoint input = getMockEndpoint("mock:input");
+ input.expectedBodiesReceived("Hello World");
+ input.expectedHeaderReceived(Exchange.HTTP_PATH, "/bar");
+ input.expectedHeaderReceived(Exchange.HTTP_URI, "/foo/bar");
+
+ template.request("netty-http:http://localhost:{{port}}/foo";, exchange
-> {
+ Message in = exchange.getIn();
+ in.setBody("Hello World");
+ in.setHeader(Exchange.HTTP_PATH, "/bar");
+ });
+
+ assertMockEndpointsSatisfied();
+ }
+
+ @Test
+ public void testNullPathDoesNotEndsWithSlash() throws Exception {
+ MockEndpoint input = getMockEndpoint("mock:input");
+ input.expectedBodiesReceived("Hello World");
+ input.expectedHeaderReceived(Exchange.HTTP_PATH, "");
+ input.expectedHeaderReceived(Exchange.HTTP_URI, "/foo");
+
+ template.request("netty-http:http://localhost:{{port}}/foo";, exchange
-> {
+ Message in = exchange.getIn();
+ in.setBody("Hello World");
+ in.setHeader(Exchange.HTTP_PATH, null);
+ });
+
+ assertMockEndpointsSatisfied();
+ }
+
+ @Test
+ public void testPathMustPreserveSlash() throws Exception {
+ MockEndpoint input = getMockEndpoint("mock:input");
+ input.expectedBodiesReceived("Hello World");
+ input.expectedHeaderReceived(Exchange.HTTP_PATH, "/bar/");
+ input.expectedHeaderReceived(Exchange.HTTP_URI, "/foo/bar/");
+
+ template.request("netty-http:http://localhost:{{port}}/foo";, exchange
-> {
+ Message in = exchange.getIn();
+ in.setBody("Hello World");
+ in.setHeader(Exchange.HTTP_PATH, "/bar/");
+ });
+
+ assertMockEndpointsSatisfied();
+ }
+
+ @Override
+ protected RouteBuilder createRouteBuilder() throws Exception {
+ return new RouteBuilder() {
+ @Override
+ public void configure() throws Exception {
+
from("netty-http:http://localhost:{{port}}/foo?matchOnUriPrefix=true";)
+ .to("mock:input")
+ .transform().constant("Bye World");
+ }
+ };
+ }
+
+}
