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/17 09:16:26 UTC
[1/4] camel git commit: CAMEL-10546: Fixed typo with non-printable
characters
Repository: camel
Updated Branches:
refs/heads/master 4093fe50a -> a43dc750f
CAMEL-10546: Fixed typo with non-printable characters
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/a43dc750
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/a43dc750
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/a43dc750
Branch: refs/heads/master
Commit: a43dc750ff2fc3a7b7dcdef911e94b8e210cb80f
Parents: 6325217
Author: aldettinger <al...@gmail.com>
Authored: Mon Jan 16 19:05:23 2017 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Tue Jan 17 10:11:02 2017 +0100
----------------------------------------------------------------------
.../test/java/org/apache/camel/builder/ExpressionBuilderTest.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/a43dc750/camel-core/src/test/java/org/apache/camel/builder/ExpressionBuilderTest.java
----------------------------------------------------------------------
diff --git a/camel-core/src/test/java/org/apache/camel/builder/ExpressionBuilderTest.java b/camel-core/src/test/java/org/apache/camel/builder/ExpressionBuilderTest.java
index 03763d6..0550580 100644
--- a/camel-core/src/test/java/org/apache/camel/builder/ExpressionBuilderTest.java
+++ b/camel-core/src/test/java/org/apache/camel/builder/ExpressionBuilderTest.java
@@ -96,7 +96,7 @@ public class ExpressionBuilderTest extends TestSupport {
}
public void testCamelContextPropertiesExpression() throws Exception {
- camelContext.getGlobalOptions().put("CamelTestKey", "CamelTestValue");
+ camelContext.getGlobalOptions().put("CamelTestKey", "CamelTestValue");
Expression expression = camelContextPropertyExpression("CamelTestKey");
assertExpression(expression, exchange, "CamelTestValue");
expression = camelContextPropertiesExpression();
[4/4] camel git commit: CAMEL-10546: renamed
CamelContext.getProperties to getGlobalOptions
Posted by da...@apache.org.
CAMEL-10546: renamed CamelContext.getProperties to getGlobalOptions
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/7b8f19d6
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/7b8f19d6
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/7b8f19d6
Branch: refs/heads/master
Commit: 7b8f19d662d35b4ccfeb8584a10db1e805e69e3f
Parents: 4093fe5
Author: aldettinger <al...@gmail.com>
Authored: Thu Jan 12 19:00:14 2017 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Tue Jan 17 10:11:02 2017 +0100
----------------------------------------------------------------------
.../java/org/apache/camel/CamelContext.java | 43 ++++++++++++++------
.../apache/camel/impl/DefaultCamelContext.java | 32 +++++++++++----
2 files changed, 55 insertions(+), 20 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/7b8f19d6/camel-core/src/main/java/org/apache/camel/CamelContext.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/CamelContext.java b/camel-core/src/main/java/org/apache/camel/CamelContext.java
index e37aa17..a2beea1 100644
--- a/camel-core/src/main/java/org/apache/camel/CamelContext.java
+++ b/camel-core/src/main/java/org/apache/camel/CamelContext.java
@@ -1265,41 +1265,58 @@ public interface CamelContext extends SuspendableService, RuntimeConfiguration {
TransformerRegistry getTransformerRegistry();
/**
- * Sets the properties that can be referenced in the camel context
+ * @deprecated use {@link #setGlobalOptions(Map) setGlobalOptions(Map<String,String>) instead}.
+ */
+ @Deprecated
+ void setProperties(Map<String, String> properties);
+
+ /**
+ * Sets global options that can be referenced in the camel context
* <p/>
* <b>Important:</b> This has nothing to do with property placeholders, and is just a plain set of key/value pairs
- * which are used to configure global settings on CamelContext, such as a maximum debug logging length etc.
+ * which are used to configure global options on CamelContext, such as a maximum debug logging length etc.
* For property placeholders use {@link #resolvePropertyPlaceholders(String)} method and see more details
* at the <a href="http://camel.apache.org/using-propertyplaceholder.html">property placeholder</a> documentation.
*
- * @param properties properties
+ * @param globalOptions global options that can be referenced in the camel context
*/
- void setProperties(Map<String, String> properties);
+ void setGlobalOptions(Map<String, String> globalOptions);
/**
- * Gets the properties that can be referenced in the camel context.
+ * @deprecated use {@link #getGlobalOptions()} instead.
+ */
+ @Deprecated
+ Map<String, String> getProperties();
+
+ /**
+ * Gets global options that can be referenced in the camel context.
* <p/>
* <b>Important:</b> This has nothing to do with property placeholders, and is just a plain set of key/value pairs
- * which are used to configure global settings on CamelContext, such as a maximum debug logging length etc.
+ * which are used to configure global options on CamelContext, such as a maximum debug logging length etc.
* For property placeholders use {@link #resolvePropertyPlaceholders(String)} method and see more details
* at the <a href="http://camel.apache.org/using-propertyplaceholder.html">property placeholder</a> documentation.
*
- * @return the properties
+ * @return global options for this context
*/
- Map<String, String> getProperties();
+ Map<String, String> getGlobalOptions();
/**
- * Gets the property value that can be referenced in the camel context
+ * @deprecated use {@link #getGlobalOption(String)} instead.
+ */
+ String getProperty(String name);
+
+ /**
+ * Gets the global option value that can be referenced in the camel context
* <p/>
* <b>Important:</b> This has nothing to do with property placeholders, and is just a plain set of key/value pairs
- * which are used to configure global settings on CamelContext, such as a maximum debug logging length etc.
+ * which are used to configure global options on CamelContext, such as a maximum debug logging length etc.
* For property placeholders use {@link #resolvePropertyPlaceholders(String)} method and see more details
* at the <a href="http://camel.apache.org/using-propertyplaceholder.html">property placeholder</a> documentation.
*
- * @return the string value of property
+ * @return the string value of the global option
*/
- String getProperty(String name);
-
+ String getGlobalOption(String name);
+
/**
* Gets the default FactoryFinder which will be used for the loading the factory class from META-INF
*
http://git-wip-us.apache.org/repos/asf/camel/blob/7b8f19d6/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java b/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java
index dc41670..2e94289 100644
--- a/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java
+++ b/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java
@@ -247,7 +247,7 @@ public class DefaultCamelContext extends ServiceSupport implements ModelCamelCon
private ScheduledExecutorService errorHandlerExecutorService;
private Map<String, DataFormatDefinition> dataFormats = new HashMap<String, DataFormatDefinition>();
private DataFormatResolver dataFormatResolver = new DefaultDataFormatResolver();
- private Map<String, String> properties = new HashMap<String, String>();
+ private Map<String, String> globalOptions = new HashMap<String, String>();
private FactoryFinderResolver factoryFinderResolver = new DefaultFactoryFinderResolver();
private FactoryFinder defaultFactoryFinder;
private PropertiesComponent propertiesComponent;
@@ -3029,8 +3029,8 @@ public class DefaultCamelContext extends ServiceSupport implements ModelCamelCon
private void doStartCamel() throws Exception {
// custom properties may use property placeholders so resolve those early on
- if (properties != null && !properties.isEmpty()) {
- for (Map.Entry<String, String> entry : properties.entrySet()) {
+ if (globalOptions != null && !globalOptions.isEmpty()) {
+ for (Map.Entry<String, String> entry : globalOptions.entrySet()) {
String key = entry.getKey();
String value = entry.getValue();
if (value != null) {
@@ -3926,12 +3926,24 @@ public class DefaultCamelContext extends ServiceSupport implements ModelCamelCon
return dataFormats;
}
+ @Deprecated
public Map<String, String> getProperties() {
- return properties;
+ return getGlobalOptions();
+ }
+
+ @Override
+ public Map<String, String> getGlobalOptions() {
+ return globalOptions;
}
+ @Deprecated
public void setProperties(Map<String, String> properties) {
- this.properties = properties;
+ this.setGlobalOptions(properties);
+ }
+
+ @Override
+ public void setGlobalOptions(Map<String, String> globalOptions) {
+ this.globalOptions = globalOptions;
}
public FactoryFinder getDefaultFactoryFinder() {
@@ -4268,14 +4280,20 @@ public class DefaultCamelContext extends ServiceSupport implements ModelCamelCon
this.restRegistry = restRegistry;
}
+ @Deprecated
@Override
public String getProperty(String name) {
- String value = getProperties().get(name);
+ return getGlobalOption(name);
+ }
+
+ @Override
+ public String getGlobalOption(String name) {
+ String value = getGlobalOptions().get(name);
if (ObjectHelper.isNotEmpty(value)) {
try {
value = resolvePropertyPlaceholders(value);
} catch (Exception e) {
- throw new RuntimeCamelException("Error getting property: " + name, e);
+ throw new RuntimeCamelException("Error getting global option: " + name, e);
}
}
return value;
[2/4] camel git commit: CAMEL-10546: Removed use of the deprecated api
Posted by da...@apache.org.
CAMEL-10546: Removed use of the deprecated api
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/93fdb1d4
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/93fdb1d4
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/93fdb1d4
Branch: refs/heads/master
Commit: 93fdb1d406a3bcdff9869e4f40de1ef1615b7509
Parents: 7b8f19d
Author: aldettinger <al...@gmail.com>
Authored: Sat Jan 14 18:34:28 2017 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Tue Jan 17 10:11:02 2017 +0100
----------------------------------------------------------------------
.../org/apache/camel/builder/ExpressionBuilder.java | 6 +++---
.../apache/camel/impl/DefaultStreamCachingStrategy.java | 8 ++++----
.../camel/management/mbean/ManagedCamelContext.java | 8 ++++----
.../main/java/org/apache/camel/model/LogDefinition.java | 2 +-
.../camel/processor/DefaultExchangeFormatter.java | 2 +-
.../apache/camel/processor/RedeliveryErrorHandler.java | 2 +-
.../java/org/apache/camel/util/CamelContextHelper.java | 4 ++--
.../main/java/org/apache/camel/util/MessageHelper.java | 8 ++++----
.../main/java/org/apache/camel/util/ObjectHelper.java | 2 +-
.../org/apache/camel/builder/ExpressionBuilderTest.java | 2 +-
.../component/properties/PropertiesComponentTest.java | 8 ++++----
.../apache/camel/converter/jaxp/XmlConverterTest.java | 4 ++--
.../impl/DefaultCamelContextEndpointCacheLimitTest.java | 2 +-
...faultConsumerTemplateWithCustomCacheMaxSizeTest.java | 6 +++---
...faultProducerTemplateWithCustomCacheMaxSizeTest.java | 6 +++---
...KeepRouteEndpointsRemoteRouteSharedEndpointTest.java | 2 +-
...dpointRegistryKeepRouteEndpointsRemoteRouteTest.java | 2 +-
.../impl/EndpointRegistryKeepRouteEndpointsTest.java | 2 +-
.../apache/camel/impl/LogDebugBodyMaxCharsOffTest.java | 2 +-
.../org/apache/camel/impl/LogDebugBodyMaxCharsTest.java | 2 +-
.../org/apache/camel/impl/LogDebugBodyStreamsTest.java | 12 ++++++------
.../camel/processor/DefaultExchangeFormatterTest.java | 8 ++++----
.../apache/camel/processor/LogGlobalLogNameTest.java | 2 +-
.../camel/processor/MessageHistoryDumpRoutingTest.java | 2 +-
.../camel/processor/StreamCachingOnlyRouteTest.java | 2 +-
.../java/org/apache/camel/util/ObjectHelperTest.java | 2 +-
.../camel/core/xml/AbstractCamelContextFactoryBean.java | 2 +-
.../org/apache/camel/spring/CamelContextAwareTest.java | 2 +-
.../apache/camel/spring/config/CamelPropertiesTest.java | 8 ++++----
29 files changed, 60 insertions(+), 60 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/93fdb1d4/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 0c04cd8..d9e685c 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
@@ -669,7 +669,7 @@ public final class ExpressionBuilder {
public static Expression camelContextPropertiesExpression() {
return new ExpressionAdapter() {
public Object evaluate(Exchange exchange) {
- return exchange.getContext().getProperties();
+ return exchange.getContext().getGlobalOptions();
}
@Override
@@ -689,7 +689,7 @@ public final class ExpressionBuilder {
return new ExpressionAdapter() {
public Object evaluate(Exchange exchange) {
String text = simpleExpression(propertyName).evaluate(exchange, String.class);
- return exchange.getContext().getProperty(text);
+ return exchange.getContext().getGlobalOption(text);
}
@Override
@@ -2413,7 +2413,7 @@ public final class ExpressionBuilder {
def.setShowHeaders(true);
def.setStyle(DefaultExchangeFormatter.OutputStyle.Fixed);
try {
- Integer maxChars = CamelContextHelper.parseInteger(camelContext, camelContext.getProperty(Exchange.LOG_DEBUG_BODY_MAX_CHARS));
+ Integer maxChars = CamelContextHelper.parseInteger(camelContext, camelContext.getGlobalOption(Exchange.LOG_DEBUG_BODY_MAX_CHARS));
if (maxChars != null) {
def.setMaxChars(maxChars);
}
http://git-wip-us.apache.org/repos/asf/camel/blob/93fdb1d4/camel-core/src/main/java/org/apache/camel/impl/DefaultStreamCachingStrategy.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/impl/DefaultStreamCachingStrategy.java b/camel-core/src/main/java/org/apache/camel/impl/DefaultStreamCachingStrategy.java
index 245765d..8a77af4 100644
--- a/camel-core/src/main/java/org/apache/camel/impl/DefaultStreamCachingStrategy.java
+++ b/camel-core/src/main/java/org/apache/camel/impl/DefaultStreamCachingStrategy.java
@@ -235,10 +235,10 @@ public class DefaultStreamCachingStrategy extends org.apache.camel.support.Servi
return;
}
- String bufferSize = camelContext.getProperty(BUFFER_SIZE);
- String hold = camelContext.getProperty(THRESHOLD);
- String chiper = camelContext.getProperty(CIPHER_TRANSFORMATION);
- String dir = camelContext.getProperty(TEMP_DIR);
+ String bufferSize = camelContext.getGlobalOption(BUFFER_SIZE);
+ String hold = camelContext.getGlobalOption(THRESHOLD);
+ String chiper = camelContext.getGlobalOption(CIPHER_TRANSFORMATION);
+ String dir = camelContext.getGlobalOption(TEMP_DIR);
boolean warn = false;
if (bufferSize != null) {
http://git-wip-us.apache.org/repos/asf/camel/blob/93fdb1d4/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedCamelContext.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedCamelContext.java b/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedCamelContext.java
index c5ff800..f983cea 100644
--- a/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedCamelContext.java
+++ b/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedCamelContext.java
@@ -144,18 +144,18 @@ public class ManagedCamelContext extends ManagedPerformanceCounter implements Ti
}
public Map<String, String> getProperties() {
- if (context.getProperties().isEmpty()) {
+ if (context.getGlobalOptions().isEmpty()) {
return null;
}
- return context.getProperties();
+ return context.getGlobalOptions();
}
public String getProperty(String name) throws Exception {
- return context.getProperty(name);
+ return context.getGlobalOption(name);
}
public void setProperty(String name, String value) throws Exception {
- context.getProperties().put(name, value);
+ context.getGlobalOptions().put(name, value);
}
public Boolean getTracing() {
http://git-wip-us.apache.org/repos/asf/camel/blob/93fdb1d4/camel-core/src/main/java/org/apache/camel/model/LogDefinition.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/model/LogDefinition.java b/camel-core/src/main/java/org/apache/camel/model/LogDefinition.java
index 299ffaa..7e6cd42 100644
--- a/camel-core/src/main/java/org/apache/camel/model/LogDefinition.java
+++ b/camel-core/src/main/java/org/apache/camel/model/LogDefinition.java
@@ -107,7 +107,7 @@ public class LogDefinition extends NoOutputDefinition<LogDefinition> {
if (logger == null) {
String name = getLogName();
if (name == null) {
- name = routeContext.getCamelContext().getProperty(Exchange.LOG_EIP_NAME);
+ name = routeContext.getCamelContext().getGlobalOption(Exchange.LOG_EIP_NAME);
if (name != null) {
LOG.debug("Using logName from CamelContext properties: {}", name);
}
http://git-wip-us.apache.org/repos/asf/camel/blob/93fdb1d4/camel-core/src/main/java/org/apache/camel/processor/DefaultExchangeFormatter.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/processor/DefaultExchangeFormatter.java b/camel-core/src/main/java/org/apache/camel/processor/DefaultExchangeFormatter.java
index a6d08fb..dfa2a1f 100644
--- a/camel-core/src/main/java/org/apache/camel/processor/DefaultExchangeFormatter.java
+++ b/camel-core/src/main/java/org/apache/camel/processor/DefaultExchangeFormatter.java
@@ -456,7 +456,7 @@ public class DefaultExchangeFormatter implements ExchangeFormatter {
private int getMaxChars(Message message) {
int maxChars = getMaxChars();
if (message.getExchange() != null) {
- String property = message.getExchange().getContext().getProperty(Exchange.LOG_DEBUG_BODY_MAX_CHARS);
+ String property = message.getExchange().getContext().getGlobalOption(Exchange.LOG_DEBUG_BODY_MAX_CHARS);
if (property != null) {
maxChars = message.getExchange().getContext().getTypeConverter().convertTo(Integer.class, property);
}
http://git-wip-us.apache.org/repos/asf/camel/blob/93fdb1d4/camel-core/src/main/java/org/apache/camel/processor/RedeliveryErrorHandler.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/processor/RedeliveryErrorHandler.java b/camel-core/src/main/java/org/apache/camel/processor/RedeliveryErrorHandler.java
index 201a008..51e6529 100644
--- a/camel-core/src/main/java/org/apache/camel/processor/RedeliveryErrorHandler.java
+++ b/camel-core/src/main/java/org/apache/camel/processor/RedeliveryErrorHandler.java
@@ -295,7 +295,7 @@ public abstract class RedeliveryErrorHandler extends ErrorHandlerSupport impleme
formatter.setShowHeaders(true);
formatter.setStyle(DefaultExchangeFormatter.OutputStyle.Fixed);
try {
- Integer maxChars = CamelContextHelper.parseInteger(camelContext, camelContext.getProperty(Exchange.LOG_DEBUG_BODY_MAX_CHARS));
+ Integer maxChars = CamelContextHelper.parseInteger(camelContext, camelContext.getGlobalOption(Exchange.LOG_DEBUG_BODY_MAX_CHARS));
if (maxChars != null) {
formatter.setMaxChars(maxChars);
}
http://git-wip-us.apache.org/repos/asf/camel/blob/93fdb1d4/camel-core/src/main/java/org/apache/camel/util/CamelContextHelper.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/util/CamelContextHelper.java b/camel-core/src/main/java/org/apache/camel/util/CamelContextHelper.java
index d22fcff..8be19d7 100644
--- a/camel-core/src/main/java/org/apache/camel/util/CamelContextHelper.java
+++ b/camel-core/src/main/java/org/apache/camel/util/CamelContextHelper.java
@@ -203,7 +203,7 @@ public final class CamelContextHelper {
*/
public static int getMaximumCachePoolSize(CamelContext camelContext) throws IllegalArgumentException {
if (camelContext != null) {
- String s = camelContext.getProperty(Exchange.MAXIMUM_CACHE_POOL_SIZE);
+ String s = camelContext.getGlobalOption(Exchange.MAXIMUM_CACHE_POOL_SIZE);
if (s != null) {
try {
// we cannot use Camel type converters as they may not be ready this early
@@ -234,7 +234,7 @@ public final class CamelContextHelper {
*/
public static int getMaximumEndpointCacheSize(CamelContext camelContext) throws IllegalArgumentException {
if (camelContext != null) {
- String s = camelContext.getProperty(Exchange.MAXIMUM_ENDPOINT_CACHE_SIZE);
+ String s = camelContext.getGlobalOption(Exchange.MAXIMUM_ENDPOINT_CACHE_SIZE);
if (s != null) {
// we cannot use Camel type converters as they may not be ready this early
try {
http://git-wip-us.apache.org/repos/asf/camel/blob/93fdb1d4/camel-core/src/main/java/org/apache/camel/util/MessageHelper.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/util/MessageHelper.java b/camel-core/src/main/java/org/apache/camel/util/MessageHelper.java
index 3e7042b..afb37d8 100644
--- a/camel-core/src/main/java/org/apache/camel/util/MessageHelper.java
+++ b/camel-core/src/main/java/org/apache/camel/util/MessageHelper.java
@@ -175,7 +175,7 @@ public final class MessageHelper {
public static String extractValueForLogging(Object value, Message message) {
boolean streams = false;
if (message.getExchange() != null) {
- String property = message.getExchange().getContext().getProperty(Exchange.LOG_DEBUG_BODY_STREAMS);
+ String property = message.getExchange().getContext().getGlobalOption(Exchange.LOG_DEBUG_BODY_STREAMS);
if (property != null) {
streams = message.getExchange().getContext().getTypeConverter().convertTo(Boolean.class, message.getExchange(), property);
}
@@ -185,7 +185,7 @@ public final class MessageHelper {
int maxChars = 1000;
if (message.getExchange() != null) {
- String property = message.getExchange().getContext().getProperty(Exchange.LOG_DEBUG_BODY_MAX_CHARS);
+ String property = message.getExchange().getContext().getGlobalOption(Exchange.LOG_DEBUG_BODY_MAX_CHARS);
if (property != null) {
maxChars = message.getExchange().getContext().getTypeConverter().convertTo(Integer.class, property);
}
@@ -208,7 +208,7 @@ public final class MessageHelper {
public static String extractBodyForLogging(Message message, String prepend) {
boolean streams = false;
if (message.getExchange() != null) {
- String property = message.getExchange().getContext().getProperty(Exchange.LOG_DEBUG_BODY_STREAMS);
+ String property = message.getExchange().getContext().getGlobalOption(Exchange.LOG_DEBUG_BODY_STREAMS);
if (property != null) {
streams = message.getExchange().getContext().getTypeConverter().convertTo(Boolean.class, message.getExchange(), property);
}
@@ -234,7 +234,7 @@ public final class MessageHelper {
int maxChars = 1000;
if (message.getExchange() != null) {
- String property = message.getExchange().getContext().getProperty(Exchange.LOG_DEBUG_BODY_MAX_CHARS);
+ String property = message.getExchange().getContext().getGlobalOption(Exchange.LOG_DEBUG_BODY_MAX_CHARS);
if (property != null) {
maxChars = message.getExchange().getContext().getTypeConverter().convertTo(Integer.class, property);
}
http://git-wip-us.apache.org/repos/asf/camel/blob/93fdb1d4/camel-core/src/main/java/org/apache/camel/util/ObjectHelper.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/util/ObjectHelper.java b/camel-core/src/main/java/org/apache/camel/util/ObjectHelper.java
index 2a9b511..7331437 100644
--- a/camel-core/src/main/java/org/apache/camel/util/ObjectHelper.java
+++ b/camel-core/src/main/java/org/apache/camel/util/ObjectHelper.java
@@ -949,7 +949,7 @@ public final class ObjectHelper {
*/
public static Properties getCamelPropertiesWithPrefix(String prefix, CamelContext camelContext) {
Properties answer = new Properties();
- Map<String, String> camelProperties = camelContext.getProperties();
+ Map<String, String> camelProperties = camelContext.getGlobalOptions();
if (camelProperties != null) {
for (Map.Entry<String, String> entry : camelProperties.entrySet()) {
String key = entry.getKey();
http://git-wip-us.apache.org/repos/asf/camel/blob/93fdb1d4/camel-core/src/test/java/org/apache/camel/builder/ExpressionBuilderTest.java
----------------------------------------------------------------------
diff --git a/camel-core/src/test/java/org/apache/camel/builder/ExpressionBuilderTest.java b/camel-core/src/test/java/org/apache/camel/builder/ExpressionBuilderTest.java
index 3cefd46..03763d6 100644
--- a/camel-core/src/test/java/org/apache/camel/builder/ExpressionBuilderTest.java
+++ b/camel-core/src/test/java/org/apache/camel/builder/ExpressionBuilderTest.java
@@ -96,7 +96,7 @@ public class ExpressionBuilderTest extends TestSupport {
}
public void testCamelContextPropertiesExpression() throws Exception {
- camelContext.getProperties().put("CamelTestKey", "CamelTestValue");
+ camelContext.getGlobalOptions().put("CamelTestKey", "CamelTestValue");
Expression expression = camelContextPropertyExpression("CamelTestKey");
assertExpression(expression, exchange, "CamelTestValue");
expression = camelContextPropertiesExpression();
http://git-wip-us.apache.org/repos/asf/camel/blob/93fdb1d4/camel-core/src/test/java/org/apache/camel/component/properties/PropertiesComponentTest.java
----------------------------------------------------------------------
diff --git a/camel-core/src/test/java/org/apache/camel/component/properties/PropertiesComponentTest.java b/camel-core/src/test/java/org/apache/camel/component/properties/PropertiesComponentTest.java
index ad82eec..5b3b608 100644
--- a/camel-core/src/test/java/org/apache/camel/component/properties/PropertiesComponentTest.java
+++ b/camel-core/src/test/java/org/apache/camel/component/properties/PropertiesComponentTest.java
@@ -573,13 +573,13 @@ public class PropertiesComponentTest extends ContextTestSupport {
}
public void testCamelProperties() throws Exception {
- context.getProperties().put("foo", "Hello {{cool.name}}");
- context.getProperties().put("bar", "cool.name");
+ context.getGlobalOptions().put("foo", "Hello {{cool.name}}");
+ context.getGlobalOptions().put("bar", "cool.name");
context.start();
- assertEquals("Hello Camel", context.getProperties().get("foo"));
- assertEquals("cool.name", context.getProperties().get("bar"));
+ assertEquals("Hello Camel", context.getGlobalOptions().get("foo"));
+ assertEquals("cool.name", context.getGlobalOptions().get("bar"));
}
@Override
http://git-wip-us.apache.org/repos/asf/camel/blob/93fdb1d4/camel-core/src/test/java/org/apache/camel/converter/jaxp/XmlConverterTest.java
----------------------------------------------------------------------
diff --git a/camel-core/src/test/java/org/apache/camel/converter/jaxp/XmlConverterTest.java b/camel-core/src/test/java/org/apache/camel/converter/jaxp/XmlConverterTest.java
index 4618131..32e2de4 100644
--- a/camel-core/src/test/java/org/apache/camel/converter/jaxp/XmlConverterTest.java
+++ b/camel-core/src/test/java/org/apache/camel/converter/jaxp/XmlConverterTest.java
@@ -520,8 +520,8 @@ public class XmlConverterTest extends ContextTestSupport {
CamelContext context = new DefaultCamelContext();
Exchange exchange = new DefaultExchange(context);
// shows how to set the OutputOptions from camelContext
- context.getProperties().put(XmlConverter.OUTPUT_PROPERTIES_PREFIX + OutputKeys.ENCODING, "UTF-8");
- context.getProperties().put(XmlConverter.OUTPUT_PROPERTIES_PREFIX + OutputKeys.STANDALONE, "no");
+ context.getGlobalOptions().put(XmlConverter.OUTPUT_PROPERTIES_PREFIX + OutputKeys.ENCODING, "UTF-8");
+ context.getGlobalOptions().put(XmlConverter.OUTPUT_PROPERTIES_PREFIX + OutputKeys.STANDALONE, "no");
XmlConverter conv = new XmlConverter();
SAXSource source = conv.toSAXSource("<foo>bar</foo>", exchange);
http://git-wip-us.apache.org/repos/asf/camel/blob/93fdb1d4/camel-core/src/test/java/org/apache/camel/impl/DefaultCamelContextEndpointCacheLimitTest.java
----------------------------------------------------------------------
diff --git a/camel-core/src/test/java/org/apache/camel/impl/DefaultCamelContextEndpointCacheLimitTest.java b/camel-core/src/test/java/org/apache/camel/impl/DefaultCamelContextEndpointCacheLimitTest.java
index 5c2d19c..39cfb80 100644
--- a/camel-core/src/test/java/org/apache/camel/impl/DefaultCamelContextEndpointCacheLimitTest.java
+++ b/camel-core/src/test/java/org/apache/camel/impl/DefaultCamelContextEndpointCacheLimitTest.java
@@ -61,7 +61,7 @@ public class DefaultCamelContextEndpointCacheLimitTest extends ContextTestSuppor
@Override
protected CamelContext createCamelContext() throws Exception {
CamelContext context = super.createCamelContext();
- context.getProperties().put(Exchange.MAXIMUM_ENDPOINT_CACHE_SIZE, "75");
+ context.getGlobalOptions().put(Exchange.MAXIMUM_ENDPOINT_CACHE_SIZE, "75");
return context;
}
}
http://git-wip-us.apache.org/repos/asf/camel/blob/93fdb1d4/camel-core/src/test/java/org/apache/camel/impl/DefaultConsumerTemplateWithCustomCacheMaxSizeTest.java
----------------------------------------------------------------------
diff --git a/camel-core/src/test/java/org/apache/camel/impl/DefaultConsumerTemplateWithCustomCacheMaxSizeTest.java b/camel-core/src/test/java/org/apache/camel/impl/DefaultConsumerTemplateWithCustomCacheMaxSizeTest.java
index 6ad0a84..fd3e306 100644
--- a/camel-core/src/test/java/org/apache/camel/impl/DefaultConsumerTemplateWithCustomCacheMaxSizeTest.java
+++ b/camel-core/src/test/java/org/apache/camel/impl/DefaultConsumerTemplateWithCustomCacheMaxSizeTest.java
@@ -30,7 +30,7 @@ public class DefaultConsumerTemplateWithCustomCacheMaxSizeTest extends ContextTe
@Override
protected CamelContext createCamelContext() throws Exception {
CamelContext context = super.createCamelContext();
- context.getProperties().put(Exchange.MAXIMUM_CACHE_POOL_SIZE, "200");
+ context.getGlobalOptions().put(Exchange.MAXIMUM_CACHE_POOL_SIZE, "200");
return context;
}
@@ -56,7 +56,7 @@ public class DefaultConsumerTemplateWithCustomCacheMaxSizeTest extends ContextTe
}
public void testInvalidSizeABC() {
- context.getProperties().put(Exchange.MAXIMUM_CACHE_POOL_SIZE, "ABC");
+ context.getGlobalOptions().put(Exchange.MAXIMUM_CACHE_POOL_SIZE, "ABC");
try {
context.createConsumerTemplate();
fail("Should have thrown an exception");
@@ -66,7 +66,7 @@ public class DefaultConsumerTemplateWithCustomCacheMaxSizeTest extends ContextTe
}
public void testInvalidSizeZero() {
- context.getProperties().put(Exchange.MAXIMUM_CACHE_POOL_SIZE, "0");
+ context.getGlobalOptions().put(Exchange.MAXIMUM_CACHE_POOL_SIZE, "0");
try {
context.createConsumerTemplate();
fail("Should have thrown an exception");
http://git-wip-us.apache.org/repos/asf/camel/blob/93fdb1d4/camel-core/src/test/java/org/apache/camel/impl/DefaultProducerTemplateWithCustomCacheMaxSizeTest.java
----------------------------------------------------------------------
diff --git a/camel-core/src/test/java/org/apache/camel/impl/DefaultProducerTemplateWithCustomCacheMaxSizeTest.java b/camel-core/src/test/java/org/apache/camel/impl/DefaultProducerTemplateWithCustomCacheMaxSizeTest.java
index 0d89c65..848bae8 100644
--- a/camel-core/src/test/java/org/apache/camel/impl/DefaultProducerTemplateWithCustomCacheMaxSizeTest.java
+++ b/camel-core/src/test/java/org/apache/camel/impl/DefaultProducerTemplateWithCustomCacheMaxSizeTest.java
@@ -30,7 +30,7 @@ public class DefaultProducerTemplateWithCustomCacheMaxSizeTest extends ContextTe
@Override
protected CamelContext createCamelContext() throws Exception {
CamelContext context = super.createCamelContext();
- context.getProperties().put(Exchange.MAXIMUM_CACHE_POOL_SIZE, "200");
+ context.getGlobalOptions().put(Exchange.MAXIMUM_CACHE_POOL_SIZE, "200");
return context;
}
@@ -56,7 +56,7 @@ public class DefaultProducerTemplateWithCustomCacheMaxSizeTest extends ContextTe
}
public void testInvalidSizeABC() {
- context.getProperties().put(Exchange.MAXIMUM_CACHE_POOL_SIZE, "ABC");
+ context.getGlobalOptions().put(Exchange.MAXIMUM_CACHE_POOL_SIZE, "ABC");
try {
context.createProducerTemplate();
fail("Should have thrown an exception");
@@ -66,7 +66,7 @@ public class DefaultProducerTemplateWithCustomCacheMaxSizeTest extends ContextTe
}
public void testInvalidSizeZero() {
- context.getProperties().put(Exchange.MAXIMUM_CACHE_POOL_SIZE, "0");
+ context.getGlobalOptions().put(Exchange.MAXIMUM_CACHE_POOL_SIZE, "0");
try {
context.createProducerTemplate();
fail("Should have thrown an exception");
http://git-wip-us.apache.org/repos/asf/camel/blob/93fdb1d4/camel-core/src/test/java/org/apache/camel/impl/EndpointRegistryKeepRouteEndpointsRemoteRouteSharedEndpointTest.java
----------------------------------------------------------------------
diff --git a/camel-core/src/test/java/org/apache/camel/impl/EndpointRegistryKeepRouteEndpointsRemoteRouteSharedEndpointTest.java b/camel-core/src/test/java/org/apache/camel/impl/EndpointRegistryKeepRouteEndpointsRemoteRouteSharedEndpointTest.java
index 922e35a..c02667a 100644
--- a/camel-core/src/test/java/org/apache/camel/impl/EndpointRegistryKeepRouteEndpointsRemoteRouteSharedEndpointTest.java
+++ b/camel-core/src/test/java/org/apache/camel/impl/EndpointRegistryKeepRouteEndpointsRemoteRouteSharedEndpointTest.java
@@ -26,7 +26,7 @@ public class EndpointRegistryKeepRouteEndpointsRemoteRouteSharedEndpointTest ext
@Override
protected CamelContext createCamelContext() throws Exception {
CamelContext context = super.createCamelContext();
- context.getProperties().put(Exchange.MAXIMUM_ENDPOINT_CACHE_SIZE, "20");
+ context.getGlobalOptions().put(Exchange.MAXIMUM_ENDPOINT_CACHE_SIZE, "20");
return context;
}
http://git-wip-us.apache.org/repos/asf/camel/blob/93fdb1d4/camel-core/src/test/java/org/apache/camel/impl/EndpointRegistryKeepRouteEndpointsRemoteRouteTest.java
----------------------------------------------------------------------
diff --git a/camel-core/src/test/java/org/apache/camel/impl/EndpointRegistryKeepRouteEndpointsRemoteRouteTest.java b/camel-core/src/test/java/org/apache/camel/impl/EndpointRegistryKeepRouteEndpointsRemoteRouteTest.java
index 1b0acdb..5d0c042 100644
--- a/camel-core/src/test/java/org/apache/camel/impl/EndpointRegistryKeepRouteEndpointsRemoteRouteTest.java
+++ b/camel-core/src/test/java/org/apache/camel/impl/EndpointRegistryKeepRouteEndpointsRemoteRouteTest.java
@@ -26,7 +26,7 @@ public class EndpointRegistryKeepRouteEndpointsRemoteRouteTest extends ContextTe
@Override
protected CamelContext createCamelContext() throws Exception {
CamelContext context = super.createCamelContext();
- context.getProperties().put(Exchange.MAXIMUM_ENDPOINT_CACHE_SIZE, "20");
+ context.getGlobalOptions().put(Exchange.MAXIMUM_ENDPOINT_CACHE_SIZE, "20");
return context;
}
http://git-wip-us.apache.org/repos/asf/camel/blob/93fdb1d4/camel-core/src/test/java/org/apache/camel/impl/EndpointRegistryKeepRouteEndpointsTest.java
----------------------------------------------------------------------
diff --git a/camel-core/src/test/java/org/apache/camel/impl/EndpointRegistryKeepRouteEndpointsTest.java b/camel-core/src/test/java/org/apache/camel/impl/EndpointRegistryKeepRouteEndpointsTest.java
index 6a67176..378fcfe 100644
--- a/camel-core/src/test/java/org/apache/camel/impl/EndpointRegistryKeepRouteEndpointsTest.java
+++ b/camel-core/src/test/java/org/apache/camel/impl/EndpointRegistryKeepRouteEndpointsTest.java
@@ -26,7 +26,7 @@ public class EndpointRegistryKeepRouteEndpointsTest extends ContextTestSupport {
@Override
protected CamelContext createCamelContext() throws Exception {
CamelContext context = super.createCamelContext();
- context.getProperties().put(Exchange.MAXIMUM_ENDPOINT_CACHE_SIZE, "20");
+ context.getGlobalOptions().put(Exchange.MAXIMUM_ENDPOINT_CACHE_SIZE, "20");
return context;
}
http://git-wip-us.apache.org/repos/asf/camel/blob/93fdb1d4/camel-core/src/test/java/org/apache/camel/impl/LogDebugBodyMaxCharsOffTest.java
----------------------------------------------------------------------
diff --git a/camel-core/src/test/java/org/apache/camel/impl/LogDebugBodyMaxCharsOffTest.java b/camel-core/src/test/java/org/apache/camel/impl/LogDebugBodyMaxCharsOffTest.java
index fb07f0f..6dc0abf 100644
--- a/camel-core/src/test/java/org/apache/camel/impl/LogDebugBodyMaxCharsOffTest.java
+++ b/camel-core/src/test/java/org/apache/camel/impl/LogDebugBodyMaxCharsOffTest.java
@@ -29,7 +29,7 @@ public class LogDebugBodyMaxCharsOffTest extends ContextTestSupport {
@Override
protected void setUp() throws Exception {
super.setUp();
- context.getProperties().put(Exchange.LOG_DEBUG_BODY_MAX_CHARS, "-1");
+ context.getGlobalOptions().put(Exchange.LOG_DEBUG_BODY_MAX_CHARS, "-1");
}
@Override
http://git-wip-us.apache.org/repos/asf/camel/blob/93fdb1d4/camel-core/src/test/java/org/apache/camel/impl/LogDebugBodyMaxCharsTest.java
----------------------------------------------------------------------
diff --git a/camel-core/src/test/java/org/apache/camel/impl/LogDebugBodyMaxCharsTest.java b/camel-core/src/test/java/org/apache/camel/impl/LogDebugBodyMaxCharsTest.java
index 721eb43..2ea55ce 100644
--- a/camel-core/src/test/java/org/apache/camel/impl/LogDebugBodyMaxCharsTest.java
+++ b/camel-core/src/test/java/org/apache/camel/impl/LogDebugBodyMaxCharsTest.java
@@ -29,7 +29,7 @@ public class LogDebugBodyMaxCharsTest extends ContextTestSupport {
@Override
protected void setUp() throws Exception {
super.setUp();
- context.getProperties().put(Exchange.LOG_DEBUG_BODY_MAX_CHARS, "20");
+ context.getGlobalOptions().put(Exchange.LOG_DEBUG_BODY_MAX_CHARS, "20");
}
@Override
http://git-wip-us.apache.org/repos/asf/camel/blob/93fdb1d4/camel-core/src/test/java/org/apache/camel/impl/LogDebugBodyStreamsTest.java
----------------------------------------------------------------------
diff --git a/camel-core/src/test/java/org/apache/camel/impl/LogDebugBodyStreamsTest.java b/camel-core/src/test/java/org/apache/camel/impl/LogDebugBodyStreamsTest.java
index cb0493a..96634b8 100644
--- a/camel-core/src/test/java/org/apache/camel/impl/LogDebugBodyStreamsTest.java
+++ b/camel-core/src/test/java/org/apache/camel/impl/LogDebugBodyStreamsTest.java
@@ -38,7 +38,7 @@ public class LogDebugBodyStreamsTest extends ContextTestSupport {
}
public void testLogBodyStreamStringSourceDisabled() throws Exception {
- context.getProperties().put(Exchange.LOG_DEBUG_BODY_STREAMS, "false");
+ context.getGlobalOptions().put(Exchange.LOG_DEBUG_BODY_STREAMS, "false");
StringSource body = new StringSource("<?xml version=\"1.0\"?><person><name>Claus</name></person>");
@@ -56,7 +56,7 @@ public class LogDebugBodyStreamsTest extends ContextTestSupport {
}
public void testLogBodyStreamStringSourceDisabledByDefault() throws Exception {
- context.getProperties().remove(Exchange.LOG_DEBUG_BODY_STREAMS);
+ context.getGlobalOptions().remove(Exchange.LOG_DEBUG_BODY_STREAMS);
StringSource body = new StringSource("<?xml version=\"1.0\"?><person><name>Claus</name></person>");
@@ -74,7 +74,7 @@ public class LogDebugBodyStreamsTest extends ContextTestSupport {
}
public void testLogBodyStreamStringSourceEnabled() throws Exception {
- context.getProperties().put(Exchange.LOG_DEBUG_BODY_STREAMS, "true");
+ context.getGlobalOptions().put(Exchange.LOG_DEBUG_BODY_STREAMS, "true");
StringSource body = new StringSource("<?xml version=\"1.0\"?><person><name>Claus</name></person>");
@@ -92,7 +92,7 @@ public class LogDebugBodyStreamsTest extends ContextTestSupport {
}
public void testLogBodyStreamDisabled() throws Exception {
- context.getProperties().put(Exchange.LOG_DEBUG_BODY_STREAMS, "false");
+ context.getGlobalOptions().put(Exchange.LOG_DEBUG_BODY_STREAMS, "false");
InputStream body = new ByteArrayInputStream("Hello World".getBytes());
@@ -110,7 +110,7 @@ public class LogDebugBodyStreamsTest extends ContextTestSupport {
}
public void testLogBodyStreamDisabledByDefault() throws Exception {
- context.getProperties().remove(Exchange.LOG_DEBUG_BODY_STREAMS);
+ context.getGlobalOptions().remove(Exchange.LOG_DEBUG_BODY_STREAMS);
InputStream body = new ByteArrayInputStream("Hello World".getBytes());
@@ -128,7 +128,7 @@ public class LogDebugBodyStreamsTest extends ContextTestSupport {
}
public void testLogBodyStreamEnabled() throws Exception {
- context.getProperties().put(Exchange.LOG_DEBUG_BODY_STREAMS, "true");
+ context.getGlobalOptions().put(Exchange.LOG_DEBUG_BODY_STREAMS, "true");
InputStream body = new ByteArrayInputStream("Hello World".getBytes());
http://git-wip-us.apache.org/repos/asf/camel/blob/93fdb1d4/camel-core/src/test/java/org/apache/camel/processor/DefaultExchangeFormatterTest.java
----------------------------------------------------------------------
diff --git a/camel-core/src/test/java/org/apache/camel/processor/DefaultExchangeFormatterTest.java b/camel-core/src/test/java/org/apache/camel/processor/DefaultExchangeFormatterTest.java
index 69ee665..5182948 100644
--- a/camel-core/src/test/java/org/apache/camel/processor/DefaultExchangeFormatterTest.java
+++ b/camel-core/src/test/java/org/apache/camel/processor/DefaultExchangeFormatterTest.java
@@ -68,11 +68,11 @@ public class DefaultExchangeFormatterTest {
* one of the message
*/
public void testFormatWithBodyMaxChars() {
- camelContext.getProperties().put(Exchange.LOG_DEBUG_BODY_MAX_CHARS, "7");
+ camelContext.getGlobalOptions().put(Exchange.LOG_DEBUG_BODY_MAX_CHARS, "7");
String formattedExchange = exchangeFormatter.format(exchange);
assertFalse(formattedExchange.contains("This is "));
assertTrue(formattedExchange.contains("This is"));
- camelContext.getProperties().remove(Exchange.LOG_DEBUG_BODY_MAX_CHARS);
+ camelContext.getGlobalOptions().remove(Exchange.LOG_DEBUG_BODY_MAX_CHARS);
}
@Test
@@ -81,11 +81,11 @@ public class DefaultExchangeFormatterTest {
* total message.
*/
public void testFormatWithBoth() {
- camelContext.getProperties().put(Exchange.LOG_DEBUG_BODY_MAX_CHARS, "7");
+ camelContext.getGlobalOptions().put(Exchange.LOG_DEBUG_BODY_MAX_CHARS, "7");
exchangeFormatter.setMaxChars(60);
String formattedExchange = exchangeFormatter.format(exchange);
assertEquals(60 + "Exchange[...]".length() - ", ".length(), formattedExchange.length());
assertFalse(formattedExchange.contains("This is "));
- camelContext.getProperties().remove(Exchange.LOG_DEBUG_BODY_MAX_CHARS);
+ camelContext.getGlobalOptions().remove(Exchange.LOG_DEBUG_BODY_MAX_CHARS);
}
}
http://git-wip-us.apache.org/repos/asf/camel/blob/93fdb1d4/camel-core/src/test/java/org/apache/camel/processor/LogGlobalLogNameTest.java
----------------------------------------------------------------------
diff --git a/camel-core/src/test/java/org/apache/camel/processor/LogGlobalLogNameTest.java b/camel-core/src/test/java/org/apache/camel/processor/LogGlobalLogNameTest.java
index cad1eff..2179763 100644
--- a/camel-core/src/test/java/org/apache/camel/processor/LogGlobalLogNameTest.java
+++ b/camel-core/src/test/java/org/apache/camel/processor/LogGlobalLogNameTest.java
@@ -27,7 +27,7 @@ public class LogGlobalLogNameTest extends LogProcessorTest {
@Override
protected CamelContext createCamelContext() throws Exception {
CamelContext context = super.createCamelContext();
- context.getProperties().put(Exchange.LOG_EIP_NAME, "com.foo.myapp");
+ context.getGlobalOptions().put(Exchange.LOG_EIP_NAME, "com.foo.myapp");
return context;
}
}
http://git-wip-us.apache.org/repos/asf/camel/blob/93fdb1d4/camel-core/src/test/java/org/apache/camel/processor/MessageHistoryDumpRoutingTest.java
----------------------------------------------------------------------
diff --git a/camel-core/src/test/java/org/apache/camel/processor/MessageHistoryDumpRoutingTest.java b/camel-core/src/test/java/org/apache/camel/processor/MessageHistoryDumpRoutingTest.java
index 58b3f96..81f8881 100644
--- a/camel-core/src/test/java/org/apache/camel/processor/MessageHistoryDumpRoutingTest.java
+++ b/camel-core/src/test/java/org/apache/camel/processor/MessageHistoryDumpRoutingTest.java
@@ -45,7 +45,7 @@ public class MessageHistoryDumpRoutingTest extends ContextTestSupport {
public void configure() throws Exception {
context.setMessageHistory(true);
// to test that the message history exchange gets clipped
- context.getProperties().put(Exchange.LOG_DEBUG_BODY_MAX_CHARS, "100");
+ context.getGlobalOptions().put(Exchange.LOG_DEBUG_BODY_MAX_CHARS, "100");
from("seda:start")
.to("log:foo")
http://git-wip-us.apache.org/repos/asf/camel/blob/93fdb1d4/camel-core/src/test/java/org/apache/camel/processor/StreamCachingOnlyRouteTest.java
----------------------------------------------------------------------
diff --git a/camel-core/src/test/java/org/apache/camel/processor/StreamCachingOnlyRouteTest.java b/camel-core/src/test/java/org/apache/camel/processor/StreamCachingOnlyRouteTest.java
index 8fff9b5..c5571da 100644
--- a/camel-core/src/test/java/org/apache/camel/processor/StreamCachingOnlyRouteTest.java
+++ b/camel-core/src/test/java/org/apache/camel/processor/StreamCachingOnlyRouteTest.java
@@ -44,7 +44,7 @@ public class StreamCachingOnlyRouteTest extends ContextTestSupport {
return new RouteBuilder() {
@Override
public void configure() throws Exception {
- getContext().getProperties().put("CamelCachedOutputStreamThreshold", "4096");
+ getContext().getGlobalOptions().put("CamelCachedOutputStreamThreshold", "4096");
from("direct:c").streamCaching().to("mock:c");
}
http://git-wip-us.apache.org/repos/asf/camel/blob/93fdb1d4/camel-core/src/test/java/org/apache/camel/util/ObjectHelperTest.java
----------------------------------------------------------------------
diff --git a/camel-core/src/test/java/org/apache/camel/util/ObjectHelperTest.java b/camel-core/src/test/java/org/apache/camel/util/ObjectHelperTest.java
index 2efa01e..0253eca 100644
--- a/camel-core/src/test/java/org/apache/camel/util/ObjectHelperTest.java
+++ b/camel-core/src/test/java/org/apache/camel/util/ObjectHelperTest.java
@@ -618,7 +618,7 @@ public class ObjectHelperTest extends TestCase {
public void testGetCamelContextPropertiesWithPrefix() {
CamelContext context = new DefaultCamelContext();
- Map<String, String> properties = context.getProperties();
+ Map<String, String> properties = context.getGlobalOptions();
properties.put("camel.object.helper.test1", "test1");
properties.put("camel.object.helper.test2", "test2");
properties.put("camel.object.test", "test");
http://git-wip-us.apache.org/repos/asf/camel/blob/93fdb1d4/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/AbstractCamelContextFactoryBean.java
----------------------------------------------------------------------
diff --git a/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/AbstractCamelContextFactoryBean.java b/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/AbstractCamelContextFactoryBean.java
index a5ce3f7..9014674 100644
--- a/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/AbstractCamelContextFactoryBean.java
+++ b/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/AbstractCamelContextFactoryBean.java
@@ -167,7 +167,7 @@ public abstract class AbstractCamelContextFactoryBean<T extends ModelCamelContex
// then set custom properties
if (getProperties() != null) {
- getContext().setProperties(getProperties().asMap());
+ getContext().setGlobalOptions(getProperties().asMap());
}
// and enable lazy loading of type converters if applicable
initLazyLoadTypeConverters();
http://git-wip-us.apache.org/repos/asf/camel/blob/93fdb1d4/components/camel-spring/src/test/java/org/apache/camel/spring/CamelContextAwareTest.java
----------------------------------------------------------------------
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/CamelContextAwareTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/CamelContextAwareTest.java
index bde66d8..ddc466c 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/CamelContextAwareTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/CamelContextAwareTest.java
@@ -32,7 +32,7 @@ public class CamelContextAwareTest extends SpringTestSupport {
public void testInjectionPoints() throws Exception {
assertNotNull("No CamelContext injected!", bean1.getCamelContext());
- Map<String, String> properties = bean1.getCamelContext().getProperties();
+ Map<String, String> properties = bean1.getCamelContext().getGlobalOptions();
assertNotNull("the properties should not been null", properties);
assertEquals("No properties injected", properties.size(), 1);
assertEquals("Should get the value of org.apache.camel.test", properties.get("org.apache.camel.test"), "this is a test first");
http://git-wip-us.apache.org/repos/asf/camel/blob/93fdb1d4/components/camel-spring/src/test/java/org/apache/camel/spring/config/CamelPropertiesTest.java
----------------------------------------------------------------------
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/config/CamelPropertiesTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/config/CamelPropertiesTest.java
index 04ea87e..961afba 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/config/CamelPropertiesTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/config/CamelPropertiesTest.java
@@ -27,10 +27,10 @@ public class CamelPropertiesTest extends SpringTestSupport {
}
public void testProperties() throws Exception {
- assertNotNull(context.getProperties());
- assertEquals(2, context.getProperties().size());
- assertEquals("123", context.getProperties().get("foo"));
- assertEquals("cheese", context.getProperties().get("bar"));
+ assertNotNull(context.getGlobalOptions());
+ assertEquals(2, context.getGlobalOptions().size());
+ assertEquals("123", context.getGlobalOptions().get("foo"));
+ assertEquals("cheese", context.getGlobalOptions().get("bar"));
}
}
\ No newline at end of file
[3/4] camel git commit: CAMEL-10546: Renamed few variables in
camel-core
Posted by da...@apache.org.
CAMEL-10546: Renamed few variables in camel-core
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/63252178
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/63252178
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/63252178
Branch: refs/heads/master
Commit: 63252178a48eb061af783fdc6f21dcab31868776
Parents: 93fdb1d
Author: aldettinger <al...@gmail.com>
Authored: Sun Jan 15 17:19:35 2017 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Tue Jan 17 10:11:02 2017 +0100
----------------------------------------------------------------------
.../camel/processor/DefaultExchangeFormatter.java | 6 +++---
.../java/org/apache/camel/util/MessageHelper.java | 18 +++++++++---------
.../camel/spring/CamelContextAwareTest.java | 8 ++++----
3 files changed, 16 insertions(+), 16 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/63252178/camel-core/src/main/java/org/apache/camel/processor/DefaultExchangeFormatter.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/processor/DefaultExchangeFormatter.java b/camel-core/src/main/java/org/apache/camel/processor/DefaultExchangeFormatter.java
index dfa2a1f..5cf552f 100644
--- a/camel-core/src/main/java/org/apache/camel/processor/DefaultExchangeFormatter.java
+++ b/camel-core/src/main/java/org/apache/camel/processor/DefaultExchangeFormatter.java
@@ -456,9 +456,9 @@ public class DefaultExchangeFormatter implements ExchangeFormatter {
private int getMaxChars(Message message) {
int maxChars = getMaxChars();
if (message.getExchange() != null) {
- String property = message.getExchange().getContext().getGlobalOption(Exchange.LOG_DEBUG_BODY_MAX_CHARS);
- if (property != null) {
- maxChars = message.getExchange().getContext().getTypeConverter().convertTo(Integer.class, property);
+ String globalOption = message.getExchange().getContext().getGlobalOption(Exchange.LOG_DEBUG_BODY_MAX_CHARS);
+ if (globalOption != null) {
+ maxChars = message.getExchange().getContext().getTypeConverter().convertTo(Integer.class, globalOption);
}
}
return maxChars;
http://git-wip-us.apache.org/repos/asf/camel/blob/63252178/camel-core/src/main/java/org/apache/camel/util/MessageHelper.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/util/MessageHelper.java b/camel-core/src/main/java/org/apache/camel/util/MessageHelper.java
index afb37d8..4e9de42 100644
--- a/camel-core/src/main/java/org/apache/camel/util/MessageHelper.java
+++ b/camel-core/src/main/java/org/apache/camel/util/MessageHelper.java
@@ -175,9 +175,9 @@ public final class MessageHelper {
public static String extractValueForLogging(Object value, Message message) {
boolean streams = false;
if (message.getExchange() != null) {
- String property = message.getExchange().getContext().getGlobalOption(Exchange.LOG_DEBUG_BODY_STREAMS);
- if (property != null) {
- streams = message.getExchange().getContext().getTypeConverter().convertTo(Boolean.class, message.getExchange(), property);
+ String globalOption = message.getExchange().getContext().getGlobalOption(Exchange.LOG_DEBUG_BODY_STREAMS);
+ if (globalOption != null) {
+ streams = message.getExchange().getContext().getTypeConverter().convertTo(Boolean.class, message.getExchange(), globalOption);
}
}
@@ -208,9 +208,9 @@ public final class MessageHelper {
public static String extractBodyForLogging(Message message, String prepend) {
boolean streams = false;
if (message.getExchange() != null) {
- String property = message.getExchange().getContext().getGlobalOption(Exchange.LOG_DEBUG_BODY_STREAMS);
- if (property != null) {
- streams = message.getExchange().getContext().getTypeConverter().convertTo(Boolean.class, message.getExchange(), property);
+ String globalOption = message.getExchange().getContext().getGlobalOption(Exchange.LOG_DEBUG_BODY_STREAMS);
+ if (globalOption != null) {
+ streams = message.getExchange().getContext().getTypeConverter().convertTo(Boolean.class, message.getExchange(), globalOption);
}
}
return extractBodyForLogging(message, prepend, streams, false);
@@ -234,9 +234,9 @@ public final class MessageHelper {
int maxChars = 1000;
if (message.getExchange() != null) {
- String property = message.getExchange().getContext().getGlobalOption(Exchange.LOG_DEBUG_BODY_MAX_CHARS);
- if (property != null) {
- maxChars = message.getExchange().getContext().getTypeConverter().convertTo(Integer.class, property);
+ String globalOption = message.getExchange().getContext().getGlobalOption(Exchange.LOG_DEBUG_BODY_MAX_CHARS);
+ if (globalOption != null) {
+ maxChars = message.getExchange().getContext().getTypeConverter().convertTo(Integer.class, globalOption);
}
}
http://git-wip-us.apache.org/repos/asf/camel/blob/63252178/components/camel-spring/src/test/java/org/apache/camel/spring/CamelContextAwareTest.java
----------------------------------------------------------------------
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/CamelContextAwareTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/CamelContextAwareTest.java
index ddc466c..338aefa 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/CamelContextAwareTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/CamelContextAwareTest.java
@@ -32,10 +32,10 @@ public class CamelContextAwareTest extends SpringTestSupport {
public void testInjectionPoints() throws Exception {
assertNotNull("No CamelContext injected!", bean1.getCamelContext());
- Map<String, String> properties = bean1.getCamelContext().getGlobalOptions();
- assertNotNull("the properties should not been null", properties);
- assertEquals("No properties injected", properties.size(), 1);
- assertEquals("Should get the value of org.apache.camel.test", properties.get("org.apache.camel.test"), "this is a test first");
+ Map<String, String> globalOptions = bean1.getCamelContext().getGlobalOptions();
+ assertNotNull("the properties should not been null", globalOptions);
+ assertEquals("No properties injected", globalOptions.size(), 1);
+ assertEquals("Should get the value of org.apache.camel.test", globalOptions.get("org.apache.camel.test"), "this is a test first");
}
public void testCamelTemplates() throws Exception {