You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2008/05/24 18:35:10 UTC
svn commit: r659849 - in /activemq/camel/trunk/camel-core/src:
main/java/org/apache/camel/builder/
main/java/org/apache/camel/component/bean/
main/java/org/apache/camel/component/file/
main/java/org/apache/camel/component/mock/ main/java/org/apache/cam...
Author: davsclaus
Date: Sat May 24 09:35:09 2008
New Revision: 659849
URL: http://svn.apache.org/viewvc?rev=659849&view=rev
Log:
CAMEL-517: Fixed IDEA code analyze: spelling in classnames, use final for synchronization maps, use addAll instead of looping to copy collections, etc.
Modified:
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/BuilderSupport.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/BeanInfo.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/FileEndpoint.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/mock/MockEndpoint.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/vm/VmComponent.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/converter/CollectionConverter.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/converter/jaxp/XmlConverter.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultExchange.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/converter/AsyncProcessorTypeConverter.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/converter/DefaultTypeConverter.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/management/CamelNamingStrategy.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/management/InstrumentationLifecycleStrategy.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ProcessorType.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/MulticastProcessor.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/idempotent/MemoryMessageIdRepository.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/loadbalancer/StickyLoadBalancer.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/spi/ComponentResolver.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/util/AsyncProcessorHelper.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/util/DefaultTimeoutMap.java
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/builder/BuilderWithScopesTest.java
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/LoadBalanceTest.java
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/BuilderSupport.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/BuilderSupport.java?rev=659849&r1=659848&r2=659849&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/BuilderSupport.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/BuilderSupport.java Sat May 24 09:35:09 2008
@@ -17,7 +17,7 @@
package org.apache.camel.builder;
import java.util.ArrayList;
-import java.util.List;
+import java.util.List;import java.util.Arrays;
import org.apache.camel.CamelContext;
import org.apache.camel.Endpoint;
@@ -176,9 +176,7 @@
*/
public List<Endpoint> endpoints(Endpoint... endpoints) {
List<Endpoint> answer = new ArrayList<Endpoint>();
- for (Endpoint endpoint : endpoints) {
- answer.add(endpoint);
- }
+ answer.addAll(Arrays.asList(endpoints));
return answer;
}
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/BeanInfo.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/BeanInfo.java?rev=659849&r1=659848&r2=659849&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/BeanInfo.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/BeanInfo.java Sat May 24 09:35:09 2008
@@ -60,7 +60,7 @@
private Map<String, MethodInfo> operations = new ConcurrentHashMap<String, MethodInfo>();
private MethodInfo defaultMethod;
private List<MethodInfo> operationsWithBody = new ArrayList<MethodInfo>();
- private List<MethodInfo> operationsWithCustomAnnotation = new ArrayList<MethodInfo>();;
+ private List<MethodInfo> operationsWithCustomAnnotation = new ArrayList<MethodInfo>();
public BeanInfo(CamelContext camelContext, Class type) {
this(camelContext, type, createParameterMappingStrategy(camelContext));
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/FileEndpoint.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/FileEndpoint.java?rev=659849&r1=659848&r2=659849&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/FileEndpoint.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/FileEndpoint.java Sat May 24 09:35:09 2008
@@ -230,7 +230,8 @@
/**
* If set to true then the default {@link FileProcessStrategy} will be to use the
- * {@link NoOpFileProcessStrategy} to not move or copy processed files
+ * {@link org.apache.camel.component.file.strategy.NoOpFileProcessStrategy NoOpFileProcessStrategy}
+ * to not move or copy processed files
*/
public void setNoop(boolean noop) {
this.noop = noop;
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/mock/MockEndpoint.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/mock/MockEndpoint.java?rev=659849&r1=659848&r2=659849&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/mock/MockEndpoint.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/mock/MockEndpoint.java Sat May 24 09:35:09 2008
@@ -22,7 +22,7 @@
import java.util.Collection;
import java.util.HashMap;
import java.util.List;
-import java.util.Map;
+import java.util.Map;import java.util.Arrays;
import java.util.concurrent.CopyOnWriteArrayList;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
@@ -130,7 +130,7 @@
public static void expectsMessageCount(int count, MockEndpoint... endpoints) throws InterruptedException {
for (MockEndpoint endpoint : endpoints) {
- endpoint.expectsMessageCount(count);
+ MockEndpoint.expectsMessageCount(count);
}
}
@@ -322,9 +322,7 @@
*/
public void expectedBodiesReceived(Object... bodies) {
List bodyList = new ArrayList();
- for (Object body : bodies) {
- bodyList.add(body);
- }
+ bodyList.addAll(Arrays.asList(bodies));
expectedBodiesReceived(bodyList);
}
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/vm/VmComponent.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/vm/VmComponent.java?rev=659849&r1=659848&r2=659849&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/vm/VmComponent.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/vm/VmComponent.java Sat May 24 09:35:09 2008
@@ -35,7 +35,7 @@
* @version $Revision$
*/
public class VmComponent extends SedaComponent {
- protected static Map<String, BlockingQueue> queues = new HashMap<String, BlockingQueue>();
+ protected static final Map<String, BlockingQueue> queues = new HashMap<String, BlockingQueue>();
private static final AtomicInteger START_COUNTER = new AtomicInteger();
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/converter/CollectionConverter.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/converter/CollectionConverter.java?rev=659849&r1=659848&r2=659849&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/converter/CollectionConverter.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/converter/CollectionConverter.java Sat May 24 09:35:09 2008
@@ -73,9 +73,7 @@
@Converter
public static Set toSet(Object[] array) {
Set answer = new HashSet();
- for (Object element : array) {
- answer.add(element);
- }
+ answer.addAll(Arrays.asList(array));
return answer;
}
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/converter/jaxp/XmlConverter.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/converter/jaxp/XmlConverter.java?rev=659849&r1=659848&r2=659849&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/converter/jaxp/XmlConverter.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/converter/jaxp/XmlConverter.java Sat May 24 09:35:09 2008
@@ -379,8 +379,8 @@
public SAXSource toSAXSourceFromDOM(DOMSource source) throws TransformerException {
if (DOM_TO_SAX_CLASS != null) {
try {
- Constructor cns = DOM_TO_SAX_CLASS.getConstructor(new Class[] {Node.class});
- XMLReader converter = (XMLReader) cns.newInstance(new Object[] {source.getNode()});
+ Constructor cns = DOM_TO_SAX_CLASS.getConstructor(Node.class);
+ XMLReader converter = (XMLReader) cns.newInstance(source.getNode());
return new SAXSource(converter, new InputSource());
} catch (Exception e) {
throw new TransformerException(e);
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultExchange.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultExchange.java?rev=659849&r1=659848&r2=659849&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultExchange.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultExchange.java Sat May 24 09:35:09 2008
@@ -206,12 +206,12 @@
if (exception == null) {
return;
}
- if (exception instanceof Exception) {
- throw (Exception)exception;
- }
if (exception instanceof RuntimeException) {
throw (RuntimeException)exception;
}
+ if (exception instanceof Exception) {
+ throw (Exception)exception;
+ }
throw new RuntimeCamelException(exception);
}
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/converter/AsyncProcessorTypeConverter.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/converter/AsyncProcessorTypeConverter.java?rev=659849&r1=659848&r2=659849&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/converter/AsyncProcessorTypeConverter.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/converter/AsyncProcessorTypeConverter.java Sat May 24 09:35:09 2008
@@ -32,9 +32,9 @@
*/
public class AsyncProcessorTypeConverter implements TypeConverter {
- private static final class ProcessorToAsynProcessorBridge extends DelegateProcessor implements AsyncProcessor {
+ private static final class ProcessorToAsyncProcessorBridge extends DelegateProcessor implements AsyncProcessor {
- private ProcessorToAsynProcessorBridge(Processor processor) {
+ private ProcessorToAsyncProcessorBridge(Processor processor) {
super(processor);
}
@@ -58,7 +58,7 @@
} else if (value instanceof Processor) {
// Provide an async bridge to the regular processor.
final Processor processor = (Processor)value;
- return toType.cast(new ProcessorToAsynProcessorBridge(processor));
+ return toType.cast(new ProcessorToAsyncProcessorBridge(processor));
}
}
}
@@ -69,6 +69,6 @@
if (value instanceof AsyncProcessor) {
return (AsyncProcessor)value;
}
- return new ProcessorToAsynProcessorBridge(value);
+ return new ProcessorToAsyncProcessorBridge(value);
}
}
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/converter/DefaultTypeConverter.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/converter/DefaultTypeConverter.java?rev=659849&r1=659848&r2=659849&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/converter/DefaultTypeConverter.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/converter/DefaultTypeConverter.java Sat May 24 09:35:09 2008
@@ -41,7 +41,7 @@
*/
public class DefaultTypeConverter implements TypeConverter, TypeConverterRegistry {
private static final transient Log LOG = LogFactory.getLog(DefaultTypeConverter.class);
- private Map<TypeMapping, TypeConverter> typeMappings = new HashMap<TypeMapping, TypeConverter>();
+ private final Map<TypeMapping, TypeConverter> typeMappings = new HashMap<TypeMapping, TypeConverter>();
private Injector injector;
private List<TypeConverterLoader> typeConverterLoaders = new ArrayList<TypeConverterLoader>();
private List<TypeConverter> fallbackConverters = new ArrayList<TypeConverter>();
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/management/CamelNamingStrategy.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/management/CamelNamingStrategy.java?rev=659849&r1=659848&r2=659849&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/management/CamelNamingStrategy.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/management/CamelNamingStrategy.java Sat May 24 09:35:09 2008
@@ -74,10 +74,10 @@
*/
public ObjectName getObjectName(CamelContext context) throws MalformedObjectNameException {
StringBuffer buffer = new StringBuffer();
- buffer.append(domainName + ":");
- buffer.append(KEY_CONTEXT + "=" + getContextId(context) + ",");
+ buffer.append(domainName).append(":");
+ buffer.append(KEY_CONTEXT + "=").append(getContextId(context)).append(",");
buffer.append(KEY_TYPE + "=" + TYPE_CONTEXT + ",");
- buffer.append(KEY_NAME + "=" + getContextId(context));
+ buffer.append(KEY_NAME + "=").append(getContextId(context));
return createObjectName(buffer);
}
@@ -94,11 +94,11 @@
Endpoint<? extends Exchange> ep = mbean.getEndpoint();
StringBuffer buffer = new StringBuffer();
- buffer.append(domainName + ":");
- buffer.append(KEY_CONTEXT + "=" + getContextId(ep.getCamelContext()) + ",");
+ buffer.append(domainName).append(":");
+ buffer.append(KEY_CONTEXT + "=").append(getContextId(ep.getCamelContext())).append(",");
buffer.append(KEY_TYPE + "=" + TYPE_ENDPOINT + ",");
- buffer.append(KEY_COMPONENT + "=" + getComponentId(ep) + ",");
- buffer.append(KEY_NAME + "=" + getEndpointId(ep));
+ buffer.append(KEY_COMPONENT + "=").append(getComponentId(ep)).append(",");
+ buffer.append(KEY_NAME + "=").append(getEndpointId(ep));
return createObjectName(buffer);
}
@@ -114,10 +114,10 @@
*/
public ObjectName getObjectName(CamelContext context, ManagedService mbean) throws MalformedObjectNameException {
StringBuffer buffer = new StringBuffer();
- buffer.append(domainName + ":");
- buffer.append(KEY_CONTEXT + "=" + getContextId(context) + ",");
+ buffer.append(domainName).append(":");
+ buffer.append(KEY_CONTEXT + "=").append(getContextId(context)).append(",");
buffer.append(KEY_TYPE + "=" + TYPE_SERVICE + ",");
- buffer.append(KEY_NAME + "=" + Integer.toHexString(mbean.getService().hashCode()));
+ buffer.append(KEY_NAME + "=").append(Integer.toHexString(mbean.getService().hashCode()));
return createObjectName(buffer);
}
@@ -141,11 +141,11 @@
: "[" + cid + "]" + getEndpointId(ep);
StringBuffer buffer = new StringBuffer();
- buffer.append(domainName + ":");
- buffer.append(KEY_CONTEXT + "=" + ctxid + ",");
- buffer.append(KEY_ROUTE + "=" + id + ",");
+ buffer.append(domainName).append(":");
+ buffer.append(KEY_CONTEXT + "=").append(ctxid).append(",");
+ buffer.append(KEY_ROUTE + "=").append(id).append(",");
buffer.append(KEY_TYPE + "=" + TYPE_ROUTE + ",");
- buffer.append(KEY_NAME + "=" + id);
+ buffer.append(KEY_NAME + "=").append(id);
return createObjectName(buffer);
}
@@ -168,11 +168,11 @@
String id = VALUE_UNKNOWN.equals(cid) ? getEndpointId(ep) : "[" + cid + "]" + getEndpointId(ep);
StringBuffer buffer = new StringBuffer();
- buffer.append(domainName + ":");
- buffer.append(KEY_CONTEXT + "=" + ctxid + ",");
- buffer.append(KEY_ROUTE + "=" + id + ",");
+ buffer.append(domainName).append(":");
+ buffer.append(KEY_CONTEXT + "=").append(ctxid).append(",");
+ buffer.append(KEY_ROUTE + "=").append(id).append(",");
buffer.append(KEY_TYPE + "=" + TYPE_PROCESSOR + ",");
- buffer.append(KEY_NAME + "=" + ObjectName.quote(processor.toString()));
+ buffer.append(KEY_NAME + "=").append(ObjectName.quote(processor.toString()));
return createObjectName(buffer);
}
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/management/InstrumentationLifecycleStrategy.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/management/InstrumentationLifecycleStrategy.java?rev=659849&r1=659848&r2=659849&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/management/InstrumentationLifecycleStrategy.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/management/InstrumentationLifecycleStrategy.java Sat May 24 09:35:09 2008
@@ -37,6 +37,9 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+/**
+ * JMX agent that registeres Camel lifecycle events in JMX.
+ */
public class InstrumentationLifecycleStrategy implements LifecycleStrategy {
private static final transient Log LOG = LogFactory.getLog(InstrumentationProcessor.class);
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ProcessorType.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ProcessorType.java?rev=659849&r1=659848&r2=659849&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ProcessorType.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ProcessorType.java Sat May 24 09:35:09 2008
@@ -23,7 +23,7 @@
import java.util.HashSet;
import java.util.LinkedList;
import java.util.List;
-import java.util.Set;
+import java.util.Set;import java.util.Arrays;
import java.util.concurrent.ThreadPoolExecutor;
import javax.xml.bind.annotation.XmlAccessType;
@@ -639,9 +639,7 @@
*/
public ResequencerType resequencer(Expression... expressions) {
List<Expression> list = new ArrayList<Expression>();
- for (Expression expression : expressions) {
- list.add(expression);
- }
+ list.addAll(Arrays.asList(expressions));
return resequencer(list);
}
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/MulticastProcessor.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/MulticastProcessor.java?rev=659849&r1=659848&r2=659849&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/MulticastProcessor.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/MulticastProcessor.java Sat May 24 09:35:09 2008
@@ -205,7 +205,7 @@
protected List<ProcessorExchangePair> createProcessorExchangePairs(
Exchange exchange) {
List<ProcessorExchangePair> result = new ArrayList<ProcessorExchangePair>(processors.size());
- Processor[] processorsArray = processors.toArray(new Processor[0]);
+ Processor[] processorsArray = processors.toArray(new Processor[processors.size()]);
for (int i = 0; i < processorsArray.length; i++) {
result.add(new ProcessorExchangePair(processorsArray[i], exchange.copy()));
}
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/idempotent/MemoryMessageIdRepository.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/idempotent/MemoryMessageIdRepository.java?rev=659849&r1=659848&r2=659849&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/idempotent/MemoryMessageIdRepository.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/idempotent/MemoryMessageIdRepository.java Sat May 24 09:35:09 2008
@@ -29,7 +29,7 @@
* @version $Revision$
*/
public class MemoryMessageIdRepository implements MessageIdRepository {
- private Map cache;
+ private final Map cache;
public MemoryMessageIdRepository(Map set) {
this.cache = set;
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/loadbalancer/StickyLoadBalancer.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/loadbalancer/StickyLoadBalancer.java?rev=659849&r1=659848&r2=659849&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/loadbalancer/StickyLoadBalancer.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/loadbalancer/StickyLoadBalancer.java Sat May 24 09:35:09 2008
@@ -36,7 +36,7 @@
private Expression<Exchange> correlationExpression;
private QueueLoadBalancer loadBalancer;
private int numberOfHashGroups = 64 * 1024;
- private Map<Object, Processor> stickyMap = new HashMap<Object, Processor>();
+ private final Map<Object, Processor> stickyMap = new HashMap<Object, Processor>();
public StickyLoadBalancer() {
this.loadBalancer = new RoundRobinLoadBalancer();
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/spi/ComponentResolver.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/spi/ComponentResolver.java?rev=659849&r1=659848&r2=659849&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/spi/ComponentResolver.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/spi/ComponentResolver.java Sat May 24 09:35:09 2008
@@ -34,6 +34,7 @@
* @param name the component name to resolve
* @param context the context to load the component if it can be resolved
* @return the component which is added to the context or null if it can not be resolved
+ * @throws Exception is thrown if the the component could not be loaded
*/
Component<E> resolveComponent(String name, CamelContext context) throws Exception;
}
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/util/AsyncProcessorHelper.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/util/AsyncProcessorHelper.java?rev=659849&r1=659848&r2=659849&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/util/AsyncProcessorHelper.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/util/AsyncProcessorHelper.java Sat May 24 09:35:09 2008
@@ -28,16 +28,13 @@
public final class AsyncProcessorHelper {
private AsyncProcessorHelper() {
+ // utility class
}
/**
* Calls the async version of the processor's process method and waits
- * for it to complete before returning. This can be used by AsyncProcessor
+ * for it to complete before returning. This can be used by AsyncProcessor
* objects to implement their sync version of the process method.
- *
- * @param processor
- * @param exchange
- * @throws Exception
*/
public static void process(AsyncProcessor processor, Exchange exchange) throws Exception {
final CountDownLatch latch = new CountDownLatch(1);
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/util/DefaultTimeoutMap.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/util/DefaultTimeoutMap.java?rev=659849&r1=659848&r2=659849&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/util/DefaultTimeoutMap.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/util/DefaultTimeoutMap.java Sat May 24 09:35:09 2008
@@ -37,7 +37,7 @@
private static final Log LOG = LogFactory.getLog(DefaultTimeoutMap.class);
- private Map map = new HashMap();
+ private final Map map = new HashMap();
private SortedSet index = new TreeSet();
private ScheduledExecutorService executor;
private long purgePollTime;
Modified: activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/builder/BuilderWithScopesTest.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/builder/BuilderWithScopesTest.java?rev=659849&r1=659848&r2=659849&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/builder/BuilderWithScopesTest.java (original)
+++ activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/builder/BuilderWithScopesTest.java Sat May 24 09:35:09 2008
@@ -138,7 +138,7 @@
.process(toProcessor);
}
};
- };
+ }
public void testRouteWithChoice1() throws Exception {
ArrayList<String> expected = new ArrayList<String>();
@@ -183,7 +183,7 @@
.process(orderProcessor3).end().process(toProcessor);
}
};
- };
+ }
public void testRouteWithChoiceOtherwise1() throws Exception {
ArrayList<String> expected = new ArrayList<String>();
@@ -228,7 +228,7 @@
.handle(ValidationException.class).process(orderProcessor).process(orderProcessor3); // continuation of the handle clause
}
};
- };
+ }
public void testRouteWithTryCatchNoEndNoException() throws Exception {
ArrayList<String> expected = new ArrayList<String>();
@@ -261,7 +261,7 @@
.handle(ValidationException.class).process(orderProcessor).end().process(orderProcessor3);
}
};
- };
+ }
public void testRouteWithTryCatchEndNoException() throws Exception {
ArrayList<String> expected = new ArrayList<String>();
@@ -297,7 +297,7 @@
.process(orderProcessor2).process(orderProcessor3); // continuation of the finallyBlock clause
}
};
- };
+ }
public void testRouteWithTryCatchFinallyNoEndNoException() throws Exception {
ArrayList<String> expected = new ArrayList<String>();
Modified: activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/LoadBalanceTest.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/LoadBalanceTest.java?rev=659849&r1=659848&r2=659849&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/LoadBalanceTest.java (original)
+++ activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/LoadBalanceTest.java Sat May 24 09:35:09 2008
@@ -43,7 +43,7 @@
from("direct:start").loadBalance().
roundRobin().to("mock:x", "mock:y", "mock:z");
// END SNIPPET: example
- };
+ }
};
}