Author: bvahdat
Date: Sat Apr 14 10:29:14 2012
New Revision: 1326084
URL: http://svn.apache.org/viewvc?rev=1326084&view=rev
Log:
Polished.
Modified:
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/ChoiceWhenBeanExpressionTest.java
camel/trunk/components/camel-fop/src/main/java/org/apache/camel/component/fop/FopProducer.java
camel/trunk/components/camel-hawtdb/src/test/java/org/apache/camel/component/hawtdb/HawtDBBigPayloadTest.java
camel/trunk/components/camel-jaxb/src/test/java/org/apache/camel/example/DataFormatConcurrentTest.java
camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/tx/JMXTXUseOriginalBodyTest.java
camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/tx/JMXTXUseOriginalBodyWithDLCErrorHandlerTest.java
camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/tx/JMXTXUseOriginalBodyWithTXErrorHandlerTest.java
camel/trunk/components/camel-leveldb/src/test/java/org/apache/camel/component/leveldb/LevelDBAggregateNotLostRemovedWhenConfirmedTest.java
camel/trunk/components/camel-leveldb/src/test/java/org/apache/camel/component/leveldb/LevelDBBigPayloadTest.java
camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailAttachmentRedeliveryTest.java
camel/trunk/components/camel-mina2/src/main/java/org/apache/camel/component/mina2/Mina2Consumer.java
camel/trunk/components/camel-quickfix/src/test/java/org/apache/camel/component/quickfixj/examples/DynamicRoutingExample.java
camel/trunk/components/camel-quickfix/src/test/java/org/apache/camel/component/quickfixj/examples/RequestReplyExample.java
camel/trunk/components/camel-shiro/src/test/java/org/apache/camel/component/shiro/security/ShiroAuthenticationTest.java
camel/trunk/components/camel-sip/src/main/java/org/apache/camel/component/sip/listener/SipMessageCodes.java
camel/trunk/components/camel-syslog/src/main/java/org/apache/camel/component/syslog/Rfc3164SyslogConverter.java
camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/jms/DynamicRouteTest.java
Modified:
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/ChoiceWhenBeanExpressionTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/ChoiceWhenBeanExpressionTest.java?rev=1326084&r1=1326083&r2=1326084&view=diff
==============================================================================
---
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/ChoiceWhenBeanExpressionTest.java
(original)
+++
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/ChoiceWhenBeanExpressionTest.java
Sat Apr 14 10:29:14 2012
@@ -66,7 +66,7 @@ public class ChoiceWhenBeanExpressionTes
public void configure() {
from("direct:expression")
.choice()
- .when().expression(bean(MyBean.class,
"isGradeA")).to("mock:gradeA")
+ .when().expression(method(MyBean.class,
"isGradeA")).to("mock:gradeA")
.otherwise().to("mock:otherGrade")
.end();
Modified:
camel/trunk/components/camel-fop/src/main/java/org/apache/camel/component/fop/FopProducer.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-fop/src/main/java/org/apache/camel/component/fop/FopProducer.java?rev=1326084&r1=1326083&r2=1326084&view=diff
==============================================================================
---
camel/trunk/components/camel-fop/src/main/java/org/apache/camel/component/fop/FopProducer.java
(original)
+++
camel/trunk/components/camel-fop/src/main/java/org/apache/camel/component/fop/FopProducer.java
Sat Apr 14 10:29:14 2012
@@ -85,6 +85,7 @@ public class FopProducer extends Default
return out;
}
+ @SuppressWarnings("unchecked")
private void setEncryptionParameters(FOUserAgent userAgent, Map<String,
Object> headers)
throws Exception {
Map<String, Object> encryptionParameters = IntrospectionSupport
Modified:
camel/trunk/components/camel-hawtdb/src/test/java/org/apache/camel/component/hawtdb/HawtDBBigPayloadTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-hawtdb/src/test/java/org/apache/camel/component/hawtdb/HawtDBBigPayloadTest.java?rev=1326084&r1=1326083&r2=1326084&view=diff
==============================================================================
---
camel/trunk/components/camel-hawtdb/src/test/java/org/apache/camel/component/hawtdb/HawtDBBigPayloadTest.java
(original)
+++
camel/trunk/components/camel-hawtdb/src/test/java/org/apache/camel/component/hawtdb/HawtDBBigPayloadTest.java
Sat Apr 14 10:29:14 2012
@@ -66,7 +66,7 @@ public class HawtDBBigPayloadTest extend
public void configure() throws Exception {
from("timer:foo")
.bean(BigPayload.class)
- .aggregate(bean(HawtDBBigPayloadTest.class, "number"), new
UseLatestAggregationStrategy())
+ .aggregate(method(HawtDBBigPayloadTest.class, "number"),
new UseLatestAggregationStrategy())
.aggregationRepository(repo)
.completionSize(2).completionTimeout(5000)
.log("Aggregated key
${header.CamelAggregatedCorrelationKey}");
Modified:
camel/trunk/components/camel-jaxb/src/test/java/org/apache/camel/example/DataFormatConcurrentTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-jaxb/src/test/java/org/apache/camel/example/DataFormatConcurrentTest.java?rev=1326084&r1=1326083&r2=1326084&view=diff
==============================================================================
---
camel/trunk/components/camel-jaxb/src/test/java/org/apache/camel/example/DataFormatConcurrentTest.java
(original)
+++
camel/trunk/components/camel-jaxb/src/test/java/org/apache/camel/example/DataFormatConcurrentTest.java
Sat Apr 14 10:29:14 2012
@@ -21,7 +21,6 @@ import java.io.StringWriter;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
-import java.util.concurrent.TimeUnit;
import javax.xml.bind.JAXBContext;
import javax.xml.bind.Marshaller;
@@ -33,13 +32,18 @@ import org.apache.camel.component.mock.M
import org.apache.camel.converter.jaxb.JaxbDataFormat;
import org.apache.camel.spi.DataFormat;
import org.apache.camel.test.junit4.CamelTestSupport;
+
import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
/**
* @version
*/
public class DataFormatConcurrentTest extends CamelTestSupport {
+ private static final Logger LOG =
LoggerFactory.getLogger(DataFormatConcurrentTest.class);
private int size = 2000;
private int warmupCount = 100;
private int testCycleCount = 10000;
@@ -145,11 +149,7 @@ public class DataFormatConcurrentTest ex
for (int i = 0; i < size; i++) {
// sleep a little so we interleave with the marshaller
- try {
- Thread.sleep(1, 500);
- } catch (InterruptedException e) {
- // ignore
- }
+ Thread.sleep(1, 500);
executor.execute(new Runnable() {
public void run() {
@@ -187,7 +187,8 @@ public class DataFormatConcurrentTest ex
latch.await();
long end = System.currentTimeMillis();
- //System.out.println("sending " + payloads.length + " messages to " +
template.getDefaultEndpoint().getEndpointUri() + " took " + (end - start) +
"ms");
+
+ LOG.info("Sending {} messages to {} took {} ms", new Object[]
{payloads.length, template.getDefaultEndpoint().getEndpointUri(), end - start});
}
public void marshal(final CountDownLatch latch) throws Exception {
@@ -211,7 +212,8 @@ public class DataFormatConcurrentTest ex
latch.await();
long end = System.currentTimeMillis();
- //System.out.println("sending " + payloads.length + " messages to " +
template.getDefaultEndpoint().getEndpointUri() + " took " + (end - start) +
"ms");
+
+ LOG.info("Sending {} messages to {} took {} ms", new Object[]
{payloads.length, template.getDefaultEndpoint().getEndpointUri(), end - start});
}
/**
Modified:
camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/tx/JMXTXUseOriginalBodyTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/tx/JMXTXUseOriginalBodyTest.java?rev=1326084&r1=1326083&r2=1326084&view=diff
==============================================================================
---
camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/tx/JMXTXUseOriginalBodyTest.java
(original)
+++
camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/tx/JMXTXUseOriginalBodyTest.java
Sat Apr 14 10:29:14 2012
@@ -101,7 +101,7 @@ public class JMXTXUseOriginalBodyTest ex
from("activemq:broken")
.transacted()
.to("mock:checkpoint1")
- .setBody(bean("foo"))
+ .setBody(method("foo"))
.to("mock:checkpoint2")
.throwException(new Exception("boo"))
.to("mock:end");
Modified:
camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/tx/JMXTXUseOriginalBodyWithDLCErrorHandlerTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/tx/JMXTXUseOriginalBodyWithDLCErrorHandlerTest.java?rev=1326084&r1=1326083&r2=1326084&view=diff
==============================================================================
---
camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/tx/JMXTXUseOriginalBodyWithDLCErrorHandlerTest.java
(original)
+++
camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/tx/JMXTXUseOriginalBodyWithDLCErrorHandlerTest.java
Sat Apr 14 10:29:14 2012
@@ -124,7 +124,7 @@ public class JMXTXUseOriginalBodyWithDLC
from("activemq:broken")
.transacted()
.to("mock:checkpoint1")
- .setBody(bean("foo"))
+ .setBody(method("foo"))
.to("mock:checkpoint2")
.throwException(new Exception("boo"))
.to("mock:end");
Modified:
camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/tx/JMXTXUseOriginalBodyWithTXErrorHandlerTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/tx/JMXTXUseOriginalBodyWithTXErrorHandlerTest.java?rev=1326084&r1=1326083&r2=1326084&view=diff
==============================================================================
---
camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/tx/JMXTXUseOriginalBodyWithTXErrorHandlerTest.java
(original)
+++
camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/tx/JMXTXUseOriginalBodyWithTXErrorHandlerTest.java
Sat Apr 14 10:29:14 2012
@@ -102,7 +102,7 @@ public class JMXTXUseOriginalBodyWithTXE
from("activemq:broken")
.transacted()
.to("mock:checkpoint1")
- .setBody(bean("foo"))
+ .setBody(method("foo"))
.to("mock:checkpoint2")
.throwException(new Exception("boo"))
.to("mock:end");
Modified:
camel/trunk/components/camel-leveldb/src/test/java/org/apache/camel/component/leveldb/LevelDBAggregateNotLostRemovedWhenConfirmedTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-leveldb/src/test/java/org/apache/camel/component/leveldb/LevelDBAggregateNotLostRemovedWhenConfirmedTest.java?rev=1326084&r1=1326083&r2=1326084&view=diff
==============================================================================
---
camel/trunk/components/camel-leveldb/src/test/java/org/apache/camel/component/leveldb/LevelDBAggregateNotLostRemovedWhenConfirmedTest.java
(original)
+++
camel/trunk/components/camel-leveldb/src/test/java/org/apache/camel/component/leveldb/LevelDBAggregateNotLostRemovedWhenConfirmedTest.java
Sat Apr 14 10:29:14 2012
@@ -55,7 +55,6 @@ public class LevelDBAggregateNotLostRemo
// the exchange should NOT be in the completed repo as it was confirmed
final LevelDBFile levelDBFile = repo.getLevelDBFile();
- final LevelDBCamelCodec codec = new LevelDBCamelCodec();
byte[] bf = levelDBFile.getDb().get(keyBuilder("repo1-completed",
exchangeId));
// assert the exchange was deleted
Modified:
camel/trunk/components/camel-leveldb/src/test/java/org/apache/camel/component/leveldb/LevelDBBigPayloadTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-leveldb/src/test/java/org/apache/camel/component/leveldb/LevelDBBigPayloadTest.java?rev=1326084&r1=1326083&r2=1326084&view=diff
==============================================================================
---
camel/trunk/components/camel-leveldb/src/test/java/org/apache/camel/component/leveldb/LevelDBBigPayloadTest.java
(original)
+++
camel/trunk/components/camel-leveldb/src/test/java/org/apache/camel/component/leveldb/LevelDBBigPayloadTest.java
Sat Apr 14 10:29:14 2012
@@ -66,7 +66,7 @@ public class LevelDBBigPayloadTest exten
public void configure() throws Exception {
from("timer:foo")
.bean(BigPayload.class)
- .aggregate(bean(LevelDBBigPayloadTest.class, "number"),
new UseLatestAggregationStrategy())
+ .aggregate(method(LevelDBBigPayloadTest.class, "number"),
new UseLatestAggregationStrategy())
.aggregationRepository(repo)
.completionSize(2).completionTimeout(5000)
.log("Aggregated key
${header.CamelAggregatedCorrelationKey}");
Modified:
camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailAttachmentRedeliveryTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailAttachmentRedeliveryTest.java?rev=1326084&r1=1326083&r2=1326084&view=diff
==============================================================================
---
camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailAttachmentRedeliveryTest.java
(original)
+++
camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailAttachmentRedeliveryTest.java
Sat Apr 14 10:29:14 2012
@@ -38,7 +38,7 @@ import org.jvnet.mock_javamail.Mailbox;
*/
public class MailAttachmentRedeliveryTest extends CamelTestSupport {
- private final List names = new ArrayList();
+ private final List<String> names = new ArrayList<String>();
@Test
public void testSendAndReceiveMailWithAttachmentsRedelivery() throws
Exception {
@@ -100,9 +100,8 @@ public class MailAttachmentRedeliveryTes
.process(new Processor() {
private int counter;
@Override
- @SuppressWarnings("unchecked")
public void process(Exchange exchange) throws
Exception {
- Map map = exchange.getIn().getAttachments();
+ Map<String, DataHandler> map =
exchange.getIn().getAttachments();
assertNotNull(map);
assertEquals(1, map.size());
names.add(map.keySet().iterator().next());
Modified:
camel/trunk/components/camel-mina2/src/main/java/org/apache/camel/component/mina2/Mina2Consumer.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-mina2/src/main/java/org/apache/camel/component/mina2/Mina2Consumer.java?rev=1326084&r1=1326083&r2=1326084&view=diff
==============================================================================
---
camel/trunk/components/camel-mina2/src/main/java/org/apache/camel/component/mina2/Mina2Consumer.java
(original)
+++
camel/trunk/components/camel-mina2/src/main/java/org/apache/camel/component/mina2/Mina2Consumer.java
Sat Apr 14 10:29:14 2012
@@ -44,7 +44,6 @@ import org.apache.mina.filter.executor.U
import org.apache.mina.filter.logging.LoggingFilter;
import org.apache.mina.filter.ssl.SslFilter;
import org.apache.mina.transport.socket.nio.NioDatagramAcceptor;
-import org.apache.mina.transport.socket.nio.NioProcessor;
import org.apache.mina.transport.socket.nio.NioSocketAcceptor;
import org.apache.mina.transport.vmpipe.VmPipeAcceptor;
import org.apache.mina.transport.vmpipe.VmPipeAddress;
Modified:
camel/trunk/components/camel-quickfix/src/test/java/org/apache/camel/component/quickfixj/examples/DynamicRoutingExample.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-quickfix/src/test/java/org/apache/camel/component/quickfixj/examples/DynamicRoutingExample.java?rev=1326084&r1=1326083&r2=1326084&view=diff
==============================================================================
---
camel/trunk/components/camel-quickfix/src/test/java/org/apache/camel/component/quickfixj/examples/DynamicRoutingExample.java
(original)
+++
camel/trunk/components/camel-quickfix/src/test/java/org/apache/camel/component/quickfixj/examples/DynamicRoutingExample.java
Sat Apr 14 10:29:14 2012
@@ -64,7 +64,7 @@ public class DynamicRoutingExample {
// Dynamic router -- Uses FIX DeliverTo tags
from("quickfix:examples/gateway.cfg").
filter(header(QuickfixjEndpoint.EVENT_CATEGORY_KEY).isEqualTo(QuickfixjEventCategory.AppMessageReceived)).
- recipientList(bean(new
FixMessageRouter("quickfix:examples/gateway.cfg")));
+ recipientList(method(new
FixMessageRouter("quickfix:examples/gateway.cfg")));
// Logger app messages as JSON
from("quickfix:examples/gateway.cfg").
Modified:
camel/trunk/components/camel-quickfix/src/test/java/org/apache/camel/component/quickfixj/examples/RequestReplyExample.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-quickfix/src/test/java/org/apache/camel/component/quickfixj/examples/RequestReplyExample.java?rev=1326084&r1=1326083&r2=1326084&view=diff
==============================================================================
---
camel/trunk/components/camel-quickfix/src/test/java/org/apache/camel/component/quickfixj/examples/RequestReplyExample.java
(original)
+++
camel/trunk/components/camel-quickfix/src/test/java/org/apache/camel/component/quickfixj/examples/RequestReplyExample.java
Sat Apr 14 10:29:14 2012
@@ -86,7 +86,7 @@ public class RequestReplyExample {
from("jetty:" + orderStatusServiceUrl)
.bean(new OrderStatusRequestTransformer())
- .routingSlip(bean(FixSessionRouter.class, "route"))
+ .routingSlip(method(FixSessionRouter.class, "route"))
.bean(new QuickfixjMessageJsonTransformer());
}
};
Modified:
camel/trunk/components/camel-shiro/src/test/java/org/apache/camel/component/shiro/security/ShiroAuthenticationTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-shiro/src/test/java/org/apache/camel/component/shiro/security/ShiroAuthenticationTest.java?rev=1326084&r1=1326083&r2=1326084&view=diff
==============================================================================
---
camel/trunk/components/camel-shiro/src/test/java/org/apache/camel/component/shiro/security/ShiroAuthenticationTest.java
(original)
+++
camel/trunk/components/camel-shiro/src/test/java/org/apache/camel/component/shiro/security/ShiroAuthenticationTest.java
Sat Apr 14 10:29:14 2012
@@ -75,6 +75,7 @@ public class ShiroAuthenticationTest ext
final ShiroSecurityPolicy securityPolicy = new
ShiroSecurityPolicy("./src/test/resources/securityconfig.ini", passPhrase);
return new RouteBuilder() {
+ @SuppressWarnings("unchecked")
public void configure() {
onException(UnknownAccountException.class,
IncorrectCredentialsException.class,
LockedAccountException.class,
AuthenticationException.class).
Modified:
camel/trunk/components/camel-sip/src/main/java/org/apache/camel/component/sip/listener/SipMessageCodes.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-sip/src/main/java/org/apache/camel/component/sip/listener/SipMessageCodes.java?rev=1326084&r1=1326083&r2=1326084&view=diff
==============================================================================
---
camel/trunk/components/camel-sip/src/main/java/org/apache/camel/component/sip/listener/SipMessageCodes.java
(original)
+++
camel/trunk/components/camel-sip/src/main/java/org/apache/camel/component/sip/listener/SipMessageCodes.java
Sat Apr 14 10:29:14 2012
@@ -20,9 +20,8 @@ import java.util.HashMap;
import java.util.Map;
public interface SipMessageCodes {
- Map<Integer, String> SIP_MESSAGE_CODES =
- new HashMap<Integer, String>()
- {
+ Map<Integer, String> SIP_MESSAGE_CODES = new HashMap<Integer, String>() {
+ private static final long serialVersionUID = 1L;
{
put(100, "Trying");
put(180, "Ringing");
Modified:
camel/trunk/components/camel-syslog/src/main/java/org/apache/camel/component/syslog/Rfc3164SyslogConverter.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-syslog/src/main/java/org/apache/camel/component/syslog/Rfc3164SyslogConverter.java?rev=1326084&r1=1326083&r2=1326084&view=diff
==============================================================================
---
camel/trunk/components/camel-syslog/src/main/java/org/apache/camel/component/syslog/Rfc3164SyslogConverter.java
(original)
+++
camel/trunk/components/camel-syslog/src/main/java/org/apache/camel/component/syslog/Rfc3164SyslogConverter.java
Sat Apr 14 10:29:14 2012
@@ -40,6 +40,7 @@ public final class Rfc3164SyslogConverte
}
private static Map<String, MONTHS> monthValueMap = new HashMap<String,
MONTHS>() {
+ private static final long serialVersionUID = 1L;
{
put("jan", MONTHS.jan);
put("feb", MONTHS.feb);
Modified:
camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/jms/DynamicRouteTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/jms/DynamicRouteTest.java?rev=1326084&r1=1326083&r2=1326084&view=diff
==============================================================================
---
camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/jms/DynamicRouteTest.java
(original)
+++
camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/jms/DynamicRouteTest.java
Sat Apr 14 10:29:14 2012
@@ -57,7 +57,7 @@ public class DynamicRouteTest extends Ca
from("jms:queue:request")
.dynamicRouter().method(MyDynamicRouter.class, "route");
from("direct:start")
- .dynamicRouter(bean(new MyDynamicRouter()));
+ .dynamicRouter(method(new MyDynamicRouter()));
}
};
