Repository: camel
Updated Branches:
  refs/heads/master 444ceb8f6 -> 72727a5e6


CAMEL-11350: Optimize - StopWatch should be tiny to have less memory footprint


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/cd1532c5
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/cd1532c5
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/cd1532c5

Branch: refs/heads/master
Commit: cd1532c53d10c85ff9a5b4c843b817f173070069
Parents: 444ceb8
Author: Claus Ibsen <[email protected]>
Authored: Sat May 27 15:12:15 2017 +0200
Committer: Claus Ibsen <[email protected]>
Committed: Sat May 27 15:12:15 2017 +0200

----------------------------------------------------------------------
 .../camel/component/file/GenericFileConsumer.java      |  2 +-
 .../org/apache/camel/component/mock/MockEndpoint.java  |  2 +-
 .../org/apache/camel/impl/DefaultCamelContext.java     |  3 ---
 .../org/apache/camel/impl/DefaultMessageHistory.java   |  5 +++--
 .../org/apache/camel/impl/DefaultShutdownStrategy.java |  2 +-
 .../org/apache/camel/impl/EventNotifierCallback.java   |  2 +-
 .../main/java/org/apache/camel/impl/ProducerCache.java |  4 ++--
 .../camel/management/InstrumentationProcessor.java     |  2 +-
 .../apache/camel/processor/CamelInternalProcessor.java |  4 ++--
 .../main/java/org/apache/camel/processor/Enricher.java |  4 ++--
 .../org/apache/camel/processor/MulticastProcessor.java |  4 ++--
 .../java/org/apache/camel/processor/SendProcessor.java |  2 +-
 .../camel/processor/aggregate/AggregateProcessor.java  |  4 ++--
 .../org/apache/camel/processor/interceptor/Debug.java  |  2 +-
 .../main/java/org/apache/camel/util/MessageHelper.java |  2 +-
 .../src/main/java/org/apache/camel/util/StopWatch.java | 13 +++++--------
 .../camel/component/bean/BeanOgnlPerformanceTest.java  |  2 +-
 .../camel/component/bean/BeanPerformanceTest.java      |  2 +-
 .../component/seda/SedaInOutChainedTimeoutTest.java    |  2 +-
 .../camel/component/vm/VmInOutChainedTimeoutTest.java  |  2 +-
 .../converter/PrimitiveTypeConverterIssueTest.java     |  2 +-
 .../PropertyEditorTypeConverterIssueTest.java          |  2 +-
 .../converter/TimerDrivenTimePatternConverterTest.java |  2 +-
 .../apache/camel/impl/ActiveMQUuidGeneratorTest.java   |  2 +-
 .../org/apache/camel/impl/JavaUuidGeneratorTest.java   |  2 +-
 .../org/apache/camel/impl/SimpleUuidGeneratorTest.java |  2 +-
 .../issues/TypeConverterConcurrencyIssueTest.java      |  2 +-
 .../TokenPairIteratorSplitChoicePerformanceTest.java   |  2 +-
 .../language/XPathSplitChoicePerformanceTest.java      |  2 +-
 ...FailoverLoadBalancerBreakoutDuringShutdownTest.java |  2 +-
 ...adLetterErrorHandlerNoRedeliveryOnShutdownTest.java |  4 ++--
 ...deliveryErrorHandlerBreakoutDuringShutdownTest.java |  2 +-
 ...deliveryErrorHandlerNoRedeliveryOnShutdownTest.java |  2 +-
 .../camel/processor/SplitterParallelAggregateTest.java |  2 +-
 .../camel/processor/SplitterParallelBigFileTest.java   |  2 +-
 35 files changed, 46 insertions(+), 51 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/cd1532c5/camel-core/src/main/java/org/apache/camel/component/file/GenericFileConsumer.java
----------------------------------------------------------------------
diff --git 
a/camel-core/src/main/java/org/apache/camel/component/file/GenericFileConsumer.java
 
b/camel-core/src/main/java/org/apache/camel/component/file/GenericFileConsumer.java
index aef1d98..8688bda 100644
--- 
a/camel-core/src/main/java/org/apache/camel/component/file/GenericFileConsumer.java
+++ 
b/camel-core/src/main/java/org/apache/camel/component/file/GenericFileConsumer.java
@@ -129,7 +129,7 @@ public abstract class GenericFileConsumer<T> extends 
ScheduledBatchPollingConsum
             throw e;
         }
 
-        long delta = stop.stop();
+        long delta = stop.taken();
         if (log.isDebugEnabled()) {
             log.debug("Took {} to poll: {}", TimeUtils.printDuration(delta), 
name);
         }

http://git-wip-us.apache.org/repos/asf/camel/blob/cd1532c5/camel-core/src/main/java/org/apache/camel/component/mock/MockEndpoint.java
----------------------------------------------------------------------
diff --git 
a/camel-core/src/main/java/org/apache/camel/component/mock/MockEndpoint.java 
b/camel-core/src/main/java/org/apache/camel/component/mock/MockEndpoint.java
index fb10f5f..3112a46 100644
--- a/camel-core/src/main/java/org/apache/camel/component/mock/MockEndpoint.java
+++ b/camel-core/src/main/java/org/apache/camel/component/mock/MockEndpoint.java
@@ -1411,7 +1411,7 @@ public class MockEndpoint extends DefaultEndpoint 
implements BrowsableEndpoint {
 
         StopWatch watch = new StopWatch();
         waitForCompleteLatch(resultWaitTime);
-        long delta = watch.stop();
+        long delta = watch.taken();
         LOG.debug("Took {} millis to complete latch", delta);
 
         if (resultMinimumWaitTime > 0 && delta < resultMinimumWaitTime) {

http://git-wip-us.apache.org/repos/asf/camel/blob/cd1532c5/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java
----------------------------------------------------------------------
diff --git 
a/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java 
b/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java
index 7ed6e84..8a8b626 100644
--- a/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java
+++ b/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java
@@ -2996,7 +2996,6 @@ public class DefaultCamelContext extends ServiceSupport 
implements ModelCamelCon
                 }
             }
 
-            watch.stop();
             if (log.isInfoEnabled()) {
                 log.info("Resumed " + suspendedRouteServices.size() + " 
routes");
                 log.info("Apache Camel " + getVersion() + " (CamelContext: " + 
getName() + ") resumed in " + TimeUtils.printDuration(watch.taken()));
@@ -3051,7 +3050,6 @@ public class DefaultCamelContext extends ServiceSupport 
implements ModelCamelCon
                 }
             }
 
-            stopWatch.stop();
             if (log.isInfoEnabled()) {
                 // count how many routes are actually started
                 int started = 0;
@@ -3419,7 +3417,6 @@ public class DefaultCamelContext extends ServiceSupport 
implements ModelCamelCon
         // stop to clear introspection cache
         IntrospectionSupport.stop();
 
-        stopWatch.stop();
         if (log.isInfoEnabled()) {
             log.info("Apache Camel " + getVersion() + " (CamelContext: " + 
getName() + ") uptime {}", getUptime());
             log.info("Apache Camel " + getVersion() + " (CamelContext: " + 
getName() + ") is shutdown in " + TimeUtils.printDuration(stopWatch.taken()));

http://git-wip-us.apache.org/repos/asf/camel/blob/cd1532c5/camel-core/src/main/java/org/apache/camel/impl/DefaultMessageHistory.java
----------------------------------------------------------------------
diff --git 
a/camel-core/src/main/java/org/apache/camel/impl/DefaultMessageHistory.java 
b/camel-core/src/main/java/org/apache/camel/impl/DefaultMessageHistory.java
index 1549ace..4ab0e7e 100644
--- a/camel-core/src/main/java/org/apache/camel/impl/DefaultMessageHistory.java
+++ b/camel-core/src/main/java/org/apache/camel/impl/DefaultMessageHistory.java
@@ -32,6 +32,7 @@ public class DefaultMessageHistory implements MessageHistory {
     private final String nodeId;
     private final Date timestamp;
     private final StopWatch stopWatch;
+    private long elapsed;
 
     public DefaultMessageHistory(String routeId, NamedNode node, Date 
timestamp) {
         this.routeId = routeId;
@@ -54,11 +55,11 @@ public class DefaultMessageHistory implements 
MessageHistory {
     }
 
     public long getElapsed() {
-        return stopWatch.taken();
+        return elapsed;
     }
 
     public void nodeProcessingDone() {
-        stopWatch.stop();
+        elapsed = stopWatch.taken();
     }
 
     @Override

http://git-wip-us.apache.org/repos/asf/camel/blob/cd1532c5/camel-core/src/main/java/org/apache/camel/impl/DefaultShutdownStrategy.java
----------------------------------------------------------------------
diff --git 
a/camel-core/src/main/java/org/apache/camel/impl/DefaultShutdownStrategy.java 
b/camel-core/src/main/java/org/apache/camel/impl/DefaultShutdownStrategy.java
index 11d378d..adc69ff 100644
--- 
a/camel-core/src/main/java/org/apache/camel/impl/DefaultShutdownStrategy.java
+++ 
b/camel-core/src/main/java/org/apache/camel/impl/DefaultShutdownStrategy.java
@@ -254,7 +254,7 @@ public class DefaultShutdownStrategy extends ServiceSupport 
implements ShutdownS
         }
 
         // convert to seconds as its easier to read than a big milli seconds 
number
-        long seconds = TimeUnit.SECONDS.convert(watch.stop(), 
TimeUnit.MILLISECONDS);
+        long seconds = TimeUnit.SECONDS.convert(watch.taken(), 
TimeUnit.MILLISECONDS);
 
         LOG.info("Graceful shutdown of " + routesOrdered.size() + " routes 
completed in " + seconds + " seconds");
         return true;

http://git-wip-us.apache.org/repos/asf/camel/blob/cd1532c5/camel-core/src/main/java/org/apache/camel/impl/EventNotifierCallback.java
----------------------------------------------------------------------
diff --git 
a/camel-core/src/main/java/org/apache/camel/impl/EventNotifierCallback.java 
b/camel-core/src/main/java/org/apache/camel/impl/EventNotifierCallback.java
index 4732ce0..cda7d14 100644
--- a/camel-core/src/main/java/org/apache/camel/impl/EventNotifierCallback.java
+++ b/camel-core/src/main/java/org/apache/camel/impl/EventNotifierCallback.java
@@ -48,7 +48,7 @@ public class EventNotifierCallback implements AsyncCallback {
     @Override
     public void done(boolean doneSync) {
         if (watch != null) {
-            long timeTaken = watch.stop();
+            long timeTaken = watch.taken();
             EventHelper.notifyExchangeSent(exchange.getContext(), exchange, 
endpoint, timeTaken);
         }
         originalCallback.done(doneSync);

http://git-wip-us.apache.org/repos/asf/camel/blob/cd1532c5/camel-core/src/main/java/org/apache/camel/impl/ProducerCache.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/impl/ProducerCache.java 
b/camel-core/src/main/java/org/apache/camel/impl/ProducerCache.java
index a5cdcbf..574f7cd 100644
--- a/camel-core/src/main/java/org/apache/camel/impl/ProducerCache.java
+++ b/camel-core/src/main/java/org/apache/camel/impl/ProducerCache.java
@@ -442,7 +442,7 @@ public class ProducerCache extends ServiceSupport {
             return producerCallback.doInAsyncProducer(producer, 
asyncProcessor, exchange, pattern, doneSync -> {
                 try {
                     if (eventNotifierEnabled && watch != null) {
-                        long timeTaken = watch.stop();
+                        long timeTaken = watch.taken();
                         // emit event that the exchange was sent to the 
endpoint
                         EventHelper.notifyExchangeSent(exchange.getContext(), 
exchange, endpoint, timeTaken);
                     }
@@ -541,7 +541,7 @@ public class ProducerCache extends ServiceSupport {
                 } finally {
                     // emit event that the exchange was sent to the endpoint
                     if (eventNotifierEnabled && watch != null) {
-                        long timeTaken = watch.stop();
+                        long timeTaken = watch.taken();
                         EventHelper.notifyExchangeSent(exchange.getContext(), 
exchange, endpoint, timeTaken);
                     }
                 }

http://git-wip-us.apache.org/repos/asf/camel/blob/cd1532c5/camel-core/src/main/java/org/apache/camel/management/InstrumentationProcessor.java
----------------------------------------------------------------------
diff --git 
a/camel-core/src/main/java/org/apache/camel/management/InstrumentationProcessor.java
 
b/camel-core/src/main/java/org/apache/camel/management/InstrumentationProcessor.java
index 4c4d7dc..a7ff87a 100644
--- 
a/camel-core/src/main/java/org/apache/camel/management/InstrumentationProcessor.java
+++ 
b/camel-core/src/main/java/org/apache/camel/management/InstrumentationProcessor.java
@@ -79,7 +79,7 @@ public class InstrumentationProcessor extends 
DelegateAsyncProcessor {
                 try {
                     // record end time
                     if (watch != null) {
-                        recordTime(exchange, watch.stop());
+                        recordTime(exchange, watch.taken());
                     }
                 } finally {
                     // and let the original callback know we are done as well

http://git-wip-us.apache.org/repos/asf/camel/blob/cd1532c5/camel-core/src/main/java/org/apache/camel/processor/CamelInternalProcessor.java
----------------------------------------------------------------------
diff --git 
a/camel-core/src/main/java/org/apache/camel/processor/CamelInternalProcessor.java
 
b/camel-core/src/main/java/org/apache/camel/processor/CamelInternalProcessor.java
index 33bda1b..5599181 100644
--- 
a/camel-core/src/main/java/org/apache/camel/processor/CamelInternalProcessor.java
+++ 
b/camel-core/src/main/java/org/apache/camel/processor/CamelInternalProcessor.java
@@ -390,7 +390,7 @@ public class CamelInternalProcessor extends 
DelegateAsyncProcessor {
         public void after(Exchange exchange, StopWatch watch) throws Exception 
{
             // record end time
             if (watch != null) {
-                recordTime(exchange, watch.stop());
+                recordTime(exchange, watch.taken());
             }
         }
     }
@@ -612,7 +612,7 @@ public class CamelInternalProcessor extends 
DelegateAsyncProcessor {
         @Override
         public void after(Exchange exchange, StopWatch stopWatch) throws 
Exception {
             if (stopWatch != null) {
-                backlogDebugger.afterProcess(exchange, target, definition, 
stopWatch.stop());
+                backlogDebugger.afterProcess(exchange, target, definition, 
stopWatch.taken());
             }
         }
 

http://git-wip-us.apache.org/repos/asf/camel/blob/cd1532c5/camel-core/src/main/java/org/apache/camel/processor/Enricher.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/processor/Enricher.java 
b/camel-core/src/main/java/org/apache/camel/processor/Enricher.java
index d68aa4b..ac39f92 100644
--- a/camel-core/src/main/java/org/apache/camel/processor/Enricher.java
+++ b/camel-core/src/main/java/org/apache/camel/processor/Enricher.java
@@ -197,7 +197,7 @@ public class Enricher extends ServiceSupport implements 
AsyncProcessor, IdAware,
 
                 // emit event that the exchange was sent to the endpoint
                 if (watch != null) {
-                    long timeTaken = watch.stop();
+                    long timeTaken = watch.taken();
                     
EventHelper.notifyExchangeSent(resourceExchange.getContext(), resourceExchange, 
destination, timeTaken);
                 }
                 
@@ -248,7 +248,7 @@ public class Enricher extends ServiceSupport implements 
AsyncProcessor, IdAware,
         LOG.trace("Processing exchangeId: {} is continued being processed 
synchronously", exchange.getExchangeId());
 
         // emit event that the exchange was sent to the endpoint
-        long timeTaken = watch.stop();
+        long timeTaken = watch.taken();
         EventHelper.notifyExchangeSent(resourceExchange.getContext(), 
resourceExchange, destination, timeTaken);
         
         if (!isAggregateOnException() && resourceExchange.isFailed()) {

http://git-wip-us.apache.org/repos/asf/camel/blob/cd1532c5/camel-core/src/main/java/org/apache/camel/processor/MulticastProcessor.java
----------------------------------------------------------------------
diff --git 
a/camel-core/src/main/java/org/apache/camel/processor/MulticastProcessor.java 
b/camel-core/src/main/java/org/apache/camel/processor/MulticastProcessor.java
index 1085192..896372b 100644
--- 
a/camel-core/src/main/java/org/apache/camel/processor/MulticastProcessor.java
+++ 
b/camel-core/src/main/java/org/apache/camel/processor/MulticastProcessor.java
@@ -704,7 +704,7 @@ public class MulticastProcessor extends ServiceSupport 
implements AsyncProcessor
 
                     // okay we are done, so notify the exchange was sent
                     if (producer != null && watch != null) {
-                        long timeTaken = watch.stop();
+                        long timeTaken = watch.taken();
                         Endpoint endpoint = producer.getEndpoint();
                         // emit event that the exchange was sent to the 
endpoint
                         EventHelper.notifyExchangeSent(exchange.getContext(), 
exchange, endpoint, timeTaken);
@@ -851,7 +851,7 @@ public class MulticastProcessor extends ServiceSupport 
implements AsyncProcessor
             }
             if (producer != null && watch != null) {
                 Endpoint endpoint = producer.getEndpoint();
-                long timeTaken = watch.stop();
+                long timeTaken = watch.taken();
                 // emit event that the exchange was sent to the endpoint
                 // this is okay to do here in the finally block, as the 
processing is not using the async routing engine
                 //( we invoke it synchronously as parallel async routing is 
too hard)

http://git-wip-us.apache.org/repos/asf/camel/blob/cd1532c5/camel-core/src/main/java/org/apache/camel/processor/SendProcessor.java
----------------------------------------------------------------------
diff --git 
a/camel-core/src/main/java/org/apache/camel/processor/SendProcessor.java 
b/camel-core/src/main/java/org/apache/camel/processor/SendProcessor.java
index 497fb74..8f7c961 100644
--- a/camel-core/src/main/java/org/apache/camel/processor/SendProcessor.java
+++ b/camel-core/src/main/java/org/apache/camel/processor/SendProcessor.java
@@ -154,7 +154,7 @@ public class SendProcessor extends ServiceSupport 
implements AsyncProcessor, Tra
                             target.setPattern(existingPattern);
                             // emit event that the exchange was sent to the 
endpoint
                             if (watch != null) {
-                                long timeTaken = watch.stop();
+                                long timeTaken = watch.taken();
                                 
EventHelper.notifyExchangeSent(target.getContext(), target, destination, 
timeTaken);
                             }
                         } finally {

http://git-wip-us.apache.org/repos/asf/camel/blob/cd1532c5/camel-core/src/main/java/org/apache/camel/processor/aggregate/AggregateProcessor.java
----------------------------------------------------------------------
diff --git 
a/camel-core/src/main/java/org/apache/camel/processor/aggregate/AggregateProcessor.java
 
b/camel-core/src/main/java/org/apache/camel/processor/aggregate/AggregateProcessor.java
index f11d459..bd1b9ed 100644
--- 
a/camel-core/src/main/java/org/apache/camel/processor/aggregate/AggregateProcessor.java
+++ 
b/camel-core/src/main/java/org/apache/camel/processor/aggregate/AggregateProcessor.java
@@ -804,7 +804,7 @@ public class AggregateProcessor extends ServiceSupport 
implements AsyncProcessor
 
         // log duration of this task so end user can see how long it takes to 
pre-check this upon starting
         LOG.info("Restored {} CompletionTimeout conditions in the 
AggregationTimeoutChecker in {}",
-                timeoutMap.size(), TimeUtils.printDuration(watch.stop()));
+                timeoutMap.size(), TimeUtils.printDuration(watch.taken()));
     }
 
     /**
@@ -1462,7 +1462,7 @@ public class AggregateProcessor extends ServiceSupport 
implements AsyncProcessor
         }
 
         if (expected > 0) {
-            LOG.info("Forcing completion of all groups with {} exchanges 
completed in {}", expected, TimeUtils.printDuration(watch.stop()));
+            LOG.info("Forcing completion of all groups with {} exchanges 
completed in {}", expected, TimeUtils.printDuration(watch.taken()));
         }
     }
 

http://git-wip-us.apache.org/repos/asf/camel/blob/cd1532c5/camel-core/src/main/java/org/apache/camel/processor/interceptor/Debug.java
----------------------------------------------------------------------
diff --git 
a/camel-core/src/main/java/org/apache/camel/processor/interceptor/Debug.java 
b/camel-core/src/main/java/org/apache/camel/processor/interceptor/Debug.java
index e62a79e..c4750b2 100644
--- a/camel-core/src/main/java/org/apache/camel/processor/interceptor/Debug.java
+++ b/camel-core/src/main/java/org/apache/camel/processor/interceptor/Debug.java
@@ -56,7 +56,7 @@ public class Debug implements InterceptStrategy {
 
                 return processor.process(exchange, new AsyncCallback() {
                     public void done(boolean doneSync) {
-                        long diff = watch.stop();
+                        long diff = watch.taken();
                         try {
                             debugger.afterProcess(exchange, processor, 
definition, diff);
                         } finally {

http://git-wip-us.apache.org/repos/asf/camel/blob/cd1532c5/camel-core/src/main/java/org/apache/camel/util/MessageHelper.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/util/MessageHelper.java 
b/camel-core/src/main/java/org/apache/camel/util/MessageHelper.java
index 4b34902..311e987 100644
--- a/camel-core/src/main/java/org/apache/camel/util/MessageHelper.java
+++ b/camel-core/src/main/java/org/apache/camel/util/MessageHelper.java
@@ -562,7 +562,7 @@ public final class MessageHelper {
         long elapsed = 0;
         Date created = exchange.getProperty(Exchange.CREATED_TIMESTAMP, 
Date.class);
         if (created != null) {
-            elapsed = new StopWatch(created).stop();
+            elapsed = new StopWatch(created).taken();
         }
 
         String goMessageHistoryOutput = 
exchange.getContext().getGlobalOption(Exchange.MESSAGE_HISTORY_OUTPUT_FORMAT);

http://git-wip-us.apache.org/repos/asf/camel/blob/cd1532c5/camel-core/src/main/java/org/apache/camel/util/StopWatch.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/util/StopWatch.java 
b/camel-core/src/main/java/org/apache/camel/util/StopWatch.java
index d1d67f3..e82adbc 100644
--- a/camel-core/src/main/java/org/apache/camel/util/StopWatch.java
+++ b/camel-core/src/main/java/org/apache/camel/util/StopWatch.java
@@ -28,7 +28,6 @@ import java.util.Date;
 public final class StopWatch {
 
     private long start;
-    private long stop;
 
     /**
      * Starts the stop watch
@@ -60,28 +59,26 @@ public final class StopWatch {
      */
     public void restart() {
         start = System.currentTimeMillis();
-        stop = 0;
     }
 
     /**
-     * Stops the stop watch
+     * Reports the time taken (does not stop the stop watch)
      *
      * @return the time taken in millis.
+     * @deprecated use {@link #taken()}
      */
+    @Deprecated
     public long stop() {
-        stop = System.currentTimeMillis();
         return taken();
     }
 
     /**
      * Returns the time taken in millis.
      *
-     * @return time in millis
+     * @return time in millis, or <tt>0</tt> if not started yet.
      */
     public long taken() {
-        if (start > 0 && stop > 0) {
-            return stop - start;
-        } else if (start > 0) {
+        if (start > 0) {
             return System.currentTimeMillis() - start;
         } else {
             return 0;

http://git-wip-us.apache.org/repos/asf/camel/blob/cd1532c5/camel-core/src/test/java/org/apache/camel/component/bean/BeanOgnlPerformanceTest.java
----------------------------------------------------------------------
diff --git 
a/camel-core/src/test/java/org/apache/camel/component/bean/BeanOgnlPerformanceTest.java
 
b/camel-core/src/test/java/org/apache/camel/component/bean/BeanOgnlPerformanceTest.java
index b539869..750cfe7 100644
--- 
a/camel-core/src/test/java/org/apache/camel/component/bean/BeanOgnlPerformanceTest.java
+++ 
b/camel-core/src/test/java/org/apache/camel/component/bean/BeanOgnlPerformanceTest.java
@@ -47,7 +47,7 @@ public class BeanOgnlPerformanceTest extends 
ContextTestSupport {
 
         assertMockEndpointsSatisfied();
 
-        log.info("Took {} millis", watch.stop());
+        log.info("Took {} millis", watch.taken());
     }
 
     @Override

http://git-wip-us.apache.org/repos/asf/camel/blob/cd1532c5/camel-core/src/test/java/org/apache/camel/component/bean/BeanPerformanceTest.java
----------------------------------------------------------------------
diff --git 
a/camel-core/src/test/java/org/apache/camel/component/bean/BeanPerformanceTest.java
 
b/camel-core/src/test/java/org/apache/camel/component/bean/BeanPerformanceTest.java
index 17fe3d8..03403ea 100644
--- 
a/camel-core/src/test/java/org/apache/camel/component/bean/BeanPerformanceTest.java
+++ 
b/camel-core/src/test/java/org/apache/camel/component/bean/BeanPerformanceTest.java
@@ -43,7 +43,7 @@ public class BeanPerformanceTest extends ContextTestSupport {
         for (int i = 0; i < times; i++) {
             template.sendBody("direct:start", "Hello World");
         }
-        log.info("Took {} to invoke the bean {} times", 
TimeUtils.printDuration(watch.stop()), times);
+        log.info("Took {} to invoke the bean {} times", 
TimeUtils.printDuration(watch.taken()), times);
 
         assertEquals(times, INVOKED.get());
     }

http://git-wip-us.apache.org/repos/asf/camel/blob/cd1532c5/camel-core/src/test/java/org/apache/camel/component/seda/SedaInOutChainedTimeoutTest.java
----------------------------------------------------------------------
diff --git 
a/camel-core/src/test/java/org/apache/camel/component/seda/SedaInOutChainedTimeoutTest.java
 
b/camel-core/src/test/java/org/apache/camel/component/seda/SedaInOutChainedTimeoutTest.java
index d1fcd4f..bbca8d3 100644
--- 
a/camel-core/src/test/java/org/apache/camel/component/seda/SedaInOutChainedTimeoutTest.java
+++ 
b/camel-core/src/test/java/org/apache/camel/component/seda/SedaInOutChainedTimeoutTest.java
@@ -37,7 +37,7 @@ public class SedaInOutChainedTimeoutTest extends 
ContextTestSupport {
             ExchangeTimedOutException cause = 
assertIsInstanceOf(ExchangeTimedOutException.class, e.getCause());
             assertEquals(2000, cause.getTimeout());
         }
-        long delta = watch.stop();
+        long delta = watch.taken();
 
         assertTrue("Should be faster than 4000 millis, was: " + delta, delta < 
4000);
     }

http://git-wip-us.apache.org/repos/asf/camel/blob/cd1532c5/camel-core/src/test/java/org/apache/camel/component/vm/VmInOutChainedTimeoutTest.java
----------------------------------------------------------------------
diff --git 
a/camel-core/src/test/java/org/apache/camel/component/vm/VmInOutChainedTimeoutTest.java
 
b/camel-core/src/test/java/org/apache/camel/component/vm/VmInOutChainedTimeoutTest.java
index 4dafe6c..846525c 100644
--- 
a/camel-core/src/test/java/org/apache/camel/component/vm/VmInOutChainedTimeoutTest.java
+++ 
b/camel-core/src/test/java/org/apache/camel/component/vm/VmInOutChainedTimeoutTest.java
@@ -38,7 +38,7 @@ public class VmInOutChainedTimeoutTest extends 
AbstractVmTestSupport {
             assertEquals(200, cause.getTimeout());
         }
         
-        long delta = watch.stop();
+        long delta = watch.taken();
 
         assertTrue("Should be faster than 1 sec, was: " + delta, delta < 1100);
     }

http://git-wip-us.apache.org/repos/asf/camel/blob/cd1532c5/camel-core/src/test/java/org/apache/camel/converter/PrimitiveTypeConverterIssueTest.java
----------------------------------------------------------------------
diff --git 
a/camel-core/src/test/java/org/apache/camel/converter/PrimitiveTypeConverterIssueTest.java
 
b/camel-core/src/test/java/org/apache/camel/converter/PrimitiveTypeConverterIssueTest.java
index 92a5309..cc6897b 100644
--- 
a/camel-core/src/test/java/org/apache/camel/converter/PrimitiveTypeConverterIssueTest.java
+++ 
b/camel-core/src/test/java/org/apache/camel/converter/PrimitiveTypeConverterIssueTest.java
@@ -30,6 +30,6 @@ public class PrimitiveTypeConverterIssueTest extends 
ContextTestSupport {
             int num = context.getTypeConverter().convertTo(int.class, "123");
             assertEquals(123, num);
         }
-        log.info("Time taken: " + watch.stop());
+        log.info("Time taken: " + watch.taken());
     }
 }

http://git-wip-us.apache.org/repos/asf/camel/blob/cd1532c5/camel-core/src/test/java/org/apache/camel/converter/PropertyEditorTypeConverterIssueTest.java
----------------------------------------------------------------------
diff --git 
a/camel-core/src/test/java/org/apache/camel/converter/PropertyEditorTypeConverterIssueTest.java
 
b/camel-core/src/test/java/org/apache/camel/converter/PropertyEditorTypeConverterIssueTest.java
index f0fdd8e..ca609e6 100644
--- 
a/camel-core/src/test/java/org/apache/camel/converter/PropertyEditorTypeConverterIssueTest.java
+++ 
b/camel-core/src/test/java/org/apache/camel/converter/PropertyEditorTypeConverterIssueTest.java
@@ -37,6 +37,6 @@ public class PropertyEditorTypeConverterIssueTest extends 
ContextTestSupport {
             log.debug(s);
             assertNotNull(s);
         }
-        log.info("Time taken: " + watch.stop());
+        log.info("Time taken: " + watch.taken());
     }
 }

http://git-wip-us.apache.org/repos/asf/camel/blob/cd1532c5/camel-core/src/test/java/org/apache/camel/converter/TimerDrivenTimePatternConverterTest.java
----------------------------------------------------------------------
diff --git 
a/camel-core/src/test/java/org/apache/camel/converter/TimerDrivenTimePatternConverterTest.java
 
b/camel-core/src/test/java/org/apache/camel/converter/TimerDrivenTimePatternConverterTest.java
index e108ad6..f597219 100644
--- 
a/camel-core/src/test/java/org/apache/camel/converter/TimerDrivenTimePatternConverterTest.java
+++ 
b/camel-core/src/test/java/org/apache/camel/converter/TimerDrivenTimePatternConverterTest.java
@@ -39,7 +39,7 @@ public class TimerDrivenTimePatternConverterTest extends 
ContextTestSupport {
 
         StopWatch watch = new StopWatch();
         assertMockEndpointsSatisfied();
-        long interval = watch.stop();
+        long interval = watch.taken();
         
         LOG.trace("Should take approx 2000 milliseconds, was: {}", interval);
         assertTrue("Should take approx 2000 milliseconds, was: " + interval, 
interval >= 1700);

http://git-wip-us.apache.org/repos/asf/camel/blob/cd1532c5/camel-core/src/test/java/org/apache/camel/impl/ActiveMQUuidGeneratorTest.java
----------------------------------------------------------------------
diff --git 
a/camel-core/src/test/java/org/apache/camel/impl/ActiveMQUuidGeneratorTest.java 
b/camel-core/src/test/java/org/apache/camel/impl/ActiveMQUuidGeneratorTest.java
index 2bf6e5c..030c0e9 100644
--- 
a/camel-core/src/test/java/org/apache/camel/impl/ActiveMQUuidGeneratorTest.java
+++ 
b/camel-core/src/test/java/org/apache/camel/impl/ActiveMQUuidGeneratorTest.java
@@ -45,7 +45,7 @@ public class ActiveMQUuidGeneratorTest extends TestCase {
         }
         LOG.info("Last id:  " + uuidGenerator.generateUuid());
 
-        LOG.info("Took " + TimeUtils.printDuration(watch.stop()));
+        LOG.info("Took " + TimeUtils.printDuration(watch.taken()));
     }
 
     public void testSanitizeHostName() throws Exception {

http://git-wip-us.apache.org/repos/asf/camel/blob/cd1532c5/camel-core/src/test/java/org/apache/camel/impl/JavaUuidGeneratorTest.java
----------------------------------------------------------------------
diff --git 
a/camel-core/src/test/java/org/apache/camel/impl/JavaUuidGeneratorTest.java 
b/camel-core/src/test/java/org/apache/camel/impl/JavaUuidGeneratorTest.java
index c7ced6f..493aa6f 100644
--- a/camel-core/src/test/java/org/apache/camel/impl/JavaUuidGeneratorTest.java
+++ b/camel-core/src/test/java/org/apache/camel/impl/JavaUuidGeneratorTest.java
@@ -47,6 +47,6 @@ public class JavaUuidGeneratorTest extends TestCase {
         }
         LOG.info("Last id:  " + uuidGenerator.generateUuid());
 
-        LOG.info("Took " + TimeUtils.printDuration(watch.stop()));
+        LOG.info("Took " + TimeUtils.printDuration(watch.taken()));
     }
 }

http://git-wip-us.apache.org/repos/asf/camel/blob/cd1532c5/camel-core/src/test/java/org/apache/camel/impl/SimpleUuidGeneratorTest.java
----------------------------------------------------------------------
diff --git 
a/camel-core/src/test/java/org/apache/camel/impl/SimpleUuidGeneratorTest.java 
b/camel-core/src/test/java/org/apache/camel/impl/SimpleUuidGeneratorTest.java
index 75860a1..5bc44db 100644
--- 
a/camel-core/src/test/java/org/apache/camel/impl/SimpleUuidGeneratorTest.java
+++ 
b/camel-core/src/test/java/org/apache/camel/impl/SimpleUuidGeneratorTest.java
@@ -43,7 +43,7 @@ public class SimpleUuidGeneratorTest extends TestCase {
         }
         LOG.info("Last id:  " + uuidGenerator.generateUuid());
 
-        LOG.info("Took " + TimeUtils.printDuration(watch.stop()));
+        LOG.info("Took " + TimeUtils.printDuration(watch.taken()));
     }
 
 }

http://git-wip-us.apache.org/repos/asf/camel/blob/cd1532c5/camel-core/src/test/java/org/apache/camel/issues/TypeConverterConcurrencyIssueTest.java
----------------------------------------------------------------------
diff --git 
a/camel-core/src/test/java/org/apache/camel/issues/TypeConverterConcurrencyIssueTest.java
 
b/camel-core/src/test/java/org/apache/camel/issues/TypeConverterConcurrencyIssueTest.java
index c6a0e67..974fac7 100644
--- 
a/camel-core/src/test/java/org/apache/camel/issues/TypeConverterConcurrencyIssueTest.java
+++ 
b/camel-core/src/test/java/org/apache/camel/issues/TypeConverterConcurrencyIssueTest.java
@@ -59,7 +59,7 @@ public class TypeConverterConcurrencyIssueTest extends 
ContextTestSupport {
         }
         
         assertTrue("The expected mandatory conversions failed!", 
latch.await(1, TimeUnit.MINUTES));
-        log.info("Took " + watch.stop() + " millis to convert " + size + " 
objects");
+        log.info("Took " + watch.taken() + " millis to convert " + size + " 
objects");
     }
     
     public static MyCamelBean toMyCamelBean(String body) {

http://git-wip-us.apache.org/repos/asf/camel/blob/cd1532c5/camel-core/src/test/java/org/apache/camel/language/TokenPairIteratorSplitChoicePerformanceTest.java
----------------------------------------------------------------------
diff --git 
a/camel-core/src/test/java/org/apache/camel/language/TokenPairIteratorSplitChoicePerformanceTest.java
 
b/camel-core/src/test/java/org/apache/camel/language/TokenPairIteratorSplitChoicePerformanceTest.java
index 67c4772..dfe3e7a 100644
--- 
a/camel-core/src/test/java/org/apache/camel/language/TokenPairIteratorSplitChoicePerformanceTest.java
+++ 
b/camel-core/src/test/java/org/apache/camel/language/TokenPairIteratorSplitChoicePerformanceTest.java
@@ -56,7 +56,7 @@ public class TokenPairIteratorSplitChoicePerformanceTest 
extends ContextTestSupp
         NotifyBuilder notify = new 
NotifyBuilder(context).whenDone(size).create();
 
         boolean matches = notify.matches(5, TimeUnit.MINUTES);
-        log.info("Processed file with " + size + " elements in: " + 
TimeUtils.printDuration(watch.stop()));
+        log.info("Processed file with " + size + " elements in: " + 
TimeUtils.printDuration(watch.taken()));
 
         log.info("Processed " + tiny.get() + " tiny messages");
         log.info("Processed " + small.get() + " small messages");

http://git-wip-us.apache.org/repos/asf/camel/blob/cd1532c5/camel-core/src/test/java/org/apache/camel/language/XPathSplitChoicePerformanceTest.java
----------------------------------------------------------------------
diff --git 
a/camel-core/src/test/java/org/apache/camel/language/XPathSplitChoicePerformanceTest.java
 
b/camel-core/src/test/java/org/apache/camel/language/XPathSplitChoicePerformanceTest.java
index 772d1c0..164c9f2 100644
--- 
a/camel-core/src/test/java/org/apache/camel/language/XPathSplitChoicePerformanceTest.java
+++ 
b/camel-core/src/test/java/org/apache/camel/language/XPathSplitChoicePerformanceTest.java
@@ -56,7 +56,7 @@ public class XPathSplitChoicePerformanceTest extends 
ContextTestSupport {
         NotifyBuilder notify = new 
NotifyBuilder(context).whenDone(size).create();
 
         boolean matches = notify.matches(60, TimeUnit.SECONDS);
-        log.info("Processed file with " + size + " elements in: " + 
TimeUtils.printDuration(watch.stop()));
+        log.info("Processed file with " + size + " elements in: " + 
TimeUtils.printDuration(watch.taken()));
 
         log.info("Processed " + tiny.get() + " tiny messages");
         log.info("Processed " + small.get() + " small messages");

http://git-wip-us.apache.org/repos/asf/camel/blob/cd1532c5/camel-core/src/test/java/org/apache/camel/processor/FailoverLoadBalancerBreakoutDuringShutdownTest.java
----------------------------------------------------------------------
diff --git 
a/camel-core/src/test/java/org/apache/camel/processor/FailoverLoadBalancerBreakoutDuringShutdownTest.java
 
b/camel-core/src/test/java/org/apache/camel/processor/FailoverLoadBalancerBreakoutDuringShutdownTest.java
index a516388..8a3fe30 100644
--- 
a/camel-core/src/test/java/org/apache/camel/processor/FailoverLoadBalancerBreakoutDuringShutdownTest.java
+++ 
b/camel-core/src/test/java/org/apache/camel/processor/FailoverLoadBalancerBreakoutDuringShutdownTest.java
@@ -44,7 +44,7 @@ public class FailoverLoadBalancerBreakoutDuringShutdownTest 
extends ContextTestS
         context.stop();
 
         // should take less than 5 seconds
-        assertTrue("Should take less than 5 seconds, was " + watch.taken(), 
watch.stop() < 5000);
+        assertTrue("Should take less than 5 seconds, was " + watch.taken(), 
watch.taken() < 5000);
     }
 
     @Override

http://git-wip-us.apache.org/repos/asf/camel/blob/cd1532c5/camel-core/src/test/java/org/apache/camel/processor/RedeliveryDeadLetterErrorHandlerNoRedeliveryOnShutdownTest.java
----------------------------------------------------------------------
diff --git 
a/camel-core/src/test/java/org/apache/camel/processor/RedeliveryDeadLetterErrorHandlerNoRedeliveryOnShutdownTest.java
 
b/camel-core/src/test/java/org/apache/camel/processor/RedeliveryDeadLetterErrorHandlerNoRedeliveryOnShutdownTest.java
index 28fcc9a..be8d351 100644
--- 
a/camel-core/src/test/java/org/apache/camel/processor/RedeliveryDeadLetterErrorHandlerNoRedeliveryOnShutdownTest.java
+++ 
b/camel-core/src/test/java/org/apache/camel/processor/RedeliveryDeadLetterErrorHandlerNoRedeliveryOnShutdownTest.java
@@ -44,13 +44,13 @@ public class 
RedeliveryDeadLetterErrorHandlerNoRedeliveryOnShutdownTest extends
         Thread.sleep(3000);
         log.info("==== stopping route foo ====");
         context.stopRoute("foo");
-        watch.stop();
+        long taken = watch.taken();
 
         getMockEndpoint("mock:deadLetter").assertIsSatisfied();
 
         log.info("OnRedelivery processor counter {}", counter.get());
 
-        assertTrue("Should stop route faster, was " + watch.taken(), 
watch.taken() < 7000);
+        assertTrue("Should stop route faster, was " + taken, taken < 7000);
         assertTrue("Redelivery counter should be >= 2 and < 12, was: " + 
counter.get(), counter.get() >= 2 && counter.get() < 12);
     }
 

http://git-wip-us.apache.org/repos/asf/camel/blob/cd1532c5/camel-core/src/test/java/org/apache/camel/processor/RedeliveryErrorHandlerBreakoutDuringShutdownTest.java
----------------------------------------------------------------------
diff --git 
a/camel-core/src/test/java/org/apache/camel/processor/RedeliveryErrorHandlerBreakoutDuringShutdownTest.java
 
b/camel-core/src/test/java/org/apache/camel/processor/RedeliveryErrorHandlerBreakoutDuringShutdownTest.java
index 570185f..25034e7 100644
--- 
a/camel-core/src/test/java/org/apache/camel/processor/RedeliveryErrorHandlerBreakoutDuringShutdownTest.java
+++ 
b/camel-core/src/test/java/org/apache/camel/processor/RedeliveryErrorHandlerBreakoutDuringShutdownTest.java
@@ -44,7 +44,7 @@ public class RedeliveryErrorHandlerBreakoutDuringShutdownTest 
extends ContextTes
         context.stop();
 
         // should take less than 5 seconds
-        assertTrue("Should take less than 5 seconds, was {}", watch.stop() < 
5000);
+        assertTrue("Should take less than 5 seconds, was {}", watch.taken() < 
5000);
     }
 
     @Override

http://git-wip-us.apache.org/repos/asf/camel/blob/cd1532c5/camel-core/src/test/java/org/apache/camel/processor/RedeliveryErrorHandlerNoRedeliveryOnShutdownTest.java
----------------------------------------------------------------------
diff --git 
a/camel-core/src/test/java/org/apache/camel/processor/RedeliveryErrorHandlerNoRedeliveryOnShutdownTest.java
 
b/camel-core/src/test/java/org/apache/camel/processor/RedeliveryErrorHandlerNoRedeliveryOnShutdownTest.java
index 373e60a..5a8d3c6 100644
--- 
a/camel-core/src/test/java/org/apache/camel/processor/RedeliveryErrorHandlerNoRedeliveryOnShutdownTest.java
+++ 
b/camel-core/src/test/java/org/apache/camel/processor/RedeliveryErrorHandlerNoRedeliveryOnShutdownTest.java
@@ -36,7 +36,7 @@ public class RedeliveryErrorHandlerNoRedeliveryOnShutdownTest 
extends ContextTes
         // should not take long to stop the route
         StopWatch watch = new StopWatch();
         context.stopRoute("foo");
-        watch.stop();
+        watch.taken();
 
         assertTrue("Should stop route faster, was " + watch.taken(), 
watch.taken() < 4000);
     }

http://git-wip-us.apache.org/repos/asf/camel/blob/cd1532c5/camel-core/src/test/java/org/apache/camel/processor/SplitterParallelAggregateTest.java
----------------------------------------------------------------------
diff --git 
a/camel-core/src/test/java/org/apache/camel/processor/SplitterParallelAggregateTest.java
 
b/camel-core/src/test/java/org/apache/camel/processor/SplitterParallelAggregateTest.java
index 6eac19d..24cfed5 100644
--- 
a/camel-core/src/test/java/org/apache/camel/processor/SplitterParallelAggregateTest.java
+++ 
b/camel-core/src/test/java/org/apache/camel/processor/SplitterParallelAggregateTest.java
@@ -91,7 +91,7 @@ public class SplitterParallelAggregateTest extends 
ContextTestSupport {
                 Future<File> future = futures.get(i);
                 future.get();
             }
-            stopWatch.stop();
+            stopWatch.taken();
 
             log.info(String.format("test%d.%s=%d\n", numberOfRequests, 
endpoint, stopWatch.taken()));
         }

http://git-wip-us.apache.org/repos/asf/camel/blob/cd1532c5/camel-core/src/test/java/org/apache/camel/processor/SplitterParallelBigFileTest.java
----------------------------------------------------------------------
diff --git 
a/camel-core/src/test/java/org/apache/camel/processor/SplitterParallelBigFileTest.java
 
b/camel-core/src/test/java/org/apache/camel/processor/SplitterParallelBigFileTest.java
index 6c93dbe..c3e08df 100644
--- 
a/camel-core/src/test/java/org/apache/camel/processor/SplitterParallelBigFileTest.java
+++ 
b/camel-core/src/test/java/org/apache/camel/processor/SplitterParallelBigFileTest.java
@@ -64,7 +64,7 @@ public class SplitterParallelBigFileTest extends 
ContextTestSupport {
         NotifyBuilder builder = new NotifyBuilder(context).whenDone(lines + 
1).create();
         boolean done = builder.matches(120, TimeUnit.SECONDS);
 
-        log.info("Took " + TimeUtils.printDuration(watch.stop()));
+        log.info("Took " + TimeUtils.printDuration(watch.taken()));
 
         if (!done) {
             throw new CamelException("Could not split file in 2 minutes");

Reply via email to