Merge branch 'main' into renovate/major-guice.version

Author: dschwartznyc

README.md

@@ -1,4 +1,4 @@
-[![FINOS - Incubating](https://cdn.jsdelivr.net/gh/finos/contrib-toolbox@master/images/badge-incubating.svg)](https://community.finos.org/docs/governance/Software-Projects/stages/incubating)[![OpenSSF Best Practices](https://www.bestpractices.dev/projects/10725/badge)](https://www.bestpractices.dev/projects/10725)[![Maven CI](https://github.com/finos/rune-python-generator/actions/workflows/cve-scanning.yml/badge.svg)](https://github.com/finos/rune-python-generator/actions/workflows/cve-scanning.yml)
+[![FINOS - Incubating](https://cdn.jsdelivr.net/gh/finos/contrib-toolbox@master/images/badge-incubating.svg)](https://community.finos.org/docs/governance/Software-Projects/stages/incubating)[![OpenSSF Best Practices](https://www.bestpractices.dev/projects/10725/badge)](https://www.bestpractices.dev/projects/10725)[![Maven CI](https://github.com/finos/rune-python-generator/actions/workflows/scan-cve.yml/badge.svg)](https://github.com/finos/rune-python-generator/actions/workflows/scan-cve.yml)
 
 <img align="right" width="15%" alt="FINOS" src="https://www.finos.org/hubfs/FINOS/finos-logo/FINOS_Icon_Wordmark_Name_RGB_horizontal.png">
 

pom.xml

@@ -71,33 +71,33 @@
         <java.enforced.version>[21,22)</java.enforced.version>
         <maven.compiler.release>21</maven.compiler.release>
 
-        <apache.commons.lang.version>3.13.0</apache.commons.lang.version>
+        <apache.commons.lang.version>3.19.0</apache.commons.lang.version>
         <apache.commons.text.version>1.11.0</apache.commons.text.version>
-        <commons-io.version>2.20.0</commons-io.version>
+        <commons-io.version>2.21.0</commons-io.version>
         <guava.version>33.3.1-jre</guava.version>
 
         <!-- Release -->
         <gpg.keyname>configured-by-release-profile</gpg.keyname>
         <repoServerHost>s01.oss.sonatype.org</repoServerHost>
         <stagingTimeoutInMinutes>20</stagingTimeoutInMinutes>
 
-        <rosetta.dsl.version>9.68.0</rosetta.dsl.version>
+        <rosetta.dsl.version>9.70.0</rosetta.dsl.version>
 
         <xtext.version>2.38.0</xtext.version>
         <guice.version>7.0.0</guice.version>
 
-        <slf4j.version>2.0.13</slf4j.version>
-        <logback.version>1.5.6</logback.version>
+        <slf4j.version>2.0.17</slf4j.version>
+        <logback.version>1.5.21</logback.version>
 
         <!-- test -->
-        <junit.version>6.0.0</junit.version>
+        <junit.version>6.0.1</junit.version>
         <hamcrest.version>3.0</hamcrest.version>
 
         <!-- plugin -->
-        <maven-enforcer-plugin.version>3.6.1</maven-enforcer-plugin.version>
+        <maven-enforcer-plugin.version>3.6.2</maven-enforcer-plugin.version>
         <maven-checkstyle-plugin.version>3.6.0</maven-checkstyle-plugin.version>
         <maven-clean-plugin.version>3.5.0</maven-clean-plugin.version>
-        <maven-compiler-plugin.version>3.14.0</maven-compiler-plugin.version>
+        <maven-compiler-plugin.version>3.14.1</maven-compiler-plugin.version>
         <maven-surefire-plugin.version>3.5.4</maven-surefire-plugin.version>
         <maven-jar-plugin.version>3.1.1</maven-jar-plugin.version>
         <maven-install-plugin.version>3.1.4</maven-install-plugin.version>

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

@@ -32,7 +32,6 @@ import com.regnosys.rosetta.rosetta.expression.RosettaIntLiteral
 import com.regnosys.rosetta.rosetta.expression.RosettaNumberLiteral
 import com.regnosys.rosetta.rosetta.expression.RosettaOnlyElement
 import com.regnosys.rosetta.rosetta.expression.RosettaOnlyExistsExpression
-import com.regnosys.rosetta.rosetta.expression.RosettaReference
 import com.regnosys.rosetta.rosetta.expression.RosettaStringLiteral
 import com.regnosys.rosetta.rosetta.expression.RosettaSymbolReference
 import com.regnosys.rosetta.rosetta.expression.SortOperation
@@ -109,7 +108,8 @@ class PythonExpressionGenerator {
             RosettaFeatureCall: generateFeatureCall(expr, ifLevel, isLambda)
             RosettaOnlyElement: '''rune_get_only_element(«generateExpression(expr.argument, ifLevel, isLambda)»)'''
             RosettaOnlyExistsExpression: '''rune_check_one_of(self, «generateExpression(expr.getArgs().get(0), ifLevel, isLambda)»)'''
-            RosettaReference: generateReference(expr, ifLevel, isLambda)
+            RosettaSymbolReference: generateSymbolReference(expr, ifLevel, isLambda)
+            RosettaImplicitVariable: generateImplicitVariable(expr, ifLevel, isLambda)
             default:{
                 throw new UnsupportedOperationException("Unsupported expression type of " + expr?.class?.simpleName)
             }
@@ -260,12 +260,8 @@ class PythonExpressionGenerator {
         return _builder.toString
     }
 
-
-    private def String generateReference(RosettaReference expr, int ifLevel, boolean isLambda) {
-        switch (expr) {
-            RosettaImplicitVariable: '''«expr.name»'''
-            RosettaSymbolReference:  generateSymbolReference(expr, ifLevel, isLambda)
-        }
+    private def String generateImplicitVariable(RosettaImplicitVariable expr, int ifLevel, boolean isLambda) {
+        '''«expr.name»'''
     }
 
     private def String generateSymbolReference(RosettaSymbolReference expr, int ifLevel, boolean isLambda) {

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

@@ -16,7 +16,7 @@ import com.regnosys.rosetta.rosetta.expression.RosettaFeatureCall
 import com.regnosys.rosetta.rosetta.expression.RosettaFunctionalOperation
 import com.regnosys.rosetta.rosetta.expression.RosettaLiteral
 import com.regnosys.rosetta.rosetta.expression.RosettaOnlyExistsExpression
-import com.regnosys.rosetta.rosetta.expression.RosettaReference
+import com.regnosys.rosetta.rosetta.expression.RosettaImplicitVariable
 import com.regnosys.rosetta.rosetta.expression.RosettaSymbolReference
 import com.regnosys.rosetta.rosetta.expression.RosettaUnaryOperation
 import com.regnosys.rosetta.rosetta.expression.RosettaDeepFeatureCall
@@ -94,7 +94,7 @@ class FunctionDependencyProvider {
             RosettaExternalFunction,
             RosettaEnumValueReference,
             RosettaLiteral,
-            RosettaReference,
+            RosettaImplicitVariable,
             RosettaSymbol,
             RosettaDeepFeatureCall:
                 dependencies = newHashSet()