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/12/09 08:04:43 UTC
svn commit: r724627 - in /activemq/camel/trunk/camel-core/src:
main/java/org/apache/camel/builder/ main/java/org/apache/camel/builder/xml/
main/java/org/apache/camel/component/bean/
main/java/org/apache/camel/component/file/ main/java/org/apache/camel/...
Author: davsclaus
Date: Mon Dec 8 23:04:39 2008
New Revision: 724627
URL: http://svn.apache.org/viewvc?rev=724627&view=rev
Log:
CAMEL-1155, CAMEL-1160: Using ObjectHelper.notNull for testing. Fixed attributes that should be required. Fixed Spelling.
Modified:
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/ExpressionBuilder.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/RouteBuilder.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/xml/XsltBuilder.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/DefaultAnnotationExpressionFactory.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/FileComponent.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/FileConsumer.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/strategy/FileExpressionRenamer.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultComponent.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultComponentResolver.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultLanguageResolver.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/ScheduledPollConsumer.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/BeanRef.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/InterceptorRef.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/InterceptorType.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/OutputType.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/PolicyRef.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ProcessorRef.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/model/RecipientListType.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/RemoveHeaderType.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/RemovePropertyType.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/RouteBuilderRef.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/RouteContainer.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/RouteType.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/RoutingSlipType.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/SetOutHeaderType.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/SetPropertyType.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ThreadType.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/loadbalancer/LoadBalancerType.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/SendProcessor.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/util/ObjectHelper.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/util/jndi/JndiContext.java
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/model/ProcessorTypeConfigurationTest.java
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/ExpressionBuilder.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/ExpressionBuilder.java?rev=724627&r1=724626&r2=724627&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/ExpressionBuilder.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/ExpressionBuilder.java Mon Dec 8 23:04:39 2008
@@ -439,7 +439,7 @@
@Override
public String toString() {
- return "" + expression + ".convertTo(" + type.getName() + ".class)";
+ return "" + expression + ".convertTo(" + type.getCanonicalName() + ".class)";
}
};
}
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/RouteBuilder.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/RouteBuilder.java?rev=724627&r1=724626&r2=724627&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/RouteBuilder.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/RouteBuilder.java Mon Dec 8 23:04:39 2008
@@ -222,7 +222,7 @@
protected void populateRoutes(List<Route> routes) throws Exception {
CamelContext camelContext = getContext();
if (camelContext == null) {
- throw new IllegalArgumentException("No CamelContext has been injected!");
+ throw new IllegalArgumentException("CamelContext has not been injected!");
}
routeCollection.setCamelContext(camelContext);
camelContext.addRouteDefinitions(routeCollection.getRoutes());
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/xml/XsltBuilder.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/xml/XsltBuilder.java?rev=724627&r1=724626&r2=724627&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/xml/XsltBuilder.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/xml/XsltBuilder.java Mon Dec 8 23:04:39 2008
@@ -67,9 +67,8 @@
}
public void process(Exchange exchange) throws Exception {
- if (getTemplate() == null) {
- throw new IllegalArgumentException("No template configured!");
- }
+ notNull(getTemplate(), "template");
+
Transformer transformer = getTemplate().newTransformer();
configureTransformer(transformer, exchange);
Source source = getSource(exchange);
@@ -207,7 +206,7 @@
setTemplate(templates);
} else {
throw new TransformerConfigurationException("Error creating XSLT template. "
- + "This is most likely be caused by an XML parse error. "
+ + "This is most likely be caused by a XML parse error. "
+ "Please verify your XSLT file configured.");
}
}
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/DefaultAnnotationExpressionFactory.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/DefaultAnnotationExpressionFactory.java?rev=724627&r1=724626&r2=724627&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/DefaultAnnotationExpressionFactory.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/DefaultAnnotationExpressionFactory.java Mon Dec 8 23:04:39 2008
@@ -55,7 +55,7 @@
}
return value.toString();
} catch (NoSuchMethodException e) {
- throw new IllegalArgumentException("Cannot determine the expression of the annotation: " + annotation + " as it does not have an value() method");
+ throw new IllegalArgumentException("Cannot determine the expression of the annotation: " + annotation + " as it does not have a value() method");
}
}
}
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/FileComponent.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/FileComponent.java?rev=724627&r1=724626&r2=724627&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/FileComponent.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/FileComponent.java Mon Dec 8 23:04:39 2008
@@ -94,7 +94,7 @@
boolean ignoreCase = reminder.startsWith("ignoreCase:");
reminder = ignoreCase ? ifStartsWithReturnRemainder("ignoreCase:", reminder) : reminder;
- ObjectHelper.notNull(reminder, "sortBy option does not contain the expression");
+ ObjectHelper.notEmpty(reminder, "sortBy expression");
// recursive add nested sorters
return DefaultFileSorter.sortByFileLanguage(reminder, reverse, ignoreCase, createSortByComparator(it));
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/FileConsumer.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/FileConsumer.java?rev=724627&r1=724626&r2=724627&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/FileConsumer.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/FileConsumer.java Mon Dec 8 23:04:39 2008
@@ -46,6 +46,9 @@
private String regexPattern = "";
private boolean exclusiveReadLock = true;
+ // TODO: move option to endpoint to get rid of consumer. prefix
+ // TODO: remove idempotent again, we should just use the idempotent DSL we already have
+
public FileConsumer(final FileEndpoint endpoint, Processor processor) {
super(endpoint, processor);
this.endpoint = endpoint;
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/strategy/FileExpressionRenamer.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/strategy/FileExpressionRenamer.java?rev=724627&r1=724626&r2=724627&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/strategy/FileExpressionRenamer.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/strategy/FileExpressionRenamer.java Mon Dec 8 23:04:39 2008
@@ -20,6 +20,7 @@
import org.apache.camel.Expression;
import org.apache.camel.component.file.FileExchange;
+import org.apache.camel.util.ObjectHelper;
/**
* File renamed using {@link Expression} to dynamically compute the file name.
@@ -34,10 +35,7 @@
private Expression expression;
public File renameFile(FileExchange exchange, File file) {
- if (expression == null) {
- throw new IllegalArgumentException("Expression is not set");
- }
- File parent = file.getParentFile();
+ ObjectHelper.notNull(expression, "expression");
Object result = expression.evaluate(exchange);
String name = exchange.getContext().getTypeConverter().convertTo(String.class, result);
@@ -45,6 +43,8 @@
if (ON_WINDOWS && (name.indexOf(":") >= 0 || name.startsWith("//"))) {
return new File(name);
}
+
+ File parent = file.getParentFile();
return new File(parent, name);
}
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java?rev=724627&r1=724626&r2=724627&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java Mon Dec 8 23:04:39 2008
@@ -157,9 +157,7 @@
}
public void addComponent(String componentName, final Component component) {
- if (component == null) {
- throw new IllegalArgumentException("Component cannot be null");
- }
+ ObjectHelper.notNull(component, "component");
synchronized (components) {
if (components.containsKey(componentName)) {
throw new IllegalArgumentException("Component previously added: " + componentName);
@@ -180,8 +178,7 @@
if (component != null) {
addComponent(name, component);
if (isStarted()) {
- // If the component is looked up after the context
- // is started,
+ // If the component is looked up after the context is started,
// lets start it up.
startServices(component);
}
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultComponent.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultComponent.java?rev=724627&r1=724626&r2=724627&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultComponent.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultComponent.java Mon Dec 8 23:04:39 2008
@@ -194,7 +194,7 @@
/**
* Sets the reference properties on the given bean
* <p/>
- * This is convention over configuration, setting all reference parameters (identifier with a value starting with #)
+ * This is convention over configuration, setting all reference parameters (using {@link #isReferenceParameter(String)}
* by looking it up in registry and setting it on the bean if possible.
*/
protected void setReferenceProperties(Object bean, Map parameters) throws Exception {
@@ -222,7 +222,7 @@
}
/**
- * Is the given parameter a reference parameter
+ * Is the given parameter a reference parameter (starting with a # char)
*/
protected boolean isReferenceParameter(String parameter) {
return parameter != null && parameter.startsWith("#");
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultComponentResolver.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultComponentResolver.java?rev=724627&r1=724626&r2=724627&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultComponentResolver.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultComponentResolver.java Mon Dec 8 23:04:39 2008
@@ -59,11 +59,10 @@
} catch (NoFactoryAvailableException e) {
return null;
} catch (Throwable e) {
- throw new IllegalArgumentException("Invalid URI, no Component registered for scheme : "
- + name, e);
+ throw new IllegalArgumentException("Invalid URI, no Component registered for scheme: " + name, e);
}
if (LOG.isDebugEnabled()) {
- LOG.debug("Found component: " + name + " via type: " + type.getName() + " via " + COMPONENT_FACTORY.getPath() + name);
+ LOG.debug("Found component: " + name + " via type: " + type.getName() + " via: " + COMPONENT_FACTORY.getPath() + name);
}
if (type == null) {
return null;
@@ -71,8 +70,7 @@
if (Component.class.isAssignableFrom(type)) {
return (Component) context.getInjector().newInstance(type);
} else {
- throw new IllegalArgumentException("Type is not a Component implementation. Found: "
- + type.getName());
+ throw new IllegalArgumentException("Type is not a Component implementation. Found: " + type.getName());
}
}
}
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultLanguageResolver.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultLanguageResolver.java?rev=724627&r1=724626&r2=724627&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultLanguageResolver.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultLanguageResolver.java Mon Dec 8 23:04:39 2008
@@ -40,7 +40,7 @@
} catch (NoFactoryAvailableException e) {
// ignore
} catch (Throwable e) {
- throw new IllegalArgumentException("Invalid URI, no Language registered for scheme : " + name, e);
+ throw new IllegalArgumentException("Invalid URI, no Language registered for scheme: " + name, e);
}
if (type != null) {
if (Language.class.isAssignableFrom(type)) {
@@ -59,7 +59,7 @@
} catch (NoFactoryAvailableException e) {
// ignore
} catch (Throwable e) {
- throw new IllegalArgumentException("Invalid URI, no Language registered for scheme : " + name, e);
+ throw new IllegalArgumentException("Invalid URI, no Language registered for scheme: " + name, e);
}
if (type != null) {
if (LanguageResolver.class.isAssignableFrom(type)) {
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/ScheduledPollConsumer.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/ScheduledPollConsumer.java?rev=724627&r1=724626&r2=724627&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/ScheduledPollConsumer.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/ScheduledPollConsumer.java Mon Dec 8 23:04:39 2008
@@ -21,8 +21,8 @@
import java.util.concurrent.TimeUnit;
import org.apache.camel.Endpoint;
-import org.apache.camel.Exchange;
import org.apache.camel.Processor;
+import org.apache.camel.util.ObjectHelper;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -50,9 +50,7 @@
public ScheduledPollConsumer(Endpoint endpoint, Processor processor, ScheduledExecutorService executor) {
super(endpoint, processor);
this.executor = executor;
- if (executor == null) {
- throw new IllegalArgumentException("A non null ScheduledExecutorService must be provided.");
- }
+ ObjectHelper.notNull(executor, "executor");
}
/**
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/BeanRef.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/BeanRef.java?rev=724627&r1=724626&r2=724627&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/BeanRef.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/BeanRef.java Mon Dec 8 23:04:39 2008
@@ -103,7 +103,7 @@
answer = new BeanProcessor(new RegistryBean(routeContext.getCamelContext(), ref));
} else {
if (bean == null) {
- ObjectHelper.notNull(beanType, "bean, ref or beanType");
+ ObjectHelper.notNull(beanType, "bean, ref or beanType", this);
bean = CamelContextHelper.newInstance(routeContext.getCamelContext(), beanType);
}
answer = new BeanProcessor(bean, routeContext.getCamelContext());
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/InterceptorRef.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/InterceptorRef.java?rev=724627&r1=724626&r2=724627&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/InterceptorRef.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/InterceptorRef.java Mon Dec 8 23:04:39 2008
@@ -25,6 +25,7 @@
import org.apache.camel.Processor;
import org.apache.camel.processor.DelegateProcessor;
import org.apache.camel.spi.RouteContext;
+import static org.apache.camel.util.ObjectHelper.notNull;
/**
* Base class for interceptor types.
@@ -72,9 +73,7 @@
if (interceptor == null) {
interceptor = routeContext.lookup(getRef(), DelegateProcessor.class);
}
- if (interceptor == null) {
- throw new IllegalArgumentException("No DelegateProcessor bean available for reference: " + getRef());
- }
+ notNull(interceptor, "registry entry called " + getRef(), this);
return interceptor;
}
@@ -88,7 +87,7 @@
public String getLabel() {
if (ref != null) {
- return "ref: " + ref;
+ return "ref: " + ref;
} else if (interceptor != null) {
return interceptor.toString();
} else {
@@ -98,8 +97,6 @@
/**
* Get the underlying {@link DelegateProcessor} implementation
- *
- * @return the {@link DelegateProcessor}
*/
@XmlTransient
public DelegateProcessor getInterceptor() {
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/InterceptorType.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/InterceptorType.java?rev=724627&r1=724626&r2=724627&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/InterceptorType.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/InterceptorType.java Mon Dec 8 23:04:39 2008
@@ -28,5 +28,6 @@
*/
@XmlType(name = "interceptorType")
public abstract class InterceptorType extends OutputType implements Block {
+
public abstract DelegateProcessor createInterceptor(RouteContext routeContext) throws Exception;
}
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/OutputType.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/OutputType.java?rev=724627&r1=724626&r2=724627&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/OutputType.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/OutputType.java Mon Dec 8 23:04:39 2008
@@ -53,7 +53,6 @@
}
}
-
@Override
protected void configureChild(ProcessorType output) {
super.configureChild(output);
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/PolicyRef.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/PolicyRef.java?rev=724627&r1=724626&r2=724627&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/PolicyRef.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/PolicyRef.java Mon Dec 8 23:04:39 2008
@@ -25,6 +25,7 @@
import org.apache.camel.Processor;
import org.apache.camel.spi.Policy;
import org.apache.camel.spi.RouteContext;
+import org.apache.camel.util.ObjectHelper;
/**
* Represents an XML <policy/> element
@@ -59,7 +60,7 @@
@Override
public String getLabel() {
if (ref != null) {
- return "ref: " + ref;
+ return "ref: " + ref;
} else if (policy != null) {
return policy.toString();
} else {
@@ -80,9 +81,7 @@
Processor childProcessor = createOutputsProcessor(routeContext);
Policy policy = resolvePolicy(routeContext);
- if (policy == null) {
- throw new IllegalArgumentException("No policy configured: " + this);
- }
+ ObjectHelper.notNull(policy, "policy", this);
return policy.wrap(childProcessor);
}
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ProcessorRef.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ProcessorRef.java?rev=724627&r1=724626&r2=724627&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ProcessorRef.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ProcessorRef.java Mon Dec 8 23:04:39 2008
@@ -23,6 +23,7 @@
import javax.xml.bind.annotation.XmlTransient;
import org.apache.camel.Processor;
+import org.apache.camel.util.ObjectHelper;
import org.apache.camel.spi.RouteContext;
/**
@@ -79,7 +80,9 @@
@Override
public Processor createProcessor(RouteContext routeContext) {
if (processor == null) {
+ ObjectHelper.notNull(ref, "ref", this);
processor = routeContext.lookup(getRef(), Processor.class);
+ ObjectHelper.notNull(processor, "registry entry called " + getRef(), this);
}
return processor;
}
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=724627&r1=724626&r2=724627&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 Mon Dec 8 23:04:39 2008
@@ -60,6 +60,7 @@
import org.apache.camel.spi.InterceptStrategy;
import org.apache.camel.spi.Policy;
import org.apache.camel.spi.RouteContext;
+import org.apache.camel.util.ObjectHelper;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -1762,10 +1763,7 @@
* @return the original processor or a new wrapped interceptor
*/
protected Processor wrapProcessorInInterceptors(RouteContext routeContext, Processor target) throws Exception {
- // The target is required.
- if (target == null) {
- throw new IllegalArgumentException("target not provided on node: " + this);
- }
+ ObjectHelper.notNull(target, "target", this);
List<InterceptStrategy> strategies = new ArrayList<InterceptStrategy>();
CamelContext camelContext = routeContext.getCamelContext();
@@ -1811,17 +1809,11 @@
* error handler.
*/
protected Processor wrapInErrorHandler(RouteContext routeContext, Processor target) throws Exception {
- // The target is required.
- if (target == null) {
- throw new IllegalArgumentException("target not provided on node: " + this);
- }
-
+ ObjectHelper.notNull(target, "target", this);
ErrorHandlerWrappingStrategy strategy = routeContext.getErrorHandlerWrappingStrategy();
-
if (strategy != null) {
return strategy.wrapProcessorInErrorHandler(routeContext, this, target);
}
-
return getErrorHandlerBuilder().createErrorHandler(routeContext, target);
}
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/RecipientListType.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/RecipientListType.java?rev=724627&r1=724626&r2=724627&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/RecipientListType.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/RecipientListType.java Mon Dec 8 23:04:39 2008
@@ -34,6 +34,7 @@
@XmlRootElement(name = "recipientList")
@XmlAccessorType(XmlAccessType.FIELD)
public class RecipientListType extends ExpressionNode {
+
public RecipientListType() {
}
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/RemoveHeaderType.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/RemoveHeaderType.java?rev=724627&r1=724626&r2=724627&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/RemoveHeaderType.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/RemoveHeaderType.java Mon Dec 8 23:04:39 2008
@@ -24,6 +24,7 @@
import org.apache.camel.Processor;
import org.apache.camel.builder.ProcessorBuilder;
import org.apache.camel.spi.RouteContext;
+import org.apache.camel.util.ObjectHelper;
/**
* Represents an XML <removeHeader/> element
@@ -31,7 +32,7 @@
@XmlRootElement(name = "removeHeader")
@XmlAccessorType(XmlAccessType.FIELD)
public class RemoveHeaderType extends OutputType<ProcessorType> {
- @XmlAttribute
+ @XmlAttribute(required = true)
private String headerName;
public RemoveHeaderType() {
@@ -52,7 +53,8 @@
}
@Override
- public Processor createProcessor(RouteContext routeContext) throws Exception {
+ public Processor createProcessor(RouteContext routeContext) throws Exception {
+ ObjectHelper.notNull(getHeaderName(), "headerName", this);
return ProcessorBuilder.removeHeader(getHeaderName());
}
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/RemovePropertyType.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/RemovePropertyType.java?rev=724627&r1=724626&r2=724627&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/RemovePropertyType.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/RemovePropertyType.java Mon Dec 8 23:04:39 2008
@@ -24,6 +24,7 @@
import org.apache.camel.Processor;
import org.apache.camel.builder.ProcessorBuilder;
import org.apache.camel.spi.RouteContext;
+import org.apache.camel.util.ObjectHelper;
/**
* Represents an XML <removeProperty/> element
@@ -31,7 +32,7 @@
@XmlRootElement(name = "removeProperty")
@XmlAccessorType(XmlAccessType.FIELD)
public class RemovePropertyType extends OutputType<ProcessorType> {
- @XmlAttribute
+ @XmlAttribute(required = true)
private String propertyName;
public RemovePropertyType() {
@@ -52,7 +53,8 @@
}
@Override
- public Processor createProcessor(RouteContext routeContext) throws Exception {
+ public Processor createProcessor(RouteContext routeContext) throws Exception {
+ ObjectHelper.notNull(getPropertyName(), "propertyName", this);
return ProcessorBuilder.removeProperty(getPropertyName());
}
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/RouteBuilderRef.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/RouteBuilderRef.java?rev=724627&r1=724626&r2=724627&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/RouteBuilderRef.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/RouteBuilderRef.java Mon Dec 8 23:04:39 2008
@@ -58,8 +58,8 @@
}
public RouteBuilder createRouteBuilder(CamelContext camelContext) {
- ObjectHelper.notNull(camelContext, "camelContext");
- ObjectHelper.notNull(ref, "ref");
+ ObjectHelper.notNull(camelContext, "camelContext", this);
+ ObjectHelper.notNull(ref, "ref", this);
RouteBuilder builder = CamelContextHelper.lookup(camelContext, ref, RouteBuilder.class);
return builder != null ? builder : CamelContextHelper.newInstance(camelContext, RouteBuilder.class);
}
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/RouteContainer.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/RouteContainer.java?rev=724627&r1=724626&r2=724627&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/RouteContainer.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/RouteContainer.java Mon Dec 8 23:04:39 2008
@@ -26,6 +26,7 @@
* @version $Revision$
*/
public interface RouteContainer {
+
/**
* Returns the routes
*/
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/RouteType.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/RouteType.java?rev=724627&r1=724626&r2=724627&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/RouteType.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/RouteType.java Mon Dec 8 23:04:39 2008
@@ -91,7 +91,7 @@
public Endpoint resolveEndpoint(String uri) throws NoSuchEndpointException {
CamelContext context = getCamelContext();
if (context == null) {
- throw new IllegalArgumentException("No CamelContext has been injected!");
+ throw new IllegalArgumentException("CamelContext has not been injected!");
}
return CamelContextHelper.getMandatoryEndpoint(context, uri);
}
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/RoutingSlipType.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/RoutingSlipType.java?rev=724627&r1=724626&r2=724627&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/RoutingSlipType.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/RoutingSlipType.java Mon Dec 8 23:04:39 2008
@@ -27,6 +27,7 @@
import org.apache.camel.Processor;
import org.apache.camel.processor.RoutingSlip;
import org.apache.camel.spi.RouteContext;
+import org.apache.camel.util.ObjectHelper;
/**
* Represents an XML <routingSlip/> element
@@ -67,6 +68,7 @@
@Override
public Processor createProcessor(RouteContext routeContext) throws Exception {
+ ObjectHelper.notNull(getHeaderName(), "headerName");
return new RoutingSlip(getHeaderName(), getUriDelimiter());
}
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/SetOutHeaderType.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/SetOutHeaderType.java?rev=724627&r1=724626&r2=724627&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/SetOutHeaderType.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/SetOutHeaderType.java Mon Dec 8 23:04:39 2008
@@ -26,6 +26,7 @@
import org.apache.camel.builder.ProcessorBuilder;
import org.apache.camel.model.language.ExpressionType;
import org.apache.camel.spi.RouteContext;
+import org.apache.camel.util.ObjectHelper;
/**
* Represents an XML <setOutHeader/> element
@@ -33,7 +34,7 @@
@XmlRootElement(name = "setOutHeader")
@XmlAccessorType(XmlAccessType.FIELD)
public class SetOutHeaderType extends ExpressionNode {
- @XmlAttribute
+ @XmlAttribute(required = true)
private String headerName;
public SetOutHeaderType() {
@@ -61,6 +62,7 @@
@Override
public Processor createProcessor(RouteContext routeContext) throws Exception {
+ ObjectHelper.notNull(getHeaderName(), "headerName", this);
Expression expr = getExpression().createExpression(routeContext);
return ProcessorBuilder.setOutHeader(getHeaderName(), expr);
}
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/SetPropertyType.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/SetPropertyType.java?rev=724627&r1=724626&r2=724627&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/SetPropertyType.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/SetPropertyType.java Mon Dec 8 23:04:39 2008
@@ -27,6 +27,7 @@
import org.apache.camel.builder.ProcessorBuilder;
import org.apache.camel.model.language.ExpressionType;
import org.apache.camel.spi.RouteContext;
+import org.apache.camel.util.ObjectHelper;
/**
* Represents an XML <setProperty/> element
@@ -34,7 +35,7 @@
@XmlRootElement(name = "setProperty")
@XmlAccessorType(XmlAccessType.FIELD)
public class SetPropertyType extends ExpressionNode {
- @XmlAttribute
+ @XmlAttribute(required = true)
private String propertyName;
public SetPropertyType() {
@@ -67,6 +68,7 @@
@Override
public Processor createProcessor(RouteContext routeContext) throws Exception {
+ ObjectHelper.notNull(getPropertyName(), "propertyName", this);
Expression expr = getExpression().createExpression(routeContext);
return ProcessorBuilder.setProperty(getPropertyName(), expr);
}
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ThreadType.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ThreadType.java?rev=724627&r1=724626&r2=724627&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ThreadType.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ThreadType.java Mon Dec 8 23:04:39 2008
@@ -250,11 +250,8 @@
return this;
}
- ///////////////////////////////////////////////////////////////////
- //
// Property Accessors
- //
- ///////////////////////////////////////////////////////////////////
+ // -----------------------------------------------------------------------
public void setCoreSize(int coreSize) {
this.coreSize = coreSize;
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/loadbalancer/LoadBalancerType.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/loadbalancer/LoadBalancerType.java?rev=724627&r1=724626&r2=724627&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/loadbalancer/LoadBalancerType.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/loadbalancer/LoadBalancerType.java Mon Dec 8 23:04:39 2008
@@ -112,22 +112,22 @@
public void addProcessor(Processor processor) {
- ObjectHelper.notNull(loadBalancer, "loadBalancer");
+ ObjectHelper.notNull(loadBalancer, "loadBalancer", this);
loadBalancer.addProcessor(processor);
}
public List<Processor> getProcessors() {
- ObjectHelper.notNull(loadBalancer, "loadBalancer");
+ ObjectHelper.notNull(loadBalancer, "loadBalancer", this);
return loadBalancer.getProcessors();
}
public void removeProcessor(Processor processor) {
- ObjectHelper.notNull(loadBalancer, "loadBalancer");
+ ObjectHelper.notNull(loadBalancer, "loadBalancer", this);
loadBalancer.removeProcessor(processor);
}
public void process(Exchange exchange) throws Exception {
- ObjectHelper.notNull(loadBalancer, "loadBalancer");
+ ObjectHelper.notNull(loadBalancer, "loadBalancer", this);
loadBalancer.process(exchange);
}
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/SendProcessor.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/SendProcessor.java?rev=724627&r1=724626&r2=724627&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/SendProcessor.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/SendProcessor.java Mon Dec 8 23:04:39 2008
@@ -24,6 +24,7 @@
import org.apache.camel.Service;
import org.apache.camel.impl.ServiceSupport;
import org.apache.camel.impl.converter.AsyncProcessorTypeConverter;
+import org.apache.camel.util.ObjectHelper;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -39,9 +40,7 @@
private AsyncProcessor processor;
public SendProcessor(Endpoint destination) {
- if (destination == null) {
- throw new IllegalArgumentException("Endpoint cannot be null!");
- }
+ ObjectHelper.notNull(destination, "destination");
this.destination = destination;
}
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/util/ObjectHelper.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/util/ObjectHelper.java?rev=724627&r1=724626&r2=724627&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/util/ObjectHelper.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/util/ObjectHelper.java Mon Dec 8 23:04:39 2008
@@ -162,6 +162,14 @@
}
}
+ public static void notNull(Object value, String name, Object on) {
+ if (on == null) {
+ notNull(value, name);
+ } else if (value == null) {
+ throw new IllegalArgumentException(name + " must be specified on: " + on);
+ }
+ }
+
public static void notEmpty(String value, String name) {
if (isNullOrBlank(value)) {
throw new IllegalArgumentException(name + " must be specified and not empty");
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/util/jndi/JndiContext.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/util/jndi/JndiContext.java?rev=724627&r1=724626&r2=724627&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/util/jndi/JndiContext.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/util/jndi/JndiContext.java Mon Dec 8 23:04:39 2008
@@ -45,7 +45,7 @@
/**
* A default JNDI context
*
- * @version $Revision$ $Date$
+ * @version $Revision$
*/
public class JndiContext implements Context, Serializable {
public static final String SEPARATOR = "/";
Modified: activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/model/ProcessorTypeConfigurationTest.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/model/ProcessorTypeConfigurationTest.java?rev=724627&r1=724626&r2=724627&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/model/ProcessorTypeConfigurationTest.java (original)
+++ activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/model/ProcessorTypeConfigurationTest.java Mon Dec 8 23:04:39 2008
@@ -31,9 +31,9 @@
from("direct:in").processRef("hello");
}
});
- fail("Should have thrown RuntimeCamelException");
+ fail("Should have thrown IllegalArgumentException");
} catch (IllegalArgumentException e) {
- assertEquals("target not provided on node: process[ref: hello]", e.getMessage());
+ assertEquals("registry entry called hello must be specified on: process[ref: hello]", e.getMessage());
}
}