Skip to content

BugFix - Remove invalid condition in auto configuration #39

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
May 2, 2020
Merged

BugFix - Remove invalid condition in auto configuration #39

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4bff681
Removed ServerConfigAvailableCondition and ClientConfigAvailableCondi…
May 1, 2020
d516d63
Added unit test for client and server with provided session settings.…
May 2, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 6 additions & 21 deletions .../quickfixj/spring/boot/starter/autoconfigure/client/QuickFixJClientAutoConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,9 @@
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
import org.springframework.boot.autoconfigure.condition.ConditionalOnSingleCandidate;
import org.springframework.boot.autoconfigure.condition.ResourceCondition;
import org.springframework.boot.context.properties.EnableConfigurationProperties;
import org.springframework.context.ApplicationEventPublisher;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Conditional;
import org.springframework.context.annotation.Configuration;

import io.allune.quickfixj.spring.boot.starter.application.EventPublisherApplicationAdapter;
Expand Down Expand Up @@ -58,7 +56,6 @@
@Configuration
@EnableConfigurationProperties(QuickFixJBootProperties.class)
@ConditionalOnBean(QuickFixJClientMarkerConfiguration.Marker.class)
@Conditional(QuickFixJClientAutoConfiguration.ClientConfigAvailableCondition.class)
public class QuickFixJClientAutoConfiguration {

private static final String SYSTEM_VARIABLE_QUICKFIXJ_CLIENT_CONFIG = "quickfixj.client.config";
Expand All @@ -75,25 +72,25 @@ public SessionSettings clientSessionSettings(QuickFixJBootProperties properties)
}

@Bean
@ConditionalOnMissingBean(name = "clientApplication")
@ConditionalOnMissingBean(name = "clientApplication", value = Application.class)
public Application clientApplication(ApplicationEventPublisher applicationEventPublisher) {
return new EventPublisherApplicationAdapter(applicationEventPublisher);
}

@Bean
@ConditionalOnMissingBean(name = "clientMessageStoreFactory")
@ConditionalOnMissingBean(name = "clientMessageStoreFactory", value = MessageStoreFactory.class)
public MessageStoreFactory clientMessageStoreFactory() {
return new MemoryStoreFactory();
}

@Bean
@ConditionalOnMissingBean(name = "clientLogFactory")
@ConditionalOnMissingBean(name = "clientLogFactory", value = LogFactory.class)
public LogFactory clientLogFactory(SessionSettings clientSessionSettings) {
return new ScreenLogFactory(clientSessionSettings);
}

@Bean
@ConditionalOnMissingBean(name = "clientMessageFactory")
@ConditionalOnMissingBean(name = "clientMessageFactory", value = MessageFactory.class)
public MessageFactory clientMessageFactory() {
return new DefaultMessageFactory();
}
Expand Down Expand Up @@ -150,7 +147,7 @@ public ConnectorManager clientConnectionManager(Initiator clientInitiator, Quick
@ConditionalOnProperty(prefix = "quickfixj.client", name = "jmx-enabled", havingValue = "true")
@ConditionalOnClass(JmxExporter.class)
@ConditionalOnSingleCandidate(Initiator.class)
@ConditionalOnMissingBean(name = "clientInitiatorMBean")
@ConditionalOnMissingBean(name = "clientInitiatorMBean", value = ObjectName.class)
public ObjectName clientInitiatorMBean(Initiator clientInitiator) {
try {
JmxExporter exporter = new JmxExporter();
Expand All @@ -161,20 +158,8 @@ public ObjectName clientInitiatorMBean(Initiator clientInitiator) {
}

@Bean
@ConditionalOnMissingBean(name = "clientQuickFixJTemplate")
@ConditionalOnMissingBean(name = "clientQuickFixJTemplate", value = QuickFixJTemplate.class)
public QuickFixJTemplate clientQuickFixJTemplate() {
return new QuickFixJTemplate();
}

/**
* {@link ClientConfigAvailableCondition} that checks if the client configuration file is defined in
* {@code quickfixj.client.config} configuration key or in the default locations.
*/
static class ClientConfigAvailableCondition extends ResourceCondition {

ClientConfigAvailableCondition() {
super("QuickFixJ Client", SYSTEM_VARIABLE_QUICKFIXJ_CLIENT_CONFIG,
"file:./" + QUICKFIXJ_CLIENT_CONFIG, "classpath:/" + QUICKFIXJ_CLIENT_CONFIG);
}
}
}
15 changes: 0 additions & 15 deletions .../quickfixj/spring/boot/starter/autoconfigure/server/QuickFixJServerAutoConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,9 @@
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
import org.springframework.boot.autoconfigure.condition.ConditionalOnSingleCandidate;
import org.springframework.boot.autoconfigure.condition.ResourceCondition;
import org.springframework.boot.context.properties.EnableConfigurationProperties;
import org.springframework.context.ApplicationEventPublisher;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Conditional;
import org.springframework.context.annotation.Configuration;

import io.allune.quickfixj.spring.boot.starter.application.EventPublisherApplicationAdapter;
Expand Down Expand Up @@ -58,7 +56,6 @@
@Configuration
@EnableConfigurationProperties(QuickFixJBootProperties.class)
@ConditionalOnBean(value = QuickFixJServerMarkerConfiguration.Marker.class)
@Conditional(QuickFixJServerAutoConfiguration.ServerConfigAvailableCondition.class)
public class QuickFixJServerAutoConfiguration {

private static final String SYSTEM_VARIABLE_QUICKFIXJ_SERVER_CONFIG = "quickfixj.server.config";
Expand Down Expand Up @@ -163,16 +160,4 @@ public ObjectName serverAcceptorMBean(Acceptor serverAcceptor) {
public QuickFixJTemplate serverQuickFixJTemplate() {
return new QuickFixJTemplate();
}

/**
* {@link ServerConfigAvailableCondition} that checks if the
* {@code quickfixj.server.config} configuration key is defined.
*/
static class ServerConfigAvailableCondition extends ResourceCondition {

ServerConfigAvailableCondition() {
super("QuickFixJ Server", SYSTEM_VARIABLE_QUICKFIXJ_SERVER_CONFIG,
"file:./quickfixj-server.cfg", "classpath:/quickfixj-server.cfg");
}
}
}
25 changes: 23 additions & 2 deletions ...une/quickfixj/spring/boot/starter/autoconfigure/QuickFixJClientAutoConfigurationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,13 +24,15 @@
import org.junit.Test;
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
import org.springframework.context.annotation.AnnotationConfigApplicationContext;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.PropertySource;

import io.allune.quickfixj.spring.boot.starter.EnableQuickFixJClient;
import io.allune.quickfixj.spring.boot.starter.application.EventPublisherApplicationAdapter;
import io.allune.quickfixj.spring.boot.starter.autoconfigure.client.QuickFixJClientAutoConfiguration;
import io.allune.quickfixj.spring.boot.starter.connection.ConnectorManager;
import io.allune.quickfixj.spring.boot.starter.connection.SessionSettingsLocator;
import io.allune.quickfixj.spring.boot.starter.exception.ConfigurationException;
import io.allune.quickfixj.spring.boot.starter.template.QuickFixJTemplate;
import quickfix.Application;
Expand All @@ -52,7 +54,7 @@
public class QuickFixJClientAutoConfigurationTest {

@Test
public void testAutoConfiguredBeansSingleThreadedAcceptor() {
public void testAutoConfiguredBeansSingleThreadedInitiator() {
AnnotationConfigApplicationContext ctx = new AnnotationConfigApplicationContext(SingleThreadedClientInitiatorConfiguration.class);
ConnectorManager clientConnectionManager = ctx.getBean("clientConnectionManager", ConnectorManager.class);
assertThat(clientConnectionManager.isRunning()).isFalse();
Expand All @@ -65,7 +67,7 @@ public void testAutoConfiguredBeansSingleThreadedAcceptor() {
}

@Test
public void testAutoConfiguredBeansMultiThreadedAcceptor() {
public void testAutoConfiguredBeansMultiThreadedInitiator() {
AnnotationConfigApplicationContext ctx = new AnnotationConfigApplicationContext(MultiThreadedClientInitiatorConfiguration.class);
ConnectorManager clientConnectionManager = ctx.getBean("clientConnectionManager", ConnectorManager.class);
assertThat(clientConnectionManager.isRunning()).isFalse();
Expand Down Expand Up @@ -106,6 +108,13 @@ public void shouldThrowConfigurationExceptionCreatingClientInitiatorMBeanGivenNu
.isThrownBy(() -> autoConfiguration.clientInitiatorMBean(null));
}

@Test
public void testAutoConfiguredBeansSingleThreadedInitiatorWithCustomClientSettings() {
AnnotationConfigApplicationContext ctx = new AnnotationConfigApplicationContext(SingleThreadedClientInitiatorConfigurationWithCustomClientSettings.class);
SessionSettings customClientSessionSettings = ctx.getBean("clientSessionSettings", SessionSettings.class);
assertThat(customClientSessionSettings.getDefaultProperties().getProperty("SenderCompID")).isEqualTo("CUSTOM-BANZAI");
}

private void hasAutoConfiguredBeans(AnnotationConfigApplicationContext ctx) {
Application clientApplication = ctx.getBean("clientApplication", Application.class);
assertThat(clientApplication).isInstanceOf(EventPublisherApplicationAdapter.class);
Expand Down Expand Up @@ -144,4 +153,16 @@ static class SingleThreadedClientInitiatorConfiguration {
static class MultiThreadedClientInitiatorConfiguration {

}

@Configuration
@EnableAutoConfiguration
@EnableQuickFixJClient
@PropertySource("classpath:single-threaded-application-no-config-defined.properties")
static class SingleThreadedClientInitiatorConfigurationWithCustomClientSettings {

@Bean(name = "clientSessionSettings")
public SessionSettings customClientSessionSettings() {
return SessionSettingsLocator.loadSettings("classpath:/quickfixj-client-extra.cfg");
}
}
}
68 changes: 45 additions & 23 deletions ...une/quickfixj/spring/boot/starter/autoconfigure/QuickFixJServerAutoConfigurationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,13 +24,15 @@
import org.junit.Test;
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
import org.springframework.context.annotation.AnnotationConfigApplicationContext;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.PropertySource;

import io.allune.quickfixj.spring.boot.starter.EnableQuickFixJServer;
import io.allune.quickfixj.spring.boot.starter.application.EventPublisherApplicationAdapter;
import io.allune.quickfixj.spring.boot.starter.autoconfigure.server.QuickFixJServerAutoConfiguration;
import io.allune.quickfixj.spring.boot.starter.connection.ConnectorManager;
import io.allune.quickfixj.spring.boot.starter.connection.SessionSettingsLocator;
import io.allune.quickfixj.spring.boot.starter.exception.ConfigurationException;
import io.allune.quickfixj.spring.boot.starter.template.QuickFixJTemplate;
import quickfix.Acceptor;
Expand Down Expand Up @@ -77,29 +79,6 @@ public void testAutoConfiguredBeansMultiThreadedAcceptor() {
hasAutoConfiguredBeans(ctx);
}

private void hasAutoConfiguredBeans(AnnotationConfigApplicationContext ctx) {
Application serverApplication = ctx.getBean("serverApplication", Application.class);
assertThat(serverApplication).isInstanceOf(EventPublisherApplicationAdapter.class);

MessageStoreFactory serverMessageStoreFactory = ctx.getBean("serverMessageStoreFactory", MessageStoreFactory.class);
assertThat(serverMessageStoreFactory).isInstanceOf(MemoryStoreFactory.class);

LogFactory serverLogFactory = ctx.getBean("serverLogFactory", LogFactory.class);
assertThat(serverLogFactory).isInstanceOf(ScreenLogFactory.class);

MessageFactory serverMessageFactory = ctx.getBean("serverMessageFactory", MessageFactory.class);
assertThat(serverMessageFactory).isInstanceOf(DefaultMessageFactory.class);

SessionSettings serverSessionSettings = ctx.getBean("serverSessionSettings", SessionSettings.class);
assertThat(serverSessionSettings).isNotNull();

ObjectName serverInitiatorMBean = ctx.getBean("serverAcceptorMBean", ObjectName.class);
assertThat(serverInitiatorMBean).isNotNull();

QuickFixJTemplate serverQuickFixJTemplate = ctx.getBean("serverQuickFixJTemplate", QuickFixJTemplate.class);
assertThat(serverQuickFixJTemplate).isNotNull();
}

@Test
public void shouldCreateServerThreadedAcceptor() throws ConfigError {
// Given
Expand Down Expand Up @@ -129,6 +108,36 @@ public void shouldThrowConfigurationExceptionCreatingServerAcceptorMBeanGivenNul
.isThrownBy(() -> autoConfiguration.serverAcceptorMBean(null));
}

@Test
public void testAutoConfiguredBeansSingleThreadedAcceptorWithCustomServerSettings() {
AnnotationConfigApplicationContext ctx = new AnnotationConfigApplicationContext(SingleThreadedServerAcceptorConfigurationWithCustomClientSettings.class);
SessionSettings customClientSessionSettings = ctx.getBean("serverSessionSettings", SessionSettings.class);
assertThat(customClientSessionSettings.getDefaultProperties().getProperty("SenderCompID")).isEqualTo("CUSTOM-EXEC");
}

private void hasAutoConfiguredBeans(AnnotationConfigApplicationContext ctx) {
Application serverApplication = ctx.getBean("serverApplication", Application.class);
assertThat(serverApplication).isInstanceOf(EventPublisherApplicationAdapter.class);

MessageStoreFactory serverMessageStoreFactory = ctx.getBean("serverMessageStoreFactory", MessageStoreFactory.class);
assertThat(serverMessageStoreFactory).isInstanceOf(MemoryStoreFactory.class);

LogFactory serverLogFactory = ctx.getBean("serverLogFactory", LogFactory.class);
assertThat(serverLogFactory).isInstanceOf(ScreenLogFactory.class);

MessageFactory serverMessageFactory = ctx.getBean("serverMessageFactory", MessageFactory.class);
assertThat(serverMessageFactory).isInstanceOf(DefaultMessageFactory.class);

SessionSettings serverSessionSettings = ctx.getBean("serverSessionSettings", SessionSettings.class);
assertThat(serverSessionSettings).isNotNull();

ObjectName serverInitiatorMBean = ctx.getBean("serverAcceptorMBean", ObjectName.class);
assertThat(serverInitiatorMBean).isNotNull();

QuickFixJTemplate serverQuickFixJTemplate = ctx.getBean("serverQuickFixJTemplate", QuickFixJTemplate.class);
assertThat(serverQuickFixJTemplate).isNotNull();
}

@Configuration
@EnableAutoConfiguration
@EnableQuickFixJServer
Expand All @@ -144,4 +153,17 @@ static class SingleThreadedServerAcceptorConfiguration {
static class MultiThreadedServerAcceptorConfiguration {

}

@Configuration
@EnableAutoConfiguration
@EnableQuickFixJServer
@PropertySource("classpath:single-threaded-application-no-config-defined.properties")
static class SingleThreadedServerAcceptorConfigurationWithCustomClientSettings {

@Bean(name = "serverSessionSettings")
public SessionSettings serverSessionSettings() {
return SessionSettingsLocator.loadSettings("classpath:/quickfixj-server-extra.cfg");
}
}

}
2 changes: 1 addition & 1 deletion .../integration/QuickFixJServerClientIT.java → ...QuickFixJServerClientIntegrationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
*/
@RunWith(SpringJUnit4ClassRunner.class)
@SpringBootTest(classes = QuickFixJServerClientITConfiguration.class)
public class QuickFixJServerClientIT {
public class QuickFixJServerClientIntegrationTest {

@Autowired
private QuickFixJTemplate serverQuickFixJTemplate;
Expand Down
36 changes: 36 additions & 0 deletions quickfixj-spring-boot-starter/src/test/resources/quickfixj-client-extra.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
[default]
FileStorePath=target/data/some-other-path-client
ConnectionType=initiator
SenderCompID=CUSTOM-BANZAI
TargetCompID=EXEC
SocketConnectHost=localhost
StartTime=00:00:00
EndTime=00:00:00
HeartBtInt=30
ReconnectInterval=5
FileLogPath=logs-client

[session]
BeginString=FIX.4.0
SocketConnectPort=9876

[session]
BeginString=FIX.4.1
SocketConnectPort=9877

[session]
BeginString=FIX.4.2
SocketConnectPort=9878

[session]
BeginString=FIX.4.3
SocketConnectPort=9879

[session]
BeginString=FIX.4.4
SocketConnectPort=9880

[session]
BeginString=FIXT.1.1
DefaultApplVerID=FIX.5.0
SocketConnectPort=9881
37 changes: 37 additions & 0 deletions quickfixj-spring-boot-starter/src/test/resources/quickfixj-server-extra.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
[default]
FileStorePath=target/data/some-other-path-server
ConnectionType=acceptor
StartTime=00:00:00
EndTime=00:00:00
HeartBtInt=30
ValidOrderTypes=1,2,F
SenderCompID=CUSTOM-EXEC
TargetCompID=BANZAI
UseDataDictionary=Y
DefaultMarketPrice=12.30
FileLogPath=logs-server

[session]
BeginString=FIX.4.0
SocketAcceptPort=9876

[session]
BeginString=FIX.4.1
SocketAcceptPort=9877

[session]
BeginString=FIX.4.2
SocketAcceptPort=9878

[session]
BeginString=FIX.4.3
SocketAcceptPort=9879

[session]
BeginString=FIX.4.4
SocketAcceptPort=9880

[session]
BeginString=FIXT.1.1
DefaultApplVerID=FIX.5.0
SocketAcceptPort=9881
6 changes: 6 additions & 0 deletions ...-boot-starter/src/test/resources/single-threaded-application-no-config-defined.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
quickfixj.server.concurrent.enabled=false
quickfixj.server.autoStartup=false
quickfixj.server.jmx-enabled=true
quickfixj.client.concurrent.enabled=false
quickfixj.client.autoStartup=false
quickfixj.client.jmx-enabled=true