You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by bv...@apache.org on 2013/01/02 16:33:35 UTC
svn commit: r1427825 - in /camel/trunk:
camel-core/src/main/java/org/apache/camel/
camel-core/src/main/java/org/apache/camel/util/
camel-core/src/test/java/org/apache/camel/component/bean/pojomessage/
camel-core/src/test/java/org/apache/camel/util/ com...
Author: bvahdat
Date: Wed Jan 2 15:33:34 2013
New Revision: 1427825
URL: http://svn.apache.org/viewvc?rev=1427825&view=rev
Log:
Polished.
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/TypeConverter.java
camel/trunk/camel-core/src/main/java/org/apache/camel/util/FileUtil.java
camel/trunk/camel-core/src/test/java/org/apache/camel/component/bean/pojomessage/PojoProxyHelperOneWayTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/component/bean/pojomessage/PojoProxyHelperRequestReplyTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/util/URISupportTest.java
camel/trunk/components/camel-avro/src/test/java/org/apache/camel/component/avro/AvroConsumerTestSupport.java
camel/trunk/components/camel-avro/src/test/java/org/apache/camel/component/avro/AvroProducerTestSupport.java
camel/trunk/components/camel-aws/src/test/java/org/apache/camel/component/aws/s3/AmazonS3ClientMock.java
camel/trunk/components/camel-aws/src/test/java/org/apache/camel/component/aws/sns/AmazonSNSClientMock.java
camel/trunk/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/BindyCsvFactory.java
camel/trunk/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/BindyFixedLengthFactory.java
camel/trunk/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/BindyKeyValuePairFactory.java
camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fix/BindyComplexKeyValuePairStandaloneTest.java
camel/trunk/components/camel-groovy/src/main/java/org/apache/camel/language/groovy/CamelGroovyMethods.java
camel/trunk/components/camel-groovy/src/main/java/org/apache/camel/language/groovy/GroovyRouteBuilder.java
camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/HttpConsumer.java
camel/trunk/components/camel-http4/src/main/java/org/apache/camel/component/http4/HttpConsumer.java
camel/trunk/components/camel-http4/src/main/java/org/apache/camel/component/http4/HttpEndpoint.java
camel/trunk/components/camel-jmx/src/test/java/org/apache/camel/component/jmx/JMXMonitorTypeLongCounterTest.java
camel/trunk/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailConstants.java
camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailProducerConcurrentTest.java
camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailProducerTest.java
camel/trunk/components/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/addressing/ConsumerWSAEndpointMappingRouteTest.java
camel/trunk/components/camel-stringtemplate/src/main/java/org/apache/camel/component/stringtemplate/StringTemplateEndpoint.java
camel/trunk/components/camel-stringtemplate/src/test/java/org/apache/camel/component/stringtemplate/StringTemplateContentCacheTest.java
camel/trunk/components/camel-websocket/src/main/java/org/apache/camel/component/websocket/WebsocketComponent.java
camel/trunk/components/camel-websocket/src/main/java/org/apache/camel/component/websocket/WebsocketEndpoint.java
camel/trunk/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketConsumerRouteTest.java
camel/trunk/tests/camel-blueprint-cxf-test/src/test/java/org/apache/camel/test/cxf/blueprint/CxfEndpointBeansTest.java
camel/trunk/tests/camel-performance/src/test/java/org/apache/camel/test/perf/AbstractBasePerformanceTest.java
camel/trunk/tests/camel-performance/src/test/java/org/apache/camel/test/perf/ContentBasedRoutingPerformanceTest.java
camel/trunk/tests/camel-performance/src/test/java/org/apache/camel/test/perf/HeaderBasedRoutingPerformanceTest.java
camel/trunk/tests/camel-performance/src/test/java/org/apache/camel/test/perf/SplitterPerformanceTest.java
camel/trunk/tests/camel-performance/src/test/java/org/apache/camel/test/perf/XPathBasedRoutingPerformanceTest.java
camel/trunk/tests/camel-performance/src/test/java/org/apache/camel/test/perf/XQueryBasedRoutingPerformanceTest.java
camel/trunk/tests/camel-performance/src/test/java/org/apache/camel/test/perf/XsltPerformanceTest.java
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/TypeConverter.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/TypeConverter.java?rev=1427825&r1=1427824&r2=1427825&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/TypeConverter.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/TypeConverter.java Wed Jan 2 15:33:34 2013
@@ -58,7 +58,7 @@ public interface TypeConverter {
* @param value the value to be converted
* @return the converted value, is never <tt>null</tt>
* @throws TypeConversionException is thrown if error during type conversion
- * @throws NoTypeConversionAvailableException} if no type converters exists to convert to the given type
+ * @throws NoTypeConversionAvailableException if no type converters exists to convert to the given type
*/
<T> T mandatoryConvertTo(Class<T> type, Object value) throws TypeConversionException, NoTypeConversionAvailableException;
@@ -73,7 +73,7 @@ public interface TypeConverter {
* @param value the value to be converted
* @return the converted value, is never <tt>null</tt>
* @throws TypeConversionException is thrown if error during type conversion
- * @throws NoTypeConversionAvailableException} if no type converters exists to convert to the given type
+ * @throws NoTypeConversionAvailableException if no type converters exists to convert to the given type
*/
<T> T mandatoryConvertTo(Class<T> type, Exchange exchange, Object value) throws TypeConversionException, NoTypeConversionAvailableException;
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/util/FileUtil.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/util/FileUtil.java?rev=1427825&r1=1427824&r2=1427825&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/util/FileUtil.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/util/FileUtil.java Wed Jan 2 15:33:34 2013
@@ -21,8 +21,6 @@ import java.io.File;
import java.io.FileInputStream;
import java.io.FileOutputStream;
import java.io.IOException;
-import java.net.URI;
-import java.net.URISyntaxException;
import java.nio.channels.FileChannel;
import java.util.Iterator;
import java.util.Locale;
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/component/bean/pojomessage/PojoProxyHelperOneWayTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/component/bean/pojomessage/PojoProxyHelperOneWayTest.java?rev=1427825&r1=1427824&r2=1427825&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/component/bean/pojomessage/PojoProxyHelperOneWayTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/component/bean/pojomessage/PojoProxyHelperOneWayTest.java Wed Jan 2 15:33:34 2013
@@ -19,13 +19,12 @@ package org.apache.camel.component.bean.
import java.util.ArrayList;
import java.util.List;
-import junit.framework.Assert;
-
import org.apache.camel.ContextTestSupport;
import org.apache.camel.Endpoint;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.bean.PojoProxyHelper;
import org.apache.camel.component.mock.MockEndpoint;
+import org.junit.Assert;
import org.junit.Test;
public class PojoProxyHelperOneWayTest extends ContextTestSupport {
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/component/bean/pojomessage/PojoProxyHelperRequestReplyTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/component/bean/pojomessage/PojoProxyHelperRequestReplyTest.java?rev=1427825&r1=1427824&r2=1427825&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/component/bean/pojomessage/PojoProxyHelperRequestReplyTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/component/bean/pojomessage/PojoProxyHelperRequestReplyTest.java Wed Jan 2 15:33:34 2013
@@ -16,12 +16,11 @@
*/
package org.apache.camel.component.bean.pojomessage;
-import junit.framework.Assert;
-
import org.apache.camel.ContextTestSupport;
import org.apache.camel.Endpoint;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.bean.PojoProxyHelper;
+import org.junit.Assert;
import org.junit.Test;
public class PojoProxyHelperRequestReplyTest extends ContextTestSupport {
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/util/URISupportTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/util/URISupportTest.java?rev=1427825&r1=1427824&r2=1427825&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/util/URISupportTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/util/URISupportTest.java Wed Jan 2 15:33:34 2013
@@ -17,7 +17,6 @@
package org.apache.camel.util;
import java.net.URI;
-import java.net.URLEncoder;
import java.util.HashMap;
import java.util.LinkedHashMap;
import java.util.Map;
Modified: camel/trunk/components/camel-avro/src/test/java/org/apache/camel/component/avro/AvroConsumerTestSupport.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-avro/src/test/java/org/apache/camel/component/avro/AvroConsumerTestSupport.java?rev=1427825&r1=1427824&r2=1427825&view=diff
==============================================================================
--- camel/trunk/components/camel-avro/src/test/java/org/apache/camel/component/avro/AvroConsumerTestSupport.java (original)
+++ camel/trunk/components/camel-avro/src/test/java/org/apache/camel/component/avro/AvroConsumerTestSupport.java Wed Jan 2 15:33:34 2013
@@ -19,7 +19,6 @@ package org.apache.camel.component.avro;
import java.io.IOException;
-import junit.framework.Assert;
import org.apache.avro.Protocol;
import org.apache.avro.ipc.Requestor;
import org.apache.avro.ipc.Transceiver;
@@ -29,6 +28,7 @@ import org.apache.camel.avro.generated.K
import org.apache.camel.avro.generated.Value;
import org.apache.camel.avro.impl.KeyValueProtocolImpl;
+import org.junit.Assert;
import org.junit.Test;
public abstract class AvroConsumerTestSupport extends AvroTestSupport {
Modified: camel/trunk/components/camel-avro/src/test/java/org/apache/camel/component/avro/AvroProducerTestSupport.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-avro/src/test/java/org/apache/camel/component/avro/AvroProducerTestSupport.java?rev=1427825&r1=1427824&r2=1427825&view=diff
==============================================================================
--- camel/trunk/components/camel-avro/src/test/java/org/apache/camel/component/avro/AvroProducerTestSupport.java (original)
+++ camel/trunk/components/camel-avro/src/test/java/org/apache/camel/component/avro/AvroProducerTestSupport.java Wed Jan 2 15:33:34 2013
@@ -19,8 +19,6 @@ package org.apache.camel.component.avro;
import java.io.IOException;
-import junit.framework.Assert;
-
import org.apache.avro.Protocol;
import org.apache.avro.ipc.Server;
@@ -31,6 +29,7 @@ import org.apache.camel.avro.generated.V
import org.apache.camel.avro.impl.KeyValueProtocolImpl;
import org.apache.camel.component.mock.MockEndpoint;
+import org.junit.Assert;
import org.junit.Test;
public abstract class AvroProducerTestSupport extends AvroTestSupport {
Modified: camel/trunk/components/camel-aws/src/test/java/org/apache/camel/component/aws/s3/AmazonS3ClientMock.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-aws/src/test/java/org/apache/camel/component/aws/s3/AmazonS3ClientMock.java?rev=1427825&r1=1427824&r2=1427825&view=diff
==============================================================================
--- camel/trunk/components/camel-aws/src/test/java/org/apache/camel/component/aws/s3/AmazonS3ClientMock.java (original)
+++ camel/trunk/components/camel-aws/src/test/java/org/apache/camel/component/aws/s3/AmazonS3ClientMock.java Wed Jan 2 15:33:34 2013
@@ -23,8 +23,6 @@ import java.util.ArrayList;
import java.util.Date;
import java.util.List;
-import junit.framework.Assert;
-
import com.amazonaws.AmazonClientException;
import com.amazonaws.AmazonServiceException;
import com.amazonaws.AmazonWebServiceRequest;
@@ -75,6 +73,8 @@ import com.amazonaws.services.s3.model.U
import com.amazonaws.services.s3.model.UploadPartResult;
import com.amazonaws.services.s3.model.VersionListing;
+import org.junit.Assert;
+
public class AmazonS3ClientMock extends AmazonS3Client {
List<S3Object> objects = new ArrayList<S3Object>();
Modified: camel/trunk/components/camel-aws/src/test/java/org/apache/camel/component/aws/sns/AmazonSNSClientMock.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-aws/src/test/java/org/apache/camel/component/aws/sns/AmazonSNSClientMock.java?rev=1427825&r1=1427824&r2=1427825&view=diff
==============================================================================
--- camel/trunk/components/camel-aws/src/test/java/org/apache/camel/component/aws/sns/AmazonSNSClientMock.java (original)
+++ camel/trunk/components/camel-aws/src/test/java/org/apache/camel/component/aws/sns/AmazonSNSClientMock.java Wed Jan 2 15:33:34 2013
@@ -16,8 +16,6 @@
*/
package org.apache.camel.component.aws.sns;
-import junit.framework.Assert;
-
import com.amazonaws.AmazonClientException;
import com.amazonaws.AmazonServiceException;
import com.amazonaws.AmazonWebServiceRequest;
@@ -46,6 +44,8 @@ import com.amazonaws.services.sns.model.
import com.amazonaws.services.sns.model.SubscribeResult;
import com.amazonaws.services.sns.model.UnsubscribeRequest;
+import org.junit.Assert;
+
public class AmazonSNSClientMock extends AmazonSNSClient {
private static final String DEFAULT_TOPIC_ARN = "arn:aws:sns:us-east-1:541925086079:MyTopic";
Modified: camel/trunk/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/BindyCsvFactory.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/BindyCsvFactory.java?rev=1427825&r1=1427824&r2=1427825&view=diff
==============================================================================
--- camel/trunk/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/BindyCsvFactory.java (original)
+++ camel/trunk/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/BindyCsvFactory.java Wed Jan 2 15:33:34 2013
@@ -187,13 +187,8 @@ public class BindyCsvFactory extends Bin
LOG.debug("Pos: {}, Data: {}, Field type: {}", new Object[]{pos, data, field.getType()});
}
- Format<?> format;
-
- // Get pattern defined for the field
- String pattern = dataField.pattern();
-
// Create format object to format the field
- format = FormatFactory.getFormat(field.getType(), getLocale(), dataField);
+ Format<?> format = FormatFactory.getFormat(field.getType(), getLocale(), dataField);
// field object to be set
Object modelField = model.get(field.getDeclaringClass().getName());
@@ -393,11 +388,8 @@ public class BindyCsvFactory extends Bin
if (obj != null) {
- // Retrieve the format, pattern and precision associated to
- // the type
+ // Retrieve the format, pattern and precision associated to the type
Class<?> type = field.getType();
- String pattern = datafield.pattern();
- int precision = datafield.precision();
// Create format
Format<?> format = FormatFactory.getFormat(type, getLocale(), datafield);
@@ -590,7 +582,6 @@ public class BindyCsvFactory extends Bin
DataField dataField = dataFields.get(i);
Object modelField = model.get(field.getDeclaringClass().getName());
if (field.get(modelField) == null && !dataField.defaultValue().isEmpty()) {
- String pattern = dataField.pattern();
Format<?> format = FormatFactory.getFormat(field.getType(), getLocale(), dataField);
Object value = format.parse(dataField.defaultValue());
field.set(modelField, value);
Modified: camel/trunk/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/BindyFixedLengthFactory.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/BindyFixedLengthFactory.java?rev=1427825&r1=1427824&r2=1427825&view=diff
==============================================================================
--- camel/trunk/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/BindyFixedLengthFactory.java (original)
+++ camel/trunk/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/BindyFixedLengthFactory.java Wed Jan 2 15:33:34 2013
@@ -162,7 +162,6 @@ public class BindyFixedLengthFactory ext
int offset;
int length;
Field field;
- String pattern;
// Iterate through the list of positions
// defined in the @DataField
@@ -210,14 +209,9 @@ public class BindyFixedLengthFactory ext
if (LOG.isDebugEnabled()) {
LOG.debug("Pos/Offset: {}, Data: {}, Field type: {}", new Object[]{offset, token, field.getType()});
}
-
- Format<?> format;
-
- // Get pattern defined for the field
- pattern = dataField.pattern();
// Create format object to format the field
- format = FormatFactory.getFormat(field.getType(), getLocale(), dataField);
+ Format<?> format = FormatFactory.getFormat(field.getType(), getLocale(), dataField);
// field object to be set
Object modelField = model.get(field.getDeclaringClass().getName());
@@ -313,13 +307,8 @@ public class BindyFixedLengthFactory ext
if (obj != null) {
- // Retrieve the format, pattern and precision associated to
- // the type
+ // Retrieve the format, pattern and precision associated to the type
Class<?> type = field.getType();
- String pattern = datafield.pattern();
- int precision = datafield.precision();
-
-
// Create format
Format<?> format = FormatFactory.getFormat(type, getLocale(), datafield);
@@ -327,7 +316,6 @@ public class BindyFixedLengthFactory ext
// Get field value
Object value = field.get(obj);
-
result = formatString(format, value);
// trim if enabled
Modified: camel/trunk/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/BindyKeyValuePairFactory.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/BindyKeyValuePairFactory.java?rev=1427825&r1=1427824&r2=1427825&view=diff
==============================================================================
--- camel/trunk/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/BindyKeyValuePairFactory.java (original)
+++ camel/trunk/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/BindyKeyValuePairFactory.java Wed Jan 2 15:33:34 2013
@@ -283,9 +283,6 @@ public class BindyKeyValuePairFactory ex
if (value != null) {
- // Get pattern defined for the field
- String pattern = keyValuePairField.pattern();
-
// Create format object to format the field
Format<?> format = FormatFactory.getFormat(field.getType(), getLocale(), keyValuePairField);
@@ -322,9 +319,6 @@ public class BindyKeyValuePairFactory ex
value = values.get(i);
- // Get pattern defined for the field
- String pattern = keyValuePairField.pattern();
-
// Create format object to format the field
Format<?> format = FormatFactory.getFormat(field.getType(), getLocale(), keyValuePairField);
@@ -451,8 +445,6 @@ public class BindyKeyValuePairFactory ex
// Retrieve the format, pattern and precision associated to the type
Class<?> type = field.getType();
- String pattern = keyValuePairField.pattern();
- int precision = keyValuePairField.precision();
// Create format
@SuppressWarnings("unchecked")
Modified: camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fix/BindyComplexKeyValuePairStandaloneTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fix/BindyComplexKeyValuePairStandaloneTest.java?rev=1427825&r1=1427824&r2=1427825&view=diff
==============================================================================
--- camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fix/BindyComplexKeyValuePairStandaloneTest.java (original)
+++ camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fix/BindyComplexKeyValuePairStandaloneTest.java Wed Jan 2 15:33:34 2013
@@ -23,7 +23,6 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
-import junit.framework.Assert;
import org.apache.camel.dataformat.bindy.BindyKeyValuePairFactory;
import org.apache.camel.dataformat.bindy.model.fix.complex.onetomany.Header;
import org.apache.camel.dataformat.bindy.model.fix.complex.onetomany.Order;
@@ -31,6 +30,7 @@ import org.apache.camel.dataformat.bindy
import org.apache.camel.impl.DefaultPackageScanClassResolver;
import org.apache.camel.spi.PackageScanClassResolver;
import org.junit.Before;
+import org.junit.Assert;
import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Modified: camel/trunk/components/camel-groovy/src/main/java/org/apache/camel/language/groovy/CamelGroovyMethods.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-groovy/src/main/java/org/apache/camel/language/groovy/CamelGroovyMethods.java?rev=1427825&r1=1427824&r2=1427825&view=diff
==============================================================================
--- camel/trunk/components/camel-groovy/src/main/java/org/apache/camel/language/groovy/CamelGroovyMethods.java (original)
+++ camel/trunk/components/camel-groovy/src/main/java/org/apache/camel/language/groovy/CamelGroovyMethods.java Wed Jan 2 15:33:34 2013
@@ -28,6 +28,7 @@ import org.apache.camel.support.Expressi
* @deprecated see {@link org.apache.camel.groovy.extend.CamelGroovyMethods} which is
* used automatically
*/
+@Deprecated
public final class CamelGroovyMethods {
private CamelGroovyMethods() {
// Utility Class
Modified: camel/trunk/components/camel-groovy/src/main/java/org/apache/camel/language/groovy/GroovyRouteBuilder.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-groovy/src/main/java/org/apache/camel/language/groovy/GroovyRouteBuilder.java?rev=1427825&r1=1427824&r2=1427825&view=diff
==============================================================================
--- camel/trunk/components/camel-groovy/src/main/java/org/apache/camel/language/groovy/GroovyRouteBuilder.java (original)
+++ camel/trunk/components/camel-groovy/src/main/java/org/apache/camel/language/groovy/GroovyRouteBuilder.java Wed Jan 2 15:33:34 2013
@@ -23,6 +23,7 @@ import org.apache.camel.builder.RouteBui
* @deprecated the standard {@link RouteBuilder} can be used to write
* Groovy routes.
*/
+@Deprecated
public abstract class GroovyRouteBuilder extends RouteBuilder {
public GroovyRouteBuilder() {
super();
Modified: camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/HttpConsumer.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/HttpConsumer.java?rev=1427825&r1=1427824&r2=1427825&view=diff
==============================================================================
--- camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/HttpConsumer.java (original)
+++ camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/HttpConsumer.java Wed Jan 2 15:33:34 2013
@@ -24,7 +24,6 @@ import org.apache.camel.impl.DefaultCons
* @version
*/
public class HttpConsumer extends DefaultConsumer implements SuspendableService {
- private final HttpEndpoint endpoint;
private volatile boolean suspended;
private boolean traceEnabled;
@@ -33,7 +32,6 @@ public class HttpConsumer extends Defaul
if (endpoint.isTraceEnabled()) {
setTraceEnabled(true);
}
- this.endpoint = endpoint;
}
@Override
@@ -42,24 +40,24 @@ public class HttpConsumer extends Defaul
}
public HttpBinding getBinding() {
- return endpoint.getBinding();
+ return getEndpoint().getBinding();
}
public String getPath() {
- return endpoint.getPath();
+ return getEndpoint().getPath();
}
@Override
protected void doStart() throws Exception {
- suspended = false;
super.doStart();
- endpoint.connect(this);
+ getEndpoint().connect(this);
+ suspended = false;
}
@Override
protected void doStop() throws Exception {
suspended = false;
- endpoint.disconnect(this);
+ getEndpoint().disconnect(this);
super.doStop();
}
@@ -75,7 +73,7 @@ public class HttpConsumer extends Defaul
return suspended;
}
- public boolean isTraceEnabled() {
+ public boolean isTraceEnabled() {
return this.traceEnabled;
}
Modified: camel/trunk/components/camel-http4/src/main/java/org/apache/camel/component/http4/HttpConsumer.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-http4/src/main/java/org/apache/camel/component/http4/HttpConsumer.java?rev=1427825&r1=1427824&r2=1427825&view=diff
==============================================================================
--- camel/trunk/components/camel-http4/src/main/java/org/apache/camel/component/http4/HttpConsumer.java (original)
+++ camel/trunk/components/camel-http4/src/main/java/org/apache/camel/component/http4/HttpConsumer.java Wed Jan 2 15:33:34 2013
@@ -25,15 +25,13 @@ import org.apache.camel.impl.DefaultCons
@Deprecated
public class HttpConsumer extends DefaultConsumer {
- private final HttpEndpoint endpoint;
- private boolean traceEnabled;
+ private boolean traceEnabled;
public HttpConsumer(HttpEndpoint endpoint, Processor processor) {
super(endpoint, processor);
if (endpoint.isTraceEnabled()) {
setTraceEnabled(true);
- }
- this.endpoint = endpoint;
+ }
}
@Override
@@ -42,30 +40,30 @@ public class HttpConsumer extends Defaul
}
public HttpBinding getBinding() {
- return endpoint.getBinding();
+ return getEndpoint().getBinding();
}
public String getPath() {
- return endpoint.getPath();
+ return getEndpoint().getPath();
}
@Override
protected void doStart() throws Exception {
super.doStart();
- endpoint.connect(this);
+ getEndpoint().connect(this);
}
@Override
protected void doStop() throws Exception {
- endpoint.disconnect(this);
+ getEndpoint().disconnect(this);
super.doStop();
}
- public boolean isTraceEnabled() {
- return this.traceEnabled;
+ public boolean isTraceEnabled() {
+ return traceEnabled;
}
public void setTraceEnabled(boolean traceEnabled) {
this.traceEnabled = traceEnabled;
- }
+ }
}
Modified: camel/trunk/components/camel-http4/src/main/java/org/apache/camel/component/http4/HttpEndpoint.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-http4/src/main/java/org/apache/camel/component/http4/HttpEndpoint.java?rev=1427825&r1=1427824&r2=1427825&view=diff
==============================================================================
--- camel/trunk/components/camel-http4/src/main/java/org/apache/camel/component/http4/HttpEndpoint.java (original)
+++ camel/trunk/components/camel-http4/src/main/java/org/apache/camel/component/http4/HttpEndpoint.java Wed Jan 2 15:33:34 2013
@@ -19,9 +19,7 @@ package org.apache.camel.component.http4
import java.net.URI;
import java.net.URISyntaxException;
-import org.apache.camel.Consumer;
import org.apache.camel.PollingConsumer;
-import org.apache.camel.Processor;
import org.apache.camel.Producer;
import org.apache.camel.RuntimeCamelException;
import org.apache.camel.component.http4.helper.HttpHelper;
Modified: camel/trunk/components/camel-jmx/src/test/java/org/apache/camel/component/jmx/JMXMonitorTypeLongCounterTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jmx/src/test/java/org/apache/camel/component/jmx/JMXMonitorTypeLongCounterTest.java?rev=1427825&r1=1427824&r2=1427825&view=diff
==============================================================================
--- camel/trunk/components/camel-jmx/src/test/java/org/apache/camel/component/jmx/JMXMonitorTypeLongCounterTest.java (original)
+++ camel/trunk/components/camel-jmx/src/test/java/org/apache/camel/component/jmx/JMXMonitorTypeLongCounterTest.java Wed Jan 2 15:33:34 2013
@@ -19,7 +19,6 @@ package org.apache.camel.component.jmx;
import java.io.File;
import org.apache.camel.component.jmx.beans.ISimpleMXBean;
-import org.junit.Ignore;
import org.junit.Test;
Modified: camel/trunk/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailConstants.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailConstants.java?rev=1427825&r1=1427824&r2=1427825&view=diff
==============================================================================
--- camel/trunk/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailConstants.java (original)
+++ camel/trunk/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailConstants.java Wed Jan 2 15:33:34 2013
@@ -23,7 +23,6 @@ public final class MailConstants {
public static final String MAIL_DEFAULT_FOLDER = "INBOX";
public static final String MAIL_DEFAULT_FROM = "camel@localhost";
public static final String MAIL_MESSAGE_ID = "CamelMailMessageId";
-
public static final long MAIL_DEFAULT_CONNECTION_TIMEOUT = 30000L;
private MailConstants() {
Modified: camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailProducerConcurrentTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailProducerConcurrentTest.java?rev=1427825&r1=1427824&r2=1427825&view=diff
==============================================================================
--- camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailProducerConcurrentTest.java (original)
+++ camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailProducerConcurrentTest.java Wed Jan 2 15:33:34 2013
@@ -54,7 +54,6 @@ public class MailProducerConcurrentTest
getMockEndpoint("mock:result").expectedMessageCount(files);
getMockEndpoint("mock:result").expectsNoDuplicates(body());
-
final CountDownLatch latch = new CountDownLatch(files);
ExecutorService executor = Executors.newFixedThreadPool(poolSize);
@@ -98,5 +97,4 @@ public class MailProducerConcurrentTest
};
}
-
}
Modified: camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailProducerTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailProducerTest.java?rev=1427825&r1=1427824&r2=1427825&view=diff
==============================================================================
--- camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailProducerTest.java (original)
+++ camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailProducerTest.java Wed Jan 2 15:33:34 2013
@@ -23,12 +23,12 @@ import org.junit.Test;
import org.jvnet.mock_javamail.Mailbox;
public class MailProducerTest extends CamelTestSupport {
-
+
@Test
public void testProduer() throws Exception {
Mailbox.clearAll();
getMockEndpoint("mock:result").expectedMessageCount(1);
-
+
template.sendBodyAndHeader("direct:start", "Message ", "To", "someone@localhost");
assertMockEndpointsSatisfied();
// need to check the message header
@@ -38,7 +38,7 @@ public class MailProducerTest extends Ca
Mailbox box = Mailbox.get("someone@localhost");
assertEquals(1, box.size());
}
-
+
@Override
protected RouteBuilder createRouteBuilder() throws Exception {
return new RouteBuilder() {
@@ -49,5 +49,4 @@ public class MailProducerTest extends Ca
};
}
-
}
Modified: camel/trunk/components/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/addressing/ConsumerWSAEndpointMappingRouteTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/addressing/ConsumerWSAEndpointMappingRouteTest.java?rev=1427825&r1=1427824&r2=1427825&view=diff
==============================================================================
--- camel/trunk/components/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/addressing/ConsumerWSAEndpointMappingRouteTest.java (original)
+++ camel/trunk/components/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/addressing/ConsumerWSAEndpointMappingRouteTest.java Wed Jan 2 15:33:34 2013
@@ -39,9 +39,6 @@ public class ConsumerWSAEndpointMappingR
private final String xmlBody = "<GetQuote xmlns=\"http://www.stockquotes.edu/\"><symbol>GOOG</symbol></GetQuote>";
- @EndpointInject(uri = "mock:testDefault")
- private MockEndpoint resultEndpointActionDefault;
-
@EndpointInject(uri = "mock:testAction")
private MockEndpoint resultEndpointAction;
@@ -69,9 +66,6 @@ public class ConsumerWSAEndpointMappingR
@EndpointInject(uri = "mock:testSoapAction")
private MockEndpoint resultSoapAction;
- @EndpointInject(uri = "mock:testReplyTo")
- private MockEndpoint resultReplyTo;
-
private WebServiceTemplate webServiceTemplate;
@Before
Modified: camel/trunk/components/camel-stringtemplate/src/main/java/org/apache/camel/component/stringtemplate/StringTemplateEndpoint.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-stringtemplate/src/main/java/org/apache/camel/component/stringtemplate/StringTemplateEndpoint.java?rev=1427825&r1=1427824&r2=1427825&view=diff
==============================================================================
--- camel/trunk/components/camel-stringtemplate/src/main/java/org/apache/camel/component/stringtemplate/StringTemplateEndpoint.java (original)
+++ camel/trunk/components/camel-stringtemplate/src/main/java/org/apache/camel/component/stringtemplate/StringTemplateEndpoint.java Wed Jan 2 15:33:34 2013
@@ -25,7 +25,6 @@ import org.apache.camel.ExchangePattern;
import org.apache.camel.Message;
import org.apache.camel.component.ResourceEndpoint;
import org.apache.camel.util.ExchangeHelper;
-import org.stringtemplate.v4.AutoIndentWriter;
import org.stringtemplate.v4.NoIndentWriter;
import org.stringtemplate.v4.ST;
Modified: camel/trunk/components/camel-stringtemplate/src/test/java/org/apache/camel/component/stringtemplate/StringTemplateContentCacheTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-stringtemplate/src/test/java/org/apache/camel/component/stringtemplate/StringTemplateContentCacheTest.java?rev=1427825&r1=1427824&r2=1427825&view=diff
==============================================================================
--- camel/trunk/components/camel-stringtemplate/src/test/java/org/apache/camel/component/stringtemplate/StringTemplateContentCacheTest.java (original)
+++ camel/trunk/components/camel-stringtemplate/src/test/java/org/apache/camel/component/stringtemplate/StringTemplateContentCacheTest.java Wed Jan 2 15:33:34 2013
@@ -39,7 +39,7 @@ public class StringTemplateContentCacheT
super.setUp();
// create a tm file in the classpath as this is the tricky reloading stuff
- template.sendBodyAndHeader("file://target/test-classes/org/apache/camel/component/stringtemplate?fileExist=Override", "Hello <headers.name>", Exchange.FILE_NAME, "hello.tm");
+ template.sendBodyAndHeader("file://target/test-classes/org/apache/camel/component/stringtemplate", "Hello <headers.name>", Exchange.FILE_NAME, "hello.tm");
}
@Override
@@ -56,7 +56,7 @@ public class StringTemplateContentCacheT
mock.assertIsSatisfied();
// now change content in the file in the classpath and try again
- template.sendBodyAndHeader("file://target/test-classes/org/apache/camel/component/stringtemplate?fileExist=Override", "Bye <headers.name>", Exchange.FILE_NAME, "hello.tm");
+ template.sendBodyAndHeader("file://target/test-classes/org/apache/camel/component/stringtemplate", "Bye <headers.name>", Exchange.FILE_NAME, "hello.tm");
mock.reset();
mock.expectedBodiesReceived("Bye Paris");
@@ -74,7 +74,7 @@ public class StringTemplateContentCacheT
mock.assertIsSatisfied();
// now change content in the file in the classpath and try again
- template.sendBodyAndHeader("file://target/test-classes/org/apache/camel/component/stringtemplate?fileExist=Override", "Bye <headers.name>", Exchange.FILE_NAME, "hello.tm");
+ template.sendBodyAndHeader("file://target/test-classes/org/apache/camel/component/stringtemplate", "Bye <headers.name>", Exchange.FILE_NAME, "hello.tm");
mock.reset();
// we must expected the original filecontent as the cache is enabled, so its Hello and not Bye
@@ -93,7 +93,7 @@ public class StringTemplateContentCacheT
mock.assertIsSatisfied();
// now change content in the file in the classpath and try again
- template.sendBodyAndHeader("file://target/test-classes/org/apache/camel/component/stringtemplate?fileExist=Override", "Bye <headers.name>", Exchange.FILE_NAME, "hello.tm");
+ template.sendBodyAndHeader("file://target/test-classes/org/apache/camel/component/stringtemplate", "Bye <headers.name>", Exchange.FILE_NAME, "hello.tm");
mock.reset();
// we must expected the original filecontent as the cache is enabled, so its Hello and not Bye
@@ -111,14 +111,14 @@ public class StringTemplateContentCacheT
mock.reset();
// we expect that the new resource will be set as the cached value, since the cache has been cleared
mock.expectedBodiesReceived("Bye Paris");
- template.sendBodyAndHeader("file://target/test-classes/org/apache/camel/component/stringtemplate?fileExist=Override", "Bye <headers.name>", Exchange.FILE_NAME, "hello.tm");
+ template.sendBodyAndHeader("file://target/test-classes/org/apache/camel/component/stringtemplate", "Bye <headers.name>", Exchange.FILE_NAME, "hello.tm");
template.sendBodyAndHeader("direct:b", "Body", "name", "Paris");
mock.assertIsSatisfied();
mock.reset();
// we expect that the cached value will not be replaced by a different resource since the cache is now re-established
mock.expectedBodiesReceived("Bye Paris");
- template.sendBodyAndHeader("file://target/test-classes/org/apache/camel/component/stringtemplate?fileExist=Override", "Hello <headers.name>", Exchange.FILE_NAME, "hello.tm");
+ template.sendBodyAndHeader("file://target/test-classes/org/apache/camel/component/stringtemplate", "Hello <headers.name>", Exchange.FILE_NAME, "hello.tm");
template.sendBodyAndHeader("direct:b", "Body", "name", "Paris");
mock.assertIsSatisfied();
}
Modified: camel/trunk/components/camel-websocket/src/main/java/org/apache/camel/component/websocket/WebsocketComponent.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-websocket/src/main/java/org/apache/camel/component/websocket/WebsocketComponent.java?rev=1427825&r1=1427824&r2=1427825&view=diff
==============================================================================
--- camel/trunk/components/camel-websocket/src/main/java/org/apache/camel/component/websocket/WebsocketComponent.java (original)
+++ camel/trunk/components/camel-websocket/src/main/java/org/apache/camel/component/websocket/WebsocketComponent.java Wed Jan 2 15:33:34 2013
@@ -422,7 +422,7 @@ public class WebsocketComponent extends
if (servlet.getConsumer() == null) {
servlet.setConsumer(consumer);
}
- // registry the consumer here
+ // register the consumer here
servlet.connect(consumer);
return servlet;
} else {
Modified: camel/trunk/components/camel-websocket/src/main/java/org/apache/camel/component/websocket/WebsocketEndpoint.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-websocket/src/main/java/org/apache/camel/component/websocket/WebsocketEndpoint.java?rev=1427825&r1=1427824&r2=1427825&view=diff
==============================================================================
--- camel/trunk/components/camel-websocket/src/main/java/org/apache/camel/component/websocket/WebsocketEndpoint.java (original)
+++ camel/trunk/components/camel-websocket/src/main/java/org/apache/camel/component/websocket/WebsocketEndpoint.java Wed Jan 2 15:33:34 2013
@@ -89,7 +89,6 @@ public class WebsocketEndpoint extends D
public void connect(WebsocketConsumer consumer) throws Exception {
component.connect(consumer);
component.addServlet(sync, consumer, remaining);
-
}
public void disconnect(WebsocketConsumer consumer) throws Exception {
Modified: camel/trunk/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketConsumerRouteTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketConsumerRouteTest.java?rev=1427825&r1=1427824&r2=1427825&view=diff
==============================================================================
--- camel/trunk/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketConsumerRouteTest.java (original)
+++ camel/trunk/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketConsumerRouteTest.java Wed Jan 2 15:33:34 2013
@@ -21,11 +21,6 @@ import com.ning.http.client.websocket.We
import com.ning.http.client.websocket.WebSocketTextListener;
import com.ning.http.client.websocket.WebSocketUpgradeHandler;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.concurrent.CountDownLatch;
-import java.util.concurrent.TimeUnit;
-
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.test.junit4.CamelTestSupport;
Modified: camel/trunk/tests/camel-blueprint-cxf-test/src/test/java/org/apache/camel/test/cxf/blueprint/CxfEndpointBeansTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-blueprint-cxf-test/src/test/java/org/apache/camel/test/cxf/blueprint/CxfEndpointBeansTest.java?rev=1427825&r1=1427824&r2=1427825&view=diff
==============================================================================
--- camel/trunk/tests/camel-blueprint-cxf-test/src/test/java/org/apache/camel/test/cxf/blueprint/CxfEndpointBeansTest.java (original)
+++ camel/trunk/tests/camel-blueprint-cxf-test/src/test/java/org/apache/camel/test/cxf/blueprint/CxfEndpointBeansTest.java Wed Jan 2 15:33:34 2013
@@ -22,7 +22,6 @@ import java.util.Properties;
import javax.xml.namespace.QName;
-import org.apache.camel.CamelContext;
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
import org.apache.camel.ProducerTemplate;
Modified: camel/trunk/tests/camel-performance/src/test/java/org/apache/camel/test/perf/AbstractBasePerformanceTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-performance/src/test/java/org/apache/camel/test/perf/AbstractBasePerformanceTest.java?rev=1427825&r1=1427824&r2=1427825&view=diff
==============================================================================
--- camel/trunk/tests/camel-performance/src/test/java/org/apache/camel/test/perf/AbstractBasePerformanceTest.java (original)
+++ camel/trunk/tests/camel-performance/src/test/java/org/apache/camel/test/perf/AbstractBasePerformanceTest.java Wed Jan 2 15:33:34 2013
@@ -58,9 +58,4 @@ public abstract class AbstractBasePerfor
public boolean isCreateCamelContextPerClass() {
return true;
}
-
- @Override
- protected boolean useJmx() {
- return false;
- }
}
\ No newline at end of file
Modified: camel/trunk/tests/camel-performance/src/test/java/org/apache/camel/test/perf/ContentBasedRoutingPerformanceTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-performance/src/test/java/org/apache/camel/test/perf/ContentBasedRoutingPerformanceTest.java?rev=1427825&r1=1427824&r2=1427825&view=diff
==============================================================================
--- camel/trunk/tests/camel-performance/src/test/java/org/apache/camel/test/perf/ContentBasedRoutingPerformanceTest.java (original)
+++ camel/trunk/tests/camel-performance/src/test/java/org/apache/camel/test/perf/ContentBasedRoutingPerformanceTest.java Wed Jan 2 15:33:34 2013
@@ -17,6 +17,7 @@
package org.apache.camel.test.perf;
import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.util.StopWatch;
import org.junit.Test;
public class ContentBasedRoutingPerformanceTest extends AbstractBasePerformanceTest {
@@ -32,12 +33,11 @@ public class ContentBasedRoutingPerforma
resetMock(count);
- long start = System.currentTimeMillis();
+ StopWatch watch = new StopWatch();
execute(count);
- long end = System.currentTimeMillis();
-
+
assertMockEndpointsSatisfied();
- log.warn("Run " + count + " tests in " + (end - start) + "ms");
+ log.warn("Ran {} tests in {}ms", count, watch.taken());
}
@Test
@@ -49,12 +49,11 @@ public class ContentBasedRoutingPerforma
resetMock(count);
- long start = System.currentTimeMillis();
+ StopWatch watch = new StopWatch();
execute(count);
- long end = System.currentTimeMillis();
-
+
assertMockEndpointsSatisfied();
- log.warn("Run " + count + " tests in " + (end - start) + "ms");
+ log.warn("Ran {} tests in {}ms", count, watch.taken());
}
@Test
@@ -66,12 +65,11 @@ public class ContentBasedRoutingPerforma
resetMock(count);
- long start = System.currentTimeMillis();
+ StopWatch watch = new StopWatch();
execute(count);
- long end = System.currentTimeMillis();
assertMockEndpointsSatisfied();
- log.warn("Run " + count + " tests in " + (end - start) + "ms");
+ log.warn("Ran {} tests in {}ms", count, watch.taken());
}
@Test
@@ -83,12 +81,11 @@ public class ContentBasedRoutingPerforma
resetMock(count);
- long start = System.currentTimeMillis();
+ StopWatch watch = new StopWatch();
execute(count);
- long end = System.currentTimeMillis();
assertMockEndpointsSatisfied();
- log.warn("Run " + count + " tests in " + (end - start) + "ms");
+ log.warn("Ran {} tests in {}ms", count, watch.taken());
}
@Override
Modified: camel/trunk/tests/camel-performance/src/test/java/org/apache/camel/test/perf/HeaderBasedRoutingPerformanceTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-performance/src/test/java/org/apache/camel/test/perf/HeaderBasedRoutingPerformanceTest.java?rev=1427825&r1=1427824&r2=1427825&view=diff
==============================================================================
--- camel/trunk/tests/camel-performance/src/test/java/org/apache/camel/test/perf/HeaderBasedRoutingPerformanceTest.java (original)
+++ camel/trunk/tests/camel-performance/src/test/java/org/apache/camel/test/perf/HeaderBasedRoutingPerformanceTest.java Wed Jan 2 15:33:34 2013
@@ -17,6 +17,7 @@
package org.apache.camel.test.perf;
import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.util.StopWatch;
import org.junit.Test;
public class HeaderBasedRoutingPerformanceTest extends AbstractBasePerformanceTest {
@@ -32,12 +33,11 @@ public class HeaderBasedRoutingPerforman
resetMock(count);
- long start = System.currentTimeMillis();
+ StopWatch watch = new StopWatch();
execute(count);
- long end = System.currentTimeMillis();
-
+
assertMockEndpointsSatisfied();
- log.warn("Run " + count + " tests in " + (end - start) + "ms");
+ log.warn("Ran {} tests in {}ms", count, watch.taken());
}
@Test
@@ -48,13 +48,12 @@ public class HeaderBasedRoutingPerforman
execute(20000);
resetMock(count);
-
- long start = System.currentTimeMillis();
+
+ StopWatch watch = new StopWatch();
execute(count);
- long end = System.currentTimeMillis();
-
+
assertMockEndpointsSatisfied();
- log.warn("Run " + count + " tests in " + (end - start) + "ms");
+ log.warn("Ran {} tests in {}ms", count, watch.taken());
}
@Test
Modified: camel/trunk/tests/camel-performance/src/test/java/org/apache/camel/test/perf/SplitterPerformanceTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-performance/src/test/java/org/apache/camel/test/perf/SplitterPerformanceTest.java?rev=1427825&r1=1427824&r2=1427825&view=diff
==============================================================================
--- camel/trunk/tests/camel-performance/src/test/java/org/apache/camel/test/perf/SplitterPerformanceTest.java (original)
+++ camel/trunk/tests/camel-performance/src/test/java/org/apache/camel/test/perf/SplitterPerformanceTest.java Wed Jan 2 15:33:34 2013
@@ -17,6 +17,7 @@
package org.apache.camel.test.perf;
import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.util.StopWatch;
import org.junit.Test;
public class SplitterPerformanceTest extends AbstractBasePerformanceTest {
@@ -60,17 +61,16 @@ public class SplitterPerformanceTest ext
public void testTokenize() throws InterruptedException {
template.setDefaultEndpointUri("direct:tokenize");
- // warm up with 30.000 messages so that the JIT compiler kicks in
+ // warm up with 1 message so that the JIT compiler kicks in
execute(1);
resetMock(count);
- long start = System.currentTimeMillis();
+ StopWatch watch = new StopWatch();
execute(1);
- long end = System.currentTimeMillis();
-
+
assertMockEndpointsSatisfied();
- log.warn("Run " + count + " tests in " + (end - start) + "ms");
+ log.warn("Ran {} tests in {}ms", count, watch.taken());
}
@Override
Modified: camel/trunk/tests/camel-performance/src/test/java/org/apache/camel/test/perf/XPathBasedRoutingPerformanceTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-performance/src/test/java/org/apache/camel/test/perf/XPathBasedRoutingPerformanceTest.java?rev=1427825&r1=1427824&r2=1427825&view=diff
==============================================================================
--- camel/trunk/tests/camel-performance/src/test/java/org/apache/camel/test/perf/XPathBasedRoutingPerformanceTest.java (original)
+++ camel/trunk/tests/camel-performance/src/test/java/org/apache/camel/test/perf/XPathBasedRoutingPerformanceTest.java Wed Jan 2 15:33:34 2013
@@ -20,6 +20,7 @@ import java.util.HashMap;
import java.util.Map;
import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.util.StopWatch;
import org.junit.Test;
public class XPathBasedRoutingPerformanceTest extends AbstractBasePerformanceTest {
@@ -35,12 +36,11 @@ public class XPathBasedRoutingPerformanc
resetMock(count);
- long start = System.currentTimeMillis();
+ StopWatch watch = new StopWatch();
execute(count);
- long end = System.currentTimeMillis();
-
+
assertMockEndpointsSatisfied();
- log.warn("Run " + count + " tests in " + (end - start) + "ms");
+ log.warn("Ran {} tests in {}ms", count, watch.taken());
}
@Test
@@ -52,12 +52,11 @@ public class XPathBasedRoutingPerformanc
resetMock(count);
- long start = System.currentTimeMillis();
+ StopWatch watch = new StopWatch();
execute(count);
- long end = System.currentTimeMillis();
assertMockEndpointsSatisfied();
- log.warn("Run " + count + " tests in " + (end - start) + "ms");
+ log.warn("Ran {} tests in {} ms", count, watch.taken());
}
@Override
Modified: camel/trunk/tests/camel-performance/src/test/java/org/apache/camel/test/perf/XQueryBasedRoutingPerformanceTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-performance/src/test/java/org/apache/camel/test/perf/XQueryBasedRoutingPerformanceTest.java?rev=1427825&r1=1427824&r2=1427825&view=diff
==============================================================================
--- camel/trunk/tests/camel-performance/src/test/java/org/apache/camel/test/perf/XQueryBasedRoutingPerformanceTest.java (original)
+++ camel/trunk/tests/camel-performance/src/test/java/org/apache/camel/test/perf/XQueryBasedRoutingPerformanceTest.java Wed Jan 2 15:33:34 2013
@@ -20,6 +20,7 @@ import java.util.HashMap;
import java.util.Map;
import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.util.StopWatch;
import org.junit.Test;
public class XQueryBasedRoutingPerformanceTest extends AbstractBasePerformanceTest {
@@ -35,12 +36,11 @@ public class XQueryBasedRoutingPerforman
resetMock(count);
- long start = System.currentTimeMillis();
+ StopWatch watch = new StopWatch();
execute(count);
- long end = System.currentTimeMillis();
-
+
assertMockEndpointsSatisfied();
- log.warn("Run " + count + " tests in " + (end - start) + "ms");
+ log.warn("Ran {} tests in {}ms", count, watch.taken());
}
@Test
@@ -52,12 +52,11 @@ public class XQueryBasedRoutingPerforman
resetMock(count);
- long start = System.currentTimeMillis();
+ StopWatch watch = new StopWatch();
execute(count);
- long end = System.currentTimeMillis();
assertMockEndpointsSatisfied();
- log.warn("Run " + count + " tests in " + (end - start) + "ms");
+ log.warn("Ran {} tests in {}ms", count, watch.taken());
}
@Override
Modified: camel/trunk/tests/camel-performance/src/test/java/org/apache/camel/test/perf/XsltPerformanceTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-performance/src/test/java/org/apache/camel/test/perf/XsltPerformanceTest.java?rev=1427825&r1=1427824&r2=1427825&view=diff
==============================================================================
--- camel/trunk/tests/camel-performance/src/test/java/org/apache/camel/test/perf/XsltPerformanceTest.java (original)
+++ camel/trunk/tests/camel-performance/src/test/java/org/apache/camel/test/perf/XsltPerformanceTest.java Wed Jan 2 15:33:34 2013
@@ -17,6 +17,7 @@
package org.apache.camel.test.perf;
import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.util.StopWatch;
import org.junit.Test;
public class XsltPerformanceTest extends AbstractBasePerformanceTest {
@@ -32,12 +33,11 @@ public class XsltPerformanceTest extends
resetMock(count);
- long start = System.currentTimeMillis();
+ StopWatch watch = new StopWatch();
execute(count);
- long end = System.currentTimeMillis();
-
+
assertMockEndpointsSatisfied();
- log.warn("Run " + count + " tests in " + (end - start) + "ms");
+ log.warn("Ran {} tests in {}ms", count, watch.taken());
}
@Override