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 2009/02/23 17:15:38 UTC
svn commit: r747062 [2/5] - in /camel/trunk:
camel-core/src/main/java/org/apache/camel/
camel-core/src/main/java/org/apache/camel/builder/
camel-core/src/main/java/org/apache/camel/builder/xml/
camel-core/src/main/java/org/apache/camel/component/bean/ ...
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultProducerTemplate.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultProducerTemplate.java?rev=747062&r1=747061&r2=747062&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultProducerTemplate.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultProducerTemplate.java Mon Feb 23 16:14:17 2009
@@ -42,7 +42,7 @@
* @version $Revision$
*/
public class DefaultProducerTemplate extends ServiceSupport implements ProducerTemplate {
- private CamelContext context;
+ private final CamelContext context;
private final ProducerCache producerCache = new ProducerCache();
private boolean useEndpointCache = true;
private final Map<String, Endpoint> endpointCache = new HashMap<String, Endpoint>();
@@ -296,7 +296,7 @@
}
public <T extends Endpoint> T getResolvedEndpoint(String endpointUri, Class<T> expectedClass) {
- Endpoint e = null;
+ Endpoint e;
synchronized (endpointCache) {
e = endpointCache.get(endpointUri);
}
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultRouteContext.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultRouteContext.java?rev=747062&r1=747061&r2=747062&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultRouteContext.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultRouteContext.java Mon Feb 23 16:14:17 2009
@@ -18,14 +18,12 @@
import java.util.ArrayList;
import java.util.Collection;
-import java.util.HashMap;
import java.util.List;
import java.util.Map;
import org.apache.camel.AsyncProcessor;
import org.apache.camel.CamelContext;
import org.apache.camel.Endpoint;
-import org.apache.camel.Exchange;
import org.apache.camel.Intercept;
import org.apache.camel.NoSuchEndpointException;
import org.apache.camel.Processor;
@@ -39,7 +37,6 @@
import org.apache.camel.processor.Pipeline;
import org.apache.camel.processor.ProceedProcessor;
import org.apache.camel.processor.UnitOfWorkProcessor;
-import org.apache.camel.spi.DataFormat;
import org.apache.camel.spi.ErrorHandlerWrappingStrategy;
import org.apache.camel.spi.InterceptStrategy;
import org.apache.camel.spi.RouteContext;
@@ -131,6 +128,7 @@
return getCamelContext().getRegistry().lookup(name, type);
}
+ @SuppressWarnings("unchecked")
public void commit() {
// now lets turn all of the event driven consumer processors into a
// single route
@@ -157,18 +155,6 @@
}
public void intercept(Intercept interceptor) {
-/*
- InterceptorRef block = new InterceptorRef(interceptor);
- RouteType route = getRoute();
- List<ProcessorType<?>> list = route.getOutputs();
- for (ProcessorType<?> processorType : list) {
- block.addOutput(processorType);
- }
- route.clearOutput();
- route.intercept(block);
-*/
-
- //getRoute().getInterceptors().add(new InterceptorRef(interceptor));
lastInterceptor = (Interceptor)interceptor;
}
@@ -198,16 +184,14 @@
public void setErrorHandlerWrappingStrategy(ErrorHandlerWrappingStrategy strategy) {
errorHandlerWrappingStrategy = strategy;
-
}
public boolean isRouteAdded() {
return routeAdded;
}
- public void setIsRouteAdded(boolean b) {
- routeAdded = b;
-
+ public void setIsRouteAdded(boolean routeAdded) {
+ this.routeAdded = routeAdded;
}
public DataFormatType getDataFormat(String ref) {
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/impl/EventDrivenConsumerRoute.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/EventDrivenConsumerRoute.java?rev=747062&r1=747061&r2=747062&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/impl/EventDrivenConsumerRoute.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/impl/EventDrivenConsumerRoute.java Mon Feb 23 16:14:17 2009
@@ -31,7 +31,7 @@
*
* @version $Revision$
*/
-public class EventDrivenConsumerRoute<E extends Exchange> extends Route<E> {
+public class EventDrivenConsumerRoute extends Route {
private Processor processor;
public EventDrivenConsumerRoute(Endpoint endpoint, Processor processor) {
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/impl/EventDrivenPollingConsumer.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/EventDrivenPollingConsumer.java?rev=747062&r1=747061&r2=747062&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/impl/EventDrivenPollingConsumer.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/impl/EventDrivenPollingConsumer.java Mon Feb 23 16:14:17 2009
@@ -64,7 +64,9 @@
handleInteruptedException(e);
}
}
- LOG.debug("Consumer is not running, so returning null");
+ if (LOG.isTraceEnabled()) {
+ LOG.trace("Consumer is not running, so returning null");
+ }
return null;
}
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/impl/JndiRegistry.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/JndiRegistry.java?rev=747062&r1=747061&r2=747062&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/impl/JndiRegistry.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/impl/JndiRegistry.java Mon Feb 23 16:14:17 2009
@@ -79,6 +79,7 @@
this.context = context;
}
+ @SuppressWarnings("unchecked")
protected Context createContext() throws NamingException {
Hashtable properties = new Hashtable(System.getProperties());
return new InitialContext(properties);
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/impl/MessageSupport.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/MessageSupport.java?rev=747062&r1=747061&r2=747062&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/impl/MessageSupport.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/impl/MessageSupport.java Mon Feb 23 16:14:17 2009
@@ -46,12 +46,12 @@
return body;
}
- @SuppressWarnings({"unchecked" })
+ @SuppressWarnings("unchecked")
public <T> T getBody(Class<T> type) {
return getBody(type, getBody());
}
- @SuppressWarnings({"unchecked" })
+ @SuppressWarnings("unchecked")
protected <T> T getBody(Class<T> type, Object body) {
Exchange e = getExchange();
if (e != null) {
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/impl/ProcessorEndpoint.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/ProcessorEndpoint.java?rev=747062&r1=747061&r2=747062&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/impl/ProcessorEndpoint.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/impl/ProcessorEndpoint.java Mon Feb 23 16:14:17 2009
@@ -55,7 +55,6 @@
this.processor = processor;
}
-
protected ProcessorEndpoint(String endpointUri, Component component) {
super(endpointUri, component);
}
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/impl/ScheduledPollEndpoint.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/ScheduledPollEndpoint.java?rev=747062&r1=747061&r2=747062&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/impl/ScheduledPollEndpoint.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/impl/ScheduledPollEndpoint.java Mon Feb 23 16:14:17 2009
@@ -77,6 +77,7 @@
configureScheduledPollConsumerProperties(options, consumerProperties);
}
+ @SuppressWarnings("unchecked")
private void configureScheduledPollConsumerProperties(Map options, Map consumerProperties) {
// special for scheduled poll consumers as we want to allow end users to configure its options
// from the URI parameters without the consumer. prefix
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/impl/converter/AnnotationTypeConverterLoader.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/converter/AnnotationTypeConverterLoader.java?rev=747062&r1=747061&r2=747062&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/impl/converter/AnnotationTypeConverterLoader.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/impl/converter/AnnotationTypeConverterLoader.java Mon Feb 23 16:14:17 2009
@@ -67,6 +67,7 @@
this.resolver = resolverUtil;
}
+ @SuppressWarnings("unchecked")
public void load(TypeConverterRegistry registry) throws Exception {
String[] packageNames = findPackageNames();
resolver.findAnnotated(Converter.class, packageNames);
@@ -166,6 +167,7 @@
}
}
+ @SuppressWarnings("unchecked")
private CachingInjector handleHasConverterAnnotation(TypeConverterRegistry registry, Class type, CachingInjector injector, Method method) {
if (isValidConverterMethod(method)) {
int modifiers = method.getModifiers();
@@ -198,6 +200,7 @@
return injector;
}
+ @SuppressWarnings("unchecked")
private CachingInjector handleHasFallbackConverterAnnotation(TypeConverterRegistry registry, Class type, CachingInjector injector, Method method) {
if (isValidFallbackConverterMethod(method)) {
int modifiers = method.getModifiers();
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/impl/converter/ArrayTypeConverter.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/converter/ArrayTypeConverter.java?rev=747062&r1=747061&r2=747062&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/impl/converter/ArrayTypeConverter.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/impl/converter/ArrayTypeConverter.java Mon Feb 23 16:14:17 2009
@@ -34,6 +34,7 @@
*/
public class ArrayTypeConverter implements TypeConverter {
+ @SuppressWarnings("unchecked")
public <T> T convertTo(Class<T> type, Object value) {
if (type.isArray()) {
if (value instanceof Collection) {
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/impl/converter/DefaultTypeConverter.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/converter/DefaultTypeConverter.java?rev=747062&r1=747061&r2=747062&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/impl/converter/DefaultTypeConverter.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/impl/converter/DefaultTypeConverter.java Mon Feb 23 16:14:17 2009
@@ -26,16 +26,17 @@
import java.util.concurrent.ConcurrentHashMap;
import org.apache.camel.Exchange;
+import org.apache.camel.NoFactoryAvailableException;
import org.apache.camel.NoTypeConversionAvailableException;
import org.apache.camel.TypeConverter;
import org.apache.camel.spi.Injector;
import org.apache.camel.spi.TypeConverterAware;
import org.apache.camel.spi.TypeConverterRegistry;
import org.apache.camel.util.FactoryFinder;
-import org.apache.camel.util.NoFactoryAvailableException;
import org.apache.camel.util.ObjectHelper;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+
import static org.apache.camel.util.ObjectHelper.wrapRuntimeCamelException;
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/impl/converter/EnumTypeConverter.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/converter/EnumTypeConverter.java?rev=747062&r1=747061&r2=747062&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/impl/converter/EnumTypeConverter.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/impl/converter/EnumTypeConverter.java Mon Feb 23 16:14:17 2009
@@ -32,6 +32,7 @@
*/
public class EnumTypeConverter implements TypeConverter {
+ @SuppressWarnings("unchecked")
public <T> T convertTo(Class<T> type, Object value) {
if (type.isEnum() && value != null) {
String text = value.toString();
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/impl/converter/InstanceMethodFallbackTypeConverter.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/converter/InstanceMethodFallbackTypeConverter.java?rev=747062&r1=747061&r2=747062&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/impl/converter/InstanceMethodFallbackTypeConverter.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/impl/converter/InstanceMethodFallbackTypeConverter.java Mon Feb 23 16:14:17 2009
@@ -52,6 +52,7 @@
return convertTo(type, null, value);
}
+ @SuppressWarnings("unchecked")
public <T> T convertTo(Class<T> type, Exchange exchange, Object value) {
Object instance = injector.newInstance();
if (instance == null) {
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/impl/converter/InstanceMethodTypeConverter.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/converter/InstanceMethodTypeConverter.java?rev=747062&r1=747061&r2=747062&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/impl/converter/InstanceMethodTypeConverter.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/impl/converter/InstanceMethodTypeConverter.java Mon Feb 23 16:14:17 2009
@@ -49,6 +49,7 @@
return convertTo(type, null, value);
}
+ @SuppressWarnings("unchecked")
public <T> T convertTo(Class<T> type, Exchange exchange, Object value) {
Object instance = injector.newInstance();
if (instance == null) {
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/impl/converter/StaticMethodFallbackTypeConverter.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/converter/StaticMethodFallbackTypeConverter.java?rev=747062&r1=747061&r2=747062&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/impl/converter/StaticMethodFallbackTypeConverter.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/impl/converter/StaticMethodFallbackTypeConverter.java Mon Feb 23 16:14:17 2009
@@ -49,6 +49,7 @@
return convertTo(type, null, value);
}
+ @SuppressWarnings("unchecked")
public <T> T convertTo(Class<T> type, Exchange exchange, Object value) {
return useExchange ? (T)ObjectHelper.invokeMethod(method, null, type, exchange, value, registry)
: (T)ObjectHelper.invokeMethod(method, null, type, value, registry);
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/impl/converter/StaticMethodTypeConverter.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/converter/StaticMethodTypeConverter.java?rev=747062&r1=747061&r2=747062&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/impl/converter/StaticMethodTypeConverter.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/impl/converter/StaticMethodTypeConverter.java Mon Feb 23 16:14:17 2009
@@ -45,6 +45,7 @@
return convertTo(type, null, value);
}
+ @SuppressWarnings("unchecked")
public <T> T convertTo(Class<T> type, Exchange exchange, Object value) {
return useExchange ? (T)ObjectHelper.invokeMethod(method, null, value, exchange)
: (T)ObjectHelper.invokeMethod(method, null, value);
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/impl/converter/ToStringTypeConverter.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/converter/ToStringTypeConverter.java?rev=747062&r1=747061&r2=747062&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/impl/converter/ToStringTypeConverter.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/impl/converter/ToStringTypeConverter.java Mon Feb 23 16:14:17 2009
@@ -27,6 +27,7 @@
*/
public class ToStringTypeConverter implements TypeConverter {
+ @SuppressWarnings("unchecked")
public <T> T convertTo(Class<T> toType, Object value) {
if (value != null) {
if (toType.equals(String.class)) {
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/language/bean/BeanLanguage.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/language/bean/BeanLanguage.java?rev=747062&r1=747061&r2=747062&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/language/bean/BeanLanguage.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/language/bean/BeanLanguage.java Mon Feb 23 16:14:17 2009
@@ -58,6 +58,7 @@
* @param method optional name of method to invoke for instance to avoid ambiguity
* @return the expression
*/
+ @SuppressWarnings("unchecked")
public static Expression bean(Class beanType, String method) {
Object bean = ObjectHelper.newInstance(beanType);
return bean(bean, method);
Copied: camel/trunk/camel-core/src/main/java/org/apache/camel/language/property/package.html (from r746943, camel/trunk/camel-core/src/main/java/org/apache/camel/language/header/package.html)
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/language/property/package.html?p2=camel/trunk/camel-core/src/main/java/org/apache/camel/language/property/package.html&p1=camel/trunk/camel-core/src/main/java/org/apache/camel/language/header/package.html&r1=746943&r2=747062&rev=747062&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/language/header/package.html (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/language/property/package.html Mon Feb 23 16:14:17 2009
@@ -19,7 +19,7 @@
</head>
<body>
-Camel <a href="http://activemq.apache.org/camel/header.html">Header</a> language.
+Camel <a href="http://activemq.apache.org/camel/header.html">Property</a> language.
</body>
</html>
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/management/CamelNamingStrategy.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/management/CamelNamingStrategy.java?rev=747062&r1=747061&r2=747062&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/management/CamelNamingStrategy.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/management/CamelNamingStrategy.java Mon Feb 23 16:14:17 2009
@@ -73,7 +73,7 @@
*
* @param context the camel context
* @return generated ObjectName
- * @throws MalformedObjectNameException
+ * @throws MalformedObjectNameException can be thrown
*/
public ObjectName getObjectName(CamelContext context) throws MalformedObjectNameException {
StringBuffer buffer = new StringBuffer();
@@ -130,7 +130,7 @@
* <tt><domain>:context=<context-name>,route=<route-name>,type=route,name=<route-name></tt>
*/
public ObjectName getObjectName(ManagedRoute mbean) throws MalformedObjectNameException {
- Route<? extends Exchange> route = mbean.getRoute();
+ Route route = mbean.getRoute();
Endpoint ep = route.getEndpoint();
String id = (String)route.getProperties().get(Route.ID_PROPERTY);
@@ -154,7 +154,7 @@
String cid;
if (ep != null) {
ctxid = getContextId(ep.getCamelContext());
- cid = ObjectName.quote(ep.getEndpointUri());
+ cid = ObjectName.quote(ep.getEndpointUri());
} else {
ctxid = VALUE_UNKNOWN;
cid = null;
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/management/InstrumentationErrorHandlerWrappingStrategy.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/management/InstrumentationErrorHandlerWrappingStrategy.java?rev=747062&r1=747061&r2=747062&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/management/InstrumentationErrorHandlerWrappingStrategy.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/management/InstrumentationErrorHandlerWrappingStrategy.java Mon Feb 23 16:14:17 2009
@@ -26,13 +26,11 @@
/**
* @version $Revision$
*/
-public class InstrumentationErrorHandlerWrappingStrategy implements
- ErrorHandlerWrappingStrategy {
+public class InstrumentationErrorHandlerWrappingStrategy implements ErrorHandlerWrappingStrategy {
private Map<ProcessorType, PerformanceCounter> counterMap;
- public InstrumentationErrorHandlerWrappingStrategy(
- Map<ProcessorType, PerformanceCounter> counterMap) {
+ public InstrumentationErrorHandlerWrappingStrategy(Map<ProcessorType, PerformanceCounter> counterMap) {
this.counterMap = counterMap;
}
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/management/InstrumentationInterceptStrategy.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/management/InstrumentationInterceptStrategy.java?rev=747062&r1=747061&r2=747062&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/management/InstrumentationInterceptStrategy.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/management/InstrumentationInterceptStrategy.java Mon Feb 23 16:14:17 2009
@@ -40,9 +40,7 @@
this.counterMap = counterMap;
}
- public Processor wrapProcessorInInterceptors(ProcessorType processorType,
- Processor target) throws Exception {
-
+ public Processor wrapProcessorInInterceptors(ProcessorType processorType, Processor target) throws Exception {
Processor retval = target;
PerformanceCounter counter = counterMap.get(processorType);
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/management/InstrumentationLifecycleStrategy.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/management/InstrumentationLifecycleStrategy.java?rev=747062&r1=747061&r2=747062&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/management/InstrumentationLifecycleStrategy.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/management/InstrumentationLifecycleStrategy.java Mon Feb 23 16:14:17 2009
@@ -108,6 +108,7 @@
}
}
+ @SuppressWarnings("unchecked")
public void onRoutesAdd(Collection<Route> routes) {
// the agent hasn't been started
if (!initialized) {
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/management/JmxSystemPropertyKeys.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/management/JmxSystemPropertyKeys.java?rev=747062&r1=747061&r2=747062&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/management/JmxSystemPropertyKeys.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/management/JmxSystemPropertyKeys.java Mon Feb 23 16:14:17 2009
@@ -45,8 +45,7 @@
public static final String CREATE_CONNECTOR = "org.apache.camel.jmx.createRmiConnector";
// use jvm platform mbean server flag
- public static final String USE_PLATFORM_MBS =
- "org.apache.camel.jmx.usePlatformMBeanServer";
+ public static final String USE_PLATFORM_MBS = "org.apache.camel.jmx.usePlatformMBeanServer";
private JmxSystemPropertyKeys() {
// not instantiated
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/management/ManagedRoute.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/management/ManagedRoute.java?rev=747062&r1=747061&r2=747062&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/management/ManagedRoute.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/management/ManagedRoute.java Mon Feb 23 16:14:17 2009
@@ -19,7 +19,6 @@
import java.io.IOException;
import org.apache.camel.Endpoint;
-import org.apache.camel.Exchange;
import org.apache.camel.Route;
import org.springframework.jmx.export.annotation.ManagedAttribute;
import org.springframework.jmx.export.annotation.ManagedOperation;
@@ -29,15 +28,15 @@
public class ManagedRoute extends PerformanceCounter {
public static final String VALUE_UNKNOWN = "Unknown";
- private Route<? extends Exchange> route;
+ private Route route;
private String description;
- ManagedRoute(Route<? extends Exchange> route) {
+ ManagedRoute(Route route) {
this.route = route;
this.description = route.toString();
}
- public Route<? extends Exchange> getRoute() {
+ public Route getRoute() {
return route;
}
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/model/BeanRef.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/BeanRef.java?rev=747062&r1=747061&r2=747062&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/BeanRef.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/BeanRef.java Mon Feb 23 16:14:17 2009
@@ -143,6 +143,7 @@
}
@Override
+ @SuppressWarnings("unchecked")
public Processor createProcessor(RouteContext routeContext) {
BeanProcessor answer;
if (ref != null) {
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/model/ChoiceType.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ChoiceType.java?rev=747062&r1=747061&r2=747062&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/ChoiceType.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/ChoiceType.java Mon Feb 23 16:14:17 2009
@@ -75,7 +75,7 @@
if (otherwise != null) {
otherwiseProcessor = otherwise.createProcessor(routeContext);
} else {
- LOG.warn("No otherwise clause was specified for a choice block, any unmatched exchanges will be dropped");
+ LOG.warn("No otherwise clause was specified for this choice block: " + this + ", any unmatched exchanges will be dropped.");
}
return new ChoiceProcessor(filters, otherwiseProcessor);
}
@@ -138,6 +138,7 @@
this.whenClauses = whenClauses;
}
+ @SuppressWarnings("unchecked")
public List<ProcessorType> getOutputs() {
if (otherwise != null) {
return otherwise.getOutputs();
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/model/ConvertBodyType.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ConvertBodyType.java?rev=747062&r1=747061&r2=747062&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/ConvertBodyType.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/ConvertBodyType.java Mon Feb 23 16:14:17 2009
@@ -70,6 +70,7 @@
}
@Override
+ @SuppressWarnings("unchecked")
public List<ProcessorType> getOutputs() {
return Collections.EMPTY_LIST;
}
@@ -94,7 +95,7 @@
if (typeClass == null) {
Class clazz = createTypeClass();
if (clazz == null) {
- throw new RuntimeCamelException("Can't load the class with the class name: " + getType());
+ throw new RuntimeCamelException("Cannot load the class with the class name: " + getType());
}
setTypeClass(clazz);
}
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/model/FilterType.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/FilterType.java?rev=747062&r1=747061&r2=747062&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/FilterType.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/FilterType.java Mon Feb 23 16:14:17 2009
@@ -34,6 +34,7 @@
@XmlRootElement(name = "filter")
@XmlAccessorType(XmlAccessType.FIELD)
public class FilterType extends ExpressionNode implements Block {
+
public FilterType() {
}
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/model/FinallyType.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/FinallyType.java?rev=747062&r1=747061&r2=747062&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/FinallyType.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/FinallyType.java Mon Feb 23 16:14:17 2009
@@ -31,6 +31,7 @@
@XmlRootElement(name = "finally")
@XmlAccessorType(XmlAccessType.FIELD)
public class FinallyType extends OutputType<ProcessorType> implements Block {
+
@Override
public String toString() {
return "Finally[" + getOutputs() + "]";
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/model/OptionalIdentifiedType.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/OptionalIdentifiedType.java?rev=747062&r1=747061&r2=747062&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/OptionalIdentifiedType.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/OptionalIdentifiedType.java Mon Feb 23 16:14:17 2009
@@ -90,6 +90,7 @@
* @param lang sets the language for the description, use null to not set a language
* @return the builder
*/
+ @SuppressWarnings("unchecked")
public T description(String id, String text, String lang) {
if (id != null) {
setId(id);
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/model/ProcessorType.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ProcessorType.java?rev=747062&r1=747061&r2=747062&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/ProcessorType.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/ProcessorType.java Mon Feb 23 16:14:17 2009
@@ -122,6 +122,7 @@
* @param uri the endpoint to send to
* @return the builder
*/
+ @SuppressWarnings("unchecked")
public Type to(String uri) {
addOutput(new ToType(uri));
return (Type) this;
@@ -134,6 +135,7 @@
* @param endpoint the endpoint to send to
* @return the builder
*/
+ @SuppressWarnings("unchecked")
public Type to(Endpoint endpoint) {
addOutput(new ToType(endpoint));
return (Type) this;
@@ -146,6 +148,7 @@
* @param uri the endpoint to send to
* @return the builder
*/
+ @SuppressWarnings("unchecked")
public Type to(ExchangePattern pattern, String uri) {
addOutput(new ToType(uri, pattern));
return (Type) this;
@@ -159,6 +162,7 @@
* @param endpoint the endpoint to send to
* @return the builder
*/
+ @SuppressWarnings("unchecked")
public Type to(ExchangePattern pattern, Endpoint endpoint) {
addOutput(new ToType(endpoint, pattern));
return (Type) this;
@@ -170,6 +174,7 @@
* @param uris list of endpoints to send to
* @return the builder
*/
+ @SuppressWarnings("unchecked")
public Type to(String... uris) {
for (String uri : uris) {
addOutput(new ToType(uri));
@@ -184,6 +189,7 @@
* @param endpoints list of endpoints to send to
* @return the builder
*/
+ @SuppressWarnings("unchecked")
public Type to(Endpoint... endpoints) {
for (Endpoint endpoint : endpoints) {
addOutput(new ToType(endpoint));
@@ -197,6 +203,7 @@
* @param endpoints list of endpoints to send to
* @return the builder
*/
+ @SuppressWarnings("unchecked")
public Type to(Iterable<Endpoint> endpoints) {
for (Endpoint endpoint : endpoints) {
addOutput(new ToType(endpoint));
@@ -212,6 +219,7 @@
* @param uris list of endpoints to send to
* @return the builder
*/
+ @SuppressWarnings("unchecked")
public Type to(ExchangePattern pattern, String... uris) {
for (String uri : uris) {
addOutput(new ToType(uri, pattern));
@@ -226,6 +234,7 @@
* @param endpoints list of endpoints to send to
* @return the builder
*/
+ @SuppressWarnings("unchecked")
public Type to(ExchangePattern pattern, Endpoint... endpoints) {
for (Endpoint endpoint : endpoints) {
addOutput(new ToType(endpoint, pattern));
@@ -240,6 +249,7 @@
* @param endpoints list of endpoints to send to
* @return the builder
*/
+ @SuppressWarnings("unchecked")
public Type to(ExchangePattern pattern, Iterable<Endpoint> endpoints) {
for (Endpoint endpoint : endpoints) {
addOutput(new ToType(endpoint, pattern));
@@ -255,6 +265,7 @@
* @param exchangePattern instance of {@link ExchangePattern}
* @return the builder
*/
+ @SuppressWarnings("unchecked")
public Type setExchangePattern(ExchangePattern exchangePattern) {
addOutput(new SetExchangePatternType(exchangePattern));
return (Type) this;
@@ -502,6 +513,7 @@
*
* @return the builder
*/
+ @SuppressWarnings("unchecked")
public ProcessorType<? extends ProcessorType> end() {
if (blocks.isEmpty()) {
if (parent == null) {
@@ -683,6 +695,7 @@
* @param recipients expression to decide the destinations
* @return the builder
*/
+ @SuppressWarnings("unchecked")
public Type recipientList(Expression recipients) {
RecipientListType answer = new RecipientListType(recipients);
addOutput(answer);
@@ -698,7 +711,7 @@
public ExpressionClause<ProcessorType<Type>> recipientList() {
RecipientListType answer = new RecipientListType();
addOutput(answer);
- ExpressionClause<ProcessorType<Type>> clause = new ExpressionClause<ProcessorType<Type>>((Type) this);
+ ExpressionClause<ProcessorType<Type>> clause = new ExpressionClause<ProcessorType<Type>>(this);
answer.setExpression(clause);
return clause;
}
@@ -714,6 +727,7 @@
* the list of URIs in the routing slip.
* @return the buiider
*/
+ @SuppressWarnings("unchecked")
public Type routingSlip(String header, String uriDelimiter) {
RoutingSlipType answer = new RoutingSlipType(header, uriDelimiter);
addOutput(answer);
@@ -731,6 +745,7 @@
* class will look in for the list of URIs to route the message to.
* @return the builder
*/
+ @SuppressWarnings("unchecked")
public Type routingSlip(String header) {
RoutingSlipType answer = new RoutingSlipType(header);
addOutput(answer);
@@ -1025,6 +1040,7 @@
* @param fault the fault
* @return the builder
*/
+ @SuppressWarnings("unchecked")
public Type throwFault(Throwable fault) {
ThrowFaultType answer = new ThrowFaultType();
answer.setFault(fault);
@@ -1048,6 +1064,7 @@
* @param ref a reference in the registry to lookup the interceptor that must be of type {@link DelegateProcessor}
* @return the builder
*/
+ @SuppressWarnings("unchecked")
public Type interceptor(String ref) {
InterceptorRef interceptor = new InterceptorRef(ref);
intercept(interceptor);
@@ -1061,6 +1078,7 @@
* be of type {@link DelegateProcessor}
* @return the builder
*/
+ @SuppressWarnings("unchecked")
public Type interceptors(String... refs) {
for (String ref : refs) {
interceptor(ref);
@@ -1074,6 +1092,7 @@
* @param interceptor the interceptor
* @return the builder
*/
+ @SuppressWarnings("unchecked")
public Type intercept(DelegateProcessor interceptor) {
intercept(new InterceptorRef(interceptor));
return (Type) this;
@@ -1144,6 +1163,7 @@
* @return the builder
* @see ProcessorType#proceed()
*/
+ @SuppressWarnings("unchecked")
public Type proceed() {
ProceedType proceed = null;
ProcessorType currentProcessor = this;
@@ -1180,6 +1200,7 @@
* @return the builder
* @see #proceed()
*/
+ @SuppressWarnings("unchecked")
public Type stop() {
ProcessorType currentProcessor = this;
@@ -1258,6 +1279,7 @@
*
* @return the current builder with the fault handler configured
*/
+ @SuppressWarnings("unchecked")
public Type handleFault() {
intercept(new HandleFaultType());
return (Type) this;
@@ -1269,6 +1291,7 @@
* @param errorHandlerBuilder the error handler to be used by default for all child routes
* @return the current builder with the error handler configured
*/
+ @SuppressWarnings("unchecked")
public Type errorHandler(ErrorHandlerBuilder errorHandlerBuilder) {
setErrorHandlerBuilder(errorHandlerBuilder);
return (Type) this;
@@ -1281,6 +1304,7 @@
* @param condition the flag as to whether error handlers should be inherited or not
* @return the current builder
*/
+ @SuppressWarnings("unchecked")
public Type inheritErrorHandler(boolean condition) {
setInheritErrorHandlerFlag(condition);
return (Type) this;
@@ -1297,6 +1321,7 @@
* @param processor the custom {@link Processor}
* @return the builder
*/
+ @SuppressWarnings("unchecked")
public Type process(Processor processor) {
ProcessorRef answer = new ProcessorRef(processor);
addOutput(answer);
@@ -1311,6 +1336,7 @@
* @param ref reference to a {@link Processor} to lookup in the registry
* @return the builder
*/
+ @SuppressWarnings("unchecked")
public Type processRef(String ref) {
ProcessorRef answer = new ProcessorRef();
answer.setRef(ref);
@@ -1325,6 +1351,7 @@
* @param bean the bean to invoke
* @return the builder
*/
+ @SuppressWarnings("unchecked")
public Type bean(Object bean) {
BeanRef answer = new BeanRef();
answer.setBean(bean);
@@ -1340,6 +1367,7 @@
* @param method the method name to invoke on the bean (can be used to avoid ambiguty)
* @return the builder
*/
+ @SuppressWarnings("unchecked")
public Type bean(Object bean, String method) {
BeanRef answer = new BeanRef();
answer.setBean(bean);
@@ -1355,6 +1383,7 @@
* @param beanType the bean class, Camel will instantiate an object at runtime
* @return the builder
*/
+ @SuppressWarnings("unchecked")
public Type bean(Class beanType) {
BeanRef answer = new BeanRef();
answer.setBeanType(beanType);
@@ -1370,6 +1399,7 @@
* @param method the method name to invoke on the bean (can be used to avoid ambiguty)
* @return the builder
*/
+ @SuppressWarnings("unchecked")
public Type bean(Class beanType, String method) {
BeanRef answer = new BeanRef();
answer.setBeanType(beanType);
@@ -1385,6 +1415,7 @@
* @param ref reference to a bean to lookup in the registry
* @return the builder
*/
+ @SuppressWarnings("unchecked")
public Type beanRef(String ref) {
BeanRef answer = new BeanRef(ref);
addOutput(answer);
@@ -1399,6 +1430,7 @@
* @param method the method name to invoke on the bean (can be used to avoid ambiguty)
* @return the builder
*/
+ @SuppressWarnings("unchecked")
public Type beanRef(String ref, String method) {
BeanRef answer = new BeanRef(ref, method);
addOutput(answer);
@@ -1412,7 +1444,7 @@
* @return a expression builder clause to set the body
*/
public ExpressionClause<ProcessorType<Type>> setBody() {
- ExpressionClause<ProcessorType<Type>> clause = new ExpressionClause<ProcessorType<Type>>((Type) this);
+ ExpressionClause<ProcessorType<Type>> clause = new ExpressionClause<ProcessorType<Type>>(this);
SetBodyType answer = new SetBodyType(clause);
addOutput(answer);
return clause;
@@ -1425,6 +1457,7 @@
* @param expression the expression used to set the body
* @return the builder
*/
+ @SuppressWarnings("unchecked")
public Type setBody(Expression expression) {
SetBodyType answer = new SetBodyType(expression);
addOutput(answer);
@@ -1438,6 +1471,7 @@
* @param expression the expression used to set the body
* @return the builder
*/
+ @SuppressWarnings("unchecked")
public Type transform(Expression expression) {
TransformType answer = new TransformType(expression);
addOutput(answer);
@@ -1474,7 +1508,7 @@
* @return a expression builder clause to set the header
*/
public ExpressionClause<ProcessorType<Type>> setHeader(String name) {
- ExpressionClause<ProcessorType<Type>> clause = new ExpressionClause<ProcessorType<Type>>((Type) this);
+ ExpressionClause<ProcessorType<Type>> clause = new ExpressionClause<ProcessorType<Type>>(this);
SetHeaderType answer = new SetHeaderType(name, clause);
addOutput(answer);
return clause;
@@ -1487,6 +1521,7 @@
* @param expression the expression used to set the header
* @return the builder
*/
+ @SuppressWarnings("unchecked")
public Type setHeader(String name, Expression expression) {
SetHeaderType answer = new SetHeaderType(name, expression);
addOutput(answer);
@@ -1500,7 +1535,7 @@
* @return a expression builder clause to set the header
*/
public ExpressionClause<ProcessorType<Type>> setOutHeader(String name) {
- ExpressionClause<ProcessorType<Type>> clause = new ExpressionClause<ProcessorType<Type>>((Type) this);
+ ExpressionClause<ProcessorType<Type>> clause = new ExpressionClause<ProcessorType<Type>>(this);
SetOutHeaderType answer = new SetOutHeaderType(name, clause);
addOutput(answer);
return clause;
@@ -1513,6 +1548,7 @@
* @param expression the expression used to set the header
* @return the builder
*/
+ @SuppressWarnings("unchecked")
public Type setOutHeader(String name, Expression expression) {
SetOutHeaderType answer = new SetOutHeaderType(name, expression);
addOutput(answer);
@@ -1537,6 +1573,7 @@
* @param expression the expression used to set the property
* @return the builder
*/
+ @SuppressWarnings("unchecked")
public Type setProperty(String name, Expression expression) {
SetPropertyType answer = new SetPropertyType(name, expression);
addOutput(answer);
@@ -1551,7 +1588,7 @@
* @return a expression builder clause to set the property
*/
public ExpressionClause<ProcessorType<Type>> setProperty(String name) {
- ExpressionClause<ProcessorType<Type>> clause = new ExpressionClause<ProcessorType<Type>>((Type) this);
+ ExpressionClause<ProcessorType<Type>> clause = new ExpressionClause<ProcessorType<Type>>(this);
SetPropertyType answer = new SetPropertyType(name, clause);
addOutput(answer);
return clause;
@@ -1563,6 +1600,7 @@
* @param name the header name
* @return the builder
*/
+ @SuppressWarnings("unchecked")
public Type removeHeader(String name) {
RemoveHeaderType answer = new RemoveHeaderType(name);
addOutput(answer);
@@ -1585,6 +1623,7 @@
* @param name the property name
* @return the builder
*/
+ @SuppressWarnings("unchecked")
public Type removeProperty(String name) {
RemovePropertyType answer = new RemovePropertyType(name);
addOutput(answer);
@@ -1597,6 +1636,7 @@
* @param type the type to convert to
* @return the builder
*/
+ @SuppressWarnings("unchecked")
public Type convertBodyTo(Class type) {
addOutput(new ConvertBodyType(type));
return (Type) this;
@@ -1608,6 +1648,7 @@
* @param typeString the type to convert to as a fully qualified classname
* @return the builder
*/
+ @SuppressWarnings("unchecked")
public Type convertBodyTo(String typeString) {
addOutput(new ConvertBodyType(typeString));
return (Type) this;
@@ -1620,6 +1661,7 @@
* @param comparator the comparator to use for sorting
* @return the builder
*/
+ @SuppressWarnings("unchecked")
public Type sortBody(Comparator comparator) {
addOutput(new SortType(body(), comparator));
return (Type) this;
@@ -1642,6 +1684,7 @@
* @param comparator the comparator to use for sorting
* @return the builder
*/
+ @SuppressWarnings("unchecked")
public Type sort(Expression expression, Comparator comparator) {
addOutput(new SortType(expression, comparator));
return (Type) this;
@@ -1668,8 +1711,8 @@
* data.
* @return this processor type
* @see Enricher
- *
*/
+ @SuppressWarnings("unchecked")
public Type enrich(String resourceUri, AggregationStrategy aggregationStrategy) {
addOutput(new EnricherType(aggregationStrategy, resourceUri));
return (Type)this;
@@ -1697,6 +1740,7 @@
* @param dataFormatType the dataformat
* @return the builder
*/
+ @SuppressWarnings("unchecked")
public Type unmarshal(DataFormatType dataFormatType) {
addOutput(new UnmarshalType(dataFormatType));
return (Type) this;
@@ -1723,6 +1767,7 @@
* @param dataTypeRef reference to a {@link DataFormat} to lookup in the registry
* @return the builder
*/
+ @SuppressWarnings("unchecked")
public Type unmarshal(String dataTypeRef) {
addOutput(new UnmarshalType(dataTypeRef));
return (Type) this;
@@ -1747,6 +1792,7 @@
* @param dataFormatType the dataformat
* @return the builder
*/
+ @SuppressWarnings("unchecked")
public Type marshal(DataFormatType dataFormatType) {
addOutput(new MarshalType(dataFormatType));
return (Type) this;
@@ -1773,6 +1819,7 @@
* @param dataTypeRef reference to a {@link DataFormat} to lookup in the registry
* @return the builder
*/
+ @SuppressWarnings("unchecked")
public Type marshal(String dataTypeRef) {
addOutput(new MarshalType(dataTypeRef));
return (Type) this;
@@ -1781,6 +1828,7 @@
// Properties
// -------------------------------------------------------------------------
@XmlTransient
+ @SuppressWarnings("unchecked")
public ProcessorType<? extends ProcessorType> getParent() {
return parent;
}
@@ -1835,7 +1883,7 @@
* Lets default the inherit value to be true if there is none specified
*/
public static boolean isInheritErrorHandler(Boolean value) {
- return value == null || value.booleanValue();
+ return value == null || value;
}
@XmlAttribute(name = "inheritErrorHandler", required = false)
@@ -1885,6 +1933,7 @@
* @param routeContext the route context
* @param target the processor which can be wrapped
* @return the original processor or a new wrapped interceptor
+ * @throws Exception can be thrown in case of error
*/
protected Processor wrapProcessorInInterceptors(RouteContext routeContext, Processor target) throws Exception {
ObjectHelper.notNull(target, "target", this);
@@ -1956,6 +2005,7 @@
output.setNodeFactory(getNodeFactory());
}
+ @SuppressWarnings("unchecked")
public void addOutput(ProcessorType processorType) {
processorType.setParent(this);
configureChild(processorType);
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/model/ResequencerType.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ResequencerType.java?rev=747062&r1=747061&r2=747062&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/ResequencerType.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/ResequencerType.java Mon Feb 23 16:14:17 2009
@@ -217,13 +217,11 @@
@XmlElement(name = "batch-config", required = false)
public void setBatchConfig(BatchResequencerConfig batchConfig) {
- // TODO: find out how to have these two within an <xsd:choice>
batch(batchConfig);
}
@XmlElement(name = "stream-config", required = false)
public void setStreamConfig(StreamResequencerConfig streamConfig) {
- // TODO: find out how to have these two within an <xsd:choice>
stream(streamConfig);
}
@@ -241,12 +239,10 @@
* Creates a batch {@link Resequencer} instance applying the given
* <code>config</code>.
*
- * @param routeContext
- * route context.
- * @param config
- * batch resequencer configuration.
+ * @param routeContext route context.
+ * @param config batch resequencer configuration.
* @return the configured batch resequencer.
- * @throws Exception
+ * @throws Exception can be thrown
*/
protected Resequencer createBatchResequencer(RouteContext routeContext,
BatchResequencerConfig config) throws Exception {
@@ -261,12 +257,10 @@
* Creates a {@link StreamResequencer} instance applying the given
* <code>config</code>.
*
- * @param routeContext
- * route context.
- * @param config
- * stream resequencer configuration.
+ * @param routeContext route context.
+ * @param config stream resequencer configuration.
* @return the configured stream resequencer.
- * @throws Exception
+ * @throws Exception can be thrwon
*/
protected StreamResequencer createStreamResequencer(RouteContext routeContext,
StreamResequencerConfig config) throws Exception {
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/model/RouteContainer.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/RouteContainer.java?rev=747062&r1=747061&r2=747062&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/RouteContainer.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/RouteContainer.java Mon Feb 23 16:14:17 2009
@@ -29,12 +29,16 @@
/**
* Returns the routes
+ *
+ * @return the routes
*/
@XmlElementRef
List<RouteType> getRoutes();
/**
* Sets the routes to use
+ *
+ * @param routes the routes
*/
void setRoutes(List<RouteType> routes);
}
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/model/RouteType.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/RouteType.java?rev=747062&r1=747061&r2=747062&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/RouteType.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/RouteType.java Mon Feb 23 16:14:17 2009
@@ -287,14 +287,6 @@
for (InterceptorType interceptor : interceptors) {
output.addInterceptor(interceptor);
}
-/*
- List<InterceptorType> list = output.getInterceptors();
- if (list == null) {
- LOG.warn("No interceptor collection: " + output);
- } else {
- list.addAll(getInterceptors());
- }
-*/
}
@Override
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/model/RoutingSlipType.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/RoutingSlipType.java?rev=747062&r1=747061&r2=747062&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/RoutingSlipType.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/RoutingSlipType.java Mon Feb 23 16:14:17 2009
@@ -73,6 +73,7 @@
}
@Override
+ @SuppressWarnings("unchecked")
public List<ProcessorType> getOutputs() {
return Collections.EMPTY_LIST;
}
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/model/SendType.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/SendType.java?rev=747062&r1=747061&r2=747062&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/SendType.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/SendType.java Mon Feb 23 16:14:17 2009
@@ -89,6 +89,7 @@
return null;
}
+ @SuppressWarnings("unchecked")
public List<ProcessorType> getOutputs() {
return Collections.EMPTY_LIST;
}
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/model/SetExchangePatternType.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/SetExchangePatternType.java?rev=747062&r1=747061&r2=747062&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/SetExchangePatternType.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/SetExchangePatternType.java Mon Feb 23 16:14:17 2009
@@ -71,9 +71,7 @@
@Override
public String toString() {
- return "setExchangePattern["
- + "pattern: " + pattern
- + "]";
+ return "setExchangePattern[pattern: " + pattern + "]";
}
@Override
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/model/SortType.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/SortType.java?rev=747062&r1=747061&r2=747062&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/SortType.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/SortType.java Mon Feb 23 16:14:17 2009
@@ -93,6 +93,7 @@
}
@Override
+ @SuppressWarnings("unchecked")
public List<ProcessorType> getOutputs() {
return Collections.EMPTY_LIST;
}
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/model/SplitterType.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/SplitterType.java?rev=747062&r1=747061&r2=747062&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/SplitterType.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/SplitterType.java Mon Feb 23 16:14:17 2009
@@ -170,6 +170,7 @@
/**
* Setting the executor for executing the splitting action.
*
+ * @param executor the executor
* @return the builder
*/
public SplitterType executor(Executor executor) {
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/model/ThrowFaultType.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ThrowFaultType.java?rev=747062&r1=747061&r2=747062&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/ThrowFaultType.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/ThrowFaultType.java Mon Feb 23 16:14:17 2009
@@ -92,6 +92,7 @@
}
@Override
+ @SuppressWarnings("unchecked")
public List<ProcessorType> getOutputs() {
return Collections.EMPTY_LIST;
}
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/model/config/StreamResequencerConfig.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/config/StreamResequencerConfig.java?rev=747062&r1=747061&r2=747062&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/config/StreamResequencerConfig.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/config/StreamResequencerConfig.java Mon Feb 23 16:14:17 2009
@@ -97,6 +97,7 @@
*
* @param capacity capacity of the resequencer's inbound queue.
* @param timeout minimum time to wait for missing elements (messages).
+ * @param comparator comparator for sequence comparision
*/
public StreamResequencerConfig(int capacity, long timeout, ExpressionResultComparator comparator) {
this.capacity = capacity;
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/DataFormatType.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/DataFormatType.java?rev=747062&r1=747061&r2=747062&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/DataFormatType.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/DataFormatType.java Mon Feb 23 16:14:17 2009
@@ -97,6 +97,7 @@
/**
* Factory method to create the data format instance
*/
+ @SuppressWarnings("unchecked")
protected DataFormat createDataFormat(RouteContext routeContext) {
if (dataFormatTypeName != null) {
Class type = ObjectHelper.loadClass(dataFormatTypeName, getClass().getClassLoader());
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/JaxbDataFormat.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/JaxbDataFormat.java?rev=747062&r1=747061&r2=747062&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/JaxbDataFormat.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/JaxbDataFormat.java Mon Feb 23 16:14:17 2009
@@ -75,13 +75,13 @@
@Override
protected void configureDataFormat(DataFormat dataFormat) {
Boolean answer = ObjectHelper.toBoolean(getPrettyPrint());
- if (answer != null && !answer.booleanValue()) {
+ if (answer != null && !answer) {
setProperty(dataFormat, "prettyPrint", Boolean.FALSE);
} else { // the default value is true
setProperty(dataFormat, "prettyPrint", Boolean.TRUE);
}
answer = ObjectHelper.toBoolean(getIgnoreJAXBElement());
- if (answer != null && !answer.booleanValue()) {
+ if (answer != null && !answer) {
setProperty(dataFormat, "ignoreJAXBElement", Boolean.FALSE);
} else { // the default value is true
setProperty(dataFormat, "ignoreJAXBElement", Boolean.TRUE);
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/model/language/ExpressionType.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/language/ExpressionType.java?rev=747062&r1=747061&r2=747062&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/language/ExpressionType.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/language/ExpressionType.java Mon Feb 23 16:14:17 2009
@@ -90,7 +90,7 @@
public String toString() {
StringBuilder sb = new StringBuilder();
if (getLanguage() != null) {
- sb.append(getLanguage() + "{");
+ sb.append(getLanguage()).append("{");
}
if (getExpression() != null) {
sb.append(getExpression());
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/model/language/XQueryExpression.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/language/XQueryExpression.java?rev=747062&r1=747061&r2=747062&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/language/XQueryExpression.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/language/XQueryExpression.java Mon Feb 23 16:14:17 2009
@@ -24,6 +24,7 @@
import org.apache.camel.Expression;
import org.apache.camel.Predicate;
+import org.apache.camel.RuntimeCamelException;
import org.apache.camel.spi.RouteContext;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -93,7 +94,7 @@
try {
resultType = Class.forName(type);
} catch (ClassNotFoundException e) {
- LOG.error("ClassNotFoundException creating class: " + type);
+ throw new RuntimeCamelException(e);
}
}
}
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/model/loadbalancer/FailOverLoadBalanceStrategy.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/loadbalancer/FailOverLoadBalanceStrategy.java?rev=747062&r1=747061&r2=747062&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/loadbalancer/FailOverLoadBalanceStrategy.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/loadbalancer/FailOverLoadBalanceStrategy.java Mon Feb 23 16:14:17 2009
@@ -20,9 +20,9 @@
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlAttribute;
import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlTransient;
import org.apache.camel.RuntimeCamelException;
+import org.apache.camel.processor.loadbalancer.FailOverLoadBalancer;
import org.apache.camel.processor.loadbalancer.LoadBalancer;
import org.apache.camel.spi.RouteContext;
import org.apache.camel.util.ObjectHelper;
@@ -38,11 +38,11 @@
if (ObjectHelper.isNotEmpty(failedException)) {
Class failExceptionClazz = ObjectHelper.loadClass(failedException);
if (failExceptionClazz == null) {
- throw new RuntimeCamelException("Can't find the failException " + failedException + " for the FailOverLoadBalancer");
+ throw new RuntimeCamelException("Cannot find failException: " + failedException + " to be used with this FailOverLoadBalancer");
}
- return new org.apache.camel.processor.loadbalancer.FailOverLoadBalancer(failExceptionClazz);
+ return new FailOverLoadBalancer(failExceptionClazz);
} else {
- return new org.apache.camel.processor.loadbalancer.FailOverLoadBalancer();
+ return new FailOverLoadBalancer();
}
}
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/model/loadbalancer/LoadBalancerType.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/loadbalancer/LoadBalancerType.java?rev=747062&r1=747061&r2=747062&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/loadbalancer/LoadBalancerType.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/loadbalancer/LoadBalancerType.java Mon Feb 23 16:14:17 2009
@@ -100,11 +100,12 @@
/**
* Factory method to create the load balancer instance
*/
+ @SuppressWarnings("unchecked")
protected LoadBalancer createLoadBalancer(RouteContext routeContext) {
if (loadBalancerTypeName != null) {
Class type = ObjectHelper.loadClass(loadBalancerTypeName, getClass().getClassLoader());
if (type == null) {
- throw new IllegalArgumentException("The class " + loadBalancerTypeName + " is not on the classpath! Cannot use the loadBalancer " + this);
+ throw new IllegalArgumentException("Cannot find class: " + loadBalancerTypeName + " in the classpath");
}
return (LoadBalancer) ObjectHelper.newInstance(type);
}
@@ -136,12 +137,10 @@
ObjectHelper.notNull(loadBalancer, "loadBalancer");
return loadBalancer.process(exchange, new AsyncCallback() {
- public void done(boolean doneSynchronously) {
+ public void done(boolean sync) {
// Only handle the async case...
- if (doneSynchronously) {
- return;
- } else {
- callback.done(doneSynchronously);
+ if (!sync) {
+ callback.done(sync);
}
}
});
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/processor/ConvertBodyProcessor.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/ConvertBodyProcessor.java?rev=747062&r1=747061&r2=747062&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/processor/ConvertBodyProcessor.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/processor/ConvertBodyProcessor.java Mon Feb 23 16:14:17 2009
@@ -20,7 +20,6 @@
import org.apache.camel.Message;
import org.apache.camel.NoTypeConversionAvailableException;
import org.apache.camel.Processor;
-import org.apache.camel.util.ExchangeHelper;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -37,6 +36,7 @@
this.type = type;
}
+ @SuppressWarnings("unchecked")
public void process(Exchange exchange) throws Exception {
Message in = exchange.getIn();
Object value = null;
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/processor/Delayer.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/Delayer.java?rev=747062&r1=747061&r2=747062&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/processor/Delayer.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/processor/Delayer.java Mon Feb 23 16:14:17 2009
@@ -71,7 +71,7 @@
if (timeExpression != null) {
Long longValue = timeExpression.evaluate(exchange, Long.class);
if (longValue != null) {
- time = longValue.longValue();
+ time = longValue;
}
}
if (time <= 0) {
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/processor/Enricher.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/Enricher.java?rev=747062&r1=747061&r2=747062&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/processor/Enricher.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/processor/Enricher.java Mon Feb 23 16:14:17 2009
@@ -45,8 +45,7 @@
* input data. When using the copy aggregation strategy the enricher
* degenerates to a normal transformer.
*
- * @param producer
- * producer to resource endpoint.
+ * @param producer producer to resource endpoint.
*/
public Enricher(Producer producer) {
this(defaultAggregationStrategy(), producer);
@@ -55,11 +54,8 @@
/**
* Creates a new {@link Enricher}.
*
- * @param aggregationStrategy
- * aggregation strategy to aggregate input data and additional
- * data.
- * @param producer
- * producer to resource endpoint.
+ * @param aggregationStrategy aggregation strategy to aggregate input data and additional data.
+ * @param producer producer to resource endpoint.
*/
public Enricher(AggregationStrategy aggregationStrategy, Producer producer) {
this.aggregationStrategy = aggregationStrategy;
@@ -92,8 +88,7 @@
* will be done and the failed exchange content is copied over to the
* original message exchange.
*
- * @param exchange
- * input data.
+ * @param exchange input data.
*/
public void process(Exchange exchange) throws Exception {
Exchange resourceExchange = createResourceExchange(exchange, ExchangePattern.InOut);
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/processor/ExchangePatternProcessor.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/ExchangePatternProcessor.java?rev=747062&r1=747061&r2=747062&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/processor/ExchangePatternProcessor.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/processor/ExchangePatternProcessor.java Mon Feb 23 16:14:17 2009
@@ -26,7 +26,6 @@
private ExchangePattern exchangePattern = ExchangePattern.InOnly;
public ExchangePatternProcessor() {
-
}
public ExchangePatternProcessor(ExchangePattern ep) {
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/processor/LoopProcessor.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/LoopProcessor.java?rev=747062&r1=747061&r2=747062&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/processor/LoopProcessor.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/processor/LoopProcessor.java Mon Feb 23 16:14:17 2009
@@ -30,9 +30,6 @@
* @version $Revision$
*/
public class LoopProcessor extends DelegateProcessor {
- public static final String PROP_ITER_COUNT = "CamelIterationCount";
- public static final String PROP_ITER_INDEX = "CamelIterationIndex";
-
private static final Log LOG = LogFactory.getLog(LoopProcessor.class);
private Expression expression;
@@ -50,13 +47,16 @@
Integer value = ExchangeHelper.convertToType(exchange, Integer.class, text);
if (value == null) {
// TODO: we should probably catch evaluate/convert exception an set is as fault (after fix for CAMEL-316)
- throw new RuntimeCamelException("Expression \"" + expression + "\" does not evaluate to an int.");
+ throw new RuntimeCamelException("Expression \"" + expression + "\" is not convertable to an Integer.");
}
- int count = value.intValue();
- exchange.setProperty(PROP_ITER_COUNT, count);
+
+ int count = value;
+ exchange.setProperty(Exchange.LOOP_SIZE, count);
for (int i = 0; i < count; i++) {
- LOG.debug("LoopProcessor: iteration #" + i);
- exchange.setProperty(PROP_ITER_INDEX, i);
+ if (LOG.isDebugEnabled()) {
+ LOG.debug("LoopProcessor: iteration #" + i);
+ }
+ exchange.setProperty(Exchange.LOOP_INDEX, i);
super.process(exchange);
}
}
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/processor/Splitter.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/Splitter.java?rev=747062&r1=747061&r2=747062&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/processor/Splitter.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/processor/Splitter.java Mon Feb 23 16:14:17 2009
@@ -43,9 +43,6 @@
* @version $Revision$
*/
public class Splitter extends MulticastProcessor implements Processor {
- public static final String SPLIT_SIZE = "org.apache.camel.splitSize";
- public static final String SPLIT_COUNTER = "org.apache.camel.splitCounter";
-
private final Expression expression;
public Splitter(Expression expression, Processor destination, AggregationStrategy aggregationStrategy) {
@@ -98,7 +95,7 @@
}
public void remove() {
- throw new UnsupportedOperationException("remove is not supported by this iterator");
+ throw new UnsupportedOperationException("Remove is not supported by this iterator");
}
};
}
@@ -126,10 +123,10 @@
}
@Override
- protected void updateNewExchange(Exchange exchange, int i, Iterable<ProcessorExchangePair> allPairs) {
- exchange.getIn().setHeader(SPLIT_COUNTER, i);
+ protected void updateNewExchange(Exchange exchange, int index, Iterable<ProcessorExchangePair> allPairs) {
+ exchange.getIn().setHeader(Exchange.SPLIT_INDEX, index);
if (allPairs instanceof Collection) {
- exchange.getIn().setHeader(SPLIT_SIZE, ((Collection) allPairs).size());
+ exchange.getIn().setHeader(Exchange.SPLIT_SIZE, ((Collection) allPairs).size());
}
}
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/processor/StreamResequencer.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/StreamResequencer.java?rev=747062&r1=747061&r2=747062&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/processor/StreamResequencer.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/processor/StreamResequencer.java Mon Feb 23 16:14:17 2009
@@ -63,12 +63,8 @@
/**
* Creates a new {@link StreamResequencer} instance.
*
- * @param endpoint
- * endpoint to poll exchanges from.
- * @param processor
- * next processor that processes re-ordered exchanges.
- * @param comparator
- * a sequence element comparator for exchanges.
+ * @param processor next processor that processes re-ordered exchanges.
+ * @param comparator a sequence element comparator for exchanges.
*/
public StreamResequencer(Processor processor, SequenceElementComparator<Exchange> comparator) {
this.exceptionHandler = new LoggingExceptionHandler(getClass());
@@ -79,8 +75,6 @@
/**
* Returns this resequencer's exception handler.
- *
- * @return this resequencer's exception handler.
*/
public ExceptionHandler getExceptionHandler() {
return exceptionHandler;
@@ -88,8 +82,6 @@
/**
* Returns the next processor.
- *
- * @return the next processor.
*/
public Processor getProcessor() {
return processor;
@@ -113,8 +105,7 @@
* timeout via {@link ResequencerEngine#setTimeout(long)}. This value is
* also used to define the polling timeout from the endpoint.
*
- * @return this resequencer's timeout.
- * (Processor)
+ * @return this resequencer's timeout. (Processor)
* @see ResequencerEngine#setTimeout(long)
*/
public long getTimeout() {
@@ -153,11 +144,10 @@
/**
* Sends the <code>exchange</code> to the next <code>processor</code>.
*
- * @param o
- * exchange to send.
+ * @param exchange exchange to send.
*/
- public void sendElement(Exchange o) throws Exception {
- processor.process(o);
+ public void sendElement(Exchange exchange) throws Exception {
+ processor.process(exchange);
}
public void process(Exchange exchange) throws Exception {
@@ -173,7 +163,7 @@
private volatile boolean cancelRequested;
public Delivery() {
- super("Delivery Thread");
+ super("Resequencer Delivery Thread");
}
@Override
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/processor/TransformProcessor.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/TransformProcessor.java?rev=747062&r1=747061&r2=747062&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/processor/TransformProcessor.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/processor/TransformProcessor.java Mon Feb 23 16:14:17 2009
@@ -19,14 +19,11 @@
import org.apache.camel.Exchange;
import org.apache.camel.Expression;
import org.apache.camel.Processor;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
/**
* A processor which sets the body on the OUT message with an expression
*/
public class TransformProcessor extends DelegateProcessor implements Processor {
- private static final transient Log LOG = LogFactory.getLog(TransformProcessor.class);
private Expression expression;
public TransformProcessor(Expression expression) {
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/processor/idempotent/IdempotentConsumer.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/idempotent/IdempotentConsumer.java?rev=747062&r1=747061&r2=747062&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/processor/idempotent/IdempotentConsumer.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/processor/idempotent/IdempotentConsumer.java Mon Feb 23 16:14:17 2009
@@ -51,6 +51,7 @@
+ ", processor=" + nextProcessor + "]";
}
+ @SuppressWarnings("unchecked")
public void process(Exchange exchange) throws Exception {
String messageId = messageIdExpression.evaluate(exchange, String.class);
if (messageId == null) {
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/processor/interceptor/DefaultTraceFormatter.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/interceptor/DefaultTraceFormatter.java?rev=747062&r1=747061&r2=747062&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/processor/interceptor/DefaultTraceFormatter.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/processor/interceptor/DefaultTraceFormatter.java Mon Feb 23 16:14:17 2009
@@ -263,7 +263,7 @@
// assemble result with and without the to/from
if (showNode) {
- result = id.trim() + " >>> " + from.toString() + " --> " + to.trim();
+ result = id.trim() + " >>> " + from + " --> " + to.trim();
if (interceptor.shouldTraceOutExchanges() && exchange.getOut(false) != null) {
result += " (OUT) ";
}
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/processor/interceptor/ExchangeFormatter.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/interceptor/ExchangeFormatter.java?rev=747062&r1=747061&r2=747062&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/processor/interceptor/ExchangeFormatter.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/processor/interceptor/ExchangeFormatter.java Mon Feb 23 16:14:17 2009
@@ -28,6 +28,9 @@
/**
* Generates a string representation of the exchange
+ *
+ * @param exchange the exchange
+ * @return a string representation of the exchange
*/
Object format(Exchange exchange);
}
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/processor/interceptor/StreamCaching.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/interceptor/StreamCaching.java?rev=747062&r1=747061&r2=747062&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/processor/interceptor/StreamCaching.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/processor/interceptor/StreamCaching.java Mon Feb 23 16:14:17 2009
@@ -33,9 +33,6 @@
super();
}
- /**
- * {@inheritDoc}
- */
@SuppressWarnings("unchecked")
public Processor wrapProcessorInInterceptors(ProcessorType processorType, Processor target) throws Exception {
return new StreamCachingInterceptor(target);
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/processor/interceptor/TraceInterceptor.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/interceptor/TraceInterceptor.java?rev=747062&r1=747061&r2=747062&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/processor/interceptor/TraceInterceptor.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/processor/interceptor/TraceInterceptor.java Mon Feb 23 16:14:17 2009
@@ -151,6 +151,7 @@
logger.process(exchange);
}
+ @SuppressWarnings("unchecked")
protected void traceExchange(Exchange exchange) throws Exception {
// should we send a trace event to an optional destination?
if (tracer.getDestination() != null || tracer.getDestinationUri() != null) {