Updated Branches: refs/heads/master 785302319 -> e19acac50
CAMEL-6588 fixed CS errors Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/e19acac5 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/e19acac5 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/e19acac5 Branch: refs/heads/master Commit: e19acac5051a8bbbd043d5aec9e390838b765c68 Parents: 276aa87 Author: Willem Jiang <ningji...@apache.org> Authored: Fri Aug 2 10:57:03 2013 +0800 Committer: Willem Jiang <ningji...@apache.org> Committed: Fri Aug 2 11:33:33 2013 +0800 ---------------------------------------------------------------------- .../seda/ArrayBlockingQueueFactory.java | 72 ++++++++++---------- .../seda/PriorityBlockingQueueFactory.java | 36 +++++----- .../camel/component/seda/SedaComponent.java | 41 ++++++----- .../camel/component/seda/SedaEndpoint.java | 18 ++--- .../component/seda/SedaQueueFactoryTest.java | 55 ++++++++------- .../camel/component/seda/SedaQueueTest.java | 23 ++++--- 6 files changed, 125 insertions(+), 120 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/e19acac5/camel-core/src/main/java/org/apache/camel/component/seda/ArrayBlockingQueueFactory.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/component/seda/ArrayBlockingQueueFactory.java b/camel-core/src/main/java/org/apache/camel/component/seda/ArrayBlockingQueueFactory.java index 3983ff8..b075467 100644 --- a/camel-core/src/main/java/org/apache/camel/component/seda/ArrayBlockingQueueFactory.java +++ b/camel-core/src/main/java/org/apache/camel/component/seda/ArrayBlockingQueueFactory.java @@ -23,42 +23,43 @@ import java.util.concurrent.ArrayBlockingQueue; * Implementation of {@link BlockingQueueFactory} producing {@link java.util.concurrent.ArrayBlockingQueue} */ public class ArrayBlockingQueueFactory<E> implements BlockingQueueFactory<E> { - /** - * Capacity used when none provided - */ - private int defaultCapacity=50; - /** - * Lock fairness. null means default fairness - */ - private Boolean fair; - /** - * @return Default array capacity - */ - public int getDefaultCapacity() { - return defaultCapacity; - } + /** + * Capacity used when none provided + */ + private int defaultCapacity = 50; + /** + * Lock fairness. null means default fairness + */ + private Boolean fair; - /** - * @param defaultCapacity Default array capacity - */ - public void setDefaultCapacity(int defaultCapacity) { - this.defaultCapacity = defaultCapacity; - } + /** + * @return Default array capacity + */ + public int getDefaultCapacity() { + return defaultCapacity; + } + + /** + * @param defaultCapacity Default array capacity + */ + public void setDefaultCapacity(int defaultCapacity) { + this.defaultCapacity = defaultCapacity; + } - /** - * @return Lock fairness - */ - public boolean isFair() { - return fair; - } + /** + * @return Lock fairness + */ + public boolean isFair() { + return fair; + } + + /** + * @param fair Lock fairness + */ + public void setFair(boolean fair) { + this.fair = fair; + } - /** - * @param fair Lock fairness - */ - public void setFair(boolean fair) { - this.fair = fair; - } - @Override public ArrayBlockingQueue<E> create() { return create(defaultCapacity); @@ -66,8 +67,7 @@ public class ArrayBlockingQueueFactory<E> implements BlockingQueueFactory<E> { @Override public ArrayBlockingQueue<E> create(int capacity) { - return fair == null ? - new ArrayBlockingQueue<E>(defaultCapacity) : - new ArrayBlockingQueue<E>(defaultCapacity, fair) ; + return fair == null + ? new ArrayBlockingQueue<E>(defaultCapacity) : new ArrayBlockingQueue<E>(defaultCapacity, fair); } } http://git-wip-us.apache.org/repos/asf/camel/blob/e19acac5/camel-core/src/main/java/org/apache/camel/component/seda/PriorityBlockingQueueFactory.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/component/seda/PriorityBlockingQueueFactory.java b/camel-core/src/main/java/org/apache/camel/component/seda/PriorityBlockingQueueFactory.java index da90d16..a1bd36f 100644 --- a/camel-core/src/main/java/org/apache/camel/component/seda/PriorityBlockingQueueFactory.java +++ b/camel-core/src/main/java/org/apache/camel/component/seda/PriorityBlockingQueueFactory.java @@ -24,31 +24,31 @@ import java.util.concurrent.PriorityBlockingQueue; * Implementation of {@link BlockingQueueFactory} producing {@link java.util.concurrent.PriorityBlockingQueue} */ public class PriorityBlockingQueueFactory<E> implements BlockingQueueFactory<E> { - /** - * Comparator used to sort exchanges - */ - private Comparator<E> comparator; + /** + * Comparator used to sort exchanges + */ + private Comparator<E> comparator; - public Comparator<E> getComparator() { - return comparator; - } + public Comparator<E> getComparator() { + return comparator; + } + + public void setComparator(Comparator<E> comparator) { + this.comparator = comparator; + } - public void setComparator(Comparator<E> comparator) { - this.comparator = comparator; - } - @Override public PriorityBlockingQueue<E> create() { - return comparator==null ? - new PriorityBlockingQueue<E>() : - // PriorityQueue as a default capacity of 11 - new PriorityBlockingQueue<E>(11, comparator); + return comparator == null + ? new PriorityBlockingQueue<E>() + // PriorityQueue as a default capacity of 11 + : new PriorityBlockingQueue<E>(11, comparator); } @Override public PriorityBlockingQueue<E> create(int capacity) { - return comparator==null? - new PriorityBlockingQueue<E>(capacity): - new PriorityBlockingQueue<E>(capacity, comparator); + return comparator == null + ? new PriorityBlockingQueue<E>(capacity) + : new PriorityBlockingQueue<E>(capacity, comparator); } } http://git-wip-us.apache.org/repos/asf/camel/blob/e19acac5/camel-core/src/main/java/org/apache/camel/component/seda/SedaComponent.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/component/seda/SedaComponent.java b/camel-core/src/main/java/org/apache/camel/component/seda/SedaComponent.java index b13dd64..dd7f6a5 100644 --- a/camel-core/src/main/java/org/apache/camel/component/seda/SedaComponent.java +++ b/camel-core/src/main/java/org/apache/camel/component/seda/SedaComponent.java @@ -38,7 +38,7 @@ public class SedaComponent extends UriEndpointComponent { protected int queueSize; protected int defaultConcurrentConsumers = 1; private final Map<String, QueueReference> queues = new HashMap<String, QueueReference>(); - private BlockingQueueFactory<Exchange> defaultQueueFactory =new LinkedBlockingQueueFactory<Exchange>(); + private BlockingQueueFactory<Exchange> defaultQueueFactory = new LinkedBlockingQueueFactory<Exchange>(); public SedaComponent() { super(SedaEndpoint.class); } @@ -59,13 +59,13 @@ public class SedaComponent extends UriEndpointComponent { return defaultConcurrentConsumers; } - public BlockingQueueFactory<Exchange> getDefaultQueueFactory() { - return defaultQueueFactory; - } + public BlockingQueueFactory<Exchange> getDefaultQueueFactory() { + return defaultQueueFactory; + } - public void setDefaultQueueFactory(BlockingQueueFactory<Exchange> defaultQueueFactory) { - this.defaultQueueFactory = defaultQueueFactory; - } + public void setDefaultQueueFactory(BlockingQueueFactory<Exchange> defaultQueueFactory) { + this.defaultQueueFactory = defaultQueueFactory; + } /** * @deprecated use {@link #getOrCreateQueue(String, Integer, Boolean, BlockingQueueFactory)} @@ -135,6 +135,7 @@ public class SedaComponent extends UriEndpointComponent { } @Override + @SuppressWarnings("unchecked") protected Endpoint createEndpoint(String uri, String remaining, Map<String, Object> parameters) throws Exception { int consumers = getAndRemoveParameter(parameters, "concurrentConsumers", Integer.class, defaultConcurrentConsumers); boolean limitConcurrentConsumers = getAndRemoveParameter(parameters, "limitConcurrentConsumers", Boolean.class, true); @@ -142,17 +143,21 @@ public class SedaComponent extends UriEndpointComponent { throw new IllegalArgumentException("The limitConcurrentConsumers flag in set to true. ConcurrentConsumers cannot be set at a value greater than " + maxConcurrentConsumers + " was " + consumers); } - // Resolve queue reference - BlockingQueue<Exchange> queue=resolveAndRemoveReferenceParameter(parameters, "queue", BlockingQueue.class); - SedaEndpoint answer; - // Resolve queue factory when no queue specified - if (queue == null) { - BlockingQueueFactory<Exchange> queueFactory=resolveAndRemoveReferenceParameter(parameters, "queueFactory", BlockingQueueFactory.class); - // defer creating queue till endpoint is started, so we pass the queue factory - answer = new SedaEndpoint(uri, this, queueFactory, consumers); - } else { - answer = new SedaEndpoint(uri, this, queue, consumers); - } + // Resolve queue reference + BlockingQueue<Exchange> queue = resolveAndRemoveReferenceParameter(parameters, "queue", + BlockingQueue.class); + SedaEndpoint answer; + // Resolve queue factory when no queue specified + if (queue == null) { + BlockingQueueFactory<Exchange> queueFactory = resolveAndRemoveReferenceParameter(parameters, + "queueFactory", + BlockingQueueFactory.class); + // defer creating queue till endpoint is started, so we pass the + // queue factory + answer = new SedaEndpoint(uri, this, queueFactory, consumers); + } else { + answer = new SedaEndpoint(uri, this, queue, consumers); + } answer.configureProperties(parameters); return answer; } http://git-wip-us.apache.org/repos/asf/camel/blob/e19acac5/camel-core/src/main/java/org/apache/camel/component/seda/SedaEndpoint.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/component/seda/SedaEndpoint.java b/camel-core/src/main/java/org/apache/camel/component/seda/SedaEndpoint.java index d806d60..aa16c6b 100644 --- a/camel-core/src/main/java/org/apache/camel/component/seda/SedaEndpoint.java +++ b/camel-core/src/main/java/org/apache/camel/component/seda/SedaEndpoint.java @@ -81,7 +81,7 @@ public class SedaEndpoint extends DefaultEndpoint implements BrowsableEndpoint, private BlockingQueueFactory<Exchange> queueFactory; public SedaEndpoint() { - queueFactory = new LinkedBlockingQueueFactory<Exchange>(); + queueFactory = new LinkedBlockingQueueFactory<Exchange>(); } public SedaEndpoint(String endpointUri, Component component, BlockingQueue<Exchange> queue) { @@ -89,19 +89,19 @@ public class SedaEndpoint extends DefaultEndpoint implements BrowsableEndpoint, } public SedaEndpoint(String endpointUri, Component component, BlockingQueue<Exchange> queue, int concurrentConsumers) { - this(endpointUri, component, concurrentConsumers); + this(endpointUri, component, concurrentConsumers); this.queue = queue; if (queue != null) { this.size = queue.remainingCapacity(); } - queueFactory = new LinkedBlockingQueueFactory<Exchange>(); - } - + queueFactory = new LinkedBlockingQueueFactory<Exchange>(); + } + public SedaEndpoint(String endpointUri, Component component, BlockingQueueFactory<Exchange> queueFactory, int concurrentConsumers) { - this(endpointUri, component, concurrentConsumers); - this.queueFactory = queueFactory; - } - + this(endpointUri, component, concurrentConsumers); + this.queueFactory = queueFactory; + } + private SedaEndpoint(String endpointUri, Component component, int concurrentConsumers) { super(endpointUri, component); this.concurrentConsumers = concurrentConsumers; http://git-wip-us.apache.org/repos/asf/camel/blob/e19acac5/camel-core/src/test/java/org/apache/camel/component/seda/SedaQueueFactoryTest.java ---------------------------------------------------------------------- diff --git a/camel-core/src/test/java/org/apache/camel/component/seda/SedaQueueFactoryTest.java b/camel-core/src/test/java/org/apache/camel/component/seda/SedaQueueFactoryTest.java index 033ce80..062df5a 100644 --- a/camel-core/src/test/java/org/apache/camel/component/seda/SedaQueueFactoryTest.java +++ b/camel-core/src/test/java/org/apache/camel/component/seda/SedaQueueFactoryTest.java @@ -1,9 +1,10 @@ -/* - * Copyright 2013 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at +/** + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -15,14 +16,13 @@ */ package org.apache.camel.component.seda; +import java.util.concurrent.ArrayBlockingQueue; import java.util.concurrent.BlockingQueue; import java.util.concurrent.LinkedBlockingQueue; -import java.util.concurrent.ArrayBlockingQueue; -import static junit.framework.TestCase.assertEquals; + import org.apache.camel.CamelContext; import org.apache.camel.ContextTestSupport; import org.apache.camel.Exchange; -import static org.apache.camel.TestSupport.assertIsInstanceOf; import org.apache.camel.impl.DefaultCamelContext; import org.apache.camel.impl.SimpleRegistry; @@ -30,37 +30,36 @@ import org.apache.camel.impl.SimpleRegistry; * */ public class SedaQueueFactoryTest extends ContextTestSupport { - private final ArrayBlockingQueueFactory<Exchange> arrayQueueFactory=new ArrayBlockingQueueFactory<Exchange>(); + private final ArrayBlockingQueueFactory<Exchange> arrayQueueFactory = new ArrayBlockingQueueFactory<Exchange>(); - @Override - protected CamelContext createCamelContext() throws Exception { - SimpleRegistry simpleRegistry=new SimpleRegistry(); - simpleRegistry.put("arrayQueueFactory", arrayQueueFactory); + @Override + protected CamelContext createCamelContext() throws Exception { + SimpleRegistry simpleRegistry = new SimpleRegistry(); + simpleRegistry.put("arrayQueueFactory", arrayQueueFactory); return new DefaultCamelContext(simpleRegistry); - } - - @SuppressWarnings("unchecked") + } + + public void testArrayBlockingQueueFactory() throws Exception { SedaEndpoint endpoint = resolveMandatoryEndpoint("seda:arrayQueue?queueFactory=#arrayQueueFactory", SedaEndpoint.class); - + BlockingQueue<Exchange> queue = endpoint.getQueue(); - ArrayBlockingQueue<Exchange> blockingQueue = assertIsInstanceOf(ArrayBlockingQueue.class, queue); - } + assertIsInstanceOf(ArrayBlockingQueue.class, queue); + } - @SuppressWarnings("unchecked") + @SuppressWarnings("unchecked") public void testArrayBlockingQueueFactoryAndSize() throws Exception { SedaEndpoint endpoint = resolveMandatoryEndpoint("seda:arrayQueue50?queueFactory=#arrayQueueFactory&size=50", SedaEndpoint.class); - + BlockingQueue<Exchange> queue = endpoint.getQueue(); ArrayBlockingQueue<Exchange> blockingQueue = assertIsInstanceOf(ArrayBlockingQueue.class, queue); - assertEquals("remainingCapacity", 50, blockingQueue.remainingCapacity()); - } + assertEquals("remainingCapacity", 50, blockingQueue.remainingCapacity()); + } - @SuppressWarnings("unchecked") + public void testDefaultBlockingQueueFactory() throws Exception { SedaEndpoint endpoint = resolveMandatoryEndpoint("seda:linkedQueue", SedaEndpoint.class); - BlockingQueue<Exchange> queue = endpoint.getQueue(); - LinkedBlockingQueue<Exchange> blockingQueue = assertIsInstanceOf(LinkedBlockingQueue.class, queue); - } + assertIsInstanceOf(LinkedBlockingQueue.class, queue); + } } http://git-wip-us.apache.org/repos/asf/camel/blob/e19acac5/camel-core/src/test/java/org/apache/camel/component/seda/SedaQueueTest.java ---------------------------------------------------------------------- diff --git a/camel-core/src/test/java/org/apache/camel/component/seda/SedaQueueTest.java b/camel-core/src/test/java/org/apache/camel/component/seda/SedaQueueTest.java index 54ccdd5..bfdf99b 100644 --- a/camel-core/src/test/java/org/apache/camel/component/seda/SedaQueueTest.java +++ b/camel-core/src/test/java/org/apache/camel/component/seda/SedaQueueTest.java @@ -17,6 +17,7 @@ package org.apache.camel.component.seda; import java.util.concurrent.ArrayBlockingQueue; + import org.apache.camel.CamelContext; import org.apache.camel.ContextTestSupport; import org.apache.camel.Exchange; @@ -24,8 +25,6 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.impl.DefaultCamelContext; import org.apache.camel.impl.SimpleRegistry; -import org.hamcrest.CoreMatchers; -import org.junit.matchers.JUnitMatchers; /** * @version @@ -46,16 +45,18 @@ public class SedaQueueTest extends ContextTestSupport { mock.expectedBodiesReceived("Hello World"); template.sendBody("seda:array?queue=#arrayQueue", "Hello World"); - - SedaEndpoint sedaEndpoint=resolveMandatoryEndpoint("seda:array?queue=#arrayQueue", SedaEndpoint.class); - assertTrue(sedaEndpoint.getQueue() instanceof ArrayBlockingQueue); + + SedaEndpoint sedaEndpoint = resolveMandatoryEndpoint("seda:array?queue=#arrayQueue", + SedaEndpoint.class); + assertTrue(sedaEndpoint.getQueue() instanceof ArrayBlockingQueue); } - @Override - protected CamelContext createCamelContext() throws Exception { - SimpleRegistry simpleRegistry=new SimpleRegistry(); - simpleRegistry.put("arrayQueue", new ArrayBlockingQueue<Exchange>(10)); + + @Override + protected CamelContext createCamelContext() throws Exception { + SimpleRegistry simpleRegistry = new SimpleRegistry(); + simpleRegistry.put("arrayQueue", new ArrayBlockingQueue<Exchange>(10)); return new DefaultCamelContext(simpleRegistry); - } + } @Override protected RouteBuilder createRouteBuilder() throws Exception { @@ -66,7 +67,7 @@ public class SedaQueueTest extends ContextTestSupport { from("seda:bar").to("mock:result"); - from("seda:array?queue=#arrayQueue").to("mock:result"); + from("seda:array?queue=#arrayQueue").to("mock:result"); } }; }
