svn commit: r782594 - in /camel/trunk/camel-core/src: main/java/org/apache/camel/processor/BatchProcessor.java test/java/org/apache/camel/processor/aggregator/AggregateTimeoutOnlyTest.java

[da...@apache.org]

Author: davsclaus
Date: Mon Jun  8 11:25:14 2009
New Revision: 782594

URL: http://svn.apache.org/viewvc?rev=782594&view=rev
Log:
CAMEL-1666: Added support for disabling batchSize in aggregator to be only timeout based.

Added:
    camel/trunk/camel-core/src/test/java/org/apache/camel/processor/aggregator/AggregateTimeoutOnlyTest.java   (with props)
Modified:
    camel/trunk/camel-core/src/main/java/org/apache/camel/processor/BatchProcessor.java

Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/processor/BatchProcessor.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/BatchProcessor.java?rev=782594&r1=782593&r2=782594&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/processor/BatchProcessor.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/processor/BatchProcessor.java Mon Jun  8 11:25:14 2009
@@ -101,7 +101,14 @@
      * @param batchSize the size
      */
     public void setBatchSize(int batchSize) {
-        this.batchSize = batchSize;
+        // setting batch size to 0 or negative is like disabling it, so we set it as the max value
+        // as the code logic is dependt on a batch size having 1..n value
+        if (batchSize <= 0) {
+            LOG.debug("Disabling batch size, will only be triggered by timeout");
+            this.batchSize = Integer.MAX_VALUE;
+        } else {
+            this.batchSize = batchSize;
+        }
     }
 
     public int getOutBatchSize() {

Added: camel/trunk/camel-core/src/test/java/org/apache/camel/processor/aggregator/AggregateTimeoutOnlyTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/aggregator/AggregateTimeoutOnlyTest.java?rev=782594&view=auto
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/processor/aggregator/AggregateTimeoutOnlyTest.java (added)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/processor/aggregator/AggregateTimeoutOnlyTest.java Mon Jun  8 11:25:14 2009
@@ -0,0 +1,58 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.processor.aggregator;
+
+import org.apache.camel.ContextTestSupport;
+import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.mock.MockEndpoint;
+
+/**
+ * Unit test to verify that aggregate by timeout only also works.
+ * 
+ * @version $Revision$
+ */
+public class AggregateTimeoutOnlyTest extends ContextTestSupport {
+
+    public void testAggregateTimeoutOnly() throws Exception {
+        MockEndpoint result = getMockEndpoint("mock:result");
+        // by default the use latest aggregatation strategy is used so we get message 9
+        result.expectedBodiesReceived("Message 9");
+        // should take 3 seconds to complete this one
+        result.setMinimumResultWaitTime(3000);
+
+        for (int i = 0; i < 10; i++) {
+            template.sendBodyAndHeader("direct:start", "Message " + i, "id", "1");
+        }
+
+        assertMockEndpointsSatisfied();
+    }
+
+    @Override
+    protected RouteBuilder createRouteBuilder() throws Exception {
+        return new RouteBuilder() {
+            @Override
+            public void configure() throws Exception {
+                // START SNIPPET: e1
+                from("direct:start")
+                    // aggregate every 3th second and disable the batch size so we set it to 0
+                    .aggregate(header("id")).batchTimeout(3000).batchSize(0)
+                    .to("mock:result");
+                // END SNIPPET: e1
+            }
+        };
+    }
+}

Propchange: camel/trunk/camel-core/src/test/java/org/apache/camel/processor/aggregator/AggregateTimeoutOnlyTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: camel/trunk/camel-core/src/test/java/org/apache/camel/processor/aggregator/AggregateTimeoutOnlyTest.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date