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 18:51:54 UTC
[08/11] camel git commit: CAMEL-10546: Added globalOptions to spring
and blueprint schema, globalOptions merge/override properties
CAMEL-10546: Added globalOptions to spring and blueprint schema, globalOptions merge/override properties
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/6b6ba1c3
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/6b6ba1c3
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/6b6ba1c3
Branch: refs/heads/master
Commit: 6b6ba1c31d681ef3456981c2a1d6a31b5cd4928f
Parents: 4d67aee
Author: aldettinger <al...@gmail.com>
Authored: Thu Jan 19 19:28:46 2017 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Sun Jan 22 18:06:43 2017 +0100
----------------------------------------------------------------------
.../blueprint/CamelContextFactoryBean.java | 15 +++++++++++++++
.../xml/AbstractCamelContextFactoryBean.java | 12 +++++++++++-
.../camel/spring/CamelContextFactoryBean.java | 20 +++++++++++++++++++-
3 files changed, 45 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/6b6ba1c3/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/CamelContextFactoryBean.java
----------------------------------------------------------------------
diff --git a/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/CamelContextFactoryBean.java b/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/CamelContextFactoryBean.java
index 0261638..cf8a9e1 100644
--- a/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/CamelContextFactoryBean.java
+++ b/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/CamelContextFactoryBean.java
@@ -45,6 +45,7 @@ import org.apache.camel.core.xml.CamelPropertyPlaceholderDefinition;
import org.apache.camel.core.xml.CamelServiceExporterDefinition;
import org.apache.camel.core.xml.CamelStreamCachingStrategyDefinition;
import org.apache.camel.model.ContextScanDefinition;
+import org.apache.camel.model.GlobalOptionsDefinition;
import org.apache.camel.model.HystrixConfigurationDefinition;
import org.apache.camel.model.InterceptDefinition;
import org.apache.camel.model.InterceptFromDefinition;
@@ -129,8 +130,11 @@ public class CamelContextFactoryBean extends AbstractCamelContextFactoryBean<Blu
private TypeConverterExists typeConverterExists;
@XmlAttribute
private LoggingLevel typeConverterExistsLoggingLevel;
+ @Deprecated
@XmlElement(name = "properties")
private PropertiesDefinition properties;
+ @XmlElement(name = "globalOptions")
+ private GlobalOptionsDefinition globalOptions;
@XmlElement(name = "propertyPlaceholder", type = CamelPropertyPlaceholderDefinition.class)
private CamelPropertyPlaceholderDefinition camelPropertyPlaceholder;
@XmlElement(name = "package")
@@ -563,14 +567,25 @@ public class CamelContextFactoryBean extends AbstractCamelContextFactoryBean<Blu
this.errorHandlerRef = errorHandlerRef;
}
+ @Deprecated
public PropertiesDefinition getProperties() {
return properties;
}
+ @Override
+ public GlobalOptionsDefinition getGlobalOptions() {
+ return globalOptions;
+ }
+
+ @Deprecated
public void setProperties(PropertiesDefinition properties) {
this.properties = properties;
}
+ public void setGlobalOptions(GlobalOptionsDefinition globalOptions) {
+ this.globalOptions = globalOptions;
+ }
+
public String[] getPackages() {
return packages;
}
http://git-wip-us.apache.org/repos/asf/camel/blob/6b6ba1c3/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 9014674..fb2dd93 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
@@ -17,6 +17,7 @@
package org.apache.camel.core.xml;
import java.util.ArrayList;
+import java.util.HashMap;
import java.util.HashSet;
import java.util.Iterator;
import java.util.List;
@@ -50,6 +51,7 @@ import org.apache.camel.management.DefaultManagementStrategy;
import org.apache.camel.management.ManagedManagementStrategy;
import org.apache.camel.model.ContextScanDefinition;
import org.apache.camel.model.FromDefinition;
+import org.apache.camel.model.GlobalOptionsDefinition;
import org.apache.camel.model.IdentifiedType;
import org.apache.camel.model.InterceptDefinition;
import org.apache.camel.model.InterceptFromDefinition;
@@ -166,9 +168,15 @@ public abstract class AbstractCamelContextFactoryBean<T extends ModelCamelContex
}
// then set custom properties
+ Map<String, String> mergedOptions = new HashMap<>();
if (getProperties() != null) {
- getContext().setGlobalOptions(getProperties().asMap());
+ mergedOptions.putAll(getProperties().asMap());
}
+ if (getGlobalOptions() != null) {
+ mergedOptions.putAll(getGlobalOptions().asMap());
+ }
+ getContext().setGlobalOptions(mergedOptions);
+
// and enable lazy loading of type converters if applicable
initLazyLoadTypeConverters();
@@ -696,7 +704,9 @@ public abstract class AbstractCamelContextFactoryBean<T extends ModelCamelContex
public abstract List<InterceptSendToEndpointDefinition> getInterceptSendToEndpoints();
+ @Deprecated
public abstract PropertiesDefinition getProperties();
+ public abstract GlobalOptionsDefinition getGlobalOptions();
public abstract String[] getPackages();
http://git-wip-us.apache.org/repos/asf/camel/blob/6b6ba1c3/components/camel-spring/src/main/java/org/apache/camel/spring/CamelContextFactoryBean.java
----------------------------------------------------------------------
diff --git a/components/camel-spring/src/main/java/org/apache/camel/spring/CamelContextFactoryBean.java b/components/camel-spring/src/main/java/org/apache/camel/spring/CamelContextFactoryBean.java
index 7861c6b..1380a5d 100644
--- a/components/camel-spring/src/main/java/org/apache/camel/spring/CamelContextFactoryBean.java
+++ b/components/camel-spring/src/main/java/org/apache/camel/spring/CamelContextFactoryBean.java
@@ -44,6 +44,7 @@ import org.apache.camel.core.xml.CamelProxyFactoryDefinition;
import org.apache.camel.core.xml.CamelServiceExporterDefinition;
import org.apache.camel.core.xml.CamelStreamCachingStrategyDefinition;
import org.apache.camel.model.ContextScanDefinition;
+import org.apache.camel.model.GlobalOptionsDefinition;
import org.apache.camel.model.HystrixConfigurationDefinition;
import org.apache.camel.model.InterceptDefinition;
import org.apache.camel.model.InterceptFromDefinition;
@@ -138,8 +139,11 @@ public class CamelContextFactoryBean extends AbstractCamelContextFactoryBean<Spr
private TypeConverterExists typeConverterExists;
@XmlAttribute @Metadata(defaultValue = "WARN")
private LoggingLevel typeConverterExistsLoggingLevel;
+ @Deprecated
@XmlElement(name = "properties")
private PropertiesDefinition properties;
+ @XmlElement(name = "globalOptions")
+ private GlobalOptionsDefinition globalOptions;
@XmlElement(name = "propertyPlaceholder", type = CamelPropertyPlaceholderDefinition.class)
private CamelPropertyPlaceholderDefinition camelPropertyPlaceholder;
@XmlElement(name = "package")
@@ -493,17 +497,31 @@ public class CamelContextFactoryBean extends AbstractCamelContextFactoryBean<Spr
this.interceptSendToEndpoints = interceptSendToEndpoints;
}
+ @Deprecated
public PropertiesDefinition getProperties() {
return properties;
}
+ @Override
+ public GlobalOptionsDefinition getGlobalOptions() {
+ return globalOptions;
+ }
+
/**
- * Configuration of CamelContext properties such as limit of debug logging and other general options.
+ * Configuration of CamelContext properties such as limit of debug logging
+ * and other general options.
+ *
+ * @deprecated Use {@link GlobalOptionsDefinition} instead.
*/
+ @Deprecated
public void setProperties(PropertiesDefinition properties) {
this.properties = properties;
}
+ public void setGlobalOptions(GlobalOptionsDefinition globalOptions) {
+ this.globalOptions = globalOptions;
+ }
+
public String[] getPackages() {
return packages;
}