First step in removing dependency on rosetta.common

Author: dschwartz-ftadvisory

pom.xml

@@ -98,7 +98,6 @@
         <maven-enforcer-plugin.version>3.3.0</maven-enforcer-plugin.version>
         <maven-checkstyle-plugin.version>3.4.0</maven-checkstyle-plugin.version>
         <maven-clean-plugin.version>3.1.0</maven-clean-plugin.version>
-        <maven-resources-plugin.version>3.1.0</maven-resources-plugin.version>
         <maven-compiler-plugin.version>3.8.1</maven-compiler-plugin.version>
         <maven-surefire-plugin.version>2.22.2</maven-surefire-plugin.version>
         <maven-jar-plugin.version>3.1.1</maven-jar-plugin.version>
@@ -477,9 +476,24 @@
                                 <filter>
                                     <artifact>*:*</artifact>
                                     <excludes>
+                                        <exclude>META-INF/LICENSE*</exclude>
+                                        <exclude>META-INF/NOTICE*</exclude>
+                                        <exclude>META-INF/DEPENDENCIES</exclude>
+                                        <exclude>META-INF/eclipse.inf</exclude>
                                         <exclude>META-INF/*.SF</exclude>
                                         <exclude>META-INF/*.DSA</exclude>
                                         <exclude>META-INF/*.RSA</exclude>
+                                        <exclude>META-INF.versions.9.module-info</exclude>
+                                        <exclude>META-INF/services/com.fasterxml.jackson.databind.Module</exclude>
+                                        <exclude>about_files/LICENSE-2.0.txt</exclude>
+                                        <exclude>about.html</exclude>
+                                        <exclude>about.ini</exclude>
+                                        <exclude>about.mappings</exclude>
+                                        <exclude>about.properties</exclude>
+                                        <exclude>plugin.xml</exclude>
+                                        <exclude>modeling32.png</exclude>
+                                        <exclude>.options</exclude>
+                                        <exclude>.api_description</exclude>
                                     </excludes>
                                 </filter>
                             </filters>

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

@@ -5,6 +5,7 @@
 import com.google.inject.Provider;
 import com.regnosys.rosetta.RosettaRuntimeModule;
 import com.regnosys.rosetta.RosettaStandaloneSetup;
+import com.regnosys.rosetta.builtin.RosettaBuiltinsService;
 import com.regnosys.rosetta.common.util.ClassPathUtils;
 import com.regnosys.rosetta.common.util.UrlUtils;
 import com.regnosys.rosetta.generator.external.ExternalGenerator;
@@ -15,6 +16,7 @@
 import org.eclipse.emf.ecore.resource.Resource;
 import org.eclipse.emf.ecore.resource.ResourceSet;
 import org.eclipse.xtext.resource.XtextResourceSet;
+import org.eclipse.emf.common.util.URI;
 import org.jetbrains.annotations.NotNull;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -90,6 +92,7 @@ public static void main(String[] args) {
             if (cmd.hasOption("s")) {
                 String srcDir = cmd.getOptionValue("s");
                 translateFromSourceDir(srcDir, tgtDir);
+                translateFromSourceDir2(srcDir, tgtDir + "-2");
             } else if (cmd.hasOption("f")) {
                 String srcFile = cmd.getOptionValue("f");
                 translateFromSourceFile(srcFile, tgtDir);
@@ -132,6 +135,63 @@ private static void translateFromSourceDir(String srcDir, String tgtDir) {
         translateRosetta(rosettaFiles, tgtDir);
     }
 
+    private static void translateFromSourceDir2(String srcDir, String tgtDir) {
+        LOGGER.info("translateFromSourceDir2 ... Reading from directory: {} and writing to: {}", srcDir, tgtDir);
+        Path srcDirPath = Paths.get(srcDir);
+        if (!Files.exists(srcDirPath)) {
+            System.err.println("Source directory does not exist: " + srcDir);
+            return;
+        }
+        if (!Files.isDirectory(srcDirPath)) {
+            System.err.println("Source directory is not a directory: " + srcDir);
+            return;
+        }
+        Injector injector = new PythonRosettaStandaloneSetup().createInjectorAndDoEMFRegistration();
+        PythonCodeGenerator pythonCodeGenerator = injector.getInstance(PythonCodeGenerator.class);
+        PythonModelLoader modelLoader = injector.getInstance(PythonModelLoader.class);
+        ResourceSet resourceSet = injector.getInstance(ResourceSet.class);
+
+        List<Resource> resources = new LinkedList<>();
+
+        RosettaBuiltinsService builtins = injector.getInstance(RosettaBuiltinsService.class);
+        resources.add (resourceSet.getResource(builtins.basicTypesURI, true));
+        resources.add (resourceSet.getResource(builtins.annotationsURI, true));
+        try {
+            // Find all .rosetta files in the directory and load them from disk
+            Files.walk(srcDirPath)
+                    .filter(path -> path.toString().endsWith(".rosetta"))
+                    .map(file -> resourceSet.getResource(URI.createFileURI(file.toString()), true))
+                    .forEach(resources::add);
+        } catch (IOException e) {
+            System.err.println("Error reading source directory: " + e.getMessage());
+            return;
+        }
+        LOGGER.info("translateFromSourceDir2 ... Found {} .rosetta files in directory {}", resources.size(), srcDir);
+
+
+        List<RosettaModel> models = modelLoader.rosettaModels2(resources);
+        if (models.isEmpty()) {
+            System.err.println("No valid Rosetta models found.");
+            return;
+        }
+        String version = models.get(0).getVersion();
+
+        LOGGER.info("translateFromSourceDir2 ... Processing {} models, version: {}", models.size(), version);
+
+        Map<String, CharSequence> generatedPython = new HashMap<>();
+        pythonCodeGenerator.beforeAllGenerate(resourceSet, models, version);
+        for (RosettaModel model : models) {
+            System.out.println("translateFromSourceDir2 ... processing: " + model.getName());
+            generatedPython.putAll(pythonCodeGenerator.beforeGenerate(model.eResource(), model, version));
+            generatedPython.putAll(pythonCodeGenerator.generate(model.eResource(), model, version));
+            generatedPython.putAll(pythonCodeGenerator.afterGenerate(model.eResource(), model, version));
+        }
+        generatedPython.putAll(pythonCodeGenerator.afterAllGenerate(resourceSet, models, version));
+
+        writePythonFiles(generatedPython, tgtDir);
+    }
+
+
     private static void translateFromSourceFile(String srcFile, String tgtDir) {
         LOGGER.info("Reading from file: {} and writing to: {}", srcFile, tgtDir);
         Path srcFilePath = Paths.get(srcFile);
@@ -169,13 +229,14 @@ private static void translateRosetta(List<Path> rosettaFiles, String tgtDir) {
             return;
         }
         XtextResourceSet resourceSet = modelLoader.getResourceSet();
-        String version = models.getFirst().getVersion();
+        String version = models.get(0).getVersion();
 
         LOGGER.info("Processing {} models, version: {}", models.size(), version);
 
         Map<String, CharSequence> generatedPython = new HashMap<>();
         pythonCodeGenerator.beforeAllGenerate(resourceSet, models, version);
         for (RosettaModel model : models) {
+            System.out.println("translateRosetta ... processing: " + model.getName());
             generatedPython.putAll(pythonCodeGenerator.beforeGenerate(model.eResource(), model, version));
             generatedPython.putAll(pythonCodeGenerator.generate(model.eResource(), model, version));
             generatedPython.putAll(pythonCodeGenerator.afterGenerate(model.eResource(), model, version));
@@ -220,6 +281,15 @@ public List<RosettaModel> rosettaModels(List<Path> statics, List<Path> sourceFil
                     .collect(Collectors.toList());
         }
 
+        public List<RosettaModel> rosettaModels2(List<Resource> resources) {
+            return resources.stream()
+                    .filter(Objects::nonNull)
+                    .map(Resource::getContents)
+                    .flatMap(Collection::stream)
+                    .filter(r -> r instanceof RosettaModel)
+                    .map(r -> (RosettaModel) r)
+                    .collect(Collectors.toList());
+        }
         public XtextResourceSet getResourceSet() {
             return resourceSetProvider.get();
         }