Return-Path: Delivered-To: apmail-activemq-camel-commits-archive@locus.apache.org Received: (qmail 59635 invoked from network); 26 Nov 2008 08:30:25 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 26 Nov 2008 08:30:25 -0000 Received: (qmail 77947 invoked by uid 500); 26 Nov 2008 08:30:36 -0000 Delivered-To: apmail-activemq-camel-commits-archive@activemq.apache.org Received: (qmail 77920 invoked by uid 500); 26 Nov 2008 08:30:36 -0000 Mailing-List: contact camel-commits-help@activemq.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: camel-dev@activemq.apache.org Delivered-To: mailing list camel-commits@activemq.apache.org Received: (qmail 77911 invoked by uid 99); 26 Nov 2008 08:30:36 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 26 Nov 2008 00:30:36 -0800 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 26 Nov 2008 08:29:18 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id F2D0C23888A3; Wed, 26 Nov 2008 00:30:04 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r720765 - in /activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model: AggregatorType.java ExceptionType.java IdempotentConsumerType.java ProceedType.java ResequencerType.java Date: Wed, 26 Nov 2008 08:30:04 -0000 To: camel-commits@activemq.apache.org From: davsclaus@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20081126083004.F2D0C23888A3@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: davsclaus Date: Wed Nov 26 00:30:04 2008 New Revision: 720765 URL: http://svn.apache.org/viewvc?rev=720765&view=rev Log: CAMEL-1116: Added javadoc for fluent builders. Added missing collectionRef builder to aggregator. Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/AggregatorType.java activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ExceptionType.java activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/IdempotentConsumerType.java activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ProceedType.java activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ResequencerType.java Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/AggregatorType.java URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/AggregatorType.java?rev=720765&r1=720764&r2=720765&view=diff ============================================================================== --- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/AggregatorType.java (original) +++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/AggregatorType.java Wed Nov 26 00:30:04 2008 @@ -269,6 +269,14 @@ this.strategyRef = strategyRef; } + public String getCollectionRef() { + return collectionRef; + } + + public void setCollectionRef(String collectionRef) { + this.collectionRef = collectionRef; + } + public void setCompletedPredicate(ExpressionSubElementType completedPredicate) { this.completedPredicate = completedPredicate; } @@ -336,6 +344,17 @@ } /** + * Sets the aggegate collection to use + * + * @param collectionRef reference to the aggregate collection to lookup in the registry + * @return the builder + */ + public AggregatorType collectionRef(String collectionRef) { + setCollectionRef(collectionRef); + return this; + } + + /** * Sets the aggegate strategy to use * * @param strategyRef reference to the strategy to lookup in the registry Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ExceptionType.java URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ExceptionType.java?rev=720765&r1=720764&r2=720765&view=diff ============================================================================== --- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ExceptionType.java (original) +++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ExceptionType.java Wed Nov 26 00:30:04 2008 @@ -85,12 +85,6 @@ return "Exception[" + getExceptionClasses() + (onWhen != null ? " " + onWhen : "") + " -> " + getOutputs() + "]"; } - @Override - public ExceptionType onException(Class exceptionType) { - getExceptionClasses().add(exceptionType); - return this; - } - /** * Allows an exception handler to create a new redelivery policy for this exception type * @param context the camel context @@ -127,6 +121,13 @@ // Fluent API //------------------------------------------------------------------------- + + @Override + public ExceptionType onException(Class exceptionType) { + getExceptionClasses().add(exceptionType); + return this; + } + /** * Sets wether the exchange should be marked as handled or not. * Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/IdempotentConsumerType.java URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/IdempotentConsumerType.java?rev=720765&r1=720764&r2=720765&view=diff ============================================================================== --- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/IdempotentConsumerType.java (original) +++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/IdempotentConsumerType.java Wed Nov 26 00:30:04 2008 @@ -83,7 +83,13 @@ childProcessor); } - public MessageIdRepository resolveMessageIdRepository(RouteContext routeContext) { + /** + * Strategy method to resolve the {@link org.apache.camel.processor.idempotent.MessageIdRepository} to use + * + * @param routeContext route context + * @return the repository + */ + protected MessageIdRepository resolveMessageIdRepository(RouteContext routeContext) { if (messageIdRepository == null) { messageIdRepository = routeContext.lookup(messageIdRepositoryRef, MessageIdRepository.class); } Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ProceedType.java URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ProceedType.java?rev=720765&r1=720764&r2=720765&view=diff ============================================================================== --- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ProceedType.java (original) +++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ProceedType.java Wed Nov 26 00:30:04 2008 @@ -37,9 +37,7 @@ return "proceed"; } - // TODO we should be just returning the outputs! public Processor createProcessor(RouteContext routeContext) throws Exception { - //return routeContext.createProceedProcessor(); return createOutputsProcessor(routeContext); } } Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ResequencerType.java URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ResequencerType.java?rev=720765&r1=720764&r2=720765&view=diff ============================================================================== --- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ResequencerType.java (original) +++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ResequencerType.java Wed Nov 26 00:30:04 2008 @@ -282,7 +282,7 @@ } private Route createBatchResequencerRoute(RouteContext routeContext) throws Exception { - // TODO: No used should it be removed? + // TODO: Not used should it be removed? final Resequencer resequencer = createBatchResequencer(routeContext, batchConfig); return new Route(routeContext.getEndpoint(), resequencer) { @Override @@ -293,7 +293,7 @@ } private Route createStreamResequencerRoute(RouteContext routeContext) throws Exception { - // TODO: No used should it be removed? + // TODO: Not used should it be removed? final StreamResequencer resequencer = createStreamResequencer(routeContext, streamConfig); return new Route(routeContext.getEndpoint(), resequencer) { @Override