Skip to content

Extract Saxon version into property and remove XPath limit workarounds #1199

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

Draft
Copilot wants to merge 3 commits into
base: master
Choose a base branch
from
Draft

Extract Saxon version into property and remove XPath limit workarounds #1199

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
35ead49
Fix XPath limit: add Saxon to xml-maven-plugin and use XSLT 2.0 seque…
Copilot Apr 30, 2026
dc7f488
Extract Saxon version into property saxon.version
Copilot Apr 30, 2026
48a9882
Remove increased XPath limits now that Saxon is used for XSLT processing
Copilot Apr 30, 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
2 changes: 1 addition & 1 deletion .junie/guidelines.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ QuickFIX/J is a full-featured messaging engine for the FIX protocol. It is a 100
2. Build the project:
Junie, please make sure to only use JDK 8 for the build and use the following Java options:
```
./mvnw package -Dmaven.javadoc.skip=true -PskipBundlePlugin,minimal-fix-latest -Xms3g -Xmx6g -Djdk.xml.xpathExprGrpLimit=500 -Djdk.xml.xpathExprOpLimit=500
./mvnw package -Dmaven.javadoc.skip=true -PskipBundlePlugin,minimal-fix-latest -Xms3g -Xmx6g
```

## Coding Standards
Expand Down
2 changes: 1 addition & 1 deletion .mvn/jvm.config
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
-Xms3g -Xmx6g -Djdk.xml.xpathExprGrpLimit=500 -Djdk.xml.xpathExprOpLimit=500
-Xms3g -Xmx6g
9 changes: 9 additions & 0 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,7 @@
<orchestra.file>OrchestraFIXLatest.xml</orchestra.file>
<org.quickfixj.orchestra.tools.version>1.0.3</org.quickfixj.orchestra.tools.version>
<jaxen.version>2.0.1</jaxen.version>
<saxon.version>12.9</saxon.version>
<jmh.version>1.37</jmh.version>
<jcstress.version>0.16</jcstress.version>
<hsqldb.version>1.8.0.10</hsqldb.version>
Expand Down Expand Up @@ -400,6 +401,14 @@
<groupId>org.codehaus.mojo</groupId>
<artifactId>xml-maven-plugin</artifactId>
<version>${xml-maven-plugin-version}</version>
<dependencies>
<!-- Use Saxon to process XSLT 2.0 stylesheets correctly and avoid JDK's XPath operation count limit -->
<dependency>
<groupId>net.sf.saxon</groupId>
<artifactId>Saxon-HE</artifactId>
<version>${saxon.version}</version>
</dependency>
</dependencies>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
Expand Down
61 changes: 8 additions & 53 deletions quickfixj-base/src/main/xsl/extractRequiredFields.xsl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,59 +15,14 @@
</xsl:template>

<!-- remove all the fields that are not required by core -->
<xsl:template match="fixr:fields/fixr:field[not(
@id='1156'
or @id='1128'
or @id='7'
or @id='8'
or @id='9'
or @id='380'
or @id='10'
or @id='1129'
or @id='1137'
or @id='128'
or @id='145'
or @id='129'
or @id='98'
or @id='16'
or @id='123'
or @id='108'
or @id='369'
or @id='347'
or @id='34'
or @id='35'
or @id='36'
or @id='789'
or @id='627'
or @id='115'
or @id='144'
or @id='370'
or @id='116'
or @id='122'
or @id='43'
or @id='97'
or @id='372'
or @id='45'
or @id='371'
or @id='141'
or @id='90'
or @id='91'
or @id='49'
or @id='142'
or @id='50'
or @id='52'
or @id='373'
or @id='1409'
or @id='89'
or @id='93'
or @id='56'
or @id='143'
or @id='57'
or @id='112'
or @id='58'
or @id='213'
or @id='212'
)]">
<xsl:template match="fixr:fields/fixr:field[not(@id = (
'1156', '1128', '7', '8', '9', '380', '10', '1129', '1137',
'128', '145', '129', '98', '16', '123', '108', '369', '347',
'34', '35', '36', '789', '627', '115', '144', '370', '116',
'122', '43', '97', '372', '45', '371', '141', '90', '91',
'49', '142', '50', '52', '373', '1409', '89', '93', '56',
'143', '57', '112', '58', '213', '212'
))]">
</xsl:template>

<!-- ApplExtID -->
Expand Down
2 changes: 1 addition & 1 deletion quickfixj-codegenerator/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
<dependency>
<groupId>net.sf.saxon</groupId>
<artifactId>Saxon-HE</artifactId>
<version>12.9</version>
<version>${saxon.version}</version>
</dependency>
<dependency>
<groupId>org.junit.vintage</groupId>
Expand Down
131 changes: 16 additions & 115 deletions quickfixj-messages/quickfixj-messages-all/src/main/xsl/minimiseOrchestra.xsl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,122 +15,23 @@
</xsl:template>

<!-- filter out fields that are not used in QFJ tests -->
<!-- Field 1492 ComplexEventStartDate is included to prove successful compilation of a field extending UTCDateOnly -->
<!-- Field 1492 ComplexEventStartDate is included to prove successful compilation of a field extending UTCDateOnly -->
<xsl:template
match="fixr:fields/fixr:field[not(
@id = '6' or
@id = '8' or
@id = '9' or
@id = '10' or
@id = '11' or
@id = '19' or
@id = '21' or
@id = '22' or
@id = '33' or
@id = '34' or
@id = '35' or
@id = '38' or
@id = '40' or
@id = '43' or
@id = '44' or
@id = '45' or
@id = '48' or
@id = '49' or
@id = '50' or
@id = '52' or
@id = '54' or
@id = '55' or
@id = '56' or
@id = '57' or
@id = '58' or
@id = '59' or
@id = '60' or
@id = '89' or
@id = '90' or
@id = '91' or
@id = '93' or
@id = '95' or
@id = '96' or
@id = '97' or
@id = '110' or
@id = '115' or
@id = '116' or
@id = '122' or
@id = '128' or
@id = '129' or
@id = '131' or
@id = '134' or
@id = '135' or
@id = '142' or
@id = '143' or
@id = '144' or
@id = '145' or
@id = '146' or
@id = '149' or
@id = '152' or
@id = '155' or
@id = '167' or
@id = '193' or
@id = '212' or
@id = '213' or
@id = '268' or
@id = '269' or
@id = '270' or
@id = '271' or
@id = '277' or
@id = '278' or
@id = '279' or
@id = '320' or
@id = '322' or
@id = '323' or
@id = '336' or
@id = '347' or
@id = '369' or
@id = '372' or
@id = '380' or
@id = '393' or
@id = '447' or
@id = '448' or
@id = '452' or
@id = '453' or
@id = '460' or
@id = '548' or
@id = '549' or
@id = '550' or
@id = '552' or
@id = '553' or
@id = '554' or
@id = '555' or
@id = '560' or
@id = '600' or
@id = '627' or
@id = '628' or
@id = '629' or
@id = '630' or
@id = '918' or
@id = '923' or
@id = '924' or
@id = '925' or
@id = '1128' or
@id = '1129' or
@id = '1262' or
@id = '1268' or
@id = '1269' or
@id = '1270' or
@id = '1271' or
@id = '1272' or
@id = '1156' or
@id = '1400' or
@id = '1401' or
@id = '1402' or
@id = '1403' or
@id = '1404' or
@id = '1483' or
@id = '1484' or
@id = '1491' or
@id = '1492' or
@id = '1779' or
@id = '321007')]"/>
match="fixr:fields/fixr:field[not(@id = (
'6', '8', '9', '10', '11', '19', '21', '22', '33',
'34', '35', '38', '40', '43', '44', '45', '48', '49',
'50', '52', '54', '55', '56', '57', '58', '59', '60',
'89', '90', '91', '93', '95', '96', '97', '110', '115',
'116', '122', '128', '129', '131', '134', '135', '142',
'143', '144', '145', '146', '149', '152', '155', '167',
'193', '212', '213', '268', '269', '270', '271', '277',
'278', '279', '320', '322', '323', '336', '347', '369',
'372', '380', '393', '447', '448', '452', '453', '460',
'548', '549', '550', '552', '553', '554', '555', '560',
'600', '627', '628', '629', '630', '918', '923', '924',
'925', '1128', '1129', '1262', '1268', '1269', '1270',
'1271', '1272', '1156', '1400', '1401', '1402', '1403',
'1404', '1483', '1484', '1491', '1492', '1779', '321007'))]"/>

<!-- filter out components that are not used in QFJ tests -->
<xsl:template
Expand Down
77 changes: 11 additions & 66 deletions quickfixj-orchestration/src/main/xsl/extractSessionLayer.xsl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,72 +19,17 @@
match="fixr:message[(@category='Session') ]" />

<!-- filter out FIX Session Layer fields -->
<xsl:template match="fixr:fields/fixr:field[( @id='7'
or @id='8'
or @id='9'
or @id='10'
or @id='16'
or @id='34'
or @id='35'
or @id='36'
or @id='43'
or @id='49'
or @id='50'
or @id='52'
or @id='56'
or @id='57'
or @id='89'
or @id='90'
or @id='91'
or @id='93'
or @id='95'
or @id='96'
or @id='97'
or @id='98'
or @id='108'
or @id='112'
or @id='115'
or @id='116'
or @id='122'
or @id='123'
or @id='128'
or @id='129'
or @id='141'
or @id='142'
or @id='143'
or @id='144'
or @id='145'
or @id='212'
or @id='213'
or @id='347'
or @id='369'
or @id='371'
or @id='373'
or @id='383'
or @id='385'
or @id='464'
or @id='553'
or @id='554'
or @id='627'
or @id='628'
or @id='629'
or @id='630'
or @id='789'
or @id='925'
or @id='1128'
or @id='1129'
or @id='1137'
or @id='1156'
or @id='1400'
or @id='1401'
or @id='1402'
or @id='1403'
or @id='1404'
or @id='1407'
or @id='1408'
or @id='1409'
or @id='1410'
or @id='2085') ]" />
<xsl:template match="fixr:fields/fixr:field[@id = (
'7', '8', '9', '10', '16', '34', '35', '36',
'43', '49', '50', '52', '56', '57', '89', '90',
'91', '93', '95', '96', '97', '98', '108', '112',
'115', '116', '122', '123', '128', '129', '141',
'142', '143', '144', '145', '212', '213', '347',
'369', '371', '373', '383', '385', '464', '553',
'554', '627', '628', '629', '630', '789', '925',
'1128', '1129', '1137', '1156', '1400', '1401',
'1402', '1403', '1404', '1407', '1408', '1409',
'1410', '2085')] />

<!-- Remove Session category -->
<xsl:template match="fixr:categories/fixr:category[(@name='Session') ]" />
Expand Down
Loading