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 2d7759f CAMEL-13160: Remove headers should be case in-sensitive by default - eg the PatternHelper. 2d7759f is described below commit 2d7759fada27711c1d58c04ff3f14a3a24cc331d Author: Claus Ibsen <claus.ib...@gmail.com> AuthorDate: Tue Feb 5 11:03:39 2019 +0100 CAMEL-13160: Remove headers should be case in-sensitive by default - eg the PatternHelper. --- .../src/main/docs/eips/removeHeaders-eip.adoc | 4 ++-- .../src/main/docs/eips/removeProperties-eip.adoc | 4 ++-- .../camel/model/RemoveHeadersDefinition.java | 24 +++++++++++++++++++--- .../camel/model/RemovePropertiesDefinition.java | 24 +++++++++++++++++++--- 4 files changed, 46 insertions(+), 10 deletions(-) diff --git a/core/camel-core/src/main/docs/eips/removeHeaders-eip.adoc b/core/camel-core/src/main/docs/eips/removeHeaders-eip.adoc index 3f1147d..c71627f 100644 --- a/core/camel-core/src/main/docs/eips/removeHeaders-eip.adoc +++ b/core/camel-core/src/main/docs/eips/removeHeaders-eip.adoc @@ -10,8 +10,8 @@ The Remove Headers EIP supports 2 options which are listed below: [width="100%",cols="2,5,^1,2",options="header"] |=== | Name | Description | Default | Type -| *pattern* | *Required* Name or pattern of headers to remove | | String -| *excludePattern* | Name or patter of headers to not remove | | String +| *pattern* | *Required* Name or pattern of headers to remove. The pattern is matched in the following order: 1 = exact match 2 = wildcard (pattern ends with a and the name starts with the pattern) 3 = regular expression (all of above is case in-sensitive). | | String +| *excludePattern* | Name or patter of headers to not remove. The pattern is matched in the following order: 1 = exact match 2 = wildcard (pattern ends with a and the name starts with the pattern) 3 = regular expression (all of above is case in-sensitive). | | String |=== // eip options: END diff --git a/core/camel-core/src/main/docs/eips/removeProperties-eip.adoc b/core/camel-core/src/main/docs/eips/removeProperties-eip.adoc index 1aec420..0eb21ed 100644 --- a/core/camel-core/src/main/docs/eips/removeProperties-eip.adoc +++ b/core/camel-core/src/main/docs/eips/removeProperties-eip.adoc @@ -11,8 +11,8 @@ The Remove Properties EIP supports 2 options which are listed below: [width="100%",cols="2,5,^1,2",options="header"] |=== | Name | Description | Default | Type -| *pattern* | *Required* Name or pattern of properties to remove | | String -| *excludePattern* | Name or pattern of properties to not remove | | String +| *pattern* | *Required* Name or pattern of properties to remove. The pattern is matched in the following order: 1 = exact match 2 = wildcard (pattern ends with a and the name starts with the pattern) 3 = regular expression (all of above is case in-sensitive). | | String +| *excludePattern* | Name or pattern of properties to not remove. The pattern is matched in the following order: 1 = exact match 2 = wildcard (pattern ends with a and the name starts with the pattern) 3 = regular expression (all of above is case in-sensitive). | | String |=== // eip options: END diff --git a/core/camel-core/src/main/java/org/apache/camel/model/RemoveHeadersDefinition.java b/core/camel-core/src/main/java/org/apache/camel/model/RemoveHeadersDefinition.java index 76042a0..739a798 100644 --- a/core/camel-core/src/main/java/org/apache/camel/model/RemoveHeadersDefinition.java +++ b/core/camel-core/src/main/java/org/apache/camel/model/RemoveHeadersDefinition.java @@ -67,7 +67,13 @@ public class RemoveHeadersDefinition extends NoOutputDefinition<RemoveHeadersDef } /** - * Name or pattern of headers to remove + * Name or pattern of headers to remove. + * + * The pattern is matched in the following order: + * 1 = exact match + * 2 = wildcard (pattern ends with a * and the name starts with the pattern) + * 3 = regular expression + * (all of above is case in-sensitive). */ public void setPattern(String pattern) { this.pattern = pattern; @@ -82,7 +88,13 @@ public class RemoveHeadersDefinition extends NoOutputDefinition<RemoveHeadersDef } /** - * Name or pattern of headers to not remove + * Name or pattern of headers to not remove. + * + * The pattern is matched in the following order: + * 1 = exact match + * 2 = wildcard (pattern ends with a * and the name starts with the pattern) + * 3 = regular expression + * (all of above is case in-sensitive). */ public void setExcludePatterns(String[] excludePatterns) { this.excludePatterns = excludePatterns; @@ -93,7 +105,13 @@ public class RemoveHeadersDefinition extends NoOutputDefinition<RemoveHeadersDef } /** - * Name or patter of headers to not remove + * Name or patter of headers to not remove. + * + * The pattern is matched in the following order: + * 1 = exact match + * 2 = wildcard (pattern ends with a * and the name starts with the pattern) + * 3 = regular expression + * (all of above is case in-sensitive). */ public void setExcludePattern(String excludePattern) { this.excludePattern = excludePattern; diff --git a/core/camel-core/src/main/java/org/apache/camel/model/RemovePropertiesDefinition.java b/core/camel-core/src/main/java/org/apache/camel/model/RemovePropertiesDefinition.java index acbc733..1a3ae4b 100644 --- a/core/camel-core/src/main/java/org/apache/camel/model/RemovePropertiesDefinition.java +++ b/core/camel-core/src/main/java/org/apache/camel/model/RemovePropertiesDefinition.java @@ -67,7 +67,13 @@ public class RemovePropertiesDefinition extends NoOutputDefinition<RemovePropert } /** - * Name or pattern of properties to remove + * Name or pattern of properties to remove. + * + * The pattern is matched in the following order: + * 1 = exact match + * 2 = wildcard (pattern ends with a * and the name starts with the pattern) + * 3 = regular expression + * (all of above is case in-sensitive). */ public void setPattern(String pattern) { this.pattern = pattern; @@ -82,7 +88,13 @@ public class RemovePropertiesDefinition extends NoOutputDefinition<RemovePropert } /** - * Name or pattern of properties to not remove + * Name or pattern of properties to not remove. + * + * The pattern is matched in the following order: + * 1 = exact match + * 2 = wildcard (pattern ends with a * and the name starts with the pattern) + * 3 = regular expression + * (all of above is case in-sensitive). */ public void setExcludePatterns(String[] excludePatterns) { this.excludePatterns = excludePatterns; @@ -93,7 +105,13 @@ public class RemovePropertiesDefinition extends NoOutputDefinition<RemovePropert } /** - * Name or pattern of properties to not remove + * Name or pattern of properties to not remove. + * + * The pattern is matched in the following order: + * 1 = exact match + * 2 = wildcard (pattern ends with a * and the name starts with the pattern) + * 3 = regular expression + * (all of above is case in-sensitive). */ public void setExcludePattern(String excludePattern) { this.excludePattern = excludePattern;