CAMEL-8316: Rename property language to exchangeProperty to avoid ambiguity, confusion and clash with properties as a general term.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/666ca517 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/666ca517 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/666ca517 Branch: refs/heads/master Commit: 666ca517823e73d65a049cad87c873592907f994 Parents: 0ab91ad Author: Claus Ibsen <[email protected]> Authored: Thu Feb 5 14:06:23 2015 +0100 Committer: Claus Ibsen <[email protected]> Committed: Thu Feb 5 15:51:24 2015 +0100 ---------------------------------------------------------------------- .../java/org/apache/camel/processor/BeanWithExceptionTest.java | 4 ++-- .../org/apache/camel/processor/BodyInAggregatingStrategy.java | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/666ca517/camel-core/src/test/java/org/apache/camel/processor/BeanWithExceptionTest.java ---------------------------------------------------------------------- diff --git a/camel-core/src/test/java/org/apache/camel/processor/BeanWithExceptionTest.java b/camel-core/src/test/java/org/apache/camel/processor/BeanWithExceptionTest.java index f5dad34..e712d1b 100644 --- a/camel-core/src/test/java/org/apache/camel/processor/BeanWithExceptionTest.java +++ b/camel-core/src/test/java/org/apache/camel/processor/BeanWithExceptionTest.java @@ -20,9 +20,9 @@ import javax.naming.Context; import org.apache.camel.ContextTestSupport; import org.apache.camel.Exchange; +import org.apache.camel.ExchangeProperty; import org.apache.camel.Header; import org.apache.camel.Processor; -import org.apache.camel.Property; import org.apache.camel.ValidationException; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; @@ -100,7 +100,7 @@ public class BeanWithExceptionTest extends ContextTestSupport { private static final Logger LOG = LoggerFactory.getLogger(ValidationBean.class); public void someMethod(String body, @Header("foo") - String header, @Property("cheese") String cheese) throws ValidationException { + String header, @ExchangeProperty("cheese") String cheese) throws ValidationException { assertEquals("old", cheese); if ("bar".equals(header)) { http://git-wip-us.apache.org/repos/asf/camel/blob/666ca517/camel-core/src/test/java/org/apache/camel/processor/BodyInAggregatingStrategy.java ---------------------------------------------------------------------- diff --git a/camel-core/src/test/java/org/apache/camel/processor/BodyInAggregatingStrategy.java b/camel-core/src/test/java/org/apache/camel/processor/BodyInAggregatingStrategy.java index 2dd0fc8..e5610a6 100644 --- a/camel-core/src/test/java/org/apache/camel/processor/BodyInAggregatingStrategy.java +++ b/camel-core/src/test/java/org/apache/camel/processor/BodyInAggregatingStrategy.java @@ -17,7 +17,7 @@ package org.apache.camel.processor; import org.apache.camel.Exchange; -import org.apache.camel.Property; +import org.apache.camel.ExchangeProperty; import org.apache.camel.processor.aggregate.AggregationStrategy; public class BodyInAggregatingStrategy implements AggregationStrategy { @@ -36,7 +36,7 @@ public class BodyInAggregatingStrategy implements AggregationStrategy { /** * An expression used to determine if the aggregation is complete */ - public boolean isCompleted(@Property(Exchange.AGGREGATED_SIZE) Integer aggregated) { + public boolean isCompleted(@ExchangeProperty(Exchange.AGGREGATED_SIZE) Integer aggregated) { if (aggregated == null) { return false; }
