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 [3/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/processor/loadbalancer/FailOverLoadBalancer.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/loadbalancer/FailOverLoadBalancer.java?rev=747062&r1=747061&r2=747062&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/processor/loadbalancer/FailOverLoadBalancer.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/processor/loadbalancer/FailOverLoadBalancer.java Mon Feb 23 16:14:17 2009
@@ -22,40 +22,41 @@
import org.apache.camel.AsyncProcessor;
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
-import org.apache.camel.RuntimeCamelException;
import org.apache.camel.util.ObjectHelper;
/**
- * This FailOverLoadBalancer will choose other processor when the exception happens
+ * This FailOverLoadBalancer will failover to use next processor when an exception occured
*/
public class FailOverLoadBalancer extends LoadBalancerSupport {
+
private final Class failException;
+
public FailOverLoadBalancer(Class throwable) {
if (ObjectHelper.isAssignableFrom(Throwable.class, throwable)) {
failException = throwable;
} else {
- throw new RuntimeCamelException("The FailOverLoadBalancer construction parameter should be the child of Throwable");
+ throw new IllegalArgumentException("Class is not an instance of Trowable: " + throwable);
}
}
-
+
public FailOverLoadBalancer() {
this(Throwable.class);
}
-
+
protected boolean isCheckedException(Exchange exchange) {
if (exchange.getException() != null) {
- if (failException.isAssignableFrom(exchange.getException().getClass())) {
+ if (failException.isAssignableFrom(exchange.getException().getClass())) {
return true;
}
- }
- return false;
+ }
+ return false;
}
-
+
private void processExchange(Processor processor, Exchange exchange) {
if (processor == null) {
throw new IllegalStateException("No processors could be chosen to process " + exchange);
}
- try {
+ try {
processor.process(exchange);
} catch (Throwable error) {
exchange.setException(error);
@@ -85,44 +86,44 @@
public boolean process(Exchange exchange, final AsyncCallback callback) {
return processExchange(0, exchange, callback);
}
-
+
public boolean processExchange(final int index, final Exchange exchange, final AsyncCallback callback) {
- boolean sync = false;
+ boolean sync;
+
List<Processor> list = getProcessors();
if (list.isEmpty()) {
throw new IllegalStateException("No processors available to process " + exchange);
- }
+ }
+
Processor processor = list.get(index);
if (processor == null) {
throw new IllegalStateException("No processors could be chosen to process " + exchange);
- } else {
- if (processor instanceof AsyncProcessor) {
- AsyncProcessor asyncProcessor = (AsyncProcessor)processor;
- sync = asyncProcessor.process(exchange, new AsyncCallback() {
- public void done(boolean doSync) {
- // check the exchange and call the FailOverProcessor
- if (isCheckedException(exchange) && index < getProcessors().size() - 1) {
- exchange.setException(null);
- processExchange(index + 1, exchange, callback);
- } else {
- callback.done(doSync);
- }
+ }
+ if (processor instanceof AsyncProcessor) {
+ AsyncProcessor asyncProcessor = (AsyncProcessor) processor;
+ sync = asyncProcessor.process(exchange, new AsyncCallback() {
+ public void done(boolean doSync) {
+ // check the exchange and call the FailOverProcessor
+ if (isCheckedException(exchange) && index < getProcessors().size() - 1) {
+ exchange.setException(null);
+ processExchange(index + 1, exchange, callback);
+ } else {
+ callback.done(doSync);
}
- });
-
- } else {
- try {
- processor.process(exchange);
- } catch (Exception ex) {
- exchange.setException(ex);
}
- if (isCheckedException(exchange) && index < getProcessors().size() - 1) {
- exchange.setException(null);
- processExchange(index + 1, exchange, callback);
- }
- sync = true;
- callback.done(true);
- }
+ });
+ } else {
+ try {
+ processor.process(exchange);
+ } catch (Exception ex) {
+ exchange.setException(ex);
+ }
+ if (isCheckedException(exchange) && index < getProcessors().size() - 1) {
+ exchange.setException(null);
+ processExchange(index + 1, exchange, callback);
+ }
+ sync = true;
+ callback.done(true);
}
return sync;
}
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/processor/loadbalancer/QueueLoadBalancer.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/loadbalancer/QueueLoadBalancer.java?rev=747062&r1=747061&r2=747062&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/processor/loadbalancer/QueueLoadBalancer.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/processor/loadbalancer/QueueLoadBalancer.java Mon Feb 23 16:14:17 2009
@@ -59,10 +59,8 @@
sync = asyncProcessor.process(exchange, new AsyncCallback() {
public void done(boolean sync) {
// Only handle the async case...
- if (sync) {
- return;
- } else {
- callback.done(sync);
+ if (!sync) {
+ callback.done(sync);
}
}
});
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/processor/loadbalancer/TopicLoadBalancer.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/loadbalancer/TopicLoadBalancer.java?rev=747062&r1=747061&r2=747062&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/processor/loadbalancer/TopicLoadBalancer.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/processor/loadbalancer/TopicLoadBalancer.java Mon Feb 23 16:14:17 2009
@@ -27,7 +27,6 @@
* (rather like JMS Topics).
*
* @version $Revision$
- *
*/
public class TopicLoadBalancer extends LoadBalancerSupport {
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/processor/resequencer/ElementComparator.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/resequencer/ElementComparator.java?rev=747062&r1=747061&r2=747062&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/processor/resequencer/ElementComparator.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/processor/resequencer/ElementComparator.java Mon Feb 23 16:14:17 2009
@@ -35,30 +35,20 @@
/**
* Creates a new element comparator instance.
*
- * @param comparator a sequence element comparator this comparator delegates
- * to.
+ * @param comparator a sequence element comparator this comparator delegates to.
*/
public ElementComparator(SequenceElementComparator<E> comparator) {
this.comparator = comparator;
}
- /**
- * @see SequenceElementComparator#predecessor(java.lang.Object, java.lang.Object)
- */
public boolean predecessor(Element<E> o1, Element<E> o2) {
return comparator.predecessor(o1.getObject(), o2.getObject());
}
- /**
- * @see SequenceElementComparator#successor(java.lang.Object, java.lang.Object)
- */
public boolean successor(Element<E> o1, Element<E> o2) {
return comparator.successor(o1.getObject(), o2.getObject());
}
- /**
- * @see java.util.Comparator#compare(java.lang.Object, java.lang.Object)
- */
public int compare(Element<E> o1, Element<E> o2) {
return comparator.compare(o1.getObject(), o2.getObject());
}
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/processor/resequencer/SequenceElementComparator.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/resequencer/SequenceElementComparator.java?rev=747062&r1=747061&r2=747062&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/processor/resequencer/SequenceElementComparator.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/processor/resequencer/SequenceElementComparator.java Mon Feb 23 16:14:17 2009
@@ -33,6 +33,7 @@
*
* @param o1 a sequence element.
* @param o2 a sequence element.
+ * @return true if its an immediate predecessor
*/
boolean predecessor(E o1, E o2);
@@ -42,6 +43,7 @@
*
* @param o1 a sequence element.
* @param o2 a sequence element.
+ * @return true if its an immediate sucessor
*/
boolean successor(E o1, E o2);
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/processor/resequencer/Timeout.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/resequencer/Timeout.java?rev=747062&r1=747061&r2=747062&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/processor/resequencer/Timeout.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/processor/resequencer/Timeout.java Mon Feb 23 16:14:17 2009
@@ -42,10 +42,8 @@
* timeout value. The task is not scheduled immediately. It will be
* scheduled by calling this task's {@link #schedule()} method.
*
- * @param timer
- * a timer
- * @param timeout
- * a timeout value.
+ * @param timer a timer
+ * @param timeout a timeout value.
*/
public Timeout(Timer timer, long timeout) {
this.timeout = timeout;
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/processor/validation/NoXmlBodyValidationException.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/validation/NoXmlBodyValidationException.java?rev=747062&r1=747061&r2=747062&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/processor/validation/NoXmlBodyValidationException.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/processor/validation/NoXmlBodyValidationException.java Mon Feb 23 16:14:17 2009
@@ -27,6 +27,6 @@
public class NoXmlBodyValidationException extends ValidationException {
public NoXmlBodyValidationException(Exchange exchange) {
- super(exchange, "No XML body could be found on the input message" + exchange);
+ super(exchange, "No XML body could be found on the input message");
}
}
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/processor/validation/SchemaValidationException.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/validation/SchemaValidationException.java?rev=747062&r1=747061&r2=747062&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/processor/validation/SchemaValidationException.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/processor/validation/SchemaValidationException.java Mon Feb 23 16:14:17 2009
@@ -45,8 +45,6 @@
/**
* Returns the schema that failed
- *
- * @return the schema that failed
*/
public Object getSchema() {
return schema;
@@ -54,8 +52,6 @@
/**
* Returns the validation errors
- *
- * @return the validation errors
*/
public List<SAXParseException> getErrors() {
return errors;
@@ -63,8 +59,6 @@
/**
* Returns the fatal validation errors
- *
- * @return the fatal validation errors
*/
public List<SAXParseException> getFatalErrors() {
return fatalErrors;
@@ -72,8 +66,6 @@
/**
* Returns the validation warnings
- *
- * @return the validation warnings
*/
public List<SAXParseException> getWarnings() {
return warnings;
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/processor/validation/ValidatingProcessor.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/validation/ValidatingProcessor.java?rev=747062&r1=747061&r2=747062&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/processor/validation/ValidatingProcessor.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/processor/validation/ValidatingProcessor.java Mon Feb 23 16:14:17 2009
@@ -145,8 +145,7 @@
}
protected Source createSchemaSource() throws IOException {
- throw new IllegalArgumentException("You must specify a schema, "
- + "schemaFile, schemaSource or schemaUrl property");
+ throw new IllegalArgumentException("You must specify a schema, schemaFile, schemaSource or schemaUrl property");
}
protected Schema createSchema() throws SAXException, IOException {
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/processor/validation/ValidatorErrorHandler.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/validation/ValidatorErrorHandler.java?rev=747062&r1=747061&r2=747062&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/processor/validation/ValidatorErrorHandler.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/processor/validation/ValidatorErrorHandler.java Mon Feb 23 16:14:17 2009
@@ -42,6 +42,7 @@
* @param exchange the exchange
* @param schema the schema
* @param result the result
+ * @throws ValidationException is thrown in case of validatation errors
*/
void handleErrors(Exchange exchange, Schema schema, DOMResult result) throws ValidationException;
}
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/util/CollectionHelper.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/util/CollectionHelper.java?rev=747062&r1=747061&r2=747062&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/util/CollectionHelper.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/util/CollectionHelper.java Mon Feb 23 16:14:17 2009
@@ -75,6 +75,7 @@
* @param key the key in the map
* @param value the value to put in the map
*/
+ @SuppressWarnings("unchecked")
public static void appendValue(Map map, Object key, Object value) {
Object oldValue = map.get(key);
if (oldValue != null) {
@@ -98,6 +99,7 @@
* @param filters objects to skip
* @return a new list without the filtered objects
*/
+ @SuppressWarnings("unchecked")
public static List filterList(List list, Object... filters) {
List answer = new ArrayList();
for (Object o : list) {
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/util/DefaultTimeoutMap.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/util/DefaultTimeoutMap.java?rev=747062&r1=747061&r2=747062&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/util/DefaultTimeoutMap.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/util/DefaultTimeoutMap.java Mon Feb 23 16:14:17 2009
@@ -52,6 +52,7 @@
schedulePoll();
}
+ @SuppressWarnings("unchecked")
public Object get(Object key) {
TimeoutMapEntry entry = null;
synchronized (map) {
@@ -66,6 +67,7 @@
return entry.getValue();
}
+ @SuppressWarnings("unchecked")
public void put(Object key, Object value, long timeoutMillis) {
TimeoutMapEntry entry = new TimeoutMapEntry(key, value, timeoutMillis);
synchronized (map) {
@@ -87,6 +89,7 @@
}
}
+ @SuppressWarnings("unchecked")
public Object[] getKeys() {
Object[] keys = null;
synchronized (map) {
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/util/ExchangeHelper.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/util/ExchangeHelper.java?rev=747062&r1=747061&r2=747062&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/util/ExchangeHelper.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/util/ExchangeHelper.java Mon Feb 23 16:14:17 2009
@@ -227,9 +227,6 @@
*
* @param source source exchange.
* @param result target exchange.
- *
- * @see #resultMessage(Exchange)
- * @see #faultMessage(Exchange)
*/
public static void copyResultsPreservePattern(Exchange result, Exchange source) {
@@ -332,6 +329,7 @@
* @param exchange the exchange to make available
* @param map the map to populate
*/
+ @SuppressWarnings("unchecked")
public static void populateVariableMap(Exchange exchange, Map map) {
map.put("exchange", exchange);
Message in = exchange.getIn();
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/util/FactoryFinder.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/util/FactoryFinder.java?rev=747062&r1=747061&r2=747062&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/util/FactoryFinder.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/util/FactoryFinder.java Mon Feb 23 16:14:17 2009
@@ -25,6 +25,7 @@
import java.util.Properties;
import java.util.concurrent.ConcurrentHashMap;
+import org.apache.camel.NoFactoryAvailableException;
import org.apache.camel.spi.Injector;
/**
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/util/IntrospectionSupport.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/util/IntrospectionSupport.java?rev=747062&r1=747061&r2=747062&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/util/IntrospectionSupport.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/util/IntrospectionSupport.java Mon Feb 23 16:14:17 2009
@@ -70,6 +70,7 @@
}
}
+ @SuppressWarnings("unchecked")
public static boolean getProperties(Object target, Map properties, String optionPrefix) {
ObjectHelper.notNull(target, "target");
ObjectHelper.notNull(properties, "properties");
@@ -160,6 +161,7 @@
return rc;
}
+ @SuppressWarnings("unchecked")
public static Map extractProperties(Map properties, String optionPrefix) {
ObjectHelper.notNull(properties, "properties");
@@ -258,6 +260,7 @@
return setProperty(null, target, name, value);
}
+ @SuppressWarnings("unchecked")
private static Object convert(TypeConverter typeConverter, Class type, Object value) throws URISyntaxException {
if (typeConverter != null) {
return typeConverter.convertTo(type, value);
@@ -391,6 +394,7 @@
return name;
}
+ @SuppressWarnings("unchecked")
private static void addFields(Object target, Class startClass, Class stopClass, LinkedHashMap map) {
if (startClass != stopClass) {
addFields(target, startClass.getSuperclass(), stopClass, map);
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/util/LRUCache.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/util/LRUCache.java?rev=747062&r1=747061&r2=747062&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/util/LRUCache.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/util/LRUCache.java Mon Feb 23 16:14:17 2009
@@ -37,7 +37,7 @@
* specified initial capacity, maximumCacheSize,load factor and ordering mode.
*
* @param initialCapacity the initial capacity.
- * @param maximumCacheSize
+ * @param maximumCacheSize the max capacity.
* @param loadFactor the load factor.
* @param accessOrder the ordering mode - <tt>true</tt> for
* access-order, <tt>false</tt> for insertion-order.
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/util/ObjectHelper.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/util/ObjectHelper.java?rev=747062&r1=747061&r2=747062&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/util/ObjectHelper.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/util/ObjectHelper.java Mon Feb 23 16:14:17 2009
@@ -119,6 +119,7 @@
* @param b the second object
* @param ignoreCase ignore case for string comparison
*/
+ @SuppressWarnings("unchecked")
public static int compare(Object a, Object b, boolean ignoreCase) {
if (a == b) {
return 0;
@@ -411,8 +412,7 @@
if (!list.isEmpty()) {
Object value = list.get(0);
if (value instanceof Boolean) {
- Boolean flag = (Boolean)value;
- return flag.booleanValue();
+ return (Boolean)value;
} else {
// lets assume non-empty results are true
return true;
@@ -436,8 +436,7 @@
return System.getProperty(name, defaultValue);
} catch (Exception e) {
if (LOG.isDebugEnabled()) {
- LOG.debug("Caught security exception accessing system property: " + name + ". Reason: " + e,
- e);
+ LOG.debug("Caught security exception accessing system property: " + name + ". Reason: " + e, e);
}
return defaultValue;
}
@@ -518,7 +517,7 @@
}
if (clazz == null) {
- LOG.warn("Could not find class: " + name);
+ LOG.warn("Cannot find class: " + name);
}
return clazz;
@@ -541,7 +540,7 @@
return loader.loadClass(name);
} catch (ClassNotFoundException e) {
if (LOG.isTraceEnabled()) {
- LOG.trace("Can not load class: " + name + " using classloader: " + loader, e);
+ LOG.trace("Cannot load class: " + name + " using classloader: " + loader, e);
}
}
@@ -759,16 +758,16 @@
closeable.close();
} catch (IOException e) {
if (log != null) {
- log.warn("Could not close: " + name + ". Reason: " + e, e);
+ log.warn("Cannot close: " + name + ". Reason: " + e, e);
}
}
}
}
/**
- * Converts the given value to the required type or throw a meaningful
- * exception
+ * Converts the given value to the required type or throw a meaningful exception
*/
+ @SuppressWarnings("unchecked")
public static <T> T cast(Class<T> toType, Object value) {
if (toType == boolean.class) {
return (T)cast(Boolean.class, value);
@@ -850,8 +849,7 @@
*/
public static boolean evaluateValuePredicate(Object value) {
if (value instanceof Boolean) {
- Boolean aBoolean = (Boolean)value;
- return aBoolean.booleanValue();
+ return (Boolean)value;
} else if (value instanceof String) {
if ("true".equals(value)) {
return true;
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/util/ResolverUtil.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/util/ResolverUtil.java?rev=747062&r1=747061&r2=747062&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/util/ResolverUtil.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/util/ResolverUtil.java Mon Feb 23 16:14:17 2009
@@ -265,8 +265,7 @@
}
if (LOG.isDebugEnabled()) {
- LOG.debug("Searching for implementations of " + parent.getName() + " in packages: " + Arrays
- .asList(packageNames));
+ LOG.debug("Searching for implementations of " + parent.getName() + " in packages: " + Arrays.asList(packageNames));
}
Test test = new IsA(parent);
@@ -294,8 +293,7 @@
}
if (LOG.isDebugEnabled()) {
- LOG.debug("Searching for annotations of " + annotation.getName() + " in packages: " + Arrays
- .asList(packageNames));
+ LOG.debug("Searching for annotations of " + annotation.getName() + " in packages: " + Arrays.asList(packageNames));
}
Test test = new AnnotatedWith(annotation, true);
@@ -515,7 +513,6 @@
* @param test a Test used to filter the classes that are discovered
* @param parent the parent package under which classes must be in order to
* be considered
- * @param jarfile the jar file to be examined for classes
* @param stream the inputstream of the jar file to be examined for classes
* @param urlPath the url of the jar file to be examined for classes
*/
@@ -550,6 +547,7 @@
* @param test the test used to determine if the class matches
* @param fqn the fully qualified name of a class
*/
+ @SuppressWarnings("unchecked")
protected void addIfMatching(Test test, String fqn) {
try {
String externalName = fqn.substring(0, fqn.indexOf('.')).replace('/', '.');
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/util/TimeoutMapEntry.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/util/TimeoutMapEntry.java?rev=747062&r1=747061&r2=747062&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/util/TimeoutMapEntry.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/util/TimeoutMapEntry.java Mon Feb 23 16:14:17 2009
@@ -52,7 +52,7 @@
}
public Object setValue(Object value) {
- Object oldValue = value;
+ Object oldValue = this.value;
this.value = value;
return oldValue;
}
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/util/URISupport.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/util/URISupport.java?rev=747062&r1=747061&r2=747062&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/util/URISupport.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/util/URISupport.java Mon Feb 23 16:14:17 2009
@@ -110,6 +110,7 @@
}
}
+ @SuppressWarnings("unchecked")
public static Map parseQuery(String uri) throws URISyntaxException {
try {
Map rc = new HashMap();
@@ -128,7 +129,9 @@
}
return rc;
} catch (UnsupportedEncodingException e) {
- throw (URISyntaxException)new URISyntaxException(e.toString(), "Invalid encoding").initCause(e);
+ URISyntaxException se = new URISyntaxException(e.toString(), "Invalid encoding");
+ se.initCause(e);
+ throw se;
}
}
@@ -220,6 +223,7 @@
}
}
+ @SuppressWarnings("unchecked")
private static String[] splitComponents(String str) {
ArrayList l = new ArrayList();
@@ -271,15 +275,15 @@
if (options.size() > 0) {
StringBuffer rc = new StringBuffer();
boolean first = true;
- for (Iterator iter = options.keySet().iterator(); iter.hasNext();) {
+ for (Object o : options.keySet()) {
if (first) {
first = false;
} else {
rc.append("&");
}
- String key = (String)iter.next();
- String value = (String)options.get(key);
+ String key = (String) o;
+ String value = (String) options.get(key);
rc.append(URLEncoder.encode(key, "UTF-8"));
rc.append("=");
rc.append(URLEncoder.encode(value, "UTF-8"));
@@ -289,7 +293,9 @@
return "";
}
} catch (UnsupportedEncodingException e) {
- throw (URISyntaxException)new URISyntaxException(e.toString(), "Invalid encoding").initCause(e);
+ URISyntaxException se = new URISyntaxException(e.toString(), "Invalid encoding");
+ se.initCause(e);
+ throw se;
}
}
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/util/WebSphereResolverUtil.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/util/WebSphereResolverUtil.java?rev=747062&r1=747061&r2=747062&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/util/WebSphereResolverUtil.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/util/WebSphereResolverUtil.java Mon Feb 23 16:14:17 2009
@@ -58,6 +58,7 @@
* @throws IOException is thrown by the classloader
*/
@Override
+ @SuppressWarnings("unchecked")
protected Enumeration<URL> getResources(ClassLoader loader, String packageName) throws IOException {
// try super first, just in vase
Enumeration<URL> enumeration = super.getResources(loader, packageName);
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/util/jndi/JndiContext.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/util/jndi/JndiContext.java?rev=747062&r1=747061&r2=747062&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/util/jndi/JndiContext.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/util/jndi/JndiContext.java Mon Feb 23 16:14:17 2009
@@ -71,6 +71,7 @@
this(env, createBindingsMapFromEnvironment(env));
}
+ @SuppressWarnings("unchecked")
public JndiContext(Hashtable environment, Map bindings) {
if (environment == null) {
this.environment = new Hashtable();
@@ -86,6 +87,7 @@
this.nameInNamespace = nameInNamespace;
}
+ @SuppressWarnings("unchecked")
protected JndiContext(JndiContext clone, Hashtable env) {
this.bindings = clone.bindings;
this.treeBindings = clone.treeBindings;
@@ -102,6 +104,7 @@
* properties using $foo.class to point to a class name with $foo.* being
* properties set on the injected bean
*/
+ @SuppressWarnings("unchecked")
public static Map createBindingsMapFromEnvironment(Hashtable env) throws Exception {
Map answer = new HashMap(env);
@@ -147,6 +150,7 @@
* created it). (the names are suitably extended by the segment originally
* lopped off).
*/
+ @SuppressWarnings("unchecked")
protected Map internalBind(String name, Object value) throws NamingException {
assert name != null && name.length() > 0;
assert !frozen;
@@ -194,6 +198,7 @@
}
}
+ @SuppressWarnings("unchecked")
public Object addToEnvironment(String propName, Object propVal) throws NamingException {
return environment.put(propName, propVal);
}
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/view/NodeData.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/view/NodeData.java?rev=747062&r1=747061&r2=747062&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/view/NodeData.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/view/NodeData.java Mon Feb 23 16:14:17 2009
@@ -55,6 +55,7 @@
public String association = "property";
private final String imagePrefix;
+ @SuppressWarnings("unchecked")
public NodeData(String id, Object node, String imagePrefix) {
this.id = id;
this.imagePrefix = imagePrefix;
@@ -159,8 +160,7 @@
}
}
if (isEmpty(this.url) && isNotEmpty(this.nodeType)) {
- this.url = "http://camel.apache.org/" + this.nodeType.toLowerCase().replace(' ', '-')
- + ".html";
+ this.url = "http://camel.apache.org/" + this.nodeType.toLowerCase().replace(' ', '-') + ".html";
}
if (node instanceof ProcessorType && this.outputs == null) {
ProcessorType processorType = (ProcessorType)node;
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/view/RouteDotGenerator.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/view/RouteDotGenerator.java?rev=747062&r1=747061&r2=747062&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/view/RouteDotGenerator.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/view/RouteDotGenerator.java Mon Feb 23 16:14:17 2009
@@ -93,6 +93,7 @@
}
}
+ @SuppressWarnings("unchecked")
protected NodeData printNode(PrintWriter writer, NodeData fromData, ProcessorType node) {
if (node instanceof MulticastType || node instanceof InterceptorRef) {
// no need for a multicast or interceptor node
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/view/XmlGraphGenerator.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/view/XmlGraphGenerator.java?rev=747062&r1=747061&r2=747062&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/view/XmlGraphGenerator.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/view/XmlGraphGenerator.java Mon Feb 23 16:14:17 2009
@@ -99,6 +99,7 @@
}
}
+ @SuppressWarnings("unchecked")
protected NodeData printNode(PrintWriter writer, NodeData fromData, ProcessorType node) {
if (node instanceof MulticastType) {
// no need for a multicast node
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/builder/RouteBuilderTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/builder/RouteBuilderTest.java?rev=747062&r1=747061&r2=747062&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/builder/RouteBuilderTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/builder/RouteBuilderTest.java Mon Feb 23 16:14:17 2009
@@ -63,7 +63,7 @@
List<Route> routes = buildSimpleRoute();
assertEquals("Number routes created", 1, routes.size());
- for (Route<Exchange> route : routes) {
+ for (Route route : routes) {
Endpoint key = route.getEndpoint();
assertEquals("From endpoint", "seda:a", key.getEndpointUri());
Processor processor = getProcessorWithoutErrorHandler(route);
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/component/bean/BeanMethodWithMultipleParametersTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/component/bean/BeanMethodWithMultipleParametersTest.java?rev=747062&r1=747061&r2=747062&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/component/bean/BeanMethodWithMultipleParametersTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/component/bean/BeanMethodWithMultipleParametersTest.java Mon Feb 23 16:14:17 2009
@@ -19,6 +19,7 @@
import javax.naming.Context;
import org.apache.camel.ContextTestSupport;
+import org.apache.camel.Exchange;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.processor.BeanRouteTest;
import org.apache.camel.util.jndi.JndiContext;
@@ -47,7 +48,7 @@
public void testSendMessageWithSettingHeader() throws Exception {
Object[] args = {"hello", 123, "world"};
- template.sendBodyAndHeader("direct:in", args, BeanProcessor.MULTI_PARAMETER_ARRAY, true);
+ template.sendBodyAndHeader("direct:in", args, Exchange.BEAN_MULTI_PARAMETER_ARRAY, true);
assertEquals("bean.foo", "hello", myBean.foo);
assertEquals("bean.bar", 123, myBean.bar);
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/component/bean/ChainedBeanInvocationTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/component/bean/ChainedBeanInvocationTest.java?rev=747062&r1=747061&r2=747062&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/component/bean/ChainedBeanInvocationTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/component/bean/ChainedBeanInvocationTest.java Mon Feb 23 16:14:17 2009
@@ -90,7 +90,7 @@
beanMock.c();
beanMock.d();
EasyMock.replay(beanMock);
- template.sendBodyAndHeader("direct:start2", "test", BeanProcessor.METHOD_NAME, "d");
+ template.sendBodyAndHeader("direct:start2", "test", Exchange.BEAN_METHOD_NAME, "d");
EasyMock.verify(beanMock);
}
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/component/dataset/DataSetConsumeTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/component/dataset/DataSetConsumeTest.java?rev=747062&r1=747061&r2=747062&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/component/dataset/DataSetConsumeTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/component/dataset/DataSetConsumeTest.java Mon Feb 23 16:14:17 2009
@@ -19,6 +19,7 @@
import javax.naming.Context;
import org.apache.camel.ContextTestSupport;
+import org.apache.camel.Exchange;
/**
* @version $Revision$
@@ -29,7 +30,7 @@
public void testSendingMessagesExplicitlyToDataSetEndpoint() throws Exception {
long size = dataSet.getSize();
for (long i = 0; i < size; i++) {
- template.sendBodyAndHeader("dataset:foo", "<hello>world!</hello>", DataSet.INDEX_HEADER, i);
+ template.sendBodyAndHeader("dataset:foo", "<hello>world!</hello>", Exchange.DATASET_INDEX, i);
}
assertMockEndpointsSatisfied();
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/BeanToFileTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/BeanToFileTest.java?rev=747062&r1=747061&r2=747062&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/BeanToFileTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/BeanToFileTest.java Mon Feb 23 16:14:17 2009
@@ -19,6 +19,7 @@
import javax.naming.Context;
import org.apache.camel.ContextTestSupport;
+import org.apache.camel.Exchange;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.util.jndi.JndiContext;
@@ -50,7 +51,7 @@
public void configure() throws Exception {
from("direct:in").
to("bean:myBean").
- setHeader(FileComponent.HEADER_FILE_NAME, constant("BeanToFileTest.txt")).
+ setHeader(Exchange.FILE_NAME, constant("BeanToFileTest.txt")).
to("file://target/?append=false", "mock:result");
}
};
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/DirectoryCreateIssueTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/DirectoryCreateIssueTest.java?rev=747062&r1=747061&r2=747062&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/DirectoryCreateIssueTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/DirectoryCreateIssueTest.java Mon Feb 23 16:14:17 2009
@@ -49,7 +49,7 @@
destinations[i] = "seda:file" + i;
from("seda:file" + i)
- .setHeader(FileComponent.HEADER_FILE_NAME,
+ .setHeader(Exchange.FILE_NAME,
constant("file" + i + ".txt"))
.to("file://" + path + "/?append=false&noop=true", "mock:result");
}
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConfigureTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConfigureTest.java?rev=747062&r1=747061&r2=747062&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConfigureTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConfigureTest.java Mon Feb 23 16:14:17 2009
@@ -89,6 +89,6 @@
Message message = new DefaultMessage();
endpoint.configureMessage(consumedFile, message);
- assertEquals(EXPECT_FILE, message.getHeader(FileComponent.HEADER_FILE_NAME));
+ assertEquals(EXPECT_FILE, message.getHeader(Exchange.FILE_NAME));
}
}
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumeFileOnlyTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumeFileOnlyTest.java?rev=747062&r1=747061&r2=747062&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumeFileOnlyTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumeFileOnlyTest.java Mon Feb 23 16:14:17 2009
@@ -17,6 +17,7 @@
package org.apache.camel.component.file;
import org.apache.camel.ContextTestSupport;
+import org.apache.camel.Exchange;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
@@ -29,9 +30,9 @@
protected void setUp() throws Exception {
deleteDirectory("target/fileonly");
super.setUp();
- template.sendBodyAndHeader("file://target/fileonly", "Hello World", FileComponent.HEADER_FILE_NAME, "report.txt");
- template.sendBodyAndHeader("file://target/fileonly", "Bye World", FileComponent.HEADER_FILE_NAME, "report2.txt");
- template.sendBodyAndHeader("file://target/fileonly/2008", "2008 Report", FileComponent.HEADER_FILE_NAME, "report2008.txt");
+ template.sendBodyAndHeader("file://target/fileonly", "Hello World", Exchange.FILE_NAME, "report.txt");
+ template.sendBodyAndHeader("file://target/fileonly", "Bye World", Exchange.FILE_NAME, "report2.txt");
+ template.sendBodyAndHeader("file://target/fileonly/2008", "2008 Report", Exchange.FILE_NAME, "report2008.txt");
}
public void testConsumeFileOnly() throws Exception {
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumeMultipleDirectoriesTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumeMultipleDirectoriesTest.java?rev=747062&r1=747061&r2=747062&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumeMultipleDirectoriesTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumeMultipleDirectoriesTest.java Mon Feb 23 16:14:17 2009
@@ -19,6 +19,7 @@
import java.io.File;
import org.apache.camel.ContextTestSupport;
+import org.apache.camel.Exchange;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
@@ -33,9 +34,9 @@
protected void setUp() throws Exception {
deleteDirectory("target/multidir");
super.setUp();
- template.sendBodyAndHeader(fileUrl, "Bye World", FileComponent.HEADER_FILE_NAME, "bye.txt");
- template.sendBodyAndHeader(fileUrl, "Hello World", FileComponent.HEADER_FILE_NAME, "sub/hello.txt");
- template.sendBodyAndHeader(fileUrl, "Godday World", FileComponent.HEADER_FILE_NAME, "sub/sub2/godday.txt");
+ template.sendBodyAndHeader(fileUrl, "Bye World", Exchange.FILE_NAME, "bye.txt");
+ template.sendBodyAndHeader(fileUrl, "Hello World", Exchange.FILE_NAME, "sub/hello.txt");
+ template.sendBodyAndHeader(fileUrl, "Godday World", Exchange.FILE_NAME, "sub/sub2/godday.txt");
}
public void testMultiDir() throws Exception {
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumeSingleDirectoryOnlyTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumeSingleDirectoryOnlyTest.java?rev=747062&r1=747061&r2=747062&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumeSingleDirectoryOnlyTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumeSingleDirectoryOnlyTest.java Mon Feb 23 16:14:17 2009
@@ -17,6 +17,7 @@
package org.apache.camel.component.file;
import org.apache.camel.ContextTestSupport;
+import org.apache.camel.Exchange;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
@@ -29,9 +30,9 @@
protected void setUp() throws Exception {
deleteDirectory("target/singledirectoryonly");
super.setUp();
- template.sendBodyAndHeader("file://target/singledirectoryonly", "Hello World", FileComponent.HEADER_FILE_NAME, "report.txt");
- template.sendBodyAndHeader("file://target/singledirectoryonly", "Bye World", FileComponent.HEADER_FILE_NAME, "report2.txt");
- template.sendBodyAndHeader("file://target/singledirectoryonly/2008", "2008 Report", FileComponent.HEADER_FILE_NAME, "report2008.txt");
+ template.sendBodyAndHeader("file://target/singledirectoryonly", "Hello World", Exchange.FILE_NAME, "report.txt");
+ template.sendBodyAndHeader("file://target/singledirectoryonly", "Bye World", Exchange.FILE_NAME, "report2.txt");
+ template.sendBodyAndHeader("file://target/singledirectoryonly/2008", "2008 Report", Exchange.FILE_NAME, "report2008.txt");
}
public void testConsumeFileOnly() throws Exception {
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerBatchTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerBatchTest.java?rev=747062&r1=747061&r2=747062&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerBatchTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerBatchTest.java Mon Feb 23 16:14:17 2009
@@ -17,6 +17,7 @@
package org.apache.camel.component.file;
import org.apache.camel.ContextTestSupport;
+import org.apache.camel.Exchange;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
@@ -29,8 +30,8 @@
protected void setUp() throws Exception {
deleteDirectory("target/file-batch");
super.setUp();
- template.sendBodyAndHeader("file://target/file-batch/", "Hello World", FileComponent.HEADER_FILE_NAME, "hello.txt");
- template.sendBodyAndHeader("file://target/file-batch/", "Bye World", FileComponent.HEADER_FILE_NAME, "bye.txt");
+ template.sendBodyAndHeader("file://target/file-batch/", "Hello World", Exchange.FILE_NAME, "hello.txt");
+ template.sendBodyAndHeader("file://target/file-batch/", "Bye World", Exchange.FILE_NAME, "bye.txt");
}
@Override
@@ -47,9 +48,9 @@
mock.expectedBodiesReceivedInAnyOrder("Hello World", "Bye World");
// test header keys
- mock.message(0).header(FileComponent.HEADER_FILE_BATCH_TOTAL).isEqualTo(2);
- mock.message(0).header(FileComponent.HEADER_FILE_BATCH_INDEX).isEqualTo(0);
- mock.message(1).header(FileComponent.HEADER_FILE_BATCH_INDEX).isEqualTo(1);
+ mock.message(0).header(Exchange.FILE_BATCH_SIZE).isEqualTo(2);
+ mock.message(0).header(Exchange.FILE_BATCH_INDEX).isEqualTo(0);
+ mock.message(1).header(Exchange.FILE_BATCH_INDEX).isEqualTo(1);
assertMockEndpointsSatisfied();
}
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerBeginAndCommitExpressionRenameStrategyTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerBeginAndCommitExpressionRenameStrategyTest.java?rev=747062&r1=747061&r2=747062&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerBeginAndCommitExpressionRenameStrategyTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerBeginAndCommitExpressionRenameStrategyTest.java Mon Feb 23 16:14:17 2009
@@ -43,7 +43,7 @@
mock.expectedBodiesReceived("Hello Paris");
mock.expectedFileExists("./target/done/paris.bak", "Hello Paris");
- template.sendBodyAndHeader("file:target/reports", "Hello Paris", FileComponent.HEADER_FILE_NAME, "paris.txt");
+ template.sendBodyAndHeader("file:target/reports", "Hello Paris", Exchange.FILE_NAME, "paris.txt");
mock.assertIsSatisfied();
}
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerBeginAndCommitRenameStrategyTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerBeginAndCommitRenameStrategyTest.java?rev=747062&r1=747061&r2=747062&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerBeginAndCommitRenameStrategyTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerBeginAndCommitRenameStrategyTest.java Mon Feb 23 16:14:17 2009
@@ -43,7 +43,7 @@
mock.expectedBodiesReceived("Hello Paris");
mock.expectedFileExists("./target/done/paris.txt", "Hello Paris");
- template.sendBodyAndHeader("file:target/reports", "Hello Paris", FileComponent.HEADER_FILE_NAME, "paris.txt");
+ template.sendBodyAndHeader("file:target/reports", "Hello Paris", Exchange.FILE_NAME, "paris.txt");
mock.assertIsSatisfied();
}
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerBeginExpressionRenameStrategyTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerBeginExpressionRenameStrategyTest.java?rev=747062&r1=747061&r2=747062&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerBeginExpressionRenameStrategyTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerBeginExpressionRenameStrategyTest.java Mon Feb 23 16:14:17 2009
@@ -42,7 +42,7 @@
mock.expectedMessageCount(1);
mock.expectedBodiesReceived("Hello Paris");
- template.sendBodyAndHeader("file:target/reports", "Hello Paris", FileComponent.HEADER_FILE_NAME, "paris.txt");
+ template.sendBodyAndHeader("file:target/reports", "Hello Paris", Exchange.FILE_NAME, "paris.txt");
Thread.sleep(100);
@@ -64,7 +64,7 @@
MockEndpoint mock = getMockEndpoint("mock:report");
mock.expectedBodiesReceived("Hello London");
- template.sendBodyAndHeader("file:target/reports", "Hello London", FileComponent.HEADER_FILE_NAME, "london.txt");
+ template.sendBodyAndHeader("file:target/reports", "Hello London", Exchange.FILE_NAME, "london.txt");
mock.assertIsSatisfied();
}
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerBeginRenameStrategyTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerBeginRenameStrategyTest.java?rev=747062&r1=747061&r2=747062&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerBeginRenameStrategyTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerBeginRenameStrategyTest.java Mon Feb 23 16:14:17 2009
@@ -42,7 +42,7 @@
mock.expectedMessageCount(1);
mock.expectedBodiesReceived("Hello Paris");
- template.sendBodyAndHeader("file:target/reports", "Hello Paris", FileComponent.HEADER_FILE_NAME, "paris.txt");
+ template.sendBodyAndHeader("file:target/reports", "Hello Paris", Exchange.FILE_NAME, "paris.txt");
mock.assertIsSatisfied();
}
@@ -62,7 +62,7 @@
MockEndpoint mock = getMockEndpoint("mock:report");
mock.expectedBodiesReceived("Hello London");
- template.sendBodyAndHeader("file:target/reports", "Hello London", FileComponent.HEADER_FILE_NAME, "london.txt");
+ template.sendBodyAndHeader("file:target/reports", "Hello London", Exchange.FILE_NAME, "london.txt");
mock.assertIsSatisfied();
}
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerCommitRenameStrategyTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerCommitRenameStrategyTest.java?rev=747062&r1=747061&r2=747062&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerCommitRenameStrategyTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerCommitRenameStrategyTest.java Mon Feb 23 16:14:17 2009
@@ -20,6 +20,7 @@
import java.io.FileWriter;
import org.apache.camel.ContextTestSupport;
+import org.apache.camel.Exchange;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.converter.IOConverter;
@@ -41,7 +42,7 @@
mock.expectedBodiesReceived("Hello Paris");
mock.expectedFileExists("./target/done/paris.txt", "Hello Paris");
- template.sendBodyAndHeader("file:target/reports", "Hello Paris", FileComponent.HEADER_FILE_NAME, "paris.txt");
+ template.sendBodyAndHeader("file:target/reports", "Hello Paris", Exchange.FILE_NAME, "paris.txt");
mock.assertIsSatisfied();
}
@@ -61,7 +62,7 @@
MockEndpoint mock = getMockEndpoint("mock:report");
mock.expectedBodiesReceived("Hello London");
- template.sendBodyAndHeader("file:target/reports", "Hello London", FileComponent.HEADER_FILE_NAME, "london.txt");
+ template.sendBodyAndHeader("file:target/reports", "Hello London", Exchange.FILE_NAME, "london.txt");
mock.assertIsSatisfied();
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerDirectoryNotMatchedTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerDirectoryNotMatchedTest.java?rev=747062&r1=747061&r2=747062&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerDirectoryNotMatchedTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerDirectoryNotMatchedTest.java Mon Feb 23 16:14:17 2009
@@ -17,6 +17,7 @@
package org.apache.camel.component.file;
import org.apache.camel.ContextTestSupport;
+import org.apache.camel.Exchange;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
@@ -33,16 +34,16 @@
super.setUp();
template.sendBodyAndHeader("file:target/dirnotmatched/", "This is a dot file",
- FileComponent.HEADER_FILE_NAME, ".skipme");
+ Exchange.FILE_NAME, ".skipme");
template.sendBodyAndHeader("file:target/dirnotmatched/", "This is a web file",
- FileComponent.HEADER_FILE_NAME, "index.html");
+ Exchange.FILE_NAME, "index.html");
template.sendBodyAndHeader("file:target/dirnotmatched/2007", "2007 report",
- FileComponent.HEADER_FILE_NAME, "report2007.txt");
+ Exchange.FILE_NAME, "report2007.txt");
template.sendBodyAndHeader("file:target/dirnotmatched/2008", "2008 report",
- FileComponent.HEADER_FILE_NAME, "report2008.txt");
+ Exchange.FILE_NAME, "report2008.txt");
}
public void testSkipDirectories() throws Exception {
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerExcludeNameTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerExcludeNameTest.java?rev=747062&r1=747061&r2=747062&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerExcludeNameTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerExcludeNameTest.java Mon Feb 23 16:14:17 2009
@@ -17,6 +17,7 @@
package org.apache.camel.component.file;
import org.apache.camel.ContextTestSupport;
+import org.apache.camel.Exchange;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
@@ -37,10 +38,10 @@
private void prepareFiles() throws Exception {
String url = "file://target/exclude";
- template.sendBodyAndHeader(url, "Hello World", FileComponent.HEADER_FILE_NAME, "hello.xml");
- template.sendBodyAndHeader(url, "Reports", FileComponent.HEADER_FILE_NAME, "report1.txt");
- template.sendBodyAndHeader(url, "Bye World", FileComponent.HEADER_FILE_NAME, "secret.txt");
- template.sendBodyAndHeader(url, "Reports", FileComponent.HEADER_FILE_NAME, "report2.txt");
+ template.sendBodyAndHeader(url, "Hello World", Exchange.FILE_NAME, "hello.xml");
+ template.sendBodyAndHeader(url, "Reports", Exchange.FILE_NAME, "report1.txt");
+ template.sendBodyAndHeader(url, "Bye World", Exchange.FILE_NAME, "secret.txt");
+ template.sendBodyAndHeader(url, "Reports", Exchange.FILE_NAME, "report2.txt");
}
protected RouteBuilder createRouteBuilder() throws Exception {
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerFailureHandledTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerFailureHandledTest.java?rev=747062&r1=747061&r2=747062&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerFailureHandledTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerFailureHandledTest.java Mon Feb 23 16:14:17 2009
@@ -42,7 +42,7 @@
MockEndpoint mock = getMockEndpoint("mock:valid");
mock.expectedBodiesReceived("Hello Paris");
- template.sendBodyAndHeader("file:target/messages/input/?delete=true", "Paris", FileComponent.HEADER_FILE_NAME, "paris.txt");
+ template.sendBodyAndHeader("file:target/messages/input/?delete=true", "Paris", Exchange.FILE_NAME, "paris.txt");
mock.assertIsSatisfied();
// sleep otherwise the file assertions below could fail
@@ -56,7 +56,7 @@
// we get the original input so its not Hello London but only London
mock.expectedBodiesReceived("London");
- template.sendBodyAndHeader("file:target/messages/input/?delete=true", "London", FileComponent.HEADER_FILE_NAME, "london.txt");
+ template.sendBodyAndHeader("file:target/messages/input/?delete=true", "London", Exchange.FILE_NAME, "london.txt");
mock.assertIsSatisfied();
// sleep otherwise the file assertions below could fail
@@ -70,7 +70,7 @@
// we get the original input so its not Hello London but only London
mock.expectedBodiesReceived("Madrid");
- template.sendBodyAndHeader("file:target/messages/input/?delete=true", "Madrid", FileComponent.HEADER_FILE_NAME, "madrid.txt");
+ template.sendBodyAndHeader("file:target/messages/input/?delete=true", "Madrid", Exchange.FILE_NAME, "madrid.txt");
mock.assertIsSatisfied();
// sleep otherwise the file assertions below could fail
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerFileExpressionTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerFileExpressionTest.java?rev=747062&r1=747061&r2=747062&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerFileExpressionTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerFileExpressionTest.java Mon Feb 23 16:14:17 2009
@@ -17,6 +17,7 @@
package org.apache.camel.component.file;
import org.apache.camel.ContextTestSupport;
+import org.apache.camel.Exchange;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.impl.JndiRegistry;
@@ -45,9 +46,9 @@
}
public void testConsumeFileBasedOnBeanName() throws Exception {
- template.sendBodyAndHeader("file://target/filelanguage/bean", "Hello World", FileComponent.HEADER_FILE_NAME, "122.txt");
- template.sendBodyAndHeader("file://target/filelanguage/bean", "Goodday World", FileComponent.HEADER_FILE_NAME, "123.txt");
- template.sendBodyAndHeader("file://target/filelanguage/bean", "Bye World", FileComponent.HEADER_FILE_NAME, "124.txt");
+ template.sendBodyAndHeader("file://target/filelanguage/bean", "Hello World", Exchange.FILE_NAME, "122.txt");
+ template.sendBodyAndHeader("file://target/filelanguage/bean", "Goodday World", Exchange.FILE_NAME, "123.txt");
+ template.sendBodyAndHeader("file://target/filelanguage/bean", "Bye World", Exchange.FILE_NAME, "124.txt");
context.addRoutes(new RouteBuilder() {
@Override
@@ -67,9 +68,9 @@
}
public void testConsumeFileBasedOnDatePattern() throws Exception {
- template.sendBodyAndHeader("file://target/filelanguage/date", "Bye World", FileComponent.HEADER_FILE_NAME, "myfile-20081128.txt");
- template.sendBodyAndHeader("file://target/filelanguage/date", "Hello World", FileComponent.HEADER_FILE_NAME, "myfile-20081129.txt");
- template.sendBodyAndHeader("file://target/filelanguage/date", "Goodday World", FileComponent.HEADER_FILE_NAME, "myfile-${date:now:yyyyMMdd}.txt");
+ template.sendBodyAndHeader("file://target/filelanguage/date", "Bye World", Exchange.FILE_NAME, "myfile-20081128.txt");
+ template.sendBodyAndHeader("file://target/filelanguage/date", "Hello World", Exchange.FILE_NAME, "myfile-20081129.txt");
+ template.sendBodyAndHeader("file://target/filelanguage/date", "Goodday World", Exchange.FILE_NAME, "myfile-${date:now:yyyyMMdd}.txt");
context.addRoutes(new RouteBuilder() {
@Override
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerFileFilterTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerFileFilterTest.java?rev=747062&r1=747061&r2=747062&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerFileFilterTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerFileFilterTest.java Mon Feb 23 16:14:17 2009
@@ -17,6 +17,7 @@
package org.apache.camel.component.file;
import org.apache.camel.ContextTestSupport;
+import org.apache.camel.Exchange;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.impl.JndiRegistry;
@@ -46,7 +47,7 @@
mock.expectedMessageCount(0);
template.sendBodyAndHeader("file:target/filefilter/", "This is a file to be filtered",
- FileComponent.HEADER_FILE_NAME, "skipme.txt");
+ Exchange.FILE_NAME, "skipme.txt");
mock.setResultWaitTime(2000);
mock.assertIsSatisfied();
@@ -58,10 +59,10 @@
mock.expectedBodiesReceived("Hello World");
template.sendBodyAndHeader("file:target/filefilter/", "This is a file to be filtered",
- FileComponent.HEADER_FILE_NAME, "skipme.txt");
+ Exchange.FILE_NAME, "skipme.txt");
template.sendBodyAndHeader("file:target/filefilter/", "Hello World",
- FileComponent.HEADER_FILE_NAME, "hello.txt");
+ Exchange.FILE_NAME, "hello.txt");
mock.assertIsSatisfied();
}
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerIdempotentRefTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerIdempotentRefTest.java?rev=747062&r1=747061&r2=747062&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerIdempotentRefTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerIdempotentRefTest.java Mon Feb 23 16:14:17 2009
@@ -19,6 +19,7 @@
import java.io.File;
import org.apache.camel.ContextTestSupport;
+import org.apache.camel.Exchange;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.impl.JndiRegistry;
@@ -42,7 +43,7 @@
protected void setUp() throws Exception {
deleteDirectory("target/idempotent");
super.setUp();
- template.sendBodyAndHeader("file://target/idempotent/", "Hello World", FileComponent.HEADER_FILE_NAME, "report.txt");
+ template.sendBodyAndHeader("file://target/idempotent/", "Hello World", Exchange.FILE_NAME, "report.txt");
}
@Override
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerIdempotentTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerIdempotentTest.java?rev=747062&r1=747061&r2=747062&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerIdempotentTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerIdempotentTest.java Mon Feb 23 16:14:17 2009
@@ -19,6 +19,7 @@
import java.io.File;
import org.apache.camel.ContextTestSupport;
+import org.apache.camel.Exchange;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
@@ -31,7 +32,7 @@
protected void setUp() throws Exception {
deleteDirectory("target/idempotent");
super.setUp();
- template.sendBodyAndHeader("file://target/idempotent/", "Hello World", FileComponent.HEADER_FILE_NAME, "report.txt");
+ template.sendBodyAndHeader("file://target/idempotent/", "Hello World", Exchange.FILE_NAME, "report.txt");
}
@Override
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerIncludeAndExcludeNameTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerIncludeAndExcludeNameTest.java?rev=747062&r1=747061&r2=747062&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerIncludeAndExcludeNameTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerIncludeAndExcludeNameTest.java Mon Feb 23 16:14:17 2009
@@ -17,6 +17,7 @@
package org.apache.camel.component.file;
import org.apache.camel.ContextTestSupport;
+import org.apache.camel.Exchange;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
@@ -37,10 +38,10 @@
private void prepareFiles() throws Exception {
String url = "file://target/includeexclude";
- template.sendBodyAndHeader(url, "Hello World", FileComponent.HEADER_FILE_NAME, "hello.xml");
- template.sendBodyAndHeader(url, "Report 1", FileComponent.HEADER_FILE_NAME, "report1.xml");
- template.sendBodyAndHeader(url, "Report 2", FileComponent.HEADER_FILE_NAME, "report2.txt");
- template.sendBodyAndHeader(url, "Report 3", FileComponent.HEADER_FILE_NAME, "report3.txt");
+ template.sendBodyAndHeader(url, "Hello World", Exchange.FILE_NAME, "hello.xml");
+ template.sendBodyAndHeader(url, "Report 1", Exchange.FILE_NAME, "report1.xml");
+ template.sendBodyAndHeader(url, "Report 2", Exchange.FILE_NAME, "report2.txt");
+ template.sendBodyAndHeader(url, "Report 3", Exchange.FILE_NAME, "report3.txt");
}
protected RouteBuilder createRouteBuilder() throws Exception {
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerIncludeNameTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerIncludeNameTest.java?rev=747062&r1=747061&r2=747062&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerIncludeNameTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerIncludeNameTest.java Mon Feb 23 16:14:17 2009
@@ -17,6 +17,7 @@
package org.apache.camel.component.file;
import org.apache.camel.ContextTestSupport;
+import org.apache.camel.Exchange;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
@@ -37,10 +38,10 @@
private void prepareFiles() throws Exception {
String url = "file://target/include";
- template.sendBodyAndHeader(url, "Hello World", FileComponent.HEADER_FILE_NAME, "hello.xml");
- template.sendBodyAndHeader(url, "Reports", FileComponent.HEADER_FILE_NAME, "report1.txt");
- template.sendBodyAndHeader(url, "Bye World", FileComponent.HEADER_FILE_NAME, "secret.txt");
- template.sendBodyAndHeader(url, "Reports", FileComponent.HEADER_FILE_NAME, "report2.txt");
+ template.sendBodyAndHeader(url, "Hello World", Exchange.FILE_NAME, "hello.xml");
+ template.sendBodyAndHeader(url, "Reports", Exchange.FILE_NAME, "report1.txt");
+ template.sendBodyAndHeader(url, "Bye World", Exchange.FILE_NAME, "secret.txt");
+ template.sendBodyAndHeader(url, "Reports", Exchange.FILE_NAME, "report2.txt");
}
protected RouteBuilder createRouteBuilder() throws Exception {
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerMoveExpressionTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerMoveExpressionTest.java?rev=747062&r1=747061&r2=747062&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerMoveExpressionTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerMoveExpressionTest.java Mon Feb 23 16:14:17 2009
@@ -19,6 +19,7 @@
import java.io.File;
import org.apache.camel.ContextTestSupport;
+import org.apache.camel.Exchange;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.impl.JndiRegistry;
@@ -60,7 +61,7 @@
MockEndpoint mock = getMockEndpoint("mock:result");
mock.expectedBodiesReceived("Hello World");
- template.sendBodyAndHeader("file://target/filelanguage/", "Hello World", FileComponent.HEADER_FILE_NAME, "report.txt");
+ template.sendBodyAndHeader("file://target/filelanguage/", "Hello World", Exchange.FILE_NAME, "report.txt");
assertMockEndpointsSatisfied();
// give time for consumer to rename file
@@ -85,7 +86,7 @@
MockEndpoint mock = getMockEndpoint("mock:result");
mock.expectedBodiesReceived("Bye World");
- template.sendBodyAndHeader("file://target/filelanguage/", "Bye World", FileComponent.HEADER_FILE_NAME, "report2.txt");
+ template.sendBodyAndHeader("file://target/filelanguage/", "Bye World", Exchange.FILE_NAME, "report2.txt");
assertMockEndpointsSatisfied();
// give time for consumer to rename file
@@ -111,7 +112,7 @@
mock.expectedBodiesReceived("Bye Big World");
mock.expectedFileExists("target/filelanguage/backup/123.txt", "Bye Big World");
- template.sendBodyAndHeader("file://target/filelanguage/", "Bye Big World", FileComponent.HEADER_FILE_NAME, "report3.txt");
+ template.sendBodyAndHeader("file://target/filelanguage/", "Bye Big World", Exchange.FILE_NAME, "report3.txt");
assertMockEndpointsSatisfied();
}
@@ -129,7 +130,7 @@
mock.expectedBodiesReceived("Hello Big World");
mock.expectedFileExists("target/backup/report4.txt.bak");
- template.sendBodyAndHeader("file://target/filelanguage/", "Hello Big World", FileComponent.HEADER_FILE_NAME, "report4.txt");
+ template.sendBodyAndHeader("file://target/filelanguage/", "Hello Big World", Exchange.FILE_NAME, "report4.txt");
assertMockEndpointsSatisfied();
}
@@ -156,7 +157,7 @@
mock.expectedFileExists("target/filelanguage/123");
template.sendBodyAndHeader("file://target/filelanguage/", "Bean Language Rules The World",
- FileComponent.HEADER_FILE_NAME, "report5.txt");
+ Exchange.FILE_NAME, "report5.txt");
assertMockEndpointsSatisfied();
}
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerSkipDotFilesTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerSkipDotFilesTest.java?rev=747062&r1=747061&r2=747062&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerSkipDotFilesTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerSkipDotFilesTest.java Mon Feb 23 16:14:17 2009
@@ -17,6 +17,7 @@
package org.apache.camel.component.file;
import org.apache.camel.ContextTestSupport;
+import org.apache.camel.Exchange;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
@@ -38,7 +39,7 @@
mock.expectedMessageCount(0);
template.sendBodyAndHeader("file:target/dotfiles/", "This is a dot file",
- FileComponent.HEADER_FILE_NAME, ".skipme");
+ Exchange.FILE_NAME, ".skipme");
mock.setResultWaitTime(2000);
mock.assertIsSatisfied();
@@ -50,10 +51,10 @@
mock.expectedBodiesReceived("Hello World");
template.sendBodyAndHeader("file:target/dotfiles/", "This is a dot file",
- FileComponent.HEADER_FILE_NAME, ".skipme");
+ Exchange.FILE_NAME, ".skipme");
template.sendBodyAndHeader("file:target/dotfiles/", "Hello World",
- FileComponent.HEADER_FILE_NAME, "hello.txt");
+ Exchange.FILE_NAME, "hello.txt");
mock.assertIsSatisfied();
}
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileDeleteRouteExceptionTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileDeleteRouteExceptionTest.java?rev=747062&r1=747061&r2=747062&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileDeleteRouteExceptionTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileDeleteRouteExceptionTest.java Mon Feb 23 16:14:17 2009
@@ -16,14 +16,7 @@
*/
package org.apache.camel.component.file;
-import java.io.File;
-
-import org.apache.camel.CamelException;
-import org.apache.camel.Exchange;
-import org.apache.camel.Processor;
-import org.apache.camel.ValidationException;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.component.mock.MockEndpoint;
/**
* @version $Revision$
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileFilterOnNameRouteTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileFilterOnNameRouteTest.java?rev=747062&r1=747061&r2=747062&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileFilterOnNameRouteTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileFilterOnNameRouteTest.java Mon Feb 23 16:14:17 2009
@@ -16,6 +16,7 @@
*/
package org.apache.camel.component.file;
+import org.apache.camel.Exchange;
import org.apache.camel.builder.RouteBuilder;
/**
@@ -27,7 +28,7 @@
protected RouteBuilder createRouteBuilder() {
return new RouteBuilder() {
public void configure() {
- from(uri).filter(header(FileComponent.HEADER_FILE_NAME).contains("-")).to("mock:result");
+ from(uri).filter(header(Exchange.FILE_NAME).contains("-")).to("mock:result");
}
};
}
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileHeaderFileNameProducedTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileHeaderFileNameProducedTest.java?rev=747062&r1=747061&r2=747062&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileHeaderFileNameProducedTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileHeaderFileNameProducedTest.java Mon Feb 23 16:14:17 2009
@@ -17,6 +17,7 @@
package org.apache.camel.component.file;
import org.apache.camel.ContextTestSupport;
+import org.apache.camel.Exchange;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
@@ -29,9 +30,9 @@
MockEndpoint mock = getMockEndpoint("mock:result");
mock.expectedMessageCount(1);
// the absolute path to the file written should contain the target folder
- mock.message(0).header(FileComponent.HEADER_FILE_NAME_PRODUCED).contains("target");
+ mock.message(0).header(Exchange.FILE_NAME_PRODUCED).contains("target");
- template.requestBodyAndHeader("direct:in", "Hello World", FileComponent.HEADER_FILE_NAME,
+ template.requestBodyAndHeader("direct:in", "Hello World", Exchange.FILE_NAME,
"FileHeaderFileNameProducedTest.txt");
mock.assertIsSatisfied();
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileMEPInOutTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileMEPInOutTest.java?rev=747062&r1=747061&r2=747062&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileMEPInOutTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileMEPInOutTest.java Mon Feb 23 16:14:17 2009
@@ -17,6 +17,7 @@
package org.apache.camel.component.file;
import org.apache.camel.ContextTestSupport;
+import org.apache.camel.Exchange;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
@@ -32,7 +33,7 @@
mock.expectedFileExists("target/FileMEPInOutTest.txt", "Hello World");
// request is InOut
- template.requestBodyAndHeader("direct:in", "Hello World", FileComponent.HEADER_FILE_NAME,
+ template.requestBodyAndHeader("direct:in", "Hello World", Exchange.FILE_NAME,
"FileMEPInOutTest.txt");
assertMockEndpointsSatisfied();
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileNoOpLockFileTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileNoOpLockFileTest.java?rev=747062&r1=747061&r2=747062&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileNoOpLockFileTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileNoOpLockFileTest.java Mon Feb 23 16:14:17 2009
@@ -40,7 +40,7 @@
mock.expectedBodiesReceived("Hello Locked");
template.sendBodyAndHeader("file:target/reports/locked", "Hello Locked",
- FileComponent.HEADER_FILE_NAME, "report.txt");
+ Exchange.FILE_NAME, "report.txt");
mock.assertIsSatisfied();
@@ -56,7 +56,7 @@
mock.expectedBodiesReceived("Hello Not Locked");
template.sendBodyAndHeader("file:target/reports/notlocked", "Hello Not Locked",
- FileComponent.HEADER_FILE_NAME, "report.txt");
+ Exchange.FILE_NAME, "report.txt");
mock.assertIsSatisfied();
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileProduceAppendTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileProduceAppendTest.java?rev=747062&r1=747061&r2=747062&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileProduceAppendTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileProduceAppendTest.java Mon Feb 23 16:14:17 2009
@@ -19,6 +19,7 @@
import java.io.File;
import org.apache.camel.ContextTestSupport;
+import org.apache.camel.Exchange;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
@@ -53,8 +54,8 @@
protected void setUp() throws Exception {
deleteDirectory("target/test-file-append");
super.setUp();
- template.sendBodyAndHeader("file://target/test-file-append", "Hello", FileComponent.HEADER_FILE_NAME, "hello.txt");
- template.sendBodyAndHeader("file://target/test-file-append", " World", FileComponent.HEADER_FILE_NAME, "world.txt");
+ template.sendBodyAndHeader("file://target/test-file-append", "Hello", Exchange.FILE_NAME, "hello.txt");
+ template.sendBodyAndHeader("file://target/test-file-append", " World", Exchange.FILE_NAME, "world.txt");
}
@Override
@@ -62,7 +63,7 @@
return new RouteBuilder() {
public void configure() {
from("direct:start")
- .setHeader(FileComponent.HEADER_FILE_NAME, constant("hello.txt"))
+ .setHeader(Exchange.FILE_NAME, constant("hello.txt"))
.to("file://target/test-file-append?append=true", "mock:result");
}
};
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileProduceTempPrefixTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileProduceTempPrefixTest.java?rev=747062&r1=747061&r2=747062&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileProduceTempPrefixTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileProduceTempPrefixTest.java Mon Feb 23 16:14:17 2009
@@ -20,6 +20,7 @@
import org.apache.camel.ContextTestSupport;
import org.apache.camel.Endpoint;
+import org.apache.camel.Exchange;
import org.apache.camel.builder.RouteBuilder;
/**
@@ -48,7 +49,7 @@
public void testTempPrefix() throws Exception {
deleteDirectory("target/tempandrename");
- template.sendBodyAndHeader("direct:a", "Hello World", FileComponent.HEADER_FILE_NAME, "hello.txt");
+ template.sendBodyAndHeader("direct:a", "Hello World", Exchange.FILE_NAME, "hello.txt");
File file = new File("target/tempandrename/hello.txt");
// use absolute file to let unittest pass on all platforms