fixed some more CS errors
Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/f0e3e201 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/f0e3e201 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/f0e3e201 Branch: refs/remotes/origin/camel-2.13.x Commit: f0e3e2015c7a5297b19e741f11c9fb9753bae5ba Parents: f424d82 Author: Christian Mueller <cmuel...@apache.org> Authored: Thu Oct 16 10:33:13 2014 +0200 Committer: Christian Mueller <cmuel...@apache.org> Committed: Thu Oct 16 10:33:13 2014 +0200 ---------------------------------------------------------------------- .../camel/component/sjms/SjmsConsumer.java | 2 +- .../camel/component/sjms/SjmsProducer.java | 2 +- .../sjms/threadpool/ThreadPoolTest.java | 131 ++++++++++--------- .../log/CustomExchangeFormatterTest.java | 8 +- 4 files changed, 73 insertions(+), 70 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/f0e3e201/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/SjmsConsumer.java ---------------------------------------------------------------------- diff --git a/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/SjmsConsumer.java b/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/SjmsConsumer.java index 4ae566d..017acbe 100644 --- a/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/SjmsConsumer.java +++ b/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/SjmsConsumer.java @@ -157,7 +157,7 @@ public class SjmsConsumer extends DefaultConsumer { consumers.drainPool(); consumers = null; } - if(this.executor!=null){ + if (this.executor != null) { getEndpoint().getCamelContext().getExecutorServiceManager().shutdownGraceful(this.executor); } } http://git-wip-us.apache.org/repos/asf/camel/blob/f0e3e201/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/SjmsProducer.java ---------------------------------------------------------------------- diff --git a/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/SjmsProducer.java b/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/SjmsProducer.java index 582d657..8e9e878 100644 --- a/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/SjmsProducer.java +++ b/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/SjmsProducer.java @@ -146,7 +146,7 @@ public abstract class SjmsProducer extends DefaultAsyncProducer { getProducers().drainPool(); setProducers(null); } - if(this.executor!=null){ + if (this.executor != null) { getEndpoint().getCamelContext().getExecutorServiceManager().shutdownGraceful(this.executor); } } http://git-wip-us.apache.org/repos/asf/camel/blob/f0e3e201/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/threadpool/ThreadPoolTest.java ---------------------------------------------------------------------- diff --git a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/threadpool/ThreadPoolTest.java b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/threadpool/ThreadPoolTest.java index 1bff29e..3c67133 100644 --- a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/threadpool/ThreadPoolTest.java +++ b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/threadpool/ThreadPoolTest.java @@ -36,77 +36,80 @@ import org.slf4j.LoggerFactory; */ public class ThreadPoolTest extends JmsTestSupport { - private static final Logger LOGGER = LoggerFactory.getLogger(ThreadPoolTest.class); - private static final String FROM_ROUTE = "from"; - private static final String TO_ROUTE = "to"; + private static final Logger LOGGER = LoggerFactory.getLogger(ThreadPoolTest.class); + private static final String FROM_ROUTE = "from"; + private static final String TO_ROUTE = "to"; - @Override - protected boolean useJmx() { - return true; - } + @Override + protected boolean useJmx() { + return true; + } - @Override - protected RouteBuilder createRouteBuilder() throws Exception { - return new RouteBuilder() { - @Override - public void configure() throws Exception { - from("direct:start").to("sjms:queue:foo").routeId(FROM_ROUTE); - from("sjms:queue:foo").to("log:test.log.1?showBody=true").routeId(TO_ROUTE); - } - }; - } + @Override + protected RouteBuilder createRouteBuilder() throws Exception { + return new RouteBuilder() { + @Override + public void configure() throws Exception { + from("direct:start").to("sjms:queue:foo").routeId(FROM_ROUTE); + from("sjms:queue:foo").to("log:test.log.1?showBody=true").routeId(TO_ROUTE); + } + }; + } - /** - * Test that only 2 thread pools are created on start - * - * @throws Exception - */ - @Test - public void testContextStart() throws Exception { - assertProducerThreadPoolCount(1); - assertConsumerThreadPoolCount(1); - } + /** + * Test that only 2 thread pools are created on start + * + * @throws Exception + */ + @Test + public void testContextStart() throws Exception { + assertProducerThreadPoolCount(1); + assertConsumerThreadPoolCount(1); + } - /** - * Test that ThreadPool is removed when producer is removed - * @throws Exception - */ - @Test - public void testProducerThreadThreadPoolRemoved() throws Exception { - context.stopRoute(FROM_ROUTE); - assertProducerThreadPoolCount(0); - } + /** + * Test that ThreadPool is removed when producer is removed + * + * @throws Exception + */ + @Test + public void testProducerThreadThreadPoolRemoved() throws Exception { + context.stopRoute(FROM_ROUTE); + assertProducerThreadPoolCount(0); + } - /** - * Test that ThreadPool is removed when consumer is removed - * @throws Exception - */ - @Test - public void testConsumerThreadThreadPoolRemoved() throws Exception { - context.stopRoute(TO_ROUTE); - assertConsumerThreadPoolCount(0); - } + /** + * Test that ThreadPool is removed when consumer is removed + * + * @throws Exception + */ + @Test + public void testConsumerThreadThreadPoolRemoved() throws Exception { + context.stopRoute(TO_ROUTE); + assertConsumerThreadPoolCount(0); + } - private void assertProducerThreadPoolCount(final int count) throws Exception { - assertEquals(count, getMbeanCount("\"InOnlyProducer")); - } + private void assertProducerThreadPoolCount(final int count) throws Exception { + assertEquals(count, getMbeanCount("\"InOnlyProducer")); + } - private void assertConsumerThreadPoolCount(final int count) throws Exception { - assertEquals(count, getMbeanCount("\"SjmsConsumer")); - } + private void assertConsumerThreadPoolCount(final int count) throws Exception { + assertEquals(count, getMbeanCount("\"SjmsConsumer")); + } - private int getMbeanCount(final String name) throws MalformedObjectNameException { - MBeanServer mbs = ManagementFactory.getPlatformMBeanServer(); - Set<ObjectInstance> mbeans = mbs.queryMBeans(new ObjectName("org.apache.camel:type=threadpools,*"), null); - LOGGER.debug("mbeans size: " + mbeans.size()); - int count = 0; - for (ObjectInstance mbean : mbeans) { - LOGGER.debug("mbean: {}", mbean); - if (mbean.getObjectName().getKeyProperty("name").startsWith(name)) { - count++; - } - } - return count; - } + private int getMbeanCount(final String name) throws MalformedObjectNameException { + MBeanServer mbs = ManagementFactory.getPlatformMBeanServer(); + Set<ObjectInstance> mbeans = mbs.queryMBeans(new ObjectName("org.apache.camel:type=threadpools,*"), + null); + LOGGER.debug("mbeans size: " + mbeans.size()); + int count = 0; + for (ObjectInstance mbean : mbeans) { + LOGGER.debug("mbean: {}", mbean); + if (mbean.getObjectName().getKeyProperty("name").startsWith(name)) { + count++; + } + } + return count; + } } http://git-wip-us.apache.org/repos/asf/camel/blob/f0e3e201/components/camel-spring/src/test/java/org/apache/camel/component/log/CustomExchangeFormatterTest.java ---------------------------------------------------------------------- diff --git a/components/camel-spring/src/test/java/org/apache/camel/component/log/CustomExchangeFormatterTest.java b/components/camel-spring/src/test/java/org/apache/camel/component/log/CustomExchangeFormatterTest.java index 4d6a15a..9d44689 100644 --- a/components/camel-spring/src/test/java/org/apache/camel/component/log/CustomExchangeFormatterTest.java +++ b/components/camel-spring/src/test/java/org/apache/camel/component/log/CustomExchangeFormatterTest.java @@ -43,10 +43,10 @@ public class CustomExchangeFormatterTest extends SpringTestSupport { LogEndpoint log = (LogEndpoint) ep; - aaa = log.getEndpointUri().contains("aaa") ? - (TestExchangeFormatter) f.get(((CamelLogProcessor) log.getLogger())) : aaa; - bbb = log.getEndpointUri().contains("bbb") ? - (TestExchangeFormatter) f.get(((CamelLogProcessor) log.getLogger())) : bbb; + aaa = log.getEndpointUri().contains("aaa") + ? (TestExchangeFormatter) f.get((CamelLogProcessor) log.getLogger()) : aaa; + bbb = log.getEndpointUri().contains("bbb") + ? (TestExchangeFormatter) f.get((CamelLogProcessor) log.getLogger()) : bbb; } assertNotNull(aaa);
