You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ac...@apache.org on 2019/12/16 14:41:39 UTC
[camel] branch camel-3.0.x updated (3ac9dec -> f90a0d8)
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a change to branch camel-3.0.x
in repository https://gitbox.apache.org/repos/asf/camel.git.
from 3ac9dec CAMEL-14300: Java 8 Supplier overloadings break all DSLs
new c67a988 CAMEL-14303: Handle duplicate matchOnUriPrefix on api docs.
new f90a0d8 CAMEL-14303: Handle duplicate matchOnUriPrefix on api docs.
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../component/netty/http/NettyHttpComponent.java | 12 ++++++------
...NettyTest.java => RestApiMatchUriNettyTest.java} | 21 +++------------------
2 files changed, 9 insertions(+), 24 deletions(-)
copy components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/rest/{RestApiNettyTest.java => RestApiMatchUriNettyTest.java} (67%)
[camel] 02/02: CAMEL-14303: Handle duplicate matchOnUriPrefix on
api docs.
Posted by ac...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch camel-3.0.x
in repository https://gitbox.apache.org/repos/asf/camel.git
commit f90a0d87bb3215515f1e9b864eee182de9bc28dc
Author: Bob Paulin <bo...@bobpaulin.com>
AuthorDate: Sun Dec 15 22:40:34 2019 -0600
CAMEL-14303: Handle duplicate matchOnUriPrefix on api docs.
---
.../java/org/apache/camel/component/netty/http/NettyHttpComponent.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/components/camel-netty-http/src/main/java/org/apache/camel/component/netty/http/NettyHttpComponent.java b/components/camel-netty-http/src/main/java/org/apache/camel/component/netty/http/NettyHttpComponent.java
index 3fd7a37..cbe6fe0 100644
--- a/components/camel-netty-http/src/main/java/org/apache/camel/component/netty/http/NettyHttpComponent.java
+++ b/components/camel-netty-http/src/main/java/org/apache/camel/component/netty/http/NettyHttpComponent.java
@@ -394,7 +394,7 @@ public class NettyHttpComponent extends NettyComponent implements HeaderFilterSt
// allow HTTP Options as we want to handle CORS in rest-dsl
boolean cors = config.isEnableCORS();
- if(api) {
+ if (api) {
map.put("matchOnUriPrefix", "true");
}
[camel] 01/02: CAMEL-14303: Handle duplicate matchOnUriPrefix on
api docs.
Posted by ac...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch camel-3.0.x
in repository https://gitbox.apache.org/repos/asf/camel.git
commit c67a988917a589bb46a945c99db455a9c8fd05ac
Author: Bob Paulin <bo...@bobpaulin.com>
AuthorDate: Sun Dec 15 22:24:35 2019 -0600
CAMEL-14303: Handle duplicate matchOnUriPrefix on api docs.
---
.../component/netty/http/NettyHttpComponent.java | 12 ++---
.../netty/http/rest/RestApiMatchUriNettyTest.java | 54 ++++++++++++++++++++++
2 files changed, 60 insertions(+), 6 deletions(-)
diff --git a/components/camel-netty-http/src/main/java/org/apache/camel/component/netty/http/NettyHttpComponent.java b/components/camel-netty-http/src/main/java/org/apache/camel/component/netty/http/NettyHttpComponent.java
index ca911bd..3fd7a37 100644
--- a/components/camel-netty-http/src/main/java/org/apache/camel/component/netty/http/NettyHttpComponent.java
+++ b/components/camel-netty-http/src/main/java/org/apache/camel/component/netty/http/NettyHttpComponent.java
@@ -393,15 +393,15 @@ public class NettyHttpComponent extends NettyComponent implements HeaderFilterSt
// allow HTTP Options as we want to handle CORS in rest-dsl
boolean cors = config.isEnableCORS();
+
+ if(api) {
+ map.put("matchOnUriPrefix", "true");
+ }
String query = URISupport.createQueryString(map);
- String url;
- if (api) {
- url = "netty-http:%s://%s:%s/%s?matchOnUriPrefix=true&httpMethodRestrict=%s";
- } else {
- url = "netty-http:%s://%s:%s/%s?httpMethodRestrict=%s";
- }
+ String url = "netty-http:%s://%s:%s/%s?httpMethodRestrict=%s";
+
// must use upper case for restrict
String restrict = verb.toUpperCase(Locale.US);
if (cors) {
diff --git a/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/rest/RestApiMatchUriNettyTest.java b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/rest/RestApiMatchUriNettyTest.java
new file mode 100644
index 0000000..774fb03
--- /dev/null
+++ b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/rest/RestApiMatchUriNettyTest.java
@@ -0,0 +1,54 @@
+/*
+ * 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 org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.netty.http.BaseNettyTest;
+import org.apache.camel.model.rest.RestParamType;
+import org.junit.Test;
+
+public class RestApiMatchUriNettyTest extends BaseNettyTest {
+
+ @Test
+ public void testApi() throws Exception {
+ String out = template.requestBody("netty-http:http://localhost:{{port}}/api-doc", null, String.class);
+ assertNotNull(out);
+ log.info(out);
+
+ assertTrue(out.contains("\"version\" : \"1.2.3\""));
+ assertTrue(out.contains("\"title\" : \"The hello rest thing\""));
+ assertTrue(out.contains("\"/hello/hi/{name}\""));
+ }
+
+ @Override
+ protected RouteBuilder createRouteBuilder() throws Exception {
+ return new RouteBuilder() {
+ @Override
+ public void configure() throws Exception {
+ restConfiguration().component("netty-http").host("localhost").port(getPort()).apiContextPath("/api-doc")
+ .endpointProperty("matchOnUriPrefix", "true")
+ .apiProperty("cors", "true").apiProperty("api.title", "The hello rest thing").apiProperty("api.version", "1.2.3");
+
+ rest("/hello").consumes("application/json").produces("application/json")
+ .get("/hi/{name}").description("Saying hi")
+ .param().name("name").type(RestParamType.path).dataType("string").description("Who is it").endParam()
+ .to("log:hi");
+ }
+ };
+ }
+
+}