camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From davscl...@apache.org
Subject svn commit: r935323 - in /camel/trunk: camel-core/src/main/java/org/apache/camel/model/ camel-core/src/main/java/org/apache/camel/processor/aggregate/ camel-core/src/main/java/org/apache/camel/spi/ camel-core/src/test/java/org/apache/camel/processor/ag...
Date Sun, 18 Apr 2010 10:02:48 GMT
Author: davsclaus
Date: Sun Apr 18 10:02:47 2010
New Revision: 935323

URL: http://svn.apache.org/viewvc?rev=935323&view=rev
Log:
Using String for correlation keys to avoid pitfals when using xpath which uses an object instance which does not fulfill equals contract.

Modified:
    camel/trunk/camel-core/src/main/java/org/apache/camel/model/AggregateDefinition.java
    camel/trunk/camel-core/src/main/java/org/apache/camel/processor/aggregate/AggregateProcessor.java
    camel/trunk/camel-core/src/main/java/org/apache/camel/processor/aggregate/MemoryAggregationRepository.java
    camel/trunk/camel-core/src/main/java/org/apache/camel/spi/AggregationRepository.java
    camel/trunk/camel-core/src/main/java/org/apache/camel/spi/RecoverableAggregationRepository.java
    camel/trunk/camel-core/src/test/java/org/apache/camel/processor/aggregator/AggregateClosedCorrelationKeyTest.java
    camel/trunk/components/camel-hawtdb/src/main/java/org/apache/camel/component/hawtdb/HawtDBAggregationRepository.java
    camel/trunk/components/camel-hawtdb/src/main/java/org/apache/camel/component/hawtdb/HawtDBCamelMarshaller.java
    camel/trunk/components/camel-hawtdb/src/test/java/org/apache/camel/component/hawtdb/HawtDBAggregateBufferSizeTest.java
    camel/trunk/components/camel-hawtdb/src/test/java/org/apache/camel/component/hawtdb/HawtDBAggregateConcurrentDifferentGroupsTest.java
    camel/trunk/components/camel-hawtdb/src/test/java/org/apache/camel/component/hawtdb/HawtDBAggregateConcurrentSameGroupTest.java
    camel/trunk/components/camel-hawtdb/src/test/java/org/apache/camel/component/hawtdb/HawtDBAggregateLoadAndRecoverTest.java
    camel/trunk/components/camel-hawtdb/src/test/java/org/apache/camel/component/hawtdb/HawtDBAggregateLoadConcurrentTest.java
    camel/trunk/components/camel-hawtdb/src/test/java/org/apache/camel/component/hawtdb/HawtDBAggregateLoadTest.java
    camel/trunk/components/camel-hawtdb/src/test/java/org/apache/camel/component/hawtdb/HawtDBAggregateNotLostRemovedWhenConfirmedTest.java
    camel/trunk/components/camel-hawtdb/src/test/java/org/apache/camel/component/hawtdb/HawtDBAggregateNotLostTest.java
    camel/trunk/components/camel-hawtdb/src/test/java/org/apache/camel/component/hawtdb/HawtDBAggregateRecoverDeadLetterChannelFailedTest.java
    camel/trunk/components/camel-hawtdb/src/test/java/org/apache/camel/component/hawtdb/HawtDBAggregateRecoverDeadLetterChannelTest.java
    camel/trunk/components/camel-hawtdb/src/test/java/org/apache/camel/component/hawtdb/HawtDBAggregateRecoverTest.java
    camel/trunk/components/camel-hawtdb/src/test/java/org/apache/camel/component/hawtdb/HawtDBAggregateRecoverWithRedeliveryPolicyTest.java
    camel/trunk/components/camel-hawtdb/src/test/java/org/apache/camel/component/hawtdb/HawtDBAggregateRecoverWithSedaTest.java
    camel/trunk/components/camel-hawtdb/src/test/java/org/apache/camel/component/hawtdb/HawtDBAggregateTest.java
    camel/trunk/components/camel-hawtdb/src/test/java/org/apache/camel/component/hawtdb/HawtDBAggregationRepositoryAlotDataTest.java
    camel/trunk/components/camel-hawtdb/src/test/java/org/apache/camel/component/hawtdb/HawtDBAggregationRepositoryLoadExistingTest.java
    camel/trunk/components/camel-hawtdb/src/test/java/org/apache/camel/component/hawtdb/HawtDBAggregationRepositoryMultipleRepoTest.java
    camel/trunk/components/camel-hawtdb/src/test/java/org/apache/camel/component/hawtdb/HawtDBAggregationRepositoryRecoverExistingTest.java
    camel/trunk/components/camel-hawtdb/src/test/java/org/apache/camel/component/hawtdb/HawtDBAggregationRepositoryTest.java
    camel/trunk/components/camel-hawtdb/src/test/java/org/apache/camel/component/hawtdb/HawtDBExchangeSerializationTest.java

Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/model/AggregateDefinition.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/AggregateDefinition.java?rev=935323&r1=935322&r2=935323&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/AggregateDefinition.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/AggregateDefinition.java Sun Apr 18 10:02:47 2010
@@ -162,7 +162,7 @@ public class AggregateDefinition extends
         }
         AggregateProcessor answer = new AggregateProcessor(routeContext.getCamelContext(), processor, correlation, strategy, executorService);
 
-        AggregationRepository<Object> repository = createAggregationRepository(routeContext);
+        AggregationRepository repository = createAggregationRepository(routeContext);
         if (repository != null) {
             answer.setAggregationRepository(repository);
         }

Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/processor/aggregate/AggregateProcessor.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/aggregate/AggregateProcessor.java?rev=935323&r1=935322&r2=935323&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/processor/aggregate/AggregateProcessor.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/processor/aggregate/AggregateProcessor.java Sun Apr 18 10:02:47 2010
@@ -83,11 +83,11 @@ public class AggregateProcessor extends 
     private final ExecutorService executorService;
     private ScheduledExecutorService recoverService;
     // store correlation key -> exchange id in timeout map
-    private TimeoutMap<Object, String> timeoutMap;
+    private TimeoutMap<String, String> timeoutMap;
     private ExceptionHandler exceptionHandler = new LoggingExceptionHandler(getClass());
-    private AggregationRepository<Object> aggregationRepository = new MemoryAggregationRepository();
+    private AggregationRepository aggregationRepository = new MemoryAggregationRepository();
     private Map<Object, Object> closedCorrelationKeys;
-    private Set<Object> batchConsumerCorrelationKeys = new LinkedHashSet<Object>();
+    private Set<String> batchConsumerCorrelationKeys = new LinkedHashSet<String>();
     private final Set<String> inProgressCompleteExchanges = new HashSet<String>();
     private final Map<String, RedeliveryData> redeliveryState = new ConcurrentHashMap<String, RedeliveryData>();
     // optional dead letter channel for exhausted recovered exchanges
@@ -153,7 +153,7 @@ public class AggregateProcessor extends 
 
     public void process(Exchange exchange) throws Exception {
         // compute correlation expression
-        Object key = correlationExpression.evaluate(exchange, Object.class);
+        String key = correlationExpression.evaluate(exchange, String.class);
         if (ObjectHelper.isEmpty(key)) {
             // we have a bad correlation key
             if (isIgnoreBadCorrelationKeys()) {
@@ -192,7 +192,7 @@ public class AggregateProcessor extends 
      * @param exchange the exchange
      * @return the aggregated exchange
      */
-    private Exchange doAggregation(Object key, Exchange exchange) {
+    private Exchange doAggregation(String key, Exchange exchange) {
         if (LOG.isTraceEnabled()) {
             LOG.trace("onAggregation +++ start +++ with correlation key: " + key);
         }
@@ -237,7 +237,7 @@ public class AggregateProcessor extends 
         } else {
             // if batch consumer completion is enabled then we need to complete the group
             if ("consumer".equals(complete)) {
-                for (Object batchKey : batchConsumerCorrelationKeys) {
+                for (String batchKey : batchConsumerCorrelationKeys) {
                     Exchange batchAnswer = aggregationRepository.get(camelContext, batchKey);
                     batchAnswer.setProperty(Exchange.AGGREGATED_COMPLETED_BY, complete);
                     onCompletion(batchKey, batchAnswer, false);
@@ -264,7 +264,7 @@ public class AggregateProcessor extends 
      * @param exchange  the incoming exchange
      * @return <tt>null</tt> if not completed, otherwise a String with the type that triggered the completion
      */
-    protected String isCompleted(Object key, Exchange exchange) {
+    protected String isCompleted(String key, Exchange exchange) {
         if (getCompletionPredicate() != null) {
             boolean answer = getCompletionPredicate().matches(exchange);
             if (answer) {
@@ -330,7 +330,7 @@ public class AggregateProcessor extends 
         return aggregationStrategy.aggregate(oldExchange, newExchange);
     }
 
-    protected void onCompletion(final Object key, final Exchange exchange, boolean fromTimeout) {
+    protected void onCompletion(final String key, final Exchange exchange, boolean fromTimeout) {
         // store the correlation key as property
         exchange.setProperty(Exchange.AGGREGATED_CORRELATION_KEY, key);
         // remove from repository as its completed
@@ -476,11 +476,11 @@ public class AggregateProcessor extends 
         this.parallelProcessing = parallelProcessing;
     }
 
-    public AggregationRepository<Object> getAggregationRepository() {
+    public AggregationRepository getAggregationRepository() {
         return aggregationRepository;
     }
 
-    public void setAggregationRepository(AggregationRepository<Object> aggregationRepository) {
+    public void setAggregationRepository(AggregationRepository aggregationRepository) {
         this.aggregationRepository = aggregationRepository;
     }
 
@@ -530,14 +530,14 @@ public class AggregateProcessor extends 
     /**
      * Background task that looks for aggregated exchanges which is triggered by completion timeouts.
      */
-    private final class AggregationTimeoutMap extends DefaultTimeoutMap<Object, String> {
+    private final class AggregationTimeoutMap extends DefaultTimeoutMap<String, String> {
 
         private AggregationTimeoutMap(ScheduledExecutorService executor, long requestMapPollTimeMillis) {
             super(executor, requestMapPollTimeMillis);
         }
 
         @Override
-        public void onEviction(Object key, String exchangeId) {
+        public void onEviction(String key, String exchangeId) {
             if (log.isDebugEnabled()) {
                 log.debug("Completion timeout triggered for correlation key: " + key);
             }
@@ -571,9 +571,9 @@ public class AggregateProcessor extends 
      * Background task that looks for aggregated exchanges to recover.
      */
     private final class RecoverTask implements Runnable {
-        private final RecoverableAggregationRepository<Object> recoverable;
+        private final RecoverableAggregationRepository recoverable;
 
-        private RecoverTask(RecoverableAggregationRepository<Object> recoverable) {
+        private RecoverTask(RecoverableAggregationRepository recoverable) {
             this.recoverable = recoverable;
         }
 
@@ -692,7 +692,7 @@ public class AggregateProcessor extends 
 
         // should we use recover checker
         if (aggregationRepository instanceof RecoverableAggregationRepository) {
-            RecoverableAggregationRepository<Object> recoverable = (RecoverableAggregationRepository<Object>) aggregationRepository;
+            RecoverableAggregationRepository recoverable = (RecoverableAggregationRepository) aggregationRepository;
             if (recoverable.isUseRecovery()) {
                 long interval = recoverable.getRecoveryIntervalInMillis();
                 if (interval <= 0) {

Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/processor/aggregate/MemoryAggregationRepository.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/aggregate/MemoryAggregationRepository.java?rev=935323&r1=935322&r2=935323&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/processor/aggregate/MemoryAggregationRepository.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/processor/aggregate/MemoryAggregationRepository.java Sun Apr 18 10:02:47 2010
@@ -29,19 +29,18 @@ import org.apache.camel.spi.AggregationR
  *
  * @version $Revision$
  */
-public class MemoryAggregationRepository extends ServiceSupport implements AggregationRepository<Object> {
+public class MemoryAggregationRepository extends ServiceSupport implements AggregationRepository {
+    private final Map<String, Exchange> cache = new ConcurrentHashMap<String, Exchange>();
 
-    private final Map<Object, Exchange> cache = new ConcurrentHashMap<Object, Exchange>();
-
-    public Exchange add(CamelContext camelContext, Object key, Exchange exchange) {
+    public Exchange add(CamelContext camelContext, String key, Exchange exchange) {
         return cache.put(key, exchange);
     }
 
-    public Exchange get(CamelContext camelContext, Object key) {
+    public Exchange get(CamelContext camelContext, String key) {
         return cache.get(key);
     }
 
-    public void remove(CamelContext camelContext, Object key, Exchange exchange) {
+    public void remove(CamelContext camelContext, String key, Exchange exchange) {
         cache.remove(key);
     }
 

Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/spi/AggregationRepository.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/spi/AggregationRepository.java?rev=935323&r1=935322&r2=935323&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/spi/AggregationRepository.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/spi/AggregationRepository.java Sun Apr 18 10:02:47 2010
@@ -24,7 +24,7 @@ import org.apache.camel.Exchange;
  *  
  * @version $Revision$
  */
-public interface AggregationRepository<K> {
+public interface AggregationRepository {
 
     /**
      * Add the given {@link Exchange} under the correlation key.
@@ -36,7 +36,7 @@ public interface AggregationRepository<K
      * @param exchange       the aggregated exchange
      * @return the old exchange if any existed
      */
-    Exchange add(CamelContext camelContext, K key, Exchange exchange);
+    Exchange add(CamelContext camelContext, String key, Exchange exchange);
 
     /**
      * Gets the given exchange with the correlation key
@@ -45,7 +45,7 @@ public interface AggregationRepository<K
      * @param key            the correlation key
      * @return the exchange, or <tt>null</tt> if no exchange was previously added
      */
-    Exchange get(CamelContext camelContext, K key);
+    Exchange get(CamelContext camelContext, String key);
 
     /**
      * Removes the exchange with the given correlation key, which should happen
@@ -55,7 +55,7 @@ public interface AggregationRepository<K
      * @param key            the correlation key
      * @param exchange       the exchange to remove
      */
-    void remove(CamelContext camelContext, K key, Exchange exchange);
+    void remove(CamelContext camelContext, String key, Exchange exchange);
 
     /**
      * Confirms the completion of the {@link Exchange}.

Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/spi/RecoverableAggregationRepository.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/spi/RecoverableAggregationRepository.java?rev=935323&r1=935322&r2=935323&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/spi/RecoverableAggregationRepository.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/spi/RecoverableAggregationRepository.java Sun Apr 18 10:02:47 2010
@@ -28,7 +28,7 @@ import org.apache.camel.Exchange;
  *
  * @version $Revision$
  */
-public interface RecoverableAggregationRepository<K> extends AggregationRepository<K> {
+public interface RecoverableAggregationRepository extends AggregationRepository {
 
     /**
      * Scans the repository for {@link Exchange}s to be recovered

Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/processor/aggregator/AggregateClosedCorrelationKeyTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/aggregator/AggregateClosedCorrelationKeyTest.java?rev=935323&r1=935322&r2=935323&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/processor/aggregator/AggregateClosedCorrelationKeyTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/processor/aggregator/AggregateClosedCorrelationKeyTest.java Sun Apr 18 10:02:47 2010
@@ -55,7 +55,7 @@ public class AggregateClosedCorrelationK
             fail("Should throw an exception");
         } catch (CamelExecutionException e) {
             ClosedCorrelationKeyException cause = assertIsInstanceOf(ClosedCorrelationKeyException.class, e.getCause());
-            assertEquals(1, cause.getCorrelationKey());
+            assertEquals("1", cause.getCorrelationKey());
             assertEquals("The correlation key [1] has been closed. Exchange[Message: C]", cause.getMessage());
         }
 
@@ -92,7 +92,7 @@ public class AggregateClosedCorrelationK
             fail("Should throw an exception");
         } catch (CamelExecutionException e) {
             ClosedCorrelationKeyException cause = assertIsInstanceOf(ClosedCorrelationKeyException.class, e.getCause());
-            assertEquals(2, cause.getCorrelationKey());
+            assertEquals("2", cause.getCorrelationKey());
             assertEquals("The correlation key [2] has been closed. Exchange[Message: H]", cause.getMessage());
         }
 
@@ -102,7 +102,7 @@ public class AggregateClosedCorrelationK
             fail("Should throw an exception");
         } catch (CamelExecutionException e) {
             ClosedCorrelationKeyException cause = assertIsInstanceOf(ClosedCorrelationKeyException.class, e.getCause());
-            assertEquals(3, cause.getCorrelationKey());
+            assertEquals("3", cause.getCorrelationKey());
             assertEquals("The correlation key [3] has been closed. Exchange[Message: I]", cause.getMessage());
         }
 

Modified: camel/trunk/components/camel-hawtdb/src/main/java/org/apache/camel/component/hawtdb/HawtDBAggregationRepository.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-hawtdb/src/main/java/org/apache/camel/component/hawtdb/HawtDBAggregationRepository.java?rev=935323&r1=935322&r2=935323&view=diff
==============================================================================
--- camel/trunk/components/camel-hawtdb/src/main/java/org/apache/camel/component/hawtdb/HawtDBAggregationRepository.java (original)
+++ camel/trunk/components/camel-hawtdb/src/main/java/org/apache/camel/component/hawtdb/HawtDBAggregationRepository.java Sun Apr 18 10:02:47 2010
@@ -27,7 +27,6 @@ import java.util.concurrent.TimeUnit;
 import org.apache.camel.CamelContext;
 import org.apache.camel.Exchange;
 import org.apache.camel.impl.ServiceSupport;
-import org.apache.camel.spi.AggregationRepository;
 import org.apache.camel.spi.RecoverableAggregationRepository;
 import org.apache.camel.util.ObjectHelper;
 import org.apache.camel.util.ServiceHelper;
@@ -40,7 +39,7 @@ import org.fusesource.hawtdb.util.buffer
 /**
  * An instance of AggregationRepository which is backed by a HawtDB.
  */
-public class HawtDBAggregationRepository<K> extends ServiceSupport implements AggregationRepository<K>, RecoverableAggregationRepository<K> {
+public class HawtDBAggregationRepository extends ServiceSupport implements RecoverableAggregationRepository {
 
     private static final transient Log LOG = LogFactory.getLog(HawtDBAggregationRepository.class);
     private HawtDBFile hawtDBFile;
@@ -49,7 +48,7 @@ public class HawtDBAggregationRepository
     private Integer bufferSize;
     private boolean sync = true;
     private boolean returnOldExchange;
-    private HawtDBCamelMarshaller<K> marshaller = new HawtDBCamelMarshaller<K>();
+    private HawtDBCamelMarshaller<String> marshaller = new HawtDBCamelMarshaller<String>();
     private long recoveryInterval = 5000;
     private boolean useRecovery = true;
     private int maximumRedeliveries;
@@ -98,7 +97,7 @@ public class HawtDBAggregationRepository
         this.repositoryName = repositoryName;
     }
 
-    public Exchange add(final CamelContext camelContext, final K key, final Exchange exchange) {
+    public Exchange add(final CamelContext camelContext, final String key, final Exchange exchange) {
         if (LOG.isDebugEnabled()) {
             LOG.debug("Adding key   [" + key + "] -> " + exchange);
         }
@@ -136,7 +135,7 @@ public class HawtDBAggregationRepository
         return null;
     }
 
-    public Exchange get(final CamelContext camelContext, final K key) {
+    public Exchange get(final CamelContext camelContext, final String key) {
         Exchange answer = null;
         try {
             final Buffer keyBuffer = marshaller.marshallKey(key);
@@ -164,7 +163,7 @@ public class HawtDBAggregationRepository
         return answer;
     }
 
-    public void remove(final CamelContext camelContext, final K key, final Exchange exchange) {
+    public void remove(final CamelContext camelContext, final String key, final Exchange exchange) {
         if (LOG.isDebugEnabled()) {
             LOG.debug("Removing key [" + key + "]");
         }

Modified: camel/trunk/components/camel-hawtdb/src/main/java/org/apache/camel/component/hawtdb/HawtDBCamelMarshaller.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-hawtdb/src/main/java/org/apache/camel/component/hawtdb/HawtDBCamelMarshaller.java?rev=935323&r1=935322&r2=935323&view=diff
==============================================================================
--- camel/trunk/components/camel-hawtdb/src/main/java/org/apache/camel/component/hawtdb/HawtDBCamelMarshaller.java (original)
+++ camel/trunk/components/camel-hawtdb/src/main/java/org/apache/camel/component/hawtdb/HawtDBCamelMarshaller.java Sun Apr 18 10:02:47 2010
@@ -67,7 +67,7 @@ public final class HawtDBCamelMarshaller
         // add the aggregated completed by property to retain
         DefaultExchangeHolder.addProperty(pe, Exchange.AGGREGATED_COMPLETED_BY, exchange.getProperty(Exchange.AGGREGATED_COMPLETED_BY, String.class));
         // add the aggregated correlation key property to retain
-        DefaultExchangeHolder.addProperty(pe, Exchange.AGGREGATED_CORRELATION_KEY, exchange.getProperty(Exchange.AGGREGATED_CORRELATION_KEY, Serializable.class));
+        DefaultExchangeHolder.addProperty(pe, Exchange.AGGREGATED_CORRELATION_KEY, exchange.getProperty(Exchange.AGGREGATED_CORRELATION_KEY, String.class));
         // persist the from endpoint as well
         if (exchange.getFromEndpoint() != null) {
             DefaultExchangeHolder.addProperty(pe, "CamelAggregatedFromEndpoint", exchange.getFromEndpoint().getEndpointUri());

Modified: camel/trunk/components/camel-hawtdb/src/test/java/org/apache/camel/component/hawtdb/HawtDBAggregateBufferSizeTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-hawtdb/src/test/java/org/apache/camel/component/hawtdb/HawtDBAggregateBufferSizeTest.java?rev=935323&r1=935322&r2=935323&view=diff
==============================================================================
--- camel/trunk/components/camel-hawtdb/src/test/java/org/apache/camel/component/hawtdb/HawtDBAggregateBufferSizeTest.java (original)
+++ camel/trunk/components/camel-hawtdb/src/test/java/org/apache/camel/component/hawtdb/HawtDBAggregateBufferSizeTest.java Sun Apr 18 10:02:47 2010
@@ -25,7 +25,7 @@ public class HawtDBAggregateBufferSizeTe
         return new RouteBuilder() {
             @Override
             public void configure() throws Exception {
-                HawtDBAggregationRepository<String> repo = new HawtDBAggregationRepository<String>("repo1", "target/data/hawtdb.dat");
+                HawtDBAggregationRepository repo = new HawtDBAggregationRepository("repo1", "target/data/hawtdb.dat");
                 // use 2mb file
                 repo.setBufferSize(1024 * 1024 * 2);
 

Modified: camel/trunk/components/camel-hawtdb/src/test/java/org/apache/camel/component/hawtdb/HawtDBAggregateConcurrentDifferentGroupsTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-hawtdb/src/test/java/org/apache/camel/component/hawtdb/HawtDBAggregateConcurrentDifferentGroupsTest.java?rev=935323&r1=935322&r2=935323&view=diff
==============================================================================
--- camel/trunk/components/camel-hawtdb/src/test/java/org/apache/camel/component/hawtdb/HawtDBAggregateConcurrentDifferentGroupsTest.java (original)
+++ camel/trunk/components/camel-hawtdb/src/test/java/org/apache/camel/component/hawtdb/HawtDBAggregateConcurrentDifferentGroupsTest.java Sun Apr 18 10:02:47 2010
@@ -91,7 +91,7 @@ public class HawtDBAggregateConcurrentDi
     protected RouteBuilder createRouteBuilder() throws Exception {
         return new RouteBuilder() {
             public void configure() throws Exception {
-                HawtDBAggregationRepository<String> repo = new HawtDBAggregationRepository<String>();
+                HawtDBAggregationRepository repo = new HawtDBAggregationRepository();
                 repo.setHawtDBFile(hawtDBFile);
                 repo.setRepositoryName("repo1");
 

Modified: camel/trunk/components/camel-hawtdb/src/test/java/org/apache/camel/component/hawtdb/HawtDBAggregateConcurrentSameGroupTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-hawtdb/src/test/java/org/apache/camel/component/hawtdb/HawtDBAggregateConcurrentSameGroupTest.java?rev=935323&r1=935322&r2=935323&view=diff
==============================================================================
--- camel/trunk/components/camel-hawtdb/src/test/java/org/apache/camel/component/hawtdb/HawtDBAggregateConcurrentSameGroupTest.java (original)
+++ camel/trunk/components/camel-hawtdb/src/test/java/org/apache/camel/component/hawtdb/HawtDBAggregateConcurrentSameGroupTest.java Sun Apr 18 10:02:47 2010
@@ -90,7 +90,7 @@ public class HawtDBAggregateConcurrentSa
     protected RouteBuilder createRouteBuilder() throws Exception {
         return new RouteBuilder() {
             public void configure() throws Exception {
-                HawtDBAggregationRepository<String> repo = new HawtDBAggregationRepository<String>();
+                HawtDBAggregationRepository repo = new HawtDBAggregationRepository();
                 repo.setHawtDBFile(hawtDBFile);
                 repo.setRepositoryName("repo1");
 

Modified: camel/trunk/components/camel-hawtdb/src/test/java/org/apache/camel/component/hawtdb/HawtDBAggregateLoadAndRecoverTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-hawtdb/src/test/java/org/apache/camel/component/hawtdb/HawtDBAggregateLoadAndRecoverTest.java?rev=935323&r1=935322&r2=935323&view=diff
==============================================================================
--- camel/trunk/components/camel-hawtdb/src/test/java/org/apache/camel/component/hawtdb/HawtDBAggregateLoadAndRecoverTest.java (original)
+++ camel/trunk/components/camel-hawtdb/src/test/java/org/apache/camel/component/hawtdb/HawtDBAggregateLoadAndRecoverTest.java Sun Apr 18 10:02:47 2010
@@ -82,7 +82,7 @@ public class HawtDBAggregateLoadAndRecov
         return new RouteBuilder() {
             @Override
             public void configure() throws Exception {
-                HawtDBAggregationRepository<String> repo = new HawtDBAggregationRepository<String>("repo1", "target/data/hawtdb.dat");
+                HawtDBAggregationRepository repo = new HawtDBAggregationRepository("repo1", "target/data/hawtdb.dat");
                 repo.setUseRecovery(true);
 
                 from("seda:start?size=" + SIZE)

Modified: camel/trunk/components/camel-hawtdb/src/test/java/org/apache/camel/component/hawtdb/HawtDBAggregateLoadConcurrentTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-hawtdb/src/test/java/org/apache/camel/component/hawtdb/HawtDBAggregateLoadConcurrentTest.java?rev=935323&r1=935322&r2=935323&view=diff
==============================================================================
--- camel/trunk/components/camel-hawtdb/src/test/java/org/apache/camel/component/hawtdb/HawtDBAggregateLoadConcurrentTest.java (original)
+++ camel/trunk/components/camel-hawtdb/src/test/java/org/apache/camel/component/hawtdb/HawtDBAggregateLoadConcurrentTest.java Sun Apr 18 10:02:47 2010
@@ -78,7 +78,7 @@ public class HawtDBAggregateLoadConcurre
         return new RouteBuilder() {
             @Override
             public void configure() throws Exception {
-                HawtDBAggregationRepository<String> repo = new HawtDBAggregationRepository<String>("repo1", "target/data/hawtdb.dat");
+                HawtDBAggregationRepository repo = new HawtDBAggregationRepository("repo1", "target/data/hawtdb.dat");
 
                 from("seda:start?size=" + SIZE)
                     .to("log:input?groupSize=500")

Modified: camel/trunk/components/camel-hawtdb/src/test/java/org/apache/camel/component/hawtdb/HawtDBAggregateLoadTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-hawtdb/src/test/java/org/apache/camel/component/hawtdb/HawtDBAggregateLoadTest.java?rev=935323&r1=935322&r2=935323&view=diff
==============================================================================
--- camel/trunk/components/camel-hawtdb/src/test/java/org/apache/camel/component/hawtdb/HawtDBAggregateLoadTest.java (original)
+++ camel/trunk/components/camel-hawtdb/src/test/java/org/apache/camel/component/hawtdb/HawtDBAggregateLoadTest.java Sun Apr 18 10:02:47 2010
@@ -65,7 +65,7 @@ public class HawtDBAggregateLoadTest ext
         return new RouteBuilder() {
             @Override
             public void configure() throws Exception {
-                HawtDBAggregationRepository<String> repo = new HawtDBAggregationRepository<String>("repo1", "target/data/hawtdb.dat");
+                HawtDBAggregationRepository repo = new HawtDBAggregationRepository("repo1", "target/data/hawtdb.dat");
 
                 from("seda:start?size=" + SIZE)
                     .to("log:input?groupSize=500")

Modified: camel/trunk/components/camel-hawtdb/src/test/java/org/apache/camel/component/hawtdb/HawtDBAggregateNotLostRemovedWhenConfirmedTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-hawtdb/src/test/java/org/apache/camel/component/hawtdb/HawtDBAggregateNotLostRemovedWhenConfirmedTest.java?rev=935323&r1=935322&r2=935323&view=diff
==============================================================================
--- camel/trunk/components/camel-hawtdb/src/test/java/org/apache/camel/component/hawtdb/HawtDBAggregateNotLostRemovedWhenConfirmedTest.java (original)
+++ camel/trunk/components/camel-hawtdb/src/test/java/org/apache/camel/component/hawtdb/HawtDBAggregateNotLostRemovedWhenConfirmedTest.java Sun Apr 18 10:02:47 2010
@@ -27,12 +27,12 @@ import org.junit.Test;
 
 public class HawtDBAggregateNotLostRemovedWhenConfirmedTest extends CamelTestSupport {
 
-    private HawtDBAggregationRepository<String> repo;
+    private HawtDBAggregationRepository repo;
 
     @Override
     public void setUp() throws Exception {
         deleteDirectory("target/data");
-        repo = new HawtDBAggregationRepository<String>("repo1", "target/data/hawtdb.dat");
+        repo = new HawtDBAggregationRepository("repo1", "target/data/hawtdb.dat");
         super.setUp();
     }
 
@@ -48,9 +48,6 @@ public class HawtDBAggregateNotLostRemov
 
         assertMockEndpointsSatisfied();
 
-        // sleep a bit since the completed signal is done async
-        Thread.sleep(2000);
-
         String exchangeId = getMockEndpoint("mock:result").getReceivedExchanges().get(0).getExchangeId();
 
         // the exchange should NOT be in the completed repo as it was confirmed

Modified: camel/trunk/components/camel-hawtdb/src/test/java/org/apache/camel/component/hawtdb/HawtDBAggregateNotLostTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-hawtdb/src/test/java/org/apache/camel/component/hawtdb/HawtDBAggregateNotLostTest.java?rev=935323&r1=935322&r2=935323&view=diff
==============================================================================
--- camel/trunk/components/camel-hawtdb/src/test/java/org/apache/camel/component/hawtdb/HawtDBAggregateNotLostTest.java (original)
+++ camel/trunk/components/camel-hawtdb/src/test/java/org/apache/camel/component/hawtdb/HawtDBAggregateNotLostTest.java Sun Apr 18 10:02:47 2010
@@ -27,12 +27,12 @@ import org.junit.Test;
 
 public class HawtDBAggregateNotLostTest extends CamelTestSupport {
 
-    private HawtDBAggregationRepository<String> repo;
+    private HawtDBAggregationRepository repo;
 
     @Override
     public void setUp() throws Exception {
         deleteDirectory("target/data");
-        repo = new HawtDBAggregationRepository<String>("repo1", "target/data/hawtdb.dat");
+        repo = new HawtDBAggregationRepository("repo1", "target/data/hawtdb.dat");
         super.setUp();
     }
 
@@ -49,9 +49,6 @@ public class HawtDBAggregateNotLostTest 
 
         assertMockEndpointsSatisfied();
 
-        // sleep a bit since the completed signal is done async
-        Thread.sleep(2000);
-
         String exchangeId = getMockEndpoint("mock:aggregated").getReceivedExchanges().get(0).getExchangeId();
 
         // the exchange should be in the completed repo where we should be able to find it
@@ -75,7 +72,8 @@ public class HawtDBAggregateNotLostTest 
         assertEquals(123, completed.getIn().getHeader("id"));
         assertEquals("size", completed.getProperty(Exchange.AGGREGATED_COMPLETED_BY));
         assertEquals(5, completed.getProperty(Exchange.AGGREGATED_SIZE));
-        assertEquals(123, completed.getProperty(Exchange.AGGREGATED_CORRELATION_KEY));
+        // will store correlation keys as String
+        assertEquals("123", completed.getProperty(Exchange.AGGREGATED_CORRELATION_KEY));
     }
 
     @Override

Modified: camel/trunk/components/camel-hawtdb/src/test/java/org/apache/camel/component/hawtdb/HawtDBAggregateRecoverDeadLetterChannelFailedTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-hawtdb/src/test/java/org/apache/camel/component/hawtdb/HawtDBAggregateRecoverDeadLetterChannelFailedTest.java?rev=935323&r1=935322&r2=935323&view=diff
==============================================================================
--- camel/trunk/components/camel-hawtdb/src/test/java/org/apache/camel/component/hawtdb/HawtDBAggregateRecoverDeadLetterChannelFailedTest.java (original)
+++ camel/trunk/components/camel-hawtdb/src/test/java/org/apache/camel/component/hawtdb/HawtDBAggregateRecoverDeadLetterChannelFailedTest.java Sun Apr 18 10:02:47 2010
@@ -26,12 +26,12 @@ import org.junit.Test;
 
 public class HawtDBAggregateRecoverDeadLetterChannelFailedTest extends CamelTestSupport {
 
-    private HawtDBAggregationRepository<String> repo;
+    private HawtDBAggregationRepository repo;
 
     @Override
     public void setUp() throws Exception {
         deleteDirectory("target/data");
-        repo = new HawtDBAggregationRepository<String>("repo1", "target/data/hawtdb.dat");
+        repo = new HawtDBAggregationRepository("repo1", "target/data/hawtdb.dat");
         // enable recovery
         repo.setUseRecovery(true);
         // exhaust after at most 3 attempts
@@ -49,15 +49,15 @@ public class HawtDBAggregateRecoverDeadL
         // should fail all times
         getMockEndpoint("mock:result").expectedMessageCount(0);
         getMockEndpoint("mock:aggregated").expectedMessageCount(4);
-        // it should keep sending to DLC if it failed, so test for min 3 messages
+        // it should keep sending to DLC if it failed, so test for min 3 attempts
         getMockEndpoint("mock:dead").expectedMinimumMessageCount(3);
         // all the details should be the same about redelivered and redelivered 3 times
-        getMockEndpoint("mock:dead").message(0).header(Exchange.REDELIVERED).isEqualTo(Boolean.TRUE);
         getMockEndpoint("mock:dead").message(0).header(Exchange.REDELIVERY_COUNTER).isEqualTo(3);
-        getMockEndpoint("mock:dead").message(1).header(Exchange.REDELIVERED).isEqualTo(Boolean.TRUE);
+        getMockEndpoint("mock:dead").message(0).header(Exchange.REDELIVERED).isEqualTo(Boolean.TRUE);
         getMockEndpoint("mock:dead").message(1).header(Exchange.REDELIVERY_COUNTER).isEqualTo(3);
-        getMockEndpoint("mock:dead").message(2).header(Exchange.REDELIVERED).isEqualTo(Boolean.TRUE);
+        getMockEndpoint("mock:dead").message(1).header(Exchange.REDELIVERED).isEqualTo(Boolean.TRUE);
         getMockEndpoint("mock:dead").message(2).header(Exchange.REDELIVERY_COUNTER).isEqualTo(3);
+        getMockEndpoint("mock:dead").message(2).header(Exchange.REDELIVERED).isEqualTo(Boolean.TRUE);
 
         template.sendBodyAndHeader("direct:start", "A", "id", 123);
         template.sendBodyAndHeader("direct:start", "B", "id", 123);

Modified: camel/trunk/components/camel-hawtdb/src/test/java/org/apache/camel/component/hawtdb/HawtDBAggregateRecoverDeadLetterChannelTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-hawtdb/src/test/java/org/apache/camel/component/hawtdb/HawtDBAggregateRecoverDeadLetterChannelTest.java?rev=935323&r1=935322&r2=935323&view=diff
==============================================================================
--- camel/trunk/components/camel-hawtdb/src/test/java/org/apache/camel/component/hawtdb/HawtDBAggregateRecoverDeadLetterChannelTest.java (original)
+++ camel/trunk/components/camel-hawtdb/src/test/java/org/apache/camel/component/hawtdb/HawtDBAggregateRecoverDeadLetterChannelTest.java Sun Apr 18 10:02:47 2010
@@ -26,12 +26,12 @@ import org.junit.Test;
 
 public class HawtDBAggregateRecoverDeadLetterChannelTest extends CamelTestSupport {
 
-    private HawtDBAggregationRepository<String> repo;
+    private HawtDBAggregationRepository repo;
 
     @Override
     public void setUp() throws Exception {
         deleteDirectory("target/data");
-        repo = new HawtDBAggregationRepository<String>("repo1", "target/data/hawtdb.dat");
+        repo = new HawtDBAggregationRepository("repo1", "target/data/hawtdb.dat");
         // enable recovery
         repo.setUseRecovery(true);
         // exhaust after at most 3 attempts

Modified: camel/trunk/components/camel-hawtdb/src/test/java/org/apache/camel/component/hawtdb/HawtDBAggregateRecoverTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-hawtdb/src/test/java/org/apache/camel/component/hawtdb/HawtDBAggregateRecoverTest.java?rev=935323&r1=935322&r2=935323&view=diff
==============================================================================
--- camel/trunk/components/camel-hawtdb/src/test/java/org/apache/camel/component/hawtdb/HawtDBAggregateRecoverTest.java (original)
+++ camel/trunk/components/camel-hawtdb/src/test/java/org/apache/camel/component/hawtdb/HawtDBAggregateRecoverTest.java Sun Apr 18 10:02:47 2010
@@ -29,12 +29,12 @@ import org.junit.Test;
 public class HawtDBAggregateRecoverTest extends CamelTestSupport {
 
     private static AtomicInteger counter = new AtomicInteger(0);
-    private HawtDBAggregationRepository<String> repo;
+    private HawtDBAggregationRepository repo;
 
     @Override
     public void setUp() throws Exception {
         deleteDirectory("target/data");
-        repo = new HawtDBAggregationRepository<String>("repo1", "target/data/hawtdb.dat");
+        repo = new HawtDBAggregationRepository("repo1", "target/data/hawtdb.dat");
         // enable recovery
         repo.setUseRecovery(true);
         // check faster

Modified: camel/trunk/components/camel-hawtdb/src/test/java/org/apache/camel/component/hawtdb/HawtDBAggregateRecoverWithRedeliveryPolicyTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-hawtdb/src/test/java/org/apache/camel/component/hawtdb/HawtDBAggregateRecoverWithRedeliveryPolicyTest.java?rev=935323&r1=935322&r2=935323&view=diff
==============================================================================
--- camel/trunk/components/camel-hawtdb/src/test/java/org/apache/camel/component/hawtdb/HawtDBAggregateRecoverWithRedeliveryPolicyTest.java (original)
+++ camel/trunk/components/camel-hawtdb/src/test/java/org/apache/camel/component/hawtdb/HawtDBAggregateRecoverWithRedeliveryPolicyTest.java Sun Apr 18 10:02:47 2010
@@ -29,12 +29,12 @@ import org.junit.Test;
 public class HawtDBAggregateRecoverWithRedeliveryPolicyTest extends CamelTestSupport {
 
     private static AtomicInteger counter = new AtomicInteger(0);
-    private HawtDBAggregationRepository<String> repo;
+    private HawtDBAggregationRepository repo;
 
     @Override
     public void setUp() throws Exception {
         deleteDirectory("target/data");
-        repo = new HawtDBAggregationRepository<String>("repo1", "target/data/hawtdb.dat");
+        repo = new HawtDBAggregationRepository("repo1", "target/data/hawtdb.dat");
         // enable recovery
         repo.setUseRecovery(true);
         // check faster

Modified: camel/trunk/components/camel-hawtdb/src/test/java/org/apache/camel/component/hawtdb/HawtDBAggregateRecoverWithSedaTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-hawtdb/src/test/java/org/apache/camel/component/hawtdb/HawtDBAggregateRecoverWithSedaTest.java?rev=935323&r1=935322&r2=935323&view=diff
==============================================================================
--- camel/trunk/components/camel-hawtdb/src/test/java/org/apache/camel/component/hawtdb/HawtDBAggregateRecoverWithSedaTest.java (original)
+++ camel/trunk/components/camel-hawtdb/src/test/java/org/apache/camel/component/hawtdb/HawtDBAggregateRecoverWithSedaTest.java Sun Apr 18 10:02:47 2010
@@ -29,12 +29,12 @@ import org.junit.Test;
 public class HawtDBAggregateRecoverWithSedaTest extends CamelTestSupport {
 
     private static AtomicInteger counter = new AtomicInteger(0);
-    private HawtDBAggregationRepository<String> repo;
+    private HawtDBAggregationRepository repo;
 
     @Override
     public void setUp() throws Exception {
         deleteDirectory("target/data");
-        repo = new HawtDBAggregationRepository<String>("repo1", "target/data/hawtdb.dat");
+        repo = new HawtDBAggregationRepository("repo1", "target/data/hawtdb.dat");
         // enable recovery
         repo.setUseRecovery(true);
         // check faster

Modified: camel/trunk/components/camel-hawtdb/src/test/java/org/apache/camel/component/hawtdb/HawtDBAggregateTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-hawtdb/src/test/java/org/apache/camel/component/hawtdb/HawtDBAggregateTest.java?rev=935323&r1=935322&r2=935323&view=diff
==============================================================================
--- camel/trunk/components/camel-hawtdb/src/test/java/org/apache/camel/component/hawtdb/HawtDBAggregateTest.java (original)
+++ camel/trunk/components/camel-hawtdb/src/test/java/org/apache/camel/component/hawtdb/HawtDBAggregateTest.java Sun Apr 18 10:02:47 2010
@@ -55,7 +55,7 @@ public class HawtDBAggregateTest extends
             // START SNIPPET: e1
             public void configure() throws Exception {
                 // create the hawtdb repo
-                HawtDBAggregationRepository<String> repo = new HawtDBAggregationRepository<String>("repo1", "target/data/hawtdb.dat");
+                HawtDBAggregationRepository repo = new HawtDBAggregationRepository("repo1", "target/data/hawtdb.dat");
 
                 // here is the Camel route where we aggregate
                 from("direct:start")

Modified: camel/trunk/components/camel-hawtdb/src/test/java/org/apache/camel/component/hawtdb/HawtDBAggregationRepositoryAlotDataTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-hawtdb/src/test/java/org/apache/camel/component/hawtdb/HawtDBAggregationRepositoryAlotDataTest.java?rev=935323&r1=935322&r2=935323&view=diff
==============================================================================
--- camel/trunk/components/camel-hawtdb/src/test/java/org/apache/camel/component/hawtdb/HawtDBAggregationRepositoryAlotDataTest.java (original)
+++ camel/trunk/components/camel-hawtdb/src/test/java/org/apache/camel/component/hawtdb/HawtDBAggregationRepositoryAlotDataTest.java Sun Apr 18 10:02:47 2010
@@ -45,7 +45,7 @@ public class HawtDBAggregationRepository
 
     @Test
     public void testWithAlotOfDataSameKey() {
-        HawtDBAggregationRepository<String> repo = new HawtDBAggregationRepository<String>();
+        HawtDBAggregationRepository repo = new HawtDBAggregationRepository();
         repo.setHawtDBFile(hawtDBFile);
         repo.setRepositoryName("repo1");
 
@@ -62,7 +62,7 @@ public class HawtDBAggregationRepository
 
     @Test
     public void testWithAlotOfDataTwoKesy() {
-        HawtDBAggregationRepository<String> repo = new HawtDBAggregationRepository<String>();
+        HawtDBAggregationRepository repo = new HawtDBAggregationRepository();
         repo.setHawtDBFile(hawtDBFile);
         repo.setRepositoryName("repo1");
 
@@ -83,7 +83,7 @@ public class HawtDBAggregationRepository
 
     @Test
     public void testWithAlotOfDataWithDifferentKesy() {
-        HawtDBAggregationRepository<String> repo = new HawtDBAggregationRepository<String>();
+        HawtDBAggregationRepository repo = new HawtDBAggregationRepository();
         repo.setHawtDBFile(hawtDBFile);
         repo.setRepositoryName("repo1");
 

Modified: camel/trunk/components/camel-hawtdb/src/test/java/org/apache/camel/component/hawtdb/HawtDBAggregationRepositoryLoadExistingTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-hawtdb/src/test/java/org/apache/camel/component/hawtdb/HawtDBAggregationRepositoryLoadExistingTest.java?rev=935323&r1=935322&r2=935323&view=diff
==============================================================================
--- camel/trunk/components/camel-hawtdb/src/test/java/org/apache/camel/component/hawtdb/HawtDBAggregationRepositoryLoadExistingTest.java (original)
+++ camel/trunk/components/camel-hawtdb/src/test/java/org/apache/camel/component/hawtdb/HawtDBAggregationRepositoryLoadExistingTest.java Sun Apr 18 10:02:47 2010
@@ -45,7 +45,7 @@ public class HawtDBAggregationRepository
 
     @Test
     public void testExisting() throws Exception {
-        HawtDBAggregationRepository<String> repo = new HawtDBAggregationRepository<String>();
+        HawtDBAggregationRepository repo = new HawtDBAggregationRepository();
         repo.setHawtDBFile(hawtDBFile);
         repo.setRepositoryName("repo1");
         repo.setReturnOldExchange(true);

Modified: camel/trunk/components/camel-hawtdb/src/test/java/org/apache/camel/component/hawtdb/HawtDBAggregationRepositoryMultipleRepoTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-hawtdb/src/test/java/org/apache/camel/component/hawtdb/HawtDBAggregationRepositoryMultipleRepoTest.java?rev=935323&r1=935322&r2=935323&view=diff
==============================================================================
--- camel/trunk/components/camel-hawtdb/src/test/java/org/apache/camel/component/hawtdb/HawtDBAggregationRepositoryMultipleRepoTest.java (original)
+++ camel/trunk/components/camel-hawtdb/src/test/java/org/apache/camel/component/hawtdb/HawtDBAggregationRepositoryMultipleRepoTest.java Sun Apr 18 10:02:47 2010
@@ -45,12 +45,12 @@ public class HawtDBAggregationRepository
 
     @Test
     public void testMultipeRepo() {
-        HawtDBAggregationRepository<String> repo1 = new HawtDBAggregationRepository<String>();
+        HawtDBAggregationRepository repo1 = new HawtDBAggregationRepository();
         repo1.setHawtDBFile(hawtDBFile);
         repo1.setRepositoryName("repo1");
         repo1.setReturnOldExchange(true);
 
-        HawtDBAggregationRepository<String> repo2 = new HawtDBAggregationRepository<String>();
+        HawtDBAggregationRepository repo2 = new HawtDBAggregationRepository();
         repo2.setHawtDBFile(hawtDBFile);
         repo2.setRepositoryName("repo2");
         repo2.setReturnOldExchange(true);
@@ -99,11 +99,11 @@ public class HawtDBAggregationRepository
 
     @Test
     public void testMultipeRepoSameKeyDifferentContent() {
-        HawtDBAggregationRepository<String> repo1 = new HawtDBAggregationRepository<String>();
+        HawtDBAggregationRepository repo1 = new HawtDBAggregationRepository();
         repo1.setHawtDBFile(hawtDBFile);
         repo1.setRepositoryName("repo1");
 
-        HawtDBAggregationRepository<String> repo2 = new HawtDBAggregationRepository<String>();
+        HawtDBAggregationRepository repo2 = new HawtDBAggregationRepository();
         repo2.setHawtDBFile(hawtDBFile);
         repo2.setRepositoryName("repo2");
 

Modified: camel/trunk/components/camel-hawtdb/src/test/java/org/apache/camel/component/hawtdb/HawtDBAggregationRepositoryRecoverExistingTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-hawtdb/src/test/java/org/apache/camel/component/hawtdb/HawtDBAggregationRepositoryRecoverExistingTest.java?rev=935323&r1=935322&r2=935323&view=diff
==============================================================================
--- camel/trunk/components/camel-hawtdb/src/test/java/org/apache/camel/component/hawtdb/HawtDBAggregationRepositoryRecoverExistingTest.java (original)
+++ camel/trunk/components/camel-hawtdb/src/test/java/org/apache/camel/component/hawtdb/HawtDBAggregationRepositoryRecoverExistingTest.java Sun Apr 18 10:02:47 2010
@@ -45,7 +45,7 @@ public class HawtDBAggregationRepository
 
     @Test
     public void testExisting() throws Exception {
-        HawtDBAggregationRepository<String> repo = new HawtDBAggregationRepository<String>();
+        HawtDBAggregationRepository repo = new HawtDBAggregationRepository();
         repo.setHawtDBFile(hawtDBFile);
         repo.setRepositoryName("repo1");
         repo.setReturnOldExchange(true);

Modified: camel/trunk/components/camel-hawtdb/src/test/java/org/apache/camel/component/hawtdb/HawtDBAggregationRepositoryTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-hawtdb/src/test/java/org/apache/camel/component/hawtdb/HawtDBAggregationRepositoryTest.java?rev=935323&r1=935322&r2=935323&view=diff
==============================================================================
--- camel/trunk/components/camel-hawtdb/src/test/java/org/apache/camel/component/hawtdb/HawtDBAggregationRepositoryTest.java (original)
+++ camel/trunk/components/camel-hawtdb/src/test/java/org/apache/camel/component/hawtdb/HawtDBAggregationRepositoryTest.java Sun Apr 18 10:02:47 2010
@@ -45,7 +45,7 @@ public class HawtDBAggregationRepository
 
     @Test
     public void testOperations() {
-        HawtDBAggregationRepository<String> repo = new HawtDBAggregationRepository<String>();
+        HawtDBAggregationRepository repo = new HawtDBAggregationRepository();
         repo.setHawtDBFile(hawtDBFile);
         repo.setRepositoryName("repo1");
         repo.setReturnOldExchange(true);

Modified: camel/trunk/components/camel-hawtdb/src/test/java/org/apache/camel/component/hawtdb/HawtDBExchangeSerializationTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-hawtdb/src/test/java/org/apache/camel/component/hawtdb/HawtDBExchangeSerializationTest.java?rev=935323&r1=935322&r2=935323&view=diff
==============================================================================
--- camel/trunk/components/camel-hawtdb/src/test/java/org/apache/camel/component/hawtdb/HawtDBExchangeSerializationTest.java (original)
+++ camel/trunk/components/camel-hawtdb/src/test/java/org/apache/camel/component/hawtdb/HawtDBExchangeSerializationTest.java Sun Apr 18 10:02:47 2010
@@ -46,7 +46,7 @@ public class HawtDBExchangeSerialization
 
     @Test
     public void testExchangeSerialization() {
-        HawtDBAggregationRepository<String> repo = new HawtDBAggregationRepository<String>();
+        HawtDBAggregationRepository repo = new HawtDBAggregationRepository();
         repo.setHawtDBFile(hawtDBFile);
         repo.setRepositoryName("repo1");
 



Mime
View raw message