Update DSL version to 7.5.3 (ISO types) and bundle version 6.1.6 (fin…

…os#2148) * Update DSL version to 7.5.3 (ISO types) and bundle version 6.1.3 * Fix projection mapper * Add release note * Update bundle version 6.1.4 * Update release notes * Bundle version 6.1.6
dackattack218 · May 17, 2023 · f40fb77 · f40fb77
1 parent d0b657f
commit f40fb77
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 10 deletions.
diff --git a/RELEASE.md b/RELEASE.md
@@ -4,9 +4,10 @@ _What is being released?_
 
 This release updates the `rosetta-dsl` dependency:
 
-- Version `7.4.0`:
-    - Rosetta models generated from an xsd
-    - Bug fix related to code-generated Java that avoids keyword clashes
+- Versions:
+    - `7.5.0` Support for ISO data types - see DSL documentation https://github.com/REGnosys/rosetta-dsl/issues/512 
+    - `7.5.2` Import model from xsd updated to support different documentation tags
+    - `7.5.3` Additional changes make ISO data types backwards compatible
 
 This release contains no changes to the model or test expectations.
 

diff --git a/pom.xml b/pom.xml
@@ -21,8 +21,8 @@
         <!-- release version is overridden in rosetta-source -->
         <maven.compiler.release>11</maven.compiler.release>
 
-        <rosetta.bundle.version>5.10.0</rosetta.bundle.version>
-        <rosetta.dsl.version>7.4.0</rosetta.dsl.version>
+        <rosetta.bundle.version>6.1.6</rosetta.bundle.version>
+        <rosetta.dsl.version>7.5.3</rosetta.dsl.version>
 
         <xtext.version>2.27.0</xtext.version>
         <opengamma.strata.version>1.7.0</opengamma.strata.version>

diff --git a/...oject/src/main/java/com/regnosys/granite/projector/fpml_5_10/Fpml510ProjectionMapper.java b/...oject/src/main/java/com/regnosys/granite/projector/fpml_5_10/Fpml510ProjectionMapper.java
@@ -42,10 +42,10 @@
 import com.rosetta.model.lib.meta.GlobalKeyFields;
 import com.rosetta.model.lib.meta.ReferenceWithMeta;
 import com.rosetta.model.lib.records.Date;
-import com.rosetta.model.metafields.BasicReferenceWithMetaDate;
 import com.rosetta.model.metafields.FieldWithMetaDate;
 import com.rosetta.model.metafields.FieldWithMetaString;
 import com.rosetta.model.metafields.MetaFields;
+import com.rosetta.model.metafields.ReferenceWithMetaDate;
 import org.fpml.fpml_5.confirmation.CalculationAgent;
 import org.fpml.fpml_5.confirmation.Currency;
 import org.fpml.fpml_5.confirmation.EuropeanExercise;
@@ -1145,9 +1145,9 @@ private Optional<DateRange> getDateRange(cdm.base.datetime.DateRange cdmDateRang
 			});
 	}
 
-	private Optional<DateReference> getDateRelativeTo(BasicReferenceWithMetaDate cdmDateRelativeTo) {
+	private Optional<DateReference> getDateRelativeTo(ReferenceWithMetaDate cdmDateRelativeTo) {
 		return Optional.ofNullable(cdmDateRelativeTo)
-			.map(BasicReferenceWithMetaDate::getExternalReference)
+			.map(ReferenceWithMetaDate::getExternalReference)
 			.map(r -> {
 				IdentifiedDate dateRef = objectFactory.createIdentifiedDate();
 				dateRef.setId(r);

diff --git a/...t/src/test/java/com/regnosys/granite/projector/fpml_5_10/Fpml510ProjectionMapperTest.java b/...t/src/test/java/com/regnosys/granite/projector/fpml_5_10/Fpml510ProjectionMapperTest.java
@@ -4,15 +4,19 @@
 import com.google.common.io.Resources;
 import com.google.inject.Module;
 import com.google.inject.*;
+import com.google.inject.util.Modules;
 import com.regnosys.ingest.test.framework.ingestor.IngestionReport;
 import com.regnosys.ingest.test.framework.ingestor.IngestionTestUtil;
 import com.regnosys.ingest.test.framework.ingestor.service.IngestionFactory;
 import com.regnosys.ingest.test.framework.ingestor.service.IngestionService;
 import com.regnosys.ingest.test.framework.ingestor.synonym.MappingResult;
+import com.regnosys.rosetta.RosettaRuntimeModule;
+import com.regnosys.rosetta.RosettaStandaloneSetup;
 import com.regnosys.rosetta.common.serialisation.RosettaObjectMapper;
 import com.regnosys.rosetta.common.util.UrlUtils;
 import com.rosetta.model.lib.path.RosettaPath;
 import com.rosetta.model.lib.process.PostProcessStep;
+import org.eclipse.xtext.common.TerminalsStandaloneSetup;
 import org.fpml.fpml_5.confirmation.DataDocument;
 import org.fpml.fpml_5.confirmation.Document;
 import org.fpml.fpml_5.confirmation.RequestClearing;
@@ -220,13 +224,21 @@ private static List<Arguments> getArguments(List<Expectations> fpmlDataDocumentF
 			.collect(Collectors.toList());
 	}
 
-	private static void initialiseIngestionFactory(Module Fpml510ProjectionMapperTest) {
+	private static void initialiseIngestionFactory(Module moduleRuntimeModule) {
 		IngestionFactory.init(INSTANCE_NAME,
 				Fpml510ProjectionMapperTest.class.getClassLoader(),
-				Fpml510ProjectionMapperTest,
+				setupRuntimeModules(moduleRuntimeModule),
 				IngestionTestUtil.getPostProcessors(injector).toArray(new PostProcessStep[0]));
 	}
 
+	private static Module setupRuntimeModules(Module modelRuntimeModule) {
+		TerminalsStandaloneSetup.doSetup();
+		Module combinedModules = Modules.combine(new Module[]{modelRuntimeModule, new RosettaRuntimeModule()});
+		injector = Guice.createInjector(new Module[]{combinedModules});
+		(new RosettaStandaloneSetup()).register(injector);
+		return combinedModules;
+	}
+
 	static class Expectations {
 		private final String fileName;
 		private final Class<? extends Document> fpmlDocument;