This is an automated email from the ASF dual-hosted git repository. orpiske pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel.git
commit a228c8977949b103f468a3412bb24016757337f6 Author: Otavio Rodolfo Piske <[email protected]> AuthorDate: Thu Nov 30 10:46:44 2023 -0300 CAMEL-20163: consolidate common add filter methods --- .../camel/component/jetty/JettyHttpComponent.java | 23 ++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/components/camel-jetty-common/src/main/java/org/apache/camel/component/jetty/JettyHttpComponent.java b/components/camel-jetty-common/src/main/java/org/apache/camel/component/jetty/JettyHttpComponent.java index d1b8f77ba11..27070b9bfec 100644 --- a/components/camel-jetty-common/src/main/java/org/apache/camel/component/jetty/JettyHttpComponent.java +++ b/components/camel-jetty-common/src/main/java/org/apache/camel/component/jetty/JettyHttpComponent.java @@ -418,18 +418,15 @@ public abstract class JettyHttpComponent extends HttpCommonComponent if (endpoint.getFilterInitParameters() != null) { filterHolder.setInitParameters(endpoint.getFilterInitParameters()); } - filterHolder.setFilter(new CamelFilterWrapper(filter)); - String pathSpec = endpoint.getPath(); - if (pathSpec == null || pathSpec.isEmpty()) { - pathSpec = "/"; - } - if (endpoint.isMatchOnUriPrefix()) { - pathSpec = pathSpec.endsWith("/") ? pathSpec + "*" : pathSpec + "/*"; - } - addFilter(context, filterHolder, pathSpec); + addFilter(endpoint, filter, filterHolder, context); } } + private void addFilter( + JettyHttpEndpoint endpoint, Filter filter, FilterHolder filterHolder, ServletContextHandler context) { + addFilter(endpoint, filterHolder, filter, context); + } + private void addFilter(ServletContextHandler context, FilterHolder filterHolder, String pathSpec) { context.getServletHandler().addFilterWithMapping(filterHolder, pathSpec, 0); } @@ -454,6 +451,12 @@ public abstract class JettyHttpComponent extends HttpCommonComponent // if no filter ref was provided, use the default filter filter = new MultiPartFilter(); } + final String pathSpec = addFilter(endpoint, filterHolder, filter, context); + LOG.debug("using multipart filter implementation {} for path {}", filter.getClass().getName(), pathSpec); + } + + private String addFilter( + HttpCommonEndpoint endpoint, FilterHolder filterHolder, Filter filter, ServletContextHandler context) { filterHolder.setFilter(new CamelFilterWrapper(filter)); String pathSpec = endpoint.getPath(); if (pathSpec == null || pathSpec.isEmpty()) { @@ -463,7 +466,7 @@ public abstract class JettyHttpComponent extends HttpCommonComponent pathSpec = pathSpec.endsWith("/") ? pathSpec + "*" : pathSpec + "/*"; } addFilter(context, filterHolder, pathSpec); - LOG.debug("using multipart filter implementation {} for path {}", filter.getClass().getName(), pathSpec); + return pathSpec; } /**
