shift to jakarta.inject from google. added DefaultExternalGeneratorsProvider

Author: dschwartz-ftadvisory

LICENSE

@@ -186,7 +186,7 @@
       same "printed page" as the copyright notice for easier
       identification within third-party archives.
 
-   Copyright 2025 CLOUDRISK Limited and FT Advisory LLC
+   Copyright 2023-2025 CLOUDRISK Limited and FT Advisory LLC
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.

NOTICE

@@ -1,5 +1,5 @@
 Rune Python Generator - FINOS
-Copyright 2025 - 2025 CLOUDRISK Limited ([email protected]) and FT Advisory LLC ([email protected])
+Copyright 2023-2025 CLOUDRISK Limited ([email protected]) and FT Advisory LLC ([email protected])
 
 This product includes software developed at the Fintech Open Source Foundation (https://www.finos.org/).
 

README.md

@@ -5,6 +5,8 @@
 # Rune Python Generator
 
 This repository creates a generator that will produce Python from a model developed using [Rune](https://github.com/finos/rune-dsl).  The generated Python relies upon the [RunePythonRuntime]() library.
+
+The generator supports creation of Python for the full Rune type syntax, and, as described in [EXPRESSION_SUPPORT.md](./EXPRESSION_SUPPORT.md), expression coverage is comprehensive.  The generator does not yet fully implement function generation.
 
 The Python package requires Python version 3.11+.
 

build/build_cdm.sh

@@ -1,4 +1,11 @@
 #!/bin/bash
+#
+# utility script - builds CDM using PythonFilesGeneratorTest::generateCDMPythonFromRosetta
+# to use:
+# 1. remove disabled test by commenting @Disabled
+# 2. specify which version of CDM to pull in get_cdm.sh
+# 3. run this script
+#
 function error
 {
     echo

build/get_cdm.sh

@@ -1,4 +1,9 @@
 #!/bin/bash
+#
+# utility script - pulls the version of CDM specified by CDM_VERSION 
+# supports build_cdm.sh
+#
+
 function error
 {
     echo

pom.xml

@@ -386,10 +386,6 @@
             <groupId>org.eclipse.emf</groupId>
             <artifactId>org.eclipse.emf.codegen.ecore</artifactId>
         </dependency>
-        <dependency>
-            <groupId>com.google.inject</groupId>
-            <artifactId>guice</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.apache.maven</groupId>
             <artifactId>maven-model</artifactId>

src/main/java/com/regnosys/rosetta/generator/python/DefaultExternalGeneratorsProvider.java

@@ -0,0 +1,31 @@
+package com.regnosys.rosetta.generator.python;
+
+import java.util.Arrays;
+import java.util.Iterator;
+import java.util.List;
+
+import jakarta.inject.Inject;
+import jakarta.inject.Provider;
+import com.regnosys.rosetta.generator.external.ExternalGenerator;
+import com.regnosys.rosetta.generator.external.ExternalGenerators;
+
+public final class DefaultExternalGeneratorsProvider implements Provider<ExternalGenerators> {
+	
+	@Inject
+	private PythonCodeGenerator pythonGenerator;
+
+	@Override
+	public ExternalGenerators get() {
+		return new DefaultGenerators();
+	}
+
+	private final class DefaultGenerators implements ExternalGenerators {
+
+		private List<ExternalGenerator> gens = Arrays.asList(pythonGenerator);
+
+		@Override
+		public Iterator<ExternalGenerator> iterator() {
+			return gens.iterator();
+		}
+	}
+}

src/main/java/com/regnosys/rosetta/generator/python/PythonCodeGenerator.java

@@ -6,7 +6,7 @@
 // TODO: review migrating choice alias processor to PythonModelObjectGenerator
 
 
-import com.google.inject.Inject;
+import jakarta.inject.Inject;
 import com.regnosys.rosetta.generator.external.AbstractExternalGenerator;
 import com.regnosys.rosetta.generator.python.enums.PythonEnumGenerator;
 import com.regnosys.rosetta.generator.python.func.PythonFunctionGenerator;

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

@@ -1,6 +1,6 @@
 package com.regnosys.rosetta.generator.python.func;
 
-import com.google.inject.Inject
+import jakarta.inject.Inject
 import com.regnosys.rosetta.rosetta.RosettaEnumValueReference
 import com.regnosys.rosetta.rosetta.RosettaEnumeration
 import com.regnosys.rosetta.rosetta.RosettaExternalFunction

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

@@ -1,6 +1,6 @@
 package com.regnosys.rosetta.generator.python.func
 
-import com.google.inject.Inject
+import jakarta.inject.Inject
 import com.regnosys.rosetta.generator.python.expressions.PythonExpressionGenerator
 import com.regnosys.rosetta.generator.python.util.PythonCodeGeneratorUtil
 import com.regnosys.rosetta.generator.python.util.RuneToPythonMapper