Author: ningjiang Date: Mon Jul 5 03:18:36 2010 New Revision: 960428 URL: http://svn.apache.org/viewvc?rev=960428&view=rev Log: CAMEL-2906 ValueBuilder provides DSL for Predicate
Added: camel/trunk/camel-core/src/test/java/org/apache/camel/processor/ChoiceWithSimpleExpressionTest.java (with props) Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/builder/ValueBuilder.java Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/builder/ValueBuilder.java URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/ValueBuilder.java?rev=960428&r1=960427&r2=960428&view=diff ============================================================================== --- camel/trunk/camel-core/src/main/java/org/apache/camel/builder/ValueBuilder.java (original) +++ camel/trunk/camel-core/src/main/java/org/apache/camel/builder/ValueBuilder.java Mon Jul 5 03:18:36 2010 @@ -51,11 +51,16 @@ public class ValueBuilder implements Exp // Predicate builders // ------------------------------------------------------------------------- - + // this method will be removed , please use PredicateBuilder.toPredicate(Expression) + @Deprecated public Predicate matches(Expression expression) { return onNewPredicate(PredicateBuilder.toPredicate(expression)); } + public Predicate matches() { + return onNewPredicate(PredicateBuilder.toPredicate(expression)); + } + public Predicate isNotEqualTo(Object value) { Expression right = asExpression(value); return onNewPredicate(PredicateBuilder.isNotEqualTo(expression, right)); @@ -97,7 +102,7 @@ public class ValueBuilder implements Exp public Predicate isNotNull() { return onNewPredicate(PredicateBuilder.isNotNull(expression)); } - + public Predicate not(Predicate predicate) { return onNewPredicate(PredicateBuilder.not(predicate)); } Added: camel/trunk/camel-core/src/test/java/org/apache/camel/processor/ChoiceWithSimpleExpressionTest.java URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/ChoiceWithSimpleExpressionTest.java?rev=960428&view=auto ============================================================================== --- camel/trunk/camel-core/src/test/java/org/apache/camel/processor/ChoiceWithSimpleExpressionTest.java (added) +++ camel/trunk/camel-core/src/test/java/org/apache/camel/processor/ChoiceWithSimpleExpressionTest.java Mon Jul 5 03:18:36 2010 @@ -0,0 +1,40 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.camel.processor; + +import org.apache.camel.ContextTestSupport; +import org.apache.camel.builder.RouteBuilder; +import org.apache.camel.component.mock.MockEndpoint; +import static org.apache.camel.component.mock.MockEndpoint.expectsMessageCount; + +/** + * @version $Revision$ + */ +public class ChoiceWithSimpleExpressionTest extends ChoiceTest { + + protected RouteBuilder createRouteBuilder() { + return new RouteBuilder() { + public void configure() { + from("direct:start").choice() + .when(simple("${header.foo} == 'bar'").matches()).to("mock:x") + .when(simple("${in.header.foo} == 'cheese'").matches()).to("mock:y") + .otherwise().to("mock:z").end().to("mock:end"); + } + }; + } + +} Propchange: camel/trunk/camel-core/src/test/java/org/apache/camel/processor/ChoiceWithSimpleExpressionTest.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: camel/trunk/camel-core/src/test/java/org/apache/camel/processor/ChoiceWithSimpleExpressionTest.java ------------------------------------------------------------------------------ svn:keywords = Rev Date