[camel] branch master updated: [CAMEL-15058] Fix failing rest DSL tests (#3828)

[davsclaus]

This is an automated email from the ASF dual-hosted git repository.

davsclaus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git


The following commit(s) were added to refs/heads/master by this push:
     new eb00a19  [CAMEL-15058] Fix failing rest DSL tests (#3828)
eb00a19 is described below

commit eb00a19c02e92819bd89b3ee9b321ea9c9ed1b4c
Author: Denis Istomin <istomin....@gmail.com>
AuthorDate: Fri May 15 09:46:26 2020 +0500

    [CAMEL-15058] Fix failing rest DSL tests (#3828)
---
 .../src/test/resources/SpringBootRestController.txt                    | 3 ++-
 .../src/test/resources/SpringBootRestController.txt                    | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git 
a/tooling/openapi-rest-dsl-generator/src/test/resources/SpringBootRestController.txt
 
b/tooling/openapi-rest-dsl-generator/src/test/resources/SpringBootRestController.txt
index 0eb0f2f..e56de13 100644
--- 
a/tooling/openapi-rest-dsl-generator/src/test/resources/SpringBootRestController.txt
+++ 
b/tooling/openapi-rest-dsl-generator/src/test/resources/SpringBootRestController.txt
@@ -16,7 +16,8 @@ public final class CamelRestController {
     public void camelServlet(HttpServletRequest request, HttpServletResponse 
response) {
         try {
             String path = request.getRequestURI();
-            request.getServletContext().getRequestDispatcher("/camel/" + 
path).forward(request, response);
+            String camelPrefix = (path != null && path.startsWith("/")) ? 
"/camel" : "/camel/";
+            request.getServletContext().getRequestDispatcher(camelPrefix + 
path).forward(request, response);
         } catch (Exception e) {
             response.setStatus(HttpServletResponse.SC_INTERNAL_SERVER_ERROR);
         }
diff --git 
a/tooling/swagger-rest-dsl-generator/src/test/resources/SpringBootRestController.txt
 
b/tooling/swagger-rest-dsl-generator/src/test/resources/SpringBootRestController.txt
index 0a54740..98f046e 100644
--- 
a/tooling/swagger-rest-dsl-generator/src/test/resources/SpringBootRestController.txt
+++ 
b/tooling/swagger-rest-dsl-generator/src/test/resources/SpringBootRestController.txt
@@ -16,7 +16,8 @@ public final class CamelRestController {
     public void camelServlet(HttpServletRequest request, HttpServletResponse 
response) {
         try {
             String path = request.getRequestURI();
-            request.getServletContext().getRequestDispatcher("/camel/" + 
path).forward(request, response);
+            String camelPrefix = (path != null && path.startsWith("/")) ? 
"/camel" : "/camel/";
+            request.getServletContext().getRequestDispatcher(camelPrefix + 
path).forward(request, response);
         } catch (Exception e) {
             response.setStatus(HttpServletResponse.SC_INTERNAL_SERVER_ERROR);
         }