Skip to content

Added function removeSection in SessionSettings #750

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 1 commit into from
Feb 13, 2024
Merged

Added function removeSection in SessionSettings #750

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
18 changes: 18 additions & 0 deletions quickfixj-core/src/main/java/quickfix/SessionSettings.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -877,4 +877,22 @@ public static Set<InetAddress> parseRemoteAddresses(String raw) {
return result;
}

public void removeSection(final SessionID sessionID) throws ConfigError {
Properties properties = getSessionProperties(sessionID);

if (properties == null) {
throw new ConfigError("Session not found");
}
sections.remove(sessionID);
}

public void removeSection(final String propertyKey, final String propertyValue) throws ConfigError {
SessionID sessionIdToRemove = sections.entrySet().stream()
.filter(entry -> propertyValue.equals(entry.getValue().get(propertyKey)))
.map(Map.Entry::getKey)
.findFirst()
.orElseThrow(() -> new ConfigError("Session not found"));

sections.remove(sessionIdToRemove);
}
}
46 changes: 46 additions & 0 deletions quickfixj-core/src/test/java/quickfix/SessionSettingsTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@
import java.util.Iterator;
import java.util.Properties;
import java.util.Set;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.HashMap;
Expand Down Expand Up @@ -610,6 +611,51 @@ public void testConcurrentAccess() throws ConfigError, InterruptedException {
assertTrue(testHasPassed.get());
}

@Test
public void testRemoveSectionBySessionID() throws ConfigError {
final Map<Object, Object> defaultSettings = createDefaultSettings();

final Map<Object, Object> pricingSection = createPricingSection();
final SessionID pricingSessionID = new SessionID("FIX.4.2:FOOBAR_PRICING->*");

final Map<Object, Object> tradingSection = createTradingSection();
final SessionID tradingSessionID = new SessionID("FIX.4.2:FOOBAR_TRADING->*");

final SessionSettings sessionSettings = new SessionSettings();
sessionSettings.set(new Dictionary(null, defaultSettings));
sessionSettings.set(pricingSessionID, new Dictionary("sessions", pricingSection));
sessionSettings.set(tradingSessionID, new Dictionary("sessions", tradingSection));

while (sessionSettings.sectionIterator().hasNext()) {
SessionID sessionID = sessionSettings.sectionIterator().next();
sessionSettings.removeSection(sessionID);
}

assertFalse(sessionSettings.sectionIterator().hasNext());
}

@Test
public void testRemoveSectionByPropertyKey() throws ConfigError {
final Map<Object, Object> defaultSettings = createDefaultSettings();

final Map<Object, Object> tradingSection = createTradingSection();
final SessionID tradingSessionID = new SessionID("FIX.4.2:FOOBAR_TRADING->*");

final SessionSettings sessionSettings = new SessionSettings();
sessionSettings.set(new Dictionary(null, defaultSettings));
sessionSettings.set(tradingSessionID, new Dictionary("sessions", tradingSection));

sessionSettings.removeSection("SocketAcceptPort", "7566");

Set<SessionID> expectedSessionIdSet = new HashSet<>();
while (sessionSettings.sectionIterator().hasNext()) {
SessionID sessionID = sessionSettings.sectionIterator().next();
expectedSessionIdSet.add(sessionID);
}

assertFalse(expectedSessionIdSet.contains(tradingSessionID));
}

private Map<Object, Object> createTradingSection() {
final Map<Object, Object> tradingSection = new HashMap<>();
tradingSection.put("PersistMessages","Y");
Expand Down