You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2008/05/24 10:29:26 UTC
svn commit: r659771 - in
/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component:
bean/ dataset/ direct/
Author: davsclaus
Date: Sat May 24 01:29:26 2008
New Revision: 659771
URL: http://svn.apache.org/viewvc?rev=659771&view=rev
Log:
CAMEL-517: Javadoc polished and fixed a 'not looping IDEA hint' from a method in DirectProducer
Modified:
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/BeanEndpoint.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/BeanExchange.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/BeanHolder.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/BeanInfo.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/BeanInvocation.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/bean/MethodInfo.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/MethodInvocation.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/NoBeanAvailableException.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/ParameterInfo.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/XPathAnnotationExpressionFactory.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/dataset/DataSetComponent.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/dataset/DataSetConsumer.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/dataset/DataSetEndpoint.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/dataset/DataSetSupport.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/direct/DirectProducer.java
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/BeanEndpoint.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/BeanEndpoint.java?rev=659771&r1=659770&r2=659771&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/BeanEndpoint.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/BeanEndpoint.java Sat May 24 01:29:26 2008
@@ -22,6 +22,8 @@
import org.apache.camel.impl.ProcessorEndpoint;
/**
+ * Endpoint for the bean component.
+ *
* @version $Revision: 1.1 $
*/
public class BeanEndpoint extends ProcessorEndpoint {
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/BeanExchange.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/BeanExchange.java?rev=659771&r1=659770&r2=659771&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/BeanExchange.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/BeanExchange.java Sat May 24 01:29:26 2008
@@ -22,6 +22,8 @@
import org.apache.camel.impl.DefaultExchange;
/**
+ * Exchange for the bean component.
+ *
* @version $Revision$
*/
public class BeanExchange extends DefaultExchange {
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/BeanHolder.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/BeanHolder.java?rev=659771&r1=659770&r2=659771&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/BeanHolder.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/BeanHolder.java Sat May 24 01:29:26 2008
@@ -19,6 +19,8 @@
import org.apache.camel.Processor;
/**
+ * Object holder for a bean.
+ *
* @version $Revision$
*/
public interface BeanHolder {
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/BeanInfo.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/BeanInfo.java?rev=659771&r1=659770&r2=659771&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/BeanInfo.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/BeanInfo.java Sat May 24 01:29:26 2008
@@ -16,7 +16,6 @@
*/
package org.apache.camel.component.bean;
-
import java.lang.annotation.Annotation;
import java.lang.reflect.Method;
import java.lang.reflect.Modifier;
@@ -47,8 +46,6 @@
import static org.apache.camel.util.ExchangeHelper.convertToType;
-
-
/**
* Represents the metadata about a bean type created via a combination of
* introspection and annotations together with some useful sensible defaults
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/BeanInvocation.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/BeanInvocation.java?rev=659771&r1=659770&r2=659771&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/BeanInvocation.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/BeanInvocation.java Sat May 24 01:29:26 2008
@@ -28,6 +28,9 @@
import org.apache.camel.util.IOHelper;
import org.apache.camel.util.ObjectHelper;
+/**
+ * Invocation of beans that can handle being serialized.
+ */
public class BeanInvocation implements Externalizable {
private Object[] args;
private MethodBean methodBean;
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=659771&r1=659770&r2=659771&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 Sat May 24 01:29:26 2008
@@ -26,6 +26,8 @@
import org.apache.camel.util.ObjectHelper;
/**
+ * Default implementation of the {@link AnnotationExpressionFactory}.
+ *
* @version $Revision$
*/
public class DefaultAnnotationExpressionFactory implements AnnotationExpressionFactory {
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/MethodInfo.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/MethodInfo.java?rev=659771&r1=659770&r2=659771&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/MethodInfo.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/MethodInfo.java Sat May 24 01:29:26 2008
@@ -28,6 +28,8 @@
import org.apache.camel.util.ObjectHelper;
/**
+ * Information about a method to be used for invocation.
+ *
* @version $Revision$
*/
public class MethodInfo {
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/MethodInvocation.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/MethodInvocation.java?rev=659771&r1=659770&r2=659771&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/MethodInvocation.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/MethodInvocation.java Sat May 24 01:29:26 2008
@@ -20,6 +20,8 @@
import java.lang.reflect.Method;
/**
+ * Information used by Camel to perform method invocation.
+ *
* @version $Revision$
*/
public interface MethodInvocation {
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/NoBeanAvailableException.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/NoBeanAvailableException.java?rev=659771&r1=659770&r2=659771&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/NoBeanAvailableException.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/NoBeanAvailableException.java Sat May 24 01:29:26 2008
@@ -19,6 +19,8 @@
import org.apache.camel.CamelException;
/**
+ * Exception thrown if the bean could not be found in the registry.
+ *
* @version $Revision$
*/
public class NoBeanAvailableException extends CamelException {
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/ParameterInfo.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/ParameterInfo.java?rev=659771&r1=659770&r2=659771&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/ParameterInfo.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/ParameterInfo.java Sat May 24 01:29:26 2008
@@ -21,6 +21,8 @@
import org.apache.camel.Expression;
/**
+ * Parameter information to be used for method invocation.
+ *
* @version $Revision$
*/
public class ParameterInfo {
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/XPathAnnotationExpressionFactory.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/XPathAnnotationExpressionFactory.java?rev=659771&r1=659770&r2=659771&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/XPathAnnotationExpressionFactory.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/XPathAnnotationExpressionFactory.java Sat May 24 01:29:26 2008
@@ -26,6 +26,8 @@
import org.apache.camel.language.XPath;
/**
+ * Factory for the XPath expression annotations.
+ *
* @version $Revision$
*/
public class XPathAnnotationExpressionFactory extends DefaultAnnotationExpressionFactory {
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/dataset/DataSetComponent.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/dataset/DataSetComponent.java?rev=659771&r1=659770&r2=659771&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/dataset/DataSetComponent.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/dataset/DataSetComponent.java Sat May 24 01:29:26 2008
@@ -28,6 +28,8 @@
import org.apache.camel.util.UnsafeUriCharactersEncoder;
/**
+ * Component for <a href="http://activemq.apache.org/camel/dataset.html">DataSet</a>.
+ *
* @version $Revision$
*/
public class DataSetComponent extends DefaultComponent<Exchange> {
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/dataset/DataSetConsumer.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/dataset/DataSetConsumer.java?rev=659771&r1=659770&r2=659771&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/dataset/DataSetConsumer.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/dataset/DataSetConsumer.java Sat May 24 01:29:26 2008
@@ -24,6 +24,8 @@
import org.apache.commons.logging.LogFactory;
/**
+ * DataSet consumer.
+ *
* @version $Revision$
*/
public class DataSetConsumer extends DefaultConsumer<Exchange> {
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/dataset/DataSetEndpoint.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/dataset/DataSetEndpoint.java?rev=659771&r1=659770&r2=659771&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/dataset/DataSetEndpoint.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/dataset/DataSetEndpoint.java Sat May 24 01:29:26 2008
@@ -33,6 +33,8 @@
import org.apache.commons.logging.LogFactory;
/**
+ * Endpoint for DataSet.
+ *
* @version $Revision$
*/
public class DataSetEndpoint extends MockEndpoint implements Service {
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/dataset/DataSetSupport.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/dataset/DataSetSupport.java?rev=659771&r1=659770&r2=659771&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/dataset/DataSetSupport.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/dataset/DataSetSupport.java Sat May 24 01:29:26 2008
@@ -25,6 +25,8 @@
import org.apache.camel.util.ExchangeHelper;
/**
+ * Base class for DataSet
+ *
* @version $Revision$
*/
public abstract class DataSetSupport implements DataSet {
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/direct/DirectProducer.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/direct/DirectProducer.java?rev=659771&r1=659770&r2=659771&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/direct/DirectProducer.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/direct/DirectProducer.java Sat May 24 01:29:26 2008
@@ -26,6 +26,8 @@
import org.apache.commons.logging.LogFactory;
/**
+ * The direct producer.
+ *
* @version $Revision$
*/
public class DirectProducer<E extends Exchange> extends DefaultProducer implements AsyncProcessor {
@@ -51,21 +53,18 @@
int size = endpoint.getConsumers().size();
if (size == 0) {
LOG.warn("No getConsumers() available on " + this + " for " + exchange);
- } else {
- if (size > 1) {
- // Too hard to do multiple async.. do it sync
- try {
- for (DefaultConsumer<E> consumer : endpoint.getConsumers()) {
- consumer.getProcessor().process(exchange);
- }
- } catch (Throwable error) {
- exchange.setException(error);
- }
- } else {
+ } else if (size == 1) {
+ DefaultConsumer<E> consumer = endpoint.getConsumers().get(0);
+ AsyncProcessor processor = AsyncProcessorTypeConverter.convert(consumer.getProcessor());
+ return processor.process(exchange, callback);
+ } else if (size > 1) {
+ // Too hard to do multiple async.. do it sync
+ try {
for (DefaultConsumer<E> consumer : endpoint.getConsumers()) {
- AsyncProcessor processor = AsyncProcessorTypeConverter.convert(consumer.getProcessor());
- return processor.process(exchange, callback);
+ consumer.getProcessor().process(exchange);
}
+ } catch (Throwable error) {
+ exchange.setException(error);
}
}
callback.done(true);