Skip to content

Stabilize external-DTD dictionary loading in MessageTest with short timeouts and bounded retries #1220

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
chrjohn merged 11 commits into from
May 10, 2026
Merged

Stabilize external-DTD dictionary loading in MessageTest with short timeouts and bounded retries #1220

Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
cd73008
Stabilize external DTD MessageTest with timeout and retries
Copilot May 9, 2026
a5c4372
Refine external DTD retry helper in MessageTest
Copilot May 9, 2026
d538482
Remove dead-code null check in DTD retry helper
Copilot May 9, 2026
da56791
Rename retry loop variable for clarity
Copilot May 9, 2026
ea02b61
Improve external DTD retry failure diagnostics
Copilot May 9, 2026
9784f39
Align retry attempt numbering in failure message
Copilot May 9, 2026
91b5559
Add short backoff between external DTD load retries
Copilot May 9, 2026
9a9393a
Preserve original exception cause across DTD retries
Copilot May 9, 2026
5553875
Use incremental backoff between DTD retry attempts
Copilot May 9, 2026
5593190
Switch DTD retry delay to exponential backoff
Copilot May 9, 2026
a2fa570
Use bit-shift exponential backoff in DTD retry delay
Copilot May 9, 2026
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
48 changes: 47 additions & 1 deletion quickfixj-core/src/test/java/quickfix/MessageTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,6 +143,11 @@
* message classes that are generated later in the compile process.
*/
public class MessageTest {
private static final String DEFAULT_CONNECT_TIMEOUT_PROPERTY = "sun.net.client.defaultConnectTimeout";
private static final String DEFAULT_READ_TIMEOUT_PROPERTY = "sun.net.client.defaultReadTimeout";
private static final int EXTERNAL_DTD_TIMEOUT_MILLIS = 5000;
private static final int EXTERNAL_DTD_LOAD_RETRIES = 3;
private static final int EXTERNAL_DTD_RETRY_DELAY_MILLIS = 250;

@Rule
public ExpectedException expectedException = ExpectedException.none();
Expand Down Expand Up @@ -1265,14 +1270,55 @@ public void testIfMessageHeaderIsOverwritten() {

@Test
public void shouldConvertToXmlWhenDataDictionaryLoadedWithExternalDTD() throws ConfigError {
DataDictionary dataDictionary = new DataDictionary("FIX_External_DTD.xml", DocumentBuilderFactory::newInstance);
DataDictionary dataDictionary = loadDataDictionaryWithExternalDtdRetry();
Message message = new Message();
message.setString(Account.FIELD, "test-account");

String xml = message.toXML(dataDictionary);
xml = xml.replace("\r", "").replace("\n", "").replaceAll(">\\s+<", "><");
assertEquals("<?xml version=\"1.0\" encoding=\"ISO-8859-1\" standalone=\"no\"?><message><header/><body><field name=\"Account\" tag=\"1\"><![CDATA[test-account]]></field></body><trailer/></message>", xml);
}

private DataDictionary loadDataDictionaryWithExternalDtdRetry() throws ConfigError {
final String previousConnectTimeout = System.getProperty(DEFAULT_CONNECT_TIMEOUT_PROPERTY);
final String previousReadTimeout = System.getProperty(DEFAULT_READ_TIMEOUT_PROPERTY);
try {
final String timeout = String.valueOf(EXTERNAL_DTD_TIMEOUT_MILLIS);
System.setProperty(DEFAULT_CONNECT_TIMEOUT_PROPERTY, timeout);
System.setProperty(DEFAULT_READ_TIMEOUT_PROPERTY, timeout);

ConfigError lastError = new ConfigError("Could not parse data dictionary file");
for (int attempt = 1; attempt <= EXTERNAL_DTD_LOAD_RETRIES; attempt++) {
try {
return new DataDictionary("FIX_External_DTD.xml", DocumentBuilderFactory::newInstance);
} catch (ConfigError e) {
lastError = e;
if (attempt < EXTERNAL_DTD_LOAD_RETRIES) {
try {
Thread.sleep((1L << (attempt - 1)) * EXTERNAL_DTD_RETRY_DELAY_MILLIS);
} catch (InterruptedException interruptedException) {
Thread.currentThread().interrupt();
throw new ConfigError("Interrupted while retrying FIX_External_DTD.xml load", interruptedException);
}
}
}
}
throw new ConfigError("Failed to load FIX_External_DTD.xml after "
+ EXTERNAL_DTD_LOAD_RETRIES + " attempts", lastError);
} finally {
restoreSystemProperty(DEFAULT_CONNECT_TIMEOUT_PROPERTY, previousConnectTimeout);
restoreSystemProperty(DEFAULT_READ_TIMEOUT_PROPERTY, previousReadTimeout);
}
}

private static void restoreSystemProperty(String key, String value) {
if (value == null) {
System.clearProperty(key);
} else {
System.setProperty(key, value);
}
}

@Test
public void shouldConvertToXMLWithoutIndent() {
Message message = new Message();
Expand Down
Loading