You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2024/03/29 16:10:30 UTC
(camel) branch main updated: CAMEL-20629: camel-platform-http-vertx - Header filter strategy should be HttpHeaderFilterStrategy
This is an automated email from the ASF dual-hosted git repository.
davsclaus 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 6f3e66582dc CAMEL-20629: camel-platform-http-vertx - Header filter strategy should be HttpHeaderFilterStrategy
6f3e66582dc is described below
commit 6f3e66582dc809733dc1803ded0e95bf78e1eb55
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Fri Mar 29 17:10:18 2024 +0100
CAMEL-20629: camel-platform-http-vertx - Header filter strategy should be HttpHeaderFilterStrategy
---
.../java/org/apache/camel/http/base}/HttpHeaderFilterStrategy.java | 2 +-
.../main/java/org/apache/camel/http/common/DefaultHttpBinding.java | 4 ++--
.../src/main/java/org/apache/camel/http/common/HttpBinding.java | 2 +-
.../main/java/org/apache/camel/http/common/HttpCommonEndpoint.java | 2 +-
.../org/apache/camel/http/common/HttpHeaderFilterStrategy.java | 7 +++++--
components/camel-platform-http-vertx/pom.xml | 4 ++++
components/camel-platform-http/pom.xml | 2 +-
.../apache/camel/component/platform/http/PlatformHttpEndpoint.java | 2 +-
8 files changed, 16 insertions(+), 9 deletions(-)
diff --git a/components/camel-http-common/src/main/java/org/apache/camel/http/common/HttpHeaderFilterStrategy.java b/components/camel-http-base/src/main/java/org/apache/camel/http/base/HttpHeaderFilterStrategy.java
similarity index 97%
copy from components/camel-http-common/src/main/java/org/apache/camel/http/common/HttpHeaderFilterStrategy.java
copy to components/camel-http-base/src/main/java/org/apache/camel/http/base/HttpHeaderFilterStrategy.java
index bc7ca239979..9249a9fd325 100644
--- a/components/camel-http-common/src/main/java/org/apache/camel/http/common/HttpHeaderFilterStrategy.java
+++ b/components/camel-http-base/src/main/java/org/apache/camel/http/base/HttpHeaderFilterStrategy.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.http.common;
+package org.apache.camel.http.base;
import java.util.Set;
diff --git a/components/camel-http-common/src/main/java/org/apache/camel/http/common/DefaultHttpBinding.java b/components/camel-http-common/src/main/java/org/apache/camel/http/common/DefaultHttpBinding.java
index 4f37622f612..835993eddbc 100644
--- a/components/camel-http-common/src/main/java/org/apache/camel/http/common/DefaultHttpBinding.java
+++ b/components/camel-http-common/src/main/java/org/apache/camel/http/common/DefaultHttpBinding.java
@@ -65,7 +65,7 @@ import static org.apache.camel.support.http.HttpUtil.determineResponseCode;
/**
* Binding between {@link HttpMessage} and {@link HttpServletResponse}.
* <p/>
- * Uses by default the {@link org.apache.camel.http.common.HttpHeaderFilterStrategy}
+ * Uses by default the {@link org.apache.camel.http.base.HttpHeaderFilterStrategy}
*/
public class DefaultHttpBinding implements HttpBinding {
@@ -91,7 +91,7 @@ public class DefaultHttpBinding implements HttpBinding {
private boolean mapHttpMessageBody = true;
private boolean mapHttpMessageHeaders = true;
private boolean mapHttpMessageFormUrlEncodedBody = true;
- private HeaderFilterStrategy headerFilterStrategy = new HttpHeaderFilterStrategy();
+ private HeaderFilterStrategy headerFilterStrategy = new org.apache.camel.http.base.HttpHeaderFilterStrategy();
private String fileNameExtWhitelist;
public DefaultHttpBinding() {
diff --git a/components/camel-http-common/src/main/java/org/apache/camel/http/common/HttpBinding.java b/components/camel-http-common/src/main/java/org/apache/camel/http/common/HttpBinding.java
index 06b6db7846d..95f4a1845c2 100644
--- a/components/camel-http-common/src/main/java/org/apache/camel/http/common/HttpBinding.java
+++ b/components/camel-http-common/src/main/java/org/apache/camel/http/common/HttpBinding.java
@@ -218,7 +218,7 @@ public interface HttpBinding {
/**
* Sets the header filter strategy to use.
* <p/>
- * Will default use {@link org.apache.camel.http.common.HttpHeaderFilterStrategy}
+ * Will default use {@link org.apache.camel.http.base.HttpHeaderFilterStrategy}
*
* @param headerFilterStrategy the custom strategy
*/
diff --git a/components/camel-http-common/src/main/java/org/apache/camel/http/common/HttpCommonEndpoint.java b/components/camel-http-common/src/main/java/org/apache/camel/http/common/HttpCommonEndpoint.java
index 208c4e55690..0e97735a413 100644
--- a/components/camel-http-common/src/main/java/org/apache/camel/http/common/HttpCommonEndpoint.java
+++ b/components/camel-http-common/src/main/java/org/apache/camel/http/common/HttpCommonEndpoint.java
@@ -41,7 +41,7 @@ public abstract class HttpCommonEndpoint extends DefaultEndpoint implements Head
URI httpUri;
@UriParam(label = "common,advanced",
description = "To use a custom HeaderFilterStrategy to filter header to and from Camel message.")
- HeaderFilterStrategy headerFilterStrategy = new HttpHeaderFilterStrategy();
+ HeaderFilterStrategy headerFilterStrategy = new org.apache.camel.http.base.HttpHeaderFilterStrategy();
@UriParam(label = "common,advanced",
description = "To use a custom HttpBinding to control the mapping between Camel message and HttpClient.")
HttpBinding httpBinding;
diff --git a/components/camel-http-common/src/main/java/org/apache/camel/http/common/HttpHeaderFilterStrategy.java b/components/camel-http-common/src/main/java/org/apache/camel/http/common/HttpHeaderFilterStrategy.java
index bc7ca239979..2ca35f1d64d 100644
--- a/components/camel-http-common/src/main/java/org/apache/camel/http/common/HttpHeaderFilterStrategy.java
+++ b/components/camel-http-common/src/main/java/org/apache/camel/http/common/HttpHeaderFilterStrategy.java
@@ -18,10 +18,13 @@ package org.apache.camel.http.common;
import java.util.Set;
-import org.apache.camel.support.DefaultHeaderFilterStrategy;
import org.apache.camel.support.http.HttpUtil;
-public class HttpHeaderFilterStrategy extends DefaultHeaderFilterStrategy {
+/**
+ * @deprecated use {@link org.apache.camel.http.base.HttpHeaderFilterStrategy}
+ */
+@Deprecated
+public class HttpHeaderFilterStrategy extends org.apache.camel.http.base.HttpHeaderFilterStrategy {
public HttpHeaderFilterStrategy() {
initialize();
diff --git a/components/camel-platform-http-vertx/pom.xml b/components/camel-platform-http-vertx/pom.xml
index 6f1672695df..49856df7660 100644
--- a/components/camel-platform-http-vertx/pom.xml
+++ b/components/camel-platform-http-vertx/pom.xml
@@ -42,6 +42,10 @@
<groupId>org.apache.camel</groupId>
<artifactId>camel-platform-http</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-attachments</artifactId>
+ </dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-vertx-common</artifactId>
diff --git a/components/camel-platform-http/pom.xml b/components/camel-platform-http/pom.xml
index a14c76dde15..88349a682e5 100644
--- a/components/camel-platform-http/pom.xml
+++ b/components/camel-platform-http/pom.xml
@@ -35,7 +35,7 @@
<dependencies>
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-http-common</artifactId>
+ <artifactId>camel-http-base</artifactId>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
diff --git a/components/camel-platform-http/src/main/java/org/apache/camel/component/platform/http/PlatformHttpEndpoint.java b/components/camel-platform-http/src/main/java/org/apache/camel/component/platform/http/PlatformHttpEndpoint.java
index 5ed05979ebf..f2b43c9474a 100644
--- a/components/camel-platform-http/src/main/java/org/apache/camel/component/platform/http/PlatformHttpEndpoint.java
+++ b/components/camel-platform-http/src/main/java/org/apache/camel/component/platform/http/PlatformHttpEndpoint.java
@@ -24,7 +24,7 @@ import org.apache.camel.Processor;
import org.apache.camel.Producer;
import org.apache.camel.component.platform.http.cookie.CookieConfiguration;
import org.apache.camel.component.platform.http.spi.PlatformHttpEngine;
-import org.apache.camel.http.common.HttpHeaderFilterStrategy;
+import org.apache.camel.http.base.HttpHeaderFilterStrategy;
import org.apache.camel.spi.HeaderFilterStrategy;
import org.apache.camel.spi.HeaderFilterStrategyAware;
import org.apache.camel.spi.Metadata;