update to dsl version 9.50.0

Author: dschwartz-ftadvisory

images/rosetta-language-code-generation.png

@@ -42,26 +42,24 @@
 
     <developers>
         <developer>
-            <id>minesh-s-patel</id>
-            <name>Minesh Patel</name>
-            <email>[email protected]</email>
-            <url>http://github.com/minesh-s-patel</url>
-            <organization>REGnosys</organization>
-            <organizationUrl>https://regnosys.com</organizationUrl>
+            <id>plamen-neykov</id>
+            <name>Plamen Neykov</name>
+            <email>[email protected]</email>
+            <url>http://github.com/plamen-neykov</url>
+            <organization>CDMFLow</organization>
             <timezone>+1</timezone>
             <roles>
                 <role>Maintainer</role>
                 <role>Developer</role>
             </roles>
         </developer>
         <developer>
-            <id>hugohills-regnosys</id>
-            <name>Hugo Hills</name>
-            <email>[email protected]</email>
-            <url>http://github.com/hugohills-regnosys</url>
-            <organization>REGnosys</organization>
-            <organizationUrl>https://regnosys.com</organizationUrl>
-            <timezone>+1</timezone>
+            <id>dschwartznyc</id>
+            <name>Daniel Schwartz</name>
+            <email>[email protected]</email>
+            <url>http://github.com/dschwartznyc</url>
+            <organization>CDMFlow</organization>
+            <timezone>+5</timezone>
             <roles>
                 <role>Maintainer</role>
                 <role>Developer</role>
@@ -156,10 +154,11 @@
         <repoServerHost>s01.oss.sonatype.org</repoServerHost>
         <stagingTimeoutInMinutes>10</stagingTimeoutInMinutes>
 
-        <rosetta.dsl.version>9.49.1</rosetta.dsl.version>
-        <rosetta.bundle.version>11.59.1</rosetta.bundle.version>
+        <rosetta.dsl.version>9.50.0</rosetta.dsl.version>   
+        <rosetta.bundle.version>11.60.0</rosetta.bundle.version>
 
-        <xtext.version>2.27.0</xtext.version>
+        <xtext.version>2.38.0</xtext.version>
+        <guice.version>6.0.0</guice.version>
 
         <slf4j.version>2.0.13</slf4j.version>
         <logback.version>1.5.6</logback.version>
@@ -205,6 +204,11 @@
                 <version>${apache.commons.text.version}</version>
             </dependency>
             <!-- xtext START -->
+            <dependency>
+                <groupId>com.google.inject</groupId>
+                <artifactId>guice</artifactId>
+                <version>${guice.version}</version>
+            </dependency>
             <dependency>
                 <groupId>org.eclipse.xtext</groupId>
                 <artifactId>xtext-dev-bom</artifactId>

pom.xml

@@ -12,7 +12,6 @@ import com.regnosys.rosetta.rosetta.expression.DistinctOperation
 import com.regnosys.rosetta.rosetta.expression.FilterOperation
 import com.regnosys.rosetta.rosetta.expression.FirstOperation
 import com.regnosys.rosetta.rosetta.expression.FlattenOperation
-// import com.regnosys.rosetta.rosetta.expression.InlineFunction
 import com.regnosys.rosetta.rosetta.expression.LastOperation
 import com.regnosys.rosetta.rosetta.expression.ListLiteral
 import com.regnosys.rosetta.rosetta.expression.MapOperation

src/main/java/com/regnosys/rosetta/generator/python/expressions/PythonExpressionGenerator.xtend

@@ -1,5 +1,6 @@
 package com.regnosys.rosetta.generator.python.func;
 
+import com.google.inject.Inject
 import com.regnosys.rosetta.rosetta.RosettaEnumValueReference
 import com.regnosys.rosetta.rosetta.RosettaEnumeration
 import com.regnosys.rosetta.rosetta.RosettaExternalFunction
@@ -25,7 +26,6 @@ import com.regnosys.rosetta.types.RFunction
 import com.regnosys.rosetta.types.RObjectFactory
 import java.util.HashSet
 import java.util.Set
-import javax.inject.Inject
 import org.eclipse.emf.ecore.EObject
 import org.eclipse.xtext.EcoreUtil2
 

src/main/java/com/regnosys/rosetta/generator/python/func/FunctionDependencyProvider.xtend

@@ -12,8 +12,6 @@ import com.regnosys.rosetta.rosetta.simple.Data
 import com.regnosys.rosetta.rosetta.simple.Function
 import com.regnosys.rosetta.rosetta.simple.Operation
 import com.regnosys.rosetta.rosetta.simple.Segment
-import com.regnosys.rosetta.rosetta.simple.ShortcutDeclaration
-import com.regnosys.rosetta.rosetta.simple.Condition
 import com.regnosys.rosetta.rosetta.RosettaFeature
 import com.regnosys.rosetta.rosetta.RosettaTyped
 import java.util.ArrayList
@@ -25,11 +23,7 @@ import java.util.Set
 import org.eclipse.emf.ecore.EObject
 import org.slf4j.Logger
 import org.slf4j.LoggerFactory
-/*
-import com.regnosys.rosetta.rosetta.simple.ShortcutDeclaration
-import com.regnosys.rosetta.rosetta.simple.Condition
-import org.eclipse.emf.common.util.EList
- */
+
 class PythonFunctionGenerator {
 
     static final Logger LOGGER = LoggerFactory.getLogger(PythonFunctionGenerator);

src/main/java/com/regnosys/rosetta/generator/python/func/PythonFunctionGenerator.xtend

@@ -1,6 +1,5 @@
 package com.regnosys.rosetta.generator.python.object
 
-// TODO: fix unit tests
 import com.google.inject.Inject
 import com.regnosys.rosetta.generator.python.expressions.PythonExpressionGenerator
 import com.regnosys.rosetta.generator.python.util.PythonCodeGeneratorUtil

src/main/java/com/regnosys/rosetta/generator/python/object/PythonModelObjectGenerator.xtend

@@ -65,7 +65,6 @@ class PythonFilesGeneratorTest {
     /*
      * generate Python Unit Tests from Rosetta files.
      */
-//    @Disabled
     @Test
     def void generatePythonUnitTests() {
         try {
@@ -96,7 +95,6 @@ class PythonFilesGeneratorTest {
     /*
      * generate Serialization Python Unit Tests from Rosetta files.
      */
-//    @Disabled
     @Test
     def void generatePythonSerializationUnitTests() {
         try {