Merge pull request #74 from finos/main

sync develop with main

Author: dschwartznyc

.github/workflows/run-build-and-test.yml

@@ -0,0 +1,23 @@
+# .github/workflows/run-build-and-test.yml
+
+name: Run Build and Test (manual)
+
+on:
+  workflow_dispatch:
+    inputs:
+      java-version:
+        description: Java version (Temurin)
+        required: false
+        default: '21'
+      python-version:
+        description: Python version
+        required: false
+        default: '3.11'
+
+jobs:
+  run-core-build-and-test:
+    uses: ./.github/workflows/build-and-test.yml
+    with:
+      java-version: ${{ inputs.java-version }}
+      python-version: ${{ inputs.python-version }}
+    secrets: inherit

pom.xml

@@ -81,7 +81,7 @@
         <repoServerHost>s01.oss.sonatype.org</repoServerHost>
         <stagingTimeoutInMinutes>20</stagingTimeoutInMinutes>
 
-        <rosetta.dsl.version>9.65.1</rosetta.dsl.version>
+        <rosetta.dsl.version>9.65.4</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/object/PythonAttributeProcessor.xtend

@@ -198,7 +198,7 @@ class PythonAttributeProcessor {
         val otherMeta = new ArrayList<String>()
 
         // process attribute metadata
-        if (attrRMAT.hasMeta) {
+        if (attrRMAT.hasAttributeMeta) {
             attrRMAT.getMetaAttributes.forEach [ma |
                 switch(ma.getName) {
                     case "key", case "id": {

src/test/java/com/regnosys/rosetta/generator/python/generated_syntax/PythonMetaDataGeneratorTest.xtend

@@ -148,10 +148,10 @@ class PythonMetaDataGeneratorTest {
         class test_generated_syntax_metadata_NodeRef(BaseDataClass):
             _FQRTN = 'test.generated_syntax.metadata.NodeRef'
             typeA: Optional[Annotated[test_generated_syntax_metadata_A, test_generated_syntax_metadata_A.serializer(), test_generated_syntax_metadata_A.validator()]] = Field(None, description='')
-            aReference: Optional[Annotated[test_generated_syntax_metadata_A, test_generated_syntax_metadata_A.serializer(), test_generated_syntax_metadata_A.validator(('@ref', '@ref:external'))]] = Field(None, description='')
+            aReference: Optional[Annotated[test_generated_syntax_metadata_A, test_generated_syntax_metadata_A.serializer(), test_generated_syntax_metadata_A.validator(('@key', '@key:external', '@ref', '@ref:external'))]] = Field(None, description='')
             
             _KEY_REF_CONSTRAINTS = {
-                'aReference': {'@ref', '@ref:external'}
+                'aReference': {'@key', '@key:external', '@ref', '@ref:external'}
             }
         '''
         testUtils.assertGeneratedContainsExpectedString(generatedBundle, expectedNodeRef)

src/test/java/com/regnosys/rosetta/generator/python/generated_syntax/PythonMetaKeyRefGeneratorTest.xtend

@@ -63,10 +63,10 @@ class PythonMetaKeyRefGeneratorTest {
         '''
         class test_generated_syntax_meta_key_ref_KeyRef(BaseDataClass):
             _FQRTN = 'test.generated_syntax.meta_key_ref.KeyRef'
-            fieldA: Annotated[StrWithMeta, StrWithMeta.serializer(), StrWithMeta.validator(('@key', '@key:external', '@ref', '@ref:external'))] = Field(..., description='')
+            fieldA: Annotated[StrWithMeta, StrWithMeta.serializer(), StrWithMeta.validator(('@ref', '@ref:external', '@key', '@key:external'))] = Field(..., description='')
             
             _KEY_REF_CONSTRAINTS = {
-                'fieldA': {'@key', '@key:external', '@ref', '@ref:external'}
+                'fieldA': {'@ref', '@ref:external', '@key', '@key:external'}
             }
         '''
         testUtils.assertGeneratedContainsExpectedString(generatedBundle, expectedKeyRef)