You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ha...@apache.org on 2012/04/23 05:38:47 UTC
svn commit: r1329050 - in /camel/branches/camel-2.8.x:
camel-core/src/main/java/org/apache/camel/impl/converter/
camel-core/src/test/java/org/apache/camel/component/seda/
components/camel-jaxb/src/test/java/org/apache/camel/jaxb/
components/camel-jms/s...
Author: hadrian
Date: Mon Apr 23 03:38:47 2012
New Revision: 1329050
URL: http://svn.apache.org/viewvc?rev=1329050&view=rev
Log:
CS fixes.
Modified:
camel/branches/camel-2.8.x/camel-core/src/main/java/org/apache/camel/impl/converter/AsyncProcessorTypeConverter.java
camel/branches/camel-2.8.x/camel-core/src/test/java/org/apache/camel/component/seda/SedaWaitForTaskNewerOnCompletionTest.java
camel/branches/camel-2.8.x/components/camel-jaxb/src/test/java/org/apache/camel/jaxb/SplitterAndExceptionRouteTwistIssueTest.java
camel/branches/camel-2.8.x/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRequestReplyCorrelationTest.java
Modified: camel/branches/camel-2.8.x/camel-core/src/main/java/org/apache/camel/impl/converter/AsyncProcessorTypeConverter.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.8.x/camel-core/src/main/java/org/apache/camel/impl/converter/AsyncProcessorTypeConverter.java?rev=1329050&r1=1329049&r2=1329050&view=diff
==============================================================================
--- camel/branches/camel-2.8.x/camel-core/src/main/java/org/apache/camel/impl/converter/AsyncProcessorTypeConverter.java (original)
+++ camel/branches/camel-2.8.x/camel-core/src/main/java/org/apache/camel/impl/converter/AsyncProcessorTypeConverter.java Mon Apr 23 03:38:47 2012
@@ -20,8 +20,8 @@ import org.apache.camel.AsyncCallback;
import org.apache.camel.AsyncProcessor;
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
-import org.apache.camel.support.TypeConverterSupport;
import org.apache.camel.processor.DelegateProcessor;
+import org.apache.camel.support.TypeConverterSupport;
/**
* A simple converter that can convert any {@link Processor} to an {@link AsyncProcessor}.
Modified: camel/branches/camel-2.8.x/camel-core/src/test/java/org/apache/camel/component/seda/SedaWaitForTaskNewerOnCompletionTest.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.8.x/camel-core/src/test/java/org/apache/camel/component/seda/SedaWaitForTaskNewerOnCompletionTest.java?rev=1329050&r1=1329049&r2=1329050&view=diff
==============================================================================
--- camel/branches/camel-2.8.x/camel-core/src/test/java/org/apache/camel/component/seda/SedaWaitForTaskNewerOnCompletionTest.java (original)
+++ camel/branches/camel-2.8.x/camel-core/src/test/java/org/apache/camel/component/seda/SedaWaitForTaskNewerOnCompletionTest.java Mon Apr 23 03:38:47 2012
@@ -30,8 +30,8 @@ import org.apache.camel.impl.Synchroniza
*/
public class SedaWaitForTaskNewerOnCompletionTest extends ContextTestSupport {
- private final CountDownLatch latch = new CountDownLatch(1);
private static String done = "";
+ private final CountDownLatch latch = new CountDownLatch(1);
public void testNever() throws Exception {
getMockEndpoint("mock:dead").expectedMessageCount(0);
@@ -88,4 +88,4 @@ public class SedaWaitForTaskNewerOnCompl
}
};
}
-}
\ No newline at end of file
+}
Modified: camel/branches/camel-2.8.x/components/camel-jaxb/src/test/java/org/apache/camel/jaxb/SplitterAndExceptionRouteTwistIssueTest.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.8.x/components/camel-jaxb/src/test/java/org/apache/camel/jaxb/SplitterAndExceptionRouteTwistIssueTest.java?rev=1329050&r1=1329049&r2=1329050&view=diff
==============================================================================
--- camel/branches/camel-2.8.x/components/camel-jaxb/src/test/java/org/apache/camel/jaxb/SplitterAndExceptionRouteTwistIssueTest.java (original)
+++ camel/branches/camel-2.8.x/components/camel-jaxb/src/test/java/org/apache/camel/jaxb/SplitterAndExceptionRouteTwistIssueTest.java Mon Apr 23 03:38:47 2012
@@ -51,7 +51,7 @@ public class SplitterAndExceptionRouteTw
protected MockEndpoint mockRejectEndpoint;
@EndpointInject(uri = "mock:mock_output")
- protected MockEndpoint mock_output;
+ protected MockEndpoint mockOutput;
@Test
public void testErrorHandlingJaxb() throws Exception {
@@ -59,7 +59,7 @@ public class SplitterAndExceptionRouteTw
String errorExample = "myerror\u0010";
mockRejectEndpoint.expectedMessageCount(1);
- mock_output.expectedMessageCount(4);
+ mockOutput.expectedMessageCount(4);
templateError.sendBody(correctExample);
templateError.sendBody(errorExample);
@@ -68,7 +68,7 @@ public class SplitterAndExceptionRouteTw
templateError.sendBody(correctExample);
mockRejectEndpoint.assertIsSatisfied();
- mock_output.assertIsSatisfied();
+ mockOutput.assertIsSatisfied();
}
@Test
@@ -77,7 +77,7 @@ public class SplitterAndExceptionRouteTw
String errorExample = "myerror\u0010";
mockRejectEndpoint.expectedMessageCount(1);
- mock_output.expectedMessageCount(4);
+ mockOutput.expectedMessageCount(4);
templateError2.sendBody(correctExample);
templateError2.sendBody(errorExample);
@@ -86,7 +86,7 @@ public class SplitterAndExceptionRouteTw
templateError2.sendBody(correctExample);
mockRejectEndpoint.assertIsSatisfied();
- mock_output.assertIsSatisfied();
+ mockOutput.assertIsSatisfied();
}
@Override
@@ -123,7 +123,7 @@ public class SplitterAndExceptionRouteTw
}
})
.split().xpath("//twits/twit").streaming()
- .to(mock_output);
+ .to(mockOutput);
from("direct:error2")
@@ -147,7 +147,7 @@ public class SplitterAndExceptionRouteTw
}
})
.split().xpath("//twits/twit").streaming()
- .to(mock_output);
+ .to(mockOutput);
}
};
}
Modified: camel/branches/camel-2.8.x/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRequestReplyCorrelationTest.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.8.x/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRequestReplyCorrelationTest.java?rev=1329050&r1=1329049&r2=1329050&view=diff
==============================================================================
--- camel/branches/camel-2.8.x/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRequestReplyCorrelationTest.java (original)
+++ camel/branches/camel-2.8.x/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRequestReplyCorrelationTest.java Mon Apr 23 03:38:47 2012
@@ -101,29 +101,28 @@ public class JmsRequestReplyCorrelationT
* to contain the correlation id dynamically generated on send.
*/
- @Test
- public void testRequestReplyCorrelationWithEmptyString() throws Exception {
- MockEndpoint result = getMockEndpoint("mock:result");
- result.expectedMessageCount(1);
-
- Exchange out = template.send("jms:queue:hello", ExchangePattern.InOut, new Processor() {
- public void process(Exchange exchange) throws Exception {
- Message in = exchange.getIn();
- in.setBody("Hello World");
- in.setHeader("JMSCorrelationID", "");
- }
- });
+ @Test
+ public void testRequestReplyCorrelationWithEmptyString() throws Exception {
+ MockEndpoint result = getMockEndpoint("mock:result");
+ result.expectedMessageCount(1);
- assertNotNull(out);
- result.assertIsSatisfied();
-
- assertEquals(REPLY_BODY, out.getOut().getBody(String.class));
- String correlationId = out.getOut().getHeader("JMSCorrelationID", String.class);
- assertNotNull(correlationId);
- // In ActiveMQ messageIds start with ID: (currently) so the ID should not be generated from AMQ
- assertFalse("CorrelationID should NOT start with ID, was: " + correlationId, correlationId.startsWith("ID:"));
- }
+ Exchange out = template.send("jms:queue:hello", ExchangePattern.InOut, new Processor() {
+ public void process(Exchange exchange) throws Exception {
+ Message in = exchange.getIn();
+ in.setBody("Hello World");
+ in.setHeader("JMSCorrelationID", "");
+ }
+ });
+
+ assertNotNull(out);
+ result.assertIsSatisfied();
+ assertEquals(REPLY_BODY, out.getOut().getBody(String.class));
+ String correlationId = out.getOut().getHeader("JMSCorrelationID", String.class);
+ assertNotNull(correlationId);
+ // In ActiveMQ messageIds start with ID: (currently) so the ID should not be generated from AMQ
+ assertFalse("CorrelationID should NOT start with ID, was: " + correlationId, correlationId.startsWith("ID:"));
+ }
/**
* When the setting useMessageIdAsCorrelationid is true for the client and