Skip to content

Commit 61ffd1a

Browse files
authored
Merge pull request #4 from david-gibbs-ig/localmktdate-and-localmkttime-must-be-string-fields
Map FIX types `LocalMktDate` and `LocalMktTime` to `String` to avoid incorrect conversion for `LocalDate` and `LocalTime`
2 parents 7503a42 + bd70f8d commit 61ffd1a

File tree

6 files changed

+42
-42
lines changed
  • quickfixj-from-fix-orchestra-repository
    • quickfixj-from-fix-orchestra-code-generator-maven-plugin
    • quickfixj-from-fix-orchestra-dictionary-generator-maven-plugin
    • quickfixj-from-fix-orchestra-generator

6 files changed

+42
-42
lines changed

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<modelVersion>4.0.0</modelVersion>
66
<groupId>org.quickfixj.orchestra</groupId>
77
<artifactId>parent</artifactId>
8-
<version>1.0.0</version>
8+
<version>1.0.1-SNAPSHOT</version>
99
<packaging>pom</packaging>
1010
<name>${project.groupId}:${project.artifactId}</name>
1111
<description>Parent project for FIX Orchestra / QuickFIX integration</description>

quickfixj-from-fix-orchestra-repository/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<groupId>org.quickfixj.orchestra</groupId>
77
<artifactId>parent</artifactId>
8-
<version>1.0.0</version>
8+
<version>1.0.1-SNAPSHOT</version>
99
</parent>
1010

1111
<artifactId>quickfixj-from-fix-orchestra</artifactId>

quickfixj-from-fix-orchestra-repository/quickfixj-from-fix-orchestra-code-generator-maven-plugin/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<groupId>org.quickfixj.orchestra</groupId>
88
<artifactId>quickfixj-from-fix-orchestra</artifactId>
9-
<version>1.0.0</version>
9+
<version>1.0.1-SNAPSHOT</version>
1010
</parent>
1111

1212
<artifactId>quickfixj-from-fix-orchestra-code-generator-maven-plugin</artifactId>

quickfixj-from-fix-orchestra-repository/quickfixj-from-fix-orchestra-dictionary-generator-maven-plugin/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<parent>
55
<groupId>org.quickfixj.orchestra</groupId>
66
<artifactId>quickfixj-from-fix-orchestra</artifactId>
7-
<version>1.0.0</version>
7+
<version>1.0.1-SNAPSHOT</version>
88
</parent>
99

1010
<artifactId>quickfixj-from-fix-orchestra-dictionary-generator-maven-plugin</artifactId>

quickfixj-from-fix-orchestra-repository/quickfixj-from-fix-orchestra-generator/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<groupId>org.quickfixj.orchestra</groupId>
77
<artifactId>quickfixj-from-fix-orchestra</artifactId>
8-
<version>1.0.0</version>
8+
<version>1.0.1-SNAPSHOT</version>
99
</parent>
1010

1111
<artifactId>quickfixj-from-fix-orchestra-generator</artifactId>

quickfixj-from-fix-orchestra-repository/quickfixj-from-fix-orchestra-generator/src/main/java/org/quickfixj/orchestra/CodeGeneratorJ.java

Lines changed: 37 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -674,43 +674,43 @@ private static File getClassFilePath(File outputDir, String packageName, String
674674
private static String getFieldBaseClass(String type, String decimalTypeString) {
675675
String baseType;
676676
switch (type) {
677-
case "char":
678-
baseType = "CharField";
679-
break;
680-
case "Price":
681-
case "Amt":
682-
case "Qty":
683-
case "float":
684-
case "PriceOffset":
685-
baseType = decimalTypeString;
686-
break;
687-
case "int":
688-
case "NumInGroup":
689-
case "SeqNum":
690-
case "Length":
691-
case "TagNum":
692-
case "DayOfMonth":
693-
baseType = "IntField";
694-
break;
695-
case "UTCTimestamp":
696-
baseType = "UtcTimeStampField";
697-
break;
698-
case "UTCTimeOnly":
699-
case "LocalMktTime":
700-
baseType = "UtcTimeOnlyField";
701-
break;
702-
case "UTCDateOnly":
703-
case "LocalMktDate":
704-
baseType = "UtcDateOnlyField";
705-
break;
706-
case "Boolean":
707-
baseType = "BooleanField";
708-
break;
709-
case "Percentage":
710-
baseType = DOUBLE_FIELD;
711-
break;
712-
default:
713-
baseType = "StringField";
677+
case "char":
678+
baseType = "CharField";
679+
break;
680+
case "Price":
681+
case "Amt":
682+
case "Qty":
683+
case "float":
684+
case "PriceOffset":
685+
baseType = decimalTypeString;
686+
break;
687+
case "int":
688+
case "NumInGroup":
689+
case "SeqNum":
690+
case "Length":
691+
case "TagNum":
692+
case "DayOfMonth":
693+
baseType = "IntField";
694+
break;
695+
case "UTCTimestamp":
696+
baseType = "UtcTimeStampField";
697+
break;
698+
case "UTCTimeOnly":
699+
baseType = "UtcTimeOnlyField";
700+
break;
701+
case "UTCDateOnly":
702+
baseType = "UtcDateOnlyField";
703+
break;
704+
case "Boolean":
705+
baseType = "BooleanField";
706+
break;
707+
case "Percentage":
708+
baseType = DOUBLE_FIELD;
709+
break;
710+
case "LocalMktDate":
711+
case "LocalMktTime":
712+
default:
713+
baseType = "StringField";
714714
}
715715
return baseType;
716716
}

0 commit comments

Comments
 (0)