Skip to content

Fix data dictionary golden-file mismatch caused by incomplete underscore rule in XSLT name conversion #95

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 9 commits into
base: master
Choose a base branch
from
Draft

Fix data dictionary golden-file mismatch caused by incomplete underscore rule in XSLT name conversion #95

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
7a5ef47
refactor: remove JAXB, add Saxon, create thin Java adapters
Copilot Aug 9, 2026
bfc4852
Replace JAXB with XSLT/Saxon for Orchestra code and dictionary genera…
Copilot Aug 9, 2026
0c2cca3
Fix TransformerException propagation and update test/mojo throws decl…
Copilot Aug 9, 2026
6868273
Merge remote-tracking branch 'origin/master' into copilot/create-xslt…
Copilot Aug 27, 2026
3d2ecd6
fixed ioi description
chrjohn Aug 27, 2026
3b9f2aa
Replace double underscores with single underscore in golden FIXLatest…
Copilot Aug 28, 2026
6d92323
Added current version EP309
chrjohn Sep 2, 2026
7da5547
Added current version of data dictionary for EP309
chrjohn Sep 2, 2026
7f80f31
Fix XSLT constant-name conversion to insert underscore after digits b…
Copilot Sep 3, 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
6 changes: 6 additions & 0 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,7 @@
<orchestra.repository.version>1.6.8</orchestra.repository.version>
<slf4j.version>2.0.18</slf4j.version>
<jaxb.version>2.3.3</jaxb.version>
<saxon.version>11.6</saxon.version>
<commons.io.version>2.22.0</commons.io.version>
<orchestra.file>OrchestraFIXLatest.xml</orchestra.file>
<picocli-version>4.7.7</picocli-version>
Expand Down Expand Up @@ -99,6 +100,11 @@
<version>${junit.jupiter.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>net.sf.saxon</groupId>
<artifactId>Saxon-HE</artifactId>
<version>${saxon.version}</version>
</dependency>
<dependency>
<groupId>io.fixprotocol.orchestra</groupId>
<artifactId>repository</artifactId>
Expand Down
4 changes: 3 additions & 1 deletion ...generator-maven-plugin/src/main/java/org/quickfixj/orchestra/maven/CodeGeneratorMojo.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@
import java.io.FileInputStream;
import java.io.IOException;

import javax.xml.transform.TransformerException;

import org.apache.maven.plugin.AbstractMojo;
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.plugins.annotations.LifecyclePhase;
Expand Down Expand Up @@ -75,7 +77,7 @@ public void execute() throws MojoExecutionException {

try (FileInputStream inputFile = new FileInputStream(orchestration)) {
generator.generate(inputFile, outputDirectory);
} catch (IOException e) {
} catch (IOException | TransformerException e) {
throw new MojoExecutionException(e.toString());
}
}
Expand Down
7 changes: 2 additions & 5 deletions ...tor-maven-plugin/src/main/java/org/quickfixj/orchestra/maven/DictionaryGeneratorMojo.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,17 +4,14 @@
import java.io.FileInputStream;
import java.io.IOException;

import javax.xml.bind.JAXBException;
import javax.xml.parsers.ParserConfigurationException;
import javax.xml.xpath.XPathExpressionException;
import javax.xml.transform.TransformerException;

import org.apache.maven.plugin.AbstractMojo;
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.plugins.annotations.LifecyclePhase;
import org.apache.maven.plugins.annotations.Mojo;
import org.apache.maven.plugins.annotations.Parameter;
import org.quickfixj.orchestra.DataDictionaryGenerator;
import org.xml.sax.SAXException;

@Mojo(name = "dictionaryGeneration", defaultPhase = LifecyclePhase.PROCESS_SOURCES)
public class DictionaryGeneratorMojo extends AbstractMojo {
Expand Down Expand Up @@ -51,7 +48,7 @@ public void execute() throws MojoExecutionException {
final DataDictionaryGenerator generator = new DataDictionaryGenerator();
try (FileInputStream inputFile = new FileInputStream(orchestration)) {
generator.generate(inputFile, outputDirectory);
} catch (XPathExpressionException | JAXBException | IOException | ParserConfigurationException | SAXException e) {
} catch (IOException | TransformerException e) {
throw new MojoExecutionException(e.toString());
}
}
Expand Down
13 changes: 2 additions & 11 deletions quickfixj-from-fix-orchestra-repository/quickfixj-from-fix-orchestra-generator/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@

<dependencies>
<dependency>
<groupId>io.fixprotocol.orchestra</groupId>
<artifactId>repository</artifactId>
<groupId>net.sf.saxon</groupId>
<artifactId>Saxon-HE</artifactId>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
Expand All @@ -35,10 +35,6 @@
<artifactId>commons-io</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>jakarta.xml.bind</groupId>
<artifactId>jakarta.xml.bind-api</artifactId>
</dependency>
<dependency>
<groupId>info.picocli</groupId>
<artifactId>picocli</artifactId>
Expand All @@ -52,11 +48,6 @@
<artifactId>slf4j-simple</artifactId>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-impl</artifactId>
<scope>runtime</scope>
</dependency>
</dependencies>

<build>
Expand Down
Loading
Loading