You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ac...@apache.org on 2019/02/01 06:57:16 UTC
[camel] branch master updated: Fixed CS for Camel-Spring
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 59b1799 Fixed CS for Camel-Spring
59b1799 is described below
commit 59b1799fb850ded7467a05e619379765a5f19011
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Fri Feb 1 07:56:57 2019 +0100
Fixed CS for Camel-Spring
---
.../src/main/java/org/apache/camel/component/event/EventEndpoint.java | 4 ++--
.../src/main/java/org/apache/camel/spring/SpringCamelContext.java | 2 +-
.../java/org/apache/camel/spring/remoting/CamelProxyFactoryBean.java | 2 +-
.../java/org/apache/camel/spring/remoting/CamelServiceExporter.java | 2 +-
.../java/org/apache/camel/spring/CamelContextFactoryBeanTest.java | 4 ++--
.../org/apache/camel/spring/config/CustomThreadPoolFactoryTest.java | 4 ++--
.../java/org/apache/camel/spring/config/DummyErrorHandlerBuilder.java | 2 +-
.../config/SpringCamelContextCustomDefaultThreadPoolProfileTest.java | 4 ++--
.../spring/config/SpringCamelContextCustomThreadPoolProfileTest.java | 4 ++--
.../SpringCamelContextSimpleCustomDefaultThreadPoolProfileTest.java | 4 ++--
.../camel/spring/config/SpringCamelContextThreadPoolProfilesTest.java | 4 ++--
.../TransactedInterceptUsingAdviceWithSendToEndpointTest.java | 4 ++--
.../src/test/java/org/apache/camel/spring/processor/MyAggregator.java | 2 +-
.../apache/camel/spring/processor/SpringComplexBlockWithEndTest.java | 4 ++--
.../processor/scattergather/LowestQuoteAggregationStrategy.java | 2 +-
15 files changed, 24 insertions(+), 24 deletions(-)
diff --git a/components/camel-spring/src/main/java/org/apache/camel/component/event/EventEndpoint.java b/components/camel-spring/src/main/java/org/apache/camel/component/event/EventEndpoint.java
index 45a1e86..6aaaf8b 100644
--- a/components/camel-spring/src/main/java/org/apache/camel/component/event/EventEndpoint.java
+++ b/components/camel-spring/src/main/java/org/apache/camel/component/event/EventEndpoint.java
@@ -19,12 +19,12 @@ package org.apache.camel.component.event;
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
import org.apache.camel.Producer;
-import org.apache.camel.support.DefaultEndpoint;
-import org.apache.camel.support.DefaultProducer;
import org.apache.camel.processor.loadbalancer.LoadBalancer;
import org.apache.camel.processor.loadbalancer.TopicLoadBalancer;
import org.apache.camel.spi.UriEndpoint;
import org.apache.camel.spi.UriPath;
+import org.apache.camel.support.DefaultEndpoint;
+import org.apache.camel.support.DefaultProducer;
import org.apache.camel.util.ObjectHelper;
import org.springframework.beans.BeansException;
import org.springframework.context.ApplicationContext;
diff --git a/components/camel-spring/src/main/java/org/apache/camel/spring/SpringCamelContext.java b/components/camel-spring/src/main/java/org/apache/camel/spring/SpringCamelContext.java
index 0ae04f8..d8e371d 100644
--- a/components/camel-spring/src/main/java/org/apache/camel/spring/SpringCamelContext.java
+++ b/components/camel-spring/src/main/java/org/apache/camel/spring/SpringCamelContext.java
@@ -21,7 +21,6 @@ import org.apache.camel.component.bean.BeanProcessor;
import org.apache.camel.component.event.EventComponent;
import org.apache.camel.component.event.EventEndpoint;
import org.apache.camel.impl.DefaultCamelContext;
-import org.apache.camel.support.ProcessorEndpoint;
import org.apache.camel.spi.Injector;
import org.apache.camel.spi.ManagementMBeanAssembler;
import org.apache.camel.spi.ModelJAXBContextFactory;
@@ -29,6 +28,7 @@ import org.apache.camel.spi.Registry;
import org.apache.camel.spring.spi.ApplicationContextRegistry;
import org.apache.camel.spring.spi.SpringInjector;
import org.apache.camel.spring.spi.SpringManagementMBeanAssembler;
+import org.apache.camel.support.ProcessorEndpoint;
import org.apache.camel.util.StopWatch;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/components/camel-spring/src/main/java/org/apache/camel/spring/remoting/CamelProxyFactoryBean.java b/components/camel-spring/src/main/java/org/apache/camel/spring/remoting/CamelProxyFactoryBean.java
index 35e057f..1b71768 100644
--- a/components/camel-spring/src/main/java/org/apache/camel/spring/remoting/CamelProxyFactoryBean.java
+++ b/components/camel-spring/src/main/java/org/apache/camel/spring/remoting/CamelProxyFactoryBean.java
@@ -23,8 +23,8 @@ import org.apache.camel.FailedToCreateProducerException;
import org.apache.camel.Producer;
import org.apache.camel.component.bean.ProxyHelper;
import org.apache.camel.spring.util.CamelContextResolverHelper;
-import org.apache.camel.util.ObjectHelper;
import org.apache.camel.support.service.ServiceHelper;
+import org.apache.camel.util.ObjectHelper;
import org.springframework.beans.BeansException;
import org.springframework.beans.factory.DisposableBean;
import org.springframework.beans.factory.FactoryBean;
diff --git a/components/camel-spring/src/main/java/org/apache/camel/spring/remoting/CamelServiceExporter.java b/components/camel-spring/src/main/java/org/apache/camel/spring/remoting/CamelServiceExporter.java
index aa4666f..4eea698 100644
--- a/components/camel-spring/src/main/java/org/apache/camel/spring/remoting/CamelServiceExporter.java
+++ b/components/camel-spring/src/main/java/org/apache/camel/spring/remoting/CamelServiceExporter.java
@@ -24,8 +24,8 @@ import org.apache.camel.FailedToCreateConsumerException;
import org.apache.camel.component.bean.BeanProcessor;
import org.apache.camel.spring.util.CamelContextResolverHelper;
import org.apache.camel.support.CamelContextHelper;
-import org.apache.camel.util.ObjectHelper;
import org.apache.camel.support.service.ServiceHelper;
+import org.apache.camel.util.ObjectHelper;
import org.springframework.beans.BeansException;
import org.springframework.beans.factory.DisposableBean;
import org.springframework.beans.factory.FactoryBean;
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/CamelContextFactoryBeanTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/CamelContextFactoryBeanTest.java
index f28d612..07f2d02 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/CamelContextFactoryBeanTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/CamelContextFactoryBeanTest.java
@@ -21,9 +21,9 @@ import java.util.List;
import org.apache.camel.impl.DefaultModelJAXBContextFactory;
import org.apache.camel.impl.DefaultUuidGenerator;
-import org.apache.camel.support.SimpleUuidGenerator;
import org.apache.camel.spi.ModelJAXBContextFactory;
import org.apache.camel.spi.UuidGenerator;
+import org.apache.camel.support.SimpleUuidGenerator;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
@@ -99,4 +99,4 @@ public class CamelContextFactoryBeanTest extends Assert {
private static class CustomModelJAXBContextFactory extends DefaultModelJAXBContextFactory {
// Do nothing here
}
-}
\ No newline at end of file
+}
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/config/CustomThreadPoolFactoryTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/config/CustomThreadPoolFactoryTest.java
index ed73e25..d55ad64 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/config/CustomThreadPoolFactoryTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/config/CustomThreadPoolFactoryTest.java
@@ -22,8 +22,8 @@ import java.util.concurrent.ThreadFactory;
import java.util.concurrent.TimeUnit;
import org.apache.camel.CamelContext;
-import org.apache.camel.support.DefaultThreadPoolFactory;
import org.apache.camel.spring.SpringRunWithTestSupport;
+import org.apache.camel.support.DefaultThreadPoolFactory;
import org.junit.Test;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.test.context.ContextConfiguration;
@@ -65,4 +65,4 @@ public class CustomThreadPoolFactoryTest extends SpringRunWithTestSupport {
}
-}
\ No newline at end of file
+}
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/config/DummyErrorHandlerBuilder.java b/components/camel-spring/src/test/java/org/apache/camel/spring/config/DummyErrorHandlerBuilder.java
index b379db2..a51404e 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/config/DummyErrorHandlerBuilder.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/config/DummyErrorHandlerBuilder.java
@@ -20,8 +20,8 @@ import org.apache.camel.Exchange;
import org.apache.camel.Processor;
import org.apache.camel.builder.ErrorHandlerBuilder;
import org.apache.camel.builder.ErrorHandlerBuilderSupport;
-import org.apache.camel.support.processor.DelegateProcessor;
import org.apache.camel.spi.RouteContext;
+import org.apache.camel.support.processor.DelegateProcessor;
import org.springframework.beans.factory.BeanNameAware;
public class DummyErrorHandlerBuilder extends ErrorHandlerBuilderSupport implements BeanNameAware {
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/config/SpringCamelContextCustomDefaultThreadPoolProfileTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/config/SpringCamelContextCustomDefaultThreadPoolProfileTest.java
index bfcc3d1..040dc7c 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/config/SpringCamelContextCustomDefaultThreadPoolProfileTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/config/SpringCamelContextCustomDefaultThreadPoolProfileTest.java
@@ -16,10 +16,10 @@
*/
package org.apache.camel.spring.config;
-import org.apache.camel.util.concurrent.ThreadPoolRejectedPolicy;
import org.apache.camel.spi.ThreadPoolProfile;
import org.apache.camel.spring.SpringCamelContext;
import org.apache.camel.spring.SpringTestSupport;
+import org.apache.camel.util.concurrent.ThreadPoolRejectedPolicy;
import org.junit.Test;
import org.springframework.context.support.AbstractXmlApplicationContext;
import org.springframework.context.support.ClassPathXmlApplicationContext;
@@ -43,4 +43,4 @@ public class SpringCamelContextCustomDefaultThreadPoolProfileTest extends Spring
assertEquals(ThreadPoolRejectedPolicy.Abort, profile.getRejectedPolicy());
}
-}
\ No newline at end of file
+}
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/config/SpringCamelContextCustomThreadPoolProfileTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/config/SpringCamelContextCustomThreadPoolProfileTest.java
index 781ee86..0d41c96 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/config/SpringCamelContextCustomThreadPoolProfileTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/config/SpringCamelContextCustomThreadPoolProfileTest.java
@@ -17,9 +17,9 @@
package org.apache.camel.spring.config;
import org.apache.camel.CamelContext;
-import org.apache.camel.util.concurrent.ThreadPoolRejectedPolicy;
import org.apache.camel.spi.ThreadPoolProfile;
import org.apache.camel.spring.SpringTestSupport;
+import org.apache.camel.util.concurrent.ThreadPoolRejectedPolicy;
import org.junit.Test;
import org.springframework.context.support.AbstractXmlApplicationContext;
import org.springframework.context.support.ClassPathXmlApplicationContext;
@@ -42,4 +42,4 @@ public class SpringCamelContextCustomThreadPoolProfileTest extends SpringTestSup
assertEquals(ThreadPoolRejectedPolicy.Abort, profile.getRejectedPolicy());
}
-}
\ No newline at end of file
+}
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/config/SpringCamelContextSimpleCustomDefaultThreadPoolProfileTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/config/SpringCamelContextSimpleCustomDefaultThreadPoolProfileTest.java
index 81e1116..ef898d7 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/config/SpringCamelContextSimpleCustomDefaultThreadPoolProfileTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/config/SpringCamelContextSimpleCustomDefaultThreadPoolProfileTest.java
@@ -17,9 +17,9 @@
package org.apache.camel.spring.config;
import org.apache.camel.CamelContext;
-import org.apache.camel.util.concurrent.ThreadPoolRejectedPolicy;
import org.apache.camel.spi.ThreadPoolProfile;
import org.apache.camel.spring.SpringTestSupport;
+import org.apache.camel.util.concurrent.ThreadPoolRejectedPolicy;
import org.junit.Test;
import org.springframework.context.support.AbstractXmlApplicationContext;
import org.springframework.context.support.ClassPathXmlApplicationContext;
@@ -44,4 +44,4 @@ public class SpringCamelContextSimpleCustomDefaultThreadPoolProfileTest extends
assertEquals(ThreadPoolRejectedPolicy.CallerRuns, profile.getRejectedPolicy());
}
-}
\ No newline at end of file
+}
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/config/SpringCamelContextThreadPoolProfilesTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/config/SpringCamelContextThreadPoolProfilesTest.java
index eecdfe8..e4f0a2e 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/config/SpringCamelContextThreadPoolProfilesTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/config/SpringCamelContextThreadPoolProfilesTest.java
@@ -21,9 +21,9 @@ import java.util.concurrent.ThreadPoolExecutor;
import java.util.concurrent.TimeUnit;
import org.apache.camel.CamelContext;
-import org.apache.camel.util.concurrent.ThreadPoolRejectedPolicy;
import org.apache.camel.spi.ThreadPoolProfile;
import org.apache.camel.spring.SpringTestSupport;
+import org.apache.camel.util.concurrent.ThreadPoolRejectedPolicy;
import org.junit.Test;
import org.springframework.context.support.AbstractXmlApplicationContext;
import org.springframework.context.support.ClassPathXmlApplicationContext;
@@ -76,4 +76,4 @@ public class SpringCamelContextThreadPoolProfilesTest extends SpringTestSupport
assertEquals("DiscardOldest", tp.getRejectedExecutionHandler().toString());
}
-}
\ No newline at end of file
+}
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/TransactedInterceptUsingAdviceWithSendToEndpointTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/TransactedInterceptUsingAdviceWithSendToEndpointTest.java
index 7b5dd78..b85669c 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/TransactedInterceptUsingAdviceWithSendToEndpointTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/TransactedInterceptUsingAdviceWithSendToEndpointTest.java
@@ -55,7 +55,7 @@ public class TransactedInterceptUsingAdviceWithSendToEndpointTest extends Transa
}
private void addInterceptor(String routeId) throws Exception {
- RouteReifier.adviceWith(context.getRouteDefinitions().get(0), context, new AdviceWithRouteBuilder() {
+ RouteReifier.adviceWith(context.getRouteDefinitions().get(0), context, new AdviceWithRouteBuilder() {
@Override
public void configure() throws Exception {
interceptSendToEndpoint("direct:(foo|bar)")
@@ -92,4 +92,4 @@ public class TransactedInterceptUsingAdviceWithSendToEndpointTest extends Transa
};
}
-}
\ No newline at end of file
+}
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/MyAggregator.java b/components/camel-spring/src/test/java/org/apache/camel/spring/processor/MyAggregator.java
index d344fb3..91d7f45 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/MyAggregator.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/processor/MyAggregator.java
@@ -16,9 +16,9 @@
*/
package org.apache.camel.spring.processor;
+import org.apache.camel.AggregationStrategy;
import org.apache.camel.Exchange;
import org.apache.camel.Message;
-import org.apache.camel.AggregationStrategy;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringComplexBlockWithEndTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringComplexBlockWithEndTest.java
index 9f36cd9..e779b80 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringComplexBlockWithEndTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringComplexBlockWithEndTest.java
@@ -16,10 +16,10 @@
*/
package org.apache.camel.spring.processor;
+import org.apache.camel.AggregationStrategy;
import org.apache.camel.CamelContext;
import org.apache.camel.ContextTestSupport;
import org.apache.camel.Exchange;
-import org.apache.camel.AggregationStrategy;
import org.junit.Test;
import static org.apache.camel.spring.processor.SpringTestHelper.createSpringCamelContext;
@@ -77,4 +77,4 @@ public class SpringComplexBlockWithEndTest extends ContextTestSupport {
}
-}
\ No newline at end of file
+}
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/scattergather/LowestQuoteAggregationStrategy.java b/components/camel-spring/src/test/java/org/apache/camel/spring/processor/scattergather/LowestQuoteAggregationStrategy.java
index 60988c0..096b489 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/scattergather/LowestQuoteAggregationStrategy.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/processor/scattergather/LowestQuoteAggregationStrategy.java
@@ -16,8 +16,8 @@
*/
package org.apache.camel.spring.processor.scattergather;
-import org.apache.camel.Exchange;
import org.apache.camel.AggregationStrategy;
+import org.apache.camel.Exchange;
// START SNIPPET: e1
public class LowestQuoteAggregationStrategy implements AggregationStrategy {