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 d6b7bdd Fixed CS for Camel-CDI
d6b7bdd is described below
commit d6b7bdde4c94b06c9849cd626ac5d19ee2f3bf53
Author: Andrea Cosentino <anco...@gmail.com>
AuthorDate: Tue Aug 6 16:51:18 2019 +0200
Fixed CS for Camel-CDI
---
.../camel/cdi/xml/CamelContextFactoryBean.java | 49 +++++++++++-----------
.../endpoint/dsl/FileEndpointBuilderFactory.java | 5 ++-
2 files changed, 27 insertions(+), 27 deletions(-)
diff --git
a/components/camel-cdi/src/main/java/org/apache/camel/cdi/xml/CamelContextFactoryBean.java
b/components/camel-cdi/src/main/java/org/apache/camel/cdi/xml/CamelContextFactoryBean.java
index 6c189d1..4c00cb1 100644
---
a/components/camel-cdi/src/main/java/org/apache/camel/cdi/xml/CamelContextFactoryBean.java
+++
b/components/camel-cdi/src/main/java/org/apache/camel/cdi/xml/CamelContextFactoryBean.java
@@ -105,7 +105,7 @@ public class CamelContextFactoryBean extends
AbstractCamelContextFactoryBean<Def
@XmlAttribute
private String useMDCLogging;
-
+
@XmlAttribute
private String mdcLoggingKeysPattern;
@@ -166,12 +166,9 @@ public class CamelContextFactoryBean extends
AbstractCamelContextFactoryBean<Def
@XmlElement(name = "jmxAgent", type = CamelJMXAgentDefinition.class)
private CamelJMXAgentDefinition camelJMXAgent;
- @XmlElements({
- @XmlElement(name = "consumerTemplate", type =
ConsumerTemplateFactoryBean.class),
- @XmlElement(name = "redeliveryPolicyProfile", type =
RedeliveryPolicyFactoryBean.class),
- @XmlElement(name = "template", type =
ProducerTemplateFactoryBean.class),
- @XmlElement(name = "threadPool", type = ThreadPoolFactoryBean.class),
- })
+ @XmlElements({@XmlElement(name = "consumerTemplate", type =
ConsumerTemplateFactoryBean.class),
+ @XmlElement(name = "redeliveryPolicyProfile", type =
RedeliveryPolicyFactoryBean.class), @XmlElement(name = "template", type =
ProducerTemplateFactoryBean.class),
+ @XmlElement(name = "threadPool", type =
ThreadPoolFactoryBean.class)})
private List<AbstractCamelFactoryBean<?>> beansFactory;
@XmlTransient
@@ -276,7 +273,7 @@ public class CamelContextFactoryBean extends
AbstractCamelContextFactoryBean<Def
return null;
}
- return (S) manager.getReference(bean, clazz,
manager.createCreationalContext(bean));
+ return (S)manager.getReference(bean, clazz,
manager.createCreationalContext(bean));
}
@Override
@@ -284,7 +281,8 @@ public class CamelContextFactoryBean extends
AbstractCamelContextFactoryBean<Def
// add filter to class resolver which then will filter
getContext().getPackageScanClassResolver().addFilter(filter);
- PackageScanRouteBuilderFinder finder = new
PackageScanRouteBuilderFinder(getContext(), packages,
getContextClassLoaderOnStart(), getContext().getPackageScanClassResolver());
+ PackageScanRouteBuilderFinder finder = new
PackageScanRouteBuilderFinder(getContext(), packages,
getContextClassLoaderOnStart(),
+
getContext().getPackageScanClassResolver());
finder.appendBuilders(builders);
// and remove the filter
@@ -476,11 +474,12 @@ public class CamelContextFactoryBean extends
AbstractCamelContextFactoryBean<Def
/**
* Sets the package names to be recursively searched for Java classes which
- * extend {@link org.apache.camel.builder.RouteBuilder} to be auto-wired
up to the
- * {@link CamelContext} as a route. Note that classes are excluded if
+ * extend {@link org.apache.camel.builder.RouteBuilder} to be auto-wired up
+ * to the {@link CamelContext} as a route. Note that classes are excluded
if
* they are specifically configured in the deployment.
* <p/>
- * A more advanced configuration can be done using {@link
#setPackageScan(org.apache.camel.model.PackageScanDefinition)}
+ * A more advanced configuration can be done using
+ * {@link #setPackageScan(org.apache.camel.model.PackageScanDefinition)}
*
* @param packages the package names which are recursively searched
* @see #setPackageScan(org.apache.camel.model.PackageScanDefinition)
@@ -512,9 +511,9 @@ public class CamelContextFactoryBean extends
AbstractCamelContextFactoryBean<Def
}
/**
- * Sets the context scanning information.
- * Context scanning allows for the automatic discovery of Camel routes
runtime for inclusion
- * e.g. {@link org.apache.camel.builder.RouteBuilder} implementations
+ * Sets the context scanning information. Context scanning allows for the
+ * automatic discovery of Camel routes runtime for inclusion e.g.
+ * {@link org.apache.camel.builder.RouteBuilder} implementations
*
* @param contextScan the context scan
*/
@@ -878,16 +877,16 @@ public class CamelContextFactoryBean extends
AbstractCamelContextFactoryBean<Def
this.errorHandlers = errorHandlers;
}
- public String getMdcLoggingKeysPattern() {
- return mdcLoggingKeysPattern;
- }
+ public String getMdcLoggingKeysPattern() {
+ return mdcLoggingKeysPattern;
+ }
- public void setMdcLoggingKeysPattern(String mdcLoggingKeysPattern) {
- this.mdcLoggingKeysPattern = mdcLoggingKeysPattern;
- }
+ public void setMdcLoggingKeysPattern(String mdcLoggingKeysPattern) {
+ this.mdcLoggingKeysPattern = mdcLoggingKeysPattern;
+ }
- @Override
- public String getMDCLoggingKeysPattern() {
- return mdcLoggingKeysPattern;
- }
+ @Override
+ public String getMDCLoggingKeysPattern() {
+ return mdcLoggingKeysPattern;
+ }
}
diff --git
a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/FileEndpointBuilderFactory.java
b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/FileEndpointBuilderFactory.java
index 1eaec3c..33f9e95 100644
---
a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/FileEndpointBuilderFactory.java
+++
b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/FileEndpointBuilderFactory.java
@@ -2349,7 +2349,8 @@ public interface FileEndpointBuilderFactory {
* Used to append characters (text) after writing files. This can for
* example be used to add new lines or other separators when writing
and
* appending to existing files. To specify new-line (
- * or
) or tab ( ) characters then escape with an extra slash, eg \n.
+ * or
+) or tab ( ) characters then escape with an extra slash, eg \n.
*
* The option is a: <code>java.lang.String</code> type.
*
@@ -3299,4 +3300,4 @@ public interface FileEndpointBuilderFactory {
}
return new FileEndpointBuilderImpl(path);
}
-}
\ No newline at end of file
+}
