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 2012/09/08 13:47:38 UTC
svn commit: r1382286 - in /camel/trunk/components/camel-quickfix/src:
main/java/org/apache/camel/component/quickfixj/
test/java/org/apache/camel/component/quickfixj/
Author: bvahdat
Date: Sat Sep 8 11:47:37 2012
New Revision: 1382286
URL: http://svn.apache.org/viewvc?rev=1382286&view=rev
Log:
CAMEL-5584: Remove QuickfixjEngine's forcedShutdown field.
Modified:
camel/trunk/components/camel-quickfix/src/main/java/org/apache/camel/component/quickfixj/QuickfixjComponent.java
camel/trunk/components/camel-quickfix/src/main/java/org/apache/camel/component/quickfixj/QuickfixjEngine.java
camel/trunk/components/camel-quickfix/src/test/java/org/apache/camel/component/quickfixj/QuickfixjConvertersTest.java
camel/trunk/components/camel-quickfix/src/test/java/org/apache/camel/component/quickfixj/QuickfixjEngineTest.java
camel/trunk/components/camel-quickfix/src/test/java/org/apache/camel/component/quickfixj/TestSupport.java
Modified: camel/trunk/components/camel-quickfix/src/main/java/org/apache/camel/component/quickfixj/QuickfixjComponent.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-quickfix/src/main/java/org/apache/camel/component/quickfixj/QuickfixjComponent.java?rev=1382286&r1=1382285&r2=1382286&view=diff
==============================================================================
--- camel/trunk/components/camel-quickfix/src/main/java/org/apache/camel/component/quickfixj/QuickfixjComponent.java (original)
+++ camel/trunk/components/camel-quickfix/src/main/java/org/apache/camel/component/quickfixj/QuickfixjComponent.java Sat Sep 8 11:47:37 2012
@@ -41,7 +41,6 @@ public class QuickfixjComponent extends
private MessageStoreFactory messageStoreFactory;
private LogFactory logFactory;
private MessageFactory messageFactory;
- private boolean forcedShutdown;
private Map<String, QuickfixjConfiguration> configurations = new HashMap<String, QuickfixjConfiguration>();
@Override
@@ -57,9 +56,9 @@ public class QuickfixjComponent extends
QuickfixjConfiguration configuration = configurations.get(remaining);
if (configuration != null) {
SessionSettings settings = configuration.createSessionSettings();
- engine = new QuickfixjEngine(uri, settings, forcedShutdown, messageStoreFactory, logFactory, messageFactory);
+ engine = new QuickfixjEngine(uri, settings, messageStoreFactory, logFactory, messageFactory);
} else {
- engine = new QuickfixjEngine(uri, remaining, forcedShutdown, messageStoreFactory, logFactory, messageFactory);
+ engine = new QuickfixjEngine(uri, remaining, messageStoreFactory, logFactory, messageFactory);
}
engines.put(remaining, engine);
@@ -126,8 +125,11 @@ public class QuickfixjComponent extends
this.messageStoreFactory = messageStoreFactory;
}
+ /**
+ * @deprecated As it had/has no effect.
+ */
+ @Deprecated
public void setForcedShutdown(boolean forcedShutdown) {
- this.forcedShutdown = forcedShutdown;
}
public Map<String, QuickfixjConfiguration> getConfigurations() {
Modified: camel/trunk/components/camel-quickfix/src/main/java/org/apache/camel/component/quickfixj/QuickfixjEngine.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-quickfix/src/main/java/org/apache/camel/component/quickfixj/QuickfixjEngine.java?rev=1382286&r1=1382285&r2=1382286&view=diff
==============================================================================
--- camel/trunk/components/camel-quickfix/src/main/java/org/apache/camel/component/quickfixj/QuickfixjEngine.java (original)
+++ camel/trunk/components/camel-quickfix/src/main/java/org/apache/camel/component/quickfixj/QuickfixjEngine.java Sat Sep 8 11:47:37 2012
@@ -89,7 +89,6 @@ public class QuickfixjEngine extends Ser
private final Acceptor acceptor;
private final Initiator initiator;
private final JmxExporter jmxExporter;
- private final boolean forcedShutdown;
private final MessageStoreFactory messageStoreFactory;
private final LogFactory sessionLogFactory;
private final MessageFactory messageFactory;
@@ -101,12 +100,28 @@ public class QuickfixjEngine extends Ser
ThreadPerConnector, ThreadPerSession;
}
+ /**
+ * @deprecated Better make use of the
+ * {@link #QuickfixjEngine(String, String)} constructor as
+ * <tt>forcedShutdown</tt> had/has no effect.
+ */
+ @Deprecated
public QuickfixjEngine(String uri, String settingsResourceName, boolean forcedShutdown)
throws ConfigError, FieldConvertError, IOException, JMException {
this(uri, settingsResourceName, forcedShutdown, null, null, null);
}
+ public QuickfixjEngine(String uri, String settingsResourceName) throws ConfigError, FieldConvertError, IOException, JMException {
+ this(uri, settingsResourceName, null, null, null);
+ }
+
+ /**
+ * @deprecated Better make use of the
+ * {@link #QuickfixjEngine(String, String, MessageStoreFactory, LogFactory, MessageFactory)}
+ * constructor as <tt>forcedShutdown</tt> had/has no effect.
+ */
+ @Deprecated
public QuickfixjEngine(String uri, String settingsResourceName, boolean forcedShutdown,
MessageStoreFactory messageStoreFactoryOverride, LogFactory sessionLogFactoryOverride,
MessageFactory messageFactoryOverride) throws ConfigError, FieldConvertError, IOException, JMException {
@@ -114,14 +129,28 @@ public class QuickfixjEngine extends Ser
sessionLogFactoryOverride, messageFactoryOverride);
}
+ public QuickfixjEngine(String uri, String settingsResourceName, MessageStoreFactory messageStoreFactoryOverride, LogFactory sessionLogFactoryOverride,
+ MessageFactory messageFactoryOverride) throws ConfigError, FieldConvertError, IOException, JMException {
+ this(uri, loadSettings(settingsResourceName), messageStoreFactoryOverride, sessionLogFactoryOverride, messageFactoryOverride);
+ }
+
+ /**
+ * @deprecated Better make use of the
+ * {@link #QuickfixjEngine(String, SessionSettings, MessageStoreFactory, LogFactory, MessageFactory)}
+ * constructor as <tt>forcedShutdown</tt> had/has no effect.
+ */
+ @Deprecated
public QuickfixjEngine(String uri, SessionSettings settings, boolean forcedShutdown,
MessageStoreFactory messageStoreFactoryOverride, LogFactory sessionLogFactoryOverride,
MessageFactory messageFactoryOverride) throws ConfigError, FieldConvertError, IOException, JMException {
+ this(uri, settings, messageStoreFactoryOverride, sessionLogFactoryOverride, messageFactoryOverride);
+ }
+ public QuickfixjEngine(String uri, SessionSettings settings, MessageStoreFactory messageStoreFactoryOverride, LogFactory sessionLogFactoryOverride,
+ MessageFactory messageFactoryOverride) throws ConfigError, FieldConvertError, IOException, JMException {
addEventListener(messageCorrelator);
this.uri = uri;
- this.forcedShutdown = forcedShutdown;
messageFactory = messageFactoryOverride != null ? messageFactoryOverride : new DefaultMessageFactory();
sessionLogFactory = sessionLogFactoryOverride != null ? sessionLogFactoryOverride : inferLogFactory(settings);
Modified: camel/trunk/components/camel-quickfix/src/test/java/org/apache/camel/component/quickfixj/QuickfixjConvertersTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-quickfix/src/test/java/org/apache/camel/component/quickfixj/QuickfixjConvertersTest.java?rev=1382286&r1=1382285&r2=1382286&view=diff
==============================================================================
--- camel/trunk/components/camel-quickfix/src/test/java/org/apache/camel/component/quickfixj/QuickfixjConvertersTest.java (original)
+++ camel/trunk/components/camel-quickfix/src/test/java/org/apache/camel/component/quickfixj/QuickfixjConvertersTest.java Sat Sep 8 11:47:37 2012
@@ -235,7 +235,7 @@ public class QuickfixjConvertersTest {
TestSupport.writeSettings(settings, settingsFile);
- quickfixjEngine = new QuickfixjEngine("quickfix:test", settingsFile.getName(), false);
+ quickfixjEngine = new QuickfixjEngine("quickfix:test", settingsFile.getName());
quickfixjEngine.start();
}
}
Modified: camel/trunk/components/camel-quickfix/src/test/java/org/apache/camel/component/quickfixj/QuickfixjEngineTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-quickfix/src/test/java/org/apache/camel/component/quickfixj/QuickfixjEngineTest.java?rev=1382286&r1=1382285&r2=1382286&view=diff
==============================================================================
--- camel/trunk/components/camel-quickfix/src/test/java/org/apache/camel/component/quickfixj/QuickfixjEngineTest.java (original)
+++ camel/trunk/components/camel-quickfix/src/test/java/org/apache/camel/component/quickfixj/QuickfixjEngineTest.java Sat Sep 8 11:47:37 2012
@@ -117,7 +117,7 @@ public class QuickfixjEngineTest {
@Test(expected = IllegalArgumentException.class)
public void missingSettingsResource() throws Exception {
- new QuickfixjEngine("quickfix:test", "bogus.cfg", false);
+ new QuickfixjEngine("quickfix:test", "bogus.cfg");
}
@Test
@@ -126,7 +126,7 @@ public class QuickfixjEngineTest {
writeSettings();
- quickfixjEngine = new QuickfixjEngine("quickfix:test", settingsFile.getName(), false);
+ quickfixjEngine = new QuickfixjEngine("quickfix:test", settingsFile.getName());
assertThat(quickfixjEngine.getInitiator(), instanceOf(SocketInitiator.class));
assertThat(quickfixjEngine.getAcceptor(), nullValue());
@@ -140,7 +140,7 @@ public class QuickfixjEngineTest {
writeSettings();
- quickfixjEngine = new QuickfixjEngine("quickfix:test", settingsFile.getName(), false);
+ quickfixjEngine = new QuickfixjEngine("quickfix:test", settingsFile.getName());
assertThat(quickfixjEngine.getInitiator(), instanceOf(ThreadedSocketInitiator.class));
assertThat(quickfixjEngine.getAcceptor(), nullValue());
@@ -154,7 +154,7 @@ public class QuickfixjEngineTest {
writeSettings();
- quickfixjEngine = new QuickfixjEngine("quickfix:test", settingsFile.getName(), false);
+ quickfixjEngine = new QuickfixjEngine("quickfix:test", settingsFile.getName());
assertThat(quickfixjEngine.getInitiator(), nullValue());
assertThat(quickfixjEngine.getAcceptor(), instanceOf(SocketAcceptor.class));
@@ -169,7 +169,7 @@ public class QuickfixjEngineTest {
writeSettings();
- quickfixjEngine = new QuickfixjEngine("quickfix:test", settingsFile.getName(), false);
+ quickfixjEngine = new QuickfixjEngine("quickfix:test", settingsFile.getName());
assertThat(quickfixjEngine.getInitiator(), nullValue());
assertThat(quickfixjEngine.getAcceptor(), instanceOf(ThreadedSocketAcceptor.class));
@@ -187,7 +187,7 @@ public class QuickfixjEngineTest {
writeSettings();
- quickfixjEngine = new QuickfixjEngine("quickfix:test", settingsFile.getName(), false);
+ quickfixjEngine = new QuickfixjEngine("quickfix:test", settingsFile.getName());
assertThat(quickfixjEngine.getInitiator(), notNullValue());
assertThat(quickfixjEngine.getAcceptor(), notNullValue());
@@ -201,7 +201,7 @@ public class QuickfixjEngineTest {
writeSettings();
- quickfixjEngine = new QuickfixjEngine("quickfix:test", settingsFile.getName(), false);
+ quickfixjEngine = new QuickfixjEngine("quickfix:test", settingsFile.getName());
assertThat(quickfixjEngine.getInitiator(), notNullValue());
assertThat(quickfixjEngine.getAcceptor(), nullValue());
@@ -224,7 +224,7 @@ public class QuickfixjEngineTest {
writeSettings();
- quickfixjEngine = new QuickfixjEngine("quickfix:test", settingsFile.getName(), false);
+ quickfixjEngine = new QuickfixjEngine("quickfix:test", settingsFile.getName());
assertThat(quickfixjEngine.getInitiator(), notNullValue());
assertThat(quickfixjEngine.getAcceptor(), nullValue());
@@ -243,7 +243,7 @@ public class QuickfixjEngineTest {
writeSettings();
- quickfixjEngine = new QuickfixjEngine("quickfix:test", settingsFile.getName(), false);
+ quickfixjEngine = new QuickfixjEngine("quickfix:test", settingsFile.getName());
assertThat(quickfixjEngine.getInitiator(), notNullValue());
assertThat(quickfixjEngine.getAcceptor(), nullValue());
@@ -271,7 +271,7 @@ public class QuickfixjEngineTest {
writeSettings();
- quickfixjEngine = new QuickfixjEngine("quickfix:test", settingsFile.getName(), false);
+ quickfixjEngine = new QuickfixjEngine("quickfix:test", settingsFile.getName());
assertThat(quickfixjEngine.getInitiator(), notNullValue());
assertThat(quickfixjEngine.getAcceptor(), nullValue());
@@ -287,7 +287,7 @@ public class QuickfixjEngineTest {
writeSettings();
- quickfixjEngine = new QuickfixjEngine("quickfix:test", settingsFile.getName(), false);
+ quickfixjEngine = new QuickfixjEngine("quickfix:test", settingsFile.getName());
assertThat(quickfixjEngine.getInitiator(), notNullValue());
assertThat(quickfixjEngine.getAcceptor(), nullValue());
@@ -303,7 +303,7 @@ public class QuickfixjEngineTest {
writeSettings();
- quickfixjEngine = new QuickfixjEngine("quickfix:test", settingsFile.getName(), false);
+ quickfixjEngine = new QuickfixjEngine("quickfix:test", settingsFile.getName());
assertThat(quickfixjEngine.getInitiator(), notNullValue());
assertThat(quickfixjEngine.getAcceptor(), nullValue());
@@ -319,7 +319,7 @@ public class QuickfixjEngineTest {
writeSettings();
- quickfixjEngine = new QuickfixjEngine("quickfix:test", settingsFile.getName(), false);
+ quickfixjEngine = new QuickfixjEngine("quickfix:test", settingsFile.getName());
assertThat(quickfixjEngine.getInitiator(), notNullValue());
assertThat(quickfixjEngine.getAcceptor(), nullValue());
@@ -341,7 +341,7 @@ public class QuickfixjEngineTest {
private void doAmbiguityTest(String exceptionText) throws FieldConvertError, IOException, JMException {
try {
- quickfixjEngine = new QuickfixjEngine("quickfix:test", settingsFile.getName(), false);
+ quickfixjEngine = new QuickfixjEngine("quickfix:test", settingsFile.getName());
fail("Expected exception, but none raised");
} catch (ConfigError e) {
assertTrue(e.getMessage().contains(exceptionText));
@@ -359,7 +359,7 @@ public class QuickfixjEngineTest {
LogFactory logFactory = Mockito.mock(LogFactory.class);
MessageFactory messageFactory = Mockito.mock(MessageFactory.class);
- quickfixjEngine = new QuickfixjEngine("quickfix:test", settingsFile.getName(), false, messageStoreFactory, logFactory, messageFactory);
+ quickfixjEngine = new QuickfixjEngine("quickfix:test", settingsFile.getName(), messageStoreFactory, logFactory, messageFactory);
assertThat(quickfixjEngine.getMessageStoreFactory(), is(messageStoreFactory));
assertThat(quickfixjEngine.getLogFactory(), is(logFactory));
@@ -374,7 +374,7 @@ public class QuickfixjEngineTest {
writeSettings();
- quickfixjEngine = new QuickfixjEngine("quickfix:test", settingsFile.getName(), false);
+ quickfixjEngine = new QuickfixjEngine("quickfix:test", settingsFile.getName());
quickfixjEngine.start();
MBeanServer mbeanServer = ManagementFactory.getPlatformMBeanServer();
@@ -391,7 +391,7 @@ public class QuickfixjEngineTest {
writeSettings();
- quickfixjEngine = new QuickfixjEngine("quickfix:test", settingsFile.getName(), false);
+ quickfixjEngine = new QuickfixjEngine("quickfix:test", settingsFile.getName());
quickfixjEngine.start();
MBeanServer mbeanServer = ManagementFactory.getPlatformMBeanServer();
@@ -405,7 +405,7 @@ public class QuickfixjEngineTest {
SessionID acceptorSessionID = new SessionID(FixVersions.BEGINSTRING_FIX42, "MARKET", "TRADER");
SessionID initiatorSessionID = new SessionID(FixVersions.BEGINSTRING_FIX42, "TRADER", "MARKET");
- quickfixjEngine = new QuickfixjEngine("quickfix:test", "examples/inprocess.cfg", false);
+ quickfixjEngine = new QuickfixjEngine("quickfix:test", "examples/inprocess.cfg");
doLogonEventsTest(acceptorSessionID, initiatorSessionID, quickfixjEngine);
Modified: camel/trunk/components/camel-quickfix/src/test/java/org/apache/camel/component/quickfixj/TestSupport.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-quickfix/src/test/java/org/apache/camel/component/quickfixj/TestSupport.java?rev=1382286&r1=1382285&r2=1382286&view=diff
==============================================================================
--- camel/trunk/components/camel-quickfix/src/test/java/org/apache/camel/component/quickfixj/TestSupport.java (original)
+++ camel/trunk/components/camel-quickfix/src/test/java/org/apache/camel/component/quickfixj/TestSupport.java Sat Sep 8 11:47:37 2012
@@ -111,7 +111,7 @@ public final class TestSupport {
settings.setLong(sessionID, Acceptor.SETTING_SOCKET_ACCEPT_PORT, 8000);
settings.setBool(sessionID, Session.SETTING_USE_DATA_DICTIONARY, false);
- return new QuickfixjEngine("", settings, false,
+ return new QuickfixjEngine("", settings,
mockMessageStoreFactory,
Mockito.mock(LogFactory.class),
Mockito.mock(MessageFactory.class));