You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2014/02/11 16:50:09 UTC
[2/2] git commit: CAMEL-7184 Ensure that QFJ consumers have their
engines initialized
CAMEL-7184 Ensure that QFJ consumers have their engines initialized
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/f2ef16c5
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/f2ef16c5
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/f2ef16c5
Branch: refs/heads/camel-2.12.x
Commit: f2ef16c5e6bdc2a0d9289bcefab2ebfc4b1da398
Parents: a68013b
Author: Grzegorz Grzybek <gr...@gmail.com>
Authored: Tue Feb 11 16:41:17 2014 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Tue Feb 11 16:51:16 2014 +0100
----------------------------------------------------------------------
.../component/quickfixj/QuickfixjConsumer.java | 6 ++++
.../quickfixj/QuickfixjConsumerTest.java | 6 ++--
.../quickfixj/QuickfixjSpringTest-context.xml | 38 ++++++++++++++++----
3 files changed, 41 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/f2ef16c5/components/camel-quickfix/src/main/java/org/apache/camel/component/quickfixj/QuickfixjConsumer.java
----------------------------------------------------------------------
diff --git a/components/camel-quickfix/src/main/java/org/apache/camel/component/quickfixj/QuickfixjConsumer.java b/components/camel-quickfix/src/main/java/org/apache/camel/component/quickfixj/QuickfixjConsumer.java
index 5720b91..31efae8 100644
--- a/components/camel-quickfix/src/main/java/org/apache/camel/component/quickfixj/QuickfixjConsumer.java
+++ b/components/camel-quickfix/src/main/java/org/apache/camel/component/quickfixj/QuickfixjConsumer.java
@@ -31,6 +31,12 @@ public class QuickfixjConsumer extends DefaultConsumer {
super(endpoint, processor);
}
+ @Override
+ protected void doStart() throws Exception {
+ ((QuickfixjEndpoint)getEndpoint()).ensureInitialized();
+ super.doStart();
+ }
+
public void onExchange(Exchange exchange) throws Exception {
if (isStarted()) {
try {
http://git-wip-us.apache.org/repos/asf/camel/blob/f2ef16c5/components/camel-quickfix/src/test/java/org/apache/camel/component/quickfixj/QuickfixjConsumerTest.java
----------------------------------------------------------------------
diff --git a/components/camel-quickfix/src/test/java/org/apache/camel/component/quickfixj/QuickfixjConsumerTest.java b/components/camel-quickfix/src/test/java/org/apache/camel/component/quickfixj/QuickfixjConsumerTest.java
index 6bad0f5..1c7e28e 100644
--- a/components/camel-quickfix/src/test/java/org/apache/camel/component/quickfixj/QuickfixjConsumerTest.java
+++ b/components/camel-quickfix/src/test/java/org/apache/camel/component/quickfixj/QuickfixjConsumerTest.java
@@ -16,7 +16,6 @@
*/
package org.apache.camel.component.quickfixj;
-import org.apache.camel.Endpoint;
import org.apache.camel.Exchange;
import org.apache.camel.ExchangePattern;
import org.apache.camel.Processor;
@@ -37,7 +36,7 @@ import quickfix.field.TargetCompID;
public class QuickfixjConsumerTest {
private Exchange mockExchange;
private Processor mockProcessor;
- private Endpoint mockEndpoint;
+ private QuickfixjEndpoint mockEndpoint;
private Message inboundFixMessage;
@Before
@@ -54,7 +53,7 @@ public class QuickfixjConsumerTest {
Mockito.when(mockCamelMessage.getBody(quickfix.Message.class)).thenReturn(inboundFixMessage);
mockProcessor = Mockito.mock(Processor.class);
- mockEndpoint = Mockito.mock(Endpoint.class);
+ mockEndpoint = Mockito.mock(QuickfixjEndpoint.class);
Mockito.when(mockEndpoint.createExchange(ExchangePattern.InOnly)).thenReturn(mockExchange);
}
@@ -71,6 +70,7 @@ public class QuickfixjConsumerTest {
Mockito.verifyZeroInteractions(mockProcessor);
consumer.start();
+ Mockito.verify(mockEndpoint).ensureInitialized();
Assert.assertThat(consumer.isStarted(), CoreMatchers.is(true));
consumer.onExchange(mockExchange);
http://git-wip-us.apache.org/repos/asf/camel/blob/f2ef16c5/components/camel-quickfix/src/test/resources/org/apache/camel/component/quickfixj/QuickfixjSpringTest-context.xml
----------------------------------------------------------------------
diff --git a/components/camel-quickfix/src/test/resources/org/apache/camel/component/quickfixj/QuickfixjSpringTest-context.xml b/components/camel-quickfix/src/test/resources/org/apache/camel/component/quickfixj/QuickfixjSpringTest-context.xml
index 10f9d58..62710f5 100644
--- a/components/camel-quickfix/src/test/resources/org/apache/camel/component/quickfixj/QuickfixjSpringTest-context.xml
+++ b/components/camel-quickfix/src/test/resources/org/apache/camel/component/quickfixj/QuickfixjSpringTest-context.xml
@@ -35,11 +35,8 @@
</filter>
</route>
<route>
- <from uri="lazyQuickfix:example"/>
- <filter>
- <simple>${in.header.EventCategory} == 'AppMessageReceived'</simple>
- <to uri="log:test"/>
- </filter>
+ <from uri="vm:test"/>
+ <to uri="lazyQuickfix:example"/>
</route>
</camelContext>
@@ -60,7 +57,7 @@
<property name="lazyCreateEngines" value="true" />
<property name="configurations">
<util:map>
- <entry key="example" value-ref="quickfixjConfiguration"/>
+ <entry key="example" value-ref="lazyQuickfixjConfiguration"/>
</util:map>
</property>
<property name="messageFactory">
@@ -97,4 +94,33 @@
</bean>
<!-- END SNIPPET: e1 -->
+ <!-- lazy quickfix settings -->
+ <bean id="lazyQuickfixjConfiguration" class="org.apache.camel.component.quickfixj.QuickfixjConfiguration">
+ <property name="defaultSettings">
+ <util:map>
+ <entry key="SocketConnectProtocol" value="VM_PIPE"/>
+ <entry key="SocketAcceptProtocol" value="VM_PIPE"/>
+ <entry key="UseDataDictionary" value="N"/>
+ </util:map>
+ </property>
+ <property name="sessionSettings">
+ <util:map>
+ <entry key="FIX.4.2:INITIATOR->ACCEPTOR">
+ <util:map>
+ <entry key="ConnectionType" value="initiator"/>
+ <entry key="SocketConnectHost" value="localhost"/>
+ <entry key="SocketConnectPort" value="5001"/>
+ </util:map>
+ </entry>
+ <entry key="FIX.4.2:ACCEPTOR->INITIATOR">
+ <util:map>
+ <entry key="ConnectionType" value="acceptor"/>
+ <entry key="SocketAcceptPort" value="5001"/>
+ </util:map>
+ </entry>
+ </util:map>
+ </property>
+ </bean>
+ <!-- END SNIPPET: e2 -->
+
</beans>
\ No newline at end of file