You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by or...@apache.org on 2023/11/30 17:17:17 UTC

(camel) branch main updated (4b84b863dfc -> 98ca9945350)

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

orpiske pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git


    from 4b84b863dfc CAMEL-20170: camel-jbang - Report more accurately maven downloads (#12277)
     new 5183d95c4f0 CAMEL-20163: cleanup content type handling code
     new 8e641b1fb10 CAMEL-20163: cleanup parsing HTTP status ranges
     new 0d1a2a52a96 CAMEL-20163: consolidate header manipulation methods
     new a228c897794 CAMEL-20163: consolidate common add filter methods
     new 98ca9945350 CAMEL-20163: consolidate common header filtering methods

The 5 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:
 .../camel/component/http/HttpEntityConverter.java  | 18 +++--
 .../apache/camel/component/http/HttpProducer.java  | 71 +++++++----------
 .../camel/component/jetty/JettyHttpComponent.java  | 23 +++---
 .../component/netty/http/NettyHttpProducer.java    | 15 ++--
 .../http/NettyHttpRestHeaderFilterStrategy.java    | 22 +-----
 .../http/vertx/VertxPlatformHttpSupport.java       | 23 ++----
 .../undertow/UndertowRestHeaderFilterStrategy.java | 22 +-----
 .../http/VertxHttpRestHeaderFilterStrategy.java    | 23 +-----
 .../org/apache/camel/support/http/HttpUtil.java    | 91 ++++++++++++++++++++++
 9 files changed, 170 insertions(+), 138 deletions(-)


(camel) 05/05: CAMEL-20163: consolidate common header filtering methods

Posted by or...@apache.org.
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 98ca9945350f8c290910c262e3a06899a9cd1a2b
Author: Otavio Rodolfo Piske <an...@gmail.com>
AuthorDate: Thu Nov 30 10:54:58 2023 -0300

    CAMEL-20163: consolidate common header filtering methods
---
 .../http/NettyHttpRestHeaderFilterStrategy.java    | 22 +++-----------------
 .../undertow/UndertowRestHeaderFilterStrategy.java | 22 +++-----------------
 .../http/VertxHttpRestHeaderFilterStrategy.java    | 23 ++++-----------------
 .../org/apache/camel/support/http/HttpUtil.java    | 24 ++++++++++++++++++++++
 4 files changed, 34 insertions(+), 57 deletions(-)

diff --git a/components/camel-netty-http/src/main/java/org/apache/camel/component/netty/http/NettyHttpRestHeaderFilterStrategy.java b/components/camel-netty-http/src/main/java/org/apache/camel/component/netty/http/NettyHttpRestHeaderFilterStrategy.java
index 91b3dae737d..c691d34f4b1 100644
--- a/components/camel-netty-http/src/main/java/org/apache/camel/component/netty/http/NettyHttpRestHeaderFilterStrategy.java
+++ b/components/camel-netty-http/src/main/java/org/apache/camel/component/netty/http/NettyHttpRestHeaderFilterStrategy.java
@@ -19,6 +19,8 @@ package org.apache.camel.component.netty.http;
 import org.apache.camel.Exchange;
 import org.apache.camel.spi.HeaderFilterStrategy;
 
+import static org.apache.camel.support.http.HttpUtil.filterCheck;
+
 /**
  * Default Netty {@link HeaderFilterStrategy} used when binding with {@link NettyHttpBinding}.
  */
@@ -35,25 +37,7 @@ public class NettyHttpRestHeaderFilterStrategy extends NettyHttpHeaderFilterStra
     @Override
     public boolean applyFilterToCamelHeaders(String headerName, Object headerValue, Exchange exchange) {
         boolean answer = super.applyFilterToCamelHeaders(headerName, headerValue, exchange);
-        // using rest producer then headers are mapping to uri and query parameters using {key} syntax
-        // if there is a match to an existing Camel Message header, then we should filter (=true) this
-        // header as its already been mapped by the RestProducer from camel-core, and we do not want
-        // the header to included as HTTP header also (eg as duplicate value)
-        if (!answer) {
-            if (templateUri != null) {
-                String token = "{" + headerName + "}";
-                if (templateUri.contains(token)) {
-                    answer = true;
-                }
-            }
-            if (!answer && queryParameters != null) {
-                String token = "=%7B" + headerName + "%7D"; // encoded values for { }
-                if (queryParameters.contains(token)) {
-                    answer = true;
-                }
-            }
-        }
-        return answer;
+        return filterCheck(templateUri, queryParameters, headerName, answer);
     }
 
 }
diff --git a/components/camel-undertow/src/main/java/org/apache/camel/component/undertow/UndertowRestHeaderFilterStrategy.java b/components/camel-undertow/src/main/java/org/apache/camel/component/undertow/UndertowRestHeaderFilterStrategy.java
index fef97da30e5..0df95259503 100644
--- a/components/camel-undertow/src/main/java/org/apache/camel/component/undertow/UndertowRestHeaderFilterStrategy.java
+++ b/components/camel-undertow/src/main/java/org/apache/camel/component/undertow/UndertowRestHeaderFilterStrategy.java
@@ -18,6 +18,8 @@ package org.apache.camel.component.undertow;
 
 import org.apache.camel.Exchange;
 
+import static org.apache.camel.support.http.HttpUtil.filterCheck;
+
 public class UndertowRestHeaderFilterStrategy extends UndertowHeaderFilterStrategy {
 
     private final String templateUri;
@@ -31,25 +33,7 @@ public class UndertowRestHeaderFilterStrategy extends UndertowHeaderFilterStrate
     @Override
     public boolean applyFilterToCamelHeaders(String headerName, Object headerValue, Exchange exchange) {
         boolean answer = super.applyFilterToCamelHeaders(headerName, headerValue, exchange);
-        // using rest producer then headers are mapping to uri and query parameters using {key} syntax
-        // if there is a match to an existing Camel Message header, then we should filter (=true) this
-        // header as its already been mapped by the RestProducer from camel-core, and we do not want
-        // the header to included as HTTP header also (eg as duplicate value)
-        if (!answer) {
-            if (templateUri != null) {
-                String token = "{" + headerName + "}";
-                if (templateUri.contains(token)) {
-                    answer = true;
-                }
-            }
-            if (!answer && queryParameters != null) {
-                String token = "=%7B" + headerName + "%7D"; // encoded values for { }
-                if (queryParameters.contains(token)) {
-                    answer = true;
-                }
-            }
-        }
-        return answer;
+        return filterCheck(templateUri, queryParameters, headerName, answer);
     }
 
 }
diff --git a/components/camel-vertx/camel-vertx-http/src/main/java/org/apache/camel/component/vertx/http/VertxHttpRestHeaderFilterStrategy.java b/components/camel-vertx/camel-vertx-http/src/main/java/org/apache/camel/component/vertx/http/VertxHttpRestHeaderFilterStrategy.java
index 15becccc58c..87196d0869d 100644
--- a/components/camel-vertx/camel-vertx-http/src/main/java/org/apache/camel/component/vertx/http/VertxHttpRestHeaderFilterStrategy.java
+++ b/components/camel-vertx/camel-vertx-http/src/main/java/org/apache/camel/component/vertx/http/VertxHttpRestHeaderFilterStrategy.java
@@ -18,6 +18,8 @@ package org.apache.camel.component.vertx.http;
 
 import org.apache.camel.Exchange;
 
+import static org.apache.camel.support.http.HttpUtil.filterCheck;
+
 public class VertxHttpRestHeaderFilterStrategy extends VertxHttpHeaderFilterStrategy {
 
     private final String templateUri;
@@ -31,24 +33,7 @@ public class VertxHttpRestHeaderFilterStrategy extends VertxHttpHeaderFilterStra
     @Override
     public boolean applyFilterToCamelHeaders(String headerName, Object headerValue, Exchange exchange) {
         boolean answer = super.applyFilterToExternalHeaders(headerName, headerValue, exchange);
-        // using rest producer then headers are mapping to uri and query parameters using {key} syntax
-        // if there is a match to an existing Camel Message header, then we should filter (=true) this
-        // header as its already been mapped by the RestProducer from camel-core, and we do not want
-        // the header to included as HTTP header also (eg as duplicate value)
-        if (!answer) {
-            if (templateUri != null) {
-                String token = "{" + headerName + "}";
-                if (templateUri.contains(token)) {
-                    answer = true;
-                }
-            }
-            if (!answer && queryParameters != null) {
-                String token = "=%7B" + headerName + "%7D"; // encoded values for { }
-                if (queryParameters.contains(token)) {
-                    answer = true;
-                }
-            }
-        }
-        return answer;
+
+        return filterCheck(templateUri, queryParameters, headerName, answer);
     }
 }
diff --git a/core/camel-support/src/main/java/org/apache/camel/support/http/HttpUtil.java b/core/camel-support/src/main/java/org/apache/camel/support/http/HttpUtil.java
index 7623a6b30f1..dfdaaea9b97 100644
--- a/core/camel-support/src/main/java/org/apache/camel/support/http/HttpUtil.java
+++ b/core/camel-support/src/main/java/org/apache/camel/support/http/HttpUtil.java
@@ -227,4 +227,28 @@ public final class HttpUtil {
 
         consumer.accept(values, firstValue);
     }
+
+    /*
+     * Using rest producer then headers are mapping to uri and query parameters using {key} syntax
+     * if there is a match to an existing Camel Message header, then we should filter (=true) this
+     * header as its already been mapped by the RestProducer from camel-core, and we do not want
+     * the header to include as HTTP header also (eg as duplicate value)
+     */
+    public static boolean filterCheck(String templateUri, String queryParameters, String headerName, boolean answer) {
+        if (!answer) {
+            if (templateUri != null) {
+                String token = "{" + headerName + "}";
+                if (templateUri.contains(token)) {
+                    answer = true;
+                }
+            }
+            if (!answer && queryParameters != null) {
+                String token = "=%7B" + headerName + "%7D"; // encoded values for { }
+                if (queryParameters.contains(token)) {
+                    answer = true;
+                }
+            }
+        }
+        return answer;
+    }
 }


(camel) 04/05: CAMEL-20163: consolidate common add filter methods

Posted by or...@apache.org.
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 <an...@gmail.com>
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;
     }
 
     /**


(camel) 02/05: CAMEL-20163: cleanup parsing HTTP status ranges

Posted by or...@apache.org.
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 8e641b1fb10e0b5a5f10699a5964f76c464bfaa8
Author: Otavio Rodolfo Piske <an...@gmail.com>
AuthorDate: Thu Nov 30 10:23:39 2023 -0300

    CAMEL-20163: cleanup parsing HTTP status ranges
---
 .../apache/camel/component/http/HttpProducer.java  | 26 ++++++++++++--------
 .../component/netty/http/NettyHttpProducer.java    | 15 ++++++++----
 .../org/apache/camel/support/http/HttpUtil.java    | 28 ++++++++++++++++++++++
 3 files changed, 54 insertions(+), 15 deletions(-)

diff --git a/components/camel-http/src/main/java/org/apache/camel/component/http/HttpProducer.java b/components/camel-http/src/main/java/org/apache/camel/component/http/HttpProducer.java
index b4974b1c5e7..53c7d7d7c8c 100644
--- a/components/camel-http/src/main/java/org/apache/camel/component/http/HttpProducer.java
+++ b/components/camel-http/src/main/java/org/apache/camel/component/http/HttpProducer.java
@@ -54,6 +54,7 @@ import org.apache.camel.support.GZIPHelper;
 import org.apache.camel.support.MessageHelper;
 import org.apache.camel.support.ObjectHelper;
 import org.apache.camel.support.SynchronizationAdapter;
+import org.apache.camel.support.http.HttpUtil;
 import org.apache.camel.util.IOHelper;
 import org.apache.camel.util.StringHelper;
 import org.apache.camel.util.URISupport;
@@ -111,16 +112,7 @@ public class HttpProducer extends DefaultProducer {
         super.doInit();
 
         String range = getEndpoint().getOkStatusCodeRange();
-        if (!range.contains(",")) {
-            // default is 200-299 so lets optimize for this
-            if (range.contains("-")) {
-                minOkRange = Integer.parseInt(StringHelper.before(range, "-"));
-                maxOkRange = Integer.parseInt(StringHelper.after(range, "-"));
-            } else {
-                minOkRange = Integer.parseInt(range);
-                maxOkRange = minOkRange;
-            }
-        }
+        parseStatusRange(range);
 
         // optimize and build default url when there are no override headers
         String url = getEndpoint().getHttpUri().toASCIIString();
@@ -139,6 +131,20 @@ public class HttpProducer extends DefaultProducer {
         defaultHttpHost = URIUtils.extractHost(uri);
     }
 
+    private void parseStatusRange(String range) {
+        if (!range.contains(",")) {
+            if (!HttpUtil.parseStatusRange(range, this::setRanges)) {
+                minOkRange = Integer.parseInt(range);
+                maxOkRange = minOkRange;
+            }
+        }
+    }
+
+    private void setRanges(int minOkRange, int maxOkRange) {
+        this.minOkRange = minOkRange;
+        this.maxOkRange = maxOkRange;
+    }
+
     @Override
     public void process(Exchange exchange) throws Exception {
         boolean cookies = !getEndpoint().getComponent().isCookieManagementDisabled();
diff --git a/components/camel-netty-http/src/main/java/org/apache/camel/component/netty/http/NettyHttpProducer.java b/components/camel-netty-http/src/main/java/org/apache/camel/component/netty/http/NettyHttpProducer.java
index 2c93e3ea2e0..1a635445a38 100644
--- a/components/camel-netty-http/src/main/java/org/apache/camel/component/netty/http/NettyHttpProducer.java
+++ b/components/camel-netty-http/src/main/java/org/apache/camel/component/netty/http/NettyHttpProducer.java
@@ -56,18 +56,23 @@ public class NettyHttpProducer extends NettyProducer {
         super.doInit();
 
         String range = getEndpoint().getConfiguration().getOkStatusCodeRange();
+        parseStatusRange(range);
+    }
+
+    private void parseStatusRange(String range) {
         if (!range.contains(",")) {
-            // default is 200-299 so lets optimize for this
-            if (range.contains("-")) {
-                minOkRange = Integer.parseInt(StringHelper.before(range, "-"));
-                maxOkRange = Integer.parseInt(StringHelper.after(range, "-"));
-            } else {
+            if (!org.apache.camel.support.http.HttpUtil.parseStatusRange(range, this::setRanges)) {
                 minOkRange = Integer.parseInt(range);
                 maxOkRange = minOkRange;
             }
         }
     }
 
+    private void setRanges(int minOkRange, int maxOkRange) {
+        this.minOkRange = minOkRange;
+        this.maxOkRange = maxOkRange;
+    }
+
     @Override
     public NettyHttpEndpoint getEndpoint() {
         return (NettyHttpEndpoint) super.getEndpoint();
diff --git a/core/camel-support/src/main/java/org/apache/camel/support/http/HttpUtil.java b/core/camel-support/src/main/java/org/apache/camel/support/http/HttpUtil.java
index 6c0992e3448..dcb6a15fa76 100644
--- a/core/camel-support/src/main/java/org/apache/camel/support/http/HttpUtil.java
+++ b/core/camel-support/src/main/java/org/apache/camel/support/http/HttpUtil.java
@@ -19,6 +19,7 @@ package org.apache.camel.support.http;
 
 import java.util.Map;
 import java.util.Set;
+import java.util.function.BiConsumer;
 
 import org.apache.camel.Exchange;
 import org.apache.camel.ExchangePropertyKey;
@@ -160,4 +161,31 @@ public final class HttpUtil {
         }
         return false;
     }
+
+    /**
+     * Parse a HTTP status range and passes the values to the consumer method
+     * @param range the HTTP status range in the format "XXX-YYY" (i.e.: 200-299)
+     * @param consumer a consumer method to receive the parse ranges
+     * @return true if the range was parsed or false otherwise
+     */
+    public static boolean parseStatusRange(String range, BiConsumer<Integer, Integer> consumer) {
+        // default is 200-299 so lets optimize for this
+        if (range.contains("-")) {
+            final String minRangeStr = StringHelper.before(range, "-");
+            final String maxRangeStr = StringHelper.after(range, "-");
+
+            if (minRangeStr == null || maxRangeStr == null) {
+                return false;
+            }
+
+            final int minOkRange = Integer.parseInt(minRangeStr);
+            final int maxOkRange = Integer.parseInt(maxRangeStr);
+
+            consumer.accept(minOkRange, maxOkRange);
+
+            return true;
+        }
+
+        return false;
+    }
 }


(camel) 03/05: CAMEL-20163: consolidate header manipulation methods

Posted by or...@apache.org.
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 0d1a2a52a96dfbd1217c6788f80c5d77c76a9ed6
Author: Otavio Rodolfo Piske <an...@gmail.com>
AuthorDate: Thu Nov 30 10:41:43 2023 -0300

    CAMEL-20163: consolidate header manipulation methods
---
 .../apache/camel/component/http/HttpProducer.java  | 45 +++++++---------------
 .../http/vertx/VertxPlatformHttpSupport.java       | 23 +++--------
 .../org/apache/camel/support/http/HttpUtil.java    | 39 +++++++++++++++++++
 3 files changed, 59 insertions(+), 48 deletions(-)

diff --git a/components/camel-http/src/main/java/org/apache/camel/component/http/HttpProducer.java b/components/camel-http/src/main/java/org/apache/camel/component/http/HttpProducer.java
index 53c7d7d7c8c..3622a57b8f3 100644
--- a/components/camel-http/src/main/java/org/apache/camel/component/http/HttpProducer.java
+++ b/components/camel-http/src/main/java/org/apache/camel/component/http/HttpProducer.java
@@ -205,37 +205,8 @@ public class HttpProducer extends DefaultProducer {
                         // use an iterator as there can be multiple values. (must not use a delimiter, and allow empty values)
                         final Iterator<?> it = ObjectHelper.createIterator(headerValue, null, true);
 
-                        // the value to add as request header
-                        List<String> multiValues = null;
-                        String prev = null;
-
-                        // if its a multi value then check each value if we can add it and for multi values they
-                        // should be combined into a single value
-                        while (it.hasNext()) {
-                            String value = tc.convertTo(String.class, it.next());
-                            if (value != null && !strategy.applyFilterToCamelHeaders(key, value, exchange)) {
-                                if (prev == null) {
-                                    prev = value;
-                                } else {
-                                    // only create array for multi values when really needed
-                                    if (multiValues == null) {
-                                        multiValues = new ArrayList<>();
-                                        multiValues.add(prev);
-                                    }
-                                    multiValues.add(value);
-                                }
-                            }
-                        }
-
-                        // add the value(s) as a http request header
-                        if (multiValues != null) {
-                            // use the default toString of a ArrayList to create in the form [xxx, yyy]
-                            // if multi valued, for a single value, then just output the value as is
-                            String s = multiValues.size() > 1 ? multiValues.toString() : multiValues.get(0);
-                            httpRequest.addHeader(key, s);
-                        } else if (prev != null) {
-                            httpRequest.addHeader(key, prev);
-                        }
+                        HttpUtil.applyHeader(strategy, exchange, it, tc, key,
+                                (multiValues, prev) -> applyHeader(httpRequest, key, multiValues, prev));
                     }
                 }
             }
@@ -354,6 +325,18 @@ public class HttpProducer extends DefaultProducer {
         }
     }
 
+    private static void applyHeader(HttpUriRequest httpRequest, String key, List<String> multiValues, String prev) {
+        // add the value(s) as a http request header
+        if (multiValues != null) {
+            // use the default toString of a ArrayList to create in the form [xxx, yyy]
+            // if multi valued, for a single value, then just output the value as is
+            String s = multiValues.size() > 1 ? multiValues.toString() : multiValues.get(0);
+            httpRequest.addHeader(key, s);
+        } else if (prev != null) {
+            httpRequest.addHeader(key, prev);
+        }
+    }
+
     @Override
     public HttpEndpoint getEndpoint() {
         return (HttpEndpoint) super.getEndpoint();
diff --git a/components/camel-platform-http-vertx/src/main/java/org/apache/camel/component/platform/http/vertx/VertxPlatformHttpSupport.java b/components/camel-platform-http-vertx/src/main/java/org/apache/camel/component/platform/http/vertx/VertxPlatformHttpSupport.java
index fa3d46c62d6..595cee8af9d 100644
--- a/components/camel-platform-http-vertx/src/main/java/org/apache/camel/component/platform/http/vertx/VertxPlatformHttpSupport.java
+++ b/components/camel-platform-http-vertx/src/main/java/org/apache/camel/component/platform/http/vertx/VertxPlatformHttpSupport.java
@@ -46,6 +46,7 @@ import org.apache.camel.spi.HeaderFilterStrategy;
 import org.apache.camel.support.ExchangeHelper;
 import org.apache.camel.support.MessageHelper;
 import org.apache.camel.support.ObjectHelper;
+import org.apache.camel.support.http.HttpUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -146,24 +147,12 @@ public final class VertxPlatformHttpSupport {
     private static void putHeader(
             HttpServerResponse response, HeaderFilterStrategy headerFilterStrategy, Exchange exchange, Iterator<?> it,
             TypeConverter tc, String key) {
-        String firstValue = null;
-        List<String> values = null;
-
-        while (it.hasNext()) {
-            final String headerValue = tc.convertTo(String.class, it.next());
-            if (headerValue != null && !headerFilterStrategy.applyFilterToCamelHeaders(key, headerValue, exchange)) {
-                if (firstValue == null) {
-                    firstValue = headerValue;
-                } else {
-                    if (values == null) {
-                        values = new ArrayList<>();
-                        values.add(firstValue);
-                    }
-                    values.add(headerValue);
-                }
-            }
-        }
 
+        HttpUtil.applyHeader(headerFilterStrategy, exchange, it, tc, key,
+                (values, firstValue) -> applyHeader(response, key, values, firstValue));
+    }
+
+    private static void applyHeader(HttpServerResponse response, String key, List<String> values, String firstValue) {
         if (values != null) {
             response.putHeader(key, values);
         } else if (firstValue != null) {
diff --git a/core/camel-support/src/main/java/org/apache/camel/support/http/HttpUtil.java b/core/camel-support/src/main/java/org/apache/camel/support/http/HttpUtil.java
index dcb6a15fa76..7623a6b30f1 100644
--- a/core/camel-support/src/main/java/org/apache/camel/support/http/HttpUtil.java
+++ b/core/camel-support/src/main/java/org/apache/camel/support/http/HttpUtil.java
@@ -17,6 +17,9 @@
 
 package org.apache.camel.support.http;
 
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import java.util.function.BiConsumer;
@@ -24,6 +27,8 @@ import java.util.function.BiConsumer;
 import org.apache.camel.Exchange;
 import org.apache.camel.ExchangePropertyKey;
 import org.apache.camel.Message;
+import org.apache.camel.TypeConverter;
+import org.apache.camel.spi.HeaderFilterStrategy;
 import org.apache.camel.util.IOHelper;
 import org.apache.camel.util.StringHelper;
 import org.apache.camel.util.URISupport;
@@ -188,4 +193,38 @@ public final class HttpUtil {
 
         return false;
     }
+
+    /**
+     * Iterates over a list of values and passes them to the consumer after applying the filter strategy. This is mostly used to
+     * simplify setting headers for HTTP responses
+     * @param headerFilterStrategy the filter strategy to apply
+     * @param exchange an exchange to apply the header strategy
+     * @param it the iterator providing the values
+     * @param tc a type converter instance so that the values can be converted to string
+     * @param key a key associated with the values being iterated
+     * @param consumer a consumer method to receive the converted values. It can receive either a list of values or a single
+     *                 value.
+     */
+    public static void applyHeader(HeaderFilterStrategy headerFilterStrategy, Exchange exchange, Iterator<?> it,
+            TypeConverter tc, String key, BiConsumer<List<String>, String> consumer) {
+        String firstValue = null;
+        List<String> values = null;
+
+        while (it.hasNext()) {
+            final String headerValue = tc.convertTo(String.class, it.next());
+            if (headerValue != null && !headerFilterStrategy.applyFilterToCamelHeaders(key, headerValue, exchange)) {
+                if (firstValue == null) {
+                    firstValue = headerValue;
+                } else {
+                    if (values == null) {
+                        values = new ArrayList<>();
+                        values.add(firstValue);
+                    }
+                    values.add(headerValue);
+                }
+            }
+        }
+
+        consumer.accept(values, firstValue);
+    }
 }


(camel) 01/05: CAMEL-20163: cleanup content type handling code

Posted by or...@apache.org.
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 5183d95c4f0bdf4dffab097b9c73b218c7b5d1ff
Author: Otavio Rodolfo Piske <an...@gmail.com>
AuthorDate: Thu Nov 30 10:11:54 2023 -0300

    CAMEL-20163: cleanup content type handling code
---
 .../camel/component/http/HttpEntityConverter.java      | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/components/camel-http/src/main/java/org/apache/camel/component/http/HttpEntityConverter.java b/components/camel-http/src/main/java/org/apache/camel/component/http/HttpEntityConverter.java
index b709dc9c928..ca882145385 100644
--- a/components/camel-http/src/main/java/org/apache/camel/component/http/HttpEntityConverter.java
+++ b/components/camel-http/src/main/java/org/apache/camel/component/http/HttpEntityConverter.java
@@ -65,10 +65,7 @@ public final class HttpEntityConverter {
         ContentType contentType = null;
         if (exchange != null) {
             contentEncoding = exchange.getIn().getHeader(HttpConstants.CONTENT_ENCODING, String.class);
-            String contentTypeAsString = ExchangeHelper.getContentType(exchange);
-            if (contentTypeAsString != null) {
-                contentType = ContentType.parse(contentTypeAsString);
-            }
+            contentType = getContentType(exchange, contentType);
         }
 
         InputStreamEntity entity;
@@ -85,6 +82,14 @@ public final class HttpEntityConverter {
         return entity;
     }
 
+    private static ContentType getContentType(Exchange exchange, ContentType contentType) {
+        String contentTypeAsString = ExchangeHelper.getContentType(exchange);
+        if (contentTypeAsString != null) {
+            contentType = ContentType.parse(contentTypeAsString);
+        }
+        return contentType;
+    }
+
     private static HttpEntity asHttpEntity(byte[] data, Exchange exchange) throws Exception {
         AbstractHttpEntity entity;
 
@@ -92,10 +97,7 @@ public final class HttpEntityConverter {
         ContentType contentType = null;
         if (exchange != null) {
             contentEncoding = exchange.getIn().getHeader(HttpConstants.CONTENT_ENCODING, String.class);
-            String contentTypeAsString = ExchangeHelper.getContentType(exchange);
-            if (contentTypeAsString != null) {
-                contentType = ContentType.parse(contentTypeAsString);
-            }
+            contentType = getContentType(exchange, contentType);
         }
 
         if (exchange != null && !exchange.getProperty(Exchange.SKIP_GZIP_ENCODING, Boolean.FALSE, Boolean.class)) {