You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ja...@apache.org on 2009/02/18 19:42:47 UTC
svn commit: r745602 - in /camel/branches/camel-1.x: ./
camel-core/src/main/java/org/apache/camel/builder/
camel-core/src/main/java/org/apache/camel/impl/
camel-core/src/test/java/org/apache/camel/processor/
Author: janstey
Date: Wed Feb 18 18:42:46 2009
New Revision: 745602
URL: http://svn.apache.org/viewvc?rev=745602&view=rev
Log:
Merged revisions 745589 via svnmerge from
https://svn.apache.org/repos/asf/camel/trunk
........
r745589 | janstey | 2009-02-18 14:45:36 -0330 (Wed, 18 Feb 2009) | 1 line
CAMEL-1357 - added regexReplaceAll to builder support
........
Added:
camel/branches/camel-1.x/camel-core/src/test/java/org/apache/camel/processor/RegExRouteTest.java
- copied, changed from r745589, camel/trunk/camel-core/src/test/java/org/apache/camel/processor/RegExRouteTest.java
Modified:
camel/branches/camel-1.x/ (props changed)
camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/builder/Builder.java
camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/builder/BuilderSupport.java
camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/builder/ValueBuilder.java
camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/impl/DefaultHeaderFilterStrategy.java
Propchange: camel/branches/camel-1.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/builder/Builder.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/builder/Builder.java?rev=745602&r1=745601&r2=745602&view=diff
==============================================================================
--- camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/builder/Builder.java (original)
+++ camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/builder/Builder.java Wed Feb 18 18:42:46 2009
@@ -118,4 +118,22 @@
final String defaultValue) {
return new ValueBuilder<E>(ExpressionBuilder.<E> systemProperty(name, defaultValue));
}
+
+ /**
+ * Returns an expression that replaces all occurrences of the regular
+ * expression with the given replacement
+ */
+ public static ValueBuilder regexReplaceAll(Expression content, String regex, String replacement) {
+ Expression newExp = ExpressionBuilder.regexReplaceAll(content, regex, replacement);
+ return new ValueBuilder(newExp);
+ }
+
+ /**
+ * Returns an expression that replaces all occurrences of the regular
+ * expression with the given replacement
+ */
+ public static ValueBuilder regexReplaceAll(Expression content, String regex, Expression replacement) {
+ Expression newExp = ExpressionBuilder.regexReplaceAll(content, regex, replacement);
+ return new ValueBuilder(newExp);
+ }
}
Modified: camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/builder/BuilderSupport.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/builder/BuilderSupport.java?rev=745602&r1=745601&r2=745602&view=diff
==============================================================================
--- camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/builder/BuilderSupport.java (original)
+++ camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/builder/BuilderSupport.java Wed Feb 18 18:42:46 2009
@@ -22,6 +22,7 @@
import org.apache.camel.CamelContext;
import org.apache.camel.Endpoint;
+import org.apache.camel.Expression;
import org.apache.camel.NoSuchEndpointException;
import org.apache.camel.model.LoggingLevel;
import org.apache.camel.processor.SendProcessor;
@@ -132,6 +133,22 @@
}
/**
+ * Returns an expression value builder that replaces all occurrences of the
+ * regular expression with the given replacement
+ */
+ public ValueBuilder regexReplaceAll(Expression content, String regex, String replacement) {
+ return Builder.regexReplaceAll(content, regex, replacement);
+ }
+
+ /**
+ * Returns an expression value builder that replaces all occurrences of the
+ * regular expression with the given replacement
+ */
+ public ValueBuilder regexReplaceAll(Expression content, String regex, Expression replacement) {
+ return Builder.regexReplaceAll(content, regex, replacement);
+ }
+
+ /**
* Resolves the given URI to an endpoint
*
* @throws NoSuchEndpointException if the endpoint URI could not be resolved
Modified: camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/builder/ValueBuilder.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/builder/ValueBuilder.java?rev=745602&r1=745601&r2=745602&view=diff
==============================================================================
--- camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/builder/ValueBuilder.java (original)
+++ camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/builder/ValueBuilder.java Wed Feb 18 18:42:46 2009
@@ -145,7 +145,7 @@
}
/**
- * Replaces all occurrencies of the regular expression with the given
+ * Replaces all occurrences of the regular expression with the given
* replacement
*/
public ValueBuilder<E> regexReplaceAll(String regex, String replacement) {
@@ -154,7 +154,7 @@
}
/**
- * Replaces all occurrencies of the regular expression with the given
+ * Replaces all occurrences of the regular expression with the given
* replacement
*/
public ValueBuilder<E> regexReplaceAll(String regex, Expression<E> replacement) {
Modified: camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/impl/DefaultHeaderFilterStrategy.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/impl/DefaultHeaderFilterStrategy.java?rev=745602&r1=745601&r2=745602&view=diff
==============================================================================
--- camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/impl/DefaultHeaderFilterStrategy.java (original)
+++ camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/impl/DefaultHeaderFilterStrategy.java Wed Feb 18 18:42:46 2009
@@ -238,7 +238,7 @@
}
if (filter != null) {
- if (isLowercase()) {
+ if (getIsLowercase()) {
if (filter.contains(headerName.toLowerCase())) {
return true;
}
Copied: camel/branches/camel-1.x/camel-core/src/test/java/org/apache/camel/processor/RegExRouteTest.java (from r745589, camel/trunk/camel-core/src/test/java/org/apache/camel/processor/RegExRouteTest.java)
URL: http://svn.apache.org/viewvc/camel/branches/camel-1.x/camel-core/src/test/java/org/apache/camel/processor/RegExRouteTest.java?p2=camel/branches/camel-1.x/camel-core/src/test/java/org/apache/camel/processor/RegExRouteTest.java&p1=camel/trunk/camel-core/src/test/java/org/apache/camel/processor/RegExRouteTest.java&r1=745589&r2=745602&rev=745602&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/processor/RegExRouteTest.java (original)
+++ camel/branches/camel-1.x/camel-core/src/test/java/org/apache/camel/processor/RegExRouteTest.java Wed Feb 18 18:42:46 2009
@@ -41,4 +41,4 @@
}
};
}
- }
\ No newline at end of file
+}