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 186034e Fixed CS for Camel-CDI 186034e is described below commit 186034e402b31eb2722f6dbf58c79b49bb56c3fd Author: Andrea Cosentino <anco...@gmail.com> AuthorDate: Tue Feb 5 10:25:43 2019 +0100 Fixed CS for Camel-CDI --- .../java/org/apache/camel/cdi/CamelContextProducer.java | 2 +- .../main/java/org/apache/camel/cdi/XmlCdiBeanFactory.java | 13 +++++++------ .../main/java/org/apache/camel/cdi/XmlProxyFactoryBean.java | 2 +- .../java/org/apache/camel/cdi/XmlServiceExporterBean.java | 2 +- .../camel/cdi/transaction/TransactionErrorHandler.java | 4 ++-- 5 files changed, 12 insertions(+), 11 deletions(-) diff --git a/components/camel-cdi/src/main/java/org/apache/camel/cdi/CamelContextProducer.java b/components/camel-cdi/src/main/java/org/apache/camel/cdi/CamelContextProducer.java index 30bb73e..0308f67 100644 --- a/components/camel-cdi/src/main/java/org/apache/camel/cdi/CamelContextProducer.java +++ b/components/camel-cdi/src/main/java/org/apache/camel/cdi/CamelContextProducer.java @@ -39,12 +39,12 @@ import org.apache.camel.spi.CamelContextNameStrategy; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import static org.apache.camel.RuntimeCamelException.wrapRuntimeCamelException; import static org.apache.camel.cdi.AnyLiteral.ANY; import static org.apache.camel.cdi.CdiSpiHelper.createCamelContextWithTCCL; import static org.apache.camel.cdi.CdiSpiHelper.getRawType; import static org.apache.camel.cdi.CdiSpiHelper.isAnnotationType; import static org.apache.camel.cdi.DefaultLiteral.DEFAULT; -import static org.apache.camel.RuntimeCamelException.wrapRuntimeCamelException; final class CamelContextProducer<T extends CamelContext> extends DelegateProducer<T> { diff --git a/components/camel-cdi/src/main/java/org/apache/camel/cdi/XmlCdiBeanFactory.java b/components/camel-cdi/src/main/java/org/apache/camel/cdi/XmlCdiBeanFactory.java index 291f1ab..92bfa78 100644 --- a/components/camel-cdi/src/main/java/org/apache/camel/cdi/XmlCdiBeanFactory.java +++ b/components/camel-cdi/src/main/java/org/apache/camel/cdi/XmlCdiBeanFactory.java @@ -27,6 +27,13 @@ import java.util.Objects; import java.util.Set; import java.util.stream.Stream; +import static java.lang.String.format; +import static java.util.Collections.addAll; +import static java.util.Collections.emptySet; +import static java.util.Collections.singleton; +import static java.util.Objects.requireNonNull; +import static java.util.stream.Collectors.toSet; + import javax.enterprise.inject.CreationException; import javax.enterprise.inject.spi.AnnotatedType; import javax.enterprise.inject.spi.Bean; @@ -53,12 +60,6 @@ import org.apache.camel.model.rest.RestDefinition; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import static java.lang.String.format; -import static java.util.Collections.addAll; -import static java.util.Collections.emptySet; -import static java.util.Collections.singleton; -import static java.util.Objects.requireNonNull; -import static java.util.stream.Collectors.toSet; import static org.apache.camel.cdi.AnyLiteral.ANY; import static org.apache.camel.cdi.ApplicationScopedLiteral.APPLICATION_SCOPED; import static org.apache.camel.cdi.CdiSpiHelper.createCamelContextWithTCCL; diff --git a/components/camel-cdi/src/main/java/org/apache/camel/cdi/XmlProxyFactoryBean.java b/components/camel-cdi/src/main/java/org/apache/camel/cdi/XmlProxyFactoryBean.java index d406f32..9f2c4f5 100644 --- a/components/camel-cdi/src/main/java/org/apache/camel/cdi/XmlProxyFactoryBean.java +++ b/components/camel-cdi/src/main/java/org/apache/camel/cdi/XmlProxyFactoryBean.java @@ -33,8 +33,8 @@ import org.apache.camel.core.xml.CamelProxyFactoryDefinition; import static org.apache.camel.cdi.BeanManagerHelper.getReference; import static org.apache.camel.cdi.BeanManagerHelper.getReferenceByName; import static org.apache.camel.component.bean.ProxyHelper.createProxy; -import static org.apache.camel.util.ObjectHelper.isNotEmpty; import static org.apache.camel.support.service.ServiceHelper.startService; +import static org.apache.camel.util.ObjectHelper.isNotEmpty; final class XmlProxyFactoryBean<T> extends SyntheticBean<T> { diff --git a/components/camel-cdi/src/main/java/org/apache/camel/cdi/XmlServiceExporterBean.java b/components/camel-cdi/src/main/java/org/apache/camel/cdi/XmlServiceExporterBean.java index a0354ba..a8100b6 100644 --- a/components/camel-cdi/src/main/java/org/apache/camel/cdi/XmlServiceExporterBean.java +++ b/components/camel-cdi/src/main/java/org/apache/camel/cdi/XmlServiceExporterBean.java @@ -34,8 +34,8 @@ import org.apache.camel.core.xml.CamelServiceExporterDefinition; import static org.apache.camel.cdi.BeanManagerHelper.getReference; import static org.apache.camel.cdi.BeanManagerHelper.getReferenceByName; import static org.apache.camel.support.CamelContextHelper.getMandatoryEndpoint; -import static org.apache.camel.util.ObjectHelper.isNotEmpty; import static org.apache.camel.support.service.ServiceHelper.startService; +import static org.apache.camel.util.ObjectHelper.isNotEmpty; final class XmlServiceExporterBean<T> extends SyntheticBean<T> { diff --git a/components/camel-cdi/src/main/java/org/apache/camel/cdi/transaction/TransactionErrorHandler.java b/components/camel-cdi/src/main/java/org/apache/camel/cdi/transaction/TransactionErrorHandler.java index 7067ae3..46929b4 100644 --- a/components/camel-cdi/src/main/java/org/apache/camel/cdi/transaction/TransactionErrorHandler.java +++ b/components/camel-cdi/src/main/java/org/apache/camel/cdi/transaction/TransactionErrorHandler.java @@ -31,13 +31,13 @@ import org.apache.camel.LoggingLevel; import org.apache.camel.Navigate; import org.apache.camel.Processor; import org.apache.camel.RuntimeCamelException; -import org.apache.camel.support.AsyncCallbackToCompletableFutureAdapter; import org.apache.camel.processor.ErrorHandlerSupport; import org.apache.camel.processor.exceptionpolicy.ExceptionPolicyStrategy; import org.apache.camel.spi.ShutdownPrepared; +import org.apache.camel.support.AsyncCallbackToCompletableFutureAdapter; import org.apache.camel.support.ExchangeHelper; -import org.apache.camel.util.ObjectHelper; import org.apache.camel.support.service.ServiceHelper; +import org.apache.camel.util.ObjectHelper; /** * Does transactional execution according given policy. This class is based on