Merge branch for Orchestra V.1.1 RC3

.github/workflows/maven.yml

@@ -13,7 +13,7 @@ jobs:
     steps:
     - uses: actions/checkout@v2
     - name: Set up JDK 11
-      uses: actions/setup-java@v2
+      uses: actions/setup-java@v3
       with:
         distribution: 'temurin'
         java-version: '11'

interfaces/src/main/java/module-info.java

@@ -2,8 +2,8 @@
   requires transitive java.xml.bind;
   requires transitive jaxb2.basics.runtime;
 
-  exports io.fixprotocol._2024.orchestra.interfaces;
-  opens io.fixprotocol._2024.orchestra.interfaces;
+  exports io.fixprotocol._2026.orchestra.interfaces;
+  opens io.fixprotocol._2026.orchestra.interfaces;
   exports org.purl.dc.elements._1;
   opens org.purl.dc.elements._1;
   exports org.purl.dc.terms;

interfaces/src/main/resources/xsd/interfaces.xsd

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:fixi="http://fixprotocol.io/2024/orchestra/interfaces" xmlns:dcterms="http://purl.org/dc/terms/" targetNamespace="http://fixprotocol.io/2024/orchestra/interfaces" elementFormDefault="qualified" version="1.1-rc2">
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:fixi="http://fixprotocol.io/2026/orchestra/interfaces" xmlns:dcterms="http://purl.org/dc/terms/" targetNamespace="http://fixprotocol.io/2026/orchestra/interfaces" elementFormDefault="qualified" version="1.1-rc3">
 	<xs:annotation>
 		<xs:documentation>
 			FIX interface configuration

message-model/src/main/java/io/fixprotocol/orchestra/message/CodeSetScope.java

@@ -15,8 +15,8 @@
 package io.fixprotocol.orchestra.message;
 
 import java.util.List;
-import io.fixprotocol._2024.orchestra.repository.CodeSetType;
-import io.fixprotocol._2024.orchestra.repository.CodeType;
+import io.fixprotocol._2026.orchestra.repository.CodeSetType;
+import io.fixprotocol._2026.orchestra.repository.CodeType;
 import io.fixprotocol.orchestra.model.FixNode;
 import io.fixprotocol.orchestra.model.FixType;
 import io.fixprotocol.orchestra.model.FixValue;

message-model/src/main/java/io/fixprotocol/orchestra/message/Populator.java

@@ -14,7 +14,7 @@
  */
 package io.fixprotocol.orchestra.message;
 
-import io.fixprotocol._2024.orchestra.repository.MessageType;
+import io.fixprotocol._2026.orchestra.repository.MessageType;
 import io.fixprotocol.orchestra.model.ModelException;
 
 /**

message-model/src/main/java/io/fixprotocol/orchestra/message/Validator.java

@@ -14,7 +14,7 @@
  */
 package io.fixprotocol.orchestra.message;
 
-import io.fixprotocol._2024.orchestra.repository.MessageType;
+import io.fixprotocol._2026.orchestra.repository.MessageType;
 
 /**
  * Validate a message against an Orchestra file

orchestra2doc/src/main/java/io/fixprotocol/orchestra/docgen/DocGenerator.java

@@ -45,30 +45,31 @@
 import org.stringtemplate.v4.STWriter;
 import org.stringtemplate.v4.misc.STMessage;
 
-import io.fixprotocol._2024.orchestra.repository.ActorType;
-import io.fixprotocol._2024.orchestra.repository.Actors;
-import io.fixprotocol._2024.orchestra.repository.CatComponentTypeT;
-import io.fixprotocol._2024.orchestra.repository.Categories;
-import io.fixprotocol._2024.orchestra.repository.CategoryType;
-import io.fixprotocol._2024.orchestra.repository.CodeSetType;
-import io.fixprotocol._2024.orchestra.repository.CodeType;
-import io.fixprotocol._2024.orchestra.repository.ComponentRefType;
-import io.fixprotocol._2024.orchestra.repository.ComponentType;
-import io.fixprotocol._2024.orchestra.repository.Datatype;
-import io.fixprotocol._2024.orchestra.repository.FieldRefType;
-import io.fixprotocol._2024.orchestra.repository.FieldRuleType;
-import io.fixprotocol._2024.orchestra.repository.FieldType;
-import io.fixprotocol._2024.orchestra.repository.FlowType;
-import io.fixprotocol._2024.orchestra.repository.GroupRefType;
-import io.fixprotocol._2024.orchestra.repository.GroupType;
-import io.fixprotocol._2024.orchestra.repository.MessageRefType;
-import io.fixprotocol._2024.orchestra.repository.MessageType;
-import io.fixprotocol._2024.orchestra.repository.MessageType.Responses;
-import io.fixprotocol._2024.orchestra.repository.PresenceT;
-import io.fixprotocol._2024.orchestra.repository.Repository;
-import io.fixprotocol._2024.orchestra.repository.ResponseType;
-import io.fixprotocol._2024.orchestra.repository.StateMachineType;
-import io.fixprotocol._2024.orchestra.repository.SupportType;
+import io.fixprotocol._2026.orchestra.repository.ActorType;
+import io.fixprotocol._2026.orchestra.repository.Actors;
+// Category component types removed with Orchestra v1.1 RC3
+// import io.fixprotocol._2026.orchestra.repository.CatComponentTypeT;
+import io.fixprotocol._2026.orchestra.repository.Categories;
+import io.fixprotocol._2026.orchestra.repository.CategoryType;
+import io.fixprotocol._2026.orchestra.repository.CodeSetType;
+import io.fixprotocol._2026.orchestra.repository.CodeType;
+import io.fixprotocol._2026.orchestra.repository.ComponentRefType;
+import io.fixprotocol._2026.orchestra.repository.ComponentType;
+import io.fixprotocol._2026.orchestra.repository.Datatype;
+import io.fixprotocol._2026.orchestra.repository.FieldRefType;
+import io.fixprotocol._2026.orchestra.repository.FieldRuleType;
+import io.fixprotocol._2026.orchestra.repository.FieldType;
+import io.fixprotocol._2026.orchestra.repository.FlowType;
+import io.fixprotocol._2026.orchestra.repository.GroupRefType;
+import io.fixprotocol._2026.orchestra.repository.GroupType;
+import io.fixprotocol._2026.orchestra.repository.MessageRefType;
+import io.fixprotocol._2026.orchestra.repository.MessageType;
+import io.fixprotocol._2026.orchestra.repository.MessageType.Responses;
+import io.fixprotocol._2026.orchestra.repository.PresenceT;
+import io.fixprotocol._2026.orchestra.repository.Repository;
+import io.fixprotocol._2026.orchestra.repository.ResponseType;
+import io.fixprotocol._2026.orchestra.repository.StateMachineType;
+import io.fixprotocol._2026.orchestra.repository.SupportType;
 
 /**
  * @author Don Mendelson
@@ -270,7 +271,11 @@ public void generate() throws Exception {
 
     final List<CategoryType> sortedCategoryList =
         optCategories.orElse(new Categories()).getCategory().stream()
-            .filter(c -> c.getComponentType() == CatComponentTypeT.MESSAGE).sorted((o1, o2) -> {
+            // Category component types removed with Orchestra v1.1 RC3 (moved to FIXML encoding)
+            // Removal of filter creates two additional (empty) html files for "Fields" and "ImplFields"
+            // TODO: analyse relevance of categories "Fields" and "ImplFields" for FIX Latest
+            // .filter(c -> c.getComponentType() == CatComponentTypeT.MESSAGE).sorted((o1, o2) -> {
+            .sorted((o1, o2) -> {
               final String sectionValue1 = o1.getSection() != null ? o1.getSection() : "";
               final String sectionValue2 = o2.getSection() != null ? o2.getSection() : "";
               int retv = sectionValue1.compareTo(sectionValue2);
@@ -566,7 +571,7 @@ private void generateGroupDetail(final Path messagesDocPath, final GroupType gro
     final ST stGroupStart;
     stGroupStart = stGroup.getInstanceOf("groupStart");
     stGroupStart.add("groupType", group);
-    final FieldType field = getField(group.getNumInGroup().getId().intValue());
+    final FieldType field = getField(group.getNumInGroup().getId());
     stGroupStart.add("fieldType", field);
 
     final ST stComponentEnd = stGroup.getInstanceOf("componentEnd");
@@ -592,7 +597,7 @@ private void generateMain(final Path baseOutputPath, final String title) throws
   private void generateMembers(final List<Object> members, final STWriter writer) {
     for (final Object member : members) {
       if (member instanceof FieldRefType) {
-        final FieldType field = getField(((FieldRefType) member).getId().intValue());
+        final FieldType field = getField(((FieldRefType) member).getId());
         final ST stField = stGroup.getInstanceOf("fieldMember");
         stField.add("field", field);
         if (((FieldRefType) member).getSupported() == SupportType.SUPPORTED) {
@@ -603,7 +608,7 @@ private void generateMembers(final List<Object> members, final STWriter writer)
         stField.add("assign", ((FieldRefType) member).getAssign());
         stField.write(writer, templateErrorListener);
       } else if (member instanceof GroupRefType) {
-        final GroupType component = getGroup(((GroupRefType) member).getId().intValue());
+        final GroupType component = getGroup(((GroupRefType) member).getId());
         final ST stComponent = stGroup.getInstanceOf("componentMember");
         stComponent.add("component", component);
         if (((ComponentRefType) member).getSupported() == SupportType.SUPPORTED) {
@@ -614,7 +619,7 @@ private void generateMembers(final List<Object> members, final STWriter writer)
         }
         stComponent.write(writer, templateErrorListener);
       } else if (member instanceof ComponentRefType) {
-        final ComponentType component = getComponent(((ComponentRefType) member).getId().intValue());
+        final ComponentType component = getComponent(((ComponentRefType) member).getId());
         final ST stComponent = stGroup.getInstanceOf("componentMember");
         stComponent.add("component", component);
         if (((ComponentRefType) member).getSupported() == SupportType.SUPPORTED) {
@@ -720,7 +725,7 @@ private void generateResponses(final List<ResponseType> responseList, final STWr
   private ComponentType getComponent(final int componentId) {
     final List<ComponentType> components = repository.getComponents().getComponent();
     for (final ComponentType component : components) {
-      if (component.getId().intValue() == componentId) {
+      if (component.getId() == componentId) {
         return component;
       }
     }
@@ -730,7 +735,7 @@ private ComponentType getComponent(final int componentId) {
   private FieldType getField(final int id) {
     final List<FieldType> fields = repository.getFields().getField();
     for (final FieldType fieldType : fields) {
-      if (fieldType.getId().intValue() == id) {
+      if (fieldType.getId() == id) {
         return fieldType;
       }
     }
@@ -775,7 +780,7 @@ private FlowType getFlow(final String name) {
   private GroupType getGroup(final int componentId) {
     final List<GroupType> groups = repository.getGroups().getGroup();
     for (final GroupType group : groups) {
-      if (group.getId().intValue() == componentId) {
+      if (group.getId() == componentId) {
         return group;
       }
     }

orchestra2doc/src/main/java/io/fixprotocol/orchestra/docgen/ImgGenerator.java

@@ -26,12 +26,12 @@
 import org.stringtemplate.v4.STGroupFile;
 import org.stringtemplate.v4.STWriter;
 
-import io.fixprotocol._2024.orchestra.repository.FlowType;
-import io.fixprotocol._2024.orchestra.repository.MessageRefType;
-import io.fixprotocol._2024.orchestra.repository.MessageType;
-import io.fixprotocol._2024.orchestra.repository.ResponseType;
-import io.fixprotocol._2024.orchestra.repository.StateMachineType;
-import io.fixprotocol._2024.orchestra.repository.Synchronization;
+import io.fixprotocol._2026.orchestra.repository.FlowType;
+import io.fixprotocol._2026.orchestra.repository.MessageRefType;
+import io.fixprotocol._2026.orchestra.repository.MessageType;
+import io.fixprotocol._2026.orchestra.repository.ResponseType;
+import io.fixprotocol._2026.orchestra.repository.StateMachineType;
+import io.fixprotocol._2026.orchestra.repository.Synchronization;
 import net.sourceforge.plantuml.SourceStringReader;
 
 public class ImgGenerator {

repository-util/src/main/java/io/fixprotocol/orchestra/transformers/RepositoryCompressor.java

@@ -20,7 +20,6 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
-import java.math.BigInteger;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
@@ -43,25 +42,25 @@
 import org.purl.dc.elements._1.ObjectFactory;
 import org.purl.dc.elements._1.SimpleLiteral;
 import org.purl.dc.terms.ElementOrRefinementContainer;
-import io.fixprotocol._2024.orchestra.repository.Actors;
-import io.fixprotocol._2024.orchestra.repository.Categories;
-import io.fixprotocol._2024.orchestra.repository.CategoryType;
-import io.fixprotocol._2024.orchestra.repository.CodeSetType;
-import io.fixprotocol._2024.orchestra.repository.CodeSets;
-import io.fixprotocol._2024.orchestra.repository.ComponentRefType;
-import io.fixprotocol._2024.orchestra.repository.ComponentType;
-import io.fixprotocol._2024.orchestra.repository.Components;
-import io.fixprotocol._2024.orchestra.repository.Datatypes;
-import io.fixprotocol._2024.orchestra.repository.FieldRefType;
-import io.fixprotocol._2024.orchestra.repository.FieldType;
-import io.fixprotocol._2024.orchestra.repository.Fields;
-import io.fixprotocol._2024.orchestra.repository.GroupRefType;
-import io.fixprotocol._2024.orchestra.repository.GroupType;
-import io.fixprotocol._2024.orchestra.repository.Groups;
-import io.fixprotocol._2024.orchestra.repository.MessageType;
-import io.fixprotocol._2024.orchestra.repository.Messages;
-import io.fixprotocol._2024.orchestra.repository.Repository;
-import io.fixprotocol._2024.orchestra.repository.Sections;
+import io.fixprotocol._2026.orchestra.repository.Actors;
+import io.fixprotocol._2026.orchestra.repository.Categories;
+import io.fixprotocol._2026.orchestra.repository.CategoryType;
+import io.fixprotocol._2026.orchestra.repository.CodeSetType;
+import io.fixprotocol._2026.orchestra.repository.CodeSets;
+import io.fixprotocol._2026.orchestra.repository.ComponentRefType;
+import io.fixprotocol._2026.orchestra.repository.ComponentType;
+import io.fixprotocol._2026.orchestra.repository.Components;
+import io.fixprotocol._2026.orchestra.repository.Datatypes;
+import io.fixprotocol._2026.orchestra.repository.FieldRefType;
+import io.fixprotocol._2026.orchestra.repository.FieldType;
+import io.fixprotocol._2026.orchestra.repository.Fields;
+import io.fixprotocol._2026.orchestra.repository.GroupRefType;
+import io.fixprotocol._2026.orchestra.repository.GroupType;
+import io.fixprotocol._2026.orchestra.repository.Groups;
+import io.fixprotocol._2026.orchestra.repository.MessageType;
+import io.fixprotocol._2026.orchestra.repository.Messages;
+import io.fixprotocol._2026.orchestra.repository.Repository;
+import io.fixprotocol._2026.orchestra.repository.Sections;
 
 /**
  * Selectively compresses an Orchestra file <br>
@@ -337,10 +336,10 @@ static Predicate<? super MessageType> hasFlow() {
     return m -> m.getFlow() != null;
   }
 
-  private final List<BigInteger> componentIdList = new ArrayList<>();
+  private final List<Integer> componentIdList = new ArrayList<>();
   private List<ComponentType> componentList = new ArrayList<>();
-  private final List<BigInteger> fieldIdList = new ArrayList<>();
-  private final List<BigInteger> groupIdList = new ArrayList<>();
+  private final List<Integer> fieldIdList = new ArrayList<>();
+  private final List<Integer> groupIdList = new ArrayList<>();
   private List<GroupType> groupList;
   private final String inputFile;
   private final Predicate<MessageType> messagePredicate;
@@ -424,7 +423,7 @@ private boolean compress(InputStream is, OutputStream os,
           messageList.stream().filter(messagePredicate).collect(Collectors.toList());
       filteredMessages.forEach(m -> walk(m.getStructure().getComponentRefOrGroupRefOrFieldRef()));
 
-      final List<BigInteger> distinctFieldIds =
+      final List<Integer> distinctFieldIds =
           fieldIdList.stream().distinct().collect(Collectors.toList());
       final Fields inFields = (Fields) inRepository.getFields().clone();
       final List<FieldType> fieldsWithFlow = inFields.getField().stream()
@@ -442,15 +441,15 @@ private boolean compress(InputStream is, OutputStream os,
       outCodeSets.getCodeSet().addAll(codeSetsWithFlow);
       outRepository.setCodeSets(outCodeSets);
 
-      final List<BigInteger> distinctComponentsIds =
+      final List<Integer> distinctComponentsIds =
           componentIdList.stream().distinct().collect(Collectors.toList());
       final List<ComponentType> componentsWithFlow = componentList.stream()
           .filter(c -> distinctComponentsIds.contains(c.getId())).collect(Collectors.toList());
       final Components outComponents = new Components();
       outComponents.getComponent().addAll(componentsWithFlow);
       outRepository.setComponents(outComponents);
 
-      final List<BigInteger> distinctGroupIds =
+      final List<Integer> distinctGroupIds =
           groupIdList.stream().distinct().collect(Collectors.toList());
       final List<GroupType> groupWithFlow = groupList.stream()
           .filter(c -> distinctGroupIds.contains(c.getId())).collect(Collectors.toList());
@@ -470,16 +469,16 @@ private boolean compress(InputStream is, OutputStream os,
     }
   }
 
-  private ComponentType getComponent(BigInteger id) {
+  private ComponentType getComponent(int id) {
     for (final ComponentType component : componentList) {
-      if (component.getId().equals(id)) {
+      if (component.getId() == id) {
         return component;
       }
     }
     return null;
   }
 
-  private List<Object> getComponentMembers(BigInteger id) {
+  private List<Object> getComponentMembers(int id) {
     final ComponentType component = getComponent(id);
     if (component != null) {
       return component.getComponentRefOrGroupRefOrFieldRef();
@@ -488,16 +487,16 @@ private List<Object> getComponentMembers(BigInteger id) {
     }
   }
 
-  private GroupType getGroup(BigInteger id) {
+  private GroupType getGroup(int id) {
     for (final GroupType group : groupList) {
-      if (group.getId().equals(id)) {
+      if (group.getId() == id) {
         return group;
       }
     }
     return null;
   }
 
-  private List<Object> getGroupMembers(BigInteger id) {
+  private List<Object> getGroupMembers(int id) {
     final GroupType component = getGroup(id);
     if (component != null) {
       return component.getComponentRefOrGroupRefOrFieldRef();
@@ -525,7 +524,7 @@ private void walk(List<Object> list) {
         final GroupRefType groupRef = (GroupRefType) obj;
         final GroupType group = getGroup(groupRef.getId());
         if (group == null) {
-          logger.error("Group missing for groupRef; ID={}", groupRef.getId().intValue());
+          logger.error("Group missing for groupRef; ID={}", groupRef.getId());
           return;
         }
         fieldIdList.add(group.getNumInGroup().getId());

repository-util/src/test/resources/OrchestraFIXLatest.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <fixr:repository xmlns:dc="http://purl.org/dc/elements/1.1/"
-                 xmlns:fixr="http://fixprotocol.io/2024/orchestra/repository"
+                 xmlns:fixr="http://fixprotocol.io/2026/orchestra/repository"
                  xmlns:functx="http://www.functx.com"
                  xmlns:xs="http://www.w3.org/2001/XMLSchema"
                  name="FIX.Latest"

repository/src/main/java/module-info.java

@@ -2,8 +2,8 @@
   requires transitive java.xml.bind;
   requires transitive jaxb2.basics.runtime;
 
-  exports io.fixprotocol._2024.orchestra.repository;
-  opens io.fixprotocol._2024.orchestra.repository;
+  exports io.fixprotocol._2026.orchestra.repository;
+  opens io.fixprotocol._2026.orchestra.repository;
   exports org.purl.dc.elements._1;
   opens org.purl.dc.elements._1;
   exports org.purl.dc.terms;