This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/master by this push:
new 441c086 Fixed Build
441c086 is described below
commit 441c0861dd7ff70d68891d301c2fceca12f7941f
Author: Andrea Cosentino <anco...@gmail.com>
AuthorDate: Thu Jan 23 17:14:40 2020 +0100
Fixed Build
---
.../camel/blueprint/CamelContextFactoryBean.java | 64 +++++++++++-----------
1 file changed, 32 insertions(+), 32 deletions(-)
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 43c9fa3..2ac32e6 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
@@ -79,10 +79,10 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/**
- * A bean to create and initialize a {@link BlueprintCamelContext}
- * and install routes either explicitly configured in
- * Blueprint XML or found by searching the classpath for Java classes which
extend
- * {@link RouteBuilder} using the nested {@link #setPackages(String[])}.
+ * A bean to create and initialize a {@link BlueprintCamelContext} and install
+ * routes either explicitly configured in Blueprint XML or found by searching
+ * the classpath for Java classes which extend {@link RouteBuilder} using the
+ * nested {@link #setPackages(String[])}.
*/
@XmlRootElement(name = "camelContext")
@XmlAccessorType(XmlAccessType.FIELD)
@@ -159,15 +159,12 @@ public class CamelContextFactoryBean extends
AbstractCamelContextFactoryBean<Blu
private CamelJMXAgentDefinition camelJMXAgent;
@XmlElement(name = "streamCaching", type =
CamelStreamCachingStrategyDefinition.class)
private CamelStreamCachingStrategyDefinition camelStreamCachingStrategy;
- @XmlElements({
- @XmlElement(name = "template", type =
CamelProducerTemplateFactoryBean.class),
- @XmlElement(name = "fluentTemplate", type =
CamelFluentProducerTemplateFactoryBean.class),
- @XmlElement(name = "consumerTemplate", type =
CamelConsumerTemplateFactoryBean.class),
- @XmlElement(name = "proxy", type = CamelProxyFactoryBean.class),
- @XmlElement(name = "errorHandler", type =
CamelErrorHandlerFactoryBean.class)})
+ @XmlElements({@XmlElement(name = "template", type =
CamelProducerTemplateFactoryBean.class),
+ @XmlElement(name = "fluentTemplate", type =
CamelFluentProducerTemplateFactoryBean.class),
+ @XmlElement(name = "consumerTemplate", type =
CamelConsumerTemplateFactoryBean.class), @XmlElement(name = "proxy", type =
CamelProxyFactoryBean.class),
+ @XmlElement(name = "errorHandler", type =
CamelErrorHandlerFactoryBean.class)})
private List<AbstractCamelFactoryBean<?>> beansFactory;
- @XmlElements({
- @XmlElement(name = "export", type =
CamelServiceExporterDefinition.class) })
+ @XmlElements({@XmlElement(name = "export", type =
CamelServiceExporterDefinition.class)})
private List<?> beans;
@XmlElement(name = "defaultServiceCallConfiguration")
private ServiceCallConfigurationDefinition defaultServiceCallConfiguration;
@@ -278,15 +275,16 @@ public class CamelContextFactoryBean extends
AbstractCamelContextFactoryBean<Blu
protected void initPropertyPlaceholder() throws Exception {
super.initPropertyPlaceholder();
- // if blueprint property resolver is enabled on CamelContext then
bridge PropertiesComponent to blueprint
+ // if blueprint property resolver is enabled on CamelContext then
bridge
+ // PropertiesComponent to blueprint
if (isUseBlueprintPropertyResolver()) {
// lookup existing configured properties component
- PropertiesComponent pc = (PropertiesComponent)
getContext().getPropertiesComponent();
+ PropertiesComponent pc =
(PropertiesComponent)getContext().getPropertiesComponent();
// any extra properties
ServiceReference<?> ref =
bundleContext.getServiceReference(PropertiesComponent.OVERRIDE_PROPERTIES);
if (ref != null) {
- Properties extra = (Properties) bundleContext.getService(ref);
+ Properties extra = (Properties)bundleContext.getService(ref);
if (extra != null) {
pc.setOverrideProperties(extra);
}
@@ -301,7 +299,9 @@ public class CamelContextFactoryBean extends
AbstractCamelContextFactoryBean<Blu
}
}
if (ids.isEmpty()) {
- // no blueprint locations has been set, so auto-detect the
blueprint property placeholders to use (convention over configuration)
+ // no blueprint locations has been set, so auto-detect the
+ // blueprint property placeholders to use (convention over
+ // configuration)
ids = lookupPropertyPlaceholderIds();
}
pc.addPropertiesSource(new
BlueprintPropertiesSource(blueprintContainer, ids));
@@ -318,10 +318,10 @@ public class CamelContextFactoryBean extends
AbstractCamelContextFactoryBean<Blu
List<String> ids = new ArrayList<>();
for (Object componentId : blueprintContainer.getComponentIds()) {
- String id = (String) componentId;
+ String id = (String)componentId;
ComponentMetadata meta =
blueprintContainer.getComponentMetadata(id);
if (meta instanceof ExtendedBeanMetadata) {
- Class<?> clazz = ((ExtendedBeanMetadata)
meta).getRuntimeClass();
+ Class<?> clazz =
((ExtendedBeanMetadata)meta).getRuntimeClass();
if (clazz != null &&
PropertyPlaceholderExt.class.isAssignableFrom(clazz)) {
ids.add(id);
}
@@ -344,8 +344,7 @@ public class CamelContextFactoryBean extends
AbstractCamelContextFactoryBean<Blu
// add filter to class resolver which then will filter
getContext().getPackageScanClassResolver().addFilter(filter);
ClassLoader classLoader = new
BundleDelegatingClassLoader(bundleContext.getBundle());
- PackageScanRouteBuilderFinder finder = new
PackageScanRouteBuilderFinder(getContext(), packages, classLoader,
-
getContext().getPackageScanClassResolver());
+ PackageScanRouteBuilderFinder finder = new
PackageScanRouteBuilderFinder(getContext(), packages, classLoader,
getContext().getPackageScanClassResolver());
finder.appendBuilders(builders);
// and remove the filter
@@ -361,7 +360,8 @@ public class CamelContextFactoryBean extends
AbstractCamelContextFactoryBean<Blu
@Override
public void afterPropertiesSet() throws Exception {
super.afterPropertiesSet();
- // setup the application context classloader with the bundle
delegating classloader
+ // setup the application context classloader with the bundle delegating
+ // classloader
ClassLoader cl = new
BundleDelegatingClassLoader(bundleContext.getBundle());
LOG.debug("Set the application context classloader to: {}", cl);
getContext().setApplicationContextClassLoader(cl);
@@ -372,7 +372,8 @@ public class CamelContextFactoryBean extends
AbstractCamelContextFactoryBean<Blu
getClass().getClassLoader().loadClass("org.osgi.service.event.EventAdmin");
getContext().getManagementStrategy().addEventNotifier(new
OsgiEventAdminNotifier(bundleContext));
} catch (Throwable t) {
- // Ignore, if the EventAdmin package is not available, just don't
use it
+ // Ignore, if the EventAdmin package is not available, just don't
+ // use it
LOG.debug("EventAdmin package is not available, just don't use
it");
}
// ensure routes is setup
@@ -496,15 +497,6 @@ public class CamelContextFactoryBean extends
AbstractCamelContextFactoryBean<Blu
}
@Override
- public Boolean getInflightRepositoryExchangeEnabled() {
- return inflightRepositoryBrowseEnabled;
- }
-
- public void setInflightRepositoryBrowseEnabled(Boolean
inflightRepositoryBrowseEnabled) {
- this.inflightRepositoryBrowseEnabled = inflightRepositoryBrowseEnabled;
- }
-
- @Override
public TypeConverterExists getTypeConverterExists() {
return typeConverterExists;
}
@@ -939,7 +931,7 @@ public class CamelContextFactoryBean extends
AbstractCamelContextFactoryBean<Blu
public boolean isImplicitId() {
return implicitId;
}
-
+
public void setImplicitId(boolean flag) {
implicitId = flag;
}
@@ -957,4 +949,12 @@ public class CamelContextFactoryBean extends
AbstractCamelContextFactoryBean<Blu
return useBlueprintPropertyResolver == null ||
useBlueprintPropertyResolver.booleanValue();
}
+ @Override
+ public Boolean getInflightRepositoryBrowseEnabled() {
+ return inflightRepositoryBrowseEnabled;
+ }
+
+ public void setInflightRepositoryBrowseEnabled(Boolean
inflightRepositoryBrowseEnabled) {
+ this.inflightRepositoryBrowseEnabled = inflightRepositoryBrowseEnabled;
+ }
}
