Merge origin/main into renovate/maven-enforcer-plugin.version

Author: dschwartz-ftadvisory

README.md

@@ -46,6 +46,11 @@ Detailed build and testing instructions can be found in [BUILDANDTEST.md](./BUIL
 
 Troubleshooting: If you run into issues, please open an [issue](https://github.com/finos/rune-python-generator/issues). This helps us improve the guide for everyone.
 
+### Coding Standards
+
+- Indentation: Since Python is sensitive to indentation, ensure your submission uses four spaces for each indentation instead of tabs.
+- Java vs xTend: since the intention is to replace xTend, all new code should be written in Java.  Ideally, changes to existing code will migrate xTend code to Java.
+
 ### 1. Building with Maven
 
 Start by cloning the project: `git clone https://github.com/finos/rune-python-generator`
@@ -109,7 +114,9 @@ We welcome contributions! Please follow these steps to get started:
 3. Read our [contribution guidelines](.github/CONTRIBUTING.md) and [Community Code of Conduct](https://www.finos.org/code-of-conduct)
 4. Commit your changes (`git commit -am 'Add some fooBar'`)
 5. Push to the branch (`git push origin feature/fooBar`)
-6. Create a new Pull Request
+6. Create a new Pull Request: the intention is to ensure that Main is always production ready and matches a release.
+   - Simple / short running changes : the PR should be to Main
+   - Complex / long running changes: the recommendation is to complete all the changes in a staging branch, such as Develop or another branch of your choosing.  Once the change is complete and passes all tests, then raise the PR to main from your staging branch.
 
 **NOTE: FINOS repositories require an executed and active FINOS Individual Contributor License Agreement (ICLA) or an executed and active FINOS Corporate Contribution License Agreement (CCLA). The FINOS Clabot tool (or EasyCLA) will flag and block commits from individuals not covered. Please note that some CCLAs require individuals/employees to be explicitly named on the CCLA.**
 

pom.xml

@@ -81,7 +81,7 @@
         <repoServerHost>s01.oss.sonatype.org</repoServerHost>
         <stagingTimeoutInMinutes>20</stagingTimeoutInMinutes>
 
-        <rosetta.dsl.version>9.68.0</rosetta.dsl.version>
+        <rosetta.dsl.version>9.71.0</rosetta.dsl.version>
 
         <xtext.version>2.38.0</xtext.version>
         <guice.version>6.0.0</guice.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()