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 2017/01/22 11:03:05 UTC
camel git commit: CAMEL-10735: Use better name and deprecate old.
Repository: camel
Updated Branches:
refs/heads/master 80138fcc6 -> 4fbeac680
CAMEL-10735: Use better name and deprecate old.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/4fbeac68
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/4fbeac68
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/4fbeac68
Branch: refs/heads/master
Commit: 4fbeac6803628b5114147b5b7b763d39add1405d
Parents: 80138fc
Author: Claus Ibsen <da...@apache.org>
Authored: Sun Jan 22 11:02:56 2017 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Sun Jan 22 12:02:10 2017 +0100
----------------------------------------------------------------------
.../org/apache/camel/ExchangeProperties.java | 35 ++++++++++++++++++++
.../main/java/org/apache/camel/Properties.java | 2 ++
.../apache/camel/builder/ExpressionBuilder.java | 15 +++++++--
.../apache/camel/builder/ExpressionClause.java | 12 ++++++-
.../camel/builder/ExpressionClauseSupport.java | 12 ++++++-
.../apache/camel/component/bean/BeanInfo.java | 5 ++-
.../aggregate/AggregationStrategyBeanInfo.java | 4 +--
...ropertiesAndHeadersAndBodyInjectionTest.java | 4 +--
...anWithPropertiesAndHeadersInjectionTest.java | 4 +--
.../DynamicRouterConvertBodyToIssueTest.java | 4 +--
.../DynamicRouterExchangePropertiesTest.java | 4 +--
11 files changed, 86 insertions(+), 15 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/4fbeac68/camel-core/src/main/java/org/apache/camel/ExchangeProperties.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/ExchangeProperties.java b/camel-core/src/main/java/org/apache/camel/ExchangeProperties.java
new file mode 100644
index 0000000..f71b809
--- /dev/null
+++ b/camel-core/src/main/java/org/apache/camel/ExchangeProperties.java
@@ -0,0 +1,35 @@
+/**
+ * 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;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * Marks a parameter as being an injection point of the exchange properties of an {@link Exchange}
+ *
+ * @see Exchange#getProperties()
+ * @version
+ */
+@Retention(RetentionPolicy.RUNTIME)
+@Documented
+@Target({ElementType.PARAMETER })
+public @interface ExchangeProperties {
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/camel/blob/4fbeac68/camel-core/src/main/java/org/apache/camel/Properties.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/Properties.java b/camel-core/src/main/java/org/apache/camel/Properties.java
index 00eea98..fc554ce 100644
--- a/camel-core/src/main/java/org/apache/camel/Properties.java
+++ b/camel-core/src/main/java/org/apache/camel/Properties.java
@@ -25,11 +25,13 @@ import java.lang.annotation.Target;
/**
* Marks a parameter as being an injection point of the properties of an {@link Exchange}
*
+ * @deprecated use {@link ExchangeProperties} instead
* @see Exchange#getProperties()
* @version
*/
@Retention(RetentionPolicy.RUNTIME)
@Documented
@Target({ElementType.PARAMETER })
+@Deprecated
public @interface Properties {
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/camel/blob/4fbeac68/camel-core/src/main/java/org/apache/camel/builder/ExpressionBuilder.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/builder/ExpressionBuilder.java b/camel-core/src/main/java/org/apache/camel/builder/ExpressionBuilder.java
index d9e685c..472c582 100644
--- a/camel-core/src/main/java/org/apache/camel/builder/ExpressionBuilder.java
+++ b/camel-core/src/main/java/org/apache/camel/builder/ExpressionBuilder.java
@@ -647,8 +647,19 @@ public final class ExpressionBuilder {
* Returns an expression for the properties of exchange
*
* @return an expression object which will return the properties
+ * @deprecated use {@link #exchangeExceptionExpression()} instead
*/
+ @Deprecated
public static Expression propertiesExpression() {
+ return exchangeExceptionExpression();
+ }
+
+ /**
+ * Returns an expression for the exchange properties of exchange
+ *
+ * @return an expression object which will return the exchange properties
+ */
+ public static Expression exchangePropertiesExpression() {
return new ExpressionAdapter() {
public Object evaluate(Exchange exchange) {
return exchange.getProperties();
@@ -656,11 +667,11 @@ public final class ExpressionBuilder {
@Override
public String toString() {
- return "properties";
+ return "exchangeProperties";
}
};
}
-
+
/**
* Returns an expression for the properties of the camel context
*
http://git-wip-us.apache.org/repos/asf/camel/blob/4fbeac68/camel-core/src/main/java/org/apache/camel/builder/ExpressionClause.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/builder/ExpressionClause.java b/camel-core/src/main/java/org/apache/camel/builder/ExpressionClause.java
index 8da22c8..610c422 100644
--- a/camel-core/src/main/java/org/apache/camel/builder/ExpressionClause.java
+++ b/camel-core/src/main/java/org/apache/camel/builder/ExpressionClause.java
@@ -334,9 +334,19 @@ public class ExpressionClause<T> extends ExpressionDefinition {
/**
* An expression of the exchange properties
+ *
+ * @deprecated use {@link #exchangeProperties()} instead
*/
+ @Deprecated
public T properties() {
- return delegate.properties();
+ return exchangeProperties();
+ }
+
+ /**
+ * An expression of the exchange properties
+ */
+ public T exchangeProperties() {
+ return delegate.exchangeProperties();
}
// Languages
http://git-wip-us.apache.org/repos/asf/camel/blob/4fbeac68/camel-core/src/main/java/org/apache/camel/builder/ExpressionClauseSupport.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/builder/ExpressionClauseSupport.java b/camel-core/src/main/java/org/apache/camel/builder/ExpressionClauseSupport.java
index 16eedced..811caa4 100644
--- a/camel-core/src/main/java/org/apache/camel/builder/ExpressionClauseSupport.java
+++ b/camel-core/src/main/java/org/apache/camel/builder/ExpressionClauseSupport.java
@@ -200,9 +200,19 @@ public class ExpressionClauseSupport<T> {
/**
* An expression of the exchange properties
+ *
+ * @deprecated use {@link #exchangeProperties()} instead
*/
+ @Deprecated
public T properties() {
- return expression(ExpressionBuilder.propertiesExpression());
+ return exchangeProperties();
+ }
+
+ /**
+ * An expression of the exchange properties
+ */
+ public T exchangeProperties() {
+ return expression(ExpressionBuilder.exchangePropertiesExpression());
}
// Languages
http://git-wip-us.apache.org/repos/asf/camel/blob/4fbeac68/camel-core/src/main/java/org/apache/camel/component/bean/BeanInfo.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/component/bean/BeanInfo.java b/camel-core/src/main/java/org/apache/camel/component/bean/BeanInfo.java
index 943fa07..ffeea3e 100644
--- a/camel-core/src/main/java/org/apache/camel/component/bean/BeanInfo.java
+++ b/camel-core/src/main/java/org/apache/camel/component/bean/BeanInfo.java
@@ -38,6 +38,7 @@ import org.apache.camel.Body;
import org.apache.camel.CamelContext;
import org.apache.camel.Exchange;
import org.apache.camel.ExchangeException;
+import org.apache.camel.ExchangeProperties;
import org.apache.camel.ExchangeProperty;
import org.apache.camel.Expression;
import org.apache.camel.Handler;
@@ -974,7 +975,9 @@ public class BeanInfo {
ExchangeProperty propertyAnnotation = (ExchangeProperty)annotation;
return ExpressionBuilder.exchangePropertyExpression(propertyAnnotation.value());
} else if (annotation instanceof Properties) {
- return ExpressionBuilder.propertiesExpression();
+ return ExpressionBuilder.exchangePropertiesExpression();
+ } else if (annotation instanceof ExchangeProperties) {
+ return ExpressionBuilder.exchangePropertiesExpression();
} else if (annotation instanceof Header) {
Header headerAnnotation = (Header)annotation;
return ExpressionBuilder.headerExpression(headerAnnotation.value());
http://git-wip-us.apache.org/repos/asf/camel/blob/4fbeac68/camel-core/src/main/java/org/apache/camel/processor/aggregate/AggregationStrategyBeanInfo.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/processor/aggregate/AggregationStrategyBeanInfo.java b/camel-core/src/main/java/org/apache/camel/processor/aggregate/AggregationStrategyBeanInfo.java
index ad34e28..45ac011 100644
--- a/camel-core/src/main/java/org/apache/camel/processor/aggregate/AggregationStrategyBeanInfo.java
+++ b/camel-core/src/main/java/org/apache/camel/processor/aggregate/AggregationStrategyBeanInfo.java
@@ -90,7 +90,7 @@ public class AggregationStrategyBeanInfo {
oldParameters.add(info);
} else if (oldParameters.size() == 2) {
// the 3rd parameter is the properties
- Expression oldProperties = ExpressionBuilder.propertiesExpression();
+ Expression oldProperties = ExpressionBuilder.exchangePropertiesExpression();
ParameterInfo info = new ParameterInfo(i, oldType, null, oldProperties);
oldParameters.add(info);
}
@@ -110,7 +110,7 @@ public class AggregationStrategyBeanInfo {
newParameters.add(info);
} else if (newParameters.size() == 2) {
// the 3rd parameter is the properties
- Expression newProperties = ExpressionBuilder.propertiesExpression();
+ Expression newProperties = ExpressionBuilder.exchangePropertiesExpression();
ParameterInfo info = new ParameterInfo(i, newType, null, newProperties);
newParameters.add(info);
}
http://git-wip-us.apache.org/repos/asf/camel/blob/4fbeac68/camel-core/src/test/java/org/apache/camel/component/bean/BeanWithPropertiesAndHeadersAndBodyInjectionTest.java
----------------------------------------------------------------------
diff --git a/camel-core/src/test/java/org/apache/camel/component/bean/BeanWithPropertiesAndHeadersAndBodyInjectionTest.java b/camel-core/src/test/java/org/apache/camel/component/bean/BeanWithPropertiesAndHeadersAndBodyInjectionTest.java
index f7485c9..4aa6d8d 100644
--- a/camel-core/src/test/java/org/apache/camel/component/bean/BeanWithPropertiesAndHeadersAndBodyInjectionTest.java
+++ b/camel-core/src/test/java/org/apache/camel/component/bean/BeanWithPropertiesAndHeadersAndBodyInjectionTest.java
@@ -22,10 +22,10 @@ import javax.naming.Context;
import org.apache.camel.Body;
import org.apache.camel.ContextTestSupport;
import org.apache.camel.Exchange;
+import org.apache.camel.ExchangeProperties;
import org.apache.camel.Headers;
import org.apache.camel.Message;
import org.apache.camel.Processor;
-import org.apache.camel.Properties;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.util.jndi.JndiContext;
@@ -88,7 +88,7 @@ public class BeanWithPropertiesAndHeadersAndBodyInjectionTest extends ContextTes
return "MyBean[foo: " + foo + " bar: " + bar + " body: " + body + "]";
}
- public void myMethod(@Properties Map<?, ?> foo, @Headers Map<?, ?> bar, @Body String body) {
+ public void myMethod(@ExchangeProperties Map<?, ?> foo, @Headers Map<?, ?> bar, @Body String body) {
this.foo = foo;
this.bar = bar;
this.body = body;
http://git-wip-us.apache.org/repos/asf/camel/blob/4fbeac68/camel-core/src/test/java/org/apache/camel/component/bean/BeanWithPropertiesAndHeadersInjectionTest.java
----------------------------------------------------------------------
diff --git a/camel-core/src/test/java/org/apache/camel/component/bean/BeanWithPropertiesAndHeadersInjectionTest.java b/camel-core/src/test/java/org/apache/camel/component/bean/BeanWithPropertiesAndHeadersInjectionTest.java
index 551f039..79b7bd5 100644
--- a/camel-core/src/test/java/org/apache/camel/component/bean/BeanWithPropertiesAndHeadersInjectionTest.java
+++ b/camel-core/src/test/java/org/apache/camel/component/bean/BeanWithPropertiesAndHeadersInjectionTest.java
@@ -22,10 +22,10 @@ import javax.naming.Context;
import org.apache.camel.ContextTestSupport;
import org.apache.camel.Exchange;
+import org.apache.camel.ExchangeProperties;
import org.apache.camel.Headers;
import org.apache.camel.Message;
import org.apache.camel.Processor;
-import org.apache.camel.Properties;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.processor.BeanRouteTest;
import org.apache.camel.util.jndi.JndiContext;
@@ -87,7 +87,7 @@ public class BeanWithPropertiesAndHeadersInjectionTest extends ContextTestSuppor
return "MyBean[foo: " + foo + " bar: " + bar + "]";
}
- public void myMethod(@Properties Map<?, ?> foo, @Headers Map<?, ?> bar) {
+ public void myMethod(@ExchangeProperties Map<?, ?> foo, @Headers Map<?, ?> bar) {
this.foo = foo;
this.bar = bar;
LOG.info("myMethod() method called on " + this);
http://git-wip-us.apache.org/repos/asf/camel/blob/4fbeac68/camel-core/src/test/java/org/apache/camel/issues/DynamicRouterConvertBodyToIssueTest.java
----------------------------------------------------------------------
diff --git a/camel-core/src/test/java/org/apache/camel/issues/DynamicRouterConvertBodyToIssueTest.java b/camel-core/src/test/java/org/apache/camel/issues/DynamicRouterConvertBodyToIssueTest.java
index 84295f5..851e9ec 100644
--- a/camel-core/src/test/java/org/apache/camel/issues/DynamicRouterConvertBodyToIssueTest.java
+++ b/camel-core/src/test/java/org/apache/camel/issues/DynamicRouterConvertBodyToIssueTest.java
@@ -21,8 +21,8 @@ import java.util.UUID;
import org.apache.camel.ContextTestSupport;
import org.apache.camel.Exchange;
+import org.apache.camel.ExchangeProperties;
import org.apache.camel.Processor;
-import org.apache.camel.Properties;
import org.apache.camel.builder.RouteBuilder;
import org.junit.Ignore;
@@ -77,7 +77,7 @@ public class DynamicRouterConvertBodyToIssueTest extends ContextTestSupport impl
}
}
- public String slip(String body, @Properties Map<String, Object> properties) {
+ public String slip(String body, @ExchangeProperties Map<String, Object> properties) {
log.info("slip " + properties.get("EXIT"));
if (properties.get("EXIT") != null && properties.get("EXIT").equals("PLEASE")) {
log.info("Exiting after " + MAX_ITERATIONS + " iterations");
http://git-wip-us.apache.org/repos/asf/camel/blob/4fbeac68/camel-core/src/test/java/org/apache/camel/processor/DynamicRouterExchangePropertiesTest.java
----------------------------------------------------------------------
diff --git a/camel-core/src/test/java/org/apache/camel/processor/DynamicRouterExchangePropertiesTest.java b/camel-core/src/test/java/org/apache/camel/processor/DynamicRouterExchangePropertiesTest.java
index 4caf759..ab8884e 100644
--- a/camel-core/src/test/java/org/apache/camel/processor/DynamicRouterExchangePropertiesTest.java
+++ b/camel-core/src/test/java/org/apache/camel/processor/DynamicRouterExchangePropertiesTest.java
@@ -21,7 +21,7 @@ import java.util.List;
import java.util.Map;
import org.apache.camel.ContextTestSupport;
-import org.apache.camel.Properties;
+import org.apache.camel.ExchangeProperties;
import org.apache.camel.builder.RouteBuilder;
/**
@@ -77,7 +77,7 @@ public class DynamicRouterExchangePropertiesTest extends ContextTestSupport {
* @param properties the exchange properties where we can store state between invocations
* @return endpoints to go, or <tt>null</tt> to indicate the end
*/
- public String slip(String body, @Properties Map<String, Object> properties) {
+ public String slip(String body, @ExchangeProperties Map<String, Object> properties) {
bodies.add(body);
// get the state from the exchange properties and keep track how many times