Skip to content

Improvements #1057

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

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Improvements #1057

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
91782d5
Minor changes to the quickfixj-core module to reduce unnecessary
abhishekraha Oct 3, 2025
3aa2197
Minor changes to the quickfixj-core module to reduce unnecessary
abhishekraha Oct 3, 2025
08df249
reverted import changes as per review comments
abhishekraha Oct 4, 2025
9190c87
Merge branch 'master' into improvements
abhishekraha Oct 21, 2025
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
34 changes: 7 additions & 27 deletions quickfixj-core/src/main/java/quickfix/CachedFileStore.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,26 +24,8 @@
import org.slf4j.LoggerFactory;
import quickfix.field.converter.UtcTimestampConverter;

import java.io.BufferedInputStream;
import java.io.BufferedOutputStream;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.EOFException;
import java.io.File;
import java.io.FileInputStream;
import java.io.FileOutputStream;
import java.io.IOException;
import java.io.OutputStream;
import java.io.RandomAccessFile;
import java.util.ArrayList;
import java.util.Calendar;
import java.util.Collection;
import java.util.Date;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.TreeMap;
import java.io.*;
import java.util.*;

/**
* File store implementation. THIS CLASS IS PUBLIC ONLY TO MAINTAIN COMPATIBILITY WITH THE QUICKFIX JNI. IT SHOULD ONLY
Expand Down Expand Up @@ -100,9 +82,7 @@ public class CachedFileStore implements MessageStore {
sessionFileName = prefix + "session";

final File directory = new File(msgFileName).getParentFile();
if (!directory.exists()) {
directory.mkdirs();
}
directory.mkdirs();

initialize(false);
}
Expand Down Expand Up @@ -176,7 +156,7 @@ private void initializeSequenceNumbers() throws IOException {
final String s = sequenceNumberFile.readUTF();
final int offset = s.indexOf(':');
if (offset < 0) {
throw new IOException("Invalid sequenceNumbderFile '" + seqNumFileName
throw new IOException("Invalid sequenceNumberFile '" + seqNumFileName
+ "' character ':' is missing");
}
cache.setNextSenderMsgSeqNum(Integer.parseInt(s.substring(0, offset)));
Expand Down Expand Up @@ -349,7 +329,7 @@ public boolean set(int sequence, String message) throws IOException {
final long offset = messageFileWriter.getFilePointer();
final byte[] messageBytes = message.getBytes(CharsetSupport.getCharset());
final int size = messageBytes.length;
messageIndex.put((long) sequence, new long[] { offset, size });
messageIndex.put((long) sequence, new long[]{offset, size});
headerDataOutputStream.writeInt(sequence);
headerDataOutputStream.writeLong(offset);
headerDataOutputStream.writeInt(size);
Expand Down Expand Up @@ -488,7 +468,7 @@ private long[] seekMessageIndex(final long index) {
final long offset = headerDataInputStream.readLong();
final int size = headerDataInputStream.readInt();
if (index == sequenceNumber) {
return new long[] { offset, size };
return new long[]{offset, size};
}
}
} catch (final IOException e) {
Expand Down Expand Up @@ -519,7 +499,7 @@ private List<long[]> seekMessageIndex(final long startSequence, final long endSe
final long offset = headerDataInputStream.readLong();
final int size = headerDataInputStream.readInt();
if (sequenceNumber >= startSequence && sequenceNumber <= endSequence) {
indexPerSequenceNumber.put(sequenceNumber, new long[] { offset, size });
indexPerSequenceNumber.put(sequenceNumber, new long[]{offset, size});
}
}
} catch (final IOException e) {
Expand Down
2 changes: 1 addition & 1 deletion quickfixj-core/src/main/java/quickfix/CachedFileStoreFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@

/**
* Creates a message store that stores messages in a file. Compatibility note: The file formats are not compatible with
* QF C++/JNI. If you upgrading from the QuickFIX JNI, you must delete your old session state files.)
* QF C++/JNI. If you're upgrading from the QuickFIX JNI, you must delete your old session state files.)
*/
public class CachedFileStoreFactory extends FileStoreFactory {

Expand Down
45 changes: 20 additions & 25 deletions quickfixj-core/src/main/java/quickfix/DefaultSessionFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,12 +27,7 @@
import quickfix.field.DefaultApplVerID;

import java.net.InetAddress;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Enumeration;
import java.util.List;
import java.util.Properties;
import java.util.Set;
import java.util.*;

/**
* Factory for creating sessions. Used by the communications code (acceptors,
Expand All @@ -56,7 +51,7 @@ public class DefaultSessionFactory implements SessionFactory {
private final SessionScheduleFactory sessionScheduleFactory;

public DefaultSessionFactory(Application application, MessageStoreFactory messageStoreFactory,
LogFactory logFactory) {
LogFactory logFactory) {
this.application = application;
this.messageStoreFactory = messageStoreFactory;
this.messageQueueFactory = new InMemoryMessageQueueFactory();
Expand All @@ -66,7 +61,7 @@ public DefaultSessionFactory(Application application, MessageStoreFactory messag
}

public DefaultSessionFactory(Application application, MessageStoreFactory messageStoreFactory,
LogFactory logFactory, MessageFactory messageFactory) {
LogFactory logFactory, MessageFactory messageFactory) {
this.application = application;
this.messageStoreFactory = messageStoreFactory;
this.messageQueueFactory = new InMemoryMessageQueueFactory();
Expand Down Expand Up @@ -274,7 +269,7 @@ public Session create(SessionID sessionID, SessionSettings settings) throws Conf
}

private void processPreFixtDataDictionary(SessionID sessionID, SessionSettings settings,
DefaultDataDictionaryProvider dataDictionaryProvider) throws ConfigError,
DefaultDataDictionaryProvider dataDictionaryProvider) throws ConfigError,
FieldConvertError {
final DataDictionary dataDictionary = createDataDictionary(sessionID, settings,
Session.SETTING_DATA_DICTIONARY, sessionID.getBeginString());
Expand All @@ -284,7 +279,7 @@ private void processPreFixtDataDictionary(SessionID sessionID, SessionSettings s
}

private DataDictionary createDataDictionary(SessionID sessionID, SessionSettings settings,
String settingsKey, String beginString) throws ConfigError, FieldConvertError {
String settingsKey, String beginString) throws ConfigError, FieldConvertError {
final String path = getDictionaryPath(sessionID, settings, settingsKey, beginString);
return getDataDictionary(path);
}
Expand All @@ -293,22 +288,22 @@ private ValidationSettings createValidationSettings(SessionID sessionID, Session
ValidationSettings validationSettings = new ValidationSettings();

validationSettings.setCheckFieldsOutOfOrder(settings.getBoolOrDefault(sessionID,
Session.SETTING_VALIDATE_FIELDS_OUT_OF_ORDER, validationSettings.isCheckFieldsOutOfOrder()));
Session.SETTING_VALIDATE_FIELDS_OUT_OF_ORDER, validationSettings.isCheckFieldsOutOfOrder()));

validationSettings.setCheckFieldsHaveValues(settings.getBoolOrDefault(sessionID,
Session.SETTING_VALIDATE_FIELDS_HAVE_VALUES, validationSettings.isCheckFieldsHaveValues()));
Session.SETTING_VALIDATE_FIELDS_HAVE_VALUES, validationSettings.isCheckFieldsHaveValues()));

validationSettings.setCheckUnorderedGroupFields(settings.getBoolOrDefault(sessionID,
Session.SETTING_VALIDATE_UNORDERED_GROUP_FIELDS, validationSettings.isCheckUnorderedGroupFields()));
Session.SETTING_VALIDATE_UNORDERED_GROUP_FIELDS, validationSettings.isCheckUnorderedGroupFields()));

validationSettings.setCheckUserDefinedFields(settings.getBoolOrDefault(sessionID,
Session.SETTING_VALIDATE_USER_DEFINED_FIELDS, validationSettings.isCheckUserDefinedFields()));
Session.SETTING_VALIDATE_USER_DEFINED_FIELDS, validationSettings.isCheckUserDefinedFields()));

validationSettings.setAllowUnknownMessageFields(settings.getBoolOrDefault(sessionID,
Session.SETTING_ALLOW_UNKNOWN_MSG_FIELDS, validationSettings.isAllowUnknownMessageFields()));
Session.SETTING_ALLOW_UNKNOWN_MSG_FIELDS, validationSettings.isAllowUnknownMessageFields()));

validationSettings.setFirstFieldInGroupIsDelimiter(settings.getBoolOrDefault(sessionID,
Session.SETTING_FIRST_FIELD_IN_GROUP_IS_DELIMITER, validationSettings.isFirstFieldInGroupIsDelimiter()));
Session.SETTING_FIRST_FIELD_IN_GROUP_IS_DELIMITER, validationSettings.isFirstFieldInGroupIsDelimiter()));

validateValidationSettings(validationSettings);

Expand All @@ -323,7 +318,7 @@ private void validateValidationSettings(ValidationSettings validationSettings) {
}

private void processFixtDataDictionaries(SessionID sessionID, SessionSettings settings,
DefaultDataDictionaryProvider dataDictionaryProvider) throws ConfigError,
DefaultDataDictionaryProvider dataDictionaryProvider) throws ConfigError,
FieldConvertError {
dataDictionaryProvider.addTransportDictionary(
sessionID.getBeginString(),
Expand Down Expand Up @@ -373,7 +368,7 @@ private boolean isApplVerIdEnum(String value) {
}

private String getDictionaryPath(SessionID sessionID, SessionSettings settings,
String settingsKey, String beginString) throws ConfigError, FieldConvertError {
String settingsKey, String beginString) throws ConfigError, FieldConvertError {
String path;
if (settings.isSetting(sessionID, settingsKey)) {
path = settings.getString(sessionID, settingsKey);
Expand Down Expand Up @@ -410,7 +405,7 @@ private int[] getLogonIntervalsInSeconds(SessionSettings settings, SessionID ses
throw new ConfigError(e);
}
}
return new int[] { 5 }; // default value
return new int[]{5}; // default value
}

private Set<InetAddress> getInetAddresses(SessionSettings settings, SessionID sessionID)
Expand All @@ -428,26 +423,26 @@ private Set<InetAddress> getInetAddresses(SessionSettings settings, SessionID se
}

private boolean getSetting(SessionSettings settings, SessionID sessionID, String key,
boolean defaultValue) throws ConfigError, FieldConvertError {
boolean defaultValue) throws ConfigError, FieldConvertError {
return settings.isSetting(sessionID, key) ? settings.getBool(sessionID, key) : defaultValue;
}

private int getSetting(SessionSettings settings, SessionID sessionID, String key,
int defaultValue) throws ConfigError, FieldConvertError {
int defaultValue) throws ConfigError, FieldConvertError {
return settings.isSetting(sessionID, key)
? (int) settings.getLong(sessionID, key)
: defaultValue;
}

private double getSetting(SessionSettings settings, SessionID sessionID, String key,
double defaultValue) throws ConfigError, FieldConvertError {
double defaultValue) throws ConfigError, FieldConvertError {
return settings.isSetting(sessionID, key)
? Double.parseDouble(settings.getString(sessionID, key))
: defaultValue;
}

private UtcTimestampPrecision getTimestampPrecision(SessionSettings settings, SessionID sessionID,
UtcTimestampPrecision defaultValue) throws ConfigError, FieldConvertError {
UtcTimestampPrecision defaultValue) throws ConfigError, FieldConvertError {
if (settings.isSetting(sessionID, Session.SETTING_TIMESTAMP_PRECISION)) {
String string = settings.getString(sessionID, Session.SETTING_TIMESTAMP_PRECISION);
try {
Expand All @@ -462,13 +457,13 @@ private UtcTimestampPrecision getTimestampPrecision(SessionSettings settings, Se

private List<StringField> getLogonTags(SessionSettings settings, SessionID sessionID) throws ConfigError, FieldConvertError {
List<StringField> logonTags = new ArrayList<>();
for (int index = 0;; index++) {
for (int index = 0; ; index++) {
final String logonTagSetting = Session.SETTING_LOGON_TAG
+ (index == 0 ? "" : NumbersCache.get(index));
if (settings.isSetting(sessionID, logonTagSetting)) {
String tag = settings.getString(sessionID, logonTagSetting);
String[] split = tag.split("=", 2);
StringField stringField = new StringField(Integer.valueOf(split[0]), split[1]);
StringField stringField = new StringField(Integer.parseInt(split[0]), split[1]);
logonTags.add(stringField);
} else {
break;
Expand Down
17 changes: 5 additions & 12 deletions quickfixj-core/src/main/java/quickfix/FileLog.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,17 +19,11 @@

package quickfix;

import java.io.File;
import java.io.FileNotFoundException;
import java.io.FileOutputStream;
import java.io.IOException;
import java.io.OutputStream;
import java.io.UnsupportedEncodingException;

import org.quickfixj.CharsetSupport;

import quickfix.field.converter.UtcTimestampConverter;

import java.io.*;

/**
* File log implementation. THIS CLASS IS PUBLIC ONLY TO MAINTAIN COMPATIBILITY
* WITH THE QUICKFIX JNI. IT SHOULD ONLY BE CREATED USING A FACTORY.
Expand Down Expand Up @@ -69,9 +63,8 @@ public class FileLog extends AbstractLog {
eventFileName = prefix + "event.log";

File directory = new File(messagesFileName).getParentFile();
if (!directory.exists()) {
directory.mkdirs();
}
directory.mkdirs();


this.includeMillis = includeMillis;
this.includeTimestampForMessages = includeTimestampForMessages;
Expand All @@ -94,7 +87,7 @@ protected void logOutgoing(String message) {

private void writeMessage(FileOutputStream stream, Object lock, String message, boolean forceTimestamp) {
try {
synchronized(lock) {
synchronized (lock) {
if (forceTimestamp || includeTimestampForMessages) {
writeTimeStamp(stream);
}
Expand Down
25 changes: 4 additions & 21 deletions quickfixj-core/src/main/java/quickfix/FileStore.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,23 +22,8 @@
import org.quickfixj.CharsetSupport;
import quickfix.field.converter.UtcTimestampConverter;

import java.io.BufferedInputStream;
import java.io.BufferedOutputStream;
import java.io.Closeable;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.EOFException;
import java.io.File;
import java.io.FileInputStream;
import java.io.FileOutputStream;
import java.io.IOException;
import java.io.RandomAccessFile;
import java.util.Calendar;
import java.util.Collection;
import java.util.Date;
import java.util.HashSet;
import java.util.Set;
import java.util.TreeMap;
import java.io.*;
import java.util.*;

/**
* File store implementation. THIS CLASS IS PUBLIC ONLY TO MAINTAIN
Expand Down Expand Up @@ -88,9 +73,7 @@ public class FileStore implements MessageStore, Closeable {
sessionFileName = prefix + "session";

final File directory = new File(msgFileName).getParentFile();
if (!directory.exists()) {
directory.mkdirs();
}
directory.mkdirs();

initialize(false);
}
Expand Down Expand Up @@ -203,7 +186,7 @@ private void updateMessageIndex(long sequenceNum, long offset, int size) {
messageIndex.pollFirstEntry();
}

messageIndex.put(sequenceNum, new long[] { offset, size });
messageIndex.put(sequenceNum, new long[]{offset, size});
}

/**
Expand Down
6 changes: 3 additions & 3 deletions quickfixj-core/src/main/java/quickfix/MessageCracker.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ public class MessageCracker {
public @interface Handler {
}

public class RedundantHandlerException extends RuntimeException {
public static class RedundantHandlerException extends RuntimeException {
private final Class<?> messageClass;
private final Method originalMethod;
private final Method redundantMethod;
Expand All @@ -55,7 +55,7 @@ public RedundantHandlerException(Class<?> messageClass, Method originalMethod,

@Override
public String toString() {
return "Duplicate handler method for " + messageClass + ", orginal method is "
return "Duplicate handler method for " + messageClass + ", original method is "
+ originalMethod + ", redundant method is " + redundantMethod;
}
}
Expand Down Expand Up @@ -97,7 +97,7 @@ private boolean matchesConventionOrAnnotation(Method method) {
return method.getName().equals("onMessage") || method.isAnnotationPresent(Handler.class);
}

private class Invoker {
private static class Invoker {
private final Object target;
private final Method method;

Expand Down
Loading